Use correct return codes and variable types

diff --git a/src/modules/rlm_eap/eap.c b/src/modules/rlm_eap/eap.c
index 9a02fa34dcab8a5aac20ed5b08d92aa7e37672f4..e2855efcbec1ec3685b7087dff3cc6111437d35e 100644 (file)
--- 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 1eb28071c7e1a20de82116472c7d094fa6fe7910..e21312495f4f29427442f86f4da6c2e6eb2a4395 100644 (file)
--- 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 6c3eb4cb13a505f2e6a50c975e915ac8cc3e6ac7..73649a96658d014c1888b56b7e6e43c1bfe96548 100644 (file)
--- 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 */