ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

resolve: Make sure to clean up if calling resolvconf failed 

If running resolvconf fails handle() fails release() is not called, which
might leave an interface file on the system (or depending on which script
called by resolvconf actually failed even the installed DNS server).
This commit is contained in:
Tobias Brunner 2016-06-07 15:58:05 +02:00
parent 96b1fab53c
commit f4a20b74fd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libcharon/plugins/resolve/resolve_handler.c
View File

@ -149,7 +149,6 @@ static bool invoke_resolvconf(private_resolve_handler_t *this,
bool install)
{
char cmd[128];
bool success = TRUE;
/* we use the nameserver's IP address as part of the interface name to
* make them unique */
@ -162,6 +161,7 @@ static bool invoke_resolvconf(private_resolve_handler_t *this,
if (install)
{
FILE *out;
bool success;
out = popen(cmd, "w");
if (!out)
@ -171,8 +171,9 @@ static bool invoke_resolvconf(private_resolve_handler_t *this,
DBG1(DBG_IKE, "installing DNS server %H via resolvconf", addr);
fprintf(out, "nameserver %H\n", addr);
success = !ferror(out);
if (pclose(out))
if (pclose(out) || !success)
{
invoke_resolvconf(this, server, addr, FALSE);
return FALSE;
}
}
@ -180,7 +181,7 @@ static bool invoke_resolvconf(private_resolve_handler_t *this,
{
ignore_result(system(cmd));
}
return success;
return TRUE;
}
METHOD(attribute_handler_t, handle, bool,