summaryrefslogtreecommitdiff
path: root/networking/Config.src
diff options
context:
space:
mode:
authorDenys Vlasenko2012-02-01 02:42:54 +0100
committerDenys Vlasenko2012-02-01 02:42:54 +0100
commit35def51c9747895d38c11e3c41e62c3c68c92438 (patch)
tree7123ee794725e9d904a7d98865ad07f61e46cd6d /networking/Config.src
parent428bd2d4337dbd83feb3c7d1fc04d840f548003c (diff)
downloadbusybox-35def51c9747895d38c11e3c41e62c3c68c92438.zip
busybox-35def51c9747895d38c11e3c41e62c3c68c92438.tar.gz
httpd: fix MD5-encrypted-in-httpd.conf password logic
function old new delta check_user_passwd 467 492 +25 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking/Config.src')
-rw-r--r--networking/Config.src16
1 files changed, 12 insertions, 4 deletions
diff --git a/networking/Config.src b/networking/Config.src
index 8aeba0e..fb7dca7 100644
--- a/networking/Config.src
+++ b/networking/Config.src
@@ -199,14 +199,22 @@ config FEATURE_HTTPD_BASIC_AUTH
help
Utilizes password settings from /etc/httpd.conf for basic
authentication on a per url basis.
+ Example for httpd.conf file:
+ /adm:toor:PaSsWd
config FEATURE_HTTPD_AUTH_MD5
bool "Support MD5 crypted passwords for http Authentication"
default y
depends on FEATURE_HTTPD_BASIC_AUTH
help
- Enables basic per URL authentication from /etc/httpd.conf
- using md5 passwords.
+ Enables encrypted passwords, and wildcard user/passwords
+ in httpd.conf file.
+ User '*' means 'any system user name is ok',
+ password of '*' means 'use system password for this user'
+ Examples:
+ /adm:toor:$1$P/eKnWXS$aI1aPGxT.dJD5SzqAKWrF0
+ /adm:root:*
+ /wiki:*:*
config FEATURE_HTTPD_CGI
bool "Support Common Gateway Interface (CGI)"
@@ -223,8 +231,8 @@ config FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
help
This option enables support for running scripts through an
interpreter. Turn this on if you want PHP scripts to work
- properly. You need to supply an additional line in your httpd
- config file:
+ properly. You need to supply an additional line in your
+ httpd.conf file:
*.php:/path/to/your/php
config FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV