summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-10-06 16:33:14 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-10-06 16:33:14 +0000
commit1084c9266191c2b936fd58d7273962c319021921 (patch)
tree51632bf28a8479caa72d865bc6b14e6448dc2945
parent8ddac8e3cd45a826c487e2aac796c48f3c25f0b1 (diff)
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
-rw-r--r--package/busybox/patches/310-passwd_access.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/busybox/patches/310-passwd_access.patch b/package/busybox/patches/310-passwd_access.patch
index 78a43d778..9a1cc95bb 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;