From 1cc95ae2a66102427e583b4924383fd414e24f0f Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Wed, 17 Jul 2019 00:45:53 +0200 Subject: [PATCH] [737-remote-option-def4-get-all-return-incorrect-tag-when-option-definition-is-configured-with-all] Fixed option def get all query --- src/hooks/dhcp/mysql_cb/mysql_query_macros_dhcp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hooks/dhcp/mysql_cb/mysql_query_macros_dhcp.h b/src/hooks/dhcp/mysql_cb/mysql_query_macros_dhcp.h index bb823d539e..c3bd66380d 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_query_macros_dhcp.h +++ b/src/hooks/dhcp/mysql_cb/mysql_query_macros_dhcp.h @@ -413,7 +413,7 @@ namespace { "INNER JOIN " #table_prefix "_option_def_server AS a" \ " ON d.id = a.option_def_id " \ "INNER JOIN " #table_prefix "_server AS s " \ - " ON (a.server_id = s.id) OR (a.server_id = 1) " \ + " ON a.server_id = s.id " \ "WHERE (s.tag = ? OR s.id = 1) " #__VA_ARGS__ \ " ORDER BY d.id" #endif