From 4a05f942fb5ebb88e638b9c721615b2a47d648d5 Mon Sep 17 00:00:00 2001
From: "Alan T. DeKok" <aland@freeradius.org>
Date: Sat, 1 Sep 2018 08:57:44 -0400
Subject: [PATCH] don't complain about PAP if Auth-Type is already set

---
 src/modules/rlm_pap/rlm_pap.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/modules/rlm_pap/rlm_pap.c b/src/modules/rlm_pap/rlm_pap.c
index dff2e86bbda4..576925ccbff5 100644
--- a/src/modules/rlm_pap/rlm_pap.c
+++ b/src/modules/rlm_pap/rlm_pap.c
@@ -492,6 +492,11 @@ static rlm_rcode_t CC_HINT(nonnull) mod_authorize(void *instance, REQUEST *reque
 			return RLM_MODULE_NOOP;
 		}
 
+		if (auth_type) {
+			DEBUG("Not doing PAP as Auth-Type is already set.");
+			return RLM_MODULE_NOOP;
+		}
+
 		RWDEBUG("No \"known good\" password found for the user.  Not setting Auth-Type");
 		RWDEBUG("Authentication will fail unless a \"known good\" password is available");
 		return RLM_MODULE_NOOP;