From: Samuel Ortiz <sameo@linux.intel.com>
Date: Thu, 29 Jul 2010 20:46:17 +0000 (+0200)
Subject: Set default ipconfig method to OFF for IPv6
X-Git-Tag: 0.56~66
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4afea89d14b9c1c4be41e9e57214c7e94435ae6e;p=platform%2Fupstream%2Fconnman.git

Set default ipconfig method to OFF for IPv6
---

diff --git a/src/ipconfig.c b/src/ipconfig.c
index e6e63b2..9d9ff4a 100644
--- a/src/ipconfig.c
+++ b/src/ipconfig.c
@@ -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);