projects
/
openwrt-10.03
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade busybox to 1.7.2
[openwrt-10.03/.git]
/
package
/
busybox
/
patches
/
310-passwd_access.patch
diff --git
a/package/busybox/patches/310-passwd_access.patch
b/package/busybox/patches/310-passwd_access.patch
index 22e6abcb01fcfbda1d3a9f68c857a11e4751db36..b8c8db7387bcb1406586817a46f035e3976b1656 100644
(file)
--- a/
package/busybox/patches/310-passwd_access.patch
+++ b/
package/busybox/patches/310-passwd_access.patch
@@
-1,19
+1,19
@@
Copyright (C) 2006 OpenWrt.org
Copyright (C) 2006 OpenWrt.org
-Index: busybox-1.
4
.2/networking/httpd.c
+Index: busybox-1.
7
.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
-@@ -1
402,12 +1402
,26 @@
+--- busybox-1.
7.2.orig/networking/httpd.c 2007-09-30 01:54:12.000000000
+0200
++++ busybox-1.
7.2/networking/httpd.c 2007-10-04 14:59:20.287304836
+0200
+@@ -1
527,12 +1527
,26 @@
if (ENABLE_FEATURE_HTTPD_AUTH_MD5) {
char *cipher;
char *pp;
+ char *ppnew = NULL;
+ struct passwd *pwd = NULL;
if (ENABLE_FEATURE_HTTPD_AUTH_MD5) {
char *cipher;
char *pp;
+ char *ppnew = NULL;
+ struct passwd *pwd = NULL;
- if (strncmp(p, request, u
-
request) != 0) {
- /* user
uncompared
*/
+ if (strncmp(p, request, u
-
request) != 0) {
+ /* user
doesn't match
*/
continue;
}
pp = strchr(p, ':');
continue;
}
pp = strchr(p, ':');
@@
-29,10
+29,10
@@
Index: busybox-1.4.2/networking/httpd.c
+ strcpy(ppnew + 1, pwd->pw_passwd);
+ pp = ppnew;
+ }
+ strcpy(ppnew + 1, pwd->pw_passwd);
+ pp = ppnew;
+ }
- if (pp && pp[1] == '$' && pp[2] == '1'
&&
- pp[3] == '$' && pp[4]) {
- pp++;
-@@ -1
417,6 +1431
,10 @@
+ if (pp && pp[1] == '$' && pp[2] == '1'
+ && pp[3] == '$' && pp[4]
+ ) {
+@@ -1
543,6 +1557
,10 @@
/* unauthorized */
continue;
}
/* unauthorized */
continue;
}