From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 6 Oct 2006 18:52:02 +0000 (+0000)
Subject: really fix webif password access patch for busybox
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=daa77961b639634c2afb560cba883ef8dbfbd590;p=openwrt%2Fstaging%2Fyousong.git

really fix webif password access patch for busybox

SVN-Revision: 4936
---

diff --git a/openwrt/package/busybox/patches/310-passwd_access.patch b/openwrt/package/busybox/patches/310-passwd_access.patch
index 740181ac77..868abfcd06 100644
--- a/openwrt/package/busybox/patches/310-passwd_access.patch
+++ b/openwrt/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;
@@ -19,8 +19,10 @@ diff -urN busybox.old/networking/httpd.c busybox.dev/networking/httpd.c
 +			if(pp && pp[1] == '$' && pp[2] == 'p' &&
 +						 pp[3] == '$' && pp[4] &&
 +						 (pwd = getpwnam(&pp[4])) != NULL) {
-+				if(pwd->pw_passwd && pwd->pw_passwd[0] == '!')
++				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);