From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 2 Oct 2006 17:40:03 +0000 (+0000)
Subject: port last commit to -ng
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fdedeckeh.git;a=commitdiff_plain;h=92d0956040f93c8f0a8bd887c2273ef2713d0505

port last commit to -ng

SVN-Revision: 4886
---

diff --git a/openwrt/package/busybox/patches/310-passwd_access.patch b/openwrt/package/busybox/patches/310-passwd_access.patch
index 3a09d2a0a6..3d4efb1351 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,22 @@
+@@ -1467,12 +1467,24 @@
  		{
  			char *cipher;
  			char *pp;
@@ -16,6 +16,8 @@ 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) {