diff options
| -rw-r--r-- | DSA/DNSHelpers.pm | 10 | ||||
| -rwxr-xr-x | bin/dsa-check-dnssec-coverage-all | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/DSA/DNSHelpers.pm b/DSA/DNSHelpers.pm index 401e11d..4c31526 100644 --- a/DSA/DNSHelpers.pm +++ b/DSA/DNSHelpers.pm @@ -183,9 +183,9 @@ sub check_zonefile { my $integrity_check = $options{'integrity-checks'} ? $options{'integrity-checks'} : 'full'; - system(qw{/usr/sbin/named-checkzone -q -k fail -n fail -S fail -m fail -M fail -i}, $integrity_check, $zonename, $zonefilename); + system(qw{named-checkzone -q -k fail -n fail -S fail -m fail -M fail -i}, $integrity_check, $zonename, $zonefilename); if ($CHILD_ERROR >> 8 != 0) { - system(qw{/usr/sbin/named-checkzone -k fail -n fail -S fail -i full -m fail -M fail}, $zonename, $zonefilename); + system(qw{named-checkzone -k fail -n fail -S fail -i full -m fail -M fail}, $zonename, $zonefilename); return undef; }; return 1; @@ -201,7 +201,7 @@ returns undef on errors, 1 if OK. sub compile_zonefile { my ($zonename, $in, $out) = @_; - system(qw{/usr/sbin/named-compilezone -q -k fail -n fail -S fail -i none -m fail -M fail -o}, $out, $zonename, $in); + system(qw{named-compilezone -q -k fail -n fail -S fail -i none -m fail -M fail -o}, $out, $zonename, $in); if ($CHILD_ERROR >> 8 != 0) { return undef; }; @@ -226,8 +226,8 @@ sub sign_zonefile { die("No keydir in options\n") unless defined $options{'keydir'}; my @cmd = (); - push @cmd, '/usr/bin/chronic'; - push @cmd, '/usr/sbin/dnssec-signzone'; + push @cmd, 'chronic'; + push @cmd, 'dnssec-signzone'; push @cmd, '-S'; # smart, pick the right keys automatically push @cmd, '-K', $options{'keydir'}."/$zonename"; push @cmd, '-d', $options{'keydir'}."/$zonename"; diff --git a/bin/dsa-check-dnssec-coverage-all b/bin/dsa-check-dnssec-coverage-all index 4c3313f..12d0187 100755 --- a/bin/dsa-check-dnssec-coverage-all +++ b/bin/dsa-check-dnssec-coverage-all @@ -18,7 +18,7 @@ if [ -e "$BASE"/repositories/auto-dns/zones ]; then [ "$zone" != "$i" ] || continue if ! "$BASE"/bin/dnssec-coverage \ - -c /usr/sbin/named-compilezone \ + -c named-compilezone \ -K "$BASE"/var/keys/"$zone" \ -r 10 \ -f "$BASE"/var/geodns-zones/db."$zone" \ @@ -37,7 +37,7 @@ for zone in $(cd "$BASE"/repositories/domains && ls ); do [ -f "$BASE/var/generated/$zone" ] || continue if ! "$BASE"/bin/dnssec-coverage \ - -c /usr/sbin/named-compilezone \ + -c named-compilezone \ -K "$BASE"/var/keys/"$zone" \ -f "$BASE"/var/generated/"$zone" \ -l "$CUTOFF" \ |