[svn] commit: r1183 - /trunk/src/lib/auth/data_source.cc

[BIND 10 source code commits]

Author: each
Date: Sun Mar  7 07:59:22 2010
New Revision: 1183

Log:
cleaned up nsec3 code a bit

Modified:
    trunk/src/lib/auth/data_source.cc

Modified: trunk/src/lib/auth/data_source.cc
==============================================================================
--- trunk/src/lib/auth/data_source.cc (original)
+++ trunk/src/lib/auth/data_source.cc Sun Mar  7 07:59:22 2010
@@ -347,18 +347,13 @@
     DataSrc::Result result;
     ConstNsec3ParamPtr nsec3 = getNsec3Param(q, ds, zonename);
     if (nsec3 != NULL) {
-        string node = nsec3->getHash(task->qname);
-        string apex = nsec3->getHash(zonename);
-        string wild("");
-        if ((task->flags & DataSrc::NAME_NOT_FOUND) != 0) {
-            wild = nsec3->getHash(Name("*").concatenate(zonename));
-        }
-
+        string node(nsec3->getHash(task->qname));
         result = addNSEC3(node, q, ds, zonename);
         if (result != DataSrc::SUCCESS) {
             return (result);
         }
 
+        string apex(nsec3->getHash(zonename));
         if (node != apex) {
             result = addNSEC3(apex, q, ds, zonename);
             if (result != DataSrc::SUCCESS) {
@@ -366,10 +361,13 @@
             }
         }
 
-        if (wild.length() != 0 && node != wild) {
-            result = addNSEC3(wild, q, ds, zonename);
-            if (result != DataSrc::SUCCESS) {
-                return (result);
+        if ((task->flags & DataSrc::NAME_NOT_FOUND) != 0) {
+            string wild(nsec3->getHash(Name("*").concatenate(zonename)));
+            if (node != wild) {
+                result = addNSEC3(wild, q, ds, zonename);
+                if (result != DataSrc::SUCCESS) {
+                    return (result);
+                }
             }
         }
     } else {