| commit | b5d1e91f437fc8a1447efda0446310ff1f375100 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Feb 22 21:11:05 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 22 21:11:05 2021 +0000 |
| tree | 510211ad5600141a8274e8b6d9af61b48a0c4296 | |
| parent | 704dfc6c1df4fe736b6dd892ead5cecc863c03a2 [diff] | |
| parent | 393ead3e4a22c473a4d316e47f9bbda36f638188 [diff] |
Merge "_PATH_SSH_PROGRAM should point to ssh not sftp" am: 68ca7e1315 am: 1eafa1de31 am: 4c22b0272b am: 393ead3e4a Original change: https://android-review.googlesource.com/c/platform/external/openssh/+/213336 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8256ff9d183fcf0884f51549170e1eeaf5994a5e
diff --git a/prebuilt-intermediates/config.h b/prebuilt-intermediates/config.h index b0d0f35..17dc842 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