From 5b0bcfb1fc4aabb6535db91e70f7f262328e664f Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Thu, 21 Apr 2011 13:21:26 +0200 Subject: Revert alloc_str changes This reverts commit fdead26ffe1da8501a6ff5e0639a6f44c723e763. This reverts commit 3e2419ebe32de72d824864eb2e0e677a7c197af1. This reverts commit 17ce69b47a1efd6234960cf7d1f50712aee61db5. --- src/libcharon/plugins/eap_ttls/eap_ttls_server.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/libcharon/plugins/eap_ttls/eap_ttls_server.c') diff --git a/src/libcharon/plugins/eap_ttls/eap_ttls_server.c b/src/libcharon/plugins/eap_ttls/eap_ttls_server.c index 816710459..835cd7306 100644 --- a/src/libcharon/plugins/eap_ttls/eap_ttls_server.c +++ b/src/libcharon/plugins/eap_ttls/eap_ttls_server.c @@ -54,12 +54,12 @@ struct private_eap_ttls_server_t { bool start_phase2_tnc; /** - * Current phase 2 EAP method + * Current phase 2 EAP method */ eap_method_t *method; /** - * Pending outbound EAP message + * Pending outbound EAP message */ eap_payload_t *out; @@ -77,10 +77,9 @@ static status_t start_phase2_auth(private_eap_ttls_server_t *this) char *eap_type_str; eap_type_t type; - eap_type_str = lib->settings->alloc_str(lib->settings, + eap_type_str = lib->settings->get_str(lib->settings, "charon.plugins.eap-ttls.phase2_method", "md5"); type = eap_type_from_string(eap_type_str); - free(eap_type_str); if (type == 0) { DBG1(DBG_IKE, "unrecognized phase2 method \"%s\"", eap_type_str); -- cgit v1.2.3