diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2017-02-03 18:16:41 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2017-02-03 18:53:39 +0100 |
| commit | 46c534d7e96e51e35b284508cefc02152871d987 (patch) | |
| tree | 7e87aa99c80d7c13fe57722e2c51b39c2f04b638 | |
| parent | 4e8eddd100bbc8429806a70620c90b72cfd29cb1 (diff) | |
| download | NetworkManager-46c534d7e96e51e35b284508cefc02152871d987.tar.gz | |
dns-manager: get rid of the nm_spawn_process() use
There's no point in making our lives more complicated by concatenating
the argument into a string and then splitting it up again.
| -rw-r--r-- | src/dns/nm-dns-manager.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/dns/nm-dns-manager.c b/src/dns/nm-dns-manager.c index 0435cc17d4..5d0cd08cb7 100644 --- a/src/dns/nm-dns-manager.c +++ b/src/dns/nm-dns-manager.c @@ -606,6 +606,8 @@ dispatch_resolvconf (NMDnsManager *self, FILE *f; gboolean success = FALSE; int errnosv, err; + char *argv[] = { RESOLVCONF_PATH, "-d", "NetworkManager", NULL }; + int status; if (!g_file_test (RESOLVCONF_PATH, G_FILE_TEST_IS_EXECUTABLE)) { g_set_error_literal (error, @@ -618,15 +620,15 @@ dispatch_resolvconf (NMDnsManager *self, if (!searches && !nameservers) { _LOGI ("Removing DNS information from %s", RESOLVCONF_PATH); - cmd = g_strconcat (RESOLVCONF_PATH, " -d ", "NetworkManager", NULL); - if (nm_spawn_process (cmd, error) != 0) { - if (error && !*error) { - g_set_error (error, - NM_MANAGER_ERROR, - NM_MANAGER_ERROR_FAILED, - "%s returned error code", - RESOLVCONF_PATH); - } + if (!g_spawn_sync ("/", argv, NULL, 0, NULL, NULL, NULL, NULL, &status, error)) + return SR_ERROR; + + if (status != 0) { + g_set_error (error, + NM_MANAGER_ERROR, + NM_MANAGER_ERROR_FAILED, + "%s returned error code", + RESOLVCONF_PATH); return SR_ERROR; } |