summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-02-04 01:21:35 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-02-04 01:21:35 +0000
commit8931e7504dacbc865094bf6b8ab7033e56a8d2c2 (patch)
treebba037e6e11270c40630a0e728cd81e892cf4fb7 /package
parenta43bcc5e42667b702a1d26d0cf678929017fd196 (diff)
busybox httpd.conf: add support for reading passwords from /etc/passwd (syntax: $p$user, similar to md5 password syntax $1$password)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3122 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/busybox/patches/310-passwd_access.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/package/busybox/patches/310-passwd_access.patch b/package/busybox/patches/310-passwd_access.patch
new file mode 100644
index 000000000..03cfe8b85
--- /dev/null
+++ b/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) {