mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 14:05:33 +00:00
Code Issues Releases Wiki Activity

[5495] Checkpoint - doc/test to do

Browse Source
This commit is contained in:
Francis Dupont
2018-01-02 03:51:08 +01:00
parent 762f2f075f
commit 78229eda2d
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/agent/agent_parser.cc
View File

@@ -889,7 +889,7 @@ namespace isc { namespace agent {
case 56:
#line 294 "agent_parser.yy" // lalr1.cc:859
{
ctx.enter(ctx.NO_KEYWORD);
ctx.enter(ctx.NO_KEYWORDS);
}
#line 895 "agent_parser.cc" // lalr1.cc:859
break;
@@ -924,7 +924,7 @@ namespace isc { namespace agent {
case 58:
#line 319 "agent_parser.yy" // lalr1.cc:859
{
ctx.enter(ctx.NO_KEYWORD);
ctx.enter(ctx.NO_KEYWORDS);
}
#line 930 "agent_parser.cc" // lalr1.cc:859
break;

4
src/bin/agent/agent_parser.yy
View File

@@ -292,7 +292,7 @@ http_port: HTTP_PORT COLON INTEGER {
};
user_context: USER_CONTEXT {
ctx.enter(ctx.NO_KEYWORD);
ctx.enter(ctx.NO_KEYWORDS);
} COLON map_value {
ElementPtr parent = ctx.stack_.back();
ElementPtr user_context = $4;
@@ -317,7 +317,7 @@ user_context: USER_CONTEXT {
};
comment: COMMENT {
ctx.enter(ctx.NO_KEYWORD);
ctx.enter(ctx.NO_KEYWORDS);
} COLON STRING {
ElementPtr parent = ctx.stack_.back();
ElementPtr user_context(new MapElement(ctx.loc2pos(@1)));

6
src/bin/d2/tests/testdata/d2_cfg_tests.json vendored
View File

@@ -1,4 +1,4 @@
# Copyright (C) 2014-2015,2017 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2014-2018 Internet Systems Consortium, Inc. ("ISC")
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -839,7 +839,7 @@
#----- D2.forward-ddns.dhcp-ddns.name tests
,{
"description" : "D2.forward-ddns.dhcp-ddns, empty domain",
"syntax-error" : "<string>:1.42: syntax error, unexpected }, expecting key-name or dns-servers or name or constant string",
"syntax-error" : "<string>:1.42: syntax error, unexpected }",
"data" :
{
"forward-ddns" :
@@ -1233,7 +1233,7 @@
#----- D2.reverse-ddns.dhcp-ddns.name tests
,{
"description" : "D2.reverse-ddns.dhcp-ddns, no name",
"syntax-error" : "<string>:1.64: syntax error, unexpected }, expecting key-name or dns-servers or name or constant string",
"syntax-error" : "<string>:1.64: syntax error, unexpected }",
"data" :
{
"forward-ddns" : {},