diff options
| author | Alistair Delva <adelva@google.com> | 2020-08-21 00:00:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-08-21 00:00:13 +0000 |
| commit | ed358b3546c776c1c677fd88eb8f716cf6187510 (patch) | |
| tree | 3c6134bcb2cda4b9dccc57b4a8b997a945aab62d /start-ssh | |
| parent | 22246b08952d746a7cc5a292570636cf4277598f (diff) | |
| parent | 44a1065de8a58c51a021243a28bfa01e87822e4f (diff) | |
Merge changes I934c73d4,I28cdc9a0,I9e734da9,I3c079d86
* changes:
UPSTREAM: depend
UPSTREAM: upstream: avoid possible NULL deref; from Pedro Martelletto
Revert "upstream: fix compilation with DEBUG_KEXDH; bz#3160 ok dtucker@"
Merge upstream-master into master
Diffstat (limited to 'start-ssh')
| -rw-r--r-- | start-ssh | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -9,7 +9,7 @@ DSA_PUB_KEY=/data/ssh/ssh_host_dsa_key.pub RSA_KEY=/data/ssh/ssh_host_rsa_key RSA_PUB_KEY=/data/ssh/ssh_host_rsa_key.pub AUTHORIZED_KEYS=/data/ssh/authorized_keys -DEFAULT_AUTHORIZED_KEYS=/system/etc/security/authorized_keys.default +DEFAULT_AUTHORIZED_KEYS=/vendor/etc/security/authorized_keys.default if [ ! -f $DSA_KEY ]; then /system/bin/ssh-keygen -t dsa -f $DSA_KEY -N "" @@ -30,8 +30,8 @@ fi if [ "1" == "$DEBUG" ] ; then # run sshd in debug mode and capture output to logcat - /system/bin/logwrapper /system/bin/sshd -f /system/etc/ssh/sshd_config -D -d + /system/bin/logwrapper /system/bin/sshd -f /vendor/etc/ssh/sshd_config -D -d else # don't daemonize - otherwise we can't stop the sshd service - /system/bin/sshd -f /system/etc/ssh/sshd_config -D + /system/bin/sshd -f /vendor/etc/ssh/sshd_config -D fi |