move User-Password warning from auth.c to rlm_pap

diff --git a/src/main/auth.c b/src/main/auth.c
index 6124b6f1592167aecde67a65ae2560c0501a0164..f1bfdd14446457d39ebe1c6c93998cc999171d68 100644 (file)
--- 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 cda4636c8225812eca5dd36eca0ff73dd971dcbe..e793b6c8a7808639ea7994b16b817d1727d91614 100644 (file)
--- 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;