summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-10-06 18:52:02 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-10-06 18:52:02 +0000
commitc1be781808c1d27e2eeb7aff624f286827b29141 (patch)
tree648b5e7285430dfd2fb52fe5030d875a5c791b8e
parent2517aebf84c5736fce1dd9403f468824bde52863 (diff)
really fix webif password access patch for busybox
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4936 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/busybox/patches/310-passwd_access.patch6
1 files changed, 4 insertions, 2 deletions
diff --git a/package/busybox/patches/310-passwd_access.patch b/package/busybox/patches/310-passwd_access.patch
index 740181ac7..868abfcd0 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,24 @@
+@@ -1467,12 +1467,26 @@
{
char *cipher;
char *pp;
@@ -19,8 +19,10 @@ diff -urN busybox.old/networking/httpd.c busybox.dev/networking/httpd.c
+ if(pp && pp[1] == '$' && pp[2] == 'p' &&
+ pp[3] == '$' && pp[4] &&
+ (pwd = getpwnam(&pp[4])) != NULL) {
-+ if(pwd->pw_passwd && pwd->pw_passwd[0] == '!')
++ if(pwd->pw_passwd && pwd->pw_passwd[0] == '!') {
++ prev = NULL;
+ continue;
++ }
+ ppnew = malloc(5 + strlen(pwd->pw_passwd));
+ ppnew[0] = ':';
+ strcpy(ppnew + 1, pwd->pw_passwd);