aboutsummaryrefslogtreecommitdiffstats
path: root/package/busybox
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-10-02 17:43:42 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-10-02 17:43:42 +0000
commitacfaea5a2e907dadc3b577768521462ddb1bc39d (patch)
tree34ff622fe06b5f7632f1efabc16b5af12a554560 /package/busybox
parentbc7992825875a57dc8c4f126bbfbc8a738df4c36 (diff)
downloadmaster-187ad058-acfaea5a2e907dadc3b577768521462ddb1bc39d.tar.gz
master-187ad058-acfaea5a2e907dadc3b577768521462ddb1bc39d.tar.bz2
master-187ad058-acfaea5a2e907dadc3b577768521462ddb1bc39d.zip
fix for the password check (checked the wrong variable)
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4887 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/busybox')
-rw-r--r--package/busybox/patches/310-passwd_access.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/busybox/patches/310-passwd_access.patch b/package/busybox/patches/310-passwd_access.patch
index 3d4efb1351..740181ac77 100644
--- a/package/busybox/patches/310-passwd_access.patch
+++ b/package/busybox/patches/310-passwd_access.patch
@@ -16,11 +16,11 @@ 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] == '!')
++ continue;
+ ppnew = malloc(5 + strlen(pwd->pw_passwd));
+ ppnew[0] = ':';
+ strcpy(ppnew + 1, pwd->pw_passwd);