ifupdown: improve compatibility with Debian

[oweals/busybox.git] / networking / Config.src

diff --git a/networking/Config.src b/networking/Config.src
index 06930f4a60dc7e521de2dbf63d3c80bdd52f9b30..fb7dca7d49146c2395e3e6afdb58c77720477fbf 100644 (file)
--- 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.
        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
 
 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)"
 
 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
        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
          *.php:/path/to/your/php
 
 config FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV


@@ -612,35 +620,6 @@ config FEATURE_IPCALC_LONG_OPTIONS
        help
          Support long options for the ipcalc applet.
 
        help
          Support long options for the ipcalc applet.
 

-config NAMEIF
-       bool "nameif"
-       default y
-       select PLATFORM_LINUX
-       select FEATURE_SYSLOG
-       help
-         nameif is used to rename network interface by its MAC address.
-         Renamed interfaces MUST be in the down state.
-         It is possible to use a file (default: /etc/mactab)
-         with list of new interface names and MACs.
-         Maximum interface name length: IFNAMSIZ = 16
-         File fields are separated by space or tab.
-         File format:
-         # Comment
-         new_interface_name    XX:XX:XX:XX:XX:XX
-
-config FEATURE_NAMEIF_EXTENDED
-       bool "Extended nameif"
-       default y
-       depends on NAMEIF
-       help
-         This extends the nameif syntax to support the bus_info and driver
-         checks. The syntax is compatible to the normal nameif.
-         File format:
-           new_interface_name  driver=asix bus=usb-0000:00:08.2-3
-           new_interface_name  bus=usb-0000:00:08.2-3 00:80:C8:38:91:B5
-           new_interface_name  mac=00:80:C8:38:91:B5
-           new_interface_name  00:80:C8:38:91:B5
-

 config NETSTAT
        bool "netstat"
        default y
 config NETSTAT
        bool "netstat"
        default y