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

device: fix configuring static ip addresses

Browse source 
When a connection had static IP addresses, an early event
from plaform would clear them from priv->con_ip4_config.

Fix that, by don't initializing priv->con_ip4_config
before we commit the first time.

https://bugzilla.gnome.org/show_bug.cgi?id=749052

Fixes: 557667df12
(cherry picked from commit 843205521f)
This commit is contained in:
Thomas Haller 2015-05-07 10:46:58 +02:00
parent acc230e3c8
commit 29f13ecf66
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/devices/nm-device.c
View file

@ -3179,7 +3179,8 @@ ip4_config_merge_and_apply (NMDevice *self,
composite = nm_ip4_config_new ();
ensure_con_ipx_config (self);
if (commit)
ensure_con_ipx_config (self);
if (priv->dev_ip4_config)
nm_ip4_config_merge (composite, priv->dev_ip4_config);
@ -3756,7 +3757,8 @@ ip6_config_merge_and_apply (NMDevice *self,
/* If no config was passed in, create a new one */
composite = nm_ip6_config_new ();
ensure_con_ipx_config (self);
if (commit)
ensure_con_ipx_config (self);
/* Merge all the IP configs into the composite config */
if (priv->ac_ip6_config)
@ -6991,7 +6993,6 @@ update_ip_config (NMDevice *self, gboolean initial)
g_clear_object (&priv->dev_ip4_config);
capture_lease_config (self, priv->ext_ip4_config, &priv->dev_ip4_config, NULL, NULL);
}
ensure_con_ipx_config (self);
/* This function was called upon external changes. Remove the configuration
* (adresses,routes) that is no longer present externally from the interal
@ -7030,8 +7031,6 @@ update_ip_config (NMDevice *self, gboolean initial)
linklocal6_just_completed = priv->linklocal6_timeout_id &&
have_ip6_address (priv->ext_ip6_config, TRUE);
ensure_con_ipx_config (self);
/* This function was called upon external changes. Remove the configuration
* (adresses,routes) that is no longer present externally from the interal
* config. This way, we don't readd addresses that were manually removed