From: Francis Dupont <fdupont@isc.org>
Date: Mon, 28 Nov 2016 12:34:33 +0000 (+0100)
Subject: [5014_phase2] Renamed Dhcp4 and DhcpDdns entries
X-Git-Tag: trac5036_base2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0fecb75a3ddfb9e614e1ec895fa6ed932d585eb1;p=thirdparty%2Fkea.git

[5014_phase2] Renamed Dhcp4 and DhcpDdns entries
---

diff --git a/src/bin/dhcp6/dhcp6_parser.yy b/src/bin/dhcp6/dhcp6_parser.yy
index b0d1d1e1ae..7cff1b89d5 100644
--- a/src/bin/dhcp6/dhcp6_parser.yy
+++ b/src/bin/dhcp6/dhcp6_parser.yy
@@ -259,8 +259,8 @@ global_objects: global_object
 // This represents a single top level entry, e.g. Dhcp6 or DhcpDdns.
 global_object: dhcp6_object
              | logging_object
-	     | dhcp4_object
-	     | dhcpddns_object
+	     | dhcp4_json_object
+	     | dhcpddns_json_object
 	     | unknown_map_entry
              ;
 
@@ -1187,14 +1187,14 @@ qualifying_suffix: QUALIFYING_SUFFIX {
     ctx.leave();
 };
 
-dhcp4_object: DHCP4 {
+dhcp4_json_object: DHCP4 {
     ctx.enter(ctx.NO_KEYWORD);
 } COLON value {
     ctx.stack_.back()->set("Dhcp4", $4);
     ctx.leave();
 };
 
-dhcpddns_object: DHCPDDNS {
+dhcpddns_json_object: DHCPDDNS {
     ctx.enter(ctx.NO_KEYWORD);
 } COLON value {
     ctx.stack_.back()->set("DhcpDdns", $4);