diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-10-13 20:51:49 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-10-13 20:51:49 +0000 |
commit | f52d66ff00b24111f87c274d3d7085ef2e1d27b1 (patch) | |
tree | d993cf48b4d89166701fe2f33976389d7634235d /package/busybox/patches/310-passwd_access.patch | |
parent | 725611a466f2edf12f809d22339b22223af4afe7 (diff) | |
parent | 0c0df9eb082d5ff83d0f22f6e00bf580729fb49d (diff) |
finally move buildroot-ng to trunk
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5059 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/busybox/patches/310-passwd_access.patch')
-rw-r--r-- | package/busybox/patches/310-passwd_access.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/package/busybox/patches/310-passwd_access.patch b/package/busybox/patches/310-passwd_access.patch new file mode 100644 index 0000000000..868abfcd06 --- /dev/null +++ b/package/busybox/patches/310-passwd_access.patch @@ -0,0 +1,44 @@ + + Copyright (C) 2006 OpenWrt.org + +diff -urN busybox.old/networking/httpd.c busybox.dev/networking/httpd.c +--- busybox.old/networking/httpd.c 2004-10-08 10:03:29.000000000 +0200 ++++ busybox.dev/networking/httpd.c 2006-02-04 01:54:19.688016250 +0100 +@@ -1467,12 +1467,26 @@ + { + char *cipher; + char *pp; ++ char *ppnew = NULL; ++ struct passwd *pwd = NULL; + + if(strncmp(p, request, u-request) != 0) { + /* user uncompared */ + continue; + } + pp = strchr(p, ':'); ++ if(pp && pp[1] == '$' && pp[2] == 'p' && ++ pp[3] == '$' && pp[4] && ++ (pwd = getpwnam(&pp[4])) != NULL) { ++ if(pwd->pw_passwd && pwd->pw_passwd[0] == '!') { ++ prev = NULL; ++ continue; ++ } ++ ppnew = malloc(5 + strlen(pwd->pw_passwd)); ++ ppnew[0] = ':'; ++ strcpy(ppnew + 1, pwd->pw_passwd); ++ pp = ppnew; ++ } + if(pp && pp[1] == '$' && pp[2] == '1' && + pp[3] == '$' && pp[4]) { + pp++; +@@ -1482,6 +1492,10 @@ + /* unauthorized */ + continue; + } ++ if (ppnew) { ++ free(ppnew); ++ ppnew = NULL; ++ } + } + #endif + if (strcmp(p, request) == 0) { |