Update the 'raddb/sites-available/dynamic-clients' to use 'map sql {.…

…..}'
FreeRADIUS · May 7, 2019 · e92ee12 · e92ee12
1 parent b02da60
commit e92ee12
Showing 1 changed file with 7 additions and 22 deletions.
diff --git a/raddb/sites-available/dynamic-clients b/raddb/sites-available/dynamic-clients
@@ -253,33 +253,18 @@ server dynamic_clients {
 		}
 
 		#
-		#  Example 3: Look the clients up in SQL.
+		#  Example 2: Look the clients up in SQL.
 		#
 		#  This requires the SQL module to be configured, of course.
 		#
-		#   @todo - use the new 'map' function to map the 'nastable' to the attributes
-		#
-		if ("%{sql: SELECT nasname FROM nas WHERE nasname = '%{Packet-Src-IP-Address}'}") {
-			update control {
-				#
-				#  Echo the IP.
-				&FreeRADIUS-Client-IP-Address = "%{Packet-Src-IP-Address}"
-
-				#
-				#  Do multiple SELECT statements to grab
-				#  the various definitions.
-				&FreeRADIUS-Client-Shortname = "%{sql: SELECT shortname FROM nas WHERE nasname = '%{Packet-Src-IP-Address}'}"
-
-				&FreeRADIUS-Client-Secret = "%{sql: SELECT secret FROM nas WHERE nasname = '%{Packet-Src-IP-Address}'}"
-
-				&FreeRADIUS-Client-NAS-Type = "%{sql: SELECT type FROM nas WHERE nasname = '%{Packet-Src-IP-Address}'}"
-
-				&FreeRADIUS-Client-Virtual-Server = "%{sql: SELECT server FROM nas WHERE nasname = '%{Packet-Src-IP-Address}'}"
-			}
-
+		map sql "SELECT nasname,shortname,secret,type,server FROM nas WHERE nasname = '%{Packet-Src-IP-Address}' LIMIT 1" {
+			&control:FreeRADIUS-Client-IP-Address := 'nasname'
+			&control:FreeRADIUS-Client-Shortname := 'shortname'
+			&control:FreeRADIUS-Client-Secret := 'secret'
+			&control:FreeRADIUS-Client-NAS-Type := 'type'
+			&control:FreeRADIUS-Client-Virtual-Server := 'server'
 		}
 
-
 		#
 		#  Example 3: Look the clients up in LDAP
 		#