client: Fix AutoConnect configuration

Changing the AutoConnect setting via connmanctl does not work, due to the
mistaken use of || instead of &&.

This patch fixes the issue, and tries to make things a little more readable.

diff --git a/client/commands.c b/client/commands.c
index 0caacd96656c3f914b0fa117e318f392455b9481..22d5b3c815ad1b688fa443b569a99e0de14d18cb 100644 (file)
--- a/client/commands.c
+++ b/client/commands.c
@@ -134,16 +134,20 @@ int config_switch(int argc, char *argv[], int c, DBusConnection *conn)
 
        switch (c) {
        case 'a':
-               if (*optarg != 'y' || *optarg != 'n' || *optarg != '1' ||
-                                       *optarg != '0' || *optarg != 't' ||
-                                                       *optarg != 'f')
-                       return -EINVAL;
-               if (*optarg == 'y' || *optarg == '1' ||
-                                               *optarg == 't')
+               switch (*optarg) {
+               case 'y':
+               case '1':
+               case 't':
                        val = TRUE;
-               else if (*optarg == 'n' || *optarg == '0' ||
-                                               *optarg == 'f')
+                       break;
+               case 'n':
+               case '0':
+               case 'f':
                        val = FALSE;
+                       break;
+               default:
+                       return -EINVAL;
+               }
                error = set_service_property(conn, message, argv[1],
                                                "AutoConnect", NULL,
                                                &val, 0);