BIND 10 trac2313, updated. b3a9b362643eddb59ef78ff392cf091d0c199163 [2313] Trivial: updates to some comments as a result of the second review.
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Jan 8 16:27:02 UTC 2013
The branch, trac2313 has been updated
via b3a9b362643eddb59ef78ff392cf091d0c199163 (commit)
from f8ad67f7166f71b5f78721cc2d7df85c2a859bbc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b3a9b362643eddb59ef78ff392cf091d0c199163
Author: Marcin Siodelski <marcin at isc.org>
Date: Tue Jan 8 17:26:42 2013 +0100
[2313] Trivial: updates to some comments as a result of the second review.
-----------------------------------------------------------------------
Summary of changes:
src/lib/dhcpsrv/option_space.cc | 6 +++---
src/lib/dhcpsrv/tests/option_space_unittest.cc | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/dhcpsrv/option_space.cc b/src/lib/dhcpsrv/option_space.cc
index c244268..6036e54 100644
--- a/src/lib/dhcpsrv/option_space.cc
+++ b/src/lib/dhcpsrv/option_space.cc
@@ -34,14 +34,14 @@ OptionSpace::validateName(const std::string& name) {
using namespace boost::algorithm;
// Allowed characters are: lower or upper case letters, digits,
- // underscores and dashes. Empty option spaces are not allowed.
+ // underscores and hyphens. Empty option spaces are not allowed.
if (all(name, boost::is_from_range('a', 'z') ||
boost::is_from_range('A', 'Z') ||
boost::is_digit() ||
boost::is_any_of("-_")) &&
!name.empty() &&
- // Hyphens are not allowed at the beginning and at
- // the end of the option space name.
+ // Hyphens and underscores are not allowed at the beginning
+ // and at the end of the option space name.
!all(find_head(name, 1), boost::is_any_of("-_")) &&
!all(find_tail(name, 1), boost::is_any_of("-_"))) {
return (true);
diff --git a/src/lib/dhcpsrv/tests/option_space_unittest.cc b/src/lib/dhcpsrv/tests/option_space_unittest.cc
index 9ee6fca..f8d75c8 100644
--- a/src/lib/dhcpsrv/tests/option_space_unittest.cc
+++ b/src/lib/dhcpsrv/tests/option_space_unittest.cc
@@ -77,8 +77,8 @@ TEST(OptionSpaceTest, validateName) {
EXPECT_FALSE(OptionSpace::validateName(" isc"));
EXPECT_FALSE(OptionSpace::validateName("isc with-space"));
- // Hyphens are not allowed at the beginning and at the end
- // of the option space name.
+ // Hyphens and underscores are not allowed at the beginning
+ // and at the end of the option space name.
EXPECT_FALSE(OptionSpace::validateName("-isc"));
EXPECT_FALSE(OptionSpace::validateName("isc-"));
EXPECT_FALSE(OptionSpace::validateName("_isc"));
More information about the bind10-changes
mailing list