summaryrefslogtreecommitdiffstats
path: root/package/busybox
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-10-02 17:40:03 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-10-02 17:40:03 +0000
commitb0ccd00793948e0fe2456f25ff6ad0e99c2eaa9a (patch)
tree8d23c6afa88f2da1a80509200e02a262be3a33a6 /package/busybox
parent5d5a8fa86414bf083fcecafd131f6fde82a3d4ce (diff)
port last commit to -ng
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4886 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/busybox')
-rw-r--r--package/busybox/patches/310-passwd_access.patch4
1 files changed, 3 insertions, 1 deletions
diff --git a/package/busybox/patches/310-passwd_access.patch b/package/busybox/patches/310-passwd_access.patch
index 3a09d2a0a..3d4efb135 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,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) {