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

dns: split create_resolv_conf() out of write_resolv_conf()

Browse source
This commit is contained in:
Thomas Haller 2016-03-21 16:34:05 +01:00
parent f73621a545
commit 22df466ed3
1 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/dns-manager/nm-dns-manager.c
View file

@ -410,12 +410,10 @@ dispatch_netconfig (NMDnsManager *self,
return SR_SUCCESS;
}
static gboolean
write_resolv_conf (FILE *f,
char **searches,
char **nameservers,
char **options,
GError **error)
static char *
create_resolv_conf (char **searches,
char **nameservers,
char **options)
{
gs_free char *searches_str = NULL;
gs_free char *nameservers_str = NULL;
@ -443,9 +441,9 @@ write_resolv_conf (FILE *f,
for (i = 0; i < num; i++) {
if (i == 3) {
g_string_append (str, "# ");
g_string_append (str, _("NOTE: the libc resolver may not support more than 3 nameservers."));
g_string_append (str, "NOTE: the libc resolver may not support more than 3 nameservers.");
g_string_append (str, "\n# ");
g_string_append (str, _("The nameservers listed below may not be recognized."));
g_string_append (str, "The nameservers listed below may not be recognized.");
g_string_append_c (str, '\n');
}
@ -456,10 +454,23 @@ write_resolv_conf (FILE *f,
nameservers_str = g_string_free (str, FALSE);
}
if (fprintf (f, "# Generated by NetworkManager\n%s%s%s",
searches_str ? searches_str : "",
nameservers_str ? nameservers_str : "",
options_str ? options_str : "") < 0) {
return g_strdup_printf ("# Generated by NetworkManager\n%s%s%s",
searches_str ?: "",
nameservers_str ?: "",
options_str ?: "");
}
static gboolean
write_resolv_conf (FILE *f,
char **searches,
char **nameservers,
char **options,
GError **error)
{
gs_free char *content = NULL;
content = create_resolv_conf (searches, nameservers, options);
if (fprintf (f, "%s", content) < 0) {
g_set_error (error,
NM_MANAGER_ERROR,
NM_MANAGER_ERROR_FAILED,