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 6cd3b6e5e5a436d5c05a6ac422acbeb151e20dd7..d4d390afc633cf220ba00f796bb5d6ac453e0c49 100644 (file)
--- 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"