Select the BSD license terms as the only license alternative

[build-utilities/hostap.git] / wpa_supplicant / main.c

diff --git a/wpa_supplicant/main.c b/wpa_supplicant/main.c
index 6ee93b9a84d570c6dc1d4db713b507db8cecf385..0ae1d7d819ee882876e08548c4eb75d3739ebbc1 100644 (file)
--- a/wpa_supplicant/main.c
+++ b/wpa_supplicant/main.c
@@ -33,7 +33,8 @@ static void usage(void)
               "[-g<global ctrl>] \\\n"
               "        -i<ifname> -c<config file> [-C<ctrl>] [-D<driver>] "
               "[-p<driver_param>] \\\n"
-              "        [-b<br_ifname>] [-f<debug file>] \\\n"
+              "        [-b<br_ifname>] [-f<debug file>] [-e<entropy file>] "
+              "\\\n"
               "        [-o<override driver>] [-O<override ctrl>] \\\n"
               "        [-N -i<ifname> -c<conf> [-C<ctrl>] "
               "[-D<driver>] \\\n"
@@ -56,7 +57,8 @@ static void usage(void)
               "  -C = ctrl_interface parameter (only used if -c is not)\n"
               "  -i = interface name\n"
               "  -d = increase debugging verbosity (-dd even more)\n"
-              "  -D = driver name (can be multiple drivers: nl80211,wext)\n");
+              "  -D = driver name (can be multiple drivers: nl80211,wext)\n"
+              "  -e = entropy file\n");
 #ifdef CONFIG_DEBUG_FILE
        printf("  -f = log output to debug file instead of stdout\n");
 #endif /* CONFIG_DEBUG_FILE */
@@ -67,15 +69,15 @@ static void usage(void)
 #endif /* CONFIG_DEBUG_SYSLOG */
        printf("  -t = include timestamp in debug messages\n"
               "  -h = show this help text\n"
-              "  -L = show license (GPL and BSD)\n"
+              "  -L = show license (BSD)\n"
               "  -o = override driver parameter for new interfaces\n"
               "  -O = override ctrl_interface parameter for new interfaces\n"
               "  -p = driver parameters\n"
               "  -P = PID file\n"
               "  -q = decrease debugging verbosity (-qq even less)\n");
-#if defined(CONFIG_CTRL_IFACE_DBUS) || defined(CONFIG_CTRL_IFACE_DBUS_NEW)
+#ifdef CONFIG_DBUS
        printf("  -u = enable DBus control interface\n");
-#endif /* CONFIG_CTRL_IFACE_DBUS || CONFIG_CTRL_IFACE_DBUS_NEW */
+#endif /* CONFIG_DBUS */
        printf("  -v = show version\n"
               "  -W = wait for a control interface monitor before starting\n"
               "  -N = start describing new interface\n");
@@ -143,7 +145,7 @@ int main(int argc, char *argv[])
        wpa_supplicant_fd_workaround();
 
        for (;;) {
-               c = getopt(argc, argv, "b:Bc:C:D:df:g:hi:KLNo:O:p:P:qstuvW");
+               c = getopt(argc, argv, "b:Bc:C:D:de:f:g:hi:KLNo:O:p:P:qstuvW");
                if (c < 0)
                        break;
                switch (c) {
@@ -172,6 +174,9 @@ int main(int argc, char *argv[])
                        params.wpa_debug_level--;
                        break;
 #endif /* CONFIG_NO_STDOUT_DEBUG */
+               case 'e':
+                       params.entropy_file = optarg;
+                       break;
 #ifdef CONFIG_DEBUG_FILE
                case 'f':
                        params.wpa_debug_file_path = optarg;
@@ -218,11 +223,11 @@ int main(int argc, char *argv[])
                case 't':
                        params.wpa_debug_timestamp++;
                        break;
-#if defined(CONFIG_CTRL_IFACE_DBUS) || defined(CONFIG_CTRL_IFACE_DBUS_NEW)
+#ifdef CONFIG_DBUS
                case 'u':
                        params.dbus_ctrl_interface = 1;
                        break;
-#endif /* CONFIG_CTRL_IFACE_DBUS || CONFIG_CTRL_IFACE_DBUS_NEW */
+#endif /* CONFIG_DBUS */
                case 'v':
                        printf("%s\n", wpa_supplicant_version);
                        exitcode = 0;