From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 10 Sep 2014 13:33:26 +0000 (-0400)
Subject: Order by callingstation-Id, too.  Fixes #786
X-Git-Tag: release_3_0_5~566
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8abb44f0d09be7f4714c8db98eaa921ea44973dc;p=thirdparty%2Ffreeradius-server.git

Order by callingstation-Id, too.  Fixes #786
---

diff --git a/raddb/mods-config/sql/ippool-dhcp/mysql/queries.conf b/raddb/mods-config/sql/ippool-dhcp/mysql/queries.conf
index 6cd3b6e5e5a..d4d390afc63 100644
--- a/raddb/mods-config/sql/ippool-dhcp/mysql/queries.conf
+++ b/raddb/mods-config/sql/ippool-dhcp/mysql/queries.conf
@@ -53,6 +53,7 @@ allocate_find = "\
 	WHERE pool_name = '%{control:Pool-Name}' \
 	AND (callingstationid = '%{Calling-Station-Id}' or callingstationid = '') \
 	ORDER BY \
+		(callingstationid <> '%{Calling-Station-Id}'), \
 		expiry_time \
 	LIMIT 1 \
 	FOR UPDATE"