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

Revert alloc_str changes

Browse Source 
This reverts commit fdead26ffe.
This reverts commit 3e2419ebe3.
This reverts commit 17ce69b47a.
This commit is contained in:
Martin Willi
2011-04-21 13:35:31 +02:00
parent fdead26ffe
commit 5b0bcfb1fc
17 changed files with 49 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/eap_radius/eap_radius_plugin.c
+6 -14
View File
@@ -65,19 +65,18 @@ static void load_servers(private_eap_radius_plugin_t *this)
char *nas_identifier, *secret, *address, *section;
int port, sockets, preference;
address = lib->settings->alloc_str(lib->settings,
address = lib->settings->get_str(lib->settings,
"charon.plugins.eap-radius.server", NULL);
if (address)
{ /* legacy configuration */
secret = lib->settings->alloc_str(lib->settings,
secret = lib->settings->get_str(lib->settings,
"charon.plugins.eap-radius.secret", NULL);
if (!secret)
{
DBG1(DBG_CFG, "no RADUIS secret defined");
free(address);
return;
}
nas_identifier = lib->settings->alloc_str(lib->settings,
nas_identifier = lib->settings->get_str(lib->settings,
"charon.plugins.eap-radius.nas_identifier", "strongSwan");
port = lib->settings->get_int(lib->settings,
"charon.plugins.eap-radius.port", RADIUS_PORT);
@@ -85,9 +84,6 @@ static void load_servers(private_eap_radius_plugin_t *this)
"charon.plugins.eap-radius.sockets", 1);
server = radius_server_create(address, port, nas_identifier,
secret, sockets, 0);
free(address);
free(nas_identifier);
free(secret);
if (!server)
{
DBG1(DBG_CFG, "no RADUIS server defined");
@@ -101,22 +97,21 @@ static void load_servers(private_eap_radius_plugin_t *this)
"charon.plugins.eap-radius.servers");
while (enumerator->enumerate(enumerator, &section))
{
address = lib->settings->alloc_str(lib->settings,
address = lib->settings->get_str(lib->settings,
"charon.plugins.eap-radius.servers.%s.address", NULL, section);
if (!address)
{
DBG1(DBG_CFG, "RADIUS server '%s' misses address, skipped", section);
continue;
}
secret = lib->settings->alloc_str(lib->settings,
secret = lib->settings->get_str(lib->settings,
"charon.plugins.eap-radius.servers.%s.secret", NULL, section);
if (!secret)
{
DBG1(DBG_CFG, "RADIUS server '%s' misses secret, skipped", section);
free(address);
continue;
}
nas_identifier = lib->settings->alloc_str(lib->settings,
nas_identifier = lib->settings->get_str(lib->settings,
"charon.plugins.eap-radius.servers.%s.nas_identifier",
"strongSwan", section);
port = lib->settings->get_int(lib->settings,
@@ -127,9 +122,6 @@ static void load_servers(private_eap_radius_plugin_t *this)
"charon.plugins.eap-radius.servers.%s.preference", 0, section);
server = radius_server_create(address, port, nas_identifier,
secret, sockets, preference);
free(address);
free(nas_identifier);
free(secret);
if (!server)
{
DBG1(DBG_CFG, "loading RADIUS server '%s' failed, skipped", section);