colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dns-manager: fail dns config if netconfig exits with non-zero status

Browse Source 
If netconfig does not exit with zero status signal, assume
configuration failed and signal an error.
This commit is contained in:
Thomas Haller
2015-05-03 14:24:57 +02:00
parent 6b646a1e37
commit 5f0c23f106
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/dns-manager/nm-dns-manager.c
View File

@@ -327,6 +327,13 @@ dispatch_netconfig (char **searches,
strerror (errsv));
return FALSE;
}
if (!WIFEXITED (status) || WEXITSTATUS (status) != EXIT_SUCCESS) {
g_set_error (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_FAILED,
"Error calling netconfig: %s %d",
WIFEXITED (status) ? "exited with status" : (WIFSIGNALED (status) ? "exited with signal" : "exited with unknown reason"),
WIFEXITED (status) ? WEXITSTATUS (status) : (WIFSIGNALED (status) ? WTERMSIG (status) : status));
return FALSE;
}
return TRUE;
}