summaryrefslogtreecommitdiff
path: root/package/openssh
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-01-31 10:27:55 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-01-31 10:27:55 +0100
commit657effffde51e2cf9181d71524a6eef1b968e9f7 (patch)
tree8fb38331dec1f1227f10802afeb856c6a9d85648 /package/openssh
parent74b82b8b841c83dd370d2109cb7d2ce2e2f8e00b (diff)
fix dependency. finetune dropbear detection.
Diffstat (limited to 'package/openssh')
-rw-r--r--package/openssh/Makefile4
-rw-r--r--package/openssh/files/sshd.init2
2 files changed, 3 insertions, 3 deletions
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index 6aa819a3d..3b724edbc 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -12,11 +12,11 @@ PKG_SECTION:= net
PKG_DEPENDS:= zlib libopenssl
PKG_BUILDDEP+= zlib openssl
ifeq (${ADK_COMPILE_OPENSSH_WITH_KRB5},y)
-PKG_DEPENDS+= krb5-libs
+PKG_DEPENDS+= krb5-libs libcom-err
PKG_BUILDDEP+= krb5
endif
ifeq (${ADK_COMPILE_OPENSSH_WITH_HEIMDAL},y)
-PKG_DEPENDS+= heimdal-libs
+PKG_DEPENDS+= heimdal-libs libcom-err
PKG_BUILDDEP+= heimdal
endif
PKG_URL:= http://www.openssh.com
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