BIND 10 trac1584, updated. c9b1b85ad2266b1f1971193db1c0ee7f093b7697 [1584] more style fixes, per the guidelines and consistency.

BIND 10 source code commits bind10-changes at lists.isc.org
Thu Feb 16 21:18:49 UTC 2012


The branch, trac1584 has been updated
       via  c9b1b85ad2266b1f1971193db1c0ee7f093b7697 (commit)
      from  45c762f1a150d2ba1f21ca169642ff6eccd0eb3a (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 c9b1b85ad2266b1f1971193db1c0ee7f093b7697
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Thu Feb 16 13:18:29 2012 -0800

    [1584] more style fixes, per the guidelines and consistency.

-----------------------------------------------------------------------

Summary of changes:
 src/bin/auth/query.cc |   46 ++++++++++++++++++++++++----------------------
 1 files changed, 24 insertions(+), 22 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/auth/query.cc b/src/bin/auth/query.cc
index 88f0017..fcb1f95 100644
--- a/src/bin/auth/query.cc
+++ b/src/bin/auth/query.cc
@@ -174,38 +174,40 @@ Query::addWildcardProof(ZoneFinder& finder,
 	// The query name shouldn't exist in the zone if there were no wildcard
 	// substitution.  Confirm that by specifying NO_WILDCARD.  It should result
 	// in NXDOMAIN and an NSEC RR that proves it should be returned.
-	if(db_result.isNSECSigned() && db_result.isWildcard()){
+	if (db_result.isNSECSigned() && db_result.isWildcard()){
 		const ZoneFinder::FindResult fresult =
-			finder.find(qname_, RRType::NSEC(),
-					dnssec_opt_ | ZoneFinder::NO_WILDCARD);
+                    finder.find(qname_, RRType::NSEC(),
+                                dnssec_opt_ | ZoneFinder::NO_WILDCARD);
 		if (fresult.code != ZoneFinder::NXDOMAIN || !fresult.rrset ||
-				fresult.rrset->getRdataCount() == 0) {
-			isc_throw(BadNSEC, "Unexpected NSEC result for wildcard proof");
+                    fresult.rrset->getRdataCount() == 0) {
+                    isc_throw(BadNSEC,
+                              "Unexpected NSEC result for wildcard proof");
 		}
 		response_.addRRset(Message::SECTION_AUTHORITY,
-				boost::const_pointer_cast<AbstractRRset>(fresult.rrset),
-				dnssec_);
-	}else if(db_result.isNSEC3Signed() && db_result.isWildcard()){
-		// case for RFC5155 Section 7.2.6
-		const ZoneFinder::FindNSEC3Result NSEC3Result(finder.findNSEC3(qname_,
-					true));
-		if (NULL == NSEC3Result.next_proof){ 
-			isc_throw(BadNSEC3, "Unexpected NSEC3 result for wildcard proof");
+                                   boost::const_pointer_cast<AbstractRRset>(
+                                       fresult.rrset),
+                                   dnssec_);
+	} else if (db_result.isNSEC3Signed() && db_result.isWildcard()) {
+            // case for RFC5155 Section 7.2.6
+            const ZoneFinder::FindNSEC3Result NSEC3Result(
+                finder.findNSEC3(qname_, true));
+		if (NULL == NSEC3Result.next_proof) {
+			isc_throw(BadNSEC3, "Unexpected NSEC3 "
+                                  "result for wildcard proof");
 		}
 		response_.addRRset(Message::SECTION_AUTHORITY,
-				boost::const_pointer_cast<AbstractRRset>(
-					NSEC3Result.next_proof), dnssec_);
+                                   boost::const_pointer_cast<AbstractRRset>(
+                                       NSEC3Result.next_proof), dnssec_);
 		const Name wname =
-			qname_.split(qname_.getLabelCount() - NSEC3Result.closest_labels - 1);
-		const ZoneFinder::FindNSEC3Result wresult(finder.findNSEC3(wname,
-					false));
+                    qname_.split(qname_.getLabelCount() -
+                                 NSEC3Result.closest_labels - 1);
+		const ZoneFinder::FindNSEC3Result wresult(
+                    finder.findNSEC3(wname, false));
 		if (wresult.matched) {
-			isc_throw(BadNSEC3, "Unexpected NSEC3 found for existing domain "
-					<< wname);
+			isc_throw(BadNSEC3, "Unexpected NSEC3 "
+                                  "found for existing domain " << wname);
 		}
-
 	}
-
 }
 
 void




More information about the bind10-changes mailing list