From 002e06a0a695b34f3fa7cde0dcd018779165ecb9 Mon Sep 17 00:00:00 2001
From: Nick Porter <nick@portercomputing.co.uk>
Date: Mon, 18 Aug 2025 15:41:29 +0100
Subject: [PATCH] Improve sample rlm_dpsk config

---
 raddb/mods-available/dpsk | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/raddb/mods-available/dpsk b/raddb/mods-available/dpsk
index b237ea9f8d..25c1f690a1 100644
--- a/raddb/mods-available/dpsk
+++ b/raddb/mods-available/dpsk
@@ -32,7 +32,7 @@
 #		rewrite_called_station_id
 #
 #		dpsk
-#		if (ok) {
+#		if (updated) {
 #			control.PSK-Identity := "bob"
 #			control.Pre-Shared-Key := "this-is-super-secret"
 #		}
@@ -48,13 +48,13 @@
 #  control,PSK-Identity and control.Pre-Shared-Key.  In general, it
 #  is easiest to just set PSK-Identity to be same as the User-Name.
 #
-#  Then update the "authenticate dpsk" section to list the "dpsk" module:
+#  Then create an "authenticate dpsk" section which calls the "dpsk" module:
 #
 #	authenticate dpsk {
 #		dpsk
 #		if (updated) {
-#			... cache &reply:Pre-Shared-Key
-#			... cache &reply:PSK-Identity
+#			... cache reply.Pre-Shared-Key
+#			... cache reply.PSK-Identity
 #		}
 #	}
 #
@@ -73,9 +73,10 @@
 #  * updated	if there are DPSK attributes which match a PSK, and the
 #		PSK was read from 'filename'.
 #
-#		It also updates the attributes &reply:Pre-Shared-Key
-#		with the found PSK, along with &reply:PSK-Identity
-#		with the found identity.
+#		It also updates the attributes reply.Pre-Shared-Key
+#		with the found PSK, along with reply.PSK-Identity
+#		with the found identity.  The attributes populated
+#		can be configured below.
 #
 #		You can then check the return code for "updated", and
 #		write those attributes into a database.  This step
@@ -240,7 +241,7 @@ dpsk {
 	#
 	#  Attribute containing the EAPoL key msg from the AP.
 	#
-	key_msg = FreeRADIUS-EV5.802_1X-EAPoL-Key-Msg
+#	key_msg = FreeRADIUS-EV5.802_1X-EAPoL-Key-Msg
 
 	#
 	#  username::
@@ -264,6 +265,8 @@ dpsk {
 	#
 	#  Attribute into which the matched pre shared key will be written.
 	#
+	#  When used with hostapd, this should be reply.Tunnel-Password
+	#
 #	pre_shared_key_attr = reply.Pre-Shared-Key
 
 	#
-- 
2.47.3