No need for tacacs_pap policy now rlm_pap uses call_env

diff --git a/raddb/policy.d/tacacs b/raddb/policy.d/tacacs
index c351c2fefea5f2f0ef6c024bf4f3a1b9c2538282..8df884135214ca202e4e3f6ba9dad43e2f6c2c1c 100644 (file)
--- a/raddb/policy.d/tacacs
+++ b/raddb/policy.d/tacacs
@@ -10,19 +10,6 @@ tacacs_set_authentication_status {
        }
 }
 
-tacacs_pap {
-       subrequest RADIUS.Access-Request {
-               &request.User-Name := &parent.request.User-Name
-               &request.User-Password := &parent.request.User-Password
-               &control.Password.Cleartext := &parent.control.Password.Cleartext
-
-               pap.authorize
-               pap.authenticate
-       }
-
-       tacacs_set_authentication_status
-}
-
 tacacs_chap {
        subrequest RADIUS.Access-Request {
                &request.User-Name := &parent.request.User-Name
@@ -67,4 +54,4 @@ tacacs_mschap {
        }
 
        tacacs_set_authentication_status
-}
\ No newline at end of file
+}

diff --git a/raddb/sites-available/tacacs b/raddb/sites-available/tacacs
index a055d4808d4c61e62c16f8c3d5ce414b73ac8cfd..8a84d734cf5e81a8b018cac216e7304acd17efb5 100644 (file)
--- a/raddb/sites-available/tacacs
+++ b/raddb/sites-available/tacacs
@@ -297,7 +297,7 @@ server tacacs {
        }
 
        authenticate PAP {
-               tacacs_pap
+               pap
        }
 
        authenticate CHAP {