2005-02-25 Dan Williams <dcbw@redhat.com>

* named/nm-named-manager.c
		- Ensure that pid and watch variables for child named process get cleared out
			when the child goes away.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@469 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2005-02-25 20:43:15 +00:00
parent 5ffb71cab5
commit 9386e25758
2 changed files with 9 additions and 0 deletions

View file

@ -1,3 +1,9 @@
2005-02-25 Dan Williams <dcbw@redhat.com>
* named/nm-named-manager.c
- Ensure that pid and watch variables for child named process get cleared out
when the child goes away.
2005-02-22 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerPolicy.c

View file

@ -464,6 +464,7 @@ watch_cb (GPid pid, gint status, gpointer data)
/* FIXME - do something with error; need to handle failure to
* respawn */
mgr->priv->named_pid = 0;
nm_named_manager_start (mgr, NULL);
}
@ -519,11 +520,13 @@ nm_named_manager_start (NMNamedManager *mgr, GError **error)
g_source_set_callback (mgr->priv->child_watch, (GSourceFunc) watch_cb, mgr, NULL);
g_source_attach (mgr->priv->child_watch, mgr->priv->main_context);
g_source_unref (mgr->priv->child_watch);
mgr->priv->child_watch = NULL;
#endif
if (!rewrite_resolv_conf (mgr, error))
{
kill (mgr->priv->named_pid, SIGTERM);
mgr->priv->named_pid = 0;
return FALSE;
}