last_patch95 from vodz:

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

diff --git a/networking/Config.in b/networking/Config.in
index d53dddcc12892f552f21e9e159964b6b7fbdd696..0bd17fb6342942f47751c0f8360e9f620980d259 100644 (file)
--- a/networking/Config.in
+++ b/networking/Config.in
@@ -58,6 +58,13 @@ config CONFIG_FEATURE_HTTPD_BASIC_AUTH
          Utilizes password settings from /etc/httpd.conf for basic
          authentication on a per url basis.
 
+config CONFIG_FEATURE_HTTPD_AUTH_MD5
+       bool "  Enable support MD5 crypted password for httpd.conf"
+       default n
+       depends on CONFIG_FEATURE_HTTPD_BASIC_AUTH
+       help
+         Please help my - send patch for set this help message
+
 
 if !CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
 config CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
@@ -105,7 +112,7 @@ config CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
 
 config CONFIG_FEATURE_HTTPD_SET_CGI_VARS_TO_ENV
        bool "  Enable setting of CGI_varname=value environment vars for CGI"
-       default y
+       default n
        depends on CONFIG_FEATURE_HTTPD_CGI
        help
          This option parses POST or GET arguments from a form and
@@ -176,14 +183,31 @@ config CONFIG_IFUPDOWN
        bool "ifupdown"
        default n
        help
-         Activate or deactivate the specified interface.
-
+         Activate or deactivate the specified interfaces.  This applet makes
+         use of either "ifconfig" and "route" or the "ip" command to actually
+         configure network interfaces.  Therefore, you will probably also want
+         to enable either CONFIG_IFCONFIG and CONFIG_ROUTE, or enable
+         CONFIG_FEATURE_IFUPDOWN_IP and the various CONFIG_IP options.  Of
+         course you could use non-busybox versions of these programs, so
+         against my better judgement (since this will surely result in plenty
+         of support questions on the mailing list), I do not force you to
+         enable these additional options.  It is up to you to supply either
+         "ifconfig" and "route" or the "ip" command, either via busybox or via
+         standalone utilities.
+
+# I really should force these to be enabled
+#    && CONFIG_IP && CONFIG_FEATURE_IP_ADDRESS && CONFIG_FEATURE_IP_LINK && CONFIG_FEATURE_IP_ROUTE
+# but then people could not use the full-blown iproute2 program...
 config CONFIG_FEATURE_IFUPDOWN_IP
        bool "  Use ip applet"
        default n
-       depends on CONFIG_IFUPDOWN && CONFIG_IP && CONFIG_FEATURE_IP_ADDRESS && CONFIG_FEATURE_IP_LINK && CONFIG_FEATURE_IP_ROUTE
+       depends on CONFIG_IFUPDOWN 
        help
-         Use "ip" in "ifupdown".
+         Use the iproute "ip" command to implement "ifupdown".  You will
+         probably want to also enable CONFIG_IP, CONFIG_FEATURE_IP_ADDRESS,
+         CONFIG_FEATURE_IP_LINK, and CONFIG_FEATURE_IP_ROUTE.  Of course
+         if you wanted to use the full-blown iproute2 program you could
+         leave the the busybox CONFIG_IP* options disabled.
 
 config CONFIG_FEATURE_IFUPDOWN_IPV4
        bool "  Enable support for IPv4"
@@ -515,13 +539,6 @@ config CONFIG_FEATURE_TRACEROUTE_VERBOSE
          Add some verbosity to traceroute.  This includes amongst other things
          hostnames and ICMP response types.
 
-config CONFIG_FEATURE_TRACEROUTE_SO_DEBUG
-       bool "  Enable SO_DEBUG option"
-       default n
-       depends on CONFIG_TRACEROUTE
-       help
-         Please submit a patch to add help text for this item.
-
 config CONFIG_VCONFIG
        bool "vconfig"
        default n