aboutsummaryrefslogtreecommitdiffstats
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
commitbcad7263a0172183845b7965e81049cf5d25f129 (patch)
treef1da3a631b112aee1f3ae3de8a027b30ae6d2be2
parent92d0956040f93c8f0a8bd887c2273ef2713d0505 (diff)
downloadupstream-bcad7263a0172183845b7965e81049cf5d25f129.tar.gz
upstream-bcad7263a0172183845b7965e81049cf5d25f129.tar.bz2
upstream-bcad7263a0172183845b7965e81049cf5d25f129.zip
fix for the password check (checked the wrong variable)
SVN-Revision: 4887
-rw-r--r--openwrt/package/busybox/patches/310-passwd_access.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/openwrt/package/busybox/patches/310-passwd_access.patch b/openwrt/package/busybox/patches/310-passwd_access.patch
index 3d4efb1351..740181ac77 100644
--- a/openwrt/package/busybox/patches/310-passwd_access.patch
+++ b/openwrt/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);