Merge pull request #552 from mcnewton/v3.0.x

allocate-update should be allocate_update for dhcp_sqlippool
FreeRADIUS · Mar 18, 2014 · 9aae5b7 · 9aae5b7
2 parents e910535 + 0f546f3
commit 9aae5b7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/raddb/mods-config/sql/ippool-dhcp/mysql/queries.conf b/raddb/mods-config/sql/ippool-dhcp/mysql/queries.conf
@@ -55,7 +55,7 @@ pool_check = "SELECT id FROM ${ippool_table} \
 
 
 ## This is the final IP Allocation query, which saves the allocated ip details
-allocate-update = "UPDATE ${ippool_table} \
+allocate_update = "UPDATE ${ippool_table} \
  SET nasipaddress = '%{NAS-IP-Address}', pool_key = '${pool_key}', \
  callingstationid = '%{Calling-Station-Id}', username = '%{User-Name}', \
  expiry_time = NOW() + INTERVAL ${lease_duration} SECOND \

diff --git a/raddb/mods-config/sql/ippool-dhcp/oracle/queries.conf b/raddb/mods-config/sql/ippool-dhcp/oracle/queries.conf
@@ -36,7 +36,7 @@ allocate_find = "WITH POOLS AS (SELECT * FROM ${ippool_table} WHERE POOL_NAME =
 #pool_check = "SELECT ID FROM (SELECT ID FROM ${ippool_table} WHERE POOL_NAME = '%{control:Pool-Name}') WHERE ROWNUM = 1"
 
 
-## This query marks the IP address handed out by "allocate-find" as used
+## This query marks the IP address handed out by "allocate_find" as used
 ## for the period of "lease_duration" after which time it may be reused.
 allocate_update = "UPDATE ${ippool_table} SET NASIPADDRESS = '%{NAS-IP-Address}', POOL_KEY = '${pool_key}', CALLINGSTATIONID = '%{Calling-Station-Id}', USERNAME = '%{SQL-User-Name}', EXPIRY_TIME = CURRENT_TIMESTAMP + INTERVAL '${lease_duration}' SECOND(1) WHERE FRAMEDIPADDRESS = '%I'"