From: Tomek Mrugalski <tomasz@isc.org>
Date: Fri, 8 Sep 2017 21:31:31 +0000 (+0200)
Subject: [5357] empty shared-networks is now allowed
X-Git-Tag: trac5073a_base~9^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7acfea804ba3b61f2e4397a214abc1f8fad1227f;p=thirdparty%2Fkea.git

[5357] empty shared-networks is now allowed
---

diff --git a/src/bin/dhcp4/dhcp4_parser.yy b/src/bin/dhcp4/dhcp4_parser.yy
index b120a70b4f..0d98b0db31 100644
--- a/src/bin/dhcp4/dhcp4_parser.yy
+++ b/src/bin/dhcp4/dhcp4_parser.yy
@@ -965,11 +965,17 @@ shared_networks: SHARED_NETWORKS {
     ctx.stack_.back()->set("shared-networks", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.SHARED_NETWORK);
-} COLON LSQUARE_BRACKET shared_networks_list RSQUARE_BRACKET {
+} COLON LSQUARE_BRACKET shared_networks_content RSQUARE_BRACKET {
     ctx.stack_.pop_back();
     ctx.leave();
 };
 
+// This allows 0 or more shared network definitions.
+shared_networks_content: %empty
+                       | shared_networks_list
+                       ;
+
+// This allows 1 or more shared network definitions.
 shared_networks_list: shared_network
                     | shared_networks_list COMMA shared_network
                     ;
diff --git a/src/bin/dhcp6/dhcp6_parser.yy b/src/bin/dhcp6/dhcp6_parser.yy
index d5404c8ccc..cdf3870e6c 100644
--- a/src/bin/dhcp6/dhcp6_parser.yy
+++ b/src/bin/dhcp6/dhcp6_parser.yy
@@ -952,11 +952,17 @@ shared_networks: SHARED_NETWORKS {
     ctx.stack_.back()->set("shared-networks", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.SHARED_NETWORK);
-} COLON LSQUARE_BRACKET shared_networks_list RSQUARE_BRACKET {
+} COLON LSQUARE_BRACKET shared_networks_content RSQUARE_BRACKET {
     ctx.stack_.pop_back();
     ctx.leave();
 };
 
+// This allows 0 or more shared network definitions.
+shared_networks_content: %empty
+                    | shared_networks_list
+                    ;
+
+// This allows 1 or more shared network definitions.
 shared_networks_list: shared_network
                     | shared_networks_list COMMA shared_network
                     ;