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