[systemd-commits] 2 commits - src/libsystemd-network src/network

[Tom Gundersen]

 src/libsystemd-network/sd-dhcp6-client.c |    3 ++-
 src/network/networkd-network.c           |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit c38d2eb828f1a62ae9052c9db45ccc70f98fdb47
Author: Steven Noonan <steven at uplinklabs.net>
Date:   Thu Jul 3 19:42:19 2014 -0700

    networkd: accept section DHCP in systemd.network files

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 9ab4f23..9f6de18 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -92,7 +92,7 @@ static int network_load_one(Manager *manager, const char *filename) {
         network->dhcp_routes = true;
         network->dhcp_sendhost = true;
 
-        r = config_parse(NULL, filename, file, "Match\0Network\0Address\0Route\0DHCPv4\0", config_item_perf_lookup,
+        r = config_parse(NULL, filename, file, "Match\0Network\0Address\0Route\0DHCP\0DHCPv4\0", config_item_perf_lookup,
                         (void*) network_network_gperf_lookup, false, false, network);
         if (r < 0) {
                 log_warning("Could not parse config file %s: %s", filename, strerror(-r));

commit b1e1238fb3af77419eca704fb64f68a313954734
Author: Steven Noonan <steven at uplinklabs.net>
Date:   Thu Jul 3 19:43:56 2014 -0700

    networkd: don't clear dhcpv6 lease timers if there's no previous lease
    
    If client->lease is NULL, dhcp6_lease_clear_timers will cause a segmentation
    fault.

diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
index 8fdbbfe..a83778e 100644
--- a/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/libsystemd-network/sd-dhcp6-client.c
@@ -708,7 +708,8 @@ static int client_receive_reply(sd_dhcp6_client *client, DHCP6Message *reply,
                         return 0;
         }
 
-        dhcp6_lease_clear_timers(&client->lease->ia);
+        if (client->lease)
+            dhcp6_lease_clear_timers(&client->lease->ia);
 
         client->lease = sd_dhcp6_lease_unref(client->lease);
         client->lease = lease;