use appropriate error functions

which mean we don't need LOG_PREFIX here

diff --git a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
index aa6482c3f284659b2ddcde5b8feb0a6a8f74b6e7..4b0b536db59b6b6033e88546bb5474fcadcf719f 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
+++ b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
@@ -23,8 +23,6 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "eap - gtc"
-
 #include <freeradius-devel/eap/base.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/server/virtual_servers.h>

diff --git a/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c b/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c
index f88984135a903def5a2a4a7c5ed2ab5460bd4673..243a8ed880e5053f43c252c378f17ec303a95287 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c
+++ b/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c
@@ -36,8 +36,6 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "eap - md5"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <freeradius-devel/eap/base.h>
@@ -48,7 +46,7 @@ RCSID("$Id$")
 /*
  *     We expect only RESPONSE for which SUCCESS or FAILURE is sent back
  */
-MD5_PACKET *eap_md5_extract(eap_round_t *eap_round)
+MD5_PACKET *eap_md5_extract(request_t *request, eap_round_t *eap_round)
 {
        md5_packet_t    *data;
        MD5_PACKET      *packet;
@@ -66,7 +64,7 @@ MD5_PACKET *eap_md5_extract(eap_round_t *eap_round)
            !eap_round->response->type.data              ||
            (eap_round->response->length <= MD5_HEADER_LEN) ||
            (eap_round->response->type.data[0] == 0)) {
-               ERROR("corrupted data");
+               REDEBUG("corrupted data");
                return NULL;
        }
 
@@ -128,7 +126,7 @@ MD5_PACKET *eap_md5_extract(eap_round_t *eap_round)
 /*
  * verify = MD5(id+password+challenge_sent)
  */
-int eap_md5_verify(MD5_PACKET *packet, fr_pair_t* password,
+int eap_md5_verify(request_t *request, MD5_PACKET *packet, fr_pair_t* password,
                  uint8_t *challenge)
 {
        char    *ptr;
@@ -140,7 +138,7 @@ int eap_md5_verify(MD5_PACKET *packet, fr_pair_t* password,
         *      Sanity check it.
         */
        if (packet->value_size != 16) {
-               ERROR("Expected 16 bytes of response to challenge, got %d", packet->value_size);
+               REDEBUG("Expected 16 bytes of response to challenge, got %d", packet->value_size);
                return 0;
        }
 

diff --git a/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.h b/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.h
index 31ed3c2fd66467674a36d70152524b7e0aa9945d..c78cda6c49b1a6119d634389b9f1e93e944f3ad3 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.h
+++ b/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.h
@@ -45,5 +45,5 @@ typedef struct {
 /* function declarations here */
 
 int            eap_md5_compose(eap_round_t *auth, MD5_PACKET *reply);
-MD5_PACKET     *eap_md5_extract(eap_round_t *auth);
-int            eap_md5_verify(MD5_PACKET *pkt, fr_pair_t* pwd, uint8_t *ch);
+MD5_PACKET     *eap_md5_extract(request_t *request, eap_round_t *auth);
+int            eap_md5_verify(request_t *request, MD5_PACKET *pkt, fr_pair_t* pwd, uint8_t *ch);

diff --git a/src/modules/rlm_eap/types/rlm_eap_md5/rlm_eap_md5.c b/src/modules/rlm_eap/types/rlm_eap_md5/rlm_eap_md5.c
index e0b72298629e1d353334506302e2ad3130149598..62aaf1870e3df77362ccd4cb8cc98d2b4b8c0b19 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_md5/rlm_eap_md5.c
+++ b/src/modules/rlm_eap/types/rlm_eap_md5/rlm_eap_md5.c
@@ -74,7 +74,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, UNUSED module_ctx_t co
        /*
         *      Extract the EAP-MD5 packet.
         */
-       packet = eap_md5_extract(eap_session->this_round);
+       packet = eap_md5_extract(request, eap_session->this_round);
        if (!packet) {
                if (ephemeral) TALLOC_FREE(known_good);
                RETURN_MODULE_INVALID;
@@ -91,7 +91,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, UNUSED module_ctx_t co
         *      Verify the received packet against the previous packet
         *      (i.e. challenge) which we sent out.
         */
-       if (eap_md5_verify(packet, known_good, eap_session->opaque)) {
+       if (eap_md5_verify(request, packet, known_good, eap_session->opaque)) {
                reply->code = FR_MD5_SUCCESS;
        } else {
                reply->code = FR_MD5_FAILURE;

diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c b/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c
index c396e24952105eb4fff7c2c3a227b66fcb3df9e7..232deca45775a5ba658237fb142ec1d7cbda6c38 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c
@@ -22,8 +22,6 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "eap - peap"
-
 #include <freeradius-devel/eap/tls.h>
 #include "eap_peap.h"
 
@@ -396,7 +394,7 @@ static int mod_instantiate(void *instance, CONF_SECTION *cs)
         */
        inst->tls_conf = eap_tls_conf_parse(cs, "tls");
        if (!inst->tls_conf) {
-               ERROR("Failed initializing SSL context");
+               cf_log_err(cs, "Failed initializing SSL context");
                return -1;
        }
 

diff --git a/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c b/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
index 65093a2f1259eb54185bffec8f32a4a6d00fac8e..b65404103a4f2add3e041ff78af543c038b66b9e 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
+++ b/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
@@ -33,8 +33,6 @@
 RCSID("$Id$")
 USES_APPLE_DEPRECATED_API      /* OpenSSL API has been deprecated by Apple */
 
-#define LOG_PREFIX "eap - pwd"
-
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>
 #include <freeradius-devel/tls/base.h>
@@ -579,7 +577,7 @@ static int mod_instantiate(void *instance, CONF_SECTION *cs)
 
        inst->bnctx = BN_CTX_new();
        if (!inst->bnctx) {
-               ERROR("Failed to get BN context");
+               cf_log_err(cs, "Failed to get BN context");
                return -1;
        }
 

diff --git a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
index 054365532d9cc3d4c152c6c83b8315199445923c..0771b251b2612c000521df285923743433c4656f 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
+++ b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
@@ -25,8 +25,6 @@
 RCSID("$Id$")
 USES_APPLE_DEPRECATED_API      /* OpenSSL API has been deprecated by Apple */
 
-#define LOG_PREFIX "eap - tls"
-
 #ifdef HAVE_OPENSSL_RAND_H
 #  include <openssl/rand.h>
 #endif
@@ -255,7 +253,7 @@ static int mod_instantiate(void *instance, CONF_SECTION *cs)
 
        inst->tls_conf = eap_tls_conf_parse(cs, "tls");
        if (!inst->tls_conf) {
-               ERROR("Failed initializing SSL context");
+               cf_log_err(cs, "Failed initializing SSL context");
                return -1;
        }
 

diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c b/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c
index 83d3e3877dd3715a0bf467db3d5d29e1b7e2134b..f2f9faea5cd8920cfc93e35b7371c849396bc881 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c
+++ b/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c
@@ -26,8 +26,6 @@
 RCSID("$Id$")
 USES_APPLE_DEPRECATED_API      /* OpenSSL API has been deprecated by Apple */
 
-#define LOG_PREFIX "eap - ttls"
-
 #include <freeradius-devel/eap/tls.h>
 #include "eap_ttls.h"
 
@@ -371,7 +369,7 @@ static int mod_instantiate(void *instance, CONF_SECTION *cs)
         */
        inst->tls_conf = eap_tls_conf_parse(cs, "tls");
        if (!inst->tls_conf) {
-               ERROR("Failed initializing SSL context");
+               cf_log_err(cs, "Failed initializing SSL context");
                return -1;
        }