From: Evan Hunt <each@isc.org>
Date: Fri, 23 Feb 2018 21:28:47 +0000 (-0800)
Subject: tidying up after backport
X-Git-Tag: v9.11.4rc1~111^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=854f7846d80dbc1de229e93c3c99ecaef4a60dea;p=thirdparty%2Fbind9.git

tidying up after backport
---

diff --git a/bin/tests/system/addzone/clean.sh b/bin/tests/system/addzone/clean.sh
index 1916f110cec..335053ff021 100644
--- a/bin/tests/system/addzone/clean.sh
+++ b/bin/tests/system/addzone/clean.sh
@@ -6,8 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: clean.sh,v 1.3 2010/09/15 03:32:34 marka Exp $
-
 rm -f dig.out.*
 rm -f rndc.out*
 rm -f */named.conf
diff --git a/bin/tests/system/autosign/ns3/named.conf.in b/bin/tests/system/autosign/ns3/named.conf.in
index 00ec223b7c9..5e630852bad 100644
--- a/bin/tests/system/autosign/ns3/named.conf.in
+++ b/bin/tests/system/autosign/ns3/named.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named.conf,v 1.15 2012/02/06 23:46:47 tbox Exp $ */
-
 // NS3
 
 controls { /* empty */ };
diff --git a/bin/tests/system/autosign/ns4/named.conf.in b/bin/tests/system/autosign/ns4/named.conf.in
index af24ed96175..afc7dd1a7b2 100644
--- a/bin/tests/system/autosign/ns4/named.conf.in
+++ b/bin/tests/system/autosign/ns4/named.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named.conf,v 1.3 2009/11/30 23:48:02 tbox Exp $ */
-
 // NS4
 
 options {
diff --git a/bin/tests/system/cacheclean/ns2/named.conf.in b/bin/tests/system/cacheclean/ns2/named.conf.in
index e36fdffbf01..5b73d85a6b3 100644
--- a/bin/tests/system/cacheclean/ns2/named.conf.in
+++ b/bin/tests/system/cacheclean/ns2/named.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named.conf,v 1.10 2011/08/02 23:47:52 tbox Exp $ */
-
 options {
 	query-source address 10.53.0.2;
 	notify-source 10.53.0.2;
diff --git a/bin/tests/system/dlv/ns1/root.db.in b/bin/tests/system/dlv/ns1/root.db.in
index e2ce3f07bcd..a4d4bd92691 100644
--- a/bin/tests/system/dlv/ns1/root.db.in
+++ b/bin/tests/system/dlv/ns1/root.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db.in,v 1.3 2011/05/26 23:47:28 tbox Exp $
-
 $TTL	120
 @		SOA	ns.rootservers.utld hostmaster.ns.rootservers.utld (
 			1 3600 1200 604800 60 )
diff --git a/bin/tests/system/dlv/ns1/rootservers.utld.db b/bin/tests/system/dlv/ns1/rootservers.utld.db
index 820e610bf17..8491ed0e305 100644
--- a/bin/tests/system/dlv/ns1/rootservers.utld.db
+++ b/bin/tests/system/dlv/ns1/rootservers.utld.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: rootservers.utld.db,v 1.4 2007/06/19 23:47:02 tbox Exp $
-
 $TTL	120
 @	SOA	ns hostmaster.ns 1 3600 1200 604800 60
 @	NS	ns
diff --git a/bin/tests/system/dlv/ns2/druz.db.in b/bin/tests/system/dlv/ns2/druz.db.in
index 149ee853769..4e0f892a53f 100644
--- a/bin/tests/system/dlv/ns2/druz.db.in
+++ b/bin/tests/system/dlv/ns2/druz.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: druz.db.in,v 1.4 2011/05/26 23:47:28 tbox Exp $
-
 $TTL	120
 @		SOA	ns hostmaster.ns 1 3600 1200 604800 60
 @		NS	ns
diff --git a/bin/tests/system/dlv/ns2/hints b/bin/tests/system/dlv/ns2/hints
index 5916e9f781f..381e86b1522 100644
--- a/bin/tests/system/dlv/ns2/hints
+++ b/bin/tests/system/dlv/ns2/hints
@@ -7,7 +7,5 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: hints,v 1.4 2007/06/19 23:47:02 tbox Exp $
-
 . 0 NS ns.rootservers.utld.
 ns.rootservers.utld. 0 A 10.53.0.1
diff --git a/bin/tests/system/dlv/ns2/utld.db b/bin/tests/system/dlv/ns2/utld.db
index c64a02902fc..66f559d76f5 100644
--- a/bin/tests/system/dlv/ns2/utld.db
+++ b/bin/tests/system/dlv/ns2/utld.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: utld.db,v 1.4 2007/06/19 23:47:02 tbox Exp $
-
 $TTL	120
 @		SOA	ns hostmaster.ns 1 3600 1200 604800 60
 @		NS	ns
diff --git a/bin/tests/system/dlv/ns3/child.db.in b/bin/tests/system/dlv/ns3/child.db.in
index 5128a0d8d92..11df807ab75 100644
--- a/bin/tests/system/dlv/ns3/child.db.in
+++ b/bin/tests/system/dlv/ns3/child.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: child.db.in,v 1.6 2010/05/27 23:51:08 tbox Exp $
-
 $TTL	120
 @		SOA	ns hostmaster.ns 1 3600 1200 604800 60
 @		NS	ns
diff --git a/bin/tests/system/dlv/ns3/dlv.db.in b/bin/tests/system/dlv/ns3/dlv.db.in
index d25b9d8148f..fdc8ce99016 100644
--- a/bin/tests/system/dlv/ns3/dlv.db.in
+++ b/bin/tests/system/dlv/ns3/dlv.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: dlv.db.in,v 1.4 2007/06/19 23:47:02 tbox Exp $
-
 $TTL	120
 @		SOA	ns hostmaster.ns 1 3600 1200 604800 60
 @		NS	ns
diff --git a/bin/tests/system/dlv/ns3/hints b/bin/tests/system/dlv/ns3/hints
index 5916e9f781f..381e86b1522 100644
--- a/bin/tests/system/dlv/ns3/hints
+++ b/bin/tests/system/dlv/ns3/hints
@@ -7,7 +7,5 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: hints,v 1.4 2007/06/19 23:47:02 tbox Exp $
-
 . 0 NS ns.rootservers.utld.
 ns.rootservers.utld. 0 A 10.53.0.1
diff --git a/bin/tests/system/dlv/ns4/child.db b/bin/tests/system/dlv/ns4/child.db
index 2a94c7968ae..c123f70a950 100644
--- a/bin/tests/system/dlv/ns4/child.db
+++ b/bin/tests/system/dlv/ns4/child.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: child.db,v 1.4 2007/06/19 23:47:02 tbox Exp $
-
 $TTL	120
 @		SOA	ns hostmaster.ns 1 3600 1200 604800 60
 @		NS	ns
diff --git a/bin/tests/system/dlv/ns4/hints b/bin/tests/system/dlv/ns4/hints
index 5916e9f781f..381e86b1522 100644
--- a/bin/tests/system/dlv/ns4/hints
+++ b/bin/tests/system/dlv/ns4/hints
@@ -7,7 +7,5 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: hints,v 1.4 2007/06/19 23:47:02 tbox Exp $
-
 . 0 NS ns.rootservers.utld.
 ns.rootservers.utld. 0 A 10.53.0.1
diff --git a/bin/tests/system/dlv/ns5/hints b/bin/tests/system/dlv/ns5/hints
index 5916e9f781f..381e86b1522 100644
--- a/bin/tests/system/dlv/ns5/hints
+++ b/bin/tests/system/dlv/ns5/hints
@@ -7,7 +7,5 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: hints,v 1.4 2007/06/19 23:47:02 tbox Exp $
-
 . 0 NS ns.rootservers.utld.
 ns.rootservers.utld. 0 A 10.53.0.1
diff --git a/bin/tests/system/dlv/ns5/rndc.conf b/bin/tests/system/dlv/ns5/rndc.conf
index 070afc5ec9e..02bce927088 100644
--- a/bin/tests/system/dlv/ns5/rndc.conf
+++ b/bin/tests/system/dlv/ns5/rndc.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: rndc.conf,v 1.5 2007/06/19 23:47:02 tbox Exp $ */
-
 key "cc64b3d1db63fc88d7cb5d2f9f57d258" {
 	algorithm hmac-sha256;
 	secret "34f88008d07deabbe65bd01f1d233d47";
diff --git a/bin/tests/system/dlv/ns6/child.db.in b/bin/tests/system/dlv/ns6/child.db.in
index 6f884d5b871..09a942ed5f8 100644
--- a/bin/tests/system/dlv/ns6/child.db.in
+++ b/bin/tests/system/dlv/ns6/child.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: child.db.in,v 1.2 2010/05/26 06:28:00 marka Exp $
-
 $TTL	120
 @		SOA	ns hostmaster.ns6 1 3600 1200 604800 60
 @		NS	ns
diff --git a/bin/tests/system/dlv/ns6/hints b/bin/tests/system/dlv/ns6/hints
index 643113edeec..381e86b1522 100644
--- a/bin/tests/system/dlv/ns6/hints
+++ b/bin/tests/system/dlv/ns6/hints
@@ -7,7 +7,5 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: hints,v 1.3 2010/05/26 23:50:47 tbox Exp $
-
 . 0 NS ns.rootservers.utld.
 ns.rootservers.utld. 0 A 10.53.0.1
diff --git a/bin/tests/system/dnssec/ns2/named.conf.in b/bin/tests/system/dnssec/ns2/named.conf.in
index 823e7dbd4e8..09399a2d792 100644
--- a/bin/tests/system/dnssec/ns2/named.conf.in
+++ b/bin/tests/system/dnssec/ns2/named.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named.conf,v 1.36 2011/03/21 23:47:21 tbox Exp $ */
-
 // NS2
 
 options {
diff --git a/bin/tests/system/dnssec/ns3/named.conf.in b/bin/tests/system/dnssec/ns3/named.conf.in
index 925f9412b60..ba09056fe68 100644
--- a/bin/tests/system/dnssec/ns3/named.conf.in
+++ b/bin/tests/system/dnssec/ns3/named.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named.conf,v 1.49 2011/10/28 06:20:05 each Exp $ */
-
 // NS3
 
 options {
diff --git a/bin/tests/system/dnssec/ns4/named1.conf.in b/bin/tests/system/dnssec/ns4/named1.conf.in
index 5927d1b17bb..251a4a03689 100644
--- a/bin/tests/system/dnssec/ns4/named1.conf.in
+++ b/bin/tests/system/dnssec/ns4/named1.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named1.conf,v 1.3 2011/01/04 23:47:13 tbox Exp $ */
-
 // NS4
 
 options {
diff --git a/bin/tests/system/dnssec/ns4/named2.conf.in b/bin/tests/system/dnssec/ns4/named2.conf.in
index 8b12f3649cf..471a0738fe2 100644
--- a/bin/tests/system/dnssec/ns4/named2.conf.in
+++ b/bin/tests/system/dnssec/ns4/named2.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named2.conf,v 1.3 2011/01/04 23:47:13 tbox Exp $ */
-
 // NS4
 
 options {
diff --git a/bin/tests/system/dnssec/ns4/named3.conf.in b/bin/tests/system/dnssec/ns4/named3.conf.in
index 63988ef40dd..a97951483db 100644
--- a/bin/tests/system/dnssec/ns4/named3.conf.in
+++ b/bin/tests/system/dnssec/ns4/named3.conf.in
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named2.conf,v 1.3 2011/01/04 23:47:13 tbox Exp $ */
-
 // NS4
 
 options {
diff --git a/bin/tests/system/dnssec/ns4/named5.conf.in b/bin/tests/system/dnssec/ns4/named5.conf.in
index 949e4a04a3f..65dad983e50 100644
--- a/bin/tests/system/dnssec/ns4/named5.conf.in
+++ b/bin/tests/system/dnssec/ns4/named5.conf.in
@@ -8,8 +8,6 @@
 
 // NS4
 
-controls { /* empty */ };
-
 options {
 	query-source address 10.53.0.4;
 	notify-source 10.53.0.4;
diff --git a/bin/tests/system/glue/tests.sh b/bin/tests/system/glue/tests.sh
index 9491fbfe041..4d73849d2b1 100644
--- a/bin/tests/system/glue/tests.sh
+++ b/bin/tests/system/glue/tests.sh
@@ -22,11 +22,11 @@ $DIG $DIGOPTS @10.53.0.1 foo.bar.fi. A >dig.out || status=1
 $PERL ../digcomp.pl --lc fi.good dig.out || status=1
 
 echo_i "testing that we find glue A RRs we are authoritative for"
-$DIG +norec @10.53.0.1 -p 5300 foo.bar.xx. a >dig.out || status=1
+$DIG +norec @10.53.0.1 -p ${PORT} foo.bar.xx. a >dig.out || status=1
 $PERL ../digcomp.pl xx.good dig.out || status=1
 
 echo_i "testing that we find glue A/AAAA RRs in the cache"
-$DIG +norec @10.53.0.1 -p 5300 foo.bar.yy. a >dig.out || status=1
+$DIG +norec @10.53.0.1 -p ${PORT} foo.bar.yy. a >dig.out || status=1
 $PERL ../digcomp.pl yy.good dig.out || status=1
 
 echo_i "testing that we don't find out-of-zone glue"
diff --git a/bin/tests/system/logfileconfig/clean.sh b/bin/tests/system/logfileconfig/clean.sh
index 69ed3455887..a75a51ea8d1 100644
--- a/bin/tests/system/logfileconfig/clean.sh
+++ b/bin/tests/system/logfileconfig/clean.sh
@@ -6,8 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: clean.sh,v 1.4 2011/03/22 16:51:50 smann Exp $
-
 #
 # Clean up after log file tests
 #
diff --git a/bin/tests/system/logfileconfig/tests.sh b/bin/tests/system/logfileconfig/tests.sh
index 0fe0ac11972..8267b439663 100644
--- a/bin/tests/system/logfileconfig/tests.sh
+++ b/bin/tests/system/logfileconfig/tests.sh
@@ -292,7 +292,7 @@ echo_i "testing logging functionality"
 
 n=`expr $n + 1`
 echo_i "testing explicit versions ($n)"
-cp $VERSCONF named.conf
+copy_setports $VERSCONF named.conf
 # a seconds since epoch version number
 touch $VERSFILE.1480039317
 t1=`$PERL -e 'print time()."\n";'`
@@ -328,7 +328,7 @@ fi
 
 n=`expr $n + 1`
 echo_i "testing unlimited versions ($n)"
-cp $UNLIMITEDCONF named.conf
+copy_setports $UNLIMITEDCONF named.conf
 # a seconds since epoch version number
 touch $UNLIMITEDFILE.1480039317
 t1=`$PERL -e 'print time()."\n";'`
diff --git a/bin/tests/system/lwresd/lwresd1/lwresd.conf.in b/bin/tests/system/lwresd/lwresd1/lwresd.conf.in
deleted file mode 100644
index 64db59211a9..00000000000
--- a/bin/tests/system/lwresd/lwresd1/lwresd.conf.in
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  Internet Systems Consortium, Inc. ("ISC")
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-/* $Id: lwresd.conf,v 1.8 2007/06/19 23:47:04 tbox Exp $ */
-
-controls { /* empty */ };
-
-options {
-	port 5300;
-	pid-file "lwresd.pid";
-	forwarders {10.53.0.1;};
-	forward only;
-};
-
-lwres {
-	listen-on {10.53.0.1 port 9210;};
-	view "_default";
-	search {example1.;};
-	ndots 1;
-};
diff --git a/bin/tests/system/lwresd/lwresd1/nosearch.conf.in b/bin/tests/system/lwresd/lwresd1/nosearch.conf.in
deleted file mode 100644
index ec8d9eb8fa2..00000000000
--- a/bin/tests/system/lwresd/lwresd1/nosearch.conf.in
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-/* $Id: lwresd.conf,v 1.8 2007/06/19 23:47:04 tbox Exp $ */
-
-controls { /* empty */ };
-
-options {
-	port 5300;
-	pid-file "lwresd.pid";
-	forwarders {10.53.0.1;};
-	forward only;
-};
-
-lwres {
-	listen-on {10.53.0.1 port 9210;};
-	view "_default";
-	ndots 1;
-};
diff --git a/bin/tests/system/lwresd/ns1/named.conf.in b/bin/tests/system/lwresd/ns1/named.conf.in
deleted file mode 100644
index abb77e2fa61..00000000000
--- a/bin/tests/system/lwresd/ns1/named.conf.in
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2000, 2001, 2004, 2006-2008, 2016  Internet Systems Consortium, Inc. ("ISC")
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-/* $Id: named.conf,v 1.21 2008/04/02 23:46:57 tbox Exp $ */
-
-controls { /* empty */ };
-
-options {
-	query-source address 10.53.0.1;
-	notify-source 10.53.0.1;
-	transfer-source 10.53.0.1;
-	port 5300;
-	pid-file "named.pid";
-	listen-on { 10.53.0.1; };
-	listen-on-v6 { none; };
-	recursion no;
-	notify no;
-	dnssec-enable yes;
-	dnssec-validation yes;
-};
-
-zone "." {
-	type master;
-	file "root.db";
-};
-
-zone "example1." {
-	type master;
-	file "example1.db";
-};
-
-zone "e.example1." {
-	type master;
-	file "e.example1.db";
-};
-
-zone "example2." {
-	type master;
-	file "example2.db";
-};
-
-zone "10.10.10.in-addr.arpa." {
-	type master;
-	file "10.10.10.in-addr.arpa.db";
-};
-
-zone "ip6.int." {
-	type master;
-	file "ip6.int.db";
-};
-
-zone "ip6.arpa." {
-	type master;
-	file "ip6.arpa.db";
-};
diff --git a/bin/tests/system/lwresd/setup.sh b/bin/tests/system/lwresd/setup.sh
deleted file mode 100644
index aa0a847fe4b..00000000000
--- a/bin/tests/system/lwresd/setup.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C)  2018  Internet Systems Consortium, Inc. ("ISC")
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-SYSTEMTESTTOP=..
-. $SYSTEMTESTTOP/conf.sh
-
-$SHELL clean.sh
-copy_setports ns1/named.conf.in ns1/named.conf
-
-copy_setports lwresd1/lwresd.conf.in lwresd1/lwresd.conf
-copy_setports lwresd1/nosearch.conf.in lwresd1/nosearch.conf
diff --git a/bin/tests/system/pipelined/pipequeries.c b/bin/tests/system/pipelined/pipequeries.c
index 715c84b5f17..02b0ed6314c 100644
--- a/bin/tests/system/pipelined/pipequeries.c
+++ b/bin/tests/system/pipelined/pipequeries.c
@@ -219,7 +219,7 @@ main(int argc, char *argv[]) {
 	UNUSED(argv);
 
 	isc_commandline_errprint = ISC_FALSE;
-	while ((c = isc_commandline_parse(argc, argv, "p:r:")) != -1) {
+	while ((c = isc_commandline_parse(argc, argv, "p:")) != -1) {
 		switch (c) {
 		case 'p':
 			result = isc_parse_uint16(&port,
@@ -230,9 +230,6 @@ main(int argc, char *argv[]) {
 				exit(1);
 			}
 			break;
-		case 'r':
-			randomfile = isc_commandline_argument;
-			break;
 		case '?':
 			fprintf(stderr, "%s: invalid argument '%c'",
 				argv[0], c);
diff --git a/bin/tests/system/rrsetorder/clean.sh b/bin/tests/system/rrsetorder/clean.sh
index eb1a4774f11..0021a50945e 100644
--- a/bin/tests/system/rrsetorder/clean.sh
+++ b/bin/tests/system/rrsetorder/clean.sh
@@ -6,8 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: clean.sh,v 1.10 2011/12/23 23:47:13 tbox Exp $
-
 rm -f dig.out.test*
 rm -f dig.out.cyclic dig.out.fixed dig.out.random
 rm -f dig.out.0 dig.out.1 dig.out.2 dig.out.3
diff --git a/bin/tests/system/tsig/clean.sh b/bin/tests/system/tsig/clean.sh
index 35f1763201d..b31f238742d 100644
--- a/bin/tests/system/tsig/clean.sh
+++ b/bin/tests/system/tsig/clean.sh
@@ -6,8 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: clean.sh,v 1.6 2007/09/26 03:22:44 marka Exp $
-
 #
 # Clean up after tsig tests.
 #