[svn] commit: r649 - /experiments/each-query/src/lib/auth/cpp/data_source_static.cc

[BIND 10 source code commits]

Author: jelte
Date: Fri Jan 29 19:45:08 2010
New Revision: 649

Log:
only return me me me if the zone we have is better than the current best

Modified:
    experiments/each-query/src/lib/auth/cpp/data_source_static.cc

Modified: experiments/each-query/src/lib/auth/cpp/data_source_static.cc
==============================================================================
--- experiments/each-query/src/lib/auth/cpp/data_source_static.cc (original)
+++ experiments/each-query/src/lib/auth/cpp/data_source_static.cc Fri Jan 29 19:45:08 2010
@@ -34,14 +34,22 @@
     NameComparisonResult::NameRelation version_cmp = qname.compare(version_name).getRelation();
     if (version_cmp == NameComparisonResult::EQUAL ||
         version_cmp == NameComparisonResult::SUBDOMAIN) {
-        container = version_name;
-        return this;
+        if (version_name.compare(container).getRelation() == NameComparisonResult::SUBDOMAIN) {
+            container = version_name;
+            return this;
+        } else {
+            return NULL;
+        }
     }
     NameComparisonResult::NameRelation authors_cmp = qname.compare(authors_name).getRelation();
     if (authors_cmp == NameComparisonResult::EQUAL ||
         authors_cmp == NameComparisonResult::SUBDOMAIN) {
-        container = authors_name;
-        return this;
+        if (authors_name.compare(container).getRelation() == NameComparisonResult::SUBDOMAIN) {
+            container = authors_name;
+            return this;
+        } else {
+            return NULL;
+        }
     }
     return NULL;
 }