diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-22 21:11:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-22 21:11:05 +0000 |
| commit | b5d1e91f437fc8a1447efda0446310ff1f375100 (patch) | |
| tree | 510211ad5600141a8274e8b6d9af61b48a0c4296 | |
| parent | 704dfc6c1df4fe736b6dd892ead5cecc863c03a2 (diff) | |
| parent | 393ead3e4a22c473a4d316e47f9bbda36f638188 (diff) | |
| download | openssh-b5d1e91f437fc8a1447efda0446310ff1f375100.tar.gz | |
Merge "_PATH_SSH_PROGRAM should point to ssh not sftp" am: 68ca7e1315 am: 1eafa1de31 am: 4c22b0272b am: 393ead3e4aandroid-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010aml_tz3_311312010android12-mainline-tzdata3-releaseandroid12-mainline-networkstack-releaseandroid12-mainline-art-releaseaml_tz3_314012010
Original change: https://android-review.googlesource.com/c/platform/external/openssh/+/213336
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8256ff9d183fcf0884f51549170e1eeaf5994a5e
| -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 |