From 7bf7ebc47074269c4817a91f668f8a2805e36f99 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 18 Nov 2014 09:42:41 -0500 Subject: [PATCH] dhcp: fix startup warnings with dhcp=internal If asked to read a file that doesn't exist, sd_dhcp_lease_load() returns 0 (success) without setting the out lease argument. So we need to check both the return status and the lease before proceeding. --- src/dhcp-manager/nm-dhcp-systemd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dhcp-manager/nm-dhcp-systemd.c b/src/dhcp-manager/nm-dhcp-systemd.c index 9cdd9e206..52f782c94 100644 --- a/src/dhcp-manager/nm-dhcp-systemd.c +++ b/src/dhcp-manager/nm-dhcp-systemd.c @@ -390,7 +390,7 @@ nm_dhcp_systemd_get_lease_ip_configs (const char *iface, path = get_leasefile_path (iface, uuid, FALSE); r = sd_dhcp_lease_load (&lease, path); - if (r == 0) { + if (r == 0 && lease) { ip4_config = lease_to_ip4_config (lease, NULL, 0, FALSE, NULL); if (ip4_config) leases = g_slist_append (leases, ip4_config);