diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-22 18:44:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-22 18:44:10 +0000 |
| commit | 4c22b0272bbcab9f9a51ae9857d5b05c802af63b (patch) | |
| tree | 510211ad5600141a8274e8b6d9af61b48a0c4296 | |
| parent | 62d082ed3eee9b1acddfd2f8a45ff21213cf3300 (diff) | |
| parent | 1eafa1de314e33e033a0e7fba1fe95d0130bcf4a (diff) | |
| download | openssh-4c22b0272bbcab9f9a51ae9857d5b05c802af63b.tar.gz | |
Merge "_PATH_SSH_PROGRAM should point to ssh not sftp" am: 68ca7e1315 am: 1eafa1de31
Original change: https://android-review.googlesource.com/c/platform/external/openssh/+/213336
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I340e03d10fd72608a2968d722030b82bc622e333
| -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 b0d0f3517..17dc84246 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 |