Renamed "check" to "control", to match "man unlang"

diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in
index 642cf7a..b24f872 100644 (file)
--- a/raddb/radiusd.conf.in
+++ b/raddb/radiusd.conf.in
@@ -1657,7 +1657,7 @@ $INCLUDE ${confdir}/eap.conf
                # timespan. Dynamic substitution is supported.
                #
                reply-message = "You are calling outside your allowed timespan\r\n"
-#              reply-message = "Outside allowed timespan (%{check:Login-Time}), %{User-Name}\r\n"
+#              reply-message = "Outside allowed timespan (%{control:Login-Time}), %{User-Name}\r\n"
 
                # The minimum timeout (in seconds) a user is allowed
                # to have. If the calculated timeout is lower we don't

diff --git a/raddb/sql/mysql-ippool-dialup.conf b/raddb/sql/mysql-ippool-dialup.conf
index b6c8385..6687639 100644 (file)
--- a/raddb/sql/mysql-ippool-dialup.conf
+++ b/raddb/sql/mysql-ippool-dialup.conf
@@ -19,7 +19,7 @@ allocate-clear = "UPDATE radippool \
 # ## The ORDER BY clause of this query tries to allocate the same IP-address
 # ## which user had last session...
 # allocate-find = "SELECT framedipaddress FROM ${ippool_table} \
-#  WHERE pool_name = '%{check:Pool-Name}' AND expiry_time < NOW() \
+#  WHERE pool_name = '%{control:Pool-Name}' AND expiry_time < NOW() \
 #  ORDER BY (username <> '%{User-Name}'), (callingstationid <> '%{Calling-Station-Id}'), \
 #  expiry_time \
 #  LIMIT 1 \
@@ -27,7 +27,7 @@ allocate-clear = "UPDATE radippool \
 
 ## If you prefer to allocate a random IP address every time, use this query instead
 allocate-find = "SELECT framedipaddress FROM ${ippool_table} \
- WHERE pool_name = '%{check:Pool-Name}' AND expiry_time = '0000-00-00 00:00:00' \
+ WHERE pool_name = '%{control:Pool-Name}' AND expiry_time = '0000-00-00 00:00:00' \
  ORDER BY RAND() \
  LIMIT 1 \
  FOR UPDATE"
@@ -38,7 +38,7 @@ allocate-find = "SELECT framedipaddress FROM ${ippool_table} \
 ## This allows the module to differentiate between a full pool and no pool
 ## Note: If you are not running redundant pool modules this query may be commented
 ## out to save running this query every time an ip is not allocated.
-pool-check = "SELECT id FROM ${ippool_table} WHERE pool_name='%{check:Pool-Name}' LIMIT 1"
+pool-check = "SELECT id FROM ${ippool_table} WHERE pool_name='%{control:Pool-Name}' LIMIT 1"
 
 
  

diff --git a/raddb/sql/postgresql-ippool-dialup.conf b/raddb/sql/postgresql-ippool-dialup.conf
index ed3fcbb..f8bac76 100644 (file)
--- a/raddb/sql/postgresql-ippool-dialup.conf
+++ b/raddb/sql/postgresql-ippool-dialup.conf
@@ -11,7 +11,7 @@
  ## The ORDER BY clause of this query tries to allocate the same IP-address
  ## which user had last session...
  allocate-find = "SELECT framedipaddress FROM ${ippool_table} \
-  WHERE pool_name = '%{check:Pool-Name}' AND expiry_time < 'now'::timestamp(0) \
+  WHERE pool_name = '%{control:Pool-Name}' AND expiry_time < 'now'::timestamp(0) \
   ORDER BY (username <> '%{SQL-User-Name}'), (callingstationid <> '%{Calling-Station-Id}'), expiry_time \
   LIMIT 1 \
   FOR UPDATE"
@@ -28,7 +28,7 @@
  ## This allows the module to differentiate between a full pool and no pool
  ## Note: If you are not running redundant pool modules this query may be commented
  ## out to save running this query every time an ip is not allocated.
- pool-check = "SELECT id FROM ${ippool_table} WHERE pool_name='%{check:Pool-Name}' LIMIT 1"
+ pool-check = "SELECT id FROM ${ippool_table} WHERE pool_name='%{control:Pool-Name}' LIMIT 1"
 
  
  allocate-update = "UPDATE ${ippool_table} \