aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-10-06 16:33:14 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-10-06 16:33:14 +0000
commit51a69f3f9730c9d6ca53a851cf31d92e842e97a0 (patch)
tree82f7db39b66df69625d98d82a47b95b42ae3164c
parent7e0e4fb486f80de36c04c58f3052862d895062e8 (diff)
downloadupstream-51a69f3f9730c9d6ca53a851cf31d92e842e97a0.tar.gz
upstream-51a69f3f9730c9d6ca53a851cf31d92e842e97a0.tar.bz2
upstream-51a69f3f9730c9d6ca53a851cf31d92e842e97a0.zip
fix busybox http auth if the root user has an empty password
SVN-Revision: 12869
-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 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;