Squash updates for openssh-6.1p1

update openssh to 6.0p1

Change-Id: I2d9720abfcd74ad1428455f42d044320767b7b67

_PATH_SSH_PROGRAM should point to ssh not sftp - this fixes scp

Change-Id: I3fa7b27156ca6db3a8950f38da243768ac50d389

Revert "Allow root login if ro.debuggable is set (userdebug and eng builds)"

Since all our builds have it set, it'll be a security flaw.

This reverts commit 8e48564f68a59a5f436a1773f94284eab3af8abc.

Change-Id: I028ac7fb5294afbad82eccd307af16c25b60062d

better sshd_config

Most of it was commented out before.

Change-Id: I3b3d71a050cc1c02ff5ad14e1ce75db8fc85f2e4

Fix pathnames for Android

Change-Id: I38c6abfb7cb9be2c83e184657b8ef9da2846347f

Update config.h to 6.0p1

Change-Id: I1c60a021acae5730f23e26b8fa802733f51bd6d0

Fix problem with user home directories

Some users have / as home directory, some /data. This commit fixes ssh
and ssh-keygen trying to create /.ssh which is volatile and read-only
anyway.

To allow an app (e.g. Android Terminal Emulator) to use ssh
/data/ssh_client still has to exist and owner permissions need to be
set to the app user. This could be fixed by using the real data
directory (/data/data/"app") in a later commit.

Change-Id: I97795876992db971034d1fe3e6faba96a816c19f

config: use standard path for SSH_USER_DIR

Change-Id: I08b7fa60cf6bd498bf639f9619f1433fc7dae40b

update to openssh 6.1p1

Change-Id: Ib997ef9c71c41c81e1a21ad79f4f1f7422a2126f

Fixes

* Fix merge fail.
* Bring sshd android config inline with sshd config.
* Other fixes.

Change-Id: I96fd2b2e74cbfb813d6d53b92cd5f2bcdd6cf781

sshd: add null check

* For some reason, privsep_pw->pw_passwd is null,
  and trying to run memset() and strlen() on that
  results in a segfault.
* Add a check for null to prevent that.

Change-Id: Ifd8edad787abf4fca481ccf6999bc2106027871a