From: Otto <otto.moerbeek@open-xchange.com>
Date: Tue, 23 Feb 2021 08:51:57 +0000 (+0100)
Subject: Zap TA and NTA enum values, they are for internal use only
X-Git-Tag: dnsdist-1.6.0-alpha2~16^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F10113%2Fhead;p=thirdparty%2Fpdns.git

Zap TA and NTA enum values, they are for internal use only
---

diff --git a/pdns/dnsmessage.proto b/pdns/dnsmessage.proto
index c92254d7e4..3c3c1187ed 100644
--- a/pdns/dnsmessage.proto
+++ b/pdns/dnsmessage.proto
@@ -49,23 +49,21 @@ message PBDNSMessage {
     Indeterminate = 1;
     Insecure = 2;
     Secure = 3;
-    NTA = 4;
-    TA = 5;
-    BogusNoValidDNSKEY = 6;
-    BogusInvalidDenial = 7;
-    BogusUnableToGetDSs = 8;
-    BogusUnableToGetDNSKEYs = 9;
-    BogusSelfSignedDS = 10;
-    BogusNoRRSIG = 11;
-    BogusNoValidRRSIG = 12;
-    BogusMissingNegativeIndication = 13;
-    BogusSignatureNotYetValid = 14;
-    BogusSignatureExpired = 15;
-    BogusUnsupportedDNSKEYAlgo = 16;
-    BogusUnsupportedDSDigestType = 17;
-    BogusNoZoneKeyBitSet = 18;
-    BogusRevokedDNSKEY = 19;
-    BogusInvalidDNSKEYProtocol = 20;
+    BogusNoValidDNSKEY = 4;
+    BogusInvalidDenial = 5;
+    BogusUnableToGetDSs = 6;
+    BogusUnableToGetDNSKEYs = 7;
+    BogusSelfSignedDS = 8;
+    BogusNoRRSIG = 9;
+    BogusNoValidRRSIG = 10;
+    BogusMissingNegativeIndication = 11;
+    BogusSignatureNotYetValid = 12;
+    BogusSignatureExpired = 13;
+    BogusUnsupportedDNSKEYAlgo = 14;
+    BogusUnsupportedDSDigestType = 15;
+    BogusNoZoneKeyBitSet = 16;
+    BogusRevokedDNSKEY = 17;
+    BogusInvalidDNSKEYProtocol = 18;
   }
   required Type type = 1;
   optional bytes messageId = 2;                 // UUID, shared by the query and the response
diff --git a/pdns/recursordist/rec-protozero.hh b/pdns/recursordist/rec-protozero.hh
index 6bfb9d170b..20f5111683 100644
--- a/pdns/recursordist/rec-protozero.hh
+++ b/pdns/recursordist/rec-protozero.hh
@@ -185,56 +185,50 @@ namespace ProtoZero
       case vState::Secure:
         s = 3;
         break;
-      case vState::NTA:
-        s = 4;
-        break;
-      case vState::TA:
-        s = 5;
-        break;
       case vState::BogusNoValidDNSKEY:
-        s = 6;
+        s = 4;
         break;
       case vState::BogusInvalidDenial:
-        s = 7;
+        s = 5;
         break;
       case vState::BogusUnableToGetDSs:
-        s = 8;
+        s = 6;
         break;
       case vState::BogusUnableToGetDNSKEYs:
-        s = 9;
+        s = 7;
         break;
       case vState::BogusSelfSignedDS:
-        s = 10;
+        s = 8;
         break;
       case vState::BogusNoRRSIG:
-        s = 11;
+        s = 9;
         break;
       case vState::BogusNoValidRRSIG:
-        s = 12;
+        s = 10;
         break;
       case vState::BogusMissingNegativeIndication:
-        s = 13;
+        s = 11;
         break;
       case vState::BogusSignatureNotYetValid:
-        s = 14;
+        s = 12;
         break;
       case vState::BogusSignatureExpired:
-        s = 15;
+        s = 13;
         break;
       case vState::BogusUnsupportedDNSKEYAlgo:
-        s = 16;
+        s = 14;
         break;
       case vState::BogusUnsupportedDSDigestType:
-        s = 17;
+        s = 15;
         break;
       case vState::BogusNoZoneKeyBitSet:
-        s = 18;
+        s = 16;
         break;
       case vState::BogusRevokedDNSKEY:
-        s = 19;
+        s = 17;
         break;
       case vState::BogusInvalidDNSKEYProtocol:
-        s = 20;
+        s = 18;
         break;
       default:
         throw std::runtime_error("Unsupported protobuf validation state");