From 78ad0763902bddf4b94bb2d7ce55fe439cb71c12 Mon Sep 17 00:00:00 2001
From: Michael Sawyer <source@isc.org>
Date: Wed, 17 May 2000 23:15:32 +0000
Subject: [PATCH] Fix typo in ifconfig script and add dnssec clean script

---
 bin/tests/system/dnssec/clean.sh    | 6 ++++++
 bin/tests/system/dnssec/ns1/sign.sh | 5 +----
 bin/tests/system/dnssec/ns2/sign.sh | 6 +-----
 bin/tests/system/dnssec/ns3/sign.sh | 8 ++------
 bin/tests/system/ifconfig.sh        | 4 ++--
 5 files changed, 12 insertions(+), 17 deletions(-)
 create mode 100644 bin/tests/system/dnssec/clean.sh

diff --git a/bin/tests/system/dnssec/clean.sh b/bin/tests/system/dnssec/clean.sh
new file mode 100644
index 0000000000..492f56919f
--- /dev/null
+++ b/bin/tests/system/dnssec/clean.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+rm -f */K* */*.keyset */*.signedkey */*.signed */trusted.conf
+rm -f ns1/root.db ns2/example.db ns3/secure.example.db
+rm -f ns3/unsecure.example.db ns3/bogus.example.db
+rm -f dig.out.*
diff --git a/bin/tests/system/dnssec/ns1/sign.sh b/bin/tests/system/dnssec/ns1/sign.sh
index 7e3f43352d..71f1509a1e 100644
--- a/bin/tests/system/dnssec/ns1/sign.sh
+++ b/bin/tests/system/dnssec/ns1/sign.sh
@@ -10,17 +10,14 @@ keyname=`$KEYGEN -a RSA -b 768 -n zone $zone`
 
 cp ../ns2/example.keyset .
 
-echo $KEYSIGNER example.keyset $keyname
 $KEYSIGNER example.keyset $keyname
 
 cat example.signedkey >> ../ns2/example.db.signed
 
-echo $KEYSETTOOL $keyname
-$KEYSETTOOL $keyname
+$KEYSETTOOL -t 3600 $keyname
 
 cat $infile $keyname.key > $zonefile
 
-echo $SIGNER -o $zone $zonefile
 $SIGNER -o $zone $zonefile
 
 # Configure the resolving server with a trusted key.
diff --git a/bin/tests/system/dnssec/ns2/sign.sh b/bin/tests/system/dnssec/ns2/sign.sh
index 984d4f9e0b..303108a561 100644
--- a/bin/tests/system/dnssec/ns2/sign.sh
+++ b/bin/tests/system/dnssec/ns2/sign.sh
@@ -13,7 +13,6 @@ keyname=`$KEYGEN -a RSA -b 768 -n zone $zone`
 
 cp ../ns3/secure.example.keyset .
 
-echo $KEYSIGNER secure.example.keyset $keyname
 $KEYSIGNER secure.example.keyset $keyname
 
 # This will leave two copies of the child's zone key in the signed db file;
@@ -22,19 +21,16 @@ cat secure.example.signedkey >>../ns3/secure.example.db.signed
 
 cp ../ns3/bogus.example.keyset .
 
-echo $KEYSIGNER bogus.example.keyset $keyname
 $KEYSIGNER bogus.example.keyset $keyname
 
 # This will leave two copies of the child's zone key in the signed db file;
 # that shouldn't cause any problems.
 cat bogus.example.signedkey >>../ns3/bogus.example.db.signed
 
-echo $KEYSETTOOL $keyname
-$KEYSETTOOL $keyname
+$KEYSETTOOL -t 3600 $keyname
 
 cat $infile $keyname.key >$zonefile
 
-echo $SIGNER -o $zone $zonefile
 $SIGNER -o $zone $zonefile
 
 
diff --git a/bin/tests/system/dnssec/ns3/sign.sh b/bin/tests/system/dnssec/ns3/sign.sh
index c506c6ddf9..59e86d0730 100644
--- a/bin/tests/system/dnssec/ns3/sign.sh
+++ b/bin/tests/system/dnssec/ns3/sign.sh
@@ -6,12 +6,10 @@ zonefile=secure.example.db
 
 keyname=`$KEYGEN -a RSA -b 768 -n zone $zone`
 
-echo $KEYSETTOOL $keyname.key
-$KEYSETTOOL $keyname.key
+$KEYSETTOOL -t 3600 $keyname.key
 
 cat $infile $keyname.key >$zonefile
 
-echo $SIGNER -o $zone $zonefile
 $SIGNER -o $zone $zonefile
 
 zone=bogus.example.
@@ -20,10 +18,8 @@ zonefile=bogus.example.db
 
 keyname=`$KEYGEN -a RSA -b 768 -n zone $zone`
 
-echo $KEYSETTOOL $keyname.key
-$KEYSETTOOL $keyname.key
+$KEYSETTOOL -t 3600 $keyname.key
 
 cat $infile $keyname.key >$zonefile
 
-echo $SIGNER -o $zone $zonefile
 $SIGNER -o $zone $zonefile
diff --git a/bin/tests/system/ifconfig.sh b/bin/tests/system/ifconfig.sh
index 57c08b3232..d5c065828a 100644
--- a/bin/tests/system/ifconfig.sh
+++ b/bin/tests/system/ifconfig.sh
@@ -23,10 +23,10 @@ do
 		ifconfig lo0:$ns 10.53.0.$ns up
 		;;
 	    lo)
-		ifconfig lo:$ns 10.50.0.$ns up
+		ifconfig lo:$ns 10.53.0.$ns up
 		;;
 	    alias)
-		ifconfig lo0 10.50.0.$ns alias
+		ifconfig lo0 10.53.0.$ns alias
 		;;
             *)
 		echo "Don't know how to set up interface.  Giving up."