mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-05 02:57:58 +02:00
2005-10-25 Dan Williams <dcbw@redhat.com>
* Back out 2005-10-24 commit from Tor Krill. Patch causes nameservers never to be removed from named. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1072 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
parent
30fe490cd5
commit
d209f3a6d0
2 changed files with 7 additions and 3 deletions
|
|
@ -1,3 +1,8 @@
|
|||
2005-10-25 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* Back out 2005-10-24 commit from Tor Krill. Patch
|
||||
causes nameservers never to be removed from named.
|
||||
|
||||
2005-10-24 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
Clean up wireless scanning and wireless link probing.
|
||||
|
|
|
|||
|
|
@ -706,6 +706,8 @@ nm_named_manager_remove_ip4_config (NMNamedManager *mgr, NMIP4Config *config)
|
|||
if (mgr->priv->use_named)
|
||||
remove_ip4_config_from_named (mgr, config);
|
||||
|
||||
mgr->priv->configs = g_slist_remove (mgr->priv->configs, config);
|
||||
nm_ip4_config_unref (config);
|
||||
|
||||
/* Clear out and reload configs since we may need a new
|
||||
* default zone if the one we are removing was the old
|
||||
|
|
@ -723,9 +725,6 @@ nm_named_manager_remove_ip4_config (NMNamedManager *mgr, NMIP4Config *config)
|
|||
g_error_free (error);
|
||||
}
|
||||
|
||||
mgr->priv->configs = g_slist_remove (mgr->priv->configs, config);
|
||||
nm_ip4_config_unref (config);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue