From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 4 Feb 2006 01:21:35 +0000 (+0000)
Subject: busybox httpd.conf: add support for reading passwords from /etc/passwd (syntax: ... 
X-Git-Tag: whiterussian_rc5~191
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b7bfb02cccead926880b61bd316291e598210588;p=openwrt%2Fsvn-archive%2Fopenwrt.git

busybox httpd.conf: add support for reading passwords from /etc/passwd (syntax: $p$user, similar to md5 password syntax $1$password)

SVN-Revision: 3122
---

diff --git a/openwrt/package/busybox/patches/310-passwd_access.patch b/openwrt/package/busybox/patches/310-passwd_access.patch
new file mode 100644
index 0000000000..03cfe8b850
--- /dev/null
+++ b/openwrt/package/busybox/patches/310-passwd_access.patch
@@ -0,0 +1,37 @@
+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 @@
+ 		{
+ 			char *cipher;
+ 			char *pp;
++			char *ppnew = NULL;
++			struct passwd *pwd = NULL;
+ 
+ 			if(strncmp(p, request, u-request) != 0) {
+ 				/* user uncompared */
+ 				continue;
+ 			}
+ 			pp = strchr(p, ':');
++			if(pp && pp[1] == '$' && pp[2] == 'p' &&
++						 pp[3] == '$' && pp[4] &&
++						 (pwd = getpwnam(&pp[4])) != NULL) {
++				ppnew = malloc(5 + strlen(pwd->pw_passwd));
++				ppnew[0] = ':';
++				strcpy(ppnew + 1, pwd->pw_passwd);
++				pp = ppnew;
++			}
+ 			if(pp && pp[1] == '$' && pp[2] == '1' &&
+ 						 pp[3] == '$' && pp[4]) {
+ 				pp++;
+@@ -1482,6 +1492,10 @@
+ 				/* unauthorized */
+ 				continue;
+ 			}
++			if (ppnew) {
++				free(ppnew);
++				ppnew = NULL;
++			}
+ 		}
+ #endif
+ 		if (strcmp(p, request) == 0) {