2006-06-27 00:51:59 +00:00
|
|
|
|
|
|
|
|
Copyright (C) 2006 OpenWrt.org
|
|
|
|
|
|
2007-06-04 11:25:53 +00:00
|
|
|
Index: busybox-1.4.2/networking/httpd.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- busybox-1.4.2.orig/networking/httpd.c 2007-06-04 13:21:32.190083032 +0200
|
|
|
|
|
+++ busybox-1.4.2/networking/httpd.c 2007-06-04 13:21:34.401746808 +0200
|
|
|
|
|
@@ -1402,12 +1402,26 @@
|
2006-12-30 19:35:58 +00:00
|
|
|
if (ENABLE_FEATURE_HTTPD_AUTH_MD5) {
|
|
|
|
|
char *cipher;
|
|
|
|
|
char *pp;
|
|
|
|
|
+ char *ppnew = NULL;
|
|
|
|
|
+ struct passwd *pwd = NULL;
|
2006-02-04 01:21:35 +00:00
|
|
|
|
2006-12-30 19:35:58 +00:00
|
|
|
if (strncmp(p, request, u-request) != 0) {
|
|
|
|
|
/* user uncompared */
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
pp = strchr(p, ':');
|
|
|
|
|
+ if(pp && pp[1] == '$' && pp[2] == 'p' &&
|
2006-02-04 01:21:35 +00:00
|
|
|
+ pp[3] == '$' && pp[4] &&
|
2006-12-30 19:35:58 +00:00
|
|
|
+ (pwd = getpwnam(&pp[4])) != NULL) {
|
|
|
|
|
+ if(pwd->pw_passwd && pwd->pw_passwd[0] == '!') {
|
|
|
|
|
+ prev = NULL;
|
|
|
|
|
+ continue;
|
|
|
|
|
+ }
|
|
|
|
|
+ ppnew = xrealloc(ppnew, 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++;
|
2007-06-04 11:25:53 +00:00
|
|
|
@@ -1417,6 +1431,10 @@
|
2006-12-30 19:35:58 +00:00
|
|
|
/* unauthorized */
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
+ if (ppnew) {
|
|
|
|
|
+ free(ppnew);
|
|
|
|
|
+ ppnew = NULL;
|
2006-10-06 18:52:02 +00:00
|
|
|
+ }
|
2006-02-04 01:21:35 +00:00
|
|
|
}
|
2006-12-30 19:35:58 +00:00
|
|
|
|
|
|
|
|
if (strcmp(p, request) == 0) {
|
