[package] dnsmasq: remove redundant code introduced with r20074

[openwrt.git] / package / busybox / config / networking / Config.in

diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index de7484a..35dae5f 100644 (file)
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -12,8 +12,19 @@ config BUSYBOX_CONFIG_FEATURE_IPV6
          Enable IPv6 support in busybox.
          This adds IPv6 support in the networking applets.
 
          Enable IPv6 support in busybox.
          This adds IPv6 support in the networking applets.
 

+config BUSYBOX_CONFIG_FEATURE_UNIX_LOCAL
+       bool "Enable Unix domain socket support (usually not needed)"
+       default n
+       help
+         Enable Unix domain socket support in all busybox networking
+         applets.  Address of the form local:/path/to/unix/socket
+         will be recognized.
+
+         This extension is almost never used in real world usage.
+         You most likely want to say N.
+

 config BUSYBOX_CONFIG_FEATURE_PREFER_IPV4_ADDRESS
 config BUSYBOX_CONFIG_FEATURE_PREFER_IPV4_ADDRESS

-       bool "Preferentially use IPv4 addresses from DNS queries"
+       bool "Prefer IPv4 addresses from DNS queries"

        default y
        depends on BUSYBOX_CONFIG_FEATURE_IPV6
        help
        default y
        depends on BUSYBOX_CONFIG_FEATURE_IPV6
        help


@@ -66,12 +77,12 @@ config BUSYBOX_CONFIG_FEATURE_BRCTL_FANCY
          This adds about 600 bytes.
 
 config BUSYBOX_CONFIG_FEATURE_BRCTL_SHOW
          This adds about 600 bytes.
 
 config BUSYBOX_CONFIG_FEATURE_BRCTL_SHOW

-       bool "Support show, showmac and showstp"
+       bool "Support show"

        default y
        depends on BUSYBOX_CONFIG_BRCTL && BUSYBOX_CONFIG_FEATURE_BRCTL_FANCY
        help
          Add support for option which prints the current config:
        default y
        depends on BUSYBOX_CONFIG_BRCTL && BUSYBOX_CONFIG_FEATURE_BRCTL_FANCY
        help
          Add support for option which prints the current config:

-           showmacs, showstp, show
+           show

 
 config BUSYBOX_CONFIG_DNSD
        bool "dnsd"
 
 config BUSYBOX_CONFIG_DNSD
        bool "dnsd"


@@ -93,6 +104,19 @@ config BUSYBOX_CONFIG_FAKEIDENTD
          fakeidentd listens on the ident port and returns a predefined
          fake value on any query.
 
          fakeidentd listens on the ident port and returns a predefined
          fake value on any query.
 

+config BUSYBOX_CONFIG_FTPD
+       bool "ftpd"
+       default n
+       help
+         simple FTP daemon. You have to run it via inetd.
+
+config BUSYBOX_CONFIG_FEATURE_FTP_WRITE
+       bool "Enable upload commands"
+       default n
+       depends on BUSYBOX_CONFIG_FTPD
+       help
+         Enable all kinds of FTP upload commands (-w option)
+

 config BUSYBOX_CONFIG_FTPGET
        bool "ftpget"
        default n
 config BUSYBOX_CONFIG_FTPGET
        bool "ftpget"
        default n


@@ -108,7 +132,7 @@ config BUSYBOX_CONFIG_FTPPUT
 config BUSYBOX_CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS
        bool "Enable long options in ftpget/ftpput"
        default n
 config BUSYBOX_CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS
        bool "Enable long options in ftpget/ftpput"
        default n

-       depends on BUSYBOX_CONFIG_GETOPT_LONG && (BUSYBOX_CONFIG_FTPGET || BUSYBOX_CONFIG_FTPPUT)
+       depends on BUSYBOX_CONFIG_LONG_OPTS && (BUSYBOX_CONFIG_FTPGET || BUSYBOX_CONFIG_FTPPUT)

        help
          Support long options for the ftpget/ftpput applet.
 
        help
          Support long options for the ftpget/ftpput applet.
 


@@ -141,14 +165,6 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_USE_SENDFILE
          When enabled, httpd will use the kernel sendfile() function
          instead of read/write loop.
 
          When enabled, httpd will use the kernel sendfile() function
          instead of read/write loop.
 

-config BUSYBOX_CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
-       bool "Support reloading of global config file on HUP signal"
-       default y
-       depends on BUSYBOX_CONFIG_HTTPD
-       help
-         This option enables processing of SIGHUP to reload cached
-         configuration settings.
-

 config BUSYBOX_CONFIG_FEATURE_HTTPD_SETUID
        bool "Enable -u <user> option"
        default n
 config BUSYBOX_CONFIG_FEATURE_HTTPD_SETUID
        bool "Enable -u <user> option"
        default n


@@ -175,14 +191,6 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_AUTH_MD5
          Enables basic per URL authentication from /etc/httpd.conf
          using md5 passwords.
 
          Enables basic per URL authentication from /etc/httpd.conf
          using md5 passwords.
 

-config BUSYBOX_CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES
-       bool "Support loading additional MIME types at run-time"
-       default y
-       depends on BUSYBOX_CONFIG_HTTPD
-       help
-         This option enables support for additional MIME types at
-         run-time to be specified in the configuration file.
-

 config BUSYBOX_CONFIG_FEATURE_HTTPD_CGI
        bool "Support Common Gateway Interface (CGI)"
        default y
 config BUSYBOX_CONFIG_FEATURE_HTTPD_CGI
        bool "Support Common Gateway Interface (CGI)"
        default y


@@ -299,6 +307,12 @@ config BUSYBOX_CONFIG_IFENSLAVE
          Userspace application to bind several interfaces
          to a logical interface (use with kernel bonding driver).
 
          Userspace application to bind several interfaces
          to a logical interface (use with kernel bonding driver).
 

+config BUSYBOX_CONFIG_IFPLUGD
+       bool "ifplugd"
+       default n
+       help
+         Network interface plug detection daemon.
+

 config BUSYBOX_CONFIG_IFUPDOWN
        bool "ifupdown"
        default n
 config BUSYBOX_CONFIG_IFUPDOWN
        bool "ifupdown"
        default n


@@ -564,7 +578,7 @@ config BUSYBOX_CONFIG_FEATURE_IPCALC_FANCY
 config BUSYBOX_CONFIG_FEATURE_IPCALC_LONG_OPTIONS
        bool "Enable long options"
        default n
 config BUSYBOX_CONFIG_FEATURE_IPCALC_LONG_OPTIONS
        bool "Enable long options"
        default n

-       depends on BUSYBOX_CONFIG_IPCALC && BUSYBOX_CONFIG_GETOPT_LONG
+       depends on BUSYBOX_CONFIG_IPCALC && BUSYBOX_CONFIG_LONG_OPTS

        help
          Support long options for the ipcalc applet.
 
        help
          Support long options for the ipcalc applet.
 


@@ -827,24 +841,23 @@ config BUSYBOX_CONFIG_FEATURE_TFTP_BLOCKSIZE
 config BUSYBOX_CONFIG_TFTP_DEBUG
        bool "Enable debug"
        default n
 config BUSYBOX_CONFIG_TFTP_DEBUG
        bool "Enable debug"
        default n

-       depends on BUSYBOX_CONFIG_TFTP
+       depends on BUSYBOX_CONFIG_TFTP || BUSYBOX_CONFIG_TFTPD

        help
        help

-         Enable debug settings for tftp. This is useful if you're running
-         into problems with tftp as the protocol doesn't help you much when
-         you run into problems.
+         Make tftp[d] print debugging messages on stderr.
+         This is useful if you are diagnosing a bug in tftp[d].

 
 config BUSYBOX_CONFIG_TRACEROUTE
        bool "traceroute"
        default y
        help
 
 config BUSYBOX_CONFIG_TRACEROUTE
        bool "traceroute"
        default y
        help

-         Utility to trace the route of IP packets
+         Utility to trace the route of IP packets.

 
 config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_VERBOSE
        bool "Enable verbose output"
        default y
        depends on BUSYBOX_CONFIG_TRACEROUTE
        help
 
 config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_VERBOSE
        bool "Enable verbose output"
        default y
        depends on BUSYBOX_CONFIG_TRACEROUTE
        help

-         Add some verbosity to traceroute. This includes amongst other things
+         Add some verbosity to traceroute. This includes among other things

          hostnames and ICMP response types.
 
 config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
          hostnames and ICMP response types.
 
 config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE


@@ -860,10 +873,19 @@ config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_USE_ICMP
        default n
        depends on BUSYBOX_CONFIG_TRACEROUTE
        help
        default n
        depends on BUSYBOX_CONFIG_TRACEROUTE
        help

-         Add feature to allow for ICMP ECHO instead of UDP datagrams.
+         Add option -I to use ICMP ECHO instead of UDP datagrams.

 
 source package/busybox/config/networking/udhcp/Config.in
 
 
 source package/busybox/config/networking/udhcp/Config.in
 

+config BUSYBOX_CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS
+       string "ifup udhcpc command line options"
+       default "-R -n"
+       depends on BUSYBOX_CONFIG_IFUPDOWN && BUSYBOX_CONFIG_APP_UDHCPC
+       help
+         Command line options to pass to udhcpc from ifup.
+         Intended to alter options not available in /etc/network/interfaces.
+         (IE: --syslog --background etc...)
+

 config BUSYBOX_CONFIG_VCONFIG
        bool "vconfig"
        default y
 config BUSYBOX_CONFIG_VCONFIG
        bool "vconfig"
        default y


@@ -894,7 +916,7 @@ config BUSYBOX_CONFIG_FEATURE_WGET_AUTHENTICATION
 config BUSYBOX_CONFIG_FEATURE_WGET_LONG_OPTIONS
        bool "Enable long options"
        default y
 config BUSYBOX_CONFIG_FEATURE_WGET_LONG_OPTIONS
        bool "Enable long options"
        default y

-       depends on BUSYBOX_CONFIG_WGET && BUSYBOX_CONFIG_GETOPT_LONG
+       depends on BUSYBOX_CONFIG_WGET && BUSYBOX_CONFIG_LONG_OPTS

        help
          Support long options for the wget applet.
 
        help
          Support long options for the wget applet.
 


@@ -917,6 +939,20 @@ config BUSYBOX_CONFIG_TCPSVD
          tcpsvd listens on a TCP port and runs a program for each new
          connection.
 
          tcpsvd listens on a TCP port and runs a program for each new
          connection.
 

+config BUSYBOX_CONFIG_TUNCTL
+       bool "tunctl"
+       default n
+       help
+         tunctl creates or deletes tun devices.
+
+config BUSYBOX_CONFIG_FEATURE_TUNCTL_UG
+       bool "Support owner:group assignment"
+       default n
+       depends on BUSYBOX_CONFIG_TUNCTL
+       help
+         Allow to specify owner and group of newly created interface.
+         340 bytes of pure bloat. Say no here.
+

 config BUSYBOX_CONFIG_UDPSVD
        bool "udpsvd"
        default n
 config BUSYBOX_CONFIG_UDPSVD
        bool "udpsvd"
        default n