From 850fd9b8f841d70938c85f697211d43f1f6825d7 Mon Sep 17 00:00:00 2001 From: Chris Down Date: Fri, 20 Sep 2019 15:13:00 +0200 Subject: [PATCH 1/2] dhcp: Log SIP server information correctly --- src/libsystemd-network/sd-dhcp-lease.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c index e360b725ac..800caec841 100644 --- a/src/libsystemd-network/sd-dhcp-lease.c +++ b/src/libsystemd-network/sd-dhcp-lease.c @@ -1175,7 +1175,7 @@ int dhcp_lease_load(sd_dhcp_lease **ret, const char *lease_file) { if (sip) { r = deserialize_in_addrs(&lease->sip, sip); if (r < 0) - log_debug_errno(r, "Failed to deserialize SIP servers %s, ignoring: %m", ntp); + log_debug_errno(r, "Failed to deserialize SIP servers %s, ignoring: %m", sip); else lease->ntp_size = r; } From de307e199bd1b8f2f6804db39bd25b8619c9e425 Mon Sep 17 00:00:00 2001 From: Chris Down Date: Fri, 20 Sep 2019 15:14:05 +0200 Subject: [PATCH 2/2] networkd: Fix SIP double-free This is already strv_freed right above --- src/network/networkd-network.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 3ea5654f76..d1c4cddeb1 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -549,7 +549,6 @@ static Network *network_free(Network *network) { strv_free(network->ntp); free(network->dns); strv_free(network->sip); - free(network->sip); ordered_set_free_free(network->search_domains); ordered_set_free_free(network->route_domains); strv_free(network->bind_carrier);