diff options
| author | Martin Willi <martin@revosec.ch> | 2011-04-21 13:21:26 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2011-04-21 13:35:31 +0200 |
| commit | 5b0bcfb1fc4aabb6535db91e70f7f262328e664f (patch) | |
| tree | 000c5588b5da0e498f74e251cd0e1aeaa6d597a9 /src/libcharon/plugins/eap_tnc/eap_tnc.c | |
| parent | fdead26ffe1da8501a6ff5e0639a6f44c723e763 (diff) | |
| download | strongswan-5b0bcfb1fc4aabb6535db91e70f7f262328e664f.tar.bz2 strongswan-5b0bcfb1fc4aabb6535db91e70f7f262328e664f.tar.xz | |
Revert alloc_str changes
This reverts commit fdead26ffe1da8501a6ff5e0639a6f44c723e763.
This reverts commit 3e2419ebe32de72d824864eb2e0e677a7c197af1.
This reverts commit 17ce69b47a1efd6234960cf7d1f50712aee61db5.
Diffstat (limited to 'src/libcharon/plugins/eap_tnc/eap_tnc.c')
| -rw-r--r-- | src/libcharon/plugins/eap_tnc/eap_tnc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/libcharon/plugins/eap_tnc/eap_tnc.c b/src/libcharon/plugins/eap_tnc/eap_tnc.c index 85628340d..d47fd379e 100644 --- a/src/libcharon/plugins/eap_tnc/eap_tnc.c +++ b/src/libcharon/plugins/eap_tnc/eap_tnc.c @@ -40,7 +40,7 @@ struct private_eap_tnc_t { /** Maximum number of EAP-TNC messages/fragments allowed */ -#define MAX_MESSAGE_COUNT 10 +#define MAX_MESSAGE_COUNT 10 /** Default size of a EAP-TNC fragment */ #define MAX_FRAGMENT_LEN 50000 @@ -149,7 +149,7 @@ static eap_tnc_t *eap_tnc_create(identification_t *server, "charon.plugins.eap-tnc.fragment_size", MAX_FRAGMENT_LEN); max_msg_count = lib->settings->get_int(lib->settings, "charon.plugins.eap-tnc.max_message_count", MAX_MESSAGE_COUNT); - protocol = lib->settings->alloc_str(lib->settings, + protocol = lib->settings->get_str(lib->settings, "charon.plugins.eap-tnc.protocol", "tnccs-1.1"); if (strcaseeq(protocol, "tnccs-2.0")) { @@ -166,11 +166,9 @@ static eap_tnc_t *eap_tnc_create(identification_t *server, else { DBG1(DBG_TNC, "TNCCS protocol '%s' not supported", protocol); - free(protocol); free(this); return NULL; } - free(protocol); tnccs = charon->tnccs->create_instance(charon->tnccs, type, is_server); this->tls_eap = tls_eap_create(EAP_TNC, (tls_t*)tnccs, frag_size, max_msg_count); if (!this->tls_eap) |