Set default ipconfig method to OFF for IPv6
authorSamuel Ortiz <sameo@linux.intel.com>
Thu, 29 Jul 2010 20:46:17 +0000 (22:46 +0200)
committerSamuel Ortiz <sameo@linux.intel.com>
Thu, 29 Jul 2010 20:46:58 +0000 (22:46 +0200)
src/ipconfig.c

index e6e63b2..9d9ff4a 100644 (file)
@@ -1606,9 +1606,12 @@ int __connman_ipconfig_load(struct connman_ipconfig *ipconfig,
 
        key = g_strdup_printf("%smethod", prefix);
        method = g_key_file_get_string(keyfile, identifier, key, NULL);
-       if (method == NULL)
-               ipconfig->method = CONNMAN_IPCONFIG_METHOD_DHCP;
-       else
+       if (method == NULL) {
+               if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4)
+                       ipconfig->method = CONNMAN_IPCONFIG_METHOD_DHCP;
+               else
+                       ipconfig->method = CONNMAN_IPCONFIG_METHOD_OFF;
+       } else
                ipconfig->method = __connman_ipconfig_string2method(method);
        g_free(key);