diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-06-07 11:13:39 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-06-07 11:13:39 +0200 |
| commit | a849538e3bf0097595fc1fd86bcda608d1151b4c (patch) | |
| tree | 20e5dbc1399719e7e24ac6997adf2428a8cdce51 /src/network/networkd-network.c | |
| parent | 82e4eda664d40ef60829e27d84b1610c2f4070cd (diff) | |
| parent | 1e7a0e21c97ac1bbc743009e5ec8c12bc6200e19 (diff) | |
Merge pull request #3394 from poettering/triple-tstamp
timestamping improvements and IPv6 RA revamp
Diffstat (limited to 'src/network/networkd-network.c')
| -rw-r--r-- | src/network/networkd-network.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index dd89b3770c..e961db60a7 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -51,8 +51,8 @@ static int network_load_one(Manager *manager, const char *filename) { if (!file) { if (errno == ENOENT) return 0; - else - return -errno; + + return -errno; } if (null_or_empty_fd(fileno(file))) { @@ -134,6 +134,7 @@ static int network_load_one(Manager *manager, const char *filename) { network->ipv6_hop_limit = -1; network->duid.type = _DUID_TYPE_INVALID; network->proxy_arp = -1; + network->ipv6_accept_ra_use_dns = true; r = config_parse(NULL, filename, file, "Match\0" |