diff -urk.orig dlint1.4.0.orig/dlint dlint1.4.0/dlint --- dlint1.4.0.orig/dlint 2000-11-19 18:42:33 +0300 +++ dlint1.4.0/dlint 2002-10-09 18:52:02 +0400 @@ -50,13 +50,8 @@ # domain (or it has host "localhost" but wrong in-addr.arpa address). # -# Path to standard bin dirs on many platforms. -# Be sure this path includes the directory that holds your dig executable: -if test x"$PATH" = x""; then # for security purposes - PATH="/usr/ucb:/usr/bsd:/bin:/usr/bin:/usr/local/bin:/usr/share/bin:/usr/com/bin" -else - PATH="${PATH}:/usr/ucb:/usr/bsd:/bin:/usr/bin:/usr/local/bin:/usr/share/bin:/usr/com/bin" -fi +# Path to standard bin dirs on ALT Linux. +PATH="/bin:/usr/bin:/usr/local/bin" export PATH VERSION=1.4.0 @@ -65,21 +60,30 @@ # RR filter from DiG output format to all FQDN on every line format. # Change this path for your site! See Makefile. -rrfilt="/usr/local/bin/digparse" +rrfilt="/usr/share/dlint/digparse" # ------------- END CONFIGURATIONS ------------------------- -TMPNS=/var/tmp/dlintns.$$ -TMPZONE=/var/tmp/dlintzone.$$ -TMPPTR=/var/tmp/dlintptr.$$ -TMPA=/var/tmp/dlinta.$$ -TMPSUBDOMS=/var/tmp/dlintsubdoms.$$ -TMPERR=/var/tmp/dlinterr.$$ -TMPERR2=/var/tmp/dlinterr2.$$ -TMPSERIALS=/var/tmp/dlintserials.$$ +WORKDIR=`mktemp -td dlint.XXXXXXXXXX` || exit 1 +TMPNS="$WORKDIR/ns" +TMPZONE="$WORKDIR/zone" +TMPPTR="$WORKDIR/ptr" +TMPA="$WORKDIR/a" +TMPSUBDOMS="$WORKDIR/subdoms" +TMPERR="$WORKDIR/err" +TMPERR2="$WORKDIR/err2" +TMPSERIALS="$WORKDIR/serials" + +exit_handler() +{ + local rc=$? + trap '' EXIT + rm -rf "$WORKDIR" + exit $rc +} -trap "rm -f $TMPNS $TMPZONE $TMPPTR $TMPA $TMPSUBDOMS $TMPERR $TMPERR2; exit 4" 1 2 3 15 +trap exit_handler SIGHUP SIGINT SIGQUIT SIGTERM EXIT usage() { echo 'usage: dlint [-n] zone' 2>&1 @@ -240,7 +244,6 @@ echo ";; ============================================================" echo ";; dlint of $domain run ending with errors." echo ";; run ending: `date`" - rm -f $TMPNS $TMPZONE $TMPPTR $TMPA $TMPSUBDOMS $TMPERR $TMPERR2 exit 2 fi @@ -292,7 +295,6 @@ echo ";; ============================================================" echo ";; dlint of $domain run ending with errors." echo ";; run ending: `date`" - rm -f $TMPNS $TMPZONE $TMPPTR $TMPA $TMPSUBDOMS $TMPERR $TMPERR2 $TMPSERIALS exit 2 fi if test `awk '{print $1}' < $TMPSERIALS | sort -u | wc -l` -gt 1; then @@ -339,7 +341,6 @@ echo ";; ============================================================" echo ";; dlint of $domain run ending with errors." echo ";; run ending: `date`" - rm -f $TMPNS $TMPZONE $TMPPTR $TMPA $TMPSUBDOMS $TMPERR $TMPERR2 test $exitcode -lt 2 && exitcode=2 exit $exitcode fi @@ -606,5 +607,4 @@ 4) echo "due to signal interruption." ;; esac echo ";; run ending: `date`" -rm -f $TMPNS $TMPZONE $TMPPTR $TMPA $TMPSUBDOMS $TMPERR $TMPERR2 exit $exitcode