Parcourir la source

[1308] Removed the status: WILDCARD_EMPTY.

Xie Jiagui il y a 13 ans
Parent
commit
11885ff9e9
3 fichiers modifiés avec 3 ajouts et 5 suppressions
  1. 0 1
      src/bin/auth/query.cc
  2. 2 2
      src/bin/auth/tests/query_unittest.cc
  3. 1 2
      src/lib/datasrc/zone.h

+ 0 - 1
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);

+ 2 - 2
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");

+ 1 - 2
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().