From: Alan T. DeKok <aland@freeradius.org>
Date: Sat, 2 Mar 2013 20:55:01 +0000 (-0800)
Subject: Use correct return codes and variable types
X-Git-Tag: release_3_0_0_beta1~856
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5da6638eadca162a6e0dac34946c9fa79f622e6e;p=thirdparty%2Ffreeradius-server.git

Use correct return codes and variable types
---

diff --git a/src/modules/rlm_eap/eap.c b/src/modules/rlm_eap/eap.c
index 9a02fa34dca..e2855efcbec 100644
--- a/src/modules/rlm_eap/eap.c
+++ b/src/modules/rlm_eap/eap.c
@@ -429,7 +429,7 @@ int eaptype_select(rlm_eap_t *inst, EAP_HANDLER *handler)
  *	Set the RADIUS reply codes based on EAP request codes.  Append
  *	any additonal VPs to RADIUS reply
  */
-int eap_compose(EAP_HANDLER *handler)
+rlm_rcode_t eap_compose(EAP_HANDLER *handler)
 {
 	VALUE_PAIR *vp;
 	eap_packet_t *eap_packet;
diff --git a/src/modules/rlm_eap/rlm_eap.c b/src/modules/rlm_eap/rlm_eap.c
index 1eb28071c7e..e21312495f4 100644
--- a/src/modules/rlm_eap/rlm_eap.c
+++ b/src/modules/rlm_eap/rlm_eap.c
@@ -272,7 +272,8 @@ static rlm_rcode_t eap_authenticate(void *instance, REQUEST *request)
 	rlm_eap_t	*inst;
 	EAP_HANDLER	*handler;
 	eap_packet_t	*eap_packet;
-	rlm_rcode_t	rcode;
+	int		rcode;
+	rlm_rcode_t	module_rcode;
 
 	inst = (rlm_eap_t *) instance;
 
@@ -392,7 +393,7 @@ static rlm_rcode_t eap_authenticate(void *instance, REQUEST *request)
 	 *	We are done, wrap the EAP-request in RADIUS to send
 	 *	with all other required radius attributes
 	 */
-	rcode = eap_compose(handler);
+	module_rcode = eap_compose(handler);
 
 	/*
 	 *	Add to the list only if it is EAP-Request, OR if
@@ -471,7 +472,7 @@ static rlm_rcode_t eap_authenticate(void *instance, REQUEST *request)
 		}
 	}
 
-	return rcode;
+	return module_rcode;
 }
 
 /*
diff --git a/src/modules/rlm_eap/rlm_eap.h b/src/modules/rlm_eap/rlm_eap.h
index 6c3eb4cb13a..73649a96658 100644
--- a/src/modules/rlm_eap/rlm_eap.h
+++ b/src/modules/rlm_eap/rlm_eap.h
@@ -95,7 +95,7 @@ int       	eaptype_select(rlm_eap_t *inst, EAP_HANDLER *h);
 int  		eap_start(rlm_eap_t *inst, REQUEST *request);
 void 		eap_fail(EAP_HANDLER *handler);
 void 		eap_success(EAP_HANDLER *handler);
-int 		eap_compose(EAP_HANDLER *handler);
+rlm_rcode_t 	eap_compose(EAP_HANDLER *handler);
 EAP_HANDLER 	*eap_handler(rlm_eap_t *inst, eap_packet_t **eap_msg, REQUEST *request);
 
 /* Memory Management */