diff --git a/Sanity/caching-forwarder-dnssec/test.sh b/Sanity/caching-forwarder-dnssec/test.sh index 77c3e98..dbf1ca8 100755 --- a/Sanity/caching-forwarder-dnssec/test.sh +++ b/Sanity/caching-forwarder-dnssec/test.sh @@ -88,10 +88,10 @@ buGetSecureNameservers() { return 1 fi - echo "$bu_SECURE_SERVERS" if [ -n "$bu_FAILED_SERVERS" ]; then rlLogWarning "Servers not supporting DNSSEC: ${bu_FAILED_SERVERS}" fi + rlLogInfo "Found secure servers: $bu_SECURE_SERVERS" } # Create bind forwarder configuration from servers entered as parameters @@ -191,10 +191,10 @@ rlJournalStart rlRun "set -o pipefail" rlRun "named -V" rlRun "dig -v" - rlRun "SECURE_SERVERS=\"$(buGetSecureNameservers)\"" || rlFail "No secure servers obtained" + rlRun "buGetSecureNameservers" || rlFail "No secure servers obtained" rlFileBackup --missing-ok /etc/named/forwarders.conf rlFileBackup /etc/named.conf - rlRun "buMakeForwarders ${SECURE_SERVERS} > /etc/named/forwarders.conf" 0 + rlRun "buMakeForwarders ${bu_SECURE_SERVERS} > /etc/named/forwarders.conf" 0 if ! buHasOption forwarders; then rlLog "Inserting include to generated forwarders" rlRun "sed -i -e '/^s*options\s*{/ a include \"/etc/named/forwarders.conf\";' /etc/named.conf"