From a5717c957c240d4d26f3313b39a2f6faef4e8c1c Mon Sep 17 00:00:00 2001 From: Witold Sowa Date: Thu, 3 Dec 2009 21:12:42 +0200 Subject: [PATCH] dbus: Enable -u option when only the new DBus API is included --- wpa_supplicant/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wpa_supplicant/main.c b/wpa_supplicant/main.c index bb3dcd858..6ee93b9a8 100644 --- a/wpa_supplicant/main.c +++ b/wpa_supplicant/main.c @@ -73,9 +73,9 @@ static void usage(void) " -p = driver parameters\n" " -P = PID file\n" " -q = decrease debugging verbosity (-qq even less)\n"); -#ifdef CONFIG_CTRL_IFACE_DBUS +#if defined(CONFIG_CTRL_IFACE_DBUS) || defined(CONFIG_CTRL_IFACE_DBUS_NEW) printf(" -u = enable DBus control interface\n"); -#endif /* CONFIG_CTRL_IFACE_DBUS */ +#endif /* CONFIG_CTRL_IFACE_DBUS || CONFIG_CTRL_IFACE_DBUS_NEW */ printf(" -v = show version\n" " -W = wait for a control interface monitor before starting\n" " -N = start describing new interface\n"); @@ -218,11 +218,11 @@ int main(int argc, char *argv[]) case 't': params.wpa_debug_timestamp++; break; -#ifdef CONFIG_CTRL_IFACE_DBUS +#if defined(CONFIG_CTRL_IFACE_DBUS) || defined(CONFIG_CTRL_IFACE_DBUS_NEW) case 'u': params.dbus_ctrl_interface = 1; break; -#endif /* CONFIG_CTRL_IFACE_DBUS */ +#endif /* CONFIG_CTRL_IFACE_DBUS || CONFIG_CTRL_IFACE_DBUS_NEW */ case 'v': printf("%s\n", wpa_supplicant_version); exitcode = 0;