diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2010-07-29 22:46:17 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-07-29 22:46:58 +0200 |
| commit | 4afea89d14b9c1c4be41e9e57214c7e94435ae6e (patch) | |
| tree | ca20100ecd7b804e8dec291895cada82a537656e | |
| parent | 0c96e020cd279cba67274d20d7895939e52d1593 (diff) | |
| download | connman-4afea89d14b9c1c4be41e9e57214c7e94435ae6e.tar.gz connman-4afea89d14b9c1c4be41e9e57214c7e94435ae6e.tar.bz2 connman-4afea89d14b9c1c4be41e9e57214c7e94435ae6e.zip | |
Set default ipconfig method to OFF for IPv6
| -rw-r--r-- | src/ipconfig.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/ipconfig.c b/src/ipconfig.c index e6e63b2e..9d9ff4ad 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); |