summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFrancis Dupont <fdupont@isc.org>2016-11-28 13:34:33 +0100
committerTomek Mrugalski <tomasz@isc.org>2016-11-29 19:58:37 +0100
commit0fecb75a3ddfb9e614e1ec895fa6ed932d585eb1 (patch)
treea5dc4d84b842e8b3f08ee81e732cb6828bf21094 /src
parent[5014_phase2] Implemented string escape (but not unicode) cf ECMA 404 (diff)
downloadkea-0fecb75a3ddfb9e614e1ec895fa6ed932d585eb1.tar.xz
kea-0fecb75a3ddfb9e614e1ec895fa6ed932d585eb1.zip
[5014_phase2] Renamed Dhcp4 and DhcpDdns entries
Diffstat (limited to 'src')
-rw-r--r--src/bin/dhcp6/dhcp6_parser.yy8
1 files changed, 4 insertions, 4 deletions
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);