X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b0ccd00793948e0fe2456f25ff6ad0e99c2eaa9a..81671750134cc98c33ac4441d7a6eacf59448641:/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 3d4efb135..868abfcd0 100644
--- a/package/busybox/patches/310-passwd_access.patch
+++ b/package/busybox/patches/310-passwd_access.patch
@@ -4,7 +4,7 @@
 diff -urN busybox.old/networking/httpd.c busybox.dev/networking/httpd.c
 --- busybox.old/networking/httpd.c	2004-10-08 10:03:29.000000000 +0200
 +++ busybox.dev/networking/httpd.c	2006-02-04 01:54:19.688016250 +0100
-@@ -1467,12 +1467,24 @@
+@@ -1467,12 +1467,26 @@
  		{
  			char *cipher;
  			char *pp;
@@ -16,11 +16,13 @@ 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] == '!') {
++					prev = NULL;
++					continue;
++				}
 +				ppnew = malloc(5 + strlen(pwd->pw_passwd));
 +				ppnew[0] = ':';
 +				strcpy(ppnew + 1, pwd->pw_passwd);