diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-22 17:55:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-22 17:55:06 +0000 |
| commit | 1eafa1de314e33e033a0e7fba1fe95d0130bcf4a (patch) | |
| tree | 510211ad5600141a8274e8b6d9af61b48a0c4296 | |
| parent | bd52a897efb8a131c6ddbb18586edcb9ea15b499 (diff) | |
| parent | 68ca7e13156246d424b80c781e83434d1f97810a (diff) | |
| download | platform_external_openssh-master.tar.gz platform_external_openssh-master.tar.bz2 platform_external_openssh-master.zip | |
Merge "_PATH_SSH_PROGRAM should point to ssh not sftp" am: 68ca7e1315HEADandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1mastermain-cg-testing-releaseandroid-s-beta-5android-s-beta-4
Original change: https://android-review.googlesource.com/c/platform/external/openssh/+/213336
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iab05b0a119b6441195e0bfd8ac32066584e4ff2e
| -rw-r--r-- | prebuilt-intermediates/config.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/prebuilt-intermediates/config.h b/prebuilt-intermediates/config.h index b0d0f351..17dc8424 100644 --- a/prebuilt-intermediates/config.h +++ b/prebuilt-intermediates/config.h @@ -1621,7 +1621,7 @@ #define _PATH_PRIVSEP_CHROOT_DIR SSHDIR "/empty" -#define _PATH_SSH_PROGRAM "/system/bin/sftp" +#define _PATH_SSH_PROGRAM "/system/bin/ssh" /* Utilize some of the LibreSSL compatibility layer */ #define HAVE_DH_GET0_KEY 1 |