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

revert to standard TNCC/TNCS Initialization function

Browse Source
This commit is contained in:
Andreas Steffen
2010-10-09 00:35:45 +02:00
parent bfba1fdc92
commit e9ba435fe3
2 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/tnc_imc/tnc_imc_plugin.c
+1 -9
View File
@@ -32,7 +32,6 @@ METHOD(plugin_t, destroy, void,
plugin_t *tnc_imc_plugin_create() plugin_t *tnc_imc_plugin_create()
{ {
char *tnc_config, *pref_lang; char *tnc_config, *pref_lang;
int imc_count;
tnc_imc_plugin_t *this; tnc_imc_plugin_t *this;
INIT(this, INIT(this,
@@ -46,19 +45,12 @@ plugin_t *tnc_imc_plugin_create()
tnc_config = lib->settings->get_str(lib->settings, tnc_config = lib->settings->get_str(lib->settings,
"charon.plugins.tnc-imc.tnc_config", "/etc/tnc_config"); "charon.plugins.tnc-imc.tnc_config", "/etc/tnc_config");
imc_count = libtnc_imc_load_config(tnc_config); if (libtnc_tncc_Initialize(tnc_config) != TNC_RESULT_SUCCESS)
if (imc_count < 0)
{ {
free(this); free(this);
DBG1(DBG_IKE, "TNC IMC initialization failed"); DBG1(DBG_IKE, "TNC IMC initialization failed");
return NULL; return NULL;
} }
else
{
DBG1(DBG_IKE, "loaded %d TNC IMC%s", imc_count,
(imc_count == 1) ? "":"s");
libtnc_tncc_PreferredLanguage(pref_lang);
}
return &this->plugin; return &this->plugin;
} }
src/libcharon/plugins/tnc_imv/tnc_imv_plugin.c
+1 -8
View File
@@ -32,7 +32,6 @@ METHOD(plugin_t, destroy, void,
plugin_t *tnc_imv_plugin_create() plugin_t *tnc_imv_plugin_create()
{ {
char *tnc_config; char *tnc_config;
int imv_count;
tnc_imv_plugin_t *this; tnc_imv_plugin_t *this;
INIT(this, INIT(this,
@@ -43,18 +42,12 @@ plugin_t *tnc_imv_plugin_create()
tnc_config = lib->settings->get_str(lib->settings, tnc_config = lib->settings->get_str(lib->settings,
"charon.plugins.tnc-imv.tnc_config", "/etc/tnc_config"); "charon.plugins.tnc-imv.tnc_config", "/etc/tnc_config");
imv_count = libtnc_imv_load_config(tnc_config); if (libtnc_tncs_Initialize(tnc_config) != TNC_RESULT_SUCCESS)
if (imv_count < 0)
{ {
free(this); free(this);
DBG1(DBG_IKE, "TNC IMV initialization failed"); DBG1(DBG_IKE, "TNC IMV initialization failed");
return NULL; return NULL;
} }
else
{
DBG1(DBG_IKE, "loaded %d TNC IMV%s", imv_count,
(imv_count == 1) ? "":"s");
}
return &this->plugin; return &this->plugin;
} }