[PATCH] dbus: make -u option working with new DBus API enabled

[Witold Sowa]

Sent the previous patch too fast. Sorry. Here is the correct one:

Bugfix: Enable -u option when only new DBus API is turned on in .config
---
 wpa_supplicant/main.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wpa_supplicant/main.c b/wpa_supplicant/main.c
index bb3dcd8..a7380ed 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 /* defined CONFIG_CTRL_IFACE_DBUS || defined 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 /* defined CONFIG_CTRL_IFACE_DBUS || defined CONFIG_CTRL_IFACE_DBUS_NEW */
 		case 'v':
 			printf("%s\n", wpa_supplicant_version);
 			exitcode = 0;
-- 
1.6.0.2