denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly handle situation if no resolver plugins are loaded

Browse Source
This commit is contained in:
Tobias Brunner
2013-04-01 13:44:04 +02:00
parent 5a516a83da
commit 53ac177cde
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/ipseckey/ipseckey_plugin.c
+2 -3
View File
@@ -60,7 +60,7 @@ METHOD(plugin_t, destroy, void,
{ {
lib->credmgr->remove_set(lib->credmgr, &this->cred->set); lib->credmgr->remove_set(lib->credmgr, &this->cred->set);
} }
this->res->destroy(this->res); DESTROY_IF(this->res);
DESTROY_IF(this->cred); DESTROY_IF(this->cred);
free(this); free(this);
} }
@@ -87,8 +87,7 @@ plugin_t *ipseckey_plugin_create()
if (!this->res) if (!this->res)
{ {
DBG1(DBG_CFG, "ipseckey_plugin: Failed to create" DBG1(DBG_CFG, "failed to create a DNS resolver instance");
"a DNS resolver instance");
destroy(this); destroy(this);
return NULL; return NULL;
} }
src/libstrongswan/resolver/resolver_manager.c
+5 -1
View File
@@ -56,7 +56,11 @@ METHOD(resolver_manager_t, remove_resolver, void,
METHOD(resolver_manager_t, create, resolver_t*, METHOD(resolver_manager_t, create, resolver_t*,
private_resolver_manager_t *this) private_resolver_manager_t *this)
{ {
return this->constructor(); if (this->constructor)
{
return this->constructor();
}
return NULL;
} }
METHOD(resolver_manager_t, destroy, void, METHOD(resolver_manager_t, destroy, void,