From: Matthew Newton <mcn4@leicester.ac.uk>
Date: Thu, 27 Sep 2012 22:38:57 +0000 (+0100)
Subject: move User-Password warning from auth.c to rlm_pap
X-Git-Tag: release_3_0_0_beta1~1675^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cb1cb3cdeb5ff5e00a83dce069a43ce36958ea8;p=thirdparty%2Ffreeradius-server.git

move User-Password warning from auth.c to rlm_pap
---

diff --git a/src/main/auth.c b/src/main/auth.c
index 6124b6f1592..f1bfdd14446 100644
--- a/src/main/auth.c
+++ b/src/main/auth.c
@@ -215,17 +215,6 @@ static int rad_check_password(REQUEST *request)
 		return 0;
 	}
 
-	/*
-	 *	Sanity check and warn on existance of legacy
-	 *	User-Password control attribute.
-	 */
-	if (pairfind(request->config_items, PW_USER_PASSWORD, 0) != NULL) {
-		RDEBUG("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
-		RDEBUG("!!! Please update your configuration so that the \"known good\"               !!!");
-		RDEBUG("!!! clear text password is in Cleartext-Password, and not in User-Password. !!!");
-		RDEBUG("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
-	}
-
 	/*
 	 *	Check that Auth-Type has been set, and reject if not.
 	 *
diff --git a/src/modules/rlm_pap/rlm_pap.c b/src/modules/rlm_pap/rlm_pap.c
index cda4636c822..e793b6c8a78 100644
--- a/src/modules/rlm_pap/rlm_pap.c
+++ b/src/modules/rlm_pap/rlm_pap.c
@@ -546,6 +546,10 @@ static int pap_authenticate(void *instance, REQUEST *request)
 		for (vp = request->config_items; vp != NULL; vp = vp->next) {
 			switch (vp->attribute) {
 			case PW_USER_PASSWORD: /* deprecated */
+				RDEBUG("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+				RDEBUG("!!! Please update your configuration so that the \"known good\"               !!!");
+				RDEBUG("!!! clear text password is in Cleartext-Password, and not in User-Password. !!!");
+				RDEBUG("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
 			case PW_CLEARTEXT_PASSWORD: /* preferred */
 				goto do_clear;