Better future-proof logic.

diff --git a/modules/bindbackend/binddnssec.cc b/modules/bindbackend/binddnssec.cc
index 130417d17c85160ae774861f4ca99bcb91a7238c..8bd46b5f8be0435780946e15b4c6541ccd124d7c 100644 (file)
--- a/modules/bindbackend/binddnssec.cc
+++ b/modules/bindbackend/binddnssec.cc
@@ -38,12 +38,11 @@ void Bind2Backend::setupDNSSEC()
 
 unsigned int Bind2Backend::getCapabilities()
 {
+  unsigned int caps = CAP_LIST;
   if (d_hybrid) {
-    return CAP_DNSSEC | CAP_LIST;
-  }
-  else {
-    return CAP_LIST;
+    caps |= CAP_DNSSEC;
   }
+  return caps;
 }
 
 bool Bind2Backend::getNSEC3PARAM(const DNSName& /* name */, NSEC3PARAMRecordContent* /* ns3p */)
@@ -204,10 +203,11 @@ void Bind2Backend::freeStatements()
 
 unsigned int Bind2Backend::getCapabilities()
 {
+  unsigned int caps = CAP_LIST;
   if (d_dnssecdb || d_hybrid) {
-    return CAP_DNSSEC | CAP_LIST;
+    caps |= CAP_DNSSEC;
   }
-  return CAP_LIST;
+  return caps;
 }
 
 bool Bind2Backend::getNSEC3PARAM(const DNSName& name, NSEC3PARAMRecordContent* ns3p)

diff --git a/modules/geoipbackend/geoipbackend.hh b/modules/geoipbackend/geoipbackend.hh
index baff3ec2aace78108d81d90ebc9dba5d836c87a6..d21aadf2147c67956df2d625eb52919dd5b68611 100644 (file)
--- a/modules/geoipbackend/geoipbackend.hh
+++ b/modules/geoipbackend/geoipbackend.hh
@@ -57,12 +57,11 @@ public:
 
   unsigned int getCapabilities() override
   {
+    unsigned int caps = 0;
     if (d_dnssec) {
-      return CAP_DNSSEC;
-    }
-    else {
-      return 0;
+      caps |= CAP_DNSSEC;
     }
+    return caps;
   }
 
   void lookup(const QType& qtype, const DNSName& qdomain, int zoneId, DNSPacket* pkt_p = nullptr) override;

diff --git a/modules/lua2backend/lua2api2.hh b/modules/lua2backend/lua2api2.hh
index 02727689030fa5066aca70c3224c28cfdb456d9f..acd501fd8881af88d3e3e804399b6590ea5a9e09 100644 (file)
--- a/modules/lua2backend/lua2api2.hh
+++ b/modules/lua2backend/lua2api2.hh
@@ -131,12 +131,11 @@ public:
 
   unsigned int getCapabilities() override
   {
+    unsigned int caps = CAP_DIRECT | CAP_LIST;
     if (d_dnssec) {
-      return CAP_DNSSEC | CAP_DIRECT | CAP_LIST;
-    }
-    else {
-      return CAP_DIRECT | CAP_LIST;
+      caps |= CAP_DNSSEC;
     }
+    return caps;
   }
 
   void parseLookup(const lookup_result_t& result)

diff --git a/modules/remotebackend/remotebackend.cc b/modules/remotebackend/remotebackend.cc
index 1639c237d83cea85d9bce93a5989dd84e2cded1e..b38280ed2d6c0e4cfe67d8e2a4b8413f2ec253bf 100644 (file)
--- a/modules/remotebackend/remotebackend.cc
+++ b/modules/remotebackend/remotebackend.cc
@@ -508,10 +508,11 @@ bool RemoteBackend::unpublishDomainKey(const DNSName& name, unsigned int id)
 
 unsigned int RemoteBackend::getCapabilities()
 {
+  unsigned int caps = CAP_DIRECT | CAP_LIST;
   if (d_dnssec) {
-    return CAP_DNSSEC | CAP_DIRECT | CAP_LIST;
+    caps |= CAP_DNSSEC;
   }
-  return CAP_DIRECT | CAP_LIST;
+  return caps;
 }
 
 bool RemoteBackend::getTSIGKey(const DNSName& name, DNSName& algorithm, std::string& content)

diff --git a/pdns/backends/gsql/gsqlbackend.cc b/pdns/backends/gsql/gsqlbackend.cc
index ae125224cee091337cb45a8339e3c223c650a245..7cc98514690499169c4bb0541fbe9e868ca14857 100644 (file)
--- a/pdns/backends/gsql/gsqlbackend.cc
+++ b/pdns/backends/gsql/gsqlbackend.cc
@@ -868,10 +868,11 @@ bool GSQLBackend::updateEmptyNonTerminals(uint32_t domain_id, set<DNSName>& inse
 
 unsigned int GSQLBackend::getCapabilities()
 {
+  unsigned int caps = CAP_COMMENTS | CAP_DIRECT | CAP_LIST | CAP_CREATE;
   if (d_dnssecQueries) {
-    return CAP_DNSSEC | CAP_COMMENTS | CAP_DIRECT | CAP_LIST | CAP_CREATE;
+    caps |= CAP_DNSSEC;
   }
-  return CAP_COMMENTS | CAP_DIRECT | CAP_LIST | CAP_CREATE;
+  return caps;
 }
 
 bool GSQLBackend::getBeforeAndAfterNamesAbsolute(uint32_t id, const DNSName& qname, DNSName& unhashed, DNSName& before, DNSName& after)