remove duplicate package/ prefix from package dump error message
[openwrt.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,22 @@
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] == 'p' &&
20 +                                                pp[3] == '$' && pp[4] &&
21 +                                                (pwd = getpwnam(&pp[4])) != NULL) {
22 +                               ppnew = malloc(5 + strlen(pwd->pw_passwd));
23 +                               ppnew[0] = ':';
24 +                               strcpy(ppnew + 1, pwd->pw_passwd);
25 +                               pp = ppnew;
26 +                       }
27                         if(pp && pp[1] == '$' && pp[2] == '1' &&
28                                                  pp[3] == '$' && pp[4]) {
29                                 pp++;
30 @@ -1482,6 +1492,10 @@
31                                 /* unauthorized */
32                                 continue;
33                         }
34 +                       if (ppnew) {
35 +                               free(ppnew);
36 +                               ppnew = NULL;
37 +                       }
38                 }
39  #endif
40                 if (strcmp(p, request) == 0) {