From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 6 Oct 2008 16:33:14 +0000 (+0000)
Subject: fix busybox http auth if the root user has an empty password
X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=e532e2ac8cbcf1f44f664ec62924748476751662;p=15.05%2Fopenwrt.git

fix busybox http auth if the root user has an empty password

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12869 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/busybox/patches/310-passwd_access.patch b/package/busybox/patches/310-passwd_access.patch
index 78a43d7782..9a1cc95bb3 100644
--- a/package/busybox/patches/310-passwd_access.patch
+++ b/package/busybox/patches/310-passwd_access.patch
@@ -3,7 +3,7 @@
 
 --- a/networking/httpd.c
 +++ b/networking/httpd.c
-@@ -1697,21 +1697,32 @@
+@@ -1697,21 +1697,32 @@ static int check_user_passwd(const char 
  
  		if (ENABLE_FEATURE_HTTPD_AUTH_MD5) {
  			char *md5_passwd;
@@ -17,7 +17,7 @@
 +
 +				pwd = getpwnam(&md5_passwd[4]);
 +				if(!pwd->pw_passwd || !pwd->pw_passwd[0] || pwd->pw_passwd[0] == '!')
-+					continue;
++					return 1;
 +
 +				md5_passwd = pwd->pw_passwd;
 +				goto check_md5_pw;