From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 19 Apr 2018 06:53:39 +0000 (+1200)
Subject: and some more
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ec587f2cbbfafd53e39131017542a55021e73f2;p=thirdparty%2Ffreeradius-server.git

and some more
---

diff --git a/src/modules/rlm_eap/lib/sim/xlat.c b/src/modules/rlm_eap/lib/sim/xlat.c
index f607b508637..5456e20eb9d 100644
--- a/src/modules/rlm_eap/lib/sim/xlat.c
+++ b/src/modules/rlm_eap/lib/sim/xlat.c
@@ -240,13 +240,13 @@ static ssize_t sim_xlat_3gpp_pseudonym_decrypt(TALLOC_CTX *ctx, char **out, UNUS
 	if (id_len != (SIM_3GPP_PSEUDONYM_LEN + 1)) {
 		REDEBUG2("3gpp pseudonym incorrect length, expected %i bytes, got %zu bytes",
 			 SIM_3GPP_PSEUDONYM_LEN + 1, id_len);
-		return -1;
+		goto error;
 	}
 
 	key_len = talloc_array_length(key);
 	if (key_len != 16) {
 		REDEBUG2("Decryption key incorrect length, expected %i bytes, got %zu bytes", 16, key_len);
-		return -1;
+		goto error;
 	}
 
 	tag = fr_sim_id_3gpp_pseudonym_tag(id);
@@ -265,13 +265,13 @@ static ssize_t sim_xlat_3gpp_pseudonym_decrypt(TALLOC_CTX *ctx, char **out, UNUS
 
 	default:
 		REDEBUG2("Unexpected tag value (%u) in SIM ID \"%pS\"", tag, id);
-		return -1;
+		goto error;
 	}
 
 	RDEBUG2("Decrypting \"%pS\"", id);
 	if (fr_sim_id_3gpp_pseudonym_decrypt(decrypted, id, key) < 0) {
 		RPEDEBUG2("Failed decrypting SIM ID");
-		return -1;
+		goto error;
 	}
 
 	/*