From: Martin Willi <martin@strongswan.org>
Date: Thu, 29 Oct 2009 08:49:55 +0000 (+0100)
Subject: Fixed replacing existing reauthentication data
X-Git-Tag: 4.3.6~217
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0107f5b687f00b2729a8ab3af7e9e58429f903dd;p=thirdparty%2Fstrongswan.git

Fixed replacing existing reauthentication data
---

diff --git a/src/charon/plugins/eap_simaka_reauth/eap_simaka_reauth_provider.c b/src/charon/plugins/eap_simaka_reauth/eap_simaka_reauth_provider.c
index a27af54f13..bdc7e7b847 100644
--- a/src/charon/plugins/eap_simaka_reauth/eap_simaka_reauth_provider.c
+++ b/src/charon/plugins/eap_simaka_reauth/eap_simaka_reauth_provider.c
@@ -124,26 +124,26 @@ static identification_t *gen_reauth(private_eap_simaka_reauth_provider_t *this,
 	identification_t *permanent;
 
 	data = this->reauth->get(this->reauth, id);
-	id = id->clone(id);
 	if (data)
 	{	/* update existing entry */
 		permanent = this->permanent->remove(this->permanent, data->id);
 		if (permanent)
 		{
-			permanent->destroy(permanent);
+			data->id->destroy(data->id);
+			data->id = gen_identity(this);
+			this->permanent->put(this->permanent, data->id, permanent);
 		}
-		data->id->destroy(data->id);
 	}
 	else
 	{	/* generate new entry */
 		data = malloc_thing(reauth_data_t);
 		data->counter = 0;
+		data->id = gen_identity(this);
+		id = id->clone(id);
 		this->reauth->put(this->reauth, id, data);
+		this->permanent->put(this->permanent, data->id, id);
 	}
 	memcpy(data->mk, mk, HASH_SIZE_SHA1);
-	data->id = gen_identity(this);
-
-	this->permanent->put(this->permanent, data->id, id);
 
 	return data->id->clone(data->id);
 }