summaryrefslogtreecommitdiff
path: root/package/openssh
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-02-14 14:05:28 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-02-14 14:05:28 +0100
commit8f39dc5c8c3d0b77daebd90f927e0bc78bca7d1d (patch)
treef064c23ea4a5ac3f8dd4730997a3426f3630452d /package/openssh
parent80cf711c344256c59b857da6cd7fc91898f90752 (diff)
parenta03e16ce46353740a2b778beda4dda03c0252e07 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/openssh')
-rw-r--r--package/openssh/Makefile5
-rw-r--r--package/openssh/files/sshd_config2
2 files changed, 4 insertions, 3 deletions
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index 42341cbe0..1818b893c 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -67,6 +67,7 @@ post-install:
${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/etc/ssh
${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/usr/bin
${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/usr/sbin
+ ${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/usr/libexec
${CP} ./files/sshd_config ${IDIR_OPENSSH_SERVER}/etc/ssh
${INSTALL_BIN} ${WRKINST}/usr/bin/ssh-keygen \
${IDIR_OPENSSH_SERVER}/usr/bin
@@ -85,8 +86,8 @@ post-install:
${INSTALL_DIR} ${IDIR_OPENSSH_SFTP_SERVER}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/bin/sftp \
${IDIR_OPENSSH_SFTP_CLIENT}/usr/bin
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/sftp-server \
- ${IDIR_OPENSSH_SFTP_SERVER}/usr/sbin
+ ${INSTALL_BIN} ${WRKINST}/usr/libexec/sftp-server \
+ ${IDIR_OPENSSH_SFTP_SERVER}/usr/libexec
chmod 0700 {${IDIR_OPENSSH_CLIENT},${IDIR_OPENSSH_SERVER}}/etc/ssh
include ${TOPDIR}/mk/pkg-bottom.mk
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