summaryrefslogtreecommitdiff
path: root/package/busybox/patches/310-passwd_access.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-10-05 00:27:49 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-10-05 00:27:49 +0000
commitfe313941ac5ef2a4e80d22be43a9d5dc667276b7 (patch)
treed27f5408929c0080b09f7e472e41abc2370c8e24 /package/busybox/patches/310-passwd_access.patch
parent9e8f2ca1f0d1fe2ea5688c466f2f8b40a5e870c2 (diff)
downloadmtk-20170518-fe313941ac5ef2a4e80d22be43a9d5dc667276b7.zip
mtk-20170518-fe313941ac5ef2a4e80d22be43a9d5dc667276b7.tar.gz
mtk-20170518-fe313941ac5ef2a4e80d22be43a9d5dc667276b7.tar.bz2
Upgrade busybox to 1.7.2 - clean up insmod crap - add some lineno/programname fixes for awx - clean up awk getopt stuff - remove unnecessary patches
SVN-Revision: 9130
Diffstat (limited to 'package/busybox/patches/310-passwd_access.patch')
-rw-r--r--package/busybox/patches/310-passwd_access.patch20
1 files changed, 10 insertions, 10 deletions
diff --git a/package/busybox/patches/310-passwd_access.patch b/package/busybox/patches/310-passwd_access.patch
index 22e6abc..b8c8db7 100644
--- 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
-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
-@@ -1402,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
+@@ -1527,12 +1527,26 @@
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, ':');
@@ -29,10 +29,10 @@ Index: busybox-1.4.2/networking/httpd.c
+ strcpy(ppnew + 1, pwd->pw_passwd);
+ pp = ppnew;
+ }
- if (pp && pp[1] == '$' && pp[2] == '1' &&
- pp[3] == '$' && pp[4]) {
- pp++;
-@@ -1417,6 +1431,10 @@
+ if (pp && pp[1] == '$' && pp[2] == '1'
+ && pp[3] == '$' && pp[4]
+ ) {
+@@ -1543,6 +1557,10 @@
/* unauthorized */
continue;
}