2005-12-12 Robert Love <rml@novell.com>

* src/named-manager/nm-named-manager.c: Don't unref the config until
	  after we call rewrite_resolv_conf(), because get_last_default_domain()
	  needs to access the config.  Fixes "rewrite_resolv_conf: assertion
	  `config != NULL' failed" assertion failures and "Could not commit DNS
	  changes" warnings.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1177 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love
2005-12-13 18:46:45 +00:00
committed by Robert Love
parent d1e0e9d91b
commit e623ea3b22
2 changed files with 11 additions and 3 deletions

View File

@@ -706,9 +706,6 @@ 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
* default zone.
@@ -726,6 +723,9 @@ 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;
}