summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThomas Markwalder <tmark@isc.org>2019-08-15 16:39:12 +0200
committerThomas Markwalder <tmark@isc.org>2019-08-17 00:35:39 +0200
commit9705445210cf2a5c4bbe86fde4ce010c45b7aac1 (patch)
treee36ce0cf7a40bb3827aa125b4084d153346ab76f /src
parent[#805,!6-p] added kea-dhcp6 to ChangeLog entry (diff)
downloadkea-9705445210cf2a5c4bbe86fde4ce010c45b7aac1.tar.xz
kea-9705445210cf2a5c4bbe86fde4ce010c45b7aac1.zip
[#805,!6-p] Fixed copyright dates and whitespacing
Diffstat (limited to 'src')
-rw-r--r--src/bin/lfc/tests/lfc_controller_unittests.cc2
-rw-r--r--src/lib/dhcpsrv/csv_lease_file4.h2
-rw-r--r--src/lib/dhcpsrv/tests/csv_lease_file4_unittest.cc4
-rw-r--r--src/lib/dhcpsrv/tests/csv_lease_file6_unittest.cc2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/bin/lfc/tests/lfc_controller_unittests.cc b/src/bin/lfc/tests/lfc_controller_unittests.cc
index ccd6fc77da..69b596fee2 100644
--- a/src/bin/lfc/tests/lfc_controller_unittests.cc
+++ b/src/bin/lfc/tests/lfc_controller_unittests.cc
@@ -411,7 +411,7 @@ TEST_F(LFCControllerTest, launch4) {
string b_3 = "192.0.3.15,dd:de:ba:0d:1b:2e:3e:4f,0a:00:01:04,"
"100,150,7,0,0,,1,\n";
- // This one should be invalid, no hardware address or client id
+ // This one should be invalid, no hardware address or client id
// and state is not declined
string c_1 = "192.0.2.3,,,"
"200,200,8,1,1,host.example.com,0,\n";
diff --git a/src/lib/dhcpsrv/csv_lease_file4.h b/src/lib/dhcpsrv/csv_lease_file4.h
index 7f6b17f88f..67df846536 100644
--- a/src/lib/dhcpsrv/csv_lease_file4.h
+++ b/src/lib/dhcpsrv/csv_lease_file4.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2019 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
diff --git a/src/lib/dhcpsrv/tests/csv_lease_file4_unittest.cc b/src/lib/dhcpsrv/tests/csv_lease_file4_unittest.cc
index fe5b668a1b..9346a0b775 100644
--- a/src/lib/dhcpsrv/tests/csv_lease_file4_unittest.cc
+++ b/src/lib/dhcpsrv/tests/csv_lease_file4_unittest.cc
@@ -150,7 +150,7 @@ TEST_F(CSVLeaseFile4Test, parse) {
EXPECT_FALSE(lease->getContext());
}
- // Second lease is malformed - has no HW address or client id and state
+ // Second lease is malformed - has no HW address or client id and state
// is not declined.
{
SCOPED_TRACE("Second lease malformed");
@@ -209,7 +209,7 @@ TEST_F(CSVLeaseFile4Test, parse) {
ASSERT_TRUE(lease->hwaddr_);
EXPECT_TRUE(lease->hwaddr_->hwaddr_.empty());
ASSERT_FALSE(lease->client_id_);
- EXPECT_EQ(lease->state_, Lease::STATE_DECLINED);
+ EXPECT_EQ(lease->state_, Lease::STATE_DECLINED);
}
// There are no more leases. Reading should cause no error, but the returned
diff --git a/src/lib/dhcpsrv/tests/csv_lease_file6_unittest.cc b/src/lib/dhcpsrv/tests/csv_lease_file6_unittest.cc
index bfc79791c0..ffe7b79675 100644
--- a/src/lib/dhcpsrv/tests/csv_lease_file6_unittest.cc
+++ b/src/lib/dhcpsrv/tests/csv_lease_file6_unittest.cc
@@ -542,7 +542,7 @@ TEST_F(CSVLeaseFile6Test, downGrade) {
}
// Verifies that leases with no DUID are invalid, and that leases
-// with the "Empty" DUID (1 byte duid = 0x0) are valid only when
+// with the "Empty" DUID (1 byte duid = 0x0) are valid only when
// in the declined state.
TEST_F(CSVLeaseFile6Test, declinedLeaseTest) {
io_.writeFile("address,duid,valid_lifetime,expire,subnet_id,"