summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2018-06-01 08:26:29 +0200
committerThomas Haller <thaller@redhat.com>2018-06-01 08:26:29 +0200
commit5485dbea21786a26e4722dfabb555c153d13a05c (patch)
tree7efaca6770a65b53f8d29c8c232f20d9ba30c090
parent960632ee7bf3c4fcfe06f9222e70f15ac00f8b07 (diff)
downloadNetworkManager-5485dbea21786a26e4722dfabb555c153d13a05c.tar.gz
dns: move local variables to inner scope in update_resolv_conf()
-rw-r--r--src/dns/nm-dns-manager.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dns/nm-dns-manager.c b/src/dns/nm-dns-manager.c
index f5500ee794..7430365c14 100644
--- a/src/dns/nm-dns-manager.c
+++ b/src/dns/nm-dns-manager.c
@@ -768,8 +768,6 @@ update_resolv_conf (NMDnsManager *self,
gs_free char *content = NULL;
SpawnResult write_file_result = SR_SUCCESS;
int errsv;
- const char *rc_path = _PATH_RESCONF;
- nm_auto_free char *rc_path_real = NULL;
gboolean resconf_link_cached = FALSE;
gs_free char *resconf_link = NULL;
@@ -794,6 +792,8 @@ update_resolv_conf (NMDnsManager *self,
if ( rc_manager == NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE
|| ( rc_manager == NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK
&& !_read_link_cached (_PATH_RESCONF, &resconf_link_cached, &resconf_link))) {
+ nm_auto_free char *rc_path_real = NULL;
+ const char *rc_path = _PATH_RESCONF;
GError *local = NULL;
if (rc_manager == NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE) {