Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
Kea
Commits
a20ee8b1
Commit
a20ee8b1
authored
Mar 04, 2017
by
Francis Dupont
Browse files
[5145b] Removed unused allow-client-update
parent
cf8d1122
Changes
10
Hide whitespace changes
Inline
Side-by-side
src/bin/dhcp4/dhcp4_lexer.ll
View file @
a20ee8b1
...
...
@@ -1018,15 +1018,6 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence}
}
}
\"
allow-client-update\
" {
switch(driver.ctx_) {
case isc::dhcp::Parser4Context::DHCP_DDNS:
return isc::dhcp::Dhcp4Parser::make_ALLOW_CLIENT_UPDATE(driver.loc_);
default:
return isc::dhcp::Dhcp4Parser::make_STRING("
allow-client-update
", driver.loc_);
}
}
\"
override-no-update\
" {
switch(driver.ctx_) {
case isc::dhcp::Parser4Context::DHCP_DDNS:
...
...
src/bin/dhcp4/dhcp4_parser.yy
View file @
a20ee8b1
...
...
@@ -155,7 +155,6 @@ using namespace std;
NCR_PROTOCOL "ncr-protocol"
NCR_FORMAT "ncr-format"
ALWAYS_INCLUDE_FQDN "always-include-fqdn"
ALLOW_CLIENT_UPDATE "allow-client-update"
OVERRIDE_NO_UPDATE "override-no-update"
OVERRIDE_CLIENT_UPDATE "override-client-update"
REPLACE_CLIENT_NAME "replace-client-name"
...
...
@@ -1487,7 +1486,6 @@ dhcp_ddns_param: enable_updates
| ncr_protocol
| ncr_format
| always_include_fqdn
| allow_client_update
| override_no_update
| override_client_update
| replace_client_name
...
...
@@ -1564,11 +1562,6 @@ always_include_fqdn: ALWAYS_INCLUDE_FQDN COLON BOOLEAN {
ctx.stack_.back()->set("always-include-fqdn", b);
};
allow_client_update: ALLOW_CLIENT_UPDATE COLON BOOLEAN {
ElementPtr b(new BoolElement($3, ctx.loc2pos(@3)));
ctx.stack_.back()->set("allow-client-update", b);
};
override_no_update: OVERRIDE_NO_UPDATE COLON BOOLEAN {
ElementPtr b(new BoolElement($3, ctx.loc2pos(@3)));
ctx.stack_.back()->set("override-no-update", b);
...
...
src/bin/dhcp4/tests/config_parser_unittest.cc
View file @
a20ee8b1
...
...
@@ -3414,7 +3414,6 @@ TEST_F(Dhcp4ParserTest, d2ClientConfig) {
"
\"
ncr-protocol
\"
:
\"
UDP
\"
, "
"
\"
ncr-format
\"
:
\"
JSON
\"
, "
"
\"
always-include-fqdn
\"
: true, "
"
\"
allow-client-update
\"
: true, "
"
\"
override-no-update
\"
: true, "
"
\"
override-client-update
\"
: true, "
"
\"
replace-client-name
\"
:
\"
when-present
\"
, "
...
...
@@ -3476,7 +3475,6 @@ TEST_F(Dhcp4ParserTest, invalidD2ClientConfig) {
"
\"
ncr-protocol
\"
:
\"
UDP
\"
, "
"
\"
ncr-format
\"
:
\"
JSON
\"
, "
"
\"
always-include-fqdn
\"
: true, "
"
\"
allow-client-update
\"
: true, "
"
\"
override-no-update
\"
: true, "
"
\"
override-client-update
\"
: true, "
"
\"
replace-client-name
\"
:
\"
when-present
\"
, "
...
...
src/bin/dhcp4/tests/d2_unittest.cc
View file @
a20ee8b1
...
...
@@ -109,7 +109,6 @@ Dhcp4SrvD2Test::configureD2(bool enable_d2, const bool exp_result,
"
\"
ncr-protocol
\"
:
\"
UDP
\"
, "
"
\"
ncr-format
\"
:
\"
JSON
\"
, "
"
\"
always-include-fqdn
\"
: true, "
"
\"
allow-client-update
\"
: true, "
"
\"
override-no-update
\"
: true, "
"
\"
override-client-update
\"
: true, "
"
\"
replace-client-name
\"
:
\"
when-present
\"
, "
...
...
src/bin/dhcp6/dhcp6_lexer.ll
View file @
a20ee8b1
...
...
@@ -263,15 +263,6 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence}
}
}
\"
allow-client-update\
" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::DHCP_DDNS:
return isc::dhcp::Dhcp6Parser::make_ALLOW_CLIENT_UPDATE(driver.loc_);
default:
return isc::dhcp::Dhcp6Parser::make_STRING("
allow-client-update
", driver.loc_);
}
}
\"
override-no-update\
" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::DHCP_DDNS:
...
...
src/bin/dhcp6/dhcp6_parser.yy
View file @
a20ee8b1
...
...
@@ -161,7 +161,6 @@ using namespace std;
NCR_PROTOCOL "ncr-protocol"
NCR_FORMAT "ncr-format"
ALWAYS_INCLUDE_FQDN "always-include-fqdn"
ALLOW_CLIENT_UPDATE "allow-client-update"
OVERRIDE_NO_UPDATE "override-no-update"
OVERRIDE_CLIENT_UPDATE "override-client-update"
REPLACE_CLIENT_NAME "replace-client-name"
...
...
@@ -1575,7 +1574,6 @@ dhcp_ddns_param: enable_updates
| ncr_protocol
| ncr_format
| always_include_fqdn
| allow_client_update
| override_no_update
| override_client_update
| replace_client_name
...
...
@@ -1652,11 +1650,6 @@ always_include_fqdn: ALWAYS_INCLUDE_FQDN COLON BOOLEAN {
ctx.stack_.back()->set("always-include-fqdn", b);
};
allow_client_update: ALLOW_CLIENT_UPDATE COLON BOOLEAN {
ElementPtr b(new BoolElement($3, ctx.loc2pos(@3)));
ctx.stack_.back()->set("allow-client-update", b);
};
override_no_update: OVERRIDE_NO_UPDATE COLON BOOLEAN {
ElementPtr b(new BoolElement($3, ctx.loc2pos(@3)));
ctx.stack_.back()->set("override-no-update", b);
...
...
src/bin/dhcp6/tests/config_parser_unittest.cc
View file @
a20ee8b1
...
...
@@ -3954,7 +3954,6 @@ TEST_F(Dhcp6ParserTest, d2ClientConfig) {
"
\"
ncr-protocol
\"
:
\"
UDP
\"
, "
"
\"
ncr-format
\"
:
\"
JSON
\"
, "
"
\"
always-include-fqdn
\"
: true, "
"
\"
allow-client-update
\"
: true, "
"
\"
override-no-update
\"
: true, "
"
\"
override-client-update
\"
: true, "
"
\"
replace-client-name
\"
:
\"
when-present
\"
, "
...
...
@@ -4015,7 +4014,6 @@ TEST_F(Dhcp6ParserTest, invalidD2ClientConfig) {
"
\"
ncr-protocol
\"
:
\"
UDP
\"
, "
"
\"
ncr-format
\"
:
\"
JSON
\"
, "
"
\"
always-include-fqdn
\"
: true, "
"
\"
allow-client-update
\"
: true, "
"
\"
override-no-update
\"
: true, "
"
\"
override-client-update
\"
: true, "
"
\"
replace-client-name
\"
:
\"
when-present
\"
, "
...
...
src/bin/dhcp6/tests/d2_unittest.cc
View file @
a20ee8b1
...
...
@@ -114,7 +114,6 @@ Dhcp6SrvD2Test::configureD2(bool enable_d2, const bool exp_result,
"
\"
ncr-protocol
\"
:
\"
UDP
\"
, "
"
\"
ncr-format
\"
:
\"
JSON
\"
, "
"
\"
always-include-fqdn
\"
: true, "
"
\"
allow-client-update
\"
: true, "
"
\"
override-no-update
\"
: true, "
"
\"
override-client-update
\"
: true, "
"
\"
replace-client-name
\"
:
\"
when-present
\"
, "
...
...
src/lib/dhcpsrv/parsers/dhcp_parsers.cc
View file @
a20ee8b1
...
...
@@ -1028,8 +1028,6 @@ D2ClientConfigParser::parse(isc::data::ConstElementPtr client_config) {
bool
always_include_fqdn
=
getBoolean
(
client_config
,
"always-include-fqdn"
);
// bool allow_client_update; (unused)
bool
override_no_update
=
getBoolean
(
client_config
,
"override-no-update"
);
...
...
src/lib/dhcpsrv/parsers/dhcp_parsers.h
View file @
a20ee8b1
...
...
@@ -753,7 +753,6 @@ public:
/// -# ncr-protocol
/// -# ncr-format
/// -# always-include-fqdn
/// -# allow-client-update
/// -# override-no-update
/// -# override-client-update
/// -# replace-client-name
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment