mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-04 16:05:17 +00:00
Code Issues Releases Wiki Activity

[1579] some trivial editorial/style fixes

Browse Source 
- removed white spaces at EOL
- add a spaece after commas
- variable naming convention (use underscored lower cased chars)
- indentation
This commit is contained in:
JINMEI Tatuya
2012-03-19 14:01:04 -07:00
parent 8e4c960405
commit c96ac865ac
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/lib/datasrc/database.cc
View File

@@ -815,14 +815,14 @@ DatabaseClient::Finder::findNoNameResult(const Name& name, const RRType& type,
//verify whether the zonefile is signed by NSEC3 method //verify whether the zonefile is signed by NSEC3 method
//If the NSEC3PARAMETER type exists in the zonefile,NSEC3 is definitly used //If the NSEC3PARAMETER type exists in the zonefile,NSEC3 is definitly used
//in this zone signature. //in this zone signature.
bool is_NSEC3 = false; bool is_nsec3 = false;
WantedTypes nsec3PARAM; WantedTypes nsec3PARAM;
nsec3PARAM.insert(RRType::NSEC3PARAM()); nsec3PARAM.insert(RRType::NSEC3PARAM());
const FoundRRsets NSEC3Found = getRRsets(origin_.toText(),nsec3PARAM, const FoundRRsets NSEC3Found = getRRsets(origin_.toText(), nsec3PARAM,
false); false);
const FoundIterator nfi(NSEC3Found.second.find(RRType::NSEC3PARAM())); const FoundIterator nfi(NSEC3Found.second.find(RRType::NSEC3PARAM()));
if (nfi != NSEC3Found.second.end()) { if (nfi != NSEC3Found.second.end()) {
is_NSEC3 = true; is_nsec3 = true;
} }
// On entry to this method, we know that the database doesn't have any // On entry to this method, we know that the database doesn't have any
// entry for this name. Before returning NXDOMAIN, we need to check // entry for this name. Before returning NXDOMAIN, we need to check
@@ -837,12 +837,14 @@ DatabaseClient::Finder::findNoNameResult(const Name& name, const RRType& type,
arg(accessor_->getDBName()).arg(name); arg(accessor_->getDBName()).arg(name);
const ConstRRsetPtr nsec = dnssec_data ? findNSECCover(name) : const ConstRRsetPtr nsec = dnssec_data ? findNSECCover(name) :
ConstRRsetPtr(); ConstRRsetPtr();
if (is_NSEC3 == true) { if (is_nsec3 == true) {
return (ResultContext(NXRRSET, nsec, return (ResultContext(NXRRSET, nsec,
nsec ? RESULT_NSEC_SIGNED : RESULT_NSEC3_SIGNED)); nsec ? RESULT_NSEC_SIGNED :
RESULT_NSEC3_SIGNED));
} else { } else {
return (ResultContext(NXRRSET, nsec, return (ResultContext(NXRRSET, nsec,
nsec ? RESULT_NSEC_SIGNED : RESULT_DEFAULT)); nsec ? RESULT_NSEC_SIGNED :
RESULT_DEFAULT));
} }
} else if ((options & NO_WILDCARD) == 0) { } else if ((options & NO_WILDCARD) == 0) {
// It's not an empty non-terminal and wildcard matching is not // It's not an empty non-terminal and wildcard matching is not
@@ -862,7 +864,7 @@ DatabaseClient::Finder::findNoNameResult(const Name& name, const RRType& type,
arg(accessor_->getDBName()).arg(name).arg(type).arg(getClass()); arg(accessor_->getDBName()).arg(name).arg(type).arg(getClass());
const ConstRRsetPtr nsec = dnssec_data ? findNSECCover(name) : const ConstRRsetPtr nsec = dnssec_data ? findNSECCover(name) :
ConstRRsetPtr(); ConstRRsetPtr();
if (is_NSEC3 == true ) { if (is_nsec3 == true) {
return (ResultContext(NXDOMAIN, nsec, return (ResultContext(NXDOMAIN, nsec,
nsec ? RESULT_NSEC_SIGNED : RESULT_NSEC3_SIGNED)); nsec ? RESULT_NSEC_SIGNED : RESULT_NSEC3_SIGNED));
} else { } else {

4
src/lib/datasrc/tests/database_unittest.cc
View File

@@ -2282,7 +2282,7 @@ TYPED_TEST(DatabaseClientTest, wildcardNXRRSET_NSEC) {
} }
TYPED_TEST(DatabaseClientTest,dbNegativeCaseFind){ TYPED_TEST(DatabaseClientTest,dbNegativeCaseFind){
//ZoneFinder::find() for negative case should show whether the zone is //ZoneFinder::find() for negative case should show whether the zone is
//signed by NSEC or NSEC3,that is good for upper layer caller. //signed by NSEC or NSEC3,that is good for upper layer caller.
//First off, add an NSEC3PARAM RR //First off, add an NSEC3PARAM RR
@@ -2301,7 +2301,7 @@ TYPED_TEST(DatabaseClientTest,dbNegativeCaseFind){
doFindTest(this->updater_->getFinder(), doFindTest(this->updater_->getFinder(),
isc::dns::Name("doesnotexist.example.org."), isc::dns::Name("doesnotexist.example.org."),
this->qtype_, this->qtype_, this->rrttl_, this->qtype_, this->qtype_, this->rrttl_,
ZoneFinder::NXDOMAIN,this->expected_rdatas_, ZoneFinder::NXDOMAIN, this->expected_rdatas_,
this->expected_sig_rdatas_, this->expected_sig_rdatas_,
ZoneFinder::RESULT_NSEC3_SIGNED); ZoneFinder::RESULT_NSEC3_SIGNED);
} }