BIND 10 trac1308, updated. 11885ff9e91c98ff0c4e93d81fc2b3d47a02090d [1308] Removed the status: WILDCARD_EMPTY.

[BIND 10 source code commits]

The branch, trac1308 has been updated
       via  11885ff9e91c98ff0c4e93d81fc2b3d47a02090d (commit)
      from  173de1cea65293e5f7cfb904454ee4fa96c51e1d (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 11885ff9e91c98ff0c4e93d81fc2b3d47a02090d
Author: Xie Jiagui <xiejiagui at cnnic.cn>
Date:   Mon Dec 5 21:43:37 2011 +0800

    [1308] Removed the status: WILDCARD_EMPTY.

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

Summary of changes:
 src/bin/auth/query.cc                |    1 -
 src/bin/auth/tests/query_unittest.cc |    4 ++--
 src/lib/datasrc/zone.h               |    3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/auth/query.cc b/src/bin/auth/query.cc
index a53dbb7..b7ee3b6 100644
--- a/src/bin/auth/query.cc
+++ b/src/bin/auth/query.cc
@@ -385,7 +385,6 @@ Query::process() {
                 }
                 break;
             case ZoneFinder::WILDCARD_NXRRSET:
-            case ZoneFinder::WILDCARD_EMPTY:
                 addSOA(*result.zone_finder);
                 if (dnssec_ && db_result.rrset) {
                     addWildcardNxrrsetProof(zfinder,db_result.rrset);
diff --git a/src/bin/auth/tests/query_unittest.cc b/src/bin/auth/tests/query_unittest.cc
index e85d14a..14067ab 100644
--- a/src/bin/auth/tests/query_unittest.cc
+++ b/src/bin/auth/tests/query_unittest.cc
@@ -448,12 +448,12 @@ MockZoneFinder::find(const Name& name, const RRType& type,
                             if ((*it).first < emptyName &&
                             (nsec_it = (*it).second.find(RRType::NSEC()))
                             != (*it).second.end()) {
-                                return (FindResult(WILDCARD_EMPTY,
+                                return (FindResult(WILDCARD_NXRRSET,
                                                    (*nsec_it).second));
                             }
                         }
                 }
-                return (FindResult(WILDCARD_EMPTY,RRsetPtr()));
+                return (FindResult(WILDCARD_NXRRSET,RRsetPtr()));
              }
         }
         const Name cnamewild_suffix("cnamewild.example.com");
diff --git a/src/lib/datasrc/zone.h b/src/lib/datasrc/zone.h
index f3afb97..9fcd289 100644
--- a/src/lib/datasrc/zone.h
+++ b/src/lib/datasrc/zone.h
@@ -136,8 +136,7 @@ public:
         DNAME,    ///< The search encounters and returns a DNAME RR
         WILDCARD, ///< Succes by wildcard match, for DNSSEC
         WILDCARD_CNAME, ///< CNAME on wildcard, search returns CNAME, for DNSSEC
-        WILDCARD_NXRRSET, ///< NXRRSET on wildcard, for DNSSEC
-        WILDCARD_EMPTY    ///< Empty non terminal on wildcard,for DNSSEC
+        WILDCARD_NXRRSET ///< NXRRSET on wildcard, for DNSSEC
     };
 
     /// A helper structure to represent the search result of \c find().