2006-06-27 00:51:59 +00:00
|
|
|
|
|
|
|
|
Copyright (C) 2006 OpenWrt.org
|
|
|
|
|
|
2006-02-04 01:21:35 +00:00
|
|
|
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
|
2006-10-02 17:40:03 +00:00
|
|
|
@@ -1467,12 +1467,24 @@
|
2006-02-04 01:21:35 +00:00
|
|
|
{
|
|
|
|
|
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) {
|
2006-10-02 17:43:42 +00:00
|
|
|
+ if(pwd->pw_passwd && pwd->pw_passwd[0] == '!')
|
|
|
|
|
+ continue;
|
2006-02-04 01:21:35 +00:00
|
|
|
+ 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) {
|
