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 78a43d7..9a1cc95 100644 (file)
--- 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
 
 --- 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;
  
                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] == '!')
 +
 +                              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;
 +
 +                              md5_passwd = pwd->pw_passwd;
 +                              goto check_md5_pw;