diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-15 22:30:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-15 22:30:13 +0100 |
| commit | c57d0300bd42fabd8eeda2a95b6c3960d6e7ce07 (patch) | |
| tree | b53bc538246b5a900300b5c6b5ea740f978196f4 /package/openssh/files | |
| parent | cf4b3959527339206254b8c8fc44deb391beeb10 (diff) | |
| parent | 023560ac69a2ecf5659c668c26c0af6b5612a46b (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/nspr/Makefile
Diffstat (limited to 'package/openssh/files')
| -rw-r--r-- | package/openssh/files/sshd.init | 2 | ||||
| -rw-r--r-- | package/openssh/files/sshd_config | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/package/openssh/files/sshd.init b/package/openssh/files/sshd.init index 149da9dc4..1a2db6ada 100644 --- a/package/openssh/files/sshd.init +++ b/package/openssh/files/sshd.init @@ -8,7 +8,7 @@ case $1 in autostop) ;; autostart) [[ $openssh = NO ]] && exit 0 - grep dropbear /etc/rc.conf >/dev/null 2>&1 || dropbear=NO + grep "^dropbear" /etc/rc.conf >/dev/null 2>&1 || dropbear=NO if [[ $openssh = AUTO && $dropbear != NO ]]; then echo openssh not starting: set to AUTO and dropbear is enabled exit 0 diff --git a/package/openssh/files/sshd_config b/package/openssh/files/sshd_config index 1ef114940..b8a2c1a70 100644 --- a/package/openssh/files/sshd_config +++ b/package/openssh/files/sshd_config @@ -104,7 +104,7 @@ UsePrivilegeSeparation yes #Banner none # override default of no subsystems -Subsystem sftp /usr/sbin/sftp-server +Subsystem sftp /usr/libexec/sftp-server # Example of overriding settings on a per-user basis #Match User anoncvs |