From: Francis Dupont <fdupont@isc.org>
Date: Tue, 16 Jul 2019 22:45:53 +0000 (+0200)
Subject: [737-remote-option-def4-get-all-return-incorrect-tag-when-option-definition-is-config... 
X-Git-Tag: Kea-1.6.0-beta2~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cc95ae2a66102427e583b4924383fd414e24f0f;p=thirdparty%2Fkea.git

[737-remote-option-def4-get-all-return-incorrect-tag-when-option-definition-is-configured-with-all] Fixed option def get all query
---

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