fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-08 20:00:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nm-iface-helper: set last_config properly

Browse source 
Update last_config outside of the conditional; otherwise it will
always remain set to NULL.

Signed-off-by: David Ward <david.ward@ll.mit.edu>
Acked-By: Thomas Haller <thaller@redhat.com>
(cherry picked from commit db4d83d5a4)

Conflicts:
	src/nm-iface-helper.c
This commit is contained in:
David Ward 2015-04-24 22:38:21 -04:00 • committed by Thomas Haller
parent c0833d13c1
commit c17b08ea3c
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/nm-iface-helper.c
View file

@ -107,11 +107,10 @@ dhcp4_state_changed (NMDhcpClient *client,
if (!nm_ip4_config_commit (existing, ifindex, global_opt.priority_v4))
nm_log_warn (LOGD_DHCP4, "(%s): failed to apply DHCPv4 config", global_opt.ifname);
if (last_config) {
if (last_config)
g_object_unref (last_config);
last_config = nm_ip4_config_new ();
nm_ip4_config_replace (last_config, ip4_config, NULL);
}
last_config = nm_ip4_config_new ();
nm_ip4_config_replace (last_config, ip4_config, NULL);
break;
case NM_DHCP_STATE_TIMEOUT:
case NM_DHCP_STATE_DONE:
@ -251,11 +250,10 @@ rdisc_config_changed (NMRDisc *rdisc, NMRDiscConfigMap changed, gpointer user_da
if (!nm_ip6_config_commit (existing, ifindex))
nm_log_warn (LOGD_IP6, "(%s): failed to apply IPv6 config", global_opt.ifname);
if (last_config) {
if (last_config)
g_object_unref (last_config);
last_config = nm_ip6_config_new ();
nm_ip6_config_replace (last_config, ip6_config, NULL);
}
last_config = nm_ip6_config_new ();
nm_ip6_config_replace (last_config, ip6_config, NULL);
}
static void