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

2007-10-26 Dan Williams <dcbw@redhat.com>

Browse source 
* src/named-manager/nm-named-manager.c
		- (rewrite_resolv_conf): clean up error handling to avoid double-free by
		    not calling fclose() twice on some error conditions



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3029 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2007-10-27 02:24:19 +00:00
parent a8decaa768
commit fb7e6b461a
2 changed files with 66 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2007-10-26 Dan Williams <dcbw@redhat.com>
* src/named-manager/nm-named-manager.c
- (rewrite_resolv_conf): clean up error handling to avoid double-free by
not calling fclose() twice on some error conditions
2007-10-26 Dan Williams <dcbw@redhat.com>
* src/nm-activation-request.c

83
src/named-manager/nm-named-manager.c
View file

@ -270,48 +270,85 @@ rewrite_resolv_conf (NMNamedManager *mgr, NMIP4Config *config, GError **error)
return TRUE;
}
if ((f = fopen (tmp_resolv_conf, "w")) == NULL)
goto lose;
if ((f = fopen (tmp_resolv_conf, "w")) == NULL) {
g_set_error (error,
NM_NAMED_MANAGER_ERROR,
NM_NAMED_MANAGER_ERROR_SYSTEM,
"Could not open " RESOLV_CONF ": %s\n",
g_strerror (errno));
return FALSE;
}
if (fprintf (f, "%s","# generated by NetworkManager, do not edit!\n\n") < 0)
goto lose;
if (fprintf (f, "%s","# generated by NetworkManager, do not edit!\n\n") < 0) {
g_set_error (error,
NM_NAMED_MANAGER_ERROR,
NM_NAMED_MANAGER_ERROR_SYSTEM,
"Could not write " RESOLV_CONF ": %s\n",
g_strerror (errno));
fclose (f);
return FALSE;
}
searches = compute_searches (mgr, config);
if (mgr->priv->use_named == TRUE)
{
/* Using caching-nameserver & local DNS */
if (fprintf (f, "%s%s%s", "; Use a local caching nameserver controlled by NetworkManager\n\n", searches, "\nnameserver 127.0.0.1\n") < 0)
goto lose;
if (fprintf (f,
"%s%s%s",
"; Use a local caching nameserver controlled by NetworkManager\n\n",
searches,
"\nnameserver 127.0.0.1\n") < 0) {
g_set_error (error,
NM_NAMED_MANAGER_ERROR,
NM_NAMED_MANAGER_ERROR_SYSTEM,
"Could not write " RESOLV_CONF ": %s\n",
g_strerror (errno));
fclose (f);
g_free (searches);
return FALSE;
}
}
else
{
/* Using glibc resolver */
char *nameservers = compute_nameservers (mgr, config);
fprintf (f, "%s\n\n", searches);
g_free (searches);
fprintf (f, "%s\n\n", nameservers);
if ((fprintf (f, "%s\n\n", searches) < 0) ||
(fprintf (f, "%s\n\n", nameservers) < 0)) {
g_set_error (error,
NM_NAMED_MANAGER_ERROR,
NM_NAMED_MANAGER_ERROR_SYSTEM,
"Could not write to " RESOLV_CONF ": %s\n",
g_strerror (errno));
g_free (nameservers);
g_free (searches);
fclose (f);
return FALSE;
}
g_free (nameservers);
}
g_free (searches);
if (fclose (f) < 0)
goto lose;
if (fclose (f) < 0) {
g_set_error (error,
NM_NAMED_MANAGER_ERROR,
NM_NAMED_MANAGER_ERROR_SYSTEM,
"Could not close " RESOLV_CONF ": %s\n",
g_strerror (errno));
return FALSE;
}
if (rename (tmp_resolv_conf, RESOLV_CONF) < 0)
goto lose;
if (rename (tmp_resolv_conf, RESOLV_CONF) < 0) {
g_set_error (error,
NM_NAMED_MANAGER_ERROR,
NM_NAMED_MANAGER_ERROR_SYSTEM,
"Could not replace " RESOLV_CONF ": %s\n",
g_strerror (errno));
return FALSE;
}
nm_system_update_dns ();
return TRUE;
lose:
g_free (searches);
fclose (f);
g_set_error (error,
NM_NAMED_MANAGER_ERROR,
NM_NAMED_MANAGER_ERROR_SYSTEM,
"Could not update " RESOLV_CONF ": %s\n", g_strerror (errno));
return FALSE;
}
static const char *