[737-remote-option-def4-get-all-return-incorrect-tag-when-option-definition-is-config...

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 bb823d539ee4303f21521101932a1ec211a07aea..c3bd66380d6fa6d00d45a2fb45e574d559e8f400 100644 (file)
--- 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