fix for the password check (checked the wrong variable)

[15.05/openwrt.git] / package / busybox / patches / 310-passwd_access.patch

diff --git a/package/busybox/patches/310-passwd_access.patch b/package/busybox/patches/310-passwd_access.patch
index 3d4efb1..740181a 100644 (file)
--- a/package/busybox/patches/310-passwd_access.patch
+++ b/package/busybox/patches/310-passwd_access.patch
@@ -16,11 +16,11 @@ diff -urN busybox.old/networking/httpd.c busybox.dev/networking/httpd.c
                                continue;
                        }
                        pp = strchr(p, ':');
-+                      if(pp && pp[1] == '!' && pp[2] == ':')
-+                              continue;
 +                      if(pp && pp[1] == '$' && pp[2] == 'p' &&
 +                                               pp[3] == '$' && pp[4] &&
 +                                               (pwd = getpwnam(&pp[4])) != NULL) {
++                              if(pwd->pw_passwd && pwd->pw_passwd[0] == '!')
++                                      continue;
 +                              ppnew = malloc(5 + strlen(pwd->pw_passwd));
 +                              ppnew[0] = ':';
 +                              strcpy(ppnew + 1, pwd->pw_passwd);