diff options
Diffstat (limited to 'src/libcharon/plugins/eap_radius')
4 files changed, 9 insertions, 20 deletions
diff --git a/src/libcharon/plugins/eap_radius/eap_radius.c b/src/libcharon/plugins/eap_radius/eap_radius.c index 08b46c68c..b93a1f5f6 100644 --- a/src/libcharon/plugins/eap_radius/eap_radius.c +++ b/src/libcharon/plugins/eap_radius/eap_radius.c @@ -387,7 +387,6 @@ METHOD(eap_method_t, destroy, void, this->peer->destroy(this->peer); this->server->destroy(this->server); this->client->destroy(this->client); - free(this->id_prefix); free(this); } @@ -415,7 +414,7 @@ eap_radius_t *eap_radius_create(identification_t *server, identification_t *peer .type = EAP_RADIUS, .eap_start = lib->settings->get_bool(lib->settings, "charon.plugins.eap-radius.eap_start", FALSE), - .id_prefix = lib->settings->alloc_str(lib->settings, + .id_prefix = lib->settings->get_str(lib->settings, "charon.plugins.eap-radius.id_prefix", ""), .class_group = lib->settings->get_bool(lib->settings, "charon.plugins.eap-radius.class_group", FALSE), @@ -426,7 +425,6 @@ eap_radius_t *eap_radius_create(identification_t *server, identification_t *peer this->client = radius_client_create(); if (!this->client) { - free(this->id_prefix); free(this); return NULL; } diff --git a/src/libcharon/plugins/eap_radius/eap_radius_plugin.c b/src/libcharon/plugins/eap_radius/eap_radius_plugin.c index 8ca5f3956..9b1525662 100644 --- a/src/libcharon/plugins/eap_radius/eap_radius_plugin.c +++ b/src/libcharon/plugins/eap_radius/eap_radius_plugin.c @@ -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, §ion)) { - 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); diff --git a/src/libcharon/plugins/eap_radius/radius_server.c b/src/libcharon/plugins/eap_radius/radius_server.c index 7cd1477c3..37a2d331e 100644 --- a/src/libcharon/plugins/eap_radius/radius_server.c +++ b/src/libcharon/plugins/eap_radius/radius_server.c @@ -201,8 +201,7 @@ radius_server_t *radius_server_create(char *server, u_int16_t port, .destroy = _destroy, }, .reachable = TRUE, - .nas_identifier = chunk_clone(chunk_create(nas_identifier, - strlen(nas_identifier))), + .nas_identifier = chunk_create(nas_identifier, strlen(nas_identifier)), .socket_count = sockets, .sockets = linked_list_create(), .mutex = mutex_create(MUTEX_TYPE_DEFAULT), diff --git a/src/libcharon/plugins/eap_radius/radius_socket.c b/src/libcharon/plugins/eap_radius/radius_socket.c index df5f5b089..76993e756 100644 --- a/src/libcharon/plugins/eap_radius/radius_socket.c +++ b/src/libcharon/plugins/eap_radius/radius_socket.c @@ -301,7 +301,7 @@ radius_socket_t *radius_socket_create(host_t *host, chunk_t secret) destroy(this); return NULL; } - this->secret = chunk_clone(secret); + this->secret = secret; this->signer->set_key(this->signer, secret); /* we use a random identifier, helps if we restart often */ this->identifier = random(); |