Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
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
73f6a7dc
Commit
73f6a7dc
authored
Jul 23, 2017
by
Josh Soref
Browse files
spelling: return
parent
89083977
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/bin/keactrl/tests/keactrl_tests.sh.in
View file @
73f6a7dc
...
@@ -392,7 +392,7 @@ dhcp_ddns=no\nctrl_agent=no\nkea_verbose=no\n${keactrl_fixed_config}"
...
@@ -392,7 +392,7 @@ dhcp_ddns=no\nctrl_agent=no\nkea_verbose=no\n${keactrl_fixed_config}"
printf
"Starting Kea:
${
keactrl
}
start -c
${
KEACTRL_CFG_FILE
}
\n
"
printf
"Starting Kea:
${
keactrl
}
start -c
${
KEACTRL_CFG_FILE
}
\n
"
${
keactrl
}
start
-c
${
KEACTRL_CFG_FILE
}
${
keactrl
}
start
-c
${
KEACTRL_CFG_FILE
}
ret
=
${
?
}
ret
=
${
?
}
assert_eq 0
${
ret
}
"Expected keactrl to ret
r
un 0, returned value was
${
ret
}
"
assert_eq 0
${
ret
}
"Expected keactrl to retu
r
n 0, returned value was
${
ret
}
"
# Wait up to 20s for the DHCPv4 server to configure.
# Wait up to 20s for the DHCPv4 server to configure.
wait_for_message 20
"DHCP4_CONFIG_COMPLETE"
1
wait_for_message 20
"DHCP4_CONFIG_COMPLETE"
1
...
@@ -568,7 +568,7 @@ dhcp_ddns=no\nctrl_agent=no\nkea_verbose=no\n${keactrl_fixed_config}"
...
@@ -568,7 +568,7 @@ dhcp_ddns=no\nctrl_agent=no\nkea_verbose=no\n${keactrl_fixed_config}"
printf
"Starting Kea:
${
keactrl
}
start -c
${
KEACTRL_CFG_FILE
}
\n
"
printf
"Starting Kea:
${
keactrl
}
start -c
${
KEACTRL_CFG_FILE
}
\n
"
${
keactrl
}
start
-c
${
KEACTRL_CFG_FILE
}
${
keactrl
}
start
-c
${
KEACTRL_CFG_FILE
}
ret
=
${
?
}
ret
=
${
?
}
assert_eq 0
${
ret
}
"Expected keactrl to ret
r
un 0, returned value was
${
ret
}
"
assert_eq 0
${
ret
}
"Expected keactrl to retu
r
n 0, returned value was
${
ret
}
"
# Wait up to 20s for the DHCPv6 server to configure.
# Wait up to 20s for the DHCPv6 server to configure.
wait_for_message 20
"DHCP6_CONFIG_COMPLETE"
1
wait_for_message 20
"DHCP6_CONFIG_COMPLETE"
1
...
@@ -731,7 +731,7 @@ dhcp_ddns=no\nctrl_agent=yes\nkea_verbose=yes\n${keactrl_fixed_config}"
...
@@ -731,7 +731,7 @@ dhcp_ddns=no\nctrl_agent=yes\nkea_verbose=yes\n${keactrl_fixed_config}"
printf
"Starting Kea:
${
keactrl
}
start -c
${
KEACTRL_CFG_FILE
}
\n
"
printf
"Starting Kea:
${
keactrl
}
start -c
${
KEACTRL_CFG_FILE
}
\n
"
${
keactrl
}
start
-c
${
KEACTRL_CFG_FILE
}
${
keactrl
}
start
-c
${
KEACTRL_CFG_FILE
}
ret
=
${
?
}
ret
=
${
?
}
assert_eq 0
${
ret
}
"Expected keactrl to ret
r
un 0, returned value was
${
ret
}
"
assert_eq 0
${
ret
}
"Expected keactrl to retu
r
n 0, returned value was
${
ret
}
"
# Wait up to 20s for the DHCPv4 server to configure.
# Wait up to 20s for the DHCPv4 server to configure.
wait_for_message 20
"DHCP4_CONFIG_COMPLETE"
1
wait_for_message 20
"DHCP4_CONFIG_COMPLETE"
1
...
@@ -783,7 +783,7 @@ dhcp_ddns=yes\nctrl_agent=yes\nkea_verbose=no\n${keactrl_fixed_config}"
...
@@ -783,7 +783,7 @@ dhcp_ddns=yes\nctrl_agent=yes\nkea_verbose=no\n${keactrl_fixed_config}"
printf
"Starting Kea:
${
keactrl
}
start -c
${
KEACTRL_CFG_FILE
}
\n
"
printf
"Starting Kea:
${
keactrl
}
start -c
${
KEACTRL_CFG_FILE
}
\n
"
${
keactrl
}
start
-c
${
KEACTRL_CFG_FILE
}
${
keactrl
}
start
-c
${
KEACTRL_CFG_FILE
}
ret
=
${
?
}
ret
=
${
?
}
assert_eq 0
${
ret
}
"Expected keactrl to ret
r
un 0, returned value was
${
ret
}
"
assert_eq 0
${
ret
}
"Expected keactrl to retu
r
n 0, returned value was
${
ret
}
"
# Wait up to 20s for the DHCPv6 server to configure.
# Wait up to 20s for the DHCPv6 server to configure.
wait_for_message 20
"DHCP6_CONFIG_COMPLETE"
1
wait_for_message 20
"DHCP6_CONFIG_COMPLETE"
1
...
...
src/lib/dhcp/option_definition.cc
View file @
73f6a7dc
...
@@ -829,7 +829,7 @@ OptionDefinition::factorySpecialFormatOption(Option::Universe u,
...
@@ -829,7 +829,7 @@ OptionDefinition::factorySpecialFormatOption(Option::Universe u,
return
(
factoryIA6
(
getCode
(),
begin
,
end
));
return
(
factoryIA6
(
getCode
(),
begin
,
end
));
}
else
if
(
getCode
()
==
D6O_IAADDR
&&
haveIAAddr6Format
())
{
}
else
if
(
getCode
()
==
D6O_IAADDR
&&
haveIAAddr6Format
())
{
// Re
r
urn Option6IAAddr option instance for the IAADDR
// Re
t
urn Option6IAAddr option instance for the IAADDR
// option only for the same reasons as described in
// option only for the same reasons as described in
// for IA_NA and IA_PD above.
// for IA_NA and IA_PD above.
return
(
factoryIAAddr6
(
getCode
(),
begin
,
end
));
return
(
factoryIAAddr6
(
getCode
(),
begin
,
end
));
...
...
src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
View file @
73f6a7dc
...
@@ -520,7 +520,7 @@ public:
...
@@ -520,7 +520,7 @@ public:
/// and parse them.
/// and parse them.
/// @param config is the configuration string to parse
/// @param config is the configuration string to parse
///
///
/// @return retuns 0 if the configuration parsed successfully,
/// @return retu
r
ns 0 if the configuration parsed successfully,
/// non-zero otherwise failure.
/// non-zero otherwise failure.
int
parseConfiguration
(
const
std
::
string
&
config
,
bool
v6
=
false
)
{
int
parseConfiguration
(
const
std
::
string
&
config
,
bool
v6
=
false
)
{
int
rcode_
=
1
;
int
rcode_
=
1
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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