Only output shell commands on PDNS_DEBUG=YES

diff --git a/pdns/dbdnsseckeeper.cc b/pdns/dbdnsseckeeper.cc
index 65d9dab407dce594daadcc5689af4de7cb1fbb9f..35360cfff7d88efb8493ab122f2e28a3bd7b7a68 100644 (file)
--- a/pdns/dbdnsseckeeper.cc
+++ b/pdns/dbdnsseckeeper.cc
@@ -370,18 +370,18 @@ bool DNSSECKeeper::unsetPublishCDNSKEY(const DNSName& zname)
 /**
  * Returns all keys that are used to sign the DNSKEY RRSet in a zone
  *
- * @param zone         DNSName of the zone
+ * @param zname        DNSName of the zone
  * @return             a keyset_t with all keys that are used to sign the DNSKEY
  *                     RRSet (these are the entrypoint(s) to the zone)
  */
-DNSSECKeeper::keyset_t DNSSECKeeper::getEntryPoints(const DNSName& zone)
+DNSSECKeeper::keyset_t DNSSECKeeper::getEntryPoints(const DNSName& zname)
 {
   DNSSECKeeper::keyset_t ret;
-  DNSSECKeeper::keyset_t keys = getKeys(zone);
+  DNSSECKeeper::keyset_t keys = getKeys(zname);
 
   set<int> algoHasKSK;
 
-  for(DNSSECKeeper::keyset_t::value_type& keymeta : keys) {
+  for(auto const &keymeta : keys) {
     if(keymeta.second.active && keymeta.second.keyOrZone) {
       // KSKs should always be returned
       ret.push_back(keymeta);

diff --git a/pdns/dnsseckeeper.hh b/pdns/dnsseckeeper.hh
index aff52b99c655e19dc09582a14942dd51b9340690..c3fa3da751622ba475eb1ef09d7cc60cdcb731a5 100644 (file)
--- a/pdns/dnsseckeeper.hh
+++ b/pdns/dnsseckeeper.hh
@@ -71,7 +71,7 @@ public:
   }
   bool isSecuredZone(const DNSName& zone);
   static uint64_t dbdnssecCacheSizes(const std::string& str);  
-  keyset_t getEntryPoints(const DNSName& zone);
+  keyset_t getEntryPoints(const DNSName& zname);
   keyset_t getKeys(const DNSName& zone, boost::tribool allOrKeyOrZone = boost::indeterminate, bool useCache = true);
   DNSSECPrivateKey getKeyById(const DNSName& zone, unsigned int id);
   bool addKey(const DNSName& zname, bool keyOrZone, int algorithm=5, int bits=0, bool active=true);

diff --git a/regression-tests.api/runtests b/regression-tests.api/runtests
index b585b84fcc06e411dee35a454614cc8142b3dc1a..a1018334d29ff8b23da61c586100ad58316c141f 100755 (executable)
--- a/regression-tests.api/runtests
+++ b/regression-tests.api/runtests
@@ -8,5 +8,7 @@ python -V
 pip install -r requirements.txt
 
 set -e
-set -x
+if [ "${PDNS_DEBUG}" = "YES" ]; then
+  set -x
+fi
 exec ./runtests.py "$@"

diff --git a/regression-tests.dnsdist/runtests b/regression-tests.dnsdist/runtests
index e7fcf025add9c4c3c00c786f0ade1abecfd9bae4..fb53a6b2acd9b034bbc64ba195a39e7a0bc30f57 100755 (executable)
--- a/regression-tests.dnsdist/runtests
+++ b/regression-tests.dnsdist/runtests
@@ -13,5 +13,7 @@ fi
 export DNSDISTBIN
 
 set -e
-set -x
-nosetests --with-xunit "$@"
+if [ "${PDNS_DEBUG}" = "YES" ]; then
+  set -x
+fi
+nosetests --with-xunit

diff --git a/regression-tests.nobackend/counters/command b/regression-tests.nobackend/counters/command
index 98b1cbab10f8a1b371c027e20340b746f5f20466..8e4b443ddc27df65ed803ed4c36960864577ede1 100755 (executable)
--- a/regression-tests.nobackend/counters/command
+++ b/regression-tests.nobackend/counters/command
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 set -e
-set -x
+if [ "${PDNS_DEBUG}" = "YES" ]; then
+  set -x
+fi
 
 port=5600
 

diff --git a/regression-tests.nobackend/edns-packet-cache/command b/regression-tests.nobackend/edns-packet-cache/command
index 0f35f240cec25d55c59af97b8af8d5d9a3541ef4..1c2d5a5732bc66e4a2d615a2265d2755a375b66b 100755 (executable)
--- a/regression-tests.nobackend/edns-packet-cache/command
+++ b/regression-tests.nobackend/edns-packet-cache/command
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 set -e
-set -x
+if [ "${PDNS_DEBUG}" = "YES" ]; then
+  set -x
+fi
 
 bindwait ()
 {

diff --git a/regression-tests.nobackend/lua-policy/command b/regression-tests.nobackend/lua-policy/command
index 6a8b7b278c4b56e357ea76212229d295857a0dbe..927aea2f09293665962ae003074de70527de6265 100755 (executable)
--- a/regression-tests.nobackend/lua-policy/command
+++ b/regression-tests.nobackend/lua-policy/command
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 set -e
-set -x
+if [ "${PDNS_DEBUG}" = "YES" ]; then
+  set -x
+fi
 
 bindwait ()
 {

diff --git a/regression-tests.nobackend/negcache-tests-dotted-cname/command b/regression-tests.nobackend/negcache-tests-dotted-cname/command
index ea8ac11fbebee75d56f0473d209bbbb770c357c2..9f1e91b5b9921a044a005ba138e05551eea8eef7 100755 (executable)
--- a/regression-tests.nobackend/negcache-tests-dotted-cname/command
+++ b/regression-tests.nobackend/negcache-tests-dotted-cname/command
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 set -e
-set -x
+if [ "${PDNS_DEBUG}" = "YES" ]; then
+  set -x
+fi
 
 port=5501
 rm -f pdns*.pid

diff --git a/regression-tests.nobackend/soa-edit/command b/regression-tests.nobackend/soa-edit/command
index afe5c72bff165c14e47c4fb6a075bbe3c60d30d9..a433d60d22927fbbbd3296fd4aff2d1d2dc80ff8 100755 (executable)
--- a/regression-tests.nobackend/soa-edit/command
+++ b/regression-tests.nobackend/soa-edit/command
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 set -e
-set -x
+if [ "${PDNS_DEBUG}" = "YES" ]; then
+  set -x
+fi
 
 bindwait ()
 {

diff --git a/regression-tests.recursor/config.sh b/regression-tests.recursor/config.sh
index 555663fbeb537f533c6b29e555432dd9308880b1..1f9cc570da94748e421ce74dadf8dfecd398453e 100755 (executable)
--- a/regression-tests.recursor/config.sh
+++ b/regression-tests.recursor/config.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 set -e
-set -x
+if [ "${PDNS_DEBUG}" = "YES" ]; then
+  set -x
+fi
 
 export PDNS=${PDNS:-../../../pdns/pdns_server}
 export PDNSRECURSOR=${PDNSRECURSOR:-../../../pdns/pdns_recursor}

diff --git a/regression-tests.recursor/runtests b/regression-tests.recursor/runtests
index 7e5945639905da4393ea0fe54c8b484abef412b9..cedcecda9fdb420bf96ffa2b3bb42eb6531ee6b4 100755 (executable)
--- a/regression-tests.recursor/runtests
+++ b/regression-tests.recursor/runtests
@@ -1,6 +1,8 @@
 #!/bin/sh
 set -e
-set -x
+if [ "${PDNS_DEBUG}" = "YES" ]; then
+  set -x
+fi
 
 . ./vars
 

diff --git a/regression-tests.recursor/start.sh b/regression-tests.recursor/start.sh
index 7cedc7554b360f8455009a2bc92bb430f98ad1dc..a27d89829b4d24d185bab319fa948a852ba14554 100755 (executable)
--- a/regression-tests.recursor/start.sh
+++ b/regression-tests.recursor/start.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 set -e
-set -x
+if [ "${PDNS_DEBUG}" = "YES" ]; then
+  set -x
+fi
 
 . ./vars
 

diff --git a/regression-tests.recursor/stop.sh b/regression-tests.recursor/stop.sh
index f5d3c7906d98ae1bd9dacae822f62df38be874cb..411b43a84740506a680033a872a148ee51ab3804 100755 (executable)
--- a/regression-tests.recursor/stop.sh
+++ b/regression-tests.recursor/stop.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 set -e
-set -x
+if [ "${PDNS_DEBUG}" = "YES" ]; then
+  set -x
+fi
 
 . ./vars
 

diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index 231f16546191c00519de401dd22a7038984f3ced..106beaf9a81a17e007183b62384005dd0fbb39a1 100755 (executable)
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 set -e
-set -x
+if [ "${PDNS_DEBUG}" = "YES" ]; then
+  set -x
+fi
 
 export PDNS=${PDNS:-${PWD}/../pdns/pdns_server}
 export PDNS2=${PDNS2:-${PWD}/../pdns/pdns_server}

diff --git a/regression-tests/tests/bind-add-zone/stress/run.sh b/regression-tests/tests/bind-add-zone/stress/run.sh
index c591f69f656c1dd279ff57e5767ec932fa7e4521..5a370a729446d48fb49f08fa097d36df98fa4ba3 100755 (executable)
--- a/regression-tests/tests/bind-add-zone/stress/run.sh
+++ b/regression-tests/tests/bind-add-zone/stress/run.sh
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 set -e
-set -x
+if [ "${PDNS_DEBUG}" = "YES" ]; then
+  set -x
+fi
 
 PDNS=../pdns/pdns_server
 AMOUNT=${1:-1000}