From: Jouni Malinen <j@w1.fi>
Date: Sat, 12 Dec 2015 10:00:28 +0000 (+0200)
Subject: EAP-FAST peer: Fix PAC parser error messages
X-Git-Tag: hostap_2_6~1210
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6e5e14fd4d98357acc08d59c05f7d0f4946864a;p=thirdparty%2Fhostap.git

EAP-FAST peer: Fix PAC parser error messages

Do not override the parsing error with the "PAC block not terminated
with END" message if the reason for the END line not yet being seen is
in failure to parse an earlier line.

Signed-off-by: Jouni Malinen <j@w1.fi>
---

diff --git a/src/eap_peer/eap_fast_pac.c b/src/eap_peer/eap_fast_pac.c
index c0986b314..0220caeda 100644
--- a/src/eap_peer/eap_fast_pac.c
+++ b/src/eap_peer/eap_fast_pac.c
@@ -455,7 +455,8 @@ int eap_fast_load_pac(struct eap_sm *sm, struct eap_fast_pac **pac_root,
 	}
 
 	if (pac) {
-		err = "PAC block not terminated with END";
+		if (!err)
+			err = "PAC block not terminated with END";
 		eap_fast_free_pac(pac);
 	}