Remove deprecated methods of specifying clients from clients.conf

raddb/clients.conf

@@ -28,13 +28,25 @@
 #  format is still accepted.
 #
 client localhost {
-	#  Allowed values are:
-	#	dotted quad (1.2.3.4)
-	#	   hostname	(radius.example.com)
+	#  Only *one* of ipaddr, ipv4addr, ipv6addr may be specified for
+	#  a client.
+	#
+	#  ipaddr will accept IPv4 or IPv6 addresses with optional CIDR
+	#  notation '/<mask>' to specify ranges.
+	#
+	#  ipaddr will accept domain names e.g. example.org resolving
+	#  them via DNS.
+	#
+	#  If both A and AAAA records are found, A records will be
+	#  used in preference to AAAA.
 	ipaddr = 127.0.0.1
 
-	#  OR, you can use an IPv6 address, but not both
-	#  at the same time.
+	#  Same as ipaddr but allows v4 addresses only. Requires A
+	#  record for domain names.
+#	ipv4addr = *	# any.  127.0.0.1 == localhost
+
+	#  Same as ipaddr but allows v6 addresses only. Requires AAAA
+	#  record for domain names.
 #	ipv6addr = ::	# any.  ::1 == localhost
 
 	#
@@ -125,7 +137,7 @@ client localhost {
 	#  domain name, or the IP address.
 	#
 	#  It is accepted for compatibility with 1.x, but it is no
-	#  longer necessary in 2.0
+	#  longer necessary in >= 2.0
 	#
 #	shortname = localhost
 
@@ -180,7 +192,6 @@ client localhost {
 	#  see raddb/sites-available/originate-coa
 #	coa_server = coa
 
-
 	#
 	#  Response window for proxied packets.  If non-zero,
 	#  then the lower of (home, client) response_window
@@ -228,50 +239,35 @@ client localhost {
 }
 
 # IPv6 Client
-#client ::1 {
+#client localhost_ipv6 {
+#	ipv6addr	= ::1
 #	secret		= testing123
-#	shortname	= localhost
 #}
-#
+
 # All IPv6 Site-local clients
-#client fe80::/16 {
+#client sitelocal_ipv6 {
+#	ipv6addr	= fe80::/16
 #	secret		= testing123
-#	shortname	= localhost
 #}
 
-#client some.host.org {
+#client example.org {
+#	ipaddr		= radius.example.org
 #	secret		= testing123
-#	shortname	= localhost
 #}
 
 #
 #  You can now specify one secret for a network of clients.
 #  When a client request comes in, the BEST match is chosen.
 #  i.e. The entry from the smallest possible network.
 #
-#client 192.0.2.0/24 {
+#client private-network-1 {
+#	ipaddr		= 192.0.2.0/24
 #	secret		= testing123-1
-#	shortname	= private-network-1
 #}
-#
-#client 198.51.100.0/24 {
-#	secret		= testing123-2
-#	shortname	= private-network-2
-#}
-
-
-#client 203.0.113.1 {
-#	# secret and password are mapped through the "secrets" file.
-#	secret		= testing123
-#	shortname	= liv1
-#}
-
-# The following three fields are optional, but may be used by
-# checkrad.pl for simultaneous usage checks
 
-#	nas_type	= livingston
-#	login		= !root
-#	password	= someadminpas
+#client private-network-2 {
+#	ipaddr		= 198.51.100.0/24
+#	secret		= testing123-2
 #}
 
 #######################################################################
@@ -287,7 +283,8 @@ client localhost {
 #  will then accept ONLY the clients listed in this section.
 #
 #clients per_socket_clients {
-#	client 192.0.2.4 {
+#	client socket_client {
+#		ipaddr = 192.0.2.4
 #		secret = testing123
 #	}
 #}