Browse Source

fix dependency. finetune dropbear detection.

Waldemar Brodkorb 15 years ago
parent
commit
657effffde
2 changed files with 3 additions and 3 deletions
  1. 2 2
      package/openssh/Makefile
  2. 1 1
      package/openssh/files/sshd.init

+ 2 - 2
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

+ 1 - 1
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