busybox httpd.conf: add support for reading passwords from /etc/passwd (syntax: ...
[openwrt-10.03/.git] / package / busybox / patches / 310-passwd_access.patch
1 diff -urN busybox.old/networking/httpd.c busybox.dev/networking/httpd.c
2 --- busybox.old/networking/httpd.c      2004-10-08 10:03:29.000000000 +0200
3 +++ busybox.dev/networking/httpd.c      2006-02-04 01:54:19.688016250 +0100
4 @@ -1467,12 +1467,22 @@
5                 {
6                         char *cipher;
7                         char *pp;
8 +                       char *ppnew = NULL;
9 +                       struct passwd *pwd = NULL;
10  
11                         if(strncmp(p, request, u-request) != 0) {
12                                 /* user uncompared */
13                                 continue;
14                         }
15                         pp = strchr(p, ':');
16 +                       if(pp && pp[1] == '$' && pp[2] == 'p' &&
17 +                                                pp[3] == '$' && pp[4] &&
18 +                                                (pwd = getpwnam(&pp[4])) != NULL) {
19 +                               ppnew = malloc(5 + strlen(pwd->pw_passwd));
20 +                               ppnew[0] = ':';
21 +                               strcpy(ppnew + 1, pwd->pw_passwd);
22 +                               pp = ppnew;
23 +                       }
24                         if(pp && pp[1] == '$' && pp[2] == '1' &&
25                                                  pp[3] == '$' && pp[4]) {
26                                 pp++;
27 @@ -1482,6 +1492,10 @@
28                                 /* unauthorized */
29                                 continue;
30                         }
31 +                       if (ppnew) {
32 +                               free(ppnew);
33 +                               ppnew = NULL;
34 +                       }
35                 }
36  #endif
37                 if (strcmp(p, request) == 0) {