From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 1 Feb 2019 13:48:10 +0000 (+0800)
Subject: Remove RAUTH macro calls
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efe41261a3f4523921ebcca8a296462bf5b8cdda;p=thirdparty%2Ffreeradius-server.git

Remove RAUTH macro calls
---

diff --git a/src/lib/tls/validate.c b/src/lib/tls/validate.c
index 8c2f56576a4..a22cb2c0f7b 100644
--- 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 8fa69bb76de..0d383e58be9 100644
--- 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 919e6875ff0..52513e09bdd 100644
--- 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 e2065b49bb0..e64f7060159 100644
--- 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 4b7aef537e8..a8f775b146a 100644
--- 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