system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-09-06 17:14:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

dns-manager: get rid of the nm_spawn_process() use

Browse source 
There's no point in making our lives more complicated by concatenating
the argument into a string and then splitting it up again.
This commit is contained in:
Lubomir Rintel 2017-02-03 18:16:41 +01:00
parent 4e8eddd100
commit 46c534d7e9
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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;
}