Remove RAUTH macro calls

diff --git a/src/lib/tls/validate.c b/src/lib/tls/validate.c
index 8c2f56576a40614371ca4fbec173abf717abdced..a22cb2c0f7b5191bbccfa43d2be20b39073ea338 100644 (file)
--- a/src/lib/tls/validate.c
+++ b/src/lib/tls/validate.c
@@ -239,8 +239,8 @@ int tls_validate_cert_cb(int ok, X509_STORE_CTX *x509_ctx)
         *      verification if they don't match.
         */
        if (conf->check_cert_issuer && (strcmp(issuer, conf->check_cert_issuer) != 0)) {
-               AUTH("Certificate issuer (%s) does not match specified value (%s)!",
-                    issuer, conf->check_cert_issuer);
+               REDEBUG("Certificate issuer (%s) does not match specified value (%s)!",
+                       issuer, conf->check_cert_issuer);
                my_ok = 0;
        }
 
@@ -258,8 +258,8 @@ int tls_validate_cert_cb(int ok, X509_STORE_CTX *x509_ctx)
                } else {
                        RDEBUG2("checking certificate CN (%s) with xlat'ed value (%s)", common_name, cn_str);
                        if (strcmp(cn_str, common_name) != 0) {
-                               AUTH("Certificate CN (%s) does not match specified value (%s)!",
-                                    common_name, cn_str);
+                               REDEBUG("Certificate CN (%s) does not match specified value (%s)!",
+                                       common_name, cn_str);
                                my_ok = 0;
                        }
                }

diff --git a/src/modules/rlm_digest/rlm_digest.c b/src/modules/rlm_digest/rlm_digest.c
index 8fa69bb76de5c620e2c39b95523212bd2c0b36ee..0d383e58be954bb6caff8606007fadb2ccb92dc2 100644 (file)
--- a/src/modules/rlm_digest/rlm_digest.c
+++ b/src/modules/rlm_digest/rlm_digest.c
@@ -237,14 +237,14 @@ static rlm_rcode_t CC_HINT(nonnull) mod_authenticate(UNUSED void *instance, UNUS
        passwd = fr_pair_find_by_da(request->control, attr_digest_ha1, TAG_ANY);
        if (passwd) {
                if (passwd->vp_length != 32) {
-                       RAUTH("Digest-HA1 has invalid length, authentication failed");
+                       REDEBUG("Digest-HA1 has invalid length, authentication failed");
                        return RLM_MODULE_INVALID;
                }
        } else {
                passwd = fr_pair_find_by_da(request->control, attr_cleartext_password, TAG_ANY);
        }
        if (!passwd) {
-               RAUTH("Cleartext-Password or Digest-HA1 is required for authentication");
+               REDEBUG("Cleartext-Password or Digest-HA1 is required for authentication");
                return RLM_MODULE_INVALID;
        }
 

diff --git a/src/modules/rlm_pam/rlm_pam.c b/src/modules/rlm_pam/rlm_pam.c
index 919e6875ff008aacedf390091de0f5c6023f5b26..52513e09bddce7812763a5915591606f4e585aac 100644 (file)
--- a/src/modules/rlm_pam/rlm_pam.c
+++ b/src/modules/rlm_pam/rlm_pam.c
@@ -222,7 +222,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_authenticate(void *instance, UNUSED void
         *      a User-Name attribute.
         */
        if (!request->username) {
-               RAUTH("Attribute \"User-Name\" is required for authentication");
+               REDEBUG("Attribute \"User-Name\" is required for authentication");
                return RLM_MODULE_INVALID;
        }
 
@@ -231,7 +231,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_authenticate(void *instance, UNUSED void
         *      a User-Password attribute.
         */
        if (!request->password) {
-               RAUTH("Attribute \"User-Password\" is required for authentication");
+               REDEBUG("Attribute \"User-Password\" is required for authentication");
                return RLM_MODULE_INVALID;
        }
 
@@ -240,8 +240,8 @@ static rlm_rcode_t CC_HINT(nonnull) mod_authenticate(void *instance, UNUSED void
         *  and not anything else.
         */
        if (request->password->da != attr_user_password) {
-               RAUTH("Attribute \"%s\" is required for authentication.  Cannot use \"%s\".",
-                     attr_user_password->name, request->password->da->name);
+               REDEBUG("Attribute \"%s\" is required for authentication.  Cannot use \"%s\".",
+                       attr_user_password->name, request->password->da->name);
                return RLM_MODULE_INVALID;
        }
 

diff --git a/src/modules/rlm_test/rlm_test.c b/src/modules/rlm_test/rlm_test.c
index e2065b49bb0ee7e48784a7de03f1788462df4378..e64f7060159f79131b44f30e48ef5c9e390b6939 100644 (file)
--- a/src/modules/rlm_test/rlm_test.c
+++ b/src/modules/rlm_test/rlm_test.c
@@ -270,10 +270,6 @@ static rlm_rcode_t CC_HINT(nonnull) mod_authorize(UNUSED void *instance, void *t
        RWDEBUG("RWDEBUG message");
        RWDEBUG("RWDEBUG2 message");
 
-       RAUTH("RAUTH message");
-       RACCT("RACCT message");
-       RPROXY("RPROXY message");
-
        /*
         *       Should appear wavy
         */

diff --git a/src/modules/rlm_unix/rlm_unix.c b/src/modules/rlm_unix/rlm_unix.c
index 4b7aef537e8a762e6389653b4bb4197ffce6b628..a8f775b146a9aad7414b52c8e90aabcbae7412b9 100644 (file)
--- a/src/modules/rlm_unix/rlm_unix.c
+++ b/src/modules/rlm_unix/rlm_unix.c
@@ -253,8 +253,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_authorize(void *instance, UNUSED void *t
        }
        endusershell();
        if (!shell) {
-               RAUTH("[%s]: invalid shell [%s]",
-                      name, pwd->pw_shell);
+               REDEBUG("[%s]: invalid shell [%s]", name, pwd->pw_shell);
                return RLM_MODULE_REJECT;
        }
 #endif
@@ -265,7 +264,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_authorize(void *instance, UNUSED void *t
         */
        if (spwd && spwd->sp_lstchg > 0 && spwd->sp_max >= 0 &&
            (request->packet->timestamp.tv_sec / 86400) > (spwd->sp_lstchg + spwd->sp_max)) {
-               RAUTH("[%s]: password has expired", name);
+               REDEBUG("[%s]: password has expired", name);
                return RLM_MODULE_REJECT;
        }
        /*
@@ -273,7 +272,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_authorize(void *instance, UNUSED void *t
         */
        if (spwd && spwd->sp_expire > 0 &&
            (request->packet->timestamp.tv_sec / 86400) > spwd->sp_expire) {
-               RAUTH("[%s]: account has expired", name);
+               REDEBUG("[%s]: account has expired", name);
                return RLM_MODULE_REJECT;
        }
 #endif
@@ -284,7 +283,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_authorize(void *instance, UNUSED void *t
         */
        if ((pwd->pw_expire > 0) &&
            (request->packet->timestamp.tv_sec > pwd->pw_expire)) {
-               RAUTH("[%s]: password has expired", name);
+               REDEBUG("[%s]: password has expired", name);
                return RLM_MODULE_REJECT;
        }
 #endif