diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2006-10-02 17:40:03 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2006-10-02 17:40:03 +0000 |
| commit | 92d0956040f93c8f0a8bd887c2273ef2713d0505 (patch) | |
| tree | 98681c8369b5c0eaa513795c09ae43f4711018dc | |
| parent | a8faf0b6b5bcc76239b9827ab77d69b24381aaa6 (diff) | |
| download | upstream-92d0956040f93c8f0a8bd887c2273ef2713d0505.tar.gz upstream-92d0956040f93c8f0a8bd887c2273ef2713d0505.tar.bz2 upstream-92d0956040f93c8f0a8bd887c2273ef2713d0505.zip | |
port last commit to -ng
SVN-Revision: 4886
| -rw-r--r-- | openwrt/package/busybox/patches/310-passwd_access.patch | 4 |
1 files changed, 3 insertions, 1 deletions
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) { |