release/3.4.0_cvs

7712 files changed, 19091 insertions, 148807 deletions

diff --git a/COPYRIGHT b/COPYRIGHT
index 1a96b64934cf..d700148acf3f 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/COPYRIGHT,v 1.2.2.2 1999/09/11 09:22:33 obrien Exp $
 #	@(#)COPYRIGHT	8.2 (Berkeley) 3/21/94
 
 All of the documentation and software included in the 4.4BSD and 4.4BSD-Lite
diff --git a/Makefile b/Makefile
index 47f6937475eb..ff7c7e22554a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/Makefile,v 1.222.2.5 1999/08/29 15:55:25 peter Exp $
 #
 # The user-driven targets are:
 #
diff --git a/Makefile.inc0 b/Makefile.inc0
index b46c65c3f8d5..3f6358ed8007 100644
--- a/Makefile.inc0
+++ b/Makefile.inc0
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/Makefile.inc0,v 1.14.2.4 1999/08/29 15:55:26 peter Exp $
 #
 # This makefile ensures that the object directory is set according to the
 # object format to avoid mixing aout and elf formatted files during the
diff --git a/Makefile.inc1 b/Makefile.inc1
index 33f66f199349..06cfb05e1100 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/Makefile.inc1,v 1.59.2.7 1999/11/25 20:00:31 julian Exp $
 #
 # Make command line options:
 #	-DCLOBBER will remove /usr/include
diff --git a/Makefile.upgrade b/Makefile.upgrade
index 4d4607e02381..1c7acefe1968 100644
--- a/Makefile.upgrade
+++ b/Makefile.upgrade
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/Makefile.upgrade,v 1.9.2.11 1999/08/29 15:55:27 peter Exp $
 #
 # This makefile contains rules for preforming upgrades that are outside
 # the scope of the normal build world process.
diff --git a/README b/README
index 2801b274b354..8db2f372b9ef 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 This is the top level of the FreeBSD source directory.  This file
 was last revised on:
-$FreeBSD$
+$FreeBSD: src/README,v 1.14.2.1 1999/08/29 15:55:28 peter Exp $
 
 For copyright information, please see the file COPYRIGHT in this
 directory (additional copyright information also exists for some
diff --git a/UPDATING b/UPDATING
index a600dbf1b9b5..a31829deef24 100644
--- a/UPDATING
+++ b/UPDATING
@@ -134,4 +134,4 @@ version of FreeBSD, you are on your own to get to November 18, 1998.
 Please filter your entries through Warner (imp@village.org) so that
 the style, formatting, etc of this file can be maintained.
 
-$FreeBSD$
+$FreeBSD: src/UPDATING,v 1.14.2.3 1999/08/29 15:55:29 peter Exp $
diff --git a/bin/Makefile b/bin/Makefile
index c78bf08d8cf4..a1a81218decf 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/Makefile,v 1.14.2.1 1999/08/29 14:11:19 peter Exp $
 
 SUBDIR= cat \
 	chio \
diff --git a/bin/Makefile.inc b/bin/Makefile.inc
index d29f43ab50c7..153e50edfffd 100644
--- a/bin/Makefile.inc
+++ b/bin/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/Makefile.inc,v 1.10.2.1 1999/08/29 14:11:20 peter Exp $
 
 BINDIR?=	/bin
 CFLAGS+=	-Wall -Wformat
diff --git a/bin/cat/Makefile b/bin/cat/Makefile
index 672a4eeeeff5..6bb05a256445 100644
--- a/bin/cat/Makefile
+++ b/bin/cat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/cat/Makefile,v 1.4.2.1 1999/08/29 14:11:23 peter Exp $
 
 PROG=	cat
 
diff --git a/bin/cat/cat.1 b/bin/cat/cat.1
index ce684fd94ad8..bed8194cae61 100644
--- a/bin/cat/cat.1
+++ b/bin/cat/cat.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cat.1	8.3 (Berkeley) 5/2/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/cat/cat.1,v 1.8.2.2 1999/08/29 14:11:23 peter Exp $
 .\"
 .Dd May 2, 1995
 .Dt CAT 1
diff --git a/bin/cat/cat.c b/bin/cat/cat.c
index f88c125ff316..0aef3ccbdf91 100644
--- a/bin/cat/cat.c
+++ b/bin/cat/cat.c
@@ -45,7 +45,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)cat.c	8.2 (Berkeley) 4/27/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/cat/cat.c,v 1.13.2.1 1999/08/29 14:11:24 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/chio/Makefile b/bin/chio/Makefile
index d4b7f56e3c97..f43494e03697 100644
--- a/bin/chio/Makefile
+++ b/bin/chio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/chio/Makefile,v 1.3.2.1 1999/08/29 14:11:26 peter Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 CFLAGS+=-I${.CURDIR}/../../sys
diff --git a/bin/chio/chio.1 b/bin/chio/chio.1
index 34f913f4287d..ff4b0ef89bde 100644
--- a/bin/chio/chio.1
+++ b/bin/chio/chio.1
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/chio/chio.1,v 1.8.2.2 1999/12/06 04:48:56 kris Exp $
 .\"
 .Dd May 14, 1998
 .Dt CHIO 1
diff --git a/bin/chio/chio.c b/bin/chio/chio.c
index c7ee34429f27..eb5b781f38f2 100644
--- a/bin/chio/chio.c
+++ b/bin/chio/chio.c
@@ -38,7 +38,7 @@
 static const char copyright[] =
 	"@(#) Copyright (c) 1996 Jason R. Thorpe.  All rights reserved.";
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/chio/chio.c,v 1.9.2.1 1999/12/06 04:48:56 kris Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/chio/defs.h b/bin/chio/defs.h
index f4580a54b586..5adec8492f18 100644
--- a/bin/chio/defs.h
+++ b/bin/chio/defs.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/bin/chio/defs.h,v 1.1.1.1.4.1 1999/08/29 14:11:27 peter Exp $	*/
 
 /*
  * Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
diff --git a/bin/chio/pathnames.h b/bin/chio/pathnames.h
index 9a9b74a54815..3419fbb1ed1f 100644
--- a/bin/chio/pathnames.h
+++ b/bin/chio/pathnames.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/bin/chio/pathnames.h,v 1.1.1.1.4.1 1999/08/29 14:11:28 peter Exp $	*/
 
 /*
  * Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
diff --git a/bin/chmod/Makefile b/bin/chmod/Makefile
index 71006d00a523..56ea3354a413 100644
--- a/bin/chmod/Makefile
+++ b/bin/chmod/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/chmod/Makefile,v 1.4.2.1 1999/08/29 14:11:29 peter Exp $
 
 PROG=	chmod
 
diff --git a/bin/chmod/chmod.1 b/bin/chmod/chmod.1
index 9726006ea23c..50f5c016b388 100644
--- a/bin/chmod/chmod.1
+++ b/bin/chmod/chmod.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chmod.1	8.4 (Berkeley) 3/31/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.10.2.5 1999/08/29 14:11:30 peter Exp $
 .\"
 .Dd March 31, 1994
 .Dt CHMOD 1
diff --git a/bin/chmod/chmod.c b/bin/chmod/chmod.c
index 21841c6fdc17..6a704367eb9f 100644
--- a/bin/chmod/chmod.c
+++ b/bin/chmod/chmod.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)chmod.c	8.8 (Berkeley) 4/1/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/chmod/chmod.c,v 1.12.2.2 1999/08/29 14:11:31 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/cp/Makefile b/bin/cp/Makefile
index 54934efe421b..efc2f40ea246 100644
--- a/bin/cp/Makefile
+++ b/bin/cp/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/cp/Makefile,v 1.5.2.1 1999/08/29 14:11:32 peter Exp $
 
 PROG=	cp
 SRCS=	cp.c utils.c
diff --git a/bin/cp/cp.1 b/bin/cp/cp.1
index 54e050a50cef..6ad6ab368904 100644
--- a/bin/cp/cp.1
+++ b/bin/cp/cp.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cp.1	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/cp/cp.1,v 1.11.2.3 1999/12/11 20:33:30 mharo Exp $
 .\"
 .Dd April 18, 1994
 .Dt CP 1
diff --git a/bin/cp/cp.c b/bin/cp/cp.c
index e528aeae93cb..04d10ca49511 100644
--- a/bin/cp/cp.c
+++ b/bin/cp/cp.c
@@ -45,7 +45,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)cp.c	8.2 (Berkeley) 4/1/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/cp/cp.c,v 1.17.2.3 1999/12/11 20:33:31 mharo Exp $";
 #endif /* not lint */
 
 /*
diff --git a/bin/cp/extern.h b/bin/cp/extern.h
index c6c1e7e1de5f..530dbd8f1177 100644
--- a/bin/cp/extern.h
+++ b/bin/cp/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/1/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/cp/extern.h,v 1.7.2.1 1999/08/29 14:11:34 peter Exp $
  */
 
 typedef struct {
diff --git a/bin/cp/utils.c b/bin/cp/utils.c
index 7e94ed9b56fc..9412651221e9 100644
--- a/bin/cp/utils.c
+++ b/bin/cp/utils.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)utils.c	8.3 (Berkeley) 4/1/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/cp/utils.c,v 1.21.2.3 1999/12/11 20:33:31 mharo Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index 3ebbb1e1f9db..291a397fe355 100644
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/csh/Makefile,v 1.9.2.2 1999/12/10 13:03:00 sheldonh Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 #
 # C Shell with process control; VM/UNIX VAX Makefile
diff --git a/bin/csh/USD.doc/Makefile b/bin/csh/USD.doc/Makefile
index e067417f94b3..8acfc6018ed5 100644
--- a/bin/csh/USD.doc/Makefile
+++ b/bin/csh/USD.doc/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
-# $FreeBSD$
+# $FreeBSD: src/bin/csh/USD.doc/Makefile,v 1.4.2.1 1999/08/29 14:11:56 peter Exp $
 
 DIR=	usd/04.csh
 SRCS=	tabs csh.1 csh.2 csh.3 csh.4 csh.a csh.g
diff --git a/bin/csh/USD.doc/csh.1 b/bin/csh/USD.doc/csh.1
index 0f5b387220db..a5ea06cb8d0d 100644
--- a/bin/csh/USD.doc/csh.1
+++ b/bin/csh/USD.doc/csh.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.1	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.1,v 1.5.2.1 1999/08/29 14:11:56 peter Exp $
 .\"
 .EH 'USD:4-%''An Introduction to the C shell'
 .OH 'An Introduction to the C shell''USD:4-%'
diff --git a/bin/csh/USD.doc/csh.2 b/bin/csh/USD.doc/csh.2
index 18d9439240a5..c4f937d96fc0 100644
--- a/bin/csh/USD.doc/csh.2
+++ b/bin/csh/USD.doc/csh.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.2	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.2,v 1.5.2.1 1999/08/29 14:11:57 peter Exp $
 .\"
 .nr H1 1
 .NH
diff --git a/bin/csh/USD.doc/csh.3 b/bin/csh/USD.doc/csh.3
index 6a85fe063716..43ee4e792a5d 100644
--- a/bin/csh/USD.doc/csh.3
+++ b/bin/csh/USD.doc/csh.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.3	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.3,v 1.4.2.1 1999/08/29 14:11:58 peter Exp $
 .\"
 .nr H1 2
 .NH
diff --git a/bin/csh/USD.doc/csh.4 b/bin/csh/USD.doc/csh.4
index 8a2bcbda5ecd..cbe855717ff1 100644
--- a/bin/csh/USD.doc/csh.4
+++ b/bin/csh/USD.doc/csh.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.4	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.4,v 1.4.2.1 1999/08/29 14:11:58 peter Exp $
 .\"
 .nr H1 3
 .NH
diff --git a/bin/csh/USD.doc/csh.a b/bin/csh/USD.doc/csh.a
index 176534fac1d3..4aeaca9f0caa 100644
--- a/bin/csh/USD.doc/csh.a
+++ b/bin/csh/USD.doc/csh.a
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.a	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.a,v 1.4.2.1 1999/08/29 14:11:59 peter Exp $
 .\"
 .SH
 Appendix \- Special characters
diff --git a/bin/csh/USD.doc/csh.g b/bin/csh/USD.doc/csh.g
index 41151735df23..6525f4d90eb9 100644
--- a/bin/csh/USD.doc/csh.g
+++ b/bin/csh/USD.doc/csh.g
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.g	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.g,v 1.4.2.1 1999/08/29 14:12:00 peter Exp $
 .\"
 .SH
 Glossary
diff --git a/bin/csh/USD.doc/tabs b/bin/csh/USD.doc/tabs
index 7066e0716d36..8c1ba98249b0 100644
--- a/bin/csh/USD.doc/tabs
+++ b/bin/csh/USD.doc/tabs
@@ -30,6 +30,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tabs	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/tabs,v 1.4.2.1 1999/08/29 14:12:00 peter Exp $
 .\"
 .ta 5n 10n 15n 20n 25n 30n 35n 40n 45n 50n 55n 60n 65n 70n 75n 80n
diff --git a/bin/csh/alloc.c b/bin/csh/alloc.c
index 16533298f62f..b2bc7481bf4a 100644
--- a/bin/csh/alloc.c
+++ b/bin/csh/alloc.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)alloc.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/csh/alloc.c,v 1.9.2.1 1999/08/29 14:11:37 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/char.c b/bin/csh/char.c
index b2aa378df682..0c939d029f96 100644
--- a/bin/csh/char.c
+++ b/bin/csh/char.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)char.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/csh/char.c,v 1.5.2.1 1999/08/29 14:11:38 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/char.h b/bin/csh/char.h
index 396e7ab34067..065f00761ebd 100644
--- a/bin/csh/char.h
+++ b/bin/csh/char.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)char.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/csh/char.h,v 1.4.2.1 1999/08/29 14:11:38 peter Exp $
  */
 
 #include <ctype.h>
diff --git a/bin/csh/const.c b/bin/csh/const.c
index 41de3c124157..2a577929fe9b 100644
--- a/bin/csh/const.c
+++ b/bin/csh/const.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)const.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/csh/const.c,v 1.7.2.1 1999/08/29 14:11:39 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/csh.1 b/bin/csh/csh.1
index 14c94c9e0715..fd62c0c2ec90 100644
--- a/bin/csh/csh.1
+++ b/bin/csh/csh.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)csh.1	8.2 (Berkeley) 1/21/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/csh.1,v 1.11.2.4 1999/12/10 13:03:00 sheldonh Exp $
 .\"
 .Dd January 21, 1994
 .Dt CSH 1
diff --git a/bin/csh/csh.c b/bin/csh/csh.c
index 0bbc55773c1b..e8b1d8ccebe7 100644
--- a/bin/csh/csh.c
+++ b/bin/csh/csh.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)csh.c	8.2 (Berkeley) 10/12/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/csh/csh.c,v 1.13.2.2 1999/08/29 14:11:40 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/csh.h b/bin/csh/csh.h
index cf6723f92aeb..d8f1689f9198 100644
--- a/bin/csh/csh.h
+++ b/bin/csh/csh.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)csh.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/csh/csh.h,v 1.6.2.2 1999/08/29 14:11:40 peter Exp $
  */
 
 /*
diff --git a/bin/csh/dir.c b/bin/csh/dir.c
index 62acd391493c..ca9ae7f6c0e4 100644
--- a/bin/csh/dir.c
+++ b/bin/csh/dir.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)dir.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/csh/dir.c,v 1.9.2.1 1999/08/29 14:11:41 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/dir.h b/bin/csh/dir.h
index 285acb7ccca3..f2d9c44da002 100644
--- a/bin/csh/dir.h
+++ b/bin/csh/dir.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dir.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/csh/dir.h,v 1.4.2.1 1999/08/29 14:11:42 peter Exp $
  */
 
 /*
diff --git a/bin/csh/dol.c b/bin/csh/dol.c
index c361406550c7..f7da152e1a0d 100644
--- a/bin/csh/dol.c
+++ b/bin/csh/dol.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)dol.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/csh/dol.c,v 1.8.2.1 1999/08/29 14:11:42 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/err.c b/bin/csh/err.c
index 9eb689d64665..5c3ac4e53649 100644
--- a/bin/csh/err.c
+++ b/bin/csh/err.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/csh/err.c,v 1.8.2.2 1999/08/29 14:11:43 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/exec.c b/bin/csh/exec.c
index 64d45d29fadd..a90e92ff16f6 100644
--- a/bin/csh/exec.c
+++ b/bin/csh/exec.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)exec.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/csh/exec.c,v 1.10.2.1 1999/08/29 14:11:44 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/exp.c b/bin/csh/exp.c
index b6ec28095c53..176713cc0ea8 100644
--- a/bin/csh/exp.c
+++ b/bin/csh/exp.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)exp.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/csh/exp.c,v 1.7.2.1 1999/08/29 14:11:44 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/extern.h b/bin/csh/extern.h
index a1cbfcb5aa23..67f38e356c87 100644
--- a/bin/csh/extern.h
+++ b/bin/csh/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/csh/extern.h,v 1.5.2.1 1999/08/29 14:11:45 peter Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/bin/csh/file.c b/bin/csh/file.c
index a1f5ab2f19bf..09a62b673874 100644
--- a/bin/csh/file.c
+++ b/bin/csh/file.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)file.c	8.2 (Berkeley) 3/19/94";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/csh/file.c,v 1.9.2.1 1999/08/29 14:11:45 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/func.c b/bin/csh/func.c
index 654aeeba8522..651f5b61bb0f 100644
--- a/bin/csh/func.c
+++ b/bin/csh/func.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)func.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/csh/func.c,v 1.11.2.2 1999/08/29 14:11:46 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/glob.c b/bin/csh/glob.c
index 09c928a570ec..1e2aa290837b 100644
--- a/bin/csh/glob.c
+++ b/bin/csh/glob.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)glob.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/csh/glob.c,v 1.11.2.1 1999/08/29 14:11:46 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/hist.c b/bin/csh/hist.c
index 2df74e1d1740..0846e981a532 100644
--- a/bin/csh/hist.c
+++ b/bin/csh/hist.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)hist.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/csh/hist.c,v 1.8.2.1 1999/08/29 14:11:47 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/init.c b/bin/csh/init.c
index c290a6b5d85b..bbdddc210d1c 100644
--- a/bin/csh/init.c
+++ b/bin/csh/init.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)init.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/csh/init.c,v 1.5.2.1 1999/08/29 14:11:47 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/lex.c b/bin/csh/lex.c
index 75f125bbdbe2..f9676d98c6fb 100644
--- a/bin/csh/lex.c
+++ b/bin/csh/lex.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)lex.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/csh/lex.c,v 1.10.2.2 1999/08/29 14:11:48 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/misc.c b/bin/csh/misc.c
index 56491d12163f..d97231b7277f 100644
--- a/bin/csh/misc.c
+++ b/bin/csh/misc.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/csh/misc.c,v 1.8.2.1 1999/08/29 14:11:48 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/parse.c b/bin/csh/parse.c
index 4cb2fcf5af1c..8d44851b7c47 100644
--- a/bin/csh/parse.c
+++ b/bin/csh/parse.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/csh/parse.c,v 1.8.2.1 1999/08/29 14:11:49 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/pathnames.h b/bin/csh/pathnames.h
index bcdb4caf46f0..78f0028ca05f 100644
--- a/bin/csh/pathnames.h
+++ b/bin/csh/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/csh/pathnames.h,v 1.5.2.1 1999/08/29 14:11:49 peter Exp $
  */
 
 #define	_PATH_BIN		"/bin"
diff --git a/bin/csh/proc.c b/bin/csh/proc.c
index a6631ec3eb30..2c34a6f70f0c 100644
--- a/bin/csh/proc.c
+++ b/bin/csh/proc.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)proc.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/csh/proc.c,v 1.9.2.2 1999/08/29 14:11:50 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/proc.h b/bin/csh/proc.h
index 0aa52595ba82..6714fb05502b 100644
--- a/bin/csh/proc.h
+++ b/bin/csh/proc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)proc.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/csh/proc.h,v 1.4.2.1 1999/08/29 14:11:50 peter Exp $
  */
 
 /*
diff --git a/bin/csh/sem.c b/bin/csh/sem.c
index f873b5953cb9..860e688d2924 100644
--- a/bin/csh/sem.c
+++ b/bin/csh/sem.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)sem.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/csh/sem.c,v 1.8.2.2 1999/08/29 14:11:51 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/set.c b/bin/csh/set.c
index af6c6cd19241..e632fa2e306c 100644
--- a/bin/csh/set.c
+++ b/bin/csh/set.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)set.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/csh/set.c,v 1.10.2.2 1999/08/29 14:11:51 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/str.c b/bin/csh/str.c
index e205e22ed6dd..0ad31f045c05 100644
--- a/bin/csh/str.c
+++ b/bin/csh/str.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)str.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/csh/str.c,v 1.6.2.1 1999/08/29 14:11:52 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/time.c b/bin/csh/time.c
index bda3874b5dd1..87c9e0b8ed61 100644
--- a/bin/csh/time.c
+++ b/bin/csh/time.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)time.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/csh/time.c,v 1.8.2.2 1999/08/29 14:11:53 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/date/Makefile b/bin/date/Makefile
index 8a1dc8579330..da622361188e 100644
--- a/bin/date/Makefile
+++ b/bin/date/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/date/Makefile,v 1.7.2.1 1999/08/29 14:12:02 peter Exp $
 
 PROG=	date
 SRCS=	date.c netdate.c vary.c
diff --git a/bin/date/date.1 b/bin/date/date.1
index 1366b6ed40fd..60867da91551 100644
--- a/bin/date/date.1
+++ b/bin/date/date.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.3 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/date/date.1,v 1.26.2.4 1999/12/15 13:57:03 sheldonh Exp $
 .\"
 .Dd November 17, 1993
 .Dt DATE 1
diff --git a/bin/date/date.c b/bin/date/date.c
index 779ab2f3189f..9fd91f650234 100644
--- a/bin/date/date.c
+++ b/bin/date/date.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)date.c	8.2 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/date/date.c,v 1.26.2.4 1999/12/15 13:57:04 sheldonh Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/date/extern.h b/bin/date/extern.h
index 4726eb6a97c3..f60476085789 100644
--- a/bin/date/extern.h
+++ b/bin/date/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/date/extern.h,v 1.4.2.1 1999/08/29 14:12:04 peter Exp $
  */
 
 int	netsettime __P((time_t));
diff --git a/bin/date/netdate.c b/bin/date/netdate.c
index 3ec041ad1813..9df156eb2278 100644
--- a/bin/date/netdate.c
+++ b/bin/date/netdate.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)netdate.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/date/netdate.c,v 1.10.2.1 1999/08/29 14:12:04 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/date/vary.c b/bin/date/vary.c
index 689b77af10df..fe4564a20959 100644
--- a/bin/date/vary.c
+++ b/bin/date/vary.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/date/vary.c,v 1.4.2.2 1999/08/29 14:12:05 peter Exp $";
 #endif /* not lint */
 
 #include <time.h>
diff --git a/bin/date/vary.h b/bin/date/vary.h
index b39306a2bb23..2ff82b7875df 100644
--- a/bin/date/vary.h
+++ b/bin/date/vary.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/bin/date/vary.h,v 1.3.2.1 1999/08/29 14:12:05 peter Exp $
  */
 
 struct vary {
diff --git a/bin/dd/Makefile b/bin/dd/Makefile
index 0cbd23895879..be248c7d6bb9 100644
--- a/bin/dd/Makefile
+++ b/bin/dd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/dd/Makefile,v 1.6.2.2 1999/12/12 01:54:02 green Exp $
 
 PROG=	dd
 SRCS=	args.c conv.c conv_tab.c dd.c misc.c position.c
diff --git a/bin/dd/args.c b/bin/dd/args.c
index 418b5cc91117..d2ff2f2d8432 100644
--- a/bin/dd/args.c
+++ b/bin/dd/args.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)args.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/dd/args.c,v 1.13.2.3 1999/12/12 01:54:03 green Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/dd/conv.c b/bin/dd/conv.c
index 0987a67f081b..33b9eef3b3fd 100644
--- a/bin/dd/conv.c
+++ b/bin/dd/conv.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)conv.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/dd/conv.c,v 1.10.2.2 1999/12/12 01:54:03 green Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/dd/conv_tab.c b/bin/dd/conv_tab.c
index bd951a76b34c..5ab93b413cf7 100644
--- a/bin/dd/conv_tab.c
+++ b/bin/dd/conv_tab.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)conv_tab.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/dd/conv_tab.c,v 1.8.2.2 1999/12/12 01:54:04 green Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/dd/dd.1 b/bin/dd/dd.1
index 49831dfdff57..4d16a814c1e0 100644
--- a/bin/dd/dd.1
+++ b/bin/dd/dd.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/dd/dd.1,v 1.8.2.3 1999/12/12 01:54:04 green Exp $
 .\"
 .Dd January 13, 1994
 .Dt DD 1
diff --git a/bin/dd/dd.c b/bin/dd/dd.c
index 9635ce996678..89c0f943e4b7 100644
--- a/bin/dd/dd.c
+++ b/bin/dd/dd.c
@@ -46,7 +46,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)dd.c	8.5 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/dd/dd.c,v 1.15.2.2 1999/12/12 01:54:04 green Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/dd/dd.h b/bin/dd/dd.h
index ae27a0ef9f28..925034a9f0da 100644
--- a/bin/dd/dd.h
+++ b/bin/dd/dd.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dd.h	8.3 (Berkeley) 4/2/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/dd/dd.h,v 1.8.2.2 1999/12/12 01:54:05 green Exp $
  */
 
 /* Input/output stream state. */
diff --git a/bin/dd/extern.h b/bin/dd/extern.h
index e5c982ca1b57..2d3bb91aab47 100644
--- a/bin/dd/extern.h
+++ b/bin/dd/extern.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.3 (Berkeley) 4/2/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/dd/extern.h,v 1.4.2.2 1999/12/12 01:54:05 green Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/bin/dd/misc.c b/bin/dd/misc.c
index 8d756683e434..0bf5b7a253e3 100644
--- a/bin/dd/misc.c
+++ b/bin/dd/misc.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/dd/misc.c,v 1.15.2.2 1999/12/12 01:54:05 green Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/dd/position.c b/bin/dd/position.c
index 9d3d0d896b65..9a26bffc5053 100644
--- a/bin/dd/position.c
+++ b/bin/dd/position.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)position.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/dd/position.c,v 1.8.2.2 1999/12/12 01:54:06 green Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/df/Makefile b/bin/df/Makefile
index 83d1bbd4c77e..da0652774b67 100644
--- a/bin/df/Makefile
+++ b/bin/df/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/df/Makefile,v 1.7.2.1 1999/08/29 14:12:13 peter Exp $
 #	@(#)Makefile	8.3 (Berkeley) 5/8/95
 
 PROG=	df
diff --git a/bin/df/df.1 b/bin/df/df.1
index 9c875dc47eb1..df2cf1e9745b 100644
--- a/bin/df/df.1
+++ b/bin/df/df.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)df.1	8.3 (Berkeley) 5/8/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/df/df.1,v 1.13.2.3 1999/08/29 14:12:14 peter Exp $
 .\"
 .Dd May 8, 1995
 .Dt DF 1
diff --git a/bin/df/df.c b/bin/df/df.c
index b402efd13864..1bb5a0e01d56 100644
--- a/bin/df/df.c
+++ b/bin/df/df.c
@@ -47,7 +47,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)df.c	8.9 (Berkeley) 5/8/95";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/df/df.c,v 1.20.2.1 1999/08/29 14:12:15 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/domainname/Makefile b/bin/domainname/Makefile
index 724bd06f6a39..2b94680678fe 100644
--- a/bin/domainname/Makefile
+++ b/bin/domainname/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/domainname/Makefile,v 1.3.2.1 1999/08/29 14:12:16 peter Exp $
 
 PROG=	domainname
 
diff --git a/bin/domainname/domainname.1 b/bin/domainname/domainname.1
index 96e4f076fdf6..d7a61a12bc63 100644
--- a/bin/domainname/domainname.1
+++ b/bin/domainname/domainname.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)hostname.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/domainname/domainname.1,v 1.6.2.2 1999/08/29 14:12:17 peter Exp $
 .\"
 .Dd September 18, 1994
 .Dt DOMAINNAME 1
diff --git a/bin/domainname/domainname.c b/bin/domainname/domainname.c
index d0c989c39fdd..989b79787dd4 100644
--- a/bin/domainname/domainname.c
+++ b/bin/domainname/domainname.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char const sccsid[] = "From: @(#)hostname.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/domainname/domainname.c,v 1.11.2.1 1999/08/29 14:12:18 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/echo/Makefile b/bin/echo/Makefile
index d00d4679d7ac..9c948f4d97d8 100644
--- a/bin/echo/Makefile
+++ b/bin/echo/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/echo/Makefile,v 1.4.2.1 1999/08/29 14:12:19 peter Exp $
 
 PROG=	echo
 
diff --git a/bin/echo/echo.1 b/bin/echo/echo.1
index 1636b7d90e75..f69b95c94f6a 100644
--- a/bin/echo/echo.1
+++ b/bin/echo/echo.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)echo.1	8.1 (Berkeley) 7/22/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/echo/echo.1,v 1.6.2.2 1999/08/29 14:12:19 peter Exp $
 .\"
 .Dd July 22, 1993
 .Dt ECHO 1
diff --git a/bin/echo/echo.c b/bin/echo/echo.c
index edab483ddbbc..72c82e8cec9c 100644
--- a/bin/echo/echo.c
+++ b/bin/echo/echo.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)echo.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/echo/echo.c,v 1.7.2.1 1999/08/29 14:12:20 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/bin/ed/Makefile b/bin/ed/Makefile
index a1f11af8a520..cf68dfe98617 100644
--- a/bin/ed/Makefile
+++ b/bin/ed/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/ed/Makefile,v 1.16.2.1 1999/08/29 14:12:21 peter Exp $
 
 PROG=	ed
 SRCS=	buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
diff --git a/bin/ed/POSIX b/bin/ed/POSIX
index 47b720d867ef..df6f8d850b6f 100644
--- a/bin/ed/POSIX
+++ b/bin/ed/POSIX
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/ed/POSIX,v 1.6.2.1 1999/08/29 14:12:22 peter Exp $
 
 This version of ed(1) is not strictly POSIX compliant, as described in
 the POSIX 1003.2 document.  The following is a summary of the omissions,
diff --git a/bin/ed/README b/bin/ed/README
index 478e7af07c70..b31898fd113b 100644
--- a/bin/ed/README
+++ b/bin/ed/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/ed/README,v 1.6.2.1 1999/08/29 14:12:22 peter Exp $
 
 ed is an 8-bit-clean, POSIX-compliant line editor.  It should work with
 any regular expression package that conforms to the POSIX interface
diff --git a/bin/ed/buf.c b/bin/ed/buf.c
index 4e2479642552..d5dbe92b846e 100644
--- a/bin/ed/buf.c
+++ b/bin/ed/buf.c
@@ -31,7 +31,7 @@
 static char * const rcsid = "@(#)buf.c,v 1.4 1994/02/01 00:34:35 alm Exp";
 #else
 static char * const rcsid =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/ed/buf.c,v 1.15.2.2 1999/08/29 14:12:23 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/ed/cbc.c b/bin/ed/cbc.c
index f77ce0dc5a18..661072a4089f 100644
--- a/bin/ed/cbc.c
+++ b/bin/ed/cbc.c
@@ -42,7 +42,7 @@
 static char * const rcsid = "@(#)cbc.c,v 1.2 1994/02/01 00:34:36 alm Exp";
 #else
 static char * const rcsid =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/ed/cbc.c,v 1.10.2.2 1999/08/29 14:12:24 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/ed/ed.1 b/bin/ed/ed.1
index 370e67225ed0..f5819b880e51 100644
--- a/bin/ed/ed.1
+++ b/bin/ed/ed.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ed/ed.1,v 1.14.2.1 1999/08/29 14:12:24 peter Exp $
 .Dd May 21, 1993
 .Dt ED 1
 .Os
diff --git a/bin/ed/ed.h b/bin/ed/ed.h
index d313a84f1cdf..d11e183aab19 100644
--- a/bin/ed/ed.h
+++ b/bin/ed/ed.h
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp
- * $FreeBSD$
+ * $FreeBSD: src/bin/ed/ed.h,v 1.12.2.1 1999/08/29 14:12:25 peter Exp $
  */
 
 #include <sys/param.h>		/* for MAXPATHLEN */
diff --git a/bin/ed/glbl.c b/bin/ed/glbl.c
index 3eae4f250f82..285a141331ae 100644
--- a/bin/ed/glbl.c
+++ b/bin/ed/glbl.c
@@ -31,7 +31,7 @@
 static char * const rcsid = "@(#)glob.c,v 1.1 1994/02/01 00:34:40 alm Exp";
 #else
 static char * const rcsid =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/ed/glbl.c,v 1.8.2.1 1999/08/29 14:12:26 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/ed/io.c b/bin/ed/io.c
index 203079898f63..338726f691a0 100644
--- a/bin/ed/io.c
+++ b/bin/ed/io.c
@@ -30,7 +30,7 @@
 static char * const rcsid = "@(#)io.c,v 1.1 1994/02/01 00:34:41 alm Exp";
 #else
 static char * const rcsid =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/ed/io.c,v 1.9.2.1 1999/08/29 14:12:26 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/ed/main.c b/bin/ed/main.c
index 7bff1297900a..8ffff1619a04 100644
--- a/bin/ed/main.c
+++ b/bin/ed/main.c
@@ -37,7 +37,7 @@ static char * const copyright =
 static char * const rcsid = "@(#)main.c,v 1.1 1994/02/01 00:34:42 alm Exp";
 #else
 static char * const rcsid =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/ed/main.c,v 1.13.2.1 1999/08/29 14:12:27 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/ed/re.c b/bin/ed/re.c
index d81d0d786e95..dcd90edcb29e 100644
--- a/bin/ed/re.c
+++ b/bin/ed/re.c
@@ -31,7 +31,7 @@
 static char * const rcsid = "@(#)re.c,v 1.6 1994/02/01 00:34:43 alm Exp";
 #else
 static char * const rcsid =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/ed/re.c,v 1.14.2.1 1999/08/29 14:12:28 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/ed/sub.c b/bin/ed/sub.c
index 32213734b6b7..643f40f1bc56 100644
--- a/bin/ed/sub.c
+++ b/bin/ed/sub.c
@@ -31,7 +31,7 @@
 static char * const rcsid = "@(#)sub.c,v 1.1 1994/02/01 00:34:44 alm Exp";
 #else
 static char * const rcsid =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/ed/sub.c,v 1.11.2.1 1999/08/29 14:12:28 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/ed/test/Makefile b/bin/ed/test/Makefile
index aedfb698f131..e1f427ca826f 100644
--- a/bin/ed/test/Makefile
+++ b/bin/ed/test/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/ed/test/Makefile,v 1.8.2.1 1999/08/29 14:12:30 peter Exp $
 
 SHELL=	/bin/sh
 ED=	${.OBJDIR}/ed
diff --git a/bin/ed/test/README b/bin/ed/test/README
index 74c4826a269d..4c91f4da0201 100644
--- a/bin/ed/test/README
+++ b/bin/ed/test/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/ed/test/README,v 1.6.2.1 1999/08/29 14:12:31 peter Exp $
 
 The files in this directory with suffixes `.t', `.d', `.r' and `.err' are
 used for testing ed.  To run the tests, set the ED variable in the Makefile
diff --git a/bin/ed/test/ckscripts.sh b/bin/ed/test/ckscripts.sh
index deab47555f7a..9cb05f115bb5 100644
--- a/bin/ed/test/ckscripts.sh
+++ b/bin/ed/test/ckscripts.sh
@@ -3,7 +3,7 @@
 # and compares their output against the .r files, which contain
 # the correct output
 #
-# $FreeBSD$
+# $FreeBSD: src/bin/ed/test/ckscripts.sh,v 1.5.2.1 1999/08/29 14:12:32 peter Exp $
 
 PATH="/bin:/usr/bin:/usr/local/bin/:."
 ED=$1
diff --git a/bin/ed/test/mkscripts.sh b/bin/ed/test/mkscripts.sh
index 1b8b3ee53182..cebe36e6c3de 100644
--- a/bin/ed/test/mkscripts.sh
+++ b/bin/ed/test/mkscripts.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -
 # This script generates ed test scripts (.ed) from .t files
 #	
-# $FreeBSD$
+# $FreeBSD: src/bin/ed/test/mkscripts.sh,v 1.5.2.1 1999/08/29 14:12:32 peter Exp $
 
 PATH="/bin:/usr/bin:/usr/local/bin/:."
 ED=$1
diff --git a/bin/ed/undo.c b/bin/ed/undo.c
index b2063c7c2791..52dc68895929 100644
--- a/bin/ed/undo.c
+++ b/bin/ed/undo.c
@@ -30,7 +30,7 @@
 static char * const rcsid = "@(#)undo.c,v 1.1 1994/02/01 00:34:44 alm Exp";
 #else
 static char * const rcsid =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/ed/undo.c,v 1.7.2.2 1999/08/29 14:12:29 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/expr/Makefile b/bin/expr/Makefile
index 544853e10a25..b0be6c0dee49 100644
--- a/bin/expr/Makefile
+++ b/bin/expr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/expr/Makefile,v 1.13.2.1 1999/08/29 14:12:34 peter Exp $
 
 PROG=	expr
 SRCS=	expr.y
diff --git a/bin/expr/expr.1 b/bin/expr/expr.1
index 85a0c8ebf601..61d8b2c2ef72 100644
--- a/bin/expr/expr.1
+++ b/bin/expr/expr.1
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/expr/expr.1,v 1.8.2.1 1999/08/29 14:12:34 peter Exp $
 .\"
 .Dd July 3, 1993
 .Dt EXPR 1
diff --git a/bin/expr/expr.y b/bin/expr/expr.y
index 117270a14f77..85767ebca0c7 100644
--- a/bin/expr/expr.y
+++ b/bin/expr/expr.y
@@ -4,7 +4,7 @@
  *
  * Largely rewritten by J.T. Conklin (jtc@wimsey.com)
  *
- * $FreeBSD$
+ * $FreeBSD: src/bin/expr/expr.y,v 1.13.2.1 1999/08/29 14:12:35 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/bin/hostname/Makefile b/bin/hostname/Makefile
index 3c7997f862fc..db2b8758481d 100644
--- a/bin/hostname/Makefile
+++ b/bin/hostname/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/hostname/Makefile,v 1.4.2.1 1999/08/29 14:12:36 peter Exp $
 
 PROG=	hostname
 
diff --git a/bin/hostname/hostname.1 b/bin/hostname/hostname.1
index 835d586e088a..e4dc084fce38 100644
--- a/bin/hostname/hostname.1
+++ b/bin/hostname/hostname.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hostname.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.8.2.1 1999/08/29 14:12:37 peter Exp $
 .\"
 .Dd April 28, 1995
 .Dt HOSTNAME 1
diff --git a/bin/hostname/hostname.c b/bin/hostname/hostname.c
index 94e5d4a72434..9ec377bf9d21 100644
--- a/bin/hostname/hostname.c
+++ b/bin/hostname/hostname.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)hostname.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/hostname/hostname.c,v 1.9.2.1 1999/08/29 14:12:37 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/kill/Makefile b/bin/kill/Makefile
index 55ef16dfce2c..91c233d7161a 100644
--- a/bin/kill/Makefile
+++ b/bin/kill/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/kill/Makefile,v 1.4.2.1 1999/08/29 14:12:39 peter Exp $
 
 PROG=	kill
 
diff --git a/bin/kill/kill.1 b/bin/kill/kill.1
index 3264f31085cf..f95359088734 100644
--- a/bin/kill/kill.1
+++ b/bin/kill/kill.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)kill.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/kill/kill.1,v 1.8.2.1 1999/08/29 14:12:40 peter Exp $
 .\"
 .Dd April 28, 1995
 .Dt KILL 1
diff --git a/bin/kill/kill.c b/bin/kill/kill.c
index 9de184f0cfa1..34e1c3aae2a3 100644
--- a/bin/kill/kill.c
+++ b/bin/kill/kill.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)kill.c	8.4 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/kill/kill.c,v 1.10.2.1 1999/08/29 14:12:40 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/bin/ln/Makefile b/bin/ln/Makefile
index b177ea8b272a..f7b149fcf486 100644
--- a/bin/ln/Makefile
+++ b/bin/ln/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/ln/Makefile,v 1.5.2.1 1999/08/29 14:12:42 peter Exp $
 
 PROG=	ln
 MAN1=	ln.1
diff --git a/bin/ln/ln.1 b/bin/ln/ln.1
index 93fa3df56bcb..e7c37f69a7bd 100644
--- a/bin/ln/ln.1
+++ b/bin/ln/ln.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ln.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ln/ln.1,v 1.6.2.2 1999/08/29 14:12:42 peter Exp $
 .\"
 .Dd December 30, 1993
 .Dt LN 1
diff --git a/bin/ln/ln.c b/bin/ln/ln.c
index 9ccf805e1b2d..cda1ef9e0852 100644
--- a/bin/ln/ln.c
+++ b/bin/ln/ln.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)ln.c	8.2 (Berkeley) 3/31/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/ln/ln.c,v 1.12.2.1 1999/08/29 14:12:43 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/ln/symlink.7 b/bin/ln/symlink.7
index 6e6d5a7fe56f..a094962a2ab0 100644
--- a/bin/ln/symlink.7
+++ b/bin/ln/symlink.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)symlink.7	8.3 (Berkeley) 3/31/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ln/symlink.7,v 1.8.2.2 1999/08/29 14:12:43 peter Exp $
 .\"
 .Dd March 31, 1994
 .Dt SYMLINK 7
diff --git a/bin/ls/Makefile b/bin/ls/Makefile
index fe40df1b1d7f..149c676d4292 100644
--- a/bin/ls/Makefile
+++ b/bin/ls/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
-# $FreeBSD$
+# $FreeBSD: src/bin/ls/Makefile,v 1.4.2.1 1999/08/29 14:12:45 peter Exp $
 
 PROG=	ls
 SRCS=	cmp.c stat_flags.c ls.c print.c util.c
diff --git a/bin/ls/cmp.c b/bin/ls/cmp.c
index 91852ba76fc2..2c4e11526652 100644
--- a/bin/ls/cmp.c
+++ b/bin/ls/cmp.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)cmp.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/ls/cmp.c,v 1.8.2.1 1999/08/29 14:12:46 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/ls/extern.h b/bin/ls/extern.h
index fd26b372c5f7..000406fa8aa5 100644
--- a/bin/ls/extern.h
+++ b/bin/ls/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)extern.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/ls/extern.h,v 1.6.2.1 1999/08/29 14:12:47 peter Exp $
  */
 
 int	 acccmp __P((const FTSENT *, const FTSENT *));
diff --git a/bin/ls/ls.1 b/bin/ls/ls.1
index c8113bf62ee3..754f748b005b 100644
--- a/bin/ls/ls.1
+++ b/bin/ls/ls.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ls/ls.1,v 1.26.2.3 1999/08/29 14:12:47 peter Exp $
 .\"
 .Dd July 29, 1994
 .Dt LS 1
diff --git a/bin/ls/ls.c b/bin/ls/ls.c
index 039327d09743..39e5c39d64a8 100644
--- a/bin/ls/ls.c
+++ b/bin/ls/ls.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ls.c	8.5 (Berkeley) 4/2/94";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/ls/ls.c,v 1.23.2.2 1999/08/29 14:12:48 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/ls/ls.h b/bin/ls/ls.h
index 33c98c45aab8..3f6cdcc9d4a5 100644
--- a/bin/ls/ls.h
+++ b/bin/ls/ls.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ls.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/ls/ls.h,v 1.10.2.1 1999/08/29 14:12:49 peter Exp $
  */
 
 #define NO_PRINT	1
diff --git a/bin/ls/print.c b/bin/ls/print.c
index 584a517a4926..4c887d225df3 100644
--- a/bin/ls/print.c
+++ b/bin/ls/print.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)print.c	8.4 (Berkeley) 4/17/94";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/ls/print.c,v 1.17.2.1 1999/08/29 14:12:49 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/ls/stat_flags.c b/bin/ls/stat_flags.c
index 5235eb31ffa6..dd9df7b19150 100644
--- a/bin/ls/stat_flags.c
+++ b/bin/ls/stat_flags.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)stat_flags.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/ls/stat_flags.c,v 1.9.2.2 1999/08/29 14:12:50 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/ls/util.c b/bin/ls/util.c
index 30066e2f49f7..e1afef0d5cfc 100644
--- a/bin/ls/util.c
+++ b/bin/ls/util.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/2/94";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/ls/util.c,v 1.18.2.1 1999/08/29 14:12:50 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/mkdir/Makefile b/bin/mkdir/Makefile
index fadc6b294ef7..60446208f46a 100644
--- a/bin/mkdir/Makefile
+++ b/bin/mkdir/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/mkdir/Makefile,v 1.4.2.1 1999/08/29 14:12:52 peter Exp $
 
 PROG=	mkdir
 
diff --git a/bin/mkdir/mkdir.1 b/bin/mkdir/mkdir.1
index ca092ef20ece..d86112da98f7 100644
--- a/bin/mkdir/mkdir.1
+++ b/bin/mkdir/mkdir.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mkdir.1	8.2 (Berkeley) 1/25/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/mkdir/mkdir.1,v 1.7.2.2 1999/08/29 14:12:53 peter Exp $
 .\"
 .Dd January 25, 1994
 .Dt MKDIR 1
diff --git a/bin/mkdir/mkdir.c b/bin/mkdir/mkdir.c
index 06178c1a38ba..13b9efcecd14 100644
--- a/bin/mkdir/mkdir.c
+++ b/bin/mkdir/mkdir.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)mkdir.c	8.2 (Berkeley) 1/25/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/mkdir/mkdir.c,v 1.16.2.1 1999/08/29 14:12:53 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/mv/Makefile b/bin/mv/Makefile
index 301fb2c5087a..c623a237f3ca 100644
--- a/bin/mv/Makefile
+++ b/bin/mv/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/2/94
-# $FreeBSD$
+# $FreeBSD: src/bin/mv/Makefile,v 1.4.2.1 1999/08/29 14:12:55 peter Exp $
 
 PROG=	mv
 
diff --git a/bin/mv/mv.1 b/bin/mv/mv.1
index 528eeaa1a8be..e9e3c9e23c30 100644
--- a/bin/mv/mv.1
+++ b/bin/mv/mv.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mv.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/mv/mv.1,v 1.11.2.3 1999/12/11 20:33:33 mharo Exp $
 .\"
 .Dd May 31, 1993
 .Dt MV 1
diff --git a/bin/mv/mv.c b/bin/mv/mv.c
index 5f0f28b1882d..bdc37fdacaa0 100644
--- a/bin/mv/mv.c
+++ b/bin/mv/mv.c
@@ -45,7 +45,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)mv.c	8.2 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/mv/mv.c,v 1.22.2.2 1999/12/11 20:33:34 mharo Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/mv/pathnames.h b/bin/mv/pathnames.h
index b9cd27ff297c..0d2dad290e0c 100644
--- a/bin/mv/pathnames.h
+++ b/bin/mv/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/mv/pathnames.h,v 1.4.2.1 1999/08/29 14:12:57 peter Exp $
  */
 
 #define	_PATH_RM	"/bin/rm"
diff --git a/bin/pax/Makefile b/bin/pax/Makefile
index b1a4dcf88f10..fb1f835cb1bb 100644
--- a/bin/pax/Makefile
+++ b/bin/pax/Makefile
@@ -1,5 +1,5 @@
 #       @(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/pax/Makefile,v 1.4.2.1 1999/08/29 14:12:58 peter Exp $
 
 # To install on versions prior to BSD 4.4 the following may have to be
 # defined with CFLAGS +=
diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c
index b286aa6c88c6..a17ba6d36791 100644
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)ar_io.c	8.2 (Berkeley) 4/18/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/pax/ar_io.c,v 1.10.2.2 1999/08/29 14:12:59 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
index 151fe2aa0206..49bf2a61d772 100644
--- a/bin/pax/ar_subs.c
+++ b/bin/pax/ar_subs.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)ar_subs.c	8.2 (Berkeley) 4/18/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/pax/ar_subs.c,v 1.11.2.2 1999/08/29 14:13:00 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index 50c30761a3e5..a0aeab0c7ae3 100644
--- a/bin/pax/buf_subs.c
+++ b/bin/pax/buf_subs.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)buf_subs.c	8.2 (Berkeley) 4/18/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/pax/buf_subs.c,v 1.10.2.2 1999/08/29 14:13:00 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/cache.c b/bin/pax/cache.c
index 7f3b37f6ee12..53b8f6b4dd39 100644
--- a/bin/pax/cache.c
+++ b/bin/pax/cache.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)cache.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/pax/cache.c,v 1.10.2.2 1999/08/29 14:13:00 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/cache.h b/bin/pax/cache.h
index 642058851070..9ed7773a069b 100644
--- a/bin/pax/cache.h
+++ b/bin/pax/cache.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *      @(#)cache.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/cache.h,v 1.4.2.2 1999/08/29 14:13:01 peter Exp $
  */
 
 /*
diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
index 626a77d94c54..5eb308d3b081 100644
--- a/bin/pax/cpio.c
+++ b/bin/pax/cpio.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)cpio.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/pax/cpio.c,v 1.10.2.2 1999/08/29 14:13:02 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/cpio.h b/bin/pax/cpio.h
index 2b72f53b6c1e..4ee7175b08f0 100644
--- a/bin/pax/cpio.h
+++ b/bin/pax/cpio.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cpio.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/cpio.h,v 1.5.2.1 1999/08/29 14:13:02 peter Exp $
  */
 
 /*
diff --git a/bin/pax/extern.h b/bin/pax/extern.h
index 2b062cbde300..79d63751fdd1 100644
--- a/bin/pax/extern.h
+++ b/bin/pax/extern.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/18/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/extern.h,v 1.5.2.1 1999/08/29 14:13:03 peter Exp $
  */
 
 /*
diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
index b8f2a4917c7b..cd3818b98d40 100644
--- a/bin/pax/file_subs.c
+++ b/bin/pax/file_subs.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)file_subs.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/pax/file_subs.c,v 1.10.2.2 1999/08/29 14:13:03 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c
index ba1e4890e455..6ea34ab32f65 100644
--- a/bin/pax/ftree.c
+++ b/bin/pax/ftree.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)ftree.c	8.2 (Berkeley) 4/18/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/pax/ftree.c,v 1.11.2.2 1999/08/29 14:13:04 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/ftree.h b/bin/pax/ftree.h
index e5c9749341a1..9e25bd6656e7 100644
--- a/bin/pax/ftree.h
+++ b/bin/pax/ftree.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ftree.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/ftree.h,v 1.4.2.1 1999/08/29 14:13:05 peter Exp $
  */
 
 /*
diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c
index 22b77f0feef8..8a672552cb33 100644
--- a/bin/pax/gen_subs.c
+++ b/bin/pax/gen_subs.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)gen_subs.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/pax/gen_subs.c,v 1.11.2.1 1999/08/29 14:13:05 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/options.c b/bin/pax/options.c
index 4ea96e402297..12a236061b59 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)options.c	8.2 (Berkeley) 4/18/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/pax/options.c,v 1.11.2.2 1999/08/29 14:13:06 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/options.h b/bin/pax/options.h
index b1de2b6de7cf..86ee4a664f2c 100644
--- a/bin/pax/options.h
+++ b/bin/pax/options.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)options.h	8.2 (Berkeley) 4/18/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/options.h,v 1.4.2.1 1999/08/29 14:13:07 peter Exp $
  */
 
 /*
diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c
index e68a0ebf6035..75eaab300b8a 100644
--- a/bin/pax/pat_rep.c
+++ b/bin/pax/pat_rep.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)pat_rep.c	8.2 (Berkeley) 4/18/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/pax/pat_rep.c,v 1.14.2.1 1999/08/29 14:13:07 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/pat_rep.h b/bin/pax/pat_rep.h
index e0d812b1de95..09bea86e37dc 100644
--- a/bin/pax/pat_rep.h
+++ b/bin/pax/pat_rep.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pat_rep.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/pat_rep.h,v 1.4.2.1 1999/08/29 14:13:08 peter Exp $
  */
 
 /*
diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index 7684578c2deb..78f2d73f01a3 100644
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pax.1	8.4 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/pax/pax.1,v 1.8.2.2 1999/08/29 14:13:08 peter Exp $
 .\"
 .Dd April 18, 1994
 .Dt PAX 1
diff --git a/bin/pax/pax.c b/bin/pax/pax.c
index 7bcc81e7ad0b..949c6ff8316c 100644
--- a/bin/pax/pax.c
+++ b/bin/pax/pax.c
@@ -46,7 +46,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)pax.c	8.2 (Berkeley) 4/18/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/pax/pax.c,v 1.11.2.2 1999/08/29 14:13:08 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/pax.h b/bin/pax/pax.h
index a87b359f14b2..3eabebe29d68 100644
--- a/bin/pax/pax.h
+++ b/bin/pax/pax.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pax.h	8.2 (Berkeley) 4/18/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/pax.h,v 1.6.2.2 1999/08/29 14:13:09 peter Exp $
  */
 
 /*
diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c
index ba7b71e7e012..d31643241f35 100644
--- a/bin/pax/sel_subs.c
+++ b/bin/pax/sel_subs.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)sel_subs.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/pax/sel_subs.c,v 1.9.2.2 1999/08/29 14:13:09 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/sel_subs.h b/bin/pax/sel_subs.h
index ab24ab00d199..9adb46a1da48 100644
--- a/bin/pax/sel_subs.h
+++ b/bin/pax/sel_subs.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sel_subs.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/sel_subs.h,v 1.4.2.1 1999/08/29 14:13:09 peter Exp $
  */
 
 /*
diff --git a/bin/pax/tables.c b/bin/pax/tables.c
index e6c106b83d58..a8be10a55617 100644
--- a/bin/pax/tables.c
+++ b/bin/pax/tables.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)tables.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/pax/tables.c,v 1.11.2.2 1999/08/29 14:13:10 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/tables.h b/bin/pax/tables.h
index 74c91f79d0ad..da4124c35163 100644
--- a/bin/pax/tables.h
+++ b/bin/pax/tables.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tables.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/tables.h,v 1.5.2.2 1999/08/29 14:13:11 peter Exp $
  */
 
 /*
diff --git a/bin/pax/tar.c b/bin/pax/tar.c
index f5415f4f74ae..9566fda7e07e 100644
--- a/bin/pax/tar.c
+++ b/bin/pax/tar.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)tar.c	8.2 (Berkeley) 4/18/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/pax/tar.c,v 1.11.2.2 1999/08/29 14:13:12 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/tar.h b/bin/pax/tar.h
index 83df0da2784e..96c8b503b738 100644
--- a/bin/pax/tar.h
+++ b/bin/pax/tar.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tar.h	8.2 (Berkeley) 4/18/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/tar.h,v 1.4.2.2 1999/08/29 14:13:12 peter Exp $
  */
 
 /*
diff --git a/bin/pax/tty_subs.c b/bin/pax/tty_subs.c
index d70bffac1827..0868b25a57e0 100644
--- a/bin/pax/tty_subs.c
+++ b/bin/pax/tty_subs.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)tty_subs.c	8.2 (Berkeley) 4/18/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/pax/tty_subs.c,v 1.9.2.2 1999/08/29 14:13:13 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/ps/Makefile b/bin/ps/Makefile
index c63e5a7ce5dd..3dd66695567a 100644
--- a/bin/ps/Makefile
+++ b/bin/ps/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/ps/Makefile,v 1.11.2.1 1999/08/29 14:13:16 peter Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
 
 PROG=	ps
diff --git a/bin/ps/extern.h b/bin/ps/extern.h
index a14390dc1d1f..f7653381519f 100644
--- a/bin/ps/extern.h
+++ b/bin/ps/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.3 (Berkeley) 4/2/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/ps/extern.h,v 1.8.2.1 1999/08/29 14:13:17 peter Exp $
  */
 
 struct kinfo;
diff --git a/bin/ps/fmt.c b/bin/ps/fmt.c
index 9c0f8d3f1710..ee3d5b0e3d1e 100644
--- a/bin/ps/fmt.c
+++ b/bin/ps/fmt.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)fmt.c	8.4 (Berkeley) 4/15/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/ps/fmt.c,v 1.13.2.1 1999/08/29 14:13:17 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index cbabd978c784..d82e974f1af6 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)keyword.c	8.5 (Berkeley) 4/2/94";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/ps/keyword.c,v 1.22.2.2 1999/08/29 14:13:18 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/ps/print.c b/bin/ps/print.c
index 2151c453f5fc..bec0194e116c 100644
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)print.c	8.6 (Berkeley) 4/16/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/ps/print.c,v 1.33.2.1 1999/08/29 14:13:18 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index 1ca26b1d9caf..45709280a733 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ps/ps.1,v 1.19.2.3 1999/08/29 14:13:19 peter Exp $
 .\"
 .Dd April 18, 1994
 .Dt PS 1
diff --git a/bin/ps/ps.c b/bin/ps/ps.c
index 86407679b738..c46dd1bc6f00 100644
--- a/bin/ps/ps.c
+++ b/bin/ps/ps.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)ps.c	8.4 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/ps/ps.c,v 1.25.2.2 1999/08/29 14:13:20 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/ps/ps.h b/bin/ps/ps.h
index f8d244c83e53..533cd4db1ede 100644
--- a/bin/ps/ps.h
+++ b/bin/ps/ps.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ps.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/ps/ps.h,v 1.6.2.1 1999/08/29 14:13:20 peter Exp $
  */
 
 #define	UNLIMITED	0	/* unlimited terminal width */
diff --git a/bin/pwd/Makefile b/bin/pwd/Makefile
index 4a8e66ac8320..fbb1c02c3223 100644
--- a/bin/pwd/Makefile
+++ b/bin/pwd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/pwd/Makefile,v 1.4.2.1 1999/08/29 14:13:23 peter Exp $
 
 PROG=	pwd
 
diff --git a/bin/pwd/pwd.1 b/bin/pwd/pwd.1
index 27150e66ca6f..fb18ea0b948a 100644
--- a/bin/pwd/pwd.1
+++ b/bin/pwd/pwd.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pwd.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/pwd/pwd.1,v 1.6.2.2 1999/08/29 14:13:23 peter Exp $
 .\"
 .Dd April 28, 1995
 .Dt PWD 1
diff --git a/bin/pwd/pwd.c b/bin/pwd/pwd.c
index 1adb3c86f508..9ff75eefe766 100644
--- a/bin/pwd/pwd.c
+++ b/bin/pwd/pwd.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)pwd.c	8.3 (Berkeley) 4/1/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/pwd/pwd.c,v 1.8.2.1 1999/08/29 14:13:24 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/bin/rcp/Makefile b/bin/rcp/Makefile
index adaf5c43b7bb..44ffb3cb24d4 100644
--- a/bin/rcp/Makefile
+++ b/bin/rcp/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/bin/rcp/Makefile,v 1.13.2.1 1999/08/29 14:13:25 peter Exp $
 
 PROG=	rcp
 SRCS=	rcp.c util.c
diff --git a/bin/rcp/extern.h b/bin/rcp/extern.h
index 5081c9dcbb57..0b4ef2f0f867 100644
--- a/bin/rcp/extern.h
+++ b/bin/rcp/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/rcp/extern.h,v 1.4.2.1 1999/08/29 14:13:26 peter Exp $
  */
 
 typedef struct {
diff --git a/bin/rcp/pathnames.h b/bin/rcp/pathnames.h
index b1f0ec083179..ae23fa5f8a35 100644
--- a/bin/rcp/pathnames.h
+++ b/bin/rcp/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/rcp/pathnames.h,v 1.5.2.1 1999/08/29 14:13:26 peter Exp $
  */
 
 #include <paths.h>
diff --git a/bin/rcp/rcp.1 b/bin/rcp/rcp.1
index 24a820b6371d..5184bbe5ac8c 100644
--- a/bin/rcp/rcp.1
+++ b/bin/rcp/rcp.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rcp.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/rcp/rcp.1,v 1.7.2.1 1999/08/29 14:13:27 peter Exp $
 .\"
 .Dd May 31, 1993
 .Dt RCP 1
diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c
index 94c83dc13cc5..51f3ccec5239 100644
--- a/bin/rcp/rcp.c
+++ b/bin/rcp/rcp.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)rcp.c	8.2 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/rcp/rcp.c,v 1.21.2.2 1999/08/29 14:13:27 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/rcp/util.c b/bin/rcp/util.c
index a8ba4c09f907..760f6d65e6b8 100644
--- a/bin/rcp/util.c
+++ b/bin/rcp/util.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)util.c	8.2 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/rcp/util.c,v 1.8.2.1 1999/08/29 14:13:28 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/rm/Makefile b/bin/rm/Makefile
index 45a5f23268f1..e7d58d74f8aa 100644
--- a/bin/rm/Makefile
+++ b/bin/rm/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/rm/Makefile,v 1.5.2.1 1999/08/29 14:13:29 peter Exp $
 
 PROG=	rm
 SRCS=   rm.c stat_flags.c
diff --git a/bin/rm/rm.1 b/bin/rm/rm.1
index 0c4b740f1543..2bd17114ba26 100644
--- a/bin/rm/rm.1
+++ b/bin/rm/rm.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rm.1	8.5 (Berkeley) 12/5/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/rm/rm.1,v 1.12.2.3 1999/12/06 05:00:50 kris Exp $
 .\"
 .Dd January 28, 1999
 .Dt RM 1
diff --git a/bin/rm/rm.c b/bin/rm/rm.c
index 7d7de4be2929..233e82d64ad3 100644
--- a/bin/rm/rm.c
+++ b/bin/rm/rm.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)rm.c	8.5 (Berkeley) 4/18/94";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/rm/rm.c,v 1.18.2.4 1999/12/06 05:00:51 kris Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/rmail/Makefile b/bin/rmail/Makefile
index 8484be8ec691..b69d0985d799 100644
--- a/bin/rmail/Makefile
+++ b/bin/rmail/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/rmail/Makefile,v 1.7.2.1 1999/08/29 14:13:32 peter Exp $
 
 .PATH:	${.CURDIR}/../../contrib/sendmail/rmail
 
diff --git a/bin/rmdir/Makefile b/bin/rmdir/Makefile
index c2c7f301ce49..14bba21d574d 100644
--- a/bin/rmdir/Makefile
+++ b/bin/rmdir/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/rmdir/Makefile,v 1.4.2.1 1999/08/29 14:13:33 peter Exp $
 
 PROG=	rmdir
 
diff --git a/bin/rmdir/rmdir.1 b/bin/rmdir/rmdir.1
index a6a247873b5b..227c26718f89 100644
--- a/bin/rmdir/rmdir.1
+++ b/bin/rmdir/rmdir.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rmdir.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/rmdir/rmdir.1,v 1.7.2.1 1999/08/29 14:13:34 peter Exp $
 .\"
 .Dd May 31, 1993
 .Dt RMDIR 1
diff --git a/bin/rmdir/rmdir.c b/bin/rmdir/rmdir.c
index 4be8427b2eab..d17e6108695c 100644
--- a/bin/rmdir/rmdir.c
+++ b/bin/rmdir/rmdir.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)rmdir.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/rmdir/rmdir.c,v 1.8.2.1 1999/08/29 14:13:34 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/bin/sh/Makefile b/bin/sh/Makefile
index 01c46f5499c1..d80e74113451 100644
--- a/bin/sh/Makefile
+++ b/bin/sh/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.4 (Berkeley) 5/5/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/Makefile,v 1.28.2.2 1999/12/10 13:03:01 sheldonh Exp $
 
 PROG=	sh
 SHSRCS=	alias.c arith.y arith_lex.l cd.c echo.c error.c eval.c exec.c expand.c \
diff --git a/bin/sh/TOUR b/bin/sh/TOUR
index 5a0b76b7ea90..693b01ab2af5 100644
--- a/bin/sh/TOUR
+++ b/bin/sh/TOUR
@@ -1,5 +1,5 @@
 #	@(#)TOUR	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/TOUR,v 1.5.2.1 1999/08/29 14:13:36 peter Exp $
 
 NOTE -- This is the original TOUR paper distributed with ash and
 does not represent the current state of the shell.  It is provided anyway
diff --git a/bin/sh/alias.c b/bin/sh/alias.c
index 2d605ec59196..2f075724163c 100644
--- a/bin/sh/alias.c
+++ b/bin/sh/alias.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)alias.c	8.3 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/sh/alias.c,v 1.10.2.2 1999/08/29 14:13:36 peter Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/bin/sh/alias.h b/bin/sh/alias.h
index a282a6976703..aed644dff597 100644
--- a/bin/sh/alias.h
+++ b/bin/sh/alias.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)alias.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/alias.h,v 1.5.2.1 1999/08/29 14:13:37 peter Exp $
  */
 
 #define ALIASINUSE	1
diff --git a/bin/sh/arith.h b/bin/sh/arith.h
index c58cd3c7cb5c..618ce8808ed9 100644
--- a/bin/sh/arith.h
+++ b/bin/sh/arith.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)arith.h	1.1 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/arith.h,v 1.4.2.1 1999/08/29 14:13:38 peter Exp $
  */
 
 int arith __P((char *));
diff --git a/bin/sh/arith.y b/bin/sh/arith.y
index 6d5bf95ce1bc..8e1eafd02953 100644
--- a/bin/sh/arith.y
+++ b/bin/sh/arith.y
@@ -88,7 +88,7 @@ expr:	ARITH_LPAREN expr ARITH_RPAREN = { $$ = $2; }
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/arith.y,v 1.9.2.1 1999/08/29 14:13:38 peter Exp $
  */
 
 #ifndef lint
@@ -96,7 +96,7 @@ expr:	ARITH_LPAREN expr ARITH_RPAREN = { $$ = $2; }
 static char sccsid[] = "@(#)arith.y	8.3 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/sh/arith.y,v 1.9.2.1 1999/08/29 14:13:38 peter Exp $";
 #endif /* not lint */
 
 #include "shell.h"
diff --git a/bin/sh/arith_lex.l b/bin/sh/arith_lex.l
index 371696a02389..0a23d9a93fa1 100644
--- a/bin/sh/arith_lex.l
+++ b/bin/sh/arith_lex.l
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/arith_lex.l,v 1.12.2.1 1999/08/29 14:13:39 peter Exp $
  */
 
 #ifndef lint
@@ -42,7 +42,7 @@
 static char sccsid[] = "@(#)arith_lex.l	8.3 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/sh/arith_lex.l,v 1.12.2.1 1999/08/29 14:13:39 peter Exp $";
 #endif /* not lint */
 
 #include <unistd.h>
diff --git a/bin/sh/bltin/bltin.h b/bin/sh/bltin/bltin.h
index a96c4761006d..d7559f57c097 100644
--- a/bin/sh/bltin/bltin.h
+++ b/bin/sh/bltin/bltin.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)bltin.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/bltin/bltin.h,v 1.9.2.1 1999/08/29 14:14:09 peter Exp $
  */
 
 /*
diff --git a/bin/sh/bltin/echo.1 b/bin/sh/bltin/echo.1
index a2f57f3d8048..06ef65548d1e 100644
--- a/bin/sh/bltin/echo.1
+++ b/bin/sh/bltin/echo.1
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)echo.1	8.2 (Berkeley) 5/4/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/sh/bltin/echo.1,v 1.6.2.1 1999/08/29 14:14:09 peter Exp $
 .\"
 .Dd May 4, 1995
 .Dt ECHO 1
diff --git a/bin/sh/bltin/echo.c b/bin/sh/bltin/echo.c
index 8ce088ad060e..da39b3fbb282 100644
--- a/bin/sh/bltin/echo.c
+++ b/bin/sh/bltin/echo.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)echo.c	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/bltin/echo.c,v 1.8.2.1 1999/08/29 14:14:10 peter Exp $
  */
 
 /*
diff --git a/bin/sh/builtins.def b/bin/sh/builtins.def
index 7cdcc38683aa..fe07981067f6 100644
--- a/bin/sh/builtins.def
+++ b/bin/sh/builtins.def
@@ -35,7 +35,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)builtins.def	8.4 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/builtins.def,v 1.6.2.1 1999/08/29 14:13:39 peter Exp $
 
 #
 # This file lists all the builtin commands.  The first column is the name
diff --git a/bin/sh/cd.c b/bin/sh/cd.c
index ee658929c8f8..8d55669e92fa 100644
--- a/bin/sh/cd.c
+++ b/bin/sh/cd.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)cd.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/sh/cd.c,v 1.18.2.1 1999/08/29 14:13:39 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/sh/cd.h b/bin/sh/cd.h
index 078b40efe61d..8c2805a769b4 100644
--- a/bin/sh/cd.h
+++ b/bin/sh/cd.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/cd.h,v 1.4.2.1 1999/08/29 14:13:40 peter Exp $
  */
 
 char	*getpwd __P((void));
diff --git a/bin/sh/error.c b/bin/sh/error.c
index f5dd6a689ef9..7b8189d39b18 100644
--- a/bin/sh/error.c
+++ b/bin/sh/error.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)error.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/sh/error.c,v 1.13.2.1 1999/08/29 14:13:40 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/bin/sh/error.h b/bin/sh/error.h
index 6c58c123373d..e9c1a0d8398e 100644
--- a/bin/sh/error.h
+++ b/bin/sh/error.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)error.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/error.h,v 1.9.2.2 1999/08/29 14:13:41 peter Exp $
  */
 
 /*
diff --git a/bin/sh/eval.c b/bin/sh/eval.c
index 0699a6698391..49ebc2b6477a 100644
--- a/bin/sh/eval.c
+++ b/bin/sh/eval.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)eval.c	8.9 (Berkeley) 6/8/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/sh/eval.c,v 1.15.2.7 1999/11/28 13:52:22 cracauer Exp $";
 #endif /* not lint */
 
 #include <signal.h>
diff --git a/bin/sh/eval.h b/bin/sh/eval.h
index 4f0b8988cae3..5fa1cfdd2b62 100644
--- a/bin/sh/eval.h
+++ b/bin/sh/eval.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)eval.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/eval.h,v 1.6.2.1 1999/08/29 14:13:42 peter Exp $
  */
 
 extern char *commandname;	/* currently executing command */
diff --git a/bin/sh/exec.c b/bin/sh/exec.c
index 3bfdba5eb984..727b1655704c 100644
--- a/bin/sh/exec.c
+++ b/bin/sh/exec.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)exec.c	8.4 (Berkeley) 6/8/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/sh/exec.c,v 1.12.2.1 1999/08/29 14:13:42 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/sh/exec.h b/bin/sh/exec.h
index 5b8e5e4657cc..5d7815c6e9c1 100644
--- a/bin/sh/exec.h
+++ b/bin/sh/exec.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.3 (Berkeley) 6/8/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/exec.h,v 1.7.2.1 1999/08/29 14:13:43 peter Exp $
  */
 
 /* values of cmdtype */
diff --git a/bin/sh/expand.c b/bin/sh/expand.c
index c6102aaeaa3e..02d75d8428ea 100644
--- a/bin/sh/expand.c
+++ b/bin/sh/expand.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)expand.c	8.5 (Berkeley) 5/15/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/sh/expand.c,v 1.24.2.5 1999/08/29 14:13:44 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/sh/expand.h b/bin/sh/expand.h
index 955b8bf424e7..ce69d0f6c4ae 100644
--- a/bin/sh/expand.h
+++ b/bin/sh/expand.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)expand.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/expand.h,v 1.7.2.2 1999/08/29 14:13:44 peter Exp $
  */
 
 struct strlist {
diff --git a/bin/sh/funcs/cmv b/bin/sh/funcs/cmv
index 6e9dcff9c088..ec74be83a01f 100644
--- a/bin/sh/funcs/cmv
+++ b/bin/sh/funcs/cmv
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)cmv	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/cmv,v 1.5.2.1 1999/08/29 14:14:11 peter Exp $
 
 # Conditional move--don't replace an existing file.
 
diff --git a/bin/sh/funcs/dirs b/bin/sh/funcs/dirs
index a5d3c8e7eeff..4d8ebd1e1253 100644
--- a/bin/sh/funcs/dirs
+++ b/bin/sh/funcs/dirs
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)dirs	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/dirs,v 1.5.2.1 1999/08/29 14:14:11 peter Exp $
 
 # pushd, popd, and dirs --- written by Chris Bertin
 # Pixel Computer Inc. ...!wjh12!pixel!pixutl!chris
diff --git a/bin/sh/funcs/kill b/bin/sh/funcs/kill
index 7455571f8b98..9daf88ea5036 100644
--- a/bin/sh/funcs/kill
+++ b/bin/sh/funcs/kill
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)kill	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/kill,v 1.5.2.1 1999/08/29 14:14:12 peter Exp $
 
 # Convert job names to process ids and then run /bin/kill.
 
diff --git a/bin/sh/funcs/login b/bin/sh/funcs/login
index 7a6fc855bfc2..de33d8953e02 100644
--- a/bin/sh/funcs/login
+++ b/bin/sh/funcs/login
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)login	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/login,v 1.5.2.1 1999/08/29 14:14:12 peter Exp $
 
 # replaces the login builtin in the BSD shell
 login () exec login "$@"
diff --git a/bin/sh/funcs/newgrp b/bin/sh/funcs/newgrp
index fd8e5d6ee5a7..01eabe73a88a 100644
--- a/bin/sh/funcs/newgrp
+++ b/bin/sh/funcs/newgrp
@@ -33,6 +33,6 @@
 # SUCH DAMAGE.
 #
 #	@(#)newgrp	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/newgrp,v 1.5.2.1 1999/08/29 14:14:13 peter Exp $
 
 newgrp() exec newgrp "$@"
diff --git a/bin/sh/funcs/popd b/bin/sh/funcs/popd
index e0be35a13a79..9a8825e464d8 100644
--- a/bin/sh/funcs/popd
+++ b/bin/sh/funcs/popd
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)popd	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/popd,v 1.5.2.1 1999/08/29 14:14:13 peter Exp $
 
 # pushd, popd, and dirs --- written by Chris Bertin
 # Pixel Computer Inc. ...!wjh12!pixel!pixutl!chris
diff --git a/bin/sh/funcs/pushd b/bin/sh/funcs/pushd
index d60ede2cbbcc..ce8f8a5206f5 100644
--- a/bin/sh/funcs/pushd
+++ b/bin/sh/funcs/pushd
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)pushd	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/pushd,v 1.5.2.1 1999/08/29 14:14:14 peter Exp $
 
 # pushd, popd, and dirs --- written by Chris Bertin
 # Pixel Computer Inc. ...!wjh12!pixel!pixutl!chris
diff --git a/bin/sh/funcs/suspend b/bin/sh/funcs/suspend
index f06e12ff0575..c3dead3c5813 100644
--- a/bin/sh/funcs/suspend
+++ b/bin/sh/funcs/suspend
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)suspend	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/suspend,v 1.5.2.1 1999/08/29 14:14:14 peter Exp $
 
 suspend() {
 	local -
diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c
index 798118b90a61..1b6d42fc6ad6 100644
--- a/bin/sh/histedit.c
+++ b/bin/sh/histedit.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)histedit.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/sh/histedit.c,v 1.12.2.1 1999/08/29 14:13:44 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/sh/init.h b/bin/sh/init.h
index 366b8a3f376d..75190da7badb 100644
--- a/bin/sh/init.h
+++ b/bin/sh/init.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)init.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/init.h,v 1.5.2.1 1999/08/29 14:13:46 peter Exp $
  */
 
 void init __P((void));
diff --git a/bin/sh/input.c b/bin/sh/input.c
index d7653ef0fefa..c8fadd9aa5c2 100644
--- a/bin/sh/input.c
+++ b/bin/sh/input.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)input.c	8.3 (Berkeley) 6/9/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/sh/input.c,v 1.11.2.1 1999/08/29 14:13:46 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>	/* defines BUFSIZ */
diff --git a/bin/sh/input.h b/bin/sh/input.h
index 16d7244cd4e7..6a62c6f397eb 100644
--- a/bin/sh/input.h
+++ b/bin/sh/input.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)input.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/input.h,v 1.6.2.1 1999/08/29 14:13:46 peter Exp $
  */
 
 /* PEOF (the end of file marker) is defined in syntax.h */
diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c
index d33e74cc0b50..2cd67bf35d82 100644
--- a/bin/sh/jobs.c
+++ b/bin/sh/jobs.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)jobs.c	8.5 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/sh/jobs.c,v 1.23.2.3 1999/08/29 14:13:47 peter Exp $";
 #endif /* not lint */
 
 #include <fcntl.h>
diff --git a/bin/sh/jobs.h b/bin/sh/jobs.h
index e8274b08f0ff..2e2409c1210d 100644
--- a/bin/sh/jobs.h
+++ b/bin/sh/jobs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)jobs.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/jobs.h,v 1.10.2.2 1999/08/29 14:13:47 peter Exp $
  */
 
 /* Mode argument to forkshell.  Don't change FORK_FG or FORK_BG. */
diff --git a/bin/sh/machdep.h b/bin/sh/machdep.h
index 20aadd04180a..ab15ca9b3c0a 100644
--- a/bin/sh/machdep.h
+++ b/bin/sh/machdep.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)machdep.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/machdep.h,v 1.5.2.1 1999/08/29 14:13:48 peter Exp $
  */
 
 /*
diff --git a/bin/sh/mail.c b/bin/sh/mail.c
index 826e89a31e8f..0bf510b48106 100644
--- a/bin/sh/mail.c
+++ b/bin/sh/mail.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)mail.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/sh/mail.c,v 1.8.2.1 1999/08/29 14:13:48 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/bin/sh/mail.h b/bin/sh/mail.h
index 319796b13eef..87e73a7b3a3e 100644
--- a/bin/sh/mail.h
+++ b/bin/sh/mail.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mail.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/mail.h,v 1.5.2.1 1999/08/29 14:13:49 peter Exp $
  */
 
 void chkmail __P((int));
diff --git a/bin/sh/main.c b/bin/sh/main.c
index 3a15230e1240..5c41f89712d2 100644
--- a/bin/sh/main.c
+++ b/bin/sh/main.c
@@ -45,7 +45,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/sh/main.c,v 1.15.2.2 1999/08/29 14:13:49 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/bin/sh/main.h b/bin/sh/main.h
index 3dc3dd77c4d7..2cccd155cdee 100644
--- a/bin/sh/main.h
+++ b/bin/sh/main.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)main.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/main.h,v 1.5.2.1 1999/08/29 14:13:50 peter Exp $
  */
 
 extern int rootpid;	/* pid of main shell */
diff --git a/bin/sh/memalloc.c b/bin/sh/memalloc.c
index dcae8660349b..77387b9e5250 100644
--- a/bin/sh/memalloc.c
+++ b/bin/sh/memalloc.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)memalloc.c	8.3 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/sh/memalloc.c,v 1.12.2.2 1999/08/29 14:13:50 peter Exp $";
 #endif /* not lint */
 
 #include "shell.h"
diff --git a/bin/sh/memalloc.h b/bin/sh/memalloc.h
index ab53a833e41a..631b356f0942 100644
--- a/bin/sh/memalloc.h
+++ b/bin/sh/memalloc.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)memalloc.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/memalloc.h,v 1.5.2.1 1999/08/29 14:13:51 peter Exp $
  */
 
 struct stackmark {
diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c
index 24683572aab7..431046c6d202 100644
--- a/bin/sh/miscbltin.c
+++ b/bin/sh/miscbltin.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)miscbltin.c	8.4 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/sh/miscbltin.c,v 1.18.2.3 1999/09/02 12:09:48 tg Exp $";
 #endif /* not lint */
 
 /*
diff --git a/bin/sh/mkbuiltins b/bin/sh/mkbuiltins
index 89f50d279b92..363535817c12 100755
--- a/bin/sh/mkbuiltins
+++ b/bin/sh/mkbuiltins
@@ -35,7 +35,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)mkbuiltins	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/mkbuiltins,v 1.7.2.1 1999/08/29 14:13:52 peter Exp $
 
 temp=/tmp/ka$$
 havejobs=0
diff --git a/bin/sh/mkinit.c b/bin/sh/mkinit.c
index e6de2d2fb245..2ea4b7c56d40 100644
--- a/bin/sh/mkinit.c
+++ b/bin/sh/mkinit.c
@@ -45,7 +45,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)mkinit.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/sh/mkinit.c,v 1.12.2.1 1999/08/29 14:13:52 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/bin/sh/mknodes.c b/bin/sh/mknodes.c
index 615668b3733a..ddebe91b8b8f 100644
--- a/bin/sh/mknodes.c
+++ b/bin/sh/mknodes.c
@@ -45,7 +45,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)mknodes.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/sh/mknodes.c,v 1.9.2.1 1999/08/29 14:13:53 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/bin/sh/mksyntax.c b/bin/sh/mksyntax.c
index 8e4ab082c712..5d0dd6060037 100644
--- a/bin/sh/mksyntax.c
+++ b/bin/sh/mksyntax.c
@@ -45,7 +45,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)mksyntax.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/sh/mksyntax.c,v 1.12.2.1 1999/08/29 14:13:53 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/bin/sh/mktokens b/bin/sh/mktokens
index 172bb23d4968..4d1ba8768d82 100644
--- a/bin/sh/mktokens
+++ b/bin/sh/mktokens
@@ -35,7 +35,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)mktokens	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/mktokens,v 1.5.2.1 1999/08/29 14:13:54 peter Exp $
 
 # The following is a list of tokens.  The second column is nonzero if the
 # token marks the end of a list.  The third column is the name to print in
diff --git a/bin/sh/myhistedit.h b/bin/sh/myhistedit.h
index e60bf5a43d0c..c3d9ed157587 100644
--- a/bin/sh/myhistedit.h
+++ b/bin/sh/myhistedit.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)myhistedit.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/myhistedit.h,v 1.6.2.1 1999/08/29 14:13:54 peter Exp $
  */
 
 #include <histedit.h>
diff --git a/bin/sh/mystring.c b/bin/sh/mystring.c
index 8013f7da6a7a..674a3969f71c 100644
--- a/bin/sh/mystring.c
+++ b/bin/sh/mystring.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)mystring.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/sh/mystring.c,v 1.9.2.1 1999/08/29 14:13:55 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/bin/sh/mystring.h b/bin/sh/mystring.h
index 4a78bd9de5ee..739a32926ff9 100644
--- a/bin/sh/mystring.h
+++ b/bin/sh/mystring.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mystring.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/mystring.h,v 1.5.2.1 1999/08/29 14:13:55 peter Exp $
  */
 
 #include <string.h>
diff --git a/bin/sh/nodes.c.pat b/bin/sh/nodes.c.pat
index 526cd88610d0..342f73cc3c65 100644
--- a/bin/sh/nodes.c.pat
+++ b/bin/sh/nodes.c.pat
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nodes.c.pat	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/nodes.c.pat,v 1.6.2.1 1999/08/29 14:13:56 peter Exp $
  */
 
 #include <stdlib.h>
diff --git a/bin/sh/nodetypes b/bin/sh/nodetypes
index ce82a35d266f..6f5a9381e13c 100644
--- a/bin/sh/nodetypes
+++ b/bin/sh/nodetypes
@@ -34,7 +34,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)nodetypes	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/nodetypes,v 1.5.2.1 1999/08/29 14:13:57 peter Exp $
 
 # This file describes the nodes used in parse trees.  Unindented lines
 # contain a node type followed by a structure tag.  Subsequent indented
diff --git a/bin/sh/options.c b/bin/sh/options.c
index 2bd55f5030e7..9960c5abb7d7 100644
--- a/bin/sh/options.c
+++ b/bin/sh/options.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)options.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/sh/options.c,v 1.14.2.1 1999/08/29 14:13:57 peter Exp $";
 #endif /* not lint */
 
 #include <signal.h>
diff --git a/bin/sh/options.h b/bin/sh/options.h
index e28370364df7..705438a9c8ea 100644
--- a/bin/sh/options.h
+++ b/bin/sh/options.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)options.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/options.h,v 1.7.2.2 1999/08/29 14:13:58 peter Exp $
  */
 
 struct shparam {
diff --git a/bin/sh/output.c b/bin/sh/output.c
index 82ae3803774f..f747b04efcdb 100644
--- a/bin/sh/output.c
+++ b/bin/sh/output.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)output.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/sh/output.c,v 1.9.2.1 1999/08/29 14:13:58 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/bin/sh/output.h b/bin/sh/output.h
index f99db6b81b8b..49409096aedf 100644
--- a/bin/sh/output.h
+++ b/bin/sh/output.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)output.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/output.h,v 1.7.2.1 1999/08/29 14:13:58 peter Exp $
  */
 
 #ifndef OUTPUT_INCL
diff --git a/bin/sh/parser.c b/bin/sh/parser.c
index c73dbc289a67..6fad907224dd 100644
--- a/bin/sh/parser.c
+++ b/bin/sh/parser.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)parser.c	8.7 (Berkeley) 5/16/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/sh/parser.c,v 1.24.2.1 1999/08/29 14:13:59 peter Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/bin/sh/parser.h b/bin/sh/parser.h
index fdb2c342bbda..d791f6226eb7 100644
--- a/bin/sh/parser.h
+++ b/bin/sh/parser.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)parser.h	8.3 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/parser.h,v 1.7.2.1 1999/08/29 14:13:59 peter Exp $
  */
 
 /* control characters in argument strings */
diff --git a/bin/sh/redir.c b/bin/sh/redir.c
index 79b70d05840f..b355234708d7 100644
--- a/bin/sh/redir.c
+++ b/bin/sh/redir.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)redir.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/sh/redir.c,v 1.10.2.1 1999/08/29 14:14:00 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/sh/redir.h b/bin/sh/redir.h
index 709ed12326f5..c2d8a4dca84c 100644
--- a/bin/sh/redir.h
+++ b/bin/sh/redir.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)redir.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/redir.h,v 1.6.2.1 1999/08/29 14:14:00 peter Exp $
  */
 
 /* flags passed to redirect */
diff --git a/bin/sh/sh.1 b/bin/sh/sh.1
index d720491c3a45..27aa71e3a52d 100644
--- a/bin/sh/sh.1
+++ b/bin/sh/sh.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.23.2.8 1999/12/05 12:16:26 cracauer Exp $
 .\"
 .Dd May 5, 1995
 .Dt SH 1
diff --git a/bin/sh/shell.h b/bin/sh/shell.h
index 5939df776c2a..7ee0404e08a3 100644
--- a/bin/sh/shell.h
+++ b/bin/sh/shell.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)shell.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/shell.h,v 1.10.2.1 1999/08/29 14:14:02 peter Exp $
  */
 
 /*
diff --git a/bin/sh/show.c b/bin/sh/show.c
index 620ffa4bcfd6..28dbbd30c999 100644
--- a/bin/sh/show.c
+++ b/bin/sh/show.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)show.c	8.3 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/sh/show.c,v 1.9.2.1 1999/08/29 14:14:02 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/bin/sh/show.h b/bin/sh/show.h
index 1b6cbbc21296..5345ec586ad2 100644
--- a/bin/sh/show.h
+++ b/bin/sh/show.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)show.h	1.1 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/show.h,v 1.6.2.1 1999/08/29 14:14:03 peter Exp $
  */
 
 void showtree __P((union node *));
diff --git a/bin/sh/trap.c b/bin/sh/trap.c
index 233746e6b5fa..a86bf230d2e2 100644
--- a/bin/sh/trap.c
+++ b/bin/sh/trap.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)trap.c	8.5 (Berkeley) 6/5/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/sh/trap.c,v 1.17.2.3 1999/08/29 14:14:03 peter Exp $";
 #endif /* not lint */
 
 #include <signal.h>
diff --git a/bin/sh/trap.h b/bin/sh/trap.h
index 2140c1460499..b7f13cea6d37 100644
--- a/bin/sh/trap.h
+++ b/bin/sh/trap.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)trap.h	8.3 (Berkeley) 6/5/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/trap.h,v 1.8.2.1 1999/08/29 14:14:04 peter Exp $
  */
 
 extern int pendingsigs;
diff --git a/bin/sh/var.c b/bin/sh/var.c
index 056ae6fcfe59..303e4b750b28 100644
--- a/bin/sh/var.c
+++ b/bin/sh/var.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/sh/var.c,v 1.12.2.2 1999/08/29 14:14:04 peter Exp $";
 #endif /* not lint */
 
 #include <unistd.h>
diff --git a/bin/sh/var.h b/bin/sh/var.h
index 1a215fc806db..f5ab135a47ac 100644
--- a/bin/sh/var.h
+++ b/bin/sh/var.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)var.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/var.h,v 1.7.2.1 1999/08/29 14:14:04 peter Exp $
  */
 
 /*
diff --git a/bin/sleep/Makefile b/bin/sleep/Makefile
index 4ff73308c45b..63b6991d2112 100644
--- a/bin/sleep/Makefile
+++ b/bin/sleep/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/sleep/Makefile,v 1.4.2.1 1999/08/29 14:14:16 peter Exp $
 
 PROG=	sleep
 
diff --git a/bin/sleep/sleep.1 b/bin/sleep/sleep.1
index 2908b3dda829..c50874382371 100644
--- a/bin/sleep/sleep.1
+++ b/bin/sleep/sleep.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sleep.1	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/sleep/sleep.1,v 1.8.2.3 1999/10/28 18:02:43 ru Exp $
 .\"
 .Dd April 18, 1994
 .Dt SLEEP 1
diff --git a/bin/sleep/sleep.c b/bin/sleep/sleep.c
index 008398759b1f..5480e8cdae17 100644
--- a/bin/sleep/sleep.c
+++ b/bin/sleep/sleep.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)sleep.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/sleep/sleep.c,v 1.7.2.2 1999/10/28 18:02:44 ru Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/bin/stty/Makefile b/bin/stty/Makefile
index 82b15eb7fcae..f16e82c570f6 100644
--- a/bin/stty/Makefile
+++ b/bin/stty/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/stty/Makefile,v 1.4.2.1 1999/08/29 14:14:18 peter Exp $
 
 PROG=	stty
 SRCS=	cchar.c gfmt.c key.c modes.c print.c stty.c util.c
diff --git a/bin/stty/cchar.c b/bin/stty/cchar.c
index 847cf749e0ac..ba423e302115 100644
--- a/bin/stty/cchar.c
+++ b/bin/stty/cchar.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cchar.c	8.5 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/stty/cchar.c,v 1.8.2.1 1999/08/29 14:14:19 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/stty/extern.h b/bin/stty/extern.h
index 27869f852dfe..ac86fbc08a11 100644
--- a/bin/stty/extern.h
+++ b/bin/stty/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/stty/extern.h,v 1.4.2.1 1999/08/29 14:14:19 peter Exp $
  */
 
 int	c_cchars __P((const void *, const void *));
diff --git a/bin/stty/gfmt.c b/bin/stty/gfmt.c
index b34a1179f475..b270287f3cd2 100644
--- a/bin/stty/gfmt.c
+++ b/bin/stty/gfmt.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)gfmt.c	8.6 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/stty/gfmt.c,v 1.9.2.1 1999/08/29 14:14:20 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/stty/key.c b/bin/stty/key.c
index ba33a81c405f..940d8f98683a 100644
--- a/bin/stty/key.c
+++ b/bin/stty/key.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)key.c	8.3 (Berkeley) 4/2/94";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/stty/key.c,v 1.10.2.1 1999/08/29 14:14:20 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/bin/stty/modes.c b/bin/stty/modes.c
index b1f333e1013f..476a7d2b2f03 100644
--- a/bin/stty/modes.c
+++ b/bin/stty/modes.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)modes.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/stty/modes.c,v 1.7.2.1 1999/08/29 14:14:21 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/stty/print.c b/bin/stty/print.c
index ce479f55e381..bf8ea434ce40 100644
--- a/bin/stty/print.c
+++ b/bin/stty/print.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)print.c	8.6 (Berkeley) 4/16/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/stty/print.c,v 1.10.2.1 1999/08/29 14:14:21 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/stty/stty.1 b/bin/stty/stty.1
index 335c50321ed2..d81707dab97e 100644
--- a/bin/stty/stty.1
+++ b/bin/stty/stty.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)stty.1	8.4 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/stty/stty.1,v 1.10.2.2 1999/08/29 14:14:21 peter Exp $
 .\"
 .Dd April 18, 1994
 .Dt STTY 1
diff --git a/bin/stty/stty.c b/bin/stty/stty.c
index 3b5913134656..32a7ca1b86ff 100644
--- a/bin/stty/stty.c
+++ b/bin/stty/stty.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)stty.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/stty/stty.c,v 1.12.2.1 1999/08/29 14:14:22 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/stty/stty.h b/bin/stty/stty.h
index e122979d799d..29be2d2d244a 100644
--- a/bin/stty/stty.h
+++ b/bin/stty/stty.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stty.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/stty/stty.h,v 1.4.2.1 1999/08/29 14:14:22 peter Exp $
  */
 
 #include <sys/ioctl.h>
diff --git a/bin/stty/util.c b/bin/stty/util.c
index b99e83f67d96..4a77b332de95 100644
--- a/bin/stty/util.c
+++ b/bin/stty/util.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/stty/util.c,v 1.7.2.1 1999/08/29 14:14:22 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/sync/Makefile b/bin/sync/Makefile
index 9698a64dcd0d..37e43b8d6241 100644
--- a/bin/sync/Makefile
+++ b/bin/sync/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/sync/Makefile,v 1.5.2.1 1999/08/29 14:14:24 peter Exp $
 
 PROG=	sync
 MAN8=	sync.8
diff --git a/bin/sync/sync.8 b/bin/sync/sync.8
index 36b017f9edc4..19f94c005ae9 100644
--- a/bin/sync/sync.8
+++ b/bin/sync/sync.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sync.8	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/sync/sync.8,v 1.7.2.1 1999/08/29 14:14:24 peter Exp $
 .\"
 .Dd May 31, 1993
 .Dt SYNC 8
diff --git a/bin/sync/sync.c b/bin/sync/sync.c
index 6fe316022702..365854a4f636 100644
--- a/bin/sync/sync.c
+++ b/bin/sync/sync.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)sync.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/sync/sync.c,v 1.8.2.1 1999/08/29 14:14:25 peter Exp $";
 #endif /* not lint */
 
 #include <unistd.h>
diff --git a/bin/test/Makefile b/bin/test/Makefile
index c1bc62c5fc6e..2712d2d9a183 100644
--- a/bin/test/Makefile
+++ b/bin/test/Makefile
@@ -1,5 +1,5 @@
 #        @(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/test/Makefile,v 1.4.2.2 1999/12/15 13:37:10 sheldonh Exp $
 
 PROG=	test
 LINKS=	${BINDIR}/test ${BINDIR}/[
diff --git a/bin/test/TEST.README b/bin/test/TEST.README
index f29195374968..326c6bd303a3 100644
--- a/bin/test/TEST.README
+++ b/bin/test/TEST.README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/test/TEST.README,v 1.3.2.1 1999/08/29 14:14:27 peter Exp $
 
 OS/shell			syntax error	failed
 --------------------------------------------------------------------
diff --git a/bin/test/TEST.csh b/bin/test/TEST.csh
index afa1c91f158a..7c77c1c34bdb 100644
--- a/bin/test/TEST.csh
+++ b/bin/test/TEST.csh
@@ -1,5 +1,5 @@
 #	@(#)TEST.csh	5.2 (Berkeley) 4/30/93
-# $FreeBSD$
+# $FreeBSD: src/bin/test/TEST.csh,v 1.5.2.1 1999/08/29 14:14:27 peter Exp $
 
 #alias t '/usr/src/bin/test/obj/test \!*; echo $status'
 alias t '/bin/test \!*; echo $status'
diff --git a/bin/test/TEST.sh b/bin/test/TEST.sh
index 148cba25624a..810ca1c4a853 100644
--- a/bin/test/TEST.sh
+++ b/bin/test/TEST.sh
@@ -26,7 +26,7 @@
 #
 # TEST.sh - check if test(1) or builtin test works
 #
-# $FreeBSD$
+# $FreeBSD: src/bin/test/TEST.sh,v 1.5.2.1 1999/08/29 14:14:28 peter Exp $
 
 # force a specified test program, e.g. `env test=/bin/test sh TEST.sh'
 : ${test=test}		
diff --git a/bin/test/test.1 b/bin/test/test.1
index cfd9ff7fc8fb..8580a85e4b8b 100644
--- a/bin/test/test.1
+++ b/bin/test/test.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)test.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/test/test.1,v 1.8.2.2 1999/12/15 13:37:11 sheldonh Exp $
 .\"
 .Dd May 31, 1993
 .Dt TEST 1
diff --git a/bin/test/test.c b/bin/test/test.c
index e02559d3df72..cd6a0228cbaf 100644
--- a/bin/test/test.c
+++ b/bin/test/test.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/bin/test/test.c,v 1.20.2.4 1999/12/15 13:37:11 sheldonh Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/contrib/amd/ChangeLog b/contrib/amd/ChangeLog
index ca984a269e69..c8ef4a66c457 100644
--- a/contrib/amd/ChangeLog
+++ b/contrib/amd/ChangeLog
@@ -3716,1810 +3716,6 @@ Sat May 10 13:09:06 1997  Erez Zadok  <ezk@lorien.cs.columbia.edu>
 	Solaris, which include NFS V3 support.
 
 	* conf/nfs_prot/nfs_prot_default.h: default NFS protocol headers.
-	*** Released am-utils-6.0a15					***
-	* conf/transp/transp_{tli,sockets}.c (get_mount_client): use NFS
-	protocol version while getting a mount client.
-
-	* amd/ops_nfs.c (mount_nfs_fh): set the mount types, mnttab types,
-	file handle size, and proper file handle based on the correct NFS
-	version number.
-	browsable_dirs=full, which will print *all* entries (other than
-	* conf/mount/mount_svr4.c (mount_svr4): support NFS3 mounts under
-	Solaris and other SVR4 systems.
-
-	* amd/ops_nfs.c: store NFS file handle version and version
-	specific handle in struct fh_cache.
-	(got_nfs_fh): pick the correct RPC reply based on the NFS version
-	of the server.
-	(prime_nfs_fhandle_cache): figure out the right NFS file handle
-	for a node, but now include NFS protocol version information.
-	(call_mountd): set the correct version for the mount protocol,
-	based on the NFS protocol version.
-	(nfs_init): use the NFS protocol generic structure
-	am_nfs_handle_t.
-	to 1500.
-	* include/am_utils.h: new structure am_nfs_handle_t to contain all
-	possible versions of NFS file handles.
-	* doc/am-utils.texi: fixed reversed documentation for NFS mount
-	* amd/srvr_nfs.c (start_ping): ping program performs NFS version
-	specific pings.
-	(recompute_portmap): figure out the correct portmap version mount.
-	(nfs_keepalive): call start_ping() with the correct NFS version.
-	(find_nfs_srvr): if mount option "vers=" is given, use it.  Get
-	the NFS server version and verify that it is up.
-
-	* conf/transp/transp_{tli,sockets}.c (get_nfs_version): a new
-	function to find the best NFS version for a particular host.
-	installing html files.  Another new target "alldocs" is just for
-	* libamu/amu.h: determine what is the highest version of NFS we
-	should try.
-
-	* include/am_utils.h (NFS_VERSION3): added definition for NFS V3
-	protocol number.
-	Added field fs_version to struct fserver, so we can now store the
-	server protocol version.
-	facility in the log_file option.
-Fri May  9 01:09:45 1997  Erez Zadok  <ezk@lorien.cs.columbia.edu>
-	* libamu/xutil.c (get_syslog_facility): allow users to specify the
-	* aux/macros/check_field.m4 (AC_MOUNT_HEADERS): map '.' (dot) into
-	underscores too, so I can test for sub-fields.
-	will use the default LOG_DAEMON facility.
-	* libamu/wire.c: use test that checks for sub-fields of struct
-	ifreq.
-Thu Jan  8 04:05:10 1998  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-Sat May  6 10:20:17 2000  Erez Zadok  <ezk@glory.soscorp.com>
-	(intel).
-	* port to BSD/OS 3.0 completed!  Many xdr_ functions were broken
-	into smaller files.  M4 macros fixed to test for existence of
-	file systems using getvfsbyname().
-	before appending to it, on systems with two or more network
-	* amd/sched.c (sigchld): signal handler must waitpid() for all
-	possible children.
-	the mntent for cachefs.
-	* hlfsd/homedir.c: signal handler must waitpid() for all possible
-	children. 
-	const for both arguments.
-	* aux/macros/check_restartable_signals.m4: new macro to determine
-	if need to reinstall signal handlers per OS is better than trying
-	to figure these out based on system macros.
-
-Fri May  5 19:23:28 2000  Erez Zadok  <ezk@glory.soscorp.com>
-	* amq/pawd.c (cluster_server): don't use getccent() if the extern
-	* amd/ops_nfs.c (mount_nfs_fh): set nfs_args_t version number.
-	<cluster.h> and struct cct_entry do not exist.
-	* amd/ops_afs.c (mount_toplvl): set nfs_args_t version number.
-	hpux systems don't have it (hpux 10.20).
-	* amd/ops_nfs.c (mount_nfs_fh): process nfs mount option resvport
-	(must be supplied for bsdi 3.0)
-
-	* libamu/wire.c: use HAVE_FIELD_STRUCT_IFREQ_IFR_ADDR (and
-	associated new macro) for determining the right way to compute the
-	size of the interface structure.
-	for new amq options -T/-U.
-Fri Apr 11 15:56:13 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* aux/configure.in: need to include libc before libnsl if
-	get_myaddress() is available because on irix libnsl has a buggy
-	get_myaddress().
-
-	* include/am_defs.h: make sure REINSTATE_SIGNAL_HANDLER is defined
-	on Irix 6 (an SVR4 variant)
-	* amq/pawd.c: a new program, Print Automounter Working Directory,
-Thu Mar 27 02:28:40 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-	* aux/macros/localconfig.m4: trivial support for am-utils
-	*******************************************************************
-	*** Released am-utils-6.0a4					***
-	*******************************************************************
-	wish in a file called localconfig.h, located in the top build
-Wed Mar 26 21:15:36 1997  Erez "HWank1" Zadok  <ezk@lorien.cs.columbia.edu>
-	* doc/am-utils.texi (Caching Filesystem): updated documents for
-	* amd/amq_subr.c (ok_security): turned off insecure code unless
-	user explicitly runs configure --enable-amq-mount.
-	* amd/ops_cachefs.c: initial cachefs support, for solaris.
-	* hlfsd/hlfsd.c (main): use new protoypes dor create_nfs_service().
-
-	* amd/nfs_start.c (mount_automounter): use code that separately
-	creates the NFS and the amq service.  Register tcp and udp
-	services for amd.
-	cachefs file systems.
-	* conf/transp/transp_*.c (create_amq_service): new function to
-	separately create the amq service for amd.  Simplified prototypes
-	for create_nfs_service().
-	mnttab type is.
-Wed Mar 19 20:40:56 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-Mon Jan  5 23:22:49 1998  Erez Zadok  <ezk@lorien.cs.columbia.edu>
-	*******************************************************************
-	*** Released am-utils-6.0a3					***
-	*******************************************************************
-
-Wed Mar 19 17:49:18 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-	* amd/ops_nfsl.c (nfsl_ffserver, nfsl_match): also check if the
-	* new port: rs6000-ibm-aix3.2.5 and rs6000-ibm-aix4.1.5.0.  Lots
-	of small changes to support these two.
-	type:=nfs.
-Wed Mar 19 14:33:30 1997  Erez Zadok  <ezk@grande.cs.columbia.edu>
-	* updated all source files to add 1998 as a copyright year.
-	* conf/umount/umount_default.c (umount_fs): bug: unlock_mntlist()
-	should run if MOUNT_TABLE_ON_FILE, not otherwise.
-	like type:=linkx if the pathname denoted by $fs exists, and like
-Mon Mar 17 22:02:43 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* hlfsd/hlfsd.c (main): fill in fhsize field if exists
-	(freebsd-2.2).
-
-	* amd/ops_{nfs,afs}.c (mount_toplvl): fill in fhsize field if
-	exists (freebsd-2.2).
-
-Sat Mar 15 19:37:48 1997  Erez "HWank1" Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-	* hlfsd/homedir.c (plt_init): make function exported, to save on
-	* new port: i386-unknown-freebsd2.2.  FreeBSD 2.2 and higher
-	changed the filehandle type in struct nfs_args from nfsv2fh_t to
-	u_char.
-	instead.
-Sat Mar 14 10:11:03 1997  Erez "HWank1" Zadok  <ezk@lorien.cs.columbia.edu>
-Thu Jan  1 00:15:58 1998  Erez Zadok  <ezk@chestnut.mcl.cs.columbia.edu>
-	* SHARED LIBRARIES: too many change to list individually.  Now,
-	libamu can be built as a shared library, and other programs link
-	with it.
-
-Tue Mar 11 22:24:09 1997  Erez "HWank1" Zadok  <ezk@lorien.cs.columbia.edu>
-
-	* aux/macros/opt_shared.m4: new macro for setting options for
-	building shared am-utils libraries.
-	* amd/ops_afs.c (mount_toplvl): Bug fix.  Don't try to free() an
-Sun Mar  9 19:17:46 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-	* ALL SOURCES: change every direct call to free() to xfree(), so
-	* fixmount/fixrmtab: cleaned up the script.
-	call dxfree(), which will print the file name and line number
-	* fixmount/Makefile.am (EXTRA_DIST): adde $(sbin_SCRIPTS) so that
-	fixrmtab gets distributed too.
-
-	* conf/nfs_prot/nfs_prot_bsdi2.h: added support for MOUNTPROC_DUMP.
-	Added extern for xdr_mountlist().
-Tue Dec 23 04:24:28 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-	* aux/configure.in: trimmed down many tests for MNT2_GEN_OPT,
-	MNT2_NFS_OPT, and MNTTAB_OPT that were not referenced anywhere in
-	the sources.
-
-Sat Mar  8 00:23:58 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-	calloc().
-	* fixmount/hlfsd ported to bsd44, hpux, and linux systems.
-
-	* aux/macros/check_fixmount_style.m4: add check for bsd44 systems.
-	malloc().
-	* conf/fixmount/fixmount_default.c: use lockf() if flock() is
-	unavailable.
-	zero its bytes.
-	* include/am_defs.h: include <string.h> even if don't have
-	STDC_HEADERS defined (sunos4).
-	(seteuid): define seteuid() to be setresuid() for systems that
-	have but not the other (hpux).
-	* amq/amq.c: amq does not need its own definition of xfree().
-	* aux/macros/check_extern.m4: test should include <strings.h>.
-	look for function malloc_verify() in libmapmalloc.a, and function
-Tue Mar  4 17:16:52 1997  Erez "HWank1" Zadok  <ezk@lorien.cs.columbia.edu>
-
-	* lib/xutil.c (debug_option): moved from amd/getargs.c to this
-	more proper file.
-	uordbytes, because it does not always exist.  Rather, compute it
-	* include/am_utils.h: put in structure for debug options, for all
-	progams to use.
-	used when debugging memory references.
-	* amd/get_args.c: moved structure for debug options out.
-Mon Dec 22 03:01:30 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-Sun Mar  2 00:13:07 1997  Erez "HWank1" Zadok  <ezk@lorien.cs.columbia.edu>
-	Otherwise browsable_dirs fails on OpenBSD 2.2.
-	* ported fixmount.
-	* amd/mntfs.c (uninit_mntfs): bug fix.  Moved freeing of
-	* lib/ualarm.c: replacement function for systems that don't have a
-	ualarm().
-Sat Dec 20 00:51:21 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-	* ported fsinfo.
-	* amd/ops_host.c (host_umounted): don't use clnt_spcreateerror()
-Sun Mar  1 10:23:34 1997  Erez "HWank1" Zadok  <ezk@lorien.cs.columbia.edu>
-	* include/am_defs.h: add missing extern definition for free().
-	* ported mk-amd-map.
-
-	* buildall: added -K option to buildall, to run mkconf.
-	optional function.
-Fri Feb 28 01:10:25 1997  Erez "HWank1" Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-	if they exist.
-	*******************************************************************
-	*** Released am-utils-6.0a2					***
-	*******************************************************************
-	* aux/configure.in: check for missing functions clnt_create and
-Thu Feb 27 13:58:59 1997  Erez "HWank1" Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* all *.[hcyl] files: add copyright line.
-	* Makefile.am: updates for new sunos3 files distributed.
-	* aux/macros/check_mount_type.m4: test for mount type for
-	linux-like systems, by checking for loadable or statically linked
-	kernel filesystem modules.
-	* conf/fh_dref/fh_dref_sunos3.h: new file.
-	* aux/macros/check_mnttab_type.m4: test for mount table entry
-	for linux-like systems, by checking for loadable or statically
-	linked kernel filesystem modules.
-	* aux/macros/check_nfs_fh_dref.m4: added sunos3 case.
-	* aux/configure.in: pcfs filesystems can use vfat type (linux)
-	* doc/am-utils.texi (wire Selector Variable): updated manual for
-	* aux/macros/check_fs_mntent.m4: test for filesystem existence for
-	linux-like systems, by checking for loadable or statically linked
-	kernel filesystem modules.
-	in_network() function.
-	* conf/trap/trap_hpux.h: ugly hack added because of stupide HPUX
-	9.0 header files.  This should be removed when HPUX 9.0 is deemed
-	defunct.
-	functions.  Converted wire, network, and netnumber all to use the
-	* aux/acconfig.h: set an undefined variable for having an extern
-	to clnt_sperrno().
-	against all networks, not just primary.
-	* include/am_defs.h: define extern for clnt_sperrno() if needed.
-	* conf/nfs_prot/nfs_prot_linux.h: add special definitions for
-	* aux/configure.in: test for extern clnt_sperrno().
-	<rpc/des_auth.h> because it is incomplete on the same systems.
-	* aux/macros/check_nfs_fh_dref.m4: HPUX's NFS fhandle dref is
-	similar to irix.
-	* hlfsd/homedir.c (table_add): cast uid field to int, for
-	* aux/macros/check_mount_style.m4: use mount helper on HPUX.
-	* include/am_defs.h: more coflicts with redhat alpha linux
-	* aux/macros/check_mtype_type.m4: hpux's mount type is a char*,
-	not integer (but may be mapped to one later).
-	* aux/macros/{mount_headers,try_compile_anyfs,try_compile_nfs}.m4:
-	* conf/mount/mount_hpux.c (mount_hpux): HPUX has confusing header
-	files.  They have mount(2) and vfsmount(2) which don't take same
-	arguments, and they have string mount types MNTTYPE_* as well as
-	integer types MOUNT_*.  So I need this new mount function to map
-	from string types to integer types for the vfsmount() function.
-	redhat alpha linux.
-	* conf/trap/trap_hpux.h (MOUNT_TRAP): instead of calling
-	vfsmount(), call mount_hpux().
-	the new "!" (negated) nomadic functions.
-Thu Feb 27 03:34:14 1997  Erez "HWank1" Zadok  <ezk@okeeffe.cs.columbia.edu>
-	rather than saying that any ARG is on a local network.
-	* lib/mount_fs.c (mnt_flags): make sure SYNC option is on only if
-	both MNTTAB_OPT_SYNC and MNT2_GEN_OPT_SYNC are defined.
-
-Thu Feb 27 00:26:00 1997  Erez "HWank1" Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-Thu Dec 18 20:57:19 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-	* conf/nfs_prot/nfs_prot_hpux.h: NFS protocol definitions for
-	hpux.
-
-	* include/am_defs.h: no need to include rpc/auth.h or rpc/clnt.h.
-	Finally, it looks as if OpenBSD 2.2's NFS 3 implementation may be
-	* aux/configure.in: no need to test for rpc/auth.h and rpc/clnt.h.
-	wait until they get it working in their version of the automounter
-	* buildall: added ability to configure using other shells than
-	/bin/sh, on those systems where /bin/sh is buggy or limited
-	(HPUX).
-	maxgrp.
-	* aux/macros/struct_nfs_fh.m4: reinstated the macro but have it
-	defined am_nfs_fh, and also test for plain typedef "nfs_fh".
-	"maxgrps".  Added test for mount table entry "maxgroups".
-	* aux/acconfig.h: #undef am_nfs_fh, which is being defined by a
-	reinstated macro.
-	* libamu/mount_fs.c (compute_nfs_args): perform more careful tests
-	* aux/configure.in: check for <nfs/export.h>
-
-	* include/am_defs.h: include <nfs/export.h> (HPUX) if exists.
-	including 9.x, should use "ignore" as the mount type to hide from
-	* aux/macros/try_compile_nfs.m4: include <nfs/export.h> (HPUX) if
-	exists.
-
-	* aux/macros/mount_headers.m4 (define): removed some non-working
-	(on HPUX) code that attempts to recreate the fhandle_t rather than
-	load it up from system headers.  Also added some NFS protocol
-	header inclusion.  include <nfs/export.h> (HPUX) if exists.
-	every where in the sources.
-Wed Feb 26 00:32:35 1997  Erez "HWank1" Zadok  <ezk@okeeffe.cs.columbia.edu>
-
-	* aux/macros/mount_headers.m4 (define): Use M4 changequote to
-	ensure [] brackets are correctly used.
-	useful for detecting internal flags and options, as well as the
-	* aux/macros/expand_cpp_{string,hex,int}.m4: encapsulate
-	multi-line M4 inclusions in [].
-	after /etc and before /etc/local.
-Tue Feb 25 22:19:44 1997  Erez "HWank1" Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-	* aux/configure.in, libamu/Makefile.am: added support for linking
-	* conf/mtab/mtab_bsd.c (mnt_dup): use statfs field f_fstypename if
-	it exists.
-
-	* aux/acconfig.h: HAVE_FIELD_STRUCT_STATFS_F_FSTYPENAME, new
-	config.h macro for field f_fstypename of struct statfs.
-	needed.
-	* aux/configure.in: testing for field f_fstypename field of struct
-	statfs (NetBSD).
-	netbsd).
-	* aux/acconfig.h: moved all of the "static" definitions out to a
-	fixed file called include/am_defs.h.  Added to all */Makefile.am
-	files a dependency on am_defs.h.  Created am_defs.h of course, and
-	then added #include <amd_defs.h> to all of the source and header
-	files that required it.
-	for NetBSD-1.3_BETA and similarly for OpenBSD.
-Mon Feb 24 01:27:02 1997  Erez Zadok  <ezk@defiant.soscorp.com>
-	* conf/nfs_prot/nfs_prot_netbsd1_3.h: new header for the slight
-	* aux/acconfig.h: two more externals for xdr functions that may be
-	implemented by libamu.
-	mktemp().
-	* conf/nfs_prot/nfs_prot_bsdi2.h: added missing RPC and XDR
-	definitions.
-	* amd/ops_nfs.c (mount_nfs_fh): Systems that include the mount
-Sun Feb 23 15:25:26 1997  Erez "HWank1" Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-	"nfs3", but to "nfs" and then they set "vers=3".  Setting it to
-	* buildall (default): added -D option for turning on even stricker
-	developer options.
-	systems, set it to "nfs".
-	* */Makefile.am: make sure @AMU_NFS_PROT_HEADERS@ is used to
-	determine dependencies on optional NFS protocol headers.
-
-	* aux/acconfig.h: define and use HAVE_NFS_PROT_HEADERS as needed.
-
-	* aux/macros/check_nfs_prot_header.m4: new test to determine what
-	NFS protocol headers to use. 
-	system mount types under nextstep for mount(2).
-	* conf/nfs_prot/nfs_prot_{irix6,sunos4,bsdi2}.h: new headers to
-	complete missing system headers for NFS protocol definitions.
-	integer and string types for file system mount types in mount(2),
-Sun Feb 16 15:58:42 1997  Erez "HWank1" Zadok  <ezk@vir.cs.columbia.edu>
-	(EPERM) instead of 0 (OK).  Fixes m68k-next-nextstep3 which now
-	* amd/ops_nfs.c (mount_nfs_fh): encapsulated some more code in
-	#ifdef's as needed.
-
-	* amd/ops_afs.c (mount_toplvl): make sure TIMEO/RETRANS code is
-	suitable #ifdef'ed.
-
-	* include/am_compat.h: a couple more mnttab options
-	(timeo/retrans) setting just in case.
-
-	* amd/autil.c (host_normalize): make sure hostent->h_name is
-	passed a non-const char *.
-
-	* conf/mount/mount_linux.c (mount_linux): cleaned up a block of code.
-	inclusion of <nfs/nfs_mount.h> which only affects nextstep3, on
-	* {lib,amq,amd}/*.c (many functions): cast xdr_entry to
-	XDRPROC_T_TYPE.
-	* libamu/mount_fs.c (mnt_flags): support either nfs or generic
-	* lib/nfs_prot_svc.c (nfs_program_2): cast xdr_entry to
-	XDRPROC_T_TYPE.
-
-	* lib/nfs_prot_xdr.c (xdr_entry): cast xdr_entry to
-	XDRPROC_T_TYPE.
-
-	* lib/wire.c (getwire): Make sure safe assignment from const to
-	none is done.
-	file in the am-utils' home page, as well as a few other useful
-Sat Feb 15 19:38:51 1997  Erez "HWank1" Zadok  <ezk@vir.cs.columbia.edu>
-Mon Nov 17 05:22:56 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-	* aux/macros/expand_cpp_int.m4: new macro for expanding integers.
-	*******************************************************************
-	* aux/configure.in: added linux/fs.h support in configure and
-	several M4 macros.
-
-	* conf/mount/mount_linux.c (mount_linux): use macro instead of
-	"ugly" fixed hex number for mount() arguments.
-	ports.
-Sat Feb 15 02:09:47 1997  Erez "HWank1" Zadok  <ezk@lorien.cs.columbia.edu>
-
-	* amd/info_hesiod.c: removed macro HAVE_HS_ZONE_TRANSFER and
-	turned all of its code always on.  That code always seems to
-	compile, as long as you have hesiod and libresolv.
-	* scripts/amd.conf.5: corrected info for -o/-O options.
-	* amd/mapc.c: removed macro HAVE_HS_ZONE_TRANSFER and turned all
-	of its code always on.
-	OS name.
-	* aux/configure.in: removed superfluous test for hs_zone_transfer
-	function (will never find it because it is an amd-internal
-	function).
-	-o and -O options.
-	* amd/mapc.c (maptypes): must used correct new name for am-utils'
-	hesiod initialization function: hesiod_am_init.
-
-	* amd/info_hesiod.c (hesiod_am_init): renamed hesiod_init to
-	hesiod_am_init so as not to conflict with libhesiod's
-	hesiod_init() function.
-	variable.
-	* aux/configure.in: added test and explicit inclusion of
-	libresolv.a for later resolution of library references with
-	libhesiod.
-	<metcalf@cag.lcs.mit.edu> to correctly set the nfs_prot headers
-	* aux/macros/opt_cppflags.m4: new file.  configure/compile C
-	preprocessor flags.
-	* doc/am-utils.texi (Distrib): typo in the subscription
-	* aux/macros/opt_libs.m4: new file.  configure/compile library
-	flags.
-	<vogel@physik-rzu.unizh.ch>.
-	* Makefile.am (EXTRA_DIST_AUX): include two new macros
-	opt_cppflags.m4 and opt_libs.m4.
-1997-11-15  Erez Zadok  <ezk@amtrak.cs.columbia.edu>
-	* aux/configure.in: test for libhesiod needs to additional
-	libresolv to link completely.  Additional configuration time
-	options added for setting initial CPPFLAGS and LIBS.
-
-Tue Feb 10 02:15:40 1997  Erez "HWank1" Zadok  <ezk@lorien.cs.columbia.edu>
-	* NFS3 works on powerpc-ibm-aix4.2.1.0.
-
-	*** Released am-utils-6.0a1					***
-	static.  Some compilers (gcc from egcs  on aix 4.2.1) corrupt the
-	stack of an automatic variable when pointer to it is passed around
-Thu Feb  6 02:55:19 1997  Erez "HWank1" Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* amd/info_ndbm.c (ndbm_search,ndbm_init): fixed the code so that
-	it works on freebsd, where they map dbm_pagfno a non-existing
-	macro on purpose, to force you to port the code to Berkeley DB.
-	* libamu/xutil.c (real_plog): syslog like behavior for normal
-Fri Jan 31 01:35:09 1997  Erez "HWank1" Zadok  <ezk@lorien.cs.columbia.edu>
-
-	* amd/ops_afs.c (mount_toplvl): added a sleep(1) right before the
-	actual mount_toplvl, to avoid some possible race conditions.
-
-Thu Jan 30 02:31:49 1997  Erez "HWank1" Zadok  <ezk@lorien.cs.columbia.edu>
-
-	* amd/rpc_fwd.c: removed all TLI (HAVE_T_OPEN) code.
-
-Wed Jan 29 18:25:07 1997  Erez "HWank1" Zadok  <ezk@lorien.cs.columbia.edu>
-
-	* lib/wire.c (getwire): removed HAVE_T_OPEN (TLI code)
-	passed to it before.  So now I have to dereference the pointer
-	* amd/amd.c (main): fix local address using htonl(). Free up
-	buffers allocated by netdir_*() functions.
-
-Wed Jan 22 23:53:24 1997  Erez "HWank1" Zadok  <ezk@lorien.cs.columbia.edu>
-
-	* amd/fix-amd-map.in: new script that will convert old-style amd
-	maps to new one.
-	compute_nfs_args() and compute_automounter_nfs_args() functions.
-Tue Jan 21 01:18:16 1997  Erez "HWank1" Zadok  <ezk@lorien.cs.columbia.edu>
-	and cleaner compute_nfs_args() and compute_automounter_nfs_args()
-	* FIRST AMD IN AM-UTILS FINALLY WORKS (mounts itself as toplvl,
-	and replies back to simple nfs/link type mount queries).
-	relates for struct nfs_args.  A new function sets the numerous
-	* conf/mtab/mtab_svr4.c: reorganized the code in this file to be
-	easier to read, and fixed a few bugs with un/setting the lock file
-	descriptor.
-	libamu.  This saves on overall size of code.
-Wed Jan  8 15:27:49 1997  Erez "HWank1" Zadok  <ezk@lorien.cs.columbia.edu>
-	mounting an automounter's mount point.  Used by hlfsd and amd.
-	* amd/sched.c: removed HAS_SVR3_SIGNALS code to handle older
-	signals in Svr3 systems.  Only stellix ever used this.
-	* amq/amq.c (get_secure_amd_client): don't print any more
-	* amd/rpc_fwd.c (fwd_reply): removed all code that was triggered
-	by DYNAMIC_BUFFERS, since it was not in use.
-	under DEBUG only.
-Tue Jan  7 00:45:59 1997  Erez "HWank1" Zadok  <ezk@lorien.cs.columbia.edu>
-
-	* amd/opts.c (eval_opts): removed AMD_COMPAT code.  Amd no longer
-	takes '=' sign as old selector.  Fix your maps.
-	(deslashify): removed APOLLO code that treated two '//' as one.
-	for file systems based on physical media (disk, cdrom, floppy) to
-Sun Jan  5 01:25:09 1997  Erez "HWank1" Zadok  <ezk@lorien.cs.columbia.edu>
-	autoconf searches for all these types of mount table entries for a
-	* amd/ops_nfsx.c (nfsx_init): removed HARD_NFSX_ERRORS, code which
-	was not used.  It made any submount error fail the whole group.
-	the actual name found!  Same for ufs, cdfs, pcfs, tmpfs, lofs,
-	* amd/ops_nfs.c (make_nfs_auth): removed code dependent on
-	HAS_NFS_QUALIFIED_NAMES.
-	(mount_nfs_fh): removed macro for NFS_ARGS_NEEDS_PATH, assuming it
-	is never on.  So code that was triggered by #ifndef
-	NFS_ARGS_NEEDS_PATH (osf1, aix3, and bsd44 variants) may have to
-	be fixed later.
-	Removed all ULTRIX_HACK code.  Ultrix is DEAD!
-	removed all PRESET_AC code, which was only on for Linux to preset
-	the attribute cache values (otherwise they default to zero).
-	(nfs_umounted): revobed KICK_KERNEL code (IRIX systems).  Will
-	have to fixed up later.
-	(mount_nfs_fh): removed code that was never included, which
-	attempted to set the port on which amd's nfs mounts on.  This
-	isn't supported by the ping algorithm yet.  In any case, it is all
-	done in nfs_init().
-
-	* amd/srvr_nfs.c (find_nfs_srvr), amd/ops_nfs.c (mount_nfs_fh):
-	removed HAS_TCP_NFS code.  The whole use of NFS V.3 with TCP or
-	specially hacked NFS V.2 that uses TCP (BSD 4.4 variants) will
-	have to be addressed later.
-Sun Oct 26 19:32:57 1997  Erez Zadok  <ezk@defiant.soscorp.com>
-	* amd/nfs_subr.c (nfsproc_getattr_2): removed all code dependent
-	on PRECISE_SYMLINKS.
-	This works better on bsdi2 and bsdi3, because their portmapper
-	* amd/mapc.c (mapc_meta_search): removed code that depended on
-	HAS_DEPOT.  It is known buggy code.  The whole DEPOT support needs
-	to be rethought.
-	(mapc_add_kv): ported code to use standard regular expression
-	(regexp) library.
-	insecure).
-	* amd/{map.c,ops_sfs.c,ops_ufs.c}: removed all code dependent on
-	FLUSH_KERNEL_NAME_CACHE and the macro itself.
-	*** Released am-utils-6.0a13					***
-Sat Jan  4 15:46:58 1997  Erez "HWank1" Zadok  <ezk@lorien.cs.columbia.edu>
-Fri Oct 24 05:04:37 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-	* amd/map.c (exported_ap_alloc): removed all code triggered by
-	SHRINK_EXPORTED_AP and the macro itself.
-	struct datum typedef.
-	* amd/info_nis.c: removed HAS_NIS_RELOAD macro, and left the code
-	in all the time.  Assuming that there is always NIS realod
-	available.
-	(yp_all_fixed): removed code for BROKEN_YP_ALL.  If your yp_all()
-	function is broken such that it does not release filedescriptors
-	it created, then you are hosed.  Get a fix for yp_all from your
-	vendor or switch operating systems.
-
-Tue Dec 31 15:34:36 1996  Erez "HWank1" Zadok  <ezk@lorien.cs.columbia.edu>
-	gid_t.
-	* amd/info_hesiod.c: renamed macro HAS_HESIOD_RELOAD to
-	HAVE_HS_ZONE_TRANSFER.
-	* conf/transp/transp_tli.c (amu_clnt_create_best_vers): don't use
-Mon Dec 30 17:33:23 1996  Erez "HWank1" Zadok  <ezk@lorien.cs.columbia.edu>
-
-	* amd/{nfs,host}_ops.cremoved INFORM_MOUNTD macro, so its code is
-	always included.  We should always try to inform the remove mount
-	daemon of mounts we performed.  If we want an option for this, it
-	should be a run-time option.
-
-	* amd/host_ops.c: removed all that optionally did not make the
-	directory mount points for amd.
-
-	* HOST_EXEC code removed from everywhere.  There is no indication
-	that it was used anywhere.  If it needs to be used, then a
-	run-time switch should control it.
-
-Thu Dec 26 00:06:52 1996  Erez "HWank1" Zadok  <ezk@lorien.cs.columbia.edu>
-	passwdfile option.  If hlfsd is started with -P passwdfile, then
-	* amd/*_ops.c: removed all references to mntent_t's fields
-	mnt_freq and mnt_passno, since they are no longe rused (and never
-	have been).
-	read and checked.  All the rest are ignored.  No NIS/netgroup
-	* amd/am_ops.c: removed function sunos4_match, which was off
-	anyway.  This was one of the places where an '=' sign was allowed
-	as an assignment operator (which is now ':=').
-
-	* amd/afs_ops.c (afs_bgmount): removed SUNOS4_COMPAT code which
-	was off anyway.  This was one of the places where an '=' sign was
-	allowed as an assignment operator (which is now ':=').
-	-h is invoked.
-Tue Dec 24 01:53:52 1996  Erez "HWank1" Zadok  <ezk@lorien.cs.columbia.edu>
-Wed Oct 22 00:16:39 1997  Erez Zadok  <ezk@lorien.cs.columbia.edu>
-	* amq/amq.c: ported to am-utils.  Working.
-
-	* conf/mount/mount_svr4.c (mount_svr4): changed mount type on svr4
-	to be string, as it should be (rather than a string mapped to int
-	and back mapped to string).
-	which returns TRUE if 'arg' is any one of this host's networks.
-Sun Dec 22 13:26:05 1996  Erez "HWank1" Zadok  <ezk@lorien.cs.columbia.edu>
-	all networks names and numbers in the order of the interface (not
-	* lib/mount_fs.c (mount_fs): removed MNTINFO_PREF code.
-Mon Oct 20 01:59:25 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-	* lib/umount_fs.c: split this into three files: default, osf, and
-	bsd44, that are in conf/umount/umount_*.c.
-	* aux/configure.in: don't add ops_ufs.o on AIX twice.  My code
-Thu Dec 19 17:33:46 1996  Erez "HWank1" Zadok  <ezk@lorien.cs.columbia.edu>
-	* doc/Makefile.am (EXTRA_DIST): include am-utils.dvi and
-	* aux/configure.in, aux/aclocal.m4, aux/acconfig.h: added new
-	macro to automatically figure out if an external definition for
-	sys_errlist[] exists.
-	(html): generate html documentation for
-	* lib/xutil.c (xfree): removed "#undef free" because it's not
-	needed there.  Any system that redefines free() needs help.
-
-	* conf/mtab/mtab_file.c (REWRITE_MTAB_IN_PLACE): removed code that
-	was dependent on REWRITE_MTAB_IN_PLACE.  It does not appear to be
-	in active use anywhere.  If added later, it should be a run-time
-	configuration option.
-	ypall_callback_fxn_t.  The NetBSD team compiles all sources with
-	* conf/mtab/mtab_mach3.c: removed code that was #ifdef'ed not to
-	be MOUNT_TABLE_ON_FILE, since mach2 always stores its mount tables
-	in a file in /etc.
-	function typedef.
-	* lib/util.c (str3cat): removed _AIX code.  AIX should have a
-	working realloc, or else find a cleaner solution to this.
-	(mkdirs): removed SUNOS4_WORKAROUND code.  This was to do a sync()
-	after immediately making directories so that fsck will be able to
-	fix the filesystem in the event of an immediate crash.  This was
-	because a bug in UFS which is fixed by now.
-	* libamu/xutil.c (amu_release_controlling_tty): new function to
-	* lib/hutil.c (domain_strip): removed PARTIAL_DOMAINS triggered
-	code.  Does not appear to be on and used anywhere.
-	(dofork): removed MACH3 code, b/c mach3 NFS bugs are fixed by now.
-	and hlfsd/hlfsd.c.  Also avoid setpgrp(), because it works on some
-	* lib/resvport.c: split the binding of reserved ports code to a
-	separate file.  A #define (HAVE_T_OPEN) separates the TLI (SVR4)
-	from the BSD code.
-
-Thu Dec 19 02:08:35 1996  Erez "HWank1" Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* lib/Makefile.am (amu_LIBADD): includs @LIBOBJS@ now, auto-filled
-	in by automake and configure, for optional sources that need to be
-	built as part of libamu.a.
-
-	* aux/aclocal.m4: Make sure AC_CHECK_MOUNT_STYLE adds mountutil.o
-	to LIBOBJS.
-
-	* lib/memcmp.c (memcmp): new file added to replace a possible bad
-	implementation of memcmp.
-
-Wed Dec 18 22:20:23 1996  Erez "HWank1" Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* converted the sources to use memset/memmove/memcmp instead of
-	bzero/bcopy/bcmp.
-
-	* ran all sources through gnu Indent w/ options specified in
-	aux/amindent.
-
-Wed Dec 11 22:19:29 1996  Erez "HWank1" Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* At this point the initial genration of config.h via autoconf and
-	some preliminary makefiles via automake is done.  I will not begin
-	modifying sources, so it's a good time to document from here.
-
-Wed Dec 10 22:19:29 1996  Erez "HWank1" Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	*******************************************************************
-	*** Initial ChangeLog Entry					***
-	*******************************************************************
-
-	* amd/ops_afs.c (mount_toplvl): turn on 'ignore' option in nfs
-	mount flags of toplvl mounts.  Important esp. for HPUX 10.  Now
-	hpux-10 will mount amd's mounts points as 'ignore' (by df).
-
-	* aux/configure.in: check for NFS mount option 'ignore', useful in
-	HPUX 10.
-
-Thu Oct 16 03:28:33 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* aux/macros/check_hide_mount_type.m4: hpux 10 should use "ignore"
-	mount type and not NFS, for the amd mount points.
-
-	* conf/transp/transp_tli.c (amu_clnt_create_best_vers): don't log
-	an RPC timeout as an error, but just an info message.  From
-	Andreas Stolcke <stolcke@speech.sri.com>
-
-	* If the NFS server is down or does not support the portmapper
-	call (such as certain Novell NFS servers) we mark it as version 2
-	and we let the nfs code deal with the case that is down.  If when
-	the server comes back up, it can support NFS V.3 and/or TCP, it
-	will use those.  From christos@deshaw.com (Christos Zoulas).
-
-	* hlfsd/homedir.c (plt_print): various compile time cleanups to
-	printfs that take a long, but pass an int to print.  From
-	christos@deshaw.com (Christos Zoulas).
-
-	* aux/macros/func_bad_yp_all.m4 (ac_cv_func_yp_all_clean,): new
-	macro to determine if the OS has a bad yp_all(), based on the host
-	OS name.  So far only irix (all versions) have a bad yp_all, so
-	they will use am_yp_all() instead (which is slower as it
-	enumerates manually all of the map's entries).
-
-Thu Oct 16 03:14:37 1997  Erez Zadok  <ezk@subzero.cs.columbia.edu>
-
-	* amd/info_nis.c (am_yp_all): code for a replacement yp_all that
-	avoids using a file-descriptor leaking yp_all() on some systems
-	like irix.
-
-Wed Oct 15 21:52:35 1997  Erez Zadok  <ezk>
-
-	* fsinfo/fsinfo.h: avoid redefining yywrap incorrectly on DU-4.x
-	systems using /usr/bin/flex.
-
-	* amd/conf_tok.l (yywrap): avoid redefining yywrap for systems
-	that have a modified GNU flex which does define yywrap (DU-4.x).
-
-Fri Sep 26 14:25:29 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* conf/checkmount/checkmount_bsd44.c: include prototype.
-
-Fri Sep 26 01:26:24 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	*******************************************************************
-	*** Released am-utils-6.0a12					***
-	*******************************************************************
-
-Fri Sep 26 00:13:48 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* conf/nfs_prot/nfs_prot_irix6.h: completely turn off all autofs
-	code in irix6 until it can be tested correctly
-
-	* conf/transp/transp_tli.c (amu_clnt_create_best_vers): time out
-	on clnt_create for 3 seconds, rather than wait for the much longer
-	default.
-
-	* conf/nfs_prot/nfs_prot_aix4_2.h: port to powerpc-ibm-aix4.2.1.0.
-	Includes NFS3, untested.
-
-Thu Sep 25 11:03:11 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* amd/ops_pcfs.c (mount_pcfs): fill in uid/gid fields of
-	pcfs_args_t if they exist.
-
-	* amd/ops_cdfs.c (mount_cdfs): fill in ssector field of
-	cdfs_args_t if it exists.
-
-	* new minor ports hppa1.1-hp-hpux10.10, hppa1.1-hp-hpux9.05,
-	hppa1.1-hp-hpux9.07, m68k-hp-hpux9.00, and sparc-sun-sunos4.1.4.
-
-Wed Sep 24 00:48:05 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* doc/am-utils.texi (wire-test): updated documentation for the new
-	option.
-
-	* wire-test/wire-test.8: updated man page for new option.
-
-	* wire-test/wire-test.c (main): added a test for various
-	combinations of NFS proto/vers to a remote/local host.
-
-	* aux/macros/try_compile_anyfs.m4 (AC_TRY_COMPILE): include
-	<isofs/cd9660/cd9660_mount.h> and <msdosfs/msdosfsmount.h> so that
-	freebsd will correctly set mount options for pcfs and cdfs.
-
-	* amd/ops_pcfs.c (mount_pcfs): set mask field of pcfs_args to
-	0777 (if field exists).
-
-	* aux/macros/try_compile_anyfs.m4 (AC_TRY_COMPILE): include
-	<msdosfs/msdosfsmount.h> if available.
-
-	* minor new port: rs6000-ibm-aix4.1.4.0.
-
-	* libamu/mount_fs.c (mount_fs): fixed bug that caused HPUX not to
-	write the "time" field in /etc/mnttab.
-
-	* conf/mtab/mtab_file.c (mnt_dup): fixed typo in macro names for
-	detecting mnt_time field of mntent_t.
-
-	* libamu/mtab.c (mnt_free): fixed typo in macro names for
-	detecting mnt_time field of mntent_t.
-
-Tue Sep 23 15:30:03 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* conf/mtab/mtab_file.c (lock): Use flock() in preference over
-	fcntl() to lock the mtab file.
-
-Mon Sep 22 23:04:58 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* conf/transp/transp_sockets.c (get_nfs_version): define
-	the try_again goto label only for NFS3.
-	(pmap_ping): assume timeout failure of clnt_stat.
-
-	* libamu/xdr_func.c (xdr_groupnode, xdr_exportnode): cast to
-	"groups *".
-
-Mon Sep 22 20:34:33 1997  Erez Zadok  <ezk@lorien.cs.columbia.edu>
-
-	* conf/transp/transp_sockets.c (pmap_ping): patch from Dan Riley
-	<dsr@mail.lns.cornell.edu> to make sure that amd works with more
-	secure portmappers that do not allow forwarding of RPC messages to
-	other services.
-
-	* */Makefile.am: all source files should also depend on the new
-	include/am_xdr_func.h header.
-
-	* include/am_xdr_func.h: new file as part of the code cleanup from
-	Christos Zoulas <christos@deshaw.com>.
-
-	* Lots of fixes from Christos Zoulas <christos@deshaw.com> that
-	involved missing prototypes, cleaned up ones, and removal of
-	unused variables.
-
-	* libamu/xdr_func.c (xdr_mountres3): some code cleanup.  A switch
-	statement with only one case is unclean.
-
-Mon Sep 22 17:26:38 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* amd/ops_<FOO>fs.c (mount_<FOO>fs): initialize mntent_t fields to
-	0 so that all fields are initialized to zero at first.  This way
-	SunOS 4.x and other systems don't get /etc/mtab entries with
-	random integers for the fsck/freq fields. Patch from Andreas
-	Stolcke <stolcke@speech.sri.com>.
-
-Mon Sep 22 00:34:19 1997  Erez Zadok  <ezk@americas.psl.cs.columbia.edu>
-
-	* conf/nfs_prot/nfs_prot_sunos4.h: include <nfs/nfs_clnt.h> so
-	that the important definition for HOSTNAMESZ will be found.
-
-	* amd/ops_afs.c (mount_toplvl): limit hostname size to HOSTNAMESZ
-	(inside the nfs_args structure) if the system uses that macro.
-	Otherwise systems like SunOS refuse to NFS mount long pathnames
-	and result in ENAMETOOLONG errno's.
-
-Wed Sep 17 04:56:11 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* doc/am-utils.texi (Supported Platforms): specify new support for
-	solaris 2.6, and hlfsd running on 2.5.1 too.
-
-Wed Sep 17 03:55:02 1997  Erez Zadok  <ezk@amsterdam.psl.cs.columbia.edu>
-
-	* conf/mount/mount_svr4.c (mount_svr4): don't attemt an autofs
-	mount if it is not supported or was turned off.
-
-Wed Sep 17 03:19:36 1997  Erez Zadok  <ezk@americas.psl.cs.columbia.edu>
-
-	* conf/nfs_prot/nfs_prot_sunos4.h: fixed so that it will nfs mount
-	again.  Apparently at some previous release SunOS 4 supported was
-	broken and all nfs mounts resulted in ESTALE.
-
-Wed Sep 17 00:26:25 1997  Erez Zadok  <ezk@amsterdam.psl.cs.columbia.edu>
-
-	* conf/nfs_prot/nfs_prot_sunos5_6.h: nfs protocol headers for
-	solaris 2.6.
-
-	* aux/macros/check_nfs_prot_headers.m4: added solaris 2.6 nfs
-	protocol header selection.
-
-Sat Sep 13 14:31:51 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* conf/transp/transp_tli.c (amu_clnt_create_best_vers): avoid
-	infinite loop.
-
-Sun Sep  7 18:23:23 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	*******************************************************************
-	*** Released am-utils-6.0a11					***
-	*******************************************************************
-
-Fri Sep  5 11:55:10 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* amd/amd.c (main): if plock() succeeded, don't try to display
-	errno message.   Patch from Chris Metcalf
-	<metcalf@catfish.lcs.mit.edu.
-
-Thu Sep  4 19:17:58 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* hlfsd/homedir.c (table_add): make sure duplicate passwd entries
-	are ignored.   Only the first entry should ever be used, because
-	that's how lookup in passwd database works.
-
-	* conf/transp/transp_sockets.c (get_nfs_version): when determining
-	if a remote host is up or down, use NFS v.2.  Fix suggested by
-	Enami Tsugutomo <enami@cv.sony.co.jp>.
-
-	* conf/transp/transp_tli.c (amu_clnt_create_best_vers): new
-	function to get the best possible NFS version, but also timeout
-	faster than normal defaults, so remote hosts which are down can be
-	detected in a reasonable time.
-	(get_nfs_version): use the new "best" function.
-
-Tue Sep  2 00:41:00 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	*******************************************************************
-	*** Released am-utils-6.0a10					***
-	*******************************************************************
-
-Mon Sep  1 15:39:51 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* conf/transp/transp_tli.c (get_nfs_version): don't use
-	clnt_tp_create_timed() on systems that don'e have it (Solaris 2.4
-	and earlier).
-
-	* aux/configure.in: test for existence of clnt_tp_create_timed(),
-	since Solaris 2.4 (and possibly earlier) do not have it.
-
-Mon Sep  1 15:23:18 1997  Erez Zadok  <ezk@felix.psl.cs.columbia.edu>
-
-	* amd/ops_autofs.c (autofs_unmount_1_svc): only display rdevid
-	field if it exists (solaris 2.4's autofs does not have it).
-
-Mon Sep  1 14:45:09 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* aux/macros/type_auth_create_gidlist.m4: a new test to determine
-	the correct type to the 5th argument of authunix_create().
-
-Mon Sep  1 03:44:32 1997  Erez Zadok  <ezk@felix.psl.cs.columbia.edu>
-
-	* libamu/xdr_func.c (xdr_umntrequest): add test for autofs
-	structure umntrequest, if it has the field rdevid.  Seems Solaris
-	2.4 and earlier didn't have it.
-
-Mon Sep  1 01:10:53 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* hlfsd/hlfsd.c (hlfsd_init): moved initialization upwards, so it
-	can be done before primary process forks.
-	(main): bug fix: wait a bit to give child a chance to initialize.
-	Without this, hlfsd got into a busy infinite loop while, never
-	completing the mount.
-
-	* amd/info_nis.c: patch from Jason Thorpe <thorpej@nas.nasa.gov>
-	to make amd works when talking to NIS+ servers in NIS
-	compatibility mode.
-
-Mon Sep  1 00:46:56 1997  Erez Zadok  <ezk@lorien.cs.columbia.edu>
-
-	* amd/mapc.c (MAX_CHAIN): increased maximum chain size to 1024.
-
-Sun Aug 31 20:20:40 1997  Erez Zadok  <ezk@lorien.cs.columbia.edu>
-
-	* amd/conf.c (gopt_fully_qualified_hosts): a new function to
-	process another new global variable.
-
-	* amd/ops_nfs.c (make_nfs_auth): if a new global variable
-	fully_qualified_hosts is on, use FQHN in RPC/NFS authentications.
-	Patch from Chris Metcalf <metcalf@catfish.lcs.mit.edu>.
-
-	* amd/conf.c (process_last_regular_map): If the amd.conf file only
-	has a [global] section (pretty useless IMHO), do not try to
-	process a map that does not exist.
-
-	* scripts/amd.conf.5: fixed typos (repeated 'as' word).
-
-	* doc/am-utils.texi: MAJOR DOCUMENTATION REVISION COMPLETED!!!
-
-	* amd/conf.c (reset_cf_map): Bug fix.  Reset 'tag' field of cfm
-	structure, so it does not carry over from map entry to another.
-
-Sat Aug 30 18:39:21 1997  Erez Zadok  <ezk@lorien.cs.columbia.edu>
-
-	* amd/amd.c (main): fixed the meaning of the plock option.  A bug
-	caused it to be reversed.
-
-Sat Aug 30 15:13:18 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* hlfsd/stubs.c: don't initialize some statics here.  They are
-	better initialized in hlfsd_init_filehandles().
-
-Fri Aug 22 14:47:16 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* amd/conf.c (gopt_show_statfs_entries): new function and a global
-	amd.conf key show_statfs_entries.  Defaults to 'no'.  If 'yes',
-	then all maps flagged as browsable will also show a count of the
-	number of entries (keys) in that map.
-
-	* amd/nfs_subr.c (count_map_entries): new function to count number
-	of entries in a map.  Now used if browsable is turned on in a map,
-	to return a count of available keys in a given map.
-
-	* hlfsd/stubs.c (eq_fh): use correct memcmp().  BUG fixed! hlfsd
-	confused the file handles for ".", "..", and the symlink, causing
-	mess.
-
-	* aux/macros/func_bad_memcmp.m4: new test, based on autoconf 2.12,
-	but also defines HAVE_BAD_MEMCMP, so I avoid linkage conflicts
-	with bad memcmp() in libc's (nextstep3).
-
-Thu Aug 21 17:38:41 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* aux/configure.in: check if autofs_args_t has a field named
-	addr.  Solaris has it for specifying the address of the daemon,
-	but Irix does not.  So how does irix tell the kernel the daemon's
-	address?  I suspect that it is hardcoded to "localhost" using a
-	"private well-known port" (#define AUTOFS_PORT 2048).
-
-	* conf/nfs_prot/nfs_prot_linux.h: added missing autofs
-	definitions.
-
-	* README.autofs: new file listing autofs support notes
-
-	* very preliminary autofs code working.  Call it pre-alpha
-	quality.
-
-Sun Aug 17 02:25:09 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* amd/conf.c (ropt_mount_type, gopt_mount_type): don't accept
-	"autofs" if system does not support it.
-
-	* amd/amd.c (main): log am-utils version string (same as amd -v)
-	at start of run.
-
-	* conf/transp/transp_sockets.c (get_nfs_version): in order to tell
-	if a remote host is available, try to contact its portmapper and
-	timeout if no answer is received in 3 seconds.
-
-Thu Aug 14 16:12:04 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* aux/macros/check_extern.m4 (pattern): use a simpler pattern for
-	match for external function definitions.  The function could span
-	multiple lines, so only match the opening parenthesis, not the
-	closing one too.
-
-	* aux/macros/os_cpp-flags.m4 (ac_cv_os_cppflags,): do NOT turn on
-	posix mode for nextstep3.  It is broken.
-
-	* amd/amd.c (init_global_options): run uname() only if
-	<sys/utsname.h> and uname(2) exist.
-
-	* amd/rpc_fwd.c (fwd_packet): if remote host is down, the
-	forwarding socket is null, so declare this an error.
-
-	* include/am_utils.h (AM_ERRNO_HOST_DOWN): find best errno to set
-	for when a remote host is down.  Try, in order, "host down", "host
-	unreachable", "invalid argument".
-
-	* amd/ops_nfs.c (discard_fh): don't dereference a null pointer
-	(happens when remote host is down, and fp->fh_fs is NULL).
-	(prime_nfs_fhandle_cache): ditto, and set fs flags to !FSF_VALID
-	and FSF_DOWN.
-
-	* amd/sched.c: nobody uses "union wait" any more, or so it
-	appears, so clean up that code.
-
-	* conf/transp/transp_tli.c (get_nfs_version): if remote host is
-	down, time it out faster than default (3 seconds).
-	(get_mount_client): free netconfig entry when done with it.
-
-	* conf/nfs_prot/nfs_prot_nextstep.h: initial (and somewhat ugly)
-	port to nextstep3 (m68k-next-nextstep3).
-
-	* fsinfo/Makefile.am (LDADD): needs to link with libamu in case
-	system does not have strdup().
-
-	* include/am_defs.h: complete external definition for getlogin()
-	if needed.
-
-	* conf/transp/transp_tli.c (get_nfs_version): no need to keep
-	static versout variable.
-
-	* amd/rpc_fwd.c (fwd_packet): if fwdto packet is null, remote
-	server is probably down.  Don't use sendto() in that case.
-
-	* buildall (default): run gmake if found, before trying plain
-	make.  GNU make is always preferable.
-
-Tue Aug 12 21:23:58 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* aux/macros/host_macros.m4: cleanup of os_version and os
-	overrides.  Solaris 2.5.1 for example will come up as solaris2 and
-	2.5.1, rather than sunos5 and 5.5.1.  Both can be overridden in
-	the amd.conf file.
-
-Fri Aug  8 14:37:30 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	*******************************************************************
-	*** Released am-utils-6.0a9					***
-	*******************************************************************
-
-Thu Aug  7 00:52:14 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* conf/nfs_prot/nfs_prot_ncr2.h: new file, for NCR2
-	(i486-ncr-sysv4.3.03) headers.  Needed to complete missing stuff
-	from <ndbm.h> and <sys/resource.h>.
-
-	* scripts/amd.conf.5: new map page.
-
-	* amd/info_hesiod.c: define extern for hesiod_resolve, since bsdi3
-	does not.
-
-	* amd/amd.8: updated man page.
-
-	* amd/get_args.c (get_args): removed defunct -h option to amd.
-
-	* amq/amq.8: updated man page.
-
-	* amd/info_nisplus.c (nisplus_search): prototype fixes so Sun
-	SparcCompiler CC won't complain.
-
-	* amd/info_hesiod.c (hesiod_search): small fixes to compile with
-	hesiod-1.3, as per Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>.
-
-	* aux/macros/opt_ldflags.m4: new option added to configure
-	--enable-ldflags, to specify -L option for configuring/compiling.
-	The older one --enable-libs is now to be used only for -l options.
-
-	* amd/ops_nfs.c (mount_nfs_fh): bug fixed.  Should initialize
-	nc_protoname from nfs_proto if available for all TLI systems, not
-	just those that have NFS V3.
-
-	* amd/info_ldap.c: ldap patches from Leif Johansson
-	<leifj@matematik.su.se>, adding two new amd.conf ldap variables:
-	ldap_cache_seconds and ldap_cache_maxmem.
-
-	* hlfsd/hlfsd.c (main): bug fixed. port number must be wrapped in
-	htons().
-
-Sun Aug  3 17:20:05 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* amd/nfs_start.c (mount_automounter): register amd with the rpc
-	program number that may have been overridden by amd.conf.
-
-	* libamu/xutil.c (set_amd_program_number, get_amd_program_number):
-	allow storing and retrieving alternate amd program numbers.
-
-	* amd/conf.c (gopt_portmap_program): new function to parse
-	amd.conf entry portmap_program=1234.
-
-	* amq/amq.c (main): allow specifying an alternate rpc program
-	number for amd via -P prognum.
-
-	* new amq RPC to get the process id of the running amd.  This is
-	used in ctl-amd to quickly find the pid of the amd that is to be
-	killed.
-
-	* expanded shared libraries support.  Using GNU libtool-1.0,
-	am-utils now builds shared libraries on many platforms that have
-	support for it and proper compilers/linkers.  See "INSTALL" file
-	for compatibility chart.
-
-Thu Jul 31 13:07:23 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* fsinfo/fsi_lex.l: removed code that was in support of very old
-	versions of flex.  No longer needed.
-
-Tue Jul 29 12:00:13 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* amd/amd.c (init_global_options): find the kernel architecture
-	from uname() if possible.
-
-Mon Jul 28 03:53:59 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* new working port: i386-unknown-openbsd2.1
-
-Fri Jul 25 03:16:31 1997  Erez Zadok  <ezk@felix.psl.cs.columbia.edu>
-
-	* working port: sparc-sun-solaris2.4.  Had to fix fhandle_t from
-	structure to actual char[], because the structure was passed to
-	xdr_fhandle as data and not a pointer.  Surprisingly, gcc
-	-fpcc-struct-return did not help.
-	
-	* conf/nfs_prot/nfs_prot_sunos5_4.h: special nfs protocol
-	definitions for solaris 2.4 have to be different from 2.3, and
-	different from 2.5.
-
-	* libamu/xdr_fhstatus.c (xdr_fhstatus): minor code cleanup.
-
-Thu Jul 24 16:22:39 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* conf/mount/mount_svr4.c (mount_svr4): use STREQ to compare mount
-	types, not ==.  Fix from Christos Zoulas <christos@deshaw.com>.
-
-	* mk-amd-map/mk-amd-map.8: man page taken from bsd44.
-
-Thu Jul 24 00:01:55 1997  Erez Zadok  <ezk@moisil.cs.columbia.edu>
-
-	* conf/mount/mount_linux.c: made the nfs error mapping code into a
-	small function.
-
-Wed Jul 23 16:11:49 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* conf/nfs_prot/nfs_prot_linux.h (NFS_ERROR_MAPPING): special
-	error mappings from errno numbers to NFS errors.  From Debian
-	Linux.
-
-	* scripts/am-eject.in (fs): new script (taken from Debian Linux
-	folks) to auto-unmount floppy/cd devices before ejecting them.
-
-	* fsinfo/wr_exportfs.c (write_exportfs): from Debian folks, pass
-	'5' as second arg to show_area_being_processed.  I'm not sure why.
-
-	* fsinfo/wr_atab.c (write_atab): from Debian folks, pass '5' as
-	second arg to show_area_being_processed.  I'm not sure why.
-
-	* conf/mount/mount_linux.c (parse_opts): as per Debian Linux,
-	ensure that you have a buffer in *xopts to strcat onto.
-	(mount_linux): fixed from Debian folks to ensure that NFS mount
-	sockets are connected only for kernels prior to 1.3.10 (avoids
-	hangs for multi-homed hosts).
-
-	* amd/mapc.c (make_entry_chain): from Debian folks: don't skip
-	over amd map keys that have a prefix, and include the prefix in
-	the returned readdir().
-
-	* amd/info_passwd.c (passwd_init, passwd_search): format
-	enhancements from the Debian Linux folks.  They added
-	- var0:=pw-prefix:=anydir
-	- var1:=pw-rhost:=dom3.dom2.dom1
-	- var2:=pw-user:=user
-	- var3:=pw-home:=/anydir/dom1/dom2/dom3/user
-
-	* new ports: sparc-sun-solaris2.4 and sparc-sun-sunos4.1.1.
-
-	* amd/ops_afs.c (afs_retry): patches from Debian Linux.  If
-	afs_mount timed out, then explicitly forbid further retries after
-	the timeout.  (afs_bgmount): buf fix from Debian Linux.  Timeout
-	values (17 and 5) were mistakenly swapped.
-
-Wed Jul 23 15:53:25 1997  Erez Zadok  <ezk@felix.psl.cs.columbia.edu>
-
-	* conf/nfs_prot/nfs_prot_sunos5_3.h: turn off non-existent NFS V.3
-	support for Solaris 2.4 (the header files incorrectly define parts
-	of the NFS V.3 protocol, but the kernel does not support it).
-
-Wed Jul 23 00:07:12 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* amd/info_hesiod.c: minor cleanup to use hes_init and hesiod_init
-	for determining if using old or new hesiod libraries,
-	respectively.
-
-	* amd/ops_nfs.c (mount_nfs_fh): If "noconn" option exists in NFS
-	V.3 then use non-connected sockets (both TCP and UDP).  Otherwise
-	they cause hangs of mounts from multi-homed hosts when the return
-	route is not the same as the outgoing route (esp. on NetBSD
-	1.2.1).  If "conn" option was supplied, then don't turn on the
-	"noconn" mount option.  Otherwise default to "noconn" mount
-	option.
-
-	* aux/configure.in: better check for systems that need libgdbm and
-	<ndbm.h>
-
-Tue Jul 22 04:02:05 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* hlfsd/hlfsd.c (main), amd/ops_afs.c (mount_toplvl): ensure that
-	mounts are hidden from df(1) on systems that keep mount tables in
-	kernel, such as osf1.
-
-Tue Jul 22 02:26:55 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	*******************************************************************
-	*** Released am-utils-6.0a8					***
-	*******************************************************************
-
-Mon Jul 21 21:33:19 1997  Erez Zadok  <ezk@stone.mcl.cs.columbia.edu>
-
-	* hlfsd/hlfsd.c (main): bug fixed: forgot to set sin_family to
-	AF_INET when hlfsd mounts itself, thus getting an errno "protocol
-	family not supported".
-
-Mon Jul 21 20:46:59 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* verified that amd on NetBSD 1.2.1 (i386) works, but the OS
-	itself is flaky.
-
-	* verified that amd AIX 3 works w/ the new readdir() code.
-
-Mon Jul 21 18:59:30 1997  Erez Zadok  <ezk@chestnut.mcl.cs.columbia.edu>
-
-	* amd/mapc.c (maptypes): changed the default map caching type for
-	nis and ndbm maps to "MAPC_ALL", so that all possible entries will
-	be available to amd for browsable_dirs=yes.
-
-Mon Jul 21 18:04:16 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* amd/ops_afs.c (afs_readdir, afs_readdir_browsable): split
-	afs_readdir into a browsable version and a non-browsable one.
-	Fixed bugs that resulted in an infinite nfs_readdir loop on the
-	localhost for some operating systems.
-
-Sat Jul 19 19:38:38 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* amd/ops_afs.c (afs_readdir): fixed up the browsable code to
-	comply with nfs_readdir specs.  It was returning all entries at
-	once, even if there was not enough space in the RPC packet.  Now,
-	it sends a reasonably sized chunk, and sets static state to resume
-	it for the next continuation RPC of readdir.
-
-	* amd/conf.c (set_conf_kv): fixed bug that resulted in the first
-	regular map not getting all of the [global] options defaulted from.
-
-Fri Jul 18 00:45:12 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* amq/amq.c (main): fixed so that portmapper "ping" will only fail
-	upon an RPC timeout
-
-	* scripts/ctl-{amd,hlfsd}.in (killproc): better method to find the
-	amd/hlfsd process to kill.
-
-	* amd/ops_afs.c (mount_toplvl), hlfsd/hlfsd.c (main): code to
-	determine how to avoid df from seeing amd's toplvl mounts.  Moved
-	from libamu/mount_fs.c and include/am_utils.h.  Ensure that hlfsd
-	is hidden from df.
-	(mount_toplvl): fixed df types for irix.
-
-Thu Jul 17 21:59:45 1997  Erez Zadok  <ezk@americas.psl.cs.columbia.edu>
-
-	* amq/amq.c (main): fixed bug that caused the 5 second timeout for
-	TLI amq using udp to be ignored.
-	(main): if amq cannot contact remote host's portmapper within 5
-	seconds, timeout and fail faster than the default longer timeout
-	(this is for non-TLI systems).
-
-Thu Jul 17 17:08:13 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* amq/amq.c (get_secure_amd_client): if amq cannot contact
-	remote host's portmapper within 5 seconds, timeout and fail faster
-	than the default TLI timeout of over 4 minutes.
-
-	* amd/am_ops.c (ops_showfstypes): added styles for new bsd44
-	file systems nullfs, unionfs, and umapfs.
-	(ops_show1): cleanup code and and reuse this function.
-	(vops): empty placeholders for nullfs, unionfs, and umapfs.
-
-	* amd/ops_{nullfs, unionfs, umapfs}.c: 3 new empty templates for
-	bsd44 style file systems.
-
-	* fsinfo/fsinfo.8: man page for fsinfo rewritten from bsd44
-	sources.
-
-	* amd/conf_tok.l, fsinof/fsi_lex.c: undefine ECHO to avoid
-	conflict with systems that define it in <sys/ioctl.h> and also
-	define a conflicting one via lex.  Newer versions of f/lex are ok.
-
-Wed Jul 16 00:17:45 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* amd/ops_nfs.c (mount_nfs_fh): fill in nfs_args' fields
-	acdirmin/max and acregmin/max only if they exist.
-
-	* aux/configure.in: test for nfs_args fields acdirmin and
-	acregmin.
-
-Tue Jul 15 17:24:09 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* aux/configure.in: commented out checking for MNT2_GEN_OPT_* for
-	"nondev" and commented back in checking for "nodev".  This was a
-	typo.
-
-	* include/am_compat.h: more compatibility options: define "ro"
-	mnttab option all the time.  Define "overlay" as needed.  Added
-	more fillers of mnttab options (as per Daniel S. Riley
-	<dsr@mail.lns.cornell.edu>), for acdirmax, acdirmin, acregmax,
-	acregmin, noac, grpid, nosuid, and actimo.
-
-	* libamu/mount_fs.c (mnt_flags): fixed a typo in "ro" option as
-	per dsr@mail.lns.cornell.edu (Daniel S. Riley).  Then cleaned up
-	the same code for other options in struct opt_tab.
-
-Mon Jul 14 22:36:37 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* amd/get_args.c (get_args): moved amd.conf file parsing to before
-	the switching the default log/debug options.  Suggested by
-	dsr@mail.lns.cornell.edu (Daniel S. Riley).
-
-	* aux/update_build_version: new script to record the build version
-	of amd, along with the rest of the info thet comes up with amd -v.
-
-Sun Jul 13 00:30:24 1997  Erez Zadok  <ezk@decca.damtp.cam.ac.uk>
-
-	* aux/macros/os_cflags.m4: new macro, to add additional
-	compilation options (also used during configuration), based on the
-	OS and the compiler.  Used for solaris-2.6, osf, and irix6.
-
-Fri Jul 11 10:15:11 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* amd/conf_tok.l, conf_parse.y: allow values of keys to include
-	white spaces, if they are double-quoted (key="some value")
-
-	* amd/info_hesiod.c (hesiod_search): cleanup and minor bug fixes
-	of hesiod from Danny Braniss <danny@cs.huji.ac.il>.
-
-Fri Jul 11 02:16:06 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	*******************************************************************
-	*** Released am-utils-6.0a7					***
-	*******************************************************************
-
-Thu Jul 10 12:19:25 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* include/am_defs.h: fill in extern definition of innetgr() in
-	case system headers don't.
-
-	* aux/macros/path_prog_lex.m4 aux/configure.in: using macros that
-	will show the full pathname to yacc/bison and f/lex.  Some systems
-	have older or bad versions of those and this way the user will
-	know for sure what is being invoked.
-
-	* tasks: file populated with todo items.
-
-	* scripts/amd2ldif.in: Script to convert amd maps to plain text
-	LDAP object files.  Contributed by Leif Johansson
-	<leifj@matematik.su.se>.
-
-	* aux/config.guess: added recognition for sun3's running 4.2bsd,
-	from Tom Schmidt <tschmidt@micron.com>.  Fixed one small typo.
-
-	* amd/conf.c: several variables that were local to a map, were
-	also added to [global], where they apply to all maps.  Each map
-	can then individually override those defaults.  Flags
-	affected: browsable_dirs and mount_type.  Options affected:
-	map_type, map_options, and search_path.
-
-	* amd/amd.h: eliminated several global flags each of which took an
-	int, in favor of one global flags variable used as a bit field.
-
-	* amd/amd.c (init_global_options): moved all global variables into
-	a single struct amu_global_options, so it is easier to add new
-	ones and/or identify existing ones.
-
-	* amd/get_args.c (get_args): removed unused amd -m option.
-
-	* amd/conf.c (gopt_cluster): added new amd.conf option for cluster
-	name, same as amd -C.
-
-	* amd/info_ldap.c: LDAP info map functions from Leif Johansson
-	<leifj@matematik.su.se>.
-
-	* amd/conf.c (gopt_ldap_base, gopt_ldap_hostports): put in global
-	amd.conf options for ldap_base and ldap_hostports.
-
-	* amd/opts.c (f_netgrp): new amd map function netgrp(ARG) to test
-	if the current host is in the ARG host netgroup.
-
-	* aux/configure.in: some systems replaced dbm in libc with GNU's
-	libgdbm, so check for libgdbm, but only if dbm_open is not in
-	libc already.  This was a recommendation from Tom Schmidt
-	<tschmidt@micron.com>.
-
-	* conf/nfs_prot/nfs_prot_sunos5_3.h: port to sparc-sun-solaris2.3
-	completed.
-
-Wed Jul  9 18:14:59 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* port to sparc-unknown-netbsd1.2E done, not tested.  Includes NFS
-	V.3.
-
-Tue Jul  8 17:35:07 1997  Erez Zadok  <ezk@elk.mcl.cs.columbia.edu>
-
-	* port to i386-unknown-freebsd3.0 done and working.  Includes NFS
-	V.3.
-
-	* aux/macros/check_nfs_fh_dref.m4: freebsd3 should use
-	file handle dereferencing style similar to freebsd22.
-
-	* include/am_defs.h: need to include <net/if_var.h> before
-	<netinet/if_ether.h> on freebsd3.
-
-	* conf/nfs_prot/nfs_prot_freebsd3.h: new protocol header additions
-	for freeBSD 3.0.
-
-Tue Jul  8 16:53:41 1997  Erez Zadok  <ezk@moisil.cs.columbia.edu>
-
-	* amd/info_nis.c (nis_reload): cast nis' callback function so
-	picky compilers won't complain.
-
-	* libamu/xdr_mountres3.c (xdr_mountres3): make sure this function
-	gets compiled only if the system has NFS V3 and does not have
-	xdr_mountres3.
-
-Tue Jul  8 12:42:03 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* COPYING: put in some legal stuff in this file.
-
-Mon Jul  7 19:10:44 1997  Erez Zadok  <ezk@prometheus.soscorp.com>
-
-	* NFS V3 now works under Irix5, thanks to patches from 
-	Andreas Stolcke <stolcke@speech.sri.com>.
-
-	* conf/mount/mount_irix5.c: sparate mount_irix.c into an irix5
-	version and an irix6 version, since irix5's NFS V3 code is broken
-	and hacky.
-
-	* amd/info_hesiod.c (hs_zone_transfer): minor fixes to buffer
-	sizes for some hesiod queries.  Patch from Danny Braniss
-	<danny@cs.huji.ac.il>.
-
-Mon Jul  7 19:04:14 1997  Erez Zadok  <ezk@glory.soscorp.com>
-
-	* amd/ops_nfs.c (mount_nfs_fh): fixed NFS V.3 support for bsdi3.
-
-Sun Jul  6 14:22:24 1997  Erez Zadok  <ezk@glory.soscorp.com>
-
-	* aux/{configure.in,acconfig.h}: added checks for struct
-	nfs_args's fields proto and sotype (bsdi3).
-	
-	* amd/ops_nfs.c (mount_nfs_fh): added nfsv3 option to
-	nfs_args.flags for bsdi3.  Set field proto to 0.  Set sotype field
-	to SOCK_STREAM or SOCK_DGRAM.
-
-	* aux/macros/check_mount_style.m4: add case for bsdi3.
-
-	* amd/info_hesiod.c: got hesiod support for bsdi3.
-
-Sun Jul  6 11:14:47 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* aux/configure.in: look for hesiod on libc (bsdi3)
-
-	* amd/get_args.c (get_args): reformat usage so it fits in 80
-	columns.
-
-	* scripts/ctl-amd.in: changed directory name for optional tftpboot
-	map to /tftpboot/.amd.
-
-Sat Jul  5 17:46:45 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	*******************************************************************
-	*** Released am-utils-6.0a6					***
-	*******************************************************************
-
-Sat Jul  5 03:17:09 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* scripts/ctl-amd.in: include -T tag for tftpboot.
-
-	* new port: mips-sgi-irix5.3.  Compiled with gcc, but NFS V3 code
-	is broken and needs work on the specific nfs_args that irix5 uses
-	for V3 mounts.
-
-Sat Jul  5 01:44:25 1997  Erez Zadok  <ezk@lorien.cs.columbia.edu>
-
-	* amd/get_args.c (get_args): new options amd -T tag.  A map with
-	tag=foo matching the -T tag will be processed.  All untagged maps
-	get processed all the time.
-
-Fri Jul  4 16:19:26 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* aux/configure.in: need to check for strcasecmp in libucb (ncr2)
-
-	* aux/macros/check_os_libs.m4: a new macro to set the usage of
-	libnsl and libsocket based on the OS.
-
-	* libamu/mount_fs.c (mnt_flags): used MNTTAB_OPT_GRPID if it is
-	defined (problem on osf4).
-
-	* conf/nfs_prot/nfs_prot_irix5.h: new file for irix5 headers.
-
-	* include/am_defs.h, aux/macros/try_compile_nfs.m4,
-	aux/macros/mount_headers.m4: do include <sys/proc.h> because it
-	failes on irix5.  Rather, put in the individual
-	conf/nfs_prot/nfs_prot_*.h headers.
-
-	* amd/conf.c: AIX3 doesn't like strdup() being passed a constant
-	char*, so cast all strdup()'s args to a non-const char*.
-
-	* amd/mapc.c (root_newmap): don't try to strdup only a "const
-	char *".
-
-Fri Jul  4 15:47:10 1997  Erez Zadok  <ezk@americas.psl.cs.columbia.edu>
-
-	* conf/nfs_prot/nfs_prot_sunos4.h: added rpc/rpc.h and
-	sys/errno.h.
-
-Thu Jul  3 17:49:00 1997  Erez Zadok  <ezk@prometheus.soscorp.com>
-
-	* made sure am-utils compiles, links, and runs properly on Irix
-	6.2 using "cc -32 -Wl,-woff,"
-
-	* aux/macros/check_lib2.m4: a bug fix version to autoconf 2.12
-	AC_CHECK_LIB.  If OTHER-LIBRARIES are defined and used, then add
-	them to $LIBS.
-
-	* aux/configure.in: some cleanup of which libraries are needed.
-	Espectially ensure that libnsl is included only on Solaris, where
-	so far it is the only system on which it is absolutely necessary.
-	Also no longer need to include libc explicitly. 
-
-	* amd/amd.c,wire-test/wire-test.c (main): convert IP address to
-	network-long order before printing it.
-
-	* wire-test/wire-test.c (main): also check and report on the IP
-	address of the local host, since some systems have bad versions of
-	get_myaddress, or ones that conflict with other versions in
-	multiple libraries (SunOS 4 and Irix especially).
-
-Wed Jul  2 18:19:02 1997  Erez Zadok  <ezk@starblazers.soscorp.com>
-
-	* scripts/ctl-amd.in: don't use full pathname so killproc() works
-	better.  Also run bsd44 and irix style ps programs. 
-
-	* aux/macros/check_lib_funcs.m4: bug fixed: used to define usage
-	of library no matter if it was found or not.
-
-Wed Jul  2 02:11:48 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* aux/macros/check_mnt2_gen_opt.m4: turned back on the checking
-	for M_* macros, but ensure that <sys/stream.h> is not included at
-	all so it won't conflict with other M_* macros.
-
-Tue Jul  1 21:16:51 1997  Erez Zadok  <ezk@mako.cs.columbia.edu>
-
-	* conf/mount/mount_irix.c (mount_irix): first arg to mount(2) on
-	irix should be "spec" (host:/path), not the dir of the mnt point.
-
-	* amd/ops_afs.c (afs_lookuppn): bug in enable_default_selectors
-	fixed.  If on, it essentially ignored the setting in a
-	selector-controlled /defaults if there were 2 or more entries in it.
-
-Tue Jul  1 12:23:38 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* scripts/ctl-{amd,hlfsd}.in (killproc): if failed to find process
-	using BSD style ps, then try SVR4 style ps.
-
-	* include/am_utils.h (amuDebug): renamed Debug macro to amuDebug
-	etc., to avoid conflicts with similar named macros in <ldap.h>.
-
-	* aux/configure.in, amd/info_ldap.c, etc.: put in all the autoconf
-	support needed for LDAP.  Now the code has to be written mostly in
-	amd/info_ldap.c.
-
-	* Included additional patches from Andreas Stolcke
-	<stolcke@speech.sri.com> to support using the best possible
-	combination of NFS version (2,3) and protocol (udp,tcp) for any
-	given host, since it appears that some Irix versions have NFS V3,
-	but do not support TCP.
-
-	* scripts/ctl-amd.in: updated amd control script to look for and
-	use amd.conf file.
-
-Tue Jul  1 00:28:23 1997  Erez Zadok  <ezk@lorien.cs.columbia.edu>
-
-	* amd/mapc.c (mapc_create): now, each map in the amd.conf can be
-	initialized off of a different type, or default to cycling through
-	all maps until one of them matches.
-
-Mon Jun 30 20:49:13 1997  Erez Zadok  <ezk@lorien.cs.columbia.edu>
-
-	* amd/ops_afs.c (afs_readdir): per-map browsing (readdir) done.
-	if browsable_dirs=yes is set in the map section in amd.conf, that
-	map will return all entries back to a readdir(2).
-
-Sun Jun 29 16:22:11 1997  Erez Zadok  <ezk@lorien.cs.columbia.edu>
-
-	* rudimentary amd.conf file support included.  You may even
-	override things like os=sos5, to get "backwards" compatibilty with
-	upl102.
-
-Sat Jun 28 13:35:02 1997  Erez Zadok  <ezk@lorien.cs.columbia.edu>
-
-	* amd/conf.c: new file to process amd.conf file.
-
-	* amd/get_args.c (get_args): new options -H to print help.
-
-	* moved enable_default_selectors to be amd.conf controlled, and
-	not compiler controlled.
-
-	* amd/get_args.c (get_args): new options -F <conf-file> to parse an
-	amd configuration file.
-
-Wed Jun 25 23:15:42 1997  Erez Zadok  <ezk@lorien.cs.columbia.edu>
-
-	* converted all files that used strcmp() == 0 or != 0  to using
-	the STREQ() macro.
-
-Mon Jun 23 22:31:14 1997  Erez Zadok  <ezk@lorien.cs.columbia.edu>
-
-	* aux/macros/check_lib_funcs.m4: new M4 macro that can be used to
-	search for any number of functions in any given library.
-
-Mon Jun 23 01:04:23 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* amd/mapc.c: Included patch from Leif Johansson
-	<leifj@matematik.su.se> to ensure that systems without an RE
-	library can compile.
-
-	* libamu/mount_fs.c (mount_fs): Included patch from Andreas
-	Stolcke <stolcke@speech.sri.com>, to ensure that mount options on
-	table are properly delimited by a comma.
-
-	* amd/ops_nfs.c (mount_nfs_fh): Included patch from Andreas
-	Stolcke <stolcke@speech.sri.com>, to allow users to override the
-	proto= and vers= mount options.
-
-Sun Jun 22 01:00:11 1997  Eric Dana  (edana@ncr2.bgs.com)
-
-	* conf/nfs_prot/nfs_prot_svr4.h: port completed to
-	i486-ncr-sysv4.3.03.  Assorted source cleanups done.
-
-	* include/am_defs.h, aux/macros/mount_headers.m4: don't include
-	mnttab.h if sys/mnttab.h was already included, because on ncr2,
-	they contain conflicting entries for struct mnttab.
-
-Sat Jun 21 23:52:15 1997  Eric Dana  (edana@ncr2.bgs.com)
-
-	* aux/macros/check_nfs_prot_headers.m4: added support for ncr2.
-
-Fri Jun 20 06:14:17 1997  Erez Zadok  <ezk>
-
-	* amd/*.c: lots of 64-bit "ugly" ports like casts to long ints.
-
-	* aux/macros/struct_nfs_fh.m4: check for "struct nfssvcfh" because
-	on DU-4.0 it is better than the next one to be picked (nfsv2fh_t).
-
-Wed Jun 18 18:59:49 1997  Erez Zadok  <ezk@defiant.soscorp.com>
-
-	* aux/macros/struct_nfs_fh.m4 (AC_TRY_COMPILE_NFS): check for
-	nfsv2fh_t before fhandle_t becasue on bsdi2.1 the former is
-	better.
-
-Tue Jun 10 17:06:58 1997  Erez Zadok  <ezk@lorien.cs.columbia.edu>
-
-	* amd/rpc_fwd.c (fwd_packet): TLI bug fix. if fwdto socket is
-	NULL, set the maxlen and len fields in netbuf to zero.
-
-Wed May 28 22:52:28 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* scripts/fix-amd-map.in (name): replace all matching patterns on
-	line.
-
-Sun May 25 19:33:41 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	*******************************************************************
-	*** Released am-utils-6.0a5					***
-	*******************************************************************
-
-Sun May 25 13:37:24 1997  Erez Zadok  <ezk@lorien.cs.columbia.edu>
-
-	* amd/amq_subr.c (amqproc_getvers_1_svc): amq's RPC service
-	procedure now returns the full string that amd -v returns.
-
-	* amd/get_args.c (get_version_string): new function to return
-	complete version/info string so it could be used more flexibly.
-
-	* amd/am_ops.c (ops_showamfstypes, ops_showfstypes): put the list
-	of Fs types into a string buffer, rather than a FILE*.
-
-	* amd/mapc.c (mapc_showtypes): put the list of map types into a
-	string buffer, rather than a FILE*.
-
-Sun May 25 01:25:36 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* amd/get_args.c (get_args): amd -v also prints user who built
-	amd, hostname built on, and date of configuration.
-
-Sat May 24 13:40:50 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* scripts/lostaltmail.conf-sample: sample lostaltmail
-	configuration file.
-
-	* scripts/lostaltmail.in: new script lostaltmail used to redeliver
-	"lost" mail that hlfsd redirected to a temp location because the
-	primary home file system of the user was full.
-
-	* scripts/amd2sun.in: new script amd2sun. Used to convert Sub
-	automount maps to amd maps.
-
-	* scripts/ctl-hlfsd.in: new script ctl-hlfsd.  Used to start,
-	stop, or restart hlfsd.
-	
-	* scripts/expn.1: man page for expn command.
-
-	* scripts/ctl-amd.in: new script ctl-amd.  Used to start, stop, or
-	restart amd.
-
-	* scripts/expn.in: new script expn.  Actually taken from David
-	Muir Sharnoff <muir@idiom.com>.  Used by hlfsd's mail re-delivery
-	script.
-
-	* scripts/wait4amd.in: new script wait4amd added.  Waits for amd
-	to come up on a host, and then runs a command (rsh $hostname by
-	default).
-
-	* scripts/Makefile.am: new directory now holds all shell/perl
-	scripts that belong to am-utils.
-
-	* conf/mount/mount_linux.c (parse_opts): new parser for
-	linux-specific mounts.  Handles fs-type specific mount-options
-	correctly.  Currently implemented: msdos, iso9660.
-
-	* amd/ops_pcfs.c (pcfs_ops): don't timeout cdfs mounts by default
-	(fix for linux).
-
-	* amd/ops_cdfs.c (cdfs_ops): don't timeout cdfs mounts by default
-	(fix for linux).
-
-	* amd/mapc.c (make_entry_chain): fixed bug that resulted in amd
-	core dumps upon "ls" of a mount point; an invalid pointer was
-	being returned and dereferenced.
-
-	* port to Linux sparc working!
-
-	* hlfsd/homedir.c (hlfsd_diskspace): close file descriptor if
-	failed to write test file, or else the fd will leak.
-
-Sun May 18 00:42:41 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* amd/info_hesiod.c (hs_strip_our_domain): use strcasecmp()
-	instead of strcmp().
-
-	* Port to Digital Unix 4.0 (OSF) done.
-
-	* hlfsd/hlfsd.c: renamed dirname to dir_name to avoid conflicts
-	with dirname() function in <string.h> on OSF systems.
-
-	* fsinfo/fsi_util.c (set_ether_if): take out extern defintion of
-	inet_addr().  It should come from <arpa/inet.h> instead.
-
-	* conf/mtab/mtab_osf.c: fixed macros and added NFS V3 specs.
-
-	* include/am_utils.h: renamed FIRST/LAST to AM_FIRST/AM_LAST to
-	avoid conflicts with DU 4.0 system header.
-
-Thu May 15 22:49:12 1997  Erez Zadok  <ezk@subzero.cs.columbia.edu>
-
-	* libamu/mount_fs.c (mount_fs): pass along NFS version so I can
-	determine if to include additional options in the mount table file
-	entry (such as proto=tcp, and vers=3).
-
-Thu May 15 00:42:12 1997  Erez Zadok  <ezk@shekel.mcl.cs.columbia.edu>
-
-	* libamu/mount_fs.c (mount_fs): include NFS version number in the
-	mount table options, as well as proto={tcp,udp}.
-
-Wed May 14 14:30:19 1997  Erez Zadok  <ezk@lorien.cs.columbia.edu>
-
-	* NFS V3 code ported to most other systems, so it compiles for V2
-	and V3 NFS systems.
-
-	* NFS VERSION 3 support, first pass.  Working for Solaris and
-	using TCP.
-
-Sun May 11 01:14:29 1997  Erez Zadok  <ezk@lorien.cs.columbia.edu>
-
-	* amq/amq.c: many newline characters were missing from various
-	stderr printfs.
-
-Sat May 10 13:09:06 1997  Erez Zadok  <ezk@lorien.cs.columbia.edu>
-
-	* conf/nfs_prot/nfs_prot_sunos5.h: protocol defintions for
-	Solaris, which include NFS V3 support.
-
-	* conf/nfs_prot/nfs_prot_default.h: default NFS protocol headers.
 
 	* conf/transp/transp_{tli,sockets}.c (get_mount_client): use NFS
 	protocol version while getting a mount client.
@@ -6141,7 +4337,7 @@ Thu Dec 19 02:08:35 1996  Erez "HWank1" Zadok  <ezk@shekel.mcl.cs.columbia.edu>
 Wed Dec 18 22:20:23 1996  Erez "HWank1" Zadok  <ezk@shekel.mcl.cs.columbia.edu>
 
 	* converted the sources to use memset/memmove/memcmp instead of
-	bzero/becopy/bcmp.
+	bzero/bcopy/bcmp.
 
 	* ran all sources through gnu Indent w/ options specified in
 	aux/amindent.
@@ -6151,3 +4347,9 @@ Wed Dec 11 22:19:29 1996  Erez "HWank1" Zadok  <ezk@shekel.mcl.cs.columbia.edu>
 	* At this point the initial genration of config.h via autoconf and
 	some preliminary makefiles via automake is done.  I will not begin
 	modifying sources, so it's a good time to document from here.
+
+Wed Dec 10 22:19:29 1996  Erez "HWank1" Zadok  <ezk@shekel.mcl.cs.columbia.edu>
+
+	*******************************************************************
+	*** Initial ChangeLog Entry					***
+	*******************************************************************
diff --git a/contrib/amd/amd/amd.8 b/contrib/amd/amd/amd.8
index f09fea9350df..b9c8b85e374d 100644
--- a/contrib/amd/amd/amd.8
+++ b/contrib/amd/amd/amd.8
@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" $Id: amd.8,v 1.3 1999/09/30 21:01:29 ezk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/amd/amd.8,v 1.3.2.1 1999/11/27 04:46:21 obrien Exp $
 .\"
 .Dd April 19, 1994
 .Dt AMD 8
diff --git a/contrib/amd/amd/amd.c b/contrib/amd/amd/amd.c
index 07022e7de4e6..80b9e5df2f3e 100644
--- a/contrib/amd/amd/amd.c
+++ b/contrib/amd/amd/amd.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: amd.c,v 1.6 1999/09/30 21:01:29 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/amd/amd.c,v 1.4.2.1 1999/11/27 04:46:22 obrien Exp $
  *
  */
 
diff --git a/contrib/amd/amd/amq_subr.c b/contrib/amd/amd/amq_subr.c
index 4fb0541772e0..420294d79bd6 100644
--- a/contrib/amd/amd/amq_subr.c
+++ b/contrib/amd/amd/amq_subr.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: amq_subr.c,v 1.5 1999/08/24 21:31:06 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/amd/amq_subr.c,v 1.3.2.2 1999/11/27 04:46:26 obrien Exp $
  *
  */
 /*
diff --git a/contrib/amd/amd/get_args.c b/contrib/amd/amd/get_args.c
index a5f5a4bfca90..35f7976f2603 100644
--- a/contrib/amd/amd/get_args.c
+++ b/contrib/amd/amd/get_args.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: get_args.c,v 1.4 1999/09/30 21:01:31 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/amd/get_args.c,v 1.3.2.1 1999/11/27 04:46:29 obrien Exp $
  *
  */
 
diff --git a/contrib/amd/amd/srvr_nfs.c b/contrib/amd/amd/srvr_nfs.c
index b5425bf7a724..5dab6805b4cc 100644
--- a/contrib/amd/amd/srvr_nfs.c
+++ b/contrib/amd/amd/srvr_nfs.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: srvr_nfs.c,v 1.5 1999/09/08 23:36:39 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/amd/srvr_nfs.c,v 1.3.2.2 1999/11/27 04:46:38 obrien Exp $
  *
  */
 
diff --git a/contrib/amd/amq/amq.8 b/contrib/amd/amq/amq.8
index c44f03626205..e1a0806a2002 100644
--- a/contrib/amd/amq/amq.8
+++ b/contrib/amd/amq/amq.8
@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" $Id: amq.8,v 1.2 1999/01/10 21:53:58 ezk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.4.2.1 1999/11/27 04:46:42 obrien Exp $
 .\"
 .Dd March 16, 1991
 .Dt AMQ 8
diff --git a/contrib/amd/amq/amq.c b/contrib/amd/amq/amq.c
index 98711ebe7392..c9a9f1c18ac5 100644
--- a/contrib/amd/amq/amq.c
+++ b/contrib/amd/amq/amq.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: amq.c,v 1.6 1999/09/08 23:36:40 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/amq/amq.c,v 1.3.2.4 1999/11/27 04:46:42 obrien Exp $
  *
  */
 
diff --git a/contrib/amd/amq/pawd.1 b/contrib/amd/amq/pawd.1
index 6713907ac108..5561dce2de43 100644
--- a/contrib/amd/amq/pawd.1
+++ b/contrib/amd/amq/pawd.1
@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" $Id: pawd.1,v 1.2 1998/09/05 06:56:36 obrien Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/amq/pawd.1,v 1.3.2.1 1999/11/27 04:46:44 obrien Exp $
 .\"
 .Dd January 6, 1998
 .Dt PAWD 1
diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h
index e719e9985cd4..934900de36c6 100644
--- a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h
+++ b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: nfs_prot_freebsd2.h,v 1.2 1999/01/10 21:54:14 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h,v 1.3.2.1 1999/11/27 04:46:47 obrien Exp $
  *
  */
 
diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h
index 29ce9496093e..3064981c7c50 100644
--- a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h
+++ b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: nfs_prot_freebsd3.h,v 1.4 1999/03/30 17:22:54 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h,v 1.6.2.1 1999/11/27 04:46:47 obrien Exp $
  *
  */
 
diff --git a/contrib/amd/fixmount/fixmount.8 b/contrib/amd/fixmount/fixmount.8
index 14915affd7df..6a5203671f7c 100644
--- a/contrib/amd/fixmount/fixmount.8
+++ b/contrib/amd/fixmount/fixmount.8
@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" $Id: fixmount.8,v 1.2 1999/01/10 21:54:26 ezk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/fixmount/fixmount.8,v 1.4.2.1 1999/11/27 04:46:51 obrien Exp $
 .\"
 .Dd February 26, 1993
 .Dt FIXMOUNT 8
diff --git a/contrib/amd/fixmount/fixmount.c b/contrib/amd/fixmount/fixmount.c
index 628e645fc0d0..4efd2f38481e 100644
--- a/contrib/amd/fixmount/fixmount.c
+++ b/contrib/amd/fixmount/fixmount.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: fixmount.c,v 1.4 1999/02/04 07:24:42 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/fixmount/fixmount.c,v 1.4.2.1 1999/11/27 04:46:52 obrien Exp $
  *
  */
 
diff --git a/contrib/amd/fsinfo/fsinfo.8 b/contrib/amd/fsinfo/fsinfo.8
index 2bc2d51044c4..e44419f96b1b 100644
--- a/contrib/amd/fsinfo/fsinfo.8
+++ b/contrib/amd/fsinfo/fsinfo.8
@@ -34,7 +34,7 @@
 .\"
 .\"     from: @(#)fsinfo.8	8.1 (Berkeley) 6/28/93
 .\"	$Id: fsinfo.8,v 1.2 1999/01/10 21:54:28 ezk Exp $
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/amd/fsinfo/fsinfo.8,v 1.2.2.2 1999/11/27 04:46:55 obrien Exp $
 .\"
 .Dd June 26, 1999
 .Dt FSINFO 8
diff --git a/contrib/amd/fsinfo/fsinfo.c b/contrib/amd/fsinfo/fsinfo.c
index 111d205f63f3..0825b7d35981 100644
--- a/contrib/amd/fsinfo/fsinfo.c
+++ b/contrib/amd/fsinfo/fsinfo.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: fsinfo.c,v 1.4 1999/02/04 07:24:44 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/fsinfo/fsinfo.c,v 1.3.2.1 1999/11/27 04:46:55 obrien Exp $
  *
  */
 
diff --git a/contrib/amd/hlfsd/hlfsd.8 b/contrib/amd/hlfsd/hlfsd.8
index 77a2b8077c00..4b2140cccf90 100644
--- a/contrib/amd/hlfsd/hlfsd.8
+++ b/contrib/amd/hlfsd/hlfsd.8
@@ -37,7 +37,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: hlfsd.8,v 1.2 1999/01/10 21:54:32 ezk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/hlfsd/hlfsd.8,v 1.3.2.2 1999/11/27 04:46:58 obrien Exp $
 .\"
 .\" HLFSD was written at Columbia University Computer Science Department, by
 .\" Erez Zadok <ezk@cs.columbia.edu> and Alexander Dupuy <dupuy@smarts.com>
diff --git a/contrib/amd/hlfsd/hlfsd.c b/contrib/amd/hlfsd/hlfsd.c
index dc5b2ace0713..d8ee2543947d 100644
--- a/contrib/amd/hlfsd/hlfsd.c
+++ b/contrib/amd/hlfsd/hlfsd.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: hlfsd.c,v 1.5 1999/09/08 23:36:51 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/hlfsd/hlfsd.c,v 1.4.2.1 1999/11/27 04:46:58 obrien Exp $
  *
  * HLFSD was written at Columbia University Computer Science Department, by
  * Erez Zadok <ezk@cs.columbia.edu> and Alexander Dupuy <dupuy@cs.columbia.edu>
diff --git a/contrib/amd/hlfsd/homedir.c b/contrib/amd/hlfsd/homedir.c
index 582acc831a9d..a5fbb1b29415 100644
--- a/contrib/amd/hlfsd/homedir.c
+++ b/contrib/amd/hlfsd/homedir.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: homedir.c,v 1.4 1999/01/13 23:31:19 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/hlfsd/homedir.c,v 1.3.2.1 1999/11/27 04:46:59 obrien Exp $
  *
  * HLFSD was written at Columbia University Computer Science Department, by
  * Erez Zadok <ezk@cs.columbia.edu> and Alexander Dupuy <dupuy@cs.columbia.edu>
diff --git a/contrib/amd/include/am_defs.h b/contrib/amd/include/am_defs.h
index 36c695eada4c..5dfefb925f64 100644
--- a/contrib/amd/include/am_defs.h
+++ b/contrib/amd/include/am_defs.h
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: am_defs.h,v 1.11 1999/09/18 08:38:05 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/include/am_defs.h,v 1.4.2.2 1999/11/27 04:47:01 obrien Exp $
  *
  */
 
diff --git a/contrib/amd/libamu/mount_fs.c b/contrib/amd/libamu/mount_fs.c
index 1a4deeee07d5..6e6ed24f073e 100644
--- a/contrib/amd/libamu/mount_fs.c
+++ b/contrib/amd/libamu/mount_fs.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: mount_fs.c,v 1.8 1999/09/18 08:38:06 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/libamu/mount_fs.c,v 1.1.1.2.2.2 1999/11/27 04:47:04 obrien Exp $
  *
  */
 
diff --git a/contrib/amd/mk-amd-map/mk-amd-map.8 b/contrib/amd/mk-amd-map/mk-amd-map.8
index 99f93e122be5..7d1464c3f8b9 100644
--- a/contrib/amd/mk-amd-map/mk-amd-map.8
+++ b/contrib/amd/mk-amd-map/mk-amd-map.8
@@ -34,7 +34,7 @@
 .\"
 .\"     from: @(#)mk-amd-map.8	8.1 (Berkeley) 6/28/93
 .\"	$Id: mk-amd-map.8,v 1.2 1999/01/10 21:54:41 ezk Exp $
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/amd/mk-amd-map/mk-amd-map.8,v 1.2.2.1 1999/11/27 04:47:07 obrien Exp $
 .\"
 .Dd June 28, 1993
 .Dt MK-AMD-MAP 8
diff --git a/contrib/amd/mk-amd-map/mk-amd-map.c b/contrib/amd/mk-amd-map/mk-amd-map.c
index 755d5bf22b4c..4977c6056794 100644
--- a/contrib/amd/mk-amd-map/mk-amd-map.c
+++ b/contrib/amd/mk-amd-map/mk-amd-map.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: mk-amd-map.c,v 1.4 1999/02/04 07:24:50 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/mk-amd-map/mk-amd-map.c,v 1.6.2.1 1999/11/27 04:47:08 obrien Exp $
  */
 
 /*
diff --git a/contrib/amd/scripts/amd.conf.5 b/contrib/amd/scripts/amd.conf.5
index 2142622a4585..59577e037a43 100644
--- a/contrib/amd/scripts/amd.conf.5
+++ b/contrib/amd/scripts/amd.conf.5
@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" $Id: amd.conf.5,v 1.3 1999/03/30 17:23:08 ezk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/scripts/amd.conf.5,v 1.6.2.3 1999/11/27 04:47:09 obrien Exp $
 .\"
 .Dd April 7, 1997
 .Dt AMD.CONF 5
diff --git a/contrib/amd/wire-test/wire-test.8 b/contrib/amd/wire-test/wire-test.8
index dfb8a862a2bb..12d72dd1c796 100644
--- a/contrib/amd/wire-test/wire-test.8
+++ b/contrib/amd/wire-test/wire-test.8
@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" $Id: wire-test.8,v 1.2 1999/01/10 21:54:44 ezk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/wire-test/wire-test.8,v 1.2.2.1 1999/11/27 04:47:11 obrien Exp $
 .\"
 .Dd February 26, 1993
 .Dt WIRE-TEST 8
diff --git a/contrib/amd/wire-test/wire-test.c b/contrib/amd/wire-test/wire-test.c
index c55764707e15..a8af5adc256e 100644
--- a/contrib/amd/wire-test/wire-test.c
+++ b/contrib/amd/wire-test/wire-test.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: wire-test.c,v 1.4 1999/02/04 07:24:54 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/wire-test/wire-test.c,v 1.4.2.1 1999/11/27 04:47:12 obrien Exp $
  *
  */
 
diff --git a/contrib/awk/FREEBSD-upgrade b/contrib/awk/FREEBSD-upgrade
index 97e4270e182c..e23bcea5dbd0 100644
--- a/contrib/awk/FREEBSD-upgrade
+++ b/contrib/awk/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/awk/FREEBSD-upgrade,v 1.5.2.1 1999/12/08 17:57:51 sheldonh Exp $
 
 Import of GNU awk 3.0.4
 
diff --git a/contrib/awk/awk.h b/contrib/awk/awk.h
index 621a98109574..dfad49cccb6f 100644
--- a/contrib/awk/awk.h
+++ b/contrib/awk/awk.h
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/awk/awk.h,v 1.4.2.1 1999/12/08 17:57:54 sheldonh Exp $
  */
 
 /* ------------------------------ Includes ------------------------------ */
diff --git a/contrib/awk/builtin.c b/contrib/awk/builtin.c
index 0fee05459a2a..8178c583ddbf 100644
--- a/contrib/awk/builtin.c
+++ b/contrib/awk/builtin.c
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/awk/builtin.c,v 1.5.2.1 1999/12/08 17:57:55 sheldonh Exp $
  */
 
 
diff --git a/contrib/awk/doc/awk.1 b/contrib/awk/doc/awk.1
index 807f79f156b9..28322e10d63e 100644
--- a/contrib/awk/doc/awk.1
+++ b/contrib/awk/doc/awk.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/awk/doc/awk.1,v 1.3.2.1 1999/12/08 17:58:01 sheldonh Exp $
 .ds PX \s-1POSIX\s+1
 .ds UX \s-1UNIX\s+1
 .ds AN \s-1ANSI\s+1
diff --git a/contrib/awk/eval.c b/contrib/awk/eval.c
index 37c5fef86789..37adf2acd3be 100644
--- a/contrib/awk/eval.c
+++ b/contrib/awk/eval.c
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/awk/eval.c,v 1.3.2.1 1999/12/08 17:57:56 sheldonh Exp $
  */
 
 #include "awk.h"
diff --git a/contrib/awk/field.c b/contrib/awk/field.c
index 72cbd78e8c20..19403bab9c05 100644
--- a/contrib/awk/field.c
+++ b/contrib/awk/field.c
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/awk/field.c,v 1.3.2.1 1999/12/08 17:57:56 sheldonh Exp $
  */
 
 #include "awk.h"
diff --git a/contrib/awk/io.c b/contrib/awk/io.c
index 0a24f8af30ce..0b796170436a 100644
--- a/contrib/awk/io.c
+++ b/contrib/awk/io.c
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/awk/io.c,v 1.3.2.1 1999/12/08 17:57:57 sheldonh Exp $
  */
 
 #include "awk.h"
diff --git a/contrib/awk/main.c b/contrib/awk/main.c
index 27452f00aed3..db972f72b1f5 100644
--- a/contrib/awk/main.c
+++ b/contrib/awk/main.c
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/awk/main.c,v 1.3.2.1 1999/12/08 17:57:57 sheldonh Exp $
  */
 
 #include "awk.h"
diff --git a/contrib/awk/node.c b/contrib/awk/node.c
index a8892a35678b..5691757453d3 100644
--- a/contrib/awk/node.c
+++ b/contrib/awk/node.c
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/awk/node.c,v 1.3.2.1 1999/12/08 17:57:57 sheldonh Exp $
  */
 
 #include "awk.h"
diff --git a/contrib/bind/bin/named-xfer/named-xfer.c b/contrib/bind/bin/named-xfer/named-xfer.c
index d7db8869d47b..db27743f2cdc 100644
--- a/contrib/bind/bin/named-xfer/named-xfer.c
+++ b/contrib/bind/bin/named-xfer/named-xfer.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/bind/bin/named-xfer/named-xfer.c,v 1.2.2.1 1999/12/13 15:05:19 peter Exp $ */
 /*
  * The original version of named-xfer by Kevin Dunlap.
  * Completed and integrated with named by David Waitzman
diff --git a/contrib/bind/bin/named/Makefile b/contrib/bind/bin/named/Makefile
index 96a392725fb4..1318ee43d3ad 100644
--- a/contrib/bind/bin/named/Makefile
+++ b/contrib/bind/bin/named/Makefile
@@ -14,7 +14,7 @@
 ## SOFTWARE.
 
 # $Id: Makefile,v 8.47 1999/08/26 18:42:31 vixie Exp $
-# $FreeBSD$
+# $FreeBSD: src/contrib/bind/bin/named/Makefile,v 1.2.2.1 1999/12/13 15:04:45 peter Exp $
 
 DESTDIR=
 CC= cc
diff --git a/contrib/bind/bin/nslookup/commands.l b/contrib/bind/bin/nslookup/commands.l
index c480d46e52ac..e73fa0f9afae 100644
--- a/contrib/bind/bin/nslookup/commands.l
+++ b/contrib/bind/bin/nslookup/commands.l
@@ -1,5 +1,5 @@
 %{
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/bind/bin/nslookup/commands.l,v 1.1.1.1.2.1 1999/12/13 15:05:23 peter Exp $ */
 /*
  * Copyright (c) 1985
  *    The Regents of the University of California.  All rights reserved.
diff --git a/contrib/bind/bin/nslookup/debug.c b/contrib/bind/bin/nslookup/debug.c
index 7dac192e5cb0..7cd4e33aeee7 100644
--- a/contrib/bind/bin/nslookup/debug.c
+++ b/contrib/bind/bin/nslookup/debug.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/bind/bin/nslookup/debug.c,v 1.2.2.1 1999/12/13 15:05:24 peter Exp $ */
 /*
  * Copyright (c) 1985, 1989
  *    The Regents of the University of California.  All rights reserved.
diff --git a/contrib/bind/bin/nslookup/getinfo.c b/contrib/bind/bin/nslookup/getinfo.c
index 673bad0a443b..121eb1335150 100644
--- a/contrib/bind/bin/nslookup/getinfo.c
+++ b/contrib/bind/bin/nslookup/getinfo.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/bind/bin/nslookup/getinfo.c,v 1.2.2.1 1999/12/13 15:05:24 peter Exp $ */
 /*
  * Copyright (c) 1985, 1989
  *    The Regents of the University of California.  All rights reserved.
diff --git a/contrib/bind/bin/nslookup/main.c b/contrib/bind/bin/nslookup/main.c
index 454fe12b1c2a..b45e19d77eed 100644
--- a/contrib/bind/bin/nslookup/main.c
+++ b/contrib/bind/bin/nslookup/main.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/bind/bin/nslookup/main.c,v 1.1.1.1.2.1 1999/12/13 15:05:26 peter Exp $ */
 /*
  * Copyright (c) 1985, 1989
  *    The Regents of the University of California.  All rights reserved.
diff --git a/contrib/bind/doc/man/dig.1 b/contrib/bind/doc/man/dig.1
index 3e59b056c58c..cb0bdc3ab3e2 100644
--- a/contrib/bind/doc/man/dig.1
+++ b/contrib/bind/doc/man/dig.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/bind/doc/man/dig.1,v 1.1.1.1.2.1 1999/12/13 15:05:44 peter Exp $
 .\" $Id: dig.1,v 8.4 1999/10/15 21:29:58 vixie Exp $
 .\"
 .\" ++Copyright++ 1993
diff --git a/contrib/bind/port/freebsd/include/port_after.h b/contrib/bind/port/freebsd/include/port_after.h
index 8dcd1f8654e1..bfb5b1a5b923 100644
--- a/contrib/bind/port/freebsd/include/port_after.h
+++ b/contrib/bind/port/freebsd/include/port_after.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/bind/port/freebsd/include/port_after.h,v 1.3.2.1 1999/12/13 15:08:00 peter Exp $ */
 #ifndef	PORT_AFTER_H
 #define	PORT_AFTER_H
 #define CAN_RECONNECT
diff --git a/contrib/binutils/bfd/VERSION b/contrib/binutils/bfd/VERSION
new file mode 100644
index 000000000000..dbe590065479
--- /dev/null
+++ b/contrib/binutils/bfd/VERSION
@@ -0,0 +1 @@
+2.8.1
diff --git a/contrib/binutils/bfd/doc/bfd.texi b/contrib/binutils/bfd/doc/bfd.texi
new file mode 100644
index 000000000000..ea0ca9e56dc9
--- /dev/null
+++ b/contrib/binutils/bfd/doc/bfd.texi
@@ -0,0 +1,585 @@
+@section @code{typedef bfd}
+A BFD has type @code{bfd}; objects of this type are the
+cornerstone of any application using BFD. Using BFD
+consists of making references though the BFD and to data in the BFD.
+
+Here is the structure that defines the type @code{bfd}.  It
+contains the major data about the file and pointers
+to the rest of the data.
+@*
+.
+@example
+struct _bfd 
+@{
+    /* The filename the application opened the BFD with.  */
+    CONST char *filename;                
+
+    /* A pointer to the target jump table.             */
+    const struct bfd_target *xvec;
+
+    /* To avoid dragging too many header files into every file that
+       includes `@code{bfd.h}', IOSTREAM has been declared as a "char
+       *", and MTIME as a "long".  Their correct types, to which they
+       are cast when used, are "FILE *" and "time_t".    The iostream
+       is the result of an fopen on the filename.  However, if the
+       BFD_IN_MEMORY flag is set, then iostream is actually a pointer
+       to a bfd_in_memory struct.  */
+    PTR iostream;
+
+    /* Is the file descriptor being cached?  That is, can it be closed as
+       needed, and re-opened when accessed later?  */
+
+    boolean cacheable;
+
+    /* Marks whether there was a default target specified when the
+       BFD was opened. This is used to select which matching algorithm
+       to use to choose the back end. */
+
+    boolean target_defaulted;
+
+    /* The caching routines use these to maintain a
+       least-recently-used list of BFDs */
+
+    struct _bfd *lru_prev, *lru_next;
+
+    /* When a file is closed by the caching routines, BFD retains
+       state information on the file here: */
+
+    file_ptr where;              
+
+    /* and here: (``once'' means at least once) */
+
+    boolean opened_once;
+
+    /* Set if we have a locally maintained mtime value, rather than
+       getting it from the file each time: */
+
+    boolean mtime_set;
+
+    /* File modified time, if mtime_set is true: */
+
+    long mtime;          
+
+    /* Reserved for an unimplemented file locking extension.*/
+
+    int ifd;
+
+    /* The format which belongs to the BFD. (object, core, etc.) */
+
+    bfd_format format;
+
+    /* The direction the BFD was opened with*/
+
+    enum bfd_direction @{no_direction = 0,
+                        read_direction = 1,
+                        write_direction = 2,
+                        both_direction = 3@} direction;
+
+    /* Format_specific flags*/
+
+    flagword flags;              
+
+    /* Currently my_archive is tested before adding origin to
+       anything. I believe that this can become always an add of
+       origin, with origin set to 0 for non archive files.   */
+
+    file_ptr origin;             
+
+    /* Remember when output has begun, to stop strange things
+       from happening. */
+    boolean output_has_begun;
+
+    /* Pointer to linked list of sections*/
+    struct sec  *sections;
+
+    /* The number of sections */
+    unsigned int section_count;
+
+    /* Stuff only useful for object files: 
+       The start address. */
+    bfd_vma start_address;
+
+    /* Used for input and output*/
+    unsigned int symcount;
+
+    /* Symbol table for output BFD (with symcount entries) */
+    struct symbol_cache_entry  **outsymbols;             
+
+    /* Pointer to structure which contains architecture information*/
+    const struct bfd_arch_info *arch_info;
+
+    /* Stuff only useful for archives:*/
+    PTR arelt_data;              
+    struct _bfd *my_archive;     /* The containing archive BFD.  */
+    struct _bfd *next;           /* The next BFD in the archive.  */
+    struct _bfd *archive_head;   /* The first BFD in the archive.  */
+    boolean has_armap;           
+
+    /* A chain of BFD structures involved in a link.  */
+    struct _bfd *link_next;
+
+    /* A field used by _bfd_generic_link_add_archive_symbols.  This will
+       be used only for archive elements.  */
+    int archive_pass;
+
+    /* Used by the back end to hold private data. */
+
+    union 
+      @{
+      struct aout_data_struct *aout_data;
+      struct artdata *aout_ar_data;
+      struct _oasys_data *oasys_obj_data;
+      struct _oasys_ar_data *oasys_ar_data;
+      struct coff_tdata *coff_obj_data;
+      struct pe_tdata *pe_obj_data;
+      struct xcoff_tdata *xcoff_obj_data;
+      struct ecoff_tdata *ecoff_obj_data;
+      struct ieee_data_struct *ieee_data;
+      struct ieee_ar_data_struct *ieee_ar_data;
+      struct srec_data_struct *srec_data;
+      struct ihex_data_struct *ihex_data;
+      struct tekhex_data_struct *tekhex_data;
+      struct elf_obj_tdata *elf_obj_data;
+      struct nlm_obj_tdata *nlm_obj_data;
+      struct bout_data_struct *bout_data;
+      struct sun_core_struct *sun_core_data;
+      struct trad_core_struct *trad_core_data;
+      struct som_data_struct *som_data;
+      struct hpux_core_struct *hpux_core_data;
+      struct hppabsd_core_struct *hppabsd_core_data;
+      struct sgi_core_struct *sgi_core_data;
+      struct lynx_core_struct *lynx_core_data;
+      struct osf_core_struct *osf_core_data;
+      struct cisco_core_struct *cisco_core_data;
+      struct versados_data_struct *versados_data;
+      struct netbsd_core_struct *netbsd_core_data;
+      PTR any;
+      @} tdata;
+  
+    /* Used by the application to hold private data*/
+    PTR usrdata;
+
+  /* Where all the allocated stuff under this BFD goes.  This is a
+     struct objalloc *, but we use PTR to avoid requiring the inclusion of
+     objalloc.h.  */
+    PTR memory;
+@};
+
+@end example
+@section Error reporting
+Most BFD functions return nonzero on success (check their
+individual documentation for precise semantics).  On an error,
+they call @code{bfd_set_error} to set an error condition that callers
+can check by calling @code{bfd_get_error}.
+If that returns @code{bfd_error_system_call}, then check
+@code{errno}.
+
+The easiest way to report a BFD error to the user is to
+use @code{bfd_perror}.
+@*
+@subsection Type @code{bfd_error_type}
+The values returned by @code{bfd_get_error} are defined by the
+enumerated type @code{bfd_error_type}.
+@*
+.
+@example
+typedef enum bfd_error
+@{
+  bfd_error_no_error = 0,
+  bfd_error_system_call,
+  bfd_error_invalid_target,
+  bfd_error_wrong_format,
+  bfd_error_invalid_operation,
+  bfd_error_no_memory,
+  bfd_error_no_symbols,
+  bfd_error_no_armap,
+  bfd_error_no_more_archived_files,
+  bfd_error_malformed_archive,
+  bfd_error_file_not_recognized,
+  bfd_error_file_ambiguously_recognized,
+  bfd_error_no_contents,
+  bfd_error_nonrepresentable_section,
+  bfd_error_no_debug_section,
+  bfd_error_bad_value,
+  bfd_error_file_truncated,
+  bfd_error_file_too_big,
+  bfd_error_invalid_error_code
+@} bfd_error_type;
+
+@end example
+@findex bfd_get_error
+@subsubsection @code{bfd_get_error}
+@strong{Synopsis}
+@example
+bfd_error_type bfd_get_error (void);
+@end example
+@strong{Description}@*
+Return the current BFD error condition.
+@*
+@findex bfd_set_error
+@subsubsection @code{bfd_set_error}
+@strong{Synopsis}
+@example
+void bfd_set_error (bfd_error_type error_tag);
+@end example
+@strong{Description}@*
+Set the BFD error condition to be @var{error_tag}.
+@*
+@findex bfd_errmsg
+@subsubsection @code{bfd_errmsg}
+@strong{Synopsis}
+@example
+CONST char *bfd_errmsg (bfd_error_type error_tag);
+@end example
+@strong{Description}@*
+Return a string describing the error @var{error_tag}, or
+the system error if @var{error_tag} is @code{bfd_error_system_call}.
+@*
+@findex bfd_perror
+@subsubsection @code{bfd_perror}
+@strong{Synopsis}
+@example
+void bfd_perror (CONST char *message);
+@end example
+@strong{Description}@*
+Print to the standard error stream a string describing the
+last BFD error that occurred, or the last system error if
+the last BFD error was a system call failure.  If @var{message}
+is non-NULL and non-empty, the error string printed is preceded
+by @var{message}, a colon, and a space.  It is followed by a newline.
+@*
+@subsection BFD error handler
+Some BFD functions want to print messages describing the
+problem.  They call a BFD error handler function.  This
+function may be overriden by the program.
+
+The BFD error handler acts like printf.
+@*
+.
+@example
+typedef void (*bfd_error_handler_type) PARAMS ((const char *, ...));
+
+@end example
+@findex bfd_set_error_handler
+@subsubsection @code{bfd_set_error_handler}
+@strong{Synopsis}
+@example
+bfd_error_handler_type bfd_set_error_handler (bfd_error_handler_type);
+@end example
+@strong{Description}@*
+Set the BFD error handler function.  Returns the previous
+function.
+@*
+@findex bfd_set_error_program_name
+@subsubsection @code{bfd_set_error_program_name}
+@strong{Synopsis}
+@example
+void bfd_set_error_program_name (const char *);
+@end example
+@strong{Description}@*
+Set the program name to use when printing a BFD error.  This
+is printed before the error message followed by a colon and
+space.  The string must not be changed after it is passed to
+this function.
+@*
+@section Symbols
+
+@*
+@findex bfd_get_reloc_upper_bound
+@subsubsection @code{bfd_get_reloc_upper_bound}
+@strong{Synopsis}
+@example
+long bfd_get_reloc_upper_bound(bfd *abfd, asection *sect);
+@end example
+@strong{Description}@*
+Return the number of bytes required to store the
+relocation information associated with section @var{sect}
+attached to bfd @var{abfd}.  If an error occurs, return -1.
+@*
+@findex bfd_canonicalize_reloc
+@subsubsection @code{bfd_canonicalize_reloc}
+@strong{Synopsis}
+@example
+long bfd_canonicalize_reloc
+   (bfd *abfd,
+    asection *sec,
+    arelent **loc,
+    asymbol	**syms);
+@end example
+@strong{Description}@*
+Call the back end associated with the open BFD
+@var{abfd} and translate the external form of the relocation
+information attached to @var{sec} into the internal canonical
+form.  Place the table into memory at @var{loc}, which has
+been preallocated, usually by a call to
+@code{bfd_get_reloc_upper_bound}.  Returns the number of relocs, or
+-1 on error.
+
+The @var{syms} table is also needed for horrible internal magic
+reasons.
+@*
+@findex bfd_set_reloc
+@subsubsection @code{bfd_set_reloc}
+@strong{Synopsis}
+@example
+void bfd_set_reloc
+   (bfd *abfd, asection *sec, arelent **rel, unsigned int count)
+@end example
+@strong{Description}@*
+Set the relocation pointer and count within
+section @var{sec} to the values @var{rel} and @var{count}.
+The argument @var{abfd} is ignored.
+@*
+@findex bfd_set_file_flags
+@subsubsection @code{bfd_set_file_flags}
+@strong{Synopsis}
+@example
+boolean bfd_set_file_flags(bfd *abfd, flagword flags);
+@end example
+@strong{Description}@*
+Set the flag word in the BFD @var{abfd} to the value @var{flags}.
+
+Possible errors are:
+@itemize @bullet
+
+@item
+@code{bfd_error_wrong_format} - The target bfd was not of object format.
+@item
+@code{bfd_error_invalid_operation} - The target bfd was open for reading.
+@item
+@code{bfd_error_invalid_operation} -
+The flag word contained a bit which was not applicable to the
+type of file.  E.g., an attempt was made to set the @code{D_PAGED} bit
+on a BFD format which does not support demand paging.
+@end itemize
+@*
+@findex bfd_set_start_address
+@subsubsection @code{bfd_set_start_address}
+@strong{Synopsis}
+@example
+boolean bfd_set_start_address(bfd *abfd, bfd_vma vma);
+@end example
+@strong{Description}@*
+Make @var{vma} the entry point of output BFD @var{abfd}.
+@*
+@strong{Returns}@*
+Returns @code{true} on success, @code{false} otherwise.
+@*
+@findex bfd_get_mtime
+@subsubsection @code{bfd_get_mtime}
+@strong{Synopsis}
+@example
+long bfd_get_mtime(bfd *abfd);
+@end example
+@strong{Description}@*
+Return the file modification time (as read from the file system, or
+from the archive header for archive members).
+@*
+@findex bfd_get_size
+@subsubsection @code{bfd_get_size}
+@strong{Synopsis}
+@example
+long bfd_get_size(bfd *abfd);
+@end example
+@strong{Description}@*
+Return the file size (as read from file system) for the file
+associated with BFD @var{abfd}.
+
+The initial motivation for, and use of, this routine is not
+so we can get the exact size of the object the BFD applies to, since
+that might not be generally possible (archive members for example).
+It would be ideal if someone could eventually modify
+it so that such results were guaranteed.
+
+Instead, we want to ask questions like "is this NNN byte sized
+object I'm about to try read from file offset YYY reasonable?"
+As as example of where we might do this, some object formats
+use string tables for which the first @code{sizeof(long)} bytes of the
+table contain the size of the table itself, including the size bytes.
+If an application tries to read what it thinks is one of these
+string tables, without some way to validate the size, and for
+some reason the size is wrong (byte swapping error, wrong location
+for the string table, etc.), the only clue is likely to be a read
+error when it tries to read the table, or a "virtual memory
+exhausted" error when it tries to allocate 15 bazillon bytes
+of space for the 15 bazillon byte table it is about to read.
+This function at least allows us to answer the quesion, "is the
+size reasonable?".
+@*
+@findex bfd_get_gp_size
+@subsubsection @code{bfd_get_gp_size}
+@strong{Synopsis}
+@example
+int bfd_get_gp_size(bfd *abfd);
+@end example
+@strong{Description}@*
+Return the maximum size of objects to be optimized using the GP
+register under MIPS ECOFF.  This is typically set by the @code{-G}
+argument to the compiler, assembler or linker.
+@*
+@findex bfd_set_gp_size
+@subsubsection @code{bfd_set_gp_size}
+@strong{Synopsis}
+@example
+void bfd_set_gp_size(bfd *abfd, int i);
+@end example
+@strong{Description}@*
+Set the maximum size of objects to be optimized using the GP
+register under ECOFF or MIPS ELF.  This is typically set by
+the @code{-G} argument to the compiler, assembler or linker.
+@*
+@findex bfd_scan_vma
+@subsubsection @code{bfd_scan_vma}
+@strong{Synopsis}
+@example
+bfd_vma bfd_scan_vma(CONST char *string, CONST char **end, int base);
+@end example
+@strong{Description}@*
+Convert, like @code{strtoul}, a numerical expression
+@var{string} into a @code{bfd_vma} integer, and return that integer.
+(Though without as many bells and whistles as @code{strtoul}.)
+The expression is assumed to be unsigned (i.e., positive).
+If given a @var{base}, it is used as the base for conversion.
+A base of 0 causes the function to interpret the string
+in hex if a leading "0x" or "0X" is found, otherwise
+in octal if a leading zero is found, otherwise in decimal.
+
+Overflow is not detected.
+@*
+@findex bfd_copy_private_bfd_data
+@subsubsection @code{bfd_copy_private_bfd_data}
+@strong{Synopsis}
+@example
+boolean bfd_copy_private_bfd_data(bfd *ibfd, bfd *obfd);
+@end example
+@strong{Description}@*
+Copy private BFD information from the BFD @var{ibfd} to the 
+the BFD @var{obfd}.  Return @code{true} on success, @code{false} on error.
+Possible error returns are:
+
+@itemize @bullet
+
+@item
+@code{bfd_error_no_memory} -
+Not enough memory exists to create private data for @var{obfd}.
+@end itemize
+@example
+#define bfd_copy_private_bfd_data(ibfd, obfd) \
+     BFD_SEND (obfd, _bfd_copy_private_bfd_data, \
+		(ibfd, obfd))
+@end example
+@*
+@findex bfd_merge_private_bfd_data
+@subsubsection @code{bfd_merge_private_bfd_data}
+@strong{Synopsis}
+@example
+boolean bfd_merge_private_bfd_data(bfd *ibfd, bfd *obfd);
+@end example
+@strong{Description}@*
+Merge private BFD information from the BFD @var{ibfd} to the 
+the output file BFD @var{obfd} when linking.  Return @code{true}
+on success, @code{false} on error.  Possible error returns are:
+
+@itemize @bullet
+
+@item
+@code{bfd_error_no_memory} -
+Not enough memory exists to create private data for @var{obfd}.
+@end itemize
+@example
+#define bfd_merge_private_bfd_data(ibfd, obfd) \
+     BFD_SEND (obfd, _bfd_merge_private_bfd_data, \
+		(ibfd, obfd))
+@end example
+@*
+@findex bfd_set_private_flags
+@subsubsection @code{bfd_set_private_flags}
+@strong{Synopsis}
+@example
+boolean bfd_set_private_flags(bfd *abfd, flagword flags);
+@end example
+@strong{Description}@*
+Set private BFD flag information in the BFD @var{abfd}.
+Return @code{true} on success, @code{false} on error.  Possible error
+returns are:
+
+@itemize @bullet
+
+@item
+@code{bfd_error_no_memory} -
+Not enough memory exists to create private data for @var{obfd}.
+@end itemize
+@example
+#define bfd_set_private_flags(abfd, flags) \
+     BFD_SEND (abfd, _bfd_set_private_flags, \
+		(abfd, flags))
+@end example
+@*
+@findex stuff
+@subsubsection @code{stuff}
+@strong{Description}@*
+Stuff which should be documented:
+@example
+#define bfd_sizeof_headers(abfd, reloc) \
+     BFD_SEND (abfd, _bfd_sizeof_headers, (abfd, reloc))
+
+#define bfd_find_nearest_line(abfd, sec, syms, off, file, func, line) \
+     BFD_SEND (abfd, _bfd_find_nearest_line,  (abfd, sec, syms, off, file, func, line))
+
+        /* Do these three do anything useful at all, for any back end?  */
+#define bfd_debug_info_start(abfd) \
+        BFD_SEND (abfd, _bfd_debug_info_start, (abfd))
+
+#define bfd_debug_info_end(abfd) \
+        BFD_SEND (abfd, _bfd_debug_info_end, (abfd))
+
+#define bfd_debug_info_accumulate(abfd, section) \
+        BFD_SEND (abfd, _bfd_debug_info_accumulate, (abfd, section))
+
+
+#define bfd_stat_arch_elt(abfd, stat) \
+        BFD_SEND (abfd, _bfd_stat_arch_elt,(abfd, stat))
+
+#define bfd_update_armap_timestamp(abfd) \
+        BFD_SEND (abfd, _bfd_update_armap_timestamp, (abfd))
+
+#define bfd_set_arch_mach(abfd, arch, mach)\
+        BFD_SEND ( abfd, _bfd_set_arch_mach, (abfd, arch, mach))
+
+#define bfd_relax_section(abfd, section, link_info, again) \
+       BFD_SEND (abfd, _bfd_relax_section, (abfd, section, link_info, again))
+
+#define bfd_link_hash_table_create(abfd) \
+	BFD_SEND (abfd, _bfd_link_hash_table_create, (abfd))
+
+#define bfd_link_add_symbols(abfd, info) \
+	BFD_SEND (abfd, _bfd_link_add_symbols, (abfd, info))
+
+#define bfd_final_link(abfd, info) \
+	BFD_SEND (abfd, _bfd_final_link, (abfd, info))
+
+#define bfd_free_cached_info(abfd) \
+       BFD_SEND (abfd, _bfd_free_cached_info, (abfd))
+
+#define bfd_get_dynamic_symtab_upper_bound(abfd) \
+	BFD_SEND (abfd, _bfd_get_dynamic_symtab_upper_bound, (abfd))
+
+#define bfd_print_private_bfd_data(abfd, file)\
+	BFD_SEND (abfd, _bfd_print_private_bfd_data, (abfd, file))
+
+#define bfd_canonicalize_dynamic_symtab(abfd, asymbols) \
+	BFD_SEND (abfd, _bfd_canonicalize_dynamic_symtab, (abfd, asymbols))
+
+#define bfd_get_dynamic_reloc_upper_bound(abfd) \
+	BFD_SEND (abfd, _bfd_get_dynamic_reloc_upper_bound, (abfd))
+
+#define bfd_canonicalize_dynamic_reloc(abfd, arels, asyms) \
+	BFD_SEND (abfd, _bfd_canonicalize_dynamic_reloc, (abfd, arels, asyms))
+
+extern bfd_byte *bfd_get_relocated_section_contents
+	PARAMS ((bfd *, struct bfd_link_info *,
+		  struct bfd_link_order *, bfd_byte *,
+		  boolean, asymbol **));
+
+@end example
+@*
diff --git a/contrib/binutils/gas/conf.in b/contrib/binutils/gas/conf.in
new file mode 100644
index 000000000000..d56807cd88d5
--- /dev/null
+++ b/contrib/binutils/gas/conf.in
@@ -0,0 +1,127 @@
+/* conf.in.  Generated automatically from configure.in by autoheader.  */
+
+/* Define if using alloca.c.  */
+#undef C_ALLOCA
+
+/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
+   This function is required for alloca.c support on those systems.  */
+#undef CRAY_STACKSEG_END
+
+/* Define if you have alloca, as a function or macro.  */
+#undef HAVE_ALLOCA
+
+/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
+#undef HAVE_ALLOCA_H
+
+/* Define as __inline if that's what the C compiler calls it.  */
+#undef inline
+
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at run-time.
+ STACK_DIRECTION > 0 => grows toward higher addresses
+ STACK_DIRECTION < 0 => grows toward lower addresses
+ STACK_DIRECTION = 0 => direction of growth unknown
+ */
+#undef STACK_DIRECTION
+
+/* Should gas use high-level BFD interfaces?  */
+#undef BFD_ASSEMBLER
+
+/* Some assert/preprocessor combinations are incapable of handling
+   certain kinds of constructs in the argument of assert.  For example,
+   quoted strings (if requoting isn't done right) or newlines.  */
+#undef BROKEN_ASSERT
+
+/* If we aren't doing cross-assembling, some operations can be optimized,
+   since byte orders and value sizes don't need to be adjusted.  */
+#undef CROSS_COMPILE
+
+/* Some gas code wants to know these parameters.  */
+#undef TARGET_ALIAS
+#undef TARGET_CPU
+#undef TARGET_CANONICAL
+#undef TARGET_OS
+#undef TARGET_VENDOR
+
+/* Sometimes the system header files don't declare strstr.  */
+#undef NEED_DECLARATION_STRSTR
+
+/* Sometimes the system header files don't declare malloc and realloc.  */
+#undef NEED_DECLARATION_MALLOC
+
+/* Sometimes the system header files don't declare free.  */
+#undef NEED_DECLARATION_FREE
+
+/* Sometimes the system header files don't declare sbrk.  */
+#undef NEED_DECLARATION_SBRK
+
+/* Sometimes errno.h doesn't declare errno itself.  */
+#undef NEED_DECLARATION_ERRNO
+
+#undef MANY_SEGMENTS
+
+/* Needed only for sparc configuration.  */
+#undef SPARC_V9
+#undef SPARC_ARCH64
+
+/* Defined if using CGEN.  */
+#undef USING_CGEN
+
+/* Needed only for some configurations that can produce multiple output
+   formats.  */
+#undef DEFAULT_EMULATION
+#undef EMULATIONS
+#undef USE_EMULATIONS
+#undef OBJ_MAYBE_AOUT
+#undef OBJ_MAYBE_BOUT
+#undef OBJ_MAYBE_COFF
+#undef OBJ_MAYBE_ECOFF
+#undef OBJ_MAYBE_ELF
+#undef OBJ_MAYBE_GENERIC
+#undef OBJ_MAYBE_HP300
+#undef OBJ_MAYBE_IEEE
+#undef OBJ_MAYBE_SOM
+#undef OBJ_MAYBE_VMS
+
+/* Used for some of the COFF configurations, when the COFF code needs
+   to select something based on the CPU type before it knows it... */
+#undef I386COFF
+#undef M68KCOFF
+#undef M88KCOFF
+
+/* Define if you have the remove function.  */
+#undef HAVE_REMOVE
+
+/* Define if you have the sbrk function.  */
+#undef HAVE_SBRK
+
+/* Define if you have the unlink function.  */
+#undef HAVE_UNLINK
+
+/* Define if you have the <errno.h> header file.  */
+#undef HAVE_ERRNO_H
+
+/* Define if you have the <memory.h> header file.  */
+#undef HAVE_MEMORY_H
+
+/* Define if you have the <stdarg.h> header file.  */
+#undef HAVE_STDARG_H
+
+/* Define if you have the <stdlib.h> header file.  */
+#undef HAVE_STDLIB_H
+
+/* Define if you have the <string.h> header file.  */
+#undef HAVE_STRING_H
+
+/* Define if you have the <strings.h> header file.  */
+#undef HAVE_STRINGS_H
+
+/* Define if you have the <sys/types.h> header file.  */
+#undef HAVE_SYS_TYPES_H
+
+/* Define if you have the <unistd.h> header file.  */
+#undef HAVE_UNISTD_H
+
+/* Define if you have the <varargs.h> header file.  */
+#undef HAVE_VARARGS_H
diff --git a/contrib/binutils/gas/config/i386coff.mt b/contrib/binutils/gas/config/i386coff.mt
new file mode 100644
index 000000000000..efda83365181
--- /dev/null
+++ b/contrib/binutils/gas/config/i386coff.mt
@@ -0,0 +1 @@
+TDEFINES=-DI386COFF
diff --git a/contrib/binutils/gas/config/sco5.mt b/contrib/binutils/gas/config/sco5.mt
new file mode 100644
index 000000000000..8879320c4e1e
--- /dev/null
+++ b/contrib/binutils/gas/config/sco5.mt
@@ -0,0 +1 @@
+TDEFINES=-DSCO_ELF
diff --git a/crypto/kerberosIV/install-sh b/contrib/binutils/install.sh
index ebc66913e940..4b883b386de2 100644..100755
--- a/crypto/kerberosIV/install-sh
+++ b/contrib/binutils/install.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 #
 # install - install a program, script, or datafile
 # This comes from X11R5 (mit/util/scripts/install.sh).
@@ -15,13 +15,9 @@
 # suitability of this software for any purpose.  It is provided "as is"
 # without express or implied warranty.
 #
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
 # This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
+# from scratch.
+#
 
 
 # set DOITPROG to echo to test this script
@@ -118,6 +114,7 @@ if [ x"$dir_arg" != x ]; then
 	
 	if [ -d $dst ]; then
 		instcmd=:
+		chmodcmd=""
 	else
 		instcmd=mkdir
 	fi
diff --git a/contrib/cvs/FREEBSD-upgrade b/contrib/cvs/FREEBSD-upgrade
index d40330c19d5d..02954fba8825 100644
--- a/contrib/cvs/FREEBSD-upgrade
+++ b/contrib/cvs/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/cvs/FREEBSD-upgrade,v 1.5.2.1 1999/12/13 20:56:22 peter Exp $
 
 MAINTAINER=	peter@FreeBSD.org
 
diff --git a/contrib/cvs/contrib/log.pl b/contrib/cvs/contrib/log.pl
index 676d6c9fbe16..a3212bb5bfc2 100644
--- a/contrib/cvs/contrib/log.pl
+++ b/contrib/cvs/contrib/log.pl
@@ -5,7 +5,7 @@
 #
 # XXX -- I HATE Perl!  This *will* be re-written in shell/awk/sed soon!
 #
-# $FreeBSD$
+# $FreeBSD: src/contrib/cvs/contrib/log.pl,v 1.2.2.2 1999/12/13 20:56:33 peter Exp $
 
 # Usage:  log.pl [[-m user] ...] [-s] -f logfile 'dirname file ...'
 #
diff --git a/contrib/cvs/diff/diff3.c b/contrib/cvs/diff/diff3.c
index c2997e92cb5f..cbb7e40dcdc2 100644
--- a/contrib/cvs/diff/diff3.c
+++ b/contrib/cvs/diff/diff3.c
@@ -13,7 +13,7 @@
 
    */
 /*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/diff/diff3.c,v 1.1.1.1.4.2 1999/12/13 20:56:37 peter Exp $
  */
 
 /* Written by Randy Smith */
diff --git a/contrib/cvs/lib/md5.h b/contrib/cvs/lib/md5.h
index 3b5ba05891f2..9ab1ea7141d0 100644
--- a/contrib/cvs/lib/md5.h
+++ b/contrib/cvs/lib/md5.h
@@ -1,7 +1,7 @@
 /* See md5.c for explanation and copyright information.  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/lib/md5.h,v 1.1.1.2.2.1 1999/12/13 20:56:48 peter Exp $
  */
 
 #ifndef MD5_H
diff --git a/contrib/cvs/man/cvs.1 b/contrib/cvs/man/cvs.1
index fe9e30a2e756..d1f1224bd36f 100644
--- a/contrib/cvs/man/cvs.1
+++ b/contrib/cvs/man/cvs.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/cvs/man/cvs.1,v 1.11.2.3 1999/12/13 20:56:50 peter Exp $
 .de Id
 .ds Rv \\$3
 .ds Dt \\$4
diff --git a/contrib/cvs/src/commit.c b/contrib/cvs/src/commit.c
index 6dfd4a80602e..260ce9e617aa 100644
--- a/contrib/cvs/src/commit.c
+++ b/contrib/cvs/src/commit.c
@@ -12,7 +12,7 @@
  *
  * The call is: cvs commit [options] files...
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/commit.c,v 1.5.2.2 1999/12/13 20:56:54 peter Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/cvs/src/cvs.h b/contrib/cvs/src/cvs.h
index b889c9a8501e..afe3174a3b91 100644
--- a/contrib/cvs/src/cvs.h
+++ b/contrib/cvs/src/cvs.h
@@ -9,7 +9,7 @@
 /*
  * basic information used in all source files
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/cvs.h,v 1.9.2.2 1999/12/13 20:56:56 peter Exp $
  */
 
 
diff --git a/contrib/cvs/src/diff.c b/contrib/cvs/src/diff.c
index 15353e63f61c..adade85c9047 100644
--- a/contrib/cvs/src/diff.c
+++ b/contrib/cvs/src/diff.c
@@ -13,7 +13,7 @@
  * Without any file arguments, runs diff against all the currently modified
  * files.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/diff.c,v 1.10.2.2 1999/12/13 20:56:56 peter Exp $
  */
 
 #include "cvs.h"
diff --git a/contrib/cvs/src/filesubr.c b/contrib/cvs/src/filesubr.c
index 83f7fb94665e..d87f239efd32 100644
--- a/contrib/cvs/src/filesubr.c
+++ b/contrib/cvs/src/filesubr.c
@@ -18,7 +18,7 @@
    file system semantics.  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/filesubr.c,v 1.2.2.2 1999/12/13 20:56:59 peter Exp $
  */
 
 #include "cvs.h"
diff --git a/contrib/cvs/src/import.c b/contrib/cvs/src/import.c
index a449842623c2..7c77ab2c34c9 100644
--- a/contrib/cvs/src/import.c
+++ b/contrib/cvs/src/import.c
@@ -15,7 +15,7 @@
  *
  * Additional arguments specify more Vendor Release Tags.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/import.c,v 1.5.2.2 1999/12/13 20:57:00 peter Exp $
  */
 
 #include "cvs.h"
diff --git a/contrib/cvs/src/lock.c b/contrib/cvs/src/lock.c
index a0c0a343ebd7..d1c08ee06f87 100644
--- a/contrib/cvs/src/lock.c
+++ b/contrib/cvs/src/lock.c
@@ -9,7 +9,7 @@
  * 
  * Lock file support for CVS.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/lock.c,v 1.6.2.1 1999/12/13 20:57:01 peter Exp $
  */
 
 /* The node Concurrency in doc/cvs.texinfo has a brief introduction to
diff --git a/contrib/cvs/src/login.c b/contrib/cvs/src/login.c
index 708dfc8d15d5..c7da8f8d80c9 100644
--- a/contrib/cvs/src/login.c
+++ b/contrib/cvs/src/login.c
@@ -6,7 +6,7 @@
  * 
  * Allow user to log in for an authenticating server.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/login.c,v 1.2.2.1 1999/12/13 20:57:02 peter Exp $
  */
 
 #include "cvs.h"
diff --git a/contrib/cvs/src/logmsg.c b/contrib/cvs/src/logmsg.c
index e1b8ed04e8b1..208a8028388f 100644
--- a/contrib/cvs/src/logmsg.c
+++ b/contrib/cvs/src/logmsg.c
@@ -5,7 +5,7 @@
  * You may distribute under the terms of the GNU General Public License as
  * specified in the README file that comes with the CVS source distribution.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/logmsg.c,v 1.5.2.1 1999/12/13 20:57:02 peter Exp $
  */
 
 #include "cvs.h"
diff --git a/contrib/cvs/src/main.c b/contrib/cvs/src/main.c
index 39bfaa2cc39c..a88c7aabd9aa 100644
--- a/contrib/cvs/src/main.c
+++ b/contrib/cvs/src/main.c
@@ -10,7 +10,7 @@
  * Credit to Dick Grune, Vrije Universiteit, Amsterdam, for writing
  * the shell-script CVS system that this is based on.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/main.c,v 1.15.2.2 1999/12/13 20:57:02 peter Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/cvs/src/mkmodules.c b/contrib/cvs/src/mkmodules.c
index 966fb3285e16..7fdeec2b9754 100644
--- a/contrib/cvs/src/mkmodules.c
+++ b/contrib/cvs/src/mkmodules.c
@@ -5,7 +5,7 @@
  * You may distribute under the terms of the GNU General Public License as
  * specified in the README file that comes with the CVS kit.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/mkmodules.c,v 1.7.2.2 1999/12/13 20:57:03 peter Exp $
  */
 
 #include "cvs.h"
diff --git a/contrib/cvs/src/prepend_args.c b/contrib/cvs/src/prepend_args.c
index 12322ce48bdf..64f89586f1b7 100644
--- a/contrib/cvs/src/prepend_args.c
+++ b/contrib/cvs/src/prepend_args.c
@@ -16,7 +16,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/cvs/src/prepend_args.c,v 1.2.2.1 1999/12/13 20:57:05 peter Exp $ */
 
 
 #ifdef HAVE_CONFIG_H
diff --git a/contrib/cvs/src/prepend_args.h b/contrib/cvs/src/prepend_args.h
index 6708442ec124..84b1d21a6c51 100644
--- a/contrib/cvs/src/prepend_args.h
+++ b/contrib/cvs/src/prepend_args.h
@@ -16,7 +16,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/cvs/src/prepend_args.h,v 1.1.2.1 1999/12/13 20:57:05 peter Exp $ */
 
 /* This code, taken from GNU Grep, originally used the "PARAM" macro, as the
    current GNU coding standards requires.  Older GNU code used the "PROTO"
diff --git a/contrib/cvs/src/rcs.c b/contrib/cvs/src/rcs.c
index 48be8e5ccb0a..ee7b9ac038e2 100644
--- a/contrib/cvs/src/rcs.c
+++ b/contrib/cvs/src/rcs.c
@@ -7,7 +7,7 @@
  * The routines contained in this file do all the rcs file parsing and
  * manipulation
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/rcs.c,v 1.16.2.2 1999/12/13 20:57:06 peter Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/cvs/src/rcs.h b/contrib/cvs/src/rcs.h
index 7aee90ac61ae..96a0a033515a 100644
--- a/contrib/cvs/src/rcs.h
+++ b/contrib/cvs/src/rcs.h
@@ -7,7 +7,7 @@
  * 
  * RCS source control definitions needed by rcs.c and friends
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/rcs.h,v 1.5.2.2 1999/12/13 20:57:07 peter Exp $
  */
 
 /* String which indicates a conflict if it occurs at the start of a line.  */
diff --git a/contrib/cvs/src/rcscmds.c b/contrib/cvs/src/rcscmds.c
index bcdffd5ad312..f49d946424e6 100644
--- a/contrib/cvs/src/rcscmds.c
+++ b/contrib/cvs/src/rcscmds.c
@@ -8,7 +8,7 @@
  * The functions in this file provide an interface for performing 
  * operations directly on RCS files. 
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/rcscmds.c,v 1.5.2.2 1999/12/13 20:57:07 peter Exp $
  */
 
 #include "cvs.h"
diff --git a/contrib/cvs/src/recurse.c b/contrib/cvs/src/recurse.c
index 209d324e44a7..cbb821f847d0 100644
--- a/contrib/cvs/src/recurse.c
+++ b/contrib/cvs/src/recurse.c
@@ -6,7 +6,7 @@
  * 
  * General recursion handler
  * 
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/recurse.c,v 1.4.2.2 1999/12/13 20:57:08 peter Exp $
  */
 
 #include "cvs.h"
diff --git a/contrib/cvs/src/server.c b/contrib/cvs/src/server.c
index 63fef8c74f0c..62718ebdd856 100644
--- a/contrib/cvs/src/server.c
+++ b/contrib/cvs/src/server.c
@@ -9,7 +9,7 @@
    GNU General Public License for more details.  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/server.c,v 1.11.2.2 1999/12/13 20:57:13 peter Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/cvs/src/update.c b/contrib/cvs/src/update.c
index 89e8323b9144..a109f1219fe7 100644
--- a/contrib/cvs/src/update.c
+++ b/contrib/cvs/src/update.c
@@ -32,7 +32,7 @@
  * directories added to the repository are automatically created and updated
  * as well.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/update.c,v 1.4.2.2 1999/12/13 20:57:15 peter Exp $
  */
 
 #include "cvs.h"
diff --git a/contrib/diff/diff.c b/contrib/diff/diff.c
index 2b2eec0236f2..d73235271b7a 100644
--- a/contrib/diff/diff.c
+++ b/contrib/diff/diff.c
@@ -20,7 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* GNU DIFF was written by Mike Haertel, David Hayes,
    Richard Stallman, Len Tower, and Paul Eggert.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/diff/diff.c,v 1.2.2.1 1999/12/08 06:33:18 obrien Exp $ */
 
 #define GDIFF_MAIN
 #include "diff.h"
diff --git a/contrib/diff/prepend_args.c b/contrib/diff/prepend_args.c
index 27f6da47403f..97fe15c9bc86 100644
--- a/contrib/diff/prepend_args.c
+++ b/contrib/diff/prepend_args.c
@@ -16,7 +16,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/diff/prepend_args.c,v 1.1.2.1 1999/12/08 06:33:20 obrien Exp $ */
 
 
 #ifdef HAVE_CONFIG_H
diff --git a/contrib/diff/prepend_args.h b/contrib/diff/prepend_args.h
index 3f72cc2fd112..e3d157a0afb5 100644
--- a/contrib/diff/prepend_args.h
+++ b/contrib/diff/prepend_args.h
@@ -16,6 +16,6 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/diff/prepend_args.h,v 1.1.2.1 1999/12/08 06:33:20 obrien Exp $ */
 
 void prepend_default_options PARAMS ((char const *, int *, char ***));
diff --git a/contrib/gcc/INSTALL b/contrib/gcc/INSTALL
new file mode 100644
index 000000000000..9577a45cd0de
--- /dev/null
+++ b/contrib/gcc/INSTALL
@@ -0,0 +1,1898 @@
+This file documents the installation of the GNU compiler.  Copyright
+(C) 1988, 1989, 1992, 1994, 1995 Free Software Foundation, Inc.  You
+may copy, distribute, and modify it freely as long as you preserve this
+copyright notice and permission notice.
+
+Installing GNU CC
+*****************
+
+   Here is the procedure for installing GNU CC on a Unix system.  See
+*Note VMS Install::, for VMS systems.  In this section we assume you
+compile in the same directory that contains the source files; see *Note
+Other Dir::, to find out how to compile in a separate directory on Unix
+systems.
+
+   You cannot install GNU C by itself on MSDOS; it will not compile
+under any MSDOS compiler except itself.  You need to get the complete
+compilation package DJGPP, which includes binaries as well as sources,
+and includes all the necessary compilation tools and libraries.
+
+  1. If you have built GNU CC previously in the same directory for a
+     different target machine, do `make distclean' to delete all files
+     that might be invalid.  One of the files this deletes is
+     `Makefile'; if `make distclean' complains that `Makefile' does not
+     exist, it probably means that the directory is already suitably
+     clean.
+
+  2. On a System V release 4 system, make sure `/usr/bin' precedes
+     `/usr/ucb' in `PATH'.  The `cc' command in `/usr/ucb' uses
+     libraries which have bugs.
+
+  3. Specify the host, build and target machine configurations.  You do
+     this by running the file `configure'.
+
+     The "build" machine is the system which you are using, the "host"
+     machine is the system where you want to run the resulting compiler
+     (normally the build machine), and the "target" machine is the
+     system for which you want the compiler to generate code.
+
+     If you are building a compiler to produce code for the machine it
+     runs on (a native compiler), you normally do not need to specify
+     any operands to `configure'; it will try to guess the type of
+     machine you are on and use that as the build, host and target
+     machines.  So you don't need to specify a configuration when
+     building a native compiler unless `configure' cannot figure out
+     what your configuration is or guesses wrong.
+
+     In those cases, specify the build machine's "configuration name"
+     with the `--build' option; the host and target will default to be
+     the same as the build machine.  (If you are building a
+     cross-compiler, see *Note Cross-Compiler::.)
+
+     Here is an example:
+
+          ./configure --build=sparc-sun-sunos4.1
+
+     A configuration name may be canonical or it may be more or less
+     abbreviated.
+
+     A canonical configuration name has three parts, separated by
+     dashes.  It looks like this: `CPU-COMPANY-SYSTEM'.  (The three
+     parts may themselves contain dashes; `configure' can figure out
+     which dashes serve which purpose.)  For example,
+     `m68k-sun-sunos4.1' specifies a Sun 3.
+
+     You can also replace parts of the configuration by nicknames or
+     aliases.  For example, `sun3' stands for `m68k-sun', so
+     `sun3-sunos4.1' is another way to specify a Sun 3.  You can also
+     use simply `sun3-sunos', since the version of SunOS is assumed by
+     default to be version 4.  `sun3-bsd' also works, since `configure'
+     knows that the only BSD variant on a Sun 3 is SunOS.
+
+     You can specify a version number after any of the system types,
+     and some of the CPU types.  In most cases, the version is
+     irrelevant, and will be ignored.  So you might as well specify the
+     version if you know it.
+
+     See *Note Configurations::, for a list of supported configuration
+     names and notes on many of the configurations.  You should check
+     the notes in that section before proceeding any further with the
+     installation of GNU CC.
+
+     There are four additional options you can specify independently to
+     describe variant hardware and software configurations.  These are
+     `--with-gnu-as', `--with-gnu-ld', `--with-stabs' and `--nfp'.
+
+    `--with-gnu-as'
+          If you will use GNU CC with the GNU assembler (GAS), you
+          should declare this by using the `--with-gnu-as' option when
+          you run `configure'.
+
+          Using this option does not install GAS.  It only modifies the
+          output of GNU CC to work with GAS.  Building and installing
+          GAS is up to you.
+
+          Conversely, if you *do not* wish to use GAS and do not specify
+          `--with-gnu-as' when building GNU CC, it is up to you to make
+          sure that GAS is not installed.  GNU CC searches for a
+          program named `as' in various directories; if the program it
+          finds is GAS, then it runs GAS.  If you are not sure where
+          GNU CC finds the assembler it is using, try specifying `-v'
+          when you run it.
+
+          The systems where it makes a difference whether you use GAS
+          are
+          `hppa1.0-ANY-ANY', `hppa1.1-ANY-ANY', `i386-ANY-sysv',
+          `i386-ANY-isc',
+          `i860-ANY-bsd', `m68k-bull-sysv', `m68k-hp-hpux',
+          `m68k-sony-bsd',
+          `m68k-altos-sysv', `m68000-hp-hpux', `m68000-att-sysv',
+          `ANY-lynx-lynxos', and `mips-ANY').  On any other system,
+          `--with-gnu-as' has no effect.
+
+          On the systems listed above (except for the HP-PA, for ISC on
+          the 386, and for `mips-sgi-irix5.*'), if you use GAS, you
+          should also use the GNU linker (and specify `--with-gnu-ld').
+
+    `--with-gnu-ld'
+          Specify the option `--with-gnu-ld' if you plan to use the GNU
+          linker with GNU CC.
+
+          This option does not cause the GNU linker to be installed; it
+          just modifies the behavior of GNU CC to work with the GNU
+          linker.  Specifically, it inhibits the installation of
+          `collect2', a program which otherwise serves as a front-end
+          for the system's linker on most configurations.
+
+    `--with-stabs'
+          On MIPS based systems and on Alphas, you must specify whether
+          you want GNU CC to create the normal ECOFF debugging format,
+          or to use BSD-style stabs passed through the ECOFF symbol
+          table.  The normal ECOFF debug format cannot fully handle
+          languages other than C.  BSD stabs format can handle other
+          languages, but it only works with the GNU debugger GDB.
+
+          Normally, GNU CC uses the ECOFF debugging format by default;
+          if you prefer BSD stabs, specify `--with-stabs' when you
+          configure GNU CC.
+
+          No matter which default you choose when you configure GNU CC,
+          the user can use the `-gcoff' and `-gstabs+' options to
+          specify explicitly the debug format for a particular
+          compilation.
+
+          `--with-stabs' is meaningful on the ISC system on the 386,
+          also, if `--with-gas' is used.  It selects use of stabs
+          debugging information embedded in COFF output.  This kind of
+          debugging information supports C++ well; ordinary COFF
+          debugging information does not.
+
+          `--with-stabs' is also meaningful on 386 systems running
+          SVR4.  It selects use of stabs debugging information embedded
+          in ELF output.  The C++ compiler currently (2.6.0) does not
+          support the DWARF debugging information normally used on 386
+          SVR4 platforms; stabs provide a workable alternative.  This
+          requires gas and gdb, as the normal SVR4 tools can not
+          generate or interpret stabs.
+
+    `--nfp'
+          On certain systems, you must specify whether the machine has
+          a floating point unit.  These systems include
+          `m68k-sun-sunosN' and `m68k-isi-bsd'.  On any other system,
+          `--nfp' currently has no effect, though perhaps there are
+          other systems where it could usefully make a difference.
+
+     The `configure' script searches subdirectories of the source
+     directory for other compilers that are to be integrated into GNU
+     CC.  The GNU compiler for C++, called G++ is in a subdirectory
+     named `cp'.  `configure' inserts rules into `Makefile' to build
+     all of those compilers.
+
+     Here we spell out what files will be set up by `configure'.
+     Normally you need not be concerned with these files.
+
+        * A file named `config.h' is created that contains a `#include'
+          of the top-level config file for the machine you will run the
+          compiler on (*note The Configuration File:
+          (gcc.info)Config.).  This file is responsible for defining
+          information about the host machine.  It includes `tm.h'.
+
+          The top-level config file is located in the subdirectory
+          `config'.  Its name is always `xm-SOMETHING.h'; usually
+          `xm-MACHINE.h', but there are some exceptions.
+
+          If your system does not support symbolic links, you might
+          want to set up `config.h' to contain a `#include' command
+          which refers to the appropriate file.
+
+        * A file named `tconfig.h' is created which includes the
+          top-level config file for your target machine.  This is used
+          for compiling certain programs to run on that machine.
+
+        * A file named `tm.h' is created which includes the
+          machine-description macro file for your target machine.  It
+          should be in the subdirectory `config' and its name is often
+          `MACHINE.h'.
+
+        * The command file `configure' also constructs the file
+          `Makefile' by adding some text to the template file
+          `Makefile.in'.  The additional text comes from files in the
+          `config' directory, named `t-TARGET' and `x-HOST'.  If these
+          files do not exist, it means nothing needs to be added for a
+          given target or host.
+
+  4. The standard directory for installing GNU CC is `/usr/local/lib'.
+     If you want to install its files somewhere else, specify
+     `--prefix=DIR' when you run `configure'.  Here DIR is a directory
+     name to use instead of `/usr/local' for all purposes with one
+     exception: the directory `/usr/local/include' is searched for
+     header files no matter where you install the compiler.  To override
+     this name, use the `--local-prefix' option below.
+
+  5. Specify `--local-prefix=DIR' if you want the compiler to search
+     directory `DIR/include' for locally installed header files
+     *instead* of `/usr/local/include'.
+
+     You should specify `--local-prefix' *only* if your site has a
+     different convention (not `/usr/local') for where to put
+     site-specific files.
+
+     *Do not* specify `/usr' as the `--local-prefix'!  The directory
+     you use for `--local-prefix' *must not* contain any of the
+     system's standard header files.  If it did contain them, certain
+     programs would be miscompiled (including GNU Emacs, on certain
+     targets), because this would override and nullify the header file
+     corrections made by the `fixincludes' script.
+
+  6. Make sure the Bison parser generator is installed.  (This is
+     unnecessary if the Bison output files `c-parse.c' and `cexp.c' are
+     more recent than `c-parse.y' and `cexp.y' and you do not plan to
+     change the `.y' files.)
+
+     Bison versions older than Sept 8, 1988 will produce incorrect
+     output for `c-parse.c'.
+
+  7. If you have chosen a configuration for GNU CC which requires other
+     GNU tools (such as GAS or the GNU linker) instead of the standard
+     system tools, install the required tools in the build directory
+     under the names `as', `ld' or whatever is appropriate.  This will
+     enable the compiler to find the proper tools for compilation of
+     the program `enquire'.
+
+     Alternatively, you can do subsequent compilation using a value of
+     the `PATH' environment variable such that the necessary GNU tools
+     come before the standard system tools.
+
+  8. Build the compiler.  Just type `make LANGUAGES=c' in the compiler
+     directory.
+
+     `LANGUAGES=c' specifies that only the C compiler should be
+     compiled.  The makefile normally builds compilers for all the
+     supported languages; currently, C, C++ and Objective C.  However,
+     C is the only language that is sure to work when you build with
+     other non-GNU C compilers.  In addition, building anything but C
+     at this stage is a waste of time.
+
+     In general, you can specify the languages to build by typing the
+     argument `LANGUAGES="LIST"', where LIST is one or more words from
+     the list `c', `c++', and `objective-c'.  If you have any
+     additional GNU compilers as subdirectories of the GNU CC source
+     directory, you may also specify their names in this list.
+
+     Ignore any warnings you may see about "statement not reached" in
+     `insn-emit.c'; they are normal.  Also, warnings about "unknown
+     escape sequence" are normal in `genopinit.c' and perhaps some
+     other files.  Likewise, you should ignore warnings about "constant
+     is so large that it is unsigned" in `insn-emit.c' and
+     `insn-recog.c' and a warning about a comparison always being zero
+     in `enquire.o'.  Any other compilation errors may represent bugs in
+     the port to your machine or operating system, and should be
+     investigated and reported.
+
+     Some commercial compilers fail to compile GNU CC because they have
+     bugs or limitations.  For example, the Microsoft compiler is said
+     to run out of macro space.  Some Ultrix compilers run out of
+     expression space; then you need to break up the statement where
+     the problem happens.
+
+  9. If you are building a cross-compiler, stop here.  *Note
+     Cross-Compiler::.
+
+ 10. Move the first-stage object files and executables into a
+     subdirectory with this command:
+
+          make stage1
+
+     The files are moved into a subdirectory named `stage1'.  Once
+     installation is complete, you may wish to delete these files with
+     `rm -r stage1'.
+
+ 11. If you have chosen a configuration for GNU CC which requires other
+     GNU tools (such as GAS or the GNU linker) instead of the standard
+     system tools, install the required tools in the `stage1'
+     subdirectory under the names `as', `ld' or whatever is
+     appropriate.  This will enable the stage 1 compiler to find the
+     proper tools in the following stage.
+
+     Alternatively, you can do subsequent compilation using a value of
+     the `PATH' environment variable such that the necessary GNU tools
+     come before the standard system tools.
+
+ 12. Recompile the compiler with itself, with this command:
+
+          make CC="stage1/xgcc -Bstage1/" CFLAGS="-g -O2"
+
+     This is called making the stage 2 compiler.
+
+     The command shown above builds compilers for all the supported
+     languages.  If you don't want them all, you can specify the
+     languages to build by typing the argument `LANGUAGES="LIST"'.  LIST
+     should contain one or more words from the list `c', `c++',
+     `objective-c', and `proto'.  Separate the words with spaces.
+     `proto' stands for the programs `protoize' and `unprotoize'; they
+     are not a separate language, but you use `LANGUAGES' to enable or
+     disable their installation.
+
+     If you are going to build the stage 3 compiler, then you might
+     want to build only the C language in stage 2.
+
+     Once you have built the stage 2 compiler, if you are short of disk
+     space, you can delete the subdirectory `stage1'.
+
+     On a 68000 or 68020 system lacking floating point hardware, unless
+     you have selected a `tm.h' file that expects by default that there
+     is no such hardware, do this instead:
+
+          make CC="stage1/xgcc -Bstage1/" CFLAGS="-g -O2 -msoft-float"
+
+ 13. If you wish to test the compiler by compiling it with itself one
+     more time, install any other necessary GNU tools (such as GAS or
+     the GNU linker) in the `stage2' subdirectory as you did in the
+     `stage1' subdirectory, then do this:
+
+          make stage2
+          make CC="stage2/xgcc -Bstage2/" CFLAGS="-g -O2"
+
+     This is called making the stage 3 compiler.  Aside from the `-B'
+     option, the compiler options should be the same as when you made
+     the stage 2 compiler.  But the `LANGUAGES' option need not be the
+     same.  The command shown above builds compilers for all the
+     supported languages; if you don't want them all, you can specify
+     the languages to build by typing the argument `LANGUAGES="LIST"',
+     as described above.
+
+     If you do not have to install any additional GNU tools, you may
+     use the command
+
+          make bootstrap LANGUAGES=LANGUAGE-LIST BOOT_CFLAGS=OPTION-LIST
+
+     instead of making `stage1', `stage2', and performing the two
+     compiler builds.
+
+ 14. Then compare the latest object files with the stage 2 object
+     files--they ought to be identical, aside from time stamps (if any).
+
+     On some systems, meaningful comparison of object files is
+     impossible; they always appear "different."  This is currently
+     true on Solaris and some systems that use ELF object file format.
+     On some versions of Irix on SGI machines and DEC Unix (OSF/1) on
+     Alpha systems, you will not be able to compare the files without
+     specifying `-save-temps'; see the description of individual
+     systems above to see if you get comparison failures.  You may have
+     similar problems on other systems.
+
+     Use this command to compare the files:
+
+          make compare
+
+     This will mention any object files that differ between stage 2 and
+     stage 3.  Any difference, no matter how innocuous, indicates that
+     the stage 2 compiler has compiled GNU CC incorrectly, and is
+     therefore a potentially serious bug which you should investigate
+     and report.
+
+     If your system does not put time stamps in the object files, then
+     this is a faster way to compare them (using the Bourne shell):
+
+          for file in *.o; do
+          cmp $file stage2/$file
+          done
+
+     If you have built the compiler with the `-mno-mips-tfile' option on
+     MIPS machines, you will not be able to compare the files.
+
+ 15. Install the compiler driver, the compiler's passes and run-time
+     support with `make install'.  Use the same value for `CC',
+     `CFLAGS' and `LANGUAGES' that you used when compiling the files
+     that are being installed.  One reason this is necessary is that
+     some versions of Make have bugs and recompile files gratuitously
+     when you do this step.  If you use the same variable values, those
+     files will be recompiled properly.
+
+     For example, if you have built the stage 2 compiler, you can use
+     the following command:
+
+          make install CC="stage2/xgcc -Bstage2/" CFLAGS="-g -O" LANGUAGES="LIST"
+
+     This copies the files `cc1', `cpp' and `libgcc.a' to files `cc1',
+     `cpp' and `libgcc.a' in the directory
+     `/usr/local/lib/gcc-lib/TARGET/VERSION', which is where the
+     compiler driver program looks for them.  Here TARGET is the target
+     machine type specified when you ran `configure', and VERSION is
+     the version number of GNU CC.  This naming scheme permits various
+     versions and/or cross-compilers to coexist.
+
+     This also copies the driver program `xgcc' into
+     `/usr/local/bin/gcc', so that it appears in typical execution
+     search paths.
+
+     On some systems, this command causes recompilation of some files.
+     This is usually due to bugs in `make'.  You should either ignore
+     this problem, or use GNU Make.
+
+     *Warning: there is a bug in `alloca' in the Sun library.  To avoid
+     this bug, be sure to install the executables of GNU CC that were
+     compiled by GNU CC.  (That is, the executables from stage 2 or 3,
+     not stage 1.)  They use `alloca' as a built-in function and never
+     the one in the library.*
+
+     (It is usually better to install GNU CC executables from stage 2
+     or 3, since they usually run faster than the ones compiled with
+     some other compiler.)
+
+ 16. If you're going to use C++, it's likely that you need to also
+     install the libg++ distribution.  It should be available from the
+     same place where you got the GNU C distribution.  Just as GNU C
+     does not distribute a C runtime library, it also does not include
+     a C++ run-time library.  All I/O functionality, special class
+     libraries, etc., are available in the libg++ distribution.
+
+Configurations Supported by GNU CC
+==================================
+
+   Here are the possible CPU types:
+
+     1750a, a29k, alpha, arm, cN, clipper, dsp16xx, elxsi, h8300,
+     hppa1.0, hppa1.1, i370, i386, i486, i586, i860, i960, m68000, m68k,
+     m88k, mips, mipsel, mips64, mips64el, ns32k, powerpc, powerpcle,
+     pyramid, romp, rs6000, sh, sparc, sparclite, sparc64, vax, we32k.
+
+   Here are the recognized company names.  As you can see, customary
+abbreviations are used rather than the longer official names.
+
+     acorn, alliant, altos, apollo, att, bull, cbm, convergent, convex,
+     crds, dec, dg, dolphin, elxsi, encore, harris, hitachi, hp, ibm,
+     intergraph, isi, mips, motorola, ncr, next, ns, omron, plexus,
+     sequent, sgi, sony, sun, tti, unicom, wrs.
+
+   The company name is meaningful only to disambiguate when the rest of
+the information supplied is insufficient.  You can omit it, writing
+just `CPU-SYSTEM', if it is not needed.  For example, `vax-ultrix4.2'
+is equivalent to `vax-dec-ultrix4.2'.
+
+   Here is a list of system types:
+
+     386bsd, aix, acis, amigados, aos, aout, bosx, bsd, clix, coff,
+     ctix, cxux, dgux, dynix, ebmon, ecoff, elf, esix, freebsd, hms,
+     genix, gnu, gnu/linux, hiux, hpux, iris, irix, isc, luna, lynxos,
+     mach, minix, msdos, mvs, netbsd, newsos, nindy, ns, osf, osfrose,
+     ptx, riscix, riscos, rtu, sco, sim, solaris, sunos, sym, sysv,
+     udi, ultrix, unicos, uniplus, unos, vms, vsta, vxworks, winnt,
+     xenix.
+
+You can omit the system type; then `configure' guesses the operating
+system from the CPU and company.
+
+   You can add a version number to the system type; this may or may not
+make a difference.  For example, you can write `bsd4.3' or `bsd4.4' to
+distinguish versions of BSD.  In practice, the version number is most
+needed for `sysv3' and `sysv4', which are often treated differently.
+
+   If you specify an impossible combination such as `i860-dg-vms', then
+you may get an error message from `configure', or it may ignore part of
+the information and do the best it can with the rest.  `configure'
+always prints the canonical name for the alternative that it used.  GNU
+CC does not support all possible alternatives.
+
+   Often a particular model of machine has a name.  Many machine names
+are recognized as aliases for CPU/company combinations.  Thus, the
+machine name `sun3', mentioned above, is an alias for `m68k-sun'.
+Sometimes we accept a company name as a machine name, when the name is
+popularly used for a particular machine.  Here is a table of the known
+machine names:
+
+     3300, 3b1, 3bN, 7300, altos3068, altos, apollo68, att-7300,
+     balance, convex-cN, crds, decstation-3100, decstation, delta,
+     encore, fx2800, gmicro, hp7NN, hp8NN, hp9k2NN, hp9k3NN, hp9k7NN,
+     hp9k8NN, iris4d, iris, isi68, m3230, magnum, merlin, miniframe,
+     mmax, news-3600, news800, news, next, pbd, pc532, pmax, powerpc,
+     powerpcle, ps2, risc-news, rtpc, sun2, sun386i, sun386, sun3,
+     sun4, symmetry, tower-32, tower.
+
+Remember that a machine name specifies both the cpu type and the company
+name.  If you want to install your own homemade configuration files,
+you can use `local' as the company name to access them.  If you use
+configuration `CPU-local', the configuration name without the cpu prefix
+is used to form the configuration file names.
+
+   Thus, if you specify `m68k-local', configuration uses files
+`m68k.md', `local.h', `m68k.c', `xm-local.h', `t-local', and `x-local',
+all in the directory `config/m68k'.
+
+   Here is a list of configurations that have special treatment or
+special things you must know:
+
+`1750a-*-*'
+     MIL-STD-1750A processors.
+
+     Starting with GCC 2.6.1, the MIL-STD-1750A cross configuration no
+     longer supports the Tektronix Assembler, but instead produces
+     output for `as1750', an assembler/linker available under the GNU
+     Public License for the 1750A. Contact *kellogg@space.otn.dasa.de*
+     for more details on obtaining `as1750'.  A similarly licensed
+     simulator for the 1750A is available from same address.
+
+     You should ignore a fatal error during the building of libgcc
+     (libgcc is not yet implemented for the 1750A.)
+
+     The `as1750' assembler requires the file `ms1750.inc', which is
+     found in the directory `config/1750a'.
+
+     GNU CC produced the same sections as the Fairchild F9450 C
+     Compiler, namely:
+
+    `Normal'
+          The program code section.
+
+    `Static'
+          The read/write (RAM) data section.
+
+    `Konst'
+          The read-only (ROM) constants section.
+
+    `Init'
+          Initialization section (code to copy KREL to SREL).
+
+     The smallest addressable unit is 16 bits (BITS_PER_UNIT is 16).
+     This means that type `char' is represented with a 16-bit word per
+     character.  The 1750A's "Load/Store Upper/Lower Byte" instructions
+     are not used by GNU CC.
+
+`alpha-*-osf1'
+     Systems using processors that implement the DEC Alpha architecture
+     and are running the DEC Unix (OSF/1) operating system, for example
+     the DEC Alpha AXP systems.  (VMS on the Alpha is not currently
+     supported by GNU CC.)
+
+     GNU CC writes a `.verstamp' directive to the assembler output file
+     unless it is built as a cross-compiler.  It gets the version to
+     use from the system header file `/usr/include/stamp.h'.  If you
+     install a new version of DEC Unix, you should rebuild GCC to pick
+     up the new version stamp.
+
+     Note that since the Alpha is a 64-bit architecture,
+     cross-compilers from 32-bit machines will not generate code as
+     efficient as that generated when the compiler is running on a
+     64-bit machine because many optimizations that depend on being
+     able to represent a word on the target in an integral value on the
+     host cannot be performed.  Building cross-compilers on the Alpha
+     for 32-bit machines has only been tested in a few cases and may
+     not work properly.
+
+     `make compare' may fail on old versions of DEC Unix unless you add
+     `-save-temps' to `CFLAGS'.  On these systems, the name of the
+     assembler input file is stored in the object file, and that makes
+     comparison fail if it differs between the `stage1' and `stage2'
+     compilations.  The option `-save-temps' forces a fixed name to be
+     used for the assembler input file, instead of a randomly chosen
+     name in `/tmp'.  Do not add `-save-temps' unless the comparisons
+     fail without that option.  If you add `-save-temps', you will have
+     to manually delete the `.i' and `.s' files after each series of
+     compilations.
+
+     GNU CC now supports both the native (ECOFF) debugging format used
+     by DBX and GDB and an encapsulated STABS format for use only with
+     GDB.  See the discussion of the `--with-stabs' option of
+     `configure' above for more information on these formats and how to
+     select them.
+
+     There is a bug in DEC's assembler that produces incorrect line
+     numbers for ECOFF format when the `.align' directive is used.  To
+     work around this problem, GNU CC will not emit such alignment
+     directives while writing ECOFF format debugging information even
+     if optimization is being performed.  Unfortunately, this has the
+     very undesirable side-effect that code addresses when `-O' is
+     specified are different depending on whether or not `-g' is also
+     specified.
+
+     To avoid this behavior, specify `-gstabs+' and use GDB instead of
+     DBX.  DEC is now aware of this problem with the assembler and
+     hopes to provide a fix shortly.
+
+`arm'
+     Advanced RISC Machines ARM-family processors.  These are often
+     used in embedded applications.  There are no standard Unix
+     configurations.  This configuration corresponds to the basic
+     instruction sequences and will produce a.out format object modules.
+
+     You may need to make a variant of the file `arm.h' for your
+     particular configuration.
+
+`arm-*-riscix'
+     The ARM2 or ARM3 processor running RISC iX, Acorn's port of BSD
+     Unix.  If you are running a version of RISC iX prior to 1.2 then
+     you must specify the version number during configuration.  Note
+     that the assembler shipped with RISC iX does not support stabs
+     debugging information; a new version of the assembler, with stabs
+     support included, is now available from Acorn.
+
+`a29k'
+     AMD Am29k-family processors.  These are normally used in embedded
+     applications.  There are no standard Unix configurations.  This
+     configuration corresponds to AMD's standard calling sequence and
+     binary interface and is compatible with other 29k tools.
+
+     You may need to make a variant of the file `a29k.h' for your
+     particular configuration.
+
+`a29k-*-bsd'
+     AMD Am29050 used in a system running a variant of BSD Unix.
+
+`decstation-*'
+     DECstations can support three different personalities: Ultrix, DEC
+     OSF/1, and OSF/rose.  To configure GCC for these platforms use the
+     following configurations:
+
+    `decstation-ultrix'
+          Ultrix configuration.
+
+    `decstation-osf1'
+          Dec's version of OSF/1.
+
+    `decstation-osfrose'
+          Open Software Foundation reference port of OSF/1 which uses
+          the OSF/rose object file format instead of ECOFF.  Normally,
+          you would not select this configuration.
+
+     The MIPS C compiler needs to be told to increase its table size
+     for switch statements with the `-Wf,-XNg1500' option in order to
+     compile `cp/parse.c'.  If you use the `-O2' optimization option,
+     you also need to use `-Olimit 3000'.  Both of these options are
+     automatically generated in the `Makefile' that the shell script
+     `configure' builds.  If you override the `CC' make variable and
+     use the MIPS compilers, you may need to add `-Wf,-XNg1500 -Olimit
+     3000'.
+
+`elxsi-elxsi-bsd'
+     The Elxsi's C compiler has known limitations that prevent it from
+     compiling GNU C.  Please contact `mrs@cygnus.com' for more details.
+
+`dsp16xx'
+     A port to the AT&T DSP1610 family of processors.
+
+`h8300-*-*'
+     The calling convention and structure layout has changed in release
+     2.6.  All code must be recompiled.  The calling convention now
+     passes the first three arguments in function calls in registers.
+     Structures are no longer a multiple of 2 bytes.
+
+`hppa*-*-*'
+     There are several variants of the HP-PA processor which run a
+     variety of operating systems.  GNU CC must be configured to use
+     the correct processor type and operating system, or GNU CC will
+     not function correctly.  The easiest way to handle this problem is
+     to *not* specify a target when configuring GNU CC, the `configure'
+     script will try to automatically determine the right processor
+     type and operating system.
+
+     `-g' does not work on HP-UX, since that system uses a peculiar
+     debugging format which GNU CC does not know about.  However, `-g'
+     will work if you also use GAS and GDB in conjunction with GCC.  We
+     highly recommend using GAS for all HP-PA configurations.
+
+     You should be using GAS-2.6 (or later) along with GDB-4.16 (or
+     later).  These can be retrieved from all the traditional GNU ftp
+     archive sites.
+
+     GAS will need to be installed into a directory before `/bin',
+     `/usr/bin', and `/usr/ccs/bin' in your search path.  You should
+     install GAS before you build GNU CC.
+
+     To enable debugging, you must configure GNU CC with the
+     `--with-gnu-as' option before building.
+
+`i370-*-*'
+     This port is very preliminary and has many known bugs.  We hope to
+     have a higher-quality port for this machine soon.
+
+`i386-*-linuxoldld'
+     Use this configuration to generate a.out binaries on Linux-based
+     GNU systems, if you do not have gas/binutils version 2.5.2 or later
+     installed.  This is an obsolete configuration.
+
+`i386-*-linuxaout'
+     Use this configuration to generate a.out binaries on Linux-based
+     GNU systems.  This configuration is being superseded.  You must use
+     gas/binutils version 2.5.2 or later.
+
+`i386-*-linux-gnulibc1'
+     Use this configuration to generate ELF binaries on Linux-based GNU
+     systems using the Linux libc version 5.  You must use gas/binutils
+     version 2.5.2 or later.
+
+`i386-*-linux'
+     Use this configuration to generate ELF binaries on Linux-based GNU
+     systems using glibc 2.  You must use gas/binutils version 2.8.1 or
+     later.
+
+`i386-*-sco'
+     Compilation with RCC is recommended.  Also, it may be a good idea
+     to link with GNU malloc instead of the malloc that comes with the
+     system.
+
+`i386-*-sco3.2v4'
+     Use this configuration for SCO release 3.2 version 4.
+
+`i386-*-isc'
+     It may be a good idea to link with GNU malloc instead of the
+     malloc that comes with the system.
+
+     In ISC version 4.1, `sed' core dumps when building `deduced.h'.
+     Use the version of `sed' from version 4.0.
+
+`i386-*-esix'
+     It may be good idea to link with GNU malloc instead of the malloc
+     that comes with the system.
+
+`i386-ibm-aix'
+     You need to use GAS version 2.1 or later, and and LD from GNU
+     binutils version 2.2 or later.
+
+`i386-sequent-bsd'
+     Go to the Berkeley universe before compiling.  In addition, you
+     probably need to create a file named `string.h' containing just
+     one line: `#include <strings.h>'.
+
+`i386-sequent-ptx1*'
+     Sequent DYNIX/ptx 1.x.
+
+`i386-sequent-ptx2*'
+     Sequent DYNIX/ptx 2.x.
+
+`i386-sun-sunos4'
+     You may find that you need another version of GNU CC to begin
+     bootstrapping with, since the current version when built with the
+     system's own compiler seems to get an infinite loop compiling part
+     of `libgcc2.c'.  GNU CC version 2 compiled with GNU CC (any
+     version) seems not to have this problem.
+
+     See *Note Sun Install::, for information on installing GNU CC on
+     Sun systems.
+
+`i[345]86-*-winnt3.5'
+     This version requires a GAS that has not let been released.  Until
+     it is, you can get a prebuilt binary version via anonymous ftp from
+     `cs.washington.edu:pub/gnat' or `cs.nyu.edu:pub/gnat'. You must
+     also use the Microsoft header files from the Windows NT 3.5 SDK.
+     Find these on the CDROM in the `/mstools/h' directory dated
+     9/4/94.  You must use a fixed version of Microsoft linker made
+     especially for NT 3.5, which is also is available on the NT 3.5
+     SDK CDROM.  If you do not have this linker, can you also use the
+     linker from Visual C/C++ 1.0 or 2.0.
+
+     Installing GNU CC for NT builds a wrapper linker, called `ld.exe',
+     which mimics the behaviour of Unix `ld' in the specification of
+     libraries (`-L' and `-l').  `ld.exe' looks for both Unix and
+     Microsoft named libraries.  For example, if you specify `-lfoo',
+     `ld.exe' will look first for `libfoo.a' and then for `foo.lib'.
+
+     You may install GNU CC for Windows NT in one of two ways,
+     depending on whether or not you have a Unix-like shell and various
+     Unix-like utilities.
+
+       1. If you do not have a Unix-like shell and few Unix-like
+          utilities, you will use a DOS style batch script called
+          `configure.bat'.  Invoke it as `configure winnt' from an
+          MSDOS console window or from the program manager dialog box.
+          `configure.bat' assumes you have already installed and have
+          in your path a Unix-like `sed' program which is used to
+          create a working `Makefile' from `Makefile.in'.
+
+          `Makefile' uses the Microsoft Nmake program maintenance
+          utility and the Visual C/C++ V8.00 compiler to build GNU CC.
+          You need only have the utilities `sed' and `touch' to use
+          this installation method, which only automatically builds the
+          compiler itself.  You must then examine what `fixinc.winnt'
+          does, edit the header files by hand and build `libgcc.a'
+          manually.
+
+       2. The second type of installation assumes you are running a
+          Unix-like shell, have a complete suite of Unix-like utilities
+          in your path, and have a previous version of GNU CC already
+          installed, either through building it via the above
+          installation method or acquiring a pre-built binary.  In this
+          case, use the `configure' script in the normal fashion.
+
+`i860-intel-osf1'
+     This is the Paragon.  If you have version 1.0 of the operating
+     system, you need to take special steps to build GNU CC due to
+     peculiarities of the system.  Newer system versions have no
+     problem.  See the section `Installation Problems' in the GNU CC
+     Manual.
+
+`*-lynx-lynxos'
+     LynxOS 2.2 and earlier comes with GNU CC 1.x already installed as
+     `/bin/gcc'.  You should compile with this instead of `/bin/cc'.
+     You can tell GNU CC to use the GNU assembler and linker, by
+     specifying `--with-gnu-as --with-gnu-ld' when configuring.  These
+     will produce COFF format object files and executables;  otherwise
+     GNU CC will use the installed tools, which produce a.out format
+     executables.
+
+`m68000-hp-bsd'
+     HP 9000 series 200 running BSD.  Note that the C compiler that
+     comes with this system cannot compile GNU CC; contact
+     `law@cs.utah.edu' to get binaries of GNU CC for bootstrapping.
+
+`m68k-*-linuxaout'
+     Use this configuration to generate a.out binaries on Linux. This
+     configuration is being superseded. You must use gas/binutils
+     version 2.5.2 or later.
+
+`m68k-*-linux-gnulibc1'
+     Use this configuration to generate ELF binaries on Linux with the
+     Linux C library 5.x.x. You must use gas/binutils version 2.8.1
+     later.
+
+`m68k-*-linux'
+     Use this configuration to generate ELF binaries on Linux-based GNU
+     systems with the GNU C library 2. You must use gas/binutils version
+     2.8.1 or later.
+
+`m68k-altos'
+     Altos 3068.  You must use the GNU assembler, linker and debugger.
+     Also, you must fix a kernel bug.  Details in the file
+     `README.ALTOS'.
+
+`m68k-att-sysv'
+     AT&T 3b1, a.k.a. 7300 PC.  Special procedures are needed to
+     compile GNU CC with this machine's standard C compiler, due to
+     bugs in that compiler.  You can bootstrap it more easily with
+     previous versions of GNU CC if you have them.
+
+     Installing GNU CC on the 3b1 is difficult if you do not already
+     have GNU CC running, due to bugs in the installed C compiler.
+     However, the following procedure might work.  We are unable to
+     test it.
+
+       1. Comment out the `#include "config.h"' line on line 37 of
+          `cccp.c' and do `make cpp'.  This makes a preliminary version
+          of GNU cpp.
+
+       2. Save the old `/lib/cpp' and copy the preliminary GNU cpp to
+          that file name.
+
+       3. Undo your change in `cccp.c', or reinstall the original
+          version, and do `make cpp' again.
+
+       4. Copy this final version of GNU cpp into `/lib/cpp'.
+
+       5. Replace every occurrence of `obstack_free' in the file
+          `tree.c' with `_obstack_free'.
+
+       6. Run `make' to get the first-stage GNU CC.
+
+       7. Reinstall the original version of `/lib/cpp'.
+
+       8. Now you can compile GNU CC with itself and install it in the
+          normal fashion.
+
+`m68k-bull-sysv'
+     Bull DPX/2 series 200 and 300 with BOS-2.00.45 up to BOS-2.01. GNU
+     CC works either with native assembler or GNU assembler. You can use
+     GNU assembler with native coff generation by providing
+     `--with-gnu-as' to the configure script or use GNU assembler with
+     dbx-in-coff encapsulation by providing `--with-gnu-as --stabs'.
+     For any problem with native assembler or for availability of the
+     DPX/2 port of GAS, contact `F.Pierresteguy@frcl.bull.fr'.
+
+`m68k-crds-unox'
+     Use `configure unos' for building on Unos.
+
+     The Unos assembler is named `casm' instead of `as'.  For some
+     strange reason linking `/bin/as' to `/bin/casm' changes the
+     behavior, and does not work.  So, when installing GNU CC, you
+     should install the following script as `as' in the subdirectory
+     where the passes of GCC are installed:
+
+          #!/bin/sh
+          casm $*
+
+     The default Unos library is named `libunos.a' instead of `libc.a'.
+     To allow GNU CC to function, either change all references to
+     `-lc' in `gcc.c' to `-lunos' or link `/lib/libc.a' to
+     `/lib/libunos.a'.
+
+     When compiling GNU CC with the standard compiler, to overcome bugs
+     in the support of `alloca', do not use `-O' when making stage 2.
+     Then use the stage 2 compiler with `-O' to make the stage 3
+     compiler.  This compiler will have the same characteristics as the
+     usual stage 2 compiler on other systems.  Use it to make a stage 4
+     compiler and compare that with stage 3 to verify proper
+     compilation.
+
+     (Perhaps simply defining `ALLOCA' in `x-crds' as described in the
+     comments there will make the above paragraph superfluous.  Please
+     inform us of whether this works.)
+
+     Unos uses memory segmentation instead of demand paging, so you
+     will need a lot of memory.  5 Mb is barely enough if no other
+     tasks are running.  If linking `cc1' fails, try putting the object
+     files into a library and linking from that library.
+
+`m68k-hp-hpux'
+     HP 9000 series 300 or 400 running HP-UX.  HP-UX version 8.0 has a
+     bug in the assembler that prevents compilation of GNU CC.  To fix
+     it, get patch PHCO_4484 from HP.
+
+     In addition, if you wish to use gas `--with-gnu-as' you must use
+     gas version 2.1 or later, and you must use the GNU linker version
+     2.1 or later.  Earlier versions of gas relied upon a program which
+     converted the gas output into the native HP/UX format, but that
+     program has not been kept up to date.  gdb does not understand
+     that native HP/UX format, so you must use gas if you wish to use
+     gdb.
+
+`m68k-sun'
+     Sun 3.  We do not provide a configuration file to use the Sun FPA
+     by default, because programs that establish signal handlers for
+     floating point traps inherently cannot work with the FPA.
+
+     See *Note Sun Install::, for information on installing GNU CC on
+     Sun systems.
+
+`m88k-*-svr3'
+     Motorola m88k running the AT&T/Unisoft/Motorola V.3 reference port.
+     These systems tend to use the Green Hills C, revision 1.8.5, as the
+     standard C compiler.  There are apparently bugs in this compiler
+     that result in object files differences between stage 2 and stage
+     3.  If this happens, make the stage 4 compiler and compare it to
+     the stage 3 compiler.  If the stage 3 and stage 4 object files are
+     identical, this suggests you encountered a problem with the
+     standard C compiler; the stage 3 and 4 compilers may be usable.
+
+     It is best, however, to use an older version of GNU CC for
+     bootstrapping if you have one.
+
+`m88k-*-dgux'
+     Motorola m88k running DG/UX.  To build 88open BCS native or cross
+     compilers on DG/UX, specify the configuration name as
+     `m88k-*-dguxbcs' and build in the 88open BCS software development
+     environment.  To build ELF native or cross compilers on DG/UX,
+     specify `m88k-*-dgux' and build in the DG/UX ELF development
+     environment.  You set the software development environment by
+     issuing `sde-target' command and specifying either `m88kbcs' or
+     `m88kdguxelf' as the operand.
+
+     If you do not specify a configuration name, `configure' guesses the
+     configuration based on the current software development
+     environment.
+
+`m88k-tektronix-sysv3'
+     Tektronix XD88 running UTekV 3.2e.  Do not turn on optimization
+     while building stage1 if you bootstrap with the buggy Green Hills
+     compiler.  Also, The bundled LAI System V NFS is buggy so if you
+     build in an NFS mounted directory, start from a fresh reboot, or
+     avoid NFS all together.  Otherwise you may have trouble getting
+     clean comparisons between stages.
+
+`mips-mips-bsd'
+     MIPS machines running the MIPS operating system in BSD mode.  It's
+     possible that some old versions of the system lack the functions
+     `memcpy', `memcmp', and `memset'.  If your system lacks these, you
+     must remove or undo the definition of `TARGET_MEM_FUNCTIONS' in
+     `mips-bsd.h'.
+
+     The MIPS C compiler needs to be told to increase its table size
+     for switch statements with the `-Wf,-XNg1500' option in order to
+     compile `cp/parse.c'.  If you use the `-O2' optimization option,
+     you also need to use `-Olimit 3000'.  Both of these options are
+     automatically generated in the `Makefile' that the shell script
+     `configure' builds.  If you override the `CC' make variable and
+     use the MIPS compilers, you may need to add `-Wf,-XNg1500 -Olimit
+     3000'.
+
+`mips-mips-riscos*'
+     The MIPS C compiler needs to be told to increase its table size
+     for switch statements with the `-Wf,-XNg1500' option in order to
+     compile `cp/parse.c'.  If you use the `-O2' optimization option,
+     you also need to use `-Olimit 3000'.  Both of these options are
+     automatically generated in the `Makefile' that the shell script
+     `configure' builds.  If you override the `CC' make variable and
+     use the MIPS compilers, you may need to add `-Wf,-XNg1500 -Olimit
+     3000'.
+
+     MIPS computers running RISC-OS can support four different
+     personalities: default, BSD 4.3, System V.3, and System V.4 (older
+     versions of RISC-OS don't support V.4).  To configure GCC for
+     these platforms use the following configurations:
+
+    `mips-mips-riscos`rev''
+          Default configuration for RISC-OS, revision `rev'.
+
+    `mips-mips-riscos`rev'bsd'
+          BSD 4.3 configuration for RISC-OS, revision `rev'.
+
+    `mips-mips-riscos`rev'sysv4'
+          System V.4 configuration for RISC-OS, revision `rev'.
+
+    `mips-mips-riscos`rev'sysv'
+          System V.3 configuration for RISC-OS, revision `rev'.
+
+     The revision `rev' mentioned above is the revision of RISC-OS to
+     use.  You must reconfigure GCC when going from a RISC-OS revision
+     4 to RISC-OS revision 5.  This has the effect of avoiding a linker
+     bug.
+
+`mips-sgi-*'
+     In order to compile GCC on an SGI running IRIX 4, the "c.hdr.lib"
+     option must be installed from the CD-ROM supplied from Silicon
+     Graphics.  This is found on the 2nd CD in release 4.0.1.
+
+     In order to compile GCC on an SGI running IRIX 5, the
+     "compiler_dev.hdr" subsystem must be installed from the IDO CD-ROM
+     supplied by Silicon Graphics.
+
+     `make compare' may fail on version 5 of IRIX unless you add
+     `-save-temps' to `CFLAGS'.  On these systems, the name of the
+     assembler input file is stored in the object file, and that makes
+     comparison fail if it differs between the `stage1' and `stage2'
+     compilations.  The option `-save-temps' forces a fixed name to be
+     used for the assembler input file, instead of a randomly chosen
+     name in `/tmp'.  Do not add `-save-temps' unless the comparisons
+     fail without that option.  If you do you `-save-temps', you will
+     have to manually delete the `.i' and `.s' files after each series
+     of compilations.
+
+     The MIPS C compiler needs to be told to increase its table size
+     for switch statements with the `-Wf,-XNg1500' option in order to
+     compile `cp/parse.c'.  If you use the `-O2' optimization option,
+     you also need to use `-Olimit 3000'.  Both of these options are
+     automatically generated in the `Makefile' that the shell script
+     `configure' builds.  If you override the `CC' make variable and
+     use the MIPS compilers, you may need to add `-Wf,-XNg1500 -Olimit
+     3000'.
+
+     On Irix version 4.0.5F, and perhaps on some other versions as well,
+     there is an assembler bug that reorders instructions incorrectly.
+     To work around it, specify the target configuration
+     `mips-sgi-irix4loser'.  This configuration inhibits assembler
+     optimization.
+
+     In a compiler configured with target `mips-sgi-irix4', you can turn
+     off assembler optimization by using the `-noasmopt' option.  This
+     compiler option passes the option `-O0' to the assembler, to
+     inhibit reordering.
+
+     The `-noasmopt' option can be useful for testing whether a problem
+     is due to erroneous assembler reordering.  Even if a problem does
+     not go away with `-noasmopt', it may still be due to assembler
+     reordering--perhaps GNU CC itself was miscompiled as a result.
+
+     To enable debugging under Irix 5, you must use GNU as 2.5 or later,
+     and use the `--with-gnu-as' configure option when configuring gcc.
+     GNU as is distributed as part of the binutils package.
+
+`mips-sony-sysv'
+     Sony MIPS NEWS.  This works in NEWSOS 5.0.1, but not in 5.0.2
+     (which uses ELF instead of COFF).  Support for 5.0.2 will probably
+     be provided soon by volunteers.  In particular, the linker does
+     not like the code generated by GCC when shared libraries are
+     linked in.
+
+`ns32k-encore'
+     Encore ns32000 system.  Encore systems are supported only under
+     BSD.
+
+`ns32k-*-genix'
+     National Semiconductor ns32000 system.  Genix has bugs in `alloca'
+     and `malloc'; you must get the compiled versions of these from GNU
+     Emacs.
+
+`ns32k-sequent'
+     Go to the Berkeley universe before compiling.  In addition, you
+     probably need to create a file named `string.h' containing just
+     one line: `#include <strings.h>'.
+
+`ns32k-utek'
+     UTEK ns32000 system ("merlin").  The C compiler that comes with
+     this system cannot compile GNU CC; contact `tektronix!reed!mason'
+     to get binaries of GNU CC for bootstrapping.
+
+`romp-*-aos'
+`romp-*-mach'
+     The only operating systems supported for the IBM RT PC are AOS and
+     MACH.  GNU CC does not support AIX running on the RT.  We
+     recommend you compile GNU CC with an earlier version of itself; if
+     you compile GNU CC with `hc', the Metaware compiler, it will work,
+     but you will get mismatches between the stage 2 and stage 3
+     compilers in various files.  These errors are minor differences in
+     some floating-point constants and can be safely ignored; the stage
+     3 compiler is correct.
+
+`rs6000-*-aix'
+`powerpc-*-aix'
+     Various early versions of each release of the IBM XLC compiler
+     will not bootstrap GNU CC.  Symptoms include differences between
+     the stage2 and stage3 object files, and errors when compiling
+     `libgcc.a' or `enquire'.  Known problematic releases include:
+     xlc-1.2.1.8, xlc-1.3.0.0 (distributed with AIX 3.2.5), and
+     xlc-1.3.0.19.  Both xlc-1.2.1.28 and xlc-1.3.0.24 (PTF 432238) are
+     known to produce working versions of GNU CC, but most other recent
+     releases correctly bootstrap GNU CC.  Also, releases of AIX prior
+     to AIX 3.2.4 include a version of the IBM assembler which does not
+     accept debugging directives: assembler updates are available as
+     PTFs.  Also, if you are using AIX 3.2.5 or greater and the GNU
+     assembler, you must have a version modified after October 16th,
+     1995 in order for the GNU C compiler to build.  See the file
+     `README.RS6000' for more details on of these problems.
+
+     GNU CC does not yet support the 64-bit PowerPC instructions.
+
+     Objective C does not work on this architecture because it makes
+     assumptions that are incompatible with the calling conventions.
+
+     AIX on the RS/6000 provides support (NLS) for environments outside
+     of the United States.  Compilers and assemblers use NLS to support
+     locale-specific representations of various objects including
+     floating-point numbers ("." vs "," for separating decimal
+     fractions).  There have been problems reported where the library
+     linked with GNU CC does not produce the same floating-point
+     formats that the assembler accepts.  If you have this problem, set
+     the LANG environment variable to "C" or "En_US".
+
+     Due to changes in the way that GNU CC invokes the binder (linker)
+     for AIX 4.1, you may now receive warnings of duplicate symbols
+     from the link step that were not reported before.  The assembly
+     files generated by GNU CC for AIX have always included multiple
+     symbol definitions for certain global variable and function
+     declarations in the original program.  The warnings should not
+     prevent the linker from producing a correct library or runnable
+     executable.
+
+`powerpc-*-elf'
+`powerpc-*-sysv4'
+     PowerPC system in big endian mode, running System V.4.
+
+     This configuration is currently under development.
+
+`powerpc-*-eabiaix'
+     Embedded PowerPC system in big endian mode with -mcall-aix
+     selected as the default.  This system is currently under
+     development.
+
+`powerpc-*-eabisim'
+     Embedded PowerPC system in big endian mode for use in running
+     under the PSIM simulator.  This system is currently under
+     development.
+
+`powerpc-*-eabi'
+     Embedded PowerPC system in big endian mode.
+
+     This configuration is currently under development.
+
+`powerpcle-*-elf'
+`powerpcle-*-sysv4'
+     PowerPC system in little endian mode, running System V.4.
+
+     This configuration is currently under development.
+
+`powerpcle-*-sysv4'
+     Embedded PowerPC system in little endian mode.
+
+     This system is currently under development.
+
+`powerpcle-*-eabisim'
+     Embedded PowerPC system in little endian mode for use in running
+     under the PSIM simulator.
+
+     This system is currently under development.
+
+`powerpcle-*-eabi'
+     Embedded PowerPC system in little endian mode.
+
+     This configuration is currently under development.
+
+`vax-dec-ultrix'
+     Don't try compiling with Vax C (`vcc').  It produces incorrect code
+     in some cases (for example, when `alloca' is used).
+
+     Meanwhile, compiling `cp/parse.c' with pcc does not work because of
+     an internal table size limitation in that compiler.  To avoid this
+     problem, compile just the GNU C compiler first, and use it to
+     recompile building all the languages that you want to run.
+
+`sparc-sun-*'
+     See *Note Sun Install::, for information on installing GNU CC on
+     Sun systems.
+
+`vax-dec-vms'
+     See *Note VMS Install::, for details on how to install GNU CC on
+     VMS.
+
+`we32k-*-*'
+     These computers are also known as the 3b2, 3b5, 3b20 and other
+     similar names.  (However, the 3b1 is actually a 68000; see *Note
+     Configurations::.)
+
+     Don't use `-g' when compiling with the system's compiler.  The
+     system's linker seems to be unable to handle such a large program
+     with debugging information.
+
+     The system's compiler runs out of capacity when compiling `stmt.c'
+     in GNU CC.  You can work around this by building `cpp' in GNU CC
+     first, then use that instead of the system's preprocessor with the
+     system's C compiler to compile `stmt.c'.  Here is how:
+
+          mv /lib/cpp /lib/cpp.att
+          cp cpp /lib/cpp.gnu
+          echo '/lib/cpp.gnu -traditional ${1+"$@"}' > /lib/cpp
+          chmod +x /lib/cpp
+
+     The system's compiler produces bad code for some of the GNU CC
+     optimization files.  So you must build the stage 2 compiler without
+     optimization.  Then build a stage 3 compiler with optimization.
+     That executable should work.  Here are the necessary commands:
+
+          make LANGUAGES=c CC=stage1/xgcc CFLAGS="-Bstage1/ -g"
+          make stage2
+          make CC=stage2/xgcc CFLAGS="-Bstage2/ -g -O"
+
+     You may need to raise the ULIMIT setting to build a C++ compiler,
+     as the file `cc1plus' is larger than one megabyte.
+
+Compilation in a Separate Directory
+===================================
+
+   If you wish to build the object files and executables in a directory
+other than the one containing the source files, here is what you must
+do differently:
+
+  1. Make sure you have a version of Make that supports the `VPATH'
+     feature.  (GNU Make supports it, as do Make versions on most BSD
+     systems.)
+
+  2. If you have ever run `configure' in the source directory, you must
+     undo the configuration.  Do this by running:
+
+          make distclean
+
+  3. Go to the directory in which you want to build the compiler before
+     running `configure':
+
+          mkdir gcc-sun3
+          cd gcc-sun3
+
+     On systems that do not support symbolic links, this directory must
+     be on the same file system as the source code directory.
+
+  4. Specify where to find `configure' when you run it:
+
+          ../gcc/configure ...
+
+     This also tells `configure' where to find the compiler sources;
+     `configure' takes the directory from the file name that was used to
+     invoke it.  But if you want to be sure, you can specify the source
+     directory with the `--srcdir' option, like this:
+
+          ../gcc/configure --srcdir=../gcc OTHER OPTIONS
+
+     The directory you specify with `--srcdir' need not be the same as
+     the one that `configure' is found in.
+
+   Now, you can run `make' in that directory.  You need not repeat the
+configuration steps shown above, when ordinary source files change.  You
+must, however, run `configure' again when the configuration files
+change, if your system does not support symbolic links.
+
+Building and Installing a Cross-Compiler
+========================================
+
+   GNU CC can function as a cross-compiler for many machines, but not
+all.
+
+   * Cross-compilers for the Mips as target using the Mips assembler
+     currently do not work, because the auxiliary programs
+     `mips-tdump.c' and `mips-tfile.c' can't be compiled on anything
+     but a Mips.  It does work to cross compile for a Mips if you use
+     the GNU assembler and linker.
+
+   * Cross-compilers between machines with different floating point
+     formats have not all been made to work.  GNU CC now has a floating
+     point emulator with which these can work, but each target machine
+     description needs to be updated to take advantage of it.
+
+   * Cross-compilation between machines of different word sizes is
+     somewhat problematic and sometimes does not work.
+
+   Since GNU CC generates assembler code, you probably need a
+cross-assembler that GNU CC can run, in order to produce object files.
+If you want to link on other than the target machine, you need a
+cross-linker as well.  You also need header files and libraries suitable
+for the target machine that you can install on the host machine.
+
+Steps of Cross-Compilation
+--------------------------
+
+   To compile and run a program using a cross-compiler involves several
+steps:
+
+   * Run the cross-compiler on the host machine to produce assembler
+     files for the target machine.  This requires header files for the
+     target machine.
+
+   * Assemble the files produced by the cross-compiler.  You can do this
+     either with an assembler on the target machine, or with a
+     cross-assembler on the host machine.
+
+   * Link those files to make an executable.  You can do this either
+     with a linker on the target machine, or with a cross-linker on the
+     host machine.  Whichever machine you use, you need libraries and
+     certain startup files (typically `crt....o') for the target
+     machine.
+
+   It is most convenient to do all of these steps on the same host
+machine, since then you can do it all with a single invocation of GNU
+CC.  This requires a suitable cross-assembler and cross-linker.  For
+some targets, the GNU assembler and linker are available.
+
+Configuring a Cross-Compiler
+----------------------------
+
+   To build GNU CC as a cross-compiler, you start out by running
+`configure'.  Use the `--target=TARGET' to specify the target type.  If
+`configure' was unable to correctly identify the system you are running
+on, also specify the `--build=BUILD' option.  For example, here is how
+to configure for a cross-compiler that produces code for an HP 68030
+system running BSD on a system that `configure' can correctly identify:
+
+     ./configure --target=m68k-hp-bsd4.3
+
+Tools and Libraries for a Cross-Compiler
+----------------------------------------
+
+   If you have a cross-assembler and cross-linker available, you should
+install them now.  Put them in the directory `/usr/local/TARGET/bin'.
+Here is a table of the tools you should put in this directory:
+
+`as'
+     This should be the cross-assembler.
+
+`ld'
+     This should be the cross-linker.
+
+`ar'
+     This should be the cross-archiver: a program which can manipulate
+     archive files (linker libraries) in the target machine's format.
+
+`ranlib'
+     This should be a program to construct a symbol table in an archive
+     file.
+
+   The installation of GNU CC will find these programs in that
+directory, and copy or link them to the proper place to for the
+cross-compiler to find them when run later.
+
+   The easiest way to provide these files is to build the Binutils
+package and GAS.  Configure them with the same `--host' and `--target'
+options that you use for configuring GNU CC, then build and install
+them.  They install their executables automatically into the proper
+directory.  Alas, they do not support all the targets that GNU CC
+supports.
+
+   If you want to install libraries to use with the cross-compiler,
+such as a standard C library, put them in the directory
+`/usr/local/TARGET/lib'; installation of GNU CC copies all all the
+files in that subdirectory into the proper place for GNU CC to find
+them and link with them.  Here's an example of copying some libraries
+from a target machine:
+
+     ftp TARGET-MACHINE
+     lcd /usr/local/TARGET/lib
+     cd /lib
+     get libc.a
+     cd /usr/lib
+     get libg.a
+     get libm.a
+     quit
+
+The precise set of libraries you'll need, and their locations on the
+target machine, vary depending on its operating system.
+
+   Many targets require "start files" such as `crt0.o' and `crtn.o'
+which are linked into each executable; these too should be placed in
+`/usr/local/TARGET/lib'.  There may be several alternatives for
+`crt0.o', for use with profiling or other compilation options.  Check
+your target's definition of `STARTFILE_SPEC' to find out what start
+files it uses.  Here's an example of copying these files from a target
+machine:
+
+     ftp TARGET-MACHINE
+     lcd /usr/local/TARGET/lib
+     prompt
+     cd /lib
+     mget *crt*.o
+     cd /usr/lib
+     mget *crt*.o
+     quit
+
+`libgcc.a' and Cross-Compilers
+------------------------------
+
+   Code compiled by GNU CC uses certain runtime support functions
+implicitly.  Some of these functions can be compiled successfully with
+GNU CC itself, but a few cannot be.  These problem functions are in the
+source file `libgcc1.c'; the library made from them is called
+`libgcc1.a'.
+
+   When you build a native compiler, these functions are compiled with
+some other compiler-the one that you use for bootstrapping GNU CC.
+Presumably it knows how to open code these operations, or else knows how
+to call the run-time emulation facilities that the machine comes with.
+But this approach doesn't work for building a cross-compiler.  The
+compiler that you use for building knows about the host system, not the
+target system.
+
+   So, when you build a cross-compiler you have to supply a suitable
+library `libgcc1.a' that does the job it is expected to do.
+
+   To compile `libgcc1.c' with the cross-compiler itself does not work.
+The functions in this file are supposed to implement arithmetic
+operations that GNU CC does not know how to open code for your target
+machine.  If these functions are compiled with GNU CC itself, they will
+compile into infinite recursion.
+
+   On any given target, most of these functions are not needed.  If GNU
+CC can open code an arithmetic operation, it will not call these
+functions to perform the operation.  It is possible that on your target
+machine, none of these functions is needed.  If so, you can supply an
+empty library as `libgcc1.a'.
+
+   Many targets need library support only for multiplication and
+division.  If you are linking with a library that contains functions for
+multiplication and division, you can tell GNU CC to call them directly
+by defining the macros `MULSI3_LIBCALL', and the like.  These macros
+need to be defined in the target description macro file.  For some
+targets, they are defined already.  This may be sufficient to avoid the
+need for libgcc1.a; if so, you can supply an empty library.
+
+   Some targets do not have floating point instructions; they need other
+functions in `libgcc1.a', which do floating arithmetic.  Recent
+versions of GNU CC have a file which emulates floating point.  With a
+certain amount of work, you should be able to construct a floating
+point emulator that can be used as `libgcc1.a'.  Perhaps future
+versions will contain code to do this automatically and conveniently.
+That depends on whether someone wants to implement it.
+
+   Some embedded targets come with all the necessary `libgcc1.a'
+routines written in C or assembler.  These targets build `libgcc1.a'
+automatically and you do not need to do anything special for them.
+Other embedded targets do not need any `libgcc1.a' routines since all
+the necessary operations are supported by the hardware.
+
+   If your target system has another C compiler, you can configure GNU
+CC as a native compiler on that machine, build just `libgcc1.a' with
+`make libgcc1.a' on that machine, and use the resulting file with the
+cross-compiler.  To do this, execute the following on the target
+machine:
+
+     cd TARGET-BUILD-DIR
+     ./configure --host=sparc --target=sun3
+     make libgcc1.a
+
+And then this on the host machine:
+
+     ftp TARGET-MACHINE
+     binary
+     cd TARGET-BUILD-DIR
+     get libgcc1.a
+     quit
+
+   Another way to provide the functions you need in `libgcc1.a' is to
+define the appropriate `perform_...' macros for those functions.  If
+these definitions do not use the C arithmetic operators that they are
+meant to implement, you should be able to compile them with the
+cross-compiler you are building.  (If these definitions already exist
+for your target file, then you are all set.)
+
+   To build `libgcc1.a' using the perform macros, use
+`LIBGCC1=libgcc1.a OLDCC=./xgcc' when building the compiler.
+Otherwise, you should place your replacement library under the name
+`libgcc1.a' in the directory in which you will build the
+cross-compiler, before you run `make'.
+
+Cross-Compilers and Header Files
+--------------------------------
+
+   If you are cross-compiling a standalone program or a program for an
+embedded system, then you may not need any header files except the few
+that are part of GNU CC (and those of your program).  However, if you
+intend to link your program with a standard C library such as `libc.a',
+then you probably need to compile with the header files that go with
+the library you use.
+
+   The GNU C compiler does not come with these files, because (1) they
+are system-specific, and (2) they belong in a C library, not in a
+compiler.
+
+   If the GNU C library supports your target machine, then you can get
+the header files from there (assuming you actually use the GNU library
+when you link your program).
+
+   If your target machine comes with a C compiler, it probably comes
+with suitable header files also.  If you make these files accessible
+from the host machine, the cross-compiler can use them also.
+
+   Otherwise, you're on your own in finding header files to use when
+cross-compiling.
+
+   When you have found suitable header files, put them in
+`/usr/local/TARGET/include', before building the cross compiler.  Then
+installation will run fixincludes properly and install the corrected
+versions of the header files where the compiler will use them.
+
+   Provide the header files before you build the cross-compiler, because
+the build stage actually runs the cross-compiler to produce parts of
+`libgcc.a'.  (These are the parts that *can* be compiled with GNU CC.)
+Some of them need suitable header files.
+
+   Here's an example showing how to copy the header files from a target
+machine.  On the target machine, do this:
+
+     (cd /usr/include; tar cf - .) > tarfile
+
+   Then, on the host machine, do this:
+
+     ftp TARGET-MACHINE
+     lcd /usr/local/TARGET/include
+     get tarfile
+     quit
+     tar xf tarfile
+
+Actually Building the Cross-Compiler
+------------------------------------
+
+   Now you can proceed just as for compiling a single-machine compiler
+through the step of building stage 1.  If you have not provided some
+sort of `libgcc1.a', then compilation will give up at the point where
+it needs that file, printing a suitable error message.  If you do
+provide `libgcc1.a', then building the compiler will automatically
+compile and link a test program called `libgcc1-test'; if you get
+errors in the linking, it means that not all of the necessary routines
+in `libgcc1.a' are available.
+
+   You must provide the header file `float.h'.  One way to do this is
+to compile `enquire' and run it on your target machine.  The job of
+`enquire' is to run on the target machine and figure out by experiment
+the nature of its floating point representation.  `enquire' records its
+findings in the header file `float.h'.  If you can't produce this file
+by running `enquire' on the target machine, then you will need to come
+up with a suitable `float.h' in some other way (or else, avoid using it
+in your programs).
+
+   Do not try to build stage 2 for a cross-compiler.  It doesn't work to
+rebuild GNU CC as a cross-compiler using the cross-compiler, because
+that would produce a program that runs on the target machine, not on the
+host.  For example, if you compile a 386-to-68030 cross-compiler with
+itself, the result will not be right either for the 386 (because it was
+compiled into 68030 code) or for the 68030 (because it was configured
+for a 386 as the host).  If you want to compile GNU CC into 68030 code,
+whether you compile it on a 68030 or with a cross-compiler on a 386, you
+must specify a 68030 as the host when you configure it.
+
+   To install the cross-compiler, use `make install', as usual.
+
+Installing GNU CC on the Sun
+============================
+
+   On Solaris (version 2.1), do not use the linker or other tools in
+`/usr/ucb' to build GNU CC.  Use `/usr/ccs/bin'.
+
+   Make sure the environment variable `FLOAT_OPTION' is not set when
+you compile `libgcc.a'.  If this option were set to `f68881' when
+`libgcc.a' is compiled, the resulting code would demand to be linked
+with a special startup file and would not link properly without special
+pains.
+
+   There is a bug in `alloca' in certain versions of the Sun library.
+To avoid this bug, install the binaries of GNU CC that were compiled by
+GNU CC.  They use `alloca' as a built-in function and never the one in
+the library.
+
+   Some versions of the Sun compiler crash when compiling GNU CC.  The
+problem is a segmentation fault in cpp.  This problem seems to be due to
+the bulk of data in the environment variables.  You may be able to avoid
+it by using the following command to compile GNU CC with Sun CC:
+
+     make CC="TERMCAP=x OBJS=x LIBFUNCS=x STAGESTUFF=x cc"
+
+Installing GNU CC on VMS
+========================
+
+   The VMS version of GNU CC is distributed in a backup saveset
+containing both source code and precompiled binaries.
+
+   To install the `gcc' command so you can use the compiler easily, in
+the same manner as you use the VMS C compiler, you must install the VMS
+CLD file for GNU CC as follows:
+
+  1. Define the VMS logical names `GNU_CC' and `GNU_CC_INCLUDE' to
+     point to the directories where the GNU CC executables
+     (`gcc-cpp.exe', `gcc-cc1.exe', etc.) and the C include files are
+     kept respectively.  This should be done with the commands:
+
+          $ assign /system /translation=concealed -
+            disk:[gcc.] gnu_cc
+          $ assign /system /translation=concealed -
+            disk:[gcc.include.] gnu_cc_include
+
+     with the appropriate disk and directory names.  These commands can
+     be placed in your system startup file so they will be executed
+     whenever the machine is rebooted.  You may, if you choose, do this
+     via the `GCC_INSTALL.COM' script in the `[GCC]' directory.
+
+  2. Install the `GCC' command with the command line:
+
+          $ set command /table=sys$common:[syslib]dcltables -
+            /output=sys$common:[syslib]dcltables gnu_cc:[000000]gcc
+          $ install replace sys$common:[syslib]dcltables
+
+  3. To install the help file, do the following:
+
+          $ library/help sys$library:helplib.hlb gcc.hlp
+
+     Now you can invoke the compiler with a command like `gcc /verbose
+     file.c', which is equivalent to the command `gcc -v -c file.c' in
+     Unix.
+
+   If you wish to use GNU C++ you must first install GNU CC, and then
+perform the following steps:
+
+  1. Define the VMS logical name `GNU_GXX_INCLUDE' to point to the
+     directory where the preprocessor will search for the C++ header
+     files.  This can be done with the command:
+
+          $ assign /system /translation=concealed -
+            disk:[gcc.gxx_include.] gnu_gxx_include
+
+     with the appropriate disk and directory name.  If you are going to
+     be using libg++, this is where the libg++ install procedure will
+     install the libg++ header files.
+
+  2. Obtain the file `gcc-cc1plus.exe', and place this in the same
+     directory that `gcc-cc1.exe' is kept.
+
+     The GNU C++ compiler can be invoked with a command like `gcc /plus
+     /verbose file.cc', which is equivalent to the command `g++ -v -c
+     file.cc' in Unix.
+
+   We try to put corresponding binaries and sources on the VMS
+distribution tape.  But sometimes the binaries will be from an older
+version than the sources, because we don't always have time to update
+them.  (Use the `/version' option to determine the version number of
+the binaries and compare it with the source file `version.c' to tell
+whether this is so.)  In this case, you should use the binaries you get
+to recompile the sources.  If you must recompile, here is how:
+
+  1. Execute the command procedure `vmsconfig.com' to set up the files
+     `tm.h', `config.h', `aux-output.c', and `md.', and to create files
+     `tconfig.h' and `hconfig.h'.  This procedure also creates several
+     linker option files used by `make-cc1.com' and a data file used by
+     `make-l2.com'.
+
+          $ @vmsconfig.com
+
+  2. Setup the logical names and command tables as defined above.  In
+     addition, define the VMS logical name `GNU_BISON' to point at the
+     to the directories where the Bison executable is kept.  This
+     should be done with the command:
+
+          $ assign /system /translation=concealed -
+            disk:[bison.] gnu_bison
+
+     You may, if you choose, use the `INSTALL_BISON.COM' script in the
+     `[BISON]' directory.
+
+  3. Install the `BISON' command with the command line:
+
+          $ set command /table=sys$common:[syslib]dcltables -
+            /output=sys$common:[syslib]dcltables -
+            gnu_bison:[000000]bison
+          $ install replace sys$common:[syslib]dcltables
+
+  4. Type `@make-gcc' to recompile everything (alternatively, submit
+     the file `make-gcc.com' to a batch queue).  If you wish to build
+     the GNU C++ compiler as well as the GNU CC compiler, you must
+     first edit `make-gcc.com' and follow the instructions that appear
+     in the comments.
+
+  5. In order to use GCC, you need a library of functions which GCC
+     compiled code will call to perform certain tasks, and these
+     functions are defined in the file `libgcc2.c'.  To compile this
+     you should use the command procedure `make-l2.com', which will
+     generate the library `libgcc2.olb'.  `libgcc2.olb' should be built
+     using the compiler built from the same distribution that
+     `libgcc2.c' came from, and `make-gcc.com' will automatically do
+     all of this for you.
+
+     To install the library, use the following commands:
+
+          $ library gnu_cc:[000000]gcclib/delete=(new,eprintf)
+          $ library gnu_cc:[000000]gcclib/delete=L_*
+          $ library libgcc2/extract=*/output=libgcc2.obj
+          $ library gnu_cc:[000000]gcclib libgcc2.obj
+
+     The first command simply removes old modules that will be replaced
+     with modules from `libgcc2' under different module names.  The
+     modules `new' and `eprintf' may not actually be present in your
+     `gcclib.olb'--if the VMS librarian complains about those modules
+     not being present, simply ignore the message and continue on with
+     the next command.  The second command removes the modules that
+     came from the previous version of the library `libgcc2.c'.
+
+     Whenever you update the compiler on your system, you should also
+     update the library with the above procedure.
+
+  6. You may wish to build GCC in such a way that no files are written
+     to the directory where the source files reside.  An example would
+     be the when the source files are on a read-only disk.  In these
+     cases, execute the following DCL commands (substituting your
+     actual path names):
+
+          $ assign dua0:[gcc.build_dir.]/translation=concealed, -
+                   dua1:[gcc.source_dir.]/translation=concealed  gcc_build
+          $ set default gcc_build:[000000]
+
+     where the directory `dua1:[gcc.source_dir]' contains the source
+     code, and the directory `dua0:[gcc.build_dir]' is meant to contain
+     all of the generated object files and executables.  Once you have
+     done this, you can proceed building GCC as described above.  (Keep
+     in mind that `gcc_build' is a rooted logical name, and thus the
+     device names in each element of the search list must be an actual
+     physical device name rather than another rooted logical name).
+
+  7. *If you are building GNU CC with a previous version of GNU CC, you
+     also should check to see that you have the newest version of the
+     assembler*.  In particular, GNU CC version 2 treats global constant
+     variables slightly differently from GNU CC version 1, and GAS
+     version 1.38.1 does not have the patches required to work with GCC
+     version 2.  If you use GAS 1.38.1, then `extern const' variables
+     will not have the read-only bit set, and the linker will generate
+     warning messages about mismatched psect attributes for these
+     variables.  These warning messages are merely a nuisance, and can
+     safely be ignored.
+
+     If you are compiling with a version of GNU CC older than 1.33,
+     specify `/DEFINE=("inline=")' as an option in all the
+     compilations.  This requires editing all the `gcc' commands in
+     `make-cc1.com'.  (The older versions had problems supporting
+     `inline'.)  Once you have a working 1.33 or newer GNU CC, you can
+     change this file back.
+
+  8. If you want to build GNU CC with the VAX C compiler, you will need
+     to make minor changes in `make-cccp.com' and `make-cc1.com' to
+     choose alternate definitions of `CC', `CFLAGS', and `LIBS'.  See
+     comments in those files.  However, you must also have a working
+     version of the GNU assembler (GNU as, aka GAS) as it is used as
+     the back-end for GNU CC to produce binary object modules and is
+     not included in the GNU CC sources.  GAS is also needed to compile
+     `libgcc2' in order to build `gcclib' (see above); `make-l2.com'
+     expects to be able to find it operational in
+     `gnu_cc:[000000]gnu-as.exe'.
+
+     To use GNU CC on VMS, you need the VMS driver programs `gcc.exe',
+     `gcc.com', and `gcc.cld'.  They are distributed with the VMS
+     binaries (`gcc-vms') rather than the GNU CC sources.  GAS is also
+     included in `gcc-vms', as is Bison.
+
+     Once you have successfully built GNU CC with VAX C, you should use
+     the resulting compiler to rebuild itself.  Before doing this, be
+     sure to restore the `CC', `CFLAGS', and `LIBS' definitions in
+     `make-cccp.com' and `make-cc1.com'.  The second generation
+     compiler will be able to take advantage of many optimizations that
+     must be suppressed when building with other compilers.
+
+   Under previous versions of GNU CC, the generated code would
+occasionally give strange results when linked with the sharable
+`VAXCRTL' library.  Now this should work.
+
+   Even with this version, however, GNU CC itself should not be linked
+with the sharable `VAXCRTL'.  The version of `qsort' in `VAXCRTL' has a
+bug (known to be present in VMS versions V4.6 through V5.5) which
+causes the compiler to fail.
+
+   The executables are generated by `make-cc1.com' and `make-cccp.com'
+use the object library version of `VAXCRTL' in order to make use of the
+`qsort' routine in `gcclib.olb'.  If you wish to link the compiler
+executables with the shareable image version of `VAXCRTL', you should
+edit the file `tm.h' (created by `vmsconfig.com') to define the macro
+`QSORT_WORKAROUND'.
+
+   `QSORT_WORKAROUND' is always defined when GNU CC is compiled with
+VAX C, to avoid a problem in case `gcclib.olb' is not yet available.
+
+`collect2'
+==========
+
+   Many target systems do not have support in the assembler and linker
+for "constructors"--initialization functions to be called before the
+official "start" of `main'.  On such systems, GNU CC uses a utility
+called `collect2' to arrange to call these functions at start time.
+
+   The program `collect2' works by linking the program once and looking
+through the linker output file for symbols with particular names
+indicating they are constructor functions.  If it finds any, it creates
+a new temporary `.c' file containing a table of them, compiles it, and
+links the program a second time including that file.
+
+   The actual calls to the constructors are carried out by a subroutine
+called `__main', which is called (automatically) at the beginning of
+the body of `main' (provided `main' was compiled with GNU CC).  Calling
+`__main' is necessary, even when compiling C code, to allow linking C
+and C++ object code together.  (If you use `-nostdlib', you get an
+unresolved reference to `__main', since it's defined in the standard
+GCC library.  Include `-lgcc' at the end of your compiler command line
+to resolve this reference.)
+
+   The program `collect2' is installed as `ld' in the directory where
+the passes of the compiler are installed.  When `collect2' needs to
+find the *real* `ld', it tries the following file names:
+
+   * `real-ld' in the directories listed in the compiler's search
+     directories.
+
+   * `real-ld' in the directories listed in the environment variable
+     `PATH'.
+
+   * The file specified in the `REAL_LD_FILE_NAME' configuration macro,
+     if specified.
+
+   * `ld' in the compiler's search directories, except that `collect2'
+     will not execute itself recursively.
+
+   * `ld' in `PATH'.
+
+   "The compiler's search directories" means all the directories where
+`gcc' searches for passes of the compiler.  This includes directories
+that you specify with `-B'.
+
+   Cross-compilers search a little differently:
+
+   * `real-ld' in the compiler's search directories.
+
+   * `TARGET-real-ld' in `PATH'.
+
+   * The file specified in the `REAL_LD_FILE_NAME' configuration macro,
+     if specified.
+
+   * `ld' in the compiler's search directories.
+
+   * `TARGET-ld' in `PATH'.
+
+   `collect2' explicitly avoids running `ld' using the file name under
+which `collect2' itself was invoked.  In fact, it remembers up a list
+of such names--in case one copy of `collect2' finds another copy (or
+version) of `collect2' installed as `ld' in a second place in the
+search path.
+
+   `collect2' searches for the utilities `nm' and `strip' using the
+same algorithm as above for `ld'.
+
+Standard Header File Directories
+================================
+
+   `GCC_INCLUDE_DIR' means the same thing for native and cross.  It is
+where GNU CC stores its private include files, and also where GNU CC
+stores the fixed include files.  A cross compiled GNU CC runs
+`fixincludes' on the header files in `$(tooldir)/include'.  (If the
+cross compilation header files need to be fixed, they must be installed
+before GNU CC is built.  If the cross compilation header files are
+already suitable for ANSI C and GNU CC, nothing special need be done).
+
+   `GPLUS_INCLUDE_DIR' means the same thing for native and cross.  It
+is where `g++' looks first for header files.  `libg++' installs only
+target independent header files in that directory.
+
+   `LOCAL_INCLUDE_DIR' is used only for a native compiler.  It is
+normally `/usr/local/include'.  GNU CC searches this directory so that
+users can install header files in `/usr/local/include'.
+
+   `CROSS_INCLUDE_DIR' is used only for a cross compiler.  GNU CC
+doesn't install anything there.
+
+   `TOOL_INCLUDE_DIR' is used for both native and cross compilers.  It
+is the place for other packages to install header files that GNU CC will
+use.  For a cross-compiler, this is the equivalent of `/usr/include'.
+When you build a cross-compiler, `fixincludes' processes any header
+files in this directory.
+
diff --git a/contrib/gcc/config/alpha/config-nt.sed b/contrib/gcc/config/alpha/config-nt.sed
new file mode 100644
index 000000000000..a5027bc1882a
--- /dev/null
+++ b/contrib/gcc/config/alpha/config-nt.sed
@@ -0,0 +1,33 @@
+/^Makefile/,/^	rm -f config.run/d
+s/rm -f/del/
+s/|| cp/|| copy/
+/^config.status/,/	fi/d
+s/config.status//g
+s/\/dev\/null/NUL/g
+s/$(srcdir)\/c-parse/c-parse/g
+s/$(srcdir)\/c-gperf/c-gperf/g
+/^multilib.h/ s/multilib/not-multilib/
+/^target=/ c\
+target=winnt3.5
+/^xmake_file=/ d
+/^tmake_file=/ d
+/^out_file/ c\
+out_file=config/alpha/alpha.c
+/^out_object_file/ c\
+out_object_file=alpha.obj
+/^md_file/ c\
+md_file=config/alpha/alpha.md
+/^tm_file/ c\
+tm_file=config/alpha/winnt.h
+/^build_xm_file/ c\
+build_xm_file=config/alpha/xm-winnt.h
+/^host_xm_file/ c\
+host_xm_file=config/alpha/xm-winnt.h
+/^####target/ i\
+CC = cl \
+CLIB = libc.lib kernel32.lib \
+CFLAGS = -Dalpha -DWIN32 -D_WIN32 -D_ALPHA_ -D_M_ALPHA \\\
+ -DALMOST_STDC \
+LDFLAGS = -subsystem:console -entry:mainCRTStartup \\\
+ -stack:1000000,1000 \
+
diff --git a/contrib/gcc/config/alpha/win-nt.h b/contrib/gcc/config/alpha/win-nt.h
new file mode 100644
index 000000000000..cb3d9eb2bd95
--- /dev/null
+++ b/contrib/gcc/config/alpha/win-nt.h
@@ -0,0 +1,72 @@
+/* Definitions of target machine for GNU compiler, for DEC Alpha
+   running Windows/NT.
+   Copyright (C) 1995 Free Software Foundation, Inc.
+   Contributed by Richard Kenner (kenner@vlsi1.ultra.nyu.edu)
+
+This file is part of GNU CC.
+
+GNU CC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU CC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU CC; see the file COPYING.  If not, write to
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+/* Say this is Windows/NT for the other config files.  */
+#define WINDOWS_NT 1
+
+#include "alpha/alpha.h"
+
+/* Names to predefine in the preprocessor for this target machine.  */
+
+#undef CPP_PREDEFINES
+#define CPP_PREDEFINES "-DWIN32 -D_WIN32 -DWINNT -D__STDC__=0 -DALMOST_STDC\
+  -D_M_ALPHA -D_ALPHA_ -D__alpha -D__alpha__\
+  -D_LONGLONG -D__unaligned= -D__stdcall= \
+  -Asystem(winnt) -Acpu(alpha) -Amachine(alpha)"
+
+#undef ASM_SPEC
+#undef ASM_FINAL_SPEC
+#define ASM_SPEC "-nopp -nologo %{g:-Zi}"
+
+/* Pointer is 32 bits but the hardware has 64-bit addresses, sign extended. */
+#undef POINTER_SIZE
+#define POINTER_SIZE 32
+#define POINTERS_EXTEND_UNSIGNED 0
+
+/* "long" is 32 bits.  */
+#undef LONG_TYPE_SIZE
+#define LONG_TYPE_SIZE 32
+
+/* We can't do any debugging.  */
+#undef SDB_DEBUGGING_INFO
+#undef DBX_DEBUGGING_INFO
+#undef MIPS_DEBUGGING_INFO
+
+#include "winnt/win-nt.h"
+
+#undef ASM_FILE_START
+#define ASM_FILE_START(FILE)					\
+{								\
+  alpha_write_verstamp (FILE);					\
+  fprintf (FILE, "\t.set noreorder\n");				\
+  fprintf (FILE, "\t.set volatile\n");                          \
+  fprintf (FILE, "\t.set noat\n");				\
+  fprintf (FILE, "\t.globl\t__fltused\n");			\
+  ASM_OUTPUT_SOURCE_FILENAME (FILE, main_input_filename);	\
+}
+
+#undef LIB_SPEC
+#define LIB_SPEC "%{mwindows:-subsystem windows -e _WinMainCRTStartup \
+  USER32.LIB%s GDI32.LIB%s COMDLG32.LIB%s WINSPOOL.LIB%s} \
+ %{!mwindows:-subsystem console -e _mainCRTStartup} \
+ %{mcrtmt:LIBCMT.LIB%s KERNEL32.LIB%s} %{!mcrtmt:LIBC.LIB%s KERNEL32.LIB%s} \
+ %{v}"
diff --git a/contrib/gcc/config/alpha/xm-winnt.h b/contrib/gcc/config/alpha/xm-winnt.h
new file mode 100644
index 000000000000..202aec3457d5
--- /dev/null
+++ b/contrib/gcc/config/alpha/xm-winnt.h
@@ -0,0 +1,35 @@
+/* Configuration for GNU compiler for an Alpha running Windows NT 3.x.
+   Copyright (C) 1995 Free Software Foundation, Inc.
+   Contributed by Douglas B. Rupp (drupp@cs.washington.edu)
+
+This file is part of GNU CC.
+
+GNU CC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU CC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU CC; see the file COPYING.  If not, write to
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+#include "alpha/xm-alpha.h"
+#include "winnt/xm-winnt.h"
+
+#undef HOST_BITS_PER_LONG
+#define	HOST_BITS_PER_LONG	32
+
+#undef POSIX
+
+#define access _access
+#define close _close
+#define mktemp _mktemp
+#define open _open
+#define read _read
+#define write _write
diff --git a/contrib/gcc/config/i386/freebsd.h b/contrib/gcc/config/i386/freebsd.h
index 0f50f62c3e5c..95de20505c22 100644
--- a/contrib/gcc/config/i386/freebsd.h
+++ b/contrib/gcc/config/i386/freebsd.h
@@ -22,7 +22,7 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.21.2.4 1999/12/05 20:57:57 obrien Exp $ */
 
 /* A lie, I guess, but the general idea behind FreeBSD/ELF is that we are
    supposed to be outputting something that will assemble under SVr4.
diff --git a/contrib/gcc/config/i386/freebsd.h.fixed b/contrib/gcc/config/i386/freebsd.h.fixed
deleted file mode 100644
index 0f50f62c3e5c..000000000000
--- a/contrib/gcc/config/i386/freebsd.h.fixed
+++ /dev/null
@@ -1,570 +0,0 @@
-/* Definitions for Intel 386 running FreeBSD with either a.out or ELF format
-   Copyright (C) 1994, 1995 Free Software Foundation, Inc.
-   Contributed by Eric Youngdale.
-   Modified for stabs-in-ELF by H.J. Lu.
-   Adapted from Linux version by John Polstra.
-   Added support for generating "old a.out gas" on the fly by Peter Wemm.
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* $FreeBSD$ */
-
-/* A lie, I guess, but the general idea behind FreeBSD/ELF is that we are
-   supposed to be outputting something that will assemble under SVr4.
-   This gets us pretty close.  */
-#include <i386/i386.h>	/* Base i386 target machine definitions */
-#include <i386/att.h>	/* Use the i386 AT&T assembler syntax */
-#include <linux.h>	/* some common stuff */
-
-/* Don't assume anything about the header files. */
-#define NO_IMPLICIT_EXTERN_C
-
-/* This defines which switch letters take arguments.  On svr4, most of
-   the normal cases (defined in gcc.c) apply, and we also have -h* and
-   -z* options (for the linker).  We have a slightly different mix.  We
-   have -R (alias --rpath), no -z, --soname (-h), --assert etc. */
-
-#undef SWITCH_TAKES_ARG
-#define SWITCH_TAKES_ARG(CHAR) \
-  (   (CHAR) == 'D' \
-   || (CHAR) == 'U' \
-   || (CHAR) == 'o' \
-   || (CHAR) == 'e' \
-   || (CHAR) == 'T' \
-   || (CHAR) == 'u' \
-   || (CHAR) == 'I' \
-   || (CHAR) == 'm' \
-   || (CHAR) == 'L' \
-   || (CHAR) == 'A' \
-   || (CHAR) == 'h' \
-   || (CHAR) == 'z' /* ignored by ld */ \
-   || (CHAR) == 'R')
-
-#undef WORD_SWITCH_TAKES_ARG
-#define WORD_SWITCH_TAKES_ARG(STR)					\
-  (DEFAULT_WORD_SWITCH_TAKES_ARG (STR)					\
-   || !strcmp (STR, "rpath") || !strcmp (STR, "rpath-link")		\
-   || !strcmp (STR, "soname") || !strcmp (STR, "defsym") 		\
-   || !strcmp (STR, "assert") || !strcmp (STR, "dynamic-linker"))
-
-#undef TARGET_VERSION
-#define TARGET_VERSION fprintf (stderr, " (i386 FreeBSD)");
-
-#define MASK_PROFILER_EPILOGUE	010000000000
-#define MASK_AOUT		004000000000	/* a.out not elf */
-#define MASK_UNDERSCORES	002000000000	/* use leading _ */
-
-#define TARGET_PROFILER_EPILOGUE	(target_flags & MASK_PROFILER_EPILOGUE)
-#define TARGET_AOUT			(target_flags & MASK_AOUT)
-#define TARGET_ELF			((target_flags & MASK_AOUT) == 0)
-#define TARGET_UNDERSCORES		((target_flags & MASK_UNDERSCORES) != 0)
-
-#undef	SUBTARGET_SWITCHES
-#define SUBTARGET_SWITCHES					\
-     { "profiler-epilogue",	 MASK_PROFILER_EPILOGUE},	\
-     { "no-profiler-epilogue",	-MASK_PROFILER_EPILOGUE},	\
-     { "aout",			 MASK_AOUT},			\
-     { "no-aout",		-MASK_AOUT},			\
-     { "underscores",		 MASK_UNDERSCORES},		\
-     { "no-underscores",	-MASK_UNDERSCORES},
-
-/* The svr4 ABI for the i386 says that records and unions are returned
-   in memory.  */
-/* On FreeBSD, we do not. */
-#undef DEFAULT_PCC_STRUCT_RETURN
-#define DEFAULT_PCC_STRUCT_RETURN 0
-
-/* Prefix for internally generated assembler labels.  If we aren't using 
-   underscores, we are using prefix `.'s to identify labels that should  
-   be ignored, as in `i386/gas.h' --karl@cs.umb.edu  */                 
-#undef  LPREFIX
-#define LPREFIX ((TARGET_UNDERSCORES) ? "L" : ".L")
-
-/* Override the default comment-starter of "/".  */
-#undef ASM_COMMENT_START
-#define ASM_COMMENT_START "#"
-
-#undef COMMENT_BEGIN
-#define COMMENT_BEGIN "#"
-
-#undef ASM_APP_ON
-#define ASM_APP_ON "#APP\n"
-
-#undef ASM_APP_OFF
-#define ASM_APP_OFF "#NO_APP\n" 
-
-/* Output at beginning of assembler file.  */
-/* The .file command should always begin the output.  */
-
-#undef ASM_FILE_START
-#define ASM_FILE_START(FILE)						\
-  do {									\
-        output_file_directive (FILE, main_input_filename);		\
-	if (TARGET_ELF)							\
-          fprintf (FILE, "\t.version\t\"01.01\"\n");			\
-  } while (0)
-
-/* Identify the front-end which produced this file.  To keep symbol
-   space down, and not confuse kdb, only do this if the language is
-   not C. (svr4.h defines ASM_IDENTIFY_GCC but neglects this) */
-#undef ASM_IDENTIFY_LANGUAGE
-#define ASM_IDENTIFY_LANGUAGE(STREAM)					\
-{									\
-  if (strcmp (lang_identify (), "c") != 0)				\
-    output_lang_identify (STREAM);					\
-}
-
-/* This is how to store into the string BUF
-   the symbol_ref name of an internal numbered label where      
-   PREFIX is the class of label and NUM is the number within the class.  
-   This is suitable for output with `assemble_name'.  */
-#undef	ASM_GENERATE_INTERNAL_LABEL
-#define ASM_GENERATE_INTERNAL_LABEL(BUF,PREFIX,NUMBER)			\
-    sprintf ((BUF), "*%s%s%d", (TARGET_UNDERSCORES) ? "" : ".",		\
-	     (PREFIX), (NUMBER))
-
-/* This is how to output an internal numbered label where
-   PREFIX is the class of label and NUM is the number within the class.  */
-#undef	ASM_OUTPUT_INTERNAL_LABEL
-#define	ASM_OUTPUT_INTERNAL_LABEL(FILE,PREFIX,NUM)			\
-  fprintf (FILE, "%s%s%d:\n", (TARGET_UNDERSCORES) ? "" : ".",		\
-	   PREFIX, NUM)
-
-/* This is how to output a reference to a user-level label named NAME.  */
-#undef  ASM_OUTPUT_LABELREF
-#define ASM_OUTPUT_LABELREF(FILE,NAME)					\
-  fprintf (FILE, "%s%s", (TARGET_UNDERSCORES) ? "_" : "", NAME)
-
-
-/* This is how to output an element of a case-vector that is relative.
-   This is only used for PIC code.  See comments by the `casesi' insn in
-   i386.md for an explanation of the expression this outputs. */
-#undef ASM_OUTPUT_ADDR_DIFF_ELT
-#define ASM_OUTPUT_ADDR_DIFF_ELT(FILE, VALUE, REL) \
-  fprintf (FILE, "\t.long _GLOBAL_OFFSET_TABLE_+[.-%s%d]\n", LPREFIX, VALUE)
-
-#undef ASM_OUTPUT_ALIGN
-#define ASM_OUTPUT_ALIGN(FILE,LOG)      \
-  if ((LOG)!=0) fprintf ((FILE), "\t.p2align %d\n", (LOG))
-
-/* Align labels, etc. at 4-byte boundaries.
-   For the 486, align to 16-byte boundary for sake of cache.  */
-#undef ASM_OUTPUT_ALIGN_CODE
-#define ASM_OUTPUT_ALIGN_CODE(FILE) \
-  fprintf ((FILE), "\t.p2align %d,0x90\n", i386_align_jumps)
-
-/* Align start of loop at 4-byte boundary.  */
-#undef ASM_OUTPUT_LOOP_ALIGN
-#define ASM_OUTPUT_LOOP_ALIGN(FILE) \
-  fprintf ((FILE), "\t.p2align %d,0x90\n", i386_align_loops)
-
-
-/* conditionalize the use of ".section rodata" on elf mode - otherwise .text */
-#undef USE_CONST_SECTION
-#define USE_CONST_SECTION	TARGET_ELF
-
-/* A C statement (sans semicolon) to output an element in the table of
-   global constructors.  */
-#undef ASM_OUTPUT_CONSTRUCTOR
-#define ASM_OUTPUT_CONSTRUCTOR(FILE,NAME)				\
-  do {									\
-    if (TARGET_ELF) {							\
-      ctors_section ();							\
-      fprintf (FILE, "\t%s\t ", INT_ASM_OP);				\
-      assemble_name (FILE, NAME);					\
-      fprintf (FILE, "\n");						\
-    } else {								\
-      fprintf (asm_out_file, "%s \"%s__CTOR_LIST__\",22,0,0,", ASM_STABS_OP, \
-	       (TARGET_UNDERSCORES) ? "_" : "");			\
-      assemble_name (asm_out_file, name);				\
-      fputc ('\n', asm_out_file);					\
-    }									\
-  } while (0)
-
-/* A C statement (sans semicolon) to output an element in the table of
-   global destructors.  */
-#undef ASM_OUTPUT_DESTRUCTOR
-#define ASM_OUTPUT_DESTRUCTOR(FILE,NAME)				\
-  do {									\
-    if (TARGET_ELF) {							\
-      dtors_section ();							\
-      fprintf (FILE, "\t%s\t ", INT_ASM_OP);				\
-      assemble_name (FILE, NAME);					\
-      fprintf (FILE, "\n");						\
-    } else {								\
-      fprintf (asm_out_file, "%s \"%s__DTOR_LIST__\",22,0,0,", ASM_STABS_OP, \
-	       (TARGET_UNDERSCORES) ? "_" : "");			\
-      assemble_name (asm_out_file, name);				\
-      fputc ('\n', asm_out_file);					\
-    }									\
-  } while (0)
-
-/* This says how to output assembler code to declare an
-   uninitialized internal linkage data object.  Under SVR4,
-   the linker seems to want the alignment of data objects
-   to depend on their types.  We do exactly that here.  */
-
-#undef ASM_OUTPUT_ALIGNED_LOCAL
-#define ASM_OUTPUT_ALIGNED_LOCAL(FILE, NAME, SIZE, ALIGN)		\
-do {									\
-  if (TARGET_ELF) {							\
-    fprintf ((FILE), "\t%s\t", LOCAL_ASM_OP);				\
-    assemble_name ((FILE), (NAME));					\
-    fprintf ((FILE), "\n");						\
-    ASM_OUTPUT_ALIGNED_COMMON (FILE, NAME, SIZE, ALIGN);		\
-  } else {								\
-    int rounded = (SIZE);						\
-    if (rounded == 0) rounded = 1;					\
-    rounded += (BIGGEST_ALIGNMENT / BITS_PER_UNIT) - 1;			\
-    rounded = (rounded / (BIGGEST_ALIGNMENT / BITS_PER_UNIT)		\
-			   * (BIGGEST_ALIGNMENT / BITS_PER_UNIT));	\
-    fputs (".lcomm ", (FILE));						\
-    assemble_name ((FILE), (NAME));					\
-    fprintf ((FILE), ",%u\n", (rounded));				\
-  }									\
-} while (0)
-
-#undef ASM_OUTPUT_ALIGNED_COMMON
-#define ASM_OUTPUT_ALIGNED_COMMON(FILE, NAME, SIZE, ALIGN)		\
-do {									\
-  if (TARGET_ELF) {							\
-    fprintf ((FILE), "\t%s\t", COMMON_ASM_OP);				\
-    assemble_name ((FILE), (NAME));					\
-    fprintf ((FILE), ",%u,%u\n", (SIZE), (ALIGN) / BITS_PER_UNIT);	\
-  } else {								\
-    int rounded = (SIZE);						\
-    if (rounded == 0) rounded = 1;					\
-    rounded += (BIGGEST_ALIGNMENT / BITS_PER_UNIT) - 1;			\
-    rounded = (rounded / (BIGGEST_ALIGNMENT / BITS_PER_UNIT)		\
-			   * (BIGGEST_ALIGNMENT / BITS_PER_UNIT));	\
-    fputs (".comm ", (FILE));						\
-    assemble_name ((FILE), (NAME));					\
-    fprintf ((FILE), ",%u\n", (rounded));				\
-  }									\
-} while (0)
-
-/* Turn off svr4.h version, it chokes the old gas.  The old layout
-   works fine under new gas anyway. */
-#undef ASM_OUTPUT_ASCII
-
-/* How to output some space */
-#undef ASM_OUTPUT_SKIP
-#define ASM_OUTPUT_SKIP(FILE,SIZE) 					\
-do {									\
-  if (TARGET_ELF) {							\
-    fprintf (FILE, "\t%s\t%u\n", SKIP_ASM_OP, (SIZE));			\
-  } else {								\
-    fprintf (FILE, "\t.space %u\n", (SIZE));				\
-  }									\
-} while (0)
-
-#undef ASM_OUTPUT_SOURCE_LINE
-#define ASM_OUTPUT_SOURCE_LINE(file, line)				\
-do {									\
-  static int sym_lineno = 1;						\
-  if (TARGET_ELF) {							\
-    fprintf (file, ".stabn 68,0,%d,.LM%d-", line, sym_lineno);		\
-    assemble_name (file, XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0));\
-    fprintf (file, "\n.LM%d:\n", sym_lineno);				\
-    sym_lineno += 1;							\
-  } else {								\
-    fprintf (file, "\t%s %d,0,%d\n", ASM_STABD_OP, N_SLINE, lineno);	\
-  }									\
-} while (0)
-
-/* in elf, the function stabs come first, before the relative offsets */
-#undef DBX_FUNCTION_FIRST
-#define DBX_CHECK_FUNCTION_FIRST TARGET_ELF
-
-/* tag end of file in elf mode */
-#undef DBX_OUTPUT_MAIN_SOURCE_FILE_END
-#define DBX_OUTPUT_MAIN_SOURCE_FILE_END(FILE, FILENAME)			\
-do {									\
-  if (TARGET_ELF) {							\
-    fprintf (FILE, "\t.text\n\t.stabs \"\",%d,0,0,.Letext\n.Letext:\n", N_SO); \
-  }									\
-} while (0)
-
-/* stabs-in-elf has offsets relative to function beginning */
-#undef DBX_OUTPUT_LBRAC
-#define DBX_OUTPUT_LBRAC(file,name)					\
-do {									\
-  fprintf (asmfile, "%s %d,0,0,", ASM_STABN_OP, N_LBRAC);		\
-  assemble_name (asmfile, buf);						\
-  if (TARGET_ELF) {							\
-    fputc ('-', asmfile);						\
-    assemble_name (asmfile, XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0)); \
-  }									\
-  fprintf (asmfile, "\n");						\
-} while (0)
-
-#undef DBX_OUTPUT_RBRAC
-#define DBX_OUTPUT_RBRAC(file,name)					\
-do {									\
-  fprintf (asmfile, "%s %d,0,0,", ASM_STABN_OP, N_RBRAC);		\
-  assemble_name (asmfile, buf);						\
-  if (TARGET_ELF) {							\
-    fputc ('-', asmfile);						\
-    assemble_name (asmfile, XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0)); \
-  }									\
-  fprintf (asmfile, "\n");						\
-} while (0)
-
-
-/* Define macro used to output shift-double opcodes when the shift
-   count is in %cl.  Some assemblers require %cl as an argument;
-   some don't.
-
-   *OLD* GAS requires the %cl argument, so override i386/unix.h. */
-      
-#undef AS3_SHIFT_DOUBLE
-#define AS3_SHIFT_DOUBLE(a,b,c,d) AS3 (a,b,c,d)
-
-/* Indicate that jump tables go in the text section.  This is
-   necessary when compiling PIC code.  */
-#define JUMP_TABLES_IN_TEXT_SECTION
-
-/* override the exception table positioning */
-#define EXCEPTION_SECTION_FUNCTION \
-do {									\
-  if (TARGET_ELF) {							\
-    named_section (NULL_TREE, ".gcc_except_table");			\
-  } else {								\
-    if (flag_pic)							\
-      data_section ();							\
-    else								\
-      readonly_data_section ();						\
-  }									\
-} while (0);
-
-/* supply our own hook for calling __main() from main() */
-#define GEN_CALL__MAIN \
-  do {									\
-    if (!(TARGET_ELF))							\
-      emit_library_call (gen_rtx (SYMBOL_REF, Pmode, NAME__MAIN), 0,	\
-			 VOIDmode, 0);					\
-  } while (0)
-
-/* Use dollar signs in special g++ assembler names.  */
-#undef NO_DOLLAR_IN_LABEL
-
-/* Map i386 registers to the numbers dwarf expects.  Of course this is different
-   from what stabs expects.  */
-
-#undef DWARF_DBX_REGISTER_NUMBER
-#define DWARF_DBX_REGISTER_NUMBER(n) \
-((n) == 0 ? 0 \
- : (n) == 1 ? 2 \
- : (n) == 2 ? 1 \
- : (n) == 3 ? 3 \
- : (n) == 4 ? 6 \
- : (n) == 5 ? 7 \
- : (n) == 6 ? 5 \
- : (n) == 7 ? 4 \
- : ((n) >= FIRST_STACK_REG && (n) <= LAST_STACK_REG) ? (n)+3 \
- : (-1))
-
-/* Now what stabs expects in the register.  */
-#define STABS_DBX_REGISTER_NUMBER(n) \
-((n) == 0 ? 0 : \
- (n) == 1 ? 2 : \
- (n) == 2 ? 1 : \
- (n) == 3 ? 3 : \
- (n) == 4 ? 6 : \
- (n) == 5 ? 7 : \
- (n) == 6 ? 4 : \
- (n) == 7 ? 5 : \
- (n) + 4)
-
-#undef  DBX_REGISTER_NUMBER
-#define DBX_REGISTER_NUMBER(n)	((write_symbols == DWARF_DEBUG)	\
-				? DWARF_DBX_REGISTER_NUMBER(n)	\
-				: STABS_DBX_REGISTER_NUMBER(n))
-
-/* Tell final.c that we don't need a label passed to mcount.  */
-#define NO_PROFILE_DATA
-
-/* Output assembler code to FILE to increment profiler label # LABELNO
-   for profiling a function entry.  */
-/* Redefine this to not pass an unused label in %edx.  */
-
-#undef FUNCTION_PROFILER
-#define FUNCTION_PROFILER(FILE, LABELNO)  \
-{									\
-  if (flag_pic)								\
-    fprintf (FILE, "\tcall *%s@GOT(%%ebx)\n",				\
-      TARGET_AOUT ? "mcount" : ".mcount");				\
-  else									\
-    fprintf (FILE, "\tcall %s\n", TARGET_AOUT ? "mcount" : ".mcount");	\
-}
-
-#define FUNCTION_PROFILER_EPILOGUE(FILE)  \
-{									\
-  if (TARGET_PROFILER_EPILOGUE)						\
-    {									\
-      if (flag_pic)							\
-	fprintf (FILE, "\tcall *%s@GOT(%%ebx)\n",			\
-	  TARGET_AOUT ? "mexitcount" : ".mexitcount");			\
-      else								\
-	fprintf (FILE, "\tcall %s\n",					\
-	  TARGET_AOUT ? "mexitcount" : ".mexitcount");			\
-    }									\
-}
-
-#undef SIZE_TYPE
-#define SIZE_TYPE "unsigned int"
- 
-#undef PTRDIFF_TYPE
-#define PTRDIFF_TYPE "int"
-  
-#undef WCHAR_TYPE
-#define WCHAR_TYPE "int"
- 
-#define WCHAR_UNSIGNED 0
-
-#undef WCHAR_TYPE_SIZE
-#define WCHAR_TYPE_SIZE BITS_PER_WORD
-
-/* FREEBSD_NATIVE is defined when gcc is integrated into the FreeBSD
-   source tree so it can be configured appropriately without using
-   the GNU configure/build mechanism. */
-
-#ifdef FREEBSD_NATIVE
-
-/* Look for the include files in the system-defined places.  */
-
-#define GPLUSPLUS_INCLUDE_DIR		"/usr/include/g++"
-
-#define GCC_INCLUDE_DIR			"/usr/include"
-
-/* FreeBSD has GCC_INCLUDE_DIR first.  */
-#define INCLUDE_DEFAULTS		\
-  {					\
-    { GCC_INCLUDE_DIR, 0, 0 },		\
-    { GPLUSPLUS_INCLUDE_DIR, 1, 1 },	\
-    { 0, 0, 0 }				\
-  }
-
-/* Under FreeBSD, the normal location of the compiler back ends is the
-   /usr/libexec directory.  */
-
-#define STANDARD_EXEC_PREFIX		"/usr/libexec/"
-
-/* Under FreeBSD, the normal location of the various *crt*.o files is the
-   /usr/lib directory.  */
-
-#define STANDARD_STARTFILE_PREFIX	"/usr/lib/"
-
-/* On FreeBSD, gcc is called 'cc' */
-#define GCC_NAME			"cc"
-
-/* FreeBSD is 4.4BSD derived */
-#define bsd4_4
-
-#endif /* FREEBSD_NATIVE */
-
-#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -D__FreeBSD_cc_version=340000 -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
-
-#undef CPP_SPEC
-#if TARGET_CPU_DEFAULT == 2
-#define CPP_SPEC "\
-%{!maout: -D__ELF__} \
-%{munderscores: -D__UNDERSCORES__} \
-%{maout: %{!mno-underscores: -D__UNDERSCORES__}} \
-%{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!m386:-D__i486__}"
-#else
-#define CPP_SPEC "\
-%{!maout: -D__ELF__} \
-%{munderscores: -D__UNDERSCORES__} \
-%{maout: %{!mno-underscores: -D__UNDERSCORES__}} \
-%{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{m486:-D__i486__}"
-#endif
-
-#undef CC1_SPEC
-#define CC1_SPEC "\
-%{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \
-%{maout: %{!mno-underscores: %{!munderscores: -munderscores }}}"
-
-#undef  ASM_SPEC
-#define ASM_SPEC	"%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}"
-
-/* Like the default, except no -lg, and no -p.  */
-#undef LIB_SPEC
-#define LIB_SPEC "%{!shared:%{!pg:%{!pthread:%{!kthread:-lc}%{kthread:-lpthread -lc}}%{pthread:-lc_r}}%{pg:%{!pthread:%{!kthread:-lc_p}%{kthread:-lpthread_p -lc_p}}%{pthread:-lc_r_p}}}"
-
-/* Let gcc locate this for us according to the -m rules */
-#undef  LIBGCC_SPEC
-#define LIBGCC_SPEC "%{!shared:libgcc.a%s}"
-
-/* Provide a LINK_SPEC appropriate for FreeBSD.  Here we provide support
-   for the special GCC options -static and -shared, which allow us to
-   link things in one of these three modes by applying the appropriate
-   combinations of options at link-time. We like to support here for
-   as many of the other GNU linker options as possible. But I don't
-   have the time to search for those flags. I am sure how to add
-   support for -soname shared_object_name. H.J.
-
-   When the -shared link option is used a final link is not being
-   done.  */
-
-#undef	LINK_SPEC
-#define LINK_SPEC "\
- %{p:%e`-p' not supported; use `-pg' and gprof(1)} \
-  %{maout: %{shared:-Bshareable} \
-    %{!shared:%{!nostdlib:%{!r:%{!e*:-e start}}} -dc -dp %{static:-Bstatic} \
-      %{pg:-Bstatic} %{Z}} \
-    %{assert*} %{R*}} \
-  %{!maout: \
-    -m elf_i386 \
-    %{Wl,*:%*} \
-    %{assert*} %{R*} %{rpath*} %{defsym*} \
-    %{shared:-Bshareable %{h*} %{soname*}} \
-    %{symbolic:-Bsymbolic} \
-    %{!shared: \
-      %{!static: \
-	%{rdynamic: -export-dynamic} \
-	%{!dynamic-linker: -dynamic-linker /usr/libexec/ld-elf.so.1}} \
-      %{static:-Bstatic}}}"
-
-/* Get perform_* macros to build libgcc.a.  */
-#include "i386/perform.h"
-
-#undef STARTFILE_SPEC
-#define STARTFILE_SPEC "\
-  %{maout: %{shared:c++rt0.o%s} \
-    %{!shared:%{pg:gcrt0.o%s}%{!pg:%{static:scrt0.o%s}%{!static:crt0.o%s}}}} \
-  %{!maout:  %{!shared: \
-    %{pg:gcrt1.o%s} %{!pg:%{p:gcrt1.o%s} %{!p:crt1.o%s}}} \
-    crti.o%s %{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}}"
-
-#undef  ENDFILE_SPEC
-#define ENDFILE_SPEC \
-  "%{!maout: %{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s}"
-
-/* This goes away when the math emulator is fixed.  */
-#undef TARGET_DEFAULT
-#define TARGET_DEFAULT	(MASK_NO_FANCY_MATH_387 | 0301)
-
-#define HAVE_ATEXIT
-#define HAVE_PUTENV
-
-/* to assist building libgcc2.c */
-#ifndef __ELF__
-#undef OBJECT_FORMAT_ELF
-#endif
diff --git a/contrib/gcc/config/t-linux b/contrib/gcc/config/t-linux
new file mode 100644
index 000000000000..843fa1bdf79d
--- /dev/null
+++ b/contrib/gcc/config/t-linux
@@ -0,0 +1,10 @@
+# Don't run fixproto
+STMP_FIXPROTO =
+
+# Don't install "assert.h" in gcc. We use the one in glibc.
+INSTALL_ASSERT_H =
+
+# Compile crtbeginS.o and crtendS.o with pic.
+CRTSTUFF_T_CFLAGS_S = -fPIC
+# Compile libgcc2.a with pic.
+TARGET_LIBGCC2_CFLAGS = -fPIC
diff --git a/contrib/gcc/config/t-linux-gnulibc1 b/contrib/gcc/config/t-linux-gnulibc1
new file mode 100644
index 000000000000..e2be684ea239
--- /dev/null
+++ b/contrib/gcc/config/t-linux-gnulibc1
@@ -0,0 +1,13 @@
+# We are building for the Linux C library 5.
+T_CFLAGS = -DUSE_GNULIBC_1
+
+# Don't run fixproto
+STMP_FIXPROTO =
+
+# Don't install "assert.h" in gcc. We use the one in glibc.
+INSTALL_ASSERT_H =
+
+# Compile crtbeginS.o and crtendS.o with pic.
+CRTSTUFF_T_CFLAGS_S = -fPIC
+# Compile libgcc2.a with pic.
+TARGET_LIBGCC2_CFLAGS = -fPIC
diff --git a/contrib/gdb/gdb/29k-share/README b/contrib/gdb/gdb/29k-share/README
new file mode 100644
index 000000000000..5e19715ffad4
--- /dev/null
+++ b/contrib/gdb/gdb/29k-share/README
@@ -0,0 +1,9 @@
+The files in this directory are shared with other debuggers and
+debug interfaces that use Advanced Micro Devices' UDI (universal debug
+interface) protocol.  The protocol provides a common interface among
+debuggers, logic analyzers, emulators, and embedded systems that use
+AMD 29000 family processors.
+
+Do not change these files without coordinating with Advanced Micro
+Devices, Embedded Processor Division, 5204 E. Ben White Blvd, Austin, TX 78741.
+Maybe postmaster@cayman.amd.com can direct you to the current maintainers.
diff --git a/contrib/gdb/gdb/29k-share/udi_soc b/contrib/gdb/gdb/29k-share/udi_soc
new file mode 100644
index 000000000000..343317f255fc
--- /dev/null
+++ b/contrib/gdb/gdb/29k-share/udi_soc
@@ -0,0 +1,9 @@
+# @(#)udi_soc	2.1 Daniel Mann
+# NOTE: the Session string must not start whith white-space characters.
+# Format of string is:
+# <session>   <domain> <soc_name|host_name> <tip_exe> <pass to UDIconnect>
+soc2cayman  AF_INET            cayman      /bin/udi_tip   ...
+soc2tip     AF_UNIX   astring              tip.exe        ...
+cuba        AF_UNIX   soc_name    ../bin.68020/udi_tip    stuff to pass
+cayman      AF_INET   cayman      this_entry_not_matter   stuff to pass
+iss         AF_UNIX   *                  sun4/isstip	-r osboot
diff --git a/contrib/gdb/gdb/config/mips/tm-tx39.h b/contrib/gdb/gdb/config/mips/tm-tx39.h
new file mode 100644
index 000000000000..ee99a2822590
--- /dev/null
+++ b/contrib/gdb/gdb/config/mips/tm-tx39.h
@@ -0,0 +1,39 @@
+/* Copyright (C) 1993 Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#define TARGET_BYTE_ORDER_SELECTABLE_P 1
+#define MIPS_EABI 1
+#define MIPS_DEFAULT_FPU_TYPE MIPS_FPU_NONE
+
+#include "mips/tm-bigmips.h"
+
+#undef  REGISTER_NAMES
+#define REGISTER_NAMES 	\
+    {	"zero",	"at",	"v0",	"v1",	"a0",	"a1",	"a2",	"a3", \
+	"t0",	"t1",	"t2",	"t3",	"t4",	"t5",	"t6",	"t7", \
+	"s0",	"s1",	"s2",	"s3",	"s4",	"s5",	"s6",	"s7", \
+	"t8",	"t9",	"k0",	"k1",	"gp",	"sp",	"s8",	"ra", \
+	"sr",	"lo",	"hi",	"bad",	"cause","pc", \
+	"",   	"",   	"",   	"",   	"",   	"",   	"",   	"", \
+	"",   	"",   	"",  	"",  	"",  	"",  	"",  	"", \
+	"",  	"",  	"",  	"",  	"",  	"",  	"",  	"", \
+	"",  	"",  	"",  	"",  	"",  	"",  	"",  	"", \
+	"",  	"",  	"",	"", \
+	"",	"",	"",	"",	"",	"",	"",	"", \
+	"",	"", "config", "cache", "debug", "depc", "epc",	"" \
+    }
diff --git a/contrib/gdb/gdb/config/mips/tm-tx39l.h b/contrib/gdb/gdb/config/mips/tm-tx39l.h
new file mode 100644
index 000000000000..8ceec7296eae
--- /dev/null
+++ b/contrib/gdb/gdb/config/mips/tm-tx39l.h
@@ -0,0 +1,39 @@
+/* Copyright (C) 1993 Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#define TARGET_BYTE_ORDER_SELECTABLE_P 1
+#define MIPS_EABI 1
+#define MIPS_DEFAULT_FPU_TYPE MIPS_FPU_NONE
+
+#include "mips/tm-mips.h"
+
+#undef  REGISTER_NAMES
+#define REGISTER_NAMES 	\
+    {	"zero",	"at",	"v0",	"v1",	"a0",	"a1",	"a2",	"a3", \
+	"t0",	"t1",	"t2",	"t3",	"t4",	"t5",	"t6",	"t7", \
+	"s0",	"s1",	"s2",	"s3",	"s4",	"s5",	"s6",	"s7", \
+	"t8",	"t9",	"k0",	"k1",	"gp",	"sp",	"s8",	"ra", \
+	"sr",	"lo",	"hi",	"bad",	"cause","pc", \
+	"",   	"",   	"",   	"",   	"",   	"",   	"",   	"", \
+	"",   	"",   	"",  	"",  	"",  	"",  	"",  	"", \
+	"",  	"",  	"",  	"",  	"",  	"",  	"",  	"", \
+	"",  	"",  	"",  	"",  	"",  	"",  	"",  	"", \
+	"",  	"",  	"",	"", \
+	"",	"",	"",	"",	"",	"",	"",	"", \
+	"",	"", "config", "cache", "debug", "depc", "epc",	"" \
+    }
diff --git a/contrib/gdb/gdb/config/mips/tm-vr4100.h b/contrib/gdb/gdb/config/mips/tm-vr4100.h
new file mode 100644
index 000000000000..843f49c2222d
--- /dev/null
+++ b/contrib/gdb/gdb/config/mips/tm-vr4100.h
@@ -0,0 +1,25 @@
+/* Copyright (C) 1998 Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#define TARGET_BYTE_ORDER_SELECTABLE_P 1
+#define MIPS_EABI 1
+#define MIPS_DEFAULT_FPU_TYPE MIPS_FPU_NONE
+#define TARGET_MONITOR_PROMPT "<RISQ> "
+#define TARGET_PTR_BIT 64
+
+#include "mips/tm-bigmips64.h"
diff --git a/contrib/gdb/gdb/config/mips/tm-vr5000.h b/contrib/gdb/gdb/config/mips/tm-vr5000.h
new file mode 100644
index 000000000000..b834a7762fc8
--- /dev/null
+++ b/contrib/gdb/gdb/config/mips/tm-vr5000.h
@@ -0,0 +1,23 @@
+/* Copyright (C) 1996 Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#define TARGET_BYTE_ORDER_SELECTABLE_P 1
+#define TARGET_MONITOR_PROMPT "<RISQ> "
+#define MIPS_EABI 1
+
+#include "mips/tm-bigmips64.h"
diff --git a/contrib/gdb/gdb/config/mips/tm-vr5000el.h b/contrib/gdb/gdb/config/mips/tm-vr5000el.h
new file mode 100644
index 000000000000..c6897d12ee1d
--- /dev/null
+++ b/contrib/gdb/gdb/config/mips/tm-vr5000el.h
@@ -0,0 +1,23 @@
+/* Copyright (C) 1996 Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#define TARGET_BYTE_ORDER_SELECTABLE_P 1
+#define TARGET_MONITOR_PROMPT "<RISQ> "
+#define MIPS_EABI 1
+
+#include "mips/tm-mips64.h"
diff --git a/contrib/gdb/gdb/config/mips/tx39.mt b/contrib/gdb/gdb/config/mips/tx39.mt
new file mode 100644
index 000000000000..8b4c1a92c244
--- /dev/null
+++ b/contrib/gdb/gdb/config/mips/tx39.mt
@@ -0,0 +1,5 @@
+# Target: Big-endian mips board, typically an IDT.
+TDEPFILES= mips-tdep.o remote-mips.o dve3900-rom.o monitor.o dsrec.o
+TM_FILE= tm-tx39.h
+SIM_OBS = remote-sim.o
+SIM = ../sim/mips/libsim.a
diff --git a/contrib/gdb/gdb/config/mips/tx39l.mt b/contrib/gdb/gdb/config/mips/tx39l.mt
new file mode 100644
index 000000000000..35083293d458
--- /dev/null
+++ b/contrib/gdb/gdb/config/mips/tx39l.mt
@@ -0,0 +1,5 @@
+# Target: Big-endian mips board, typically an IDT.
+TDEPFILES= mips-tdep.o remote-mips.o dve3900-rom.o monitor.o dsrec.o
+TM_FILE= tm-tx39l.h
+SIM_OBS = remote-sim.o
+SIM = ../sim/mips/libsim.a
diff --git a/contrib/gdb/gdb/config/mips/vr4100.mt b/contrib/gdb/gdb/config/mips/vr4100.mt
new file mode 100644
index 000000000000..c5ae4f94a6dd
--- /dev/null
+++ b/contrib/gdb/gdb/config/mips/vr4100.mt
@@ -0,0 +1,5 @@
+# Target: Big-endian SIM monitor board.
+TDEPFILES= mips-tdep.o remote-mips.o
+TM_FILE= tm-vr4100.h
+SIM_OBS = remote-sim.o
+SIM = ../sim/mips/libsim.a
diff --git a/contrib/gdb/gdb/config/mips/vr5000.mt b/contrib/gdb/gdb/config/mips/vr5000.mt
new file mode 100644
index 000000000000..316c548de093
--- /dev/null
+++ b/contrib/gdb/gdb/config/mips/vr5000.mt
@@ -0,0 +1,7 @@
+# Target: Big-endian SIM monitor board.
+TDEPFILES= mips-tdep.o remote-mips.o
+TM_FILE= tm-vr5000.h
+SIM_OBS = remote-sim.o
+SIM = ../sim/mips/libsim.a
+GDBSERVER_DEPFILES= low-sim.o
+GDBSERVER_LIBS = ../../sim/mips/libsim.a ../../bfd/libbfd.a ../../libiberty/libiberty.a -lm
diff --git a/contrib/gdb/gdb/config/mips/vr5000el.mt b/contrib/gdb/gdb/config/mips/vr5000el.mt
new file mode 100644
index 000000000000..99687edcefc2
--- /dev/null
+++ b/contrib/gdb/gdb/config/mips/vr5000el.mt
@@ -0,0 +1,5 @@
+# Target: Little-endian SIM monitor board.
+TDEPFILES= mips-tdep.o remote-mips.o
+TM_FILE= tm-vr5000el.h
+SIM_OBS = remote-sim.o
+SIM = ../sim/mips/libsim.a
diff --git a/contrib/gdb/gdb/d10v-tdep.c b/contrib/gdb/gdb/d10v-tdep.c
new file mode 100644
index 000000000000..f4b52f62295b
--- /dev/null
+++ b/contrib/gdb/gdb/d10v-tdep.c
@@ -0,0 +1,1028 @@
+/* Target-dependent code for Mitsubishi D10V, for GDB.
+   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/*  Contributed by Martin Hunt, hunt@cygnus.com */
+
+#include "defs.h"
+#include "frame.h"
+#include "obstack.h"
+#include "symtab.h"
+#include "gdbtypes.h"
+#include "gdbcmd.h"
+#include "gdbcore.h"
+#include "gdb_string.h"
+#include "value.h"
+#include "inferior.h"
+#include "dis-asm.h"  
+#include "symfile.h"
+#include "objfiles.h"
+
+void d10v_frame_find_saved_regs PARAMS ((struct frame_info *fi,
+					 struct frame_saved_regs *fsr));
+
+int
+d10v_frame_chain_valid (chain, frame)
+     CORE_ADDR chain;
+     struct frame_info *frame;      /* not used here */
+{
+  return ((chain) != 0 && (frame) != 0 && (frame)->pc > IMEM_START);
+}
+
+
+/* Should we use EXTRACT_STRUCT_VALUE_ADDRESS instead of
+   EXTRACT_RETURN_VALUE?  GCC_P is true if compiled with gcc
+   and TYPE is the type (which is known to be struct, union or array).
+
+   The d10v returns anything less than 8 bytes in size in
+   registers. */
+
+int
+d10v_use_struct_convention (gcc_p, type)
+     int gcc_p;
+     struct type *type;
+{
+  return (TYPE_LENGTH (type) > 8);
+}
+
+
+/* Discard from the stack the innermost frame, restoring all saved
+   registers.  */
+
+void
+d10v_pop_frame (frame)
+     struct frame_info *frame;
+{
+  CORE_ADDR fp;
+  int regnum;
+  struct frame_saved_regs fsr;
+  char raw_buffer[8];
+
+  fp = FRAME_FP (frame);
+  /* fill out fsr with the address of where each */
+  /* register was stored in the frame */
+  get_frame_saved_regs (frame, &fsr);
+  
+  /* now update the current registers with the old values */
+  for (regnum = A0_REGNUM; regnum < A0_REGNUM+2 ; regnum++)
+    {
+      if (fsr.regs[regnum])
+	{
+	  read_memory (fsr.regs[regnum], raw_buffer,  REGISTER_RAW_SIZE(regnum));
+	  write_register_bytes (REGISTER_BYTE (regnum), raw_buffer,  REGISTER_RAW_SIZE(regnum));
+	}
+    }
+  for (regnum = 0; regnum < SP_REGNUM; regnum++)
+    {
+      if (fsr.regs[regnum])
+	{
+	  write_register (regnum, read_memory_unsigned_integer (fsr.regs[regnum], REGISTER_RAW_SIZE(regnum)));
+	}
+    }
+  if (fsr.regs[PSW_REGNUM])
+    {
+      write_register (PSW_REGNUM, read_memory_unsigned_integer (fsr.regs[PSW_REGNUM], REGISTER_RAW_SIZE(PSW_REGNUM)));
+    }
+
+  write_register (PC_REGNUM, read_register (LR_REGNUM));
+  write_register (SP_REGNUM, fp + frame->size);
+  target_store_registers (-1);
+  flush_cached_frames ();
+}
+
+static int 
+check_prologue (op)
+     unsigned short op;
+{
+  /* st  rn, @-sp */
+  if ((op & 0x7E1F) == 0x6C1F)
+    return 1;
+
+  /* st2w  rn, @-sp */
+  if ((op & 0x7E3F) == 0x6E1F)
+    return 1;
+
+  /* subi  sp, n */
+  if ((op & 0x7FE1) == 0x01E1)
+    return 1;
+
+  /* mv  r11, sp */
+  if (op == 0x417E)
+    return 1;
+
+  /* nop */
+  if (op == 0x5E00)
+    return 1;
+
+  /* st  rn, @sp */
+  if ((op & 0x7E1F) == 0x681E)
+    return 1;
+
+  /* st2w  rn, @sp */
+ if ((op & 0x7E3F) == 0x3A1E)
+   return 1;
+
+  return 0;
+}
+
+CORE_ADDR
+d10v_skip_prologue (pc)
+     CORE_ADDR pc;
+{
+  unsigned long op;
+  unsigned short op1, op2;
+  CORE_ADDR func_addr, func_end;
+  struct symtab_and_line sal;
+
+  /* If we have line debugging information, then the end of the */
+  /* prologue should the first assembly instruction of  the first source line */
+  if (find_pc_partial_function (pc, NULL, &func_addr, &func_end))
+    {
+      sal = find_pc_line (func_addr, 0);
+      if ( sal.end && sal.end < func_end)
+	return sal.end;
+    }
+  
+  if (target_read_memory (pc, (char *)&op, 4))
+    return pc;			/* Can't access it -- assume no prologue. */
+
+  while (1)
+    {
+      op = (unsigned long)read_memory_integer (pc, 4);
+      if ((op & 0xC0000000) == 0xC0000000)
+	{
+	  /* long instruction */
+	  if ( ((op & 0x3FFF0000) != 0x01FF0000) &&   /* add3 sp,sp,n */
+	       ((op & 0x3F0F0000) != 0x340F0000) &&   /* st  rn, @(offset,sp) */
+ 	       ((op & 0x3F1F0000) != 0x350F0000))     /* st2w  rn, @(offset,sp) */
+	    break;
+	}
+      else
+	{
+	  /* short instructions */
+	  if ((op & 0xC0000000) == 0x80000000)
+	    {
+	      op2 = (op & 0x3FFF8000) >> 15;
+	      op1 = op & 0x7FFF;
+	    } 
+	  else 
+	    {
+	      op1 = (op & 0x3FFF8000) >> 15;
+	      op2 = op & 0x7FFF;
+	    }
+	  if (check_prologue(op1))
+	    {
+	      if (!check_prologue(op2))
+		{
+		  /* if the previous opcode was really part of the prologue */
+		  /* and not just a NOP, then we want to break after both instructions */
+		  if (op1 != 0x5E00)
+		    pc += 4;
+		  break;
+		}
+	    }
+	  else
+	    break;
+	}
+      pc += 4;
+    }
+  return pc;
+}
+
+/* Given a GDB frame, determine the address of the calling function's frame.
+   This will be used to create a new GDB frame struct, and then
+   INIT_EXTRA_FRAME_INFO and INIT_FRAME_PC will be called for the new frame.
+*/
+
+CORE_ADDR
+d10v_frame_chain (frame)
+     struct frame_info *frame;
+{
+  struct frame_saved_regs fsr;
+
+  d10v_frame_find_saved_regs (frame, &fsr);
+
+  if (frame->return_pc == IMEM_START || inside_entry_file(frame->return_pc))
+    return (CORE_ADDR)0;
+
+  if (!fsr.regs[FP_REGNUM])
+    {
+      if (!fsr.regs[SP_REGNUM] || fsr.regs[SP_REGNUM] == STACK_START)
+	return (CORE_ADDR)0;
+      
+      return fsr.regs[SP_REGNUM];
+    }
+
+  if (!read_memory_unsigned_integer(fsr.regs[FP_REGNUM], REGISTER_RAW_SIZE(FP_REGNUM)))
+    return (CORE_ADDR)0;
+
+  return D10V_MAKE_DADDR (read_memory_unsigned_integer (fsr.regs[FP_REGNUM], REGISTER_RAW_SIZE (FP_REGNUM)));
+}  
+
+static int next_addr, uses_frame;
+
+static int 
+prologue_find_regs (op, fsr, addr)
+     unsigned short op;
+     struct frame_saved_regs *fsr;
+     CORE_ADDR addr;
+{
+  int n;
+
+  /* st  rn, @-sp */
+  if ((op & 0x7E1F) == 0x6C1F)
+    {
+      n = (op & 0x1E0) >> 5;
+      next_addr -= 2;
+      fsr->regs[n] = next_addr;
+      return 1;
+    }
+
+  /* st2w  rn, @-sp */
+  else if ((op & 0x7E3F) == 0x6E1F)
+    {
+      n = (op & 0x1E0) >> 5;
+      next_addr -= 4;
+      fsr->regs[n] = next_addr;
+      fsr->regs[n+1] = next_addr+2;
+      return 1;
+    }
+
+  /* subi  sp, n */
+  if ((op & 0x7FE1) == 0x01E1)
+    {
+      n = (op & 0x1E) >> 1;
+      if (n == 0)
+	n = 16;
+      next_addr -= n;
+      return 1;
+    }
+
+  /* mv  r11, sp */
+  if (op == 0x417E)
+    {
+      uses_frame = 1;
+      return 1;
+    }
+
+  /* nop */
+  if (op == 0x5E00)
+    return 1;
+
+  /* st  rn, @sp */
+  if ((op & 0x7E1F) == 0x681E)
+    {
+      n = (op & 0x1E0) >> 5;
+      fsr->regs[n] = next_addr;
+      return 1;
+    }
+
+  /* st2w  rn, @sp */
+  if ((op & 0x7E3F) == 0x3A1E)
+    {
+      n = (op & 0x1E0) >> 5;
+      fsr->regs[n] = next_addr;
+      fsr->regs[n+1] = next_addr+2;
+      return 1;
+    }
+
+  return 0;
+}
+
+/* Put here the code to store, into a struct frame_saved_regs, the
+   addresses of the saved registers of frame described by FRAME_INFO.
+   This includes special registers such as pc and fp saved in special
+   ways in the stack frame.  sp is even more special: the address we
+   return for it IS the sp for the next frame. */
+void
+d10v_frame_find_saved_regs (fi, fsr)
+     struct frame_info *fi;
+     struct frame_saved_regs *fsr;
+{
+  CORE_ADDR fp, pc;
+  unsigned long op;
+  unsigned short op1, op2;
+  int i;
+
+  fp = fi->frame;
+  memset (fsr, 0, sizeof (*fsr));
+  next_addr = 0;
+
+  pc = get_pc_function_start (fi->pc);
+
+  uses_frame = 0;
+  while (1)
+    {
+      op = (unsigned long)read_memory_integer (pc, 4);
+      if ((op & 0xC0000000) == 0xC0000000)
+	{
+	  /* long instruction */
+	  if ((op & 0x3FFF0000) == 0x01FF0000)
+	    {
+	      /* add3 sp,sp,n */
+	      short n = op & 0xFFFF;
+	      next_addr += n;
+	    }
+	  else if ((op & 0x3F0F0000) == 0x340F0000)
+	    {
+	      /* st  rn, @(offset,sp) */
+	      short offset = op & 0xFFFF;
+	      short n = (op >> 20) & 0xF;
+	      fsr->regs[n] = next_addr + offset;
+	    }
+	  else if ((op & 0x3F1F0000) == 0x350F0000)
+	    {
+	      /* st2w  rn, @(offset,sp) */
+	      short offset = op & 0xFFFF;
+	      short n = (op >> 20) & 0xF;
+	      fsr->regs[n] = next_addr + offset;
+	      fsr->regs[n+1] = next_addr + offset + 2;
+	    }
+	  else
+	    break;
+	}
+      else
+	{
+	  /* short instructions */
+	  if ((op & 0xC0000000) == 0x80000000)
+	    {
+	      op2 = (op & 0x3FFF8000) >> 15;
+	      op1 = op & 0x7FFF;
+	    } 
+	  else 
+	    {
+	      op1 = (op & 0x3FFF8000) >> 15;
+	      op2 = op & 0x7FFF;
+	    }
+	  if (!prologue_find_regs(op1,fsr,pc) || !prologue_find_regs(op2,fsr,pc))
+	    break;
+	}
+      pc += 4;
+    }
+  
+  fi->size = -next_addr;
+
+  if (!(fp & 0xffff))
+    fp = D10V_MAKE_DADDR (read_register(SP_REGNUM));
+
+  for (i=0; i<NUM_REGS-1; i++)
+    if (fsr->regs[i])
+      {
+	fsr->regs[i] = fp - (next_addr - fsr->regs[i]); 
+      }
+
+  if (fsr->regs[LR_REGNUM])
+    {
+      CORE_ADDR return_pc = read_memory_unsigned_integer (fsr->regs[LR_REGNUM], REGISTER_RAW_SIZE (LR_REGNUM));
+      fi->return_pc = D10V_MAKE_IADDR (return_pc);
+    }
+  else
+    {
+      fi->return_pc = D10V_MAKE_IADDR (read_register(LR_REGNUM));
+    }
+  
+  /* th SP is not normally (ever?) saved, but check anyway */
+  if (!fsr->regs[SP_REGNUM])
+    {
+      /* if the FP was saved, that means the current FP is valid, */
+      /* otherwise, it isn't being used, so we use the SP instead */
+      if (uses_frame)
+	fsr->regs[SP_REGNUM] = read_register(FP_REGNUM) + fi->size;
+      else
+	{
+	  fsr->regs[SP_REGNUM] = fp + fi->size;
+	  fi->frameless = 1;
+	  fsr->regs[FP_REGNUM] = 0;
+	}
+    }
+}
+
+void
+d10v_init_extra_frame_info (fromleaf, fi)
+     int fromleaf;
+     struct frame_info *fi;
+{
+  fi->frameless = 0;
+  fi->size = 0;
+  fi->return_pc = 0;
+
+  /* The call dummy doesn't save any registers on the stack, so we can
+     return now.  */
+  if (PC_IN_CALL_DUMMY (fi->pc, fi->frame, fi->frame))
+    {
+      return;
+    }
+  else
+    {
+      struct frame_saved_regs dummy;
+      d10v_frame_find_saved_regs (fi, &dummy);
+    }
+}
+
+static void
+show_regs (args, from_tty)
+     char *args;
+     int from_tty;
+{
+  int a;
+  printf_filtered ("PC=%04x (0x%x) PSW=%04x RPT_S=%04x RPT_E=%04x RPT_C=%04x\n",
+                   read_register (PC_REGNUM), D10V_MAKE_IADDR (read_register (PC_REGNUM)),
+                   read_register (PSW_REGNUM),
+                   read_register (24),
+                   read_register (25),
+                   read_register (23));
+  printf_filtered ("R0-R7  %04x %04x %04x %04x %04x %04x %04x %04x\n",
+                   read_register (0),
+                   read_register (1),
+                   read_register (2),
+                   read_register (3),
+                   read_register (4),
+                   read_register (5),
+                   read_register (6),
+                   read_register (7));
+  printf_filtered ("R8-R15 %04x %04x %04x %04x %04x %04x %04x %04x\n",
+                   read_register (8), 
+                   read_register (9),
+                   read_register (10),
+                   read_register (11),
+                   read_register (12),
+                   read_register (13),
+                   read_register (14),
+                   read_register (15));
+  printf_filtered ("IMAP0 %04x    IMAP1 %04x    DMAP %04x\n",
+                   read_register (IMAP0_REGNUM),
+                   read_register (IMAP1_REGNUM),
+                   read_register (DMAP_REGNUM));
+  printf_filtered ("A0-A1");
+  for (a = A0_REGNUM; a <= A0_REGNUM + 1; a++)
+    {
+      char num[MAX_REGISTER_RAW_SIZE];
+      int i;
+      printf_filtered ("  ");
+      read_register_gen (a, (char *)&num);
+      for (i = 0; i < MAX_REGISTER_RAW_SIZE; i++)
+	{
+	  printf_filtered ("%02x", (num[i] & 0xff));
+	}
+    }
+  printf_filtered ("\n");
+}
+
+CORE_ADDR
+d10v_read_pc (pid)
+     int pid;
+{
+  int save_pid;
+  CORE_ADDR pc;
+  CORE_ADDR retval;
+
+  save_pid = inferior_pid;
+  inferior_pid = pid;
+  pc = (int) read_register (PC_REGNUM);
+  inferior_pid = save_pid;
+  retval = D10V_MAKE_IADDR (pc);
+  return retval;
+}
+
+void
+d10v_write_pc (val, pid)
+     CORE_ADDR val;
+     int pid;
+{
+  int save_pid;
+
+  save_pid = inferior_pid;
+  inferior_pid = pid;
+  write_register (PC_REGNUM, D10V_CONVERT_IADDR_TO_RAW (val));
+  inferior_pid = save_pid;
+}
+
+CORE_ADDR
+d10v_read_sp ()
+{
+  return (D10V_MAKE_DADDR (read_register (SP_REGNUM)));
+}
+
+void
+d10v_write_sp (val)
+     CORE_ADDR val;
+{
+  write_register (SP_REGNUM, D10V_CONVERT_DADDR_TO_RAW (val));
+}
+
+void
+d10v_write_fp (val)
+     CORE_ADDR val;
+{
+  write_register (FP_REGNUM, D10V_CONVERT_DADDR_TO_RAW (val));
+}
+
+CORE_ADDR
+d10v_read_fp ()
+{
+  return (D10V_MAKE_DADDR (read_register(FP_REGNUM)));
+}
+
+/* Function: push_return_address (pc)
+   Set up the return address for the inferior function call.
+   Needed for targets where we don't actually execute a JSR/BSR instruction */
+ 
+CORE_ADDR
+d10v_push_return_address (pc, sp)
+     CORE_ADDR pc;
+     CORE_ADDR sp;
+{
+  write_register (LR_REGNUM, D10V_CONVERT_IADDR_TO_RAW (CALL_DUMMY_ADDRESS ()));
+  return sp;
+}
+ 
+
+CORE_ADDR
+d10v_push_arguments (nargs, args, sp, struct_return, struct_addr)
+     int nargs;
+     value_ptr *args;
+     CORE_ADDR sp;
+     int struct_return;
+     CORE_ADDR struct_addr;
+{
+  int i;
+  int regnum = ARG1_REGNUM;
+  
+  /* Fill in registers and arg lists */
+  for (i = 0; i < nargs; i++)
+    {
+      value_ptr arg = args[i];
+      struct type *type = check_typedef (VALUE_TYPE (arg));
+      char *contents = VALUE_CONTENTS (arg);
+      int len = TYPE_LENGTH (type);
+      /* printf ("push: type=%d len=%d\n", type->code, len); */
+      if (TYPE_CODE (type) == TYPE_CODE_PTR)
+	{
+	  /* pointers require special handling - first convert and
+	     then store */
+	  long val = extract_signed_integer (contents, len);
+	  len = 2;
+	  if (TYPE_TARGET_TYPE (type)
+	      && (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_FUNC))
+	    {
+	      /* function pointer */
+	      val = D10V_CONVERT_IADDR_TO_RAW (val);
+	    }
+	  else if (D10V_IADDR_P (val))
+	    {
+	      /* also function pointer! */
+	      val = D10V_CONVERT_DADDR_TO_RAW (val);
+	    }
+	  else
+	    {
+	      /* data pointer */
+	      val &= 0xFFFF;
+	    }
+	  if (regnum <= ARGN_REGNUM)
+	    write_register (regnum++, val & 0xffff);
+	  else
+	    {
+	      char ptr[2];
+	      sp -= 2;
+	      store_address (ptr, val & 0xffff, 2);
+	      write_memory (sp, ptr, 2);
+	    }
+	}
+      else
+	{
+	  int aligned_regnum = (regnum + 1) & ~1;
+	  if (len <= 2 && regnum <= ARGN_REGNUM)
+	    /* fits in a single register, do not align */
+	    {
+	      long val = extract_unsigned_integer (contents, len);
+	      write_register (regnum++, val);
+	    }
+	  else if (len <= (ARGN_REGNUM - aligned_regnum + 1) * 2)
+	    /* value fits in remaining registers, store keeping left
+               aligned */
+	    {
+	      int b;
+	      regnum = aligned_regnum;
+	      for (b = 0; b < (len & ~1); b += 2)
+		{
+		  long val = extract_unsigned_integer (&contents[b], 2);
+		  write_register (regnum++, val);
+		}
+	      if (b < len)
+		{
+		  long val = extract_unsigned_integer (&contents[b], 1);
+		  write_register (regnum++, (val << 8));
+		}
+	    }
+	  else
+	    {
+	      /* arg goes straight on stack */
+	      regnum = ARGN_REGNUM + 1;
+	      sp = (sp - len) & ~1;
+	      write_memory (sp, contents, len);
+	    }
+	}
+    }
+  return sp;
+}
+
+
+/* Given a return value in `regbuf' with a type `valtype', 
+   extract and copy its value into `valbuf'.  */
+
+void
+d10v_extract_return_value (type, regbuf, valbuf)
+     struct type *type;
+     char regbuf[REGISTER_BYTES];
+     char *valbuf;
+{
+  int len;
+  /*    printf("RET: TYPE=%d len=%d r%d=0x%x\n",type->code, TYPE_LENGTH (type), RET1_REGNUM - R0_REGNUM, (int) extract_unsigned_integer (regbuf + REGISTER_BYTE(RET1_REGNUM), REGISTER_RAW_SIZE (RET1_REGNUM)));  */
+  if (TYPE_CODE (type) == TYPE_CODE_PTR
+      && TYPE_TARGET_TYPE (type)
+      && (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_FUNC))
+    {
+      /* pointer to function */
+      int num;
+      short snum;
+      snum = extract_address (regbuf + REGISTER_BYTE (RET1_REGNUM), REGISTER_RAW_SIZE (RET1_REGNUM));
+      store_address ( valbuf, 4, D10V_MAKE_IADDR(snum));
+    }
+  else if (TYPE_CODE(type) == TYPE_CODE_PTR)
+    {
+      /* pointer to data */
+      int num;
+      short snum;
+      snum = extract_address (regbuf + REGISTER_BYTE (RET1_REGNUM), REGISTER_RAW_SIZE (RET1_REGNUM));
+      store_address ( valbuf, 4, D10V_MAKE_DADDR(snum));
+    }
+  else
+    {
+      len = TYPE_LENGTH (type);
+      if (len == 1)
+	{
+	  unsigned short c = extract_unsigned_integer (regbuf + REGISTER_BYTE (RET1_REGNUM), REGISTER_RAW_SIZE (RET1_REGNUM));
+	  store_unsigned_integer (valbuf, 1, c);
+	}
+      else if ((len & 1) == 0)
+	memcpy (valbuf, regbuf + REGISTER_BYTE (RET1_REGNUM), len);
+      else
+	{
+	  /* For return values of odd size, the first byte is in the
+             least significant part of the first register.  The
+             remaining bytes in remaining registers. Interestingly,
+             when such values are passed in, the last byte is in the
+             most significant byte of that same register - wierd. */
+	  memcpy (valbuf, regbuf + REGISTER_BYTE (RET1_REGNUM) + 1, len);
+	}
+    }
+}
+
+/* The following code implements access to, and display of, the D10V's
+   instruction trace buffer.  The buffer consists of 64K or more
+   4-byte words of data, of which each words includes an 8-bit count,
+   an 8-bit segment number, and a 16-bit instruction address.
+
+   In theory, the trace buffer is continuously capturing instruction
+   data that the CPU presents on its "debug bus", but in practice, the
+   ROMified GDB stub only enables tracing when it continues or steps
+   the program, and stops tracing when the program stops; so it
+   actually works for GDB to read the buffer counter out of memory and
+   then read each trace word.  The counter records where the tracing
+   stops, but there is no record of where it started, so we remember
+   the PC when we resumed and then search backwards in the trace
+   buffer for a word that includes that address.  This is not perfect,
+   because you will miss trace data if the resumption PC is the target
+   of a branch.  (The value of the buffer counter is semi-random, any
+   trace data from a previous program stop is gone.)  */
+
+/* The address of the last word recorded in the trace buffer.  */
+
+#define DBBC_ADDR (0xd80000)
+
+/* The base of the trace buffer, at least for the "Board_0".  */
+
+#define TRACE_BUFFER_BASE (0xf40000)
+
+static void trace_command PARAMS ((char *, int));
+
+static void untrace_command PARAMS ((char *, int));
+
+static void trace_info PARAMS ((char *, int));
+
+static void tdisassemble_command PARAMS ((char *, int));
+
+static void display_trace PARAMS ((int, int));
+
+/* True when instruction traces are being collected.  */
+
+static int tracing;
+
+/* Remembered PC.  */
+
+static CORE_ADDR last_pc;
+
+/* True when trace output should be displayed whenever program stops.  */
+
+static int trace_display;
+
+/* True when trace listing should include source lines.  */
+
+static int default_trace_show_source = 1;
+
+struct trace_buffer {
+  int size;
+  short *counts;
+  CORE_ADDR *addrs;
+} trace_data;
+
+static void
+trace_command (args, from_tty)
+     char *args;
+     int from_tty;
+{
+  /* Clear the host-side trace buffer, allocating space if needed.  */
+  trace_data.size = 0;
+  if (trace_data.counts == NULL)
+    trace_data.counts = (short *) xmalloc (65536 * sizeof(short));
+  if (trace_data.addrs == NULL)
+    trace_data.addrs = (CORE_ADDR *) xmalloc (65536 * sizeof(CORE_ADDR));
+
+  tracing = 1;
+
+  printf_filtered ("Tracing is now on.\n");
+}
+
+static void
+untrace_command (args, from_tty)
+     char *args;
+     int from_tty;
+{
+  tracing = 0;
+
+  printf_filtered ("Tracing is now off.\n");
+}
+
+static void
+trace_info (args, from_tty)
+     char *args;
+     int from_tty;
+{
+  int i;
+
+  if (trace_data.size)
+    {
+      printf_filtered ("%d entries in trace buffer:\n", trace_data.size);
+
+      for (i = 0; i < trace_data.size; ++i)
+	{
+	  printf_filtered ("%d: %d instruction%s at 0x%x\n",
+			   i, trace_data.counts[i],
+			   (trace_data.counts[i] == 1 ? "" : "s"),
+			   trace_data.addrs[i]);
+	}
+    }
+  else
+    printf_filtered ("No entries in trace buffer.\n");
+
+  printf_filtered ("Tracing is currently %s.\n", (tracing ? "on" : "off"));
+}
+
+/* Print the instruction at address MEMADDR in debugged memory,
+   on STREAM.  Returns length of the instruction, in bytes.  */
+
+static int
+print_insn (memaddr, stream)
+     CORE_ADDR memaddr;
+     GDB_FILE *stream;
+{
+  /* If there's no disassembler, something is very wrong.  */
+  if (tm_print_insn == NULL)
+    abort ();
+
+  if (TARGET_BYTE_ORDER == BIG_ENDIAN)
+    tm_print_insn_info.endian = BFD_ENDIAN_BIG;
+  else
+    tm_print_insn_info.endian = BFD_ENDIAN_LITTLE;
+  return (*tm_print_insn) (memaddr, &tm_print_insn_info);
+}
+
+void
+d10v_eva_prepare_to_trace ()
+{
+  if (!tracing)
+    return;
+
+  last_pc = read_register (PC_REGNUM);
+}
+
+/* Collect trace data from the target board and format it into a form
+   more useful for display.  */
+
+void
+d10v_eva_get_trace_data ()
+{
+  int count, i, j, oldsize;
+  int trace_addr, trace_seg, trace_cnt, next_cnt;
+  unsigned int last_trace, trace_word, next_word;
+  unsigned int *tmpspace;
+
+  if (!tracing)
+    return;
+
+  tmpspace = xmalloc (65536 * sizeof(unsigned int));
+
+  last_trace = read_memory_unsigned_integer (DBBC_ADDR, 2) << 2;
+
+  /* Collect buffer contents from the target, stopping when we reach
+     the word recorded when execution resumed.  */
+
+  count = 0;
+  while (last_trace > 0)
+    {
+      QUIT;
+      trace_word =
+	read_memory_unsigned_integer (TRACE_BUFFER_BASE + last_trace, 4);
+      trace_addr = trace_word & 0xffff;
+      last_trace -= 4;
+      /* Ignore an apparently nonsensical entry.  */
+      if (trace_addr == 0xffd5)
+	continue;
+      tmpspace[count++] = trace_word;
+      if (trace_addr == last_pc)
+	break;
+      if (count > 65535)
+	break;
+    }
+
+  /* Move the data to the host-side trace buffer, adjusting counts to
+     include the last instruction executed and transforming the address
+     into something that GDB likes.  */
+
+  for (i = 0; i < count; ++i)
+    {
+      trace_word = tmpspace[i];
+      next_word = ((i == 0) ? 0 : tmpspace[i - 1]);
+      trace_addr = trace_word & 0xffff;
+      next_cnt = (next_word >> 24) & 0xff;
+      j = trace_data.size + count - i - 1;
+      trace_data.addrs[j] = (trace_addr << 2) + 0x1000000;
+      trace_data.counts[j] = next_cnt + 1;
+    }
+
+  oldsize = trace_data.size;
+  trace_data.size += count;
+
+  free (tmpspace);
+
+  if (trace_display)
+    display_trace (oldsize, trace_data.size);
+}
+
+static void
+tdisassemble_command (arg, from_tty)
+     char *arg;
+     int from_tty;
+{
+  int i, count;
+  CORE_ADDR low, high;
+  char *space_index;
+
+  if (!arg)
+    {
+      low = 0;
+      high = trace_data.size;
+    }
+  else if (!(space_index = (char *) strchr (arg, ' ')))
+    {
+      low = parse_and_eval_address (arg);
+      high = low + 5;
+    }
+  else
+    {
+      /* Two arguments.  */
+      *space_index = '\0';
+      low = parse_and_eval_address (arg);
+      high = parse_and_eval_address (space_index + 1);
+      if (high < low)
+	high = low;
+    }
+
+  printf_filtered ("Dump of trace from %d to %d:\n", low, high);
+
+  display_trace (low, high);
+
+  printf_filtered ("End of trace dump.\n");
+  gdb_flush (gdb_stdout);
+}
+
+static void
+display_trace (low, high)
+     int low, high;
+{
+  int i, count, trace_show_source, first, suppress;
+  CORE_ADDR next_address;
+
+  trace_show_source = default_trace_show_source;
+  if (!have_full_symbols () && !have_partial_symbols())
+    {
+      trace_show_source = 0;
+      printf_filtered ("No symbol table is loaded.  Use the \"file\" command.\n");
+      printf_filtered ("Trace will not display any source.\n");
+    }
+
+  first = 1;
+  suppress = 0;
+  for (i = low; i < high; ++i)
+    {
+      next_address = trace_data.addrs[i];
+      count = trace_data.counts[i]; 
+      while (count-- > 0)
+	{
+	  QUIT;
+	  if (trace_show_source)
+	    {
+	      struct symtab_and_line sal, sal_prev;
+
+	      sal_prev = find_pc_line (next_address - 4, 0);
+	      sal = find_pc_line (next_address, 0);
+
+	      if (sal.symtab)
+		{
+		  if (first || sal.line != sal_prev.line)
+		    print_source_lines (sal.symtab, sal.line, sal.line + 1, 0);
+		  suppress = 0;
+		}
+	      else
+		{
+		  if (!suppress)
+		    /* FIXME-32x64--assumes sal.pc fits in long.  */
+		    printf_filtered ("No source file for address %s.\n",
+				     local_hex_string((unsigned long) sal.pc));
+		  suppress = 1;
+		}
+	    }
+	  first = 0;
+	  print_address (next_address, gdb_stdout);
+	  printf_filtered (":");
+	  printf_filtered ("\t");
+	  wrap_here ("    ");
+	  next_address = next_address + print_insn (next_address, gdb_stdout);
+	  printf_filtered ("\n");
+	  gdb_flush (gdb_stdout);
+	}
+    }
+}
+
+extern void (*target_resume_hook) PARAMS ((void));
+extern void (*target_wait_loop_hook) PARAMS ((void));
+
+void
+_initialize_d10v_tdep ()
+{
+  tm_print_insn = print_insn_d10v;
+
+  target_resume_hook = d10v_eva_prepare_to_trace;
+  target_wait_loop_hook = d10v_eva_get_trace_data;
+
+  add_com ("regs", class_vars, show_regs, "Print all registers");
+
+  add_com ("trace", class_support, trace_command,
+	   "Enable tracing of instruction execution.");
+
+  add_com ("untrace", class_support, untrace_command,
+	   "Disable tracing of instruction execution.");
+
+  add_com ("tdisassemble", class_vars, tdisassemble_command,
+	   "Disassemble the trace buffer.\n\
+Two optional arguments specify a range of trace buffer entries\n\
+as reported by info trace (NOT addresses!).");
+
+  add_info ("trace", trace_info,
+	    "Display info about the trace data buffer.");
+
+  add_show_from_set (add_set_cmd ("tracedisplay", no_class,
+				  var_integer, (char *)&trace_display,
+				  "Set automatic display of trace.\n", &setlist),
+		     &showlist);
+  add_show_from_set (add_set_cmd ("tracesource", no_class,
+				  var_integer, (char *)&default_trace_show_source,
+				  "Set display of source code with trace.\n", &setlist),
+		     &showlist);
+
+} 
diff --git a/contrib/gdb/gdb/d30v-tdep.c b/contrib/gdb/gdb/d30v-tdep.c
new file mode 100644
index 000000000000..ec4646331411
--- /dev/null
+++ b/contrib/gdb/gdb/d30v-tdep.c
@@ -0,0 +1,1396 @@
+/* Target-dependent code for Mitsubishi D30V, for GDB.
+   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/*  Contributed by Martin Hunt, hunt@cygnus.com */
+
+#include "defs.h"
+#include "frame.h"
+#include "obstack.h"
+#include "symtab.h"
+#include "gdbtypes.h"
+#include "gdbcmd.h"
+#include "gdbcore.h"
+#include "gdb_string.h"
+#include "value.h"
+#include "inferior.h"
+#include "dis-asm.h"  
+#include "symfile.h"
+#include "objfiles.h"
+
+void d30v_frame_find_saved_regs PARAMS ((struct frame_info *fi,
+					 struct frame_saved_regs *fsr));
+void d30v_frame_find_saved_regs_offsets PARAMS ((struct frame_info *fi,
+						 struct frame_saved_regs *fsr));
+static void d30v_pop_dummy_frame PARAMS ((struct frame_info *fi));
+static void d30v_print_flags PARAMS ((void));
+static void print_flags_command PARAMS ((char *, int));
+
+/* the following defines assume:
+   fp is r61, lr is r62, sp is r63, and ?? is r22
+   if that changes, they will need to be updated */
+
+#define OP_MASK_ALL_BUT_RA	0x0ffc0fff /* throw away Ra, keep the rest */
+
+#define OP_STW_SPM		0x054c0fc0 /* stw Ra, @(sp-) */
+#define OP_STW_SP_R0		0x05400fc0 /* stw Ra, @(sp,r0) */
+#define OP_STW_SP_IMM0		0x05480fc0 /* st Ra, @(sp, 0x0) */
+#define OP_STW_R22P_R0		0x05440580 /* stw Ra, @(r22+,r0) */
+
+#define OP_ST2W_SPM		0x056c0fc0 /* st2w Ra, @(sp-) */
+#define OP_ST2W_SP_R0		0x05600fc0 /* st2w Ra, @(sp, r0) */
+#define OP_ST2W_SP_IMM0		0x05680fc0 /* st2w Ra, @(sp, 0x0) */
+#define OP_ST2W_R22P_R0		0x05640580 /* st2w Ra, @(r22+, r0) */
+
+#define OP_MASK_OPCODE		0x0ffc0000 /* just the opcode, ign operands */
+#define OP_NOP			0x00f00000 /* nop */
+
+#define OP_MASK_ALL_BUT_IMM	0x0fffffc0 /* throw away imm, keep the rest */
+#define OP_SUB_SP_IMM		0x082bffc0 /* sub sp,sp,imm */
+#define OP_ADD_SP_IMM		0x080bffc0 /* add sp,sp,imm */
+#define OP_ADD_R22_SP_IMM	0x08096fc0 /* add r22,sp,imm */
+#define OP_STW_FP_SP_IMM	0x054bdfc0 /* stw fp,@(sp,imm) */
+#define OP_OR_SP_R0_IMM		0x03abf000 /* or sp,r0,imm */
+
+/* no mask */
+#define OP_OR_FP_R0_SP		0x03a3d03f /* or fp,r0,sp */
+#define OP_OR_FP_SP_R0		0x03a3dfc0 /* or fp,sp,r0 */
+#define OP_OR_FP_IMM0_SP	0x03abd03f /* or fp,0x0,sp */
+#define OP_STW_FP_R22P_R0	0x0547d580 /* stw fp,@(r22+,r0) */
+#define OP_STW_LR_R22P_R0	0x0547e580 /* stw lr,@(r22+,r0) */
+
+#define OP_MASK_OP_AND_RB	0x0ff80fc0 /* keep op and rb,throw away rest */
+#define OP_STW_SP_IMM		0x05480fc0 /* stw Ra,@(sp,imm) */
+#define OP_ST2W_SP_IMM		0x05680fc0 /* st2w Ra,@(sp,imm) */
+#define OP_STW_FP_IMM		0x05480f40 /* stw Ra,@(fp,imm) */
+#define OP_STW_FP_R0		0x05400f40 /* stw Ra,@(fp,r0) */
+
+#define OP_MASK_FM_BIT		0x80000000
+#define OP_MASK_CC_BITS		0x70000000
+#define OP_MASK_SUB_INST	0x0fffffff
+
+#define EXTRACT_RA(op)		(((op) >> 12) & 0x3f)
+#define EXTRACT_RB(op)		(((op) >> 6) & 0x3f)
+#define EXTRACT_RC(op)		(((op) & 0x3f)
+#define EXTRACT_UIMM6(op)	((op) & 0x3f)
+#define EXTRACT_IMM6(op)	((((int)EXTRACT_UIMM6(op)) << 26) >> 26)
+#define EXTRACT_IMM26(op)	((((op)&0x0ff00000) >> 2) | ((op)&0x0003ffff))
+#define EXTRACT_IMM32(opl, opr)	((EXTRACT_UIMM6(opl) << 26)|EXTRACT_IMM26(opr))
+
+
+int
+d30v_frame_chain_valid (chain, fi)
+     CORE_ADDR chain;
+     struct frame_info *fi;      /* not used here */
+{
+#if 0
+  return ((chain) != 0 && (fi) != 0 && (fi)->return_pc != 0);
+#else
+  return ((chain) != 0 && (fi) != 0 && (fi)->frame <= chain);
+#endif
+}
+
+/* Discard from the stack the innermost frame, restoring all saved
+   registers.  */
+
+void
+d30v_pop_frame ()
+{
+  struct frame_info *frame = get_current_frame ();
+  CORE_ADDR fp;
+  int regnum;
+  struct frame_saved_regs fsr;
+  char raw_buffer[8];
+
+  fp = FRAME_FP (frame);
+  if (frame->dummy)
+    {
+      d30v_pop_dummy_frame(frame);
+      return;
+    }
+
+  /* fill out fsr with the address of where each */
+  /* register was stored in the frame */
+  get_frame_saved_regs (frame, &fsr);
+  
+  /* now update the current registers with the old values */
+  for (regnum = A0_REGNUM; regnum < A0_REGNUM+2 ; regnum++)
+    {
+      if (fsr.regs[regnum])
+	{
+	  read_memory (fsr.regs[regnum], raw_buffer, 8);
+	  write_register_bytes (REGISTER_BYTE (regnum), raw_buffer, 8);
+	}
+    }
+  for (regnum = 0; regnum < SP_REGNUM; regnum++)
+    {
+      if (fsr.regs[regnum])
+	{
+	  write_register (regnum, read_memory_unsigned_integer (fsr.regs[regnum], 4));
+	}
+    }
+  if (fsr.regs[PSW_REGNUM])
+    {
+      write_register (PSW_REGNUM, read_memory_unsigned_integer (fsr.regs[PSW_REGNUM], 4));
+    }
+
+  write_register (PC_REGNUM, read_register(LR_REGNUM));
+  write_register (SP_REGNUM, fp + frame->size);
+  target_store_registers (-1);
+  flush_cached_frames ();
+}
+
+static int 
+check_prologue (op)
+     unsigned long op;
+{
+  /* add sp,sp,imm -- observed */
+  if ((op & OP_MASK_ALL_BUT_IMM) == OP_ADD_SP_IMM)
+    return 1;
+
+  /* add r22,sp,imm -- observed */
+  if ((op & OP_MASK_ALL_BUT_IMM) == OP_ADD_R22_SP_IMM)
+    return 1;
+
+  /* or  fp,r0,sp -- observed */
+  if (op == OP_OR_FP_R0_SP)
+    return 1;
+
+  /* nop */
+  if ((op & OP_MASK_OPCODE) == OP_NOP)
+    return 1;
+
+  /* stw  Ra,@(sp,r0) */
+  if ((op & OP_MASK_ALL_BUT_RA) == OP_STW_SP_R0)
+    return 1;
+
+  /* stw  Ra,@(sp,0x0) */
+  if ((op & OP_MASK_ALL_BUT_RA) == OP_STW_SP_IMM0)
+    return 1;
+
+  /* st2w  Ra,@(sp,r0) */
+ if ((op & OP_MASK_ALL_BUT_RA) == OP_ST2W_SP_R0)
+   return 1;
+
+  /* st2w  Ra,@(sp,0x0) */
+ if ((op & OP_MASK_ALL_BUT_RA) == OP_ST2W_SP_IMM0)
+   return 1;
+
+ /* stw fp, @(r22+,r0) -- observed */
+ if (op == OP_STW_FP_R22P_R0)
+   return 1;
+
+ /* stw r62, @(r22+,r0) -- observed */
+ if (op == OP_STW_LR_R22P_R0)
+   return 1;
+
+ /* stw Ra, @(fp,r0) -- observed */
+ if ((op & OP_MASK_ALL_BUT_RA) == OP_STW_FP_R0)
+   return 1;			/* first arg */
+
+ /* stw Ra, @(fp,imm) -- observed */
+ if ((op & OP_MASK_OP_AND_RB) == OP_STW_FP_IMM)
+   return 1;			/* second and subsequent args */
+
+ /* stw fp,@(sp,imm) -- observed */
+ if ((op & OP_MASK_ALL_BUT_IMM) == OP_STW_FP_SP_IMM)
+   return 1;
+
+ /* st2w Ra,@(r22+,r0) */
+ if ((op & OP_MASK_ALL_BUT_RA) == OP_ST2W_R22P_R0)
+   return 1;
+
+  /* stw  Ra, @(sp-) */
+  if ((op & OP_MASK_ALL_BUT_RA) == OP_STW_SPM)
+    return 1;
+
+  /* st2w  Ra, @(sp-) */
+  if ((op & OP_MASK_ALL_BUT_RA) == OP_ST2W_SPM)
+    return 1;
+
+  /* sub.?  sp,sp,imm */
+  if ((op & OP_MASK_ALL_BUT_IMM) == OP_SUB_SP_IMM)
+    return 1;
+
+  return 0;
+}
+
+CORE_ADDR
+d30v_skip_prologue (pc)
+     CORE_ADDR pc;
+{
+  unsigned long op[2];
+  unsigned long opl, opr;	/* left / right sub operations */
+  unsigned long fm0, fm1;	/* left / right mode bits */
+  unsigned long cc0, cc1;
+  unsigned long op1, op2;
+  CORE_ADDR func_addr, func_end;
+  struct symtab_and_line sal;
+
+  /* If we have line debugging information, then the end of the */
+  /* prologue should the first assembly instruction of  the first source line */
+  if (find_pc_partial_function (pc, NULL, &func_addr, &func_end))
+    {
+      sal = find_pc_line (func_addr, 0);
+      if ( sal.end && sal.end < func_end)
+	return sal.end;
+    }
+  
+  if (target_read_memory (pc, (char *)&op[0], 8))
+    return pc;			/* Can't access it -- assume no prologue. */
+
+  while (1)
+    {
+      opl = (unsigned long)read_memory_integer (pc, 4);
+      opr = (unsigned long)read_memory_integer (pc+4, 4);
+
+      fm0 = (opl & OP_MASK_FM_BIT);
+      fm1 = (opr & OP_MASK_FM_BIT);
+
+      cc0 = (opl & OP_MASK_CC_BITS);
+      cc1 = (opr & OP_MASK_CC_BITS);
+
+      opl = (opl & OP_MASK_SUB_INST);
+      opr = (opr & OP_MASK_SUB_INST);
+
+      if (fm0 && fm1)
+	{
+	  /* long instruction (opl contains the opcode) */
+	  if (((opl & OP_MASK_ALL_BUT_IMM) != OP_ADD_SP_IMM) && /* add sp,sp,imm */
+	      ((opl & OP_MASK_ALL_BUT_IMM) != OP_ADD_R22_SP_IMM) && /* add r22,sp,imm */
+	      ((opl & OP_MASK_OP_AND_RB) != OP_STW_SP_IMM) && /* stw Ra, @(sp,imm) */
+	      ((opl & OP_MASK_OP_AND_RB) != OP_ST2W_SP_IMM)) /* st2w Ra, @(sp,imm) */
+	    break;
+	}
+      else
+	{
+	  /* short instructions */
+	  if (fm0 && !fm1)
+	    {
+	      op1 = opr;
+	      op2 = opl;
+	    } 
+	  else 
+	    {
+	      op1 = opl;
+	      op2 = opr;
+	    }
+	  if (check_prologue(op1))
+	    {
+	      if (!check_prologue(op2))
+		{
+		  /* if the previous opcode was really part of the prologue */
+		  /* and not just a NOP, then we want to break after both instructions */
+		  if ((op1 & OP_MASK_OPCODE) != OP_NOP)
+		    pc += 8;
+		  break;
+		}
+	    }
+	  else
+	    break;
+	}
+      pc += 8;
+    }
+  return pc;
+}
+
+static int end_of_stack;
+
+/* Given a GDB frame, determine the address of the calling function's frame.
+   This will be used to create a new GDB frame struct, and then
+   INIT_EXTRA_FRAME_INFO and INIT_FRAME_PC will be called for the new frame.
+*/
+
+CORE_ADDR
+d30v_frame_chain (frame)
+     struct frame_info *frame;
+{
+  struct frame_saved_regs fsr;
+
+  d30v_frame_find_saved_regs (frame, &fsr);
+
+  if (end_of_stack)
+    return (CORE_ADDR)0;
+
+  if (frame->return_pc == IMEM_START)
+    return (CORE_ADDR)0;
+
+  if (!fsr.regs[FP_REGNUM])
+    {
+      if (!fsr.regs[SP_REGNUM] || fsr.regs[SP_REGNUM] == STACK_START)
+	return (CORE_ADDR)0;
+      
+      return fsr.regs[SP_REGNUM];
+    }
+
+  if (!read_memory_unsigned_integer(fsr.regs[FP_REGNUM],4))
+    return (CORE_ADDR)0;
+
+  return read_memory_unsigned_integer(fsr.regs[FP_REGNUM],4);
+}  
+
+static int next_addr, uses_frame;
+static int frame_size;
+
+static int 
+prologue_find_regs (op, fsr, addr)
+     unsigned long op;
+     struct frame_saved_regs *fsr;
+     CORE_ADDR addr;
+{
+  int n;
+  int offset;
+
+  /* add sp,sp,imm -- observed */
+  if ((op & OP_MASK_ALL_BUT_IMM) == OP_ADD_SP_IMM)
+    {
+      offset = EXTRACT_IMM6(op);
+      /*next_addr += offset;*/
+      frame_size += -offset;
+      return 1;
+    }
+
+  /* add r22,sp,imm -- observed */
+  if ((op & OP_MASK_ALL_BUT_IMM) == OP_ADD_R22_SP_IMM)
+    {
+      offset = EXTRACT_IMM6(op);
+      next_addr = (offset - frame_size);
+      return 1;
+    }
+
+  /* stw Ra, @(fp, offset) -- observed */
+  if ((op & OP_MASK_OP_AND_RB) == OP_STW_FP_IMM)
+    {
+      n = EXTRACT_RA(op);
+      offset = EXTRACT_IMM6(op);
+      fsr->regs[n] = (offset - frame_size);
+      return 1;
+    }
+
+  /* stw Ra, @(fp, r0) -- observed */
+  if ((op & OP_MASK_ALL_BUT_RA) == OP_STW_FP_R0)
+    {
+      n = EXTRACT_RA(op);
+      fsr->regs[n] = (- frame_size);
+      return 1;
+    }
+
+  /* or  fp,0,sp -- observed */
+  if ((op == OP_OR_FP_R0_SP) ||
+      (op == OP_OR_FP_SP_R0) ||
+      (op == OP_OR_FP_IMM0_SP))
+    {
+      uses_frame = 1;
+      return 1;
+    }
+
+  /* nop */
+  if ((op & OP_MASK_OPCODE) == OP_NOP)
+    return 1;
+
+  /* stw Ra,@(r22+,r0) -- observed */
+  if ((op & OP_MASK_ALL_BUT_RA) == OP_STW_R22P_R0)
+    {
+      n = EXTRACT_RA(op);
+      fsr->regs[n] = next_addr;
+      next_addr += 4;
+      return 1;
+    }
+#if 0				/* subsumed in pattern above */
+  /* stw fp,@(r22+,r0) -- observed */
+  if (op == OP_STW_FP_R22P_R0)
+    {
+      fsr->regs[FP_REGNUM] = next_addr;	/* XXX */
+      next_addr += 4;
+      return 1;
+    }
+
+  /* stw r62,@(r22+,r0) -- observed */
+  if (op == OP_STW_LR_R22P_R0)
+    {
+      fsr->regs[LR_REGNUM] = next_addr;
+      next_addr += 4;
+      return 1;
+    }
+#endif
+  /* st2w Ra,@(r22+,r0) -- observed */
+  if ((op & OP_MASK_ALL_BUT_RA) == OP_ST2W_R22P_R0)
+    {
+      n = EXTRACT_RA(op);
+      fsr->regs[n] = next_addr;
+      fsr->regs[n+1] = next_addr + 4;
+      next_addr += 8;
+      return 1;
+    }
+
+  /* stw  rn, @(sp-) */
+  if ((op & OP_MASK_ALL_BUT_RA) == OP_STW_SPM)
+    {
+      n = EXTRACT_RA(op);
+      fsr->regs[n] = next_addr;
+      next_addr -= 4;
+      return 1;
+    }
+
+  /* st2w  Ra, @(sp-) */
+  else if ((op & OP_MASK_ALL_BUT_RA) == OP_ST2W_SPM)
+    {
+      n = EXTRACT_RA(op);
+      fsr->regs[n] = next_addr;
+      fsr->regs[n+1] = next_addr+4;
+      next_addr -= 8;
+      return 1;
+    }
+
+  /* sub  sp,sp,imm */
+  if ((op & OP_MASK_ALL_BUT_IMM) == OP_SUB_SP_IMM)
+    {
+      offset = EXTRACT_IMM6(op);
+      frame_size += -offset;
+      return 1;
+    }
+
+  /* st  rn, @(sp,0) -- observed */
+  if (((op & OP_MASK_ALL_BUT_RA) == OP_STW_SP_R0) ||
+      ((op & OP_MASK_ALL_BUT_RA) == OP_STW_SP_IMM0))
+    {
+      n = EXTRACT_RA(op);
+      fsr->regs[n] = (- frame_size);
+      return 1;
+    }
+
+  /* st2w  rn, @(sp,0) */
+  if (((op & OP_MASK_ALL_BUT_RA) == OP_ST2W_SP_R0) ||
+      ((op & OP_MASK_ALL_BUT_RA) == OP_ST2W_SP_IMM0))
+    {
+      n = EXTRACT_RA(op);
+      fsr->regs[n] = (- frame_size);
+      fsr->regs[n+1] = (- frame_size) + 4;
+      return 1;
+    }
+
+  /* stw fp,@(sp,imm) -- observed */
+  if ((op & OP_MASK_ALL_BUT_IMM) == OP_STW_FP_SP_IMM)
+    {
+      offset = EXTRACT_IMM6(op);
+      fsr->regs[FP_REGNUM] = (offset - frame_size);
+      return 1;
+    }
+  return 0;
+}
+
+/* Put here the code to store, into a struct frame_saved_regs, the
+   addresses of the saved registers of frame described by FRAME_INFO.
+   This includes special registers such as pc and fp saved in special
+   ways in the stack frame.  sp is even more special: the address we
+   return for it IS the sp for the next frame. */
+void
+d30v_frame_find_saved_regs (fi, fsr)
+     struct frame_info *fi;
+     struct frame_saved_regs *fsr;
+{
+  CORE_ADDR fp, pc;
+  unsigned long opl, opr;
+  unsigned long op1, op2;
+  unsigned long fm0, fm1;
+  int i;
+
+  fp = fi->frame;
+  memset (fsr, 0, sizeof (*fsr));
+  next_addr = 0;
+  frame_size = 0;
+  end_of_stack = 0;
+
+  uses_frame = 0;
+
+  d30v_frame_find_saved_regs_offsets (fi, fsr);
+  
+  fi->size = frame_size;
+
+  if (!fp)
+    fp = read_register(SP_REGNUM);
+
+  for (i=0; i<NUM_REGS-1; i++)
+    if (fsr->regs[i])
+      {
+	fsr->regs[i] = fsr->regs[i] + fp + frame_size;
+      }
+
+  if (fsr->regs[LR_REGNUM])
+    fi->return_pc = read_memory_unsigned_integer(fsr->regs[LR_REGNUM],4);
+  else
+    fi->return_pc = read_register(LR_REGNUM);
+  
+  /* the SP is not normally (ever?) saved, but check anyway */
+  if (!fsr->regs[SP_REGNUM])
+    {
+      /* if the FP was saved, that means the current FP is valid, */
+      /* otherwise, it isn't being used, so we use the SP instead */
+      if (uses_frame)
+	fsr->regs[SP_REGNUM] = read_register(FP_REGNUM) + fi->size;
+      else
+	{
+	  fsr->regs[SP_REGNUM] = fp + fi->size;
+	  fi->frameless = 1;
+	  fsr->regs[FP_REGNUM] = 0;
+	}
+    }
+}
+
+void
+d30v_frame_find_saved_regs_offsets (fi, fsr)
+     struct frame_info *fi;
+     struct frame_saved_regs *fsr;
+{
+  CORE_ADDR fp, pc;
+  unsigned long opl, opr;
+  unsigned long op1, op2;
+  unsigned long fm0, fm1;
+  int i;
+
+  fp = fi->frame;
+  memset (fsr, 0, sizeof (*fsr));
+  next_addr = 0;
+  frame_size = 0;
+  end_of_stack = 0;
+
+  pc = get_pc_function_start (fi->pc);
+
+  uses_frame = 0;
+  while (pc < fi->pc)
+    {
+      opl = (unsigned long)read_memory_integer (pc, 4);
+      opr = (unsigned long)read_memory_integer (pc+4, 4);
+
+      fm0 = (opl & OP_MASK_FM_BIT);
+      fm1 = (opr & OP_MASK_FM_BIT);
+
+      opl = (opl & OP_MASK_SUB_INST);
+      opr = (opr & OP_MASK_SUB_INST);
+
+      if (fm0 && fm1)
+	{
+	  /* long instruction */
+	  if ((opl & OP_MASK_ALL_BUT_IMM) == OP_ADD_SP_IMM)
+	    {
+	      /* add sp,sp,n */
+	      long offset = EXTRACT_IMM32(opl, opr);
+	      frame_size += -offset;
+	    }
+	  else if ((opl & OP_MASK_ALL_BUT_IMM) == OP_ADD_R22_SP_IMM)
+	    {
+	      /* add r22,sp,offset */
+	      long offset = EXTRACT_IMM32(opl,opr);
+	      next_addr = (offset - frame_size);
+	    }
+	  else if ((opl & OP_MASK_OP_AND_RB) == OP_STW_SP_IMM)
+	    {
+	      /* st Ra, @(sp,imm) */
+	      long offset = EXTRACT_IMM32(opl, opr);
+	      short n = EXTRACT_RA(opl);
+	      fsr->regs[n] = (offset - frame_size);
+	    }
+	  else if ((opl & OP_MASK_OP_AND_RB) == OP_ST2W_SP_IMM)
+	    {
+	      /* st2w Ra, @(sp,offset) */
+	      long offset = EXTRACT_IMM32(opl, opr);
+	      short n = EXTRACT_RA(opl);
+	      fsr->regs[n] = (offset - frame_size);
+	      fsr->regs[n+1] = (offset - frame_size) + 4;
+	    }
+	  else if ((opl & OP_MASK_ALL_BUT_IMM) == OP_OR_SP_R0_IMM)
+	    {
+	      end_of_stack = 1;
+	    }
+	  else
+	    break;
+	}
+      else
+	{
+	  /* short instructions */
+	  if (fm0 && !fm1)
+	    {
+	      op2 = opl;
+	      op1 = opr;
+	    } 
+	  else 
+	    {
+	      op1 = opl;
+	      op2 = opr;
+	    }
+	  if (!prologue_find_regs(op1,fsr,pc) || !prologue_find_regs(op2,fsr,pc))
+	    break;
+	}
+      pc += 8;
+    }
+  
+#if 0
+  fi->size = frame_size;
+
+  if (!fp)
+    fp = read_register(SP_REGNUM);
+
+  for (i=0; i<NUM_REGS-1; i++)
+    if (fsr->regs[i])
+      {
+	fsr->regs[i] = fsr->regs[i] + fp + frame_size;
+      }
+
+  if (fsr->regs[LR_REGNUM])
+    fi->return_pc = read_memory_unsigned_integer(fsr->regs[LR_REGNUM],4);
+  else
+    fi->return_pc = read_register(LR_REGNUM);
+  
+  /* the SP is not normally (ever?) saved, but check anyway */
+  if (!fsr->regs[SP_REGNUM])
+    {
+      /* if the FP was saved, that means the current FP is valid, */
+      /* otherwise, it isn't being used, so we use the SP instead */
+      if (uses_frame)
+	fsr->regs[SP_REGNUM] = read_register(FP_REGNUM) + fi->size;
+      else
+	{
+	  fsr->regs[SP_REGNUM] = fp + fi->size;
+	  fi->frameless = 1;
+	  fsr->regs[FP_REGNUM] = 0;
+	}
+    }
+#endif
+}
+
+void
+d30v_init_extra_frame_info (fromleaf, fi)
+     int fromleaf;
+     struct frame_info *fi;
+{
+  struct frame_saved_regs dummy;
+
+  if (fi->next && (fi->pc == 0))
+    fi->pc = fi->next->return_pc; 
+
+  d30v_frame_find_saved_regs_offsets (fi, &dummy);
+
+  if (uses_frame == 0)
+    fi->frameless = 1;
+  else
+    fi->frameless = 0;
+
+  if ((fi->next == 0) && (uses_frame == 0))
+    /* innermost frame and it's "frameless",
+       so the fi->frame field is wrong, fix it! */
+    fi->frame = read_sp ();
+
+  if (dummy.regs[LR_REGNUM])
+    {
+      /* it was saved, grab it! */
+      dummy.regs[LR_REGNUM] += (fi->frame + frame_size);
+      fi->return_pc = read_memory_unsigned_integer(dummy.regs[LR_REGNUM],4);
+    }
+  else
+    fi->return_pc = read_register(LR_REGNUM);
+}
+
+void
+d30v_init_frame_pc (fromleaf, prev)
+     int fromleaf;
+     struct frame_info *prev;
+{
+  /* default value, put here so we can breakpoint on it and
+     see if the default value is really the right thing to use */
+  prev->pc = (fromleaf ? SAVED_PC_AFTER_CALL (prev->next) : \
+	      prev->next ? FRAME_SAVED_PC (prev->next) : read_pc ());
+}
+
+static void d30v_print_register PARAMS ((int regnum, int tabular));
+
+static void
+d30v_print_register (regnum, tabular)
+     int regnum;
+     int tabular;
+{
+  if (regnum < A0_REGNUM)
+    {
+      if (tabular)
+	printf_filtered ("%08x", read_register (regnum));
+      else
+	printf_filtered ("0x%x	%d", read_register (regnum),
+			 read_register (regnum));
+    }
+  else
+    {
+      char regbuf[MAX_REGISTER_RAW_SIZE];
+
+      read_relative_register_raw_bytes (regnum, regbuf);
+
+      val_print (REGISTER_VIRTUAL_TYPE (regnum), regbuf, 0, 0,
+		 gdb_stdout, 'x', 1, 0, Val_pretty_default);
+
+      if (!tabular)
+	{
+	  printf_filtered ("	");
+	  val_print (REGISTER_VIRTUAL_TYPE (regnum), regbuf, 0, 0,
+		 gdb_stdout, 'd', 1, 0, Val_pretty_default);
+	}
+    }
+}
+
+static void
+d30v_print_flags ()
+{
+  long psw = read_register (PSW_REGNUM);
+  printf_filtered ("flags #1");
+  printf_filtered ("   (sm) %d", (psw & PSW_SM) != 0);
+  printf_filtered ("   (ea) %d", (psw & PSW_EA) != 0);
+  printf_filtered ("   (db) %d", (psw & PSW_DB) != 0);
+  printf_filtered ("   (ds) %d", (psw & PSW_DS) != 0);
+  printf_filtered ("   (ie) %d", (psw & PSW_IE) != 0);
+  printf_filtered ("   (rp) %d", (psw & PSW_RP) != 0);
+  printf_filtered ("   (md) %d\n", (psw & PSW_MD) != 0);
+
+  printf_filtered ("flags #2");
+  printf_filtered ("   (f0) %d", (psw & PSW_F0) != 0);
+  printf_filtered ("   (f1) %d", (psw & PSW_F1) != 0);
+  printf_filtered ("   (f2) %d", (psw & PSW_F2) != 0);
+  printf_filtered ("   (f3) %d", (psw & PSW_F3) != 0);
+  printf_filtered ("    (s) %d", (psw & PSW_S) != 0);
+  printf_filtered ("    (v) %d", (psw & PSW_V) != 0);
+  printf_filtered ("   (va) %d", (psw & PSW_VA) != 0);
+  printf_filtered ("    (c) %d\n", (psw & PSW_C) != 0);
+}
+
+static void
+print_flags_command (args, from_tty)
+     char *args;
+     int from_tty;
+{
+  d30v_print_flags ();
+}
+
+void
+d30v_do_registers_info (regnum, fpregs)
+     int regnum;
+     int fpregs;
+{
+  long long num1, num2;
+  long psw;
+
+  if (regnum != -1)
+    {
+      if (REGISTER_NAME (0) == NULL || REGISTER_NAME (0)[0] == '\000')
+	return;
+
+      printf_filtered ("%s ", REGISTER_NAME (regnum));
+      d30v_print_register (regnum, 0);
+
+      printf_filtered ("\n");
+      return;
+    }
+
+  /* Have to print all the registers.  Format them nicely.  */
+
+  printf_filtered ("PC=");
+  print_address (read_pc (), gdb_stdout);
+
+  printf_filtered (" PSW=");
+  d30v_print_register (PSW_REGNUM, 1);
+
+  printf_filtered (" BPC=");
+  print_address (read_register (BPC_REGNUM), gdb_stdout);
+
+  printf_filtered (" BPSW=");
+  d30v_print_register (BPSW_REGNUM, 1);
+  printf_filtered ("\n");
+
+  printf_filtered ("DPC=");
+  print_address (read_register (DPC_REGNUM), gdb_stdout);
+
+  printf_filtered (" DPSW=");
+  d30v_print_register (DPSW_REGNUM, 1);
+
+  printf_filtered (" IBA=");
+  print_address (read_register (IBA_REGNUM), gdb_stdout);
+  printf_filtered ("\n");
+
+  printf_filtered ("RPT_C=");
+  d30v_print_register (RPT_C_REGNUM, 1);
+
+  printf_filtered (" RPT_S=");
+  print_address (read_register (RPT_S_REGNUM), gdb_stdout);
+
+  printf_filtered (" RPT_E=");
+  print_address (read_register (RPT_E_REGNUM), gdb_stdout);
+  printf_filtered ("\n");
+
+  printf_filtered ("MOD_S=");
+  print_address (read_register (MOD_S_REGNUM), gdb_stdout);
+
+  printf_filtered (" MOD_E=");
+  print_address (read_register (MOD_E_REGNUM), gdb_stdout);
+  printf_filtered ("\n");
+
+  printf_filtered ("EIT_VB=");
+  print_address (read_register (EIT_VB_REGNUM), gdb_stdout);
+
+  printf_filtered (" INT_S=");
+  d30v_print_register (INT_S_REGNUM, 1);
+
+  printf_filtered (" INT_M=");
+  d30v_print_register (INT_M_REGNUM, 1);
+  printf_filtered ("\n");
+
+  d30v_print_flags ();
+  for (regnum = 0; regnum <= 63;)
+    {
+      int i;
+
+      printf_filtered ("R%d-R%d ", regnum, regnum + 7);
+      if (regnum < 10)
+	printf_filtered (" ");
+      if (regnum + 7 < 10)
+	printf_filtered (" ");
+
+      for (i = 0; i < 8; i++)
+	{
+	  printf_filtered (" ");
+	  d30v_print_register (regnum++, 1);
+	}
+
+      printf_filtered ("\n");
+    }
+
+  printf_filtered ("A0-A1    ");
+
+  d30v_print_register (A0_REGNUM, 1);
+  printf_filtered ("    ");
+  d30v_print_register (A1_REGNUM, 1);
+  printf_filtered ("\n");
+}
+
+CORE_ADDR
+d30v_fix_call_dummy (dummyname, start_sp, fun, nargs, args, type, gcc_p)
+     char *dummyname;
+     CORE_ADDR start_sp;
+     CORE_ADDR fun;
+     int nargs;
+     value_ptr *args;
+     struct type *type;
+     int gcc_p;
+{
+  int regnum;
+  CORE_ADDR sp;
+  char buffer[MAX_REGISTER_RAW_SIZE];
+  struct frame_info *frame = get_current_frame ();
+  frame->dummy = start_sp;
+  /*start_sp |= DMEM_START;*/
+
+  sp = start_sp;
+  for (regnum = 0; regnum < NUM_REGS; regnum++)
+    {
+      sp -= REGISTER_RAW_SIZE(regnum);
+      store_address (buffer, REGISTER_RAW_SIZE(regnum), read_register(regnum));
+      write_memory (sp, buffer, REGISTER_RAW_SIZE(regnum));
+    }
+  write_register (SP_REGNUM, (LONGEST)sp);
+  /* now we need to load LR with the return address */
+  write_register (LR_REGNUM, (LONGEST)d30v_call_dummy_address());  
+  return sp;
+}
+
+static void
+d30v_pop_dummy_frame (fi)
+     struct frame_info *fi;
+{
+  CORE_ADDR sp = fi->dummy;
+  int regnum;
+
+  for (regnum = 0; regnum < NUM_REGS; regnum++)
+    {
+      sp -= REGISTER_RAW_SIZE(regnum);
+      write_register(regnum, read_memory_unsigned_integer (sp, REGISTER_RAW_SIZE(regnum)));
+    }
+  flush_cached_frames (); /* needed? */
+}
+
+
+CORE_ADDR
+d30v_push_arguments (nargs, args, sp, struct_return, struct_addr)
+     int nargs;
+     value_ptr *args;
+     CORE_ADDR sp;
+     int struct_return;
+     CORE_ADDR struct_addr;
+{
+  int i, len, index=0, regnum=2;
+  char buffer[4], *contents;
+  LONGEST val;
+  CORE_ADDR ptrs[10];
+
+#if 0
+  /* Pass 1. Put all large args on stack */
+  for (i = 0; i < nargs; i++)
+    {
+      value_ptr arg = args[i];
+      struct type *arg_type = check_typedef (VALUE_TYPE (arg));
+      len = TYPE_LENGTH (arg_type);
+      contents = VALUE_CONTENTS(arg);
+      val = extract_signed_integer (contents, len);
+      if (len > 4)
+	{
+	  /* put on stack and pass pointers */
+	  sp -= len;
+	  write_memory (sp, contents, len);
+	  ptrs[index++] = sp;
+	}
+    }
+#endif
+  index = 0;
+
+  for (i = 0; i < nargs; i++)
+    {
+      value_ptr arg = args[i];
+      struct type *arg_type = check_typedef (VALUE_TYPE (arg));
+      len = TYPE_LENGTH (arg_type);
+      contents = VALUE_CONTENTS(arg);
+      if (len > 4)
+	{
+	  /* we need multiple registers */
+	  int ndx;
+
+	  for (ndx = 0; len > 0; ndx += 8, len -= 8)
+	    {
+	      if (regnum & 1)
+		regnum++;	/* all args > 4 bytes start in even register */
+
+	      if (regnum < 18)
+		{
+		  val = extract_signed_integer (&contents[ndx], 4);
+		  write_register (regnum++, val);
+
+		  if (len >= 8)
+		    val = extract_signed_integer (&contents[ndx+4], 4);
+		  else
+		    val = extract_signed_integer (&contents[ndx+4], len-4);
+		  write_register (regnum++, val);
+		}
+	      else
+		{
+		  /* no more registers available.  put it on the stack */
+
+		  /* all args > 4 bytes are padded to a multiple of 8 bytes
+		   and start on an 8 byte boundary */
+		  if (sp & 7)
+		    sp -= (sp & 7); /* align it */
+
+		  sp -= ((len + 7) & ~7); /* allocate space */
+		  write_memory (sp, &contents[ndx], len);
+		  break;
+		}
+	    }
+	}
+      else
+	{
+	  if (regnum < 18 )
+	    {
+	      val = extract_signed_integer (contents, len);
+	      write_register (regnum++, val);
+	    }
+	  else
+	    {
+	      /* all args are padded to a multiple of 4 bytes (at least) */
+	      sp -= ((len + 3) & ~3);
+	      write_memory (sp, contents, len);
+	    }
+	}
+    }
+  if (sp & 7)
+    /* stack pointer is not on an 8 byte boundary -- align it */
+    sp -= (sp & 7);
+  return sp;
+}
+
+
+/* pick an out-of-the-way place to set the return value */
+/* for an inferior function call.  The link register is set to this  */
+/* value and a momentary breakpoint is set there.  When the breakpoint */
+/* is hit, the dummy frame is popped and the previous environment is */
+/* restored. */
+
+CORE_ADDR
+d30v_call_dummy_address ()
+{
+  CORE_ADDR entry;
+  struct minimal_symbol *sym;
+
+  entry = entry_point_address ();
+
+  if (entry != 0)
+    return entry;
+
+  sym = lookup_minimal_symbol ("_start", NULL, symfile_objfile);
+
+  if (!sym || MSYMBOL_TYPE (sym) != mst_text)
+    return 0;
+  else
+    return SYMBOL_VALUE_ADDRESS (sym);
+}
+
+/* Given a return value in `regbuf' with a type `valtype', 
+   extract and copy its value into `valbuf'.  */
+
+void
+d30v_extract_return_value (valtype, regbuf, valbuf)
+     struct type *valtype;
+     char regbuf[REGISTER_BYTES];
+     char *valbuf;
+{
+  memcpy (valbuf, regbuf + REGISTER_BYTE (2), TYPE_LENGTH (valtype));
+}
+
+/* The following code implements access to, and display of, the D30V's
+   instruction trace buffer.  The buffer consists of 64K or more
+   4-byte words of data, of which each words includes an 8-bit count,
+   an 8-bit segment number, and a 16-bit instruction address.
+
+   In theory, the trace buffer is continuously capturing instruction
+   data that the CPU presents on its "debug bus", but in practice, the
+   ROMified GDB stub only enables tracing when it continues or steps
+   the program, and stops tracing when the program stops; so it
+   actually works for GDB to read the buffer counter out of memory and
+   then read each trace word.  The counter records where the tracing
+   stops, but there is no record of where it started, so we remember
+   the PC when we resumed and then search backwards in the trace
+   buffer for a word that includes that address.  This is not perfect,
+   because you will miss trace data if the resumption PC is the target
+   of a branch.  (The value of the buffer counter is semi-random, any
+   trace data from a previous program stop is gone.)  */
+
+/* The address of the last word recorded in the trace buffer.  */
+
+#define DBBC_ADDR (0xd80000)
+
+/* The base of the trace buffer, at least for the "Board_0".  */
+
+#define TRACE_BUFFER_BASE (0xf40000)
+
+static void trace_command PARAMS ((char *, int));
+
+static void untrace_command PARAMS ((char *, int));
+
+static void trace_info PARAMS ((char *, int));
+
+static void tdisassemble_command PARAMS ((char *, int));
+
+static void display_trace PARAMS ((int, int));
+
+/* True when instruction traces are being collected.  */
+
+static int tracing;
+
+/* Remembered PC.  */
+
+static CORE_ADDR last_pc;
+
+/* True when trace output should be displayed whenever program stops.  */
+
+static int trace_display;
+
+/* True when trace listing should include source lines.  */
+
+static int default_trace_show_source = 1;
+
+struct trace_buffer {
+  int size;
+  short *counts;
+  CORE_ADDR *addrs;
+} trace_data;
+
+static void
+trace_command (args, from_tty)
+     char *args;
+     int from_tty;
+{
+  /* Clear the host-side trace buffer, allocating space if needed.  */
+  trace_data.size = 0;
+  if (trace_data.counts == NULL)
+    trace_data.counts = (short *) xmalloc (65536 * sizeof(short));
+  if (trace_data.addrs == NULL)
+    trace_data.addrs = (CORE_ADDR *) xmalloc (65536 * sizeof(CORE_ADDR));
+
+  tracing = 1;
+
+  printf_filtered ("Tracing is now on.\n");
+}
+
+static void
+untrace_command (args, from_tty)
+     char *args;
+     int from_tty;
+{
+  tracing = 0;
+
+  printf_filtered ("Tracing is now off.\n");
+}
+
+static void
+trace_info (args, from_tty)
+     char *args;
+     int from_tty;
+{
+  int i;
+
+  if (trace_data.size)
+    {
+      printf_filtered ("%d entries in trace buffer:\n", trace_data.size);
+
+      for (i = 0; i < trace_data.size; ++i)
+	{
+	  printf_filtered ("%d: %d instruction%s at 0x%x\n",
+			   i, trace_data.counts[i],
+			   (trace_data.counts[i] == 1 ? "" : "s"),
+			   trace_data.addrs[i]);
+	}
+    }
+  else
+    printf_filtered ("No entries in trace buffer.\n");
+
+  printf_filtered ("Tracing is currently %s.\n", (tracing ? "on" : "off"));
+}
+
+/* Print the instruction at address MEMADDR in debugged memory,
+   on STREAM.  Returns length of the instruction, in bytes.  */
+
+static int
+print_insn (memaddr, stream)
+     CORE_ADDR memaddr;
+     GDB_FILE *stream;
+{
+  /* If there's no disassembler, something is very wrong.  */
+  if (tm_print_insn == NULL)
+    abort ();
+
+  if (TARGET_BYTE_ORDER == BIG_ENDIAN)
+    tm_print_insn_info.endian = BFD_ENDIAN_BIG;
+  else
+    tm_print_insn_info.endian = BFD_ENDIAN_LITTLE;
+  return (*tm_print_insn) (memaddr, &tm_print_insn_info);
+}
+
+void
+d30v_eva_prepare_to_trace ()
+{
+  if (!tracing)
+    return;
+
+  last_pc = read_register (PC_REGNUM);
+}
+
+/* Collect trace data from the target board and format it into a form
+   more useful for display.  */
+
+void
+d30v_eva_get_trace_data ()
+{
+  int count, i, j, oldsize;
+  int trace_addr, trace_seg, trace_cnt, next_cnt;
+  unsigned int last_trace, trace_word, next_word;
+  unsigned int *tmpspace;
+
+  if (!tracing)
+    return;
+
+  tmpspace = xmalloc (65536 * sizeof(unsigned int));
+
+  last_trace = read_memory_unsigned_integer (DBBC_ADDR, 2) << 2;
+
+  /* Collect buffer contents from the target, stopping when we reach
+     the word recorded when execution resumed.  */
+
+  count = 0;
+  while (last_trace > 0)
+    {
+      QUIT;
+      trace_word =
+	read_memory_unsigned_integer (TRACE_BUFFER_BASE + last_trace, 4);
+      trace_addr = trace_word & 0xffff;
+      last_trace -= 4;
+      /* Ignore an apparently nonsensical entry.  */
+      if (trace_addr == 0xffd5)
+	continue;
+      tmpspace[count++] = trace_word;
+      if (trace_addr == last_pc)
+	break;
+      if (count > 65535)
+	break;
+    }
+
+  /* Move the data to the host-side trace buffer, adjusting counts to
+     include the last instruction executed and transforming the address
+     into something that GDB likes.  */
+
+  for (i = 0; i < count; ++i)
+    {
+      trace_word = tmpspace[i];
+      next_word = ((i == 0) ? 0 : tmpspace[i - 1]);
+      trace_addr = trace_word & 0xffff;
+      next_cnt = (next_word >> 24) & 0xff;
+      j = trace_data.size + count - i - 1;
+      trace_data.addrs[j] = (trace_addr << 2) + 0x1000000;
+      trace_data.counts[j] = next_cnt + 1;
+    }
+
+  oldsize = trace_data.size;
+  trace_data.size += count;
+
+  free (tmpspace);
+
+  if (trace_display)
+    display_trace (oldsize, trace_data.size);
+}
+
+static void
+tdisassemble_command (arg, from_tty)
+     char *arg;
+     int from_tty;
+{
+  int i, count;
+  CORE_ADDR low, high;
+  char *space_index;
+
+  if (!arg)
+    {
+      low = 0;
+      high = trace_data.size;
+    }
+  else if (!(space_index = (char *) strchr (arg, ' ')))
+    {
+      low = parse_and_eval_address (arg);
+      high = low + 5;
+    }
+  else
+    {
+      /* Two arguments.  */
+      *space_index = '\0';
+      low = parse_and_eval_address (arg);
+      high = parse_and_eval_address (space_index + 1);
+      if (high < low)
+	high = low;
+    }
+
+  printf_filtered ("Dump of trace from %d to %d:\n", low, high);
+
+  display_trace (low, high);
+
+  printf_filtered ("End of trace dump.\n");
+  gdb_flush (gdb_stdout);
+}
+
+static void
+display_trace (low, high)
+     int low, high;
+{
+  int i, count, trace_show_source, first, suppress;
+  CORE_ADDR next_address;
+
+  trace_show_source = default_trace_show_source;
+  if (!have_full_symbols () && !have_partial_symbols())
+    {
+      trace_show_source = 0;
+      printf_filtered ("No symbol table is loaded.  Use the \"file\" command.\n");
+      printf_filtered ("Trace will not display any source.\n");
+    }
+
+  first = 1;
+  suppress = 0;
+  for (i = low; i < high; ++i)
+    {
+      next_address = trace_data.addrs[i];
+      count = trace_data.counts[i]; 
+      while (count-- > 0)
+	{
+	  QUIT;
+	  if (trace_show_source)
+	    {
+	      struct symtab_and_line sal, sal_prev;
+
+	      sal_prev = find_pc_line (next_address - 4, 0);
+	      sal = find_pc_line (next_address, 0);
+
+	      if (sal.symtab)
+		{
+		  if (first || sal.line != sal_prev.line)
+		    print_source_lines (sal.symtab, sal.line, sal.line + 1, 0);
+		  suppress = 0;
+		}
+	      else
+		{
+		  if (!suppress)
+		    /* FIXME-32x64--assumes sal.pc fits in long.  */
+		    printf_filtered ("No source file for address %s.\n",
+				     local_hex_string((unsigned long) sal.pc));
+		  suppress = 1;
+		}
+	    }
+	  first = 0;
+	  print_address (next_address, gdb_stdout);
+	  printf_filtered (":");
+	  printf_filtered ("\t");
+	  wrap_here ("    ");
+	  next_address = next_address + print_insn (next_address, gdb_stdout);
+	  printf_filtered ("\n");
+	  gdb_flush (gdb_stdout);
+	}
+    }
+}
+
+extern void (*target_resume_hook) PARAMS ((void));
+extern void (*target_wait_loop_hook) PARAMS ((void));
+
+void
+_initialize_d30v_tdep ()
+{
+  tm_print_insn = print_insn_d30v;
+
+  target_resume_hook = d30v_eva_prepare_to_trace;
+  target_wait_loop_hook = d30v_eva_get_trace_data;
+
+  add_info ("flags", print_flags_command, "Print d30v flags.");
+
+  add_com ("trace", class_support, trace_command,
+	   "Enable tracing of instruction execution.");
+
+  add_com ("untrace", class_support, untrace_command,
+ 	   "Disable tracing of instruction execution.");
+
+  add_com ("tdisassemble", class_vars, tdisassemble_command,
+	   "Disassemble the trace buffer.\n\
+Two optional arguments specify a range of trace buffer entries\n\
+as reported by info trace (NOT addresses!).");
+
+  add_info ("trace", trace_info,
+	    "Display info about the trace data buffer.");
+
+  add_show_from_set (add_set_cmd ("tracedisplay", no_class,
+				  var_integer, (char *)&trace_display,
+				  "Set automatic display of trace.\n", &setlist),
+		     &showlist);
+  add_show_from_set (add_set_cmd ("tracesource", no_class,
+				  var_integer, (char *)&default_trace_show_source,
+				  "Set display of source code with trace.\n", &setlist),
+		     &showlist);
+
+} 
diff --git a/contrib/gdb/gdb/dbug-rom.c b/contrib/gdb/gdb/dbug-rom.c
new file mode 100644
index 000000000000..fa9c97440ed8
--- /dev/null
+++ b/contrib/gdb/gdb/dbug-rom.c
@@ -0,0 +1,164 @@
+/* Remote debugging interface to dBUG ROM monitor for GDB, the GNU debugger.
+   Copyright 1996 Free Software Foundation, Inc.
+
+   Written by Stan Shebs of Cygnus Support.
+
+This file is part of GDB.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* dBUG is a monitor supplied on various Motorola boards, including
+   m68k, ColdFire, and PowerPC-based designs.  The code here assumes
+   the ColdFire, and (as of 9/25/96) has only been tested with a
+   ColdFire IDP board.  */
+
+#include "defs.h"
+#include "gdbcore.h"
+#include "target.h"
+#include "monitor.h"
+#include "serial.h"
+
+static void dbug_open PARAMS ((char *args, int from_tty));
+
+static void
+dbug_supply_register (regname, regnamelen, val, vallen)
+     char *regname;
+     int regnamelen;
+     char *val;
+     int vallen;
+{
+  int regno;
+
+  if (regnamelen != 2)
+    return;
+
+  switch (regname[0])
+    {
+    case 'S':
+      if (regname[1] != 'R')
+	return;
+      regno = PS_REGNUM;
+      break;
+    case 'P':
+      if (regname[1] != 'C')
+	return;
+      regno = PC_REGNUM;
+      break;
+    case 'D':
+      if (regname[1] < '0' || regname[1] > '7')
+	return;
+      regno = regname[1] - '0' + D0_REGNUM;
+      break;
+    case 'A':
+      if (regname[1] < '0' || regname[1] > '7')
+	return;
+      regno = regname[1] - '0' + A0_REGNUM;
+      break;
+    default:
+      return;
+    }
+
+  monitor_supply_register (regno, val);
+}
+
+/* This array of registers needs to match the indexes used by GDB. The
+   whole reason this exists is because the various ROM monitors use
+   different names than GDB does, and don't support all the registers
+   either. So, typing "info reg sp" becomes an "A7". */
+
+static char *dbug_regnames[NUM_REGS] =
+{
+  "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7",
+  "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7",
+  "SR", "PC"
+  /* no float registers */
+};
+static struct target_ops dbug_ops;
+static struct monitor_ops dbug_cmds ;
+
+static char *dbug_inits[] = {"\r", NULL};
+
+
+static void 
+init_dbug_cmds(void)
+{
+  dbug_cmds.flags =   MO_CLR_BREAK_USES_ADDR | MO_GETMEM_NEEDS_RANGE | MO_FILL_USES_ADDR;
+  dbug_cmds.init =   dbug_inits;			/* Init strings */
+  dbug_cmds.cont =   "go\r";			/* continue command */
+  dbug_cmds.step =   "step\r";			/* single step */
+  dbug_cmds.stop =   NULL;				/* interrupt command */
+  dbug_cmds.set_break =   "br %x\r";			/* set a breakpoint */
+  dbug_cmds.clr_break =   "br -c %x\r";			/* clear a breakpoint */
+  dbug_cmds.clr_all_break =   "br -c\r";			/* clear all breakpoints */
+  dbug_cmds.fill =   "bf.b %x %x %x";		/* fill (start end val) */
+  dbug_cmds.setmem.cmdb =     "mm.b %x %x\r";		/* setmem.cmdb (addr, value) */
+  dbug_cmds.setmem.cmdw =     "mm.w %x %x\r";		/* setmem.cmdw (addr, value) */
+  dbug_cmds.setmem.cmdl =     "mm.l %x %x\r";		/* setmem.cmdl (addr, value) */
+  dbug_cmds.setmem.cmdll =     NULL;			/* setmem.cmdll (addr, value) */
+  dbug_cmds.setmem.resp_delim =     NULL;			/* setmem.resp_delim */
+  dbug_cmds.setmem.term =     NULL;			/* setmem.term */
+  dbug_cmds.setmem.term_cmd =     NULL;			/* setmem.term_cmd */
+  dbug_cmds.getmem.cmdb =     "md.b %x %x\r";		/* getmem.cmdb (addr, addr2) */
+  dbug_cmds.getmem.cmdw =     "md.w %x %x\r";		/* getmem.cmdw (addr, addr2) */
+  dbug_cmds.getmem.cmdl =     "md.l %x %x\r";		/* getmem.cmdl (addr, addr2) */
+  dbug_cmds.getmem.cmdll =     NULL;			/* getmem.cmdll (addr, addr2) */
+  dbug_cmds.getmem.resp_delim =     ":";			/* getmem.resp_delim */
+  dbug_cmds.getmem.term =     NULL;			/* getmem.term */
+  dbug_cmds.getmem.term_cmd =     NULL;			/* getmem.term_cmd */
+  dbug_cmds.setreg.cmd =     "rm %s %x\r";		/* setreg.cmd (name, value) */
+  dbug_cmds.setreg.resp_delim =     NULL;			/* setreg.resp_delim */
+  dbug_cmds.setreg.term =     NULL;			/* setreg.term */
+  dbug_cmds.setreg.term_cmd =     NULL;			/* setreg.term_cmd */
+  dbug_cmds.getreg.cmd =     "rd %s\r";			/* getreg.cmd (name) */
+  dbug_cmds.getreg.resp_delim =     ":";			/* getreg.resp_delim */
+  dbug_cmds.getreg.term =     NULL;			/* getreg.term */
+  dbug_cmds.getreg.term_cmd =     NULL;			/* getreg.term_cmd */
+  dbug_cmds.dump_registers =   "rd\r";			/* dump_registers */
+  dbug_cmds.register_pattern =   "\\(\\w+\\) +:\\([0-9a-fA-F]+\\b\\)"; /* register_pattern */
+  dbug_cmds.supply_register =   dbug_supply_register;		/* supply_register */
+  dbug_cmds.load_routine =   NULL;				/* load_routine (defaults to SRECs) */
+  dbug_cmds.load =   "dl\r";			/* download command */
+  dbug_cmds.loadresp =   "\n";				/* load response */
+  dbug_cmds.prompt =   "dBUG>";			/* monitor command prompt */
+  dbug_cmds.line_term =   "\r";				/* end-of-line terminator */
+  dbug_cmds.cmd_end =   NULL;				/* optional command terminator */
+  dbug_cmds.target =   &dbug_ops ;			/* target operations */
+  dbug_cmds.stopbits =   SERIAL_1_STOPBITS;		/* number of stop bits */
+  dbug_cmds.regnames =   dbug_regnames;		/* registers names */
+  dbug_cmds.magic =   MONITOR_OPS_MAGIC	;	/* magic */
+} /* init_debug_ops */
+
+static void
+dbug_open(args, from_tty)
+     char *args;
+     int from_tty;
+{
+  monitor_open (args, &dbug_cmds, from_tty);
+}
+
+void
+_initialize_dbug_rom ()
+{
+  init_dbug_cmds() ;
+  init_monitor_ops (&dbug_ops);
+
+  dbug_ops.to_shortname = "dbug";
+  dbug_ops.to_longname = "dBUG monitor";
+  dbug_ops.to_doc = "Debug via the dBUG monitor.\n\
+Specify the serial device it is connected to (e.g. /dev/ttya).";
+  dbug_ops.to_open = dbug_open;
+
+  add_target (&dbug_ops);
+}
diff --git a/contrib/gdb/gdb/debugify.c b/contrib/gdb/gdb/debugify.c
new file mode 100644
index 000000000000..841b58913948
--- /dev/null
+++ b/contrib/gdb/gdb/debugify.c
@@ -0,0 +1,109 @@
+
+/* Debug macros for developemnt.
+   Copyright 1997
+   Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#define DEBUGIFY
+#include "debugify.h"
+#include "config.h"
+
+#include <stdio.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#include <strings.h>
+#endif
+
+#define REDIRECT
+
+static FILE *fout = NULL;
+static char fname[128];
+static int file_cnt = 0;	/* count number of open files */
+
+void 
+puts_dbg (data)
+  const char *data;
+{
+  FILE *fdbg;
+
+  fdbg = fopen ("dbg.log", "a+");
+  if (fdbg == NULL)
+    return;
+  fprintf (fdbg, data);
+  fclose (fdbg);
+}
+
+/* Can't easily get the message back to gdb... write to a log instead. */
+void 
+fputs_dbg (data, fakestream)
+  const char *data;
+  FILE *fakestream;
+{
+#ifdef REDIRECT
+  puts_dbg (data);
+#else /* REDIRECT */
+
+  if (fakestream == stdout || fakestream == stderr || fakestream == NULL)
+    {
+      if (fout == NULL)
+	{
+	  for (file_cnt = 0; file_cnt < 20; file_cnt++)
+	    {
+	      sprintf (fname, "dbg%d.log", file_cnt);
+	      if ((fout = fopen (fname), "r") != NULL)
+		fclose (fout);
+	      else
+		break;
+	    }
+	  fout = fopen (fname, "w");
+	  if (fout == NULL)
+	    return;
+	}
+      fakestream = fout;
+    }
+  fprintf (fakestream, data);
+  fflush (fakestream);
+#endif /* REDIRECT */
+}
+
+void 
+#ifdef ANSI_PROTOTYPES
+printf_dbg (const char *format,...)
+#else
+printf_dbg (va_alist) 
+     va_dcl
+#endif
+{
+  va_list args;
+  char buf[256];
+#ifdef ANSI_PROTOTYPES
+  va_start (args, format);
+#else
+  char *format;
+
+  va_start (args);
+  format = va_arg (args, char *); 
+#endif
+  vsprintf (buf, format, args);
+  puts_dbg (buf);
+  va_end (args);
+}
diff --git a/contrib/gdb/gdb/debugify.h b/contrib/gdb/gdb/debugify.h
new file mode 100644
index 000000000000..b4ae92bc93b7
--- /dev/null
+++ b/contrib/gdb/gdb/debugify.h
@@ -0,0 +1,83 @@
+
+/* Debug macros for development.
+   Copyright 1997
+   Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifndef _DEBUGIFY_H_
+#define _DEBUGIFY_H_
+
+#include "ansidecl.h"
+
+#ifdef ANSI_PROTOTYPES
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+
+#ifdef DEBUGIFY
+#include <assert.h>
+#ifdef TO_SCREEN
+#ifdef _Win32
+#define DBG(x) OutputDebugString x
+#else
+#define DBG(x) printf x
+#endif
+#elif TO_GDB
+#define DBG(x) printf_unfiltered x
+#elif TO_POPUP
+#ifdef _Win32
+#define DBG(x) MessageBox x
+#else
+#define DBG(x) printf x
+#endif
+#else /* default: TO_FILE "gdb.log" */
+#define DBG(x) printf_dbg x
+#endif
+
+#define ASSERT(x) assert(x)
+
+#else /* DEBUGIFY */
+#define DBG(x)
+#define ASSERT(x)
+#endif
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#ifdef REDIRECT
+#define printf_unfiltered printf_dbg
+#define fputs_unfiltered fputs_dbg
+  extern void fputs_dbg PARAMS ((const char *fmt, FILE * fakestream));
+#endif /* REDIRECT */
+
+  extern void puts_dbg PARAMS ((const char *fmt));
+#ifdef ANSI_PROTOTYPES
+  extern void printf_dbg PARAMS ((const char *fmt,...));
+#else
+  extern void printf_dbg PARAMS ((va_alist va_dcl));
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _DEBUGIFY_H_ */
diff --git a/contrib/gdb/gdb/dve3900-rom.c b/contrib/gdb/gdb/dve3900-rom.c
new file mode 100644
index 000000000000..c76da776d60a
--- /dev/null
+++ b/contrib/gdb/gdb/dve3900-rom.c
@@ -0,0 +1,962 @@
+/* Remote debugging interface for Densan DVE-R3900 ROM monitor for
+   GDB, the GNU debugger.
+   Copyright 1997 Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#include "defs.h"
+#include "gdbcore.h"
+#include "target.h"
+#include "monitor.h"
+#include "serial.h"
+#include "inferior.h"
+#include "command.h"
+#include "gdb_string.h"
+#include <time.h>
+
+/* Type of function passed to bfd_map_over_sections.  */
+
+typedef void (*section_map_func) PARAMS ((bfd *abfd, asection *sect, PTR obj));
+
+/* Packet escape character used by Densan monitor.  */
+
+#define PESC 0xdc
+
+/* Maximum packet size.  This is actually smaller than necessary
+   just to be safe.  */
+
+#define MAXPSIZE 1024
+
+/* External functions.  */
+
+extern void report_transfer_performance PARAMS ((unsigned long,
+						 time_t, time_t));
+
+/* Certain registers are "bitmapped", in that the monitor can only display
+   them or let the user modify them as a series of named bitfields.
+   This structure describes a field in a bitmapped register.  */
+
+struct bit_field
+{
+  char *prefix;		/* string appearing before the value */
+  char *suffix;		/* string appearing after the value */
+  char *user_name;	/* name used by human when entering field value */
+  int  length;		/* number of bits in the field */
+  int  start;		/* starting (least significant) bit number of field */
+};
+        
+/* Local functions for register manipulation.  */
+
+static void r3900_supply_register PARAMS ((char *regname, int regnamelen,
+					   char *val, int vallen));
+static void fetch_bad_vaddr PARAMS ((void));
+static unsigned long fetch_fields PARAMS ((struct bit_field *bf));
+static void fetch_bitmapped_register PARAMS ((int regno,
+						   struct bit_field *bf));
+static void r3900_fetch_registers PARAMS ((int regno));
+static void store_bitmapped_register PARAMS ((int regno,
+						    struct bit_field *bf));
+static void r3900_store_registers PARAMS ((int regno));
+
+/* Local functions for fast binary loading.  */
+
+static void write_long PARAMS ((char *buf, long n));
+static void write_long_le PARAMS ((char *buf, long n));
+static int  debug_readchar PARAMS ((int hex));
+static void debug_write PARAMS ((unsigned char *buf, int buflen));
+static void ignore_packet PARAMS ((void));
+static void send_packet PARAMS ((char type, unsigned char *buf, int buflen,
+				 int seq));
+static void process_read_request PARAMS ((unsigned char *buf, int buflen));
+static void count_section PARAMS ((bfd *abfd, asection *s,
+				   unsigned int *section_count));
+static void load_section PARAMS ((bfd *abfd, asection *s,
+				  unsigned int *data_count));
+static void r3900_load PARAMS ((char *filename, int from_tty));
+
+/* Miscellaneous local functions.  */
+
+static void r3900_open PARAMS ((char *args, int from_tty));
+
+
+/* Pointers to static functions in monitor.c for fetching and storing
+   registers.  We can't use these function in certain cases where the Densan
+   monitor acts perversely: for registers that it displays in bit-map
+   format, and those that can't be modified at all.  In those cases
+   we have to use our own functions to fetch and store their values.  */
+
+static void (*orig_monitor_fetch_registers) PARAMS ((int regno));
+static void (*orig_monitor_store_registers) PARAMS ((int regno));
+
+/* Pointer to static function in monitor. for loading programs.
+   We use this function for loading S-records via the serial link.  */
+
+static void (*orig_monitor_load) PARAMS ((char *file, int from_tty));
+
+/* This flag is set if a fast ethernet download should be used.  */
+
+static int ethernet = 0;
+
+/* This array of registers needs to match the indexes used by GDB. The
+   whole reason this exists is because the various ROM monitors use
+   different names than GDB does, and don't support all the registers
+   either.  */
+
+static char *r3900_regnames[NUM_REGS] =
+{
+  "r0",   "r1",   "r2",   "r3",   "r4",   "r5",   "r6",   "r7",
+  "r8",   "r9",   "r10",  "r11",  "r12",  "r13",  "r14",  "r15",
+  "r16",  "r17",  "r18",  "r19",  "r20",  "r21",  "r22",  "r23",
+  "r24",  "r25",  "r26",  "r27",  "r28",  "r29",  "r30",  "r31",
+
+  "S", 		/* PS_REGNUM */
+  "l",		/* LO_REGNUM */
+  "h",		/* HI_REGNUM */
+  "B",		/* BADVADDR_REGNUM */
+  "Pcause",	/* CAUSE_REGNUM */
+  "p"		/* PC_REGNUM */
+};
+
+
+/* Table of register names produced by monitor's register dump command.  */
+
+static struct reg_entry
+{
+  char *name;
+  int regno;
+} reg_table[] =
+{
+  { "r0_zero", 0 },  { "r1_at",   1 },  { "r2_v0",   2 },  { "r3_v1",   3 },
+  { "r4_a0",   4 },  { "r5_a1",   5 },  { "r6_a2",   6 },  { "r7_a3",   7 },
+  { "r8_t0",   8 },  { "r9_t1",   9 },  { "r10_t2", 10 },  { "r11_t3", 11 },
+  { "r12_t4", 12 },  { "r13_t5", 13 },  { "r14_t6", 14 },  { "r15_t7", 15 },
+  { "r16_s0", 16 },  { "r17_s1", 17 },  { "r18_s2", 18 },  { "r19_s3", 19 },
+  { "r20_s4", 20 },  { "r21_s5", 21 },  { "r22_s6", 22 },  { "r23_s7", 23 },
+  { "r24_t8", 24 },  { "r25_t9", 25 },  { "r26_k0", 26 },  { "r27_k1", 27 },
+  { "r28_gp", 28 },  { "r29_sp", 29 },  { "r30_fp", 30 },  { "r31_ra", 31 },
+  { "HI",     HI_REGNUM },
+  { "LO",     LO_REGNUM },
+  { "PC",     PC_REGNUM },
+  { "BadV",   BADVADDR_REGNUM },
+  { NULL,     0 }
+};
+
+
+/* The monitor displays the cache register along with the status register,
+   as if they were a single register.  So when we want to fetch the
+   status register, parse but otherwise ignore the fields of the
+   cache register that the monitor displays.  Register fields that should
+   be ignored have a length of zero in the tables below.  */
+
+static struct bit_field status_fields [] =
+{
+  /* Status register portion */
+  { "SR[<CU=",	" ",	"cu",	4, 28 },
+  { "RE=",	" ",	"re",	1, 25 },
+  { "BEV=",	" ",	"bev",	1, 22 },
+  { "TS=",	" ",	"ts",	1, 21 },
+  { "Nmi=",	" ",	"nmi",	1, 20 },
+  { "INT=",	" ",	"int",  6, 10 },
+  { "SW=",	">]",	"sw",   2,  8 },
+  { "[<KUO=",	" ",	"kuo",  1,  5 },
+  { "IEO=",	" ",	"ieo",  1,  4 },
+  { "KUP=",	" ",	"kup",  1,  3 },
+  { "IEP=",	" ",	"iep",  1,  2 },
+  { "KUC=",	" ",	"kuc",  1,  1 },
+  { "IEC=",	">]",	"iec",  1,  0 },
+
+  /* Cache register portion (dummy for parsing only) */
+  { "CR[<IalO="," ",	"ialo",	0, 13 },
+  { "DalO=",	" ",	"dalo",	0, 12 },
+  { "IalP=",	" ",	"ialp",	0, 11 },
+  { "DalP=",	" ",	"dalp",	0, 10 },
+  { "IalC=",	" ",	"ialc",	0,  9 },
+  { "DalC=",	">] ",	"dalc",	0,  8 },
+
+  { NULL,	NULL,	0,  0 }		/* end of table marker */
+};
+
+
+#if 0	/* FIXME: Enable when we add support for modifying cache register.  */
+static struct bit_field cache_fields [] =
+{
+  /* Status register portion (dummy for parsing only) */
+  { "SR[<CU=",	" ",	"cu",	0, 28 },
+  { "RE=",	" ",	"re",	0, 25 },
+  { "BEV=",	" ",	"bev",	0, 22 },
+  { "TS=",	" ",	"ts",	0, 21 },
+  { "Nmi=",	" ",	"nmi",	0, 20 },
+  { "INT=",	" ",	"int",  0, 10 },
+  { "SW=",	">]",	"sw",   0,  8 },
+  { "[<KUO=",	" ",	"kuo",  0,  5 },
+  { "IEO=",	" ",	"ieo",  0,  4 },
+  { "KUP=",	" ",	"kup",  0,  3 },
+  { "IEP=",	" ",	"iep",  0,  2 },
+  { "KUC=",	" ",	"kuc",  0,  1 },
+  { "IEC=",	">]",	"iec",  0,  0 },
+
+  /* Cache register portion  */
+  { "CR[<IalO="," ",	"ialo",	1, 13 },
+  { "DalO=",	" ",	"dalo",	1, 12 },
+  { "IalP=",	" ",	"ialp",	1, 11 },
+  { "DalP=",	" ",	"dalp",	1, 10 },
+  { "IalC=",	" ",	"ialc",	1,  9 },
+  { "DalC=",	">] ",	"dalc",	1,  8 },
+
+  { NULL,	NULL,	NULL,	0,  0 }		/* end of table marker */
+};
+#endif
+
+
+static struct bit_field cause_fields[] = 
+{
+  { "<BD=",	" ",	"bd",   1, 31 },
+  { "CE=",	" ",	"ce",   2, 28 },
+  { "IP=",	" ",	"ip",   6, 10 },
+  { "SW=", 	" ",	"sw",   2,  8 },
+  { "EC=", 	">]" ,	"ec",   5,  2 },
+
+  { NULL,	NULL,	NULL,	0,  0 }		/* end of table marker */
+};
+
+
+/* The monitor prints register values in the form
+
+	regname = xxxx xxxx
+
+   We look up the register name in a table, and remove the embedded space in
+   the hex value before passing it to monitor_supply_register.  */
+
+static void
+r3900_supply_register (regname, regnamelen, val, vallen)
+     char *regname;
+     int regnamelen;
+     char *val;
+     int vallen;
+{
+  int regno = -1;
+  int i;
+  char valbuf[10];
+  char *p;
+
+  /* Perform some sanity checks on the register name and value.  */
+  if (regnamelen < 2 || regnamelen > 7 || vallen != 9)
+    return;
+
+  /* Look up the register name.  */
+  for (i = 0; reg_table[i].name != NULL; i++)
+    {
+      int rlen = strlen (reg_table[i].name);
+      if (rlen == regnamelen && strncmp (regname, reg_table[i].name, rlen) == 0)
+	{
+	  regno = reg_table[i].regno;
+	  break;
+	}
+    }
+  if (regno == -1)
+    return;
+
+  /* Copy the hex value to a buffer and eliminate the embedded space. */
+  for (i = 0, p = valbuf; i < vallen; i++)
+    if (val[i] != ' ')
+      *p++ = val[i];
+  *p = '\0';
+
+  monitor_supply_register (regno, valbuf);
+}
+
+
+/* Fetch the BadVaddr register.  Unlike the other registers, this
+   one can't be modified, and the monitor won't even prompt to let
+   you modify it.  */
+
+static void
+fetch_bad_vaddr()
+{
+  char buf[20];
+
+  monitor_printf ("xB\r");
+  monitor_expect ("BadV=", NULL, 0);
+  monitor_expect_prompt (buf, sizeof(buf));
+  monitor_supply_register (BADVADDR_REGNUM, buf);
+}
+
+    
+/* Read a series of bit fields from the monitor, and return their
+   combined binary value.  */
+
+static unsigned long
+fetch_fields (bf)
+     struct bit_field *bf;
+{
+  char buf[20];
+  unsigned long val = 0;
+  unsigned long bits;
+
+  for ( ; bf->prefix != NULL; bf++)
+    {
+      monitor_expect (bf->prefix, NULL, 0);		/* get prefix */
+      monitor_expect (bf->suffix, buf, sizeof (buf));	/* hex value, suffix */
+      if (bf->length != 0)
+        {
+	  bits = strtoul (buf, NULL, 16);	/* get field value */
+	  bits &= ((1 << bf->length) - 1);	/* mask out useless bits */
+	  val |= bits << bf->start;		/* insert into register */
+	}
+	  
+    }
+
+  return val;
+}
+
+
+static void
+fetch_bitmapped_register (regno, bf)
+     int regno;
+     struct bit_field *bf;
+{
+  unsigned long val;
+  unsigned char regbuf[MAX_REGISTER_RAW_SIZE];
+
+  monitor_printf ("x%s\r", r3900_regnames[regno]);
+  val = fetch_fields (bf);
+  monitor_printf (".\r");
+  monitor_expect_prompt (NULL, 0);
+
+  /* supply register stores in target byte order, so swap here */
+
+  store_unsigned_integer (regbuf, REGISTER_RAW_SIZE (regno), val);
+  supply_register (regno, regbuf);
+
+}
+
+
+/* Fetch all registers (if regno is -1), or one register from the
+   monitor.  For most registers, we can use the generic monitor_
+   monitor_fetch_registers function.  But others are displayed in
+   a very unusual fashion by the monitor, and must be handled specially.  */
+
+static void
+r3900_fetch_registers (regno)
+     int regno;
+{
+  switch (regno)
+    {
+    case BADVADDR_REGNUM:
+      fetch_bad_vaddr ();
+      return;
+    case PS_REGNUM:
+      fetch_bitmapped_register (PS_REGNUM, status_fields);
+      return;
+    case CAUSE_REGNUM:
+      fetch_bitmapped_register (CAUSE_REGNUM, cause_fields);
+      return;
+    default:
+      orig_monitor_fetch_registers (regno);
+    }
+}
+
+
+/* Write the new value of the bitmapped register to the monitor.  */
+
+static void
+store_bitmapped_register (regno, bf)
+     int regno;
+     struct bit_field *bf;
+{
+  unsigned long oldval, newval;
+
+  /* Fetch the current value of the register.  */
+  monitor_printf ("x%s\r", r3900_regnames[regno]);
+  oldval = fetch_fields (bf);
+  newval = read_register (regno);
+
+  /* To save time, write just the fields that have changed.  */
+  for ( ; bf->prefix != NULL; bf++)
+    {
+      if (bf->length != 0)
+        {
+	  unsigned long oldbits, newbits, mask;
+
+	  mask = (1 << bf->length) - 1;
+	  oldbits = (oldval >> bf->start) & mask;
+	  newbits = (newval >> bf->start) & mask;
+	  if (oldbits != newbits)
+	    monitor_printf ("%s %x ", bf->user_name, newbits);
+	}
+    }
+
+  monitor_printf (".\r");
+  monitor_expect_prompt (NULL, 0);
+}
+
+
+static void
+r3900_store_registers (regno)
+     int regno;
+{
+  switch (regno)
+    {
+    case PS_REGNUM:
+      store_bitmapped_register (PS_REGNUM, status_fields);
+      return;
+    case CAUSE_REGNUM:
+      store_bitmapped_register (CAUSE_REGNUM, cause_fields);
+      return;
+    default:
+      orig_monitor_store_registers (regno);
+    }
+}
+
+
+/* Write a 4-byte integer to the buffer in big-endian order.  */
+
+static void
+write_long (buf, n)
+     char *buf;
+     long n;
+{
+  buf[0] = (n >> 24) & 0xff;
+  buf[1] = (n >> 16) & 0xff;
+  buf[2] = (n >> 8) & 0xff;
+  buf[3] = n & 0xff;
+}
+
+
+/* Write a 4-byte integer to the buffer in little-endian order.  */
+
+static void
+write_long_le (buf, n)
+     char *buf;
+     long n;
+{
+  buf[0] = n & 0xff;
+  buf[1] = (n >> 8) & 0xff;
+  buf[2] = (n >> 16) & 0xff;
+  buf[3] = (n >> 24) & 0xff;
+}
+
+
+/* Read a character from the monitor.  If remote debugging is on,
+   print the received character.  If HEX is non-zero, print the
+   character in hexadecimal; otherwise, print it in ASCII.  */
+
+static int
+debug_readchar (hex)
+     int hex;
+{
+  char buf [10];
+  int c = monitor_readchar ();
+
+  if (remote_debug > 0)
+    {
+      if (hex)
+	sprintf (buf, "[%02x]", c & 0xff);
+      else if (c == '\0')
+	strcpy (buf, "\\0");
+      else 
+	{
+	  buf[0] = c;
+	  buf[1] = '\0';
+	}
+      puts_debug ("Read -->", buf, "<--");
+    }
+  return c;
+}
+
+
+/* Send a buffer of characters to the monitor.  If remote debugging is on,
+   print the sent buffer in hex.  */
+
+static void
+debug_write (buf, buflen)
+     unsigned char *buf;
+     int buflen;
+{
+  char s[10];
+
+  monitor_write (buf, buflen);
+
+  if (remote_debug > 0)
+    {
+      while (buflen-- > 0)
+	{
+	  sprintf (s, "[%02x]", *buf & 0xff);
+	  puts_debug ("Sent -->", s, "<--");
+	  buf++;
+	}
+    }
+}
+
+
+/* Ignore a packet sent to us by the monitor.  It send packets
+   when its console is in "communications interface" mode.   A packet
+   is of this form:
+
+      start of packet flag (one byte: 0xdc)
+      packet type (one byte)
+      length (low byte)
+      length (high byte)
+      data (length bytes)
+
+   The last two bytes of the data field are a checksum, but we don't
+   bother to verify it.
+*/
+
+static void
+ignore_packet ()
+{
+  int c;
+  int len;  
+
+  /* Ignore lots of trash (messages about section addresses, for example)
+     until we see the start of a packet.  */
+  for (len = 0; len < 256; len++)
+    {
+      c = debug_readchar (0);
+      if (c == PESC)
+	break;
+    }
+  if (len == 8)
+    error ("Packet header byte not found; %02x seen instead.", c);
+
+  /* Read the packet type and length.  */
+  c = debug_readchar (1);			/* type */
+
+  c = debug_readchar (1);			/* low byte of length */
+  len = c & 0xff;
+
+  c = debug_readchar (1);			/* high byte of length */
+  len += (c & 0xff) << 8;
+
+  /* Ignore the rest of the packet.  */
+  while (len-- > 0)
+    c = debug_readchar (1);
+}
+
+
+/* Encapsulate some data into a packet and send it to the monitor.
+
+   The 'p' packet is a special case.  This is a packet we send
+   in response to a read ('r') packet from the monitor.  This function
+   appends a one-byte sequence number to the data field of such a packet.
+*/
+
+static void
+send_packet (type, buf, buflen, seq)
+     char type;
+     unsigned char *buf;
+     int buflen, seq;
+{
+  unsigned char hdr[4];
+  int len = buflen;
+  int sum, i;
+
+  /* If this is a 'p' packet, add one byte for a sequence number.  */
+  if (type == 'p')
+    len++;
+
+  /* If the buffer has a non-zero length, add two bytes for a checksum.  */
+  if (len > 0)
+    len += 2;
+
+  /* Write the packet header.  */
+  hdr[0] = PESC;
+  hdr[1] = type;
+  hdr[2] = len & 0xff;
+  hdr[3] = (len >> 8) & 0xff;
+  debug_write (hdr, sizeof (hdr));
+
+  if (len)
+    {
+      /* Write the packet data.  */
+      debug_write (buf, buflen);
+
+      /* Write the sequence number if this is a 'p' packet.  */
+      if (type == 'p')
+	{
+	  hdr[0] = seq;
+	  debug_write (hdr, 1);
+	}
+
+      /* Write the checksum.  */
+      sum = 0;
+      for (i = 0; i < buflen; i++)
+	{
+	  int tmp = (buf[i] & 0xff);
+	  if (i & 1)
+	    sum += tmp;
+	  else
+	    sum += tmp << 8;
+	}
+      if (type == 'p')
+        {
+	  if (buflen & 1)
+	    sum += (seq & 0xff);
+	  else
+	    sum += (seq & 0xff) << 8;
+	}
+      sum = (sum & 0xffff) + ((sum >> 16) & 0xffff);
+      sum += (sum >> 16) & 1;
+      sum = ~sum;  
+
+      hdr[0] = (sum >> 8) & 0xff;
+      hdr[1] = sum & 0xff;
+      debug_write (hdr, 2);
+    }
+}
+
+
+/* Respond to an expected read request from the monitor by sending
+   data in chunks.  Handle all acknowledgements and handshaking packets.
+
+   The monitor expects a response consisting of a one or more 'p' packets,
+   each followed by a portion of the data requested.  The 'p' packet
+   contains only a four-byte integer, the value of which is the number
+   of bytes of data we are about to send.  Following the 'p' packet,
+   the monitor expects the data bytes themselves in raw, unpacketized,
+   form, without even a checksum.
+ */
+
+static void
+process_read_request (buf, buflen)
+     unsigned char *buf;
+     int buflen;
+{
+  unsigned char len[4];
+  int i, chunk;
+  unsigned char seq;
+
+  /* Discard the read request.  FIXME: we have to hope it's for
+     the exact number of bytes we want to send; should check for this.  */
+  ignore_packet ();
+
+  for (i = chunk = 0, seq = 0; i < buflen; i += chunk, seq++)
+    {
+      /* Don't send more than MAXPSIZE bytes at a time.  */
+      chunk = buflen - i;
+      if (chunk > MAXPSIZE)
+	chunk = MAXPSIZE;
+
+      /* Write a packet containing the number of bytes we are sending.  */
+      write_long_le (len, chunk);
+      send_packet ('p', len, sizeof (len), seq);
+
+      /* Write the data in raw form following the packet.  */
+      debug_write (&buf[i], chunk);
+
+      /* Discard the ACK packet.  */
+      ignore_packet ();
+    }
+
+  /* Send an "end of data" packet.  */
+  send_packet ('e', "", 0, 0);
+}
+
+
+/* Count loadable sections (helper function for r3900_load).  */
+
+static void
+count_section (abfd, s, section_count)
+     bfd      *abfd;
+     asection *s;
+     unsigned int *section_count;
+{
+  if (s->flags & SEC_LOAD && bfd_section_size (abfd, s) != 0)
+    (*section_count)++;
+}
+
+
+/* Load a single BFD section (helper function for r3900_load).
+
+   WARNING: this code is filled with assumptions about how
+   the Densan monitor loads programs.  The monitor issues
+   packets containing read requests, but rather than respond
+   to them in an general way, we expect them to following
+   a certain pattern.
+   
+   For example, we know that the monitor will start loading by
+   issuing an 8-byte read request for the binary file header.
+   We know this is coming and ignore the actual contents
+   of the read request packet.
+*/
+
+static void
+load_section (abfd, s, data_count)
+     bfd      *abfd;
+     asection *s;
+     unsigned int *data_count;
+{
+  if (s->flags & SEC_LOAD)
+    {
+      bfd_size_type section_size = bfd_section_size (abfd, s);
+      bfd_vma       section_base = bfd_section_lma  (abfd, s);
+      unsigned char *buffer;
+      unsigned char header[8];
+
+      /* Don't output zero-length sections.  */
+      if (section_size == 0)
+        return;
+      if (data_count)
+	*data_count += section_size;
+
+      /* Print some fluff about the section being loaded.  */
+      printf_filtered ("Loading section %s, size 0x%lx lma ",
+		       bfd_section_name (abfd, s), (long)section_size);
+      print_address_numeric (section_base, 1, gdb_stdout);
+      printf_filtered ("\n");
+      gdb_flush (gdb_stdout);
+
+      /* Write the section header (location and size).  */
+      write_long (&header[0], (long)section_base);
+      write_long (&header[4], (long)section_size);
+      process_read_request (header, sizeof (header));
+
+      /* Read the section contents into a buffer, write it out,
+         then free the buffer.  */
+      buffer = (unsigned char *) xmalloc (section_size);
+      bfd_get_section_contents (abfd, s, buffer, 0, section_size);
+      process_read_request (buffer, section_size);
+      free (buffer);
+  }
+}
+
+
+/* When the ethernet is used as the console port on the Densan board,
+   we can use the "Rm" command to do a fast binary load.  The format
+   of the download data is:
+
+	number of sections (4 bytes)
+	starting address (4 bytes)
+	repeat for each section:
+	    location address (4 bytes)
+	    section size (4 bytes)
+	    binary data
+
+   The 4-byte fields are all in big-endian order.
+
+   Using this command is tricky because we have to put the monitor
+   into a special funky "communications interface" mode, in which
+   it sends and receives packets of data along with the normal prompt.
+ */
+
+static void
+r3900_load (filename, from_tty) 
+    char *filename;
+    int from_tty;
+{
+  bfd *abfd;
+  unsigned int data_count = 0;
+  time_t start_time, end_time;	/* for timing of download */
+  int section_count = 0;
+  unsigned char buffer[8];
+
+  /* If we are not using the ethernet, use the normal monitor load,
+     which sends S-records over the serial link.  */
+  if (!ethernet)
+    {
+      orig_monitor_load (filename, from_tty);
+      return;
+    }
+
+  /* Open the file.  */
+  if (filename == NULL || filename[0] == 0)
+    filename = get_exec_file (1);
+  abfd = bfd_openr (filename, 0);
+  if (!abfd)
+    error ("Unable to open file %s\n", filename);
+  if (bfd_check_format (abfd, bfd_object) == 0)
+    error ("File is not an object file\n");
+
+  /* Output the "vconsi" command to get the monitor in the communication
+     state where it will accept a load command.  This will cause
+     the monitor to emit a packet before each prompt, so ignore the packet.  */
+  monitor_printf ("vconsi\r");
+  ignore_packet ();
+  monitor_expect_prompt (NULL, 0);
+
+  /* Output the "Rm" (load) command and respond to the subsequent "open"
+     packet by sending an ACK packet.  */
+  monitor_printf ("Rm\r");
+  ignore_packet ();
+  send_packet ('a', "", 0, 0);
+  
+  /* Output the fast load header (number of sections and starting address).  */
+  bfd_map_over_sections ((bfd *) abfd, (section_map_func) count_section,
+			 &section_count);
+  write_long (&buffer[0], (long)section_count);
+  if (exec_bfd)
+    write_long (&buffer[4], (long)bfd_get_start_address (exec_bfd));
+  else
+    write_long (&buffer[4], 0);
+  process_read_request (buffer, sizeof (buffer));
+
+  /* Output the section data.  */
+  start_time = time (NULL);
+  bfd_map_over_sections (abfd, (section_map_func) load_section, &data_count);
+  end_time = time (NULL);
+
+  /* Acknowledge the close packet and put the monitor back into
+     "normal" mode so it won't send packets any more.  */
+  ignore_packet ();
+  send_packet ('a', "", 0, 0);
+  monitor_expect_prompt (NULL, 0);
+  monitor_printf ("vconsx\r");
+  monitor_expect_prompt (NULL, 0);
+
+  /* Print start address and download performance information.  */
+  printf_filtered ("Start address 0x%lx\n", (long)bfd_get_start_address (abfd));
+  report_transfer_performance (data_count, start_time, end_time);
+
+  /* Finally, make the PC point at the start address */
+  if (exec_bfd)
+    write_pc (bfd_get_start_address (exec_bfd));
+
+  inferior_pid = 0;             /* No process now */
+
+  /* This is necessary because many things were based on the PC at the
+     time that we attached to the monitor, which is no longer valid
+     now that we have loaded new code (and just changed the PC).
+     Another way to do this might be to call normal_stop, except that
+     the stack may not be valid, and things would get horribly
+     confused... */
+  clear_symtab_users ();
+}
+
+
+/* Commands to send to the monitor when first connecting:
+    * The bare carriage return forces a prompt from the monitor
+      (monitor doesn't prompt immediately after a reset).
+    * The "vconsx" switches the monitor back to interactive mode
+      in case an aborted download had left it in packet mode.
+    * The "Xtr" command causes subsequent "t" (trace) commands to display
+      the general registers only.
+    * The "Xxr" command does the same thing for the "x" (examine
+      registers) command.
+    * The "bx" command clears all breakpoints.
+*/
+
+static char *r3900_inits[] = {"\r", "vconsx\r", "Xtr\r", "Xxr\r", "bx\r", NULL};
+static char *dummy_inits[] = { NULL };
+
+static struct target_ops r3900_ops;
+static struct monitor_ops r3900_cmds;
+
+static void
+r3900_open (args, from_tty)
+     char *args;
+     int from_tty;
+{
+  char buf[64];
+  int i;
+
+  monitor_open (args, &r3900_cmds, from_tty);
+
+  /* We have to handle sending the init strings ourselves, because
+     the first two strings we send (carriage returns) may not be echoed
+     by the monitor, but the rest will be.  */
+  monitor_printf_noecho ("\r\r");
+  for (i = 0; r3900_inits[i] != NULL; i++)
+    {
+      monitor_printf (r3900_inits[i]);
+      monitor_expect_prompt (NULL, 0);
+    }
+
+  /* Attempt to determine whether the console device is ethernet or serial.
+     This will tell us which kind of load to use (S-records over a serial
+     link, or the Densan fast binary multi-section format over the net).  */
+
+  ethernet = 0;
+  monitor_printf ("v\r");
+  if (monitor_expect ("console device :", NULL, 0) != -1)
+      if (monitor_expect ("\n", buf, sizeof (buf)) != -1)
+	if (strstr (buf, "ethernet") != NULL)
+	  ethernet = 1;
+  monitor_expect_prompt (NULL, 0);
+}
+
+void
+_initialize_r3900_rom ()
+{
+  r3900_cmds.flags = MO_NO_ECHO_ON_OPEN |
+		     MO_ADDR_BITS_REMOVE |
+		     MO_CLR_BREAK_USES_ADDR |
+		     MO_GETMEM_READ_SINGLE |
+		     MO_PRINT_PROGRAM_OUTPUT;
+
+  r3900_cmds.init = dummy_inits;
+  r3900_cmds.cont = "g\r";
+  r3900_cmds.step = "t\r";
+  r3900_cmds.set_break = "b %A\r";		/* COREADDR */
+  r3900_cmds.clr_break = "b %A,0\r";		/* COREADDR */
+  r3900_cmds.fill = "fx %A s %x %x\r";		/* COREADDR, len, val */
+
+  r3900_cmds.setmem.cmdb = "sx %A %x\r";	/* COREADDR, val */
+  r3900_cmds.setmem.cmdw = "sh %A %x\r";	/* COREADDR, val */
+  r3900_cmds.setmem.cmdl = "sw %A %x\r";	/* COREADDR, val */
+
+  r3900_cmds.getmem.cmdb = "sx %A\r";		/* COREADDR */
+  r3900_cmds.getmem.cmdw = "sh %A\r";		/* COREADDR */
+  r3900_cmds.getmem.cmdl = "sw %A\r";		/* COREADDR */
+  r3900_cmds.getmem.resp_delim = " : ";
+  r3900_cmds.getmem.term = " ";
+  r3900_cmds.getmem.term_cmd = ".\r";
+
+  r3900_cmds.setreg.cmd = "x%s %x\r";		/* regname, val */
+
+  r3900_cmds.getreg.cmd = "x%s\r";		/* regname */
+  r3900_cmds.getreg.resp_delim = "=";
+  r3900_cmds.getreg.term = " ";
+  r3900_cmds.getreg.term_cmd = ".\r";
+
+  r3900_cmds.dump_registers = "x\r";
+  r3900_cmds.register_pattern =
+	"\\([a-zA-Z0-9_]+\\) *=\\([0-9a-f]+ [0-9a-f]+\\b\\)";
+  r3900_cmds.supply_register = r3900_supply_register;
+  /* S-record download, via "keyboard port".  */
+  r3900_cmds.load = "r0\r";
+  r3900_cmds.prompt = "#";
+  r3900_cmds.line_term = "\r";
+  r3900_cmds.target = &r3900_ops;
+  r3900_cmds.stopbits = SERIAL_1_STOPBITS;
+  r3900_cmds.regnames = r3900_regnames;
+  r3900_cmds.magic = MONITOR_OPS_MAGIC;
+
+  init_monitor_ops (&r3900_ops);
+
+  r3900_ops.to_shortname = "r3900";
+  r3900_ops.to_longname = "R3900 monitor";
+  r3900_ops.to_doc = "Debug using the DVE R3900 monitor.\n\
+Specify the serial device it is connected to (e.g. /dev/ttya).";
+  r3900_ops.to_open = r3900_open;
+
+  /* Override the functions to fetch and store registers.  But save the
+     addresses of the default functions, because we will use those functions
+     for "normal" registers.  */
+
+  orig_monitor_fetch_registers = r3900_ops.to_fetch_registers;
+  orig_monitor_store_registers = r3900_ops.to_store_registers;
+  r3900_ops.to_fetch_registers = r3900_fetch_registers;
+  r3900_ops.to_store_registers = r3900_store_registers;
+
+  /* Override the load function, but save the address of the default
+     function to use when loading S-records over a serial link.  */
+  orig_monitor_load = r3900_ops.to_load;
+  r3900_ops.to_load = r3900_load;
+
+  add_target (&r3900_ops);
+}
diff --git a/contrib/gdb/gdb/mn10200-tdep.c b/contrib/gdb/gdb/mn10200-tdep.c
new file mode 100644
index 000000000000..cb7ead093137
--- /dev/null
+++ b/contrib/gdb/gdb/mn10200-tdep.c
@@ -0,0 +1,919 @@
+/* Target-dependent code for the Matsushita MN10200 for GDB, the GNU debugger.
+   Copyright 1997 Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#include "defs.h"
+#include "frame.h"
+#include "inferior.h"
+#include "obstack.h"
+#include "target.h"
+#include "value.h"
+#include "bfd.h"
+#include "gdb_string.h"
+#include "gdbcore.h"
+#include "symfile.h"
+
+  	
+/* Should call_function allocate stack space for a struct return?  */
+int
+mn10200_use_struct_convention (gcc_p, type)
+     int gcc_p;
+     struct type *type;
+{
+  return (TYPE_NFIELDS (type) > 1 || TYPE_LENGTH (type) > 8);
+}
+
+
+
+/* The main purpose of this file is dealing with prologues to extract
+   information about stack frames and saved registers.
+
+   For reference here's how prologues look on the mn10200:
+
+     With frame pointer:
+	mov fp,a0
+	mov sp,fp
+	add <size>,sp
+	Register saves for d2, d3, a1, a2 as needed.  Saves start
+	at fp - <size> + <outgoing_args_size> and work towards higher
+	addresses.  Note that the saves are actually done off the stack
+	pointer in the prologue!  This makes for smaller code and easier
+	prologue scanning as the displacement fields will unlikely
+        be more than 8 bits!
+
+     Without frame pointer:
+        add <size>,sp
+	Register saves for d2, d3, a1, a2 as needed.  Saves start
+	at sp + <outgoing_args_size> and work towards higher addresses.
+
+     Out of line prologue:
+	add <local size>,sp  -- optional
+	jsr __prologue
+	add <outgoing_size>,sp -- optional
+
+   The stack pointer remains constant throughout the life of most
+   functions.  As a result the compiler will usually omit the
+   frame pointer, so we must handle frame pointerless functions.  */
+
+/* Analyze the prologue to determine where registers are saved,
+   the end of the prologue, etc etc.  Return the end of the prologue
+   scanned.
+
+   We store into FI (if non-null) several tidbits of information:
+
+    * stack_size -- size of this stack frame.  Note that if we stop in
+    certain parts of the prologue/epilogue we may claim the size of the
+    current frame is zero.  This happens when the current frame has
+    not been allocated yet or has already been deallocated.
+
+    * fsr -- Addresses of registers saved in the stack by this frame.
+
+    * status -- A (relatively) generic status indicator.  It's a bitmask
+    with the following bits: 
+
+      MY_FRAME_IN_SP: The base of the current frame is actually in
+      the stack pointer.  This can happen for frame pointerless
+      functions, or cases where we're stopped in the prologue/epilogue
+      itself.  For these cases mn10200_analyze_prologue will need up
+      update fi->frame before returning or analyzing the register
+      save instructions.
+
+      MY_FRAME_IN_FP: The base of the current frame is in the
+      frame pointer register ($a2).
+
+      CALLER_A2_IN_A0: $a2 from the caller's frame is temporarily
+      in $a0.  This can happen if we're stopped in the prologue.
+
+      NO_MORE_FRAMES: Set this if the current frame is "start" or
+      if the first instruction looks like mov <imm>,sp.  This tells
+      frame chain to not bother trying to unwind past this frame.  */
+
+#define MY_FRAME_IN_SP 0x1
+#define MY_FRAME_IN_FP 0x2
+#define CALLER_A2_IN_A0 0x4
+#define NO_MORE_FRAMES 0x8
+ 
+static CORE_ADDR
+mn10200_analyze_prologue (fi, pc)
+    struct frame_info *fi;
+    CORE_ADDR pc;
+{
+  CORE_ADDR func_addr, func_end, addr, stop;
+  CORE_ADDR stack_size;
+  unsigned char buf[4];
+  int status;
+  char *name;
+  int out_of_line_prologue = 0;
+
+  /* Use the PC in the frame if it's provided to look up the
+     start of this function.  */
+  pc = (fi ? fi->pc : pc);
+
+  /* Find the start of this function.  */
+  status = find_pc_partial_function (pc, &name, &func_addr, &func_end);
+
+  /* Do nothing if we couldn't find the start of this function or if we're
+     stopped at the first instruction in the prologue.  */
+  if (status == 0)
+    return pc;
+
+  /* If we're in start, then give up.  */
+  if (strcmp (name, "start") == 0)
+    {
+      if (fi)
+        fi->status = NO_MORE_FRAMES;
+      return pc;
+    }
+
+  /* At the start of a function our frame is in the stack pointer.  */
+  if (fi)
+    fi->status = MY_FRAME_IN_SP;
+
+  /* If we're physically on an RTS instruction, then our frame has already
+     been deallocated.
+
+     fi->frame is bogus, we need to fix it.  */
+  if (fi && fi->pc + 1 == func_end)
+    {
+      status = target_read_memory (fi->pc, buf, 1);
+      if (status != 0)
+	{
+	  if (fi->next == NULL)
+	    fi->frame = read_sp ();
+	  return fi->pc;
+	}
+
+      if (buf[0] == 0xfe)
+	{
+	  if (fi->next == NULL)
+	    fi->frame = read_sp ();
+	  return fi->pc;
+	}
+    }
+
+  /* Similarly if we're stopped on the first insn of a prologue as our
+     frame hasn't been allocated yet.  */
+  if (fi && fi->pc == func_addr)
+    {
+      if (fi->next == NULL)
+	fi->frame = read_sp ();
+      return fi->pc;
+    }
+
+  /* Figure out where to stop scanning.  */
+  stop = fi ? fi->pc : func_end;
+
+  /* Don't walk off the end of the function.  */
+  stop = stop > func_end ? func_end : stop;
+
+  /* Start scanning on the first instruction of this function.  */
+  addr = func_addr;
+
+  status = target_read_memory (addr, buf, 2);
+  if (status != 0)
+    {
+      if (fi && fi->next == NULL && fi->status & MY_FRAME_IN_SP)
+	fi->frame = read_sp ();
+      return addr;
+    }
+
+  /* First see if this insn sets the stack pointer; if so, it's something
+     we won't understand, so quit now.   */
+  if (buf[0] == 0xdf
+      || (buf[0] == 0xf4 && buf[1] == 0x77))
+    {
+      if (fi)
+	fi->status = NO_MORE_FRAMES;
+      return addr;
+    }
+
+  /* Now see if we have a frame pointer.
+       
+     Search for mov a2,a0 (0xf278)
+        then	mov a3,a2 (0xf27e).  */
+
+  if (buf[0] == 0xf2 && buf[1] == 0x78)
+    {
+      /* Our caller's $a2 will be found in $a0 now.  Note it for
+	 our callers.  */
+      if (fi)
+	fi->status |= CALLER_A2_IN_A0;
+      addr += 2;
+      if (addr >= stop)
+	{
+	  /* We still haven't allocated our local stack.  Handle this
+	     as if we stopped on the first or last insn of a function.   */
+	  if (fi && fi->next == NULL)
+	    fi->frame = read_sp ();
+	  return addr;
+	}
+
+      status = target_read_memory (addr, buf, 2);
+      if (status != 0)
+	{
+	  if (fi && fi->next == NULL)
+	    fi->frame = read_sp ();
+	  return addr;
+	}
+      if (buf[0] == 0xf2 && buf[1] == 0x7e)
+	{
+	  addr += 2;
+
+	  /* Our frame pointer is valid now.  */
+	  if (fi)
+	    {
+	      fi->status |= MY_FRAME_IN_FP;
+	      fi->status &= ~MY_FRAME_IN_SP;
+	    }
+	  if (addr >= stop)
+	    return addr;
+	}
+      else
+	{
+	  if (fi && fi->next == NULL)
+	    fi->frame = read_sp ();
+	  return addr;
+	}
+    }
+
+  /* Next we should allocate the local frame.
+       
+     Search for add imm8,a3 (0xd3XX)
+        or	add imm16,a3 (0xf70bXXXX)
+        or	add imm24,a3 (0xf467XXXXXX).
+       
+     If none of the above was found, then this prologue has
+     no stack, and therefore can't have any register saves,
+     so quit now.  */
+  status = target_read_memory (addr, buf, 2);
+  if (status != 0)
+    {
+      if (fi && fi->next == NULL && (fi->status & MY_FRAME_IN_SP))
+	fi->frame = read_sp ();
+      return addr;
+    }
+  if (buf[0] == 0xd3)
+    {
+      stack_size = extract_signed_integer (&buf[1], 1);
+      if (fi)
+	fi->stack_size = stack_size;
+      addr += 2;
+      if (addr >= stop)
+	{
+	  if (fi && fi->next == NULL && (fi->status & MY_FRAME_IN_SP))
+	    fi->frame = read_sp () - stack_size;
+	  return addr;
+	}
+    }
+  else if (buf[0] == 0xf7 && buf[1] == 0x0b)
+    {
+      status = target_read_memory (addr + 2, buf, 2);
+      if (status != 0)
+	{
+	  if (fi && fi->next == NULL && (fi->status & MY_FRAME_IN_SP))
+	    fi->frame = read_sp ();
+	  return addr;
+	}
+      stack_size = extract_signed_integer (buf, 2);
+      if (fi)
+	fi->stack_size = stack_size;
+      addr += 4;
+      if (addr >= stop)
+	{
+	  if (fi && fi->next == NULL && (fi->status & MY_FRAME_IN_SP))
+	    fi->frame = read_sp () - stack_size;
+	  return addr;
+	}
+    }
+  else if (buf[0] == 0xf4 && buf[1] == 0x67)
+    {
+      status = target_read_memory (addr + 2, buf, 3);
+      if (status != 0)
+	{
+	  if (fi && fi->next == NULL && (fi->status & MY_FRAME_IN_SP))
+	    fi->frame = read_sp ();
+	  return addr;
+	}
+      stack_size = extract_signed_integer (buf, 3);
+      if (fi)
+	fi->stack_size = stack_size;
+      addr += 5;
+      if (addr >= stop)
+	{
+	  if (fi && fi->next == NULL && (fi->status & MY_FRAME_IN_SP))
+	    fi->frame = read_sp () - stack_size;
+	  return addr;
+	}
+    }
+
+  /* Now see if we have a call to __prologue for an out of line
+     prologue.  */
+  status = target_read_memory (addr, buf, 2);
+  if (status != 0)
+    return addr;
+
+  /* First check for 16bit pc-relative call to __prologue.  */
+  if (buf[0] == 0xfd)
+    {
+      CORE_ADDR temp;
+      status = target_read_memory (addr + 1, buf, 2);
+      if (status != 0)
+	{
+  	  if (fi && fi->next == NULL && (fi->status & MY_FRAME_IN_SP))
+    	    fi->frame = read_sp ();
+	  return addr;
+	}
+      
+      /* Get the PC this instruction will branch to.  */
+      temp = (extract_signed_integer (buf, 2) + addr + 3) & 0xffffff;
+
+      /* Get the name of the function at the target address.  */
+      status = find_pc_partial_function (temp, &name, NULL, NULL);
+      if (status == 0)
+	{
+  	  if (fi && fi->next == NULL && (fi->status & MY_FRAME_IN_SP))
+    	    fi->frame = read_sp ();
+	  return addr;
+	}
+
+      /* Note if it is an out of line prologue.  */
+      out_of_line_prologue = (strcmp (name, "__prologue") == 0);
+
+      /* This sucks up 3 bytes of instruction space.  */
+      if (out_of_line_prologue)
+	addr += 3;
+
+      if (addr >= stop)
+	{
+	  if (fi && fi->next == NULL)
+	    {
+	      fi->stack_size -= 16;
+	      fi->frame = read_sp () - fi->stack_size;
+	    }
+	  return addr;
+	}
+    }
+  /* Now check for the 24bit pc-relative call to __prologue.  */
+  else if (buf[0] == 0xf4 && buf[1] == 0xe1)
+    {
+      CORE_ADDR temp;
+      status = target_read_memory (addr + 2, buf, 3);
+      if (status != 0)
+	{
+  	  if (fi && fi->next == NULL && (fi->status & MY_FRAME_IN_SP))
+    	    fi->frame = read_sp ();
+	  return addr;
+	}
+      
+      /* Get the PC this instruction will branch to.  */
+      temp = (extract_signed_integer (buf, 3) + addr + 5) & 0xffffff;
+
+      /* Get the name of the function at the target address.  */
+      status = find_pc_partial_function (temp, &name, NULL, NULL);
+      if (status == 0)
+	{
+  	  if (fi && fi->next == NULL && (fi->status & MY_FRAME_IN_SP))
+    	    fi->frame = read_sp ();
+	  return addr;
+	}
+
+      /* Note if it is an out of line prologue.  */
+      out_of_line_prologue = (strcmp (name, "__prologue") == 0);
+
+      /* This sucks up 5 bytes of instruction space.  */
+      if (out_of_line_prologue)
+	addr += 5;
+
+      if (addr >= stop)
+	{
+	  if (fi && fi->next == NULL && (fi->status & MY_FRAME_IN_SP))
+	    {
+	      fi->stack_size -= 16;
+	      fi->frame = read_sp () - fi->stack_size;
+	    }
+	  return addr;
+	}
+    }
+
+  /* Now actually handle the out of line prologue.  */
+  if (out_of_line_prologue)
+    {
+      int outgoing_args_size = 0;
+
+      /* First adjust the stack size for this function.  The out of
+	 line prologue saves 4 registers (16bytes of data).  */
+      if (fi)
+	fi->stack_size -= 16;
+
+      /* Update fi->frame if necessary.  */
+      if (fi && fi->next == NULL)
+	fi->frame = read_sp () - fi->stack_size;
+
+      /* After the out of line prologue, there may be another
+	 stack adjustment for the outgoing arguments.
+
+	 Search for add imm8,a3 (0xd3XX)
+	    or	add imm16,a3 (0xf70bXXXX)
+	    or	add imm24,a3 (0xf467XXXXXX).  */
+       
+      status = target_read_memory (addr, buf, 2);
+      if (status != 0)
+	{
+	  if (fi)
+	    {
+	      fi->fsr.regs[2] = fi->frame + fi->stack_size + 4;
+	      fi->fsr.regs[3] = fi->frame + fi->stack_size + 8;
+	      fi->fsr.regs[5] = fi->frame + fi->stack_size + 12;
+	      fi->fsr.regs[6] = fi->frame + fi->stack_size + 16;
+	    }
+	  return addr;
+	}
+
+      if (buf[0] == 0xd3)
+	{
+	  outgoing_args_size = extract_signed_integer (&buf[1], 1);
+	  addr += 2;
+	}
+      else if (buf[0] == 0xf7 && buf[1] == 0x0b)
+	{
+	  status = target_read_memory (addr + 2, buf, 2);
+	  if (status != 0)
+	    {
+	      if (fi)
+		{
+		  fi->fsr.regs[2] = fi->frame + fi->stack_size + 4;
+		  fi->fsr.regs[3] = fi->frame + fi->stack_size + 8;
+		  fi->fsr.regs[5] = fi->frame + fi->stack_size + 12;
+		  fi->fsr.regs[6] = fi->frame + fi->stack_size + 16;
+		}
+	      return addr;
+	    }
+	  outgoing_args_size = extract_signed_integer (buf, 2);
+	  addr += 4;
+	}
+      else if (buf[0] == 0xf4 && buf[1] == 0x67)
+	{
+	  status = target_read_memory (addr + 2, buf, 3);
+	  if (status != 0)
+	    {
+	      if (fi && fi->next == NULL)
+		{
+		  fi->fsr.regs[2] = fi->frame + fi->stack_size + 4;
+		  fi->fsr.regs[3] = fi->frame + fi->stack_size + 8;
+		  fi->fsr.regs[5] = fi->frame + fi->stack_size + 12;
+		  fi->fsr.regs[6] = fi->frame + fi->stack_size + 16;
+		}
+	      return addr;
+	    }
+	  outgoing_args_size = extract_signed_integer (buf, 3);
+	  addr += 5;
+	}
+      else
+	outgoing_args_size = 0;
+
+      /* Now that we know the size of the outgoing arguments, fix
+	 fi->frame again if this is the innermost frame.  */
+      if (fi && fi->next == NULL)
+	fi->frame -= outgoing_args_size;
+
+      /* Note the register save information and update the stack
+	 size for this frame too.  */
+      if (fi)
+	{
+	  fi->fsr.regs[2] = fi->frame + fi->stack_size + 4;
+	  fi->fsr.regs[3] = fi->frame + fi->stack_size + 8;
+	  fi->fsr.regs[5] = fi->frame + fi->stack_size + 12;
+	  fi->fsr.regs[6] = fi->frame + fi->stack_size + 16;
+	  fi->stack_size += outgoing_args_size;
+	}
+      /* There can be no more prologue insns, so return now.  */
+      return addr;
+    }
+
+  /* At this point fi->frame needs to be correct.
+
+     If MY_FRAME_IN_SP is set and we're the innermost frame, then we
+     need to fix fi->frame so that backtracing, find_frame_saved_regs,
+     etc work correctly.  */
+  if (fi && fi->next == NULL && (fi->status & MY_FRAME_IN_SP) != 0)
+    fi->frame = read_sp () - fi->stack_size;
+
+  /* And last we have the register saves.  These are relatively
+     simple because they're physically done off the stack pointer,
+     and thus the number of different instructions we need to
+     check is greatly reduced because we know the displacements
+     will be small.
+       
+     Search for movx d2,(X,a3) (0xf55eXX)
+        then	movx d3,(X,a3) (0xf55fXX)
+        then	mov  a1,(X,a3) (0x5dXX)	   No frame pointer case
+        then	mov  a2,(X,a3) (0x5eXX)	   No frame pointer case
+        or  mov  a0,(X,a3) (0x5cXX)	   Frame pointer case.  */
+
+  status = target_read_memory (addr, buf, 2);
+  if (status != 0)
+    return addr;
+  if (buf[0] == 0xf5 && buf[1] == 0x5e)
+    {
+      if (fi)
+	{
+	  status = target_read_memory (addr + 2, buf, 1);
+	  if (status != 0)
+	    return addr;
+	  fi->fsr.regs[2] = (fi->frame + stack_size
+			     + extract_signed_integer (buf, 1));
+	}
+      addr += 3;
+      if (addr >= stop)
+	return addr;
+      status = target_read_memory (addr, buf, 2);
+      if (status != 0)
+	return addr;
+    }
+  if (buf[0] == 0xf5 && buf[1] == 0x5f)
+    {
+      if (fi)
+	{
+	  status = target_read_memory (addr + 2, buf, 1);
+	  if (status != 0)
+	    return addr;
+	  fi->fsr.regs[3] = (fi->frame + stack_size
+			     + extract_signed_integer (buf, 1));
+	}
+      addr += 3;
+      if (addr >= stop)
+	return addr;
+      status = target_read_memory (addr, buf, 2);
+      if (status != 0)
+	return addr;
+    }
+  if (buf[0] == 0x5d)
+    {
+      if (fi)
+	{
+	  status = target_read_memory (addr + 1, buf, 1);
+	  if (status != 0)
+	    return addr;
+	  fi->fsr.regs[5] = (fi->frame + stack_size
+			     + extract_signed_integer (buf, 1));
+	}
+      addr += 2;
+      if (addr >= stop)
+	return addr;
+      status = target_read_memory (addr, buf, 2);
+      if (status != 0)
+	return addr;
+    }
+  if (buf[0] == 0x5e || buf[0] == 0x5c)
+    {
+      if (fi)
+	{
+	  status = target_read_memory (addr + 1, buf, 1);
+	  if (status != 0)
+	    return addr;
+	  fi->fsr.regs[6] = (fi->frame + stack_size
+			     + extract_signed_integer (buf, 1));
+	  fi->status &= ~CALLER_A2_IN_A0;
+	}
+      addr += 2;
+      if (addr >= stop)
+	return addr;
+      return addr;
+    }
+  return addr;
+}
+  
+/* Function: frame_chain
+   Figure out and return the caller's frame pointer given current
+   frame_info struct.
+
+   We don't handle dummy frames yet but we would probably just return the
+   stack pointer that was in use at the time the function call was made?  */
+
+CORE_ADDR
+mn10200_frame_chain (fi)
+     struct frame_info *fi;
+{
+  struct frame_info dummy_frame;
+
+  /* Walk through the prologue to determine the stack size,
+     location of saved registers, end of the prologue, etc.  */
+  if (fi->status == 0)
+    mn10200_analyze_prologue (fi, (CORE_ADDR)0);
+
+  /* Quit now if mn10200_analyze_prologue set NO_MORE_FRAMES.  */
+  if (fi->status & NO_MORE_FRAMES)
+    return 0;
+
+  /* Now that we've analyzed our prologue, determine the frame
+     pointer for our caller.
+
+       If our caller has a frame pointer, then we need to
+       find the entry value of $a2 to our function.
+
+	 If CALLER_A2_IN_A0, then the chain is in $a0.
+
+	 If fsr.regs[6] is nonzero, then it's at the memory
+	 location pointed to by fsr.regs[6].
+
+	 Else it's still in $a2.
+
+       If our caller does not have a frame pointer, then his
+       frame base is fi->frame + -caller's stack size + 4.  */
+       
+  /* The easiest way to get that info is to analyze our caller's frame.
+
+     So we set up a dummy frame and call mn10200_analyze_prologue to
+     find stuff for us.  */
+  dummy_frame.pc = FRAME_SAVED_PC (fi);
+  dummy_frame.frame = fi->frame;
+  memset (dummy_frame.fsr.regs, '\000', sizeof dummy_frame.fsr.regs);
+  dummy_frame.status = 0;
+  dummy_frame.stack_size = 0;
+  mn10200_analyze_prologue (&dummy_frame);
+
+  if (dummy_frame.status & MY_FRAME_IN_FP)
+    {
+      /* Our caller has a frame pointer.  So find the frame in $a2, $a0,
+	 or in the stack.  */
+      if (fi->fsr.regs[6])
+	return (read_memory_integer (fi->fsr.regs[FP_REGNUM], REGISTER_SIZE)
+		& 0xffffff);
+      else if (fi->status & CALLER_A2_IN_A0)
+	return read_register (4);
+      else
+	return read_register (FP_REGNUM);
+    }
+  else
+    {
+      /* Our caller does not have a frame pointer.  So his frame starts
+	 at the base of our frame (fi->frame) + <his size> + 4 (saved pc).  */
+      return fi->frame + -dummy_frame.stack_size + 4;
+    }
+}
+
+/* Function: skip_prologue
+   Return the address of the first inst past the prologue of the function.  */
+
+CORE_ADDR
+mn10200_skip_prologue (pc)
+     CORE_ADDR pc;
+{
+  /* We used to check the debug symbols, but that can lose if
+     we have a null prologue.  */
+  return mn10200_analyze_prologue (NULL, pc);
+}
+
+/* Function: pop_frame
+   This routine gets called when either the user uses the `return'
+   command, or the call dummy breakpoint gets hit.  */
+
+void
+mn10200_pop_frame (frame)
+     struct frame_info *frame;
+{
+  int regnum;
+
+  if (PC_IN_CALL_DUMMY(frame->pc, frame->frame, frame->frame))
+    generic_pop_dummy_frame ();
+  else
+    {
+      write_register (PC_REGNUM, FRAME_SAVED_PC (frame));
+
+      /* Restore any saved registers.  */
+      for (regnum = 0; regnum < NUM_REGS; regnum++)
+	if (frame->fsr.regs[regnum] != 0)
+	  {
+	    ULONGEST value;
+
+	    value = read_memory_unsigned_integer (frame->fsr.regs[regnum],
+						  REGISTER_RAW_SIZE (regnum));
+	    write_register (regnum, value);
+	  }
+
+      /* Actually cut back the stack.  */
+      write_register (SP_REGNUM, FRAME_FP (frame));
+
+      /* Don't we need to set the PC?!?  XXX FIXME.  */
+    }
+
+  /* Throw away any cached frame information.  */
+  flush_cached_frames ();
+}
+
+/* Function: push_arguments
+   Setup arguments for a call to the target.  Arguments go in
+   order on the stack.  */
+
+CORE_ADDR
+mn10200_push_arguments (nargs, args, sp, struct_return, struct_addr)
+     int nargs;
+     value_ptr *args;
+     CORE_ADDR sp;
+     unsigned char struct_return;
+     CORE_ADDR struct_addr;
+{
+  int argnum = 0;
+  int len = 0;
+  int stack_offset = 0;
+  int regsused = struct_return ? 1 : 0;
+
+  /* This should be a nop, but align the stack just in case something
+     went wrong.  Stacks are two byte aligned on the mn10200.  */
+  sp &= ~1;
+
+  /* Now make space on the stack for the args.
+
+     XXX This doesn't appear to handle pass-by-invisible reference
+     arguments.  */
+  for (argnum = 0; argnum < nargs; argnum++)
+    {
+      int arg_length = (TYPE_LENGTH (VALUE_TYPE (args[argnum])) + 1) & ~1;
+
+      /* If we've used all argument registers, then this argument is
+	 pushed.  */
+      if (regsused >= 2 || arg_length > 4)
+	{
+	  regsused = 2;
+	  len += arg_length;
+	}
+      /* We know we've got some arg register space left.  If this argument
+	 will fit entirely in regs, then put it there.  */
+      else if (arg_length <= 2
+	       || TYPE_CODE (VALUE_TYPE (args[argnum])) == TYPE_CODE_PTR) 
+	{
+	  regsused++;
+	}
+      else if (regsused == 0)
+	{
+	  regsused = 2;
+	}
+      else
+	{
+	  regsused = 2;
+	  len += arg_length;
+	}
+    }
+
+  /* Allocate stack space.  */
+  sp -= len;
+
+  regsused = struct_return ? 1 : 0;
+  /* Push all arguments onto the stack. */
+  for (argnum = 0; argnum < nargs; argnum++)
+    {
+      int len;
+      char *val;
+
+      /* XXX Check this.  What about UNIONS?  */
+      if (TYPE_CODE (VALUE_TYPE (*args)) == TYPE_CODE_STRUCT
+	  && TYPE_LENGTH (VALUE_TYPE (*args)) > 8)
+	{
+	  /* XXX Wrong, we want a pointer to this argument.  */
+          len = TYPE_LENGTH (VALUE_TYPE (*args));
+          val = (char *)VALUE_CONTENTS (*args);
+	}
+      else
+	{
+	  len = TYPE_LENGTH (VALUE_TYPE (*args));
+	  val = (char *)VALUE_CONTENTS (*args);
+	}
+
+      if (regsused < 2
+	  && (len <= 2
+	      || TYPE_CODE (VALUE_TYPE (*args)) == TYPE_CODE_PTR))
+	{
+	  write_register (regsused, extract_unsigned_integer (val, 4));
+	  regsused++;
+	}
+      else if (regsused == 0 && len == 4)
+	{
+	  write_register (regsused, extract_unsigned_integer (val, 2));
+	  write_register (regsused + 1, extract_unsigned_integer (val + 2, 2));
+	  regsused = 2;
+	}
+      else
+	{
+	  regsused = 2;
+	  while (len > 0)
+	    {
+	      write_memory (sp + stack_offset, val, 2);
+
+	      len -= 2;
+	      val += 2;
+	      stack_offset += 2;
+	    }
+	}
+      args++;
+    }
+
+  return sp;
+}
+
+/* Function: push_return_address (pc)
+   Set up the return address for the inferior function call.
+   Needed for targets where we don't actually execute a JSR/BSR instruction */
+ 
+CORE_ADDR
+mn10200_push_return_address (pc, sp)
+     CORE_ADDR pc;
+     CORE_ADDR sp;
+{
+  unsigned char buf[4];
+
+  store_unsigned_integer (buf, 4, CALL_DUMMY_ADDRESS ());
+  write_memory (sp - 4, buf, 4);
+  return sp - 4;
+}
+
+/* Function: store_struct_return (addr,sp)
+   Store the structure value return address for an inferior function
+   call.  */
+ 
+CORE_ADDR
+mn10200_store_struct_return (addr, sp)
+     CORE_ADDR addr;
+     CORE_ADDR sp;
+{
+  /* The structure return address is passed as the first argument.  */
+  write_register (0, addr);
+  return sp;
+}
+ 
+/* Function: frame_saved_pc 
+   Find the caller of this frame.  We do this by seeing if RP_REGNUM
+   is saved in the stack anywhere, otherwise we get it from the
+   registers.  If the inner frame is a dummy frame, return its PC
+   instead of RP, because that's where "caller" of the dummy-frame
+   will be found.  */
+
+CORE_ADDR
+mn10200_frame_saved_pc (fi)
+     struct frame_info *fi;
+{
+  /* The saved PC will always be at the base of the current frame.  */
+  return (read_memory_integer (fi->frame, REGISTER_SIZE) & 0xffffff);
+}
+
+void
+get_saved_register (raw_buffer, optimized, addrp, frame, regnum, lval)
+     char *raw_buffer;
+     int *optimized;
+     CORE_ADDR *addrp;
+     struct frame_info *frame;
+     int regnum;
+     enum lval_type *lval;
+{
+  generic_get_saved_register (raw_buffer, optimized, addrp, 
+			      frame, regnum, lval);
+}
+
+/* Function: init_extra_frame_info
+   Setup the frame's frame pointer, pc, and frame addresses for saved
+   registers.  Most of the work is done in mn10200_analyze_prologue().
+
+   Note that when we are called for the last frame (currently active frame),
+   that fi->pc and fi->frame will already be setup.  However, fi->frame will
+   be valid only if this routine uses FP.  For previous frames, fi-frame will
+   always be correct.  mn10200_analyze_prologue will fix fi->frame if
+   it's not valid.
+
+   We can be called with the PC in the call dummy under two circumstances.
+   First, during normal backtracing, second, while figuring out the frame
+   pointer just prior to calling the target function (see run_stack_dummy).  */
+
+void
+mn10200_init_extra_frame_info (fi)
+     struct frame_info *fi;
+{
+  if (fi->next)
+    fi->pc = FRAME_SAVED_PC (fi->next);
+
+  memset (fi->fsr.regs, '\000', sizeof fi->fsr.regs);
+  fi->status = 0;
+  fi->stack_size = 0;
+
+  mn10200_analyze_prologue (fi, 0);
+}
+
+void
+_initialize_mn10200_tdep ()
+{
+  tm_print_insn = print_insn_mn10200;
+}
+
diff --git a/contrib/gdb/gdb/mn10300-tdep.c b/contrib/gdb/gdb/mn10300-tdep.c
new file mode 100644
index 000000000000..6c43176193b8
--- /dev/null
+++ b/contrib/gdb/gdb/mn10300-tdep.c
@@ -0,0 +1,791 @@
+/* Target-dependent code for the Matsushita MN10300 for GDB, the GNU debugger.
+   Copyright 1996, 1997, 1998 Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#include "defs.h"
+#include "frame.h"
+#include "inferior.h"
+#include "obstack.h"
+#include "target.h"
+#include "value.h"
+#include "bfd.h"
+#include "gdb_string.h"
+#include "gdbcore.h"
+#include "symfile.h"
+
+static char *mn10300_generic_register_names[] = 
+{ "d0", "d1", "d2", "d3", "a0", "a1", "a2", "a3",
+  "sp", "pc", "mdr", "psw", "lir", "lar", "", "",
+  "", "", "", "", "", "", "", "",
+  "", "", "", "", "", "", "", "fp" };
+
+char **mn10300_register_names = mn10300_generic_register_names;
+
+static CORE_ADDR mn10300_analyze_prologue PARAMS ((struct frame_info *fi,
+						  CORE_ADDR pc));
+
+/* Additional info used by the frame */
+
+struct frame_extra_info
+{
+  int status;
+  int stack_size;
+};
+
+static struct frame_info *analyze_dummy_frame PARAMS ((CORE_ADDR, CORE_ADDR));
+static struct frame_info *
+analyze_dummy_frame (pc, frame)
+     CORE_ADDR pc;
+     CORE_ADDR frame;
+{
+  static struct frame_info *dummy = NULL;
+  if (dummy == NULL)
+    {
+      dummy = xmalloc (sizeof (struct frame_info));
+      dummy->saved_regs = xmalloc (SIZEOF_FRAME_SAVED_REGS);
+      dummy->extra_info = xmalloc (sizeof (struct frame_extra_info));
+    }
+  dummy->next = NULL;
+  dummy->prev = NULL;
+  dummy->pc = pc;
+  dummy->frame = frame;
+  dummy->extra_info->status = 0;
+  dummy->extra_info->stack_size = 0;
+  memset (dummy->saved_regs, '\000', SIZEOF_FRAME_SAVED_REGS);
+  mn10300_analyze_prologue (dummy, 0);
+  return dummy;
+}
+
+/* Values for frame_info.status */
+
+#define MY_FRAME_IN_SP 0x1
+#define MY_FRAME_IN_FP 0x2
+#define NO_MORE_FRAMES 0x4
+
+
+/* Should call_function allocate stack space for a struct return?  */
+int
+mn10300_use_struct_convention (gcc_p, type)
+     int gcc_p;
+     struct type *type;
+{
+  return (TYPE_NFIELDS (type) > 1 || TYPE_LENGTH (type) > 8);
+}
+
+/* The breakpoint instruction must be the same size as the smallest
+   instruction in the instruction set.
+
+   The Matsushita mn10x00 processors have single byte instructions
+   so we need a single byte breakpoint.  Matsushita hasn't defined
+   one, so we defined it ourselves.  */
+
+unsigned char *
+mn10300_breakpoint_from_pc (bp_addr, bp_size)
+     CORE_ADDR *bp_addr;
+     int *bp_size;
+{
+  static char breakpoint[] = {0xff};
+  *bp_size = 1;
+  return breakpoint;
+}
+
+
+/* Fix fi->frame if it's bogus at this point.  This is a helper
+   function for mn10300_analyze_prologue. */
+
+static void
+fix_frame_pointer (fi, stack_size)
+    struct frame_info *fi;
+    int stack_size;
+{
+  if (fi && fi->next == NULL)
+    {
+      if (fi->extra_info->status & MY_FRAME_IN_SP)
+	fi->frame = read_sp () - stack_size;
+      else if (fi->extra_info->status & MY_FRAME_IN_FP)
+	fi->frame = read_register (A3_REGNUM);
+    }
+}
+
+
+/* Set offsets of registers saved by movm instruction.
+   This is a helper function for mn10300_analyze_prologue.  */
+
+static void
+set_movm_offsets (fi, movm_args)
+    struct frame_info *fi;
+    int movm_args;
+{
+  int offset = 0;
+
+  if (fi == NULL || movm_args == 0)
+    return;
+
+  if (movm_args & 0x10)
+    {
+      fi->saved_regs[A3_REGNUM] = fi->frame + offset;
+      offset += 4;
+    }
+  if (movm_args & 0x20)
+    {
+      fi->saved_regs[A2_REGNUM] = fi->frame + offset;
+      offset += 4;
+    }
+  if (movm_args & 0x40)
+    {
+      fi->saved_regs[D3_REGNUM] = fi->frame + offset;
+      offset += 4;
+    }
+  if (movm_args & 0x80)
+    {
+      fi->saved_regs[D2_REGNUM] = fi->frame + offset;
+      offset += 4;
+    }
+}
+
+
+/* The main purpose of this file is dealing with prologues to extract
+   information about stack frames and saved registers.
+
+   For reference here's how prologues look on the mn10300:
+
+     With frame pointer:
+	movm [d2,d3,a2,a3],sp
+	mov sp,a3
+	add <size>,sp
+
+     Without frame pointer:
+	movm [d2,d3,a2,a3],sp (if needed)
+        add <size>,sp
+
+   One day we might keep the stack pointer constant, that won't
+   change the code for prologues, but it will make the frame
+   pointerless case much more common.  */
+	
+/* Analyze the prologue to determine where registers are saved,
+   the end of the prologue, etc etc.  Return the end of the prologue
+   scanned.
+
+   We store into FI (if non-null) several tidbits of information:
+
+    * stack_size -- size of this stack frame.  Note that if we stop in
+    certain parts of the prologue/epilogue we may claim the size of the
+    current frame is zero.  This happens when the current frame has
+    not been allocated yet or has already been deallocated.
+
+    * fsr -- Addresses of registers saved in the stack by this frame.
+
+    * status -- A (relatively) generic status indicator.  It's a bitmask
+    with the following bits: 
+
+      MY_FRAME_IN_SP: The base of the current frame is actually in
+      the stack pointer.  This can happen for frame pointerless
+      functions, or cases where we're stopped in the prologue/epilogue
+      itself.  For these cases mn10300_analyze_prologue will need up
+      update fi->frame before returning or analyzing the register
+      save instructions.
+
+      MY_FRAME_IN_FP: The base of the current frame is in the
+      frame pointer register ($a2).
+
+      NO_MORE_FRAMES: Set this if the current frame is "start" or
+      if the first instruction looks like mov <imm>,sp.  This tells
+      frame chain to not bother trying to unwind past this frame.  */
+
+static CORE_ADDR
+mn10300_analyze_prologue (fi, pc)
+    struct frame_info *fi;
+    CORE_ADDR pc;
+{
+  CORE_ADDR func_addr, func_end, addr, stop;
+  CORE_ADDR stack_size;
+  int imm_size;
+  unsigned char buf[4];
+  int status, movm_args = 0;
+  char *name;
+
+  /* Use the PC in the frame if it's provided to look up the
+     start of this function.  */
+  pc = (fi ? fi->pc : pc);
+
+  /* Find the start of this function.  */
+  status = find_pc_partial_function (pc, &name, &func_addr, &func_end);
+
+  /* Do nothing if we couldn't find the start of this function or if we're
+     stopped at the first instruction in the prologue.  */
+  if (status == 0)
+    return pc;
+
+  /* If we're in start, then give up.  */
+  if (strcmp (name, "start") == 0)
+    {
+      if (fi != NULL)
+	fi->extra_info->status = NO_MORE_FRAMES;
+      return pc;
+    }
+
+  /* At the start of a function our frame is in the stack pointer.  */
+  if (fi)
+    fi->extra_info->status = MY_FRAME_IN_SP;
+
+  /* Get the next two bytes into buf, we need two because rets is a two
+     byte insn and the first isn't enough to uniquely identify it.  */
+  status = read_memory_nobpt (pc, buf, 2);
+  if (status != 0)
+    return pc;
+
+  /* If we're physically on an "rets" instruction, then our frame has
+     already been deallocated.  Note this can also be true for retf
+     and ret if they specify a size of zero.
+
+     In this case fi->frame is bogus, we need to fix it.  */
+  if (fi && buf[0] == 0xf0 && buf[1] == 0xfc)
+    {
+      if (fi->next == NULL)
+	fi->frame = read_sp ();
+      return fi->pc;
+    }
+
+  /* Similarly if we're stopped on the first insn of a prologue as our
+     frame hasn't been allocated yet.  */
+  if (fi && fi->pc == func_addr)
+    {
+      if (fi->next == NULL)
+	fi->frame = read_sp ();
+      return fi->pc;
+    }
+
+  /* Figure out where to stop scanning.  */
+  stop = fi ? fi->pc : func_end;
+
+  /* Don't walk off the end of the function.  */
+  stop = stop > func_end ? func_end : stop;
+
+  /* Start scanning on the first instruction of this function.  */
+  addr = func_addr;
+
+  /* Suck in two bytes.  */
+  status = read_memory_nobpt (addr, buf, 2);
+  if (status != 0)
+    {
+      fix_frame_pointer (fi, 0);
+      return addr;
+    }
+
+  /* First see if this insn sets the stack pointer; if so, it's something
+     we won't understand, so quit now.   */
+  if (buf[0] == 0xf2 && (buf[1] & 0xf3) == 0xf0)
+    {
+      if (fi)
+	fi->extra_info->status = NO_MORE_FRAMES;
+      return addr;
+    }
+
+  /* Now look for movm [regs],sp, which saves the callee saved registers.
+
+     At this time we don't know if fi->frame is valid, so we only note
+     that we encountered a movm instruction.  Later, we'll set the entries
+     in fsr.regs as needed.  */
+  if (buf[0] == 0xcf)
+    {
+      /* Extract the register list for the movm instruction.  */
+      status = read_memory_nobpt (addr + 1, buf, 1);
+      movm_args = *buf;
+
+      addr += 2;
+
+      /* Quit now if we're beyond the stop point.  */
+      if (addr >= stop)
+	{
+	  /* Fix fi->frame since it's bogus at this point.  */
+	  if (fi && fi->next == NULL)
+	    fi->frame = read_sp ();
+
+	  /* Note if/where callee saved registers were saved.  */
+	  set_movm_offsets (fi, movm_args);
+	  return addr;
+	}
+
+      /* Get the next two bytes so the prologue scan can continue.  */
+      status = read_memory_nobpt (addr, buf, 2);
+      if (status != 0)
+	{
+	  /* Fix fi->frame since it's bogus at this point.  */
+	  if (fi && fi->next == NULL)
+	    fi->frame = read_sp ();
+
+	  /* Note if/where callee saved registers were saved.  */
+	  set_movm_offsets (fi, movm_args);
+	  return addr;
+	}
+    }
+
+  /* Now see if we set up a frame pointer via "mov sp,a3" */
+  if (buf[0] == 0x3f)
+    {
+      addr += 1;
+
+      /* The frame pointer is now valid.  */
+      if (fi)
+	{
+	  fi->extra_info->status |= MY_FRAME_IN_FP;
+	  fi->extra_info->status &= ~MY_FRAME_IN_SP;
+	}
+
+      /* Quit now if we're beyond the stop point.  */
+      if (addr >= stop)
+	{
+	  /* Fix fi->frame if it's bogus at this point.  */
+	  fix_frame_pointer (fi, 0);
+
+	  /* Note if/where callee saved registers were saved.  */
+	  set_movm_offsets (fi, movm_args);
+	  return addr;
+	}
+
+      /* Get two more bytes so scanning can continue.  */
+      status = read_memory_nobpt (addr, buf, 2);
+      if (status != 0)
+	{
+	  /* Fix fi->frame if it's bogus at this point.  */
+	  fix_frame_pointer (fi, 0);
+
+	  /* Note if/where callee saved registers were saved.  */
+	  set_movm_offsets (fi, movm_args);
+	  return addr;
+	}
+    }
+  
+  /* Next we should allocate the local frame.  No more prologue insns
+     are found after allocating the local frame.
+       
+     Search for add imm8,sp (0xf8feXX)
+        or	add imm16,sp (0xfafeXXXX)
+        or	add imm32,sp (0xfcfeXXXXXXXX).
+       
+     If none of the above was found, then this prologue has no 
+     additional stack.  */
+
+  status = read_memory_nobpt (addr, buf, 2);
+  if (status != 0)
+    {
+      /* Fix fi->frame if it's bogus at this point.  */
+      fix_frame_pointer (fi, 0);
+
+      /* Note if/where callee saved registers were saved.  */
+      set_movm_offsets (fi, movm_args);
+      return addr;
+    }
+
+  imm_size = 0;
+  if (buf[0] == 0xf8 && buf[1] == 0xfe)
+    imm_size = 1;
+  else if (buf[0] == 0xfa && buf[1] == 0xfe)
+    imm_size = 2;
+  else if (buf[0] == 0xfc && buf[1] == 0xfe)
+    imm_size = 4;
+
+  if (imm_size != 0)
+    {
+      /* Suck in imm_size more bytes, they'll hold the size of the
+         current frame.  */
+      status = read_memory_nobpt (addr + 2, buf, imm_size);
+      if (status != 0)
+	{
+	  /* Fix fi->frame if it's bogus at this point.  */
+	  fix_frame_pointer (fi, 0);
+
+	  /* Note if/where callee saved registers were saved.  */
+	  set_movm_offsets (fi, movm_args);
+	  return addr;
+	}
+
+      /* Note the size of the stack in the frame info structure.  */
+      stack_size = extract_signed_integer (buf, imm_size);
+      if (fi)
+	fi->extra_info->stack_size = stack_size;
+
+      /* We just consumed 2 + imm_size bytes.  */
+      addr += 2 + imm_size;
+
+      /* No more prologue insns follow, so begin preparation to return.  */
+      /* Fix fi->frame if it's bogus at this point.  */
+      fix_frame_pointer (fi, stack_size);
+
+      /* Note if/where callee saved registers were saved.  */
+      set_movm_offsets (fi, movm_args);
+      return addr;
+    }
+
+  /* We never found an insn which allocates local stack space, regardless
+     this is the end of the prologue.  */
+  /* Fix fi->frame if it's bogus at this point.  */
+  fix_frame_pointer (fi, 0);
+
+  /* Note if/where callee saved registers were saved.  */
+  set_movm_offsets (fi, movm_args);
+  return addr;
+}
+  
+/* Function: frame_chain
+   Figure out and return the caller's frame pointer given current
+   frame_info struct.
+
+   We don't handle dummy frames yet but we would probably just return the
+   stack pointer that was in use at the time the function call was made?  */
+
+CORE_ADDR
+mn10300_frame_chain (fi)
+     struct frame_info *fi;
+{
+  struct frame_info *dummy;
+  /* Walk through the prologue to determine the stack size,
+     location of saved registers, end of the prologue, etc.  */
+  if (fi->extra_info->status == 0)
+    mn10300_analyze_prologue (fi, (CORE_ADDR)0);
+
+  /* Quit now if mn10300_analyze_prologue set NO_MORE_FRAMES.  */
+  if (fi->extra_info->status & NO_MORE_FRAMES)
+    return 0;
+
+  /* Now that we've analyzed our prologue, determine the frame
+     pointer for our caller.
+
+       If our caller has a frame pointer, then we need to
+       find the entry value of $a3 to our function.
+
+	 If fsr.regs[A3_REGNUM] is nonzero, then it's at the memory
+	 location pointed to by fsr.regs[A3_REGNUM].
+
+	 Else it's still in $a3.
+
+       If our caller does not have a frame pointer, then his
+       frame base is fi->frame + -caller's stack size.  */
+       
+  /* The easiest way to get that info is to analyze our caller's frame.
+     So we set up a dummy frame and call mn10300_analyze_prologue to
+     find stuff for us.  */
+  dummy = analyze_dummy_frame (FRAME_SAVED_PC (fi), fi->frame);
+
+  if (dummy->extra_info->status & MY_FRAME_IN_FP)
+    {
+      /* Our caller has a frame pointer.  So find the frame in $a3 or
+         in the stack.  */
+      if (fi->saved_regs[A3_REGNUM])
+	return (read_memory_integer (fi->saved_regs[A3_REGNUM], REGISTER_SIZE));
+      else
+	return read_register (A3_REGNUM);
+    }
+  else
+    {
+      int adjust = 0;
+
+      adjust += (fi->saved_regs[D2_REGNUM] ? 4 : 0);
+      adjust += (fi->saved_regs[D3_REGNUM] ? 4 : 0);
+      adjust += (fi->saved_regs[A2_REGNUM] ? 4 : 0);
+      adjust += (fi->saved_regs[A3_REGNUM] ? 4 : 0);
+
+      /* Our caller does not have a frame pointer.  So his frame starts
+	 at the base of our frame (fi->frame) + register save space
+	 + <his size>.  */
+      return fi->frame + adjust + -dummy->extra_info->stack_size;
+    }
+}
+
+/* Function: skip_prologue
+   Return the address of the first inst past the prologue of the function.  */
+
+CORE_ADDR
+mn10300_skip_prologue (pc)
+     CORE_ADDR pc;
+{
+  /* We used to check the debug symbols, but that can lose if
+     we have a null prologue.  */
+  return mn10300_analyze_prologue (NULL, pc);
+}
+
+
+/* Function: pop_frame
+   This routine gets called when either the user uses the `return'
+   command, or the call dummy breakpoint gets hit.  */
+
+void
+mn10300_pop_frame (frame)
+     struct frame_info *frame;
+{
+  int regnum;
+
+  if (PC_IN_CALL_DUMMY(frame->pc, frame->frame, frame->frame))
+    generic_pop_dummy_frame ();
+  else
+    {
+      write_register (PC_REGNUM, FRAME_SAVED_PC (frame));
+
+      /* Restore any saved registers.  */
+      for (regnum = 0; regnum < NUM_REGS; regnum++)
+	if (frame->saved_regs[regnum] != 0)
+	  {
+	    ULONGEST value;
+
+	    value = read_memory_unsigned_integer (frame->saved_regs[regnum],
+						  REGISTER_RAW_SIZE (regnum));
+	    write_register (regnum, value);
+	  }
+
+      /* Actually cut back the stack.  */
+      write_register (SP_REGNUM, FRAME_FP (frame));
+
+      /* Don't we need to set the PC?!?  XXX FIXME.  */
+    }
+
+  /* Throw away any cached frame information.  */
+  flush_cached_frames ();
+}
+
+/* Function: push_arguments
+   Setup arguments for a call to the target.  Arguments go in
+   order on the stack.  */
+
+CORE_ADDR
+mn10300_push_arguments (nargs, args, sp, struct_return, struct_addr)
+     int nargs;
+     value_ptr *args;
+     CORE_ADDR sp;
+     unsigned char struct_return;
+     CORE_ADDR struct_addr;
+{
+  int argnum = 0;
+  int len = 0;
+  int stack_offset = 0;
+  int regsused = struct_return ? 1 : 0;
+
+  /* This should be a nop, but align the stack just in case something
+     went wrong.  Stacks are four byte aligned on the mn10300.  */
+  sp &= ~3;
+
+  /* Now make space on the stack for the args.
+
+     XXX This doesn't appear to handle pass-by-invisible reference
+     arguments.  */
+  for (argnum = 0; argnum < nargs; argnum++)
+    {
+      int arg_length = (TYPE_LENGTH (VALUE_TYPE (args[argnum])) + 3) & ~3;
+
+      while (regsused < 2 && arg_length > 0)
+	{
+	  regsused++;
+	  arg_length -= 4;
+	}
+      len += arg_length;
+    }
+
+  /* Allocate stack space.  */
+  sp -= len;
+
+  regsused = struct_return ? 1 : 0;
+  /* Push all arguments onto the stack. */
+  for (argnum = 0; argnum < nargs; argnum++)
+    {
+      int len;
+      char *val;
+
+      /* XXX Check this.  What about UNIONS?  */
+      if (TYPE_CODE (VALUE_TYPE (*args)) == TYPE_CODE_STRUCT
+	  && TYPE_LENGTH (VALUE_TYPE (*args)) > 8)
+	{
+	  /* XXX Wrong, we want a pointer to this argument.  */
+          len = TYPE_LENGTH (VALUE_TYPE (*args));
+          val = (char *)VALUE_CONTENTS (*args);
+	}
+      else
+	{
+	  len = TYPE_LENGTH (VALUE_TYPE (*args));
+	  val = (char *)VALUE_CONTENTS (*args);
+	}
+
+      while (regsused < 2 && len > 0)
+	{
+	  write_register (regsused, extract_unsigned_integer (val, 4));
+	  val += 4;
+	  len -= 4;
+	  regsused++;
+	}
+
+      while (len > 0)
+	{
+	  write_memory (sp + stack_offset, val, 4);
+	  len -= 4;
+	  val += 4;
+	  stack_offset += 4;
+	}
+
+      args++;
+    }
+
+  /* Make space for the flushback area.  */
+  sp -= 8;
+  return sp;
+}
+
+/* Function: push_return_address (pc)
+   Set up the return address for the inferior function call.
+   Needed for targets where we don't actually execute a JSR/BSR instruction */
+ 
+CORE_ADDR
+mn10300_push_return_address (pc, sp)
+     CORE_ADDR pc;
+     CORE_ADDR sp;
+{
+  unsigned char buf[4];
+
+  store_unsigned_integer (buf, 4, CALL_DUMMY_ADDRESS ());
+  write_memory (sp - 4, buf, 4);
+  return sp - 4;
+}
+
+/* Function: store_struct_return (addr,sp)
+   Store the structure value return address for an inferior function
+   call.  */
+ 
+CORE_ADDR
+mn10300_store_struct_return (addr, sp)
+     CORE_ADDR addr;
+     CORE_ADDR sp;
+{
+  /* The structure return address is passed as the first argument.  */
+  write_register (0, addr);
+  return sp;
+}
+ 
+/* Function: frame_saved_pc 
+   Find the caller of this frame.  We do this by seeing if RP_REGNUM
+   is saved in the stack anywhere, otherwise we get it from the
+   registers.  If the inner frame is a dummy frame, return its PC
+   instead of RP, because that's where "caller" of the dummy-frame
+   will be found.  */
+
+CORE_ADDR
+mn10300_frame_saved_pc (fi)
+     struct frame_info *fi;
+{
+  int adjust = 0;
+
+  adjust += (fi->saved_regs[D2_REGNUM] ? 4 : 0);
+  adjust += (fi->saved_regs[D3_REGNUM] ? 4 : 0);
+  adjust += (fi->saved_regs[A2_REGNUM] ? 4 : 0);
+  adjust += (fi->saved_regs[A3_REGNUM] ? 4 : 0);
+
+  return (read_memory_integer (fi->frame + adjust, REGISTER_SIZE));
+}
+
+void
+get_saved_register (raw_buffer, optimized, addrp, frame, regnum, lval)
+     char *raw_buffer;
+     int *optimized;
+     CORE_ADDR *addrp;
+     struct frame_info *frame;
+     int regnum;
+     enum lval_type *lval;
+{
+  generic_get_saved_register (raw_buffer, optimized, addrp, 
+			      frame, regnum, lval);
+}
+
+/* Function: mn10300_init_extra_frame_info
+   Setup the frame's frame pointer, pc, and frame addresses for saved
+   registers.  Most of the work is done in mn10300_analyze_prologue().
+
+   Note that when we are called for the last frame (currently active frame),
+   that fi->pc and fi->frame will already be setup.  However, fi->frame will
+   be valid only if this routine uses FP.  For previous frames, fi-frame will
+   always be correct.  mn10300_analyze_prologue will fix fi->frame if
+   it's not valid.
+
+   We can be called with the PC in the call dummy under two circumstances.
+   First, during normal backtracing, second, while figuring out the frame
+   pointer just prior to calling the target function (see run_stack_dummy).  */
+
+void
+mn10300_init_extra_frame_info (fi)
+     struct frame_info *fi;
+{
+  if (fi->next)
+    fi->pc = FRAME_SAVED_PC (fi->next);
+
+  frame_saved_regs_zalloc (fi);
+  fi->extra_info = (struct frame_extra_info *)
+    frame_obstack_alloc (sizeof (struct frame_extra_info));
+
+  fi->extra_info->status = 0;
+  fi->extra_info->stack_size = 0;
+
+  mn10300_analyze_prologue (fi, 0);
+}
+
+/* Function: mn10300_virtual_frame_pointer
+   Return the register that the function uses for a frame pointer, 
+   plus any necessary offset to be applied to the register before
+   any frame pointer offsets.  */
+
+void
+mn10300_virtual_frame_pointer (pc, reg, offset)
+     CORE_ADDR pc;
+     long *reg;
+     long *offset;
+{
+  struct frame_info *dummy = analyze_dummy_frame (pc, 0);
+  /* Set up a dummy frame_info, Analyze the prolog and fill in the
+     extra info.  */
+  /* Results will tell us which type of frame it uses.  */
+  if (dummy->extra_info->status & MY_FRAME_IN_SP)
+    {
+      *reg    = SP_REGNUM;
+      *offset = -(dummy->extra_info->stack_size);
+    }
+  else
+    {
+      *reg    = A3_REGNUM;
+      *offset = 0;
+    }
+}
+  
+/* This can be made more generic later.  */
+static void
+set_machine_hook (filename)
+     char *filename;
+{
+  int i;
+
+  if (bfd_get_mach (exec_bfd) == bfd_mach_mn10300
+      || bfd_get_mach (exec_bfd) == 0)
+    {
+      mn10300_register_names = mn10300_generic_register_names;
+    }
+
+}
+
+void
+_initialize_mn10300_tdep ()
+{
+/*  printf("_initialize_mn10300_tdep\n"); */
+
+  tm_print_insn = print_insn_mn10300;
+
+  specify_exec_file_hook (set_machine_hook);
+}
+
diff --git a/contrib/gdb/gdb/ser-ocd.c b/contrib/gdb/gdb/ser-ocd.c
new file mode 100644
index 000000000000..971f84e049c4
--- /dev/null
+++ b/contrib/gdb/gdb/ser-ocd.c
@@ -0,0 +1,209 @@
+/* Remote serial interface for Macraigor Systems implementation of
+	On-Chip Debugging using serial target box or serial wiggler
+
+   Copyright 1994, 1997 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#include "defs.h"
+#include "serial.h"
+
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
+static int ser_ocd_open PARAMS ((serial_t scb, const char *name));
+static void ser_ocd_raw PARAMS ((serial_t scb));
+static int ser_ocd_readchar PARAMS ((serial_t scb, int timeout));
+static int ser_ocd_setbaudrate PARAMS ((serial_t scb, int rate));
+static int ser_ocd_write PARAMS ((serial_t scb, const char *str, int len));
+static void ser_ocd_close PARAMS ((serial_t scb));
+static serial_ttystate ser_ocd_get_tty_state PARAMS ((serial_t scb));
+static int ser_ocd_set_tty_state PARAMS ((serial_t scb, serial_ttystate state));
+
+#ifdef _WIN32
+/* On Windows, this function pointer is initialized to a function in
+   the wiggler DLL.  */
+static int (*dll_do_command) PARAMS ((const char *, char *));
+#endif
+
+static int
+ocd_open (scb, name)
+     serial_t scb;
+     const char *name;
+{
+#ifdef _WIN32
+  /* Find the wiggler DLL which talks to the board.  */
+  if (dll_do_command == NULL)
+    {
+      HINSTANCE handle;
+
+      /* FIXME: Should the user be able to configure this?  */
+      handle = LoadLibrary ("Wigglers.dll");
+      if (handle == NULL)
+	error ("Can't load Wigglers.dll");
+
+      dll_do_command = ((int (*) PARAMS ((const char *, char *)))
+			GetProcAddress (handle, "do_command"));
+      if (dll_do_command == NULL)
+	error ("Can't find do_command function in Wigglers.dll");
+    }
+#else
+  /* No wiggler DLLs on Unix yet, fail.  */
+  error ("Wiggler library not available for this type of host.");
+#endif /* _WIN32 */
+  return 0;
+}
+
+static int
+ocd_noop (scb)
+     serial_t scb;
+{
+  return 0;
+}
+
+static void
+ocd_raw (scb)
+     serial_t scb;
+{
+  /* Always in raw mode */
+}
+
+static void
+ocd_readremote ()
+{
+}
+
+/* We need a buffer to store responses from the Wigglers.dll */
+#define WIGGLER_BUFF_SIZE 512
+unsigned char from_wiggler_buffer[WIGGLER_BUFF_SIZE];
+unsigned char * wiggler_buffer_ptr;	/* curr spot in buffer */
+
+static int
+ocd_readchar (scb, timeout)
+     serial_t scb;
+     int timeout;
+{
+  /* Catch attempts at reading past the end of the buffer */
+  if (wiggler_buffer_ptr >
+              (from_wiggler_buffer + (sizeof (char *) * WIGGLER_BUFF_SIZE)))
+    error ("ocd_readchar asked to read past the end of the buffer!");
+
+  return (int) *wiggler_buffer_ptr++; /* return curr char and increment ptr */
+}
+
+struct ocd_ttystate {
+  int dummy;
+};
+
+/* ocd_{get set}_tty_state() are both dummys to fill out the function
+   vector.  Someday, they may do something real... */
+
+static serial_ttystate
+ocd_get_tty_state (scb)
+     serial_t scb;
+{
+  struct ocd_ttystate *state;
+
+  state = (struct ocd_ttystate *) xmalloc (sizeof *state);
+
+  return (serial_ttystate) state;
+}
+
+static int
+ocd_set_tty_state (scb, ttystate)
+     serial_t scb;
+     serial_ttystate ttystate;
+{
+  return 0;
+}
+
+static int
+ocd_noflush_set_tty_state (scb, new_ttystate, old_ttystate)
+     serial_t scb;
+     serial_ttystate new_ttystate;
+     serial_ttystate old_ttystate;
+{
+  return 0;
+}
+
+static void
+ocd_print_tty_state (scb, ttystate)
+     serial_t scb;
+     serial_ttystate ttystate;
+{
+  /* Nothing to print.  */
+  return;
+}
+
+static int
+ocd_setbaudrate (scb, rate)
+     serial_t scb;
+     int rate;
+{
+  return 0;
+}
+
+static int
+ocd_write (scb, str, len)
+     serial_t scb;
+     const char *str;
+     int len;
+{
+  char c;
+
+#ifdef _WIN32 
+  /* send packet to Wigglers.dll and store response so we can give it to
+	remote-wiggler.c when get_packet is run */
+  dll_do_command (str, from_wiggler_buffer);
+  wiggler_buffer_ptr = from_wiggler_buffer;
+#endif
+
+  return 0;
+}
+
+static void
+ocd_close (scb)
+     serial_t scb;
+{
+}
+
+static struct serial_ops ocd_ops =
+{
+  "ocd",
+  0,
+  ocd_open,
+  ocd_close,
+  ocd_readchar,
+  ocd_write,
+  ocd_noop,		/* flush output */
+  ocd_noop,		/* flush input */
+  ocd_noop,		/* send break -- currently used only for nindy */
+  ocd_raw,
+  ocd_get_tty_state,
+  ocd_set_tty_state,
+  ocd_print_tty_state,
+  ocd_noflush_set_tty_state,
+  ocd_setbaudrate,
+  ocd_noop,		/* wait for output to drain */
+};
+
+void
+_initialize_ser_ocd_bdm ()
+{
+  serial_add_interface (&ocd_ops);
+}
diff --git a/contrib/gdb/gdb/sh-stub.c b/contrib/gdb/gdb/sh-stub.c
new file mode 100644
index 000000000000..a036cff60628
--- /dev/null
+++ b/contrib/gdb/gdb/sh-stub.c
@@ -0,0 +1,1549 @@
+/* sh-stub.c -- debugging stub for the Hitachi-SH. 
+
+ NOTE!! This code has to be compiled with optimization, otherwise the 
+ function inlining which generates the exception handlers won't work.
+ 
+*/
+
+/*   This is originally based on an m68k software stub written by Glenn
+     Engel at HP, but has changed quite a bit. 
+
+     Modifications for the SH by Ben Lee and Steve Chamberlain
+
+*/
+
+/****************************************************************************
+
+		THIS SOFTWARE IS NOT COPYRIGHTED
+
+   HP offers the following for use in the public domain.  HP makes no
+   warranty with regard to the software or it's performance and the
+   user accepts the software "AS IS" with all faults.
+
+   HP DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED, WITH REGARD
+   TO THIS SOFTWARE INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+****************************************************************************/
+
+
+/* Remote communication protocol.
+
+   A debug packet whose contents are <data>
+   is encapsulated for transmission in the form:
+
+	$ <data> # CSUM1 CSUM2
+
+	<data> must be ASCII alphanumeric and cannot include characters
+	'$' or '#'.  If <data> starts with two characters followed by
+	':', then the existing stubs interpret this as a sequence number.
+
+	CSUM1 and CSUM2 are ascii hex representation of an 8-bit 
+	checksum of <data>, the most significant nibble is sent first.
+	the hex digits 0-9,a-f are used.
+
+   Receiver responds with:
+
+	+	- if CSUM is correct and ready for next packet
+	-	- if CSUM is incorrect
+
+   <data> is as follows:
+   All values are encoded in ascii hex digits.
+
+	Request		Packet
+
+	read registers  g
+	reply		XX....X		Each byte of register data
+					is described by two hex digits.
+					Registers are in the internal order
+					for GDB, and the bytes in a register
+					are in the same order the machine uses.
+			or ENN		for an error.
+
+	write regs	GXX..XX		Each byte of register data
+					is described by two hex digits.
+	reply		OK		for success
+			ENN		for an error
+
+        write reg	Pn...=r...	Write register n... with value r...,
+					which contains two hex digits for each
+					byte in the register (target byte
+					order).
+	reply		OK		for success
+			ENN		for an error
+	(not supported by all stubs).
+
+	read mem	mAA..AA,LLLL	AA..AA is address, LLLL is length.
+	reply		XX..XX		XX..XX is mem contents
+					Can be fewer bytes than requested
+					if able to read only part of the data.
+			or ENN		NN is errno
+
+	write mem	MAA..AA,LLLL:XX..XX
+					AA..AA is address,
+					LLLL is number of bytes,
+					XX..XX is data
+	reply		OK		for success
+			ENN		for an error (this includes the case
+					where only part of the data was
+					written).
+
+	cont		cAA..AA		AA..AA is address to resume
+					If AA..AA is omitted,
+					resume at same address.
+
+	step		sAA..AA		AA..AA is address to resume
+					If AA..AA is omitted,
+					resume at same address.
+
+	last signal     ?               Reply the current reason for stopping.
+                                        This is the same reply as is generated
+					for step or cont : SAA where AA is the
+					signal number.
+
+	There is no immediate reply to step or cont.
+	The reply comes when the machine stops.
+	It is		SAA		AA is the "signal number"
+
+	or...		TAAn...:r...;n:r...;n...:r...;
+					AA = signal number
+					n... = register number
+					r... = register contents
+	or...		WAA		The process exited, and AA is
+					the exit status.  This is only
+					applicable for certains sorts of
+					targets.
+	kill request	k
+
+	toggle debug	d		toggle debug flag (see 386 & 68k stubs)
+	reset		r		reset -- see sparc stub.
+	reserved	<other>		On other requests, the stub should
+					ignore the request and send an empty
+					response ($#<checksum>).  This way
+					we can extend the protocol and GDB
+					can tell whether the stub it is
+					talking to uses the old or the new.
+	search		tAA:PP,MM	Search backwards starting at address
+					AA for a match with pattern PP and
+					mask MM.  PP and MM are 4 bytes.
+					Not supported by all stubs.
+
+	general query	qXXXX		Request info about XXXX.
+	general set	QXXXX=yyyy	Set value of XXXX to yyyy.
+	query sect offs	qOffsets	Get section offsets.  Reply is
+					Text=xxx;Data=yyy;Bss=zzz
+	console output	Otext		Send text to stdout.  Only comes from
+					remote target.
+
+	Responses can be run-length encoded to save space.  A '*' means that
+	the next character is an ASCII encoding giving a repeat count which
+	stands for that many repititions of the character preceding the '*'.
+	The encoding is n+29, yielding a printable character where n >=3 
+	(which is where rle starts to win).  Don't use an n > 126. 
+
+	So 
+	"0* " means the same as "0000".  */
+
+#include <string.h>
+#include <setjmp.h>
+
+
+
+#define COND_BR_MASK	0xff00
+#define UCOND_DBR_MASK	0xe000
+#define UCOND_RBR_MASK	0xf0df
+#define TRAPA_MASK		0xff00
+
+#define COND_DISP		0x00ff
+#define UCOND_DISP		0x0fff
+#define UCOND_REG		0x0f00
+
+#define BF_INSTR		0x8b00
+#define BT_INSTR		0x8900
+#define BRA_INSTR		0xa000
+#define BSR_INSTR		0xb000
+#define JMP_INSTR		0x402b
+#define JSR_INSTR		0x400b
+#define RTS_INSTR		0x000b
+#define RTE_INSTR		0x002b
+#define TRAPA_INSTR		0xc300
+
+#define SSTEP_INSTR		0xc3ff
+
+#define T_BIT_MASK		0x0001
+/*
+ * BUFMAX defines the maximum number of characters in inbound/outbound
+ * buffers at least NUMREGBYTES*2 are needed for register packets
+ */
+#define BUFMAX 1024
+
+/*
+ * Number of bytes for registers
+ */
+#define NUMREGBYTES 112		/* 92 */
+
+/*
+ * typedef
+ */
+typedef void (*Function) ();
+
+/*
+ * Forward declarations
+ */
+
+static int hex (char);
+static char *mem2hex (char *, char *, int);
+static char *hex2mem (char *, char *, int);
+static int hexToInt (char **, int *);
+static void getpacket (char *);
+static void putpacket (char *);
+static void handle_buserror (void);
+static int computeSignal (int exceptionVector);
+static void handle_exception (int exceptionVector);
+void init_serial();
+
+void putDebugChar (char);
+char getDebugChar (void);
+
+/* These are in the file but in asm statements so the compiler can't see them */
+void catch_exception_4 (void);
+void catch_exception_6 (void);
+void catch_exception_9 (void);
+void catch_exception_10 (void);
+void catch_exception_11 (void);
+void catch_exception_32 (void);
+void catch_exception_33 (void);
+void catch_exception_255 (void);
+
+
+
+#define catch_exception_random catch_exception_255 /* Treat all odd ones like 255 */
+
+void breakpoint (void);
+
+
+#define init_stack_size 8*1024  /* if you change this you should also modify BINIT */
+#define stub_stack_size 8*1024
+
+int init_stack[init_stack_size] __attribute__ ((section ("stack"))) = {0};
+int stub_stack[stub_stack_size] __attribute__ ((section ("stack"))) = {0};
+
+typedef struct
+  {
+    void (*func_cold) ();
+    int *stack_cold;
+    void (*func_warm) ();
+    int *stack_warm;
+    void (*(handler[256 - 4])) ();
+  }
+vec_type;
+
+
+void INIT ();
+void BINIT ();
+
+/* When you link take care that this is at address 0 -
+   or wherever your vbr points */
+
+#define CPU_BUS_ERROR_VEC  9
+#define DMA_BUS_ERROR_VEC 10
+#define NMI_VEC           11
+#define INVALID_INSN_VEC   4
+#define INVALID_SLOT_VEC   6
+#define TRAP_VEC          32
+#define IO_VEC            33
+#define USER_VEC         255
+
+
+#define BCR  (*(volatile short *)(0x05FFFFA0)) /* Bus control register */
+#define BAS  (0x800)				/* Byte access select */
+#define WCR1 (*(volatile short *)(0x05ffffA2)) /* Wait state control register */
+
+const vec_type vectable =
+{ 
+  &BINIT,			/* 0: Power-on reset PC */
+  init_stack + init_stack_size, /* 1: Power-on reset SP */
+  &BINIT,			/* 2: Manual reset PC */
+  init_stack + init_stack_size, /* 3: Manual reset SP */
+{
+  &catch_exception_4,		/* 4: General invalid instruction */
+  &catch_exception_random,	/* 5: Reserved for system */
+  &catch_exception_6,		/* 6: Invalid slot instruction */
+  &catch_exception_random,	/* 7: Reserved for system */
+  &catch_exception_random,	/* 8: Reserved for system */
+  &catch_exception_9,		/* 9: CPU bus error */
+  &catch_exception_10,		/* 10: DMA bus error */
+  &catch_exception_11,		/* 11: NMI */
+  &catch_exception_random,	/* 12: User break */
+  &catch_exception_random,	/* 13: Reserved for system */
+  &catch_exception_random,	/* 14: Reserved for system */
+  &catch_exception_random,	/* 15: Reserved for system */
+  &catch_exception_random,	/* 16: Reserved for system */
+  &catch_exception_random,	/* 17: Reserved for system */
+  &catch_exception_random,	/* 18: Reserved for system */
+  &catch_exception_random,	/* 19: Reserved for system */
+  &catch_exception_random,	/* 20: Reserved for system */
+  &catch_exception_random,	/* 21: Reserved for system */
+  &catch_exception_random,	/* 22: Reserved for system */
+  &catch_exception_random,	/* 23: Reserved for system */
+  &catch_exception_random,	/* 24: Reserved for system */
+  &catch_exception_random,	/* 25: Reserved for system */
+  &catch_exception_random,	/* 26: Reserved for system */
+  &catch_exception_random,	/* 27: Reserved for system */
+  &catch_exception_random,	/* 28: Reserved for system */
+  &catch_exception_random,	/* 29: Reserved for system */
+  &catch_exception_random,	/* 30: Reserved for system */
+  &catch_exception_random,	/* 31: Reserved for system */
+  &catch_exception_32,		/* 32: Trap instr (user vectors) */
+  &catch_exception_33,		/* 33: Trap instr (user vectors) */
+  &catch_exception_random,	/* 34: Trap instr (user vectors) */
+  &catch_exception_random,	/* 35: Trap instr (user vectors) */
+  &catch_exception_random,	/* 36: Trap instr (user vectors) */
+  &catch_exception_random,	/* 37: Trap instr (user vectors) */
+  &catch_exception_random,	/* 38: Trap instr (user vectors) */
+  &catch_exception_random,	/* 39: Trap instr (user vectors) */
+  &catch_exception_random,	/* 40: Trap instr (user vectors) */
+  &catch_exception_random,	/* 41: Trap instr (user vectors) */
+  &catch_exception_random,	/* 42: Trap instr (user vectors) */
+  &catch_exception_random,	/* 43: Trap instr (user vectors) */
+  &catch_exception_random,	/* 44: Trap instr (user vectors) */
+  &catch_exception_random,	/* 45: Trap instr (user vectors) */
+  &catch_exception_random,	/* 46: Trap instr (user vectors) */
+  &catch_exception_random,	/* 47: Trap instr (user vectors) */
+  &catch_exception_random,	/* 48: Trap instr (user vectors) */
+  &catch_exception_random,	/* 49: Trap instr (user vectors) */
+  &catch_exception_random,	/* 50: Trap instr (user vectors) */
+  &catch_exception_random,	/* 51: Trap instr (user vectors) */
+  &catch_exception_random,	/* 52: Trap instr (user vectors) */
+  &catch_exception_random,	/* 53: Trap instr (user vectors) */
+  &catch_exception_random,	/* 54: Trap instr (user vectors) */
+  &catch_exception_random,	/* 55: Trap instr (user vectors) */
+  &catch_exception_random,	/* 56: Trap instr (user vectors) */
+  &catch_exception_random,	/* 57: Trap instr (user vectors) */
+  &catch_exception_random,	/* 58: Trap instr (user vectors) */
+  &catch_exception_random,	/* 59: Trap instr (user vectors) */
+  &catch_exception_random,	/* 60: Trap instr (user vectors) */
+  &catch_exception_random,	/* 61: Trap instr (user vectors) */
+  &catch_exception_random,	/* 62: Trap instr (user vectors) */
+  &catch_exception_random,	/* 63: Trap instr (user vectors) */
+  &catch_exception_random,	/* 64: IRQ0 */
+  &catch_exception_random,	/* 65: IRQ1 */
+  &catch_exception_random,	/* 66: IRQ2 */
+  &catch_exception_random,	/* 67: IRQ3 */
+  &catch_exception_random,	/* 68: IRQ4 */
+  &catch_exception_random,	/* 69: IRQ5 */
+  &catch_exception_random,	/* 70: IRQ6 */
+  &catch_exception_random,	/* 71: IRQ7 */
+  &catch_exception_random,
+  &catch_exception_random,
+  &catch_exception_random,
+  &catch_exception_random,
+  &catch_exception_random,
+  &catch_exception_random,
+  &catch_exception_random,
+  &catch_exception_random,
+  &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_random,
+     &catch_exception_255}};
+
+
+char in_nmi;   /* Set when handling an NMI, so we don't reenter */
+int dofault;  /* Non zero, bus errors will raise exception */
+
+int *stub_sp;
+
+/* debug > 0 prints ill-formed commands in valid packets & checksum errors */
+int remote_debug;
+
+/* jump buffer used for setjmp/longjmp */
+jmp_buf remcomEnv;
+
+enum regnames
+  {
+    R0, R1, R2, R3, R4, R5, R6, R7,
+    R8, R9, R10, R11, R12, R13, R14,
+    R15, PC, PR, GBR, VBR, MACH, MACL, SR,
+    TICKS, STALLS, CYCLES, INSTS, PLR
+  };
+
+typedef struct
+  {
+    short *memAddr;
+    short oldInstr;
+  }
+stepData;
+
+int registers[NUMREGBYTES / 4];
+stepData instrBuffer;
+char stepped;
+static const char hexchars[] = "0123456789abcdef";
+char remcomInBuffer[BUFMAX];
+char remcomOutBuffer[BUFMAX];
+
+char highhex(int  x)
+{
+  return hexchars[(x >> 4) & 0xf];
+}
+
+char lowhex(int  x)
+{
+  return hexchars[x & 0xf];
+}
+
+/*
+ * Assembly macros
+ */
+
+#define BREAKPOINT()   asm("trapa	#0x20"::);
+
+
+/*
+ * Routines to handle hex data
+ */
+
+static int
+hex (char ch)
+{
+  if ((ch >= 'a') && (ch <= 'f'))
+    return (ch - 'a' + 10);
+  if ((ch >= '0') && (ch <= '9'))
+    return (ch - '0');
+  if ((ch >= 'A') && (ch <= 'F'))
+    return (ch - 'A' + 10);
+  return (-1);
+}
+
+/* convert the memory, pointed to by mem into hex, placing result in buf */
+/* return a pointer to the last char put in buf (null) */
+static char *
+mem2hex (char *mem, char *buf, int count)
+{
+  int i;
+  int ch;
+  for (i = 0; i < count; i++)
+    {
+      ch = *mem++;
+      *buf++ = highhex (ch);
+      *buf++ = lowhex (ch);
+    }
+  *buf = 0;
+  return (buf);
+}
+
+/* convert the hex array pointed to by buf into binary, to be placed in mem */
+/* return a pointer to the character after the last byte written */
+
+static char *
+hex2mem (char *buf, char *mem, int count)
+{
+  int i;
+  unsigned char ch;
+  for (i = 0; i < count; i++)
+    {
+      ch = hex (*buf++) << 4;
+      ch = ch + hex (*buf++);
+      *mem++ = ch;
+    }
+  return (mem);
+}
+
+/**********************************************/
+/* WHILE WE FIND NICE HEX CHARS, BUILD AN INT */
+/* RETURN NUMBER OF CHARS PROCESSED           */
+/**********************************************/
+static int
+hexToInt (char **ptr, int *intValue)
+{
+  int numChars = 0;
+  int hexValue;
+
+  *intValue = 0;
+
+  while (**ptr)
+    {
+      hexValue = hex (**ptr);
+      if (hexValue >= 0)
+	{
+	  *intValue = (*intValue << 4) | hexValue;
+	  numChars++;
+	}
+      else
+	break;
+
+      (*ptr)++;
+    }
+
+  return (numChars);
+}
+
+/*
+ * Routines to get and put packets
+ */
+
+/* scan for the sequence $<data>#<checksum>     */
+
+static
+void
+getpacket (char *buffer)
+{
+  unsigned char checksum;
+  unsigned char xmitcsum;
+  int i;
+  int count;
+  char ch;
+  do
+    {
+      /* wait around for the start character, ignore all other characters */
+      while ((ch = getDebugChar ()) != '$');
+      checksum = 0;
+      xmitcsum = -1;
+
+      count = 0;
+
+      /* now, read until a # or end of buffer is found */
+      while (count < BUFMAX)
+	{
+	  ch = getDebugChar ();
+	  if (ch == '#')
+	    break;
+	  checksum = checksum + ch;
+	  buffer[count] = ch;
+	  count = count + 1;
+	}
+      buffer[count] = 0;
+
+      if (ch == '#')
+	{
+	  xmitcsum = hex (getDebugChar ()) << 4;
+	  xmitcsum += hex (getDebugChar ());
+	  if (checksum != xmitcsum)
+	    putDebugChar ('-');	/* failed checksum */
+	  else
+	    {
+	      putDebugChar ('+');	/* successful transfer */
+	      /* if a sequence char is present, reply the sequence ID */
+	      if (buffer[2] == ':')
+		{
+		  putDebugChar (buffer[0]);
+		  putDebugChar (buffer[1]);
+		  /* remove sequence chars from buffer */
+		  count = strlen (buffer);
+		  for (i = 3; i <= count; i++)
+		    buffer[i - 3] = buffer[i];
+		}
+	    }
+	}
+    }
+  while (checksum != xmitcsum);
+
+}
+
+
+/* send the packet in buffer.  The host get's one chance to read it.
+   This routine does not wait for a positive acknowledge.  */
+
+static void
+putpacket (register char *buffer)
+{
+  register  int checksum;
+  register  int count;
+
+  /*  $<packet info>#<checksum>. */
+  do
+    {
+      char *src = buffer;
+      putDebugChar ('$');
+      checksum = 0;
+
+      while (*src)
+	{
+	  int runlen;
+
+	  /* Do run length encoding */
+	  for (runlen = 0; runlen < 100; runlen ++) 
+	    {
+	      if (src[0] != src[runlen]) 
+		{
+		  if (runlen > 3) 
+		    {
+		      int encode;
+		      /* Got a useful amount */
+		      putDebugChar (*src);
+		      checksum += *src;
+		      putDebugChar ('*');
+		      checksum += '*';
+		      checksum += (encode = runlen + ' ' - 4);
+		      putDebugChar (encode);
+		      src += runlen;
+		    }
+		  else
+		    {
+		      putDebugChar (*src);
+		      checksum += *src;
+		      src++;
+		    }
+		  break;
+		}
+	    }
+	}
+
+
+      putDebugChar ('#');
+      putDebugChar (highhex(checksum));
+      putDebugChar (lowhex(checksum));
+    }
+  while  (getDebugChar() != '+');
+
+}
+
+
+/* a bus error has occurred, perform a longjmp
+   to return execution and allow handling of the error */
+
+void
+handle_buserror (void)
+{
+  longjmp (remcomEnv, 1);
+}
+
+/*
+ * this function takes the SH-1 exception number and attempts to
+ * translate this number into a unix compatible signal value
+ */
+static int
+computeSignal (int exceptionVector)
+{
+  int sigval;
+  switch (exceptionVector)
+    {
+    case INVALID_INSN_VEC:
+      sigval = 4;
+      break;			
+    case INVALID_SLOT_VEC:
+      sigval = 4;
+      break;			
+    case CPU_BUS_ERROR_VEC:
+      sigval = 10;
+      break;			
+    case DMA_BUS_ERROR_VEC:
+      sigval = 10;
+      break;	
+    case NMI_VEC:
+      sigval = 2;
+      break;	
+
+    case TRAP_VEC:
+    case USER_VEC:
+      sigval = 5;
+      break;
+
+    default:
+      sigval = 7;		/* "software generated"*/
+      break;
+    }
+  return (sigval);
+}
+
+void
+doSStep (void)
+{
+  short *instrMem;
+  int displacement;
+  int reg;
+  unsigned short opcode;
+
+  instrMem = (short *) registers[PC];
+
+  opcode = *instrMem;
+  stepped = 1;
+
+  if ((opcode & COND_BR_MASK) == BT_INSTR)
+    {
+      if (registers[SR] & T_BIT_MASK)
+	{
+	  displacement = (opcode & COND_DISP) << 1;
+	  if (displacement & 0x80)
+	    displacement |= 0xffffff00;
+	  /*
+		   * Remember PC points to second instr.
+		   * after PC of branch ... so add 4
+		   */
+	  instrMem = (short *) (registers[PC] + displacement + 4);
+	}
+      else
+	instrMem += 1;
+    }
+  else if ((opcode & COND_BR_MASK) == BF_INSTR)
+    {
+      if (registers[SR] & T_BIT_MASK)
+	instrMem += 1;
+      else
+	{
+	  displacement = (opcode & COND_DISP) << 1;
+	  if (displacement & 0x80)
+	    displacement |= 0xffffff00;
+	  /*
+		   * Remember PC points to second instr.
+		   * after PC of branch ... so add 4
+		   */
+	  instrMem = (short *) (registers[PC] + displacement + 4);
+	}
+    }
+  else if ((opcode & UCOND_DBR_MASK) == BRA_INSTR)
+    {
+      displacement = (opcode & UCOND_DISP) << 1;
+      if (displacement & 0x0800)
+	displacement |= 0xfffff000;
+
+      /*
+	   * Remember PC points to second instr.
+	   * after PC of branch ... so add 4
+	   */
+      instrMem = (short *) (registers[PC] + displacement + 4);
+    }
+  else if ((opcode & UCOND_RBR_MASK) == JSR_INSTR)
+    {
+      reg = (char) ((opcode & UCOND_REG) >> 8);
+
+      instrMem = (short *) registers[reg];
+    }
+  else if (opcode == RTS_INSTR)
+    instrMem = (short *) registers[PR];
+  else if (opcode == RTE_INSTR)
+    instrMem = (short *) registers[15];
+  else if ((opcode & TRAPA_MASK) == TRAPA_INSTR)
+    instrMem = (short *) ((opcode & ~TRAPA_MASK) << 2);
+  else
+    instrMem += 1;
+
+  instrBuffer.memAddr = instrMem;
+  instrBuffer.oldInstr = *instrMem;
+  *instrMem = SSTEP_INSTR;
+}
+
+
+/* Undo the effect of a previous doSStep.  If we single stepped,
+   restore the old instruction. */
+
+void
+undoSStep (void)
+{
+  if (stepped)
+    {  short *instrMem;
+      instrMem = instrBuffer.memAddr;
+      *instrMem = instrBuffer.oldInstr;
+    }
+  stepped = 0;
+}
+
+/*
+This function does all exception handling.  It only does two things -
+it figures out why it was called and tells gdb, and then it reacts
+to gdb's requests.
+
+When in the monitor mode we talk a human on the serial line rather than gdb.
+
+*/
+
+
+void
+gdb_handle_exception (int exceptionVector)
+{
+  int sigval;
+  int addr, length;
+  char *ptr;
+
+  /* reply to host that an exception has occurred */
+  sigval = computeSignal (exceptionVector);
+  remcomOutBuffer[0] = 'S';
+  remcomOutBuffer[1] = highhex(sigval);
+  remcomOutBuffer[2] = lowhex (sigval);
+  remcomOutBuffer[3] = 0;
+
+  putpacket (remcomOutBuffer);
+
+  /*
+   * exception 255 indicates a software trap
+   * inserted in place of code ... so back up
+   * PC by one instruction, since this instruction
+   * will later be replaced by its original one!
+   */
+  if (exceptionVector == 0xff
+      || exceptionVector == 0x20)
+    registers[PC] -= 2;
+
+  /*
+   * Do the thangs needed to undo
+   * any stepping we may have done!
+   */
+  undoSStep ();
+
+  while (1)
+    {
+      remcomOutBuffer[0] = 0;
+      getpacket (remcomInBuffer);
+
+      switch (remcomInBuffer[0])
+	{
+	case '?':
+	  remcomOutBuffer[0] = 'S';
+	  remcomOutBuffer[1] = highhex (sigval);
+	  remcomOutBuffer[2] = lowhex (sigval);
+	  remcomOutBuffer[3] = 0;
+	  break;
+	case 'd':
+	  remote_debug = !(remote_debug);	/* toggle debug flag */
+	  break;
+	case 'g':		/* return the value of the CPU registers */
+	  mem2hex ((char *) registers, remcomOutBuffer, NUMREGBYTES);
+	  break;
+	case 'G':		/* set the value of the CPU registers - return OK */
+	  hex2mem (&remcomInBuffer[1], (char *) registers, NUMREGBYTES);
+	  strcpy (remcomOutBuffer, "OK");
+	  break;
+
+	  /* mAA..AA,LLLL  Read LLLL bytes at address AA..AA */
+	case 'm':
+	  if (setjmp (remcomEnv) == 0)
+	    {
+	      dofault = 0;
+	      /* TRY, TO READ %x,%x.  IF SUCCEED, SET PTR = 0 */
+	      ptr = &remcomInBuffer[1];
+	      if (hexToInt (&ptr, &addr))
+		if (*(ptr++) == ',')
+		  if (hexToInt (&ptr, &length))
+		    {
+		      ptr = 0;
+		      mem2hex ((char *) addr, remcomOutBuffer, length);
+		    }
+	      if (ptr)
+		strcpy (remcomOutBuffer, "E01");
+	    }
+	  else
+	    strcpy (remcomOutBuffer, "E03");
+
+	  /* restore handler for bus error */
+	  dofault = 1;
+	  break;
+
+	  /* MAA..AA,LLLL: Write LLLL bytes at address AA.AA return OK */
+	case 'M':
+	  if (setjmp (remcomEnv) == 0)
+	    {
+	      dofault = 0;
+
+	      /* TRY, TO READ '%x,%x:'.  IF SUCCEED, SET PTR = 0 */
+	      ptr = &remcomInBuffer[1];
+	      if (hexToInt (&ptr, &addr))
+		if (*(ptr++) == ',')
+		  if (hexToInt (&ptr, &length))
+		    if (*(ptr++) == ':')
+		      {
+			hex2mem (ptr, (char *) addr, length);
+			ptr = 0;
+			strcpy (remcomOutBuffer, "OK");
+		      }
+	      if (ptr)
+		strcpy (remcomOutBuffer, "E02");
+	    }
+	  else
+	    strcpy (remcomOutBuffer, "E03");
+
+	  /* restore handler for bus error */
+	  dofault = 1;
+	  break;
+
+	  /* cAA..AA    Continue at address AA..AA(optional) */
+	  /* sAA..AA   Step one instruction from AA..AA(optional) */
+	case 'c':
+	case 's':
+	  {
+	    /* tRY, to read optional parameter, pc unchanged if no parm */
+	    ptr = &remcomInBuffer[1];
+	    if (hexToInt (&ptr, &addr))
+	      registers[PC] = addr;
+
+	    if (remcomInBuffer[0] == 's')
+	      doSStep ();
+	  }
+	  return;
+	  break;
+
+	  /* kill the program */
+	case 'k':		/* do nothing */
+	  break;
+	}			/* switch */
+
+      /* reply to the request */
+      putpacket (remcomOutBuffer);
+    }
+}
+
+
+#define GDBCOOKIE 0x5ac 
+static int ingdbmode;
+/* We've had an exception - choose to go into the monitor or
+   the gdb stub */
+void handle_exception(int exceptionVector)
+{
+#ifdef MONITOR
+    if (ingdbmode != GDBCOOKIE)
+      monitor_handle_exception (exceptionVector);
+    else 
+#endif
+      gdb_handle_exception (exceptionVector);
+
+}
+
+void
+gdb_mode()
+{
+  ingdbmode = GDBCOOKIE;
+  breakpoint();
+}
+/* This function will generate a breakpoint exception.  It is used at the
+   beginning of a program to sync up with a debugger and can be used
+   otherwise as a quick means to stop program execution and "break" into
+   the debugger. */
+
+void
+breakpoint (void)
+{
+      BREAKPOINT ();
+}
+
+asm ("_BINIT: mov.l  L1,r15");
+asm ("bra _INIT");
+asm ("nop");
+asm ("L1: .long _init_stack + 8*1024*4");
+void
+INIT (void)
+{
+  /* First turn on the ram */
+  WCR1  = 0;    /* Never sample wait */
+  BCR = BAS;    /* use lowbyte/high byte */
+
+  init_serial();
+
+#ifdef MONITOR
+  reset_hook ();
+#endif
+
+
+  in_nmi = 0;
+  dofault = 1;
+  stepped = 0;
+
+  stub_sp = stub_stack + stub_stack_size;
+  breakpoint ();
+
+  while (1)
+    ;
+}
+
+
+static void sr()
+{
+
+
+  /* Calling Reset does the same as pressing the button */
+  asm (".global _Reset
+        .global _WarmReset
+_Reset:
+_WarmReset:
+         mov.l L_sp,r15
+         bra   _INIT
+         nop
+         .align 2
+L_sp:    .long _init_stack + 8000");
+
+  asm("saveRegisters:
+	mov.l	@(L_reg, pc), r0
+	mov.l	@r15+, r1				! pop R0
+	mov.l	r2, @(0x08, r0)				! save R2
+	mov.l	r1, @r0					! save R0
+	mov.l	@r15+, r1				! pop R1
+	mov.l	r3, @(0x0c, r0)				! save R3
+	mov.l	r1, @(0x04, r0)				! save R1
+	mov.l	r4, @(0x10, r0)				! save R4
+	mov.l	r5, @(0x14, r0)				! save R5
+	mov.l	r6, @(0x18, r0)				! save R6
+	mov.l	r7, @(0x1c, r0)				! save R7
+	mov.l	r8, @(0x20, r0)				! save R8
+	mov.l	r9, @(0x24, r0)				! save R9
+	mov.l	r10, @(0x28, r0)			! save R10
+	mov.l	r11, @(0x2c, r0)			! save R11
+	mov.l	r12, @(0x30, r0)			! save R12
+	mov.l	r13, @(0x34, r0)			! save R13
+	mov.l	r14, @(0x38, r0)			! save R14
+	mov.l	@r15+, r4				! save arg to handleException
+	add	#8, r15					! hide PC/SR values on stack
+	mov.l	r15, @(0x3c, r0)			! save R15
+	add	#-8, r15				! save still needs old SP value
+	add	#92, r0					! readjust register pointer
+	mov	r15, r2
+	add	#4, r2
+	mov.l	@r2, r2					! R2 has SR
+	mov.l	@r15, r1				! R1 has PC
+	mov.l	r2, @-r0				! save SR
+	sts.l	macl, @-r0				! save MACL
+	sts.l	mach, @-r0				! save MACH
+	stc.l	vbr, @-r0				! save VBR
+	stc.l	gbr, @-r0				! save GBR
+	sts.l	pr, @-r0				! save PR
+	mov.l	@(L_stubstack, pc), r2
+	mov.l	@(L_hdl_except, pc), r3
+	mov.l	@r2, r15
+	jsr	@r3
+	mov.l	r1, @-r0				! save PC
+	mov.l	@(L_stubstack, pc), r0
+	mov.l	@(L_reg, pc), r1
+	bra	restoreRegisters
+	mov.l	r15, @r0				! save __stub_stack
+	
+	.align 2
+L_reg:
+	.long	_registers
+L_stubstack:
+	.long	_stub_sp
+L_hdl_except:
+	.long	_handle_exception");
+
+}
+
+static void rr()
+{
+asm("
+	.align 2	
+        .global _resume
+_resume:
+	mov	r4,r1
+restoreRegisters:
+	add	#8, r1						! skip to R2
+	mov.l	@r1+, r2					! restore R2
+	mov.l	@r1+, r3					! restore R3
+	mov.l	@r1+, r4					! restore R4
+	mov.l	@r1+, r5					! restore R5
+	mov.l	@r1+, r6					! restore R6
+	mov.l	@r1+, r7					! restore R7
+	mov.l	@r1+, r8					! restore R8
+	mov.l	@r1+, r9					! restore R9
+	mov.l	@r1+, r10					! restore R10
+	mov.l	@r1+, r11					! restore R11
+	mov.l	@r1+, r12					! restore R12
+	mov.l	@r1+, r13					! restore R13
+	mov.l	@r1+, r14					! restore R14
+	mov.l	@r1+, r15					! restore programs stack
+	mov.l	@r1+, r0
+	add	#-8, r15					! uncover PC/SR on stack 
+	mov.l	r0, @r15					! restore PC onto stack
+	lds.l	@r1+, pr					! restore PR
+	ldc.l	@r1+, gbr					! restore GBR		
+	ldc.l	@r1+, vbr					! restore VBR
+	lds.l	@r1+, mach					! restore MACH
+	lds.l	@r1+, macl					! restore MACL
+	mov.l	@r1, r0	
+	add	#-88, r1					! readjust reg pointer to R1
+	mov.l	r0, @(4, r15)					! restore SR onto stack+4
+	mov.l	r2, @-r15
+	mov.l	L_in_nmi, r0
+	mov		#0, r2
+	mov.b	r2, @r0
+	mov.l	@r15+, r2
+	mov.l	@r1+, r0					! restore R0
+	rte
+	mov.l	@r1, r1						! restore R1
+
+");
+}
+
+
+static __inline__ void code_for_catch_exception(int n) 
+{
+  asm("		.globl	_catch_exception_%O0" : : "i" (n) 				); 
+  asm("	_catch_exception_%O0:" :: "i" (n)      						);
+
+  asm("		add	#-4, r15 				! reserve spot on stack ");
+  asm("		mov.l	r1, @-r15				! push R1		");
+
+  if (n == NMI_VEC) 
+    {
+      /* Special case for NMI - make sure that they don't nest */
+      asm("	mov.l	r0, @-r15					! push R0");
+      asm("	mov.l	L_in_nmi, r0");
+      asm("	tas.b	@r0						! Fend off against addtnl NMIs");
+      asm("	bt		noNMI");
+      asm("	mov.l	@r15+, r0");
+      asm("	mov.l	@r15+, r1");
+      asm("	add		#4, r15");
+      asm("	rte");
+      asm("	nop");
+      asm(".align 2");
+      asm("L_in_nmi: .long	_in_nmi");
+      asm("noNMI:");
+    }
+  else
+    {
+
+      if (n == CPU_BUS_ERROR_VEC)
+	{
+	  /* Exception 9 (bus errors) are disasbleable - so that you
+	     can probe memory and get zero instead of a fault.
+	     Because the vector table may be in ROM we don't revector
+	     the interrupt like all the other stubs, we check in here
+	     */
+	  asm("mov.l	L_dofault,r1");
+	  asm("mov.l	@r1,r1");
+	  asm("tst	r1,r1");
+	  asm("bf	faultaway");
+	  asm("bsr	_handle_buserror");
+	  asm(".align	2");
+	  asm("L_dofault: .long _dofault");
+	  asm("faultaway:");
+	}
+      asm("		mov	#15<<4, r1							");
+      asm("		ldc	r1, sr					! disable interrupts	");
+      asm("		mov.l	r0, @-r15				! push R0		");
+    }
+
+  /* Prepare for saving context, we've already pushed r0 and r1, stick exception number
+     into the frame */
+  asm("		mov	r15, r0								");
+  asm("		add	#8, r0								");
+  asm("		mov	%0,r1" :: "i" (n)        					);
+  asm("		extu.b  r1,r1								");
+  asm("		bra	saveRegisters				! save register values	");
+  asm("		mov.l	r1, @r0					! save exception # 	");
+}
+
+
+static  void
+exceptions()
+{
+  code_for_catch_exception (CPU_BUS_ERROR_VEC);
+  code_for_catch_exception (DMA_BUS_ERROR_VEC);
+  code_for_catch_exception (INVALID_INSN_VEC);
+  code_for_catch_exception (INVALID_SLOT_VEC);
+  code_for_catch_exception (NMI_VEC);
+  code_for_catch_exception (TRAP_VEC);
+  code_for_catch_exception (USER_VEC);
+  code_for_catch_exception (IO_VEC);
+}
+
+
+
+
+
+
+/* Support for Serial I/O using on chip uart */
+
+#define SMR0 (*(volatile char *)(0x05FFFEC0)) /* Channel 0  serial mode register */
+#define BRR0 (*(volatile char *)(0x05FFFEC1)) /* Channel 0  bit rate register */
+#define SCR0 (*(volatile char *)(0x05FFFEC2)) /* Channel 0  serial control register */
+#define TDR0 (*(volatile char *)(0x05FFFEC3)) /* Channel 0  transmit data register */
+#define SSR0 (*(volatile char *)(0x05FFFEC4)) /* Channel 0  serial status register */
+#define RDR0 (*(volatile char *)(0x05FFFEC5)) /* Channel 0  receive data register */
+
+#define SMR1 (*(volatile char *)(0x05FFFEC8)) /* Channel 1  serial mode register */
+#define BRR1 (*(volatile char *)(0x05FFFEC9)) /* Channel 1  bit rate register */
+#define SCR1 (*(volatile char *)(0x05FFFECA)) /* Channel 1  serial control register */
+#define TDR1 (*(volatile char *)(0x05FFFECB)) /* Channel 1  transmit data register */
+#define SSR1 (*(volatile char *)(0x05FFFECC)) /* Channel 1  serial status register */
+#define RDR1 (*(volatile char *)(0x05FFFECD)) /* Channel 1  receive data register */
+
+/*
+ * Serial mode register bits
+ */
+
+#define SYNC_MODE 		0x80
+#define SEVEN_BIT_DATA 		0x40
+#define PARITY_ON		0x20
+#define ODD_PARITY		0x10
+#define STOP_BITS_2		0x08
+#define ENABLE_MULTIP		0x04
+#define PHI_64			0x03
+#define PHI_16			0x02
+#define PHI_4			0x01
+
+/*
+ * Serial control register bits
+ */
+#define SCI_TIE				0x80	/* Transmit interrupt enable */
+#define SCI_RIE				0x40	/* Receive interrupt enable */
+#define SCI_TE				0x20	/* Transmit enable */
+#define SCI_RE				0x10	/* Receive enable */
+#define SCI_MPIE			0x08	/* Multiprocessor interrupt enable */
+#define SCI_TEIE			0x04	/* Transmit end interrupt enable */
+#define SCI_CKE1			0x02	/* Clock enable 1 */
+#define SCI_CKE0			0x01	/* Clock enable 0 */
+
+/*
+ * Serial status register bits
+ */
+#define SCI_TDRE			0x80	/* Transmit data register empty */
+#define SCI_RDRF			0x40	/* Receive data register full */
+#define SCI_ORER			0x20	/* Overrun error */
+#define SCI_FER				0x10	/* Framing error */
+#define SCI_PER				0x08	/* Parity error */
+#define SCI_TEND			0x04	/* Transmit end */
+#define SCI_MPB				0x02	/* Multiprocessor bit */
+#define SCI_MPBT			0x01	/* Multiprocessor bit transfer */
+
+
+/*
+ * Port B IO Register (PBIOR)
+ */
+#define	PBIOR 		(*(volatile char *)(0x05FFFFC6))
+#define	PB15IOR 	0x8000
+#define	PB14IOR 	0x4000
+#define	PB13IOR 	0x2000
+#define	PB12IOR 	0x1000
+#define	PB11IOR 	0x0800
+#define	PB10IOR 	0x0400
+#define	PB9IOR 		0x0200
+#define	PB8IOR 		0x0100
+#define	PB7IOR 		0x0080
+#define	PB6IOR 		0x0040
+#define	PB5IOR 		0x0020
+#define	PB4IOR 		0x0010
+#define	PB3IOR 		0x0008
+#define	PB2IOR 		0x0004
+#define	PB1IOR 		0x0002
+#define	PB0IOR 		0x0001
+
+/*
+ * Port B Control Register (PBCR1)
+ */
+#define	PBCR1 		(*(volatile short *)(0x05FFFFCC))
+#define	PB15MD1 	0x8000
+#define	PB15MD0 	0x4000
+#define	PB14MD1 	0x2000
+#define	PB14MD0 	0x1000
+#define	PB13MD1 	0x0800
+#define	PB13MD0 	0x0400
+#define	PB12MD1 	0x0200
+#define	PB12MD0 	0x0100
+#define	PB11MD1 	0x0080
+#define	PB11MD0 	0x0040
+#define	PB10MD1 	0x0020
+#define	PB10MD0 	0x0010
+#define	PB9MD1 		0x0008
+#define	PB9MD0 		0x0004
+#define	PB8MD1 		0x0002
+#define	PB8MD0 		0x0001
+
+#define	PB15MD 		PB15MD1|PB14MD0
+#define	PB14MD 		PB14MD1|PB14MD0
+#define	PB13MD 		PB13MD1|PB13MD0
+#define	PB12MD 		PB12MD1|PB12MD0
+#define	PB11MD 		PB11MD1|PB11MD0
+#define	PB10MD 		PB10MD1|PB10MD0
+#define	PB9MD 		PB9MD1|PB9MD0
+#define	PB8MD 		PB8MD1|PB8MD0
+
+#define PB_TXD1 	PB11MD1
+#define PB_RXD1 	PB10MD1
+#define PB_TXD0 	PB9MD1
+#define PB_RXD0 	PB8MD1
+
+/*
+ * Port B Control Register (PBCR2)
+ */
+#define	PBCR2 	0x05FFFFCE
+#define	PB7MD1 	0x8000
+#define	PB7MD0 	0x4000
+#define	PB6MD1 	0x2000
+#define	PB6MD0 	0x1000
+#define	PB5MD1 	0x0800
+#define	PB5MD0 	0x0400
+#define	PB4MD1 	0x0200
+#define	PB4MD0 	0x0100
+#define	PB3MD1 	0x0080
+#define	PB3MD0 	0x0040
+#define	PB2MD1 	0x0020
+#define	PB2MD0 	0x0010
+#define	PB1MD1 	0x0008
+#define	PB1MD0 	0x0004
+#define	PB0MD1 	0x0002
+#define	PB0MD0 	0x0001
+	
+#define	PB7MD 	PB7MD1|PB7MD0
+#define	PB6MD 	PB6MD1|PB6MD0
+#define	PB5MD 	PB5MD1|PB5MD0
+#define	PB4MD 	PB4MD1|PB4MD0
+#define	PB3MD 	PB3MD1|PB3MD0
+#define	PB2MD 	PB2MD1|PB2MD0
+#define	PB1MD 	PB1MD1|PB1MD0
+#define	PB0MD 	PB0MD1|PB0MD0
+
+
+#ifdef MHZ
+#define BPS			32 * 9600 * MHZ / ( BAUD * 10)
+#else
+#define BPS			32	/* 9600 for 10 Mhz */
+#endif
+
+void handleError (char theSSR);
+
+void
+nop ()
+{
+
+}
+void 
+init_serial()
+{
+  int i;
+
+  /* Clear TE and RE in Channel 1's SCR   */
+  SCR1 &= ~(SCI_TE | SCI_RE);
+
+  /* Set communication to be async, 8-bit data, no parity, 1 stop bit and use internal clock */
+
+  SMR1 = 0;
+  BRR1 = BPS;
+
+  SCR1 &= ~(SCI_CKE1 | SCI_CKE0);
+
+  /* let the hardware settle */
+
+  for (i = 0; i < 1000; i++)
+    nop ();
+
+  /* Turn on in and out */
+  SCR1 |= SCI_RE | SCI_TE;
+
+  /* Set the PFC to make RXD1 (pin PB8) an input pin and TXD1 (pin PB9) an output pin */
+  PBCR1 &= ~(PB_TXD1 | PB_RXD1);
+  PBCR1 |= PB_TXD1 | PB_RXD1;
+}
+
+
+int
+getDebugCharReady (void)
+{
+  char mySSR;
+  mySSR = SSR1 & ( SCI_PER | SCI_FER | SCI_ORER );
+  if ( mySSR )
+    handleError ( mySSR );
+  return SSR1 & SCI_RDRF ;
+}
+
+char 
+getDebugChar (void)
+{
+  char ch;
+  char mySSR;
+
+  while ( ! getDebugCharReady())
+    ;
+
+  ch = RDR1;
+  SSR1 &= ~SCI_RDRF;
+
+  mySSR = SSR1 & (SCI_PER | SCI_FER | SCI_ORER);
+
+  if (mySSR)
+    handleError (mySSR);
+
+  return ch;
+}
+
+int 
+putDebugCharReady()
+{
+  return (SSR1 & SCI_TDRE);
+}
+
+void
+putDebugChar (char ch)
+{
+  while (!putDebugCharReady())
+    ;
+
+  /*
+   * Write data into TDR and clear TDRE
+   */
+  TDR1 = ch;
+  SSR1 &= ~SCI_TDRE;
+}
+
+void 
+handleError (char theSSR)
+{
+  SSR1 &= ~(SCI_ORER | SCI_PER | SCI_FER);
+}
+
diff --git a/contrib/gdb/gdb/sparclet-rom.c b/contrib/gdb/gdb/sparclet-rom.c
new file mode 100644
index 000000000000..992cca1ab51c
--- /dev/null
+++ b/contrib/gdb/gdb/sparclet-rom.c
@@ -0,0 +1,296 @@
+/* Remote target glue for the SPARC Sparclet ROM monitor.
+   Copyright 1995, 1996 Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+
+#include "defs.h"
+#include "gdbcore.h"
+#include "target.h"
+#include "monitor.h"
+#include "serial.h"
+#include "srec.h"
+#include "symtab.h"
+#include "symfile.h" /* for generic_load */
+#include <time.h>
+
+extern void report_transfer_performance PARAMS ((unsigned long, time_t, time_t));
+
+static struct target_ops sparclet_ops;
+
+static void sparclet_open PARAMS ((char *args, int from_tty));
+
+/* This array of registers need to match the indexes used by GDB.
+   This exists because the various ROM monitors use different strings
+   than does GDB, and don't necessarily support all the registers
+   either. So, typing "info reg sp" becomes a "r30".  */
+
+/*PSR 0x00000080  impl ver icc AW LE EE EC EF PIL S PS ET CWP  WIM
+                0x0  0x0 0x0  0  0  0  0  0 0x0 1  0  0 0x00 0x2
+                                                             0000010
+       INS        LOCALS       OUTS      GLOBALS
+ 0  0x00000000  0x00000000  0x00000000  0x00000000
+ 1  0x00000000  0x00000000  0x00000000  0x00000000
+ 2  0x00000000  0x00000000  0x00000000  0x00000000
+ 3  0x00000000  0x00000000  0x00000000  0x00000000
+ 4  0x00000000  0x00000000  0x00000000  0x00000000
+ 5  0x00000000  0x00001000  0x00000000  0x00000000
+ 6  0x00000000  0x00000000  0x123f0000  0x00000000
+ 7  0x00000000  0x00000000  0x00000000  0x00000000
+pc:  0x12010000 0x00000000    unimp
+npc: 0x12010004 0x00001000    unimp     0x1000
+tbr: 0x00000000
+y:   0x00000000
+*/
+/* these correspond to the offsets from tm-* files from config directories */
+
+/* is wim part of psr?? */
+/* monitor wants lower case */
+static char *sparclet_regnames[NUM_REGS] = REGISTER_NAMES;
+
+
+/* Function: sparclet_supply_register
+   Just returns with no action.
+   This function is required, because parse_register_dump (monitor.c)
+   expects to be able to call it.  If we don't supply something, it will
+   call a null pointer and core-dump.  Since this function does not 
+   actually do anything, GDB will request the registers individually.  */
+
+static void
+sparclet_supply_register (regname, regnamelen, val, vallen)
+     char *regname;
+     int regnamelen;
+     char *val;
+     int vallen;
+{
+  return;
+}
+
+static void
+sparclet_load (desc, file, hashmark)
+     serial_t desc;
+     char *file;
+     int hashmark;
+{
+  bfd *abfd;
+  asection *s;
+  int i;
+  CORE_ADDR load_offset;
+  time_t start_time, end_time;
+  unsigned long data_count = 0;
+
+  /* enable user to specify address for downloading as 2nd arg to load */
+
+  i = sscanf(file, "%*s 0x%lx", &load_offset);
+  if (i >= 1 ) 
+    {
+      char *p;
+
+      for (p = file; *p != '\000' && !isspace (*p); p++);
+
+      *p = '\000';
+    }
+  else
+    load_offset = 0;
+
+  abfd = bfd_openr (file, 0);
+  if (!abfd)
+    {
+      printf_filtered ("Unable to open file %s\n", file);
+      return;
+    }
+
+  if (bfd_check_format (abfd, bfd_object) == 0)
+    {
+      printf_filtered ("File is not an object file\n");
+      return;
+    }
+  
+  start_time = time (NULL);
+
+  for (s = abfd->sections; s; s = s->next)
+    if (s->flags & SEC_LOAD)
+      {
+	bfd_size_type section_size;
+	bfd_vma vma;
+
+	vma = bfd_get_section_vma (abfd, s) + load_offset;
+	section_size = bfd_section_size (abfd, s);
+
+	data_count += section_size;
+
+	printf_filtered ("%s\t: 0x%4x .. 0x%4x  ",
+			 bfd_get_section_name (abfd, s), vma,
+			 vma + section_size);
+	gdb_flush (gdb_stdout);
+
+	monitor_printf ("load c r %x %x\r", vma, section_size);
+
+	monitor_expect ("load: loading ", NULL, 0);
+	monitor_expect ("\r", NULL, 0);
+
+	for (i = 0; i < section_size; i += 2048)
+	  {
+	    int numbytes;
+	    char buf[2048];
+
+	    numbytes = min (sizeof buf, section_size - i);
+
+	    bfd_get_section_contents (abfd, s, buf, i, numbytes);
+
+	    SERIAL_WRITE (desc, buf, numbytes);
+
+	    if (hashmark)
+	      {
+		putchar_unfiltered ('#');
+		gdb_flush (gdb_stdout);
+	      }
+	  }			/* Per-packet (or S-record) loop */
+
+	monitor_expect_prompt (NULL, 0);
+
+	putchar_unfiltered ('\n');
+      }				/* Loadable sections */
+
+  monitor_printf ("reg pc %x\r", bfd_get_start_address (abfd));
+  monitor_expect_prompt (NULL, 0);
+  monitor_printf ("reg npc %x\r", bfd_get_start_address (abfd) + 4);
+  monitor_expect_prompt (NULL, 0);
+
+  monitor_printf ("run\r");
+
+  end_time = time (NULL);
+
+  if (hashmark) 
+    putchar_unfiltered ('\n');
+
+  report_transfer_performance (data_count, start_time, end_time);
+
+  pop_target ();
+  push_remote_target (monitor_get_dev_name (), 1);
+
+  return_to_top_level (RETURN_QUIT);
+}
+
+/* Define the monitor command strings. Since these are passed directly
+   through to a printf style function, we may include formatting
+   strings. We also need a CR or LF on the end.  */
+
+/* need to pause the monitor for timing reasons, so slow it down */
+
+static char *sparclet_inits[] = {"\n\r\r\n", NULL};
+
+static struct monitor_ops sparclet_cmds ;
+
+static void 
+init_sparclet_cmds(void)
+{
+  sparclet_cmds.flags =   MO_CLR_BREAK_USES_ADDR |
+    MO_HEX_PREFIX          |
+    MO_NO_ECHO_ON_OPEN     |
+    MO_NO_ECHO_ON_SETMEM   |
+    MO_RUN_FIRST_TIME      |
+    MO_GETMEM_READ_SINGLE ;	/* flags */
+  sparclet_cmds.init =   sparclet_inits;		/* Init strings */
+  sparclet_cmds.cont =   "cont\r";			/* continue command */
+  sparclet_cmds.step =   "step\r";			/* single step */
+  sparclet_cmds.stop =   "\r";				/* break interrupts the program */
+  sparclet_cmds.set_break =   "+bp %x\r";		/* set a breakpoint */
+  sparclet_cmds.clr_break =  "-bp %x\r" ;		/* can't use "br" because only 2 hw bps are supported */
+  sparclet_cmds.clr_all_break =   "-bp %x\r";		/* clear a breakpoint */
+  "-bp\r" ;			/* clear all breakpoints */
+  sparclet_cmds.fill =   "fill %x -n %x -v %x -b\r";	/* fill (start length val) */
+  /* can't use "fi" because it takes words, not bytes */
+  /* ex [addr] [-n count] [-b|-s|-l]          default: ex cur -n 1 -b */
+  sparclet_cmds.setmem.cmdb =     "ex %x -b\r%x\rq\r";	/* setmem.cmdb (addr, value) */
+  sparclet_cmds.setmem.cmdw =     "ex %x -s\r%x\rq\r";	/* setmem.cmdw (addr, value) */
+  sparclet_cmds.setmem.cmdl =     "ex %x -l\r%x\rq\r";  /* setmem.cmdl (addr, value) */
+  sparclet_cmds.setmem.cmdll =     NULL;		/* setmem.cmdll (addr, value) */
+  sparclet_cmds.setmem.resp_delim =     NULL; /*": " */	/* setmem.resp_delim */
+  sparclet_cmds.setmem.term =     NULL; /*"? " */	/* setmem.term */
+  sparclet_cmds.setmem.term_cmd =     NULL; /*"q\r" */	/* setmem.term_cmd */
+  /* since the parsing of multiple bytes is difficult due to
+     interspersed addresses, we'll only read 1 value at a time,
+     even tho these can handle a count */
+  /* we can use -n to set count to read, but may have to parse? */
+  sparclet_cmds.getmem.cmdb =     "ex %x -n 1 -b\r";	/* getmem.cmdb (addr, #bytes) */
+  sparclet_cmds.getmem.cmdw =     "ex %x -n 1 -s\r";	/* getmem.cmdw (addr, #swords) */
+  sparclet_cmds.getmem.cmdl =     "ex %x -n 1 -l\r";	/* getmem.cmdl (addr, #words) */
+  sparclet_cmds.getmem.cmdll =     NULL;		/* getmem.cmdll (addr, #dwords) */
+  sparclet_cmds.getmem.resp_delim =     ": ";		/* getmem.resp_delim */
+  sparclet_cmds.getmem.term =     NULL;			/* getmem.term */
+  sparclet_cmds.getmem.term_cmd =     NULL;		/* getmem.term_cmd */
+  sparclet_cmds.setreg.cmd =     "reg %s 0x%x\r";	/* setreg.cmd (name, value) */
+  sparclet_cmds.setreg.resp_delim =     NULL;		/* setreg.resp_delim */
+  sparclet_cmds.setreg.term =     NULL;			/* setreg.term */
+  sparclet_cmds.setreg.term_cmd =  NULL ;		/* setreg.term_cmd */
+  sparclet_cmds.getreg.cmd =     "reg %s\r";		/* getreg.cmd (name) */
+  sparclet_cmds.getreg.resp_delim =     " ";		/* getreg.resp_delim */
+  sparclet_cmds.getreg.term =     NULL;			/* getreg.term */
+  sparclet_cmds.getreg.term_cmd =     NULL;		/* getreg.term_cmd */
+  sparclet_cmds.dump_registers =   "reg\r";		/* dump_registers */
+  sparclet_cmds.register_pattern =   "\\(\\w+\\)=\\([0-9a-fA-F]+\\)";	/* register_pattern */
+  sparclet_cmds.supply_register =   sparclet_supply_register;	/* supply_register */
+  sparclet_cmds.load_routine =   sparclet_load;		/* load_routine */
+  sparclet_cmds.load =   NULL;				/* download command (srecs on console) */
+  sparclet_cmds.loadresp =   NULL;			/* load response */
+  sparclet_cmds.prompt =   "monitor>";			/* monitor command prompt */
+  /* yikes!  gdb core dumps without this delimitor!! */
+  sparclet_cmds.line_term =   "\r";			/* end-of-command delimitor */
+  sparclet_cmds.cmd_end =   NULL;			/* optional command terminator */
+  sparclet_cmds.target =   &sparclet_ops;		/* target operations */
+  sparclet_cmds.stopbits =   SERIAL_1_STOPBITS;		/* number of stop bits */
+  sparclet_cmds.regnames =   sparclet_regnames;		/* registers names */
+  sparclet_cmds.magic =   MONITOR_OPS_MAGIC ;	/* magic */
+};
+
+static void
+sparclet_open (args, from_tty)
+     char *args;
+     int from_tty;
+{
+  monitor_open (args, &sparclet_cmds, from_tty);
+}
+
+void
+_initialize_sparclet ()
+{
+  int i;
+  init_sparclet_cmds() ;
+
+  for (i = 0; i < NUM_REGS; i++)
+    if (sparclet_regnames[i][0] == 'c' ||
+	sparclet_regnames[i][0] == 'a')
+      sparclet_regnames[i] = 0;		/* mon can't report c* or a* regs */
+
+  sparclet_regnames[0] = 0;		/* mon won't report %G0 */
+
+  init_monitor_ops (&sparclet_ops);
+  sparclet_ops.to_shortname = "sparclet"; /* for the target command */
+  sparclet_ops.to_longname = "SPARC Sparclet monitor";
+  /* use SW breaks; target only supports 2 HW breakpoints */
+  sparclet_ops.to_insert_breakpoint = memory_insert_breakpoint; 
+  sparclet_ops.to_remove_breakpoint = memory_remove_breakpoint; 
+
+  sparclet_ops.to_doc = 
+    "Use a board running the Sparclet debug monitor.\n\
+Specify the serial device it is connected to (e.g. /dev/ttya).";
+
+  sparclet_ops.to_open = sparclet_open;
+  add_target (&sparclet_ops);
+}
+
diff --git a/contrib/gdb/gdb/sparclet-stub.c b/contrib/gdb/gdb/sparclet-stub.c
new file mode 100644
index 000000000000..ecf670b11526
--- /dev/null
+++ b/contrib/gdb/gdb/sparclet-stub.c
@@ -0,0 +1,1232 @@
+/****************************************************************************
+
+		THIS SOFTWARE IS NOT COPYRIGHTED
+
+   HP offers the following for use in the public domain.  HP makes no
+   warranty with regard to the software or it's performance and the
+   user accepts the software "AS IS" with all faults.
+
+   HP DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED, WITH REGARD
+   TO THIS SOFTWARE INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+****************************************************************************/
+
+/****************************************************************************
+ *  Header: remcom.c,v 1.34 91/03/09 12:29:49 glenne Exp $
+ *
+ *  Module name: remcom.c $
+ *  Revision: 1.34 $
+ *  Date: 91/03/09 12:29:49 $
+ *  Contributor:     Lake Stevens Instrument Division$
+ *
+ *  Description:     low level support for gdb debugger. $
+ *
+ *  Considerations:  only works on target hardware $
+ *
+ *  Written by:      Glenn Engel $
+ *  ModuleState:     Experimental $
+ *
+ *  NOTES:           See Below $
+ *
+ *  Modified for SPARC by Stu Grossman, Cygnus Support.
+ *  Based on sparc-stub.c, it's modified for SPARClite Debug Unit hardware
+ *  breakpoint support to create sparclite-stub.c, by Kung Hsu, Cygnus Support.
+ *
+ *  This code has been extensively tested on the Fujitsu SPARClite demo board.
+ *
+ *  To enable debugger support, two things need to happen.  One, a
+ *  call to set_debug_traps() is necessary in order to allow any breakpoints
+ *  or error conditions to be properly intercepted and reported to gdb.
+ *  Two, a breakpoint needs to be generated to begin communication.  This
+ *  is most easily accomplished by a call to breakpoint().  Breakpoint()
+ *  simulates a breakpoint by executing a trap #1.
+ *
+ *************
+ *
+ *    The following gdb commands are supported:
+ *
+ * command          function                               Return value
+ *
+ *    g             return the value of the CPU registers  hex data or ENN
+ *    G             set the value of the CPU registers     OK or ENN
+ *    P             set the value of a single CPU register OK or P01 (???)
+ *
+ *    mAA..AA,LLLL  Read LLLL bytes at address AA..AA      hex data or ENN
+ *    MAA..AA,LLLL: Write LLLL bytes at address AA.AA      OK or ENN
+ *
+ *    c             Resume at current address              SNN   ( signal NN)
+ *    cAA..AA       Continue at address AA..AA             SNN
+ *
+ *    s             Step one instruction                   SNN
+ *    sAA..AA       Step one instruction from AA..AA       SNN
+ *
+ *    k             kill
+ *
+ *    ?             What was the last sigval ?             SNN   (signal NN)
+ *
+ *    bBB..BB	    Set baud rate to BB..BB		   OK or BNN, then sets
+ *							   baud rate
+ *
+ * All commands and responses are sent with a packet which includes a
+ * checksum.  A packet consists of
+ *
+ * $<packet info>#<checksum>.
+ *
+ * where
+ * <packet info> :: <characters representing the command or response>
+ * <checksum>    :: <two hex digits computed as modulo 256 sum of <packetinfo>>
+ *
+ * When a packet is received, it is first acknowledged with either '+' or '-'.
+ * '+' indicates a successful transfer.  '-' indicates a failed transfer.
+ *
+ * Example:
+ *
+ * Host:                  Reply:
+ * $m0,10#2a               +$00010203040506070809101112131415#42
+ *
+ ****************************************************************************/
+
+#include <string.h>
+#include <signal.h>
+
+/************************************************************************
+ *
+ * external low-level support routines
+ */
+
+extern void putDebugChar();	/* write a single character      */
+extern int getDebugChar();	/* read and return a single char */
+
+/************************************************************************/
+/* BUFMAX defines the maximum number of characters in inbound/outbound buffers*/
+/* at least NUMREGBYTES*2 are needed for register packets */
+#define BUFMAX 2048
+
+static int initialized = 0;	/* !0 means we've been initialized */
+static int remote_debug = 0;	/* turn on verbose debugging */
+
+extern void breakinst();
+void _cprint();
+static void hw_breakpoint();
+static void set_mem_fault_trap();
+static void get_in_break_mode();
+static unsigned char *mem2hex();
+
+static const char hexchars[]="0123456789abcdef";
+
+#define NUMREGS 121
+
+static unsigned long saved_stack_pointer;
+
+/* Number of bytes of registers.  */
+#define NUMREGBYTES (NUMREGS * 4)
+enum regnames { G0, G1, G2, G3, G4, G5, G6, G7,
+		O0, O1, O2, O3, O4, O5, SP, O7,
+		L0, L1, L2, L3, L4, L5, L6, L7,
+		I0, I1, I2, I3, I4, I5, FP, I7,
+
+		F0, F1, F2, F3, F4, F5, F6, F7,
+		F8, F9, F10, F11, F12, F13, F14, F15,
+		F16, F17, F18, F19, F20, F21, F22, F23,
+		F24, F25, F26, F27, F28, F29, F30, F31,
+
+		Y, PSR, WIM, TBR, PC, NPC, FPSR, CPSR,
+		CCSR, CCPR, CCCRCR, CCOR, CCOBR, CCIBR, CCIR, UNUSED1,
+
+		ASR1, ASR15, ASR17, ASR18, ASR19, ASR20, ASR21, ASR22, 
+		/* the following not actually implemented */
+		AWR0,  AWR1,  AWR2,  AWR3,  AWR4,  AWR5,  AWR6,  AWR7,  
+		AWR8,  AWR9,  AWR10, AWR11, AWR12, AWR13, AWR14, AWR15,  
+		AWR16, AWR17, AWR18, AWR19, AWR20, AWR21, AWR22, AWR23,  
+		AWR24, AWR25, AWR26, AWR27, AWR28, AWR29, AWR30, AWR31,  
+		APSR
+};
+
+/***************************  ASSEMBLY CODE MACROS *************************/
+/* 									   */
+
+extern void trap_low();
+
+asm("
+	.reserve trapstack, 1000 * 4, \"bss\", 8
+
+	.data
+	.align	4
+
+in_trap_handler:
+	.word	0
+
+	.text
+	.align 4
+
+! This function is called when any SPARC trap (except window overflow or
+! underflow) occurs.  It makes sure that the invalid register window is still
+! available before jumping into C code.  It will also restore the world if you
+! return from handle_exception.
+!
+! On entry, trap_low expects l1 and l2 to contain pc and npc respectivly.
+
+	.globl _trap_low
+_trap_low:
+	mov	%psr, %l0
+	mov	%wim, %l3
+
+	srl	%l3, %l0, %l4		! wim >> cwp
+	and	%l4, 0xff, %l4		! Mask off windows 28, 29
+	cmp	%l4, 1
+	bne	window_fine		! Branch if not in the invalid window
+	nop
+
+! Handle window overflow
+
+	mov	%g1, %l4		! Save g1, we use it to hold the wim
+	srl	%l3, 1, %g1		! Rotate wim right
+	and	%g1, 0xff, %g1		! Mask off windows 28, 29
+	tst	%g1
+	bg	good_wim		! Branch if new wim is non-zero
+	nop
+
+! At this point, we need to bring a 1 into the high order bit of the wim.
+! Since we don't want to make any assumptions about the number of register
+! windows, we figure it out dynamically so as to setup the wim correctly.
+
+	! The normal way doesn't work on the sparclet as register windows
+	! 28 and 29 are special purpose windows.
+	!not	%g1			! Fill g1 with ones
+	!mov	%g1, %wim		! Fill the wim with ones
+	!nop
+	!nop
+	!nop
+	!mov	%wim, %g1		! Read back the wim
+	!inc	%g1			! Now g1 has 1 just to left of wim
+	!srl	%g1, 1, %g1		! Now put 1 at top of wim
+
+	mov	0x80, %g1		! Hack for sparclet
+
+	! This doesn't work on the sparclet.
+	!mov	%g0, %wim		! Clear wim so that subsequent save
+					!  won't trap
+	andn	%l3, 0xff, %l5		! Clear wim but not windows 28, 29
+	mov	%l5, %wim
+	nop
+	nop
+	nop
+
+good_wim:
+	save	%g0, %g0, %g0		! Slip into next window
+	mov	%g1, %wim		! Install the new wim
+
+	std	%l0, [%sp + 0 * 4]	! save L & I registers
+	std	%l2, [%sp + 2 * 4]
+	std	%l4, [%sp + 4 * 4]
+	std	%l6, [%sp + 6 * 4]
+
+	std	%i0, [%sp + 8 * 4]
+	std	%i2, [%sp + 10 * 4]
+	std	%i4, [%sp + 12 * 4]
+	std	%i6, [%sp + 14 * 4]
+
+	restore				! Go back to trap window.
+	mov	%l4, %g1		! Restore %g1
+
+window_fine:
+	sethi	%hi(in_trap_handler), %l4
+	ld	[%lo(in_trap_handler) + %l4], %l5
+	tst	%l5
+	bg	recursive_trap
+	inc	%l5
+
+	set	trapstack+1000*4, %sp	! Switch to trap stack
+
+recursive_trap:
+	st	%l5, [%lo(in_trap_handler) + %l4]
+	sub	%sp,(16+1+6+1+88)*4,%sp ! Make room for input & locals
+ 					! + hidden arg + arg spill
+					! + doubleword alignment
+					! + registers[121]
+
+	std	%g0, [%sp + (24 + 0) * 4] ! registers[Gx]
+	std	%g2, [%sp + (24 + 2) * 4]
+	std	%g4, [%sp + (24 + 4) * 4]
+	std	%g6, [%sp + (24 + 6) * 4]
+
+	std	%i0, [%sp + (24 + 8) * 4] ! registers[Ox]
+	std	%i2, [%sp + (24 + 10) * 4]
+	std	%i4, [%sp + (24 + 12) * 4]
+	std	%i6, [%sp + (24 + 14) * 4]
+
+	! FP regs (sparclet doesn't have fpu)
+
+	mov	%y, %l4
+	mov	%tbr, %l5
+	st	%l4, [%sp + (24 + 64) * 4] ! Y
+	st	%l0, [%sp + (24 + 65) * 4] ! PSR
+	st	%l3, [%sp + (24 + 66) * 4] ! WIM
+	st	%l5, [%sp + (24 + 67) * 4] ! TBR
+	st	%l1, [%sp + (24 + 68) * 4] ! PC
+	st	%l2, [%sp + (24 + 69) * 4] ! NPC
+					! CPSR and FPSR not impl
+	or	%l0, 0xf20, %l4
+	mov	%l4, %psr		! Turn on traps, disable interrupts
+	nop
+        nop
+        nop
+
+! Save coprocessor state.
+! See SK/demo/hdlc_demo/ldc_swap_context.S.
+
+	mov	%psr, %l0
+	sethi	%hi(0x2000), %l5		! EC bit in PSR
+	or	%l5, %l0, %l5
+	mov	%l5, %psr			! enable coprocessor
+	nop			! 3 nops after write to %psr (needed?)
+	nop
+	nop
+	crdcxt	%ccsr, %l1			! capture CCSR
+	mov	0x6, %l2
+	cwrcxt	%l2, %ccsr	! set CCP state machine for CCFR
+	crdcxt	%ccfr, %l2			! capture CCOR
+	cwrcxt	%l2, %ccfr			! tickle  CCFR
+	crdcxt	%ccfr, %l3			! capture CCOBR
+	cwrcxt	%l3, %ccfr			! tickle  CCFR
+	crdcxt	%ccfr, %l4			! capture CCIBR
+	cwrcxt	%l4, %ccfr			! tickle  CCFR
+	crdcxt	%ccfr, %l5			! capture CCIR
+	cwrcxt	%l5, %ccfr			! tickle  CCFR
+	crdcxt	%ccpr, %l6			! capture CCPR
+	crdcxt	%cccrcr, %l7			! capture CCCRCR
+	st	%l1, [%sp + (24 + 72) * 4]	! save CCSR
+	st	%l2, [%sp + (24 + 75) * 4]	! save CCOR
+	st	%l3, [%sp + (24 + 76) * 4]	! save CCOBR
+	st	%l4, [%sp + (24 + 77) * 4]	! save CCIBR
+	st	%l5, [%sp + (24 + 78) * 4]	! save CCIR
+	st	%l6, [%sp + (24 + 73) * 4]	! save CCPR
+	st	%l7, [%sp + (24 + 74) * 4]	! save CCCRCR
+	mov	%l0, %psr 			! restore original PSR
+	nop			! 3 nops after write to %psr (needed?)
+	nop
+	nop
+
+! End of saving coprocessor state.
+! Save asr regs
+
+! Part of this is silly -- we should not display ASR15 or ASR19 at all.
+
+	sethi	%hi(0x01000000), %l6
+	st	%l6, [%sp + (24 + 81) * 4]	! ASR15 == NOP
+	sethi	%hi(0xdeadc0de), %l6
+	or	%l6, %lo(0xdeadc0de), %l6
+	st	%l6, [%sp + (24 + 84) * 4]	! ASR19 == DEADC0DE
+
+	rd	%asr1, %l4
+	st	%l4, [%sp + (24 + 80) * 4]
+!	rd	%asr15, %l4			! must not read ASR15
+!	st	%l4, [%sp + (24 + 81) * 4]	! (illegal instr trap)
+	rd	%asr17, %l4
+	st	%l4, [%sp + (24 + 82) * 4]
+	rd	%asr18, %l4
+	st	%l4, [%sp + (24 + 83) * 4]
+!	rd	%asr19, %l4			! must not read asr19
+!	st	%l4, [%sp + (24 + 84) * 4]	! (halts the CPU)
+	rd	%asr20, %l4
+	st	%l4, [%sp + (24 + 85) * 4]
+	rd	%asr21, %l4
+	st	%l4, [%sp + (24 + 86) * 4]
+	rd	%asr22, %l4
+	st	%l4, [%sp + (24 + 87) * 4]
+
+! End of saving asr regs
+
+	call	_handle_exception
+	add	%sp, 24 * 4, %o0	! Pass address of registers
+
+! Reload all of the registers that aren't on the stack
+
+	ld	[%sp + (24 + 1) * 4], %g1 ! registers[Gx]
+	ldd	[%sp + (24 + 2) * 4], %g2
+	ldd	[%sp + (24 + 4) * 4], %g4
+	ldd	[%sp + (24 + 6) * 4], %g6
+
+	ldd	[%sp + (24 + 8) * 4], %i0 ! registers[Ox]
+	ldd	[%sp + (24 + 10) * 4], %i2
+	ldd	[%sp + (24 + 12) * 4], %i4
+	ldd	[%sp + (24 + 14) * 4], %i6
+
+	! FP regs (sparclet doesn't have fpu)
+
+! Update the coprocessor registers.
+! See SK/demo/hdlc_demo/ldc_swap_context.S.
+
+	mov	%psr, %l0
+	sethi	%hi(0x2000), %l5		! EC bit in PSR
+	or	%l5, %l0, %l5
+	mov	%l5, %psr			! enable coprocessor
+	nop			! 3 nops after write to %psr (needed?)
+	nop
+	nop
+
+	mov 0x6, %l2
+	cwrcxt	%l2, %ccsr	! set CCP state machine for CCFR
+
+	ld	[%sp + (24 + 72) * 4], %l1	! saved CCSR
+	ld	[%sp + (24 + 75) * 4], %l2	! saved CCOR
+	ld	[%sp + (24 + 76) * 4], %l3	! saved CCOBR
+	ld	[%sp + (24 + 77) * 4], %l4	! saved CCIBR
+	ld	[%sp + (24 + 78) * 4], %l5	! saved CCIR
+	ld	[%sp + (24 + 73) * 4], %l6	! saved CCPR
+	ld	[%sp + (24 + 74) * 4], %l7	! saved CCCRCR
+
+	cwrcxt	%l2, %ccfr			! restore CCOR
+	cwrcxt	%l3, %ccfr			! restore CCOBR
+	cwrcxt	%l4, %ccfr			! restore CCIBR
+	cwrcxt	%l5, %ccfr			! restore CCIR
+	cwrcxt	%l6, %ccpr			! restore CCPR
+	cwrcxt	%l7, %cccrcr			! restore CCCRCR
+	cwrcxt	%l1, %ccsr			! restore CCSR
+
+	mov %l0, %psr				! restore PSR
+	nop		! 3 nops after write to %psr (needed?)
+	nop
+	nop
+
+! End of coprocessor handling stuff.
+! Update asr regs
+
+	ld	[%sp + (24 + 80) * 4], %l4
+	wr	%l4, %asr1
+!	ld	[%sp + (24 + 81) * 4], %l4	! can't write asr15
+!	wr	%l4, %asr15
+	ld	[%sp + (24 + 82) * 4], %l4
+	wr	%l4, %asr17
+	ld	[%sp + (24 + 83) * 4], %l4
+	wr	%l4, %asr18
+!	ld	[%sp + (24 + 84) * 4], %l4	! can't write asr19
+!	wr	%l4, %asr19
+!	ld	[%sp + (24 + 85) * 4], %l4	! can't write asr20
+!	wr	%l4, %asr20
+!	ld	[%sp + (24 + 86) * 4], %l4	! can't write asr21
+!	wr	%l4, %asr21
+	ld	[%sp + (24 + 87) * 4], %l4
+	wr	%l4, %asr22
+
+! End of restoring asr regs
+
+
+	ldd	[%sp + (24 + 64) * 4], %l0 ! Y & PSR
+	ldd	[%sp + (24 + 68) * 4], %l2 ! PC & NPC
+
+	restore				! Ensure that previous window is valid
+	save	%g0, %g0, %g0		!  by causing a window_underflow trap
+
+	mov	%l0, %y
+	mov	%l1, %psr		! Make sure that traps are disabled
+					! for rett
+	nop	! 3 nops after write to %psr (needed?)
+	nop
+	nop
+
+	sethi	%hi(in_trap_handler), %l4
+	ld	[%lo(in_trap_handler) + %l4], %l5
+	dec	%l5
+	st	%l5, [%lo(in_trap_handler) + %l4]
+
+	jmpl	%l2, %g0		! Restore old PC
+	rett	%l3			! Restore old nPC
+");
+
+/* Convert ch from a hex digit to an int */
+
+static int
+hex(ch)
+     unsigned char ch;
+{
+  if (ch >= 'a' && ch <= 'f')
+    return ch-'a'+10;
+  if (ch >= '0' && ch <= '9')
+    return ch-'0';
+  if (ch >= 'A' && ch <= 'F')
+    return ch-'A'+10;
+  return -1;
+}
+
+/* scan for the sequence $<data>#<checksum>     */
+
+static void
+getpacket(buffer)
+     char *buffer;
+{
+  unsigned char checksum;
+  unsigned char xmitcsum;
+  int i;
+  int count;
+  unsigned char ch;
+
+  do
+    {
+      /* wait around for the start character, ignore all other characters */
+      while ((ch = (getDebugChar() & 0x7f)) != '$') 
+	;
+
+      checksum = 0;
+      xmitcsum = -1;
+
+      count = 0;
+
+      /* now, read until a # or end of buffer is found */
+      while (count < BUFMAX)
+	{
+	  ch = getDebugChar() & 0x7f;
+	  if (ch == '#')
+	    break;
+	  checksum = checksum + ch;
+	  buffer[count] = ch;
+	  count = count + 1;
+	}
+
+      if (count >= BUFMAX)
+	continue;
+
+      buffer[count] = 0;
+
+      if (ch == '#')
+	{
+	  xmitcsum = hex(ch = getDebugChar() & 0x7f) << 4;
+	  xmitcsum |= hex(ch = getDebugChar() & 0x7f);
+
+	  if (checksum != xmitcsum)
+	    putDebugChar('-');	/* failed checksum */
+	  else
+	    {
+	      putDebugChar('+'); /* successful transfer */
+	      /* if a sequence char is present, reply the sequence ID */
+	      if (buffer[2] == ':')
+		{
+		  putDebugChar(buffer[0]);
+		  putDebugChar(buffer[1]);
+		  /* remove sequence chars from buffer */
+		  count = strlen(buffer);
+		  for (i=3; i <= count; i++)
+		    buffer[i-3] = buffer[i];
+		}
+	    }
+	}
+    }
+  while (checksum != xmitcsum);
+}
+
+/* send the packet in buffer.  */
+
+static void
+putpacket(buffer)
+     unsigned char *buffer;
+{
+  unsigned char checksum;
+  int count;
+  unsigned char ch;
+
+  /*  $<packet info>#<checksum>. */
+  do
+    {
+      putDebugChar('$');
+      checksum = 0;
+      count = 0;
+
+      while (ch = buffer[count])
+	{
+	  putDebugChar(ch);
+	  checksum += ch;
+	  count += 1;
+	}
+
+      putDebugChar('#');
+      putDebugChar(hexchars[checksum >> 4]);
+      putDebugChar(hexchars[checksum & 0xf]);
+
+    }
+  while ((getDebugChar() & 0x7f) != '+');
+}
+
+static char remcomInBuffer[BUFMAX];
+static char remcomOutBuffer[BUFMAX];
+
+/* Indicate to caller of mem2hex or hex2mem that there has been an
+   error.  */
+static volatile int mem_err = 0;
+
+/* Convert the memory pointed to by mem into hex, placing result in buf.
+ * Return a pointer to the last char put in buf (null), in case of mem fault,
+ * return 0.
+ * If MAY_FAULT is non-zero, then we will handle memory faults by returning
+ * a 0, else treat a fault like any other fault in the stub.
+ */
+
+static unsigned char *
+mem2hex(mem, buf, count, may_fault)
+     unsigned char *mem;
+     unsigned char *buf;
+     int count;
+     int may_fault;
+{
+  unsigned char ch;
+
+  set_mem_fault_trap(may_fault);
+
+  while (count-- > 0)
+    {
+      ch = *mem++;
+      if (mem_err)
+	return 0;
+      *buf++ = hexchars[ch >> 4];
+      *buf++ = hexchars[ch & 0xf];
+    }
+
+  *buf = 0;
+
+  set_mem_fault_trap(0);
+
+  return buf;
+}
+
+/* convert the hex array pointed to by buf into binary to be placed in mem
+ * return a pointer to the character AFTER the last byte written */
+
+static char *
+hex2mem(buf, mem, count, may_fault)
+     unsigned char *buf;
+     unsigned char *mem;
+     int count;
+     int may_fault;
+{
+  int i;
+  unsigned char ch;
+
+  set_mem_fault_trap(may_fault);
+
+  for (i=0; i<count; i++)
+    {
+      ch = hex(*buf++) << 4;
+      ch |= hex(*buf++);
+      *mem++ = ch;
+      if (mem_err)
+	return 0;
+    }
+
+  set_mem_fault_trap(0);
+
+  return mem;
+}
+
+/* This table contains the mapping between SPARC hardware trap types, and
+   signals, which are primarily what GDB understands.  It also indicates
+   which hardware traps we need to commandeer when initializing the stub. */
+
+static struct hard_trap_info
+{
+  unsigned char tt;		/* Trap type code for SPARClite */
+  unsigned char signo;		/* Signal that we map this trap into */
+} hard_trap_info[] = {
+  {1, SIGSEGV},			/* instruction access exception */
+  {0x3b, SIGSEGV},		/* instruction access error */
+  {2, SIGILL},			/* illegal    instruction */
+  {3, SIGILL},			/* privileged instruction */
+  {4, SIGEMT},			/* fp disabled */
+  {0x24, SIGEMT},		/* cp disabled */
+  {7, SIGBUS},			/* mem address not aligned */
+  {0x29, SIGSEGV},		/* data access exception */
+  {10, SIGEMT},			/* tag overflow */
+  {128+1, SIGTRAP},		/* ta 1 - normal breakpoint instruction */
+  {0, 0}			/* Must be last */
+};
+
+/* Set up exception handlers for tracing and breakpoints */
+
+void
+set_debug_traps()
+{
+  struct hard_trap_info *ht;
+
+  for (ht = hard_trap_info; ht->tt && ht->signo; ht++)
+    exceptionHandler(ht->tt, trap_low);
+
+  /* In case GDB is started before us, ack any packets (presumably
+     "$?#xx") sitting there.  */
+  putDebugChar ('+');
+
+  initialized = 1;
+}
+
+asm ("
+! Trap handler for memory errors.  This just sets mem_err to be non-zero.  It
+! assumes that %l1 is non-zero.  This should be safe, as it is doubtful that
+! 0 would ever contain code that could mem fault.  This routine will skip
+! past the faulting instruction after setting mem_err.
+
+	.text
+	.align 4
+
+_fltr_set_mem_err:
+	sethi %hi(_mem_err), %l0
+	st %l1, [%l0 + %lo(_mem_err)]
+	jmpl %l2, %g0
+	rett %l2+4
+");
+
+static void
+set_mem_fault_trap(enable)
+     int enable;
+{
+  extern void fltr_set_mem_err();
+  mem_err = 0;
+
+  if (enable)
+    exceptionHandler(0x29, fltr_set_mem_err);
+  else
+    exceptionHandler(0x29, trap_low);
+}
+
+asm ("
+	.text
+	.align 4
+
+_dummy_hw_breakpoint:
+	jmpl %l2, %g0
+	rett %l2+4
+	nop
+	nop
+");
+
+static void
+set_hw_breakpoint_trap(enable)
+     int enable;
+{
+  extern void dummy_hw_breakpoint();
+
+  if (enable)
+    exceptionHandler(255, dummy_hw_breakpoint);
+  else
+    exceptionHandler(255, trap_low);
+}
+
+static void
+get_in_break_mode()
+{
+#if 0
+  int x;
+  mesg("get_in_break_mode, sp = ");
+  phex(&x);
+#endif
+  set_hw_breakpoint_trap(1);
+
+  asm("
+        sethi   %hi(0xff10), %l4
+        or      %l4, %lo(0xff10), %l4
+	sta 	%g0, [%l4]0x1	
+	nop
+	nop
+	nop
+      ");
+
+  set_hw_breakpoint_trap(0);
+}
+
+/* Convert the SPARC hardware trap type code to a unix signal number. */
+
+static int
+computeSignal(tt)
+     int tt;
+{
+  struct hard_trap_info *ht;
+
+  for (ht = hard_trap_info; ht->tt && ht->signo; ht++)
+    if (ht->tt == tt)
+      return ht->signo;
+
+  return SIGHUP;		/* default for things we don't know about */
+}
+
+/*
+ * While we find nice hex chars, build an int.
+ * Return number of chars processed.
+ */
+
+static int
+hexToInt(char **ptr, int *intValue)
+{
+  int numChars = 0;
+  int hexValue;
+
+  *intValue = 0;
+
+  while (**ptr)
+    {
+      hexValue = hex(**ptr);
+      if (hexValue < 0)
+	break;
+
+      *intValue = (*intValue << 4) | hexValue;
+      numChars ++;
+
+      (*ptr)++;
+    }
+
+  return (numChars);
+}
+
+/*
+ * This function does all command procesing for interfacing to gdb.  It
+ * returns 1 if you should skip the instruction at the trap address, 0
+ * otherwise.
+ */
+
+static void
+handle_exception (registers)
+     unsigned long *registers;
+{
+  int tt;			/* Trap type */
+  int sigval;
+  int addr;
+  int length;
+  char *ptr;
+  unsigned long *sp;
+  unsigned long dsr;
+
+/* First, we must force all of the windows to be spilled out */
+
+  asm("
+	! Ugh.  sparclet has broken save
+	!save %sp, -64, %sp
+	save
+	add %fp,-64,%sp
+	!save %sp, -64, %sp
+	save
+	add %fp,-64,%sp
+	!save %sp, -64, %sp
+	save
+	add %fp,-64,%sp
+	!save %sp, -64, %sp
+	save
+	add %fp,-64,%sp
+	!save %sp, -64, %sp
+	save
+	add %fp,-64,%sp
+	!save %sp, -64, %sp
+	save
+	add %fp,-64,%sp
+	!save %sp, -64, %sp
+	save
+	add %fp,-64,%sp
+	!save %sp, -64, %sp
+	save
+	add %fp,-64,%sp
+	restore
+	restore
+	restore
+	restore
+	restore
+	restore
+	restore
+	restore
+");
+
+  if (registers[PC] == (unsigned long)breakinst)
+    {
+      registers[PC] = registers[NPC];
+      registers[NPC] += 4;
+    }
+  sp = (unsigned long *)registers[SP];
+
+  tt = (registers[TBR] >> 4) & 0xff;
+
+  /* reply to host that an exception has occurred */
+  sigval = computeSignal(tt);
+  ptr = remcomOutBuffer;
+
+  *ptr++ = 'T';
+  *ptr++ = hexchars[sigval >> 4];
+  *ptr++ = hexchars[sigval & 0xf];
+
+  *ptr++ = hexchars[PC >> 4];
+  *ptr++ = hexchars[PC & 0xf];
+  *ptr++ = ':';
+  ptr = mem2hex((char *)&registers[PC], ptr, 4, 0);
+  *ptr++ = ';';
+
+  *ptr++ = hexchars[FP >> 4];
+  *ptr++ = hexchars[FP & 0xf];
+  *ptr++ = ':';
+  ptr = mem2hex(sp + 8 + 6, ptr, 4, 0); /* FP */
+  *ptr++ = ';';
+
+  *ptr++ = hexchars[SP >> 4];
+  *ptr++ = hexchars[SP & 0xf];
+  *ptr++ = ':';
+  ptr = mem2hex((char *)&sp, ptr, 4, 0);
+  *ptr++ = ';';
+
+  *ptr++ = hexchars[NPC >> 4];
+  *ptr++ = hexchars[NPC & 0xf];
+  *ptr++ = ':';
+  ptr = mem2hex((char *)&registers[NPC], ptr, 4, 0);
+  *ptr++ = ';';
+
+  *ptr++ = hexchars[O7 >> 4];
+  *ptr++ = hexchars[O7 & 0xf];
+  *ptr++ = ':';
+  ptr = mem2hex((char *)&registers[O7], ptr, 4, 0);
+  *ptr++ = ';';
+
+  *ptr++ = 0;
+
+  putpacket(remcomOutBuffer);
+
+  while (1)
+    {
+      remcomOutBuffer[0] = 0;
+
+      getpacket(remcomInBuffer);
+      switch (remcomInBuffer[0])
+	{
+	case '?':
+	  remcomOutBuffer[0] = 'S';
+	  remcomOutBuffer[1] = hexchars[sigval >> 4];
+	  remcomOutBuffer[2] = hexchars[sigval & 0xf];
+	  remcomOutBuffer[3] = 0;
+	  break;
+
+	case 'd':
+	  remote_debug = !(remote_debug);	/* toggle debug flag */
+	  break;
+
+	case 'g':		/* return the value of the CPU registers */
+	  {
+	    ptr = remcomOutBuffer;
+	    ptr = mem2hex((char *)registers, ptr, 16 * 4, 0); /* G & O regs */
+	    ptr = mem2hex(sp + 0, ptr, 16 * 4, 0); /* L & I regs */
+	    memset(ptr, '0', 32 * 8); /* Floating point */
+	    ptr = mem2hex((char *)&registers[Y],
+		    ptr + 32 * 4 * 2,
+		    8 * 4,
+		    0); /* Y, PSR, WIM, TBR, PC, NPC, FPSR, CPSR */
+	    ptr = mem2hex((char *)&registers[CCSR],
+		    ptr,
+		    8 * 4,
+		    0); /* CCSR, CCPR, CCCRCR, CCOR, CCOBR, CCIBR, CCIR */
+	    ptr = mem2hex((char *)&registers[ASR1],
+		    ptr,
+		    8 * 4,
+		    0); /* ASR1,ASR15,ASR17,ASR18,ASR19,ASR20,ASR21,ASR22 */
+#if 0 /* not implemented */
+	    ptr = mem2hex((char *) &registers[AWR0], 
+		    ptr, 
+		    32 * 4, 
+		    0); /* Alternate Window Registers */
+#endif
+	  }
+	  break;
+
+	case 'G':	/* set value of all the CPU registers - return OK */
+	case 'P':	/* set value of one CPU register      - return OK */
+	  {
+	    unsigned long *newsp, psr;
+
+	    psr = registers[PSR];
+
+	    ptr = &remcomInBuffer[1];
+
+	    if (remcomInBuffer[0] == 'P')	/* do a single register */
+	      {
+		int regno;
+ 
+                if (hexToInt (&ptr, &regno)
+                    && *ptr++ == '=')
+                  if (regno >= L0 && regno <= I7)
+                    hex2mem (ptr, sp + regno - L0, 4, 0);
+                  else
+                    hex2mem (ptr, (char *)&registers[regno], 4, 0);
+                else
+                  {
+                    strcpy (remcomOutBuffer, "P01");
+                    break;
+                  }
+	      }
+	    else
+	      {
+		hex2mem(ptr, (char *)registers, 16 * 4, 0); /* G & O regs */
+		hex2mem(ptr + 16 * 4 * 2, sp + 0, 16 * 4, 0); /* L & I regs */
+		hex2mem(ptr + 64 * 4 * 2, (char *)&registers[Y],
+			8 * 4, 0); /* Y,PSR,WIM,TBR,PC,NPC,FPSR,CPSR */
+		hex2mem(ptr + 72 * 4 * 2, (char *)&registers[CCSR],
+			8 * 4, 0); /* CCSR,CCPR,CCCRCR,CCOR,CCOBR,CCIBR,CCIR */
+		hex2mem(ptr + 80 * 4 * 2, (char *)&registers[ASR1],
+			8 * 4, 0); /* ASR1 ... ASR22 */
+#if 0 /* not implemented */
+		hex2mem(ptr + 88 * 4 * 2, (char *)&registers[AWR0],
+			8 * 4, 0); /* Alternate Window Registers */
+#endif
+	      }
+	    /* See if the stack pointer has moved.  If so, then copy the saved
+	       locals and ins to the new location.  This keeps the window
+	       overflow and underflow routines happy.  */
+
+	    newsp = (unsigned long *)registers[SP];
+	    if (sp != newsp)
+	      sp = memcpy(newsp, sp, 16 * 4);
+
+	    /* Don't allow CWP to be modified. */
+
+	    if (psr != registers[PSR])
+	      registers[PSR] = (psr & 0x1f) | (registers[PSR] & ~0x1f);
+
+	    strcpy(remcomOutBuffer,"OK");
+	  }
+	  break;
+
+	case 'm':	  /* mAA..AA,LLLL  Read LLLL bytes at address AA..AA */
+	  /* Try to read %x,%x.  */
+
+	  ptr = &remcomInBuffer[1];
+
+	  if (hexToInt(&ptr, &addr)
+	      && *ptr++ == ','
+	      && hexToInt(&ptr, &length))
+	    {
+	      if (mem2hex((char *)addr, remcomOutBuffer, length, 1))
+		break;
+
+	      strcpy (remcomOutBuffer, "E03");
+	    }
+	  else
+	    strcpy(remcomOutBuffer,"E01");
+	  break;
+
+	case 'M': /* MAA..AA,LLLL: Write LLLL bytes at address AA.AA return OK */
+	  /* Try to read '%x,%x:'.  */
+
+	  ptr = &remcomInBuffer[1];
+
+	  if (hexToInt(&ptr, &addr)
+	      && *ptr++ == ','
+	      && hexToInt(&ptr, &length)
+	      && *ptr++ == ':')
+	    {
+	      if (hex2mem(ptr, (char *)addr, length, 1))
+		strcpy(remcomOutBuffer, "OK");
+	      else
+		strcpy(remcomOutBuffer, "E03");
+	    }
+	  else
+	    strcpy(remcomOutBuffer, "E02");
+	  break;
+
+	case 'c':    /* cAA..AA    Continue at address AA..AA(optional) */
+	  /* try to read optional parameter, pc unchanged if no parm */
+
+	  ptr = &remcomInBuffer[1];
+	  if (hexToInt(&ptr, &addr))
+	    {
+	      registers[PC] = addr;
+	      registers[NPC] = addr + 4;
+	    }
+
+/* Need to flush the instruction cache here, as we may have deposited a
+   breakpoint, and the icache probably has no way of knowing that a data ref to
+   some location may have changed something that is in the instruction cache.
+ */
+
+	  flush_i_cache();
+	  return;
+
+	  /* kill the program */
+	case 'k' :		/* do nothing */
+	  break;
+#if 0
+	case 't':		/* Test feature */
+	  asm (" std %f30,[%sp]");
+	  break;
+#endif
+	case 'r':		/* Reset */
+	  asm ("call 0
+		nop ");
+	  break;
+
+#if 0
+Disabled until we can unscrew this properly
+
+	case 'b':	  /* bBB...  Set baud rate to BB... */
+	  {
+	    int baudrate;
+	    extern void set_timer_3();
+
+	    ptr = &remcomInBuffer[1];
+	    if (!hexToInt(&ptr, &baudrate))
+	      {
+		strcpy(remcomOutBuffer,"B01");
+		break;
+	      }
+
+	    /* Convert baud rate to uart clock divider */
+	    switch (baudrate)
+	      {
+	      case 38400:
+		baudrate = 16;
+		break;
+	      case 19200:
+		baudrate = 33;
+		break;
+	      case 9600:
+		baudrate = 65;
+		break;
+	      default:
+		strcpy(remcomOutBuffer,"B02");
+		goto x1;
+	      }
+
+	    putpacket("OK");	/* Ack before changing speed */
+	    set_timer_3(baudrate); /* Set it */
+	  }
+x1:	  break;
+#endif
+	}			/* switch */
+
+      /* reply to the request */
+      putpacket(remcomOutBuffer);
+    }
+}
+
+/* This function will generate a breakpoint exception.  It is used at the
+   beginning of a program to sync up with a debugger and can be used
+   otherwise as a quick means to stop program execution and "break" into
+   the debugger. */
+
+void
+breakpoint()
+{
+  if (!initialized)
+    return;
+
+  asm("	.globl _breakinst
+
+	_breakinst: ta 1
+      ");
+}
+
+static void
+hw_breakpoint()
+{
+  asm("
+      ta 127
+      ");
+}
+
+#if 0 /* experimental and never finished, left here for reference */
+static void
+splet_temp(void)
+{
+  asm("	sub	%sp,(16+1+6+1+121)*4,%sp ! Make room for input & locals
+ 					! + hidden arg + arg spill
+					! + doubleword alignment
+					! + registers[121]
+
+! Leave a trail of breadcrumbs! (save register save area for debugging)
+	mov	%sp, %l0
+	add	%l0, 24*4, %l0
+	sethi	%hi(_debug_registers), %l1
+	st	%l0, [%lo(_debug_registers) + %l1]
+
+! Save the Alternate Register Set: (not implemented yet)
+!    To save the Alternate Register set, we must:
+!    1) Save the current SP in some global location.
+!    2) Swap the register sets.
+!    3) Save the Alternate SP in the Y register
+!    4) Fetch the SP that we saved in step 1.
+!    5) Use that to save the rest of the regs (not forgetting ASP in Y)
+!    6) Restore the Alternate SP from Y
+!    7) Swap the registers back.
+
+! 1) Copy the current stack pointer to global _SAVED_STACK_POINTER:
+	sethi	%hi(_saved_stack_pointer), %l0
+	st	%sp, [%lo(_saved_stack_pointer) + %l0]
+
+! 2) Swap the register sets:
+	mov	%psr, %l1
+	sethi	%hi(0x10000), %l2
+	xor	%l1, %l2, %l1
+	mov	%l1, %psr
+	nop			! 3 nops after write to %psr (needed?)
+	nop
+	nop
+
+! 3) Save Alternate L0 in Y
+	wr	%l0, 0, %y
+
+! 4) Load former SP into alternate SP, using L0
+	sethi	%hi(_saved_stack_pointer), %l0
+	or	%lo(_saved_stack_pointer), %l0, %l0
+	swap	[%l0], %sp
+
+! 4.5) Restore alternate L0
+	rd	%y, %l0
+
+! 5) Save the Alternate Window Registers
+	st	%r0, [%sp + (24 + 88) * 4]	! AWR0
+	st	%r1, [%sp + (24 + 89) * 4]	! AWR1
+	st	%r2, [%sp + (24 + 90) * 4]	! AWR2
+	st	%r3, [%sp + (24 + 91) * 4]	! AWR3
+	st	%r4, [%sp + (24 + 92) * 4]	! AWR4
+	st	%r5, [%sp + (24 + 93) * 4]	! AWR5
+	st	%r6, [%sp + (24 + 94) * 4]	! AWR6
+	st	%r7, [%sp + (24 + 95) * 4]	! AWR7
+	st	%r8, [%sp + (24 + 96) * 4]	! AWR8
+	st	%r9, [%sp + (24 + 97) * 4]	! AWR9
+	st	%r10, [%sp + (24 + 98) * 4]	! AWR10
+	st	%r11, [%sp + (24 + 99) * 4]	! AWR11
+	st	%r12, [%sp + (24 + 100) * 4]	! AWR12
+	st	%r13, [%sp + (24 + 101) * 4]	! AWR13
+!	st	%r14, [%sp + (24 + 102) * 4]	! AWR14	(SP)
+	st	%r15, [%sp + (24 + 103) * 4]	! AWR15
+	st	%r16, [%sp + (24 + 104) * 4]	! AWR16
+	st	%r17, [%sp + (24 + 105) * 4]	! AWR17
+	st	%r18, [%sp + (24 + 106) * 4]	! AWR18
+	st	%r19, [%sp + (24 + 107) * 4]	! AWR19
+	st	%r20, [%sp + (24 + 108) * 4]	! AWR20
+	st	%r21, [%sp + (24 + 109) * 4]	! AWR21
+	st	%r22, [%sp + (24 + 110) * 4]	! AWR22
+	st	%r23, [%sp + (24 + 111) * 4]	! AWR23
+	st	%r24, [%sp + (24 + 112) * 4]	! AWR24
+	st	%r25, [%sp + (24 + 113) * 4]	! AWR25
+	st	%r26, [%sp + (24 + 114) * 4]	! AWR26
+	st	%r27, [%sp + (24 + 115) * 4]	! AWR27
+	st	%r28, [%sp + (24 + 116) * 4]	! AWR28
+	st	%r29, [%sp + (24 + 117) * 4]	! AWR29
+	st	%r30, [%sp + (24 + 118) * 4]	! AWR30
+	st	%r31, [%sp + (24 + 119) * 4]	! AWR21
+
+! Get the Alternate PSR (I hope...)
+
+	rd	%psr, %l2
+	st	%l2, [%sp + (24 + 120) * 4]	! APSR
+
+! Don't forget the alternate stack pointer
+
+	rd	%y, %l3
+	st	%l3, [%sp + (24 + 102) * 4]	! AWR14 (SP)
+
+! 6) Restore the Alternate SP (saved in Y)
+
+	rd	%y, %o6
+
+
+! 7) Swap the registers back:
+
+	mov	%psr, %l1
+	sethi	%hi(0x10000), %l2
+	xor	%l1, %l2, %l1
+	mov	%l1, %psr
+	nop			! 3 nops after write to %psr (needed?)
+	nop
+	nop
+");
+}
+
+#endif
diff --git a/contrib/groff/nroff/nroff.man b/contrib/groff/nroff/nroff.man
index 6d64bea3a67d..ce71003c0c8b 100644
--- a/contrib/groff/nroff/nroff.man
+++ b/contrib/groff/nroff/nroff.man
@@ -16,7 +16,7 @@ versions, except that this permission notice may be included in
 translations approved by the Free Software Foundation instead of in
 the original English.
 
-	$FreeBSD$
+	$FreeBSD: src/contrib/groff/nroff/nroff.man,v 1.2.4.1 1999/11/02 12:33:21 phantom Exp $
 
 ..
 .TH @G@NROFF @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
diff --git a/contrib/groff/nroff/nroff.sh b/contrib/groff/nroff/nroff.sh
index 57e5d454938b..5ab6044593dc 100755
--- a/contrib/groff/nroff/nroff.sh
+++ b/contrib/groff/nroff/nroff.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Emulate nroff with groff.
-# $FreeBSD$
+# $FreeBSD: src/contrib/groff/nroff/nroff.sh,v 1.4.2.5 1999/11/02 12:33:21 phantom Exp $
 
 prog="$0"
 # Default device.
diff --git a/contrib/isc-dhcp/TODO b/contrib/isc-dhcp/TODO
new file mode 100644
index 000000000000..f1391360b56a
--- /dev/null
+++ b/contrib/isc-dhcp/TODO
@@ -0,0 +1,31 @@
+Things to do, not in any particular order...
+
+- Dynamic DNS support
+
+- SNMP support
+
+- Asynchronous DNS support (look up names while serving other requests)
+
+- Authentication heirarchies (particularly by MAC address or by DHCP
+  Authentication Protocol key).
+
+- Authentication protocol
+
+- Server-to-server protocol
+
+- Token ring support for bpf/nit interfaces
+
+- FDDI support for bpf/nit interfaces (mostly done)
+
+- Other network hardware support for low-level interfaces?
+
+- Standard socket API for sending to all-ones broadcast and figuring
+  out which interface a packet came in on?
+
+- IPv6/DHCPv6 support
+
+- Dhcpd running on MacOS Open Transport
+
+- Dhcpd running on Windows/NT
+
+- Dhcpd running on Windows95
diff --git a/contrib/isc-dhcp/client/scripts/freebsd b/contrib/isc-dhcp/client/scripts/freebsd
index 5a4ab0b5c40d..e8d0463f1667 100755
--- a/contrib/isc-dhcp/client/scripts/freebsd
+++ b/contrib/isc-dhcp/client/scripts/freebsd
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/contrib/isc-dhcp/client/scripts/freebsd,v 1.1.1.2.2.7 1999/12/12 01:17:30 obrien Exp $
 
 if [ -x /usr/bin/logger ]; then
 	LOGGER="/usr/bin/logger -s -p user.notice -t dhclient"
diff --git a/contrib/isc-dhcp/common/tables.c b/contrib/isc-dhcp/common/tables.c
index 2accc5751a34..df8d1a58db11 100644
--- a/contrib/isc-dhcp/common/tables.c
+++ b/contrib/isc-dhcp/common/tables.c
@@ -40,7 +40,7 @@
  * Enterprises, see ``http://www.vix.com''.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/isc-dhcp/common/tables.c,v 1.1.1.2.2.3 1999/12/08 06:43:26 obrien Exp $ */
 
 #ifndef lint
 static char copyright[] =
diff --git a/contrib/nvi/ex/ex.c b/contrib/nvi/ex/ex.c
index ecdae4b86934..b7663c9e1f03 100644
--- a/contrib/nvi/ex/ex.c
+++ b/contrib/nvi/ex/ex.c
@@ -7,7 +7,7 @@
  * See the LICENSE file for redistribution information.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/nvi/ex/ex.c,v 1.1.1.1.4.1 1999/09/15 08:57:36 ru Exp $ */
 
 #include "config.h"
 
diff --git a/contrib/perl5/ext/POSIX/POSIX.xs b/contrib/perl5/ext/POSIX/POSIX.xs
index 093cc9957797..a2f387fdab8c 100644
--- a/contrib/perl5/ext/POSIX/POSIX.xs
+++ b/contrib/perl5/ext/POSIX/POSIX.xs
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/perl5/ext/POSIX/POSIX.xs,v 1.1.1.1.2.2 1999/11/13 20:08:57 ache Exp $ */
 #ifdef WIN32
 #define _POSIX_
 #endif
diff --git a/contrib/perl5/pp.c b/contrib/perl5/pp.c
index 1d4dbcc83d34..c765d9b4dece 100644
--- a/contrib/perl5/pp.c
+++ b/contrib/perl5/pp.c
@@ -5,7 +5,7 @@
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/perl5/pp.c,v 1.1.1.1.2.2 1999/12/13 19:16:47 ache Exp $
  */
 
 /*
diff --git a/contrib/tcpdump/ethertype.h b/contrib/tcpdump/ethertype.h
index 487183a5b9bf..de7a6f19b252 100644
--- a/contrib/tcpdump/ethertype.h
+++ b/contrib/tcpdump/ethertype.h
@@ -19,7 +19,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * @(#) $Header: ethertype.h,v 1.6 96/07/14 18:21:49 leres Exp $ (LBL)
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/ethertype.h,v 1.2.4.1 1999/11/21 10:51:24 brian Exp $
  */
 
 /* Types missing from some systems */
diff --git a/contrib/tcpdump/interface.h b/contrib/tcpdump/interface.h
index 7287a48134ae..8f80150a471e 100644
--- a/contrib/tcpdump/interface.h
+++ b/contrib/tcpdump/interface.h
@@ -19,7 +19,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * @(#) $Header: interface.h,v 1.105 97/04/26 13:39:58 leres Exp $ (LBL)
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/interface.h,v 1.1.1.3.2.2 1999/11/21 10:51:25 brian Exp $
  */
 
 #ifndef tcpdump_interface_h
diff --git a/contrib/tcpdump/ppp.h b/contrib/tcpdump/ppp.h
index 8bf94e3c82be..099bfd49d1f4 100644
--- a/contrib/tcpdump/ppp.h
+++ b/contrib/tcpdump/ppp.h
@@ -15,7 +15,7 @@
  * suitability of this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/ppp.h,v 1.1.1.1.2.1 1999/11/21 10:51:26 brian Exp $
  */
 #undef PPP_ADDRESS
 #define PPP_ADDRESS	0xff	/* The address byte value */
diff --git a/contrib/tcpdump/print-ether.c b/contrib/tcpdump/print-ether.c
index 4f267eaa4992..3ca26dd72023 100644
--- a/contrib/tcpdump/print-ether.c
+++ b/contrib/tcpdump/print-ether.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-ether.c,v 1.7.2.1 1999/11/21 10:51:26 brian Exp $
  */
 #ifndef lint
 static const char rcsid[] =
diff --git a/contrib/tcpdump/print-ppp.c b/contrib/tcpdump/print-ppp.c
index b5052c7fffe4..6b24d519375c 100644
--- a/contrib/tcpdump/print-ppp.c
+++ b/contrib/tcpdump/print-ppp.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-ppp.c,v 1.7.2.2 1999/11/27 18:05:26 brian Exp $
  */
 
 #ifndef lint
diff --git a/crypto/README b/crypto/README
deleted file mode 100644
index 004485eadec0..000000000000
--- a/crypto/README
+++ /dev/null
@@ -1,9 +0,0 @@
-This directory is for the EXACT same use as src/contrib, execpt it
-holds crypto sources. As a consequence of USA law, this makes it export
-controlled, so it has to be kept separate.
-
-Please do not export the contents of this direcory and its
-subdirectories from the USA without the necessary permits.
-
-Mark Murray
-3 May, 1997
diff --git a/crypto/kerberosIV/COPYRIGHT b/crypto/kerberosIV/COPYRIGHT
deleted file mode 100644
index 1ec6394da320..000000000000
--- a/crypto/kerberosIV/COPYRIGHT
+++ /dev/null
@@ -1,166 +0,0 @@
-Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan 
-(Royal Institute of Technology, Stockholm, Sweden).
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement:
-     This product includes software developed by the Kungliga Tekniska
-     Högskolan and its contributors.
-
-4. Neither the name of the Institute nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-
-
-Copyright (C) 1995 Eric Young (eay@mincom.oz.au)
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement:
-   This product includes software developed by Eric Young (eay@mincom.oz.au)
-
-THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-
-
-Copyright (c) 1983, 1990 The Regents of the University of California.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement:
-     This product includes software developed by the University of
-     California, Berkeley and its contributors.
-
-4. Neither the name of the University nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-
-
-Copyright (C) 1990 by the Massachusetts Institute of Technology
-
-Export of this software from the United States of America is assumed
-to require a specific license from the United States Government.
-It is the responsibility of any person or organization contemplating
-export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-
-
-Copyright 1987, 1989 by the Student Information Processing Board
-	of the Massachusetts Institute of Technology
-
-Permission to use, copy, modify, and distribute this software
-and its documentation for any purpose and without fee is
-hereby granted, provided that the above copyright notice
-appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation,
-and that the names of M.I.T. and the M.I.T. S.I.P.B. not be
-used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-M.I.T. and the M.I.T. S.I.P.B. make no representations about
-the suitability of this software for any purpose.  It is
-provided "as is" without express or implied warranty.
-
-
-
-Copyright 1992 Simmule Turner and Rich Salz.  All rights reserved. 
-
-This software is not subject to any license of the American Telephone 
-and Telegraph Company or of the Regents of the University of California. 
-
-Permission is granted to anyone to use this software for any purpose on
-any computer system, and to alter it and redistribute it freely, subject
-to the following restrictions:
-
-1. The authors are not responsible for the consequences of use of this
-   software, no matter how awful, even if they arise from flaws in it.
-
-2. The origin of this software must not be misrepresented, either by
-   explicit claim or by omission.  Since few users ever read sources,
-   credits must appear in the documentation.
-
-3. Altered versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.  Since few users
-   ever read sources, credits must appear in the documentation.
-
-4. This notice may not be removed or altered.
-
diff --git a/crypto/kerberosIV/ChangeLog b/crypto/kerberosIV/ChangeLog
deleted file mode 100644
index 146748835025..000000000000
--- a/crypto/kerberosIV/ChangeLog
+++ /dev/null
@@ -1,3761 +0,0 @@
-Tue Jun 3 1997
-
-	* Release 0.9.6
-
-	* appl/kx/rxtelnet.in, appl/kx/rxterm.in: new argument '-w
- 	term_emulator' for specifiying which terminal emulator to use.
-  	Based on a patch from <arve@nada.kth.se>.
-
-Mon Jun 2 1997
-
-	* appl/xnlock/Makefile.in, appl/kx/Makefile.in,
- 	lib/auth/Makefile.in: fix the Makefile to do the for loops the
- 	automake way.
-
-Sun Jun 1 1997
-
-	* appl/xnlock/Makefile.in, appl/kx/Makefile.in: do install
- 	correctly even if there are no programs to install
-
-	* configure.in: Check for `h_nerr'.
-
-	* lib/auth/pam/pam.c: Include <security/pam_appl.h> to make it
- 	compile on Solaris 2.6
-
-	lib/sl/sl.c, lib/krb/realm_parse.c, appl/ftp/ftpd/popen.c,
- 	appl/ftp/ftpd/ftpd.c, appl/bsd/login_fbtab.c,
- 	appl/bsd/login_access.c: Initialize the `lasts' to NULL before
- 	calling strtok_r the first time.  With our strtok_r it's not
- 	necessary, but the man-page on SGIs says it should be done.
-
-Fri May 30 1997
-
-	* lib/krb/mk_req.c (krb_mk_req, get_ad_tkt): Support for
- 	multi-realm ticket files by using the best matching TGT to define
- 	the realm of the ticket holder.
-
-
-	* appl/bsd/utmpx_login.c (utmpx_update): Set `ut_id' if we're
- 	using utmpx
-
-	* appl/telnet/telnetd/sys_term.c (start_login): Set `ut_id' if
- 	we're using utmpx
-
-Wed May 28 1997
-
-	* lib/roken/daemon.c: New file.
-
-	* include/protos.H: <sys/types.h> needed on solaris 2.4
-
-Mon May 26 1997
-
-	* appl/bsd/su.c (kerberos): If kerberos password is zero length
- 	immediately try next scheme.
-
-
-	* lib/kafs/afskrb.c (k_afsklog_uid): Token lifetime should be even
- 	if we don't know the proper ViceId.
-
-
-	* Release 0.9.5
-
-	* man/Makefile.in: Install preformatted manual pages with correct
- 	suffix on *BSD.
-
-Sun May 25 1997
-
-	* appl/kpopper/popper.h: Remove XTND, and XTND XMIT. Rename XTND
- 	XOVER to XOVER.
-
-
-	* appl/telnet/telnetd/sys_term.c: Only include <utmp.h> and
- 	<utmpx.h> once
-
-	* fix-export: Also create cat manpages.
-
-	* appl/ftp/ftpd/logwtmp.c: Check for `_PATH_WTMP'
-
-	* appl/telnet/telnetd/sys_term.c: Ditto.
-	Remove stupid macros.
-
-	* appl/ftp/ftp/cmds.c (setpeer): Check for `__unix'.  This is
- 	(apparently) a standard with many representations.
-
-	* appl/ftp/ftpd/ftpcmd.y (SYST): Ditto.
-
-	* appl/ftp/ftpd/ftpd.c (retrieve): file must exist to apply a
- 	command to it.
-
-	* appl/ftp/ftpd/ftpd.c (retrieve): Generalise list of commands and
- 	basename argument.
-
-	* appl/ftp/ftpd/popen.c (ftpd_popen): Try standard binary if the
- 	one in ~ftp fails.
-
-	* appl/telnet/telnetd/sys_term.c: Use `_getpty' if there's one
-
-	* appl/bsd/forkpty.c: Use `_getpty' if there's one
-
-	* configure.in: check for `_getpty'
-
-	* acconfig.h: correct test for IRIX
-
-	* lib/roken/snprintf.c: code for checking the correct functioning
- 	of *nprintf is now #ifdef PARANOIA
-
-	* appl/bsd/rlogind.c: fix logging in wtmp and parsing of winsize
-
-	* appl/bsd/rlogin.c: New option `-p'.
-
-	* lib/des/fcrypt.c: removed `inline' from `des_set_key'
-
-Thu May 22 1997
-
-	* lib/des/md5.c (MD5Final): Made signature compliant with FreeBSD.
-	
-	* lib/des/md5.h: Remove digest from MD5_CTX, it is now an argument
- 	to MD5Final instead.
-
-	* lib/des/fcrypt.c: Also support MD5 style crypt(2).
-
-Tue May 20 1997
-
-	* appl/telnet/telnetd/sys_term.c: utmp stuff now seems to be
- 	compatible with login
-
-	* appl/ftp/ftpd/logwtmp.c: Add support for logging to wtmpx
-
-
-	* (*/)*/Makefile.in:s (install): Avoid redundant multiple
- 	recursion in install targets.
-
-	* Made things compile with socks5-v1.0r1.
-
-
-	* appl/telnet/telnetd/sys_term.c: changed utmp-stuff not to use
- 	ut_id at all
-
-	* appl/bsd/utmpx_login.c: handle case where there's no wtmpx (such
- 	as HP-UX 10)
-
-	* appl/bsd/rlogind.c: Added support for utmpx
-
-Sun May 18 1997
-
-	* lib/roken: removed herror, strchr, and strrchr
-
- 	* lib/krb/dest_tkt.c(dest_tkt): Only use `lstat' iff HAVE_LSTAT
-
-	* lib/krb: snprintf, strdup, strtok_r, and strcasecmp always live
- 	in lib/roken and get linked here when needed.
-
-	* lib/roken: removed strchr, strrchr.
-
-	* appl/telnet/telnet/telnet.c: Always use our own `setupterm' for
- 	compatibility reasons.
-
-	* appl/telnet/telnetd/telnetd.c: Removed <curses.h> and <term.h>.
-  	They doesn't seem to be used and breaks on fujitsu.
-
-	* appl/kx/kx.c: try to give a better error message (than a core
- 	dump :-) when talking to an old kxd.
-
-	* appl/kx/kxd.c, appl/kip/kipd.c, appl/kauth/kauthd.c: corrected
-	fencepost error with KRB_SENDAUTH_VLEN.
-
-	* appl/ftp/common/buffer.c: new file.
-
-	* configure.in: cray hides their bitypes in <bind/bitypes.h>.
-  	Also check for this file.
-
-	* appl/telnet/telnet/telnet_locl.h: moved termios.h before
- 	curses.h.  This was needed to compile on cray, but will probably
- 	break on some other host.
-
-Thu May 15 1997
-
-	* server/kerberos.c: Implement changes to the tcp protocol, while
- 	being compatible with the old protocol.
-
-	* lib/krb/send_to_kdc.c: The old method to signal end of
- 	transmission by closing the sending side of the socket does not
- 	work well through some firewalls. This is now changed so that the
- 	client instead sends the length of the request as a four byte
- 	integer (in network byte order) before sending the data.
-
-Wed May 14 1997
-
-	* appl/telnet/telnetd/sys_term.c: HAVE_UTMPX -> HAVE_UTMPX_H.  Fix
- 	for OSF1.
-
-	* appl/bsd/utmp_login.c: UTMPX_DOES_UTMP_LOGGING -> HAVE_UTMPX_H
-
-	* appl/bsd/sysv_environ.c: Use k_concat rather than snprintf.
-
-Tue May 13 1997
-
-	* kuser/klist.c: updated usage string
-
-	* lib/otp/otp_print.c: make word table and reverse word table
- 	constant
-
-Sun May 11 1997
-
-	* */*: Added some __attribute__ ((format (printf))) and fixes
-	where needed.
-
-	* appl/ftp/common/sockbuf.c: start probing at 4Mb
-
-	* appl/ftp/ftpd/ftpd.c: use MAP_FAILED
-
-	* appl/ftp/ftp/ftp.c: Use MAP_FAILED.
-	(alloc_buffer): new function for allocating a buffer of size
- 	max(BUFSIZ, st.st_blksize) (Based on a patch from
- 	<haba@pdc.kth.se>)
-
-	* appl/ftpd/ftpdcmd.y: hack for reget.
-
-	* appl/kx/kxd.c: Give a error message to old-version kx.
-
-	* replaced vsprintf with vsnprintf.
-	
-	* lib/roken/vsyslog.c: not used. removed.
-	
-	* Changed <sys/bitypes.h> -> <ktypes.h>
-
-	* include/Makefile.in: Added ktypes.h
-
-	* include/sys/Makefile.in: removed bitypes.h
-
-Wed May 7 1997
-
-	* appl/ftp/ftp/ftp.c: Open files in binary mode.
-
-	* appl/ftp/ftpd/ftpd.c (checkaccess): Changed to make absent file
- 	mean `allow'. Added shell matching to names (if fnmatch is
- 	available).
-
-
-	* appl/ftp/ftpd/kauth.c (kauth): Use `DEFAULT_TKT_LIFE'
-
-	* appl/ftp/ftpd/ftpcmd.y, appl/ftp/ftpd/ftpd.c: always cast to
- 	(long) before printing out an `off_t'
-
-	* lib/kdb/print_princ.c (krb_print_principal),
-	  lib/kdb/krb_lib.c (kerb_put_principal),
-	  admin/kdb_edit.c (change_principal),
-	  admin/kdb_util.c (print_time) : gmtime should never return
- 	tm_year > 1900
-
-	* appl/ftp/ftpd/ftpcmd.y: Year 2000 fix
-
-	* appl/telnet/telnetd/telnetd.c: removed code that used `getent'
-
-	* lib/roken/getent.c: removed
-
-Mon May 5 1997
-
-	* appl/ftp/ftpd/ftpd.c: fix for mmap and restart_point
-
-	* kadmin/ksrvutil_get.c (ksrvutil_get): get correct default realm
-
-Sun May 4 1997
-
-	* configure.in (REAL_PICFLAGS): Use `-fPIC' instead of `-fpic',
- 	otherwise it's not possible to make libotp on hpux.
-
-	* configure.in: try sending picflags even when linking a shared
- 	library with $CC
-
-	* lib/roken/getent.c: remove getstr
-
-	* configure.in: removed unneeded REAL_-variables working shared
- 	libraries on *bsd*
-
-	* appl/kip/kip.h: Added <net/if_var.h>
-
-	* */Makefile.in: Use @LDSHARED@
-
-	* configure.in: Fix shared libraries on HP/UX.
-	check for curses.h
- 	check for `getstr' and `cgetstr' in curses
-
-	* appl/telnet/telnet: clean-up
-
-	* lib/kafs/afssys.c: ifdef-out the code that is not used to avoid
- 	referencing `syscall' on AIX.
-
-	* lib/krb/et_list.c: s/WEAK_PRAGMA/PRAGMA_WEAK/
-
-	* aclocal.m4 (AC_HAVE_PRAGMA_WEAK): redirect output
-
-	* lib/roken/snprintf.c: fix for the case of max_sz == 0
-
-	* doc/kth-krb.texi: Add @dircategory and @direntry to enable
- 	`install-info' to install this entry in `dir'.
-
-	* appl/telnet/telnetd/Makefile.in: Don't link with getstr
-
-
-	* lib/auth/sia/krb4_matrix.conf: Fix entries for ses_release and
- 	chk_user.
-
-Sat May 3 1997
-
-	* lib/auth/sia/sia.c: Some cleanup.
-
-Fri May 2 1997
-
-	* configure.in: only link the programs that need it with the
- 	db/dbm library
-
-
-	* lib/auth/sia/sia.c: Merge code for for normal and su
- 	authentication.
-
-
-	* Replaced sprintf with snprintf and asprintf all over the place.
-
-	* lib/roken/snprintf.c: Added asnprintf and vasnprintf
-
-	* lib/roken/snprintf.c: implemented asprintf, vasprintf
-
-	* lib/roken/snprintf.c: new file
-
-Thu May 1 1997
-
-	* lib/kafs/afskrb.c (k_afsklog_all_local_cells): Use `k_concat'
-
-Wed Apr 30 1997
-
-	* lib/krb/{get_host,get_krbrlm,getrealm,realm_parse}.c: Fix some
- 	potential buffer overruns.
-
-	* lib/krb/k_concat.c: Safely concatenate two strings.
-
-Sat Apr 26 1997
-
-	* appl/telnet/libtelnet/kerberos.c: removed stupid #if 0
-
-	* appl/bsd/rlogind.c (send_oob): different default for `last_oob'
- 	to avoid losing first OOB packet
-
-Fri Apr 25 1997
-
-	* appl/voodoo/AuthOption.cpp: provoke the telnetd in turning on
- 	encryption
-
-Wed Apr 23 1997
-
-	* lib/kafs/afskrb.c (realm_of_cell): don't overflow buffer with
- 	result from `gethostbyaddr'
-
-	* lib/krb/name2name.c (krb_name_to_name): new parameter
- 	`phost_size' to disable buffer overflowing.  Changed all callers.
-
-	* lib/krb/k_getsockinst.c: New parameter `inst_size' to disable
- 	buffer overflowing.  Changed all callers.
-
-	* appl/kpopper/Makefile.in: soriasis make stupidity
-
-	* appl/kx/Makefile.in: don't include encdata.c in SOURCES_COMMON,
- 	otherwise DEC make gets upset.
-
-Tue Apr 22 1997
-
-	* lib/krb/k_getsockinst.c: Use same name as in krb_get_phost.
-
-
-	* acconfig.h: hp-ux 10 also has `pututxline' that writes both to
- 	utmp and utmpx.
-
-Sun Apr 20 1997
-
-	* include/win32/config.h: adapted to win95/NT
-
-	* appl/voodoo: Merged in win32-telnet from <d93-jka@nada.kth.se>
-
-	* lib/krb/tkt_string.c: dummy `getuid' function.
-
-	* lib/krb/ticket_memory.c (tf_setup): implement
-
-	* lib/roken/roken.mak, roken.def: new files
-
-	* lib/des/des.def: Removed des_random_{seed,key}
-
-	* lib/krb/dllmain.c: Rewrote `msg'.
-	Better explanation when it fails to spawn `krbmanager'.
-
-	* lib/krb/tf_util.c: backwards `in_tkt' added.
-
-	* lib/krb/in_tkt.c: removed
-
-	* lib/kclient/KClient: Reformatted and fixed.
-
-Sat Apr 19 1997
-
-	* appl/ftp/ftpd/ftpd.c: Incorporate /etc/ftpusers changes from
- 	NetBSD.
-
-	* appl/ftp/ftpd/ftpd.c: Handle oob-stuff better.
-
-Fri Apr 18 1997
-
-	* appl/kpopper/pop_{dropinfo,send,updt}.c: Fix 'From ' line
- 	parsing bug.
-
-	* appl/kpopper/pop_dropinfo.c: Add support for xover.
-
-	* appl/kpopper/pop_xover.c: Add some kind of xover support.
-
-	* appl/kpopper/pop_debug.c: New tiny popper debugging program.
-
-Tue Apr 15 1997
-
-	* lib/krb/kdc_reply.c (kdc_reply_cred): fix sanity checks.
-
-	* appl/bsd/rshd.c: k_afsklog so that remote command gets a token.
-  	fix usage string.
-
-Sat Apr 12 1997
-
-	* appl/bsd/rcp.c (main): Rcp implements encrypted file transfer
- 	without using the kshell service.
-
-
-	* lib/krb/mk_safe.c: Emit new checksum.
-
-	* lib/krb/rd_safe.c: New code to handle both new and old
- 	checksums.
-
-	* lib/des/qud_cksm.c: Fix compatibility with mit deslib.
-
-Fri Apr 11 1997
-
-	* lib/sl/sl.c (sl_match): initialize `partial_cmd'
-
-Sun Apr 6 1997
-
-	* lib/kafs/kafs.h: Ugly addition of `_P'
-
-	* lib/kafs/afssys.c: <sys/socket.h> contains the definition of
- 	`_IOW' on cygwin32.
-
-	* appl/telnet/telnet/utilities.c: <sys/socket.h> needed by
- 	cygwin32
-
-	* doc/Makefile.in: always run $(MAKEINFO).
-	
-	* lib/otp/otp_md.c (sha_finito_little_endian): byte-swap
- 	correctly.
-
-	* include/sys/bitypes.H: Added #ifndef for types
-
-	* configure.in: test for types
-
-	* aclocal.m4: Stolen AC_GROK_TYPES? from heimdal
-
-
-	* appl/ftp/ftp/ftp.c: Fix passive mode.
-
-Sat Apr 5 1997
-
-	* appl/kauth/ksrvtgt.in: New ksrvtgt script.
-
-Fri Apr 4 1997
-
-	* lib/krb/kdc_reply.c: Add some range checking.
-
-
-	* lib/otp/otptest.c: Updated tests from `draft-ietf-otp-01.txt'.
-	Passes verification examples from appendix C.
-
-	* admin/kdb_util.c: All usage strings are now consistent (and even
- 	with the code)!
-
-Thu Apr 3 1997
-
-	* lib/kafs/afssys.c (k_pioctl): Separate syscall functionality and
- 	kerberos convenience routines into afssys.c and afskrb.c. This to
- 	make it possible to use k_pioctl() without linking in all
- 	libraries in the world.
-
-Tue Apr 1 1997
-
-	* appl/telnet/telnet/commands.c: Rename suspend to telnetsuspend,
- 	since Unicos has one of its own.
-
-Sun Mar 30 1997
-
-	* appl/bsd/{rsh,rlogin}.c: Don't look at argv[0].
-
-
-	* man/tenletxr.1: new file
-
-	* appl/kx/rxtelnet.in, appl/kx/rxterm.in, appl/kx/tenletxr.in:
- 	Support `-k'
-
-	* appl/kx/tenletxr.in: new script for running kx in backwards
- 	mode.
-
-	* appl/kx: New version of protocol.
-
-	* appl/kauth: Use err & c:o
-
-	* appl/kauth/encdata.c (read_encrypted): Give better return code
- 	for EOF
-
-
-	* appl/ftp/ftp/krb4.c: Use stdout rather than stderr. Add newlines
- 	to many strings.
-
-	* kuser/kdestroy.c: Use set_progname, make -q equal to -f, remove
- 	bell.
-
-	* lib/roken/warnerr.c: New function set_progname.
-	* aclocal.m4: Invert test of AC_NEED_DECLARATION and rename it to
- 	AC_CHECK_DECLARATION.  Add new function AC_CHECK_VAR, that looks
- 	for a variable, including a declaration.
-
-	* lib/roken/roken.h: Add optional declaration for __progname.
-
-	* lib/roken/*{err,warn}.c: Restructure err and warn functions.
-
-Sat Mar 29 1997
-
-	* appl/telnet/telnet/sys_bsd.c: Maybe-fix for HP-UX 10: Ifdef
- 	SO_OOBINLINE, don't even select for exceptional conditions.
-
-	* lib/otp/otp_md.c: always downcase the seed.
-	byte-swap the SHA result.
-
-Thu Mar 27 1997
-
-	* appl/otp/otp.c: removed bad free of global data
-
-Sun Mar 23 1997
-
-	* configure.in: moved version.h and config.h to include
-
-
-	* acconfig.h: Fix utmp/utmpx stuff on OSF/1.
-
-
-	* appl/bsd/rlogind.c (control): Rewritten to handle the case of
- 	there being no `ws_xpixel' and `ws_ypixel'
-
-	* appl/bsd/rlogin.c (sendwindow): Rewritten to handle the case of
- 	there being no `ws_xpixel' and `ws_ypixel'
-
-	* aclocal.m4 (AC_KRB_STRUCT_WINSIZE): Also test for `ws_xpixel'
- 	and `ws_ypixel'
-
-	* lib/otp/otp.h: Change default global timeout
-
-	* lib/krb/tf_util.c (tf_setup): Also take `pname' and `pinst'
-
-	* appl/telnet/telnetd/sys_term.c, appl/bsd/utmpx_login.c: Do
- 	gettimeofday and then copy the data for the sake of those systems
- 	like SGI that can have different timevals in file and memory.
-
-	* configure.in: Allow `--with-readline'
-
-	* lib/editline/edit_compat.c (readline): strdup data before
- 	returning it.
-
-
-	* appl/telnet/telnetd/state.c: Change size of subbuffer to 2k.
-
-Thu Mar 20 1997
-
-	* lib/krb/decomp_ticket.c: Add some range checking.
-
-	* appl/ftp/ftpd/krb4.c: Check return value from krb_net_write.
-
-	* appl/ftp/ftp/ftp.c: Fix hash mark printing.
-
-Wed Mar 19 1997
-
-	* appl/kauth/kauthd.c: more logging
-
-	* man/kx.1, man/kxd.8: Updated.
-
-	* appl/kx/kx.c, kxd.c: Hacked so that all TCP-connections are kx
- 	-> kxd
-
-
-	* lib/editline/edit_compat.c: BSD libedit comatibility.
-
-Wed Mar 12 1997
-
-	* appl/ftp/ftpd/ftpd.c: Set `byte_count' even when using mmap.
-	Log foreign IP address together with hostname.
-
-Mon Mar 10 1997
-
-	* server/kerberos.c: Fix log file muddle.
-
-Sun Mar 9 1997
-
-	* appl/bsd/kcmd.c (kcmd): check malloc for failure.
-
-Tue Feb 25 1997
-
-	* man/ftpd.8: Documented the `-g' option.
-
-	* appl/ftp/ftpd/ftpd.c: New option `-g umask' for specifying the
- 	umask for anonymous users.
-
-	* appl/ftp/ftpd/ftpd.c: conditionalize SIGURG
-
-	* appl/otp/otp.c: More fixes from Fabien COELHO
- 	<coelho@cri.ensmp.fr>.  Check for current OTP before allowing the
- 	update.
-
-Wed Feb 19 1997
-
-	* appl/otp/otp.c: updated help string
-
-	* appl/bsd/Makefile.in: Fixed installation of suid programs.
-
-	* appl/telnet/libtelnet/kerberos.c: fix some stuff to get
- 	forwarding code to compile
-
-	* lib/otp/otp_db.c: fix for signed char overflow.
-
-
-	* lib/krb/resolve.c: Patch from Jörgen Wahlsten
- 	<wahlsten@pathfinder.com>: Zero out resource record, and send
- 	correct length to dn_expand.
-
-Mon Feb 17 1997
-
-	* lib/roken/roken.h: Check for `_setsid'
-
-	* appl/ftp/ftp/ftp.c: s/__CYGWIN32__/HAVE_H_ERRNO/
-
-	* include/Makefile.in: Generete krb_err.h and kadm_err.h before
- 	linking/copying them
-
-	* aclocal.m4: AC_FIND_FUNC: Add the library at the beginning of
- 	the list.
-
-	* configure.in: Use AC_PROG_RANLIB
-	Always use EMXOMF under OS/2
-	Check for sys/termio.h and _setsid
-
-
-	* configure.in: A preliminary fix for editline.
-
-	* appl/telnet/libtelnet/kerberos.c: Include ticket forwarding
- 	stuff.
-
-	* lib/krb/krb_get_in_tkt.c: Use tf_setup.
-
-	* lib/krb/krb_get_in_tkt.c: New function tf_setup.
-
-Sat Feb 15 1997
-
-	* man/otp.1: updated
-
-	* appl/otp/otp.c: New options `-d' and `-r'.  From Fabien COELHO
- 	<coelho@cri.ensmp.fr>
-
-	* lib/otp/otp.h: Changed default from md4 to md5
-	* lib/otp/otp_db.c (otp_get, otp_simple_get): New functions.
-
-Thu Feb 13 1997
-
-	* appl/kx/rxtelnet.in: allow specification of port number
-
-	* appl/otp/otp.c: Add `-u' option
-
-Sun Feb 9 1997
-
-	* appl/ftp/common/glob.c: Rename FOO -> CHAR_FOO to avoid
- 	collision with symbol in sys/ioctl.h
-
-Fri Feb 7 1997
-
-	* man/kpropd.8: updated
-
-	* appl/bsd/rcmd_util.c: warning needs to know what program is
- 	used.
-
-	* slave/kpropd.c: New explicit flag `-i' for interactive.  Don't
- 	use AI to figure out if we have been started by inetd or not.
-
-Thu Feb 6 1997
-
-	* appl/kx/rxtelnet.in, appl/kx/rxterm.in: Patch for sending -l to
- 	kx.  From <map@stacken.kth.se>
-
-	* kuser/klist.c: corrected alignment of `expired'
-
-	* appl/telnet/telnet/commands.c: replaced lots of \n by \r\n
-
-Mon Feb 3 1997
-
-	* configure.in (socket, gethostbyname, getsockopt, setsockopt):
- 	Better tests.
-	(HAVE_H_ERRNO): New test
-
-	* lib/roken/herror.c (herror): Check HAVE_H_ERRNO
-	lots of other files as well.
-
-Sat Feb 1 1997
-
-	* appl/bsd/rcp.c: Work around the non-working getpw* in cygwin32
-
-	* lib/krb/logging.c: Init function for `std_log´
-
-	* appl/telnet/telnet/utilities.c: Remove `upcase´
-	Check HAVE_SETSOCKOPT
-
-	* appl/telnet/telnet/telnet.c: Use `strupr´ instead of `upcase´
-
-	* appl/telnet/telnet/commands.c, appl/movemail/pop.c,
- 	appl/kauth/rkinit.c, appl/ftp/ftp/ftp.c,
- 	appl/sample/sample_client.c: Ifdef around for the non-existence of
- 	`h_errno' in cygwin32.
-
-	* lib/des/read_pwd.c: work-around for cygwin32
-
-	* appl/telnet/telnet/sys_bsd.c: work-around for cygwin32
-
-Fri Jan 31 1997
-
-	* lib/krb/tf_util.c: gnu-win32 needs to open files with O_BINARY.
-
-Sun Jan 26 1997
-
-	* configure.in: removed duplicate of initgroups and lstat
-	Use AC_KRB_STRUCT_WINSIZE
-
-	* aclocal.m4 (AC_KRB_STRUCT_WINSIZE): New test
-
-	* lib/krb/getaddrs.c: Check for SIOCGIFFLAGS and SIOCGIFADDR
-
-	* appl/bsd/rlogin.c: conditional on SIGWINCH
-
-	* appl/bsd/rcmd_util.c et al: conditional getsockopt
-
-	* configure.in (cygwin32): New target
-	(getsockopt, getsockopt): Test for
-	(herror, hstrerror): Better tests
-
-	* aclocal.m4 (AC_FIND_IF_NOT_BROKEN): Pass arguments to
- 	AC_FIND_FUNC
-
-Thu Jan 23 1997
-
-	* configure.in: Add EXECSUFFIX
-
-	* appl/kx/rxterm.in: rsh -n
-
-	* lib/krb/unparse_name.c (krb_unparse_name_long_r): new function
-
-
-	* lib/auth/sia/sia.c: Fix a bug with ticket filename. Add afs
- 	support.
-
-	* lib/krb/get_host.c: Use KRB_SERVICE.
-
-Wed Jan 22 1997
-
-	* lib/auth/sia/Makefile.in: Add linker magic fix for broken,
- 	conflicting kerberos code in xdm.
-
-Tue Jan 21 1997
-
-	* appl/xnlock/xnlock.c (verify): Change the "LOGOUT" password to
- 	be manageable as X-resource XNlock*logoutPasswd. The password is
- 	stored in UNIX crypt format so that it can be stored in a global
- 	resource file for sites that whish to keep it a secret.
-
-
-	* configure.in: Check for winsize in sys/ioctl.h also.
-
-Sat Jan 18 1997
-
-	* lib/krb/get_default_principal.c: Use principal from
- 	KRB4PRINCIPAL before using uid.
-
-Wed Jan 15 1997
-
-	* appl/telnet/telnet/sys_bsd.c: Use `get_window_size'
-
-	* lib/roken/get_window_size.c: New file
-
-	* appl/bsd/rlogin.c: Use `get_window_size'
-
-	* appl/bsd/forkpty.c, appl/bsd/rlogind.c: conditionalize on
- 	TIOCSWINSZ
-
-	* configure.in: Check for `_scrsize' and `struct winsize'
-
-Tue Jan 14 1997
-
-	* Makefile.in (install-strip, travelkit-strip): New targets.
-
-Thu Jan 9 1997
-
-	* */Makefile.in: Use @foo_prefix@ and @program_transform_name@
- 	Add code to uninstall target
-
-Thu Dec 19 1996
-
-	* configure.in: Set LIBPREFIX
-
-	* config.sub: Add os2 as a system
-
-	* config.guess: Try to recognize i386-pc-os2_emx
-
-	* configure.in: case for *-*-os2_emx
-	NEED_PROTO for `strtok_r'
-	
-	* aclocal.m4: ranlib is apparently calld EMXOMF on OS/2
-	(AC_KRB_PROG_LN_S): New test that uses cp if ln fails
-
-Wed Dec 18 1996
-
-	* appl/bsd/login.c (main): First try to verify password using
- 	standard UNIX method and if it fails try kerberos authentication.
-	
-Sat Dec 14 1996
-
-	* appl/bsd/rcp.c: consider case of no fchmod
-
-	* appl/kpopper/pop_init.c: Use k_getsockinst.
-
-	* lib/roken/{strupr,strlwr,strchr,strrchr,lstat,initgroups,chown,
-	fchown,rcmd}.c: new files
-
-	* appl/kpopper/pop_lower.c: Removed.
-
-	* Makefile.in (travelkit): New target.
-
-Tue Dec 10 1996
-
-	* lib/krb/parse_name.c (kname_parse): Only copy realm if it is
- 	specified.
-
-	* lib/krb/get_host.c (krb_get_host): Treat no realm as local
- 	realm.
-
-Mon Dec 9 1996
-
-	* appl/ftp/ftpd/ftpd.c: Get afs-tokens when logging in with
- 	password.
-
-
-	* slave/kprop.c: flock with K_LOCK_SH
-
-Wed Dec 4 1996
-
-	* appl/telnet/telnet/commands.c: Also export XAUTHORITY
-
-Sun Dec 1 1996
-
-	* kadmin/ksrvutil.c: If realm is not specified, use the local one.
-
-Sat Nov 30 1996
-
-	* appl/kauth/kauthd.c: Use KAUTH_VERSION.  Try to give correct
- 	error messages back to kauth.
-
-	* config.sub, config.guess: Merged in changes from autoconf 2.12
-
-	* appl/bsd/rsh.c: quick hack to make `-n' to the right thing.
-
-	* kadmin/kadm_locl.h: Add prototype for FascistCheck.
-
-Thu Nov 28 1996
-
-	* man/afslog.1: Documented `-createuser'
-
-	* appl/afsutil/aklog.c: removed `cell_of_file' Added option
- 	`-createuser' to run pts to create a foreign principal.
-
-Tue Nov 26 1996
-
-	* lib/otp/otp_challenge.c: Initialize error string and check for
- 	NULL from strdup.
-
-	* lib/roken/mini_inetd.c: Initialize `sin_family'
-
-	* appl/kpopper/pop_init.c: Add `-p' option and make `-a'
- 	auth-style
-
-	* appl/bsd/rshd.c: Add `-p' option.
-
-	* appl/bsd/rlogind.c: Handle `-p' correctly.
-
-	* appl/bsd/login.c: Removed confusing initialization of
- 	`login_timeout'
-
-	* appl/kpopper/pop_dropinfo.c: Remove white-space at the beginning
- 	of UIDL-string.
-
-Sun Nov 24 1996
-
-	* Release 0.9.3
-
-Sat Nov 23 1996
-
-	* kadmin/ksrvutil_get.c: Use `krb_unparse_name_long' Better
- 	defaults.
-
-	* lib/krb/krb.h: Added *_to_key
-
-	* lib/krb/get_svc_in_tkt.c (srvtab_to_key): Make public
-
-	* kadmin/kadmin.c (do_init): `-p' is a synonym for `-u'
-	(do_init): more logical defaults
-	(help): removed old code
-	better error messages
-
-	* lib/krb/get_in_tkt.c (passwd_to_key, passwd_to_afskey): Export
- 	and remove functionality for reading passwords.
-
-	* lib/sl/sl.c: Nicer help output.
-
-	* lib/otp/otp_challenge.c: Initialize `challengep'
-
-	* lib/krb/Makefile.in: Removed get_pw_tkt.c
-
-Fri Nov 22 1996
-
-	* lib/auth/sia/sia.c: Now compiles under Digital UNIX 4.0.
-
-Wed Nov 20 1996
-
-	* lib/auth/pam/pam.c: Chown ticketfile to correct GID.
-
-Tue Nov 19 1996
-
-	* appl/kx/rxtelnet.in: Try to set the screen number as well.
-
-	* Be careful not to thrust `h_length' from gethostby{name,addr}
-
-	* appl/bsd/rcmd_util.c (ip_options_and_die): New function.
-
-	* configure.in: moved headers before functions.
-	call AC_PATH_XTRA_XTRA.
-	Add strchr, index, rindex, and strrchr to AC_CHECK_FUNCS.
-	remove strchr and strrchr, add strtok_r from/to AC_BROKEN.
-
-	* aclocal.m4 (AC_PATH_XTRA_XTRA): New macro.
-
-	* aclocal.m4 (AC_FIND_FUNC, AC_FIND_FUNC_NO_LIBS): Two new
- 	arguments: includes and arguments)
-
-	* configure.in: Need to supply arguments and includes to test for
- 	`res_search' and `dn_expand'
-
-	* lib/kafs/afssys.c (k_setpag): Handle AFS_SYSCALL3
-
-	* Use `k_getpw{nam,uid}' instead of getpw{nam,uid}.
-
-	* Replace lots of `strtok' with `strtok_r'.
-
-	* lib/sl/sl.c: Allow unlimited number of arguments.  Use
- 	`strtok_r' to divide up string into arguments.
-
-	* lib/roken/roken.h: Added `strtok_r'
-
-	* configure.in: Test for `strtok_r'
-
-	* include/Makefile.in: Don't build in ss
-
-	* Makefile.export: Fixed ChangeLog-generation
-
-	* lib/sl/sl.c: Let `readline' to the \n-removal.  Handle empty
- 	lines.  Don't store empty lines in the history.
-
-Mon Nov 18 1996
-
-	* lib/sl/sl.c: Use readline compatible i/o.
-
-
-	* lib/otp/otp_locl.h: Changed location of otp database to /etc
-
-	* appl/otp/Makefile.in: Install otp setuid root.
-
-	* util/Makefile.in: don't build SS
-
-	* lib/sl: New directory.
-
-	* kadmin/kadmin.c: Replaced SS by SL.
-
-Sun Nov 17 1996
-
-	* kadmin/kadm_funcs.c: Improved log messages.
-
-
-	* Use KRB_TICKET_GRANTING_TICKET.
-
-
-	* server/kerberos.c: Don't do any special logging when running as
- 	slave.
-
-
-	* Lots of files: remove unnecessary `(void)'
-
-	* Lots of files: remove unnecessary `register' declaration.
-
-
-	* lib/krb/get_host.c: Only keep list of hosts from requested
- 	realm.
-
-
-	* man/otpprint.1, otp.1: New files.
-
-	* appl/otp/otp.c: `-s' is now default.
-
-	* appl/otp/otp.c: removed count
-
-	* lib/des/destest.c: more general quad_cksum test.
-
-	* lib/otp/otp_print.c (otp_print_stddict_extended,
- 	otp_print_hex_extended): New functions.
-
-	* lib/otp/otptest.c: New file.
-
-
-	* appl/ftp/ftpd/ftpd.c: Change default auth level to what was
- 	formerly known as `user'.
-
-	* appl/ftp/ftpd/ftpd.c: Orthogonalize arguments to -a
-
-
-	* appl/kip/kip.c: Try all addresses we get back from the name
- 	server.
-
-	* kadmin/kpasswd.c: updated to new functions.
-
-	* lib/otp/otp_db.c (otp_db_open): Do a few retries.  Unlock in
- 	case this file cannot be opened.
-
-	* doc/kth-krb.texi: New chapter about OTPs.
-
-	* appl/otp/otpprint.c, appl/otp/otp.c: Use OTP_ALG_DEFAULT.
-  	Consistent language Check return value from des_read_pw_string.
-
-	* lib/otp/otp.h: Add OTP_ALG_DEFAULT
-
-
-	* lib/krb/parse_name.c: New function krb_parse_name
-
-Sat Nov 16 1996
-
-	* appl/bsd/login.c: removed S/Key.
-	Added OTP with option `-a otp'
-	Reorganized verification loop.
-
-	* appl/bsd/Makefile.in (login): Remove skey and add OTP
-
-	* configure.in: Test for `uid_t' and `off_t'
-
-	* appl/telnet/telnetd/telnetd.c: Removed `-s' for securID and
- 	added `-a otp' for OTP.
-
-	* appl/kpopper: removed s/key and added OTP support.  Updated
- 	man-page.
-
-	* lib/otp/otp.h: more fields in the struct and a new function.
-
-	* appl/ftp/ftpd/ftpd.c: Full OTP support.
-
-	* appl/kx/rxterm.in: Add options: -l username, -r args_to_rsh, and
- 	-x args_to_xterm
-
-	* appl/kx/rxtelnet.in: Add options: -l username, -t
- 	args_to_telnet, and -x args_to_xterm
-
-	* man/kx.cat1: regenerated
-
-	* man/kx.1: Added `-l' option.
-
-	* appl/kx/kxd.c: Accept username from `kx'
-
-	* appl/kx/kx.c: Introduced option `-l user' to be able to login as
- 	some other user.
-
-Fri Nov 15 1996
-
-	* appl/kx/kx.c: Print out display and not display_nr
-
-	* lib/auth/Makefile.in: Fix the case with empty SUBDIRS.
-
-	* */Makefile.in: Use $(LN_S) instead of ln -s
-
-	* */Makefile.in: Add @SET_MAKE@
-
-	* doc/latin1.tex: New file.
-
-	* doc/kth-krb.texi: Use latin1.tex to be able to use one letter
- 	that some bear seem to think is important.
-
-	* doc/kth-krb.texi: Added acknowledgements.
-
-	* lib/auth/Makefile.in: Only build relevant subdirectories.
-
-	* configure.in: Set @LIB_AUTH_SUBDIRS@ to the subdirectories of
- 	lib/auth that should be built.
-
-
-	* lib/kafs/afssys.c: Only get tokens for each cell once.
-
-Thu Nov 14 1996
-
-	* man: Added man pages for movemail(1) and kerberos(8).
-
-
-	* kadmin/kadmin_cmds.ct: Add `add' for add_new_key and `passwd'
- 	for change_password.
-
-
-	* lib/krb/logging.c: Now actually compiles!
-
-
-	* config.{guess,sub}: Merge changes from Autoconf
-
-
-	* lib/krb/{recv,send}auth.c: Don't return errno if there is a
- 	system error.
-
-Wed Nov 13 1996
-
-	* util/ss/Makefile.in: Now even compiles with BSD make!
-
-	* appl/kx: Now send the complete display from `kxd' to `kx'.  This
- 	should enable it to work better with Xlibraries that don't support
- 	unix sockets.
-
-	* kuser/klist.c: conditionally include <sys/ioctl.h> and
- 	<sys/ioccom.h> before <kafs.h>
-
-	* lib/krb/resolve.h: Add fallback for `T_TXT'.
-
-	* appl/otp/otp.c: removed print-functionality.
-
-	* appl/otp/otpprint.c: New file.
-
-	* appl/otp/Makefile.in: New program `otpprint'
-
-	* lots of Makefile.in: Now should be possible to build with makes
- 	that have broken VPATH-handling.
-
-	* configure.in: Always replace REAL_SHARED & c:o so that some
- 	libraries may be built as shared.
-	Removed unused AC_SUBST.
-	Only build afskauthlib on irix.
-
-	* lib/auth/afskauthlib/Makefile.in, lib/auth/sia/Makefile.in,
- 	lib/auth/pam/Makefile.in: Always build as a shared library.
-
-	* appl/kx/rxtelnet.in, appl/kx/rxterm.in: export PATH (from
- 	<jas@pdc.kth.se>).
-
-
-	* lib/krb/{pkt_cipher,fgetst}.c: Removed
-
-	* lib/krb/name2name.c: Renamed k_name_to_name to krb_name_to_name
-
-Mon Nov 11 1996
-
-	* appl/telnet/telnetd/sys_term.c: Really remove bad stuff from
- 	environment.
-
-Fri Nov 8 1996
-
-	* appl/bsd/rlogind.c (main): `portnum' should be int.
-
-	* appl/bsd/sysv_environ.c: Use _PATH_ETC_ENVIRONMENT
-
-	* appl/bsd/pathnames.h: _PATH_ETC_ENVIRONMENT: new
-
-	* lib/krb/get_host.c (srv_find_realm): New parameter `service'
-
-
-	* lib/krb/unparse_name.c: New function.
-
-Tue Nov 5 1996
-
-	* lib/auth/pam/pam.c: Add PAM Kerberos module.
-
-Mon Nov 4 1996
-
-	* configure.in: configure in lib/auth/afskauthlib
-
-	* lib/kafs/afssys.c: New function `k_afsklog_uid'.
-
-	* lib/auth/afskauthlib: New library that works like
-	`afskauthlib.so' from Transarc.
-
-
-	*lib/krb/get_host.c, lib/krb/getrealm.c, lib/kafs/afssys.c: Use
- 	dns_lookup().
-	
-	* lib/krb/resolve.c (dns_lookup): Replaced several different
- 	resolver functions with one more generalized.
-
-Sun Nov 3 1996
-
-	* Add check target in lib/krb.
-	
-	* appl/bsd/login.c (main): Sleep 10 seconds before bailing out so
- 	that there is a chance of reading the error message.
-
-	* appl/bsd/rsh.c (main): When invoked as rlogin equivalent change
- 	to real uid before execing rlogin.
-
-Sat Nov 2 1996
-
-	* appl/bsd/utmp_login.c: Do the right thing on systems where
- 	UTMPX_DOES_UTMP_LOGGING is defined.
-
-
-	* lib/krb/krb.h: names for `krb_kuserok' prototype
-
-	* lib/krb/get_host.c: Add tcp/kerberos.REALM as well.
-
-	* appl/bsd/su.c: Replace call to `kuserok' by `krb_kuserok'.
-
-	* lib/otp/otp_parse.c: Add support for parsing extended responses
- 	(draft-ietf-otp-ext-01).
-
-	* lib/otp/otp.h: Define OTP_HEXPREFIX and OTP_WORDPREFIX.
-
-	* appl/otp/otp.c: Add option `-e' for printing responses in
- 	extended mode (according to draft-ietf-otp-ext-01.txt).
-
-
-	* lib/krb/kuserok.c: Function krb_kuserok now takes name,
- 	instance, realm rather than an AUTH_DAT.
-
-Fri Nov 1 1996
-
-	* lib/auth/sia: Add SIA Kerberos module.
-
-
-	* lib/roken/roken.h: Need to include signal.h prior to defining
- 	SIG_ERR.
-
-	* appl/bsd/utmpx_login.c (utmpx_update): Minor restructuring for
- 	simplified maintainability.
-
-	* appl/bsd/utmp_login.c (utmp_login): Even when there are utmpx
- 	files on this system we should also log to the utmp files. If
- 	there are no utmp files we of course don't have to log to them.
-
-
-	* Makefile.export: now generate PROBLEMS and COPYRIGHT as well.
-
-	* PROBLEMS, COPYRIGHT, doc/kth-krb.info: removed
-
-	* doc/kth-krb.texi: Put copyrights in marketing order.
-
-	* appl/kpopper/popper.h: client and ipaddr should be char [] so
- 	that we can store the names there.
-
-	* appl/kpopper/pop_init.c: save copies of addresses that otherwise
- 	get overwritten.
-
-Mon Oct 28 1996
-
-	* lib/krb/send_to_kdc.c (send_recv_it): Use `recv' not `recvfrom'
- 	to make winsock happy.  Also don't care anymore about from which
- 	address we got the answer since we do a `connect'.
-
-	* admin/adm_locl.h, lib/kdb/kdb_locl.h, kadmin/kadm_locl.h,
- 	lib/krb/krb_locl.h, lib/roken/strftime.c, server/kerberos.c: Do
- 	not use #if, use #ifdef.
-
-	* configure.in: Test for `rand' and `getuid'
-
-
-	* slave/kprop.c: Don't terminate on trivial errors in slaves-file.
-
-Sun Oct 27 1996
-
-	* doc/Makefile.in: Install from source directory if necessary.
-
-	* lib/krb/kuserok.c: Do not use `k_getpwnam' in libkrb.
-
-	* configure.in: You can't even use `unset', Ultrix sh does not
- 	have it.
-
-
-	* several files: Check status from des_read_pw_string.
-
-
-	* server/kerberos.c: Make sure all data is recieved on a tcp
- 	socket before trying to reply.
-
-
-	* lib/krb/krb.h: Add <time.h> for `struct tm'
-
-	* appl/kx/Makefile.in: Both kx and kxd requires @XauWriteAuth@
-
-	* configure.in: Fix test for `XauReadAuth'
-
-Fri Oct 25 1996
-
-	* lib/krb/get_host.c (init_hosts): Must ntohs(KRB_PORT) on
- 	machines running backwards.
-
-	* More consistent use of CRLF in telnet and telnetd.
-
-	* Removed redundant -I$(srcsdir)/../../include from compiler args.
-	
-
-	* appl/ftp/ftpd/ftpd.c: New option `-a otp' to allow OTPs but no
- 	ordinary passwords in cleartext.
-
-	* appl/ftp/ftpd/Makefile.in: Link `ftpd' with -lotp
-
-	* lib/Makefile.in: Add otp
-
-	* include/Makefile.in: Add otp.h
-
-	* configure.in: Test for ndbm.h
-	Generate Makefiles in lib/otp and appl/otp
-
-	* appl/otp: New program to set up and generate OTPs.
-	
-	* lib/otp: New library for one-time passwords (RFC1938).
-
-	* lib/krb/get_host.c (srv_find_realm): Added parameter `proto'
-
-	* lib/des/Makefile.in: Add md4 and sha.  run `mdtest' from check.
-
-	* lib/des/md4.h, lib/des/md4.c, lib/des/sha.c, lib/des/sha.h,
- 	lib/des/mdtest.c: New files.
-
-	* appl/kauth/Makefile.in: Make $(libexedir) as well.
-
-Thu Oct 24 1996
-
-	* appl/bsd/rlogind.c (setup_term): Actually set the speed of the
- 	terminal.
-
-	* appl/bsd/rlogin.c (main): Do a `speed_t2int' before putting the
- 	speed in the TERM variable.
-
-	* appl/bsd/rcmd_util.c: New functions: `speed_t2int' and
- 	`int2speed_t'.
-
-	* appl/bsd/bsd_locl.h: Added prototype of `speed_t2int' and
- 	`int2speed_t'.
-
-Sun Oct 20 1996
-
-	* appl/bsd/login.c: Do `getspnam' before change the UID. Also call
- 	`endspent'
-
-	* appl/krbmanager: New program used on PCs by kclient.
-
-	* lib/kclient: New library.
-
-	* lib/des, lib/krb: Added some PC-specific files.
-
-	* doc/kth-krb.info: Regenerated.
-
-	* doc/Makefile.in (kth-krb.info): Some stupid makes don't
- 	understand $<
-	(kth-krb.html): New rule.
-
-	* doc/kth-krb.texi (Compiling from source): Added some references
- 	about Socks.
-
-Sat Oct 19 1996
-
-	* doc/kth-krb.texi: Added text about ``--with-socks''.
-
-	* configure.in: Use `AC_TEST_PACKAGE' for skey and socks.
-
-	* aclocal.m4: Replaced `AC_TEST_SOCKS' and `AC_TEST_SKEY' with the
- 	more general `AC_TEST_PACKAGE'.
-
-Fri Oct 18 1996
-
-	* configure.in: call AC_TEST_SOCKS
-
-	* acconfig.h: SOCKS
-
-	* aclocal.m4: Added AC_TEST_SOCKS
-
-	* lib/krb/send_to_kdc.c (send_to_kdc): Removed unused `f' and
- 	close.
-
-Thu Oct 17 1996
-
-	* man/popper.8: Option `-i'
-
-	* appl/kpopper/pop_send.c: clean-up
-
-	* appl/kpopper/popper.h: Removed old garbage and added SKEY.
-
-	* appl/kpopper/pop_xmit.c: clean up
-
-	* appl/kpopper/pop_user.c: SKEY-support
-
-	* appl/kpopper/pop_pass.c: Added support for spaces in passwords
- 	and S/Key.
-
-	* appl/kpopper/pop_init.c: Moved some variables into struct pop
-	(main): Added support for `-i'
-
-	* appl/kpopper/pop_get_command.c: New command "HELP".
-
-	* appl/kpopper/Makefile.in: Add SKEY-stuff.
-
-	* lib/krb/get_host.c: Use `k_getportbyname(KRB_SERVICE,...)' as a
- 	default instead of KRB_PORT
-
-	* lib/krb/getaddrs.c (k_get_all_addrs): Add
- 	gethostbyname(k_gethostname()) as a fallback.
-
-	* lib/krb/k_getport.c (k_getportbyname): proto can be NULL
-
-	* lib/krb/krb.h: Only include <sys/types.h> if HAVE_SYS_TYPES_H
-
-	* lib/krb/prot.h: KRB_SERVICE: Added
-
-
-	* server/kerberos.c: Replaced linked list with a vector.
-
-Wed Oct 16 1996
-
-	* server/kerberos.c: Add support for TCP connections.
-
-	* lib/krb/send_to_kdc.c: On stream sockets, use krb_net_read
- 	rather than recvfrom.
-
-Mon Oct 14 1996
-	
-	* doc/kth-krb.texi: Only use `kdb_edit' to add the initial
- 	`nisse.admin'.  Add all other users with `kadmin'.
-
-	* doc/kth-krb.info: new file.
-
-	* doc/kth-krb.texi: Added some text about kx and ftp.
-
-	* appl/ftp/ftpd/ftpcmd.y,
-	  util/ss/ct.y,
-	  util/et/error_table.y :
- 	Added code for handling the case of using `bison' and having no
- 	`alloca'.  Alloca is usually never called anyway, so we just use
- 	`malloc'.
-
-	* appl/kx/kxd.c: All static variables are now global and in
- 	common.c.
-	(doit_conn, doit): Turn on TCP_NODELAY.
-	(create_and_write_cookie, suspicious_address): Moved to common.c
-
-	* appl/kx/kx.c (connect_host): Try all addresses of `host'. Turn
- 	on TCP_NODELAY.
-	(doit): prepare for TCP-only hosts.
-	(usage,main): add `-t'
-	(main): Passive mode is possible again.
-
-	* appl/kx/kx.h: More #ifdefs for include files.  Declarations for
- 	global variables.
-
-	* appl/kx/common.c (get_xsockets): Try to chmod
- 	dirname(`X_UNIX_PATH')
-	(get_xsockets): Turn on TCP_NODELAY on TCP connections.
-
-	* doc/Makefile.in: New file
-
-	* Makefile.in: Added `doc' to `SUBDIRS'
-
-	* configure.in: Generate `doc/Makefile'
-
-Sun Oct 13 1996
-
-	* appl/bsd/rcp.c (main): Made rcp AFS aware.
-
-	* lib/krb/kuserok.c (kuserok): Act as if luser@LOCALREALM is
- 	always an entry of .klogin.
-
-Sat Oct 12 1996
-
-	* appl/kx/rxtelnet.in: Start the `xterm' process correctly.
-
-	* lib/des/rnd_keys.c (sumFile): consider the case that `res' is
- 	not longword-aligned.
-
-	* lib/krb/get_host.c (parse_address): `getservbyname' should
- 	really get proto = NULL
-
-	* lib/krb/send_to_kdc.c (krb_udp_port): removed
-	(send_to_kdc): removed `addrlist'
-
-	* lib/krb/send_to_kdc.c: Support not only UDP.
-
-	* lib/krb/get_host.c (krb_get_admhst): Really ask for a admin host
- 	if that's what we want.
-
-Thu Oct 10 1996
-
-	* lib/krb/get_host.c: Simplified some code. Added stub-support for
- 	SRV-records.
-
-Wed Oct 9 1996
-
-	* appl/kx/rxtelnet.in, appl/kx/rxterm.in: PDC are unable to give
- 	correct instructions to their users and therefore we have to add
- 	strange directories to the PATH.
-
-	* appl/kx/rxtelnet.in: Support sending arguments to telnet.
-
-	* appl/kx/rxterm.in: rsh can reside in path or %bindir% support
- 	extra arguments to xterm (from <jas@pdc.kth.se>).
-
-	* appl/kx/rxtelnet.in: Try to find some kind of terminal emulator
- 	for X.
-
-	* appl/kx/rxterm.in, appl/kx/rxtelnet.in: Look for kx in $PATH and
- 	%bindir%.
-
-	* appl/kx/common.c (get_xsockets): `mkdir' the correct directory.
-  	From <jas@pdc.kth.se>
-
-
-	* lib/krb/send_to_kdc.c: Changes to allow other than udp port 750
- 	connections.
-
-	* lib/krb/get_host.c: rewrite of krb_get_{adm,krb}hst.
-
-Sun Oct 6 1996
-
-	* appl/ftp/ftpd/ftpd.c (retrieve): Got rid of `sprintf'.
-
-	* configure.in: Fix order for x libs.  From <jas@pdc.kth.se>.
-  	Check for `fcntl', `alloca', `winsock.h', and `io.h'.
-
-	* lib/krb/krb_locl.h: Check for <io.h> and <winsock.h>
-
-	* lib/krb/krb.h: Check for winsock.h
-
-	* lib/krb/k_flock.c: Better test for `fcntl' with locking.
-
-	* lib/krb/et_list.c: Hopefully correct pragma this time.  From
- 	<jas@pdc.kth.se>
-
-Thu Oct 3 1996
-
-	* lib/krb/klog.c (klog): Do not forget to print the text.
-
-	* lib/krb/log.c (krb_log): Print space after time in log.
-
-Wed Oct 2 1996
-
-	* appl/kpopper/popper.h: Add field msg_id to hold Message-Id for
- 	UIDL command.
-
-	* appl/kpopper/pop_dropinfo.c (pop_dropinfo): Support for UIDL
- 	command. Saves Message-Id to be used as unique id. Everything is
- 	#ifdef:ed UIDL.
-
-	* appl/kpopper/pop_get_command.c: Recognize UIDL command.
-
-	* appl/kpopper/pop_uidl.c (pop_uidl): POP3 UIDL command
- 	implementation.
-
-	* appl/kpopper/Makefile.in: New file pop_uidl.c.
-
-
-	* configure.in: Made some of the tests into macros defined in
- 	aclocal.m4
-
-	* appl/telnet/libtelnet/kerberos.c: Given better error message
- 	when user is not authorized to login.
-
-	* lib/roken/k_getpwuid.c, lib/roken/k_getpwnam.c: Call `endpwent'.
-  	If we are using a BSD-kind of system we should not leave the
- 	shadow password database open.
-
-	* appl/xnlock/xnlock.c: Got rid of all `register' declarations.
-
-	* appl/kx/rxterm.in, appl/kx/rxtelnet.in: Use `set --'
-
-Mon Sep 30 1996
-
-	* lib/roken/k_getpwnam.c, lib/roken_k_getpwuid.c: Call `endspent'
- 	to try to close the shadow password file.
-
-	* appl/ftp/ftpd/ftpd.c (retrieve): Cut the argument to the command
- 	and the first character of the extension.
-
-	* lib/krb/send_to_kdc.c: Sun doesn't have any strerror so we can't
- 	use that here.  We are only printing debug messages anyway, so
- 	just print errno for now.
-
-	* appl/kx/rxtelnet.in: Now using SIGUSR2.
-
-	* appl/kx/kx.c: Now using SIGUSR1 to mean `exit when number of
- 	children goes down to zero'.  SIGUSR2 is `exit when number of
- 	children is equal to zero'.
-
-	* appl/xnlock/xnlock.c: More fixup of old code.
-
-	* appl/ftp/ftpd/ftpd.c: Only call `filename_check' for guest
- 	users.
-
-	* configure.in: Added tests for more header files.  Also added
-	more ifdefs when actually including those files.
-
-	* appl/kx/Makefile.in: Do not build programs if we have no X11.
-	
-Sun Sep 29 1996
-
-	* appl/xnlock/xnlock.c (main): Support for shadow passwords.
-
-	* lib/roken/k_getpwuid.c: New file, better support for shadow
- 	passwords.
-
-
-	* appl/telnet/Makefile.in: Use SET_MAKE
-
-
-	* appl/ftp/ftpd/ftpcmd.y: Remove access to several commands for
- 	anonymous users.
-
-	* lib/krb/get_krbhst.c: Look for kerberos-#.realm.
-
-	* appl/ftp/ftpd/popen.c: Execute files from ~ftp if possible.
-
-	* appl/ftp/ftpd/ftpd.c: Add find site command.
-
-	* appl/ftp/ftpd/ftpd.c: Add special handling of nonexistant files
- 	with extensions {,.tar}{,.gz,Z}.
-
-Sat Sep 28 1996
-
-	* configure.in: Check for sys/times.h, sys/param.h, and
- 	sys/timeb.h
-
-	* lib/des: autoconfed a little to make it compile.
-
-	* lib/roken/roken.h: Add `max', `min', and definitions for broken
- 	syslogs.
-
-	* appl/bsd/bsd_locl.h: Removed SYSLOG-garbage and max.
-
-	* appl/kx/kx.h: Remove prototype of childhandler.
-
-	* appl/kx/common.c: Remove childhandler.  Not common any more.
-
-	* appl/kx/rxterm.in: Send SIGUSR1 to kx before starting xterm.
-
-	* appl/kx/rxtelnet.in: Send USR1 to kx at appropriate moment.
-
-	* appl/kx/kx.c: Die after receiving SIGUSR1 and when number of
- 	children goes to zero.
-
-	* lib/roken/roken.h: Add STDERR_FILENO
-
-	* lib/roken/mini_inetd.c (mini_inetd): Also dup onto stderr.
-
-	* lib/kafs/Makefile.in (afslib.so): Change argument so they work
- 	with `ld' instead of `cc'
-
-	* appl/kx/kxd.c: writeauth.c as separate file.
-
-	* appl/kx/kx.c: `-d' option to disable forking.
-
-	* appl/kx/Makefile.in: Compile and link writeauth.c if necessary.
-  	For some stupid reason $< does not work correctly in BSD make.
-  	Use $(srcdir) instead.
-
-	* appl/ftp/ftp/ftp_locl.h: Only include <roken.h> once.
-
-	* configure.in: Use strange X flags when looking for XauReadAuth.
-  	Add XauWriteAuth if we need to include it.
-
-Fri Sep 27 1996
-
-	* appl/sample: Sample programs work again.
-
-
-	* appl/kx/kxd.c (main): use `mini_inetd'
-
-	* appl/kx/kx.c: Use KX_PORT
-
-	* appl/kx/kx.h: Remove SOMAXCONN and add KX_PORT
-
-	* appl/kauth/kauthd.c (main): use `mini_inetd'
-
-	* appl/ftp/ftpd/ftpd.c: Removed `conn_wait' and use `mini_inetd'
- 	instead.
-
-	* appl/bsd/bsd_locl.h: Prototypes for `get_shell_port' and
- 	`get_login_port'
-
-	* appl/bsd/rcmd_util.c: New file.
-
-	* appl/bsd/Makefile.in: Added rcmd_util.c
-
-	* appl/bsd/rcp.c: Moved `get_shell_port' to rcmd_util.c
-
-	* appl/bsd/rsh.c: Moved `get_shell_port' to rcmd_util.c
-
-	* appl/bsd/rlogind.c (main): Use `mini_inetd'
-
-	* appl/bsd/rshd.c (main): Add support for interactive mode with
- 	`-i'.
-
-	* appl/telnet/telnetd/telnetd.c (main): use `mini_inetd'
-
-	* lib/roken/roken.h: Added prototype for `mini_inetd', and
- 	fallback definitions for SOMAXCONN, STDIN_FILENO, and
- 	STDOUT_FILENO.
-
-	* lib/roken/Makefile.in: Added mini_inetd.o
-
-	* lib/roken/mini_inetd.c: New file.
-
-Thu Sep 26 1996
-
-	* appl/kx/kxd.c (doit): read port number in ascii.
-
-	* appl/kx/kx.c (doit): write port number in ascii.
-
-	* appl/kauth/rkinit.c (doit_host): Check return value from
- 	`read_encrypted'.
-
-	* appl/kauth/kauthd.c (doit): Removed unnecessary sprintf's before
- 	syslog.
-
-	* lib/krb/krb_get_in_tkt.c (krb_get_in_tkt): Return error code
- 	from `tf_create' and not always INTK_ERR.
-
-	* lib/krb/tf_util.c (tf_create): Correct check for return value
- 	from `open'.
-
-	* lib/des/rnd_keys.c (des_rand_data): Try /dev/urandom as well.
-
-Wed Sep 25 1996
-
-	* appl/afsutil/pagsh.c (main): One-of error hopefully fixed this
- 	time.
-
-	* configure.in: Add test for <sys/un.h>
-
-	* kadmin/Makefile.in: Add back $(CRACKLIB)
-
-Mon Sep 16 1996
-
-	* appl/kx/Makefile.in: Create rxterm and rxtelnet at compile time.
-
-	* kstring2key moved to appl/afsutil.
-
-Sun Sep 15 1996
-
-	* appl/kx/kx.c (main): For now always use passive mode.  That's
- 	the only thing that has been tested and not a lot of people are
- 	going to use non-passive anyways.
-
-	* appl/kx/kx.c (connect_host): write display_number in ascii.
-
-	* appl/kx/kxd.c (doit): read display_number in ascii.
-
-	* appl/kx/common.c (get_local_xsocket): Generate the
- 	/tmp/.X11-unix directory with the sticky bit set.
-
-	* configure.in: Generate appl/kx/rxterm and appl/kx/rxtelnet.
-
-	* appl/kx/Makefile.in: Install rxterm and rxtelnet.
-
-	* appl/kx/rxterm.in, appl/kx/rxtelnet.in: New files.
-
-	* appl/kx/common.c (get_local_xsocket): try to bind the socket
- 	instead of checking for existence with lstat.
-
-
-	* appl/kx/kxd.c: Detect remote termination and cleanup on exit.
-
-Sat Sep 14 1996
-
-	* lib/des/rnd_keys.c: Hack for systems that lack setitimer (like
- 	crays).
-
-
-	* appl/kx/kxd.c (doit): Send over the display number and the
- 	authority file actually used to kx.
-	
-	(create_and_write_cookie):  New function to generate and write into a
-	file a local cookie used between this pseudo-server and the
- 	clients on this host.
-	
-	(start_session):  New function to check and remove the local cookie
-	before the data is sent over to `kx'.
-
-	* appl/kx/kx.c (display_num, xauthfile): New variables.  Now `kx'
- 	prints out the values of those two variables and then goes to the
- 	background to enable some script to set these on the other host.
-	
-	(start_session): New function that adds a local cookie before sending
-	the rest of the connection to the local X-server.
-	
-	(main): Also recognize "unix" as a local DISPLAY.
-
-	* appl/kx/kx.h: <X11/Xauth.h> used.
-	(get_local_xsocket): Changed parameter.
-
-	* appl/kx/common.c (get_local_xsocket): Now try to allocate the
- 	first free socket in /tmp/.X11-unix.  Also `mkdir' this directory
- 	first.  Return the number of the display opened.
-
-	* appl/kx/Makefile.in: Added X libraries.
-
-	* lib/des/des.h: Added prototype for `des_rand_data'.
-
-	* lib/des/rnd_keys.c: Made `des_rand_data' non-static.  This
- 	function is useful and now even used.
-
-Wed Sep 11 1996
-
-	* appl/bsd/login.c: Use k_afs_cell_of_file() to get tokens for the
- 	cell of the home catalog rather than the local cell.
-
-	* lib/kafs/afssys.c: Add k_afs_cell_of_file.
-
-Tue Sep 10 1996
-
-	* appl/telnet/telnetd/telnetd.c, appl/telnet/telnetd/sys_term.c:
- 	Removed all convex code.
-
-Mon Sep 9 1996
-
-	* appl/telnet/telnetd/termstat.c: UNICOS5: removed
-
-	* appl/telnet/telnetd/telnetd.c, appl/telnet/telnetd/sys_term.c:
- 	NEWINIT, UNICOS7x, UNICOS5: removed
-	
-	STREAMSPTY: added variable `really_stream' Now able to handle the
- 	case where the OS supports stream ptys but we run out of them and
- 	start using ordinary BSD ones.
-
-	* appl/telnet/telnetd/state.c: UNICOS5: removed
-
-	* appl/telnet/telnetd/pathnames.h: BFTPPATH: removed
-
-	* appl/telnet/telnetd/ext.h, appl/telnet/telnetd/global.c:
-	BFTPDAEMON: removed.
-	UNICOS5: removed.
-	
-	* appl/telnet/telnetd/ext.h: STREAMSPTY: added variable
- 	`really_stream'.
-
-	* lib/krb/stime.c (krb_stime): argument should be `time_t'.
-	lib/krb/krb_locl.h: changed prototype.
-
-Sun Sep 8 1996
-
-	* configure.in: Also generate `appl/sample/Makefile'
-
-	* appl/Makefile.in: Use @SET_MAKE@.
-	Include sample
-
-	* lib/krb/Makefile.in: Add krb_stime, krb_mk_auth, and
- 	krb_check_auth.
-
-	* util/et/compile_et.c (main): Include <foo.h> in foo.c
-
-	* slave/kprop.c: exit with return code == 1 to indicate failure.
-
-	* server/kerberos.c (usage): Fixed usage string.
-
-	* lib/krb/tkt_string.c (tkt_string): Removed bogus extern
- 	declaration of `getuid'.
-
-	* lib/krb/tf_util.c (tf_save_cred): Removed bogus extern
- 	declaration of `lseek'.
-
-	* lib/krb/stime.c (stime): Renamed to `krb_stime'
-
-	* lib/krb/sendauth.c (krb_sendauth): reimplemented using
- 	`krb_mk_auth' and `krb_check_auth'.
-
-	* lib/krb/send_to_kdc.c (send_recv): Removed stupid cast.
-
-	* lib/krb/recvauth.c: Removed KRB_SENDAUTH_VERS
-
-	* lib/krb/prot.h: create_auth_reply: correct prototype.
-  	krb_create_death_packet: ditto.
-	KRB_SENDAUTH_VERS: moved here from sendauth.c and recvauth.c
-
-	* lib/krb/month_sname.c: Made `month_sname' const.
-
-	* lib/krb/mk_req.c: Remove stupid `register'
-
-	* lib/krb/log.c (krb_log): Use `krb_stime'
-
-	* lib/krb/kuserok.c (kuserok): Nightmare Filesystem might return
- 	ESTALE.  Treat it the same way as ENOENT.
-
-	* lib/krb/krb_locl.h: Added prototype for `krb_stime'
-
-	* lib/krb/krb_check_auth.c: New file with `krb_check_auth',
-	implemented for compatibility with CNS.
-	lib/krb/krb_mk_auth.c: Ditto.
-
-	* lib/krb/krb.h: Removed duplicate declarations of `get_request'
- 	and `krb_get_admhst'.
-	Added declarations for `krb_mk_auth' and `krb_check_auth'.
-
-	* lib/krb/kparse.h: removed prototype for `strsave'
-
-	* lib/krb/kparse.c (fGetParameterSet): Use `strdup' instead of
- 	`strsave'.
-	(strsave): Removed.
-
-	* lib/krb/kname_parse.c: Removed stupid `register' declarations.
-
-	* lib/krb/klog.c (klog): Use `krb_stime'
-
-	* lib/krb/get_phost.c: Handle the case where the name has no dots
- 	in it by just returning it as-is.
-
-	* lib/knet/Imakefile, lib/knet/getkdata.c, lib/knet/phost.c,
-	lib/knet/sendkdata.c: removed unused files.
-
-	* lib/kadm/kadm_cli_wrap.c (kadm_init_link): use `k_getportbyname'
-
-	* kadmin/ksrvutil_get.c (get_srvtab_ent): Erase the key if
- 	something goes wrong.  Include realm in the message when writing a
- 	key.
-	(parseinput): New function that removes quotes and backslashes
- 	from input.
-	(ksrvutil_get): Use `parseinput' to read input.
-
-	* kadmin/ksrvutil.c (safe_read_stdin): Correct use of printf.
-  	Removed bogus casts and fflush of stdin.
-	(main): Use `return' instead of `exit'.
-
-	* kadmin/kpasswd.c (main): Use `return' instead of `exit'.
-
-	* kadmin/admin_server.c: exit with return code == 1 to indicate
- 	failure.
-
-	* appl/sample/sample_server.c: Rewrote to use all new functions.
-
-	* appl/sample/sample_client.c: Rewrote to use all new functions.
-
-	* appl/sample/sample.h: new file.
-
-	* appl/sample/Makefile.in: new file.
-
-	* appl/movemail/pop.c (socket_connection): use `k_getportbyname'
-
-	* appl/kpopper/pop_init.c: exit with return code == 1 to indicate
- 	failure.
-
-	* appl/kauth/kauth.c (doexec): new-style definition.  ret should
- 	be a `pid_t'.
-	(main): new-style definition.  Use `prog' instead of `argv[0]'
-
-	* appl/ftp/ftp/extern.h: Removed unused `abortsend'
-
-	* appl/ftp/Makefile.in: Use @SET_MAKE@
-
-	* appl/bsd/rsh.c: get_shell_port: use `k_getportbyname'
-
-	* appl/bsd/rlogin.c: get_login_port: use `k_getportbyname'
-
-	* appl/bsd/kcmd.c: Removed bogus casts to `caddr_t'
-
-	* admin/kstash.c: Removed bogus flushing of stderr.  Replaced lots
- 	of `exit(-1)' by `return 1'
-
-	* admin/kdb_util.c: Removed unused variable `aprinc'.
-	Removed bogus flushing of stderr.
-	Replaced lots of `exit(-1)' by `return 1'.
-
-	* admin/kdb_edit.c, admin/kdb_init.c: use `return' instead of
- 	calling `exit' and use 1, not -1, for failure.
-
-	* Makefile.in: Use @SET_MAKE@
-
-	* aclocal.m4: AC_NEED_PROTO: need macro to determine if we need to
- 	define a prototype for a function.
-
-	* configure.in: Reordered.  Removed unused stuff.  Start using
- 	AC_NEED_PROTO.
-
-	* config.guess: merged in FSF version from 960908.
-
-Tue Sep 3 1996
-
-	* include/protos.H: Added optarg, opterr, optind, optopt and
- 	(fclose under Sunos 4).  Removed these declarations from lots of
-	other files.
-
-	* acconfig.h: Add undefs for h_errno, h_errlist, optarg, optind,
- 	opterr, and optopt.
-
-	* configure.in: Use `AC_NEED_DECLARATION' for h_errno, h_errlist,
- 	optarg, optind, opterr, and optopt.
-
-	* aclocal.m4: New macro `AC_NEED_DECLARATION' to figure out if we
- 	need to have an external declaration of a variable.
-
-Mon Sep 2 1996
-
-	* lib/krb/krb.h: Removed unused `req_act_vno' and `k_log'.
-  	Changed all callers.
-
-	* lib/krb/krb.h: Removed definition of `MAX_HSTNM'.
-
-	* lib/krb/send_to_kdc.c: Removed use of `MAX_HSTNM'.
-
-	* appl/afsutil/pagsh.c: Some reformatting and fixed the off-by-one
- 	args bug.
-
-Sat Aug 31 1996
-
-	* lib/krb/{send_to_kdc.c, getrealm.c}, appl/xnlock/xnlock.c,
- 	appl/kauthkauth.c, appl/bsd/{rshd.c,rlogind.c}: Removed '#if 0'-ed
- 	code.
-
-	* lib/krb/get_in_tkt.c: Removed '#if 0'-ed code and now compiles
- 	with NOENCRYPTION.
-
-	* kadmin/ksrvutil.c: Now compiles with NOENCRYPTION.
-
-	* appl/ftp/ftpd/ftpcmd.y: Throw away passwd after use.
-
-	* appl/ftp/ftpd/ftpd.c: Fixed old comment.
-
-	* slave/kpropd.c: s/sa_len/salen/ Irix has a #define for sa_len.
-	
-	* lib/kdb/krb_dbm.c: If key->dptr is not a `char *' we have to
- 	cast it before adding to it.
-
-	* configure.in: Old test for `sa_len' in `struct sockaddr' fails
- 	on IRIX 6.2.  Try to compile a program refering to that field
- 	instead of grepping for it in <sys/socket.h>.
-
-	* appl/bsd/kcmd.c: Removed old and broken code.
-
-	* configure.in: Check for `gethostname', `uname', and
- 	<sys/utsname.h>
-
-	* lib/krb/k_gethostname.c: Try to use `uname' if we have no
- 	`gethostname'.
-
-	* appl/ftp/ftpd/klogin.c: Incorrect use of `gethostname' replaced
- 	by correct use of `k_gethostname'.
-
-
-	* lib/roken/verify.c: Change name verify_unix_user ->
- 	unix_verify_user in analogy with krb_verify_user.
-
-Fri Aug 30 1996
-
-	* appl/xnlock/Makefile.in: Install man-page.
-
-	* configure.in, */Makefile.in: Replace `-shared' with some other
- 	option when not using gcc.
-
-	* lib/kafs/afssys.c: Do not start by checking if we have AFS in
- 	`k_afsklog'.
-
-	* appl/bsd/rlogin.c: More kludges to make it work with rlogin on
- 	linux: Do not select for an exceptional condition on `rem' after
- 	having received EINVAL.
-	
-	Also rewrote ifndef NOENCRYPTION stuff.
-
-	* appl/bsd/rlogind.c: More kludges to make it work with rlogin on
- 	linux: Only send oob data just after having sent normal data to
- 	make sure we never send two consecutive bytes of oob data.
-
-	Also rewrote ifndef NOENCRYPTION stuff.
-
-Thu Aug 29 1996
-
-	* lib/kafs/Makefile.in: Use `ld' instead of `cc' for linking
- 	afslib.so.  Not everybody has cc.
-
-Wed Aug 28 1996
-
-	* Release 0.9.2a
-
-Mon Aug 26 1996
-
-	* appl/bsd/login.c: Clean-up.  Made static a lot of functions and
- 	variables.  Rewrote some function definitions to ANSI-style.
-
-	* appl/bsd/sysv_environ.c: KRB4_MAILDIR may and may not contain a
- 	trailing slash.  We need to be very careful to make sure the
- 	contents of $MAIL does not contain two, because RMAIL in emacs
- 	uses it and emacs is no friend with double slashing.
-
-
-	* lib/kafs/afssys.c (k_afsklog_all_local_cells): Now should return
- 	correct value.
-
-Sun Aug 25 1996
-
-	* Release 0.9.2.
-
-Sat Aug 24 1996
-
-	* lib/roken/hstrerror.c: Check for h_errlist prototype.
-
-Thu Aug 22 1996
-
-	* lib/krb/send_to_kdc.c, etc/services.append, server/kerberos.c:
- 	Changed `kerberos' to `kerberos-iv' now that it has been
- 	registered with IANA.
-
-	* man/rshd.8, man/rlogind.8: updated documentation of `-a'
-
-	* lib/roken/roken.h: Added declaration of `h_errno'
-
-	* kuser/Makefile.in: Link kdestroy with KRB_KAFS_LIB
-
-	* appl/kauth/kauth.h: Stupid declarations for syslog.
-
-	* appl/kauth/kauthd.c: syslog errors and success.
-
-	* include/protos.H: Removed `h_errno', now in roken.h Declare
- 	`getusershell' under solaris.
-
-	* configure.in, acconfig.h: Figure out if we have to declare
- 	`h_errno'.
-
-	* appl/ftp/ftp/kauth.c: Added support for afs_string_to_key.
-
-Wed Aug 21 1996
-
-	* lib/kafs/afssys.c: Look for AFS database servers in dns also.
-
-	* lib/kafs/afssys.c: Add support for a ~/.TheseCells-file.
-
-Sun Aug 18 1996
-
-	* appl/bsd/rlogind.c: Removed unused `check_all' variable.  Use
- 	`inaddr2str'.
-
-	* appl/bsd/rshd.c: Use `inaddr2str'.
-	
-	* appl/bsd/iruserok.c: Removed potential buffer overrun after
- 	`gethostbyaddr'.
-
-	* lib/roken/inet_aton.c: Some const-ness.
-
-	* lib/roken/Makefile.in: Add `inaddr2str.o'.
-
-	* appl/ftp/ftpd/ftpd.c: Use `inaddr2str'.
-
-	* lib/roken/inaddr2str.c, lib/roken/roken.h: New function
- 	`inaddr2str' to convert an IP address into a verified hostname or
- 	a string of the form x.y.z.a
-
-	* lib/krb/{krb_locl.h, krb.h, k_name_to_name.c, k_getsockinst.c,
- 	getrealm.c}: Some const-ness.
-	
-	* appl/bsd/bsd_locl.h: Removed another prototype for `crypt'.
-
-	* appl/kpopper/popper.h: Some const-ness to get rid of a warning.
-
-	* appl/bsd/rshd.c: Always check reverse mapping.  Removed
- 	`local_domain' and `top_domain'.  Added some const-ness.
-
-Sat Aug 17 1996
-
-	* include/Makefile.in: Removed VPATH.  With it this makefile does
- 	not work correctly.
-
-	* lib/krb/rw.c, lib/krb/krb_locl.h: Changed parameters to
- 	`krb_{get,put}'-functions to void *.
-
-	* include/protos.H: Add `getusershell' in solaris.
-
-	* appl/kauth/kauthd.c, appl/bsd/{rlogin.c,rlogind.c}: Less
- 	warnings because of arguments to `setsockopt'.
-
-	* lib/roken/roken.h: Fixed prototype of `inet_aton'
-
-Wed Aug 14 1996
-
-	* lib/roken/verify.c: Use <crypt.h> if there is one.
-
-	* lib/kafs/Makefile.in: AFS_EXTRA_LIBS is always called
- 	`afslib.so'.  Otherwise some makes get upset when there is no such
- 	library to be made.
-
-	* appl/telnet/telnetd/telnetd.h: <protos.h> are needed to get
- 	prototype for `ptsname'.
-
-	* appl/bsd/rlogind.c, appl/kpopper/pop_dropinfo.c,
-	appl/telnet/libtelnet/{auth.h,enc_des.c,kerberos.c},
-	appl/telnet/telnet/utilities.c, appl/telnet/telnetd/{sys_term.c,
-	telnetd.h, kadmin/admin_server.c, kuser/klist.c,
-	lib/kdb/{krb_cache.c, krb_dbm.c}, lib/krb/{fgetst.c, getst.c,
-	log.c, tf_util.c}: Include type `int' on all definitions and
- 	remove unnecessary `register'.
-
-	* appl/bsd/login_access.c: Fix parameter declaration to
- 	`netgroup_match'.
-
-	* appl/bsd/forkpty.c, include/protos.h: s/__sgi__/__sgi//g
-
-	* admin/kdb_util.c: Use `errno' for error message instead of
- 	uninitialized variable.
-
-Tue Aug 13 1996
-
-	* appl/kauth/rkinit.c: Default port should be the same in kauth
- 	and kauthd.
-
-Sun Aug 11 1996
-
-	* configure.in: Added `AC_REVISION'
-
-	* slave/kpropd.c: Cleaned up structure.  Now returns useful value.
-
-	* lib/roken/verify.c: Broken OSes need declartion of `crypt'.
-
-	* lib/roken/roken.h: Added prototype for `verify_unix_user'.
-
-	* lib/krb/lsb_addr_comp.h: Added prototype for `lsb_time'.
-
-	* lib/krb/{get_admhst.c, get_default_principal.c, get_krbhst.c,
- 	get_krbrlm.c, getrealm.c, realm_parse.c} : Check for buffer
- 	overwrite correctly.
-
-	* lib/krb/rw.c, lib/krb/krb_locl.h: Prepended `krb_' to `get_int',
- 	`put_int', `get_address', `put_address', `put_string',
- 	`get_string', `get_nir', and `put_nir'.  Changed all callers.
-
-	* lib/kdb/krb_db.h: Added prototype for `kerb_delete_principal'
- 	and `kerb_db_delete_principal'.
-
-	* lib/kadm/kadm_cli_wrap.c: Removed unused variable.
-
-	* appl/telnet/telnetd/telnetd.c: Changed bogus `strncpy' to
- 	`strcpy'.
-
-	* appl/bsd/su.c: Fixed error messages from execv.
-
-	* appl/bsd/rlogin.c: Fixed potential buffer overrun when reading
- 	"TERM".
-
-Thu Aug 8 1996
-
-	* appl/telnet/telnet/commands.c, appl/kauth/rkinit.c: Replaced
- 	`herror' by `hstrerror'.
-	
-	* appl/bsd/login.c: chmod the tty so that it is writable for group
- 	tty.
-
-	* configure.in: Use AC_FIND_IF_NOT_BROKEN for herror and
- 	hstrerror.
-
-	* aclocal.m4: New macro `AC_FIND_IF_NOT_BROKEN'
-
-	* config.guess: Add 686
-
-Tue Aug 6 1996
-
-	* lib/krb/getrealm.c: Fallback for `T_TXT'
-
-	* configure.in: Look for `res_search' and `dn_expand' in
- 	libresolv.
-
-Mon Aug 5 1996
-
-	* */Makefile.in: Add Id to those missing it.
-
-	* configure.in: Small fix in comment.
-
-
-	* Release 0.9.1.
-
-
-	* appl/ftp/ftpd/ftpcmd.y: s/timeout/ftpd_timeout/
-
-	* appl/kstring2key/kstring2key.c: `usage' changed to void.
-
-	* lib/krb/mk_req.c: `build_request' changed to void.
-
-	* appl/ftp/ftp/ftp_locl.h: Changed order of includes.
-
-	* appl/bsd/login.c, appl/ftp/ftpd/*: s/timeout/login_timeout/
-
-	* lib/kafs/afssysdefs.h: undef AFS_SYSCALL if we are defining it.
-
-Sun Aug 4 1996
-
-	* lib/kafs/afssys.c: AIX systems will now correctly (I hope)
- 	detect whether AFS is loaded or not. This is currently a bit
- 	kludgy, and involves loading an external shared library,
- 	afslib.so, which can be put in athena/lib or pointed to with
- 	environment variable AFSLIBPATH.  This is only tested on AIX 4
- 	(due to lack of an AIX 3 system).
-
-
-	* lib/krb/getrealm.c: Range-check the result from the DNS.
-
-	* lib/krb/get_krbrlm.c: Try to use the DNS to find out which realm
- 	this host belongs to.
-
-	* kadmin/ksrvutil_get.c: Fixed error message.
-
-
-	* lib/kafs/*: Fix aix/afs brokenness.
-
-	* lib/kadm/kadm_stream.c (stv_string): Range check.
-
-Fri Jul 26 1996
-
-	* appl/ftp/common/{ftp,ruserpass}.c: Less bogus domain name
- 	handling.
-
-Mon Jul 22 1996
-
-	* lib/krb/mk_req.c: Use encrypt_ktext()
-
-	* configure.in, lib/kafs/afssys.c: Add option to exclude AFS
- 	support (this is useful only on AIX systems that doesn't have
- 	AFS).
-
-	* configure.in: Removed configuration from subdirectories.
-
-Sat Jul 13 1996
-
-	* appl/ftp/ftp/extern.h, appl/ftp/ftp/ftp.c: Substitute `struct
- 	fd_set' with `fd_set'.
-
-Mon Jul 8 1996
-
-	* Makefile.in: install should depend on all.
-
-Sun Jul 7 1996
-
-	* appl/bsd/su.c: Allow root to set the uid without entering a
- 	password.
-
-Fri Jul 5 1996
-
-	* lib/krb/getrealm.c: Add automatic dns realm search.
-
-Thu Jul 4 1996
-
-	* lib/krb/log.c (krb_log): Renamed k_log(...) to krb_log(...) for
- 	compatibility with CNS. There is still a #define k_log krb_log.
-
-	* util/et/et_list.c: Hack to resolve _et_list in shared libraries.
-
-Fri Jun 28 1996
-
-	* appl/bsd/rlogin.c (reader): If after a select rlogin fails to
- 	read expected OOB data try to read ordinary data before	continuing.
-
-	* appl/bsd/rlogin.c (oob_real): SunOS5 tty race kludge.
-
-	* appl/bsd/rlogind.c: Cleanup oobdata stuff.
-
-Thu Jun 27 1996
-
-	* appl/bsd/login.c (main): Also check for complete tty name with
- 	`rootterm'.
-
-	* lib/krb/check_time.c: New function `krb_check_tm'.
-
-	* lib/roken/tm2time.c: New function `tm2time', mktime generalized
-	to local timezone and UTC.
-
-	* kadmin, admin: Use `tm2time' and `krb_check_time' instead of
- 	`maketime'.
-
-Tue Jun 25 1996
-
-	* lib/krb/mk_priv.c (krb_mk_priv): Send correct address.
-
-	* appl/kauth/kauthd.c: Set ticket file to some sane default, and
- 	add -i debugging switch.
-
-Mon Jun 24 1996
-
-	* appl/xnlock, appl/kauth, appl/telnet/telnetd: Use BINDIR and not
-	`/usr/athena/bin'.
-
-Wed Jun 19 1996
-
-	* appl/bsd/rlogin.c: consistent usage of oob_real.
-
-	* appl/bsd/rlogind.c: Do not send oob garbage when running
- 	solaris?  Seems that linux is unable to handle the duplicate
- 	urgent data that is the result.
-	
-	* appl/bsd/rlogind.c: Fix usage.
-
-	* appl/bsd/kcmd.c: Don't F_SETOWN.
-
-Mon Jun 17 1996
-
-	* lib/krb/rw.c: Add get_address() and put_address().
-
-
-	* appl/telnet/telnetd/telnetd.c: updated usage
-
-	* appl/bsd/su.c: Replaced getpass by des_read_pw_string
-
-	* appl/bsd/forkpty.c (ptym_open): Removed unused `ptr2'.
-
-	* appl/bsd/rlogind.c: Removed unused functions and made others
- 	static.
-
-Sun Jun 16 1996
-
-	* Release 0.9.
-	
-
-	* appl/ftp/ftpd/ftpd.c: Don't just send data in plain when doing
- 	NLST.
-
-
-	* configure.in: test for setresgid.
-
-	* kadmin/ksrvutil_get.c: Fixed byte manipulations of keys.
-
-Sat Jun 15 1996
-
-	* lib/des/rnd_keys.c (des_rand_data): At least `srandom'.
-
-	* appl/ftp/ftp/cmds.c: Support longer passwords when retrying
- 	login.
-
-	* kadmin/admin_server.c, man/kadmind.8, kth-krb.texi: Reading key
- 	file from file is now the default.  Use `-m' to enter it manually.
-  	`-n' is currently a no-op.
-
-	* appl/ftp/ftpd/ftpd.c: Add S/Key support.
-
-	* appl/ftp/ftpd/Makefile.in: Link with S/Key.
-
-	* appl/ftp/configure.in: Test for S/key.
-	
-	* configure.in, aclocal.m4: Moved skey test
-	to aclocal.m4.
-
-	* appl/bsd/login.c: Correct argument to `skeyaccess'.
-
-Fri Jun 14 1996
-
-	* lib/krb/verify_user.c: New parameter to specify service key
-	instance, NULL means "rcmd".
-
-	* lots of files: All ticket filenames uses `TKT_ROOT'.
-
-	* appl/bsd/rlogind.c: Check for uid == 0 and user != "root".
-
-Tue Jun 11 1996
-
-	* appl/kpopper/pop_init.c(pop_init): Got rid of some old ifdef'ed
-	code.
-
-	* lib/kdb/krb_dbm.c: Add macro for `dbm_delete' for the people
- 	that are ndbm challenged.
-
-Mon Jun 10 1996
-
-	* lib/krb/kname_parse.c: Got rid of duplicate defintions.
-
-	* appl/ftp/ftp/ruserpass.c: Get hostname even if user has no
- 	'.netrc' file.
-
-
-	* lib/kadm, lib/kdb, kadmin: Add database delete operation.
-
-	* lib/krb/kname_parse.c: Allow dots in instances.
-
-
-	* appl/bsd/rlogind.c (logwtmp): Only define `logwtmp' if it does
-	not exist.  Log more garbage.
-
-Sun Jun 9 1996
-
-	* appl/telnet/configure.in: Check for `logwtmp'.
-
-	* appl/ftp/configure.in: Use `AC_FUNC_MMAP'
-
-
-	* appl/bsd/forkpty.c: Removed all ugly pty search stuff from
- 	ptym_open().
-
-	* configure.in: Modified the creation of version.h, now actually
- 	shows up with ident.It is now also slightly more keen on creating
- 	a new version.h.
-
-Sat Jun 8 1996
-
-	* lib/roken/verify.c: <stdio.h> for NULL.
-
-	* appl/xnlock/xnlock.c (leave): Call XCloseDisplay, otherwise
- 	screen saver changes are not updated before closing the X
- 	connection.
-
-
-	* appl/bsd/utmp_login.c: Remove tty-prefix from ut_id; this field
- 	is usually very short.
-
-Fri Jun 7 1996
-
-	* slave/kpropd.c: Add option -m to merge rather then load
- 	database.
-
-Thu Jun 6 1996
-
-	* admin/kdb_util.c: Add a merge operation.  (One day it might be
- 	used to propagate only patches to the database)
-
-Wed Jun 5 1996
-
-	* appl/kpopper: Support both POP3 and KPOP3.
-
-	* appl/xnlock/xnlock.c: Use `verify_unix_user'
-
-	* lib/roken/verify.c: verify_unix_user: New function from xnlock
- 	for checking passwd in `/etc/passwd'.
-
-	* appl/telnet/telnetd/sys_term.c: gettimeofday buglet
-
-
-	* slave/kpropd.c: Rewrite of kpropd.
-
-	* admin/kdb_util.c: Sanity check on input to load_db.
-
-	* slave/kpropd.c: Use default value for fname.
-
-	* slave/kprop.c: Use some sane default values for data_file and
- 	slaves_file.
-
-	* admin/kdb_util.c: If there isn't any database when loading,
- 	create an empty one.
-
-Mon Jun 3 1996
-
-	* appl/telnet/telnetd/sys_term.c: Somewhat changed the way utmpx
- 	entries are created. It should now work on both Solaris and IRIX,
- 	without stale login information.
-
-Sat Jun 1 1996
-
-	* lib/krb/k_gethostname.c (k_gethostname): Fallback.
-
-	* lib/krb/send_to_kdc.c (send_to_kdc),
-	  kadmin/kadm_ser_wrap.c (kadm_ser_init),
-	  slave/kprop.c (prop_to_slaves),
-	  slave/kpropd.c (main): Use `k_getportbyname'.
-
-Fri May 31 1996
-
-	* Lots of files: more #includes ifdefad and cleaned up.
-
-Thu May 30 1996
-
-	* Lots of files: Replaced bcopy/bzero/bcmp with
- 	memcpy/memset/memcmp.
-
-
-	* lib/krb/get_default_principal.c: Use getlogin() if it is the BSD
- 	variant that actually gives some information.
-
-	* lib/krb/create_ticket.c: Write correct address byteorder.
-
-	* lib/kadm/kadm_stream.c,kadm_cli_wrap.c: Don't assume int32_t is
- 	four bytes.
-
-	* kadmin/kpasswd.c: Allow principal without -n.
-
-	* kadmin/kadmin.c: Use krb_get_default_principal.
-
-	* appl/ftp/ftpd/ftpd.c: Fix bare newline bug.
-
-	* appl/bsd/rlogind.c: Add -i and -p options to start rlogind from
- 	command line (for debugging).
-
-	* INSTALL: Rewritten.
-
-Wed May 29 1996
-
-	* appl/ftp/ftp/krb4.c: Handle different sizes of returned
- 	checksum.
-
-
-	* appl/bsd/Makefile.in: Don't install login setuid.
-
-Fri May 24 1996
-
-	* appl/bsd/rsh.c: Don't run away yelling if someone calls you
- 	`remsh'.
-
-Sun May 19 1996
-
-	* lib/krb/kdc_reply.c: Remove unused function decrypt_tkt. Sanity
- 	check on decrypted ticket.
-
-Wed May 15 1996
-
-	* server/kerberos.c: Should work with the new libkrb
-
-	* appl/kip: Support more than one tunnel device.
-
-
-	* lib/krb/*.c: All functions that create or decode kerberos
- 	packets have been rewritten.  Hopefully, everything still
- 	works. This is to eliminate problems with wierd systems, like
- 	Crays, that doesn't have any two or four byte integers. Some of
- 	these changes could be a lot more pretty, and *many* assumptions
- 	that sizeof(int32) == 4 still exist in the rest of the code,
- 	though.
-
-	As a side effect, all packets sent are now in network byte order.
-
-Mon May 13 1996
-
-	* configure.in: Shared libraries for Irix
-
-
-	* Several fixes for UNICOS.
-
-	* appl/ftp/ftp/krb4.c: Allow default data protection level through
- 	a "prot level" in .netrc. This really should be done in a more
- 	useful manner.
-
-Sun May 12 1996
-
-	* appl/xnlock/xnlock.c: Cleaned up user verification code. Now
- 	uses new function krb_verify_user.  Also fixed a few problems with
- 	the password prompt box.
-
-	* lib/krb/verify_user.c: New function krb_verify_user to verify a
- 	user with kerberos.
-
-
-	* appl/kip: New program for forwarding IP packets over kerberised
-	connections using tunnel devices.
-
-	* appl/kauth/kauth.c, kadmin/ksrvutil.c: Use
- 	krb_get_default_principal
-
-	* appl/bsd/rlogind.c: Do not change portnumber to host order if
- 	using kerberos.  This will cause the magic
- 	`reverse-time-if-port-is-less-than' to fail.
-
-	* lib/des/GNUmakefile: Removed file.  This file causes problem
-	when building in the source directory and when using GNU make
-	which prefers this file to the generated Makefile.
-
-	* appl/bsd/login.c: More careful when handling returned value from
- 	`getspnam'.
-
-Sat May 11 1996
-
-	* lib/krb/realm_parse.c: New function to expand a non-complete
- 	realm to its official name, e.g nada -> NADA.KTH.SE.
-
-	* lib/krb/get_default_principal.c: New function to guess the
- 	default principal to use. Looks at any existing ticket file first,
- 	then at uid/logname etc.
-
-
-	* kadmin/kadmin.c: Use kname_parse and allow different instances
- 	and realms.
-
-	* lib/roken/k_getpwnam.c: New function k_getpwnam that should work
- 	with and without shadow passwords.
-
-	* Lots of files: s/getpwnam/k_&/g.
-
-Tue May 7 1996
-
-	* lib/des/des_locl.h: DES library updated to version 3.23,
- 	des_locl.h now includes configure.h to get HAVE_TERMIOS etc.
-
-	* lib/des/des.h: On the alpha define DES_LONG to unsigned int.
-	
-
-	* kuser/kinit.c: Handle passwords longer than 16 characters.
-
-	* appl/xnlock/xnlock.c (GetPasswd): Handle longer passwords than
-	16 characters.
-
-Sun May 5 1996
-
-	* Release 0.8.
-
-
-	* appl/ftp/ftpd/kauth.c: Klist command.
-
-
-	* appl/ftp/ftpd: Removed `-g' from calls to ls.
-
-	* appl/ftp/ftp/cmds.c (setpeer): Fix so that opening a second
-	connection to a specified port works.
-
-	* appl/telnet/telnet: Default is binary.
-
-	* appl: Now build under Ultrix.
-
-	* appl/kx: Now even builds on AIX.
-
-Sat May 4 1996
-
-	* lib/des: Now merged in libdes 3.21 on main branch.
-
-
-	* appl/ftp/ftpd/logwtmp.c: Slightly different functionality. Works
- 	on systems that has more fields in struct utmp such as OSF/1.
-  	Still some questions about Solaris.
-
-	* lib/krb/lsb_addr_comp.c: Now byteorder independent.
-
-
-	* appl/kx: Rewrote kx & kxd to share more code.  They are also now
- 	able to talk both ways.
-
-	* lib/kdb/krb_dbm.c (kerb_db_rename): Now works properly when
-	using berkeley DB.
-
-Thu Apr 25 1996
-
-	* lib/krb/get_krbrlm.c (krb_get_default_realm): New function for
- 	SunOS5 compat.
-
-	* When building shared libraries link libkrb with libdes to be
- 	compatible with SunOS5.
-
-	* Move lib/krb/krb_err.et to lib/kadm since it is only used there,
- 	no longer need to link libkrb against libcom_err.
-	
-Wed Apr 24 1996
-
-	* lib/krb/lsb_addr_comp.h: Renamed ugly lsb_addr_comp.
-
-	* Some porting to UNICOS.
-
-Tue Apr 23 1996
-
-	* Moved some junk from appl/bsd to libroken.
-	
-	* lib/roken/Makefile.in (LIBNAME): Added header file roken.h for
- 	library libroken.a.
-
-
-	* Add kerberized ftp.
-
-	* Add libroken.
-
-Mon Apr 22 1996
-
-	* appl/kauth/kauth.c: When commands are given to kauth, a new
- 	ticket file is used.
-
-Sat Apr 20 1996
-
-	* appl/xnlock/xnlock.c: Fixed a potential overwrite bug. Also
- 	works with more than one screen, only fancy stuff on screen 0,
- 	though.
-
-Fri Apr 19 1996
-
-	* appl/bsd/login.c, su.c, rshd.c, rlogind.c: Syslog and abort when
- 	getpwnam returns uid == 0 but user is not root. This is usually
- 	the result of an attack on NIS (former YP).
-
-Wed Apr 17 1996
-
-	* kadmin/ksrvutil.c (get_key_from_password): Support for
- 	generating AFS keys.  From <flag@it.kth.se>
-
-Sun Apr 14 1996
-
-	* appl/kx: New program for forwarding a X connection.
-
-Mon Apr 8 1996
-
-	* appl/bsd/rsh.c (get_shell_port): Default port number for ekshell
- 	changed from 2106 to 545.
-
-	* appl/bsd/login.c (doremotelogin): Remove terminal speed from the
- 	value of $TERM in the case of an ancient rlogind being used.
-
-Thu Apr 4 1996
-
-	* lib/kafs/afssys.c (k_afsklog): Try to read from
-	/usr/vice/etc/TheseCells for list of cells we should try to obtain
-	tokens for.
-
-	* appl/kauth/kauth.c (renew): Use cell even when renewing.
-	
-	* appl/kauth/kauth.c, appl/xnlock/xnlock.c: Always call k_afsklog
- 	with realm == NULL.
-
-
-	* lib/kafs/afssys.c: More thorough guessing of what realm a cell
- 	belongs to.
-
-Wed Apr 3 1996
-
-	* appl/bsd/login.c: If setuid() failes and not logging in as root,
- 	exit.
-
-Tue Apr 2 1996
-
-	* server/kerberos.c: Set name, inst, and realm to NULL in
- 	APPL_REQUEST, error replies tend to look a bit funny otherwise.
-
-Thu Mar 28 1996
-
-	* appl/bsd/iruserok.c (iruserok): Imported iruserok() FreeBSD.
-
-Tue Mar 26 1996
-
-	* lib/des/Makefile.in: Removed enc_read.c enc_writ.c.
-	
-	* appl/bsd/Makefile.in: New file with the old functions from
- 	libdes.
-
-
-	* appl/bsd/utmp_login.c: Fixed (hopefully) double utmp-entries in
- 	Solaris. Only put entries in one of utmp/utmpx, since they both
- 	get updated by putut*ent() anyway.
-
-Mon Mar 25 1996
-
-	* kuser/klist.c (main): Use verbose option (-v) to list key
- 	version numbers.
-
-
-	* Release 0.7.
-
-Sun Mar 24 1996
-
-	* appl/bsd/rlogin.c (doit): Moved signal junk (as far as possible)
-        to doit().
-
-
-	* configure.in: Check for getmsg with AC_TRY_RUN instead.
-	Otherwise it fails under AIx 3.2.  Now rlogind works on this
-	so-called OS.  Also cache value of berkeley db check.
-
-
-	* lib/kdb/krb_kdb_utils.c: New experimental masterkey generation,
- 	enabled with --enable-random-mkey. This makes kdb_init et al
- 	generate random master keys, based on random input from the
- 	user. This comes in a package with auto-kstash, and possibility to
- 	enter lost master keys as base64.
-
-	Moved default master key file from /.k to
- 	/var/kerberos/master-key, override with --with-mkey=file.
-
-
-	* kadmin/kadmin.c (do_init): Handle the `-t' option to kadmin,
-	meaning do not get a new ticket file.  (From CNS).
-
-Fri Mar 22 1996
-
-	* appl/xnlock/xnlock.c: Removed some dead code, and a few unused
- 	header files.
-
-
-	* kadmin/pw_check.c (kadm_pw_check): If kadm_pw_check()
- 	fails *pw_msg can't be 0! At the very least use the
-	empty string but a descriptive error-message is preferred.
-
-	* libtelnet: add nonbroken signal() function.
-
-Wed Mar 20 1996
-
-	* appl/kpopper/pop_pass.c (pop_pass): Use kuserok to determine if
-	user is allowed to fetch mail.
-
-	* appl/kpopper/*. Got rid of some ugly codes and some warnings.
-
-	* appl/bsd/Makefile.in: signal.o was not included in OBJECTS,
-	which made strange makes not doing what they should.
-
-	* configure.in, appl/kpopper/popper.h, appl/bsd/pathnames.h: Now
- 	should work on systems that do not have mail spool files in
- 	/var/spool/mail.  Looks for MAILDIR or _PATH_MAILDIR, usually from
- 	<paths.h> or <maillock.h>.  Defaults to /var/spool/mail.
-
-Mon Mar 18 1996
-
-	* appl/bsd/bsd_locl.h: TIOCPKT for those systems missing it.
-
-Fri Mar 15 1996
-
-	* lib/kafs/kafs.h: Use <sys/ioctl.h> instead of <sys/ioccom.h>
-
-	* appl/bsd/rshd.c (doit): Don't set environ, send it as an
- 	argument to execle instead.
-
-	* lib/kafs/kafs.h: Find definition of _IOW.
-
-	* configure.in: Check for random.
-
-	* appl/bsd/bsd_locl.h: Including <crypt.h> gives too many conflicts.
-
-	* appl/afsutil/pagsh.c: Check for random.
-
-Thu Mar 14 1996
-
-	* appl/bsd/bsd_locl.h, appl/telnet/telnetd/defs.h: Default values
-	of `TIOCPKT_FLUSHWRITE' & c:o.
-
-	* appl/telnet/telnet{,d}/Makefile.in (telnetd): Change order of
-	linking in libraries.
-
-	* configure.in: Check for interesting functions in libsocket and
-	libnsl and not strange soriasis inventions.
-
-Wed Mar 13 1996
-
-	* appl/bsd/bsd_locl.h (fatal): Only use prototype or iruserok if
-	the function does not exist.
-
-Mon Mar 11 1996
-
-	* lib/krb/krb_err_txt.c (krb_get_err_text): Changed name of
- 	krb_err_msg to krb_get_err_text(int) to be compatible with the CNS
- 	distribution. This function is used for instance by CVS-1.7.
-
-Sun Mar 10 1996
-
-	* configure.in, appl/Makefile.in: removed rkinit
-
-	* etc/inetd.conf.changes, etc/services.append: Added kauth.
-
-	* appl/kauth: Integrated rkinit into kauth.
-	
-	* appl/kauth/kauth.c (main): Only look for principal name if no -p
-	has been given.
-
-	* lots of files: prototypes and other small fixes.
-	
-	* appl/bsd/sysv_shadow.h: spwd multiple defined.
-
-	* appl/bsd/bsd_locl.h: include <crypt.h>
-
-	* configure.in: Added afsutil and rkinit.
-
-	* */Makefile.in: Do cd $$i && $(MAKE).  Otherwise, if cd fails you
-	end up with an infinite recursion.
-
-	* kuser/klist.c (display_tktfile): Another warning removed.
-
-Tue Mar 5 1996
-
-	* appl/bsd/forkpty.c (forkpty): Kludge for Ultrix, rlogind now
- 	works properly also under this system.
-
-
-	* appl/afsutil: New aklog and pagsh
-
-
-	* lib/krb/krb_equiv.c (krb_equiv): Fix bugs with '\\'.
-
-	* lib/des/rnd_keys.c: Include <sys/time.h>.
-
-Mon Mar 4 1996
-
-	* appl/kauth/kauth.c (main): Handle name when given after options.
-
-Sun Mar 3 1996
-
-	* appl/rkinit/rkinit.c (getalladdrs): Check for herror.  Solaris
-	apparently does not have any.
-	(main): Use memset instead of bzero.
-
-	* appl/rkinit/rkinitd.c (decrypt_remote_tkt): bcopy -> memcpy.
-
-	* kuser/kinit.c (main): Corrected lifetime.
-
-	* lib/krb/krb_equiv.c (krb_equiv): Now handles longer lines,
-	continuation lines and addresses of the form 193.10.156.0/24.
-
-
-	* kuser/Makefile.in (kdestroy): Link kdestroy with libkafs.
-
-Wed Feb 28 1996
-
-	* Replaced all occurencies of krb_err_txt[] with new function
- 	krb_err_msg(), that does some sanity checks before indexing
- 	krb_err_txt.
-
-Mon Feb 26 1996
-
-	* appl/telnet/telnetd: Added flags -z to have telnetd log
- 	unauthenticated logins, such as when using an old telnet
- 	client. Unfortunately in most of these cases, the user name is not
- 	known.
-	
-	There should also be a way to tell the difference between bad
- 	authentication (such as with expired tickets) and no attempt to
- 	provide authentication (such as with an old client).
-
-Sun Feb 25 1996
-
-	* kuser/kdestroy.c: Remove afs-tokens as well as tickets, -t flags
- 	added to prevent this.
-
-Thu Feb 22 1996
-
-	* appl/rkinit/rkinitd.c (doit): Use k_getsockinst to make it work
-	correctly for multi-homed hosts.
-
-	* appl/rkinit: New program with rkinit functionality.
-
-	* lib/krb/k_getport.c: Function for finding port in /etc/services
-	with fallback.
-
-	* lib/krb/netread.c,netwrite.c (krb_net_{read,write}): Now correct
-	prototype with void * and size_t.
-
-Wed Feb 21 1996
-
-	* kadmin/new_pwd.c (get_pw_new_pwd): Moved get_pw_new_pwd to
-	seperate file.  Now called both from kadmin and kpasswd.
-
-	* kadmin/pw_check.c (kadm_pw_check): Handle the case of no
-	password provided.  This is really a policy decision.  The server
-	should be able to say `use a client that sends the password'.
-
-	* appl/bsd/rlogind.c (local_domain): MAXHOSTNAMELEN -> MaxHostNameLen.
-
-Sun Feb 18 1996
-
-	* appl/bsd/rcp.c (answer_auth): Made rcp multihome aware.
-
-	* appl/bsd/rlogind.c (do_krb_login): Made rlogind multihome aware.
-
-	* appl/bsd/rshd.c (doit): Made rshd multihome aware.
-
-	* lib/krb/k_getsockinst.c (k_getsockinst): New function to figure
-        out the instance name of interfaces on multihomed hosts. Use this
-        function when making daemons multihome aware.
-
-	* appl/telnet/libtelnet/kerberos.c (kerberos4_is): Made telnetd
-        multihome aware.
-
-Mon Feb 12 1996
-
-	* Release 0.6.
-
-Sun Feb 11 1996
-
-	* lots of files: hacks to make it all compile.
-
-	* configure.in, appl/telnet/configure.in: More broken AIX.
-
-
-	* appl/bsd/bsd_locl.h: Fix for old syslogs (as in Ultrix).
-
-
-	* appl/telnet/libtelnet/encrypt.c: encrypt_verbose by default.
-
-
-	* appl/telnet/libtelnet/kerberos.c: Show difference between
- 	MUTUAL and ONE_WAY KERBEROS4.
-
-	* appl/telnet/libtelnet/encrypt.c:
-	Print message about not encrypting when receiving WONT or DONT encrypt.
-
-
-	* configure.in: Automatic check for HAVE_NEW_DB.
-
-
-	* lib/krb/getaddrs.c (k_get_all_addrs): Fixed for systems with
-        SOCKADDR_HAS_SA_LEN, aka 4.4BSD-based.
-
-	* appl/telnet/telnetd/global.c: Removed some multiple defined
-        variables.
-
-	* appl/bsd/rlogind.c (cleanup): ifndef HAVE_VHANGUP.
-
-	* appl/bsd/sysv_shadow.h: Add DAY and DAY_NOW ifndef.
-
-	* configure.in: Check if `struct sockaddr' has `sa_len'.
-
-Sat Feb 10 1996
-
-	* appl/telnet/telnetd/telnetd.c (recv_ayt): pty -> ourpty.
-
-	* appl/bsd/bsd_locl.h: More include-files: <sys/uio.h> and <userpw.h>
-
-	* appl/kpopper/popper.c (catchSIGHUP): Got rid of some warnings.
-
-	* lib/krb/log.c (new_log): Yet another year 2000.
-
-	* appl/bsd/sysv_environ.c (read_etc_environment): Support setting
-	environment variables from /etc/environment.
-
-	* appl/bsd/bsd_locl.h: <usersec.h>
-
-	* configure.in: check for setpcred, libs.a and <usersec.h>.
-
-	* appl/bsd/login.c (main): setpcred is used on AIX.
-
-	* appl/bsd/rshd.c (doit): Added setpcred for AIX.
-
-	* lib/krb/getaddrs.c: <sys/sockio.h> is sometimes needed.
-
-	* admin/kdb_init.c (main): Now verifies master key.
-
-	* lib/kdb/krb_kdb_utils.c (kdb_get_master_key): Added possibility
-	of asking for verfication.
-
-	* appl/bsd/bsd_locl.h: Try to include <sys/stream.h>
-
-	* appl/telnet/telnetd/utility.c (printsub): Mismatch arguments.
-
-	* lib/krb/send_to_kdc.c (send_to_kdc): Send to all A records and
-	accept an answer from anything we have sent to.
-
-	* appl/kauth/kauth.c (renew): Use strange return types for strange
-	OSes.
-	(doexec): Remove tokens.
-
-	* server/kerberos.c (main): Uses k_get_all_addrs and binds to each
-	of these addresses.
-
-	* kadmin/ksrvutil_get.c (ksrvutil_get): Added support for
-	specifying key to create on command line to get.
-
-Wed Feb 7 1996
-
-	* lib/krb/log.c (k_log): Now using YYYY for years.
-
-	* lib/krb/klog.c (klog): Preparing for the year 2000.
-
-	* kuser/kinit.c (main): Added option -p to get changepw-tickets.
-
-	* lib/krb/getaddrs.c: New file to get all the addresses of all the
-	interfaces on this machine.
-
-Tue Feb 6 1996
-
-	* configure.in: Support for S/Key in login.c. Use --with-skeylib
-        switch to configure. The code assumes that the skeylib.a comes
-        from logdaemon.
-
-	* General support for shadow password files if there is an
-        shadow.h.
-
-	* appl/bsd/su.c: Arrange so that it supports shadow passords.
-
-Sun Feb 4 1996
-
-	* appl/telnet/*: Hacks to make it work on strange OSes.
-
-	* appl/bsd/bsd_locl.h: Check for sys/ptyvar.h
-
-	* appl/telnet/configure.in (telnet_msg): sys/str_tty.h, sys/uio.h
-
-	* configure.in: test for crypt.h and sys/ptyvar.h
-
-	* appl/telnet/telnetd/*.c: pty -> ourpty.
-
-
-	* telnetd: Changes to make more systems work better, specifically
- 	AIX 4. Hopefully this will work on both STREAM and BSD
- 	systems. Not tested on some systems, like CRAY and Linux.
-
-
-	* util/ss/mk_cmds.c: Generating cleaner code.
-
-	* lib/krb/krb_err_txt.c (krb_err_txt): Clarification.
-
-	* kadmin/admin_server.c: Less varnings.
-
-	* appl/xnlock/xnlock.c: Changed some types and added some casts.
-
-	* appl/movemail/movemail.c: Not using syswait.h anymore.
-
-	* appl/xnlock/xnlock.c: God rid of some warnings.
-
-	* util/ss/*.[ch]: cleanup
-
-	* util/et/*.[ch]: cleanup
-
-	* appl/bsd/rcp.c: Less warnings.
-
-	* kadmin/admin_server.c (kadm_listen): Get rid of another warning.
-
-	* kadmin/pw_check.c (kadm_pw_check): Support for letting cracklib
-	check the quality of the password.
-
-	* kadmin/pw_check.h (kadm_pw_check): New argument to
-	kadm_pw_check: list of useful strings to check for.
-
-	* kadmin/kadm_server.c (kadm_ser_cpw): Send a few `useful' strings
-	to kadm_pw_check (name, instance, and realm).
-
-	* kadmin/Makefile.in (kadmind): Linking with -lcrack.
-
-	* configure.in: Support for --with-cracklib and --with-dictpath.
-
-	* kadmin/ksrvutil_get.c: Now seems to be working.
-
-	* kadmin/ksrvutil.h: Some new parameters.
-
-	* kadmin/ksrvutil.c: Some reorganisation and uses a working
-	ksrvutil_get.
-
-	* appl/movemail/movemail.c: Some more include-files.
-
-	* appl/bsd/rlogind.c: Testing for the existence of vhangup.
-
-Wed Jan 31 1996
-
-	* configure.in: Massaged the configure files so that we can build
-        under NEXTSTEP 3.3. Some kludges to prevent cpp bugs and link
-        errors where also neccessary.
-
-Tue Jan 30 1996
-
-        * appl/xnlock/xnlock.c (main): Improved user feedback on password
-        input.
-
-	* appl/xnlock/xnlock.c: Applied patch made by flag@it.kth.se that
-        enables C-u to erase the password field.
-
-	* lib/krb/lifetime.c: configure now creates a version string which
-        is referenced here. Use what and grep version to figure out where,
-        when and by whom binaries where created.
-
-	* appl/bsd/forkpty.c (ptys_open): Call revoke before pty slave is
-        opened. Add revoke using vhangup for those system lacking revoke.
-        Also call vhangup when rlogind exits.
-
-Mon Jan 29 1996
-
-	* lib/krb/send_to_kdc.c (send_to_kdc): Removed kludge for SunOS
-        3.2 and Ultrix 2.2 that prevented multihomed kerberos servers to
-        operate correctly.
-
-	* kadmin/kadmin.c (change_key): Add new subcommand change_key so
-        that it is possible to enter keys in the DB on binary form. Most
-        usefull for sites running AFS.
-
-Fri Jan 26 1996
-
-	* appl/bsd/su.c (koktologin): New option -i root-instance. If you
-        want a user.afs ticket in a root shell and user.afs is on root's
-        ACL then do a "su -i afs".
-
-	* Makefile.in: Rearrange the order of object files to make shared
-        libraries slightly more efficient.
-
-	* appl/kauth/kauth.c (main): Always up case realm. Better error
-        messages on failed exec.
-
-Mon Jan 22 1996
-
-	* appl/bsd/rshd.c (main): New option -P to prevent rshd from using
-        a new PAG. Expert use only!
-
-	* appl/bsd/rlogind.c (doit): Avoid race when setting tty size.
-
-	* appl/bsd/rlogin.c (reader): Use select rather than horrible
-        signal hacks to handle OOB data.
-
-	* appl/bsd/login.c (main) sysv_environ.c (sysv_newenv): Login does
-        now honor the -p switch when invoked by root. This is used by
-        telnetd to export environment variables.
-
-Fri Jan 5 1996
-
-	* appl/bsd/signal.c (signal): New BSD compatible signal
-        function. Most r* applications assume reliable signals.
-
-
-	* appl/bsd/login.c (main): Check HAVE_ULIMIT.
-
-	* appl/bsd/bsd_locl.h: Include sys/ioctl.h.
-
-	* configure.in: Check for ulimit.
-
-	* admin/kdb_edit.c: Flush stdout after printing prompts.
-
-	* appl/kpopper/pop_xmit.c: Remember to include config.h.
-
-Tue Jan 2 1996
-
-	* appl/bsd/login.c (main): New function stty_default to setup
-        default tty settings.
-
-Fri Dec 29 1995
-
-	* appl/kstring2key/kstring2key.c (main): New program that converts
-        passwords to DES keys, either using des_string_to_key or
-        afs_string_to_key.
-
-	* server/kerberos.c: Kerberos server now listen on 2 ports,
-        kerberos/udp and kerberos-sec/udp.
-
-Wed Dec 27 1995
-
-	* appl/bsd/rcp.c (main): Integrated -x option to rcp. This
-        required some real horrible hacks in lib/des/enc_{read,write}.c
-
-	* acconfig.h: Enabled MULTIHOMED_KADMIN in acconfig.h.
-
-	* Add RCSID stuff to telnet files.
-
-Fri Dec 22 1995
-
-	* appl/bsd/login.c (main): The login program does now by default
-	read /etc/default/login, even on non Psoriasis systems. Unifdef
-	SYSV4, this was essentially only for prompting.
-
-Mon Dec 18 1995
-
-	* appl/kpopper/popper.c (main): Integrate default timeout of 120
-        seconds from Qualcomm popper. Timeout is also set able with -T
-        seconds.
-
-
-	* lib/kadm/kadm_cli_wrap.c (kadm_change_pw_plain): If there's no
-	password, don't even send the empty string.
-
-Thu Dec 7 1995
-
-	* lots of files: all debug messages now printed to stderr (from
- 	<lama@pdc.kth.se>)
-
-	* lib/krb/tf_util.c (tf_create): New method for creating a new
- 	ticket file.  Remove the old old and then open with O_CREAT and
- 	O_EXCL.
-
-	* server/kerberos.c, slave/kpropd.c: Some casts to get rid of warnings.
-
-	* configure.in: Added checks for unistd.h, memmove and const.
-
-	* appl/telnet/telnet/commands.c: Changed types of functions to
-	confirm with struct Command.
-
-	* appl/telnet/configure.in: Check for setpgid.
-
-	* appl/bsd/rlogin.c: Get rid of another warning.
-
-	* appl/bsd/bsd_locl.h, appl/telnet/acconfig.h: New synonym for
- 	solaris.
-
-Wed Dec 6 1995
-
-	* (movemail): Now from emacs-19.30. If you have a newish emacs
- 	there is no reason to use this movemail.
-
-	* (kadm): Added support for server side password checks. Hopefully
- 	this is compatible with kerberos 4.10. Old kpasswd:s will give
- 	funny error messages. For examples of checks, see
- 	kadmin/pw_check.c. Since this is mostly political matters,
- 	kadm_pw_check() should probably return KADM_SUCCESS by default.
-
-Mon Nov 27 1995
-
-	* appl/telnet/telnetd/telnetd.c (main): Kludge to fix encryption
-        problem with Mac NCSA telnet 2.6.
-
-
-	* lib/krb/stime.c: Now using YYYY for years.  (2000 is soon here).
-
-	* appl/bsd/rsh.c, rcp.c, rlogin.c: Fixed fallback for port number
- 	(added missing ntohs).
-
-Sun Nov 12 1995
-
-	* (many files): More ANSI/ISO 9899-1990 to the people!  
-	Now actually builds (not including util) with DEC "cc -std1" and
- 	Sun "acc -Xc".  There are still major prototype conflicts, but
- 	there isn't much to do about this.
-
-Sat Oct 28 1995
-
-	* lib/kadm/kadm_cli_wrap.c: Fallback for kerberos and
- 	kerberos_master services.
-
-Fri Oct 27 1995
-
-	* Released version 0.5
-
-
-	* lib/des/read_pwd.c: Redifine TIOCGETP and TIOCSETP so that the
-        same code is used both for posix termios and others.
-
-	* rsh, rlogin: Add environment variable RSTAR_NO_WARN which when
-	set to "yes" make warnings about "rlogin: warning, using standard
-	rlogin: remote host doesn't support Kerberos." go away.
-
-Tue Oct 24 1995
-
-	* admin/kdb_util.c (load_db) lib/kdb/krb_dbm.c (kerb_db_update):
-        Optimized so that it can handle large databases, previously a
-        10000 entry DB would take *many* minutes, this can now be done in
-        under a minute.
-
-Sat Oct 21 1995
-
-	* Changes in server/kerberos.c, kadmin/*.c slave/*.c to support 64
-        bit machines. Source should now be free of 64 bit assumptions.
-
-	* admin/copykey.c (copy_from_key): New functions for copying to
-        and from keys. Neccessary to solve som problems with longs on 64
-        bit machines in kdb_init, kdb_edit, kdb_util and ext_srvtab.
-
-	* lib/kdb/krb_kdb_utils.c (kdb_verify_master_key): More problems
-        with longs on 64 bit machines.
-
-Mon Oct 16 1995
-
-	* appl/bsd/login.c (main): Lots of stuff to support Psoriasis
-        login. Courtesy of gertz@lysator.liu.se.
-
-	* configure.in, all Makefile.in's: Support for Linux shared
-        libraries. Courtesy of svedja@lysator.liu.se.
-
-	* lib/krb/cr_err_reply.c server/kerberos.c: Moved int req_act_vno
-	= KRB_PROT_VERSION; from server kode to libkrb where it really
-	belongs.
-
-        * appl/bsd/forkpty.c (forkpty): New function that allocates master
-        and slave ptys in a portable way. Used by rlogind.
-
-	* appl/telnet/telnetd/sys_term.c (start_login): Under SunOS5 the
-	same utmpx slot got used by sevral sessions. Courtesy of
-	gertz@lysator.liu.se.
-
-Wed Oct 4 1995
-
-	* util/{ss, et}/Makefile.in (LEX): Use flex or lex. Courtesy of
-        svedja@lysator.liu.se.
-
-	* Fix the above Makefiles to work around bugs in Solaris and OSF/1
-        make rules that was triggered by VPATH functionality in the yacc
-        and lex rules.
-
-Mon Oct 2 1995
-
-	* appl/kpopper/pop_log.c (pop_log) appl/kpopper/pop_msg.c (pop_msg):
-	Use stdarg instead of varargs. The code is still broken though,
-	you'll realize	that on a machine with 64 bit pointers and 32 bit 
-	int:s and no vsprintf, let's hope there will be no such beasts ;-).
-
-	* appl/telnet/telnetd/sys_term.c (getptyslave): Not all systems
-	 have (or need) modules ttcompat and pckt so don't flag it as a
-	 fatal error if they don't exist.
-
-Mon Sep 25 1995
-
-	* kadmin/admin_server.c (kadm_listen) kadmind/kadm_ser_wrap.c
-	(kadm_listen): Add kludge for kadmind running on a multihomed
-	server. #ifdef:ed under MULTIHOMED_KADMIN. Change in acconfig.h
-	if you need this feature.
-
-	* appl/Makefile.in (SUBDIRS): Add applications movemail kpopper
-        and xnlock.
-
-Wed Sep 20 1995
-
-	* appl/bsd/rlogin.c (main): New rlogind.c, forkpty() is not
-        implemented yet though.
-
-Wed Sep 13 1995
-
-	* appl/xnlock/Makefile.in: Some stubs for X11 programs in
-        configure.in as well as a kerberized version of xnlock.
-
-	* appl/bsd/{rlogin.c, rsh.c, rcp.c}: Add code to support fallback
-        port numbers if they can not be found using getservbyname.
-
-Tue Sep 12 1995
-
-	* appl/bsd/klogin.c (klogin): Use differnet ticket files for each
-        login so that a malicous user won't be able to destroy our tickets
-        with a failed login attempt.
-
-	* lib/kafs/afssys.c (k_afsklog): First we try afs.cell@REALM, if
-	there is no such thing try afs@CELL instead. There is now two
-	arguments to k_afslog(char *cell, char *realm).
-
-Mon Sep 11 1995
-
-	* kadmin/admin_server.c (kadm_listen): If we are multihomed we
-        need to figure out which local address that is used this time
-        since it is used in "direction" comparison.
-
-Wed Sep 6 1995
-
-	* kadmin/kadm_ser_wrap.c (kadm_ser_init): Fallback to use default
-        port number.
-
-	* lib/krb/send_to_kdc.c (send_to_kdc): Default port number
-        (KRB_PORT) was not in network byte order.
-
-Tue Sep 5 1995
-
-	* lib/krb/send_to_kdc.c (send_recv): Linux clears timeout struct
-        when selecting.
-
-
-Mon Sep 4 1995
-
-	* appl/bsd/rcp.c, appl/bsd/rlogin.c, appl/bsd/rsh.c:
-	Now does fallback if there isn't any entries in /etc/services for
-	klogin/kshell. This also made the code a bit more pretty.
-
-
-	* appl/bsd/login.c: Added support for lots of more struct utmp fields.
-	If there is no ttyslot() use setutent and friends.
-
-	* appl/bsd/Makefile.in, appl/bsd/rlogind.c, appl/bsd/rshd.c:
-	Added extern iruserok().
-
-	* appl/bsd/iruserok.c: Initial revision
-
-	* appl/bsd/bsd_locl.h: Must include sys/filio.h on Psoriasis.
-
-	* appl/bsd/Makefile.in: New install
-
-	* appl/bsd/pathnames.h: Fix default path, rsh and rlogin.
-
-	* appl/bsd/rshd.c: Extend default PATH with bindir to find rcp.
-
-
-	* appl/bsd/login.c (login): If there is no ttyslot use setutent
-	and friends. Added support for lots of more struct utmp fields.
-
-	* server/kerberos.c (main) lib/kafs/afssys.c appl/bsd/bsd_locl.h:
-        Must include sys/filio.h on Psoriasis to find _IOW and FIO* macros.
-
-	* appl/bsd/rlogind.c (doit): Use _PATH_DEFPATH rather than
-        _PATH_DEF.
-
-	* appl/bsd/login.c, su.c (main): Use fallback to bourne shell if
-        running as root.
-
-	* appl/bsd/su.c (main): Update usage message to reflect that '-'
-	option must come after the ordinary options and before login-id.
-
-Sat Sep 2 1995
-
-	* appl/telnet/telnetd/telnetd.c (doit): If remote host name is to
-	long to fit into utmp try to remove domain part if it does match
-	our local domain.
-
-	(main): Add new option -L /bin/login so that it is possible to 
-	specify an alternate login program.
-
-	* appl/telnet/telnet/commands.c (env_init): When exporting
-	variable DISPLAY and if hostname is not the full name, try to get
-	the full name from DNS.
-
-	* appl/telnet/telnet/main.c (main): Option -k realm was broken due
-        to a bogous external declaration.
-
-Fri Sep 1 1995
-
-	* kadmin/kadmin.c (add_new_key): Kadmin now properly sets
-	lifetime, expiration date and attributes in add_new_key command.
-
-Wed Aug 30 1995
-
-	* appl/bsd/su.c (main): Don't handle '-' option with getopt.
-
-	* appl/telnet/telnet/externs.h: Removed protection for multiple
-	inclusions of termio(s).h since it broke definition of termio
-	macro on POSIX systems.
-
-Tue Aug 29 1995
-
-	* lib/krb/lifetime.c (krb_life_to_time): If you want to disable
-	AFS compatible long lifetimes set krb_no_long_lifetimes = 1.
-	
-	Please note that the long lifetimes are 100% compatible up to
-	10h so this should rarely be necessary.
-
-	* lib/krb/krb_equiv.c (krb_equiv): If you don't want to use
-	ipaddress protection of tickets set krb_ignore_ip_address. This
-	makes it possible for an intruder to steal a ticket and then use
-	it from som other machine anywhere on the net.
-
-Mon Aug 28 1995
-
-	* kadmin/kadm_ser_wrap.c (kadm_ser_init): Don't bind to only one
-        local address. Accept request on all interfaces.
-
-	* admin/kdb_edit.c (change_principal): Don't accept illegal
-        dates. Courtesy of gertz@lysator.liu.se.
-
-Sat Aug 26 1995
-
-	* configure.in: AIX specific libraries needed when using standard
-        libc routine getttyent, IBM should be ashamed!
-
-	* lib/krb/recvauth.c (krb_recvauth): Long that should be int32_t
-        problem.
-
-	* Added strdup for su and rlogin.
-
-	* Fix for old syslog macros in appl/bsd/bsd_locl.
-
-Fri Aug 25 1995
-
-	* lib/kdb/krb_dbm.c (kerb_db_rename) admin/kdb_destroy.c: New
-        ifdef HAVE_NEW_DB for new databases residing in one file only.
-
-	* appl/bsd/rlogin.c (oob): Add workaround for Linux.
-
-Mon Aug 21 1995
-
-	* appl/bsd/getpass.c: New routine that reads up to 127 char
-        passwords. Used in su.c and login.c.
-
-Tue Aug 15 1995
-
-	* appl/telnet/telnetd/sys_term.c (login_tty): Ioctl TIOCSCTTY
-        should not be used on HP-UX.
-
-Mon Aug 14 1995
-
-	* appl/bsd/rlogin.c (main): Added dummy rlogind that tells user to
-        rather use telnet.
-
-Thu Aug 10 1995
-
-	* lib/krb/ krb.h, decomp_ticket.c, getrealm.c, get_krbhst.c,
-	get_krbrlm.c, get_admhst.c: 
-
-	Use multiple configuration directories for krb.conf and
-	krb.realms, KRB_CONF and KRB_REALM_TRANS macros substituted with
-	KRB_CNF_FILES and KRB_RLM_FILES. Currently /etc and
-	/etc/kerberosIV are searched. Directory specified by envioronment
-	variable KRBCONFDIR is searched first if set. No hardcoded
-	realmname or kerberos server. Instead use domainname for deafult
-	realm and kerberos.domain as kerberos server if they are not
-	listed in krb.conf and/or krb.realms. In the normal case there
-	should be no need for configuration files if administrators add a
-	CNAME pointing to the kerberos server.
-
-	* appl/bsd/Makefile.in and friends: GNU make should no longer be
-        neccessary unless building with VPATH.
-
-Wed Aug 9 1995
-
-	* appl/bsd/klogin.c (klogin): Old ticket file need to be removed
-	before we call krb_get_pw_in_tkt or we might get a Kerberos intkt
-	error because the wrong user owns the file.
-
-Tue Aug 8 1995
-
-	* configure.in : Telnet.beta2 is now official and has been moved
-        to appl/telnet.
-
-	* appl/bsd/su.c (main): Reenable -K flag, won't work if not
-        PASSWD_FALLBACK is enabled. Cosmetics for Password prompt.
-
-Fri Aug 4 1995
-
-	* appl/bsd/su.c (kerberos): Don't allow su from possibly bogous
-        kerberos server. Controlled by #ifdef KLOGIN_PARANOID.
-
-	* lib/kafs/afssys.c (SIGSYS_handler): Need to reinstall handler on
-        SYSV.
-
-Mon Jul 24 1995
-
-	* lib/kafs/afssys.c (k_afsklog): Use default realm on null argument.
-
-	* appl/bsd/rlogin.c, login.c: New programs.
-
-Fri Jul 21 1995
-
-	* appl/bsd/kcmd.c rsh.c rlogin.c: Use POSIX signals.
-
-	* appl/telnet.95.05.31.NE/telnetd/sys_term.c, telnetd.c: Port to
-        IRIX.
-
-Tue Jul 11 1995
-
-	* admin/kdb_init.c (main): Use new random generator.  Dito in
-	admin/kdb_edit.c. Use master key to initialize random sequence.
-
-Mon Jul 10 1995
-
-	* kadmin/kadmin.c (get_password): Fix for random passwords.
-	Dito for admin/kdb_edit.c
-
-	* appl/kauth/kauth.c (main): Updated for krb distribution, now
-        uses new library libkafs.
-
-	* appl/telnet.beta/telnet/main.c (main): New telnet with
-        encryption hacks from ftp.funet.fi:/pub/unix/security/esrasrc-1.0.
-        Encryption does not currently work though.
-
-Tue Jun 20 1995
-
-	* New library to support AFS. Routines:
-
-	  int k_hasafs(void);
-	  int k_afsklog(...);
-	  int k_setpag(void);
-	  int k_unlog(void);
-	  int k_pioctl(char *, int, struct ViceIoctl *, int);
-
-	  Modified it to support more than one single entry point AFS
-	  syscalls (needed by HPUX and OSF/1 when running DFS). Don't rely
-	  on transarc headers or library code.
-
-	  This has not been tested and will most probably need some
-	  serious violence to get working under AIX. (AIX has since been
-	  fixed to. /bg)
-
-Fri Jun 16 1995
-
-	* lib/krb/krb_equiv.c (krb_equiv): Compare IP adresses using
-        krb_equiv() to allow for hosts with more than one address in files
-        rd_priv.c rd_req.c and rd_safe.c.
-
-	* slave/kpropd.c (main): Fix uninitialized variables and rewind
-        file in kprop.c.
-
-Thu Jun 15 1995
-
-	* appl/bsd/rcp.c (allocbuf): Fix various bugs.
-
-	* slave/kpropd.c (main): Responder uses
-        KPROP_SERVICE_NAME.`hostname' and requestor always uses
-        KPROP_SERVICE_NAME.KRB_MASTER, i.e rcmd.kerberos in kprop/kpropd
-        protocol.
-
-Wed Jun 14 1995
-
-	* appl/bsd/rshd.c (doit): Encryption should now work both ways.
-
-Tue Jun 13 1995
-
-	* appl/bsd/pathnames.h: Fixup paths.
-
-	* server/Makefile.in and friends (install): Install daemons in in
-	libexec and administrator programs in sbin.
-
-
-	* Makefile.in: Joda (d91-jda) added install target
-
-Wed Jun 7 1995
-
-	* lib/krb/k_strerror.c: New function k_strerror() to use instead
-        of the non portable sys_errlist[].
diff --git a/crypto/kerberosIV/Makefile.in b/crypto/kerberosIV/Makefile.in
deleted file mode 100644
index afa77fbec745..000000000000
--- a/crypto/kerberosIV/Makefile.in
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: Makefile.in,v 1.30 1997/05/20 18:58:34 bg Exp $
-
-srcdir		= @srcdir@
-prefix		= @prefix@
-VPATH		= @srcdir@
-
-SHELL		= /bin/sh
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
-TRAVELKIT = appl/kauth/kauth kuser/klist appl/telnet/telnet/telnet \
-	    appl/ftp/ftp/ftp appl/kx/kx appl/kx/rxtelnet
-
-@SET_MAKE@
-
-SUBDIRS		= util include lib kuser server slave admin kadmin appl man doc
-
-all:
-	for i in $(SUBDIRS); \
-	do (cd $$i && $(MAKE) $(MFLAGS) all); done
-
-Wall:
-	make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
-
-check:
-	cd lib && $(MAKE) $(MFLAGS) check
-
-install:
-	$(MKINSTALLDIRS) $(prefix)
-	for i in $(SUBDIRS); \
-	do (cd $$i && $(MAKE) $(MFLAGS) install); done
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
-
-uninstall:
-	for i in $(SUBDIRS); \
-	do (cd $$i && $(MAKE) $(MFLAGS) uninstall); done
-
-travelkit:	all
-	$(MKINSTALLDIRS) tmp
-	for i in $(TRAVELKIT); \
-	do $(INSTALL_PROGRAM) $$i tmp; done
-	(cd tmp; tar cf ../travelkit.tar `for i in $(TRAVELKIT); do basename $$i; done`)
-	rm -rf tmp
-
-travelkit-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' travelkit
-
-TAGS:
-	find . -name '*.[chyl]' -print | etags -
-
-clean:
-	for i in $(SUBDIRS); \
-	do (cd $$i && $(MAKE) $(MFLAGS) clean); done
-
-mostlyclean:	clean
-
-distclean:
-	$(MAKE) clean
-	for i in $(SUBDIRS); \
-	do (cd $$i && $(MAKE) $(MFLAGS) distclean); done
-	rm -f Makefile config.status config.cache config.log version.h newversion.h.in version.h.in *~
-
-realclean:
-	for i in $(SUBDIRS); \
-	do (cd $$i && $(MAKE) $(MFLAGS) realclean); done
-
-.PHONY: all install install-strip uninstall travelkit travelkit-strip clean distclean realclean mostlyclean
diff --git a/crypto/kerberosIV/NEWS b/crypto/kerberosIV/NEWS
deleted file mode 100644
index cddbb2291699..000000000000
--- a/crypto/kerberosIV/NEWS
+++ /dev/null
@@ -1,563 +0,0 @@
-Minor changes in release 0.9.6:
-
-* utmp(x) works correctly on systems with utmpx.
-
-* A security-related bug in ftpd fixed.
-
-* Compiles on solaris 2.4, 2.6 and on WinNT/95 with cygwin32 beta18.
-
-* New option `-w' to rxtelnet, rxterm.
-
-Major changes in release 0.9.5:
-
-* We made some changes to be compatible with the other kerberised ftp
-  implementations and this means that an old kerberised ftp client will
-  not be able to talk to a new ftp server.  So try to upgrade your ftp
-  clients and servers at the same time.  The reason for this change is
-  described in more detail below.
-
-* The interpretation of /etc/ftpusers has changed slightly, see
-  ftpusers(5). These changes come from NetBSD.
-
-* The function `des_quad_cksum', which is used by `krb_rd_safe', and
-  `krb_mk_safe', has never been compatible with MIT's DES
-  library. This has now been fixed.
-
-  This fix will however break some programs that used those functions,
-  for instance `ftp'. In this version `krb_rd_safe' is modified to
-  accept checksums of both the new and the old format; `krb_mk_safe'
-  will always emit checksums of the new type *unless* `krb_rd_safe'
-  has detected that the client is using the old checksum (this feature
-  may be removed in some future release).
-
-  If you have programs that use `krb_mk_safe' and `krb_rd_safe' you
-  should upgrade all clients before upgrading your servers. Client is
-  here defined as the program that first calls `krb_rd_safe'.
-
-  If you are using some protocol that talks to more than one client or
-  server in one session, the heuristics to detect which kind of
-  checksum to use might fail.
-
-  The problem with `des_quad_cksum' was just a byte-order problem, so
-  there are no security problems with using the old versions. Thanks
-  to Derrick J Brashear <shadow@DEMENTIA.ORG> for pointing in the
-  right general direction.
-
-* Rewrote kx to work always open TCP connections in the same
-  direction.  This was needed to make it work through NATs and is
-  generally a cleaner way of doing it.  Also added `tenletxr'.
-  Unfortunately the new protocol is not compatible with the old one.
-  The new kx and kxd programs try to figure out if they are talking to
-  old versions.
-
-* Quite a bit of new functionality in otp.  Changed default hash
-  function to `md5'.  Fixed implementation of SHA and added downcasing
-  of seed to conform with `draft-ietf-otp-01.txt'.  All verification
-  examples in the draft now work.
-
-* Fixed buffer overflows.
-
-* Add history/line editing in kadmin and ftp.
-
-* utmp/utmpx and wtmp/wtmpx might work better on strange machines.
-
-* Bug fixes for `rsh -n' and `rcp -x'.
-
-* reget now works in ftp and ftpd.  Passive mode works.  Other minor
-  bug fixes as well.
-
-* New option `-g umask' to ftpd for specifying the umask for anonymous users.
-
-* Fix for `-l' option in rxtelnet and rxterm.
-
-* XOVER support in popper.
-
-* Better support for building shared libraries.
-
-* Better support for talking to the KDC over TCP.  This could make it
-  easier to use brain-damaged firewalls.
-
-* Support FreeBSD-style MD5 /etc/passwd.
-
-* New option `-createuser' to afslog.
-
-* Upgraded to work with socks5-v1.0r1.
-
-* Almost compiles and works on OS/2 with EMX, and Win95/NT with gnu-win32.
-
-* Merged in win32-telnet, see README-WIN32 for more details.
-
-* Possibly fixed telnet bug on HP-UX 10.
-
-* Updated man-pages.
-
-* Support for NetBSD/OpenBSD manual page circus.
-
-* Bug fixes.
-
-Major changes in release 0.9.3:
-
-* kx has been rewritten and is now a lot easier to use.  Two new
-  scripts: rxtelnet and rxterm.  It also works on machines such as
-  Cray where the X-libraries cannot talk unix sockets.
-	
-* experimental OTP (RFC1938).  Included in login, ftpd, and popper.
-
-* authentication modules: PAM for linux, SIA for OSF/1, and
-  afskauthlib for Irix.
-
-* popper now has the UIDL command.
-
-* ftpd can now tar and compress files and directories on the fly, also
-  added a find site command.
-
-* updated documentation and man pages.
-
-* Change kuserok so that it acts as if luser@LOCALREALM is always an
-  entry of .klogin, even when it's not possible to verify that there
-  is no such file or the file is unreadable.
-
-* Support for SRV-records.
-
-* Socks v5 support.
-
-* rcp is AFS-aware.
-
-* allow for other transport mechanisms than udp (useful for firewall
-  tormented souls); as a side effect the format of krb.conf had to
-  become more flexible
-
-* sample programs included.
-
-* work arounds for Linux networking bugs in rlogind and rlogin.
-
-* more portable
-
-* quite a number of improvments/bugfixes
-
-* New platforms: HP-UX 10, Irix 6.2
-
-Major changes in release 0.9.2a:
-
-* fix annoying bug with kauth (et al) returning incorrect error
-
-Major changes in release 0.9.2:
-
-* service `kerberos-iv' and port 750 has been registered with IANA.
-
-* Bugfixes.
-
-  - Compiles with gcc on AIX.
-
-  - Compiles with really old resolvers.
-
-  - ftp works with afs string-to-key.
-
-  - shared libraries should work on Linux/ELF.
-
-  - some potential buffer overruns.
-
-  - general code clean-up.
-
-* Better Cray/UNICOS support.
-
-* New platforms: AIX 4.2, IRIX 6.1, and Linux 2.0
-
-Major changes in release 0.9.1:
-
-* Mostly bugfixes.
-
-  - No hardcoded references to /usr/athena
-
-  - Better Linux support with rlogin
-
-  - Fix for broken handling of NULL password in kadmind (such as with
-    `ksrvutil change')
-
-  - AFS-aware programs should work on AIX systems without AFS
-
-* New platforms: Digital UNIX 4.0 and Fujitsu UXP/V
-
-* New mechanism to determine realm from hostname based on DNS. To find
-  the realm of a.b.c.d it tries to find krb4-realm.a.b.c.d and then
-  krb4-realm.b.c.d and so on. The entry in DNS should be a TXT record
-  with the realm name.
-
-  krb4-realm.pdc.kth.se.  7200    TXT     "NADA.KTH.SE"
-
-Major changes in release 0.9:
-
-* Tested platforms:
-
-Dec Alpha	OSF/1 3.2	with cc -std1
-HP 9000/735	HP/UX 9.05	with gcc
-DEC Pmax	Ultrix 4.4	with gcc (cc does not work)
-IBM RS/6000	AIX 4.1		with xlc (gcc works, cc does not)
-SGI		IRIX 5.3	with cc
-Sun		SunOS 4.1.4	with gcc (cc is not ANSI and does not work)
-Sun		SunOS 5.5	with gcc
-Intel i386	NetBSD 1.2	with gcc
-Intel i386	Linux 1.3.95	with gcc
-Cray J90	Unicos 9	with cc
-
-* Mostly ported to Crays running Unicos 9.
-
-* S/Key-support in ftpd.
-
-* Delete operation supported in kerberos database.
-
-* Cleaner and more portable code.
-
-* Even less bugs than before.
-
-* kpopper now supports the old pop3 protocol and has been renamed to popper.
-
-* rsh can be renamed remsh.
-
-* Experimental program for forwarding IP over a kerberos tunnel.
-
-* Updated to libdes 3.23.
-
-Major changes in release 0.8:
-
-* New programs: ftp & ftpd.
-
-* New programs: kx & kxd.  These programs forward X connections over
-  kerberos-encrypted connections.
-
-* Incorporated version 3.21 of libdes.
-
-* login: No double utmp-entries on Solaris.
-
-* kafs
-
-  * Better guessing of what realm a cell belongs to.
-
-  * Support for authenticating to several cells.  Reads
-    /usr/vice/etc/TheseCells, if present.
-
-* ksrvutil: Support for generating AFS keys.
-
-* login, su, rshd, rlogind: tries to counter possible NIS-attack.
-
-* xnlock: several bug fixes and support for more than one screen.
-
-* Default port number for ekshell changed from 2106 to 545.  kauth
-  port changed from 4711 to 2120.
-
-* Rumored to work on Fujitsu UXP/V and Cray UNICOS.
-
-Major changes in release 0.7:
-
-* New experimental masterkey generation.   Enable with
-  --enable-random-mkey. Also the default place for the master key has
-  moved from /.k to /var/kerberos/master-key. This is customizable
-  with --with-mkey=file. If you don't want you master key to be on the
-  same backup medium as your database, remember to use this flag. All
-  relevant programs still checks for /.k.
-
-* `-t' option to kadmin.
-
-* Kpopper uses kuserok to verify if user is allowed to pop mail.
-
-* Kpopper tries to locate the mail spool directory: /var/mail or
-  /var/spool/mail.
-
-* kauth has ability to get ticket on a remove host with the `-h' option.
-
-* afslog (aklog clone) and pagsh included.
-
-* New format for /etc/krb.equiv.
-
-* Better multi-homed hosts support in kauth, rcp, rlogin, rlogind,
-  rshd, telnet, telnetd.
-
-* rlogind works on ultrix and aix 3.2.
-
-* lots of bug fixes.
-
-Major changes in release 0.6:
-
-* Tested platforms:
-
-DEC/Alpha	OSF3.2
-HP700		HPux 9.x
-Dec/Pmax	Ultrix 4.4	(rlogind not working)
-IBM RS/6000	AIX 3.2		(rlogind not working)
-IBM RS/6000	AIX 4.1
-SGI		Irix 5.3
-Sun		Sunos 4.1.x
-Sun		Sunos 5.4
-386		BSD/OS 2.0.1
-386		NetBSD 1.1
-386		Linux 1.2.13
-
-It is rumored to work to some extent on NextStep 3.3.
-
-* ksrvutil get to create new keys and put them in the database at the
-same time.
-
-* Support for S/Key in login.
-
-* kstring2key: new program to show string to key conversion.
-
-* Kerberos server should now listen on all available network
-interfaces and on both port 88 and 750.
-
-* Timeout in kpopper.
-
-* Support password quality checks in kadmind.  Use --with-crack-lib to
-link kadmind with cracklib.  The patches in cracklib.patch are needed.
-
-* Movemail from emacs 19.30.
-
-* Logging format uses four digits for years.
-
-* Fallback if port numbers are not listed in /etc/services.
-
-
-	* Relesed version 0.5
-
-	* lib/des/read_pwd.c: Redifine TIOCGETP and TIOCSETP so that the
-        same code is used both for posix termios and others.
-
-	* rsh, rlogin: Add environment variable RSTAR_NO_WARN which when
-	set to "yes" make warnings about "rlogin: warning, using standard
-	rlogin: remote host doesn't support Kerberos." go away.
-
-	* admin/kdb_util.c (load_db) lib/kdb/krb_dbm.c (kerb_db_update):
-        Optimized so that it can handle large databases, previously a
-        10000 entry DB would take *many* minutes, this can now be done in
-        under a minute.
-
-	* Changes in server/kerberos.c, kadmin/*.c slave/*.c to support 64
-        bit machines. Source should now be free of 64 bit assumptions.
-
-	* admin/copykey.c (copy_from_key): New functions for copying to
-        and from keys. Neccessary to solve som problems with longs on 64
-        bit machines in kdb_init, kdb_edit, kdb_util and ext_srvtab.
-
-	* lib/kdb/krb_kdb_utils.c (kdb_verify_master_key): More problems
-        with longs on 64 bit machines.
-
-	* appl/bsd/login.c (main): Lots of stuff to support Psoriasis
-        login. Courtesy of gertz@lysator.liu.se.
-
-	* configure.in, all Makefile.in's: Support for Linux shared
-        libraries. Courtesy of svedja@lysator.liu.se.
-
-	* lib/krb/cr_err_reply.c server/kerberos.c: Moved int req_act_vno
-	= KRB_PROT_VERSION; from server kode to libkrb where it really
-	belongs.
-
-        * appl/bsd/forkpty.c (forkpty): New function that allocates master
-        and slave ptys in a portable way. Used by rlogind.
-
-	* appl/telnet/telnetd/sys_term.c (start_login): Under SunOS5 the
-	same utmpx slot got used by sevral sessions. Courtesy of
-	gertz@lysator.liu.se.
-
-	* util/{ss, et}/Makefile.in (LEX): Use flex or lex. Courtesy of
-        svedja@lysator.liu.se.
-
-	* Fix the above Makefiles to work around bugs in Solaris and OSF/1
-        make rules that was triggered by VPATH functionality in the yacc
-        and lex rules.
-
-	* appl/kpopper/pop_log.c (pop_log) appl/kpopper/pop_msg.c (pop_msg):
-	Use stdarg instead of varargs. The code is still broken though,
-	you'll realize	that on a machine with 64 bit pointers and 32 bit 
-	int:s and no vsprintf, let's hope there will be no such beasts ;-).
-
-	* appl/telnet/telnetd/sys_term.c (getptyslave): Not all systems
-	 have (or need) modules ttcompat and pckt so don't flag it as a
-	 fatal error if they don't exist.
-
-	* kadmin/admin_server.c (kadm_listen) kadmind/kadm_ser_wrap.c
-	(kadm_listen): Add kludge for kadmind running on a multihomed
-	server. #ifdef:ed under MULTIHOMED_KADMIN. Change in acconfig.h
-	if you need this feature.
-
-	* appl/Makefile.in (SUBDIRS): Add applications movemail kpopper
-        and xnlock.
-
-	* appl/bsd/rlogin.c (main): New rlogind.c, forkpty() is not
-        implemented yet though.
-
-	* appl/xnlock/Makefile.in: Some stubs for X11 programs in
-        configure.in as well as a kerberized version of xnlock.
-
-	* appl/bsd/{rlogin.c, rsh.c, rcp.c}: Add code to support fallback
-        port numbers if they can not be found using getservbyname.
-
-	* appl/bsd/klogin.c (klogin): Use differnet ticket files for each
-        login so that a malicous user won't be able to destroy our tickets
-        with a failed login attempt.
-
-	* lib/kafs/afssys.c (k_afsklog): First we try afs.cell@REALM, if
-	there is no such thing try afs@CELL instead. There is now two
-	arguments to k_afslog(char *cell, char *realm).
-
-	* kadmin/admin_server.c (kadm_listen): If we are multihomed we
-        need to figure out which local address that is used this time
-        since it is used in "direction" comparison.
-
-	* kadmin/kadm_ser_wrap.c (kadm_ser_init): Fallback to use default
-        port number.
-
-	* lib/krb/send_to_kdc.c (send_to_kdc): Default port number
-        (KRB_PORT) was not in network byte order.
-
-	* lib/krb/send_to_kdc.c (send_recv): Linux clears timeout struct
-        when selecting.
-
-	* appl/bsd/rcp.c, appl/bsd/rlogin.c, appl/bsd/rsh.c:
-	Now does fallback if there isn't any entries in /etc/services for
-	klogin/kshell. This also made the code a bit more pretty.
-
-	* appl/bsd/login.c: Added support for lots of more struct utmp fields.
-	If there is no ttyslot() use setutent and friends.
-
-	* appl/bsd/Makefile.in, appl/bsd/rlogind.c, appl/bsd/rshd.c:
-	Added extern iruserok().
-
-	* appl/bsd/iruserok.c: Initial revision
-
-	* appl/bsd/bsd_locl.h: Must include sys/filio.h on Psoriasis.
-
-	* appl/bsd/Makefile.in: New install
-
-	* appl/bsd/pathnames.h: Fix default path, rsh and rlogin.
-
-	* appl/bsd/rshd.c: Extend default PATH with bindir to find rcp.
-
-	* appl/bsd/login.c (login): If there is no ttyslot use setutent
-	and friends. Added support for lots of more struct utmp fields.
-
-	* server/kerberos.c (main) lib/kafs/afssys.c appl/bsd/bsd_locl.h:
-        Must include sys/filio.h on Psoriasis to find _IOW and FIO* macros.
-
-	* appl/bsd/rlogind.c (doit): Use _PATH_DEFPATH rather than
-        _PATH_DEF.
-
-	* appl/bsd/login.c, su.c (main): Use fallback to bourne shell if
-        running as root.
-
-	* appl/bsd/su.c (main): Update usage message to reflect that '-'
-	option must come after the ordinary options and before login-id.
-
-	* appl/telnet/telnetd/telnetd.c (doit): If remote host name is to
-	long to fit into utmp try to remove domain part if it does match
-	our local domain.
-
-	(main): Add new option -L /bin/login so that it is possible to 
-	specify an alternate login program.
-
-	* appl/telnet/telnet/commands.c (env_init): When exporting
-	variable DISPLAY and if hostname is not the full name, try to get
-	the full name from DNS.
-
-	* appl/telnet/telnet/main.c (main): Option -k realm was broken due
-        to a bogous external declaration.
-
-	* kadmin/kadmin.c (add_new_key): Kadmin now properly sets
-	lifetime, expiration date and attributes in add_new_key command.
-
-	* appl/bsd/su.c (main): Don't handle '-' option with getopt.
-
-	* appl/telnet/telnet/externs.h: Removed protection for multiple
-	inclusions of termio(s).h since it broke definition of termio
-	macro on POSIX systems.
-
-	* lib/krb/lifetime.c (krb_life_to_time): If you want to disable
-	AFS compatible long lifetimes set krb_no_long_lifetimes = 1.
-	
-	Please note that the long lifetimes are 100% compatible up to
-	10h so this should rarely be necessary.
-
-	* lib/krb/krb_equiv.c (krb_equiv): If you don't want to use
-	ipaddress protection of tickets set krb_ignore_ip_address. This
-	makes it possible for an intruder to steal a ticket and then use
-	it from som other machine anywhere on the net.
-
-	* kadmin/kadm_ser_wrap.c (kadm_ser_init): Don't bind to only one
-        local address. Accept request on all interfaces.
-
-	* admin/kdb_edit.c (change_principal): Don't accept illegal
-        dates. Courtesy of gertz@lysator.liu.se.
-
-	* configure.in: AIX specific libraries needed when using standard
-        libc routine getttyent, IBM should be ashamed!
-
-	* lib/krb/recvauth.c (krb_recvauth): Long that should be int32_t
-        problem.
-
-	* Added strdup for su and rlogin.
-
-	* Fix for old syslog macros in appl/bsd/bsd_locl.
-
-	* lib/kdb/krb_dbm.c (kerb_db_rename) admin/kdb_destroy.c: New
-        ifdef HAVE_NEW_DB for new databases residing in one file only.
-
-	* appl/bsd/rlogin.c (oob): Add workaround for Linux.
-
-	* appl/bsd/getpass.c: New routine that reads up to 127 char
-        passwords. Used in su.c and login.c.
-
-	* appl/telnet/telnetd/sys_term.c (login_tty): Ioctl TIOCSCTTY
-        should not be used on HP-UX.
-
-==========================*** Released 0.2? ***=============================
-
-ksrvutil
-  If there is a dot in the about to be added principals name there is
-  no need to ask for instance name.
-
-kerberos & kadmind
-  Logfiles are created with small permissions (600).
-
-krb.conf and krb.realms
- Use domain part as realm name if there is no match in krb.realms.
- Use kerberos.REALMNAME if there is no match in krb.realms.
-
-rlogin
-  The rlogin client is supported both with and without encryption,
-  there is no rlogind yet though.
-
-login
-  There is login program that supports the -f option. Both kerberos
-  and /etc/passwd authentication is enabled.
-
-  Vendors login programs typically have no -f option (needed by
-  telnetd) and also does not know how to verify passwords againts
-  kerberos.
-
-appl/bsd/*
-  Now uses POSIX signals.
-
-kdb_edit, kadmin
-  Generate random passwords if administrator enters empty password.
-
-lib/kafs
-  New library to support AFS. Routines:
-  int k_hasafs(void);
-  int k_afsklog(...); or some other name
-  int k_setpag(void);
-  int k_unlog(void);
-  int k_pioctl(char *, int, struct ViceIoctl *, int);
-
-  Library supports more than one single entry point AFS syscalls
-  (needed be HP/UX and OSF/1 when running DFS). Doesn't rely on
-  transarc headers or library code. Same binaries can be used both on
-  machines running AFS and others.
-
-  This library is used in telnetd, login and the r* programs.
-
-telnet & telnetd
-  Based on telnet.95.05.31.NE but with the encryption hacks from
-  ftp.funet.fi:/pub/unix/security/esrasrc-1.0 added.  This encryption
-  stuff needed some more modifications (done by joda@nada.kth.se)
-  before it was usable. Telnet has also been modified to use GNU
-  autoconf.
-
-Numerous other changes that are long since forgotten.
diff --git a/crypto/kerberosIV/PROBLEMS b/crypto/kerberosIV/PROBLEMS
deleted file mode 100644
index f6eeeef3e858..000000000000
--- a/crypto/kerberosIV/PROBLEMS
+++ /dev/null
@@ -1,74 +0,0 @@
-
-Problems compiling Kerberos
-===========================
-
-Many compilers require a switch to become ANSI compliant. Since kth-krb
-is written in ANSI C it is necessary to specify the name of the compiler
-to be used and the required switch to make it ANSI compliant. This is
-most easily done when running configure using the `env' command. For
-instance to build under HP-UX using the native compiler do:
-
-     datan$ env CC="cc -Ae" ./configure
-
-In general `gcc' works. The following combinations have also been
-verified to successfully compile the distribution:
-
-`HP-UX'
-     `cc -Ae'
-
-`Digital UNIX'
-     `cc -std1'
-
-`AIX'
-     `xlc'
-
-`Solaris 2.x'
-     `cc' (unbundled one)
-
-`IRIX'
-     `cc'
-
-Linux problems
---------------
-
-Some systems have lost `/usr/include/ndbm.h' which is necessary to
-build kth-krb correctly. There is a `ndbm.h.Linux' right next to the
-source distribution.
-
-There has been reports of non-working `libdb' on some Linux
-distributions.  If that happens, use the `--without-berkeley-db' when
-configuring.
-
-HP-UX problems
---------------
-
-The shared library `/usr/lib/libndbm.sl' doesn't exist on all systems.
-To make problems even worse, there is never an archive version for
-static linking either. Therefore, when building "truly portable"
-binaries first install GNU gdbm or Berkeley DB, and make sure that you
-are linking against that library.
-
-Cray problems
--------------
-
-`rlogind' won't work on Crays until `forkpty()' has been ported, in the
-mean time use `telnetd'.
-
-AIX problems
-------------
-
-`gcc' version 2.7.2.1 has a bug which makes it miscompile
-`appl/telnet/telnetd/sys_term.c' (and possibily `appl/bsd/forkpty.c'),
-if used with too much optimization.
-
-C2 problems
------------
-
-The programs that checks passwords works with `passwd', OTP, and
-Kerberos paswords. This is problem if you use C2 security (or use some
-other password database), that normally keeps passwords in some obscure
-place. If you want to use Kerberos with C2 security you will have to
-think about what kind of changes are necessary. See also the discussion
-about Digital's SIA and C2 security, see *Note Digital SIA::.
-
-
diff --git a/crypto/kerberosIV/README b/crypto/kerberosIV/README
deleted file mode 100644
index 064761495f48..000000000000
--- a/crypto/kerberosIV/README
+++ /dev/null
@@ -1,44 +0,0 @@
-This is a severly hacked up version of Eric Young's eBones-p9 kerberos
-version. The DES library has been updated with his 3.23 version and
-numerous patches collected over the years have been applied to both
-the kerberos and DES sources, most notably the CMU patches for extended
-lifetimes that AFS uses. There is also support for AFS built into most
-programs. 
-
-The source has been changed to use ANSI C and POSIX to the largest
-possible extent. The code in util/et and appl/bsd have not been
-updated in this way though (they really need it).
-
-Telnet and telnetd are based on the telnet.95.10.23.NE.tar.Z. Kerberos
-authentication is the default and warnings are issued by telnetd if
-the telnet client does not turn on encryption.
-
-The r* programs in appl/bsd have been updated with newer sources from
-NetBSD and FreeBSD. NOTE: use of telnet is prefered to the use of
-rlogin which is a temporary hack and not an Internet standard (and has
-only been documented quite recently).  Telnet uses kerberos
-authentication to prevent the passing of cleartext passwords and is
-thus superior to rlogin.
-
-The distribution has been configured to primarily use kerberos
-authentication with a fallback to /etc/passwd passwords. This should
-make it easy to do a slow migration to kerberos.  OTP support is also
-included in login, popper, and ftpd.
-
-All programs in this distribution follow these conventions:
-
-/usr/athena/bin:	User programs
-/usr/athena/sbin:	Administrator programs
-/usr/athena/libexec:	Daemons
-/etc:			Configuration files
-/var/log:		Logfiles
-/var/kerberos:		Kerberos database and ACL files
-
-A W3-page is at http://www.pdc.kth.se/kth-krb/
-
-You can get some documentation from ftp://ftp.pdc.kth.se/pub/krb/doc.
-
-Please report bugs and problems to kth-krb-bugs@nada.kth.se
-
-There is a mailing list discussing kerberos at krb4@sics.se, send a
-message to majordomo@sics.se to subscribe.
diff --git a/crypto/kerberosIV/README-WIN32 b/crypto/kerberosIV/README-WIN32
deleted file mode 100644
index ba74c46f2172..000000000000
--- a/crypto/kerberosIV/README-WIN32
+++ /dev/null
@@ -1,30 +0,0 @@
-It should be possible to build several of the libraries and the GUI
-telnet ``voodoo'' on Win95/NT.  In case you don't want to try there
-are binaries available at
-ftp://ftp.pdc.kth.se/pub/krb/binaries/i386-unknown-winnt4.0.
-
-In case you want to build from source and possibly hack some on them
-yourself here's a short guide:
-
-You need to build the libraries (DLLs) first and in this order:
-
-lib/roken
-lib/des
-lib/krb
-lib/kclient
-
-And then the two applications:
-
-appl/krbmanager
-appl/voodoo
-
-In each case there is a Visual-C++ generated makefile with the name
-*.mak in the corresponding directory.  You might be able to load that
-into Microsoft whatever Studio and you might be able to just run nmake
-on them.
-
-Once you have ended up with 4 DLLs and 2 EXEs you only have to place
-them in a directory in your PATH and start voodoo.
-
-In case it doesn't work, you have discovered bugs or added some more
-features the mail address to use is <kth-krb-bugs@nada.kth.se>
diff --git a/crypto/kerberosIV/TODO b/crypto/kerberosIV/TODO
deleted file mode 100644
index 66aa1f13b8c2..000000000000
--- a/crypto/kerberosIV/TODO
+++ /dev/null
@@ -1,42 +0,0 @@
--*- indented-text -*-
-rlogind, rshd, popper, ftpd (telnetd uses nonce?)
-  Add a replay cache.
-
-telnet, rlogin, rsh, rcp
-  Some form of support for ticket forwarding, perhaps only for AFS tickets.
-
-telnet, telnetd
-  Add negotiation for keep-alives.
-
-rlogind
-  Fix utmp logging.
-
-documentation
-  Write more info on:
-  * how to use
-
-rshd
-  Read default environment from /etc/default/login and other files.
-  Encryption without secondary port is bugged, it currently does no
-  encryption. But, nobody uses it anyway.
-
-autoconf
-
-libraries
-  generate archive and shared libraries in some portable way.
-
-k_get_all_addrs
-  for Cray UNICOS
-
-ftpd
-
-kx
-  Compress and recode X protocol?
-
-kip
-  Other kinds of encapsulations?
-  Tunnel device as loadable kernel module.
-  Speed?
-
-BUGS
-  Where?
diff --git a/crypto/kerberosIV/acconfig.h b/crypto/kerberosIV/acconfig.h
deleted file mode 100644
index bb7b7aa83214..000000000000
--- a/crypto/kerberosIV/acconfig.h
+++ /dev/null
@@ -1,282 +0,0 @@
-/* $Id: acconfig.h,v 1.71 1997/06/01 22:32:24 assar Exp $ */
-
-/*  Define this if RETSIGTYPE == void  */
-#undef VOID_RETSIGTYPE
-
-/*  Define this if struct utmp have ut_user  */
-#undef HAVE_UT_USER
-
-/*  Define this if struct utmp have ut_host  */
-#undef HAVE_UT_HOST
-
-/*  Define this if struct utmp have ut_addr  */
-#undef HAVE_UT_ADDR
-
-/*  Define this if struct utmp have ut_type  */
-#undef HAVE_UT_TYPE
-
-/*  Define this if struct utmp have ut_pid  */
-#undef HAVE_UT_PID
-
-/*  Define this if struct utmp have ut_id  */
-#undef HAVE_UT_ID
-
-/*  Define this if struct utmpx have ut_syslen  */
-#undef HAVE_UT_SYSLEN
-
-/*  Define this if struct winsize is declared in sys/termios.h */
-#undef HAVE_STRUCT_WINSIZE
-
-/*  Define this if struct winsize have ws_xpixel */
-#undef HAVE_WS_XPIXEL
-
-/*  Define this if struct winsize have ws_ypixel */
-#undef HAVE_WS_YPIXEL
-
-/*  Define this to be the directory where the dictionary for cracklib */
-/*  resides */
-#undef DICTPATH
-
-/* Define this if you want to use SOCKS v5 */
-#undef SOCKS
-
-/* Define this to the path of the mail spool directory */
-#undef KRB4_MAILDIR
-
-/* Define this if `struct sockaddr' includes sa_len */
-#undef SOCKADDR_HAS_SA_LEN
-
-/* Define this if `struct siaentity' includes ouid */
-#undef SIAENTITY_HAS_OUID
-
-/* Define if getlogin has POSIX flavour, as opposed to BSD */
-#undef POSIX_GETLOGIN
-
-/* Define if getpwnam_r has POSIX flavour */
-#undef POSIX_GETPWNAM_R
-
-/* define if getcwd() is broken (such as in SunOS) */
-#undef BROKEN_GETCWD
-
-/* define if the system is missing a prototype for crypt() */
-#undef NEED_CRYPT_PROTO
-
-/* define if the system is missing a prototype for strtok_r() */
-#undef NEED_STRTOK_R_PROTO
-
-/* define if /bin/ls takes -A */
-#undef HAVE_LS_A
-
-/* define if you have h_errno */
-#undef HAVE_H_ERRNO
-
-/* define if you have h_errlist but not hstrerror */
-#undef HAVE_H_ERRLIST
-
-/* define if you have h_nerr but not hstrerror */
-#undef HAVE_H_NERR
-
-/* define if your system doesn't declare h_errlist */
-#undef HAVE_H_ERRLIST_DECLARATION
-
-/* define if your system doesn't declare h_nerr */
-#undef HAVE_H_NERR_DECLARATION
-
-/* define this if you need a declaration for h_errno */
-#undef HAVE_H_ERRNO_DECLARATION
-
-/* define if you need a declaration for optarg */
-#undef HAVE_OPTARG_DECLARATION
-
-/* define if you need a declaration for optind */
-#undef HAVE_OPTIND_DECLARATION
-
-/* define if you need a declaration for opterr */
-#undef HAVE_OPTERR_DECLARATION
-
-/* define if you need a declaration for optopt */
-#undef HAVE_OPTOPT_DECLARATION
-
-/* define if you need a declaration for __progname */
-#undef HAVE___PROGNAME_DECLARATION
-
-@BOTTOM@
-
-#undef HAVE_INT8_T
-#undef HAVE_INT16_T
-#undef HAVE_INT32_T
-#undef HAVE_INT64_T
-#undef HAVE_U_INT8_T
-#undef HAVE_U_INT16_T
-#undef HAVE_U_INT32_T
-#undef HAVE_U_INT64_T
-
-#define RCSID(msg) \
-static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
-
-/*
- * Set ORGANIZATION to be the desired organization string printed
- * by the 'kinit' program.  It may have spaces.
- */
-#define ORGANIZATION "eBones International"
-
-#if 0
-#undef BINDIR 
-#undef LIBDIR
-#undef LIBEXECDIR
-#undef SBINDIR
-#endif
-
-#if 0
-#define KRB_CNF_FILES	{ "/etc/krb.conf",   "/etc/kerberosIV/krb.conf", 0}
-#define KRB_RLM_FILES	{ "/etc/krb.realms", "/etc/kerberosIV/krb.realms", 0}
-#define KRB_EQUIV	"/etc/krb.equiv"
-
-#define KEYFILE		"/etc/srvtab"
-
-#define KRBDIR		"/var/kerberos"
-#define DBM_FILE	KRBDIR "/principal"
-#define DEFAULT_ACL_DIR	KRBDIR
-
-#define KRBLOG		"/var/log/kerberos.log"	/* master server  */
-#define KRBSLAVELOG	"/var/log/kerberos_slave.log" /* slave server  */
-#define KADM_SYSLOG	"/var/log/admin_server.syslog"
-#define K_LOGFIL	"/var/log/kpropd.log"
-#endif
-
-/* Maximum values on all known systems */
-#define MaxHostNameLen (64+4)
-#define MaxPathLen (1024+4)
-
-/*
- * Define NDBM if you are using the 4.3 ndbm library (which is part of
- * libc).  If not defined, 4.2 dbm will be assumed.
- */
-#if defined(HAVE_DBM_FIRSTKEY)
-#define NDBM
-#endif
-
-/* ftp stuff -------------------------------------------------- */
-
-#define KERBEROS
-
-/* telnet stuff ----------------------------------------------- */
-
-/* define this if you have kerberos 4 */
-#undef KRB4
-
-/* define this if you want encryption */
-#undef ENCRYPTION
-
-/* define this if you want authentication */
-#undef AUTHENTICATION
-
-#if defined(ENCRYPTION) && !defined(AUTHENTICATION)
-#define AUTHENTICATION 1
-#endif
-
-/* Set this if you want des encryption */
-#undef DES_ENCRYPTION
-
-/* Set this to the default system lead string for telnetd 
- * can contain %-escapes: %s=sysname, %m=machine, %r=os-release
- * %v=os-version, %t=tty, %h=hostname, %d=date and time
- */
-#undef USE_IM
-
-/* define this if you want diagnostics in telnetd */
-#undef DIAGNOSTICS
-
-/* define this if you want support for broken ENV_{VALUE,VAR} systems  */
-#undef ENV_HACK
-
-/*  */
-#undef OLD_ENVIRON
-
-/* Used with login -p */
-#undef LOGIN_ARGS
-
-/* Define if there are working stream ptys */
-#undef STREAMSPTY
-
-/* set this to a sensible login */
-#ifndef LOGIN_PATH
-#define LOGIN_PATH BINDIR "/login"
-#endif
-
-
-/* ------------------------------------------------------------ */
-
-/*
- * Define this if your ndbm-library really is berkeley db and creates
- * files that ends in .db.
- */
-#undef HAVE_NEW_DB
-
-/* Define this if you have a working getmsg */
-#undef HAVE_GETMSG
-
-/* Define to enable new master key code */
-#undef RANDOM_MKEY
-
-/* Location of the master key file, default value lives in <kdc.h> */
-#undef MKEYFILE
-
-/* Define if you don't want support for afs, might be a good idea on
-   AIX if you don't have afs */
-#undef NO_AFS
-
-/* Define if you have a readline compatible library */
-#undef HAVE_READLINE
-
-#ifdef VOID_RETSIGTYPE
-#define SIGRETURN(x) return
-#else
-#define SIGRETURN(x) return (RETSIGTYPE)(x)
-#endif
-
-/* Define this if your compiler supports '#pragma weak' */
-#undef HAVE_PRAGMA_WEAK
-
-/* Temporary fixes for krb_{rd,mk}_safe */
-#define DES_QUAD_GUESS 0
-#define DES_QUAD_NEW 1
-#define DES_QUAD_OLD 2
-
-/* Set this to one of the constants above to specify default checksum
-   type to emit */
-#undef DES_QUAD_DEFAULT
-
-/*
- * AIX braindamage!
- */
-#if _AIX
-#define _ALL_SOURCE
-#define _POSIX_SOURCE
-/* this is left for hysteric reasons :-) */
-#define unix /* well, ok... */
-#endif
-
-/*
- * SunOS braindamage! (Sun include files are generally braindead)
- */
-#if (defined(sun) || defined(__sun))
-#if defined(__svr4__) || defined(__SVR4)
-#define SunOS 5
-#else
-#define SunOS 4
-#endif
-#endif
-
-#if defined(__sgi) || defined(sgi)
-#if defined(__SYSTYPE_SVR4) || defined(_SYSTYPE_SVR4)
-#define IRIX 5
-#else
-#define IRIX 4
-#endif
-#endif
-
-/* IRIX 4 braindamage */
-#if IRIX == 4 && !defined(__STDC__)
-#define __STDC__ 0
-#endif
diff --git a/crypto/kerberosIV/aclocal.m4 b/crypto/kerberosIV/aclocal.m4
deleted file mode 100644
index 133e19d93e43..000000000000
--- a/crypto/kerberosIV/aclocal.m4
+++ /dev/null
@@ -1,543 +0,0 @@
-dnl
-dnl $Id: aclocal.m4,v 1.38 1997/05/18 18:47:30 assar Exp $
-dnl
-
-dnl
-dnl General tests
-dnl
-
-dnl
-dnl Look for function in any of the specified libraries
-dnl
-
-dnl AC_FIND_FUNC_NO_LIBS(func, libraries, includes, arguments)
-AC_DEFUN(AC_FIND_FUNC_NO_LIBS, [
-
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(ac_cv_funclib_$1,
-[
-if eval "test \"\$ac_cv_func_$1\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in "" $2; do
-		if test -n "$ac_lib"; then 
-			ac_lib="-l$ac_lib"
-			LIBS="$ac_lib $ac_save_LIBS"
-		fi
-		AC_TRY_LINK([$3],[$1($4)],eval "if test -n \"$ac_lib\";then ac_cv_funclib_$1=$ac_lib; else ac_cv_funclib_$1=yes; fi";break)
-	done
-	eval "ac_cv_funclib_$1=\${ac_cv_funclib_$1-no}"
-	LIBS="$ac_save_LIBS"
-fi
-])
-
-eval "ac_res=\$ac_cv_funclib_$1"
-
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs $1"@@@
-@@@libs="$libs $2"@@@
-END
-
-changequote(, )dnl
-eval "ac_tr_func=HAVE_`echo $1 | tr '[a-z]' '[A-Z]'`"
-eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr '[a-z]' '[A-Z]'`"
-eval "LIB_$1=$ac_res"
-changequote([, ])dnl
-
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_$1=yes"
-	eval "LIB_$1="
-	AC_DEFINE_UNQUOTED($ac_tr_func)
-	AC_MSG_RESULT([yes])
-	;;
-	no)
-	eval "ac_cv_func_$1=no"
-	eval "LIB_$1="
-	AC_MSG_RESULT([no])
-	;;
-	*)
-	eval "ac_cv_func_$1=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	AC_DEFINE_UNQUOTED($ac_tr_func)
-	AC_DEFINE_UNQUOTED($ac_tr_lib)
-	AC_MSG_RESULT([yes, in $ac_res])
-	;;
-esac
-AC_SUBST(LIB_$1)
-])
-
-dnl AC_FIND_FUNC(func, libraries, includes, arguments)
-AC_DEFUN(AC_FIND_FUNC, [
-AC_FIND_FUNC_NO_LIBS([$1], [$2], [$3], [$4])
-if test -n "$LIB_$1"; then
-	LIBS="$LIB_$1 $LIBS"
-fi
-])
-
-dnl
-dnl Same as AC _REPLACE_FUNCS, just define HAVE_func if found in normal
-dnl libraries 
-
-AC_DEFUN(AC_BROKEN,
-[for ac_func in $1
-do
-AC_CHECK_FUNC($ac_func, [
-changequote(, )dnl
-ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
-changequote([, ])dnl
-AC_DEFINE_UNQUOTED($ac_tr_func)],[LIBOBJS="$LIBOBJS ${ac_func}.o"])
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs $1"@@@
-END
-done
-AC_SUBST(LIBOBJS)dnl
-])
-
-dnl
-dnl Mix between AC_FIND_FUNC and AC_BROKEN
-dnl
-
-AC_DEFUN(AC_FIND_IF_NOT_BROKEN,
-[AC_FIND_FUNC([$1], [$2], [$3], [$4])
-if eval "test \"$ac_cv_func_$1\" != yes"; then
-LIBOBJS="$LIBOBJS $1.o"
-fi
-AC_SUBST(LIBOBJS)dnl
-])
-
-dnl
-dnl
-dnl
-
-dnl AC_TEST_PACKAGE(package,header,lib,linkline)
-AC_DEFUN(AC_TEST_PACKAGE,
-[
-AC_MSG_CHECKING(for $1)
-AC_ARG_WITH($1,
-[  --with-$1=dir                use $1 in dir],
-[if test "$with_$1" = "no"; then
-  with_$1=
-fi]
-)
-AC_ARG_WITH($1-lib,
-[  --with-$1-lib=dir            use $1-lib in dir],
-[if test "$withval" = "yes" -o "$withval" = "no"; then
-  AC_MSG_ERROR([No argument for --with-$1-lib])
-elif test "X$with_$1" = "X"; then
-  with_$1=yes
-fi]
-)
-AC_ARG_WITH($1-include,
-[  --with-$1-include=dir        use $1-include in dir],
-[if test "$withval" = "yes" -o "$withval" = "no"; then
-  AC_MSG_ERROR([No argument for --with-$1-include])
-elif test "X$with_$1" = "X"; then
-  with_$1=yes
-fi]
-)
-
-define([foo], translit($1, [a-z], [A-Z]))
-: << END
-@@@syms="$syms foo"@@@
-END
-
-if test -n "$with_$1"; then
-  AC_DEFINE([foo])
-  if test "$with_$1" != "yes"; then
-    $1_dir=$with_$1
-  fi
-dnl Try to find include
-  if test -n "$with_$1_include"; then
-    trydir=$with_$1_include
-  elif test "$with_$1" != "yes"; then
-    trydir="$with_$1 $with_$1/include"
-  else
-    trydir=
-  fi
-  found=
-  for i in $trydir ""; do
-    if test -n "$i"; then
-      if test -f $i/$2; then
-        found=yes; res=$i; break
-      fi
-    else
-      AC_TRY_CPP([#include <$2>], [found=yes; res=$i; break])
-    fi
-  done
-  if test -n "$found"; then
-    $1_include=$res
-  else
-    AC_MSG_ERROR(Cannot find $2)
-  fi
-dnl Try to find lib
-  if test -n "$with_$1_lib"; then
-    trydir=$with_$1_lib
-  elif test "$with_$1" != "yes"; then
-    trydir="$with_$1 $with_$1/lib"
-  else
-    trydir=
-  fi
-  found=
-  for i in $trydir ""; do
-    if test -n "$i"; then
-      if test -f $i/$3; then
-        found=yes; res=$i; break
-      fi
-    else
-      old_LIBS=$LIBS
-      LIBS="$4 $LIBS"
-      AC_TRY_LINK([], [], [found=yes; res=$i; LIBS=$old_LIBS; break])
-      LIBS=$old_LIBS
-    fi
-  done
-  if test -n "$found"; then
-    $1_lib=$res
-  else
-    AC_MSG_ERROR(Cannot find $3)
-  fi
-  AC_MSG_RESULT([headers $$1_include, libraries $$1_lib])
-  AC_DEFINE_UNQUOTED(foo)
-  if test -n "$$1_include"; then
-    foo[INCLUDE]="-I$$1_include"
-  fi
-  AC_SUBST(foo[INCLUDE])
-  if test -n "$$1_lib"; then
-    foo[LIB]="-L$$1_lib"
-  fi
-  foo[LIB]="$foo[LIB] $4"
-  AC_SUBST(foo[LIB])
-else
-  AC_MSG_RESULT(no)
-fi
-undefine([foo])
-])
-
-dnl
-dnl Check if we need the declaration of a variable
-dnl
-
-dnl AC_HAVE_DECLARATION(includes, variable)
-AC_DEFUN(AC_CHECK_DECLARATION, [
-AC_MSG_CHECKING([if $2 is properly declared])
-AC_CACHE_VAL(ac_cv_var_$2_declaration, [
-AC_TRY_COMPILE([$1
-extern struct { int foo; } $2;],
-[$2.foo = 1;],
-eval "ac_cv_var_$2_declaration=no",
-eval "ac_cv_var_$2_declaration=yes")
-])
-
-ac_tr_var=[HAVE_]translit($2, [a-z], [A-Z])[_DECLARATION]
-
-define([foo], [HAVE_]translit($2, [a-z], [A-Z])[_DECLARATION])
-: << END
-@@@syms="$syms foo"@@@
-END
-undefine([foo])
-
-AC_MSG_RESULT($ac_cv_var_$2_declaration)
-if eval "test \"\$ac_cv_var_$2_declaration\" = yes"; then
-	AC_DEFINE_UNQUOTED($ac_tr_var)
-fi
-])
-
-dnl
-dnl
-dnl
-
-dnl AC_CHECK_VAR(includes, variable)
-AC_DEFUN(AC_CHECK_VAR, [
-AC_MSG_CHECKING(for $2)
-AC_CACHE_VAL(ac_cv_var_$2, [
-AC_TRY_LINK([extern int $2;
-int foo() { return $2; }],
-	    [foo()],
-	    ac_cv_var_$2=yes, ac_cv_var_$2=no)
-])
-eval "ac_tr_var=[HAVE_]translit($2,[a-z],[A-Z])"
-
-define([foo], [HAVE_]translit($2, [a-z], [A-Z]))
-: << END
-@@@syms="$syms foo"@@@
-END
-undefine([foo])
-
-AC_MSG_RESULT(`eval echo \\$ac_cv_var_$2`)
-if test `eval echo \\$ac_cv_var_$2` = yes; then
-	AC_DEFINE_UNQUOTED($ac_tr_var)
-	AC_CHECK_DECLARATION([$1],[$2])
-fi
-])
-
-dnl
-dnl Check if we need the prototype for a function
-dnl
-
-dnl AC_NEED_PROTO(includes, function)
-
-AC_DEFUN(AC_NEED_PROTO, [
-AC_CACHE_CHECK([if $2 needs a prototype], ac_cv_func_$2_noproto,
-AC_TRY_COMPILE([$1],
-[struct foo { int foo; } xx;
-extern int $2 (struct foo*);
-$2(&xx);
-],
-eval "ac_cv_func_$2_noproto=yes",
-eval "ac_cv_func_$2_noproto=no"))
-define([foo], [NEED_]translit($2, [a-z], [A-Z])[_PROTO])
-if test "$ac_cv_func_$2_noproto" = yes; then
-	AC_DEFINE(foo)
-fi
-: << END
-@@@syms="$syms foo"@@@
-END
-undefine([foo])
-])
-
-dnl AC_MSG_RESULT($ac_cv_func_$3_proto)
-dnl if eval "test \"\$ac_cv_func_$3_proto\" = yes"; then
-dnl 	AC_DEFINE_UNQUOTED($ac_tr_func)
-dnl fi
-dnl ])
-dnl 
-dnl AC_DEFUN(AC_NEED_PROTO, [
-dnl AC_MSG_CHECKING([if $3 needs a proto])
-dnl AC_CACHE_VAL(ac_cv_func_$3_proto, [
-dnl AC_TRY_COMPILE([$1],
-dnl [$2],
-dnl eval "ac_cv_func_$3_proto=no",
-dnl eval "ac_cv_func_$3_proto=yes")
-dnl ])
-dnl changequote(, )dnl
-dnl eval "ac_tr_func=NEED_`echo $3 | tr '[a-z]' '[A-Z]'`_PROTO"
-dnl changequote([, ])dnl
-dnl 
-dnl define([foo], [NEED_]translit($3, [a-z], [A-Z])[_PROTO])
-dnl : << END
-dnl @@@syms="$syms foo"@@@
-dnl END
-dnl undefine([foo])
-dnl 
-dnl AC_MSG_RESULT($ac_cv_func_$3_proto)
-dnl if eval "test \"\$ac_cv_func_$3_proto\" = yes"; then
-dnl 	AC_DEFINE_UNQUOTED($ac_tr_func)
-dnl fi
-dnl ])
-
-AC_DEFUN(AC_GROK_TYPE, [
-AC_CACHE_VAL(ac_cv_type_$1, 
-AC_TRY_COMPILE([
-#include "confdefs.h"
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-#ifdef HAVE_BIND_BITYPES_H
-#include <bind/bitypes.h>
-#endif
-#ifdef HAVE_NETINET_IN6_MACHTYPES_H
-#include <netinet/in6_machtypes.h>
-#endif
-],
-$i x;
-,
-eval ac_cv_type_$1=yes,
-eval ac_cv_type_$1=no))])
-
-
-AC_DEFUN(AC_GROK_TYPES, [
-for i in $1; do
-	AC_MSG_CHECKING(for $i)
-	AC_GROK_TYPE($i)
-	eval ac_res=\$ac_cv_type_$i
-	if test "$ac_res" = yes; then
-		type=HAVE_`echo $i | tr '[a-z]' '[A-Z]'`
-		AC_DEFINE_UNQUOTED($type)
-	fi
-	AC_MSG_RESULT($ac_res)
-done
-])
-
-dnl
-dnl Specific tests
-dnl
-
-dnl
-dnl We prefer byacc or yacc because they do not use `alloca'
-dnl
-
-AC_DEFUN(AC_KRB_PROG_YACC,
-[AC_CHECK_PROGS(YACC, byacc yacc 'bison -y')])
-
-dnl
-dnl Also look for EMXOMF for OS/2
-dnl
-
-AC_DEFUN(AC_KRB_PROG_RANLIB,
-[AC_CHECK_PROGS(RANLIB, ranlib EMXOMF, :)])
-
-dnl
-dnl Better test for ln -s, ln or cp
-dnl
-
-AC_DEFUN(AC_KRB_PROG_LN_S,
-[AC_MSG_CHECKING(for ln -s or something else)
-AC_CACHE_VAL(ac_cv_prog_LN_S,
-[rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
-  rm -f conftestdata
-  ac_cv_prog_LN_S="ln -s"
-else
-  touch conftestdata1
-  if ln conftestdata1 conftestdata2; then
-    rm -f conftestdata*
-    ac_cv_prog_LN_S=ln
-  else
-    ac_cv_prog_LN_S=cp
-  fi
-fi])dnl
-LN_S="$ac_cv_prog_LN_S"
-AC_MSG_RESULT($ac_cv_prog_LN_S)
-AC_SUBST(LN_S)dnl
-])
-
-dnl
-dnl NEXTSTEP is not posix compliant by default,
-dnl you need a switch -posix to the compiler
-dnl
-
-AC_DEFUN(AC_KRB_SYS_NEXTSTEP, [
-AC_MSG_CHECKING(for NEXTSTEP)
-AC_CACHE_VAL(krb_cv_sys_nextstep,
-AC_EGREP_CPP(yes, 
-[#ifdef NeXT
-	yes
-#endif 
-], krb_cv_sys_nextstep=yes, krb_cv_sys_nextstep=no) )
-if test "$krb_cv_sys_nextstep" = "yes"; then
-  CFLAGS="$CFLAGS -posix"
-  LIBS="$LIBS -posix"
-fi
-AC_MSG_RESULT($krb_cv_sys_nextstep)
-])
-
-dnl
-dnl AIX have a very different syscall convention
-dnl
-AC_DEFUN(AC_KRB_SYS_AIX, [
-AC_MSG_CHECKING(for AIX)
-AC_CACHE_VAL(krb_cv_sys_aix,
-AC_EGREP_CPP(yes, 
-[#ifdef _AIX
-	yes
-#endif 
-], krb_cv_sys_aix=yes, krb_cv_sys_aix=no) )
-AC_MSG_RESULT($krb_cv_sys_aix)
-])
-
-dnl
-dnl test for broken getcwd in (SunOS braindamage)
-dnl
-
-AC_DEFUN(AC_KRB_FUNC_GETCWD_BROKEN, [
-if test "$ac_cv_func_getcwd" = yes; then
-AC_MSG_CHECKING(if getcwd is broken)
-AC_CACHE_VAL(ac_cv_func_getcwd_broken, [
-ac_cv_func_getcwd_broken=no
-
-AC_TRY_RUN([
-#include <errno.h>
-char *getcwd(char*, int);
-
-void *popen(char *cmd, char *mode)
-{
-	errno = ENOTTY;
-	return 0;
-}
-
-int main()
-{
-	char *ret;
-	ret = getcwd(0, 1024);
-	if(ret == 0 && errno == ENOTTY)
-		return 0;
-	return 1;
-}
-], ac_cv_func_getcwd_broken=yes,:,:)
-])
-if test "$ac_cv_func_getcwd_broken" = yes; then
-	AC_DEFINE(BROKEN_GETCWD, 1)dnl
-	LIBOBJS="$LIBOBJS getcwd.o"
-	AC_SUBST(LIBOBJS)dnl
-	AC_MSG_RESULT($ac_cv_func_getcwd_broken)
-else
-	AC_MSG_RESULT([seems ok])
-fi
-fi
-])
-
-
-AC_DEFUN(AC_HAVE_PRAGMA_WEAK, [
-if test "${with_shared}" = "yes"; then
-AC_MSG_CHECKING(for pragma weak)
-AC_CACHE_VAL(ac_have_pragma_weak, [
-ac_have_pragma_weak=no
-cat > conftest_foo.$ac_ext <<'EOF'
-[#]line __oline__ "configure"
-#include "confdefs.h"
-#pragma weak foo = _foo
-int _foo = 17;
-EOF
-cat > conftest_bar.$ac_ext <<'EOF'
-[#]line __oline__ "configure"
-#include "confdefs.h"
-extern int foo;
-
-int t() {
-  return foo;
-}
-
-int main() {
-  return t();
-}
-EOF
-if AC_TRY_EVAL('CC -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest_foo.$ac_ext conftest_bar.$ac_ext 1>&AC_FD_CC'); then
-ac_have_pragma_weak=yes
-fi
-rm -rf conftest*
-])
-if test "$ac_have_pragma_weak" = "yes"; then
-	AC_DEFINE(HAVE_PRAGMA_WEAK, 1)dnl
-fi
-AC_MSG_RESULT($ac_have_pragma_weak)
-fi
-])
-
-dnl
-dnl Search for struct winsize
-dnl
-
-AC_DEFUN(AC_KRB_STRUCT_WINSIZE, [
-AC_MSG_CHECKING(for struct winsize)
-AC_CACHE_VAL(ac_cv_struct_winsize, [
-ac_cv_struct_winsize=no
-for i in sys/termios.h sys/ioctl.h; do
-AC_EGREP_HEADER(
-changequote(, )dnl
-struct[ 	]*winsize,dnl
-changequote([,])dnl
-$i, ac_cv_struct_winsize=yes; break)dnl
-done
-])
-if test "$ac_cv_struct_winsize" = "yes"; then
-  AC_DEFINE(HAVE_STRUCT_WINSIZE, 1)dnl
-fi
-AC_MSG_RESULT($ac_cv_struct_winsize)
-AC_EGREP_HEADER(ws_xpixel, termios.h, AC_DEFINE(HAVE_WS_XPIXEL))
-AC_EGREP_HEADER(ws_ypixel, termios.h, AC_DEFINE(HAVE_WS_YPIXEL))
-])
diff --git a/crypto/kerberosIV/admin/Makefile.in b/crypto/kerberosIV/admin/Makefile.in
deleted file mode 100644
index d0b68b1532ef..000000000000
--- a/crypto/kerberosIV/admin/Makefile.in
+++ /dev/null
@@ -1,104 +0,0 @@
-# $Id: Makefile.in,v 1.26 1997/05/04 08:33:50 assar Exp $
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-CC = @CC@
-AR = ar
-RANLIB = @RANLIB@
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-LD_FLAGS = @LD_FLAGS@
-LIBS = @LIBS@
-LIB_DBM = @LIB_DBM@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-
-MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-libdir = @libdir@
-sbindir = @sbindir@
-transform=@program_transform_name@
-EXECSUFFIX=@EXECSUFFIX@
-
-PROGS = ext_srvtab$(EXECSUFFIX) \
-	kdb_destroy$(EXECSUFFIX) \
-	kdb_edit$(EXECSUFFIX) \
-	kdb_init$(EXECSUFFIX) \
-	kdb_util$(EXECSUFFIX) \
-	kstash$(EXECSUFFIX)
-
-SOURCES = ext_srvtab.c kdb_destroy.c kdb_edit.c \
-          kdb_init.c kdb_util.c kstash.c
-
-OBJECTS = ext_srvtab.o kdb_destroy.o kdb_edit.o \
-          kdb_init.o kdb_util.o kstash.o
-
-all: $(PROGS)
-
-Wall:
-	make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../include -I$(srcdir) $(CFLAGS) $<
-
-install: all
-	$(MKINSTALLDIRS) $(sbindir)
-	for x in $(PROGS); do \
-	  $(INSTALL_PROGRAM) $$x $(sbindir)/`echo $$x|sed '$(transform)'`; \
-	done
-
-uninstall:
-	for x in $(PROGS); do \
-	  rm -f $(sbindir)/`echo $$x|sed '$(transform)'`; \
-	done
-
-TAGS: $(SOURCES)
-	etags $(SOURCES)
-
-check:
-
-clean:
-	rm -f *.a *.o $(PROGS)
-
-mostlyclean: clean
-
-distclean: clean
-	rm -f Makefile *.tab.c *~
-
-realclean: distclean
-	rm -f TAGS
-
-dist: $(DISTFILES)
-	for file in $(DISTFILES); do \
-	  ln $$file ../`cat ../.fname`/lib \
-	    || cp -p $$file ../`cat ../.fname`/lib; \
-	done
-
-KLIB=-L../lib/kdb -lkdb -L../lib/krb -lkrb -L../lib/des -ldes
-LIBROKEN= -L../lib/roken -lroken
-
-ext_srvtab$(EXECSUFFIX): ext_srvtab.o
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ ext_srvtab.o $(KLIB) $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
-
-kdb_destroy$(EXECSUFFIX): kdb_destroy.o
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ kdb_destroy.o $(KLIB) $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
-
-kdb_edit$(EXECSUFFIX): kdb_edit.o
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ kdb_edit.o $(KLIB) $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
-
-kdb_init$(EXECSUFFIX): kdb_init.o
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ kdb_init.o $(KLIB) $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
-
-kdb_util$(EXECSUFFIX): kdb_util.o
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ kdb_util.o $(KLIB) $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
-
-kstash$(EXECSUFFIX): kstash.o
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ kstash.o $(KLIB) $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
-
-$(OBJECTS): ../include/config.h
diff --git a/crypto/kerberosIV/admin/adm_locl.h b/crypto/kerberosIV/admin/adm_locl.h
deleted file mode 100644
index 6cbd20dfde9a..000000000000
--- a/crypto/kerberosIV/admin/adm_locl.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id: adm_locl.h,v 1.16 1997/04/20 05:46:14 assar Exp $ */
-
-#ifndef __adm_locl_h
-#define __adm_locl_h
-
-#include "config.h"
-#include "protos.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#elif defined(HAVE_SYS_TIME_H)
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif /* !TIME_WITH_SYS_TIME */
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <signal.h>
-#include <errno.h>
-
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-
-#include <err.h>
-
-#include <roken.h>
-
-#include <des.h>
-#include <krb.h>
-#include <krb_db.h>
-#include <kdc.h>
-#include <kadm.h>
-
-#endif /*  __adm_locl_h */
diff --git a/crypto/kerberosIV/admin/ext_srvtab.c b/crypto/kerberosIV/admin/ext_srvtab.c
deleted file mode 100644
index 9c029219d899..000000000000
--- a/crypto/kerberosIV/admin/ext_srvtab.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>. 
- *
- * Description 
- */
-
-#include "adm_locl.h"
-
-RCSID("$Id: ext_srvtab.c,v 1.13 1997/05/02 14:27:33 assar Exp $");
-
-static des_cblock master_key;
-static des_cblock session_key;
-static des_key_schedule master_key_schedule;
-static char realm[REALM_SZ];
-
-static void
-usage(void)
-{
-    fprintf(stderr, 
-	    "Usage: %s [-n] [-r realm] instance [instance ...]\n",
-	    __progname);
-    exit(1);
-}
-
-static void
-StampOutSecrets(void)
-{
-    memset(master_key, 0, sizeof master_key);
-    memset(session_key, 0, sizeof session_key);
-    memset(master_key_schedule, 0, sizeof master_key_schedule);
-}
-
-static void
-Die(void)
-{
-    StampOutSecrets();
-    exit(1);
-}
-
-static void
-FWrite(void *p, int size, int n, FILE *f)
-{
-    if (fwrite(p, size, n, f) != n) {
-	printf("Error writing output file.  Terminating.\n");
-	Die();
-    }
-}
-
-int
-main(int argc, char **argv)
-{
-    FILE *fout;
-    char fname[1024];
-    int fopen_errs = 0;
-    int arg;
-    Principal princs[40];
-    int more; 
-    int prompt = KDB_GET_PROMPT;
-    int n, i;
-    
-    set_progname (argv[0]);
-    memset(realm, 0, sizeof(realm));
-    
-    /* Parse commandline arguments */
-    if (argc < 2)
-	usage();
-    else {
-	for (i = 1; i < argc; i++) {
-	    if (strcmp(argv[i], "-n") == 0)
-		prompt = FALSE;
-	    else if (strcmp(argv[i], "-r") == 0) {
-		if (++i >= argc)
-		    usage();
-		else {
-		    strcpy(realm, argv[i]);
-		    /* 
-		     * This is to humor the broken way commandline
-		     * argument parsing is done.  Later, this
-		     * program ignores everything that starts with -.
-		     */
-		    argv[i][0] = '-';
-		}
-	    }
-	    else if (argv[i][0] == '-')
-		usage();
-	    else
-		if (!k_isinst(argv[i])) {
-		  warnx("bad instance name: %s", argv[i]);
-		  usage();
-	    }
-	}
-    }
-
-    if (kdb_get_master_key (prompt, &master_key, master_key_schedule) != 0)
-      errx (1, "Couldn't read master key.");
-
-    if (kdb_verify_master_key (&master_key, master_key_schedule, stderr) < 0) {
-      exit(1);
-    }
-
-    /* For each arg, search for instances of arg, and produce */
-    /* srvtab file */
-    if (!realm[0])
-	if (krb_get_lrealm(realm, 1) != KSUCCESS)
-	  errx (1, "couldn't get local realm");
-    umask(077);
-
-    for (arg = 1; arg < argc; arg++) {
-	if (argv[arg][0] == '-')
-	    continue;
-	snprintf(fname, sizeof(fname), "%s-new-srvtab", argv[arg]);
-	if ((fout = fopen(fname, "w")) == NULL) {
-	    warn("Couldn't create file '%s'.", fname);
-	    fopen_errs++;
-	    continue;
-	}
-	printf("Generating '%s'....\n", fname);
-	n = kerb_get_principal("*", argv[arg], &princs[0], 40, &more);
-	if (more)
-	    fprintf(stderr, "More than 40 found...\n");
-	for (i = 0; i < n; i++) {
-	    FWrite(princs[i].name, strlen(princs[i].name) + 1, 1, fout);
-	    FWrite(princs[i].instance, strlen(princs[i].instance) + 1,
-		   1, fout);
-	    FWrite(realm, strlen(realm) + 1, 1, fout);
-	    FWrite(&princs[i].key_version,
-		sizeof(princs[i].key_version), 1, fout);
-	    copy_to_key(&princs[i].key_low, &princs[i].key_high, session_key);
-	    kdb_encrypt_key (&session_key, &session_key, 
-			     &master_key, master_key_schedule, DES_DECRYPT);
-	    FWrite(session_key, sizeof session_key, 1, fout);
-	}
-	fclose(fout);
-    }
-
-    StampOutSecrets();
-
-    return fopen_errs;		/* 0 errors if successful */
-
-}
diff --git a/crypto/kerberosIV/admin/kdb_destroy.c b/crypto/kerberosIV/admin/kdb_destroy.c
deleted file mode 100644
index fca339f0dd6b..000000000000
--- a/crypto/kerberosIV/admin/kdb_destroy.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 1988 by the Massachusetts Institute of Technology.
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
- *
- * Description.
- */
-
-#include "adm_locl.h"
-
-RCSID("$Id: kdb_destroy.c,v 1.7 1997/03/31 02:25:21 assar Exp $");
-
-int
-main(int argc, char **argv)
-{
-    char    answer[10];		/* user input */
-    char    dbm[256];		/* database path and name */
-    char    dbm1[256];		/* database path and name */
-#ifdef HAVE_NEW_DB
-    char   *file;               /* database file names */
-#else
-    char   *file1, *file2;	/* database file names */
-#endif
-
-    set_progname (argv[0]);
-
-    strcpy(dbm, DBM_FILE);
-#ifdef HAVE_NEW_DB
-    file = strcat(dbm, ".db");
-#else
-    strcpy(dbm1, DBM_FILE);
-    file1 = strcat(dbm, ".dir");
-    file2 = strcat(dbm1, ".pag");
-#endif
-
-    printf("You are about to destroy the Kerberos database ");
-    printf("on this machine.\n");
-    printf("Are you sure you want to do this (y/n)? ");
-    fgets(answer, sizeof(answer), stdin);
-
-    if (answer[0] == 'y' || answer[0] == 'Y') {
-#ifdef HAVE_NEW_DB
-      if (unlink(file) == 0)
-#else
-	if (unlink(file1) == 0 && unlink(file2) == 0)
-#endif
-	  {
-	    warnx ("Database deleted at %s", DBM_FILE);
-	    return 0;
-	  }
-	else
-	    warn ("Database cannot be deleted at %s", DBM_FILE);
-    } else
-        warnx ("Database not deleted at %s", DBM_FILE);
-    return 1;
-}
diff --git a/crypto/kerberosIV/admin/kdb_edit.c b/crypto/kerberosIV/admin/kdb_edit.c
deleted file mode 100644
index 5d07135e9780..000000000000
--- a/crypto/kerberosIV/admin/kdb_edit.c
+++ /dev/null
@@ -1,404 +0,0 @@
-/*
- * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute
- * of Technology.
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
- *
- * This routine changes the Kerberos encryption keys for principals,
- * i.e., users or services. 
- */
-
-/*
- * exit returns 	 0 ==> success -1 ==> error 
- */
-
-#include "adm_locl.h"
-
-RCSID("$Id: kdb_edit.c,v 1.25 1997/05/07 01:34:05 assar Exp $");
-
-#ifdef DEBUG
-extern  kerb_debug;
-#endif
-
-#define zaptime(foo) memset((foo), 0, sizeof(*(foo)))
-
-static int     nflag = 0;
-static int     debug;
-
-static des_cblock new_key;
-
-static int     i, j;
-static int     more;
-
-static char    input_name[ANAME_SZ];
-static char    input_instance[INST_SZ];
-
-#define	MAX_PRINCIPAL	10
-static Principal principal_data[MAX_PRINCIPAL];
-
-static Principal old_principal;
-static Principal default_princ;
-
-static des_cblock master_key;
-static des_cblock session_key;
-static des_key_schedule master_key_schedule;
-static char pw_str[255];
-static long master_key_version;
-
-static void
-Usage(void)
-{
-    fprintf(stderr, "Usage: %s [-n]\n", __progname);
-    exit(1);
-}
-
-static char *
-n_gets(char *buf, int size)
-{
-    char *p;
-    char *ret;
-    ret = fgets(buf, size, stdin);
-  
-    if (ret && (p = strchr(buf, '\n')))
-	*p = 0;
-    return ret;
-}
-
-
-static int
-change_principal(void)
-{
-    static char temp[255];
-    int     creating = 0;
-    int     editpw = 0;
-    int     changed = 0;
-    long    temp_long;		/* Don't change to int32_t, used by scanf */
-    int     n;
-    struct tm 	*tp, edate;
-
-    fprintf(stdout, "\nPrincipal name: ");
-    fflush(stdout);
-    if (!n_gets(input_name, sizeof(input_name)) || *input_name == '\0')
-	return 0;
-    fprintf(stdout, "Instance: ");
-    fflush(stdout);
-    /* instance can be null */
-    n_gets(input_instance, sizeof(input_instance));
-    j = kerb_get_principal(input_name, input_instance, principal_data,
-			   MAX_PRINCIPAL, &more);
-    if (!j) {
-	fprintf(stdout, "\n\07\07<Not found>, Create [y] ? ");
-	fflush(stdout);
-	n_gets(temp, sizeof(temp));		/* Default case should work, it didn't */
-	if (temp[0] != 'y' && temp[0] != 'Y' && temp[0] != '\0')
-	    return -1;
-	/* make a new principal, fill in defaults */
-	j = 1;
-	creating = 1;
-	strcpy(principal_data[0].name, input_name);
-	strcpy(principal_data[0].instance, input_instance);
-	principal_data[0].old = NULL;
-	principal_data[0].exp_date = default_princ.exp_date;
-	if (strcmp(input_instance, "admin") == 0)
-	  principal_data[0].max_life = 1 + (CLOCK_SKEW/(5*60)); /*5+5 minutes*/
-	else if (strcmp(input_instance, "root") == 0)
-	  principal_data[0].max_life = 96; /* 8 hours */
-	else
-	  principal_data[0].max_life = default_princ.max_life;
-	principal_data[0].attributes = default_princ.attributes;
-	principal_data[0].kdc_key_ver = (unsigned char) master_key_version;
-	principal_data[0].key_version = 0; /* bumped up later */
-    }
-    tp = k_localtime(&principal_data[0].exp_date);
-    snprintf(principal_data[0].exp_date_txt,
-	     sizeof(principal_data[0].exp_date_txt),
-	     "%4d-%02d-%02d",
-	     tp->tm_year + 1900,
-	     tp->tm_mon + 1, tp->tm_mday); /* January is 0, not 1 */
-    for (i = 0; i < j; i++) {
-	for (;;) {
-	    fprintf(stdout,
-		    "\nPrincipal: %s, Instance: %s, kdc_key_ver: %d",
-		    principal_data[i].name, principal_data[i].instance,
-		    principal_data[i].kdc_key_ver);
-	    fflush(stdout);
-	    editpw = 1;
-	    changed = 0;
-	    if (!creating) {
-		/*
-		 * copy the existing data so we can use the old values
-		 * for the qualifier clause of the replace 
-		 */
-		principal_data[i].old = (char *) &old_principal;
-		memcpy(&old_principal, &principal_data[i],
-		       sizeof(old_principal));
-		printf("\nChange password [n] ? ");
-		n_gets(temp, sizeof(temp));
-		if (strcmp("y", temp) && strcmp("Y", temp))
-		    editpw = 0;
-	    }
-	    /* password */
-	    if (editpw) {
-#ifdef NOENCRYPTION
-		placebo_read_pw_string(pw_str, sizeof pw_str,
-		    "\nNew Password: ", TRUE);
-#else
-                if(des_read_pw_string(pw_str, sizeof pw_str,
-			"\nNew Password: ", TRUE))
-		    continue;
-#endif
-		if (   strcmp(pw_str, "RANDOM") == 0
-		    || strcmp(pw_str, "") == 0) {
-		    printf("\nRandom password [y] ? ");
-		    n_gets(temp, sizeof(temp));
-		    if (!strcmp("n", temp) || !strcmp("N", temp)) {
-			/* no, use literal */
-#ifdef NOENCRYPTION
-			memset(new_key, 0, sizeof(des_cblock));
-			new_key[0] = 127;
-#else
-			des_string_to_key(pw_str, &new_key);
-#endif
-			memset(pw_str, 0, sizeof pw_str);	/* "RANDOM" */
-		    } else {
-#ifdef NOENCRYPTION
-			memset(new_key, 0, sizeof(des_cblock));
-			new_key[0] = 127;
-#else
-			des_new_random_key(&new_key);
-#endif
-			memset(pw_str, 0, sizeof pw_str);
-		    }
-		} else if (!strcmp(pw_str, "NULL")) {
-		    printf("\nNull Key [y] ? ");
-		    n_gets(temp, sizeof(temp));
-		    if (!strcmp("n", temp) || !strcmp("N", temp)) {
-			/* no, use literal */
-#ifdef NOENCRYPTION
-			memset(new_key, 0, sizeof(des_cblock));
-			new_key[0] = 127;
-#else
-			des_string_to_key(pw_str, &new_key);
-#endif
-			memset(pw_str, 0, sizeof pw_str);	/* "NULL" */
-		    } else {
-
-			principal_data[i].key_low = 0;
-			principal_data[i].key_high = 0;
-			goto null_key;
-		    }
-		} else {
-#ifdef NOENCRYPTION
-		    memset(new_key, 0, sizeof(des_cblock));
-		    new_key[0] = 127;
-#else
-		    des_string_to_key(pw_str, &new_key);
-#endif
-		    memset(pw_str, 0, sizeof pw_str);
-		}
-
-		/* seal it under the kerberos master key */
-		kdb_encrypt_key (&new_key, &new_key, 
-				 &master_key, master_key_schedule,
-				 DES_ENCRYPT);
-		copy_from_key(new_key,
-			      &principal_data[i].key_low,
-			      &principal_data[i].key_high);
-		memset(new_key, 0, sizeof(new_key));
-	null_key:
-		/* set master key version */
-		principal_data[i].kdc_key_ver =
-		    (unsigned char) master_key_version;
-		/* bump key version # */
-		principal_data[i].key_version++;
-		fprintf(stdout,
-			"\nPrincipal's new key version = %d\n",
-			principal_data[i].key_version);
-		fflush(stdout);
-		changed = 1;
-	    }
-	    /* expiration date */
-	    fprintf(stdout, "Expiration date (enter yyyy-mm-dd) [ %s ] ? ",
-		    principal_data[i].exp_date_txt);
-	    fflush(stdout);
-	    zaptime(&edate);
-	    while (n_gets(temp, sizeof(temp)) && ((n = strlen(temp)) >
-				  sizeof(principal_data[0].exp_date_txt))) {
-	    bad_date:
-		fprintf(stdout, "\07\07Date Invalid\n");
-		fprintf(stdout,
-			"Expiration date (enter yyyy-mm-dd) [ %s ] ? ",
-			principal_data[i].exp_date_txt);
-		fflush(stdout);
-		zaptime(&edate);
-	    }
-
-	    if (*temp) {
-		if (sscanf(temp, "%d-%d-%d", &edate.tm_year,
-			      &edate.tm_mon, &edate.tm_mday) != 3)
-		    goto bad_date;
-		edate.tm_mon--;		/* January is 0, not 1 */
-		edate.tm_hour = 23;	/* nearly midnight at the end of the */
-		edate.tm_min = 59;	/* specified day */
-		if (krb_check_tm (edate))
-		    goto bad_date;
-		edate.tm_year -= 1900;
-		temp_long = tm2time (edate, 1);
-		strcpy(principal_data[i].exp_date_txt, temp);
-		principal_data[i].exp_date = temp_long;
-		changed = 1;
-	    }
-
-	    /* maximum lifetime */
-	    fprintf(stdout, "Max ticket lifetime (*5 minutes) [ %d ] ? ",
-		    principal_data[i].max_life);
-	    fflush(stdout);
-	    while (n_gets(temp, sizeof(temp)) && *temp) {
-		if (sscanf(temp, "%ld", &temp_long) != 1)
-		    goto bad_life;
-		if (temp_long > 255 || (temp_long < 0)) {
-		bad_life:
-		    fprintf(stdout, "\07\07Invalid, choose 0-255\n");
-		    fprintf(stdout,
-			    "Max ticket lifetime (*5 minutes) [ %d ] ? ",
-			    principal_data[i].max_life);
-		    fflush(stdout);
-		    continue;
-		}
-		changed = 1;
-		/* dont clobber */
-		principal_data[i].max_life = (unsigned short) temp_long;
-		break;
-	    }
-
-	    /* attributes */
-	    fprintf(stdout, "Attributes [ %d ] ? ",
-		    principal_data[i].attributes);
-	    fflush(stdout);
-	    while (n_gets(temp, sizeof(temp)) && *temp) {
-		if (sscanf(temp, "%ld", &temp_long) != 1)
-		    goto bad_att;
-		if (temp_long > 65535 || (temp_long < 0)) {
-		bad_att:
-		    fprintf(stdout, "\07\07Invalid, choose 0-65535\n");
-		    fprintf(stdout, "Attributes [ %d ] ? ",
-			    principal_data[i].attributes);
-		    fflush(stdout);
-		    continue;
-		}
-		changed = 1;
-		/* dont clobber */
-		principal_data[i].attributes =
-		    (unsigned short) temp_long;
-		break;
-	    }
-
-	    /*
-	     * remaining fields -- key versions and mod info, should
-	     * not be directly manipulated 
-	     */
-	    if (changed) {
-		if (kerb_put_principal(&principal_data[i], 1)) {
-		    fprintf(stdout,
-			"\nError updating Kerberos database");
-		} else {
-		    fprintf(stdout, "Edit O.K.");
-		}
-	    } else {
-		fprintf(stdout, "Unchanged");
-	    }
-
-
-	    memset(&principal_data[i].key_low, 0, 4);
-	    memset(&principal_data[i].key_high, 0, 4);
-	    fflush(stdout);
-	    break;
-	}
-    }
-    if (more) {
-	fprintf(stdout, "\nThere were more tuples found ");
-	fprintf(stdout, "than there were space for");
-      }
-    return 1;
-}
-
-static void
-cleanup(void)
-{
-
-    memset(master_key, 0, sizeof(master_key));
-    memset(session_key, 0, sizeof(session_key));
-    memset(master_key_schedule, 0, sizeof(master_key_schedule));
-    memset(principal_data, 0, sizeof(principal_data));
-    memset(new_key, 0, sizeof(new_key));
-    memset(pw_str, 0, sizeof(pw_str));
-}
-
-int
-main(int argc, char **argv)
-{
-    /* Local Declarations */
-
-    long    n;
-
-    set_progname (argv[0]);
-
-    while (--argc > 0 && (*++argv)[0] == '-')
-	for (i = 1; argv[0][i] != '\0'; i++) {
-	    switch (argv[0][i]) {
-
-		/* debug flag */
-	    case 'd':
-		debug = 1;
-		continue;
-
-		/* debug flag */
-#ifdef DEBUG
-	    case 'l':
-		kerb_debug |= 1;
-		continue;
-#endif
-	    case 'n':		/* read MKEYFILE for master key */
-		nflag = 1;
-		continue;
-
-	    default:
-		warnx ("illegal flag \"%c\"", argv[0][i]);
-		Usage();	/* Give message and die */
-	    }
-	}
-
-    fprintf(stdout, "Opening database...\n");
-    fflush(stdout);
-    kerb_init();
-    if (argc > 0)
-	if (kerb_db_set_name(*argv) != 0)
-	    errx (1, "Could not open altername database name");
-
-    if (kdb_get_master_key ((nflag == 0) ? KDB_GET_PROMPT : 0, 
-			    &master_key, master_key_schedule) != 0)
-	errx (1, "Couldn't read master key.");
-
-    if ((master_key_version = kdb_verify_master_key(&master_key,
-						    master_key_schedule,
-						    stdout)) < 0)
-      return 1;
-
-    /* Initialize non shared random sequence */
-    des_init_random_number_generator(&master_key);
-
-    /* lookup the default values */
-    n = kerb_get_principal(KERB_DEFAULT_NAME, KERB_DEFAULT_INST,
-			   &default_princ, 1, &more);
-    if (n != 1)
-	errx (1, "Kerberos error on default value lookup, %ld found.", n);
-    fprintf(stdout, "Previous or default values are in [brackets] ,\n");
-    fprintf(stdout, "enter return to leave the same, or new value.\n");
-
-    while (change_principal()) {
-    }
-
-    cleanup();
-    return 0;
-}
diff --git a/crypto/kerberosIV/admin/kdb_init.c b/crypto/kerberosIV/admin/kdb_init.c
deleted file mode 100644
index b9ea009c5d1c..000000000000
--- a/crypto/kerberosIV/admin/kdb_init.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>. 
- *
- * program to initialize the database,  reports error if database file
- * already exists. 
- */
-
-#include "adm_locl.h"
-
-RCSID("$Id: kdb_init.c,v 1.23 1997/03/30 17:45:05 assar Exp $");
-
-enum ap_op {
-    NULL_KEY,			/* setup null keys */
-    MASTER_KEY,                 /* use master key as new key */
-    RANDOM_KEY			/* choose a random key */
-};
-
-static des_cblock master_key;
-static des_key_schedule master_key_schedule;
-
-/* use a return code to indicate success or failure.  check the return */
-/* values of the routines called by this routine. */
-
-static int
-add_principal(char *name, char *instance, enum ap_op aap_op, int maxlife)
-{
-    Principal principal;
-    struct tm *tm;
-    des_cblock new_key;
-
-    memset(&principal, 0, sizeof(principal));
-    strncpy(principal.name, name, ANAME_SZ);
-    strncpy(principal.instance, instance, INST_SZ);
-    switch (aap_op) {
-    case NULL_KEY:
-	principal.key_low = 0;
-	principal.key_high = 0;
-	break;
-    case RANDOM_KEY:
-#ifdef NOENCRYPTION
-        memset(new_key, 0, sizeof(des_cblock));
-	new_key[0] = 127;
-#else
-	des_new_random_key(&new_key);
-#endif
-	kdb_encrypt_key (&new_key, &new_key, &master_key, master_key_schedule,
-			 DES_ENCRYPT);
-	copy_from_key(new_key, &principal.key_low, &principal.key_high);
-	memset(new_key, 0, sizeof(new_key));
-	break;
-    case MASTER_KEY:
-	memcpy(new_key, master_key, sizeof (des_cblock));
-	kdb_encrypt_key (&new_key, &new_key, &master_key, master_key_schedule,
-			 DES_ENCRYPT);
-	copy_from_key(new_key, &principal.key_low, &principal.key_high);
-	break;
-    }
-    principal.exp_date = 946702799;	/* Happy new century */
-    strncpy(principal.exp_date_txt, "12/31/99", DATE_SZ);
-    principal.mod_date = time(0);
-
-    tm = k_localtime(&principal.mod_date);
-    principal.attributes = 0;
-    principal.max_life = maxlife;
-
-    principal.kdc_key_ver = 1;
-    principal.key_version = 1;
-
-    strncpy(principal.mod_name, "db_creation", ANAME_SZ);
-    strncpy(principal.mod_instance, "", INST_SZ);
-    principal.old = 0;
-
-    if (kerb_db_put_principal(&principal, 1) != 1)
-        return -1;		/* FAIL */
-    
-    /* let's play it safe */
-    memset(new_key, 0, sizeof (des_cblock));
-    memset(&principal.key_low, 0, 4);
-    memset(&principal.key_high, 0, 4);
-    return 0;
-}
-
-int
-main(int argc, char **argv)
-{
-    char    realm[REALM_SZ];
-    char   *cp;
-    int code;
-    char *database;
-    
-    set_progname (argv[0]);
-
-    if (argc > 3) {
-	fprintf(stderr, "Usage: %s [realm-name] [database-name]\n", argv[0]);
-	return 1;
-    }
-    if (argc == 3) {
-	database = argv[2];
-	--argc;
-    } else
-	database = DBM_FILE;
-
-    /* Do this first, it'll fail if the database exists */
-    if ((code = kerb_db_create(database)) != 0)
-	err (1, "Couldn't create database %s", database);
-    kerb_db_set_name(database);
-
-    if (argc == 2)
-	strncpy(realm, argv[1], REALM_SZ);
-    else {
-        if (krb_get_lrealm(realm, 1) != KSUCCESS)
-		strcpy(realm, KRB_REALM);
-	fprintf(stderr, "Realm name [default  %s ]: ", realm);
-	if (fgets(realm, sizeof(realm), stdin) == NULL)
-	    errx (1, "\nEOF reading realm");
-	if ((cp = strchr(realm, '\n')))
-	    *cp = '\0';
-	if (!*realm)			/* no realm given */
-		if (krb_get_lrealm(realm, 1) != KSUCCESS)
-			strcpy(realm, KRB_REALM);
-    }
-    if (!k_isrealm(realm))
-	errx (1, "Bad kerberos realm name \"%s\"", realm);
-#ifndef RANDOM_MKEY
-    printf("You will be prompted for the database Master Password.\n");
-    printf("It is important that you NOT FORGET this password.\n");
-#else
-    printf("To generate a master key, please enter some random data.\n");
-    printf("You do not have to remember this.\n");
-#endif
-    fflush(stdout);
-
-    if (kdb_get_master_key (KDB_GET_TWICE, &master_key,
-			    master_key_schedule) != 0)
-	errx (1, "Couldn't read master key.");
-
-#ifdef RANDOM_MKEY
-    if(kdb_kstash(&master_key, MKEYFILE) < 0)
-	err (1, "Error writing master key");
-    fprintf(stderr, "Wrote master key to %s\n", MKEYFILE);
-#endif
-
-    /* Initialize non shared random sequence */
-    des_init_random_number_generator(&master_key);
-
-    /* Maximum lifetime for changepw.kerberos (kadmin) tickets, 10 minutes */
-#define ADMLIFE (1 + (CLOCK_SKEW/(5*60)))
-
-    /* Maximum lifetime for ticket granting tickets, 4 days or 21.25h */
-#define TGTLIFE ((krb_life_to_time(0, 162) >= 24*60*60) ? 161 : 255)
-
-    /* This means that default lifetimes have not been initialized */
-#define DEFLIFE 255
-
-#define NOLIFE 0
-
-    if (
-	add_principal(KERB_M_NAME, KERB_M_INST, MASTER_KEY, NOLIFE) ||
-	add_principal(KERB_DEFAULT_NAME, KERB_DEFAULT_INST, NULL_KEY,DEFLIFE)||
-	add_principal(KRB_TICKET_GRANTING_TICKET, realm, RANDOM_KEY, TGTLIFE)||
-	add_principal(PWSERV_NAME, KRB_MASTER, RANDOM_KEY, ADMLIFE) 
-	) {
-      putc ('\n', stderr);
-      errx (1, "couldn't initialize database.");
-    }
-
-    /* play it safe */
-    memset(master_key, 0, sizeof (des_cblock));
-    memset(master_key_schedule, 0, sizeof (des_key_schedule));
-    return 0;
-}
diff --git a/crypto/kerberosIV/admin/kdb_util.c b/crypto/kerberosIV/admin/kdb_util.c
deleted file mode 100644
index b221fddb1e6b..000000000000
--- a/crypto/kerberosIV/admin/kdb_util.c
+++ /dev/null
@@ -1,496 +0,0 @@
-/*
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
- * 
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
- *
- * Kerberos database manipulation utility. This program allows you to
- * dump a kerberos database to an ascii readable file and load this
- * file into the database. Read locking of the database is done during a
- * dump operation. NO LOCKING is done during a load operation. Loads
- * should happen with other processes shutdown. 
- *
- * Written July 9, 1987 by Jeffrey I. Schiller
- */
-
-#include "adm_locl.h"
-
-RCSID("$Id: kdb_util.c,v 1.35 1997/05/07 00:57:45 assar Exp $");
-
-static des_cblock master_key, new_master_key;
-static des_key_schedule master_key_schedule, new_master_key_schedule;
-
-#define zaptime(foo) memset((foo), 0, sizeof(*(foo)))
-
-/* cv_key is a procedure which takes a principle and changes its key, 
-   either for a new method of encrypting the keys, or a new master key.
-   if cv_key is null no transformation of key is done (other than net byte
-   order). */
-
-struct callback_args {
-    void (*cv_key)(Principal *);
-    FILE *output_file;
-};
-
-static void
-print_time(FILE *file, time_t timeval)
-{
-    struct tm *tm;
-    tm = gmtime(&timeval);
-    fprintf(file, " %04d%02d%02d%02d%02d",
-	    tm->tm_year + 1900,
-            tm->tm_mon + 1,
-            tm->tm_mday,
-            tm->tm_hour,
-            tm->tm_min);
-}
-
-static long
-time_explode(char *cp)
-{
-    char wbuf[5];
-    struct tm tp;
-    int local;
-
-    zaptime(&tp);			/* clear out the struct */
-    
-    if (strlen(cp) > 10) {		/* new format */
-	strncpy(wbuf, cp, 4);
-	wbuf[4] = 0;
-	tp.tm_year = atoi(wbuf) - 1900;
-	cp += 4;			/* step over the year */
-	local = 0;			/* GMT */
-    } else {				/* old format: local time, 
-					   year is 2 digits, assuming 19xx */
-	wbuf[0] = *cp++;
-	wbuf[1] = *cp++;
-	wbuf[2] = 0;
-	tp.tm_year = atoi(wbuf);
-	local = 1;			/* local */
-    }
-
-    wbuf[0] = *cp++;
-    wbuf[1] = *cp++;
-    wbuf[2] = 0;
-    tp.tm_mon = atoi(wbuf)-1;
-
-    wbuf[0] = *cp++;
-    wbuf[1] = *cp++;
-    tp.tm_mday = atoi(wbuf);
-    
-    wbuf[0] = *cp++;
-    wbuf[1] = *cp++;
-    tp.tm_hour = atoi(wbuf);
-    
-    wbuf[0] = *cp++;
-    wbuf[1] = *cp++;
-    tp.tm_min = atoi(wbuf);
-
-
-    return(tm2time(tp, local));
-}
-
-static int
-dump_db_1(void *arg, Principal *principal)
-{	    /* replace null strings with "*" */
-    struct callback_args *a = (struct callback_args *)arg;
-    
-    if (principal->instance[0] == '\0') {
-	principal->instance[0] = '*';
-	principal->instance[1] = '\0';
-    }
-    if (principal->mod_name[0] == '\0') {
-	principal->mod_name[0] = '*';
-	principal->mod_name[1] = '\0';
-    }
-    if (principal->mod_instance[0] == '\0') {
-	principal->mod_instance[0] = '*';
-	principal->mod_instance[1] = '\0';
-    }
-    if (a->cv_key != NULL) {
-	(*a->cv_key) (principal);
-    }
-    fprintf(a->output_file, "%s %s %d %d %d %d %x %x",
-	    principal->name,
-	    principal->instance,
-	    principal->max_life,
-	    principal->kdc_key_ver,
-	    principal->key_version,
-	    principal->attributes,
-	    (int)htonl (principal->key_low),
-	    (int)htonl (principal->key_high));
-    print_time(a->output_file, principal->exp_date);
-    print_time(a->output_file, principal->mod_date);
-    fprintf(a->output_file, " %s %s\n",
-	    principal->mod_name,
-	    principal->mod_instance);
-    return 0;
-}
-
-static int
-dump_db (char *db_file, FILE *output_file, void (*cv_key) (Principal *))
-{
-    struct callback_args a;
-
-    a.cv_key = cv_key;
-    a.output_file = output_file;
-    
-    kerb_db_iterate ((k_iter_proc_t)dump_db_1, &a);
-    return fflush(output_file);
-}
-
-static int
-add_file(void *db, FILE *file)
-{
-    int ret;
-    int lineno = 0;
-    char line[1024];
-    unsigned long key[2]; /* yes, long */
-    Principal pr;
-    
-    char exp_date[64], mod_date[64];
-    
-    int life, kkvno, kvno;
-    
-    while(1){
-	memset(&pr, 0, sizeof(pr));
-	errno = 0;
-	if(fgets(line, sizeof(line), file) == NULL){
-	    if(errno != 0)
-	      err (1, "fgets");
-	    break;
-	}
-	lineno++;
-	ret = sscanf(line, "%s %s %d %d %d %hd %lx %lx %s %s %s %s",
-		     pr.name, pr.instance,
-		     &life, &kkvno, &kvno,
-		     &pr.attributes,
-		     &key[0], &key[1],
-		     exp_date, mod_date,
-		     pr.mod_name, pr.mod_instance);
-	if(ret != 12){
-	    warnx("Line %d malformed (ignored)", lineno);
-	    continue;
-	}
-	pr.key_low = ntohl (key[0]);
-	pr.key_high = ntohl (key[1]);
-	pr.max_life = life;
-	pr.kdc_key_ver = kkvno;
-	pr.key_version = kvno;
-	pr.exp_date = time_explode(exp_date);
-	pr.mod_date = time_explode(mod_date);
-	if (pr.instance[0] == '*')
-	    pr.instance[0] = 0;
-	if (pr.mod_name[0] == '*')
-	    pr.mod_name[0] = 0;
-	if (pr.mod_instance[0] == '*')
-	    pr.mod_instance[0] = 0;
-	if (kerb_db_update(db, &pr, 1) != 1) {
-	    warn ("store %s.%s aborted",
-		  pr.name, pr.instance);
-	    return 1;
-	}
-    }
-    return 0;
-}
-
-static void
-load_db (char *db_file, FILE *input_file)
-{
-    long *db;
-    int     temp1;
-    int code;
-    char *temp_db_file;
-
-    temp1 = strlen(db_file)+2;
-    temp_db_file = malloc (temp1);
-    strcpy(temp_db_file, db_file);
-    strcat(temp_db_file, "~");
-
-    /* Create the database */
-    if ((code = kerb_db_create(temp_db_file)) != 0)
-	err (1, "creating temp database %s", temp_db_file);
-    kerb_db_set_name(temp_db_file);
-    db = kerb_db_begin_update();
-    if (db == NULL)
-	err (1, "opening temp database %s", temp_db_file);
-    
-    if(add_file(db, input_file))
-	errx (1, "Load aborted");
-
-    kerb_db_end_update(db);
-    if ((code = kerb_db_rename(temp_db_file, db_file)) != 0)
-        warn("database rename failed");
-    fclose(input_file);
-    free(temp_db_file);
-}
-
-static void
-merge_db(char *db_file, FILE *input_file)
-{
-    void *db;
-    
-    db = kerb_db_begin_update();
-    if(db == NULL)
-        err (1, "Couldn't open database");
-    if(add_file(db, input_file))
-        errx (1, "Merge aborted");
-    kerb_db_end_update(db);
-}
-
-static void
-update_ok_file (char *file_name)
-{
-    /* handle slave locking/failure stuff */
-    char *file_ok;
-    int fd;
-    static char ok[]=".dump_ok";
-
-    asprintf (&file_ok, "%s%s", file_name, ok);
-    if (file_ok == NULL)
-      errx (1, "out of memory");
-    if ((fd = open(file_ok, O_WRONLY|O_CREAT|O_TRUNC, 0400)) < 0)
-        err (1, "Error creating %s", file_ok);
-    free(file_ok);
-    close(fd);
-}
-
-static void
-convert_key_new_master (Principal *p)
-{
-  des_cblock key;
-
-  /* leave null keys alone */
-  if ((p->key_low == 0) && (p->key_high == 0)) return;
-
-  /* move current key to des_cblock for encryption, special case master key
-     since that's changing */
-  if ((strncmp (p->name, KERB_M_NAME, ANAME_SZ) == 0) &&
-      (strncmp (p->instance, KERB_M_INST, INST_SZ) == 0)) {
-    memcpy (key, new_master_key, sizeof(des_cblock));
-    (p->key_version)++;
-  } else {
-    copy_to_key(&p->key_low, &p->key_high, key);
-    kdb_encrypt_key (&key, &key, &master_key, master_key_schedule, DES_DECRYPT);
-  }
-
-  kdb_encrypt_key (&key, &key, &new_master_key, new_master_key_schedule, DES_ENCRYPT);
-
-  copy_from_key(key, &(p->key_low), &(p->key_high));
-  memset(key, 0, sizeof (key));  /* a little paranoia ... */
-
-  (p->kdc_key_ver)++;
-}
-
-static void
-clear_secrets (void)
-{
-  memset(master_key, 0, sizeof (des_cblock));
-  memset(master_key_schedule, 0, sizeof (des_key_schedule));
-  memset(new_master_key, 0, sizeof (des_cblock));
-  memset(new_master_key_schedule, 0, sizeof (des_key_schedule));
-}
-
-static void
-convert_new_master_key (char *db_file, FILE *out)
-{
-#ifdef RANDOM_MKEY
-  errx (1, "Sorry, this function is not available with "
-	"the new master key scheme.");
-#else
-  printf ("\n\nEnter the CURRENT master key.");
-  if (kdb_get_master_key (KDB_GET_PROMPT, &master_key,
-			  master_key_schedule) != 0) {
-    clear_secrets ();
-    errx (1, "Couldn't get master key.");
-  }
-
-  if (kdb_verify_master_key (&master_key, master_key_schedule, stderr) < 0) {
-    clear_secrets ();
-    exit (1);
-  }
-
-  printf ("\n\nNow enter the NEW master key.  Do not forget it!!");
-  if (kdb_get_master_key (KDB_GET_TWICE, &new_master_key,
-			  new_master_key_schedule) != 0) {
-    clear_secrets ();
-    errx (1, "Couldn't get new master key.");
-  }
-
-  dump_db (db_file, out, convert_key_new_master);
-  {
-    char fname[128];
-    snprintf(fname, sizeof(fname), "%s.new", MKEYFILE);
-    kdb_kstash(&new_master_key, fname);
-  }
-#endif /* RANDOM_MKEY */
-}
-
-static void
-convert_key_old_db (Principal *p)
-{
-  des_cblock key;
-
- /* leave null keys alone */
-  if ((p->key_low == 0) && (p->key_high == 0)) return;
-
-  copy_to_key(&p->key_low, &p->key_high, key);
-
-#ifndef NOENCRYPTION
-  des_pcbc_encrypt((des_cblock *)key,(des_cblock *)key,
-	(long)sizeof(des_cblock),master_key_schedule,
-	(des_cblock *)master_key_schedule, DES_DECRYPT);
-#endif
-
-  /* make new key, new style */
-  kdb_encrypt_key (&key, &key, &master_key, master_key_schedule, DES_ENCRYPT);
-
-  copy_from_key(key, &(p->key_low), &(p->key_high));
-  memset(key, 0, sizeof (key));  /* a little paranoia ... */
-}
-
-static void
-convert_old_format_db (char *db_file, FILE *out)
-{
-  des_cblock key_from_db;
-  Principal principal_data[1];
-  int n, more;
-
-  if (kdb_get_master_key (KDB_GET_PROMPT, &master_key,
-			  master_key_schedule) != 0L) {
-    clear_secrets();
-    errx (1, "Couldn't get master key.");
-  }
-
-  /* can't call kdb_verify_master_key because this is an old style db */
-  /* lookup the master key version */
-  n = kerb_get_principal(KERB_M_NAME, KERB_M_INST, principal_data,
-			 1 /* only one please */, &more);
-  if ((n != 1) || more)
-    errx (1, "verify_master_key: Kerberos error on master key lookup, %d found.\n", n);
-
-  /* set up the master key */
-  fprintf(stderr, "Current Kerberos master key version is %d.\n",
-	  principal_data[0].kdc_key_ver);
-
-  /*
-   * now use the master key to decrypt (old style) the key in the db, had better
-   * be the same! 
-   */
-  copy_to_key(&principal_data[0].key_low,
-	      &principal_data[0].key_high,
-	      key_from_db);
-#ifndef NOENCRYPTION
-  des_pcbc_encrypt(&key_from_db,&key_from_db,(long)sizeof(key_from_db),
-	master_key_schedule,(des_cblock *)master_key_schedule, DES_DECRYPT);
-#endif
-  /* the decrypted database key had better equal the master key */
-
-  n = memcmp(master_key, key_from_db, sizeof(master_key));
-  memset(key_from_db, 0, sizeof(key_from_db));
-
-  if (n) {
-    fprintf(stderr, "\n\07\07verify_master_key: Invalid master key, ");
-    fprintf(stderr, "does not match database.\n");
-    exit (1);
-  }
-    
-  fprintf(stderr, "Master key verified.\n");
-
-  dump_db (db_file, out, convert_key_old_db);
-}
-
-int
-main(int argc, char **argv)
-{
-    int ret;
-    FILE   *file;
-    enum {
-	OP_LOAD,
-	OP_MERGE,
-	OP_DUMP,
-	OP_SLAVE_DUMP,
-	OP_NEW_MASTER,
-	OP_CONVERT_OLD_DB
-    }       op;
-    char *file_name;
-    char *db_name;
-
-    set_progname (argv[0]);
-    
-    if (argc != 3 && argc != 4) {
-	fprintf(stderr, "Usage: %s operation file [database name].\n",
-		argv[0]);
-	fprintf(stderr, "Operation is one of: "
-		"load, merge, dump, slave_dump, new_master_key, "
-		"convert_old_db\n");
-	exit(1);
-    }
-    if (argc == 3)
-	db_name = DBM_FILE;
-    else
-	db_name = argv[3];
-    
-    ret = kerb_db_set_name (db_name);
-    
-    /* this makes starting slave servers ~14.3 times easier */
-    if(ret && strcmp(argv[1], "load") == 0)
-       ret = kerb_db_create (db_name);
-
-    if(ret)
-      err (1, "Can't open database");
-
-    if (!strcmp(argv[1], "load"))
-	op = OP_LOAD;
-    else if (!strcmp(argv[1], "merge"))
-	op = OP_MERGE;
-    else if (!strcmp(argv[1], "dump"))
-	op = OP_DUMP;
-    else if (!strcmp(argv[1], "slave_dump"))
-        op = OP_SLAVE_DUMP;
-    else if (!strcmp(argv[1], "new_master_key"))
-        op = OP_NEW_MASTER;
-    else if (!strcmp(argv[1], "convert_old_db"))
-        op = OP_CONVERT_OLD_DB;
-    else {
-        warnx ("%s is an invalid operation.", argv[1]);
-	warnx ("Valid operations are \"load\", \"merge\", "
-	       "\"dump\", \"slave_dump\", \"new_master_key\", "
-	       "and \"convert_old_db\"");
-	return 1;
-    }
-
-    file_name = argv[2];
-    file = fopen(file_name, (op == OP_LOAD || op == OP_MERGE) ? "r" : "w");
-    if (file == NULL)
-        err (1, "open %s", argv[2]);
-
-    switch (op) {
-    case OP_DUMP:
-      if ((dump_db (db_name, file, (void (*)(Principal *)) 0) == EOF) ||
-	  (fclose(file) == EOF))
-	  err (1, "%s", file_name);
-      break;
-    case OP_SLAVE_DUMP:
-      if ((dump_db (db_name, file, (void (*)(Principal *)) 0) == EOF) ||
-	  (fclose(file) == EOF))
-	err (1, "%s", file_name);
-      update_ok_file (file_name);
-      break;
-    case OP_LOAD:
-      load_db (db_name, file);
-      break;
-    case OP_MERGE:
-      merge_db (db_name, file);
-      break;
-    case OP_NEW_MASTER:
-      convert_new_master_key (db_name, file);
-      printf("Don't forget to do a `kdb_util load %s' to reload the database!\n", file_name);
-      break;
-    case OP_CONVERT_OLD_DB:
-      convert_old_format_db (db_name, file);
-      printf("Don't forget to do a `kdb_util load %s' to reload the database!\n", file_name);      
-      break;
-    }
-    return 0;
-}
diff --git a/crypto/kerberosIV/admin/kstash.c b/crypto/kerberosIV/admin/kstash.c
deleted file mode 100644
index 4595de58ef32..000000000000
--- a/crypto/kerberosIV/admin/kstash.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute
- * of Technology 
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
- *
- * Description.
- */
-
-#include "adm_locl.h"
-
-RCSID("$Id: kstash.c,v 1.10 1997/03/30 17:35:37 assar Exp $");
-
-/* change this later, but krblib_dbm needs it for now */
-
-static des_cblock master_key;
-static des_key_schedule master_key_schedule;
-
-static void 
-clear_secrets(void)
-{
-    memset(master_key_schedule, 0, sizeof(master_key_schedule));
-    memset(master_key, 0, sizeof(master_key));
-}
-
-int
-main(int argc, char **argv)
-{
-    long    n;
-    int ret = 0;
-    set_progname (argv[0]);
-
-    if ((n = kerb_init()))
-        errx(1, "Kerberos db and cache init failed = %ld\n", n);
-
-    if (kdb_get_master_key (KDB_GET_PROMPT, &master_key,
-			    master_key_schedule) != 0) {
-	clear_secrets();
-	errx(1, "Couldn't read master key.");
-    }
-
-    if (kdb_verify_master_key (&master_key, master_key_schedule, stderr) < 0) {
-	clear_secrets();
-	return 1;
-    }
-
-    ret = kdb_kstash(&master_key, MKEYFILE);
-    if(ret < 0)
-        warn("writing master key");
-    else
-	fprintf(stderr, "Wrote master key to %s\n", MKEYFILE);
-    
-    clear_secrets();
-    return ret;
-}
diff --git a/crypto/kerberosIV/appl/Makefile.in b/crypto/kerberosIV/appl/Makefile.in
deleted file mode 100644
index c9512589525f..000000000000
--- a/crypto/kerberosIV/appl/Makefile.in
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: Makefile.in,v 1.27 1997/05/20 18:58:37 bg Exp $
-
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-SHELL		= /bin/sh
-
-@SET_MAKE@
-
-SUBDIRS		= sample kauth bsd movemail afsutil \
-		  kpopper xnlock kx otp @APPL_KIP_DIR@ ftp telnet
-
-all:
-	for i in $(SUBDIRS); \
-	do (cd $$i && $(MAKE) $(MFLAGS) all); done
-
-Wall:
-	make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
-
-install:
-	for i in $(SUBDIRS); \
-	do (cd $$i && $(MAKE) $(MFLAGS) install); done
-
-uninstall:
-	for i in $(SUBDIRS); \
-	do (cd $$i && $(MAKE) $(MFLAGS) uninstall); done
-
-clean:
-	for i in $(SUBDIRS); \
-	do (cd $$i && $(MAKE) $(MFLAGS) clean); done
-
-mostlyclean:	clean
-
-distclean:
-	for i in $(SUBDIRS);\
-	do (cd $$i && $(MAKE) $(MFLAGS) distclean); done
-	rm -f Makefile *~
-
-realclean:
-	for i in $(SUBDIRS); \
-	do (cd $$i && $(MAKE) $(MFLAGS) realclean); done
-
-.PHONY: all install uninstall clean distclean realclean mostlyclean
diff --git a/crypto/kerberosIV/appl/bsd/Makefile.in b/crypto/kerberosIV/appl/bsd/Makefile.in
deleted file mode 100644
index 57a810890094..000000000000
--- a/crypto/kerberosIV/appl/bsd/Makefile.in
+++ /dev/null
@@ -1,135 +0,0 @@
-# $Id: Makefile.in,v 1.56 1997/05/20 20:35:04 assar Exp $
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-topdir	= ../..
-
-CC = @CC@
-AR = ar
-RANLIB = @RANLIB@
-DEFS = @DEFS@ -DBINDIR='"$(bindir)"'
-CFLAGS = @CFLAGS@
-LD_FLAGS = @LD_FLAGS@
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-LIBS = @LIBS@
-LIB_DBM = @LIB_DBM@
-MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-libdir = @libdir@
-libexecdir = @libexecdir@
-bindir = @bindir@
-transform=@program_transform_name@
-EXECSUFFIX=@EXECSUFFIX@
-
-# Beware, these are all setuid root programs
-PROG_SUIDBIN	= rsh$(EXECSUFFIX) \
-		  rcp$(EXECSUFFIX) \
-		  rlogin$(EXECSUFFIX) \
-		  su$(EXECSUFFIX)
-PROG_BIN	= login$(EXECSUFFIX)
-PROG_LIBEXEC	= rshd$(EXECSUFFIX) \
-		  rlogind$(EXECSUFFIX)
-PROGS = $(PROG_SUIDBIN) $(PROG_BIN) $(PROG_LIBEXEC)
-
-SOURCES = rsh.c kcmd.c krcmd.c rlogin.c rcp.c rcp_util.c rshd.c \
-	login.c klogin.c login_access.c su.c rlogind.c iruserok.c \
-	login_fbtab.c forkpty.c sysv_default.c sysv_environ.c sysv_shadow.c \
-	utmp_login.c utmpx_login.c stty_default.c encrypt.c rcmd_util.c tty.c
-
-rsh_OBJS	= rsh.o kcmd.o krcmd.o encrypt.o rcmd_util.o
-rcp_OBJS	= rcp.o rcp_util.o kcmd.o krcmd.o encrypt.o rcmd_util.o
-rlogin_OBJS	= rlogin.o kcmd.o krcmd.o encrypt.o rcmd_util.o
-login_OBJS 	= login.o klogin.o login_fbtab.o login_access.o \
-		  sysv_default.o sysv_environ.o sysv_shadow.o \
-		  utmp_login.o utmpx_login.o stty_default.o tty.o
-su_OBJS		= su.o
-rshd_OBJS	= rshd.o iruserok.o encrypt.o rcmd_util.o
-rlogind_OBJS	= rlogind.o iruserok.o forkpty.o encrypt.o rcmd_util.o tty.o
-
-
-all: $(PROGS) 
-
-Wall:
-	make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
-
-.c.o: 
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $<
-
-install: all
-	$(MKINSTALLDIRS) $(libexecdir)
-	for x in $(PROG_LIBEXEC); do \
-	  $(INSTALL_PROGRAM) $$x $(libexecdir)/`echo $$x| sed '$(transform)'`; \
-	done
-	$(MKINSTALLDIRS) $(bindir)
-	for x in $(PROG_BIN); do \
-	  $(INSTALL_PROGRAM) $$x $(bindir)/`echo $$x| sed '$(transform)'`; \
-	done
-	-for x in $(PROG_SUIDBIN); do \
-	  $(INSTALL_PROGRAM) -o root -m 04555 $$x $(bindir)/`echo $$x| sed '$(transform)'`; \
-	done
-
-uninstall:
-	for x in $(PROG_LIBEXEC); do \
-	  rm -f $(libexecdir)/`echo $$x| sed '$(transform)'`; \
-	done
-	for x in $(PROG_BIN); do \
-	  rm -f $(bindir)/`echo $$x| sed '$(transform)'`; \
-	done
-	for x in $(PROG_SUIDBIN); do \
-	  rm -f $(bindir)/`echo $$x| sed '$(transform)'`; \
-	done
-
-TAGS: $(SOURCES)
-	etags $(SOURCES)
-
-check:
-
-clean:
-	rm -f *.a *.o $(PROGS)
-
-mostlyclean: clean
-
-distclean: clean
-	rm -f Makefile *.tab.c *~
-
-realclean: distclean
-	rm -f TAGS
-
-dist: $(DISTFILES)
-	for file in $(DISTFILES); do \
-	  ln $$file ../`cat ../.fname`/lib \
-	    || cp -p $$file ../`cat ../.fname`/lib; \
-	done
-
-KLIB=-L../../lib/krb -lkrb -L../../lib/des -ldes
-KLIB_AFS=@KRB_KAFS_LIB@ $(KLIB)
-OTPLIB=-L../../lib/otp -lotp
-LIBROKEN=-L../../lib/roken -lroken
-
-rcp$(EXECSUFFIX): $(rcp_OBJS)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(rcp_OBJS) $(KLIB_AFS) $(LIBROKEN) $(LIBS) $(LIBROKEN)
-
-rsh$(EXECSUFFIX): $(rsh_OBJS)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(rsh_OBJS) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
-
-rshd$(EXECSUFFIX): $(rshd_OBJS)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(rshd_OBJS) $(KLIB_AFS) $(LIBROKEN) $(LIBS) $(LIBROKEN)
-
-rlogin$(EXECSUFFIX): $(rlogin_OBJS)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@  $(rlogin_OBJS) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
-
-rlogind$(EXECSUFFIX): $(rlogind_OBJS)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(rlogind_OBJS) $(KLIB_AFS) $(LIBROKEN) $(LIBS) $(LIBROKEN)
-
-login$(EXECSUFFIX): $(login_OBJS)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(login_OBJS) $(OTPLIB) $(KLIB_AFS) $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
-
-su$(EXECSUFFIX): $(su_OBJS)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(su_OBJS) $(KLIB_AFS) $(LIBROKEN) $(LIBS) $(LIBROKEN)
diff --git a/crypto/kerberosIV/appl/bsd/README.login b/crypto/kerberosIV/appl/bsd/README.login
deleted file mode 100644
index c0729690a77f..000000000000
--- a/crypto/kerberosIV/appl/bsd/README.login
+++ /dev/null
@@ -1,20 +0,0 @@
-This login has additional functionalities. They are all based on (part of)
-Wietse Venema's logdaemon package.
-
-
-The following defines can be used:
-1) LOGIN_ACCESS to allow access control on a per tty/user combination
-2) LOGALL to log all logins
-
--Guido
-
-This login has some of Berkeley's paranoid/broken (depending on your point
-of view) Kerberos code conditionalized out, so that by default it works like
-klogin does at MIT-LCS.  You can define KLOGIN_PARANOID to re-enable this code.
-This define also controls whether a warning message is printed when logging
-into a system with no krb.conf file, which usually means that Kerberos is
-not configured.
-
--GAWollman
-
-(removed S/Key,	/assar)
diff --git a/crypto/kerberosIV/appl/bsd/bsd_locl.h b/crypto/kerberosIV/appl/bsd/bsd_locl.h
deleted file mode 100644
index d0b37aa56f66..000000000000
--- a/crypto/kerberosIV/appl/bsd/bsd_locl.h
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id: bsd_locl.h,v 1.98 1997/05/25 01:14:17 assar Exp $ */
-
-#define LOGALL
-#define KERBEROS
-#define KLOGIN_PARANOID
-#define LOGIN_ACCESS
-#define PASSWD_FALLBACK
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-/* Any better way to test NO_MOTD? */
-#if (SunOS == 5) || defined(__hpux)
-#define NO_MOTD
-#endif
-
-#ifdef HAVE_SHADOW_H
-#define SYSV_SHADOW
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <setjmp.h>
-
-#include <stdarg.h>
-
-#include <errno.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#elif defined(HAVE_SYS_TIME_H)
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
-#ifndef S_ISTXT
-#ifdef S_ISVTX
-#define S_ISTXT S_ISVTX
-#else
-#define S_ISTXT 0
-#endif
-#endif
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif
-#include <signal.h>
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif /* HAVE_SYS_RESOURCE_H */
-#ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
-#ifndef NCARGS
-#define NCARGS  0x100000 /* (absolute) max # characters in exec arglist */
-#endif
-#ifdef HAVE_PWD_H
-#include <pwd.h>
-#endif
-
-#ifdef HAVE_GRP_H
-#include <grp.h>
-#endif
-#ifdef HAVE_UTIME_H
-#include <utime.h>
-#endif
-
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_NETINET_IN_SYSTM_H
-#include <netinet/in_systm.h>
-#endif
-#ifdef HAVE_NETINET_IP_H
-#include <netinet/ip.h>
-#endif
-#ifdef HAVE_NETINET_TCP_H
-#include <netinet/tcp.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-
-#if defined(HAVE_SYS_IOCTL_H) && SunOS != 4
-#include <sys/ioctl.h>
-#endif
-#ifdef HAVE_SYS_IOCCOM_H
-#include <sys/ioccom.h>
-#endif
-
-#ifdef HAVE_SYS_SOCKIO_H
-#include <sys/sockio.h>
-#endif
-
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
-#ifdef HAVE_SYS_FILIO_H
-#include <sys/filio.h>
-#endif
-
-#ifdef HAVE_SYS_STREAM_H
-#ifdef HAVE_SYS_UIO_H
-#include <sys/uio.h>
-#endif /* HAVE_SYS_UIO_H */
-#include <sys/stream.h>
-#endif /* HAVE_SYS_STREAM_H */
-
-#ifdef HAVE_SYS_PTYVAR_H
-#ifdef HAVE_SYS_PROC_H
-#include <sys/proc.h>
-#endif
-#ifdef HAVE_SYS_TTY_H
-#include <sys/tty.h>
-#endif
-#ifdef HAVE_SYS_PTYIO_H
-#include <sys/ptyio.h>
-#endif
-#include <sys/ptyvar.h>
-#endif /* HAVE_SYS_PTYVAR_H */
-
-/* Cray stuff */
-#ifdef HAVE_UDB_H
-#include <udb.h>
-#endif
-#ifdef HAVE_SYS_CATEGORY_H
-#include <sys/category.h>
-#endif
-
-/* Strange ioctls that are not always defined */
-
-#ifndef TIOCPKT_FLUSHWRITE
-#define TIOCPKT_FLUSHWRITE      0x02
-#endif
- 
-#ifndef TIOCPKT_NOSTOP
-#define TIOCPKT_NOSTOP  0x10
-#endif
- 
-#ifndef TIOCPKT_DOSTOP
-#define TIOCPKT_DOSTOP  0x20
-#endif
-
-#ifndef TIOCPKT
-#define TIOCPKT		_IOW('t', 112, int)   /* pty: set/clear packet mode */
-#endif
-
-#ifdef HAVE_LASTLOG_H
-#include <lastlog.h>
-#endif
-
-#ifdef HAVE_LOGIN_H
-#include <login.h>
-#endif
-
-#ifdef HAVE_TTYENT_H
-#include <ttyent.h>
-#endif
-
-#ifdef HAVE_STROPTS_H
-#include <stropts.h>
-#endif
-
-#ifdef HAVE_UTMP_H
-#include <utmp.h>
-#endif
-#ifndef UT_NAMESIZE
-#define UT_NAMESIZE     sizeof(((struct utmp *)0)->ut_name)
-#endif
-
-#ifdef HAVE_UTMPX_H
-#include <utmpx.h>
-#endif
-
-#ifdef HAVE_USERPW_H
-#include <userpw.h>
-#endif /* HAVE_USERPW_H */
-
-#ifdef HAVE_USERSEC_H
-#include <usersec.h>
-#endif /* HAVE_USERSEC_H */
-
-#ifndef PRIO_PROCESS
-#define PRIO_PROCESS 0
-#endif
-
-#include <err.h>
-
-#include <roken.h>
-
-#ifdef SOCKS
-#include <socks.h>
-#endif
-
-#include <des.h>
-#include <krb.h>
-#include <kafs.h>
-
-int kcmd(int *sock, char **ahost, u_int16_t rport, char *locuser,
-	 char *remuser, char *cmd, int *fd2p, KTEXT ticket,
-	 char *service, char *realm, CREDENTIALS *cred,
-	 Key_schedule schedule, MSG_DAT *msg_data,
-	 struct sockaddr_in *laddr, struct sockaddr_in *faddr,
-	 int32_t authopts);
-
-int krcmd(char **ahost, u_int16_t rport, char *remuser, char *cmd,
-	  int *fd2p, char *realm);
-
-int krcmd_mutual(char **ahost, u_int16_t rport, char *remuser,
-		 char *cmd,int *fd2p, char *realm,
-		 CREDENTIALS *cred, Key_schedule sched);
-
-int klogin(struct passwd *pw, char *instance, char *localhost, char *password);
-
-typedef struct {
-        int cnt;
-        char *buf;
-} BUF;
-
-char *colon(char *cp);
-int okname(char *cp0);
-int susystem(char *s, int userid);
-
-int forkpty(int *amaster, char *name,
-	    struct termios *termp, struct winsize *winp);
-
-#ifndef MODEMASK
-#define	MODEMASK	(S_ISUID|S_ISGID|S_ISTXT|S_IRWXU|S_IRWXG|S_IRWXO)
-#endif
-
-#ifdef HAVE_PATHS_H
-#include <paths.h>
-#endif
-#ifdef HAVE_MAILLOCK_H
-#include <maillock.h>
-#endif
-#include "pathnames.h"
-
-void stty_default (void);
-
-int utmpx_login(char *line, char *user, char *host);
-
-extern char **environ;
-
-void sysv_newenv(int argc, char **argv, struct passwd *pwd,
-		 char *term, int pflag);
-
-int login_access(char *user, char *from);
-#ifndef HAVE_IRUSEROK
-int iruserok(u_int32_t raddr, int superuser, const char *ruser,
-	     const char *luser);
-#endif
-void fatal(int f, const char *msg, int syserr);
-
-extern int LEFT_JUSTIFIED;
-int des_enc_read(int fd,char *buf,int len,des_key_schedule sched,
-	des_cblock *iv);
-int des_enc_write(int fd,char *buf,int len,des_key_schedule sched,
-	des_cblock *iv);
-
-void sysv_defaults(void);
-void utmp_login(char *tty, char *username, char *hostname);
-void sleepexit (int);
-
-#ifndef HAVE_SETPRIORITY
-#define setpriority(which, who, niceval) 0
-#endif
-
-#ifndef HAVE_GETPRIORITY
-#define getpriority(which, who) 0
-#endif
-
-#ifdef HAVE_TERMIOS_H
-#include <termios.h>
-#endif
-
-#ifndef _POSIX_VDISABLE
-#define _POSIX_VDISABLE 0
-#endif /* _POSIX_VDISABLE */
-#if SunOS == 4
-#include <sys/ttold.h>
-#endif
-
-#if defined(_AIX)
-#include <sys/termio.h>
-#endif
-
-#ifndef CEOF
-#define CEOF 04
-#endif
-
-/* concession to Sun */
-#ifndef SIGUSR1
-#define	SIGUSR1	30
-#endif
-
-#ifndef TIOCPKT_WINDOW
-#define TIOCPKT_WINDOW 0x80
-#endif
-
-int get_shell_port(int kerberos, int encryption);
-int get_login_port(int kerberos, int encryption);
-int speed_t2int (speed_t);
-speed_t int2speed_t (int);
-void ip_options_and_die (int sock, struct sockaddr_in *);
-void warning(const char *fmt, ...)
-#ifdef __GNUC__
-__attribute__ ((format (printf, 1, 2)))
-#endif
-;
-
-char *clean_ttyname (char *tty);
-char *make_id (char *tty);
-void prepare_utmp (struct utmp *utmp, char *tty, char *username,
-		   char *hostname);
diff --git a/crypto/kerberosIV/appl/bsd/encrypt.c b/crypto/kerberosIV/appl/bsd/encrypt.c
deleted file mode 100644
index b74f329c4d79..000000000000
--- a/crypto/kerberosIV/appl/bsd/encrypt.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include "bsd_locl.h"
-
-RCSID("$Id: encrypt.c,v 1.3 1996/04/30 13:50:54 bg Exp $");
-
-#undef BSIZE
-
-/* used in des_read and des_write */
-#define MAXWRITE	(1024*16)
-#define BSIZE		(MAXWRITE+4)
-
-/* replacements for htonl and ntohl since I have no idea what to do
- * when faced with machines with 8 byte longs. */
-#define HDRSIZE 4
-
-#define n2l(c,l)	(l =((u_int32_t)(*((c)++)))<<24, \
-			 l|=((u_int32_t)(*((c)++)))<<16, \
-			 l|=((u_int32_t)(*((c)++)))<< 8, \
-			 l|=((u_int32_t)(*((c)++))))
-
-#define l2n(l,c)	(*((c)++)=(unsigned char)(((l)>>24)&0xff), \
-			 *((c)++)=(unsigned char)(((l)>>16)&0xff), \
-			 *((c)++)=(unsigned char)(((l)>> 8)&0xff), \
-			 *((c)++)=(unsigned char)(((l)    )&0xff))
-
-/* This has some uglies in it but it works - even over sockets. */
-extern int errno;
-int des_rw_mode=DES_PCBC_MODE;
-int LEFT_JUSTIFIED = 0;
-
-int
-des_enc_read(int fd, char *buf, int len, struct des_ks_struct *sched, des_cblock *iv)
-{
-  /* data to be unencrypted */
-  int net_num=0;
-  unsigned char net[BSIZE];
-  /* extra unencrypted data 
-   * for when a block of 100 comes in but is des_read one byte at
-   * a time. */
-  static char unnet[BSIZE];
-  static int unnet_start=0;
-  static int unnet_left=0;
-  int i;
-  long num=0,rnum;
-  unsigned char *p;
-
-  /* left over data from last decrypt */
-  if (unnet_left != 0)
-    {
-      if (unnet_left < len)
-	{
-	  /* we still still need more data but will return
-	   * with the number of bytes we have - should always
-	   * check the return value */
-	  memcpy(buf,&(unnet[unnet_start]),unnet_left);
-	  /* eay 26/08/92 I had the next 2 lines
-	   * reversed :-( */
-	  i=unnet_left;
-	  unnet_start=unnet_left=0;
-	}
-      else
-	{
-	  memcpy(buf,&(unnet[unnet_start]),len);
-	  unnet_start+=len;
-	  unnet_left-=len;
-	  i=len;
-	}
-      return(i);
-    }
-
-  /* We need to get more data. */
-  if (len > MAXWRITE) len=MAXWRITE;
-
-  /* first - get the length */
-  net_num=0;
-  while (net_num < HDRSIZE) 
-    {
-      i=read(fd,&(net[net_num]),(unsigned int)HDRSIZE-net_num);
-      if ((i == -1) && (errno == EINTR)) continue;
-      if (i <= 0) return(0);
-      net_num+=i;
-    }
-
-  /* we now have at net_num bytes in net */
-  p=net;
-  num=0;
-  n2l(p,num);
-  /* num should be rounded up to the next group of eight
-   * we make sure that we have read a multiple of 8 bytes from the net.
-   */
-  if ((num > MAXWRITE) || (num < 0)) /* error */
-    return(-1);
-  rnum=(num < 8)?8:((num+7)/8*8);
-
-  net_num=0;
-  while (net_num < rnum)
-    {
-      i=read(fd,&(net[net_num]),(unsigned int)rnum-net_num);
-      if ((i == -1) && (errno == EINTR)) continue;
-      if (i <= 0) return(0);
-      net_num+=i;
-    }
-
-  /* Check if there will be data left over. */
-  if (len < num)
-    {
-      if (des_rw_mode & DES_PCBC_MODE)
-	des_pcbc_encrypt((des_cblock *)net,(des_cblock *)unnet,
-		     num,sched,iv,DES_DECRYPT);
-      else
-	des_cbc_encrypt((des_cblock *)net,(des_cblock *)unnet,
-		    num,sched,iv,DES_DECRYPT);
-      memcpy(buf,unnet,len);
-      unnet_start=len;
-      unnet_left=num-len;
-
-      /* The following line is done because we return num
-       * as the number of bytes read. */
-      num=len;
-    }
-  else
-    {
-      /* >output is a multiple of 8 byes, if len < rnum
-       * >we must be careful.  The user must be aware that this
-       * >routine will write more bytes than he asked for.
-       * >The length of the buffer must be correct.
-       * FIXED - Should be ok now 18-9-90 - eay */
-      if (len < rnum)
-	{
-	  char tmpbuf[BSIZE];
-
-	  if (des_rw_mode & DES_PCBC_MODE)
-	    des_pcbc_encrypt((des_cblock *)net,
-			 (des_cblock *)tmpbuf,
-			 num,sched,iv,DES_DECRYPT);
-	  else
-	    des_cbc_encrypt((des_cblock *)net,
-			(des_cblock *)tmpbuf,
-			num,sched,iv,DES_DECRYPT);
-
-	  /* eay 26/08/92 fix a bug that returned more
-	   * bytes than you asked for (returned len bytes :-( */
-	  if (LEFT_JUSTIFIED || (len >= 8))
-	      memcpy(buf,tmpbuf,num);
-	  else
-	      memcpy(buf,tmpbuf+(8-num),num); /* Right justified */
-	}
-      else if (num >= 8)
-	{
-	  if (des_rw_mode & DES_PCBC_MODE)
-	    des_pcbc_encrypt((des_cblock *)net,
-			 (des_cblock *)buf,num,sched,iv,
-			 DES_DECRYPT);
-	  else
-	    des_cbc_encrypt((des_cblock *)net,
-			(des_cblock *)buf,num,sched,iv,
-			DES_DECRYPT);
-	}
-      else
-	{
-	  if (des_rw_mode & DES_PCBC_MODE)
-	    des_pcbc_encrypt((des_cblock *)net,
-			 (des_cblock *)buf,8,sched,iv,
-			 DES_DECRYPT);
-	  else
-	    des_cbc_encrypt((des_cblock *)net,
-			(des_cblock *)buf,8,sched,iv,
-			DES_DECRYPT);
-	  if (!LEFT_JUSTIFIED)
-	      memcpy(buf, buf+(8-num), num); /* Right justified */
-	}
-    }
-  return(num);
-}
-
-int
-des_enc_write(int fd, char *buf, int len, struct des_ks_struct *sched, des_cblock *iv)
-{
-  long rnum;
-  int i,j,k,outnum;
-  char outbuf[BSIZE+HDRSIZE];
-  char shortbuf[8];
-  char *p;
-  static int start=1;
-
-  /* If we are sending less than 8 bytes, the same char will look
-   * the same if we don't pad it out with random bytes */
-  if (start)
-    {
-      start=0;
-      srand(time(NULL));
-    }
-
-  /* lets recurse if we want to send the data in small chunks */
-  if (len > MAXWRITE)
-    {
-      j=0;
-      for (i=0; i<len; i+=k)
-	{
-	  k=des_enc_write(fd,&(buf[i]),
-			  ((len-i) > MAXWRITE)?MAXWRITE:(len-i),sched,iv);
-	  if (k < 0)
-	    return(k);
-	  else
-	    j+=k;
-	}
-      return(j);
-    }
-
-  /* write length first */
-  p=outbuf;
-  l2n(len,p);
-
-  /* pad short strings */
-  if (len < 8)
-    {
-	if (LEFT_JUSTIFIED)
-	    {
-		p=shortbuf;
-		memcpy(shortbuf,buf,(unsigned int)len);
-		for (i=len; i<8; i++)
-		    shortbuf[i]=rand();
-		rnum=8;
-	    }
-	else
-	    {
-		p=shortbuf;
-		for (i=0; i<8-len; i++)
-		    shortbuf[i]=rand();
-		memcpy(shortbuf + 8 - len, buf, len);
-		rnum=8;
-	    }
-    }
-  else
-    {
-      p=buf;
-      rnum=((len+7)/8*8);	/* round up to nearest eight */
-    }
-
-  if (des_rw_mode & DES_PCBC_MODE)
-    des_pcbc_encrypt((des_cblock *)p,(des_cblock *)&(outbuf[HDRSIZE]),
-		 (long)((len<8)?8:len),sched,iv,DES_ENCRYPT); 
-  else
-    des_cbc_encrypt((des_cblock *)p,(des_cblock *)&(outbuf[HDRSIZE]),
-		(long)((len<8)?8:len),sched,iv,DES_ENCRYPT); 
-
-  /* output */
-  outnum=rnum+HDRSIZE;
-
-  for (j=0; j<outnum; j+=i)
-    {
-      /* eay 26/08/92 I was not doing writing from where we
-       * got upto. */
-      i=write(fd,&(outbuf[j]),(unsigned int)(outnum-j));
-      if (i == -1)
-	{
-	  if (errno == EINTR)
-	    i=0;
-	  else			/* This is really a bad error - very bad
-				 * It will stuff-up both ends. */
-	    return(-1);
-	}
-    }
-
-  return(len);
-}
diff --git a/crypto/kerberosIV/appl/bsd/forkpty.c b/crypto/kerberosIV/appl/bsd/forkpty.c
deleted file mode 100644
index 5c0aaafa40aa..000000000000
--- a/crypto/kerberosIV/appl/bsd/forkpty.c
+++ /dev/null
@@ -1,461 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "bsd_locl.h"
-
-#ifndef HAVE_FORKPTY
-
-RCSID("$Id: forkpty.c,v 1.52 1997/05/25 07:37:01 assar Exp $");
-
-/* Only CRAY is known to have problems with forkpty(). */
-#if defined(CRAY)
-static int forkpty_ok = 0;
-#else
-static int forkpty_ok = 1;
-#endif
-
-#ifndef HAVE_PTSNAME
-static char *ptsname(int fd)
-{
-#ifdef HAVE_TTYNAME
-  return ttyname(fd);
-#else
-  return NULL;
-#endif
-}
-#endif
-
-#ifndef HAVE_GRANTPT
-#define grantpt(fdm) (0)
-#endif
-
-#ifndef HAVE_UNLOCKPT
-#define unlockpt(fdm) (0)
-#endif
-
-#ifndef HAVE_VHANGUP
-#define vhangup() (0)
-#endif
-
-#ifndef HAVE_REVOKE
-static
-void
-revoke(char *line)
-{
-    int slave;
-    RETSIGTYPE (*ofun)();
-
-    if ( (slave = open(line, O_RDWR)) < 0)
-	return;
-    
-    ofun = signal(SIGHUP, SIG_IGN);
-    vhangup();
-    signal(SIGHUP, ofun);
-    /*
-     * Some systems (atleast SunOS4) want to have the slave end open
-     * at all times to prevent a race in the child. Login will close
-     * it so it should really not be a problem. However for the
-     * paranoid we use the close on exec flag so it will only be open
-     * in the parent. Additionally since this will be the controlling
-     * tty of rlogind the final vhangup() in rlogind should hangup all
-     * processes. A working revoke would of course have been prefered
-     * though (sigh).
-     */
-    fcntl(slave, F_SETFD, 1);
-    /* close(slave); */
-}
-#endif
-
-
-static int pty_major, pty_minor;
-
-static void
-pty_scan_start(void)
-{
-    pty_major = -1;
-    pty_minor = 0;
-}
-
-static char *bsd_1 = "0123456789abcdefghijklmnopqrstuv";
-/* there are many more */
-static char *bsd_2 = "pqrstuvwxyzabcdefghijklmnoABCDEFGHIJKLMNOPQRSTUVWXYZ";
-
-static int
-pty_scan_next(char *buf, size_t sz)
-{
-#ifdef CRAY
-    if(++pty_major >= sysconf(_SC_CRAY_NPTY))
-	return -1;
-    snprintf(buf, sz, "/dev/pty/%03d", pty_major);
-#else
-    if(++pty_major == strlen(bsd_1)){
-	pty_major = 0;
-	if(++pty_minor == strlen(bsd_2))
-	    return -1;
-    }
-#ifdef __hpux
-    snprintf(buf, sz, "/dev/ptym/pty%c%c", bsd_2[pty_major], bsd_1[pty_minor]);
-#else
-    snprintf(buf, sz, "/dev/pty%c%c", bsd_2[pty_major], bsd_1[pty_minor]);
-#endif /* __hpux */
-#endif /* CRAY */
-    return 0;
-}
-
-static void
-pty_scan_tty(char *buf, size_t sz)
-{
-#ifdef CRAY
-    snprintf(buf, sz, "/dev/ttyp%03d", pty_major);
-#elif defined(__hpux)
-    snprintf(buf, sz, "/dev/pty/tty%c%c", bsd_2[pty_major], bsd_1[pty_minor]);
-#else
-    snprintf(buf, sz, "/dev/tty%c%c", bsd_2[pty_major], bsd_1[pty_minor]);
-#endif
-}
-
-static int
-ptym_open_streams_flavor(char *pts_name, int *streams_pty)
-{
-    /* Try clone device master ptys */
-    const char *const clone[] = { "/dev/ptc", "/dev/ptmx",
-				  "/dev/ptm", "/dev/ptym/clone", 0 };
-    int	fdm;
-    const char *const *q;
-    
-    for (q = clone; *q; q++) {
-	fdm = open(*q, O_RDWR);
-	if (fdm >= 0)
-	    break;
-    }
-    if (fdm >= 0) {
-	char *ptr1;
-	if ((ptr1 = ptsname(fdm)) != NULL) /* Get slave's name */
-	    strcpy(pts_name, ptr1); /* Return name of slave */  
-	else {
-	    close(fdm);
-	    return(-4);
-	}
-	if (grantpt(fdm) < 0) {	/* Grant access to slave */
-	    close(fdm);
-	    return(-2);
-	}
-	if (unlockpt(fdm) < 0) {	/* Clear slave's lock flag */
-	    close(fdm);
-	    return(-3);
-	}
-	return(fdm);			/* return fd of master */
-    }
-    return -1;
-}
-
-static int
-ptym_open_bsd_flavor(char *pts_name, int *streams_pty)
-{
-    int fdm;
-    char ptm[MaxPathLen];
-
-    pty_scan_start();
-
-    while (pty_scan_next(ptm, sizeof(ptm)) != -1) {
-	fdm = open(ptm, O_RDWR);
-	if (fdm < 0)
-	    continue;
-#if SunOS == 4
-	/* Avoid a bug in SunOS4 ttydriver */
-	if (fdm > 0) {
-	    int pgrp;
-	    if ((ioctl(fdm, TIOCGPGRP, &pgrp) == -1)
-		&& (errno == EIO))
-		/* All fine */;
-	    else {
-		close(fdm);
-		continue;
-	    }
-	}
-#endif
-	pty_scan_tty(pts_name, sizeof(ptm));
-#if CRAY
-	/* this is some magic from the telnet code */
-	{
-	    struct stat sb;
-	    if(stat(pts_name, &sb) < 0) {
-		close(fdm);
-		continue;
-	    }
-	    if(sb.st_uid || sb.st_gid || sb.st_mode != 0600) {
-		chown(pts_name, 0, 0);
-		chmod(pts_name, 0600);
-		close(fdm);
-		fdm = open(ptm, 2);
-		if (fdm < 0)
-		    continue;
-	    }
-	}
-	/*
-	 * Now it should be safe...check for accessability.
-	 */
-	if (access(pts_name, 6) != 0){
-	    /* no tty side to pty so skip it */
-	    close(fdm);
-	    continue;
-	}
-#endif
-	return fdm;	/* All done! */
-    }
-    
-    /* We failed to find BSD style pty */
-    errno = ENOENT;
-    return -1;
-}
-
-/*
- *
- * Open a master pty either using the STREAM flavor or the BSD flavor.
- * Depending on if there are any free ptys in the different classes we
- * need to try both. Normally try STREAMS first and then BSD.
- *
- * Kludge alert: Under HP-UX 10 and perhaps other systems STREAM ptys
- * doesn't get initialized properly so we try them in different order
- * until the problem has been resolved.
- *
- */
-static int
-ptym_open(char *pts_name, size_t pts_name_sz, int *streams_pty)
-{
-    int	fdm;
-
-#ifdef HAVE__GETPTY
-    {
-	char *p = _getpty(&fdm, O_RDWR, 0600, 1);
-	if (p) {
-	    *streams_pty = 1;
-	    strcpy (pts_name, p);
-	    return fdm;
-	}
-    }
-#endif
-
-#ifdef STREAMSPTY
-    fdm = ptym_open_streams_flavor(pts_name, streams_pty);
-    if (fdm >= 0)
-      {
-	*streams_pty = 1;
-	return fdm;
-      }
-#endif
-    
-    fdm = ptym_open_bsd_flavor(pts_name, streams_pty);
-    if (fdm >= 0)
-      {
-	*streams_pty = 0;
-	return fdm;
-      }
-
-#ifndef STREAMSPTY
-    fdm = ptym_open_streams_flavor(pts_name, streams_pty);
-    if (fdm >= 0)
-      {
-	*streams_pty = 1;
-	return fdm;
-      }
-#endif
-    
-    return -1;
-}
-
-static int
-maybe_push_modules(int fd, char **modules)
-{
-#ifdef I_PUSH
-  char **p;
-  int err;
-
-  for(p=modules; *p; p++){
-    err=ioctl(fd, I_FIND, *p);
-    if(err == 1)
-      break;
-    if(err < 0 && errno != EINVAL)
-      return -17;
-    /* module not pushed or does not exist */
-  }
-  /* p points to null or to an already pushed module, now push all
-     modules before this one */
-
-  for(p--; p >= modules; p--){
-    err = ioctl(fd, I_PUSH, *p);
-    if(err < 0 && errno != EINVAL)
-      return -17;
-  }
-#endif
-  return 0;
-}
-
-static int
-ptys_open(int fdm, char *pts_name, int streams_pty)
-{
-    int fds;
-
-    if (streams_pty) {
-	/* Streams style slave ptys */
-	if ( (fds = open(pts_name, O_RDWR)) < 0) {
-	    close(fdm);
-	    return(-5);
-	}
-
-	{
-	  char *ttymodules[] = { "ttcompat", "ldterm", "ptem", NULL };
-	  char *ptymodules[] = { "pckt", NULL };
-	  
-	  if(maybe_push_modules(fds, ttymodules)<0){
-	    close(fdm);
-	    close(fds);
-	    return -6;
-	  }
-	  if(maybe_push_modules(fdm, ptymodules)<0){
-	    close(fdm);
-	    close(fds);
-	    return -7;
-	  }
-	}
-    } else {
-        /* BSD style slave ptys */
-	struct group *grptr;
-	int gid;
-	if ( (grptr = getgrnam("tty")) != NULL)
-	    gid = grptr->gr_gid;
-	else
-	    gid = -1;	/* group tty is not in the group file */
-
-	/* Grant access to slave */
-	chown(pts_name, getuid(), gid);
-	chmod(pts_name, S_IRUSR | S_IWUSR | S_IWGRP);
-
-	if ( (fds = open(pts_name, O_RDWR)) < 0) {
-	    close(fdm);
-	    return(-1);
-	}
-    }
-    return(fds);
-}
-
-int
-forkpty(int *ptrfdm,
-	char *slave_name,
-	struct termios *slave_termios,
-	struct winsize *slave_winsize)
-{
-    int		fdm, fds, streams_pty;
-    pid_t	pid;
-    char	pts_name[20];
-
-    if (!forkpty_ok)
-        fatal(0, "Protocol not yet supported, use telnet", 0);
-
-    if ( (fdm = ptym_open(pts_name, sizeof(pts_name), &streams_pty)) < 0)
-	return -1;
-
-    if (slave_name != NULL)
-	strcpy(slave_name, pts_name);	/* Return name of slave */
-
-    pid = fork();
-    if (pid < 0)
-	return(-1);
-    else if (pid == 0) {		/* Child */
-	if (setsid() < 0)
-	    fatal(0, "setsid() failure", errno);
-
-        revoke(slave_name);
-
-#if defined(NeXT) || defined(ultrix)
-	/* The NeXT is severely broken, this makes things slightly
-	 * better but we still doesn't get a working pty. If there
-	 * where a TIOCSCTTY we could perhaps fix things but... The
-	 * same problem also exists in xterm! */
-	if (setpgrp(0, 0) < 0)
-	    fatal(0, "NeXT kludge failed setpgrp", errno);
-#endif
-
-	/* SVR4 acquires controlling terminal on open() */
-	if ( (fds = ptys_open(fdm, pts_name, streams_pty)) < 0)
-	    return -1;
-	close(fdm);		/* All done with master in child */
-	
-#if	defined(TIOCSCTTY) && !defined(CIBAUD) && !defined(__hpux)
-	/* 44BSD way to acquire controlling terminal */
-	/* !CIBAUD to avoid doing this under SunOS */
-	if (ioctl(fds, TIOCSCTTY, (char *) 0) < 0)
-	    return -1;
-#endif
-#if defined(NeXT)
-	{
-	    int t = open("/dev/tty", O_RDWR);
-	    if (t < 0)
-	        fatal(0, "Failed to open /dev/tty", errno);
-	    close(fds);
-	    fds = t;
-	}
-#endif
-	/* Set slave's termios and window size */
-	if (slave_termios != NULL) {
-	    if (tcsetattr(fds, TCSANOW, slave_termios) < 0)
-		return -1;
-	}
-#ifdef TIOCSWINSZ
-	if (slave_winsize != NULL) {
-	    if (ioctl(fds, TIOCSWINSZ, slave_winsize) < 0)
-		return -1;
-	}
-#endif
-	/* slave becomes stdin/stdout/stderr of child */
-	if (dup2(fds, STDIN_FILENO) != STDIN_FILENO)
-	    return -1;
-	if (dup2(fds, STDOUT_FILENO) != STDOUT_FILENO)
-	    return -1;
-	if (dup2(fds, STDERR_FILENO) != STDERR_FILENO)
-	    return -1;
-	if (fds > STDERR_FILENO)
-	    close(fds);
-	return(0);		/* child returns 0 just like fork() */
-    }
-    else {			/* Parent */
-	*ptrfdm = fdm;	/* Return fd of master */
-	return(pid);	/* Parent returns pid of child */
-    }
-}
-#endif /* HAVE_FORKPTY */
diff --git a/crypto/kerberosIV/appl/bsd/iruserok.c b/crypto/kerberosIV/appl/bsd/iruserok.c
deleted file mode 100644
index 8349d8526ab8..000000000000
--- a/crypto/kerberosIV/appl/bsd/iruserok.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Copyright (c) 1983, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "bsd_locl.h"
-
-RCSID("$Id: iruserok.c,v 1.15 1997/03/23 04:54:00 assar Exp $");
-
-#ifndef HAVE_IRUSEROK
-
-int     __check_rhosts_file = 1;
-char    *__rcmd_errstr = 0;
-
-/*
- * Returns "true" if match, 0 if no match.
- */
-static
-int
-__icheckhost(u_int32_t raddr, const char *lhost)
-{
-	struct hostent *hp;
-	u_long laddr;
-	char **pp;
-
-	/* Try for raw ip address first. */
-	if (isdigit(*lhost) && (long)(laddr = inet_addr(lhost)) != -1)
-		return (raddr == laddr);
-
-	/* Better be a hostname. */
-	if ((hp = gethostbyname(lhost)) == NULL)
-		return (0);
-
-	/* Spin through ip addresses. */
-	for (pp = hp->h_addr_list; *pp; ++pp)
-	        if (memcmp(&raddr, *pp, sizeof(u_long)) == 0)
-			return (1);
-
-	/* No match. */
-	return (0);
-}
-
-#ifndef HAVE_INNETGR
-static int
-innetgr(const char *netgroup, const char *machine, 
-	const char *user, const char *domain)
-{
-    return 0;
-}
-#endif
-
-/*
- * Returns 0 if ok, -1 if not ok.
- */
-static
-int
-__ivaliduser(FILE *hostf, u_int32_t raddr, const char *luser,
-	     const char *ruser)
-{
-	char *user, *p;
-	int ch;
-	char buf[MaxHostNameLen + 128];		/* host + login */
-	char hname[MaxHostNameLen];
-	struct hostent *hp;
-	/* Presumed guilty until proven innocent. */
-	int userok = 0, hostok = 0;
-#ifdef HAVE_YP_GET_DEFAULT_DOMAIN
-	char *ypdomain;
-
-	if (yp_get_default_domain(&ypdomain))
-		ypdomain = NULL;
-#else
-#define	ypdomain NULL
-#endif
-	/* We need to get the damn hostname back for netgroup matching. */
-	if ((hp = gethostbyaddr((char *)&raddr,
-				sizeof(u_long),
-				AF_INET)) == NULL)
-		return (-1);
-	strncpy(hname, hp->h_name, sizeof(hname));
-	hname[sizeof(hname) - 1] = '\0';
-
-	while (fgets(buf, sizeof(buf), hostf)) {
-		p = buf;
-		/* Skip lines that are too long. */
-		if (strchr(p, '\n') == NULL) {
-			while ((ch = getc(hostf)) != '\n' && ch != EOF);
-			continue;
-		}
-		if (*p == '\n' || *p == '#') {
-			/* comment... */
-			continue;
-		}
-		while (*p != '\n' && *p != ' ' && *p != '\t' && *p != '\0') {
-			*p = isupper(*p) ? tolower(*p) : *p;
-			p++;
-		}
-		if (*p == ' ' || *p == '\t') {
-			*p++ = '\0';
-			while (*p == ' ' || *p == '\t')
-				p++;
-			user = p;
-			while (*p != '\n' && *p != ' ' &&
-			    *p != '\t' && *p != '\0')
-				p++;
-		} else
-			user = p;
-		*p = '\0';
-		/*
-		 * Do +/- and +@/-@ checking. This looks really nasty,
-		 * but it matches SunOS's behavior so far as I can tell.
-		 */
-		switch(buf[0]) {
-		case '+':
-			if (!buf[1]) {     /* '+' matches all hosts */
-				hostok = 1;
-				break;
-			}
-			if (buf[1] == '@')  /* match a host by netgroup */
-				hostok = innetgr((char *)&buf[2],
-					(char *)&hname, NULL, ypdomain);
-			else		/* match a host by addr */
-				hostok = __icheckhost(raddr,(char *)&buf[1]);
-			break;
-		case '-':     /* reject '-' hosts and all their users */
-			if (buf[1] == '@') {
-				if (innetgr((char *)&buf[2],
-					      (char *)&hname, NULL, ypdomain))
-					return(-1);
-			} else {
-				if (__icheckhost(raddr,(char *)&buf[1]))
-					return(-1);
-			}
-			break;
-		default:  /* if no '+' or '-', do a simple match */
-			hostok = __icheckhost(raddr, buf);
-			break;
-		}
-		switch(*user) {
-		case '+':
-			if (!*(user+1)) {      /* '+' matches all users */
-				userok = 1;
-				break;
-			}
-			if (*(user+1) == '@')  /* match a user by netgroup */
-				userok = innetgr(user+2, NULL, (char *)ruser,
-						 ypdomain);
-			else	   /* match a user by direct specification */
-				userok = !(strcmp(ruser, user+1));
-			break;
-		case '-': 		/* if we matched a hostname, */
-			if (hostok) {   /* check for user field rejections */
-				if (!*(user+1))
-					return(-1);
-				if (*(user+1) == '@') {
-					if (innetgr(user+2, NULL,
-						    (char *)ruser, ypdomain))
-						return(-1);
-				} else {
-					if (!strcmp(ruser, user+1))
-						return(-1);
-				}
-			}
-			break;
-		default:	/* no rejections: try to match the user */
-			if (hostok)
-				userok = !(strcmp(ruser,*user ? user : luser));
-			break;
-		}
-		if (hostok && userok)
-			return(0);
-	}
-	return (-1);
-}
-
-/*
- * New .rhosts strategy: We are passed an ip address. We spin through
- * hosts.equiv and .rhosts looking for a match. When the .rhosts only
- * has ip addresses, we don't have to trust a nameserver.  When it
- * contains hostnames, we spin through the list of addresses the nameserver
- * gives us and look for a match.
- *
- * Returns 0 if ok, -1 if not ok.
- */
-int
-iruserok(u_int32_t raddr, int superuser, const char *ruser, const char *luser)
-{
-	char *cp;
-	struct stat sbuf;
-	struct passwd *pwd;
-	FILE *hostf;
-	uid_t uid;
-	int first;
-	char pbuf[MaxPathLen];
-
-	first = 1;
-	hostf = superuser ? NULL : fopen(_PATH_HEQUIV, "r");
-again:
-	if (hostf) {
-		if (__ivaliduser(hostf, raddr, luser, ruser) == 0) {
-			fclose(hostf);
-			return (0);
-		}
-		fclose(hostf);
-	}
-	if (first == 1 && (__check_rhosts_file || superuser)) {
-		first = 0;
-		if ((pwd = k_getpwnam((char*)luser)) == NULL)
-			return (-1);
-		strcpy(pbuf, pwd->pw_dir);
-		strcat(pbuf, "/.rhosts");
-
-		/*
-		 * Change effective uid while opening .rhosts.  If root and
-		 * reading an NFS mounted file system, can't read files that
-		 * are protected read/write owner only.
-		 */
-		uid = geteuid();
-		seteuid(pwd->pw_uid);
-		hostf = fopen(pbuf, "r");
-		seteuid(uid);
-
-		if (hostf == NULL)
-			return (-1);
-		/*
-		 * If not a regular file, or is owned by someone other than
-		 * user or root or if writeable by anyone but the owner, quit.
-		 */
-		cp = NULL;
-		if (lstat(pbuf, &sbuf) < 0)
-			cp = ".rhosts lstat failed";
-		else if (!S_ISREG(sbuf.st_mode))
-			cp = ".rhosts not regular file";
-		else if (fstat(fileno(hostf), &sbuf) < 0)
-			cp = ".rhosts fstat failed";
-		else if (sbuf.st_uid && sbuf.st_uid != pwd->pw_uid)
-			cp = "bad .rhosts owner";
-		else if (sbuf.st_mode & (S_IWGRP|S_IWOTH))
-			cp = ".rhosts writeable by other than owner";
-		/* If there were any problems, quit. */
-		if (cp) {
-			__rcmd_errstr = cp;
-			fclose(hostf);
-			return (-1);
-		}
-		goto again;
-	}
-	return (-1);
-}
-
-#endif /* !HAVE_IRUSEROK */
diff --git a/crypto/kerberosIV/appl/bsd/kcmd.c b/crypto/kerberosIV/appl/bsd/kcmd.c
deleted file mode 100644
index 9fa7ab285aac..000000000000
--- a/crypto/kerberosIV/appl/bsd/kcmd.c
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "bsd_locl.h"
-
-RCSID("$Id: kcmd.c,v 1.19 1997/05/02 14:27:42 assar Exp $");
-
-#define	START_PORT	5120	 /* arbitrary */
-
-static int
-getport(int *alport)
-{
-	struct sockaddr_in sin;
-	int s;
-
-	sin.sin_family = AF_INET;
-	sin.sin_addr.s_addr = INADDR_ANY;
-	s = socket(AF_INET, SOCK_STREAM, 0);
-	if (s < 0)
-		return (-1);
-	for (;;) {
-		sin.sin_port = htons((u_short)*alport);
-		if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) >= 0)
-			return (s);
-		if (errno != EADDRINUSE) {
-			close(s);
-			return (-1);
-		}
-		(*alport)--;
-#ifdef ATHENA_COMPAT
-		if (*alport == IPPORT_RESERVED/2) {
-#else
-		if (*alport == IPPORT_RESERVED) {
-#endif
-			close(s);
-			errno = EAGAIN;		/* close */
-			return (-1);
-		}
-	}
-}
-
-int
-kcmd(int *sock,
-     char **ahost,
-     u_int16_t rport, 
-     char *locuser,
-     char *remuser,
-     char *cmd,
-     int *fd2p,
-     KTEXT ticket,
-     char *service,
-     char *realm,
-     CREDENTIALS *cred,
-     Key_schedule schedule,
-     MSG_DAT *msg_data,
-     struct sockaddr_in *laddr,
-     struct sockaddr_in *faddr,
-     int32_t authopts)
-{
-	int s, timo = 1;
-	pid_t pid;
-	struct sockaddr_in sin, from;
-	char c;
-#ifdef ATHENA_COMPAT
-	int lport = IPPORT_RESERVED - 1;
-#else
-	int lport = START_PORT;
-#endif
-	struct hostent *hp;
-	int rc;
-	char *host_save;
-	int status;
-
-	pid = getpid();
-	hp = gethostbyname(*ahost);
-	if (hp == NULL) {
-		/* fprintf(stderr, "%s: unknown host\n", *ahost); */
-		return (-1);
-	}
-
-	host_save = strdup(hp->h_name);
-	if (host_save == NULL)
-		return -1;
-	*ahost = host_save;
-
-	/* If realm is null, look up from table */
-	if (realm == NULL || realm[0] == '\0')
-		realm = krb_realmofhost(host_save);
-
-	for (;;) {
-		s = getport(&lport);
-		if (s < 0) {
-			if (errno == EAGAIN)
-				warnx("kcmd(socket): All ports in use\n");
-			else
-				warn("kcmd: socket");
-			return (-1);
-		}
-		sin.sin_family = hp->h_addrtype;
-		memcpy (&sin.sin_addr, hp->h_addr, sizeof(sin.sin_addr));
-		sin.sin_port = rport;
-		if (connect(s, (struct sockaddr *)&sin, sizeof(sin)) >= 0)
-			break;
-		close(s);
-		if (errno == EADDRINUSE) {
-			lport--;
-			continue;
-		}
-		/*
-		 * don't wait very long for Kerberos rcmd.
-		 */
-		if (errno == ECONNREFUSED && timo <= 4) {
-			/* sleep(timo); don't wait at all here */
-			timo *= 2;
-			continue;
-		}
-		if (hp->h_addr_list[1] != NULL) {
-			warn ("kcmd: connect (%s)",
-			      inet_ntoa(sin.sin_addr));
-			hp->h_addr_list++;
-			memcpy(&sin.sin_addr,
-			       hp->h_addr_list[0], 
-			       sizeof(sin.sin_addr));
-			fprintf(stderr, "Trying %s...\n",
-				inet_ntoa(sin.sin_addr));
-			continue;
-		}
-		if (errno != ECONNREFUSED)
-			warn ("connect(%s)", hp->h_name);
-		return (-1);
-	}
-	lport--;
-	if (fd2p == 0) {
-		write(s, "", 1);
-		lport = 0;
-	} else {
-		char num[8];
-		int s2 = getport(&lport), s3;
-		int len = sizeof(from);
-
-		if (s2 < 0) {
-			status = -1;
-			goto bad;
-		}
-		listen(s2, 1);
-		snprintf(num, sizeof(num), "%d", lport);
-		if (write(s, num, strlen(num) + 1) != strlen(num) + 1) {
-			warn("kcmd(write): setting up stderr");
-			close(s2);
-			status = -1;
-			goto bad;
-		}
-		{
-		    fd_set fds;
-		    FD_ZERO(&fds);
-		    FD_SET(s, &fds);
-		    FD_SET(s2, &fds);
-		    status = select(FD_SETSIZE, &fds, NULL, NULL, NULL);
-		    if(FD_ISSET(s, &fds)){
-			warnx("kcmd: connection unexpectedly closed.");
-			close(s2);
-			status = -1;
-			goto bad;
-		    }
-		}
-		s3 = accept(s2, (struct sockaddr *)&from, &len);
-		close(s2);
-		if (s3 < 0) {
-			warn ("kcmd: accept");
-			lport = 0;
-			status = -1;
-			goto bad;
-		}
-		
-		*fd2p = s3;
-		from.sin_port = ntohs((u_short)from.sin_port);
-		if (from.sin_family != AF_INET ||
-		    from.sin_port >= IPPORT_RESERVED) {
-			warnx("kcmd(socket): "
-			      "protocol failure in circuit setup.");
-			status = -1;
-			goto bad2;
-		}
-	}
-	/*
-	 * Kerberos-authenticated service.  Don't have to send locuser,
-	 * since its already in the ticket, and we'll extract it on
-	 * the other side.
-	 */
-	/* write(s, locuser, strlen(locuser)+1); */
-
-	/* set up the needed stuff for mutual auth, but only if necessary */
-	if (authopts & KOPT_DO_MUTUAL) {
-		int sin_len;
-		*faddr = sin;
-
-		sin_len = sizeof(struct sockaddr_in);
-		if (getsockname(s, (struct sockaddr *)laddr, &sin_len) < 0) {
-			warn("kcmd(getsockname)");
-			status = -1;
-			goto bad2;
-		}
-	}
-	if ((status = krb_sendauth(authopts, s, ticket, service, *ahost,
-			       realm, (unsigned long) getpid(), msg_data,
-			       cred, schedule,
-			       laddr,
-			       faddr,
-			       "KCMDV0.1")) != KSUCCESS)
-		goto bad2;
-
-	write(s, remuser, strlen(remuser)+1);
-	write(s, cmd, strlen(cmd)+1);
-
-	if ((rc = read(s, &c, 1)) != 1) {
-		if (rc == -1)
-			warn("read(%s)", *ahost);
-		else
-			warnx("kcmd: bad connection with remote host");
-		status = -1;
-		goto bad2;
-	}
-	if (c != '\0') {
-		while (read(s, &c, 1) == 1) {
-			write(2, &c, 1);
-			if (c == '\n')
-				break;
-		}
-		status = -1;
-		goto bad2;
-	}
-	*sock = s;
-	return (KSUCCESS);
-bad2:
-	if (lport)
-		close(*fd2p);
-bad:
-	close(s);
-	return (status);
-}
diff --git a/crypto/kerberosIV/appl/bsd/klogin.c b/crypto/kerberosIV/appl/bsd/klogin.c
deleted file mode 100644
index 321da64cbf9b..000000000000
--- a/crypto/kerberosIV/appl/bsd/klogin.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "bsd_locl.h"
-
-RCSID("$Id: klogin.c,v 1.20 1997/05/02 14:27:42 assar Exp $");
-
-#ifdef KERBEROS
-
-#define	VERIFY_SERVICE	"rcmd"
-
-extern int notickets;
-extern char *krbtkfile_env;
-
-static char tkt_location[MaxPathLen];
-
-/*
- * Attempt to log the user in using Kerberos authentication
- *
- * return 0 on success (will be logged in)
- *	  1 if Kerberos failed (try local password in login)
- */
-int
-klogin(struct passwd *pw, char *instance, char *localhost, char *password)
-{
-    int kerror;
-    AUTH_DAT authdata;
-    KTEXT_ST ticket;
-    struct hostent *hp;
-    u_int32_t faddr;
-    char realm[REALM_SZ], savehost[MaxHostNameLen];
-    extern int noticketsdontcomplain;
-
-#ifdef KLOGIN_PARANOID
-    noticketsdontcomplain = 0; /* enable warning message */
-#endif
-    /*
-     * Root logins don't use Kerberos.
-     * If we have a realm, try getting a ticket-granting ticket
-     * and using it to authenticate.  Otherwise, return
-     * failure so that we can try the normal passwd file
-     * for a password.  If that's ok, log the user in
-     * without issuing any tickets.
-     */
-    if (strcmp(pw->pw_name, "root") == 0 ||
-	krb_get_lrealm(realm, 0) != KSUCCESS)
-	return (1);
-
-    noticketsdontcomplain = 0; /* enable warning message */
-
-    /*
-     * get TGT for local realm
-     * tickets are stored in a file named TKT_ROOT plus uid
-     * except for user.root tickets.
-     */
-
-    if (strcmp(instance, "root") != 0)
-	snprintf(tkt_location, sizeof(tkt_location),
-		 "%s%u_%u",
-		TKT_ROOT, (unsigned)pw->pw_uid, (unsigned)getpid());
-    else {
-	snprintf(tkt_location, sizeof(tkt_location),
-		 "%s_root_%d", TKT_ROOT,
-		(unsigned)pw->pw_uid);
-    }
-    krbtkfile_env = tkt_location;
-    krb_set_tkt_string(tkt_location);
-
-    kerror = krb_get_pw_in_tkt(pw->pw_name, instance,
-			       realm, KRB_TICKET_GRANTING_TICKET, realm,
-			       DEFAULT_TKT_LIFE, password);
-
-    /*
-     * If we got a TGT, get a local "rcmd" ticket and check it so as to
-     * ensure that we are not talking to a bogus Kerberos server.
-     *
-     * There are 2 cases where we still allow a login:
-     *	1: the VERIFY_SERVICE doesn't exist in the KDC
-     *	2: local host has no srvtab, as (hopefully) indicated by a
-     *	   return value of RD_AP_UNDEC from krb_rd_req().
-     */
-    if (kerror != INTK_OK) {
-	if (kerror != INTK_BADPW && kerror != KDC_PR_UNKNOWN) {
-	    syslog(LOG_ERR, "Kerberos intkt error: %s",
-		   krb_get_err_text(kerror));
-	    dest_tkt();
-	}
-	return (1);
-    }
-
-    if (chown(TKT_FILE, pw->pw_uid, pw->pw_gid) < 0)
-	syslog(LOG_ERR, "chown tkfile (%s): %m", TKT_FILE);
-
-    strncpy(savehost, krb_get_phost(localhost), sizeof(savehost));
-    savehost[sizeof(savehost)-1] = '\0';
-
-#ifdef KLOGIN_PARANOID
-    /*
-     * if the "VERIFY_SERVICE" doesn't exist in the KDC for this host,
-     * don't allow kerberos login, also log the error condition.
-     */
-
-    kerror = krb_mk_req(&ticket, VERIFY_SERVICE, savehost, realm, 33);
-    if (kerror == KDC_PR_UNKNOWN) {
-	syslog(LOG_NOTICE,
-	       "warning: TGT not verified (%s); %s.%s not registered, or srvtab is wrong?",
-	       krb_get_err_text(kerror), VERIFY_SERVICE, savehost);
-	notickets = 0;
-	return (1);
-    }
-
-    if (kerror != KSUCCESS) {
-	warnx("unable to use TGT: (%s)", krb_get_err_text(kerror));
-	syslog(LOG_NOTICE, "unable to use TGT: (%s)",
-	       krb_get_err_text(kerror));
-	dest_tkt();
-	return (1);
-    }
-
-    if (!(hp = gethostbyname(localhost))) {
-	syslog(LOG_ERR, "couldn't get local host address");
-	dest_tkt();
-	return (1);
-    }
-
-    memcpy(&faddr, hp->h_addr, sizeof(faddr));
-
-    kerror = krb_rd_req(&ticket, VERIFY_SERVICE, savehost, faddr,
-			&authdata, "");
-
-    if (kerror == KSUCCESS) {
-	notickets = 0;
-	return (0);
-    }
-
-    /* undecipherable: probably didn't have a srvtab on the local host */
-    if (kerror == RD_AP_UNDEC) {
-	syslog(LOG_NOTICE, "krb_rd_req: (%s)\n", krb_get_err_text(kerror));
-	dest_tkt();
-	return (1);
-    }
-    /* failed for some other reason */
-    warnx("unable to verify %s ticket: (%s)", VERIFY_SERVICE,
-	  krb_get_err_text(kerror));
-    syslog(LOG_NOTICE, "couldn't verify %s ticket: %s", VERIFY_SERVICE,
-	   krb_get_err_text(kerror));
-    dest_tkt();
-    return (1);
-#else
-    notickets = 0;
-    return (0);
-#endif
-}
-#endif
diff --git a/crypto/kerberosIV/appl/bsd/krcmd.c b/crypto/kerberosIV/appl/bsd/krcmd.c
deleted file mode 100644
index 8c3c6f3c2172..000000000000
--- a/crypto/kerberosIV/appl/bsd/krcmd.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "bsd_locl.h"
-
-RCSID("$Id: krcmd.c,v 1.10 1997/03/30 18:20:18 joda Exp $");
-
-#define	SERVICE_NAME	"rcmd"
-
-/*
- * krcmd: simplified version of Athena's "kcmd"
- *	returns a socket attached to the destination, -1 or krb error on error 
- *	if fd2p is non-NULL, another socket is filled in for it
- */
-
-int
-krcmd(char **ahost, u_short rport, char *remuser, char *cmd, int *fd2p, char *realm)
-{
-	int		sock = -1, err = 0;
-	KTEXT_ST	ticket;
-	long		authopts = 0L;
-
-	err = kcmd(
-		&sock,
-		ahost,
-		rport,
-		NULL,	/* locuser not used */
-		remuser,
-		cmd,
-		fd2p,
-		&ticket,
-		SERVICE_NAME,
-		realm,
-		(CREDENTIALS *)  NULL,		/* credentials not used */
-		0,				/* key schedule not used */
-		(MSG_DAT *) NULL,		/* MSG_DAT not used */
-		(struct sockaddr_in *) NULL,	/* local addr not used */
-		(struct sockaddr_in *) NULL,	/* foreign addr not used */
-		authopts
-	);
-
-	if (err > KSUCCESS && err < MAX_KRB_ERRORS) {
-	    warning("krcmd: %s", krb_get_err_text(err));
-	    return(-1);
-	}
-	if (err < 0)
-	    return(-1);
-	return(sock);
-}
-
-int
-krcmd_mutual(char **ahost, u_short rport, char *remuser, char *cmd, int *fd2p, char *realm, CREDENTIALS *cred, Key_schedule sched)
-{
-	int		sock, err;
-	KTEXT_ST	ticket;
-	MSG_DAT		msg_dat;
-	struct sockaddr_in	laddr, faddr;
-	long authopts = KOPT_DO_MUTUAL;
-
-	err = kcmd(
-		&sock,
-		ahost,
-		rport,
-		NULL,	/* locuser not used */
-		remuser,
-		cmd,
-		fd2p,
-		&ticket,
-		SERVICE_NAME,
-		realm,
-		cred,		/* filled in */
-		sched,		/* filled in */
-		&msg_dat,	/* filled in */
-		&laddr,		/* filled in */
-		&faddr,		/* filled in */
-		authopts
-	);
-
-	if (err > KSUCCESS && err < MAX_KRB_ERRORS) {
-	    warnx("krcmd_mutual: %s", krb_get_err_text(err));
-	    return(-1);
-	}
-	
-	if (err < 0)
-	    return (-1);
-	return(sock);
-}
diff --git a/crypto/kerberosIV/appl/bsd/login.c b/crypto/kerberosIV/appl/bsd/login.c
deleted file mode 100644
index c436f8db98bb..000000000000
--- a/crypto/kerberosIV/appl/bsd/login.c
+++ /dev/null
@@ -1,990 +0,0 @@
-/*-
- * Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * login [ name ]
- * login -h hostname	(for telnetd, etc.)
- * login -f name	(for pre-authenticated login: datakit, xterm, etc.)
- */
-
-#include "bsd_locl.h"
-
-RCSID("$Id: login.c,v 1.104 1997/05/20 20:35:06 assar Exp $");
-
-#include <otp.h>
-
-#include "sysv_default.h"
-#ifdef SYSV_SHADOW
-#include "sysv_shadow.h"
-#endif
-
-static	void	 badlogin (char *);
-static	void	 checknologin (void);
-static	void	 dolastlog (int);
-static	void	 getloginname (int);
-static	int	 rootterm (char *);
-static	char	*stypeof (char *);
-static	RETSIGTYPE	 timedout (int);
-static	int	 doremotelogin (char *);
-void	login_fbtab (char *, uid_t, gid_t);
-#ifdef KERBEROS
-int	klogin (struct passwd *, char *, char *, char *);
-#endif
-
-#define	TTYGRPNAME	"tty"		/* name of group to own ttys */
-
-/*
- * This bounds the time given to login.  Change it in
- * `/etc/default/login'.
- */
-
-static	u_int	login_timeout;
-
-#ifdef KERBEROS
-int	notickets = 1;
-int	noticketsdontcomplain = 1;
-char	*instance;
-char	*krbtkfile_env;
-int	authok;
-#endif
-
-#ifdef HAVE_SHADOW_H
-static  struct spwd *spwd = NULL;
-#endif
-
-static	char    *ttyprompt;
-
-static	struct	passwd *pwd;
-static	int	failures;
-static	char	term[64], *hostname, *username, *tty;
-
-static  char rusername[100], lusername[100];
-
-static int
-change_passwd(struct passwd  *who)
-{
-        int             status;
-        int             pid;
-        int             wpid;
- 
-        switch (pid = fork()) {
-	case -1:
-	    warn("fork /bin/passwd");
-	    sleepexit(1);
-	case 0:
-	    execlp("/bin/passwd", "passwd", who->pw_name, (char *) 0);
-	    _exit(1);
-	default:
-	    while ((wpid = wait(&status)) != -1 && wpid != pid)
-		/* void */ ;
-	    return (status);
-	}
-}
-
-#ifndef NO_MOTD /* message of the day stuff */
-
-jmp_buf motdinterrupt;
-
-static RETSIGTYPE
-sigint(int signo)
-{
-	longjmp(motdinterrupt, 1);
-}
-
-static void
-motd(void)
-{
-	int fd, nchars;
-	RETSIGTYPE (*oldint)();
-	char tbuf[8192];
-
-	if ((fd = open(_PATH_MOTDFILE, O_RDONLY, 0)) < 0)
-		return;
-	oldint = signal(SIGINT, sigint);
-	if (setjmp(motdinterrupt) == 0)
-		while ((nchars = read(fd, tbuf, sizeof(tbuf))) > 0)
-			write(fileno(stdout), tbuf, nchars);
-	signal(SIGINT, oldint);
-	close(fd);
-}
-
-#endif /* !NO_MOTD */
-
-#define AUTH_NONE 0
-#define AUTH_OTP  1
-
-/*
- * getpwnam and try to detect the worst form of NIS attack.
- */
-
-static struct passwd *
-paranoid_getpwnam (char *user)
-{
-	struct passwd *p;
-
-	p = k_getpwnam (user);
-	if (p == NULL)
-		return p;
-	if (p->pw_uid == 0 && strcmp (username, "root") != 0) {
-		syslog (LOG_ALERT,
-			"NIS attack, user %s has uid 0", username);
-		return NULL;
-	}
-	return p;
-}
-
-int
-main(int argc, char **argv)
-{
-	struct group *gr;
-	int ask, ch, cnt, fflag, hflag, pflag, quietlog, nomailcheck;
-	int rootlogin, rval;
-	int rflag;
-	int changepass = 0;
-	uid_t uid;
-	char *domain, *p, passwd[128], *ttyn;
-	char tbuf[MaxPathLen + 2], tname[sizeof(_PATH_TTY) + 10];
-	char localhost[MaxHostNameLen];
-	char full_hostname[MaxHostNameLen];
-	int auth_level = AUTH_NONE;
-	OtpContext otp_ctx;
-	int mask = 022;		/* Default umask (set below) */
-	int maxtrys = 5;	/* Default number of allowed failed logins */
-
-	set_progname(argv[0]);
-
-	openlog("login", LOG_ODELAY, LOG_AUTH);
-
-        /* Read defaults file and set the login timeout period. */
-        sysv_defaults();
-        login_timeout = atoi(default_timeout);
-        maxtrys = atoi(default_maxtrys);
-        if (sscanf(default_umask, "%o", &mask) != 1 || (mask & ~0777))
-                syslog(LOG_WARNING, "bad umask default: %s", default_umask);
-        else
-                umask(mask);
-
-	signal(SIGALRM, timedout);
-	alarm(login_timeout);
-	signal(SIGQUIT, SIG_IGN);
-	signal(SIGINT, SIG_IGN);
-	setpriority(PRIO_PROCESS, 0, 0);
-
-	/*
-	 * -p is used by getty to tell login not to destroy the environment
-	 * -f is used to skip a second login authentication
-	 * -h is used by other servers to pass the name of the remote
-	 *    host to login so that it may be placed in utmp and wtmp
-	 * -r is used by old-style rlogind to execute the autologin protocol
-	 */
-
-	*full_hostname = '\0';
-	domain = NULL;
-	if (k_gethostname(localhost, sizeof(localhost)) < 0)
-		syslog(LOG_ERR, "couldn't get local hostname: %m");
-	else
-		domain = strchr(localhost, '.');
-
-	fflag = hflag = pflag = rflag = 0;
-	uid = getuid();
-	while ((ch = getopt(argc, argv, "a:d:fh:pr:")) != EOF)
-	        switch (ch) {
-		case 'a':
-			if (strcmp (optarg, "none") == 0)
-				auth_level = AUTH_NONE;
-			else if (strcmp (optarg, "otp") == 0)
-				auth_level = AUTH_OTP;
-			else
-				warnx ("bad value for -a: %s", optarg);
-			break;
-		case 'd':
-			break;
-		case 'f':
-			fflag = 1;
-			break;
-		case 'h':
-			if (rflag || hflag) {
-			    printf("Only one of -r and -h allowed\n");
-			    exit(1);
-                        }
-			if (uid)
-				errx(1, "-h option: %s", strerror(EPERM));
-			hflag = 1;
-			strncpy(full_hostname, optarg, sizeof(full_hostname)-1);
-			if (domain && (p = strchr(optarg, '.')) &&
-			    strcasecmp(p, domain) == 0)
-				*p = 0;
-			hostname = optarg;
-			break;
-		case 'p':
-			if (getuid()) {
-				warnx("-p for super-user only.");
-				exit(1);
-                        }
-			pflag = 1;
-			break;
-	        case 'r':
-			if (rflag || hflag) {
-				warnx("Only one of -r and -h allowed\n");
-				exit(1);
-                        }
-			if (getuid()) {
-				warnx("-r for super-user only.");
-				exit(1);
-                        }
-			rflag = 1;
-			strncpy(full_hostname, optarg, sizeof(full_hostname)-1);
-			if (domain && (p = strchr(optarg, '.')) &&
-			    strcasecmp(p, domain) == 0)
-				*p = 0;
-			hostname = optarg;
-			fflag = (doremotelogin(full_hostname) == 0);
-			break;
-		case '?':
-		default:
-			if (!uid)
-				syslog(LOG_ERR, "invalid flag %c", ch);
-			fprintf(stderr,
-				"usage: login [-fp] [-a otp]"
-				"[-h hostname | -r hostname] [username]\n");
-			exit(1);
-		}
-	argc -= optind;
-	argv += optind;
-
-	if (geteuid() != 0) {
-		warnx("only root may use login, use su");
-	        /* Or install login setuid root, which is not necessary */
-		sleep(10);
-		exit(1);
-	}
-        /*
-         * Figure out if we should ask for the username or not. The name
-         * may be given on the command line or via the environment, and
-         * it may even be in the terminal input queue.
-         */
-        if (rflag) {
-                username = lusername;
-                ask = 0;
-	      } else
-        if (*argv && strchr(*argv, '=')) {
-                ask = 1;
-	      } else
-        if (*argv && strcmp(*argv, "-") == 0) {
-                argc--;
-                argv++;
-                ask = 1;
-	      } else
-	if (*argv) {
-		username = *argv;
-		ask = 0;
-                argc--;
-                argv++;
-        } else if ((ttyprompt = getenv("TTYPROMPT")) && *ttyprompt) {
-                getloginname(0);
-                ask = 0;
-	} else
-		ask = 1;
-
-	/* Default tty settings. */
-	stty_default();
-
-	for (cnt = getdtablesize(); cnt > 2; cnt--)
-		close(cnt);
-
-        /*
-         * Determine the tty name. BSD takes the basename, SYSV4 takes
-         * whatever remains after stripping the "/dev/" prefix. The code
-         * below should produce sensible results in either environment.
-         */
-        ttyn = ttyname(STDIN_FILENO);
-        if (ttyn == NULL || *ttyn == '\0') {
-	        snprintf(tname, sizeof(tname), "%s??", _PATH_TTY);
-	        ttyn = tname;
-	}
-        if ((tty = strchr(ttyn + 1, '/')))
-	        ++tty;
-        else
-	        tty = ttyn;
-
-	for (cnt = 0;; ask = 1) {
-	        char prompt[128], ss[256];
-		if (ask) {
-			fflag = 0;
-			getloginname(1);
-		}
-		rootlogin = 0;
-		rval = 1;
-#ifdef	KERBEROS
-		if ((instance = strchr(username, '.')) != NULL) {
-		    if (strcmp(instance, ".root") == 0)
-			rootlogin = 1;
-		    *instance++ = '\0';
-		} else
-		    instance = "";
-#endif
-		if (strlen(username) > UT_NAMESIZE)
-			username[UT_NAMESIZE] = '\0';
-
-		/*
-		 * Note if trying multiple user names; log failures for
-		 * previous user name, but don't bother logging one failure
-		 * for nonexistent name (mistyped username).
-		 */
-		if (failures && strcmp(tbuf, username)) {
-			if (failures > (pwd ? 0 : 1))
-				badlogin(tbuf);
-			failures = 0;
-		}
-		strcpy(tbuf, username);
-
-		pwd = paranoid_getpwnam (username);
-
-		/*
-		 * if we have a valid account name, and it doesn't have a
-		 * password, or the -f option was specified and the caller
-		 * is root or the caller isn't changing their uid, don't
-		 * authenticate.
-		 */
-		if (pwd) {
-			if (pwd->pw_uid == 0)
-				rootlogin = 1;
-
-			if (fflag && (uid == 0 || uid == pwd->pw_uid)) {
-				/* already authenticated */
-				break;
-			} else if (pwd->pw_passwd[0] == '\0') {
-				/* pretend password okay */
-				rval = 0;
-				goto ttycheck;
-			}
-		}
-
-		fflag = 0;
-
-		setpriority(PRIO_PROCESS, 0, -4);
-
-		if (otp_challenge (&otp_ctx, username,
-				   ss, sizeof(ss)) == 0)
-			snprintf (prompt, sizeof(prompt), "%s's %s Password: ",
-				  username, ss);
-		else {
-			if (auth_level == AUTH_NONE)
-				snprintf(prompt, sizeof(prompt), "%s's Password: ",
-					 username);
-			else {
-				char *s;
-
-				rval = 1;
-				s = otp_error(&otp_ctx);
-				if(s)
-					printf ("OTP: %s\n", s);
-				continue;
-			}
-		}
-
-		if (des_read_pw_string (passwd, sizeof(passwd) - 1, prompt, 0))
-			continue;
-		passwd[sizeof(passwd) - 1] = '\0';
-
-		/* Verify it somehow */
-
-		if (otp_verify_user (&otp_ctx, passwd) == 0)
-			rval = 0;
-		else if (pwd == NULL)
-			;
-		else if (auth_level == AUTH_NONE) {
-			uid_t pwd_uid = pwd->pw_uid;
-
-			rval = unix_verify_user (username, passwd);
-
-			if (rval == 0)
-			  {
-			    if (rootlogin && pwd_uid != 0)
-			      rootlogin = 0;
-			  }
-			else
-			  {
-			    rval = klogin(pwd, instance, localhost, passwd);
-			    if (rval != 0 && rootlogin && pwd_uid != 0)
-			      rootlogin = 0;
-			    if (rval == 0)
-			      authok = 1;
-			  }
-		} else {
-			char *s;
-
-			rval = 1;
-			if ((s = otp_error(&otp_ctx)))
-				printf ("OTP: %s\n", s);
-		}
-
-		memset (passwd, 0, sizeof(passwd));
-		setpriority (PRIO_PROCESS, 0, 0);
-
-		/*
-		 * Santa Claus, give me a portable and reentrant getpwnam.
-		 */
-		pwd = paranoid_getpwnam (username);
-
-	ttycheck:
-		/*
-		 * If trying to log in as root without Kerberos,
-		 * but with insecure terminal, refuse the login attempt.
-		 */
-#ifdef KERBEROS
-		if (authok == 0)
-#endif
-		if (pwd && !rval && rootlogin && !rootterm(tty)
-		    && !rootterm(ttyn)) {
-			warnx("%s login refused on this terminal.",
-			      pwd->pw_name);
-			if (hostname)
-				syslog(LOG_NOTICE,
-				       "LOGIN %s REFUSED FROM %s ON TTY %s",
-				       pwd->pw_name, hostname, tty);
-			else
-				syslog(LOG_NOTICE,
-				       "LOGIN %s REFUSED ON TTY %s",
-				       pwd->pw_name, tty);
-			continue;
-		}
-
-		if (rval == 0)
-			break;
-
-		printf("Login incorrect\n");
-		failures++;
-
-                /* max number of attemps and delays taken from defaults file */
-		/* we allow maxtrys tries, but after 2 we start backing off */
-		if (++cnt > 2) {
-			if (cnt >= maxtrys) {
-				badlogin(username);
-				sleepexit(1);
-			}
-			sleep((u_int)((cnt - 2) * atoi(default_sleep)));
-		}
-	}
-
-	/* committed to login -- turn off timeout */
-	alarm(0);
-
-	endpwent();
-
-#if defined(HAVE_GETUDBNAM) && defined(HAVE_SETLIM)
-	{
-	    struct udb *udb;
-	    long t;
-	    const long maxcpu = 46116860184; /* some random constant */
-	    udb = getudbnam(pwd->pw_name);
-	    if(udb == UDB_NULL){
-		    warnx("Failed to get UDB entry.");
-		    exit(1);
-	    }
-	    t = udb->ue_pcpulim[UDBRC_INTER];
-	    if(t == 0 || t > maxcpu)
-		t = CPUUNLIM;
-	    else
-		t *= 100 * CLOCKS_PER_SEC;
-
-	    if(limit(C_PROC, 0, L_CPU, t) < 0)
-		warn("limit C_PROC");
-
-	    t = udb->ue_jcpulim[UDBRC_INTER];
-	    if(t == 0 || t > maxcpu)
-		t = CPUUNLIM;
-	    else
-		t *= 100 * CLOCKS_PER_SEC;
-
-	    if(limit(C_JOBPROCS, 0, L_CPU, t) < 0)
-		warn("limit C_JOBPROCS");
-
-	    nice(udb->ue_nice[UDBRC_INTER]);
-	}
-#endif
-	/* if user not super-user, check for disabled logins */
-	if (!rootlogin)
-		checknologin();
-
-	if (chdir(pwd->pw_dir) < 0) {
-		printf("No home directory %s!\n", pwd->pw_dir);
-		if (chdir("/"))
-			exit(0);
-		pwd->pw_dir = "/";
-		printf("Logging in with home = \"/\".\n");
-	}
-
-	quietlog = access(_PATH_HUSHLOGIN, F_OK) == 0;
-	nomailcheck = access(_PATH_NOMAILCHECK, F_OK) == 0;
-
-#if defined(HAVE_PASSWD_CHANGE) && defined(HAVE_PASSWD_EXPIRE)
-	if (pwd->pw_change || pwd->pw_expire)
-		gettimeofday(&tp, (struct timezone *)NULL);
-
-	if (pwd->pw_change)
-		if (tp.tv_sec >= pwd->pw_change) {
-			printf("Sorry -- your password has expired.\n");
-			changepass=1;
-		} else if (pwd->pw_change - tp.tv_sec <
-		    2 * DAYSPERWEEK * SECSPERDAY && !quietlog)
-			printf("Warning: your password expires on %s",
-			    ctime(&pwd->pw_change));
-	if (pwd->pw_expire)
-		if (tp.tv_sec >= pwd->pw_expire) {
-			printf("Sorry -- your account has expired.\n");
-			sleepexit(1);
-		} else if (pwd->pw_expire - tp.tv_sec <
-		    2 * DAYSPERWEEK * SECSPERDAY && !quietlog)
-			printf("Warning: your account expires on %s",
-			    ctime(&pwd->pw_expire));
-#endif /* defined(HAVE_PASSWD_CHANGE) && defined(HAVE_PASSWD_EXPIRE) */
-
-	/* Nothing else left to fail -- really log in. */
-
-        /*
-         * Update the utmp files, both BSD and SYSV style.
-         */
-        if (utmpx_login(tty, username, hostname ? hostname : "") != 0
-	    && !fflag) {
-                printf("No utmpx entry.  You must exec \"login\" from the lowest level \"sh\".\n");
-                sleepexit(0);
-        }
-	utmp_login(ttyn, username, hostname ? hostname : "");
-	dolastlog(quietlog);
-
-	/*
-	 * Set device protections, depending on what terminal the
-	 * user is logged in. This feature is used on Suns to give
-	 * console users better privacy.
-	 */
-	login_fbtab(tty, pwd->pw_uid, pwd->pw_gid);
-
-	chown(ttyn, pwd->pw_uid,
-	    (gr = getgrnam(TTYGRPNAME)) ? gr->gr_gid : pwd->pw_gid);
-	chmod(ttyn, S_IRUSR | S_IWUSR | S_IWGRP);
-	setgid(pwd->pw_gid);
-
-	initgroups(username, pwd->pw_gid);
-
-	if (*pwd->pw_shell == '\0')
-		pwd->pw_shell = _PATH_BSHELL;
-
-        /*
-         * Set up a new environment. With SYSV, some variables are always
-         * preserved; some varables are never preserved, and some variables
-         * are always clobbered. With BSD, nothing is always preserved, and
-         * some variables are always clobbered. We add code to make sure
-         * that LD_* and IFS are never preserved.
-         */
-	if (term[0] == '\0')
-		strncpy(term, stypeof(tty), sizeof(term));
-        /* set up a somewhat censored environment. */
-        sysv_newenv(argc, argv, pwd, term, pflag);
-#ifdef KERBEROS
-	if (krbtkfile_env)
-	    setenv("KRBTKFILE", krbtkfile_env, 1);
-#endif
-
-	if (tty[sizeof("tty")-1] == 'd')
-		syslog(LOG_INFO, "DIALUP %s, %s", tty, pwd->pw_name);
-
-	/* If fflag is on, assume caller/authenticator has logged root login. */
-	if (rootlogin && fflag == 0)
-		if (hostname)
-			syslog(LOG_NOTICE, "ROOT LOGIN (%s) ON %s FROM %s",
-			    username, tty, hostname);
-		else
-			syslog(LOG_NOTICE, "ROOT LOGIN (%s) ON %s", username, tty);
-
-#ifdef KERBEROS
-	if (!quietlog && notickets == 1 && !noticketsdontcomplain)
-		printf("Warning: no Kerberos tickets issued.\n");
-#endif
-
-#ifdef LOGALL
-	/*
-	 * Syslog each successful login, so we don't have to watch hundreds
-	 * of wtmp or lastlogin files.
-	 */
-	if (hostname) {
-		syslog(LOG_INFO, "login from %s as %s", hostname, pwd->pw_name);
-	} else {
-		syslog(LOG_INFO, "login on %s as %s", tty, pwd->pw_name);
-	}
-#endif
-
-#ifndef NO_MOTD
-        /*
-         * Optionally show the message of the day. System V login leaves
-         * motd and mail stuff up to the shell startup file.
-         */
-	if (!quietlog) {
-	        struct stat st;
-#if 0
-		printf("%s\n\t%s  %s\n\n",
-	    "Copyright (c) 1980, 1983, 1986, 1988, 1990, 1991, 1993, 1994",
-		    "The Regents of the University of California. ",
-		    "All rights reserved.");
-#endif
-		motd();
-		if(!nomailcheck){
-		    snprintf(tbuf, sizeof(tbuf), "%s/%s", _PATH_MAILDIR, pwd->pw_name);
-		    if (stat(tbuf, &st) == 0 && st.st_size != 0)
-			printf("You have %smail.\n",
-			       (st.st_mtime > st.st_atime) ? "new " : "");
-		}
-	}
-#endif /* NO_MOTD */
-
-#ifdef LOGIN_ACCESS
-	if (login_access(pwd->pw_name, hostname ? full_hostname : tty) == 0) {
-		printf("Permission denied\n");
-		if (hostname)
-			syslog(LOG_NOTICE, "%s LOGIN REFUSED FROM %s",
-				pwd->pw_name, hostname);
-		else
-			syslog(LOG_NOTICE, "%s LOGIN REFUSED ON %s",
-				pwd->pw_name, tty);
-		sleepexit(1);
-	}
-#endif
-
-	signal(SIGALRM, SIG_DFL);
-	signal(SIGQUIT, SIG_DFL);
-	signal(SIGINT, SIG_DFL);
-	signal(SIGTSTP, SIG_IGN);
-
-	tbuf[0] = '-';
-	strcpy(tbuf + 1, (p = strrchr(pwd->pw_shell, '/')) ?
-	       p + 1 : pwd->pw_shell);
-
-#ifdef HAVE_SETLOGIN
-     	if (setlogin(pwd->pw_name) < 0)
-                syslog(LOG_ERR, "setlogin() failure: %m");
-#endif
-
-#ifdef HAVE_SETPCRED
-	if (setpcred (pwd->pw_name, NULL) == -1)
-		syslog(LOG_ERR, "setpcred() failure: %m");
-#endif /* HAVE_SETPCRED */
-
-#if defined(SYSV_SHADOW) && defined(HAVE_GETSPNAM)
-	spwd = getspnam (username);
-	endspent ();
-#endif
-	/* Discard permissions last so can't get killed and drop core. */
-	{
-	    int uid = rootlogin ? 0 : pwd->pw_uid;
-	    if(setuid(uid) != 0){
-		    warn("setuid(%d)", uid);
-		    if(!rootlogin)
-			    exit(1);
-	    }
-	}
-		       
-
-	/*
-         * After dropping privileges and after cleaning up the environment,
-         * optionally run, as the user, /bin/passwd.
-         */
- 
-        if (pwd->pw_passwd[0] == 0 &&
-	    strcasecmp(default_passreq, "YES") == 0) {
-                printf("You don't have a password.  Choose one.\n");
-                if (change_passwd(pwd))
-                        sleepexit(0);
-		changepass = 0;
-        }
-
-#ifdef SYSV_SHADOW
-        if (spwd && sysv_expire(spwd)) {
-                if (change_passwd(pwd))
-                        sleepexit(0);
-		changepass = 0;
-        }
-#endif /* SYSV_SHADOW */
-	if (changepass) {
-		int res;
-		if ((res=system(_PATH_CHPASS)))
-			sleepexit(1);
-	}
-
-	if (k_hasafs()) {
-	    char cell[64];
-	    k_setpag();
-	    if(k_afs_cell_of_file(pwd->pw_dir, cell, sizeof(cell)) == 0)
-		k_afsklog(cell, 0);
-	    k_afsklog(0, 0);
-	}
-
-	execlp(pwd->pw_shell, tbuf, 0);
-	if (getuid() == 0) {
-		warnx("Can't exec %s, trying %s\n", 
-		      pwd->pw_shell, _PATH_BSHELL);
-		execlp(_PATH_BSHELL, tbuf, 0);
-		err(1, "%s", _PATH_BSHELL);
-	}
-	err(1, "%s", pwd->pw_shell);
-	return 1;
-}
-
-#ifdef	KERBEROS
-#define	NBUFSIZ		(UT_NAMESIZE + 1 + 5)	/* .root suffix */
-#else
-#define	NBUFSIZ		(UT_NAMESIZE + 1)
-#endif
-
-static void
-getloginname(int prompt)
-{
-	int ch;
-	char *p;
-	static char nbuf[NBUFSIZ];
-
-	for (;;) {
-                if (prompt)
-                    if (ttyprompt && *ttyprompt)
-                        printf("%s", ttyprompt);
-                    else
-		        printf("login: ");
-		prompt = 1;
-		for (p = nbuf; (ch = getchar()) != '\n'; ) {
-			if (ch == EOF) {
-				badlogin(username);
-				exit(0);
-			}
-			if (p < nbuf + (NBUFSIZ - 1))
-				*p++ = ch;
-		}
-		if (p > nbuf)
-			if (nbuf[0] == '-')
-				warnx("login names may not start with '-'.");
-			else {
-				*p = '\0';
-				username = nbuf;
-				break;
-			}
-	}
-}
-
-static int
-rootterm(char *ttyn)
-{
-#ifndef HAVE_TTYENT_H
-        return (default_console == 0 || strcmp(default_console, ttyname(0)) == 0);
-#else
-	struct ttyent *t;
-
-	return ((t = getttynam(ttyn)) && t->ty_status & TTY_SECURE);
-#endif
-}
-
-static RETSIGTYPE
-timedout(int signo)
-{
-	fprintf(stderr, "Login timed out after %d seconds\n",
-		login_timeout);
-	exit(0);
-}
-
-static void
-checknologin(void)
-{
-	int fd, nchars;
-	char tbuf[8192];
-
-	if ((fd = open(_PATH_NOLOGIN, O_RDONLY, 0)) >= 0) {
-		while ((nchars = read(fd, tbuf, sizeof(tbuf))) > 0)
-			write(fileno(stdout), tbuf, nchars);
-		sleepexit(0);
-	}
-}
-
-static void
-dolastlog(int quiet)
-{
-#if defined(HAVE_LASTLOG_H) || defined(HAVE_LOGIN_H) || defined(SYSV_SHADOW)
-	struct lastlog ll;
-	int fd;
-
-	if ((fd = open(_PATH_LASTLOG, O_RDWR, 0)) >= 0) {
-		lseek(fd, (off_t)pwd->pw_uid * sizeof(ll), SEEK_SET);
-#ifdef SYSV_SHADOW
-                if (read(fd, &ll, sizeof(ll)) == sizeof(ll) &&
-                    ll.ll_time != 0) {
-                        if (pwd->pw_uid && spwd && spwd->sp_inact > 0
-                            && ll.ll_time / (24 * 60 * 60)
-			    + spwd->sp_inact < time(0)) {
-                                printf("Your account has been inactive too long.\n");
-                                sleepexit(1);
-                        }
-                        if (!quiet) {
-                                printf("Last login: %.*s ",
-                                    24-5, ctime(&ll.ll_time));
-                                if (*ll.ll_host != '\0') {
-                                        printf("from %.*s\n",
-                                            (int)sizeof(ll.ll_host),
-					       ll.ll_host);
-                                } else
-                                        printf("on %.*s\n",
-                                            (int)sizeof(ll.ll_line),
-					       ll.ll_line);
-                        }
-                }
-                lseek(fd, (off_t)pwd->pw_uid * sizeof(ll), SEEK_SET);
-#else /* SYSV_SHADOW */
-		if (!quiet) {
-			if (read(fd, &ll, sizeof(ll)) == sizeof(ll) &&
-			    ll.ll_time != 0) {
-				printf("Last login: %.*s ",
-				    24-5, ctime(&ll.ll_time));
-				if (*ll.ll_host != '\0')
-					printf("from %.*s\n",
-					    (int)sizeof(ll.ll_host),
-					    ll.ll_host);
-				else
-					printf("on %.*s\n",
-					    (int)sizeof(ll.ll_line),
-					    ll.ll_line);
-			}
-			lseek(fd, (off_t)pwd->pw_uid * sizeof(ll), SEEK_SET);
-		}
-#endif /* SYSV_SHADOW */
-		memset(&ll, 0, sizeof(ll));
-		time(&ll.ll_time);
-		strncpy(ll.ll_line, tty, sizeof(ll.ll_line));
-		if (hostname)
-			strncpy(ll.ll_host, hostname, sizeof(ll.ll_host));
-		write(fd, &ll, sizeof(ll));
-		close(fd);
-	}
-#endif /* DOLASTLOG */
-}
-
-static void
-badlogin(char *name)
-{
-
-	if (failures == 0)
-		return;
-	if (hostname) {
-		syslog(LOG_NOTICE, "%d LOGIN FAILURE%s FROM %s",
-		    failures, failures > 1 ? "S" : "", hostname);
-		syslog(LOG_AUTHPRIV|LOG_NOTICE,
-		    "%d LOGIN FAILURE%s FROM %s, %s",
-		    failures, failures > 1 ? "S" : "", hostname, name);
-	} else {
-		syslog(LOG_NOTICE, "%d LOGIN FAILURE%s ON %s",
-		    failures, failures > 1 ? "S" : "", tty);
-		syslog(LOG_AUTHPRIV|LOG_NOTICE,
-		    "%d LOGIN FAILURE%s ON %s, %s",
-		    failures, failures > 1 ? "S" : "", tty, name);
-	}
-}
-
-#undef	UNKNOWN
-#define	UNKNOWN	"su"
-
-static char *
-stypeof(char *ttyid)
-{
-    /* TERM is probably a better guess than anything else. */
-    char *term = getenv("TERM");
-
-    if (term != 0 && term[0] != 0)
-	return term;
-
-    {
-#ifndef HAVE_TTYENT_H
-	return UNKNOWN;
-#else
-	struct ttyent *t;
-	return (ttyid && (t = getttynam(ttyid)) ? t->ty_type : UNKNOWN);
-#endif
-    }
-}
-
-static void
-xgetstr(char *buf, int cnt, char *err)
-{
-        char ch;
- 
-        do {
-                if (read(0, &ch, sizeof(ch)) != sizeof(ch))
-                        exit(1);
-                if (--cnt < 0) {
-                        fprintf(stderr, "%s too long\r\n", err);
-                        sleepexit(1);
-                }
-                *buf++ = ch;
-        } while (ch);
-}
-
-/*
- * Some old rlogind's unknowingly pass remuser, locuser and
- * terminal_type/speed so we need to take care of that part of the
- * protocol here. Also, we can't make a getpeername(2) on the socket
- * so we have to trust that rlogind resolved the name correctly.
- */
-
-static int
-doremotelogin(char *host)
-{
-        int code;
-        char *cp;
-
-        xgetstr(rusername, sizeof (rusername), "remuser");
-        xgetstr(lusername, sizeof (lusername), "locuser");
-        xgetstr(term, sizeof(term), "Terminal type");
-	cp = strchr(term, '/');
-	if (cp != 0)
-		*cp = 0;	/* For now ignore speed/bg */
-        pwd = k_getpwnam(lusername);
-        if (pwd == NULL)
-                return(-1);
-        code = ruserok(host, (pwd->pw_uid == 0), rusername, lusername);
-	if (code == 0)
-	  syslog(LOG_NOTICE,
-		 "Warning: An old rlogind accepted login probably from host %s",
-		 host);
-	return(code);
-}
- 
-void
-sleepexit(int eval)
-{
-
-	sleep(5);
-	exit(eval);
-}
diff --git a/crypto/kerberosIV/appl/bsd/login_access.c b/crypto/kerberosIV/appl/bsd/login_access.c
deleted file mode 100644
index 0e017b10cdfd..000000000000
--- a/crypto/kerberosIV/appl/bsd/login_access.c
+++ /dev/null
@@ -1,221 +0,0 @@
- /*
-  * This module implements a simple but effective form of login access
-  * control based on login names and on host (or domain) names, internet
-  * addresses (or network numbers), or on terminal line names in case of
-  * non-networked logins. Diagnostics are reported through syslog(3).
-  *
-  * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
-  */
-
-#include "bsd_locl.h"
-
-RCSID("$Id: login_access.c,v 1.15 1997/06/01 03:12:28 assar Exp $");
-
-#ifdef LOGIN_ACCESS
-
- /* Delimiters for fields and for lists of users, ttys or hosts. */
-
-static char fs[] = ":";			/* field separator */
-static char sep[] = ", \t";		/* list-element separator */
-
- /* Constants to be used in assignments only, not in comparisons... */
-
-#define YES             1
-#define NO              0
-
-static int list_match(char *list, char *item, int (*match_fn)(char *, char *));
-static int user_match(char *tok, char *string);
-static int from_match(char *tok, char *string);
-static int string_match(char *tok, char *string);
-
-/* login_access - match username/group and host/tty with access control file */
-
-int login_access(char *user, char *from)
-{
-    FILE   *fp;
-    char    line[BUFSIZ];
-    char   *perm;			/* becomes permission field */
-    char   *users;			/* becomes list of login names */
-    char   *froms;			/* becomes list of terminals or hosts */
-    int     match = NO;
-    int     end;
-    int     lineno = 0;			/* for diagnostics */
-    char   *foo;
-
-    /*
-     * Process the table one line at a time and stop at the first match.
-     * Blank lines and lines that begin with a '#' character are ignored.
-     * Non-comment lines are broken at the ':' character. All fields are
-     * mandatory. The first field should be a "+" or "-" character. A
-     * non-existing table means no access control.
-     */
-
-    if ((fp = fopen(_PATH_LOGACCESS, "r")) != 0) {
-	while (!match && fgets(line, sizeof(line), fp)) {
-	    lineno++;
-	    if (line[end = strlen(line) - 1] != '\n') {
-		syslog(LOG_ERR, "%s: line %d: missing newline or line too long",
-		       _PATH_LOGACCESS, lineno);
-		continue;
-	    }
-	    if (line[0] == '#')
-		continue;			/* comment line */
-	    while (end > 0 && isspace(line[end - 1]))
-		end--;
-	    line[end] = 0;			/* strip trailing whitespace */
-	    if (line[0] == 0)			/* skip blank lines */
-		continue;
-	    foo = NULL;
-	    if (!(perm = strtok_r(line, fs, &foo))
-		|| !(users = strtok_r(NULL, fs, &foo))
-		|| !(froms = strtok_r(NULL, fs, &foo))
-		|| strtok_r(NULL, fs, &foo)) {
-		syslog(LOG_ERR, "%s: line %d: bad field count", 
-		       _PATH_LOGACCESS,
-		       lineno);
-		continue;
-	    }
-	    if (perm[0] != '+' && perm[0] != '-') {
-		syslog(LOG_ERR, "%s: line %d: bad first field", 
-		       _PATH_LOGACCESS,
-		       lineno);
-		continue;
-	    }
-	    match = (list_match(froms, from, from_match)
-		     && list_match(users, user, user_match));
-	}
-	fclose(fp);
-    } else if (errno != ENOENT) {
-	syslog(LOG_ERR, "cannot open %s: %m", _PATH_LOGACCESS);
-    }
-    return (match == 0 || (line[0] == '+'));
-}
-
-/* list_match - match an item against a list of tokens with exceptions */
-
-static int
-list_match(char *list, char *item, int (*match_fn)(char *, char *))
-{
-    char   *tok;
-    int     match = NO;
-    char   *foo = NULL;
-
-    /*
-     * Process tokens one at a time. We have exhausted all possible matches
-     * when we reach an "EXCEPT" token or the end of the list. If we do find
-     * a match, look for an "EXCEPT" list and recurse to determine whether
-     * the match is affected by any exceptions.
-     */
-
-    for (tok = strtok_r(list, sep, &foo);
-	 tok != NULL;
-	 tok = strtok_r(NULL, sep, &foo)) {
-	if (strcasecmp(tok, "EXCEPT") == 0)	/* EXCEPT: give up */
-	    break;
-	if ((match = (*match_fn) (tok, item)) != 0)	/* YES */
-	    break;
-    }
-    /* Process exceptions to matches. */
-
-    if (match != NO) {
-	while ((tok = strtok_r(NULL, sep, &foo)) && strcasecmp(tok, "EXCEPT"))
-	     /* VOID */ ;
-	if (tok == 0 || list_match(NULL, item, match_fn) == NO)
-	    return (match);
-    }
-    return (NO);
-}
-
-/* netgroup_match - match group against machine or user */
-
-static int netgroup_match(char *group, char *machine, char *user)
-{
-#ifdef HAVE_YP_GET_DEFAULT_DOMAIN
-    static char *mydomain = 0;
-
-    if (mydomain == 0)
-	yp_get_default_domain(&mydomain);
-    return (innetgr(group, machine, user, mydomain));
-#else
-    syslog(LOG_ERR, "NIS netgroup support not configured");
-    return 0;
-#endif
-}
-
-/* user_match - match a username against one token */
-
-static int user_match(char *tok, char *string)
-{
-    struct group *group;
-    int     i;
-
-    /*
-     * If a token has the magic value "ALL" the match always succeeds.
-     * Otherwise, return YES if the token fully matches the username, or if
-     * the token is a group that contains the username.
-     */
-
-    if (tok[0] == '@') {			/* netgroup */
-	return (netgroup_match(tok + 1, (char *) 0, string));
-    } else if (string_match(tok, string)) {	/* ALL or exact match */
-	return (YES);
-    } else if ((group = getgrnam(tok)) != 0) { /* try group membership */
-	for (i = 0; group->gr_mem[i]; i++)
-	    if (strcasecmp(string, group->gr_mem[i]) == 0)
-		return (YES);
-    }
-    return (NO);
-}
-
-/* from_match - match a host or tty against a list of tokens */
-
-static int from_match(char *tok, char *string)
-{
-    int     tok_len;
-    int     str_len;
-
-    /*
-     * If a token has the magic value "ALL" the match always succeeds. Return
-     * YES if the token fully matches the string. If the token is a domain
-     * name, return YES if it matches the last fields of the string. If the
-     * token has the magic value "LOCAL", return YES if the string does not
-     * contain a "." character. If the token is a network number, return YES
-     * if it matches the head of the string.
-     */
-
-    if (tok[0] == '@') {			/* netgroup */
-	return (netgroup_match(tok + 1, string, (char *) 0));
-    } else if (string_match(tok, string)) {	/* ALL or exact match */
-	return (YES);
-    } else if (tok[0] == '.') {			/* domain: match last fields */
-	if ((str_len = strlen(string)) > (tok_len = strlen(tok))
-	    && strcasecmp(tok, string + str_len - tok_len) == 0)
-	    return (YES);
-    } else if (strcasecmp(tok, "LOCAL") == 0) {	/* local: no dots */
-	if (strchr(string, '.') == 0)
-	    return (YES);
-    } else if (tok[(tok_len = strlen(tok)) - 1] == '.'	/* network */
-	       && strncmp(tok, string, tok_len) == 0) {
-	return (YES);
-    }
-    return (NO);
-}
-
-/* string_match - match a string against one token */
-
-static int string_match(char *tok, char *string)
-{
-
-    /*
-     * If the token has the magic value "ALL" the match always succeeds.
-     * Otherwise, return YES if the token fully matches the string.
-     */
-
-    if (strcasecmp(tok, "ALL") == 0) {		/* all: always matches */
-	return (YES);
-    } else if (strcasecmp(tok, string) == 0) {	/* try exact match */
-	return (YES);
-    }
-    return (NO);
-}
-#endif /* LOGIN_ACCES */
diff --git a/crypto/kerberosIV/appl/bsd/login_fbtab.c b/crypto/kerberosIV/appl/bsd/login_fbtab.c
deleted file mode 100644
index f7f53aa57c43..000000000000
--- a/crypto/kerberosIV/appl/bsd/login_fbtab.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/************************************************************************
-* Copyright 1995 by Wietse Venema.  All rights reserved.
-*
-* This material was originally written and compiled by Wietse Venema at
-* Eindhoven University of Technology, The Netherlands, in 1990, 1991,
-* 1992, 1993, 1994 and 1995.
-*
-* Redistribution and use in source and binary forms are permitted
-* provided that this entire copyright notice is duplicated in all such
-* copies.
-*
-* This software is provided "as is" and without any expressed or implied
-* warranties, including, without limitation, the implied warranties of
-* merchantibility and fitness for any particular purpose.
-************************************************************************/
-/*
-    SYNOPSIS
-	void login_fbtab(tty, uid, gid)
-	char *tty;
-	uid_t uid;
-	gid_t gid;
-
-    DESCRIPTION
-	This module implements device security as described in the
-	SunOS 4.1.x fbtab(5) and SunOS 5.x logindevperm(4) manual
-	pages. The program first looks for /etc/fbtab. If that file
-	cannot be opened it attempts to process /etc/logindevperm.
-	We expect entries with the folowing format:
-
-	    Comments start with a # and extend to the end of the line.
-
-	    Blank lines or lines with only a comment are ignored.
-
-	    All other lines consist of three fields delimited by
-	    whitespace: a login device (/dev/console), an octal
-	    permission number (0600), and a ":"-delimited list of
-	    devices (/dev/kbd:/dev/mouse). All device names are
-	    absolute paths. A path that ends in "/*" refers to all
-	    directory entries except "." and "..".
-
-	    If the tty argument (relative path) matches a login device
-	    name (absolute path), the permissions of the devices in the
-	    ":"-delimited list are set as specified in the second
-	    field, and their ownership is changed to that of the uid
-	    and gid arguments.
-
-    DIAGNOSTICS
-	Problems are reported via the syslog daemon with severity
-	LOG_ERR.
-
-    BUGS
-
-    AUTHOR
-	Wietse Venema (wietse@wzv.win.tue.nl)
-	Eindhoven University of Technology
-	The Netherlands
- */
-
-#include "bsd_locl.h"
-
-RCSID("$Id: login_fbtab.c,v 1.10 1997/06/01 03:12:54 assar Exp $");
-
-void	login_protect	(char *, char *, int, uid_t, gid_t);
-void	login_fbtab	(char *tty, uid_t uid, gid_t gid);
-
-#define	WSPACE		" \t\n"
-
-/* login_fbtab - apply protections specified in /etc/fbtab or logindevperm */
-
-void
-login_fbtab(char *tty, uid_t uid, gid_t gid)
-{
-    FILE   *fp;
-    char    buf[BUFSIZ];
-    char   *devname;
-    char   *cp;
-    int     prot;
-    char   *table;
-    char   *foo;
-
-    if ((fp = fopen(table = _PATH_FBTAB, "r")) == 0
-    && (fp = fopen(table = _PATH_LOGINDEVPERM, "r")) == 0)
-	return;
-
-    while (fgets(buf, sizeof(buf), fp)) {
-	if ((cp = strchr(buf, '#')) != 0)
-	    *cp = 0;				/* strip comment */
-	foo = NULL;
-	if ((cp = devname = strtok_r(buf, WSPACE, &foo)) == 0)
-	    continue;				/* empty or comment */
-	if (strncmp(devname, "/dev/", 5) != 0
-	       || (cp = strtok_r(NULL, WSPACE, &foo)) == 0
-	       || *cp != '0'
-	       || sscanf(cp, "%o", &prot) == 0
-	       || prot == 0
-	       || (prot & 0777) != prot
-	       || (cp = strtok_r(NULL, WSPACE, &foo)) == 0) {
-	    syslog(LOG_ERR, "%s: bad entry: %s", table, cp ? cp : "(null)");
-	    continue;
-	}
-	if (strcmp(devname + 5, tty) == 0) {
-	    foo = NULL;
-	    for (cp = strtok_r(cp, ":", &foo);
-		 cp;
-		 cp = strtok_r(NULL, ":", &foo)) {
-		login_protect(table, cp, prot, uid, gid);
-	    }
-	}
-    }
-    fclose(fp);
-}
-
-/* login_protect - protect one device entry */
-
-void
-login_protect(char *table, char *path, int mask, uid_t uid, gid_t gid)
-{
-    char    buf[BUFSIZ];
-    int     pathlen = strlen(path);
-    struct dirent *ent;
-    DIR    *dir;
-
-    if (strcmp("/*", path + pathlen - 2) != 0) {
-	if (chmod(path, mask) && errno != ENOENT)
-	    syslog(LOG_ERR, "%s: chmod(%s): %m", table, path);
-	if (chown(path, uid, gid) && errno != ENOENT)
-	    syslog(LOG_ERR, "%s: chown(%s): %m", table, path);
-    } else {
-	strcpy(buf, path);
-	buf[pathlen - 1] = 0;
-	if ((dir = opendir(buf)) == 0) {
-	    syslog(LOG_ERR, "%s: opendir(%s): %m", table, path);
-	} else {
-	    while ((ent = readdir(dir)) != 0) {
-		if (strcmp(ent->d_name, ".") != 0
-		    && strcmp(ent->d_name, "..") != 0) {
-		    strcpy(buf + pathlen - 1, ent->d_name);
-		    login_protect(table, buf, mask, uid, gid);
-		}
-	    }
-	    closedir(dir);
-	}
-    }
-}
diff --git a/crypto/kerberosIV/appl/bsd/pathnames.h b/crypto/kerberosIV/appl/bsd/pathnames.h
deleted file mode 100644
index 3c10bff02404..000000000000
--- a/crypto/kerberosIV/appl/bsd/pathnames.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	from: @(#)pathnames.h	5.2 (Berkeley) 4/9/90
- *	$Id: pathnames.h,v 1.23 1996/11/17 06:36:42 joda Exp $
- */
-
-/******* First fix default path, we stick to _PATH_DEFPATH everywhere */
-
-#if !defined(_PATH_DEFPATH) && defined(_PATH_USERPATH)
-#define _PATH_DEFPATH _PATH_USERPATH
-#endif
-
-#if defined(_PATH_DEFPATH) && !defined(_DEF_PATH)
-#define _DEF_PATH _PATH_DEFPATH
-#endif
-
-#if !defined(_PATH_DEFPATH) && defined(_DEF_PATH)
-#define _PATH_DEFPATH _DEF_PATH
-#endif
-
-#ifndef _PATH_DEFPATH
-#define _PATH_DEFPATH "/usr/ucb:/usr/bin:/bin"
-#define _DEF_PATH _PATH_DEFPATH
-#endif /* !_PATH_DEFPATH */
-
-#ifndef _PATH_DEFSUPATH
-#define _PATH_DEFSUPATH "/usr/sbin:"  _DEF_PATH
-#endif /* _PATH_DEFSUPATH */
-
-/******* Default PATH fixed! */
-
-#undef  _PATH_RLOGIN		/* Redifine rlogin */
-#define	_PATH_RLOGIN	BINDIR  "/rlogin"
-
-#undef _PATH_RSH		/* Redifine rsh */
-#define _PATH_RSH	BINDIR  "/rsh"
-
-#undef _PATH_LOGIN
-#define _PATH_LOGIN	BINDIR "/login"
-
-/******* The rest is fallback defaults */
-
-#ifndef _PATH_DEV
-#define _PATH_DEV "/dev/"
-#endif
-
-#ifndef _PATH_CP
-#define _PATH_CP "/bin/cp"
-#endif /* _PATH_CP */
-
-#ifndef _PATH_SHELLS
-#define _PATH_SHELLS "/etc/shells"
-#endif /* _PATH_SHELLS */
-
-#ifndef _PATH_BSHELL
-#define _PATH_BSHELL "/bin/sh"
-#endif /* _PATH_BSHELL */
-
-#ifndef _PATH_CSHELL
-#define _PATH_CSHELL "/bin/csh"
-#endif /* _PATH_CSHELL */
-
-#ifndef _PATH_NOLOGIN
-#define _PATH_NOLOGIN "/etc/nologin"
-#endif /* _PATH_NOLOGIN */
-
-#ifndef _PATH_TTY
-#define _PATH_TTY "/dev/tty"
-#endif /* _PATH_TTY */
-
-#ifndef _PATH_HUSHLOGIN
-#define _PATH_HUSHLOGIN ".hushlogin"
-#endif /* _PATH_HUSHLOGIN */
-
-#ifndef _PATH_NOMAILCHECK
-#define _PATH_NOMAILCHECK ".nomailcheck"
-#endif /* _PATH_NOMAILCHECK */
-
-#ifndef _PATH_MOTDFILE
-#define _PATH_MOTDFILE "/etc/motd"
-#endif /* _PATH_MOTDFILE */
-
-#ifndef _PATH_LOGACCESS
-#define _PATH_LOGACCESS "/etc/login.access"
-#endif /* _PATH_LOGACCESS */
-
-#ifndef _PATH_HEQUIV
-#define _PATH_HEQUIV "/etc/hosts.equiv"
-#endif
-
-#ifndef _PATH_FBTAB
-#define _PATH_FBTAB "/etc/fbtab"
-#endif /* _PATH_FBTAB */
-
-#ifndef _PATH_LOGINDEVPERM
-#define _PATH_LOGINDEVPERM "/etc/logindevperm"
-#endif /* _PATH_LOGINDEVPERM */
-
-#ifndef _PATH_CHPASS
-#define _PATH_CHPASS "/usr/bin/passwd"
-#endif /* _PATH_CHPASS */
-
-#if defined(__hpux)
-#define __FALLBACK_MAILDIR__ "/usr/mail"
-#else
-#define __FALLBACK_MAILDIR__ "/usr/spool/mail"
-#endif
-
-#ifndef KRB4_MAILDIR
-#ifndef _PATH_MAILDIR
-#ifdef MAILDIR
-#define _PATH_MAILDIR MAILDIR
-#else
-#define _PATH_MAILDIR __FALLBACK_MAILDIR__
-#endif
-#endif /* _PATH_MAILDIR */
-#define KRB4_MAILDIR _PATH_MAILDIR
-#endif
-
-#ifndef _PATH_LASTLOG
-#define _PATH_LASTLOG		"/var/adm/lastlog"
-#endif
-
-#if defined(UTMP_FILE) && !defined(_PATH_UTMP)
-#define _PATH_UTMP UTMP_FILE
-#endif
-
-#ifndef _PATH_UTMP
-#define _PATH_UTMP   "/etc/utmp"
-#endif
-
-#if defined(WTMP_FILE) && !defined(_PATH_WTMP)
-#define _PATH_WTMP WTMP_FILE
-#endif
-
-#ifndef _PATH_WTMP
-#define _PATH_WTMP   "/usr/adm/wtmp"
-#endif
-
-#ifndef _PATH_ETC_DEFAULT_LOGIN
-#define _PATH_ETC_DEFAULT_LOGIN	"/etc/default/login"
-#endif
-
-#ifndef _PATH_ETC_ENVIRONMENT
-#define _PATH_ETC_ENVIRONMENT "/etc/environment"
-#endif
-
-/*
- * NeXT KLUDGE ALERT!!!!!!!!!!!!!!!!!!
- * Some sort of bug in the NEXTSTEP cpp.
- */
-#ifdef NeXT
-#undef  _PATH_DEFSUPATH
-#define _PATH_DEFSUPATH "/usr/sbin:/usr/ucb:/usr/bin:/bin"
-#undef  _PATH_RLOGIN
-#define	_PATH_RLOGIN	"/usr/athena/bin/rlogin"
-#undef  _PATH_RSH
-#define _PATH_RSH	"/usr/athena/bin/rsh"
-#undef  _PATH_LOGIN
-#define _PATH_LOGIN	"/usr/athena/bin/login"
-#endif
diff --git a/crypto/kerberosIV/appl/bsd/rcmd_util.c b/crypto/kerberosIV/appl/bsd/rcmd_util.c
deleted file mode 100644
index 466900954a91..000000000000
--- a/crypto/kerberosIV/appl/bsd/rcmd_util.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "bsd_locl.h"
-
-RCSID("$Id: rcmd_util.c,v 1.15 1997/05/02 14:27:44 assar Exp $");
-
-int
-get_login_port(int kerberos, int encryption)
-{
-  char *service="login";
-  int port=htons(513);
-
-  if(kerberos && encryption){
-    service="eklogin";
-    port=htons(2105);
-  }
-  
-  if(kerberos && !encryption){
-    service="klogin";
-    port=htons(543);
-  }
-  return k_getportbyname (service, "tcp", port);
-}
-
-int
-get_shell_port(int kerberos, int encryption)
-{
-  char *service="shell";
-  int port=htons(514);
-
-  if(kerberos && encryption){
-    service="ekshell";
-    port=htons(545);
-  }
-  
-  if(kerberos && !encryption){
-    service="kshell";
-    port=htons(544);
-  }
-
-  return k_getportbyname (service, "tcp", port);
-}
-
-/* 
- * On reasonable systems, `cf[gs]et[io]speed' use values of bit/s
- * directly, and the following functions are just identity functions.
- * This is however a slower way of doing those
- * should-be-but-are-not-always idenity functions.  
- */
-
-static struct { int speed; int bps; } conv[] = {
-#ifdef B0
-    {B0, 0},
-#endif
-#ifdef B50
-    {B50, 50},
-#endif
-#ifdef B75
-    {B75, 75},
-#endif
-#ifdef B110
-    {B110, 110},
-#endif
-#ifdef B134
-    {B134, 134},
-#endif
-#ifdef B150
-    {B150, 150},
-#endif
-#ifdef B200
-    {B200, 200},
-#endif
-#ifdef B300
-    {B300, 300},
-#endif
-#ifdef B600
-    {B600, 600},
-#endif
-#ifdef B1200
-    {B1200, 1200},
-#endif
-#ifdef B1800
-    {B1800, 1800},
-#endif
-#ifdef B2400
-    {B2400, 2400},
-#endif
-#ifdef B4800
-    {B4800, 4800},
-#endif
-#ifdef B9600
-    {B9600, 9600},
-#endif
-#ifdef B19200
-    {B19200, 19200},
-#endif
-#ifdef B38400
-    {B38400, 38400},
-#endif
-#ifdef B57600
-    {B57600, 57600},
-#endif
-#ifdef B115200
-    {B115200, 115200},
-#endif
-#ifdef B153600
-    {B153600, 153600},
-#endif
-#ifdef B230400
-    {B230400, 230400},
-#endif
-#ifdef B307200
-    {B307200, 307200},
-#endif
-#ifdef B460800
-    {B460800, 460800},
-#endif
-};
-
-#define N (sizeof(conv)/sizeof(*conv))
-
-int
-speed_t2int (speed_t s)
-{
-  int l, r, m;
-
-  l = 0;
-  r = N - 1;
-  while(l <= r) {
-    m = (l + r) / 2;
-    if (conv[m].speed == s)
-      return conv[m].bps;
-    else if(conv[m].speed < s)
-      l = m + 1;
-    else
-      r = m - 1; 
-  }
-  return -1;
-}
-
-/*
- *
- */
-
-speed_t
-int2speed_t (int i)
-{
-  int l, r, m;
-
-  l = 0;
-  r = N - 1;
-  while(l <= r) {
-    m = (l + r) / 2;
-    if (conv[m].bps == i)
-      return conv[m].speed;
-    else if(conv[m].bps < i)
-      l = m + 1;
-    else
-      r = m - 1;
-  }
-  return -1;
-}
-
-/*
- * If there are any IP options on `sock', die.
- */
-
-void
-ip_options_and_die (int sock, struct sockaddr_in *fromp)
-{
-#if defined(IP_OPTIONS) && defined(HAVE_GETSOCKOPT)
-  u_char optbuf[BUFSIZ/3], *cp;
-  char lbuf[BUFSIZ], *lp;
-  int optsize = sizeof(optbuf), ipproto;
-  struct protoent *ip;
-
-  if ((ip = getprotobyname("ip")) != NULL)
-    ipproto = ip->p_proto;
-  else
-    ipproto = IPPROTO_IP;
-  if (getsockopt(sock, ipproto, IP_OPTIONS,
-		 (void *)optbuf, &optsize) == 0 &&
-      optsize != 0) {
-    lp = lbuf;
-    for (cp = optbuf; optsize > 0; cp++, optsize--, lp += 3)
-      snprintf(lp, sizeof(lbuf) - (lp - lbuf), " %2.2x", *cp);
-    syslog(LOG_NOTICE,
-	   "Connection received from %s using IP options (dead):%s",
-	   inet_ntoa(fromp->sin_addr), lbuf);
-    exit(1);
-  }
-#endif
-}
-
-void
-warning(const char *fmt, ...)
-{
-    char *rstar_no_warn = getenv("RSTAR_NO_WARN");
-    va_list args;
-
-    va_start(args, fmt);
-    if (rstar_no_warn == NULL)
-	rstar_no_warn = "";
-    if (strncmp(rstar_no_warn, "yes", 3) != 0) {
-	/* XXX */
-	fprintf(stderr, "%s: warning, using standard ", __progname);
-	warnx(fmt, args);
-    }
-    va_end(args);
-}
diff --git a/crypto/kerberosIV/appl/bsd/rcp.c b/crypto/kerberosIV/appl/bsd/rcp.c
deleted file mode 100644
index 6dfb4726680a..000000000000
--- a/crypto/kerberosIV/appl/bsd/rcp.c
+++ /dev/null
@@ -1,1019 +0,0 @@
-/*
- * Copyright (c) 1983, 1990, 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "bsd_locl.h"
-
-RCSID("$Id: rcp.c,v 1.43 1997/05/13 09:41:26 bg Exp $");
-
-/* Globals */
-static char	dst_realm_buf[REALM_SZ];
-static char	*dest_realm = NULL;
-static int	use_kerberos = 1;
-
-static int	doencrypt = 0;
-#define	OPTIONS	"dfKk:prtx"
-
-static int errs, rem;
-static struct passwd *pwd;
-static u_short	port;
-static uid_t	userid;
-static int pflag, iamremote, iamrecursive, targetshouldbedirectory;
-
-#define	CMDNEEDS	64
-static char cmd[CMDNEEDS];		/* must hold "rcp -r -p -d\0" */
-
-void rsource(char *name, struct stat *statp);
-
-#define	SERVICE_NAME	"rcmd"
-
-CREDENTIALS cred;
-MSG_DAT msg_data;
-struct sockaddr_in foreign, local;
-Key_schedule schedule;
-
-KTEXT_ST ticket;
-AUTH_DAT kdata;
-
-static void
-send_auth(char *h, char *r)
-{
-    int lslen, fslen, status;
-    long opts;
-
-    lslen = sizeof(struct sockaddr_in);
-    if (getsockname(rem, (struct sockaddr *)&local, &lslen) < 0)
-	err(1, "getsockname");
-    fslen = sizeof(struct sockaddr_in);
-    if (getpeername(rem, (struct sockaddr *)&foreign, &fslen) < 0)
-	err(1, "getpeername");
-    if ((r == NULL) || (*r == '\0'))
-	r = krb_realmofhost(h);
-    opts = KOPT_DO_MUTUAL;
-    if ((status = krb_sendauth(opts, rem, &ticket, SERVICE_NAME, h, r, 
-			       (unsigned long)getpid(), &msg_data, &cred, 
-			       schedule, &local, 
-			       &foreign, "KCMDV0.1")) != KSUCCESS)
-	errx(1, "krb_sendauth failure: %s", krb_get_err_text(status));
-}
-
-static void
-answer_auth(void)
-{
-    int lslen, fslen, status;
-    long opts;
-    char inst[INST_SZ], v[9];
-
-    lslen = sizeof(struct sockaddr_in);
-    if (getsockname(rem, (struct sockaddr *)&local, &lslen) < 0)
-	err(1, "getsockname");
-    fslen = sizeof(struct sockaddr_in);
-    if(getpeername(rem, (struct sockaddr *)&foreign, &fslen) < 0)
-	    err(1, "getperrname");
-    k_getsockinst(rem, inst, sizeof(inst));
-    opts = KOPT_DO_MUTUAL;
-    if ((status = krb_recvauth(opts, rem, &ticket, SERVICE_NAME, inst,
-			       &foreign, &local, 
-			       &kdata, "", schedule, v)) != KSUCCESS)
-	errx(1, "krb_recvauth failure: %s", krb_get_err_text(status));
-}
-
-static int
-des_read(int fd, char *buf, int len)
-{
-    if (doencrypt)
-	return(des_enc_read(fd, buf, len, schedule, 
-			    (iamremote? &kdata.session : &cred.session)));
-    else
-	return(read(fd, buf, len));
-}
-
-static int
-des_write(int fd, char *buf, int len)
-{
-    if (doencrypt)
-	return(des_enc_write(fd, buf, len, schedule, 
-			     (iamremote? &kdata.session : &cred.session)));
-    else
-	return(write(fd, buf, len));
-}
-
-static void run_err(const char *fmt, ...)
-#ifdef __GNUC__
-__attribute__ ((format (printf, 1, 2)))
-#endif
-;
-
-
-static void
-run_err(const char *fmt, ...)
-{
-	char errbuf[1024];
-
-	va_list args;
-	va_start(args, fmt);
-	++errs;
-#define RCPERR "\001rcp: "
-	strcpy (errbuf, RCPERR);
-	vsnprintf (errbuf + strlen(RCPERR), sizeof(errbuf) - strlen(RCPERR),
-		   fmt, args);
-	strcat (errbuf, "\n");
-	des_write (rem, errbuf, strlen(errbuf));
-	if (!iamremote)
-		vwarnx(fmt, args);
-	va_end(args);
-}
-
-static void
-verifydir(char *cp)
-{
-	struct stat stb;
-
-	if (!stat(cp, &stb)) {
-		if (S_ISDIR(stb.st_mode))
-			return;
-		errno = ENOTDIR;
-	}
-	run_err("%s: %s", cp, strerror(errno));
-	exit(1);
-}
-
-#define ROUNDUP(x, y)   ((((x)+((y)-1))/(y))*(y))
-
-static BUF *
-allocbuf(BUF *bp, int fd, int blksize)
-{
-	struct stat stb;
-	size_t size;
-
-	if (fstat(fd, &stb) < 0) {
-		run_err("fstat: %s", strerror(errno));
-		return (0);
-	}
-#ifdef HAVE_ST_BLKSIZE
-	size = ROUNDUP(stb.st_blksize, blksize);
-#else
-	size = blksize;
-#endif
-	if (size == 0)
-		size = blksize;
-	if (bp->cnt >= size)
-		return (bp);
-	if (bp->buf == NULL)
-		bp->buf = malloc(size);
-	else
-		bp->buf = realloc(bp->buf, size);
-	if (bp->buf == NULL) {
-		bp->cnt = 0;
-		run_err("%s", strerror(errno));
-		return (0);
-	}
-	bp->cnt = size;
-	return (bp);
-}
-
-static void
-usage(void)
-{
-	fprintf(stderr, "%s\n\t%s\n",
-	    "usage: rcp [-Kpx] [-k realm] f1 f2",
-	    "or: rcp [-Kprx] [-k realm] f1 ... fn directory");
-	exit(1);
-}
-
-static void
-oldw(const char *s)
-{
-    char *rstar_no_warn = getenv("RSTAR_NO_WARN");
-    if (rstar_no_warn == 0)
-	rstar_no_warn = "";
-    if (strncmp(rstar_no_warn, "yes", 3) != 0)
-	warnx("%s, using standard rcp", s);
-}
-
-static RETSIGTYPE
-lostconn(int signo)
-{
-	if (!iamremote)
-		warnx("lost connection");
-	exit(1);
-}
-
-static int
-response(void)
-{
-	char ch, *cp, resp, rbuf[BUFSIZ];
-
-	if (des_read(rem, &resp, sizeof(resp)) != sizeof(resp))
-		lostconn(0);
-
-	cp = rbuf;
-	switch(resp) {
-	case 0:				/* ok */
-		return (0);
-	default:
-		*cp++ = resp;
-		/* FALLTHROUGH */
-	case 1:				/* error, followed by error msg */
-	case 2:				/* fatal error, "" */
-		do {
-			if (des_read(rem, &ch, sizeof(ch)) != sizeof(ch))
-				lostconn(0);
-			*cp++ = ch;
-		} while (cp < &rbuf[BUFSIZ] && ch != '\n');
-
-		if (!iamremote)
-			write(STDERR_FILENO, rbuf, cp - rbuf);
-		++errs;
-		if (resp == 1)
-			return (-1);
-		exit(1);
-	}
-	/* NOTREACHED */
-}
-
-static void
-source(int argc, char **argv)
-{
-	struct stat stb;
-	static BUF buffer;
-	BUF *bp;
-	off_t i;
-	int amt, fd, haderr, indx, result;
-	char *last, *name, buf[BUFSIZ];
-
-	for (indx = 0; indx < argc; ++indx) {
-                name = argv[indx];
-		if ((fd = open(name, O_RDONLY, 0)) < 0)
-			goto syserr;
-		if (fstat(fd, &stb)) {
-syserr:			run_err("%s: %s", name, strerror(errno));
-			goto next;
-		}
-		switch (stb.st_mode & S_IFMT) {
-		case S_IFREG:
-			break;
-		case S_IFDIR:
-			if (iamrecursive) {
-				rsource(name, &stb);
-				goto next;
-			}
-			/* FALLTHROUGH */
-		default:
-			run_err("%s: not a regular file", name);
-			goto next;
-		}
-		if ((last = strrchr(name, '/')) == NULL)
-			last = name;
-		else
-			++last;
-		if (pflag) {
-			/*
-			 * Make it compatible with possible future
-			 * versions expecting microseconds.
-			 */
-			snprintf(buf, sizeof(buf), "T%ld 0 %ld 0\n",
-			    (long)stb.st_mtime, (long)stb.st_atime);
-			des_write(rem, buf, strlen(buf));
-			if (response() < 0)
-				goto next;
-		}
-		snprintf(buf, sizeof(buf), "C%04o %ld %s\n",
-		    (int)stb.st_mode & MODEMASK, (long) stb.st_size, last);
-		des_write(rem, buf, strlen(buf));
-		if (response() < 0)
-			goto next;
-		if ((bp = allocbuf(&buffer, fd, BUFSIZ)) == NULL) {
-next:			close(fd);
-			continue;
-		}
-
-		/* Keep writing after an error so that we stay sync'd up. */
-		for (haderr = i = 0; i < stb.st_size; i += bp->cnt) {
-			amt = bp->cnt;
-			if (i + amt > stb.st_size)
-				amt = stb.st_size - i;
-			if (!haderr) {
-				result = read(fd, bp->buf, amt);
-				if (result != amt)
-					haderr = result >= 0 ? EIO : errno;
-			}
-			if (haderr)
-				des_write(rem, bp->buf, amt);
-			else {
-				result = des_write(rem, bp->buf, amt);
-				if (result != amt)
-					haderr = result >= 0 ? EIO : errno;
-			}
-		}
-		if (close(fd) && !haderr)
-			haderr = errno;
-		if (!haderr)
-			des_write(rem, "", 1);
-		else
-			run_err("%s: %s", name, strerror(haderr));
-		response();
-	}
-}
-
-void
-rsource(char *name, struct stat *statp)
-{
-	DIR *dirp;
-	struct dirent *dp;
-	char *last, *vect[1], path[MaxPathLen];
-
-	if (!(dirp = opendir(name))) {
-		run_err("%s: %s", name, strerror(errno));
-		return;
-	}
-	last = strrchr(name, '/');
-	if (last == 0)
-		last = name;
-	else
-		last++;
-	if (pflag) {
-		snprintf(path, sizeof(path), "T%ld 0 %ld 0\n",
-		    (long)statp->st_mtime, (long)statp->st_atime);
-		des_write(rem, path, strlen(path));
-		if (response() < 0) {
-			closedir(dirp);
-			return;
-		}
-	}
-	snprintf(path, sizeof(path),
-		 "D%04o %d %s\n", (int)statp->st_mode & MODEMASK, 0, last);
-	des_write(rem, path, strlen(path));
-	if (response() < 0) {
-		closedir(dirp);
-		return;
-	}
-	while ((dp = readdir(dirp))) {
-		if (dp->d_ino == 0)
-			continue;
-		if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, ".."))
-			continue;
-		if (strlen(name) + 1 + strlen(dp->d_name) >= MaxPathLen - 1) {
-			run_err("%s/%s: name too long", name, dp->d_name);
-			continue;
-		}
-		if (snprintf(path, sizeof(path),
-			     "%s/%s", name, dp->d_name) >= sizeof(path)) {
-			run_err("%s/%s: name too long", name, dp->d_name);
-			continue;
-		}
-		vect[0] = path;
-		source(1, vect);
-	}
-	closedir(dirp);
-	des_write(rem, "E\n", 2);
-	response();
-}
-
-static int
-kerberos(char **host, char *bp, char *locuser, char *user)
-{
-        int sock = -1, err;
-again:
-	if (use_kerberos) {
-		rem = KSUCCESS;
-		errno = 0;
-		if (dest_realm == NULL)
-			dest_realm = krb_realmofhost(*host);
-
-#if 0
-		rem = krcmd(host, port, user, bp, 0, dest_realm);
-#else
-		err = kcmd(
-		    &sock,
-		    host,
-		    port,
-		    NULL,	/* locuser not used */
-		    user,
-		    bp,
-		    0,
-		    &ticket,
-		    SERVICE_NAME,
-		    dest_realm,
-		    (CREDENTIALS *) NULL, /* credentials not used */
-		    0,		/* key schedule not used */
-		    (MSG_DAT *) NULL, /* MSG_DAT not used */
-		    (struct sockaddr_in *) NULL, /* local addr not used */
-		    (struct sockaddr_in *) NULL, /* foreign addr not used */
-		    0L);	/* authopts */
-		if (err > KSUCCESS && err < MAX_KRB_ERRORS) {
-		    warnx("kcmd: %s", krb_get_err_text(err));
-		    rem = -1;
-		} else if (err < 0)
-		    rem = -1;
-		else
-		    rem = sock;
-#endif
-		if (rem < 0) {
-			use_kerberos = 0;
-			port = get_shell_port(use_kerberos, 0);
-			if (errno == ECONNREFUSED)
-			    oldw("remote host doesn't support Kerberos");
-			else if (errno == ENOENT)
-			    oldw("can't provide Kerberos authentication data");
-			goto again;
-		}
-	} else {
-		if (doencrypt)
-			errx(1,
-			   "the -x option requires Kerberos authentication");
-		if (geteuid() != 0) {
-		    errx(1, "not installed setuid root, "
-			 "only root may use non kerberized rcp");
-		}
-		rem = rcmd(host, port, locuser, user, bp, 0);
-	}
-	return (rem);
-}
-
-static void
-toremote(char *targ, int argc, char **argv)
-{
-	int i, len;
-#ifdef IP_TOS
-	int tos;
-#endif
-	char *bp, *host, *src, *suser, *thost, *tuser;
-
-	*targ++ = 0;
-	if (*targ == 0)
-		targ = ".";
-
-	if ((thost = strchr(argv[argc - 1], '@'))) {
-		/* user@host */
-		*thost++ = 0;
-		tuser = argv[argc - 1];
-		if (*tuser == '\0')
-			tuser = NULL;
-		else if (!okname(tuser))
-			exit(1);
-	} else {
-		thost = argv[argc - 1];
-		tuser = NULL;
-	}
-
-	for (i = 0; i < argc - 1; i++) {
-		src = colon(argv[i]);
-		if (src) {			/* remote to remote */
-			*src++ = 0;
-			if (*src == 0)
-				src = ".";
-			host = strchr(argv[i], '@');
-			len = strlen(_PATH_RSH) + strlen(argv[i]) +
-			    strlen(src) + (tuser ? strlen(tuser) : 0) +
-			    strlen(thost) + strlen(targ) + CMDNEEDS + 20;
-			if (!(bp = malloc(len)))
-				err(1, " ");
-			if (host) {
-				*host++ = 0;
-				suser = argv[i];
-				if (*suser == '\0')
-					suser = pwd->pw_name;
-				else if (!okname(suser))
-					continue;
-				snprintf(bp, len,
-					 "%s %s -l %s -n %s %s '%s%s%s:%s'",
-					 _PATH_RSH, host, suser, cmd, src,
-					 tuser ? tuser : "", tuser ? "@" : "",
-					 thost, targ);
-			} else
-				snprintf(bp, len,
-					 "exec %s %s -n %s %s '%s%s%s:%s'",
-					 _PATH_RSH, argv[i], cmd, src,
-					 tuser ? tuser : "", tuser ? "@" : "",
-					 thost, targ);
-			susystem(bp, userid);
-			free(bp);
-		} else {			/* local to remote */
-			if (rem == -1) {
-				len = strlen(targ) + CMDNEEDS + 20;
-				if (!(bp = malloc(len)))
-					err(1, " ");
-				snprintf(bp, len, "%s -t %s", cmd, targ);
-				host = thost;
-				if (use_kerberos)
-					rem = kerberos(&host, bp,
-#ifdef __CYGWIN32__
-						       tuser,
-#else
-					    pwd->pw_name,
-#endif
-					    tuser ? tuser : pwd->pw_name);
-				else
-					rem = rcmd(&host, port,
-#ifdef __CYGWIN32__
-						   tuser,
-#else
-						   pwd->pw_name,
-#endif
-					    tuser ? tuser : pwd->pw_name,
-					    bp, 0);
-				if (rem < 0)
-					exit(1);
-#if defined(IP_TOS) && defined(HAVE_SETSOCKOPT)
-				tos = IPTOS_THROUGHPUT;
-				if (setsockopt(rem, IPPROTO_IP, IP_TOS,
-				    (void *)&tos, sizeof(int)) < 0)
-					warn("TOS (ignored)");
-#endif /* IP_TOS */
-				if (doencrypt)
-				    send_auth(host, dest_realm);
-				if (response() < 0)
-					exit(1);
-				free(bp);
-				setuid(userid);
-			}
-			source(1, argv+i);
-		}
-	}
-}
-
-static void
-sink(int argc, char **argv)
-{
-	static BUF buffer;
-	struct stat stb;
-	struct timeval tv[2];
-	enum { YES, NO, DISPLAYED } wrerr;
-	BUF *bp;
-	off_t i, j;
-	int amt, count, exists, first, mask, mode, ofd, omode;
-	int setimes, size, targisdir, wrerrno=0;
-	char ch, *cp, *np, *targ, *why, *vect[1], buf[BUFSIZ];
-
-#define	atime	tv[0]
-#define	mtime	tv[1]
-#define	SCREWUP(str)	{ why = str; goto screwup; }
-
-	setimes = targisdir = 0;
-	mask = umask(0);
-	if (!pflag)
-		umask(mask);
-	if (argc != 1) {
-		run_err("ambiguous target");
-		exit(1);
-	}
-	targ = *argv;
-	if (targetshouldbedirectory)
-		verifydir(targ);
-	des_write(rem, "", 1);
-	if (stat(targ, &stb) == 0 && S_ISDIR(stb.st_mode))
-		targisdir = 1;
-	for (first = 1;; first = 0) {
-		cp = buf;
-		if (des_read(rem, cp, 1) <= 0)
-			return;
-		if (*cp++ == '\n')
-			SCREWUP("unexpected <newline>");
-		do {
-			if (des_read(rem, &ch, sizeof(ch)) != sizeof(ch))
-				SCREWUP("lost connection");
-			*cp++ = ch;
-		} while (cp < &buf[BUFSIZ - 1] && ch != '\n');
-		*cp = 0;
-
-		if (buf[0] == '\01' || buf[0] == '\02') {
-			if (iamremote == 0)
-				write(STDERR_FILENO,
-				    buf + 1, strlen(buf + 1));
-			if (buf[0] == '\02')
-				exit(1);
-			++errs;
-			continue;
-		}
-		if (buf[0] == 'E') {
-			des_write(rem, "", 1);
-			return;
-		}
-
-		if (ch == '\n')
-			*--cp = 0;
-
-#define getnum(t) (t) = 0; while (isdigit(*cp)) (t) = (t) * 10 + (*cp++ - '0');
-		cp = buf;
-		if (*cp == 'T') {
-			setimes++;
-			cp++;
-			getnum(mtime.tv_sec);
-			if (*cp++ != ' ')
-				SCREWUP("mtime.sec not delimited");
-			getnum(mtime.tv_usec);
-			if (*cp++ != ' ')
-				SCREWUP("mtime.usec not delimited");
-			getnum(atime.tv_sec);
-			if (*cp++ != ' ')
-				SCREWUP("atime.sec not delimited");
-			getnum(atime.tv_usec);
-			if (*cp++ != '\0')
-				SCREWUP("atime.usec not delimited");
-			des_write(rem, "", 1);
-			continue;
-		}
-		if (*cp != 'C' && *cp != 'D') {
-			/*
-			 * Check for the case "rcp remote:foo\* local:bar".
-			 * In this case, the line "No match." can be returned
-			 * by the shell before the rcp command on the remote is
-			 * executed so the ^Aerror_message convention isn't
-			 * followed.
-			 */
-			if (first) {
-				run_err("%s", cp);
-				exit(1);
-			}
-			SCREWUP("expected control record");
-		}
-		mode = 0;
-		for (++cp; cp < buf + 5; cp++) {
-			if (*cp < '0' || *cp > '7')
-				SCREWUP("bad mode");
-			mode = (mode << 3) | (*cp - '0');
-		}
-		if (*cp++ != ' ')
-			SCREWUP("mode not delimited");
-
-		for (size = 0; isdigit(*cp);)
-			size = size * 10 + (*cp++ - '0');
-		if (*cp++ != ' ')
-			SCREWUP("size not delimited");
-		if (targisdir) {
-			static char *namebuf;
-			static int cursize;
-			size_t need;
-
-			need = strlen(targ) + strlen(cp) + 250;
-			if (need > cursize) {
-				if (!(namebuf = malloc(need)))
-					run_err("%s", strerror(errno));
-			}
-			snprintf(namebuf, need, "%s%s%s", targ,
-			    *targ ? "/" : "", cp);
-			np = namebuf;
-		} else
-			np = targ;
-		exists = stat(np, &stb) == 0;
-		if (buf[0] == 'D') {
-			int mod_flag = pflag;
-			if (exists) {
-				if (!S_ISDIR(stb.st_mode)) {
-					errno = ENOTDIR;
-					goto bad;
-				}
-				if (pflag)
-					chmod(np, mode);
-			} else {
-				/* Handle copying from a read-only directory */
-				mod_flag = 1;
-				if (mkdir(np, mode | S_IRWXU) < 0)
-					goto bad;
-			}
-			vect[0] = np;
-			sink(1, vect);
-			if (setimes) {
-			        struct utimbuf times;
-				times.actime = atime.tv_sec;
-				times.modtime = mtime.tv_sec;
-				setimes = 0;
-				if (utime(np, &times) < 0)
-				    run_err("%s: set times: %s",
-					    np, strerror(errno));
-			}
-			if (mod_flag)
-				chmod(np, mode);
-			continue;
-		}
-		omode = mode;
-		mode |= S_IWRITE;
-		if ((ofd = open(np, O_WRONLY|O_CREAT, mode)) < 0) {
-bad:			run_err("%s: %s", np, strerror(errno));
-			continue;
-		}
-		des_write(rem, "", 1);
-		if ((bp = allocbuf(&buffer, ofd, BUFSIZ)) == NULL) {
-			close(ofd);
-			continue;
-		}
-		cp = bp->buf;
-		wrerr = NO;
-		for (count = i = 0; i < size; i += BUFSIZ) {
-			amt = BUFSIZ;
-			if (i + amt > size)
-				amt = size - i;
-			count += amt;
-			do {
-				j = des_read(rem, cp, amt);
-				if (j <= 0) {
-					run_err("%s", j ? strerror(errno) :
-						"dropped connection");
-					exit(1);
-				}
-				amt -= j;
-				cp += j;
-			} while (amt > 0);
-			if (count == bp->cnt) {
-				/* Keep reading so we stay sync'd up. */
-				if (wrerr == NO) {
-					j = write(ofd, bp->buf, count);
-					if (j != count) {
-						wrerr = YES;
-						wrerrno = j >= 0 ? EIO : errno; 
-					}
-				}
-				count = 0;
-				cp = bp->buf;
-			}
-		}
-		if (count != 0 && wrerr == NO &&
-		    (j = write(ofd, bp->buf, count)) != count) {
-			wrerr = YES;
-			wrerrno = j >= 0 ? EIO : errno; 
-		}
-		if (ftruncate(ofd, size)) {
-			run_err("%s: truncate: %s", np, strerror(errno));
-			wrerr = DISPLAYED;
-		}
-		if (pflag) {
-			if (exists || omode != mode)
-#ifdef HAVE_FCHMOD
-				if (fchmod(ofd, omode))
-#else
-				if (chmod(np, omode))
-#endif
-					run_err("%s: set mode: %s",
-						np, strerror(errno));
-		} else {
-			if (!exists && omode != mode)
-#ifdef HAVE_FCHMOD
-				if (fchmod(ofd, omode & ~mask))
-#else
-				if (chmod(np, omode & ~mask))
-#endif
-					run_err("%s: set mode: %s",
-						np, strerror(errno));
-		}
-		close(ofd);
-		response();
-		if (setimes && wrerr == NO) {
-		        struct utimbuf times;
-			times.actime = atime.tv_sec;
-			times.modtime = mtime.tv_sec;
-			setimes = 0;
-			if (utime(np, &times) < 0) {
-				run_err("%s: set times: %s",
-					np, strerror(errno));
-				wrerr = DISPLAYED;
-			}
-		}
-		switch(wrerr) {
-		case YES:
-			run_err("%s: %s", np, strerror(wrerrno));
-			break;
-		case NO:
-			des_write(rem, "", 1);
-			break;
-		case DISPLAYED:
-			break;
-		}
-	}
-screwup:
-	run_err("protocol error: %s", why);
-	exit(1);
-}
-
-static void
-tolocal(int argc, char **argv)
-{
-	int i, len;
-#ifdef IP_TOS
-	int tos;
-#endif
-	char *bp, *host, *src, *suser;
-
-	for (i = 0; i < argc - 1; i++) {
-		if (!(src = colon(argv[i]))) {		/* Local to local. */
-			len = strlen(_PATH_CP) + strlen(argv[i]) +
-			    strlen(argv[argc - 1]) + 20;
-			if (!(bp = malloc(len)))
-				err(1, " ");
-			snprintf(bp, len, "exec %s%s%s %s %s", _PATH_CP,
-				 iamrecursive ? " -r" : "", pflag ? " -p" : "",
-				 argv[i], argv[argc - 1]);
-			if (susystem(bp, userid))
-				++errs;
-			free(bp);
-			continue;
-		}
-		*src++ = 0;
-		if (*src == 0)
-			src = ".";
-		if ((host = strchr(argv[i], '@')) == NULL) {
-#ifdef __CYGWIN32__
-			errx (1, "Sorry, you need to specify the username");
-#else
-			host = argv[i];
-			suser = pwd->pw_name;
-#endif
-		} else {
-			*host++ = 0;
-			suser = argv[i];
-			if (*suser == '\0')
-#ifdef __CYGWIN32__
-			errx (1, "Sorry, you need to specify the username");
-#else
-				suser = pwd->pw_name;
-#endif
-			else if (!okname(suser))
-				continue;
-		}
-		len = strlen(src) + CMDNEEDS + 20;
-		if ((bp = malloc(len)) == NULL)
-			err(1, " ");
-		snprintf(bp, len, "%s -f %s", cmd, src);
-		rem = 
-		    use_kerberos ? 
-			kerberos(&host, bp,
-#ifndef __CYGWIN32__
-				 pwd->pw_name,
-#else
-				 suser,
-#endif
-				 suser) : 
-			rcmd(&host, port,
-#ifndef __CYGWIN32__
-			     pwd->pw_name,
-#else
-			     suser,
-#endif
-			     suser, bp, 0);
-		free(bp);
-		if (rem < 0) {
-			++errs;
-			continue;
-		}
-		seteuid(userid);
-#if defined(IP_TOS) && defined(HAVE_SETSOCKOPT)
-		tos = IPTOS_THROUGHPUT;
-		if (setsockopt(rem, IPPROTO_IP, IP_TOS, (void *)&tos,
-			       sizeof(int)) < 0)
-			warn("TOS (ignored)");
-#endif /* IP_TOS */
-		if (doencrypt)
-			send_auth(host, dest_realm);
-		sink(1, argv + argc - 1);
-		seteuid(0);
-		close(rem);
-		rem = -1;
-	}
-}
-
-
-int
-main(int argc, char **argv)
-{
-	int ch, fflag, tflag;
-	char *targ;
-
-	set_progname(argv[0]);
-	fflag = tflag = 0;
-	while ((ch = getopt(argc, argv, OPTIONS)) != EOF)
-		switch(ch) {			/* User-visible flags. */
-		case 'K':
-			use_kerberos = 0;
-			break;
-		case 'k':
-			dest_realm = dst_realm_buf;
-			strncpy(dst_realm_buf, optarg, REALM_SZ);
-			break;
-		case 'x':
-			doencrypt = 1;
-			LEFT_JUSTIFIED = 1;
-			break;
-		case 'p':
-			pflag = 1;
-			break;
-		case 'r':
-			iamrecursive = 1;
-			break;
-						/* Server options. */
-		case 'd':
-			targetshouldbedirectory = 1;
-			break;
-		case 'f':			/* "from" */
-			iamremote = 1;
-			fflag = 1;
-			break;
-		case 't':			/* "to" */
-			iamremote = 1;
-			tflag = 1;
-			break;
-		case '?':
-		default:
-			usage();
-		}
-	argc -= optind;
-	argv += optind;
-
-	/* Rcp implements encrypted file transfer without using the
-	 * kshell service, pass 0 for no encryption */
-	port = get_shell_port(use_kerberos, 0);
-
-#ifndef __CYGWIN32__
-	if ((pwd = k_getpwuid(userid = getuid())) == NULL)
-		errx(1, "unknown user %d", (int)userid);
-#endif
-
-	rem = STDIN_FILENO;		/* XXX */
-
-	if (fflag) {			/* Follow "protocol", send data. */
-		if (doencrypt)
-			answer_auth();
-		response();
-		setuid(userid);
-		if (k_hasafs()) {
-		       /* Sometimes we will need cell specific tokens
-			* to be able to read and write files, thus,
-			* the token stuff done in rshd might not
-			* suffice.
-			*/
-			char cell[64];
-			if (k_afs_cell_of_file(pwd->pw_dir,
-					       cell, sizeof(cell)) == 0)
-				k_afsklog(cell, 0);
-			k_afsklog(0, 0);
-		}
-		source(argc, argv);
-		exit(errs);
-	}
-
-	if (tflag) {			/* Receive data. */
-		if (doencrypt)
-			answer_auth();
-		setuid(userid);
-		if (k_hasafs()) {
-			char cell[64];
-			if (k_afs_cell_of_file(pwd->pw_dir,
-					       cell, sizeof(cell)) == 0)
-				k_afsklog(cell, 0);
-			k_afsklog(0, 0);
-		}
-		sink(argc, argv);
-		exit(errs);
-	}
-
-	if (argc < 2)
-		usage();
-	if (argc > 2)
-		targetshouldbedirectory = 1;
-
-	rem = -1;
-	/* Command to be executed on remote system using "rsh". */
-	snprintf(cmd, sizeof(cmd),
-		 "rcp%s%s%s%s", iamrecursive ? " -r" : "",
-		 (doencrypt && use_kerberos ? " -x" : ""),
-		 pflag ? " -p" : "", targetshouldbedirectory ? " -d" : "");
-
-	signal(SIGPIPE, lostconn);
-
-	if ((targ = colon(argv[argc - 1])))	/* Dest is remote host. */
-		toremote(targ, argc, argv);
-	else {
-		tolocal(argc, argv);		/* Dest is local host. */
-		if (targetshouldbedirectory)
-			verifydir(argv[argc - 1]);
-	}
-	exit(errs);
-}
diff --git a/crypto/kerberosIV/appl/bsd/rcp_util.c b/crypto/kerberosIV/appl/bsd/rcp_util.c
deleted file mode 100644
index 6f0c5f06ea06..000000000000
--- a/crypto/kerberosIV/appl/bsd/rcp_util.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "bsd_locl.h"
-
-RCSID("$Id: rcp_util.c,v 1.7 1996/11/17 20:23:05 assar Exp $");
-
-char *
-colon(char *cp)
-{
-	if (*cp == ':')		/* Leading colon is part of file name. */
-		return (0);
-
-	for (; *cp; ++cp) {
-		if (*cp == ':')
-			return (cp);
-		if (*cp == '/')
-			return (0);
-	}
-	return (0);
-}
-
-int
-okname(char *cp0)
-{
-	int c;
-	char *cp;
-
-	cp = cp0;
-	do {
-		c = *cp;
-		if (c & 0200)
-			goto bad;
-		if (!isalpha(c) && !isdigit(c) && c != '_' && c != '-')
-			goto bad;
-	} while (*++cp);
-	return (1);
-
-bad:	warnx("%s: invalid user name", cp0);
-	return (0);
-}
-
-int
-susystem(char *s, int userid)
-{
-        RETSIGTYPE (*istat)(), (*qstat)();
-	int status;
-	pid_t pid;
-
-	pid = fork();
-	switch (pid) {
-	case -1:
-		return (127);
-	
-	case 0:
-		setuid(userid);
-		execl(_PATH_BSHELL, "sh", "-c", s, NULL);
-		_exit(127);
-	}
-	istat = signal(SIGINT, SIG_IGN);
-	qstat = signal(SIGQUIT, SIG_IGN);
-	if (waitpid(pid, &status, 0) < 0)
-		status = -1;
-	signal(SIGINT, istat);
-	signal(SIGQUIT, qstat);
-	return (status);
-}
diff --git a/crypto/kerberosIV/appl/bsd/rlogin.c b/crypto/kerberosIV/appl/bsd/rlogin.c
deleted file mode 100644
index 27aa8f032d37..000000000000
--- a/crypto/kerberosIV/appl/bsd/rlogin.c
+++ /dev/null
@@ -1,707 +0,0 @@
-/*
- * Copyright (c) 1983, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * rlogin - remote login
- */
-#include "bsd_locl.h"
-
-RCSID("$Id: rlogin.c,v 1.61 1997/05/25 01:14:47 assar Exp $");
-
-CREDENTIALS cred;
-Key_schedule schedule;
-int use_kerberos = 1, doencrypt;
-char dst_realm_buf[REALM_SZ], *dest_realm = NULL;
-
-#ifndef CCEQ
-#define c2uc(x) ((unsigned char) x)
-#define CCEQ__(val, c)	(c == val ? val != c2uc(_POSIX_VDISABLE) : 0)
-#define CCEQ(val, c) CCEQ__(c2uc(val), c2uc(c))
-#endif
-
-int eight, rem;
-struct termios deftty;
-
-int noescape;
-char escapechar = '~';
-
-struct	winsize winsize;
-
-int parent, rcvcnt;
-char rcvbuf[8 * 1024];
-
-int child;
-
-static void
-echo(char c)
-{
-	char *p;
-	char buf[8];
-
-	p = buf;
-	c &= 0177;
-	*p++ = escapechar;
-	if (c < ' ') {
-		*p++ = '^';
-		*p++ = c + '@';
-	} else if (c == 0177) {
-		*p++ = '^';
-		*p++ = '?';
-	} else
-		*p++ = c;
-	*p++ = '\r';
-	*p++ = '\n';
-	write(STDOUT_FILENO, buf, p - buf);
-}
-
-static void
-mode(int f)
-{
-	struct termios tty;
-
-	switch (f) {
-	case 0:
-		tcsetattr(0, TCSANOW, &deftty);
-		break;
-	case 1:
-		tcgetattr(0, &deftty);
-		tty = deftty;
-		/* This is loosely derived from sys/compat/tty_compat.c. */
-		tty.c_lflag &= ~(ECHO|ICANON|ISIG|IEXTEN);
-		tty.c_iflag &= ~ICRNL;
-		tty.c_oflag &= ~OPOST;
-		tty.c_cc[VMIN] = 1;
-		tty.c_cc[VTIME] = 0;
-		if (eight) {
-			tty.c_iflag &= IXOFF;
-			tty.c_cflag &= ~(CSIZE|PARENB);
-			tty.c_cflag |= CS8;
-		}
-		tcsetattr(0, TCSANOW, &tty);
-		break;
-	default:
-		return;
-	}
-}
-
-static void
-done(int status)
-{
-	int w, wstatus;
-
-	mode(0);
-	if (child > 0) {
-		/* make sure catch_child does not snap it up */
-		signal(SIGCHLD, SIG_DFL);
-		if (kill(child, SIGKILL) >= 0)
-			while ((w = wait(&wstatus)) > 0 && w != child);
-	}
-	exit(status);
-}
-
-static
-RETSIGTYPE
-catch_child(int foo)
-{
-	int status;
-	int pid;
-
-	for (;;) {
-		pid = waitpid(-1, &status, WNOHANG|WUNTRACED);
-		if (pid == 0)
-			return;
-		/* if the child (reader) dies, just quit */
-		if (pid < 0 || (pid == child && !WIFSTOPPED(status)))
-			done(WTERMSIG(status) | WEXITSTATUS(status));
-	}
-	/* NOTREACHED */
-}
-
-/*
- * There is a race in the SunOS5 rlogind. If the slave end has not yet
- * been opened by the child when setting tty size the size is reset to
- * zero when the child opens it. Therefore we send the window update
- * twice.
- */
-
-static int tty_kludge = 1;
-
-/* Return the number of OOB bytes processed. */
-static int
-oob_real(void)
-{
-	struct termios tty;
-	int atmark, n, out, rcvd;
-	char waste[BUFSIZ], mark;
-
-	out = O_RDWR;
-	rcvd = 0;
-	if (recv(rem, &mark, 1, MSG_OOB) < 0) {
-		return -1;
-	}
-	if (mark & TIOCPKT_WINDOW) {
-		/* Let server know about window size changes */
-		kill(parent, SIGUSR1);
-	} else if (tty_kludge) {
-		/* Let server know about window size changes */
-		kill(parent, SIGUSR1);
-		tty_kludge = 0;
-	}
-	if (!eight && (mark & TIOCPKT_NOSTOP)) {
-		tcgetattr(0, &tty);
-		tty.c_iflag &= ~IXON;
-		tcsetattr(0, TCSANOW, &tty);
-	}
-	if (!eight && (mark & TIOCPKT_DOSTOP)) {
-		tcgetattr(0, &tty);
-		tty.c_iflag |= (deftty.c_iflag & IXON);
-		tcsetattr(0, TCSANOW, &tty);
-	}
-	if (mark & TIOCPKT_FLUSHWRITE) {
-#ifdef TCOFLUSH
-		tcflush(1, TCOFLUSH);
-#else
-		ioctl(1, TIOCFLUSH, (char *)&out);
-#endif
-		for (;;) {
-			if (ioctl(rem, SIOCATMARK, &atmark) < 0) {
-			    warn("ioctl");
-			    break;
-			}
-			if (atmark)
-				break;
-			n = read(rem, waste, sizeof (waste));
-			if (n <= 0)
-				break;
-		}
-		/*
-		 * Don't want any pending data to be output, so clear the recv
-		 * buffer.  If we were hanging on a write when interrupted,
-		 * don't want it to restart.  If we were reading, restart
-		 * anyway.
-		 */
-		rcvcnt = 0;
-	}
-
-	/* oob does not do FLUSHREAD (alas!) */
-	return 1;
-}
-
-/* reader: read from remote: line -> 1 */
-static int
-reader(void)
-{
-	int n, remaining;
-	char *bufp;
-	int kludgep = 1;
-
-	bufp = rcvbuf;
-	for (;;) {
-	        fd_set readfds, exceptfds;
-		while ((remaining = rcvcnt - (bufp - rcvbuf)) > 0) {
-			n = write(STDOUT_FILENO, bufp, remaining);
-			if (n < 0) {
-				if (errno != EINTR)
-					return (-1);
-				continue;
-			}
-			bufp += n;
-		}
-		bufp = rcvbuf;
-		rcvcnt = 0;
-
-		FD_ZERO (&readfds);
-		FD_SET (rem, &readfds);
-		FD_ZERO (&exceptfds);
-		if (kludgep)
-		  FD_SET (rem, &exceptfds);
-		if (select(rem+1, &readfds, 0, &exceptfds, 0) == -1) {
-		    if (errno == EINTR)
-			continue; /* Got signal */
-		    else
-			errx(1, "select failed mysteriously");
-		}
-
-		if (!FD_ISSET(rem, &exceptfds) && !FD_ISSET(rem, &readfds)) {
-		    warnx("select: nothing to read?");
-		    continue;
-		  }
-
-		if (FD_ISSET(rem, &exceptfds)) {
-		  int foo = oob_real ();
-		  if (foo >= 1)
-		    continue;	/* First check if there is more OOB data. */
-		  else if (foo < 0)
-		    kludgep = 0;
-		}
-
-		if (!FD_ISSET(rem, &readfds))
-		    continue;	/* Nothing to read. */
-
-		kludgep = 1;
-#ifndef NOENCRYPTION
-		if (doencrypt)
-			rcvcnt = des_enc_read(rem, rcvbuf,
-					      sizeof(rcvbuf),
-					      schedule, &cred.session);
-		else
-#endif
-			rcvcnt = read(rem, rcvbuf, sizeof (rcvbuf));
-		if (rcvcnt == 0)
-			return (0);
-		if (rcvcnt < 0) {
-			if (errno == EINTR)
-				continue;
-			warn("read");
-			return (-1);
-		}
-	}
-}
-
-/*
- * Send the window size to the server via the magic escape
- */
-static void
-sendwindow(void)
-{
-	char obuf[4 + 4 * sizeof (u_int16_t)];
-	unsigned short *p;
-
-	p = (u_int16_t *)(obuf + 4);
-	obuf[0] = 0377;
-	obuf[1] = 0377;
-	obuf[2] = 's';
-	obuf[3] = 's';
-	*p++ = htons(winsize.ws_row);
-	*p++ = htons(winsize.ws_col);
-#ifdef HAVE_WS_XPIXEL
-	*p++ = htons(winsize.ws_xpixel);
-#else
-	*p++ = htons(0);
-#endif	
-#ifdef HAVE_WS_YPIXEL
-	*p++ = htons(winsize.ws_ypixel);
-#else
-	*p++ = htons(0);
-#endif	
-
-#ifndef NOENCRYPTION
-	if(doencrypt)
-		des_enc_write(rem, obuf, sizeof(obuf), schedule,
-			      &cred.session);
-	else
-#endif
-		write(rem, obuf, sizeof(obuf));
-}
-
-static
-RETSIGTYPE
-sigwinch(int foo)
-{
-	struct winsize ws;
-
-	if (get_window_size(0, &ws) == 0 &&
-	    memcmp(&ws, &winsize, sizeof(ws))) {
-		winsize = ws;
-		sendwindow();
-	}
-}
-
-static void
-stop(int all)
-{
-	mode(0);
-	signal(SIGCHLD, SIG_IGN);
-	kill(all ? 0 : getpid(), SIGTSTP);
-	signal(SIGCHLD, catch_child);
-	mode(1);
-#ifdef SIGWINCH
-	kill(SIGWINCH, getpid()); /* check for size changes, if caught */
-#endif
-}
-
-/*
- * writer: write to remote: 0 -> line.
- * ~.				terminate
- * ~^Z				suspend rlogin process.
- * ~<delayed-suspend char>	suspend rlogin process, but leave reader alone.
- */
-static void
-writer(void)
-{
-	int bol, local, n;
-	char c;
-
-	bol = 1;			/* beginning of line */
-	local = 0;
-	for (;;) {
-		n = read(STDIN_FILENO, &c, 1);
-		if (n <= 0) {
-			if (n < 0 && errno == EINTR)
-				continue;
-			break;
-		}
-		/*
-		 * If we're at the beginning of the line and recognize a
-		 * command character, then we echo locally.  Otherwise,
-		 * characters are echo'd remotely.  If the command character
-		 * is doubled, this acts as a force and local echo is
-		 * suppressed.
-		 */
-		if (bol) {
-			bol = 0;
-			if (!noescape && c == escapechar) {
-				local = 1;
-				continue;
-			}
-		} else if (local) {
-			local = 0;
-			if (c == '.' || CCEQ(deftty.c_cc[VEOF], c)) {
-				echo(c);
-				break;
-			}
-			if (CCEQ(deftty.c_cc[VSUSP], c)) {
-				bol = 1;
-				echo(c);
-				stop(1);
-				continue;
-			}
-#ifdef VDSUSP
-			/* Is VDSUSP called something else on Linux?
-			 * Perhaps VDELAY is a better thing? */		
-			if (CCEQ(deftty.c_cc[VDSUSP], c)) {
-				bol = 1;
-				echo(c);
-				stop(0);
-				continue;
-			}
-#endif /* VDSUSP */
-			if (c != escapechar)
-#ifndef NOENCRYPTION
-				if (doencrypt)
-					des_enc_write(rem, &escapechar,1, schedule, &cred.session);
-				else
-#endif
-					write(rem, &escapechar, 1);
-		}
-
-		if (doencrypt) {
-#ifdef NOENCRYPTION
-			if (write(rem, &c, 1) == 0) {
-#else
-			if (des_enc_write(rem, &c, 1, schedule, &cred.session) == 0) {
-#endif
-				warnx("line gone");
-				break;
-			}
-		} else
-			if (write(rem, &c, 1) == 0) {
-				warnx("line gone");
-				break;
-			}
-		bol = CCEQ(deftty.c_cc[VKILL], c) ||
-		    CCEQ(deftty.c_cc[VEOF], c) ||
-		    CCEQ(deftty.c_cc[VINTR], c) ||
-		    CCEQ(deftty.c_cc[VSUSP], c) ||
-		    c == '\r' || c == '\n';
-	}
-}
-
-static
-RETSIGTYPE
-lostpeer(int foo)
-{
-	signal(SIGPIPE, SIG_IGN);
-	warnx("\aconnection closed.\r");
-	done(1);
-}
-
-/*
- * This is called in the parent when the reader process gets the
- * out-of-band (urgent) request to turn on the window-changing
- * protocol. It is signalled from the child(reader).
- */
-static
-RETSIGTYPE
-sigusr1(int foo)
-{
-        /*
-	 * Now we now daemon supports winsize hack,
-	 */
-	sendwindow();
-#ifdef SIGWINCH
-	signal(SIGWINCH, sigwinch); /* so we start to support it */
-#endif
-	SIGRETURN(0);
-}
-
-static void
-doit(void)
-{
-	signal(SIGINT, SIG_IGN);
-	signal(SIGHUP, SIG_IGN);
-	signal(SIGQUIT, SIG_IGN);
-
-	signal(SIGCHLD, catch_child);
-
-	/*
-	 * Child sends parent this signal for window size hack.
-	 */
-	signal(SIGUSR1, sigusr1);
-
-	signal(SIGPIPE, lostpeer);
-
-	mode(1);
-	parent = getpid();
-	child = fork();
-	if (child == -1) {
-	    warn("fork");
-	    done(1);
-	}
-	if (child == 0) {
-	        signal(SIGCHLD, SIG_IGN);
-	        signal(SIGTTOU, SIG_IGN);
-		if (reader() == 0)
-		    errx(1, "connection closed.\r");
-		sleep(1);
-		errx(1, "\aconnection closed.\r");
-	}
-
-	writer();
-	warnx("closed connection.\r");
-	done(0);
-}
-
-static void
-usage(void)
-{
-    fprintf(stderr,
-	    "usage: rlogin [ -%s]%s[-e char] [ -l username ] host\n",
-	    "8DEKLdx", " [-k realm] ");
-    exit(1);
-}
-
-static u_int
-getescape(char *p)
-{
-	long val;
-	int len;
-
-	if ((len = strlen(p)) == 1)	/* use any single char, including '\' */
-		return ((u_int)*p);
-					/* otherwise, \nnn */
-	if (*p == '\\' && len >= 2 && len <= 4) {
-		val = strtol(++p, NULL, 8);
-		for (;;) {
-			if (!*++p)
-				return ((u_int)val);
-			if (*p < '0' || *p > '8')
-				break;
-		}
-	}
-	warnx("illegal option value -- e");
-	usage();
-	return 0;
-}
-
-int
-main(int argc, char **argv)
-{
-	struct passwd *pw;
-	int sv_port, user_port = 0;
-	int argoff, ch, dflag, Dflag, one, uid;
-	char *host, *user, term[1024];
-
-	argoff = dflag = Dflag = 0;
-	one = 1;
-	host = user = NULL;
-
-	set_progname(argv[0]);
-
-	/* handle "rlogin host flags" */
-	if (argc > 2 && argv[1][0] != '-') {
-	    host = argv[1];
-	    argoff = 1;
-	}
-
-#define	OPTIONS	"8DEKLde:k:l:xp:"
-	while ((ch = getopt(argc - argoff, argv + argoff, OPTIONS)) != EOF)
-		switch(ch) {
-		case '8':
-			eight = 1;
-			break;
-		case 'D':
-		        Dflag = 1;
-			break;
-		case 'E':
-			noescape = 1;
-			break;
-		case 'K':
-			use_kerberos = 0;
-			break;
-		case 'd':
-			dflag = 1;
-			break;
-		case 'e':
-			noescape = 0;
-			escapechar = getescape(optarg);
-			break;
-		case 'k':
-			dest_realm = dst_realm_buf;
-			strncpy(dest_realm, optarg, REALM_SZ);
-			break;
-		case 'l':
-			user = optarg;
-			break;
-		case 'x':
-			doencrypt = 1;
-			break;
-		case 'p':
-			user_port = htons(atoi(optarg));
-			break;
-		case '?':
-		default:
-			usage();
-		}
-	optind += argoff;
-	argc -= optind;
-	argv += optind;
-
-	/* if haven't gotten a host yet, do so */
-	if (!host && !(host = *argv++))
-		usage();
-
-	if (*argv)
-		usage();
-
-	if (!(pw = k_getpwuid(uid = getuid())))
-	    errx(1, "unknown user id.");
-	if (!user)
-	    user = pw->pw_name;
-
-
-	if (user_port)
-		sv_port = user_port;
-	else
-		sv_port = get_login_port(use_kerberos, doencrypt);
-
-	{
-	    char *p = getenv("TERM");
-	    struct termios tty;
-	    int i;
-
-	    if (p == NULL)
-		p = "network";
-
-	    if (tcgetattr(0, &tty) == 0
-		&& (i = speed_t2int (cfgetospeed(&tty))) > 0)
-		snprintf (term, sizeof(term),
-			  "%s/%d",
-			  p, i);
-	    else
-		snprintf (term, sizeof(term),
-			  "%s",
-			  p);
-	}
-
-	get_window_size(0, &winsize);
-
-      try_connect:
-	if (use_kerberos) {
-		struct hostent *hp;
-
-		/* Fully qualify hostname (needed for krb_realmofhost). */
-		hp = gethostbyname(host);
-		if (hp != NULL && !(host = strdup(hp->h_name))) {
-		    errno = ENOMEM;
-		    err(1, NULL);
-		}
-
-		rem = KSUCCESS;
-		errno = 0;
-		if (dest_realm == NULL)
-		    dest_realm = krb_realmofhost(host);
-
-		if (doencrypt)
-		    rem = krcmd_mutual(&host, sv_port, user, term, 0,
-				       dest_realm, &cred, schedule);
-		else
-			rem = krcmd(&host, sv_port, user, term, 0,
-			    dest_realm);
-		if (rem < 0) {
-			use_kerberos = 0;
-			if (user_port == 0)
-				sv_port = get_login_port(use_kerberos,
-							 doencrypt);
-			if (errno == ECONNREFUSED)
-			    warning("remote host doesn't support Kerberos");
-			if (errno == ENOENT)
-			  warning("can't provide Kerberos auth data");
-			goto try_connect;
-		}
-	} else {
-		if (doencrypt)
-		    errx(1, "the -x flag requires Kerberos authentication.");
-		if (geteuid() != 0)
-		    errx(1, "not installed setuid root, "
-			 "only root may use non kerberized rlogin");
-		rem = rcmd(&host, sv_port, pw->pw_name, user, term, 0);
-	}
-	
-	if (rem < 0)
-		exit(1);
-
-#ifdef HAVE_SETSOCKOPT
-#ifdef SO_DEBUG
-	if (dflag &&
-	    setsockopt(rem, SOL_SOCKET, SO_DEBUG, (void *)&one,
-		       sizeof(one)) < 0)
-	    warn("setsockopt");
-#endif
-#ifdef TCP_NODELAY
-	if (Dflag &&
-	    setsockopt(rem, IPPROTO_TCP, TCP_NODELAY, (void *)&one,
-		       sizeof(one)) < 0)
-	    warn("setsockopt(TCP_NODELAY)");
-#endif
-#ifdef IP_TOS
-	one = IPTOS_LOWDELAY;
-	if (setsockopt(rem, IPPROTO_IP, IP_TOS, (void *)&one, sizeof(int)) < 0)
-	    warn("setsockopt(IP_TOS)");
-#endif /* IP_TOS */
-#endif /* HAVE_SETSOCKOPT */
-
-	setuid(uid);
-	doit();
-	return 0;
-}
diff --git a/crypto/kerberosIV/appl/bsd/rlogind.c b/crypto/kerberosIV/appl/bsd/rlogind.c
deleted file mode 100644
index c5d807749675..000000000000
--- a/crypto/kerberosIV/appl/bsd/rlogind.c
+++ /dev/null
@@ -1,934 +0,0 @@
-/*-
- * Copyright (c) 1983, 1988, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * remote login server:
- *	\0
- *	remuser\0
- *	locuser\0
- *	terminal_type/speed\0
- *	data
- */
-
-#include "bsd_locl.h"
-
-RCSID("$Id: rlogind.c,v 1.100 1997/05/25 01:15:20 assar Exp $");
-
-extern int __check_rhosts_file;
-
-char *INSECURE_MESSAGE =
-"\r\n*** Connection not encrypted! Communication may be eavesdropped. ***"
-"\r\n*** Use telnet or rlogin -x instead! ***\r\n";
-
-#ifndef NOENCRYPTION
-char *SECURE_MESSAGE =
-"This rlogin session is using DES encryption for all transmissions.\r\n";
-#else
-#define	SECURE_MESSAGE INSECURE_MESSAGE
-#endif
-
-AUTH_DAT	*kdata;
-KTEXT		ticket;
-u_char		auth_buf[sizeof(AUTH_DAT)];
-u_char		tick_buf[sizeof(KTEXT_ST)];
-Key_schedule	schedule;
-int		doencrypt, retval, use_kerberos, vacuous;
-
-#define		ARGSTR			"Daip:lnkvxL:"
-
-char	*env[2];
-#define	NMAX 30
-char	lusername[NMAX+1], rusername[NMAX+1];
-static	char term[64] = "TERM=";
-#define	ENVSIZE	(sizeof("TERM=")-1)	/* skip null for concatenation */
-int	keepalive = 1;
-int	check_all = 0;
-int     no_delay = 0;
-
-struct	passwd *pwd;
-
-static const char *new_login = _PATH_LOGIN;
-
-static void	doit (int, struct sockaddr_in *);
-static int	control (int, char *, int);
-static void	protocol (int, int);
-static RETSIGTYPE cleanup (int);
-void	fatal (int, const char *, int);
-static int	do_rlogin (struct sockaddr_in *);
-static void	setup_term (int);
-static int	do_krb_login (struct sockaddr_in *);
-static void	usage (void);
-
-static int
-readstream(int p, char *ibuf, int bufsize)
-{
-#ifndef HAVE_GETMSG
-    return read(p, ibuf, bufsize);
-#else
-    static int flowison = -1;  /* current state of flow: -1 is unknown */
-    static struct strbuf strbufc, strbufd;
-    static unsigned char ctlbuf[BUFSIZ];
-    static int use_read = 1;
-
-    int flags = 0;
-    int ret;
-    struct termios tsp;
-
-    struct iocblk ip;
-    char vstop, vstart;
-    int ixon;
-    int newflow;
-
-    if (use_read)
-	{
-	    ret = read(p, ibuf, bufsize);
-	    if (ret < 0 && errno == EBADMSG)
-		use_read = 0;
-	    else
-		return ret;
-	}
-
-    strbufc.maxlen = BUFSIZ;
-    strbufc.buf = (char *)ctlbuf;
-    strbufd.maxlen = bufsize-1;
-    strbufd.len = 0;
-    strbufd.buf = ibuf+1;
-    ibuf[0] = 0;
-
-    ret = getmsg(p, &strbufc, &strbufd, &flags);
-    if (ret < 0)  /* error of some sort -- probably EAGAIN */
-	return(-1);
-
-    if (strbufc.len <= 0 || ctlbuf[0] == M_DATA) {
-	/* data message */
-	if (strbufd.len > 0) {			/* real data */
-	    return(strbufd.len + 1);	/* count header char */
-	} else {
-	    /* nothing there */
-	    errno = EAGAIN;
-	    return(-1);
-	}
-    }
-
-    /*
-     * It's a control message.  Return 1, to look at the flag we set
-     */
-
-    switch (ctlbuf[0]) {
-    case M_FLUSH:
-	if (ibuf[1] & FLUSHW)
-	    ibuf[0] = TIOCPKT_FLUSHWRITE;
-	return(1);
-
-    case M_IOCTL:
-	memcpy(&ip, (ibuf+1), sizeof(ip));
-
-	switch (ip.ioc_cmd) {
-#ifdef TCSETS
-	case TCSETS:
-	case TCSETSW:
-	case TCSETSF:
-	    memcpy(&tsp,
-		   (ibuf+1 + sizeof(struct iocblk)),
-		   sizeof(tsp));
-	    vstop = tsp.c_cc[VSTOP];
-	    vstart = tsp.c_cc[VSTART];
-	    ixon = tsp.c_iflag & IXON;
-	    break;
-#endif
-	default:
-	    errno = EAGAIN;
-	    return(-1);
-	}
-
-	newflow =  (ixon && (vstart == 021) && (vstop == 023)) ? 1 : 0;
-	if (newflow != flowison) {  /* it's a change */
-	    flowison = newflow;
-	    ibuf[0] = newflow ? TIOCPKT_DOSTOP : TIOCPKT_NOSTOP;
-	    return(1);
-	}
-    }
-
-    /* nothing worth doing anything about */
-    errno = EAGAIN;
-    return(-1);
-#endif
-}
-
-#ifdef HAVE_UTMPX_H
-static int
-logout(const char *line)
-{
-    struct utmpx utmpx, *utxp;
-    int ret = 1;
-
-    setutxent ();
-    memset(&utmpx, 0, sizeof(utmpx));
-    utmpx.ut_type = USER_PROCESS;
-    strncpy(utmpx.ut_line, line, sizeof(utmpx.ut_line));
-    utxp = getutxline(&utmpx);
-    if (utxp) {
-	strcpy(utxp->ut_user, "");
-	utxp->ut_type = DEAD_PROCESS;
-#ifdef _STRUCT___EXIT_STATUS
-	utxp->ut_exit.__e_termination = 0;
-	utxp->ut_exit.__e_exit = 0;
-#elif defined(__osf__) /* XXX */
-	utxp->ut_exit.ut_termination = 0;
-	utxp->ut_exit.ut_exit = 0;
-#else	
-	utxp->ut_exit.e_termination = 0;
-	utxp->ut_exit.e_exit = 0;
-#endif
-	gettimeofday(&utxp->ut_tv, NULL);
-	pututxline(utxp);
-#ifdef WTMPX_FILE
-	updwtmpx(WTMPX_FILE, utxp);
-#else
-	ret = 0;
-#endif
-    }
-    endutxent();
-    return ret;
-}
-#else
-static int
-logout(const char *line)
-{
-    FILE *fp;
-    struct utmp ut;
-    int rval;
-
-    if (!(fp = fopen(_PATH_UTMP, "r+")))
-	return(0);
-    rval = 1;
-    while (fread(&ut, sizeof(struct utmp), 1, fp) == 1) {
-	if (!ut.ut_name[0] ||
-	    strncmp(ut.ut_line, line, sizeof(ut.ut_line)))
-	    continue;
-	memset(ut.ut_name, 0, sizeof(ut.ut_name));
-#ifdef HAVE_UT_HOST
-	memset(ut.ut_host, 0, sizeof(ut.ut_host));
-#endif
-	time(&ut.ut_time);
-	fseek(fp, (long)-sizeof(struct utmp), SEEK_CUR);
-	fwrite(&ut, sizeof(struct utmp), 1, fp);
-	fseek(fp, (long)0, SEEK_CUR);
-	rval = 0;
-    }
-    fclose(fp);
-    return(rval);
-}
-#endif
-
-#ifndef HAVE_LOGWTMP
-static void
-logwtmp(const char *line, const char *name, const char *host)
-{
-    struct utmp ut;
-    struct stat buf;
-    int fd;
-
-    memset (&ut, 0, sizeof(ut));
-    if ((fd = open(_PATH_WTMP, O_WRONLY|O_APPEND, 0)) < 0)
-	return;
-    if (!fstat(fd, &buf)) {
-	strncpy(ut.ut_line, line, sizeof(ut.ut_line));
-	strncpy(ut.ut_name, name, sizeof(ut.ut_name));
-#ifdef HAVE_UT_HOST
-	strncpy(ut.ut_host, host, sizeof(ut.ut_host));
-#endif
-#ifdef HAVE_UT_PID
-	ut.ut_pid = getpid();
-#endif
-#ifdef HAVE_UT_TYPE
-	if(name[0])
-	    ut.ut_type = USER_PROCESS;
-	else
-	    ut.ut_type = DEAD_PROCESS;
-#endif
-	time(&ut.ut_time);
-	if (write(fd, &ut, sizeof(struct utmp)) !=
-	    sizeof(struct utmp))
-	    ftruncate(fd, buf.st_size);
-    }
-    close(fd);
-}
-#endif
-
-int
-main(int argc, char **argv)
-{
-    struct sockaddr_in from;
-    int ch, fromlen, on;
-    int interactive = 0;
-    int portnum = 0;
-
-    set_progname(argv[0]);
-
-    openlog("rlogind", LOG_PID | LOG_CONS, LOG_AUTH);
-
-    opterr = 0;
-    while ((ch = getopt(argc, argv, ARGSTR)) != EOF)
-	switch (ch) {
-	case 'D':
-	    no_delay = 1;
-	    break;
-	case 'a':
-	    break;
-	case 'i':
-	    interactive = 1;
-	    break;
-	case 'p':
-	    portnum = htons(atoi(optarg));
-	    break;
-	case 'l':
-	    __check_rhosts_file = 0;
-	    break;
-	case 'n':
-	    keepalive = 0;
-	    break;
-	case 'k':
-	    use_kerberos = 1;
-	    break;
-	case 'v':
-	    vacuous = 1;
-	    break;
-	case 'x':
-	    doencrypt = 1;
-	    break;
-	case 'L':
-	    new_login = optarg;
-	    break;
-	case '?':
-	default:
-	    usage();
-	    break;
-	}
-    argc -= optind;
-    argv += optind;
-
-    if (use_kerberos && vacuous) {
-	usage();
-	fatal(STDERR_FILENO, "only one of -k and -v allowed", 0);
-    }
-    if (interactive) {
-	if(portnum == 0)
-	    portnum = get_login_port (use_kerberos, doencrypt);
-	mini_inetd (portnum);
-    }
-
-    fromlen = sizeof (from);
-    if (getpeername(0, (struct sockaddr *)&from, &fromlen) < 0) {
-	syslog(LOG_ERR,"Can't get peer name of remote host: %m");
-	fatal(STDERR_FILENO, "Can't get peer name of remote host", 1);
-    }
-    on = 1;
-#ifdef HAVE_SETSOCKOPT
-#ifdef SO_KEEPALIVE
-    if (keepalive &&
-	setsockopt(0, SOL_SOCKET, SO_KEEPALIVE, (void *)&on,
-		   sizeof (on)) < 0)
-	syslog(LOG_WARNING, "setsockopt (SO_KEEPALIVE): %m");
-#endif
-#ifdef TCP_NODELAY
-    if (no_delay &&
-	setsockopt(0, IPPROTO_TCP, TCP_NODELAY, (void *)&on,
-		   sizeof(on)) < 0)
-	syslog(LOG_WARNING, "setsockopt (TCP_NODELAY): %m");
-#endif
-
-#ifdef IP_TOS
-    on = IPTOS_LOWDELAY;
-    if (setsockopt(0, IPPROTO_IP, IP_TOS, (void *)&on, sizeof(int)) < 0)
-	syslog(LOG_WARNING, "setsockopt (IP_TOS): %m");
-#endif
-#endif /* HAVE_SETSOCKOPT */
-    doit(0, &from);
-    return 0;
-}
-
-int	child;
-int	netf;
-char	line[MaxPathLen];
-int	confirmed;
-
-struct winsize win = { 0, 0, 0, 0 };
-
-
-static void
-doit(int f, struct sockaddr_in *fromp)
-{
-    int master, pid, on = 1;
-    int authenticated = 0;
-    char hostname[2 * MaxHostNameLen + 1];
-    char c;
-
-    alarm(60);
-    read(f, &c, 1);
-
-    if (c != 0)
-	exit(1);
-    if (vacuous)
-	fatal(f, "Remote host requires Kerberos authentication", 0);
-
-    alarm(0);
-    inaddr2str (fromp->sin_addr, hostname, sizeof(hostname));
-
-    if (use_kerberos) {
-	retval = do_krb_login(fromp);
-	if (retval == 0)
-	    authenticated++;
-	else if (retval > 0)
-	    fatal(f, krb_get_err_text(retval), 0);
-	write(f, &c, 1);
-	confirmed = 1;		/* we sent the null! */
-    } else {
-	fromp->sin_port = ntohs((u_short)fromp->sin_port);
-	if (fromp->sin_family != AF_INET ||
-	    fromp->sin_port >= IPPORT_RESERVED ||
-	    fromp->sin_port < IPPORT_RESERVED/2) {
-	    syslog(LOG_NOTICE, "Connection from %s on illegal port",
-		   inet_ntoa(fromp->sin_addr));
-	    fatal(f, "Permission denied", 0);
-	}
-	ip_options_and_die (0, fromp);
-	if (do_rlogin(fromp) == 0)
-	    authenticated++;
-    }
-    if (confirmed == 0) {
-	write(f, "", 1);
-	confirmed = 1;		/* we sent the null! */
-    }
-#ifndef NOENCRYPTION
-    if (doencrypt)
-	des_enc_write(f, SECURE_MESSAGE,
-		      strlen(SECURE_MESSAGE),
-		      schedule, &kdata->session);
-    else
-#endif
-	write(f, INSECURE_MESSAGE, strlen(INSECURE_MESSAGE));
-    netf = f;
-
-    pid = forkpty(&master, line, NULL, NULL);
-    if (pid < 0) {
-	if (errno == ENOENT)
-	    fatal(f, "Out of ptys", 0);
-	else
-	    fatal(f, "Forkpty", 1);
-    }
-    if (pid == 0) {
-	if (f > 2)	/* f should always be 0, but... */
-	    close(f);
-	setup_term(0);
-	if (lusername[0] == '-'){
-	    syslog(LOG_ERR, "tried to pass user \"%s\" to login",
-		   lusername);
-	    fatal(STDERR_FILENO, "invalid user", 0);
-	}
-	if (authenticated) {
-	    if (use_kerberos && (pwd->pw_uid == 0))
-		syslog(LOG_INFO|LOG_AUTH,
-		       "ROOT Kerberos login from %s on %s\n",
-		       krb_unparse_name_long(kdata->pname, 
-					     kdata->pinst, 
-					     kdata->prealm), 
-		       hostname);
-		    
-	    execl(new_login, "login", "-p",
-		  "-h", hostname, "-f", "--", lusername, 0);
-	} else
-	    execl(new_login, "login", "-p",
-		  "-h", hostname, "--", lusername, 0);
-	fatal(STDERR_FILENO, new_login, 1);
-	/*NOTREACHED*/
-    }
-    /*
-     * If encrypted, don't turn on NBIO or the des read/write
-     * routines will croak.
-     */
-
-    if (!doencrypt)
-	ioctl(f, FIONBIO, &on);
-    ioctl(master, FIONBIO, &on);
-    ioctl(master, TIOCPKT, &on);
-    signal(SIGTSTP, SIG_IGN);
-    signal(SIGCHLD, cleanup);
-    setsid();
-    protocol(f, master);
-    signal(SIGCHLD, SIG_IGN);
-    cleanup(0);
-}
-
-const char	magic[2] = { 0377, 0377 };
-
-/*
- * Handle a "control" request (signaled by magic being present)
- * in the data stream.  For now, we are only willing to handle
- * window size changes.
- */
-static int
-control(int master, char *cp, int n)
-{
-    struct winsize w;
-    char *p;
-    u_int32_t tmp;
-
-    if (n < 4 + 4 * sizeof (u_int16_t) || cp[2] != 's' || cp[3] != 's')
-	return (0);
-#ifdef TIOCSWINSZ
-    p = cp + 4;
-    p += krb_get_int(p, &tmp, 2, 0);
-    w.ws_row = tmp;
-    p += krb_get_int(p, &tmp, 2, 0);
-    w.ws_col = tmp;
-
-    p += krb_get_int(p, &tmp, 2, 0);
-#ifdef HAVE_WS_XPIXEL
-    w.ws_xpixel = tmp;
-#endif
-    p += krb_get_int(p, &tmp, 2, 0);
-#ifdef HAVE_WS_YPIXEL
-    w.ws_ypixel = tmp;
-#endif
-    ioctl(master, TIOCSWINSZ, &w);
-#endif
-    return p - cp;
-}
-
-static
-void
-send_oob(int fd, char c)
-{
-    static char last_oob = 0xFF;
-
-#if (SunOS == 5) || defined(__hpux)
-    /*
-     * PSoriasis and HP-UX always send TIOCPKT_DOSTOP at startup so we
-     * can avoid sending OOB data and thus not break on Linux by merging
-     * TIOCPKT_DOSTOP into the first TIOCPKT_WINDOW.
-     */
-    static int oob_kludge = 2;
-    if (oob_kludge == 2)
-	{
-	    oob_kludge--;		/* First time send nothing */
-	    return;
-	}
-    else if (oob_kludge == 1)
-	{
-	    oob_kludge--;		/* Second time merge TIOCPKT_WINDOW */
-	    c |= TIOCPKT_WINDOW;
-	}
-#endif
-
-#define	pkcontrol(c) ((c)&(TIOCPKT_FLUSHWRITE|TIOCPKT_NOSTOP|TIOCPKT_DOSTOP))
-    c = pkcontrol(c);
-    /* Multiple OOB data breaks on Linux, avoid it when possible. */
-    if (c != last_oob)
-	send(fd, &c, 1, MSG_OOB);
-    last_oob = c;
-}
-
-/*
- * rlogin "protocol" machine.
- */
-static void
-protocol(int f, int master)
-{
-    char pibuf[1024+1], fibuf[1024], *pbp, *fbp;
-    int pcc = 0, fcc = 0;
-    int cc, nfd, n;
-    char cntl;
-    unsigned char oob_queue = 0;
-
-    /*
-     * Must ignore SIGTTOU, otherwise we'll stop
-     * when we try and set slave pty's window shape
-     * (our controlling tty is the master pty).
-     */
-    signal(SIGTTOU, SIG_IGN);
-
-    send_oob(f, TIOCPKT_WINDOW); /* indicate new rlogin */
-
-    if (f > master)
-	nfd = f + 1;
-    else
-	nfd = master + 1;
-    if (nfd > FD_SETSIZE) {
-	syslog(LOG_ERR, "select mask too small, increase FD_SETSIZE");
-	fatal(f, "internal error (select mask too small)", 0);
-    }
-    for (;;) {
-	fd_set ibits, obits, ebits, *omask;
-
-	FD_ZERO(&ebits);
-	FD_ZERO(&ibits);
-	FD_ZERO(&obits);
-	omask = (fd_set *)NULL;
-	if (fcc) {
-	    FD_SET(master, &obits);
-	    omask = &obits;
-	} else
-	    FD_SET(f, &ibits);
-	if (pcc >= 0)
-	    if (pcc) {
-		FD_SET(f, &obits);
-		omask = &obits;
-	    } else
-		FD_SET(master, &ibits);
-	FD_SET(master, &ebits);
-	if ((n = select(nfd, &ibits, omask, &ebits, 0)) < 0) {
-	    if (errno == EINTR)
-		continue;
-	    fatal(f, "select", 1);
-	}
-	if (n == 0) {
-	    /* shouldn't happen... */
-	    sleep(5);
-	    continue;
-	}
-	if (FD_ISSET(master, &ebits)) {
-	    cc = readstream(master, &cntl, 1);
-	    if (cc == 1 && pkcontrol(cntl)) {
-#if 0				/* Kludge around */
-		send_oob(f, cntl);
-#endif
-		oob_queue = cntl;
-		if (cntl & TIOCPKT_FLUSHWRITE) {
-		    pcc = 0;
-		    FD_CLR(master, &ibits);
-		}
-	    }
-	}
-	if (FD_ISSET(f, &ibits)) {
-#ifndef NOENCRYPTION
-	    if (doencrypt)
-		fcc = des_enc_read(f, fibuf,
-				   sizeof(fibuf),
-				   schedule, &kdata->session);
-	    else
-#endif
-		fcc = read(f, fibuf, sizeof(fibuf));
-	    if (fcc < 0 && errno == EWOULDBLOCK)
-		fcc = 0;
-	    else {
-		char *cp;
-		int left, n;
-
-		if (fcc <= 0)
-		    break;
-		fbp = fibuf;
-
-	    top:
-		for (cp = fibuf; cp < fibuf+fcc-1; cp++)
-		    if (cp[0] == magic[0] &&
-			cp[1] == magic[1]) {
-			left = fcc - (cp-fibuf);
-			n = control(master, cp, left);
-			if (n) {
-			    left -= n;
-			    if (left > 0)
-				memmove(cp, cp+n, left);
-			    fcc -= n;
-			    goto top; /* n^2 */
-			}
-		    }
-		FD_SET(master, &obits);		/* try write */
-	    }
-	}
-
-	if (FD_ISSET(master, &obits) && fcc > 0) {
-	    cc = write(master, fbp, fcc);
-	    if (cc > 0) {
-		fcc -= cc;
-		fbp += cc;
-	    }
-	}
-
-	if (FD_ISSET(master, &ibits)) {
-	    pcc = readstream(master, pibuf, sizeof (pibuf));
-	    pbp = pibuf;
-	    if (pcc < 0 && errno == EWOULDBLOCK)
-		pcc = 0;
-	    else if (pcc <= 0)
-		break;
-	    else if (pibuf[0] == 0) {
-		pbp++, pcc--;
-		if (!doencrypt)
-		    FD_SET(f, &obits);	/* try write */
-	    } else {
-		if (pkcontrol(pibuf[0])) {
-		    oob_queue = pibuf[0];
-#if 0				/* Kludge around */
-		    send_oob(f, pibuf[0]);
-#endif
-		}
-		pcc = 0;
-	    }
-	}
-	if ((FD_ISSET(f, &obits)) && pcc > 0) {
-#ifndef NOENCRYPTION
-	    if (doencrypt)
-		cc = des_enc_write(f, pbp, pcc, schedule, &kdata->session);
-	    else
-#endif
-		cc = write(f, pbp, pcc);
-	    if (cc < 0 && errno == EWOULDBLOCK) {
-		/*
-		 * This happens when we try write after read
-		 * from p, but some old kernels balk at large
-		 * writes even when select returns true.
-		 */
-		if (!FD_ISSET(master, &ibits))
-		    sleep(5);
-		continue;
-	    }
-	    if (cc > 0) {
-		pcc -= cc;
-		pbp += cc;
-		/* Only send urg data when normal data
-		 * has just been sent.
-		 * Linux has deep problems with more
-		 * than one byte of OOB data.
-		 */
-		if (oob_queue) {
-		    send_oob (f, oob_queue);
-		    oob_queue = 0;
-		}
-	    }
-	}
-    }
-}
-
-static RETSIGTYPE
-cleanup(int signo)
-{
-    char *p = clean_ttyname (line);
-
-    if (logout(p) == 0)
-	logwtmp(p, "", "");
-    chmod(line, 0666);
-    chown(line, 0, 0);
-    *p = 'p';
-    chmod(line, 0666);
-    chown(line, 0, 0);
-    shutdown(netf, 2);
-    signal(SIGHUP, SIG_IGN);
-#ifdef HAVE_VHANGUP
-    vhangup();
-#endif /* HAVE_VHANGUP */
-    exit(1);
-}
-
-void
-fatal(int f, const char *msg, int syserr)
-{
-    int len;
-    char buf[BUFSIZ], *bp = buf;
-
-    /*
-     * Prepend binary one to message if we haven't sent
-     * the magic null as confirmation.
-     */
-    if (!confirmed)
-	*bp++ = '\01';		/* error indicator */
-    if (syserr)
-	snprintf(bp, sizeof(buf) - (bp - buf),
-		 "rlogind: %s: %s.\r\n",
-		 msg, strerror(errno));
-    else
-	snprintf(bp, sizeof(buf) - (bp - buf),
-		 "rlogind: %s.\r\n", msg);
-    len = strlen(bp);
-#ifndef NOENCRYPTION
-    if (doencrypt)
-	des_enc_write(f, buf, bp + len - buf, schedule, &kdata->session);
-    else
-#endif
-	write(f, buf, bp + len - buf);
-    exit(1);
-}
-
-static void
-xgetstr(char *buf, int cnt, char *errmsg)
-{
-    char c;
-
-    do {
-	if (read(0, &c, 1) != 1)
-	    exit(1);
-	if (--cnt < 0)
-	    fatal(STDOUT_FILENO, errmsg, 0);
-	*buf++ = c;
-    } while (c != 0);
-}
-
-static int
-do_rlogin(struct sockaddr_in *dest)
-{
-    xgetstr(rusername, sizeof(rusername), "remuser too long");
-    xgetstr(lusername, sizeof(lusername), "locuser too long");
-    xgetstr(term+ENVSIZE, sizeof(term)-ENVSIZE, "Terminal type too long");
-
-    pwd = k_getpwnam(lusername);
-    if (pwd == NULL)
-	return (-1);
-    if (pwd->pw_uid == 0 && strcmp("root", lusername) != 0)
-	{
-	    syslog(LOG_ALERT, "NIS attack, user %s has uid 0", lusername);
-	    return (-1);
-	}
-    return (iruserok(dest->sin_addr.s_addr,
-		     (pwd->pw_uid == 0),
-		     rusername,
-		     lusername));
-}
-
-static void 
-setup_term(int fd)
-{
-    char *cp = strchr(term+ENVSIZE, '/');
-    char *speed;
-    struct termios tt;
-
-    tcgetattr(fd, &tt);
-    if (cp) {
-	int s;
-
-	*cp++ = '\0';
-	speed = cp;
-	cp = strchr(speed, '/');
-	if (cp)
-	    *cp++ = '\0';
-	s = int2speed_t (atoi (speed));
-	if (s > 0) {
-	    cfsetospeed (&tt, s);
-	    cfsetispeed (&tt, s);
-	}
-    }
-
-    tt.c_iflag &= ~INPCK;
-    tt.c_iflag |= ICRNL|IXON;
-    tt.c_oflag |= OPOST|ONLCR;
-#ifdef TAB3
-    tt.c_oflag |= TAB3;
-#endif /* TAB3 */
-#ifdef ONLRET
-    tt.c_oflag &= ~ONLRET;
-#endif /* ONLRET */
-    tt.c_lflag |= (ECHO|ECHOE|ECHOK|ISIG|ICANON);
-    tt.c_cflag &= ~PARENB;
-    tt.c_cflag |= CS8;
-    tt.c_cc[VMIN] = 1;
-    tt.c_cc[VTIME] = 0;
-    tt.c_cc[VEOF] = CEOF;
-    tcsetattr(fd, TCSAFLUSH, &tt);
-
-    env[0] = term;
-    env[1] = 0;
-    environ = env;
-}
-
-#define	VERSION_SIZE	9
-
-/*
- * Do the remote kerberos login to the named host with the
- * given inet address
- *
- * Return 0 on valid authorization
- * Return -1 on valid authentication, no authorization
- * Return >0 for error conditions
- */
-static int
-do_krb_login(struct sockaddr_in *dest)
-{
-    int rc;
-    char instance[INST_SZ], version[VERSION_SIZE];
-    long authopts = 0L;	/* !mutual */
-    struct sockaddr_in faddr;
-
-    kdata = (AUTH_DAT *) auth_buf;
-    ticket = (KTEXT) tick_buf;
-
-    k_getsockinst(0, instance, sizeof(instance));
-
-    if (doencrypt) {
-	rc = sizeof(faddr);
-	if (getsockname(0, (struct sockaddr *)&faddr, &rc))
-	    return (-1);
-	authopts = KOPT_DO_MUTUAL;
-	rc = krb_recvauth(
-			  authopts, 0,
-			  ticket, "rcmd",
-			  instance, dest, &faddr,
-			  kdata, "", schedule, version);
-	des_set_key(&kdata->session, schedule);
-
-    } else
-	rc = krb_recvauth(
-			  authopts, 0,
-			  ticket, "rcmd",
-			  instance, dest, (struct sockaddr_in *) 0,
-			  kdata, "", 0, version);
-
-    if (rc != KSUCCESS)
-	return (rc);
-
-    xgetstr(lusername, sizeof(lusername), "locuser");
-    /* get the "cmd" in the rcmd protocol */
-    xgetstr(term+ENVSIZE, sizeof(term)-ENVSIZE, "Terminal type");
-
-    pwd = k_getpwnam(lusername);
-    if (pwd == NULL)
-	return (-1);
-    if (pwd->pw_uid == 0 && strcmp("root", lusername) != 0)
-	{
-	    syslog(LOG_ALERT, "NIS attack, user %s has uid 0", lusername);
-	    return (-1);
-	}
-
-    /* returns nonzero for no access */
-    if (kuserok(kdata, lusername) != 0)
-	return (-1);
-
-    return (0);
-
-}
-
-static void
-usage(void)
-{
-    syslog(LOG_ERR,
-	   "usage: rlogind [-Dailn] [-p port] [-x] [-L login] [-k | -v]");
-    exit(1);
-}
diff --git a/crypto/kerberosIV/appl/bsd/rsh.c b/crypto/kerberosIV/appl/bsd/rsh.c
deleted file mode 100644
index 329ebf73ffe5..000000000000
--- a/crypto/kerberosIV/appl/bsd/rsh.c
+++ /dev/null
@@ -1,353 +0,0 @@
-/*-
- * Copyright (c) 1983, 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "bsd_locl.h"
-
-RCSID("$Id: rsh.c,v 1.35 1997/03/30 18:20:22 joda Exp $");
-
-CREDENTIALS cred;
-Key_schedule schedule;
-int use_kerberos = 1, doencrypt;
-char dst_realm_buf[REALM_SZ], *dest_realm;
-
-/*
- * rsh - remote shell
- */
-int rfd2;
-
-static void
-usage(void)
-{
-    fprintf(stderr,
-	    "usage: rsh [-ndKx] [-k realm] [-l login] host [command]\n");
-    exit(1);
-}
-
-static char *
-copyargs(char **argv)
-{
-    int cc;
-    char **ap, *p;
-    char *args;
-
-    cc = 0;
-    for (ap = argv; *ap; ++ap)
-	cc += strlen(*ap) + 1;
-    if (!(args = malloc(cc))) 
-	errx(1, "Out of memory.");
-    for (p = args, ap = argv; *ap; ++ap) {
-	strcpy(p, *ap);
-	for (p = strcpy(p, *ap); *p; ++p);
-	if (ap[1])
-	    *p++ = ' ';
-    }
-    return(args);
-}
-
-static RETSIGTYPE
-sendsig(int signo_)
-{
-    char signo = signo_;
-#ifndef NOENCRYPTION
-    if (doencrypt)
-	des_enc_write(rfd2, &signo, 1, schedule, &cred.session);
-    else
-#endif
-	write(rfd2, &signo, 1);
-}
-
-static void
-talk(int nflag, sigset_t omask, int pid, int rem)
-{
-    int cc, wc;
-    char *bp;
-    fd_set readfrom, ready, rembits;
-    char buf[BUFSIZ];
-
-    if (pid == 0) {
-	if (nflag)
-	    goto done;
-
-	close(rfd2);
-
-    reread:		errno = 0;
-    if ((cc = read(0, buf, sizeof buf)) <= 0)
-	goto done;
-    bp = buf;
-
-    rewrite:	FD_ZERO(&rembits);
-    FD_SET(rem, &rembits);
-    if (select(16, 0, &rembits, 0, 0) < 0) {
-	if (errno != EINTR) 
-	    err(1, "select");
-	goto rewrite;
-    }
-    if (!FD_ISSET(rem, &rembits))
-	goto rewrite;
-#ifndef NOENCRYPTION
-    if (doencrypt)
-	wc = des_enc_write(rem, bp, cc, schedule, &cred.session);
-    else
-#endif
-	wc = write(rem, bp, cc);
-    if (wc < 0) {
-	if (errno == EWOULDBLOCK)
-	    goto rewrite;
-	goto done;
-    }
-    bp += wc;
-    cc -= wc;
-    if (cc == 0)
-	goto reread;
-    goto rewrite;
-    done:
-    shutdown(rem, 1);
-    exit(0);
-    }
-
-    if (sigprocmask(SIG_SETMASK, &omask, 0) != 0)
-	warn("sigprocmask");
-    FD_ZERO(&readfrom);
-    FD_SET(rem, &readfrom);
-    FD_SET(rfd2, &readfrom);
-    do {
-	ready = readfrom;
-	if (select(16, &ready, 0, 0, 0) < 0) {
-	    if (errno != EINTR)
-		err(1, "select");
-	    continue;
-	}
-	if (FD_ISSET(rfd2, &ready)) {
-	    errno = 0;
-#ifndef NOENCRYPTION
-	    if (doencrypt)
-		cc = des_enc_read(rfd2, buf, sizeof buf,
-				  schedule, &cred.session);
-	    else
-#endif
-		cc = read(rfd2, buf, sizeof buf);
-	    if (cc <= 0) {
-		if (errno != EWOULDBLOCK)
-		    FD_CLR(rfd2, &readfrom);
-	    } else
-		write(2, buf, cc);
-	}
-	if (FD_ISSET(rem, &ready)) {
-	    errno = 0;
-#ifndef NOENCRYPTION
-	    if (doencrypt)
-		cc = des_enc_read(rem, buf, sizeof buf,
-				  schedule, &cred.session);
-	    else
-#endif
-		cc = read(rem, buf, sizeof buf);
-	    if (cc <= 0) {
-		if (errno != EWOULDBLOCK)
-		    FD_CLR(rem, &readfrom);
-	    } else
-		write(1, buf, cc);
-	}
-    } while (FD_ISSET(rfd2, &readfrom) || FD_ISSET(rem, &readfrom));
-}
-
-int
-main(int argc, char **argv)
-{
-    struct passwd *pw;
-    int sv_port;
-    sigset_t omask;
-    int argoff, ch, dflag, nflag, nfork, one, pid, rem, uid;
-    char *args, *host, *user, *local_user;
-
-    argoff = dflag = nflag = nfork = 0;
-    one = 1;
-    host = user = NULL;
-    pid = 1;
-
-    set_progname(argv[0]);
-
-    /* handle "rsh host flags" */
-    if (!host && argc > 2 && argv[1][0] != '-') {
-	host = argv[1];
-	argoff = 1;
-    }
-
-#define	OPTIONS	"+8KLde:k:l:nwx"
-    while ((ch = getopt(argc - argoff, argv + argoff, OPTIONS)) != EOF)
-	switch(ch) {
-	case 'K':
-	    use_kerberos = 0;
-	    break;
-	case 'L':	/* -8Lew are ignored to allow rlogin aliases */
-	case 'e':
-	case 'w':
-	case '8':
-	    break;
-	case 'd':
-	    dflag = 1;
-	    break;
-	case 'l':
-	    user = optarg;
-	    break;
-	case 'k':
-	    dest_realm = dst_realm_buf;
-	    strncpy(dest_realm, optarg, REALM_SZ);
-	    break;
-	case 'n':
-	    nflag = nfork = 1;
-	    break;
-	case 'x':
-	    doencrypt = 1;
-	    break;
-	case '?':
-	default:
-	    usage();
-	}
-    optind += argoff;
-
-    /* if haven't gotten a host yet, do so */
-    if (!host && !(host = argv[optind++]))
-	usage();
-
-    /* if no further arguments, must have been called as rlogin. */
-    if (!argv[optind]) {
-	*argv = "rlogin";
-	setuid(getuid());
-	execv(_PATH_RLOGIN, argv);
-	err(1, "can't exec %s", _PATH_RLOGIN);
-    }
-
-    argc -= optind;
-    argv += optind;
-
-#ifndef __CYGWIN32__
-    if (!(pw = k_getpwuid(uid = getuid())))
-	errx(1, "unknown user id.");
-    local_user = pw->pw_name;
-    if (!user)
-	user = local_user;
-#else
-    if (!user)
-	errx(1, "Sorry, you need to specify the username (with -l)");
-    local_user = user;
-#endif
-
-    /* -n must still fork but does not turn of the -n functionality */
-    if (doencrypt)
-	nfork = 0;
-
-    args = copyargs(argv);
-
-    sv_port=get_shell_port(use_kerberos, doencrypt);
-
-try_connect:
-    if (use_kerberos) {
-	rem = KSUCCESS;
-	errno = 0;
-	if (dest_realm == NULL)
-	    dest_realm = krb_realmofhost(host);
-
-	if (doencrypt)
-	    rem = krcmd_mutual(&host, sv_port, user, args,
-			       &rfd2, dest_realm, &cred, schedule);
-	else
-	    rem = krcmd(&host, sv_port, user, args, &rfd2,
-			dest_realm);
-	if (rem < 0) {
-	    if (errno == ECONNREFUSED)
-		warning("remote host doesn't support Kerberos");
-	    if (errno == ENOENT)
-		warning("can't provide Kerberos auth data");
-	    use_kerberos = 0;
-	    sv_port=get_shell_port(use_kerberos, doencrypt);
-	    goto try_connect;
-	}
-    } else {
-	if (doencrypt)
-	    errx(1, "the -x flag requires Kerberos authentication.");
-	if (geteuid() != 0)
-	    errx(1, "not installed setuid root, "
-		 "only root may use non kerberized rsh");
-	rem = rcmd(&host, sv_port, local_user, user, args, &rfd2);
-    }
-
-    if (rem < 0)
-	exit(1);
-
-    if (rfd2 < 0)
-	errx(1, "can't establish stderr.");
-#if defined(SO_DEBUG) && defined(HAVE_SETSOCKOPT)
-    if (dflag) {
-	if (setsockopt(rem, SOL_SOCKET, SO_DEBUG, (void *)&one,
-		       sizeof(one)) < 0)
-	    warn("setsockopt");
-	if (setsockopt(rfd2, SOL_SOCKET, SO_DEBUG, (void *)&one,
-		       sizeof(one)) < 0)
-	    warn("setsockopt");
-    }
-#endif
-
-    setuid(uid);
-    {
-	sigset_t sigmsk;
-	sigemptyset(&sigmsk);
-	sigaddset(&sigmsk, SIGINT);
-	sigaddset(&sigmsk, SIGQUIT);
-	sigaddset(&sigmsk, SIGTERM);
-	if (sigprocmask(SIG_BLOCK, &sigmsk, &omask) != 0)
-	    warn("sigprocmask");
-    }
-    if (signal(SIGINT, SIG_IGN) != SIG_IGN)
-	signal(SIGINT, sendsig);
-    if (signal(SIGQUIT, SIG_IGN) != SIG_IGN)
-	signal(SIGQUIT, sendsig);
-    if (signal(SIGTERM, SIG_IGN) != SIG_IGN)
-	signal(SIGTERM, sendsig);
-
-    if (!nfork) {
-	pid = fork();
-	if (pid < 0)
-	    err(1, "fork");
-    }
-
-    if (!doencrypt) {
-	ioctl(rfd2, FIONBIO, &one);
-	ioctl(rem, FIONBIO, &one);
-    }
-
-    talk(nflag, omask, pid, rem);
-    
-    if (!nflag)
-	kill(pid, SIGKILL);
-    exit(0);
-}
diff --git a/crypto/kerberosIV/appl/bsd/rshd.c b/crypto/kerberosIV/appl/bsd/rshd.c
deleted file mode 100644
index 75ca1df454ba..000000000000
--- a/crypto/kerberosIV/appl/bsd/rshd.c
+++ /dev/null
@@ -1,635 +0,0 @@
-/*-
- * Copyright (c) 1988, 1989, 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * remote shell server:
- *	[port]\0
- *	remuser\0
- *	locuser\0
- *	command\0
- *	data
- */
-
-#include "bsd_locl.h"
-
-RCSID("$Id: rshd.c,v 1.51 1997/05/13 09:42:39 bg Exp $");
-
-extern char *__rcmd_errstr; /* syslog hook from libc/net/rcmd.c. */
-extern int __check_rhosts_file;
-
-static int	keepalive = 1;
-static int	log_success;	/* If TRUE, log all successful accesses */
-static int	new_pag = 1;	/* Put process in new PAG by default */
-static int	no_inetd = 0;
-static int	sent_null;
-
-static void		 doit (struct sockaddr_in *);
-static void		 error (const char *, ...)
-#ifdef __GNUC__
-__attribute__ ((format (printf, 1, 2)))
-#endif
-;
-static void		 usage (void);
-
-#define	VERSION_SIZE	9
-#define SECURE_MESSAGE  "This rsh session is using DES encryption for all transmissions.\r\n"
-#define	OPTIONS		"alnkvxLp:Pi"
-AUTH_DAT authbuf;
-KTEXT_ST tickbuf;
-int	doencrypt, use_kerberos, vacuous;
-Key_schedule	schedule;
-
-int
-main(int argc, char *argv[])
-{
-    struct linger linger;
-    int ch, on = 1, fromlen;
-    struct sockaddr_in from;
-    int portnum = 0;
-
-    set_progname(argv[0]);
-
-    openlog("rshd", LOG_PID | LOG_ODELAY, LOG_DAEMON);
-
-    opterr = 0;
-    while ((ch = getopt(argc, argv, OPTIONS)) != EOF)
-	switch (ch) {
-	case 'a':
-	    break;
-	case 'l':
-	    __check_rhosts_file = 0;
-	    break;
-	case 'n':
-	    keepalive = 0;
-	    break;
-	case 'k':
-	    use_kerberos = 1;
-	    break;
-
-	case 'v':
-	    vacuous = 1;
-	    break;
-
-	case 'x':
-	    doencrypt = 1;
-	    break;
-	case 'L':
-	    log_success = 1;
-	    break;
-	case 'p':
-	    portnum = htons(atoi(optarg));
-	    break;
-	case 'P':
-	    new_pag = 0;
-	    break;
-	case 'i':
-	    no_inetd = 1;
-	    break;
-	case '?':
-	default:
-	    usage();
-	    break;
-	}
-
-    argc -= optind;
-    argv += optind;
-
-    if (use_kerberos && vacuous) {
-	syslog(LOG_ERR, "only one of -k and -v allowed");
-	exit(2);
-    }
-    if (doencrypt && !use_kerberos) {
-	syslog(LOG_ERR, "-k is required for -x");
-	exit(2);
-    }
-
-    if (no_inetd) {
-	if(portnum == 0)
-	    portnum = get_shell_port (use_kerberos, doencrypt);
-	mini_inetd (portnum);
-    }
-
-    fromlen = sizeof (from);
-    if (getpeername(0, (struct sockaddr *)&from, &fromlen) < 0) {
-	syslog(LOG_ERR, "getpeername: %m");
-	_exit(1);
-    }
-#ifdef HAVE_SETSOCKOPT
-#ifdef SO_KEEPALIVE
-    if (keepalive &&
-	setsockopt(0, SOL_SOCKET, SO_KEEPALIVE, (void *)&on,
-		   sizeof(on)) < 0)
-	syslog(LOG_WARNING, "setsockopt (SO_KEEPALIVE): %m");
-#endif
-#ifdef SO_LINGER
-    linger.l_onoff = 1;
-    linger.l_linger = 60;			/* XXX */
-    if (setsockopt(0, SOL_SOCKET, SO_LINGER, (void *)&linger,
-		   sizeof (linger)) < 0)
-	syslog(LOG_WARNING, "setsockopt (SO_LINGER): %m");
-#endif
-#endif /* HAVE_SETSOCKOPT */
-    doit(&from);
-    /* NOTREACHED */
-    return 0;
-}
-
-char	username[20] = "USER=";
-char	homedir[64] = "HOME=";
-char	shell[64] = "SHELL=";
-char	path[100] = "PATH=";
-char	*envinit[] =
-{homedir, shell, path, username, 0};
-
-static void
-xgetstr(char *buf, int cnt, char *err)
-{
-    char c;
-
-    do {
-	if (read(STDIN_FILENO, &c, 1) != 1)
-	    exit(1);
-	*buf++ = c;
-	if (--cnt == 0) {
-	    error("%s too long\n", err);
-	    exit(1);
-	}
-    } while (c != 0);
-}
-
-static void
-doit(struct sockaddr_in *fromp)
-{
-    struct passwd *pwd;
-    u_short port;
-    fd_set ready, readfrom;
-    int cc, nfd, pv[2], pid, s;
-    int one = 1;
-    const char *errorhost = "";
-    char *errorstr;
-    char *cp, sig, buf[BUFSIZ];
-    char cmdbuf[NCARGS+1], locuser[16], remuser[16];
-    char remotehost[2 * MaxHostNameLen + 1];
-
-    AUTH_DAT	*kdata;
-    KTEXT		ticket;
-    char		instance[INST_SZ], version[VERSION_SIZE];
-    struct		sockaddr_in	fromaddr;
-    int		rc;
-    long		authopts;
-    int		pv1[2], pv2[2];
-    fd_set		wready, writeto;
-
-    fromaddr = *fromp;
-
-    signal(SIGINT, SIG_DFL);
-    signal(SIGQUIT, SIG_DFL);
-    signal(SIGTERM, SIG_DFL);
-#ifdef DEBUG
-    { int t = open(_PATH_TTY, 2);
-    if (t >= 0) {
-	ioctl(t, TIOCNOTTY, (char *)0);
-	close(t);
-    }
-    }
-#endif
-    fromp->sin_port = ntohs((u_short)fromp->sin_port);
-    if (fromp->sin_family != AF_INET) {
-	syslog(LOG_ERR, "malformed \"from\" address (af %d)\n",
-	       fromp->sin_family);
-	exit(1);
-    }
-
-
-    if (!use_kerberos) {
-	ip_options_and_die (0, fromp);
-	if (fromp->sin_port >= IPPORT_RESERVED ||
-	    fromp->sin_port < IPPORT_RESERVED/2) {
-	    syslog(LOG_NOTICE|LOG_AUTH,
-		   "Connection from %s on illegal port %u",
-		   inet_ntoa(fromp->sin_addr),
-		   fromp->sin_port);
-	    exit(1);
-	}
-    }
-
-    alarm(60);
-    port = 0;
-    for (;;) {
-	char c;
-	if ((cc = read(STDIN_FILENO, &c, 1)) != 1) {
-	    if (cc < 0)
-		syslog(LOG_NOTICE, "read: %m");
-	    shutdown(0, 1+1);
-	    exit(1);
-	}
-	if (c== 0)
-	    break;
-	port = port * 10 + c - '0';
-    }
-
-    alarm(0);
-    if (port != 0) {
-	int lport = IPPORT_RESERVED - 1;
-	s = rresvport(&lport);
-	if (s < 0) {
-	    syslog(LOG_ERR, "can't get stderr port: %m");
-	    exit(1);
-	}
-	if (!use_kerberos)
-	    if (port >= IPPORT_RESERVED) {
-		syslog(LOG_ERR, "2nd port not reserved\n");
-		exit(1);
-	    }
-	fromp->sin_port = htons(port);
-	if (connect(s, (struct sockaddr *)fromp, sizeof (*fromp)) < 0) {
-	    syslog(LOG_INFO, "connect second port %d: %m", port);
-	    exit(1);
-	}
-    }
-
-    if (vacuous) {
-	error("rshd: remote host requires Kerberos authentication\n");
-	exit(1);
-    }
-
-    errorstr = NULL;
-    inaddr2str (fromp->sin_addr, remotehost, sizeof(remotehost));
-
-    if (use_kerberos) {
-	kdata = &authbuf;
-	ticket = &tickbuf;
-	authopts = 0L;
-	k_getsockinst(0, instance, sizeof(instance));
-	version[VERSION_SIZE - 1] = '\0';
-	if (doencrypt) {
-	    struct sockaddr_in local_addr;
-	    rc = sizeof(local_addr);
-	    if (getsockname(0, (struct sockaddr *)&local_addr,
-			    &rc) < 0) {
-		syslog(LOG_ERR, "getsockname: %m");
-		error("rlogind: getsockname: %m");
-		exit(1);
-	    }
-	    authopts = KOPT_DO_MUTUAL;
-	    rc = krb_recvauth(authopts, 0, ticket,
-			      "rcmd", instance, &fromaddr,
-			      &local_addr, kdata, "", schedule,
-			      version);
-#ifndef NOENCRYPTION
-	    des_set_key(&kdata->session, schedule);
-#else
-	    memset(schedule, 0, sizeof(schedule));
-#endif
-	} else
-	    rc = krb_recvauth(authopts, 0, ticket, "rcmd",
-			      instance, &fromaddr,
-			      (struct sockaddr_in *) 0,
-			      kdata, "", 0, version);
-	if (rc != KSUCCESS) {
-	    error("Kerberos authentication failure: %s\n",
-		  krb_get_err_text(rc));
-	    exit(1);
-	}
-    } else
-	xgetstr(remuser, sizeof(remuser), "remuser");
-
-    xgetstr(locuser, sizeof(locuser), "locuser");
-    xgetstr(cmdbuf, sizeof(cmdbuf), "command");
-    setpwent();
-    pwd = k_getpwnam(locuser);
-    if (pwd == NULL) {
-	syslog(LOG_INFO|LOG_AUTH,
-	       "%s@%s as %s: unknown login. cmd='%.80s'",
-	       remuser, remotehost, locuser, cmdbuf);
-	if (errorstr == NULL)
-	    errorstr = "Login incorrect.\n";
-	goto fail;
-    }
-    if (pwd->pw_uid == 0 && strcmp("root", locuser) != 0)
-	{
-	    syslog(LOG_ALERT, "NIS attack, user %s has uid 0", locuser);
-	    if (errorstr == NULL)
-		errorstr = "Login incorrect.\n";
-	    goto fail;
-	}
-    if (chdir(pwd->pw_dir) < 0) {
-	chdir("/");
-#ifdef notdef
-	syslog(LOG_INFO|LOG_AUTH,
-	       "%s@%s as %s: no home directory. cmd='%.80s'",
-	       remuser, remotehost, locuser, cmdbuf);
-	error("No remote directory.\n");
-	exit(1);
-#endif
-    }
-
-    if (use_kerberos) {
-	if (pwd->pw_passwd != 0 && *pwd->pw_passwd != '\0') {
-	    if (kuserok(kdata, locuser) != 0) {
-		syslog(LOG_INFO|LOG_AUTH,
-		       "Kerberos rsh denied to %s",
-		       krb_unparse_name_long(kdata->pname, 
-					     kdata->pinst, 
-					     kdata->prealm));
-		error("Permission denied.\n");
-		exit(1);
-	    }
-	}
-    } else
-
-	if (errorstr ||
-	    pwd->pw_passwd != 0 && *pwd->pw_passwd != '\0' &&
-	    iruserok(fromp->sin_addr.s_addr, pwd->pw_uid == 0,
-		     remuser, locuser) < 0) {
-	    if (__rcmd_errstr)
-		syslog(LOG_INFO|LOG_AUTH,
-		       "%s@%s as %s: permission denied (%s). cmd='%.80s'",
-		       remuser, remotehost, locuser,
-		       __rcmd_errstr, cmdbuf);
-	    else
-		syslog(LOG_INFO|LOG_AUTH,
-		       "%s@%s as %s: permission denied. cmd='%.80s'",
-		       remuser, remotehost, locuser, cmdbuf);
-		     fail:
-	    if (errorstr == NULL)
-		errorstr = "Permission denied.\n";
-	    error(errorstr, errorhost);
-	    exit(1);
-	}
-
-    if (pwd->pw_uid && !access(_PATH_NOLOGIN, F_OK)) {
-	error("Logins currently disabled.\n");
-	exit(1);
-    }
-
-    write(STDERR_FILENO, "\0", 1);
-    sent_null = 1;
-
-    if (port) {
-	if (pipe(pv) < 0) {
-	    error("Can't make pipe.\n");
-	    exit(1);
-	}
-	if (doencrypt) {
-	    if (pipe(pv1) < 0) {
-		error("Can't make 2nd pipe.\n");
-		exit(1);
-	    }
-	    if (pipe(pv2) < 0) {
-		error("Can't make 3rd pipe.\n");
-		exit(1);
-	    }
-	}
-	pid = fork();
-	if (pid == -1)  {
-	    error("Can't fork; try again.\n");
-	    exit(1);
-	}
-	if (pid) {
-	    if (doencrypt) {
-		static char msg[] = SECURE_MESSAGE;
-		close(pv1[1]);
-		close(pv2[0]);
-#ifndef NOENCRYPTION
-		des_enc_write(s, msg, sizeof(msg) - 1, schedule, &kdata->session);
-#else
-		write(s, msg, sizeof(msg) - 1);
-#endif
-	    } else {
-		close(0);
-		close(1);
-	    }
-	    close(2);
-	    close(pv[1]);
-
-	    FD_ZERO(&readfrom);
-	    FD_SET(s, &readfrom);
-	    FD_SET(pv[0], &readfrom);
-	    if (pv[0] > s)
-		nfd = pv[0];
-	    else
-		nfd = s;
-	    if (doencrypt) {
-		FD_ZERO(&writeto);
-		FD_SET(pv2[1], &writeto);
-		FD_SET(pv1[0], &readfrom);
-		FD_SET(STDIN_FILENO, &readfrom);
-
-		nfd = max(nfd, pv2[1]);
-		nfd = max(nfd, pv1[0]);
-	    } else
-		ioctl(pv[0], FIONBIO, (char *)&one);
-
-	    /* should set s nbio! */
-	    nfd++;
-	    do {
-		ready = readfrom;
-		if (doencrypt) {
-		    wready = writeto;
-		    if (select(nfd, &ready,
-			       &wready, 0,
-			       (struct timeval *) 0) < 0)
-			break;
-		} else
-		    if (select(nfd, &ready, 0,
-			       0, (struct timeval *)0) < 0)
-			break;
-		if (FD_ISSET(s, &ready)) {
-		    int	ret;
-		    if (doencrypt)
-#ifndef NOENCRYPTION
-			ret = des_enc_read(s, &sig, 1, schedule, &kdata->session);
-#else
-		    ret = read(s, &sig, 1);
-#endif
-		    else
-			ret = read(s, &sig, 1);
-		    if (ret <= 0)
-			FD_CLR(s, &readfrom);
-		    else
-			kill(-pid, sig);
-		}
-		if (FD_ISSET(pv[0], &ready)) {
-		    errno = 0;
-		    cc = read(pv[0], buf, sizeof(buf));
-		    if (cc <= 0) {
-			shutdown(s, 1+1);
-			FD_CLR(pv[0], &readfrom);
-		    } else {
-			if (doencrypt)
-#ifndef NOENCRYPTION
-			    des_enc_write(s, buf, cc, schedule, &kdata->session);
-#else
-			write(s, buf, cc);
-#endif
-			else
-			    (void)
-				write(s, buf, cc);
-		    }
-		}
-		if (doencrypt && FD_ISSET(pv1[0], &ready)) {
-		    errno = 0;
-		    cc = read(pv1[0], buf, sizeof(buf));
-		    if (cc <= 0) {
-			shutdown(pv1[0], 1+1);
-			FD_CLR(pv1[0], &readfrom);
-		    } else
-#ifndef NOENCRYPTION
-			des_enc_write(STDOUT_FILENO, buf, cc, schedule, &kdata->session);
-#else
-		    write(STDOUT_FILENO, buf, cc);
-#endif
-		}
-
-		if (doencrypt
-		    && FD_ISSET(STDIN_FILENO, &ready)
-		    && FD_ISSET(pv2[1], &wready)) {
-		    errno = 0;
-#ifndef NOENCRYPTION
-		    cc = des_enc_read(STDIN_FILENO, buf, sizeof(buf), schedule, &kdata->session);
-#else
-		    cc = read(STDIN_FILENO, buf, sizeof(buf));
-#endif
-		    if (cc <= 0) {
-			shutdown(STDIN_FILENO, 0);
-			FD_CLR(STDIN_FILENO, &readfrom);
-			close(pv2[1]);
-			FD_CLR(pv2[1], &writeto);
-		    } else
-			write(pv2[1], buf, cc);
-		}
-
-	    } while (FD_ISSET(s, &readfrom) ||
-		     (doencrypt && FD_ISSET(pv1[0], &readfrom)) ||
-		     FD_ISSET(pv[0], &readfrom));
-	    exit(0);
-	}
-	setsid();
-	close(s);
-	close(pv[0]);
-	if (doencrypt) {
-	    close(pv1[0]);
-	    close(pv2[1]);
-	    dup2(pv1[1], 1);
-	    dup2(pv2[0], 0);
-	    close(pv1[1]);
-	    close(pv2[0]);
-	}
-	dup2(pv[1], 2);
-	close(pv[1]);
-    }
-    if (*pwd->pw_shell == '\0')
-	pwd->pw_shell = _PATH_BSHELL;
-#ifdef HAVE_SETLOGIN
-    if (setlogin(pwd->pw_name) < 0)
-	syslog(LOG_ERR, "setlogin() failed: %m");
-#endif
-
-#ifdef HAVE_SETPCRED
-    if (setpcred (pwd->pw_name, NULL) == -1)
-	syslog(LOG_ERR, "setpcred() failure: %m");
-#endif /* HAVE_SETPCRED */
-    setgid((gid_t)pwd->pw_gid);
-    initgroups(pwd->pw_name, pwd->pw_gid);
-    setuid((uid_t)pwd->pw_uid);
-    strncat(homedir, pwd->pw_dir, sizeof(homedir)-6);
-
-    /* Need to extend path to find rcp */
-    strncat(path, BINDIR, sizeof(path)-1);
-    strncat(path, ":", sizeof(path)-1);
-    strncat(path, _PATH_DEFPATH, sizeof(path)-1);
-    path[sizeof(path)-1] = '\0';
-
-    strncat(shell, pwd->pw_shell, sizeof(shell)-7);
-    strncat(username, pwd->pw_name, sizeof(username)-6);
-    cp = strrchr(pwd->pw_shell, '/');
-    if (cp)
-	cp++;
-    else
-	cp = pwd->pw_shell;
-    endpwent();
-    if (log_success || pwd->pw_uid == 0) {
-	if (use_kerberos)
-	    syslog(LOG_INFO|LOG_AUTH,
-		   "Kerberos shell from %s on %s as %s, cmd='%.80s'",
-		   krb_unparse_name_long(kdata->pname, 
-					 kdata->pinst, 
-					 kdata->prealm),
-		   remotehost, locuser, cmdbuf);
-	else
-	    syslog(LOG_INFO|LOG_AUTH, "%s@%s as %s: cmd='%.80s'",
-		   remuser, remotehost, locuser, cmdbuf);
-    }
-    if (k_hasafs()) {
-	if (new_pag)
-	    k_setpag();	/* Put users process in an new pag */
-	k_afsklog(0, 0);
-    }
-    execle(pwd->pw_shell, cp, "-c", cmdbuf, 0, envinit);
-    err(1, pwd->pw_shell);
-}
-
-/*
- * Report error to client.  Note: can't be used until second socket has
- * connected to client, or older clients will hang waiting for that
- * connection first.
- */
-
-static void
-error(const char *fmt, ...)
-{
-    va_list ap;
-    int len;
-    char *bp, buf[BUFSIZ];
-
-    va_start(ap, fmt);
-    bp = buf;
-    if (sent_null == 0) {
-	*bp++ = 1;
-	len = 1;
-    } else
-	len = 0;
-    len = vsnprintf (bp, sizeof(buf) - len, fmt, ap);
-    write (STDERR_FILENO, buf, len);
-    va_end(ap);
-}
-
-static void
-usage()
-{
-
-    syslog(LOG_ERR,
-	   "usage: rshd [-alnkvxLPi] [-p port]");
-    exit(2);
-}
diff --git a/crypto/kerberosIV/appl/bsd/stty_default.c b/crypto/kerberosIV/appl/bsd/stty_default.c
deleted file mode 100644
index b7112c1b6943..000000000000
--- a/crypto/kerberosIV/appl/bsd/stty_default.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "bsd_locl.h"
-
-RCSID("$Id: stty_default.c,v 1.6 1997/04/01 08:17:17 joda Exp $");
-
-#include <termios.h>
-
-/* HP-UX 9.0 termios doesn't define these */
-#ifndef FLUSHO
-#define	FLUSHO	0
-#endif
-
-#ifndef XTABS
-#define	XTABS	0
-#endif
-
-#ifndef OXTABS
-#define OXTABS	XTABS
-#endif
-
-/* Ultrix... */
-#ifndef ECHOPRT
-#define ECHOPRT	0
-#endif
-
-#ifndef ECHOCTL
-#define ECHOCTL	0
-#endif
-
-#ifndef ECHOKE
-#define ECHOKE	0
-#endif
-
-#ifndef IMAXBEL
-#define IMAXBEL	0
-#endif
-
-#define Ctl(x) ((x) ^ 0100)
-
-void
-stty_default(void)
-{
-    struct	termios termios;
-
-    /*
-     * Finalize the terminal settings. Some systems default to 8 bits,
-     * others to 7, so we should leave that alone.
-     */
-    tcgetattr(0, &termios);
-
-    termios.c_iflag |= (BRKINT|IGNPAR|ICRNL|IXON|IMAXBEL);
-    termios.c_iflag &= ~IXANY;
-
-    termios.c_lflag |= (ISIG|IEXTEN|ICANON|ECHO|ECHOE|ECHOK|ECHOCTL|ECHOKE);
-    termios.c_lflag &= ~(ECHOPRT|TOSTOP|FLUSHO);
-
-    termios.c_oflag |= (OPOST|ONLCR);
-    termios.c_oflag &= ~OXTABS;
-
-    termios.c_cc[VINTR] = Ctl('C');
-    termios.c_cc[VERASE] = Ctl('H');
-    termios.c_cc[VKILL] = Ctl('U');
-    termios.c_cc[VEOF] = Ctl('D');
-
-    termios.c_cc[VSUSP] = Ctl('Z');
-    
-    tcsetattr(0, TCSANOW, &termios);
-}
diff --git a/crypto/kerberosIV/appl/bsd/su.c b/crypto/kerberosIV/appl/bsd/su.c
deleted file mode 100644
index 8c610e1d3036..000000000000
--- a/crypto/kerberosIV/appl/bsd/su.c
+++ /dev/null
@@ -1,452 +0,0 @@
-/*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "bsd_locl.h"
-
-RCSID ("$Id: su.c,v 1.59 1997/05/26 17:45:54 bg Exp $");
-
-#ifdef SYSV_SHADOW
-#include "sysv_shadow.h"
-#endif
-
-static int kerberos (char *username, char *user, int uid);
-static int chshell (char *sh);
-static char *ontty (void);
-static int koktologin (char *name, char *realm, char *toname);
-static int chshell (char *sh);
-
-/* Handle '-' option after all the getopt options */
-#define	ARGSTR	"Kflmi:"
-
-static int use_kerberos = 1;
-static char *root_inst = "root";
-
-int
-main (int argc, char **argv)
-{
-    struct passwd *pwd;
-    char *p, **g;
-    struct group *gr;
-    uid_t ruid;
-    int asme, ch, asthem, fastlogin, prio;
-    enum { UNSET, YES, NO } iscsh = UNSET;
-    char *user, *shell, *avshell, *username, **np;
-    char shellbuf[MaxPathLen], avshellbuf[MaxPathLen];
-
-    set_progname (argv[0]);
-
-    asme = asthem = fastlogin = 0;
-    while ((ch = getopt (argc, argv, ARGSTR)) != EOF)
-	switch ((char) ch) {
-	case 'K':
-	    use_kerberos = 0;
-	    break;
-	case 'f':
-	    fastlogin = 1;
-	    break;
-	case 'l':
-	    asme = 0;
-	    asthem = 1;
-	    break;
-	case 'm':
-	    asme = 1;
-	    asthem = 0;
-	    break;
-	case 'i':
-	    root_inst = optarg;
-	    break;
-	case '?':
-	default:
-	    fprintf (stderr,
-		     "usage: su [-Kflm] [-i root-instance] [-] [login]\n");
-	    exit (1);
-	}
-    /* Don't handle '-' option with getopt */
-    if (optind < argc && strcmp (argv[optind], "-") == 0) {
-	asme = 0;
-	asthem = 1;
-	optind++;
-    }
-    argv += optind;
-
-    if (use_kerberos) {
-	int fd = open (KEYFILE, O_RDONLY);
-
-	if (fd >= 0)
-	    close (fd);
-	else
-	    use_kerberos = 0;
-    }
-    errno = 0;
-    prio = getpriority (PRIO_PROCESS, 0);
-    if (errno)
-	prio = 0;
-    setpriority (PRIO_PROCESS, 0, -2);
-    openlog ("su", LOG_CONS, 0);
-
-    /* get current login name and shell */
-    ruid = getuid ();
-    username = getlogin ();
-    if (username == NULL || (pwd = k_getpwnam (username)) == NULL ||
-	pwd->pw_uid != ruid)
-	pwd = k_getpwuid (ruid);
-    if (pwd == NULL)
-	errx (1, "who are you?");
-    username = strdup (pwd->pw_name);
-    if (asme)
-	if (pwd->pw_shell && *pwd->pw_shell)
-	    shell = strcpy (shellbuf, pwd->pw_shell);
-	else {
-	    shell = _PATH_BSHELL;
-	    iscsh = NO;
-	}
-
-    /* get target login information, default to root */
-    user = *argv ? *argv : "root";
-    np = *argv ? argv : argv - 1;
-
-    pwd = k_getpwnam (user);
-    if (pwd == NULL)
-	errx (1, "unknown login %s", user);
-    if (pwd->pw_uid == 0 && strcmp ("root", user) != 0) {
-	syslog (LOG_ALERT, "NIS attack, user %s has uid 0", user);
-	errx (1, "unknown login %s", user);
-    }
-    if (!use_kerberos || kerberos (username, user, pwd->pw_uid)) {
-#ifndef PASSWD_FALLBACK
-	errx (1, "won't use /etc/passwd authentication");
-#endif
-	/* getpwnam() is not reentrant and kerberos might use it! */
-	pwd = k_getpwnam (user);
-	if (pwd == NULL)
-	    errx (1, "unknown login %s", user);
-	/* only allow those in group zero to su to root. */
-	if (pwd->pw_uid == 0 && (gr = getgrgid ((gid_t) 0)))
-	    for (g = gr->gr_mem;; ++g) {
-		if (!*g) {
-#if 1
-		    /* if group 0 is empty or only 
-		       contains root su is still ok. */
-		    if (gr->gr_mem[0] == 0)
-			break;	/* group 0 is empty */
-		    if (gr->gr_mem[1] == 0 &&
-			strcmp (gr->gr_mem[0], "root") == 0)
-			break;	/* only root in group 0 */
-#endif
-		    errx (1, "you are not in the correct group to su %s.",
-			  user);
-		}
-		if (!strcmp (username, *g))
-		    break;
-	    }
-	/* if target requires a password, verify it */
-	if (ruid && *pwd->pw_passwd) {
-	    char prompt[128];
-	    char passwd[256];
-
-	    snprintf (prompt, sizeof(prompt), "%s's Password: ", pwd->pw_name);
-	    if (des_read_pw_string (passwd, sizeof (passwd),
-				    prompt, 0)) {
-		memset (passwd, 0, sizeof (passwd));
-		exit (1);
-	    }
-	    if (strcmp (pwd->pw_passwd,
-			crypt (passwd, pwd->pw_passwd))) {
-		memset (passwd, 0, sizeof (passwd));
-		syslog (LOG_AUTH | LOG_WARNING,
-			"BAD SU %s to %s%s", username,
-			user, ontty ());
-		errx (1, "Sorry");
-	    }
-	    memset (passwd, 0, sizeof (passwd));
-	}
-    }
-    if (asme) {
-	/* if asme and non-standard target shell, must be root */
-	if (!chshell (pwd->pw_shell) && ruid)
-	    errx (1, "permission denied (shell '%s' not in /etc/shells).",
-		  pwd->pw_shell);
-    } else if (pwd->pw_shell && *pwd->pw_shell) {
-	shell = pwd->pw_shell;
-	iscsh = UNSET;
-    } else {
-	shell = _PATH_BSHELL;
-	iscsh = NO;
-    }
-
-    if ((p = strrchr (shell, '/')) != 0)
-	avshell = p + 1;
-    else
-	avshell = shell;
-
-    /* if we're forking a csh, we want to slightly muck the args */
-    if (iscsh == UNSET)
-	iscsh = strcmp (avshell, "csh") ? NO : YES;
-
-    /* set permissions */
-
-    if (setgid (pwd->pw_gid) < 0)
-	err (1, "setgid");
-    if (initgroups (user, pwd->pw_gid))
-	errx (1, "initgroups failed.");
-
-    if (setuid (pwd->pw_uid) < 0)
-	err (1, "setuid");
-
-    if (!asme) {
-	if (asthem) {
-	    char *k = getenv ("KRBTKFILE");
-	    char *t = getenv ("TERM");
-
-	    environ = malloc (10 * sizeof (char *));
-	    environ[0] = NULL;
-	    setenv ("PATH", _PATH_DEFPATH, 1);
-	    if (t)
-		setenv ("TERM", t, 1);
-	    if (k)
-		setenv ("KRBTKFILE", k, 1);
-	    if (chdir (pwd->pw_dir) < 0)
-		errx (1, "no directory");
-	}
-	if (asthem || pwd->pw_uid)
-	    setenv ("USER", pwd->pw_name, 1);
-	setenv ("HOME", pwd->pw_dir, 1);
-	setenv ("SHELL", shell, 1);
-    }
-    if (iscsh == YES) {
-	if (fastlogin)
-	    *np-- = "-f";
-	if (asme)
-	    *np-- = "-m";
-    }
-    if (asthem) {
-	avshellbuf[0] = '-';
-	strcpy (avshellbuf + 1, avshell);
-	avshell = avshellbuf;
-    } else if (iscsh == YES) {
-	/* csh strips the first character... */
-	avshellbuf[0] = '_';
-	strcpy (avshellbuf + 1, avshell);
-	avshell = avshellbuf;
-    }
-    *np = avshell;
-
-    if (ruid != 0)
-	syslog (LOG_NOTICE | LOG_AUTH, "%s to %s%s",
-		username, user, ontty ());
-
-    setpriority (PRIO_PROCESS, 0, prio);
-
-    if (k_hasafs ()) {
-	int code;
-
-	if (k_setpag () != 0)
-	    warn ("setpag");
-	code = k_afsklog (0, 0);
-	if (code != KSUCCESS && code != KDC_PR_UNKNOWN)
-	    warnx ("afsklog: %s", krb_get_err_text (code));
-    }
-    execv (shell, np);
-    warn ("execv(%s)", shell);
-    if (getuid () == 0) {
-	execv (_PATH_BSHELL, np);
-	warn ("execv(%s)", _PATH_BSHELL);
-    }
-    exit (1);
-}
-
-static int
-chshell (char *sh)
-{
-    char *cp;
-
-    while ((cp = getusershell ()) != NULL)
-	if (!strcmp (cp, sh))
-	    return (1);
-    return (0);
-}
-
-static char *
-ontty (void)
-{
-    char *p;
-    static char buf[MaxPathLen + 4];
-
-    buf[0] = 0;
-    if ((p = ttyname (STDERR_FILENO)) != 0)
-	snprintf (buf, sizeof(buf), " on %s", p);
-    return (buf);
-}
-
-static int
-kerberos (char *username, char *user, int uid)
-{
-    KTEXT_ST ticket;
-    AUTH_DAT authdata;
-    struct hostent *hp;
-    int kerno;
-    u_long faddr;
-    char lrealm[REALM_SZ], krbtkfile[MaxPathLen];
-    char hostname[MaxHostNameLen], savehost[MaxHostNameLen];
-
-    if (krb_get_lrealm (lrealm, 1) != KSUCCESS)
-	return (1);
-    if (koktologin (username, lrealm, user) && !uid) {
-#ifndef PASSWD_FALLBACK
-	warnx ("not in %s's ACL.", user);
-#endif
-	return (1);
-    }
-    snprintf (krbtkfile, sizeof(krbtkfile),
-	      "%s_%s_to_%s_%u", TKT_ROOT, username, user,
-	     (unsigned) getpid ());
-
-    setenv ("KRBTKFILE", krbtkfile, 1);
-    krb_set_tkt_string (krbtkfile);
-    /*
-     * Little trick here -- if we are su'ing to root, we need to get a ticket
-     * for "xxx.root", where xxx represents the name of the person su'ing.
-     * Otherwise (non-root case), we need to get a ticket for "yyy.", where
-     * yyy represents the name of the person being su'd to, and the instance
-     * is null 
-     *
-     * We should have a way to set the ticket lifetime, with a system default
-     * for root. 
-     */
-    {
-	char prompt[128];
-	char passw[256];
-
-	snprintf (prompt, sizeof(prompt),
-		  "%s's Password: ",
-		  krb_unparse_name_long ((uid == 0 ? username : user),
-					 (uid == 0 ? root_inst : ""),
-					 lrealm));
-	if (des_read_pw_string (passw, sizeof (passw), prompt, 0)) {
-	    memset (passw, 0, sizeof (passw));
-	    return (1);
-	}
-	if (strlen(passw) == 0)
-	    return (1);		/* Empty passwords is not allowed */
-	kerno = krb_get_pw_in_tkt ((uid == 0 ? username : user),
-				   (uid == 0 ? root_inst : ""), lrealm,
-				   KRB_TICKET_GRANTING_TICKET,
-				   lrealm,
-				   DEFAULT_TKT_LIFE,
-				   passw);
-	memset (passw, 0, strlen (passw));
-    }
-
-    if (kerno != KSUCCESS) {
-	if (kerno == KDC_PR_UNKNOWN) {
-	    warnx ("principal unknown: %s",
-		   krb_unparse_name_long ((uid == 0 ? username : user),
-					  (uid == 0 ? root_inst : ""),
-					  lrealm));
-	    return (1);
-	}
-	warnx ("unable to su: %s", krb_get_err_text (kerno));
-	syslog (LOG_NOTICE | LOG_AUTH,
-		"BAD SU: %s to %s%s: %s",
-		username, user, ontty (), krb_get_err_text (kerno));
-	return (1);
-    }
-    if (chown (krbtkfile, uid, -1) < 0) {
-	warn ("chown");
-	unlink (krbtkfile);
-	return (1);
-    }
-    setpriority (PRIO_PROCESS, 0, -2);
-
-    if (k_gethostname (hostname, sizeof (hostname)) == -1) {
-	warn ("gethostname");
-	dest_tkt ();
-	return (1);
-    }
-    strncpy (savehost, krb_get_phost (hostname), sizeof (savehost));
-    savehost[sizeof (savehost) - 1] = '\0';
-
-    kerno = krb_mk_req (&ticket, "rcmd", savehost, lrealm, 33);
-
-    if (kerno == KDC_PR_UNKNOWN) {
-	warnx ("Warning: TGT not verified.");
-	syslog (LOG_NOTICE | LOG_AUTH,
-		"%s to %s%s, TGT not verified (%s); "
-		"%s.%s not registered?",
-		username, user, ontty (), krb_get_err_text (kerno),
-		"rcmd", savehost);
-#ifdef KLOGIN_PARANOID
-	/*
-	 * if the "VERIFY_SERVICE" doesn't exist in the KDC for this host, *
-	 * don't allow kerberos login, also log the error condition. 
-	 */
-	warnx ("Trying local password!");
-	return (1);
-#endif
-    } else if (kerno != KSUCCESS) {
-	warnx ("Unable to use TGT: %s", krb_get_err_text (kerno));
-	syslog (LOG_NOTICE | LOG_AUTH, "failed su: %s to %s%s: %s",
-		username, user, ontty (), krb_get_err_text (kerno));
-	dest_tkt ();
-	return (1);
-    } else {
-	if (!(hp = gethostbyname (hostname))) {
-	    warnx ("can't get addr of %s", hostname);
-	    dest_tkt ();
-	    return (1);
-	}
-	memcpy (&faddr, hp->h_addr, sizeof (faddr));
-
-	if ((kerno = krb_rd_req (&ticket, "rcmd", savehost, faddr,
-				 &authdata, "")) != KSUCCESS) {
-	    warnx ("unable to verify rcmd ticket: %s",
-		   krb_get_err_text (kerno));
-	    syslog (LOG_NOTICE | LOG_AUTH,
-		    "failed su: %s to %s%s: %s", username,
-		    user, ontty (), krb_get_err_text (kerno));
-	    dest_tkt ();
-	    return (1);
-	}
-    }
-    fprintf (stderr, "Don't forget to kdestroy before exiting the shell.\n");
-    return (0);
-}
-
-static int
-koktologin (char *name, char *realm, char *toname)
-{
-    return krb_kuserok (name,
-			strcmp (toname, "root") == 0 ? root_inst : "",
-			realm,
-			toname);
-}
diff --git a/crypto/kerberosIV/appl/bsd/sysv_default.c b/crypto/kerberosIV/appl/bsd/sysv_default.c
deleted file mode 100644
index cb36b849454f..000000000000
--- a/crypto/kerberosIV/appl/bsd/sysv_default.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Author: Wietse Venema <wietse@wzv.win.tue.nl> */
-
-#include "bsd_locl.h"
-
-RCSID("$Id: sysv_default.c,v 1.9 1997/03/31 01:47:59 assar Exp $");
-
-#include "sysv_default.h"
-
- /*
-  * Default values for stuff that can be read from the defaults file. The
-  * SunOS 5.1 documentation is incomplete and often disagrees with reality.
-  */
-
-static char default_umask_value[] = "022";
-
-char   *default_console	= 0;
-char   *default_altsh	= "YES";
-char   *default_passreq	= "NO";
-char   *default_timezone= 0;
-char   *default_hz	= 0;
-char   *default_path	= _PATH_DEFPATH;
-char   *default_supath	= _PATH_DEFSUPATH;
-char   *default_ulimit	= 0;
-char   *default_timeout	= "60";
-char   *default_umask	= default_umask_value;
-char   *default_sleep	= "4";
-char   *default_maxtrys	= "5";
-
-static struct sysv_default {
-    char  **valptr;
-    char   *prefix;
-    int     prefix_len;
-} defaults[] = {
-    {&default_console,	"CONSOLE=",	sizeof("CONSOLE=") -1},
-    {&default_altsh,	"ALTSHELL=",	sizeof("ALTSHELL=") -1},
-    {&default_passreq,	"PASSREQ=",	sizeof("PASSREQ=") -1},
-    {&default_timezone,	"TIMEZONE=",	sizeof("TIMEZONE=") -1},
-    {&default_hz,	"HZ=",		sizeof("HZ=") -1},
-    {&default_path,	"PATH=",	sizeof("PATH=") -1},
-    {&default_supath,	"SUPATH=",	sizeof("SUPATH=") -1},
-    {&default_ulimit,	"ULIMIT=",	sizeof("ULIMIT=") -1},
-    {&default_timeout,	"TIMEOUT=",	sizeof("TIMEOUT=") -1},
-    {&default_umask,	"UMASK=",	sizeof("UMASK=") -1},
-    {&default_sleep,	"SLEEPTIME=",	sizeof("SLEEPTIME=") -1},
-    {&default_maxtrys,	"MAXTRYS=",	sizeof("MAXTRYS=") -1},
-    {0},
-};
-
-#define trim(s) { \
-	char   *cp = s + strlen(s); \
-	while (cp > s && isspace(cp[-1])) \
-	    cp--; \
-	*cp = 0; \
-}
-
-/* sysv_defaults - read login defaults file */
-
-void
-sysv_defaults()
-{
-    struct sysv_default *dp;
-    FILE   *fp;
-    char    buf[BUFSIZ];
-
-    if ((fp = fopen(_PATH_ETC_DEFAULT_LOGIN, "r"))) {
-
-	/* Stupid quadratic algorithm. */
-
-	while (fgets(buf, sizeof(buf), fp)) {
-
-	    /* Skip comments and blank lines. */
-
-	    if (buf[0] == '#')
-		continue;
-	    trim(buf);
-	    if (buf[0] == 0)
-		continue;
-
-	    /* Assign defaults from file. */
-
-#define STREQN(x,y,l) (x[0] == y[0] && strncmp(x,y,l) == 0)
-
-	    for (dp = defaults; dp->valptr; dp++) {
-		if (STREQN(buf, dp->prefix, dp->prefix_len)) {
-		    if ((*(dp->valptr) = strdup(buf + dp->prefix_len)) == 0) {
-			warnx("Insufficient memory resources - try later.");
-			sleepexit(1);
-		    }
-		    break;
-		}
-	    }
-	}
-	fclose(fp);
-    }
-}
diff --git a/crypto/kerberosIV/appl/bsd/sysv_default.h b/crypto/kerberosIV/appl/bsd/sysv_default.h
deleted file mode 100644
index 00560594d3c9..000000000000
--- a/crypto/kerberosIV/appl/bsd/sysv_default.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Author: Wietse Venema <wietse@wzv.win.tue.nl> */
-
-/* $Id: sysv_default.h,v 1.5 1996/10/27 23:51:14 assar Exp $ */
-
-extern char *default_console;
-extern char *default_altsh;
-extern char *default_passreq;
-extern char *default_timezone;
-extern char *default_hz;
-extern char *default_path;
-extern char *default_supath;
-extern char *default_ulimit;
-extern char *default_timeout;
-extern char *default_umask;
-extern char *default_sleep;
-extern char *default_maxtrys;
-
-void sysv_defaults(void);
diff --git a/crypto/kerberosIV/appl/bsd/sysv_environ.c b/crypto/kerberosIV/appl/bsd/sysv_environ.c
deleted file mode 100644
index f5e782d0da38..000000000000
--- a/crypto/kerberosIV/appl/bsd/sysv_environ.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/* Author: Wietse Venema <wietse@wzv.win.tue.nl> */
-
-#include "bsd_locl.h"
-
-RCSID("$Id: sysv_environ.c,v 1.21 1997/05/14 17:34:15 joda Exp $");
-
-#ifdef HAVE_ULIMIT_H
-#include <ulimit.h>
-#endif
-
-#ifndef UL_SETFSIZE
-#define UL_SETFSIZE 2
-#endif
-
-#include "sysv_default.h"
-
-/*
- * Set 
- */
-
-static void
-read_etc_environment (void)
-{
-    FILE *f;
-    char buf[BUFSIZ];
-
-    f = fopen(_PATH_ETC_ENVIRONMENT, "r");
-    if (f) {
-	char *val;
-
-	while (fgets (buf, sizeof(buf), f) != NULL) {
-	    if (buf[0] == '\n' || buf[0] == '#')
-		continue;
-	    buf[strlen(buf) - 1] = '\0';
-	    val = strchr (buf, '=');
-	    if (val == NULL)
-		continue;
-	    *val = '\0';
-	    setenv(buf, val + 1, 1);
-	}
-	fclose (f);
-    }
-}
-
- /*
-  * Environment variables that are preserved (but may still be overruled by
-  * other means). Only TERM and TZ appear to survive (SunOS 5.1). These are
-  * typically inherited from the ttymon process.
-  */
-
-static struct preserved {
-    char   *name;
-    char   *value;
-} preserved[] = {
-    {"TZ", 0},
-    {"TERM", 0},
-    {0},
-};
-
- /*
-  * Environment variables that are not preserved and that cannot be specified
-  * via commandline or stdin. Except for the LD_xxx (runtime linker) stuff,
-  * the list applies to most SYSV systems. The manpage mentions only that
-  * SHELL and PATH are censored. HOME, LOGNAME and MAIL are always
-  * overwritten; they are in the list to make the censoring explicit.
-  */
-
-static struct censored {
-    char   *prefix;
-    int     length;
-} censored[] = {
-  {"SHELL=",	sizeof("SHELL=") - 1},
-     {"HOME=",	sizeof("HOME=") - 1},
-     {"LOGNAME=",	sizeof("LOGNAME=") - 1},
-     {"MAIL=",	sizeof("MAIL=") - 1},
-     {"CDPATH=",	sizeof("CDPATH=") - 1},
-     {"IFS=",	sizeof("IFS=") - 1},
-     {"PATH=",	sizeof("PATH=") - 1},
-    {"LD_",	sizeof("LD_") - 1},
-    {0},
-};
-
-/* sysv_newenv - set up final environment after logging in */
-
-void sysv_newenv(int argc, char **argv, struct passwd *pwd,
-		 char *term, int pflag)
-{
-    unsigned umask_val;
-    long    limit_val;
-    char    buf[BUFSIZ];
-    int     count = 0;
-    struct censored *cp;
-    struct preserved *pp;
-
-    /* Preserve a selection of the environment. */
-
-    for (pp = preserved; pp->name; pp++)
-	pp->value = getenv(pp->name);
-
-    /*
-     * Note: it is a bad idea to assign a static array to the global environ
-     * variable. Reason is that putenv() can run into problems when it tries
-     * to realloc() the environment table. Instead, we just clear environ[0]
-     * and let putenv() work things out.
-     */
-
-    if (!pflag && environ)
-	environ[0] = 0;
-
-    /* Restore preserved environment variables. */
-
-    for (pp = preserved; pp->name; pp++)
-	if (pp->value)
-	    setenv(pp->name, pp->value, 1);
-
-    /* The TERM definition from e.g. rlogind can override an existing one. */
-
-    if (term[0])
-	setenv("TERM", term, 1);
-
-    /*
-     * Environment definitions from the command line overrule existing ones,
-     * but can be overruled by definitions from stdin. Some variables are
-     * censored.
-     * 
-     * Omission: we do not support environment definitions from stdin.
-     */
-
-#define STREQN(x,y,l) (x[0] == y[0] && strncmp(x,y,l) == 0)
-
-    while (argc && *argv) {
-	if (strchr(*argv, '=') == 0) {
-	    snprintf(buf, sizeof(buf), "L%d", count++);
-	    setenv(buf, *argv, 1);
-	} else {
-	    for (cp = censored; cp->prefix; cp++)
-		if (STREQN(*argv, cp->prefix, cp->length))
-		    break;
-	    if (cp->prefix == 0)
-		putenv(*argv);
-	}
-	argc--, argv++;
-    }
-
-    /* PATH is always reset. */
-
-    setenv("PATH", pwd->pw_uid ? default_path : default_supath, 1);
-
-    /* Undocumented: HOME, MAIL and LOGNAME are always reset (SunOS 5.1). */
-
-    setenv("HOME", pwd->pw_dir, 1);
-    {
-	char *sep = "/";
-	if(KRB4_MAILDIR[strlen(KRB4_MAILDIR) - 1] == '/')
-	    sep = "";
-	k_concat(buf, sizeof(buf), KRB4_MAILDIR, sep, pwd->pw_name, NULL);
-    }
-    setenv("MAIL", buf, 1);
-    setenv("LOGNAME", pwd->pw_name, 1);
-    setenv("USER", pwd->pw_name, 1);
-
-    /*
-     * Variables that may be set according to specifications in the defaults
-     * file. HZ and TZ are set only if they are still uninitialized.
-     * 
-     * Extension: when ALTSHELL=YES, we set the SHELL variable even if it is
-     * /bin/sh.
-     */
-
-    if (strcasecmp(default_altsh, "YES") == 0)
-	setenv("SHELL", pwd->pw_shell, 1);
-    if (default_hz)
-	setenv("HZ", default_hz, 0);
-    if (default_timezone)
-	setenv("TZ", default_timezone, 0);
-
-    /* Non-environment stuff. */
-
-    if (default_umask) {
-	if (sscanf(default_umask, "%o", &umask_val) == 1 && umask_val)
-	    umask(umask_val);
-    }
-#ifdef HAVE_ULIMIT
-    if (default_ulimit) {
-	if (sscanf(default_ulimit, "%ld", &limit_val) == 1 && limit_val)
-	    if (ulimit(UL_SETFSIZE, limit_val) < 0)
-	        warn ("ulimit(UL_SETFSIZE, %ld)", limit_val);
-    }
-#endif
-    read_etc_environment();
-}
-
diff --git a/crypto/kerberosIV/appl/bsd/sysv_shadow.c b/crypto/kerberosIV/appl/bsd/sysv_shadow.c
deleted file mode 100644
index 68394414129c..000000000000
--- a/crypto/kerberosIV/appl/bsd/sysv_shadow.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Author: Wietse Venema <wietse@wzv.win.tue.nl> */
-
-#include "bsd_locl.h"
-
-RCSID("$Id: sysv_shadow.c,v 1.7 1997/03/23 04:56:05 assar Exp $");
-
-#ifdef SYSV_SHADOW
-
-#include <sysv_shadow.h>
-
-/* sysv_expire - check account and password expiration times */
-
-int
-sysv_expire(struct spwd *spwd)
-{
-    long    today;
-
-    tzset();
-    today = time(0);
-
-    if (spwd->sp_expire > 0) {
-	if (today > spwd->sp_expire) {
-	    printf("Your account has expired.\n");
-	    sleepexit(1);
-	} else if (spwd->sp_expire - today < 14) {
-	    printf("Your account will expire in %d days.\n",
-		   (int)(spwd->sp_expire - today));
-	    return (0);
-	}
-    }
-    if (spwd->sp_max > 0) {
-	if (today > (spwd->sp_lstchg + spwd->sp_max)) {
-	    printf("Your password has expired. Choose a new one.\n");
-	    return (1);
-	} else if (spwd->sp_warn > 0
-	    && (today > (spwd->sp_lstchg + spwd->sp_max - spwd->sp_warn))) {
-	    printf("Your password will expire in %d days.\n",
-		   (int)(spwd->sp_lstchg + spwd->sp_max - today));
-	    return (0);
-	}
-    }
-    return (0);
-}
-
-#endif /* SYSV_SHADOW */
diff --git a/crypto/kerberosIV/appl/bsd/sysv_shadow.h b/crypto/kerberosIV/appl/bsd/sysv_shadow.h
deleted file mode 100644
index 4f07b49a0d23..000000000000
--- a/crypto/kerberosIV/appl/bsd/sysv_shadow.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* $Id: sysv_shadow.h,v 1.6 1997/03/23 04:55:51 assar Exp $ */
-
-#include <shadow.h>
-
-extern sysv_expire(struct spwd *);
diff --git a/crypto/kerberosIV/appl/bsd/tty.c b/crypto/kerberosIV/appl/bsd/tty.c
deleted file mode 100644
index 3192426a8a54..000000000000
--- a/crypto/kerberosIV/appl/bsd/tty.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "bsd_locl.h"
-
-RCSID("$Id: tty.c,v 1.2 1997/05/25 01:14:22 assar Exp $");
-
-/*
- * Clean the tty name.  Return a pointer to the cleaned version.
- */
-
-char *
-clean_ttyname (char *tty)
-{
-  char *res = tty;
-
-  if (strncmp (res, _PATH_DEV, strlen(_PATH_DEV)) == 0)
-    res += strlen(_PATH_DEV);
-  if (strncmp (res, "pty/", 4) == 0)
-    res += 4;
-  if (strncmp (res, "ptym/", 5) == 0)
-    res += 5;
-  return res;
-}
-
-/*
- * Generate a name usable as an `ut_id', typically without `tty'.
- */
-
-char *
-make_id (char *tty)
-{
-  char *res = tty;
-  
-  if (strncmp (res, "pts/", 4) == 0)
-    res += 4;
-  if (strncmp (res, "tty", 3) == 0)
-    res += 3;
-  return res;
-}
diff --git a/crypto/kerberosIV/appl/bsd/utmp_login.c b/crypto/kerberosIV/appl/bsd/utmp_login.c
deleted file mode 100644
index da3f96a99047..000000000000
--- a/crypto/kerberosIV/appl/bsd/utmp_login.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "bsd_locl.h"
-
-RCSID("$Id: utmp_login.c,v 1.13 1997/05/20 13:46:21 assar Exp $");
-
-void
-prepare_utmp (struct utmp *utmp, char *tty, char *username, char *hostname)
-{
-    char *ttyx = clean_ttyname (tty);
-
-    memset(utmp, 0, sizeof(*utmp));
-    utmp->ut_time = time(NULL);
-    strncpy(utmp->ut_line, ttyx, sizeof(utmp->ut_line));
-    strncpy(utmp->ut_name, username, sizeof(utmp->ut_name));
-
-# ifdef HAVE_UT_USER
-    strncpy(utmp->ut_user, username, sizeof(utmp->ut_user));
-# endif
-
-# ifdef HAVE_UT_ADDR
-    if (hostname[0]) {
-        struct hostent *he;
-	if ((he = gethostbyname(hostname)))
-	    memcpy(&utmp->ut_addr, he->h_addr_list[0],
-		   sizeof(utmp->ut_addr));
-    }
-# endif
-
-# ifdef HAVE_UT_HOST
-    strncpy(utmp->ut_host, hostname, sizeof(utmp->ut_host));
-# endif
-
-# ifdef HAVE_UT_TYPE
-    utmp->ut_type = USER_PROCESS;
-# endif
-
-# ifdef HAVE_UT_PID
-    utmp->ut_pid = getpid();
-# endif
-
-# ifdef HAVE_UT_ID
-    strncpy(utmp->ut_id, make_id(ttyx), sizeof(utmp->ut_id));
-# endif
-}
-
-#ifdef HAVE_UTMPX_H
-void utmp_login(char *tty, char *username, char *hostname) { return; }
-#else
-
-/* update utmp and wtmp - the BSD way */
-
-void utmp_login(char *tty, char *username, char *hostname)
-{
-    struct utmp utmp;
-    int fd;
-
-    prepare_utmp (&utmp, tty, username, hostname);
-
-#ifdef HAVE_SETUTENT
-    utmpname(_PATH_UTMP);
-    setutent();
-    pututline(&utmp);
-    endutent();
-#else
-
-#ifdef HAVE_TTYSLOT
-    {
-      int ttyno;
-      ttyno = ttyslot();
-      if (ttyno > 0 && (fd = open(_PATH_UTMP, O_WRONLY, 0)) >= 0) {
-	lseek(fd, (long)(ttyno * sizeof(struct utmp)), SEEK_SET);
-	write(fd, &utmp, sizeof(struct utmp));
-	close(fd);
-      }
-    }
-#endif /* HAVE_TTYSLOT */
-#endif /* HAVE_SETUTENT */
-
-    if ((fd = open(_PATH_WTMP, O_WRONLY|O_APPEND, 0)) >= 0) {
-	write(fd, &utmp, sizeof(struct utmp));
-	close(fd);
-    }
-}
-#endif /* !HAVE_UTMPX_H */
diff --git a/crypto/kerberosIV/appl/bsd/utmpx_login.c b/crypto/kerberosIV/appl/bsd/utmpx_login.c
deleted file mode 100644
index 005eca56b30b..000000000000
--- a/crypto/kerberosIV/appl/bsd/utmpx_login.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Author: Wietse Venema <wietse@wzv.win.tue.nl> */
-
-#include "bsd_locl.h"
-
-RCSID("$Id: utmpx_login.c,v 1.20 1997/06/01 03:13:15 assar Exp $");
-
-/* utmpx_login - update utmp and wtmp after login */
-
-#ifndef HAVE_UTMPX_H
-int utmpx_login(char *line, char *user, char *host) { return 0; }
-#else
-
-static void
-utmpx_update(struct utmpx *ut, char *line, char *user, char *host)
-{
-    struct timeval tmp;
-    char *clean_tty = clean_ttyname(line);
-
-    strncpy(ut->ut_line, clean_tty, sizeof(ut->ut_line));
-#ifdef HAVE_UT_ID
-    strncpy(ut->ut_id, make_id(clean_tty), sizeof(ut->ut_id));
-#endif
-    strncpy(ut->ut_user, user, sizeof(ut->ut_user));
-    strncpy(ut->ut_host, host, sizeof(ut->ut_host));
-#ifdef HAVE_UT_SYSLEN
-    ut->ut_syslen = strlen(host) + 1;
-    if (ut->ut_syslen > sizeof(ut->ut_host))
-        ut->ut_syslen = sizeof(ut->ut_host);
-#endif
-    ut->ut_type = USER_PROCESS;
-    gettimeofday (&tmp, 0);
-    ut->ut_tv.tv_sec = tmp.tv_sec;
-    ut->ut_tv.tv_usec = tmp.tv_usec;
-    pututxline(ut);
-#ifdef WTMPX_FILE
-    updwtmpx(WTMPX_FILE, ut);
-#elif defined(WTMP_FILE)
-    {
-	struct utmp utmp;
-	int fd;
-
-	prepare_utmp (&utmp, line, user, host);
-	if ((fd = open(_PATH_WTMP, O_WRONLY|O_APPEND, 0)) >= 0) {
-	    write(fd, &utmp, sizeof(struct utmp));
-	    close(fd);
-	}
-    }
-#endif
-}
-
-int
-utmpx_login(char *line, char *user, char *host)
-{
-    struct utmpx *ut;
-    pid_t   mypid = getpid();
-    int     ret = (-1);
-
-    /*
-     * SYSV4 ttymon and login use tty port names with the "/dev/" prefix
-     * stripped off. Rlogind and telnetd, on the other hand, make utmpx
-     * entries with device names like /dev/pts/nnn. We therefore cannot use
-     * getutxline(). Return nonzero if no utmp entry was found with our own
-     * process ID for a login or user process.
-     */
-
-    while ((ut = getutxent())) {
-        /* Try to find a reusable entry */
-	if (ut->ut_pid == mypid
-	    && (   ut->ut_type == INIT_PROCESS
-		|| ut->ut_type == LOGIN_PROCESS
-		|| ut->ut_type == USER_PROCESS)) {
-	    utmpx_update(ut, line, user, host);
-	    ret = 0;
-	    break;
-	}
-    }
-    if (ret == -1) {
-        /* Grow utmpx file by one record. */
-        struct utmpx newut;
-	memset(&newut, 0, sizeof(newut));
-	newut.ut_pid = mypid;
-        utmpx_update(&newut, line, user, host);
-	ret = 0;
-    }
-    endutxent();
-    return (ret);
-}
-#endif /* HAVE_UTMPX_H */
diff --git a/crypto/kerberosIV/appl/ftp/Makefile.in b/crypto/kerberosIV/appl/ftp/Makefile.in
deleted file mode 100644
index 6d0c4207ee48..000000000000
--- a/crypto/kerberosIV/appl/ftp/Makefile.in
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: Makefile.in,v 1.9 1997/03/23 13:03:54 assar Exp $
-
-srcdir		= @srcdir@
-top_srcdir	= @top_srcdir@
-VPATH		= @srcdir@
-
-SHELL		= /bin/sh
-
-@SET_MAKE@
-
-CC 	= @CC@
-RANLIB 	= @RANLIB@
-DEFS 	= @DEFS@
-CFLAGS 	= @CFLAGS@
-
-INSTALL = @INSTALL@
-
-prefix 	= @prefix@
-
-SUBDIRS=common ftp ftpd
-
-all:
-	for i in $(SUBDIRS); \
-	do (cd $$i && $(MAKE) $(MFLAGS) all); done
-
-install: all
-	for i in $(SUBDIRS); \
-	do (cd $$i && $(MAKE) $(MFLAGS) install); done
-
-uninstall:
-	for i in $(SUBDIRS); \
-	do (cd $$i && $(MAKE) $(MFLAGS) uninstall); done
-
-clean cleandir:
-	for i in $(SUBDIRS); \
-	do (cd $$i && $(MAKE) $(MFLAGS) clean); done
-
-distclean: 
-	for i in $(SUBDIRS); \
-	do (cd $$i && $(MAKE) $(MFLAGS) distclean); done
-	rm -f Makefile *~
diff --git a/crypto/kerberosIV/appl/ftp/common/Makefile.in b/crypto/kerberosIV/appl/ftp/common/Makefile.in
deleted file mode 100644
index 9ce1aa598bd1..000000000000
--- a/crypto/kerberosIV/appl/ftp/common/Makefile.in
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: Makefile.in,v 1.17 1997/05/18 20:00:06 assar Exp $
-
-SHELL		= /bin/sh
-
-srcdir		= @srcdir@
-top_srcdir	= @top_srcdir@
-VPATH		= @srcdir@
-
-CC 	= @CC@
-AR	= ar
-RANLIB 	= @RANLIB@
-DEFS 	= @DEFS@
-CFLAGS 	= @CFLAGS@
-
-INSTALL = @INSTALL@
-
-prefix 	= @prefix@
-
-SOURCES = base64.c glob.c sockbuf.c buffer.c
-OBJECTS = $(libcommon_OBJS)
-
-libcommon_OBJS = base64.o glob.o sockbuf.o buffer.o
-
-LIBNAME = $(LIBPREFIX)common
-LIBEXT = a
-LIBPREFIX = @LIBPREFIX@
-LIB = $(LIBNAME).$(LIBEXT)
-
-all: $(LIB)
-
-.c.o:
-	$(CC) -c $(CFLAGS) -I$(srcdir) -I../../../include $(DEFS) $<
-
-$(LIB): $(libcommon_OBJS)
-	rm -f $@
-	ar cr $@ $(libcommon_OBJS)
-	-$(RANLIB) $@
-
-install:
-
-uninstall:
-
-TAGS: $(SOURCES)
-	etags $(SOURCES)
-
-clean cleandir:
-	rm -f *~ *.o libcommon.a core \#*
-
-distclean: 
-	rm -f Makefile
-
-$(OBJECTS): ../../../include/config.h
diff --git a/crypto/kerberosIV/appl/ftp/common/base64.c b/crypto/kerberosIV/appl/ftp/common/base64.c
deleted file mode 100644
index 648f32dfd4a5..000000000000
--- a/crypto/kerberosIV/appl/ftp/common/base64.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: base64.c,v 1.6 1997/05/30 17:24:06 assar Exp $");
-#endif
-#include <stdlib.h>
-#include <string.h>
-#include "base64.h"
-
-static char base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-static int pos(char c)
-{
-  char *p;
-  for(p = base64; *p; p++)
-    if(*p == c)
-      return p - base64;
-  return -1;
-}
-
-int base64_encode(const void *data, int size, char **str)
-{
-  char *s, *p;
-  int i;
-  int c;
-  unsigned char *q;
-
-  p = s = (char*)malloc(size*4/3+4);
-  q = (unsigned char*)data;
-  i=0;
-  for(i = 0; i < size;){
-    c=q[i++];
-    c*=256;
-    if(i < size)
-      c+=q[i];
-    i++;
-    c*=256;
-    if(i < size)
-      c+=q[i];
-    i++;
-    p[0]=base64[(c&0x00fc0000) >> 18];
-    p[1]=base64[(c&0x0003f000) >> 12];
-    p[2]=base64[(c&0x00000fc0) >> 6];
-    p[3]=base64[(c&0x0000003f) >> 0];
-    if(i > size)
-      p[3]='=';
-    if(i > size+1)
-      p[2]='=';
-    p+=4;
-  }
-  *p=0;
-  *str = s;
-  return strlen(s);
-}
-
-int base64_decode(const char *str, void *data)
-{
-  const char *p;
-  unsigned char *q;
-  int c;
-  int x;
-  int done = 0;
-  q=(unsigned char*)data;
-  for(p=str; *p && !done; p+=4){
-    x = pos(p[0]);
-    if(x >= 0)
-      c = x;
-    else{
-      done = 3;
-      break;
-    }
-    c*=64;
-    
-    x = pos(p[1]);
-    if(x >= 0)
-      c += x;
-    else
-      return -1;
-    c*=64;
-    
-    if(p[2] == '=')
-      done++;
-    else{
-      x = pos(p[2]);
-      if(x >= 0)
-	c += x;
-      else
-	return -1;
-    }
-    c*=64;
-    
-    if(p[3] == '=')
-      done++;
-    else{
-      if(done)
-	return -1;
-      x = pos(p[3]);
-      if(x >= 0)
-	c += x;
-      else
-	return -1;
-    }
-    if(done < 3)
-      *q++=(c&0x00ff0000)>>16;
-      
-    if(done < 2)
-      *q++=(c&0x0000ff00)>>8;
-    if(done < 1)
-      *q++=(c&0x000000ff)>>0;
-  }
-  return q - (unsigned char*)data;
-}
diff --git a/crypto/kerberosIV/appl/ftp/common/base64.h b/crypto/kerberosIV/appl/ftp/common/base64.h
deleted file mode 100644
index fe799a2dccf0..000000000000
--- a/crypto/kerberosIV/appl/ftp/common/base64.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id: base64.h,v 1.5 1997/04/01 08:17:19 joda Exp $ */
-
-#ifndef _BASE64_H_
-#define _BASE64_H_
-
-int base64_encode(const void *data, int size, char **str);
-int base64_decode(const char *str, void *data);
-
-#endif
diff --git a/crypto/kerberosIV/appl/ftp/common/buffer.c b/crypto/kerberosIV/appl/ftp/common/buffer.c
deleted file mode 100644
index 5b7829a5da96..000000000000
--- a/crypto/kerberosIV/appl/ftp/common/buffer.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "common.h"
-#include <stdio.h>
-#include "roken.h"
-
-RCSID("$Id: buffer.c,v 1.1 1997/05/18 19:59:24 assar Exp $");
-
-/*
- * Allocate a buffer enough to handle st->st_blksize, if
- * there is such a field, otherwise BUFSIZ.
- */
-
-void *
-alloc_buffer (void *oldbuf, size_t *sz, struct stat *st)
-{
-    size_t new_sz;
-
-    new_sz = BUFSIZ;
-#ifdef HAVE_ST_BLKSIZE
-    if (st)
-	new_sz = max(BUFSIZ, st->st_blksize);
-#endif
-    if(new_sz > *sz) {
-	if (oldbuf)
-	    free (oldbuf);
-	oldbuf = malloc (new_sz);
-	if (oldbuf == NULL) {
-	    warn ("malloc");
-	    *sz = 0;
-	    return NULL;
-	}
-	*sz = new_sz;
-    }
-    return oldbuf;
-}
-
diff --git a/crypto/kerberosIV/appl/ftp/common/common.h b/crypto/kerberosIV/appl/ftp/common/common.h
deleted file mode 100644
index 4ec3149998b0..000000000000
--- a/crypto/kerberosIV/appl/ftp/common/common.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id: common.h,v 1.9 1997/05/18 19:59:58 assar Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifndef __COMMON_H__
-#define __COMMON_H__
-
-#include "base64.h"
-
-void set_buffer_size(int, int);
-
-#include <stdlib.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
-void *alloc_buffer (void *oldbuf, size_t *sz, struct stat *st);
-
-#endif /* __COMMON_H__ */
diff --git a/crypto/kerberosIV/appl/ftp/common/glob.c b/crypto/kerberosIV/appl/ftp/common/glob.c
deleted file mode 100644
index 8f19d7ca4dab..000000000000
--- a/crypto/kerberosIV/appl/ftp/common/glob.c
+++ /dev/null
@@ -1,835 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Guido van Rossum.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * glob(3) -- a superset of the one defined in POSIX 1003.2.
- *
- * The [!...] convention to negate a range is supported (SysV, Posix, ksh).
- *
- * Optional extra services, controlled by flags not defined by POSIX:
- *
- * GLOB_QUOTE:
- *	Escaping convention: \ inhibits any special meaning the following
- *	character might have (except \ at end of string is retained).
- * GLOB_MAGCHAR:
- *	Set in gl_flags if pattern contained a globbing character.
- * GLOB_NOMAGIC:
- *	Same as GLOB_NOCHECK, but it will only append pattern if it did
- *	not contain any magic characters.  [Used in csh style globbing]
- * GLOB_ALTDIRFUNC:
- *	Use alternately specified directory access functions.
- * GLOB_TILDE:
- *	expand ~user/foo to the /home/dir/of/user/foo
- * GLOB_BRACE:
- *	expand {1,2}{a,b} to 1a 1b 2a 2b 
- * gl_matchc:
- *	Number of matches in the current invocation of glob.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
-#include <ctype.h>
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif
-#include <errno.h>
-#ifdef HAVE_PWD_H
-#include <pwd.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include "glob.h"
-#include "roken.h"
-
-#define	CHAR_DOLLAR		'$'
-#define	CHAR_DOT		'.'
-#define	CHAR_EOS		'\0'
-#define	CHAR_LBRACKET		'['
-#define	CHAR_NOT		'!'
-#define	CHAR_QUESTION		'?'
-#define	CHAR_QUOTE		'\\'
-#define	CHAR_RANGE		'-'
-#define	CHAR_RBRACKET		']'
-#define	CHAR_SEP		'/'
-#define	CHAR_STAR		'*'
-#define	CHAR_TILDE		'~'
-#define	CHAR_UNDERSCORE		'_'
-#define	CHAR_LBRACE		'{'
-#define	CHAR_RBRACE		'}'
-#define	CHAR_SLASH		'/'
-#define	CHAR_COMMA		','
-
-#ifndef DEBUG
-
-#define	M_QUOTE		0x8000
-#define	M_PROTECT	0x4000
-#define	M_MASK		0xffff
-#define	M_ASCII		0x00ff
-
-typedef u_short Char;
-
-#else
-
-#define	M_QUOTE		0x80
-#define	M_PROTECT	0x40
-#define	M_MASK		0xff
-#define	M_ASCII		0x7f
-
-typedef char Char;
-
-#endif
-
-
-#define	CHAR(c)		((Char)((c)&M_ASCII))
-#define	META(c)		((Char)((c)|M_QUOTE))
-#define	M_ALL		META('*')
-#define	M_END		META(']')
-#define	M_NOT		META('!')
-#define	M_ONE		META('?')
-#define	M_RNG		META('-')
-#define	M_SET		META('[')
-#define	ismeta(c)	(((c)&M_QUOTE) != 0)
-
-
-static int	 compare (const void *, const void *);
-static void	 g_Ctoc (const Char *, char *);
-static int	 g_lstat (Char *, struct stat *, glob_t *);
-static DIR	*g_opendir (Char *, glob_t *);
-static Char	*g_strchr (Char *, int);
-#ifdef notdef
-static Char	*g_strcat (Char *, const Char *);
-#endif
-static int	 g_stat (Char *, struct stat *, glob_t *);
-static int	 glob0 (const Char *, glob_t *);
-static int	 glob1 (Char *, glob_t *);
-static int	 glob2 (Char *, Char *, Char *, glob_t *);
-static int	 glob3 (Char *, Char *, Char *, Char *, glob_t *);
-static int	 globextend (const Char *, glob_t *);
-static const Char *	 globtilde (const Char *, Char *, glob_t *);
-static int	 globexp1 (const Char *, glob_t *);
-static int	 globexp2 (const Char *, const Char *, glob_t *, int *);
-static int	 match (Char *, Char *, Char *);
-#ifdef DEBUG
-static void	 qprintf (const char *, Char *);
-#endif
-
-int
-glob(const char *pattern, 
-     int flags, 
-     int (*errfunc)(const char *, int), 
-     glob_t *pglob)
-{
-	const u_char *patnext;
-	int c;
-	Char *bufnext, *bufend, patbuf[MaxPathLen+1];
-
-	patnext = (u_char *) pattern;
-	if (!(flags & GLOB_APPEND)) {
-		pglob->gl_pathc = 0;
-		pglob->gl_pathv = NULL;
-		if (!(flags & GLOB_DOOFFS))
-			pglob->gl_offs = 0;
-	}
-	pglob->gl_flags = flags & ~GLOB_MAGCHAR;
-	pglob->gl_errfunc = errfunc;
-	pglob->gl_matchc = 0;
-
-	bufnext = patbuf;
-	bufend = bufnext + MaxPathLen;
-	if (flags & GLOB_QUOTE) {
-		/* Protect the quoted characters. */
-		while (bufnext < bufend && (c = *patnext++) != CHAR_EOS) 
-			if (c == CHAR_QUOTE) {
-				if ((c = *patnext++) == CHAR_EOS) {
-					c = CHAR_QUOTE;
-					--patnext;
-				}
-				*bufnext++ = c | M_PROTECT;
-			}
-			else
-				*bufnext++ = c;
-	}
-	else 
-	    while (bufnext < bufend && (c = *patnext++) != CHAR_EOS) 
-		    *bufnext++ = c;
-	*bufnext = CHAR_EOS;
-
-	if (flags & GLOB_BRACE)
-	    return globexp1(patbuf, pglob);
-	else
-	    return glob0(patbuf, pglob);
-}
-
-/*
- * Expand recursively a glob {} pattern. When there is no more expansion
- * invoke the standard globbing routine to glob the rest of the magic
- * characters
- */
-static int globexp1(const Char *pattern, glob_t *pglob)
-{
-	const Char* ptr = pattern;
-	int rv;
-
-	/* Protect a single {}, for find(1), like csh */
-	if (pattern[0] == CHAR_LBRACE && pattern[1] == CHAR_RBRACE && pattern[2] == CHAR_EOS)
-		return glob0(pattern, pglob);
-
-	while ((ptr = (const Char *) g_strchr((Char *) ptr, CHAR_LBRACE)) != NULL)
-		if (!globexp2(ptr, pattern, pglob, &rv))
-			return rv;
-
-	return glob0(pattern, pglob);
-}
-
-
-/*
- * Recursive brace globbing helper. Tries to expand a single brace.
- * If it succeeds then it invokes globexp1 with the new pattern.
- * If it fails then it tries to glob the rest of the pattern and returns.
- */
-static int globexp2(const Char *ptr, const Char *pattern, 
-		    glob_t *pglob, int *rv)
-{
-	int     i;
-	Char   *lm, *ls;
-	const Char *pe, *pm, *pl;
-	Char    patbuf[MaxPathLen + 1];
-
-	/* copy part up to the brace */
-	for (lm = patbuf, pm = pattern; pm != ptr; *lm++ = *pm++)
-		continue;
-	ls = lm;
-
-	/* Find the balanced brace */
-	for (i = 0, pe = ++ptr; *pe; pe++)
-		if (*pe == CHAR_LBRACKET) {
-			/* Ignore everything between [] */
-			for (pm = pe++; *pe != CHAR_RBRACKET && *pe != CHAR_EOS; pe++)
-				continue;
-			if (*pe == CHAR_EOS) {
-				/* 
-				 * We could not find a matching CHAR_RBRACKET.
-				 * Ignore and just look for CHAR_RBRACE
-				 */
-				pe = pm;
-			}
-		}
-		else if (*pe == CHAR_LBRACE)
-			i++;
-		else if (*pe == CHAR_RBRACE) {
-			if (i == 0)
-				break;
-			i--;
-		}
-
-	/* Non matching braces; just glob the pattern */
-	if (i != 0 || *pe == CHAR_EOS) {
-		*rv = glob0(patbuf, pglob);
-		return 0;
-	}
-
-	for (i = 0, pl = pm = ptr; pm <= pe; pm++)
-		switch (*pm) {
-		case CHAR_LBRACKET:
-			/* Ignore everything between [] */
-			for (pl = pm++; *pm != CHAR_RBRACKET && *pm != CHAR_EOS; pm++)
-				continue;
-			if (*pm == CHAR_EOS) {
-				/* 
-				 * We could not find a matching CHAR_RBRACKET.
-				 * Ignore and just look for CHAR_RBRACE
-				 */
-				pm = pl;
-			}
-			break;
-
-		case CHAR_LBRACE:
-			i++;
-			break;
-
-		case CHAR_RBRACE:
-			if (i) {
-			    i--;
-			    break;
-			}
-			/* FALLTHROUGH */
-		case CHAR_COMMA:
-			if (i && *pm == CHAR_COMMA)
-				break;
-			else {
-				/* Append the current string */
-				for (lm = ls; (pl < pm); *lm++ = *pl++)
-					continue;
-				/* 
-				 * Append the rest of the pattern after the
-				 * closing brace
-				 */
-				for (pl = pe + 1; (*lm++ = *pl++) != CHAR_EOS;)
-					continue;
-
-				/* Expand the current pattern */
-#ifdef DEBUG
-				qprintf("globexp2:", patbuf);
-#endif
-				*rv = globexp1(patbuf, pglob);
-
-				/* move after the comma, to the next string */
-				pl = pm + 1;
-			}
-			break;
-
-		default:
-			break;
-		}
-	*rv = 0;
-	return 0;
-}
-
-
-
-/*
- * expand tilde from the passwd file.
- */
-static const Char *
-globtilde(const Char *pattern, Char *patbuf, glob_t *pglob)
-{
-	struct passwd *pwd;
-	char *h;
-	const Char *p;
-	Char *b;
-
-	if (*pattern != CHAR_TILDE || !(pglob->gl_flags & GLOB_TILDE))
-		return pattern;
-
-	/* Copy up to the end of the string or / */
-	for (p = pattern + 1, h = (char *) patbuf; *p && *p != CHAR_SLASH; 
-	     *h++ = *p++)
-		continue;
-
-	*h = CHAR_EOS;
-
-	if (((char *) patbuf)[0] == CHAR_EOS) {
-		/* 
-		 * handle a plain ~ or ~/ by expanding $HOME 
-		 * first and then trying the password file
-		 */
-		if ((h = getenv("HOME")) == NULL) {
-			if ((pwd = k_getpwuid(getuid())) == NULL)
-				return pattern;
-			else
-				h = pwd->pw_dir;
-		}
-	}
-	else {
-		/*
-		 * Expand a ~user
-		 */
-		if ((pwd = k_getpwnam((char*) patbuf)) == NULL)
-			return pattern;
-		else
-			h = pwd->pw_dir;
-	}
-
-	/* Copy the home directory */
-	for (b = patbuf; *h; *b++ = *h++)
-		continue;
-	
-	/* Append the rest of the pattern */
-	while ((*b++ = *p++) != CHAR_EOS)
-		continue;
-
-	return patbuf;
-}
-	
-
-/*
- * The main glob() routine: compiles the pattern (optionally processing
- * quotes), calls glob1() to do the real pattern matching, and finally
- * sorts the list (unless unsorted operation is requested).  Returns 0
- * if things went well, nonzero if errors occurred.  It is not an error
- * to find no matches.
- */
-static int
-glob0(const Char *pattern, glob_t *pglob)
-{
-	const Char *qpatnext;
-	int c, err, oldpathc;
-	Char *bufnext, patbuf[MaxPathLen+1];
-
-	qpatnext = globtilde(pattern, patbuf, pglob);
-	oldpathc = pglob->gl_pathc;
-	bufnext = patbuf;
-
-	/* We don't need to check for buffer overflow any more. */
-	while ((c = *qpatnext++) != CHAR_EOS) {
-		switch (c) {
-		case CHAR_LBRACKET:
-			c = *qpatnext;
-			if (c == CHAR_NOT)
-				++qpatnext;
-			if (*qpatnext == CHAR_EOS ||
-			    g_strchr((Char *) qpatnext+1, CHAR_RBRACKET) == NULL) {
-				*bufnext++ = CHAR_LBRACKET;
-				if (c == CHAR_NOT)
-					--qpatnext;
-				break;
-			}
-			*bufnext++ = M_SET;
-			if (c == CHAR_NOT)
-				*bufnext++ = M_NOT;
-			c = *qpatnext++;
-			do {
-				*bufnext++ = CHAR(c);
-				if (*qpatnext == CHAR_RANGE &&
-				    (c = qpatnext[1]) != CHAR_RBRACKET) {
-					*bufnext++ = M_RNG;
-					*bufnext++ = CHAR(c);
-					qpatnext += 2;
-				}
-			} while ((c = *qpatnext++) != CHAR_RBRACKET);
-			pglob->gl_flags |= GLOB_MAGCHAR;
-			*bufnext++ = M_END;
-			break;
-		case CHAR_QUESTION:
-			pglob->gl_flags |= GLOB_MAGCHAR;
-			*bufnext++ = M_ONE;
-			break;
-		case CHAR_STAR:
-			pglob->gl_flags |= GLOB_MAGCHAR;
-			/* collapse adjacent stars to one, 
-			 * to avoid exponential behavior
-			 */
-			if (bufnext == patbuf || bufnext[-1] != M_ALL)
-			    *bufnext++ = M_ALL;
-			break;
-		default:
-			*bufnext++ = CHAR(c);
-			break;
-		}
-	}
-	*bufnext = CHAR_EOS;
-#ifdef DEBUG
-	qprintf("glob0:", patbuf);
-#endif
-
-	if ((err = glob1(patbuf, pglob)) != 0)
-		return(err);
-
-	/*
-	 * If there was no match we are going to append the pattern 
-	 * if GLOB_NOCHECK was specified or if GLOB_NOMAGIC was specified
-	 * and the pattern did not contain any magic characters
-	 * GLOB_NOMAGIC is there just for compatibility with csh.
-	 */
-	if (pglob->gl_pathc == oldpathc && 
-	    ((pglob->gl_flags & GLOB_NOCHECK) || 
-	      ((pglob->gl_flags & GLOB_NOMAGIC) &&
-	       !(pglob->gl_flags & GLOB_MAGCHAR))))
-		return(globextend(pattern, pglob));
-	else if (!(pglob->gl_flags & GLOB_NOSORT)) 
-		qsort(pglob->gl_pathv + pglob->gl_offs + oldpathc,
-		    pglob->gl_pathc - oldpathc, sizeof(char *), compare);
-	return(0);
-}
-
-static int
-compare(const void *p, const void *q)
-{
-	return(strcmp(*(char **)p, *(char **)q));
-}
-
-static int
-glob1(Char *pattern, glob_t *pglob)
-{
-	Char pathbuf[MaxPathLen+1];
-
-	/* A null pathname is invalid -- POSIX 1003.1 sect. 2.4. */
-	if (*pattern == CHAR_EOS)
-		return(0);
-	return(glob2(pathbuf, pathbuf, pattern, pglob));
-}
-
-/*
- * The functions glob2 and glob3 are mutually recursive; there is one level
- * of recursion for each segment in the pattern that contains one or more
- * meta characters.
- */
-
-#ifndef S_ISLNK
-#if defined(S_IFLNK) && defined(S_IFMT)
-#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK)
-#else
-#define S_ISLNK(mode) 0
-#endif
-#endif
-
-static int
-glob2(Char *pathbuf, Char *pathend, Char *pattern, glob_t *pglob)
-{
-	struct stat sb;
-	Char *p, *q;
-	int anymeta;
-
-	/*
-	 * Loop over pattern segments until end of pattern or until
-	 * segment with meta character found.
-	 */
-	for (anymeta = 0;;) {
-		if (*pattern == CHAR_EOS) {		/* End of pattern? */
-			*pathend = CHAR_EOS;
-			if (g_lstat(pathbuf, &sb, pglob))
-				return(0);
-		
-			if (((pglob->gl_flags & GLOB_MARK) &&
-			    pathend[-1] != CHAR_SEP) && (S_ISDIR(sb.st_mode)
-			    || (S_ISLNK(sb.st_mode) &&
-			    (g_stat(pathbuf, &sb, pglob) == 0) &&
-			    S_ISDIR(sb.st_mode)))) {
-				*pathend++ = CHAR_SEP;
-				*pathend = CHAR_EOS;
-			}
-			++pglob->gl_matchc;
-			return(globextend(pathbuf, pglob));
-		}
-
-		/* Find end of next segment, copy tentatively to pathend. */
-		q = pathend;
-		p = pattern;
-		while (*p != CHAR_EOS && *p != CHAR_SEP) {
-			if (ismeta(*p))
-				anymeta = 1;
-			*q++ = *p++;
-		}
-
-		if (!anymeta) {		/* No expansion, do next segment. */
-			pathend = q;
-			pattern = p;
-			while (*pattern == CHAR_SEP)
-				*pathend++ = *pattern++;
-		} else			/* Need expansion, recurse. */
-			return(glob3(pathbuf, pathend, pattern, p, pglob));
-	}
-	/* CHAR_NOTREACHED */
-}
-
-static int
-glob3(Char *pathbuf, Char *pathend, Char *pattern, Char *restpattern, 
-      glob_t *pglob)
-{
-	struct dirent *dp;
-	DIR *dirp;
-	int err;
-	char buf[MaxPathLen];
-
-	/*
-	 * The readdirfunc declaration can't be prototyped, because it is
-	 * assigned, below, to two functions which are prototyped in glob.h
-	 * and dirent.h as taking pointers to differently typed opaque
-	 * structures.
-	 */
-	struct dirent *(*readdirfunc)(void *);
-
-	*pathend = CHAR_EOS;
-	errno = 0;
-	    
-	if ((dirp = g_opendir(pathbuf, pglob)) == NULL) {
-		/* TODO: don't call for ENOENT or ENOTDIR? */
-		if (pglob->gl_errfunc) {
-			g_Ctoc(pathbuf, buf);
-			if (pglob->gl_errfunc(buf, errno) ||
-			    pglob->gl_flags & GLOB_ERR)
-				return (GLOB_ABEND);
-		}
-		return(0);
-	}
-
-	err = 0;
-
-	/* Search directory for matching names. */
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		readdirfunc = pglob->gl_readdir;
-	else
-		readdirfunc = (struct dirent *(*)(void *))readdir;
-	while ((dp = (*readdirfunc)(dirp))) {
-		u_char *sc;
-		Char *dc;
-
-		/* Initial CHAR_DOT must be matched literally. */
-		if (dp->d_name[0] == CHAR_DOT && *pattern != CHAR_DOT)
-			continue;
-		for (sc = (u_char *) dp->d_name, dc = pathend; 
-		     (*dc++ = *sc++) != CHAR_EOS;)
-			continue;
-		if (!match(pathend, pattern, restpattern)) {
-			*pathend = CHAR_EOS;
-			continue;
-		}
-		err = glob2(pathbuf, --dc, restpattern, pglob);
-		if (err)
-			break;
-	}
-
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		(*pglob->gl_closedir)(dirp);
-	else
-		closedir(dirp);
-	return(err);
-}
-
-
-/*
- * Extend the gl_pathv member of a glob_t structure to accomodate a new item,
- * add the new item, and update gl_pathc.
- *
- * This assumes the BSD realloc, which only copies the block when its size
- * crosses a power-of-two boundary; for v7 realloc, this would cause quadratic
- * behavior.
- *
- * Return 0 if new item added, error code if memory couldn't be allocated.
- *
- * Invariant of the glob_t structure:
- *	Either gl_pathc is zero and gl_pathv is NULL; or gl_pathc > 0 and
- *	gl_pathv points to (gl_offs + gl_pathc + 1) items.
- */
-static int
-globextend(const Char *path, glob_t *pglob)
-{
-	char **pathv;
-	int i;
-	u_int newsize;
-	char *copy;
-	const Char *p;
-
-	newsize = sizeof(*pathv) * (2 + pglob->gl_pathc + pglob->gl_offs);
-	pathv = pglob->gl_pathv ? 
-		    realloc(pglob->gl_pathv, newsize) :
-		    malloc(newsize);
-	if (pathv == NULL)
-		return(GLOB_NOSPACE);
-
-	if (pglob->gl_pathv == NULL && pglob->gl_offs > 0) {
-		/* first time around -- clear initial gl_offs items */
-		pathv += pglob->gl_offs;
-		for (i = pglob->gl_offs; --i >= 0; )
-			*--pathv = NULL;
-	}
-	pglob->gl_pathv = pathv;
-
-	for (p = path; *p++;)
-		continue;
-	if ((copy = malloc(p - path)) != NULL) {
-		g_Ctoc(path, copy);
-		pathv[pglob->gl_offs + pglob->gl_pathc++] = copy;
-	}
-	pathv[pglob->gl_offs + pglob->gl_pathc] = NULL;
-	return(copy == NULL ? GLOB_NOSPACE : 0);
-}
-
-
-/*
- * pattern matching function for filenames.  Each occurrence of the *
- * pattern causes a recursion level.
- */
-static int
-match(Char *name, Char *pat, Char *patend)
-{
-	int ok, negate_range;
-	Char c, k;
-
-	while (pat < patend) {
-		c = *pat++;
-		switch (c & M_MASK) {
-		case M_ALL:
-			if (pat == patend)
-				return(1);
-			do 
-			    if (match(name, pat, patend))
-				    return(1);
-			while (*name++ != CHAR_EOS);
-			return(0);
-		case M_ONE:
-			if (*name++ == CHAR_EOS)
-				return(0);
-			break;
-		case M_SET:
-			ok = 0;
-			if ((k = *name++) == CHAR_EOS)
-				return(0);
-			if ((negate_range = ((*pat & M_MASK) == M_NOT)) != CHAR_EOS)
-				++pat;
-			while (((c = *pat++) & M_MASK) != M_END)
-				if ((*pat & M_MASK) == M_RNG) {
-					if (c <= k && k <= pat[1])
-						ok = 1;
-					pat += 2;
-				} else if (c == k)
-					ok = 1;
-			if (ok == negate_range)
-				return(0);
-			break;
-		default:
-			if (*name++ != c)
-				return(0);
-			break;
-		}
-	}
-	return(*name == CHAR_EOS);
-}
-
-/* Free allocated data belonging to a glob_t structure. */
-void
-globfree(glob_t *pglob)
-{
-	int i;
-	char **pp;
-
-	if (pglob->gl_pathv != NULL) {
-		pp = pglob->gl_pathv + pglob->gl_offs;
-		for (i = pglob->gl_pathc; i--; ++pp)
-			if (*pp)
-				free(*pp);
-		free(pglob->gl_pathv);
-	}
-}
-
-static DIR *
-g_opendir(Char *str, glob_t *pglob)
-{
-	char buf[MaxPathLen];
-
-	if (!*str)
-		strcpy(buf, ".");
-	else
-		g_Ctoc(str, buf);
-
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		return((*pglob->gl_opendir)(buf));
-
-	return(opendir(buf));
-}
-
-static int
-g_lstat(Char *fn, struct stat *sb, glob_t *pglob)
-{
-	char buf[MaxPathLen];
-
-	g_Ctoc(fn, buf);
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		return((*pglob->gl_lstat)(buf, sb));
-	return(lstat(buf, sb));
-}
-
-static int
-g_stat(Char *fn, struct stat *sb, glob_t *pglob)
-{
-	char buf[MaxPathLen];
-
-	g_Ctoc(fn, buf);
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		return((*pglob->gl_stat)(buf, sb));
-	return(stat(buf, sb));
-}
-
-static Char *
-g_strchr(Char *str, int ch)
-{
-	do {
-		if (*str == ch)
-			return (str);
-	} while (*str++);
-	return (NULL);
-}
-
-#ifdef notdef
-static Char *
-g_strcat(Char *dst, const Char *src)
-{
-	Char *sdst = dst;
-
-	while (*dst++)
-		continue;
-	--dst;
-	while((*dst++ = *src++) != CHAR_EOS)
-	    continue;
-
-	return (sdst);
-}
-#endif
-
-static void
-g_Ctoc(const Char *str, char *buf)
-{
-	char *dc;
-
-	for (dc = buf; (*dc++ = *str++) != CHAR_EOS;)
-		continue;
-}
-
-#ifdef DEBUG
-static void 
-qprintf(const Char *str, Char *s)
-{
-	Char *p;
-
-	printf("%s:\n", str);
-	for (p = s; *p; p++)
-		printf("%c", CHAR(*p));
-	printf("\n");
-	for (p = s; *p; p++)
-		printf("%c", *p & M_PROTECT ? '"' : ' ');
-	printf("\n");
-	for (p = s; *p; p++)
-		printf("%c", ismeta(*p) ? '_' : ' ');
-	printf("\n");
-}
-#endif
diff --git a/crypto/kerberosIV/appl/ftp/common/glob.h b/crypto/kerberosIV/appl/ftp/common/glob.h
deleted file mode 100644
index bece48a89cd7..000000000000
--- a/crypto/kerberosIV/appl/ftp/common/glob.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Guido van Rossum.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)glob.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef _GLOB_H_
-#define	_GLOB_H_
-
-struct stat;
-typedef struct {
-	int gl_pathc;		/* Count of total paths so far. */
-	int gl_matchc;		/* Count of paths matching pattern. */
-	int gl_offs;		/* Reserved at beginning of gl_pathv. */
-	int gl_flags;		/* Copy of flags parameter to glob. */
-	char **gl_pathv;	/* List of paths matching pattern. */
-				/* Copy of errfunc parameter to glob. */
-	int (*gl_errfunc) (const char *, int);
-
-	/*
-	 * Alternate filesystem access methods for glob; replacement
-	 * versions of closedir(3), readdir(3), opendir(3), stat(2)
-	 * and lstat(2).
-	 */
-	void (*gl_closedir) (void *);
-	struct dirent *(*gl_readdir) (void *);	
-	void *(*gl_opendir) (const char *);
-	int (*gl_lstat) (const char *, struct stat *);
-	int (*gl_stat) (const char *, struct stat *);
-} glob_t;
-
-#define	GLOB_APPEND	0x0001	/* Append to output from previous call. */
-#define	GLOB_DOOFFS	0x0002	/* Use gl_offs. */
-#define	GLOB_ERR	0x0004	/* Return on error. */
-#define	GLOB_MARK	0x0008	/* Append / to matching directories. */
-#define	GLOB_NOCHECK	0x0010	/* Return pattern itself if nothing matches. */
-#define	GLOB_NOSORT	0x0020	/* Don't sort. */
-
-#define	GLOB_ALTDIRFUNC	0x0040	/* Use alternately specified directory funcs. */
-#define	GLOB_BRACE	0x0080	/* Expand braces ala csh. */
-#define	GLOB_MAGCHAR	0x0100	/* Pattern had globbing characters. */
-#define	GLOB_NOMAGIC	0x0200	/* GLOB_NOCHECK without magic chars (csh). */
-#define	GLOB_QUOTE	0x0400	/* Quote special chars with \. */
-#define	GLOB_TILDE	0x0800	/* Expand tilde names from the passwd file. */
-
-#define	GLOB_NOSPACE	(-1)	/* Malloc call failed. */
-#define	GLOB_ABEND	(-2)	/* Unignored error. */
-
-int	glob (const char *, int, int (*)(const char *, int), glob_t *);
-void	globfree (glob_t *);
-
-#endif /* !_GLOB_H_ */
diff --git a/crypto/kerberosIV/appl/ftp/common/sockbuf.c b/crypto/kerberosIV/appl/ftp/common/sockbuf.c
deleted file mode 100644
index ab8c293f6548..000000000000
--- a/crypto/kerberosIV/appl/ftp/common/sockbuf.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "common.h"
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-
-RCSID("$Id: sockbuf.c,v 1.2 1997/05/11 10:01:48 assar Exp $");
-
-void
-set_buffer_size(int fd, int read)
-{
-#if defined(SO_RCVBUF) && defined(SO_SNDBUF) && defined(HAVE_SETSOCKOPT)
-    size_t size = 4194304;
-    while(size >= 131072 && 
-	  setsockopt(fd, SOL_SOCKET, read ? SO_RCVBUF : SO_SNDBUF, 
-		     (void *)&size, sizeof(size)) < 0)
-	size /= 2;
-#endif
-}
-
-
diff --git a/crypto/kerberosIV/appl/ftp/ftp/Makefile.in b/crypto/kerberosIV/appl/ftp/ftp/Makefile.in
deleted file mode 100644
index 62bde3b17eab..000000000000
--- a/crypto/kerberosIV/appl/ftp/ftp/Makefile.in
+++ /dev/null
@@ -1,76 +0,0 @@
-# 
-# $Id: Makefile.in,v 1.24 1997/03/23 13:03:55 assar Exp $
-#
-
-SHELL		= /bin/sh
-
-srcdir		= @srcdir@
-top_srcdir	= @top_srcdir@
-VPATH		= @srcdir@
-
-topdir		= ../../..
-
-CC 	= @CC@
-RANLIB 	= @RANLIB@
-DEFS 	= @DEFS@
-CFLAGS 	= @CFLAGS@
-CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir) -I$(topdir) -I$(top_srcdir) -I$(topdir)/include -I$(top_srcdir)/include -I$(srcdir)/../common  @INCLUDE_readline@
-LD_FLAGS = @LD_FLAGS@
-LIB_tgetent = @LIB_tgetent@
-LIBS	 = @LIBS@ @LIB_readline@
-MKINSTALLDIRS = $(top_srcdir)/mkinstalldirs
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-
-prefix 	= @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-libdir = @libdir@
-transform=@program_transform_name@
-EXECSUFFIX=@EXECSUFFIX@
-
-INCTOP = $(topdir)/include
-
-LIBTOP = $(topdir)/lib
-
-PROGS = ftp$(EXECSUFFIX)
-
-ftp_OBJS = cmds.o cmdtab.o ftp.o krb4.o main.o ruserpass.o domacro.o \
-	globals.o kauth.o
-
-ftp_SOURCES = cmds.c cmdtab.c ftp.c krb4.c main.c ruserpass.c \
-	domacro.c globals.c kauth.c
-
-OBJECTS = $(ftp_OBJS)
-SOURCES = $(ftp_SOURCES)
-
-all: $(PROGS)
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(DEFS) $<
-
-install: all
-	$(MKINSTALLDIRS) $(bindir)
-	for x in $(PROGS); do \
-	  $(INSTALL_PROGRAM) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \
-	done
-
-uninstall:
-	for x in $(PROGS); do \
-	  rm -f $(bindir)/`echo $$x | sed '$(transform)'`; \
-	done
-
-ftp$(EXECSUFFIX): $(ftp_OBJS) # ../common/libcommon.a
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(ftp_OBJS) -L../common -lcommon -L$(LIBTOP)/krb -lkrb -L$(LIBTOP)/des -ldes -L$(LIBTOP)/roken -lroken $(LIBS) -L$(LIBTOP)/roken -lroken
-
-TAGS: $(SOURCES)
-	etags $(SOURCES)
-
-clean cleandir:
-	rm -f *~ *.o core ftp \#*
-
-distclean: 
-	rm -f Makefile
-
-$(OBJECTS): ../../../include/config.h
diff --git a/crypto/kerberosIV/appl/ftp/ftp/cmds.c b/crypto/kerberosIV/appl/ftp/ftp/cmds.c
deleted file mode 100644
index 5e1980b703e1..000000000000
--- a/crypto/kerberosIV/appl/ftp/ftp/cmds.c
+++ /dev/null
@@ -1,2073 +0,0 @@
-/*
- * Copyright (c) 1985, 1989, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * FTP User Program -- Command Routines.
- */
-
-#include "ftp_locl.h"
-RCSID("$Id: cmds.c,v 1.23 1997/06/01 22:52:37 assar Exp $");
-
-typedef void (*sighand)(int);
-
-jmp_buf	jabort;
-char   *mname;
-char   *home = "/";
-
-/*
- * `Another' gets another argument, and stores the new argc and argv.
- * It reverts to the top level (via main.c's intr()) on EOF/error.
- *
- * Returns false if no new arguments have been added.
- */
-int
-another(int *pargc, char ***pargv, char *prompt)
-{
-	int len = strlen(line), ret;
-
-	if (len >= sizeof(line) - 3) {
-		printf("sorry, arguments too long\n");
-		intr(0);
-	}
-	printf("(%s) ", prompt);
-	line[len++] = ' ';
-	if (fgets(&line[len], sizeof(line) - len, stdin) == NULL)
-		intr(0);
-	len += strlen(&line[len]);
-	if (len > 0 && line[len - 1] == '\n')
-		line[len - 1] = '\0';
-	makeargv();
-	ret = margc > *pargc;
-	*pargc = margc;
-	*pargv = margv;
-	return (ret);
-}
-
-/*
- * Connect to peer server and
- * auto-login, if possible.
- */
-void
-setpeer(int argc, char **argv)
-{
-	char *host;
-	short port;
-	struct servent *sp;
-
-	if (connected) {
-		printf("Already connected to %s, use close first.\n",
-			hostname);
-		code = -1;
-		return;
-	}
-	if (argc < 2)
-		another(&argc, &argv, "to");
-	if (argc < 2 || argc > 3) {
-		printf("usage: %s host-name [port]\n", argv[0]);
-		code = -1;
-		return;
-	}
-	sp = getservbyname("ftp", "tcp");
-	if (sp == NULL)
-		errx(1, "You bastard. You removed ftp/tcp from services");
-	port = sp->s_port;
-	if (argc > 2) {
-		port = atoi(argv[2]);
-		if (port <= 0) {
-			printf("%s: bad port number-- %s\n", argv[1], argv[2]);
-			printf ("usage: %s host-name [port]\n", argv[0]);
-			code = -1;
-			return;
-		}
-		port = htons(port);
-	}
-	host = hookup(argv[1], port);
-	if (host) {
-		int overbose;
-
-		connected = 1;
-		/*
-		 * Set up defaults for FTP.
-		 */
-		strcpy(typename, "ascii"), type = TYPE_A;
-		curtype = TYPE_A;
-		strcpy(formname, "non-print"), form = FORM_N;
-		strcpy(modename, "stream"), mode = MODE_S;
-		strcpy(structname, "file"), stru = STRU_F;
-		strcpy(bytename, "8"), bytesize = 8;
-		if (autologin)
-			login(argv[1]);
-
-#if (defined(unix) || defined(__unix__) || defined(__unix) || defined(_AIX) || defined(_CRAY)) && NBBY == 8
-/*
- * this ifdef is to keep someone form "porting" this to an incompatible
- * system and not checking this out. This way they have to think about it.
- */
-		overbose = verbose;
-		if (debug == 0)
-			verbose = -1;
-		if (command("SYST") == COMPLETE && overbose) {
-			char *cp, c;
-			cp = strchr(reply_string+4, ' ');
-			if (cp == NULL)
-				cp = strchr(reply_string+4, '\r');
-			if (cp) {
-				if (cp[-1] == '.')
-					cp--;
-				c = *cp;
-				*cp = '\0';
-			}
-
-			printf("Remote system type is %s.\n",
-				reply_string+4);
-			if (cp)
-				*cp = c;
-		}
-		if (!strncmp(reply_string, "215 UNIX Type: L8", 17)) {
-			if (proxy)
-				unix_proxy = 1;
-			else
-				unix_server = 1;
-			/*
-			 * Set type to 0 (not specified by user),
-			 * meaning binary by default, but don't bother
-			 * telling server.  We can use binary
-			 * for text files unless changed by the user.
-			 */
-			type = 0;
-			strcpy(typename, "binary");
-			if (overbose)
-			    printf("Using %s mode to transfer files.\n",
-				typename);
-		} else {
-			if (proxy)
-				unix_proxy = 0;
-			else
-				unix_server = 0;
-			if (overbose && 
-			    !strncmp(reply_string, "215 TOPS20", 10))
-				printf(
-"Remember to set tenex mode when transfering binary files from this machine.\n");
-		}
-		verbose = overbose;
-#endif /* unix */
-	}
-}
-
-struct	types {
-	char	*t_name;
-	char	*t_mode;
-	int	t_type;
-	char	*t_arg;
-} types[] = {
-	{ "ascii",	"A",	TYPE_A,	0 },
-	{ "binary",	"I",	TYPE_I,	0 },
-	{ "image",	"I",	TYPE_I,	0 },
-	{ "ebcdic",	"E",	TYPE_E,	0 },
-	{ "tenex",	"L",	TYPE_L,	bytename },
-	{ NULL }
-};
-
-/*
- * Set transfer type.
- */
-void
-settype(int argc, char **argv)
-{
-	struct types *p;
-	int comret;
-
-	if (argc > 2) {
-		char *sep;
-
-		printf("usage: %s [", argv[0]);
-		sep = " ";
-		for (p = types; p->t_name; p++) {
-			printf("%s%s", sep, p->t_name);
-			sep = " | ";
-		}
-		printf(" ]\n");
-		code = -1;
-		return;
-	}
-	if (argc < 2) {
-		printf("Using %s mode to transfer files.\n", typename);
-		code = 0;
-		return;
-	}
-	for (p = types; p->t_name; p++)
-		if (strcmp(argv[1], p->t_name) == 0)
-			break;
-	if (p->t_name == 0) {
-		printf("%s: unknown mode\n", argv[1]);
-		code = -1;
-		return;
-	}
-	if ((p->t_arg != NULL) && (*(p->t_arg) != '\0'))
-		comret = command ("TYPE %s %s", p->t_mode, p->t_arg);
-	else
-		comret = command("TYPE %s", p->t_mode);
-	if (comret == COMPLETE) {
-		strcpy(typename, p->t_name);
-		curtype = type = p->t_type;
-	}
-}
-
-/*
- * Internal form of settype; changes current type in use with server
- * without changing our notion of the type for data transfers.
- * Used to change to and from ascii for listings.
- */
-void
-changetype(int newtype, int show)
-{
-	struct types *p;
-	int comret, oldverbose = verbose;
-
-	if (newtype == 0)
-		newtype = TYPE_I;
-	if (newtype == curtype)
-		return;
-	if (debug == 0 && show == 0)
-		verbose = 0;
-	for (p = types; p->t_name; p++)
-		if (newtype == p->t_type)
-			break;
-	if (p->t_name == 0) {
-		printf("ftp: internal error: unknown type %d\n", newtype);
-		return;
-	}
-	if (newtype == TYPE_L && bytename[0] != '\0')
-		comret = command("TYPE %s %s", p->t_mode, bytename);
-	else
-		comret = command("TYPE %s", p->t_mode);
-	if (comret == COMPLETE)
-		curtype = newtype;
-	verbose = oldverbose;
-}
-
-char *stype[] = {
-	"type",
-	"",
-	0
-};
-
-/*
- * Set binary transfer type.
- */
-/*VARARGS*/
-void
-setbinary(int argc, char **argv)
-{
-
-	stype[1] = "binary";
-	settype(2, stype);
-}
-
-/*
- * Set ascii transfer type.
- */
-/*VARARGS*/
-void
-setascii(int argc, char **argv)
-{
-
-	stype[1] = "ascii";
-	settype(2, stype);
-}
-
-/*
- * Set tenex transfer type.
- */
-/*VARARGS*/
-void
-settenex(int argc, char **argv)
-{
-
-	stype[1] = "tenex";
-	settype(2, stype);
-}
-
-/*
- * Set file transfer mode.
- */
-/*ARGSUSED*/
-void
-setftmode(int argc, char **argv)
-{
-
-	printf("We only support %s mode, sorry.\n", modename);
-	code = -1;
-}
-
-/*
- * Set file transfer format.
- */
-/*ARGSUSED*/
-void
-setform(int argc, char **argv)
-{
-
-	printf("We only support %s format, sorry.\n", formname);
-	code = -1;
-}
-
-/*
- * Set file transfer structure.
- */
-/*ARGSUSED*/
-void
-setstruct(int argc, char **argv)
-{
-
-	printf("We only support %s structure, sorry.\n", structname);
-	code = -1;
-}
-
-/*
- * Send a single file.
- */
-void
-put(int argc, char **argv)
-{
-	char *cmd;
-	int loc = 0;
-	char *oldargv1, *oldargv2;
-
-	if (argc == 2) {
-		argc++;
-		argv[2] = argv[1];
-		loc++;
-	}
-	if (argc < 2 && !another(&argc, &argv, "local-file"))
-		goto usage;
-	if (argc < 3 && !another(&argc, &argv, "remote-file")) {
-usage:
-		printf("usage: %s local-file remote-file\n", argv[0]);
-		code = -1;
-		return;
-	}
-	oldargv1 = argv[1];
-	oldargv2 = argv[2];
-	if (!globulize(&argv[1])) {
-		code = -1;
-		return;
-	}
-	/*
-	 * If "globulize" modifies argv[1], and argv[2] is a copy of
-	 * the old argv[1], make it a copy of the new argv[1].
-	 */
-	if (argv[1] != oldargv1 && argv[2] == oldargv1) {
-		argv[2] = argv[1];
-	}
-	cmd = (argv[0][0] == 'a') ? "APPE" : ((sunique) ? "STOU" : "STOR");
-	if (loc && ntflag) {
-		argv[2] = dotrans(argv[2]);
-	}
-	if (loc && mapflag) {
-		argv[2] = domap(argv[2]);
-	}
-	sendrequest(cmd, argv[1], argv[2],
-	    argv[1] != oldargv1 || argv[2] != oldargv2);
-}
-
-/* ARGSUSED */
-static RETSIGTYPE
-mabort(int signo)
-{
-	int ointer;
-
-	printf("\n");
-	fflush(stdout);
-	if (mflag && fromatty) {
-		ointer = interactive;
-		interactive = 1;
-		if (confirm("Continue with", mname)) {
-			interactive = ointer;
-			longjmp(jabort,0);
-		}
-		interactive = ointer;
-	}
-	mflag = 0;
-	longjmp(jabort,0);
-}
-
-/*
- * Send multiple files.
- */
-void
-mput(int argc, char **argv)
-{
-	int i;
-	RETSIGTYPE (*oldintr)();
-	int ointer;
-	char *tp;
-
-	if (argc < 2 && !another(&argc, &argv, "local-files")) {
-		printf("usage: %s local-files\n", argv[0]);
-		code = -1;
-		return;
-	}
-	mname = argv[0];
-	mflag = 1;
-	oldintr = signal(SIGINT, mabort);
-	setjmp(jabort);
-	if (proxy) {
-		char *cp, *tp2, tmpbuf[MaxPathLen];
-
-		while ((cp = remglob(argv,0)) != NULL) {
-			if (*cp == 0) {
-				mflag = 0;
-				continue;
-			}
-			if (mflag && confirm(argv[0], cp)) {
-				tp = cp;
-				if (mcase) {
-					while (*tp && !islower(*tp)) {
-						tp++;
-					}
-					if (!*tp) {
-						tp = cp;
-						tp2 = tmpbuf;
-						while ((*tp2 = *tp) != '\0') {
-						     if (isupper(*tp2)) {
-						        *tp2 = 'a' + *tp2 - 'A';
-						     }
-						     tp++;
-						     tp2++;
-						}
-					}
-					tp = tmpbuf;
-				}
-				if (ntflag) {
-					tp = dotrans(tp);
-				}
-				if (mapflag) {
-					tp = domap(tp);
-				}
-				sendrequest((sunique) ? "STOU" : "STOR",
-				    cp, tp, cp != tp || !interactive);
-				if (!mflag && fromatty) {
-					ointer = interactive;
-					interactive = 1;
-					if (confirm("Continue with","mput")) {
-						mflag++;
-					}
-					interactive = ointer;
-				}
-			}
-		}
-		signal(SIGINT, oldintr);
-		mflag = 0;
-		return;
-	}
-	for (i = 1; i < argc; i++) {
-		char **cpp;
-		glob_t gl;
-		int flags;
-
-		if (!doglob) {
-			if (mflag && confirm(argv[0], argv[i])) {
-				tp = (ntflag) ? dotrans(argv[i]) : argv[i];
-				tp = (mapflag) ? domap(tp) : tp;
-				sendrequest((sunique) ? "STOU" : "STOR",
-				    argv[i], tp, tp != argv[i] || !interactive);
-				if (!mflag && fromatty) {
-					ointer = interactive;
-					interactive = 1;
-					if (confirm("Continue with","mput")) {
-						mflag++;
-					}
-					interactive = ointer;
-				}
-			}
-			continue;
-		}
-
-		memset(&gl, 0, sizeof(gl));
-		flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE;
-		if (glob(argv[i], flags, NULL, &gl) || gl.gl_pathc == 0) {
-			warnx("%s: not found", argv[i]);
-			globfree(&gl);
-			continue;
-		}
-		for (cpp = gl.gl_pathv; cpp && *cpp != NULL; cpp++) {
-			if (mflag && confirm(argv[0], *cpp)) {
-				tp = (ntflag) ? dotrans(*cpp) : *cpp;
-				tp = (mapflag) ? domap(tp) : tp;
-				sendrequest((sunique) ? "STOU" : "STOR",
-				    *cpp, tp, *cpp != tp || !interactive);
-				if (!mflag && fromatty) {
-					ointer = interactive;
-					interactive = 1;
-					if (confirm("Continue with","mput")) {
-						mflag++;
-					}
-					interactive = ointer;
-				}
-			}
-		}
-		globfree(&gl);
-	}
-	signal(SIGINT, oldintr);
-	mflag = 0;
-}
-
-void
-reget(int argc, char **argv)
-{
-
-	getit(argc, argv, 1, "r+w");
-}
-
-void
-get(int argc, char **argv)
-{
-
-	getit(argc, argv, 0, restart_point ? "r+w" : "w" );
-}
-
-/*
- * Receive one file.
- */
-int
-getit(int argc, char **argv, int restartit, char *mode)
-{
-	int loc = 0;
-	char *oldargv1, *oldargv2;
-
-	if (argc == 2) {
-		argc++;
-		argv[2] = argv[1];
-		loc++;
-	}
-	if (argc < 2 && !another(&argc, &argv, "remote-file"))
-		goto usage;
-	if (argc < 3 && !another(&argc, &argv, "local-file")) {
-usage:
-		printf("usage: %s remote-file [ local-file ]\n", argv[0]);
-		code = -1;
-		return (0);
-	}
-	oldargv1 = argv[1];
-	oldargv2 = argv[2];
-	if (!globulize(&argv[2])) {
-		code = -1;
-		return (0);
-	}
-	if (loc && mcase) {
-		char *tp = argv[1], *tp2, tmpbuf[MaxPathLen];
-
-		while (*tp && !islower(*tp)) {
-			tp++;
-		}
-		if (!*tp) {
-			tp = argv[2];
-			tp2 = tmpbuf;
-			while ((*tp2 = *tp) != '\0') {
-				if (isupper(*tp2)) {
-					*tp2 = 'a' + *tp2 - 'A';
-				}
-				tp++;
-				tp2++;
-			}
-			argv[2] = tmpbuf;
-		}
-	}
-	if (loc && ntflag)
-		argv[2] = dotrans(argv[2]);
-	if (loc && mapflag)
-		argv[2] = domap(argv[2]);
-	if (restartit) {
-		struct stat stbuf;
-		int ret;
-
-		ret = stat(argv[2], &stbuf);
-		if (restartit == 1) {
-			if (ret < 0) {
-				warn("local: %s", argv[2]);
-				return (0);
-			}
-			restart_point = stbuf.st_size;
-		} else {
-			if (ret == 0) {
-				int overbose;
-
-				overbose = verbose;
-				if (debug == 0)
-					verbose = -1;
-				if (command("MDTM %s", argv[1]) == COMPLETE) {
-					int yy, mo, day, hour, min, sec;
-					struct tm *tm;
-					verbose = overbose;
-					sscanf(reply_string,
-					    "%*s %04d%02d%02d%02d%02d%02d",
-					    &yy, &mo, &day, &hour, &min, &sec);
-					tm = gmtime(&stbuf.st_mtime);
-					tm->tm_mon++;
-					if (tm->tm_year > yy%100)
-						return (1);
-					if ((tm->tm_year == yy%100 && 
-					    tm->tm_mon > mo) ||
-					   (tm->tm_mon == mo && 
-					    tm->tm_mday > day) ||
-					   (tm->tm_mday == day && 
-					    tm->tm_hour > hour) ||
-					   (tm->tm_hour == hour && 
-					    tm->tm_min > min) ||
-					   (tm->tm_min == min && 
-					    tm->tm_sec > sec))
-						return (1);
-				} else {
-					printf("%s\n", reply_string);
-					verbose = overbose;
-					return (0);
-				}
-			}
-		}
-	}
-
-	recvrequest("RETR", argv[2], argv[1], mode,
-	    argv[1] != oldargv1 || argv[2] != oldargv2);
-	restart_point = 0;
-	return (0);
-}
-
-/*
- * Get multiple files.
- */
-void
-mget(int argc, char **argv)
-{
-	sighand oldintr;
-	int ch, ointer;
-	char *cp, *tp, *tp2, tmpbuf[MaxPathLen];
-
-	if (argc < 2 && !another(&argc, &argv, "remote-files")) {
-		printf("usage: %s remote-files\n", argv[0]);
-		code = -1;
-		return;
-	}
-	mname = argv[0];
-	mflag = 1;
-	oldintr = signal(SIGINT, mabort);
-	setjmp(jabort);
-	while ((cp = remglob(argv,proxy)) != NULL) {
-		if (*cp == '\0') {
-			mflag = 0;
-			continue;
-		}
-		if (mflag && confirm(argv[0], cp)) {
-			tp = cp;
-			if (mcase) {
-				for (tp2 = tmpbuf; (ch = *tp++);)
-					*tp2++ = isupper(ch) ? tolower(ch) : ch;
-				*tp2 = '\0';
-				tp = tmpbuf;
-			}
-			if (ntflag) {
-				tp = dotrans(tp);
-			}
-			if (mapflag) {
-				tp = domap(tp);
-			}
-			recvrequest("RETR", tp, cp, "w",
-			    tp != cp || !interactive);
-			if (!mflag && fromatty) {
-				ointer = interactive;
-				interactive = 1;
-				if (confirm("Continue with","mget")) {
-					mflag++;
-				}
-				interactive = ointer;
-			}
-		}
-	}
-	signal(SIGINT,oldintr);
-	mflag = 0;
-}
-
-char *
-remglob(char **argv, int doswitch)
-{
-	char temp[16];
-	static char buf[MaxPathLen];
-	static FILE *ftemp = NULL;
-	static char **args;
-	int oldverbose, oldhash;
-	char *cp, *mode;
-
-	if (!mflag) {
-		if (!doglob) {
-			args = NULL;
-		}
-		else {
-			if (ftemp) {
-				fclose(ftemp);
-				ftemp = NULL;
-			}
-		}
-		return (NULL);
-	}
-	if (!doglob) {
-		if (args == NULL)
-			args = argv;
-		if ((cp = *++args) == NULL)
-			args = NULL;
-		return (cp);
-	}
-	if (ftemp == NULL) {
-		strcpy(temp, _PATH_TMP_XXX);
-		mktemp(temp);
-		oldverbose = verbose, verbose = 0;
-		oldhash = hash, hash = 0;
-		if (doswitch) {
-			pswitch(!proxy);
-		}
-		for (mode = "w"; *++argv != NULL; mode = "a")
-			recvrequest ("NLST", temp, *argv, mode, 0);
-		if (doswitch) {
-			pswitch(!proxy);
-		}
-		verbose = oldverbose; hash = oldhash;
-		ftemp = fopen(temp, "r");
-		unlink(temp);
-		if (ftemp == NULL) {
-			printf("can't find list of remote files, oops\n");
-			return (NULL);
-		}
-	}
-	if (fgets(buf, sizeof (buf), ftemp) == NULL) {
-		fclose(ftemp);
-		ftemp = NULL;
-		return (NULL);
-	}
-	if ((cp = strchr(buf, '\n')) != NULL)
-		*cp = '\0';
-	return (buf);
-}
-
-char *
-onoff(int bool)
-{
-
-	return (bool ? "on" : "off");
-}
-
-/*
- * Show status.
- */
-/*ARGSUSED*/
-void
-status(int argc, char **argv)
-{
-	int i;
-
-	if (connected)
-		printf("Connected to %s.\n", hostname);
-	else
-		printf("Not connected.\n");
-	if (!proxy) {
-		pswitch(1);
-		if (connected) {
-			printf("Connected for proxy commands to %s.\n", hostname);
-		}
-		else {
-			printf("No proxy connection.\n");
-		}
-		pswitch(0);
-	}
-	sec_status();
-	printf("Mode: %s; Type: %s; Form: %s; Structure: %s\n",
-		modename, typename, formname, structname);
-	printf("Verbose: %s; Bell: %s; Prompting: %s; Globbing: %s\n", 
-		onoff(verbose), onoff(bell), onoff(interactive),
-		onoff(doglob));
-	printf("Store unique: %s; Receive unique: %s\n", onoff(sunique),
-		onoff(runique));
-	printf("Case: %s; CR stripping: %s\n",onoff(mcase),onoff(crflag));
-	if (ntflag) {
-		printf("Ntrans: (in) %s (out) %s\n", ntin,ntout);
-	}
-	else {
-		printf("Ntrans: off\n");
-	}
-	if (mapflag) {
-		printf("Nmap: (in) %s (out) %s\n", mapin, mapout);
-	}
-	else {
-		printf("Nmap: off\n");
-	}
-	printf("Hash mark printing: %s; Use of PORT cmds: %s\n",
-		onoff(hash), onoff(sendport));
-	if (macnum > 0) {
-		printf("Macros:\n");
-		for (i=0; i<macnum; i++) {
-			printf("\t%s\n",macros[i].mac_name);
-		}
-	}
-	code = 0;
-}
-
-/*
- * Set beep on cmd completed mode.
- */
-/*VARARGS*/
-void
-setbell(int argc, char **argv)
-{
-
-	bell = !bell;
-	printf("Bell mode %s.\n", onoff(bell));
-	code = bell;
-}
-
-/*
- * Turn on packet tracing.
- */
-/*VARARGS*/
-void
-settrace(int argc, char **argv)
-{
-
-	trace = !trace;
-	printf("Packet tracing %s.\n", onoff(trace));
-	code = trace;
-}
-
-/*
- * Toggle hash mark printing during transfers.
- */
-/*VARARGS*/
-void
-sethash(int argc, char **argv)
-{
-
-	hash = !hash;
-	printf("Hash mark printing %s", onoff(hash));
-	code = hash;
-	if (hash)
-		printf(" (%d bytes/hash mark)", 1024);
-	printf(".\n");
-}
-
-/*
- * Turn on printing of server echo's.
- */
-/*VARARGS*/
-void
-setverbose(int argc, char **argv)
-{
-
-	verbose = !verbose;
-	printf("Verbose mode %s.\n", onoff(verbose));
-	code = verbose;
-}
-
-/*
- * Toggle PORT cmd use before each data connection.
- */
-/*VARARGS*/
-void
-setport(int argc, char **argv)
-{
-
-	sendport = !sendport;
-	printf("Use of PORT cmds %s.\n", onoff(sendport));
-	code = sendport;
-}
-
-/*
- * Turn on interactive prompting
- * during mget, mput, and mdelete.
- */
-/*VARARGS*/
-void
-setprompt(int argc, char **argv)
-{
-
-	interactive = !interactive;
-	printf("Interactive mode %s.\n", onoff(interactive));
-	code = interactive;
-}
-
-/*
- * Toggle metacharacter interpretation
- * on local file names.
- */
-/*VARARGS*/
-void
-setglob(int argc, char **argv)
-{
-	
-	doglob = !doglob;
-	printf("Globbing %s.\n", onoff(doglob));
-	code = doglob;
-}
-
-/*
- * Set debugging mode on/off and/or
- * set level of debugging.
- */
-/*VARARGS*/
-void
-setdebug(int argc, char **argv)
-{
-	int val;
-
-	if (argc > 1) {
-		val = atoi(argv[1]);
-		if (val < 0) {
-			printf("%s: bad debugging value.\n", argv[1]);
-			code = -1;
-			return;
-		}
-	} else
-		val = !debug;
-	debug = val;
-	if (debug)
-		options |= SO_DEBUG;
-	else
-		options &= ~SO_DEBUG;
-	printf("Debugging %s (debug=%d).\n", onoff(debug), debug);
-	code = debug > 0;
-}
-
-/*
- * Set current working directory
- * on remote machine.
- */
-void
-cd(int argc, char **argv)
-{
-
-	if (argc < 2 && !another(&argc, &argv, "remote-directory")) {
-		printf("usage: %s remote-directory\n", argv[0]);
-		code = -1;
-		return;
-	}
-	if (command("CWD %s", argv[1]) == ERROR && code == 500) {
-		if (verbose)
-			printf("CWD command not recognized, trying XCWD\n");
-		command("XCWD %s", argv[1]);
-	}
-}
-
-/*
- * Set current working directory
- * on local machine.
- */
-void
-lcd(int argc, char **argv)
-{
-	char buf[MaxPathLen];
-
-	if (argc < 2)
-		argc++, argv[1] = home;
-	if (argc != 2) {
-		printf("usage: %s local-directory\n", argv[0]);
-		code = -1;
-		return;
-	}
-	if (!globulize(&argv[1])) {
-		code = -1;
-		return;
-	}
-	if (chdir(argv[1]) < 0) {
-		warn("local: %s", argv[1]);
-		code = -1;
-		return;
-	}
-	if (getcwd(buf, sizeof(buf)) != NULL)
-		printf("Local directory now %s\n", buf);
-	else
-		warnx("getwd: %s", buf);
-	code = 0;
-}
-
-/*
- * Delete a single file.
- */
-void
-delete(int argc, char **argv)
-{
-
-	if (argc < 2 && !another(&argc, &argv, "remote-file")) {
-		printf("usage: %s remote-file\n", argv[0]);
-		code = -1;
-		return;
-	}
-	command("DELE %s", argv[1]);
-}
-
-/*
- * Delete multiple files.
- */
-void
-mdelete(int argc, char **argv)
-{
-	sighand oldintr;
-	int ointer;
-	char *cp;
-
-	if (argc < 2 && !another(&argc, &argv, "remote-files")) {
-		printf("usage: %s remote-files\n", argv[0]);
-		code = -1;
-		return;
-	}
-	mname = argv[0];
-	mflag = 1;
-	oldintr = signal(SIGINT, mabort);
-	setjmp(jabort);
-	while ((cp = remglob(argv,0)) != NULL) {
-		if (*cp == '\0') {
-			mflag = 0;
-			continue;
-		}
-		if (mflag && confirm(argv[0], cp)) {
-			command("DELE %s", cp);
-			if (!mflag && fromatty) {
-				ointer = interactive;
-				interactive = 1;
-				if (confirm("Continue with", "mdelete")) {
-					mflag++;
-				}
-				interactive = ointer;
-			}
-		}
-	}
-	signal(SIGINT, oldintr);
-	mflag = 0;
-}
-
-/*
- * Rename a remote file.
- */
-void
-renamefile(int argc, char **argv)
-{
-
-	if (argc < 2 && !another(&argc, &argv, "from-name"))
-		goto usage;
-	if (argc < 3 && !another(&argc, &argv, "to-name")) {
-usage:
-		printf("%s from-name to-name\n", argv[0]);
-		code = -1;
-		return;
-	}
-	if (command("RNFR %s", argv[1]) == CONTINUE)
-		command("RNTO %s", argv[2]);
-}
-
-/*
- * Get a directory listing
- * of remote files.
- */
-void
-ls(int argc, char **argv)
-{
-	char *cmd;
-
-	if (argc < 2)
-		argc++, argv[1] = NULL;
-	if (argc < 3)
-		argc++, argv[2] = "-";
-	if (argc > 3) {
-		printf("usage: %s remote-directory local-file\n", argv[0]);
-		code = -1;
-		return;
-	}
-	cmd = argv[0][0] == 'n' ? "NLST" : "LIST";
-	if (strcmp(argv[2], "-") && !globulize(&argv[2])) {
-		code = -1;
-		return;
-	}
-	if (strcmp(argv[2], "-") && *argv[2] != '|')
-		if (!globulize(&argv[2]) || !confirm("output to local-file:", argv[2])) {
-			code = -1;
-			return;
-	}
-	recvrequest(cmd, argv[2], argv[1], "w", 0);
-}
-
-/*
- * Get a directory listing
- * of multiple remote files.
- */
-void
-mls(int argc, char **argv)
-{
-	sighand oldintr;
-	int ointer, i;
-	char *cmd, mode[1], *dest;
-
-	if (argc < 2 && !another(&argc, &argv, "remote-files"))
-		goto usage;
-	if (argc < 3 && !another(&argc, &argv, "local-file")) {
-usage:
-		printf("usage: %s remote-files local-file\n", argv[0]);
-		code = -1;
-		return;
-	}
-	dest = argv[argc - 1];
-	argv[argc - 1] = NULL;
-	if (strcmp(dest, "-") && *dest != '|')
-		if (!globulize(&dest) ||
-		    !confirm("output to local-file:", dest)) {
-			code = -1;
-			return;
-	}
-	cmd = argv[0][1] == 'l' ? "NLST" : "LIST";
-	mname = argv[0];
-	mflag = 1;
-	oldintr = signal(SIGINT, mabort);
-	setjmp(jabort);
-	for (i = 1; mflag && i < argc-1; ++i) {
-		*mode = (i == 1) ? 'w' : 'a';
-		recvrequest(cmd, dest, argv[i], mode, 0);
-		if (!mflag && fromatty) {
-			ointer = interactive;
-			interactive = 1;
-			if (confirm("Continue with", argv[0])) {
-				mflag ++;
-			}
-			interactive = ointer;
-		}
-	}
-	signal(SIGINT, oldintr);
-	mflag = 0;
-}
-
-/*
- * Do a shell escape
- */
-/*ARGSUSED*/
-void
-shell(int argc, char **argv)
-{
-	pid_t pid;
-	RETSIGTYPE (*old1)(), (*old2)();
-	char shellnam[40], *shell, *namep; 
-	int status;
-
-	old1 = signal (SIGINT, SIG_IGN);
-	old2 = signal (SIGQUIT, SIG_IGN);
-	if ((pid = fork()) == 0) {
-		for (pid = 3; pid < 20; pid++)
-			close(pid);
-		signal(SIGINT, SIG_DFL);
-		signal(SIGQUIT, SIG_DFL);
-		shell = getenv("SHELL");
-		if (shell == NULL)
-			shell = _PATH_BSHELL;
-		namep = strrchr(shell,'/');
-		if (namep == NULL)
-			namep = shell;
-		strcpy(shellnam,"-");
-		strcat(shellnam, ++namep);
-		if (strcmp(namep, "sh") != 0)
-			shellnam[0] = '+';
-		if (debug) {
-			printf ("%s\n", shell);
-			fflush (stdout);
-		}
-		if (argc > 1) {
-			execl(shell,shellnam,"-c",altarg,(char *)0);
-		}
-		else {
-			execl(shell,shellnam,(char *)0);
-		}
-		warn("%s", shell);
-		code = -1;
-		exit(1);
-	}
-	if (pid > 0)
-		while (waitpid(-1, &status, 0) != pid)
-			;
-	signal(SIGINT, old1);
-	signal(SIGQUIT, old2);
-	if (pid == -1) {
-		warn("%s", "Try again later");
-		code = -1;
-	}
-	else {
-		code = 0;
-	}
-}
-
-/*
- * Send new user information (re-login)
- */
-void
-user(int argc, char **argv)
-{
-	char acct[80];
-	int n, aflag = 0;
-	char tmp[256];
-
-	if (argc < 2)
-		another(&argc, &argv, "username");
-	if (argc < 2 || argc > 4) {
-		printf("usage: %s username [password] [account]\n", argv[0]);
-		code = -1;
-		return;
-	}
-	n = command("USER %s", argv[1]);
-	if (n == CONTINUE) {
-	    if (argc < 3 ) {
-		des_read_pw_string (tmp,
-				    sizeof(tmp),
-				    "Password: ", 0);
-		argv[2] = tmp;
-		argc++;
-	    }
-	    n = command("PASS %s", argv[2]);
-	}
-	if (n == CONTINUE) {
-		if (argc < 4) {
-			printf("Account: "); fflush(stdout);
-			fgets(acct, sizeof(acct) - 1, stdin);
-			acct[strlen(acct) - 1] = '\0';
-			argv[3] = acct; argc++;
-		}
-		n = command("ACCT %s", argv[3]);
-		aflag++;
-	}
-	if (n != COMPLETE) {
-		fprintf(stdout, "Login failed.\n");
-		return;
-	}
-	if (!aflag && argc == 4) {
-		command("ACCT %s", argv[3]);
-	}
-}
-
-/*
- * Print working directory.
- */
-/*VARARGS*/
-void
-pwd(int argc, char **argv)
-{
-	int oldverbose = verbose;
-
-	/*
-	 * If we aren't verbose, this doesn't do anything!
-	 */
-	verbose = 1;
-	if (command("PWD") == ERROR && code == 500) {
-		printf("PWD command not recognized, trying XPWD\n");
-		command("XPWD");
-	}
-	verbose = oldverbose;
-}
-
-/*
- * Make a directory.
- */
-void
-makedir(int argc, char **argv)
-{
-
-	if (argc < 2 && !another(&argc, &argv, "directory-name")) {
-		printf("usage: %s directory-name\n", argv[0]);
-		code = -1;
-		return;
-	}
-	if (command("MKD %s", argv[1]) == ERROR && code == 500) {
-		if (verbose)
-			printf("MKD command not recognized, trying XMKD\n");
-		command("XMKD %s", argv[1]);
-	}
-}
-
-/*
- * Remove a directory.
- */
-void
-removedir(int argc, char **argv)
-{
-
-	if (argc < 2 && !another(&argc, &argv, "directory-name")) {
-		printf("usage: %s directory-name\n", argv[0]);
-		code = -1;
-		return;
-	}
-	if (command("RMD %s", argv[1]) == ERROR && code == 500) {
-		if (verbose)
-			printf("RMD command not recognized, trying XRMD\n");
-		command("XRMD %s", argv[1]);
-	}
-}
-
-/*
- * Send a line, verbatim, to the remote machine.
- */
-void
-quote(int argc, char **argv)
-{
-
-	if (argc < 2 && !another(&argc, &argv, "command line to send")) {
-		printf("usage: %s line-to-send\n", argv[0]);
-		code = -1;
-		return;
-	}
-	quote1("", argc, argv);
-}
-
-/*
- * Send a SITE command to the remote machine.  The line
- * is sent verbatim to the remote machine, except that the
- * word "SITE" is added at the front.
- */
-void
-site(int argc, char **argv)
-{
-
-	if (argc < 2 && !another(&argc, &argv, "arguments to SITE command")) {
-		printf("usage: %s line-to-send\n", argv[0]);
-		code = -1;
-		return;
-	}
-	quote1("SITE ", argc, argv);
-}
-
-/*
- * Turn argv[1..argc) into a space-separated string, then prepend initial text.
- * Send the result as a one-line command and get response.
- */
-void
-quote1(char *initial, int argc, char **argv)
-{
-	int i, len;
-	char buf[BUFSIZ];		/* must be >= sizeof(line) */
-
-	strcpy(buf, initial);
-	if (argc > 1) {
-		len = strlen(buf);
-		len += strlen(strcpy(&buf[len], argv[1]));
-		for (i = 2; i < argc; i++) {
-			buf[len++] = ' ';
-			len += strlen(strcpy(&buf[len], argv[i]));
-		}
-	}
-	if (command(buf) == PRELIM) {
-		while (getreply(0) == PRELIM)
-			continue;
-	}
-}
-
-void
-do_chmod(int argc, char **argv)
-{
-
-	if (argc < 2 && !another(&argc, &argv, "mode"))
-		goto usage;
-	if (argc < 3 && !another(&argc, &argv, "file-name")) {
-usage:
-		printf("usage: %s mode file-name\n", argv[0]);
-		code = -1;
-		return;
-	}
-	command("SITE CHMOD %s %s", argv[1], argv[2]);
-}
-
-void
-do_umask(int argc, char **argv)
-{
-	int oldverbose = verbose;
-
-	verbose = 1;
-	command(argc == 1 ? "SITE UMASK" : "SITE UMASK %s", argv[1]);
-	verbose = oldverbose;
-}
-
-void
-ftp_idle(int argc, char **argv)
-{
-	int oldverbose = verbose;
-
-	verbose = 1;
-	command(argc == 1 ? "SITE IDLE" : "SITE IDLE %s", argv[1]);
-	verbose = oldverbose;
-}
-
-/*
- * Ask the other side for help.
- */
-void
-rmthelp(int argc, char **argv)
-{
-	int oldverbose = verbose;
-
-	verbose = 1;
-	command(argc == 1 ? "HELP" : "HELP %s", argv[1]);
-	verbose = oldverbose;
-}
-
-/*
- * Terminate session and exit.
- */
-/*VARARGS*/
-void
-quit(int argc, char **argv)
-{
-
-	if (connected)
-		disconnect(0, 0);
-	pswitch(1);
-	if (connected) {
-		disconnect(0, 0);
-	}
-	exit(0);
-}
-
-/*
- * Terminate session, but don't exit.
- */
-void
-disconnect(int argc, char **argv)
-{
-
-	if (!connected)
-		return;
-	command("QUIT");
-	if (cout) {
-		fclose(cout);
-	}
-	cout = NULL;
-	connected = 0;
-	krb4_quit();
-	data = -1;
-	if (!proxy) {
-		macnum = 0;
-	}
-}
-
-int
-confirm(char *cmd, char *file)
-{
-	char line[BUFSIZ];
-
-	if (!interactive)
-		return (1);
-	printf("%s %s? ", cmd, file);
-	fflush(stdout);
-	if (fgets(line, sizeof line, stdin) == NULL)
-		return (0);
-	return (*line != 'n' && *line != 'N');
-}
-
-void
-fatal(char *msg)
-{
-
-	errx(1, "%s", msg);
-}
-
-/*
- * Glob a local file name specification with
- * the expectation of a single return value.
- * Can't control multiple values being expanded
- * from the expression, we return only the first.
- */
-int
-globulize(char **cpp)
-{
-	glob_t gl;
-	int flags;
-
-	if (!doglob)
-		return (1);
-
-	flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE;
-	memset(&gl, 0, sizeof(gl));
-	if (glob(*cpp, flags, NULL, &gl) ||
-	    gl.gl_pathc == 0) {
-		warnx("%s: not found", *cpp);
-		globfree(&gl);
-		return (0);
-	}
-	*cpp = strdup(gl.gl_pathv[0]);	/* XXX - wasted memory */
-	globfree(&gl);
-	return (1);
-}
-
-void
-account(int argc, char **argv)
-{
-	char acct[50];
-
-	if (argc > 1) {
-		++argv;
-		--argc;
-		strncpy(acct,*argv,49);
-		acct[49] = '\0';
-		while (argc > 1) {
-			--argc;
-			++argv;
-			strncat(acct,*argv, 49-strlen(acct));
-		}
-	}
-	else {
-	    des_read_pw_string(acct, sizeof(acct), "Account:", 0);
-	}
-	command("ACCT %s", acct);
-}
-
-jmp_buf abortprox;
-
-static RETSIGTYPE
-proxabort(int sig)
-{
-
-	if (!proxy) {
-		pswitch(1);
-	}
-	if (connected) {
-		proxflag = 1;
-	}
-	else {
-		proxflag = 0;
-	}
-	pswitch(0);
-	longjmp(abortprox,1);
-}
-
-void
-doproxy(int argc, char **argv)
-{
-	struct cmd *c;
-	RETSIGTYPE (*oldintr)();
-
-	if (argc < 2 && !another(&argc, &argv, "command")) {
-		printf("usage: %s command\n", argv[0]);
-		code = -1;
-		return;
-	}
-	c = getcmd(argv[1]);
-	if (c == (struct cmd *) -1) {
-		printf("?Ambiguous command\n");
-		fflush(stdout);
-		code = -1;
-		return;
-	}
-	if (c == 0) {
-		printf("?Invalid command\n");
-		fflush(stdout);
-		code = -1;
-		return;
-	}
-	if (!c->c_proxy) {
-		printf("?Invalid proxy command\n");
-		fflush(stdout);
-		code = -1;
-		return;
-	}
-	if (setjmp(abortprox)) {
-		code = -1;
-		return;
-	}
-	oldintr = signal(SIGINT, proxabort);
-	pswitch(1);
-	if (c->c_conn && !connected) {
-		printf("Not connected\n");
-		fflush(stdout);
-		pswitch(0);
-		signal(SIGINT, oldintr);
-		code = -1;
-		return;
-	}
-	(*c->c_handler)(argc-1, argv+1);
-	if (connected) {
-		proxflag = 1;
-	}
-	else {
-		proxflag = 0;
-	}
-	pswitch(0);
-	signal(SIGINT, oldintr);
-}
-
-void
-setcase(int argc, char **argv)
-{
-
-	mcase = !mcase;
-	printf("Case mapping %s.\n", onoff(mcase));
-	code = mcase;
-}
-
-void
-setcr(int argc, char **argv)
-{
-
-	crflag = !crflag;
-	printf("Carriage Return stripping %s.\n", onoff(crflag));
-	code = crflag;
-}
-
-void
-setntrans(int argc, char **argv)
-{
-	if (argc == 1) {
-		ntflag = 0;
-		printf("Ntrans off.\n");
-		code = ntflag;
-		return;
-	}
-	ntflag++;
-	code = ntflag;
-	strncpy(ntin, argv[1], 16);
-	ntin[16] = '\0';
-	if (argc == 2) {
-		ntout[0] = '\0';
-		return;
-	}
-	strncpy(ntout, argv[2], 16);
-	ntout[16] = '\0';
-}
-
-char *
-dotrans(char *name)
-{
-	static char new[MaxPathLen];
-	char *cp1, *cp2 = new;
-	int i, ostop, found;
-
-	for (ostop = 0; *(ntout + ostop) && ostop < 16; ostop++)
-		continue;
-	for (cp1 = name; *cp1; cp1++) {
-		found = 0;
-		for (i = 0; *(ntin + i) && i < 16; i++) {
-			if (*cp1 == *(ntin + i)) {
-				found++;
-				if (i < ostop) {
-					*cp2++ = *(ntout + i);
-				}
-				break;
-			}
-		}
-		if (!found) {
-			*cp2++ = *cp1;
-		}
-	}
-	*cp2 = '\0';
-	return (new);
-}
-
-void
-setnmap(int argc, char **argv)
-{
-	char *cp;
-
-	if (argc == 1) {
-		mapflag = 0;
-		printf("Nmap off.\n");
-		code = mapflag;
-		return;
-	}
-	if (argc < 3 && !another(&argc, &argv, "mapout")) {
-		printf("Usage: %s [mapin mapout]\n",argv[0]);
-		code = -1;
-		return;
-	}
-	mapflag = 1;
-	code = 1;
-	cp = strchr(altarg, ' ');
-	if (proxy) {
-		while(*++cp == ' ')
-			continue;
-		altarg = cp;
-		cp = strchr(altarg, ' ');
-	}
-	*cp = '\0';
-	strncpy(mapin, altarg, MaxPathLen - 1);
-	while (*++cp == ' ')
-		continue;
-	strncpy(mapout, cp, MaxPathLen - 1);
-}
-
-char *
-domap(char *name)
-{
-	static char new[MaxPathLen];
-	char *cp1 = name, *cp2 = mapin;
-	char *tp[9], *te[9];
-	int i, toks[9], toknum = 0, match = 1;
-
-	for (i=0; i < 9; ++i) {
-		toks[i] = 0;
-	}
-	while (match && *cp1 && *cp2) {
-		switch (*cp2) {
-			case '\\':
-				if (*++cp2 != *cp1) {
-					match = 0;
-				}
-				break;
-			case '$':
-				if (*(cp2+1) >= '1' && (*cp2+1) <= '9') {
-					if (*cp1 != *(++cp2+1)) {
-						toks[toknum = *cp2 - '1']++;
-						tp[toknum] = cp1;
-						while (*++cp1 && *(cp2+1)
-							!= *cp1);
-						te[toknum] = cp1;
-					}
-					cp2++;
-					break;
-				}
-				/* FALLTHROUGH */
-			default:
-				if (*cp2 != *cp1) {
-					match = 0;
-				}
-				break;
-		}
-		if (match && *cp1) {
-			cp1++;
-		}
-		if (match && *cp2) {
-			cp2++;
-		}
-	}
-	if (!match && *cp1) /* last token mismatch */
-	{
-		toks[toknum] = 0;
-	}
-	cp1 = new;
-	*cp1 = '\0';
-	cp2 = mapout;
-	while (*cp2) {
-		match = 0;
-		switch (*cp2) {
-			case '\\':
-				if (*(cp2 + 1)) {
-					*cp1++ = *++cp2;
-				}
-				break;
-			case '[':
-LOOP:
-				if (*++cp2 == '$' && isdigit(*(cp2+1))) { 
-					if (*++cp2 == '0') {
-						char *cp3 = name;
-
-						while (*cp3) {
-							*cp1++ = *cp3++;
-						}
-						match = 1;
-					}
-					else if (toks[toknum = *cp2 - '1']) {
-						char *cp3 = tp[toknum];
-
-						while (cp3 != te[toknum]) {
-							*cp1++ = *cp3++;
-						}
-						match = 1;
-					}
-				}
-				else {
-					while (*cp2 && *cp2 != ',' && 
-					    *cp2 != ']') {
-						if (*cp2 == '\\') {
-							cp2++;
-						}
-						else if (*cp2 == '$' &&
-   						        isdigit(*(cp2+1))) {
-							if (*++cp2 == '0') {
-							   char *cp3 = name;
-
-							   while (*cp3) {
-								*cp1++ = *cp3++;
-							   }
-							}
-							else if (toks[toknum =
-							    *cp2 - '1']) {
-							   char *cp3=tp[toknum];
-
-							   while (cp3 !=
-								  te[toknum]) {
-								*cp1++ = *cp3++;
-							   }
-							}
-						}
-						else if (*cp2) {
-							*cp1++ = *cp2++;
-						}
-					}
-					if (!*cp2) {
-						printf("nmap: unbalanced brackets\n");
-						return (name);
-					}
-					match = 1;
-					cp2--;
-				}
-				if (match) {
-					while (*++cp2 && *cp2 != ']') {
-					      if (*cp2 == '\\' && *(cp2 + 1)) {
-							cp2++;
-					      }
-					}
-					if (!*cp2) {
-						printf("nmap: unbalanced brackets\n");
-						return (name);
-					}
-					break;
-				}
-				switch (*++cp2) {
-					case ',':
-						goto LOOP;
-					case ']':
-						break;
-					default:
-						cp2--;
-						goto LOOP;
-				}
-				break;
-			case '$':
-				if (isdigit(*(cp2 + 1))) {
-					if (*++cp2 == '0') {
-						char *cp3 = name;
-
-						while (*cp3) {
-							*cp1++ = *cp3++;
-						}
-					}
-					else if (toks[toknum = *cp2 - '1']) {
-						char *cp3 = tp[toknum];
-
-						while (cp3 != te[toknum]) {
-							*cp1++ = *cp3++;
-						}
-					}
-					break;
-				}
-				/* intentional drop through */
-			default:
-				*cp1++ = *cp2;
-				break;
-		}
-		cp2++;
-	}
-	*cp1 = '\0';
-	if (!*new) {
-		return (name);
-	}
-	return (new);
-}
-
-void
-setpassive(int argc, char **argv)
-{
-
-	passivemode = !passivemode;
-	printf("Passive mode %s.\n", onoff(passivemode));
-	code = passivemode;
-}
-
-void
-setsunique(int argc, char **argv)
-{
-
-	sunique = !sunique;
-	printf("Store unique %s.\n", onoff(sunique));
-	code = sunique;
-}
-
-void
-setrunique(int argc, char **argv)
-{
-
-	runique = !runique;
-	printf("Receive unique %s.\n", onoff(runique));
-	code = runique;
-}
-
-/* change directory to perent directory */
-void
-cdup(int argc, char **argv)
-{
-
-	if (command("CDUP") == ERROR && code == 500) {
-		if (verbose)
-			printf("CDUP command not recognized, trying XCUP\n");
-		command("XCUP");
-	}
-}
-
-/* restart transfer at specific point */
-void
-restart(int argc, char **argv)
-{
-
-    if (argc != 2)
-	printf("restart: offset not specified\n");
-    else {
-	restart_point = atol(argv[1]);
-	printf("restarting at %ld. %s\n", (long)restart_point,
-	       "execute get, put or append to initiate transfer");
-    }
-}
-
-/* show remote system type */
-void
-syst(int argc, char **argv)
-{
-
-	command("SYST");
-}
-
-void
-macdef(int argc, char **argv)
-{
-	char *tmp;
-	int c;
-
-	if (macnum == 16) {
-		printf("Limit of 16 macros have already been defined\n");
-		code = -1;
-		return;
-	}
-	if (argc < 2 && !another(&argc, &argv, "macro name")) {
-		printf("Usage: %s macro_name\n",argv[0]);
-		code = -1;
-		return;
-	}
-	if (interactive) {
-		printf("Enter macro line by line, terminating it with a null line\n");
-	}
-	strncpy(macros[macnum].mac_name, argv[1], 8);
-	if (macnum == 0) {
-		macros[macnum].mac_start = macbuf;
-	}
-	else {
-		macros[macnum].mac_start = macros[macnum - 1].mac_end + 1;
-	}
-	tmp = macros[macnum].mac_start;
-	while (tmp != macbuf+4096) {
-		if ((c = getchar()) == EOF) {
-			printf("macdef:end of file encountered\n");
-			code = -1;
-			return;
-		}
-		if ((*tmp = c) == '\n') {
-			if (tmp == macros[macnum].mac_start) {
-				macros[macnum++].mac_end = tmp;
-				code = 0;
-				return;
-			}
-			if (*(tmp-1) == '\0') {
-				macros[macnum++].mac_end = tmp - 1;
-				code = 0;
-				return;
-			}
-			*tmp = '\0';
-		}
-		tmp++;
-	}
-	while (1) {
-		while ((c = getchar()) != '\n' && c != EOF)
-			/* LOOP */;
-		if (c == EOF || getchar() == '\n') {
-			printf("Macro not defined - 4k buffer exceeded\n");
-			code = -1;
-			return;
-		}
-	}
-}
-
-/*
- * get size of file on remote machine
- */
-void
-sizecmd(int argc, char **argv)
-{
-
-	if (argc < 2 && !another(&argc, &argv, "filename")) {
-		printf("usage: %s filename\n", argv[0]);
-		code = -1;
-		return;
-	}
-	command("SIZE %s", argv[1]);
-}
-
-/*
- * get last modification time of file on remote machine
- */
-void
-modtime(int argc, char **argv)
-{
-	int overbose;
-
-	if (argc < 2 && !another(&argc, &argv, "filename")) {
-		printf("usage: %s filename\n", argv[0]);
-		code = -1;
-		return;
-	}
-	overbose = verbose;
-	if (debug == 0)
-		verbose = -1;
-	if (command("MDTM %s", argv[1]) == COMPLETE) {
-		int yy, mo, day, hour, min, sec;
-		sscanf(reply_string, "%*s %04d%02d%02d%02d%02d%02d", &yy, &mo,
-			&day, &hour, &min, &sec);
-		/* might want to print this in local time */
-		printf("%s\t%02d/%02d/%04d %02d:%02d:%02d GMT\n", argv[1],
-			mo, day, yy, hour, min, sec);
-	} else
-		printf("%s\n", reply_string);
-	verbose = overbose;
-}
-
-/*
- * show status on reomte machine
- */
-void
-rmtstatus(int argc, char **argv)
-{
-
-	command(argc > 1 ? "STAT %s" : "STAT" , argv[1]);
-}
-
-/*
- * get file if modtime is more recent than current file
- */
-void
-newer(int argc, char **argv)
-{
-
-	if (getit(argc, argv, -1, "w"))
-		printf("Local file \"%s\" is newer than remote file \"%s\"\n",
-			argv[2], argv[1]);
-}
diff --git a/crypto/kerberosIV/appl/ftp/ftp/cmdtab.c b/crypto/kerberosIV/appl/ftp/ftp/cmdtab.c
deleted file mode 100644
index 9567e3c71d3a..000000000000
--- a/crypto/kerberosIV/appl/ftp/ftp/cmdtab.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright (c) 1985, 1989, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "ftp_locl.h"
-
-/*
- * User FTP -- Command Tables.
- */
-
-char	accounthelp[] =	"send account command to remote server";
-char	appendhelp[] =	"append to a file";
-char	asciihelp[] =	"set ascii transfer type";
-char	beephelp[] =	"beep when command completed";
-char	binaryhelp[] =	"set binary transfer type";
-char	casehelp[] =	"toggle mget upper/lower case id mapping";
-char	cdhelp[] =	"change remote working directory";
-char	cduphelp[] = 	"change remote working directory to parent directory";
-char	chmodhelp[] =	"change file permissions of remote file";
-char	connecthelp[] =	"connect to remote tftp";
-char	crhelp[] =	"toggle carriage return stripping on ascii gets";
-char	deletehelp[] =	"delete remote file";
-char	debughelp[] =	"toggle/set debugging mode";
-char	dirhelp[] =	"list contents of remote directory";
-char	disconhelp[] =	"terminate ftp session";
-char	domachelp[] = 	"execute macro";
-char	formhelp[] =	"set file transfer format";
-char	globhelp[] =	"toggle metacharacter expansion of local file names";
-char	hashhelp[] =	"toggle printing `#' for each buffer transferred";
-char	helphelp[] =	"print local help information";
-char	idlehelp[] =	"get (set) idle timer on remote side";
-char	lcdhelp[] =	"change local working directory";
-char	lshelp[] =	"list contents of remote directory";
-char	macdefhelp[] =  "define a macro";
-char	mdeletehelp[] =	"delete multiple files";
-char	mdirhelp[] =	"list contents of multiple remote directories";
-char	mgethelp[] =	"get multiple files";
-char	mkdirhelp[] =	"make directory on the remote machine";
-char	mlshelp[] =	"list contents of multiple remote directories";
-char	modtimehelp[] = "show last modification time of remote file";
-char	modehelp[] =	"set file transfer mode";
-char	mputhelp[] =	"send multiple files";
-char	newerhelp[] =	"get file if remote file is newer than local file ";
-char	nlisthelp[] =	"nlist contents of remote directory";
-char	nmaphelp[] =	"set templates for default file name mapping";
-char	ntranshelp[] =	"set translation table for default file name mapping";
-char	porthelp[] =	"toggle use of PORT cmd for each data connection";
-char	prompthelp[] =	"force interactive prompting on multiple commands";
-char	proxyhelp[] =	"issue command on alternate connection";
-char	pwdhelp[] =	"print working directory on remote machine";
-char	quithelp[] =	"terminate ftp session and exit";
-char	quotehelp[] =	"send arbitrary ftp command";
-char	receivehelp[] =	"receive file";
-char	regethelp[] =	"get file restarting at end of local file";
-char	remotehelp[] =	"get help from remote server";
-char	renamehelp[] =	"rename file";
-char	restarthelp[]=	"restart file transfer at bytecount";
-char	rmdirhelp[] =	"remove directory on the remote machine";
-char	rmtstatushelp[]="show status of remote machine";
-char	runiquehelp[] = "toggle store unique for local files";
-char	resethelp[] =	"clear queued command replies";
-char	sendhelp[] =	"send one file";
-char	passivehelp[] =	"enter passive transfer mode";
-char	sitehelp[] =	"send site specific command to remote server\n\t\tTry \"rhelp site\" or \"site help\" for more information";
-char	shellhelp[] =	"escape to the shell";
-char	sizecmdhelp[] = "show size of remote file";
-char	statushelp[] =	"show current status";
-char	structhelp[] =	"set file transfer structure";
-char	suniquehelp[] = "toggle store unique on remote machine";
-char	systemhelp[] =  "show remote system type";
-char	tenexhelp[] =	"set tenex file transfer type";
-char	tracehelp[] =	"toggle packet tracing";
-char	typehelp[] =	"set file transfer type";
-char	umaskhelp[] =	"get (set) umask on remote side";
-char	userhelp[] =	"send new user information";
-char	verbosehelp[] =	"toggle verbose mode";
-
-char	prothelp[] = 	"set protection level";
-char	kauthhelp[] = 	"get remote tokens";
-char	klisthelp[] =	"show remote tickets";
-char	aklog[] = 	"obtain remote AFS tokens";
-
-struct cmd cmdtab[] = {
-	{ "!",		shellhelp,	0,	0,	0,	shell },
-	{ "$",		domachelp,	1,	0,	0,	domacro },
-	{ "account",	accounthelp,	0,	1,	1,	account},
-	{ "append",	appendhelp,	1,	1,	1,	put },
-	{ "ascii",	asciihelp,	0,	1,	1,	setascii },
-	{ "bell",	beephelp,	0,	0,	0,	setbell },
-	{ "binary",	binaryhelp,	0,	1,	1,	setbinary },
-	{ "bye",	quithelp,	0,	0,	0,	quit },
-	{ "case",	casehelp,	0,	0,	1,	setcase },
-	{ "cd",		cdhelp,		0,	1,	1,	cd },
-	{ "cdup",	cduphelp,	0,	1,	1,	cdup },
-	{ "chmod",	chmodhelp,	0,	1,	1,	do_chmod },
-	{ "close",	disconhelp,	0,	1,	1,	disconnect },
-	{ "cr",		crhelp,		0,	0,	0,	setcr },
-	{ "delete",	deletehelp,	0,	1,	1,	delete },
-	{ "debug",	debughelp,	0,	0,	0,	setdebug },
-	{ "dir",	dirhelp,	1,	1,	1,	ls },
-	{ "disconnect",	disconhelp,	0,	1,	1,	disconnect },
-	{ "form",	formhelp,	0,	1,	1,	setform },
-	{ "get",	receivehelp,	1,	1,	1,	get },
-	{ "glob",	globhelp,	0,	0,	0,	setglob },
-	{ "hash",	hashhelp,	0,	0,	0,	sethash },
-	{ "help",	helphelp,	0,	0,	1,	help },
-	{ "idle",	idlehelp,	0,	1,	1,	ftp_idle },
-	{ "image",	binaryhelp,	0,	1,	1,	setbinary },
-	{ "lcd",	lcdhelp,	0,	0,	0,	lcd },
-	{ "ls",		lshelp,		1,	1,	1,	ls },
-	{ "macdef",	macdefhelp,	0,	0,	0,	macdef },
-	{ "mdelete",	mdeletehelp,	1,	1,	1,	mdelete },
-	{ "mdir",	mdirhelp,	1,	1,	1,	mls },
-	{ "mget",	mgethelp,	1,	1,	1,	mget },
-	{ "mkdir",	mkdirhelp,	0,	1,	1,	makedir },
-	{ "mls",	mlshelp,	1,	1,	1,	mls },
-	{ "mode",	modehelp,	0,	1,	1,	setftmode },
-	{ "modtime",	modtimehelp,	0,	1,	1,	modtime },
-	{ "mput",	mputhelp,	1,	1,	1,	mput },
-	{ "newer",	newerhelp,	1,	1,	1,	newer },
-	{ "nmap",	nmaphelp,	0,	0,	1,	setnmap },
-	{ "nlist",	nlisthelp,	1,	1,	1,	ls },
-	{ "ntrans",	ntranshelp,	0,	0,	1,	setntrans },
-	{ "open",	connecthelp,	0,	0,	1,	setpeer },
-	{ "passive",	passivehelp,	0,	0,	0,	setpassive },
-	{ "prompt",	prompthelp,	0,	0,	0,	setprompt },
-	{ "proxy",	proxyhelp,	0,	0,	1,	doproxy },
-	{ "sendport",	porthelp,	0,	0,	0,	setport },
-	{ "put",	sendhelp,	1,	1,	1,	put },
-	{ "pwd",	pwdhelp,	0,	1,	1,	pwd },
-	{ "quit",	quithelp,	0,	0,	0,	quit },
-	{ "quote",	quotehelp,	1,	1,	1,	quote },
-	{ "recv",	receivehelp,	1,	1,	1,	get },
-	{ "reget",	regethelp,	1,	1,	1,	reget },
-	{ "rstatus",	rmtstatushelp,	0,	1,	1,	rmtstatus },
-	{ "rhelp",	remotehelp,	0,	1,	1,	rmthelp },
-	{ "rename",	renamehelp,	0,	1,	1,	renamefile },
-	{ "reset",	resethelp,	0,	1,	1,	reset },
-	{ "restart",	restarthelp,	1,	1,	1,	restart },
-	{ "rmdir",	rmdirhelp,	0,	1,	1,	removedir },
-	{ "runique",	runiquehelp,	0,	0,	1,	setrunique },
-	{ "send",	sendhelp,	1,	1,	1,	put },
-	{ "site",	sitehelp,	0,	1,	1,	site },
-	{ "size",	sizecmdhelp,	1,	1,	1,	sizecmd },
-	{ "status",	statushelp,	0,	0,	1,	status },
-	{ "struct",	structhelp,	0,	1,	1,	setstruct },
-	{ "system",	systemhelp,	0,	1,	1,	syst },
-	{ "sunique",	suniquehelp,	0,	0,	1,	setsunique },
-	{ "tenex",	tenexhelp,	0,	1,	1,	settenex },
-	{ "trace",	tracehelp,	0,	0,	0,	settrace },
-	{ "type",	typehelp,	0,	1,	1,	settype },
-	{ "user",	userhelp,	0,	1,	1,	user },
-	{ "umask",	umaskhelp,	0,	1,	1,	do_umask },
-	{ "verbose",	verbosehelp,	0,	0,	0,	setverbose },
-	{ "?",		helphelp,	0,	0,	1,	help },
-
-	{ "prot", 	prothelp, 	0, 	1, 	0,	sec_prot },
-	{ "kauth", 	kauthhelp, 	0, 	1, 	0,	kauth },
-	{ "klist", 	klisthelp, 	0, 	1, 	0,	klist },
-	
-	{ 0 },
-};
-
-int	NCMDS = (sizeof (cmdtab) / sizeof (cmdtab[0])) - 1;
diff --git a/crypto/kerberosIV/appl/ftp/ftp/domacro.c b/crypto/kerberosIV/appl/ftp/ftp/domacro.c
deleted file mode 100644
index f5a89b9f1201..000000000000
--- a/crypto/kerberosIV/appl/ftp/ftp/domacro.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (c) 1985, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "ftp_locl.h"
-RCSID("$Id: domacro.c,v 1.5 1996/11/17 20:23:10 assar Exp $");
-
-void
-domacro(int argc, char **argv)
-{
-	int i, j, count = 2, loopflg = 0;
-	char *cp1, *cp2, line2[200];
-	struct cmd *c;
-
-	if (argc < 2 && !another(&argc, &argv, "macro name")) {
-		printf("Usage: %s macro_name.\n", argv[0]);
-		code = -1;
-		return;
-	}
-	for (i = 0; i < macnum; ++i) {
-		if (!strncmp(argv[1], macros[i].mac_name, 9)) {
-			break;
-		}
-	}
-	if (i == macnum) {
-		printf("'%s' macro not found.\n", argv[1]);
-		code = -1;
-		return;
-	}
-	strcpy(line2, line);
-TOP:
-	cp1 = macros[i].mac_start;
-	while (cp1 != macros[i].mac_end) {
-		while (isspace(*cp1)) {
-			cp1++;
-		}
-		cp2 = line;
-		while (*cp1 != '\0') {
-		      switch(*cp1) {
-		   	    case '\\':
-				 *cp2++ = *++cp1;
-				 break;
-			    case '$':
-				 if (isdigit(*(cp1+1))) {
-				    j = 0;
-				    while (isdigit(*++cp1)) {
-					  j = 10*j +  *cp1 - '0';
-				    }
-				    cp1--;
-				    if (argc - 2 >= j) {
-					strcpy(cp2, argv[j+1]);
-					cp2 += strlen(argv[j+1]);
-				    }
-				    break;
-				 }
-				 if (*(cp1+1) == 'i') {
-					loopflg = 1;
-					cp1++;
-					if (count < argc) {
-					   strcpy(cp2, argv[count]);
-					   cp2 += strlen(argv[count]);
-					}
-					break;
-				}
-				/* intentional drop through */
-			    default:
-				*cp2++ = *cp1;
-				break;
-		      }
-		      if (*cp1 != '\0') {
-			 cp1++;
-		      }
-		}
-		*cp2 = '\0';
-		makeargv();
-		c = getcmd(margv[0]);
-		if (c == (struct cmd *)-1) {
-			printf("?Ambiguous command\n");
-			code = -1;
-		}
-		else if (c == 0) {
-			printf("?Invalid command\n");
-			code = -1;
-		}
-		else if (c->c_conn && !connected) {
-			printf("Not connected.\n");
-			code = -1;
-		}
-		else {
-			if (verbose) {
-				printf("%s\n",line);
-			}
-			(*c->c_handler)(margc, margv);
-			if (bell && c->c_bell) {
-				putchar('\007');
-			}
-			strcpy(line, line2);
-			makeargv();
-			argc = margc;
-			argv = margv;
-		}
-		if (cp1 != macros[i].mac_end) {
-			cp1++;
-		}
-	}
-	if (loopflg && ++count < argc) {
-		goto TOP;
-	}
-}
diff --git a/crypto/kerberosIV/appl/ftp/ftp/extern.h b/crypto/kerberosIV/appl/ftp/ftp/extern.h
deleted file mode 100644
index b830999d664b..000000000000
--- a/crypto/kerberosIV/appl/ftp/ftp/extern.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/*-
- * Copyright (c) 1994 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)extern.h	8.3 (Berkeley) 10/9/94
- */
-
-/* $Id: extern.h,v 1.13 1997/04/20 05:46:48 assar Exp $ */
-
-#include <setjmp.h>
-#include <stdlib.h>
-#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#elif defined(HAVE_SYS_TIME_H)
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
-void    abort_remote (FILE *);
-void    abortpt (int);
-void    abortrecv (int);
-void	account (int, char **);
-int	another (int *, char ***, char *);
-void	blkfree (char **);
-void	cd (int, char **);
-void	cdup (int, char **);
-void	changetype (int, int);
-void	cmdabort (int);
-void	cmdscanner (int);
-int	command (char *fmt, ...);
-int	confirm (char *, char *);
-FILE   *dataconn (char *);
-void	delete (int, char **);
-void	disconnect (int, char **);
-void	do_chmod (int, char **);
-void	do_umask (int, char **);
-void	domacro (int, char **);
-char   *domap (char *);
-void	doproxy (int, char **);
-char   *dotrans (char *);
-int     empty (fd_set *, int);
-void	fatal (char *);
-void	get (int, char **);
-struct cmd *getcmd (char *);
-int	getit (int, char **, int, char *);
-int	getreply (int);
-int	globulize (char **);
-char   *gunique (char *);
-void	help (int, char **);
-char   *hookup (char *, int);
-void	ftp_idle (int, char **);
-int     initconn (void);
-void	intr (int);
-void	lcd (int, char **);
-int	login (char *);
-RETSIGTYPE	lostpeer (int);
-void	ls (int, char **);
-void	macdef (int, char **);
-void	makeargv (void);
-void	makedir (int, char **);
-void	mdelete (int, char **);
-void	mget (int, char **);
-void	mls (int, char **);
-void	modtime (int, char **);
-void	mput (int, char **);
-char   *onoff (int);
-void	newer (int, char **);
-void    proxtrans (char *, char *, char *);
-void    psabort (int);
-void    pswitch (int);
-void    ptransfer (char *, long, struct timeval *, struct timeval *);
-void	put (int, char **);
-void	pwd (int, char **);
-void	quit (int, char **);
-void	quote (int, char **);
-void	quote1 (char *, int, char **);
-void    recvrequest (char *, char *, char *, char *, int);
-void	reget (int, char **);
-char   *remglob (char **, int);
-void	removedir (int, char **);
-void	renamefile (int, char **);
-void    reset (int, char **);
-void	restart (int, char **);
-void	rmthelp (int, char **);
-void	rmtstatus (int, char **);
-int	ruserpass (char *, char **, char **, char **);
-void    sendrequest (char *, char *, char *, int);
-void	setascii (int, char **);
-void	setbell (int, char **);
-void	setbinary (int, char **);
-void	setcase (int, char **);
-void	setcr (int, char **);
-void	setdebug (int, char **);
-void	setform (int, char **);
-void	setftmode (int, char **);
-void	setglob (int, char **);
-void	sethash (int, char **);
-void	setnmap (int, char **);
-void	setntrans (int, char **);
-void	setpassive (int, char **);
-void	setpeer (int, char **);
-void	setport (int, char **);
-void	setprompt (int, char **);
-void	setrunique (int, char **);
-void	setstruct (int, char **);
-void	setsunique (int, char **);
-void	settenex (int, char **);
-void	settrace (int, char **);
-void	settype (int, char **);
-void	setverbose (int, char **);
-void	shell (int, char **);
-void	site (int, char **);
-void	sizecmd (int, char **);
-char   *slurpstring (void);
-void	status (int, char **);
-void	syst (int, char **);
-void    tvsub (struct timeval *, struct timeval *, struct timeval *);
-void	user (int, char **);
-
-extern jmp_buf	abortprox;
-extern int	abrtflag;
-extern struct	cmd cmdtab[];
-extern FILE	*cout;
-extern int	data;
-extern char    *home;
-extern jmp_buf	jabort;
-extern int	proxy;
-extern char	reply_string[];
-extern off_t	restart_point;
-extern int	NCMDS;
-
-extern char 	username[32];
-extern char	myhostname[];
-extern char	*mydomain;
diff --git a/crypto/kerberosIV/appl/ftp/ftp/ftp.c b/crypto/kerberosIV/appl/ftp/ftp/ftp.c
deleted file mode 100644
index cfabda6a5688..000000000000
--- a/crypto/kerberosIV/appl/ftp/ftp/ftp.c
+++ /dev/null
@@ -1,1658 +0,0 @@
-/*
- * Copyright (c) 1985, 1989, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "ftp_locl.h"
-RCSID("$Id: ftp.c,v 1.44 1997/05/18 20:00:31 assar Exp $");
-
-struct	sockaddr_in hisctladdr;
-struct	sockaddr_in data_addr;
-int	data = -1;
-int	abrtflag = 0;
-jmp_buf	ptabort;
-int	ptabflg;
-int	ptflag = 0;
-struct	sockaddr_in myctladdr;
-off_t	restart_point = 0;
-
-
-FILE	*cin, *cout;
-
-typedef void (*sighand)(int);
-
-char *
-hookup(char *host, int port)
-{
-    struct hostent *hp = 0;
-    int s, len, tos;
-    static char hostnamebuf[80];
-
-    memset(&hisctladdr, 0, sizeof (hisctladdr));
-    if(inet_aton(host, &hisctladdr.sin_addr)){
-	hisctladdr.sin_family = AF_INET;
-	strncpy(hostnamebuf, host, sizeof(hostnamebuf));
-    } else {
-	hp = gethostbyname(host);
-	if (hp == NULL) {
-#ifdef HAVE_H_ERRNO
-	    warnx("%s: %s", host, hstrerror(h_errno));
-#else
-	    warnx("%s: %s", host, "unknown error");
-#endif
-	    code = -1;
-	    return NULL;
-	}
-	hisctladdr.sin_family = hp->h_addrtype;
-	memmove(&hisctladdr.sin_addr,
-		hp->h_addr_list[0],
-		sizeof(hisctladdr.sin_addr));
-	strncpy(hostnamebuf, hp->h_name, sizeof(hostnamebuf));
-	hostnamebuf[sizeof(hostnamebuf) - 1] = '\0';
-    }
-    hostname = hostnamebuf;
-    s = socket(hisctladdr.sin_family, SOCK_STREAM, 0);
-    if (s < 0) {
-	warn("socket");
-	code = -1;
-	return (0);
-    }
-    hisctladdr.sin_port = port;
-    while (connect(s, (struct sockaddr *)&hisctladdr, sizeof (hisctladdr)) < 0) {
-	if (hp && hp->h_addr_list[1]) {
-	    int oerrno = errno;
-	    char *ia;
-
-	    ia = inet_ntoa(hisctladdr.sin_addr);
-	    errno = oerrno;
-	    warn("connect to address %s", ia);
-	    hp->h_addr_list++;
-	    memmove(&hisctladdr.sin_addr,
-		    hp->h_addr_list[0],
-		    sizeof(hisctladdr.sin_addr));
-	    fprintf(stdout, "Trying %s...\n",
-		    inet_ntoa(hisctladdr.sin_addr));
-	    close(s);
-	    s = socket(hisctladdr.sin_family, SOCK_STREAM, 0);
-	    if (s < 0) {
-		warn("socket");
-		code = -1;
-		return (0);
-	    }
-	    continue;
-	}
-	warn("connect");
-	code = -1;
-	goto bad;
-    }
-    len = sizeof (myctladdr);
-    if (getsockname(s, (struct sockaddr *)&myctladdr, &len) < 0) {
-	warn("getsockname");
-	code = -1;
-	goto bad;
-    }
-#if defined(IP_TOS) && defined(HAVE_SETSOCKOPT)
-    tos = IPTOS_LOWDELAY;
-    if (setsockopt(s, IPPROTO_IP, IP_TOS, (char *)&tos, sizeof(int)) < 0)
-	warn("setsockopt TOS (ignored)");
-#endif
-    cin = fdopen(s, "r");
-    cout = fdopen(s, "w");
-    if (cin == NULL || cout == NULL) {
-	warnx("fdopen failed.");
-	if (cin)
-	    fclose(cin);
-	if (cout)
-	    fclose(cout);
-	code = -1;
-	goto bad;
-    }
-    if (verbose)
-	printf("Connected to %s.\n", hostname);
-    if (getreply(0) > 2) { 	/* read startup message from server */
-	if (cin)
-	    fclose(cin);
-	if (cout)
-	    fclose(cout);
-	code = -1;
-	goto bad;
-    }
-#if defined(SO_OOBINLINE) && defined(HAVE_SETSOCKOPT)
-    {
-	int on = 1;
-
-	if (setsockopt(s, SOL_SOCKET, SO_OOBINLINE, (char *)&on, sizeof(on))
-	    < 0 && debug) {
-	    warn("setsockopt");
-	}
-    }
-#endif /* SO_OOBINLINE */
-
-    return (hostname);
-bad:
-    close(s);
-    return NULL;
-}
-
-int
-login(char *host)
-{
-    char tmp[80];
-    char defaultpass[128];
-    char *user, *pass, *acct;
-    int n, aflag = 0;
-
-    char *myname = NULL;
-    struct passwd *pw = k_getpwuid(getuid());
-    if (pw != NULL)
-	myname = pw->pw_name;
-
-    user = pass = acct = 0;
-
-    if(do_klogin(host))
-	printf("\n*** Using plaintext user and password ***\n\n");
-    else{
-	printf("Kerberos authentication successful.\n\n");
-    }
-
-    if (ruserpass(host, &user, &pass, &acct) < 0) {
-	code = -1;
-	return (0);
-    }
-    while (user == NULL) {
-	if (myname)
-	    printf("Name (%s:%s): ", host, myname);
-	else
-	    printf("Name (%s): ", host);
-	fgets(tmp, sizeof(tmp) - 1, stdin);
-	tmp[strlen(tmp) - 1] = '\0';
-	if (*tmp == '\0')
-	    user = myname;
-	else
-	    user = tmp;
-    }
-    strcpy(username, user);
-    n = command("USER %s", user);
-    if (n == CONTINUE) {
-	if(auth_complete)
-	    pass = myname;
-	else if (pass == NULL) {
-	    char prompt[128];
-	    if(myname && 
-	       (!strcmp(user, "ftp") || !strcmp(user, "anonymous"))){
-		snprintf(defaultpass, sizeof(defaultpass), "%s@%s", myname, mydomain);
-		snprintf(prompt, sizeof(prompt), "Password (%s): ", defaultpass);
-	    }else{
-		strcpy(defaultpass, "");
-		snprintf(prompt, sizeof(prompt), "Password: ");
-	    }
-	    pass = defaultpass;
-	    des_read_pw_string (tmp, sizeof(tmp), prompt, 0);
-	    if(tmp[0])
-		pass = tmp;
-	}
-	n = command("PASS %s", pass);
-    }
-    if (n == CONTINUE) {
-	aflag++;
-	acct = tmp;
-	des_read_pw_string(acct, 128, "Account:", 0);
-	n = command("ACCT %s", acct);
-    }
-    if (n != COMPLETE) {
-	warnx("Login failed.");
-	return (0);
-    }
-    if (!aflag && acct != NULL)
-	command("ACCT %s", acct);
-    if (proxy)
-	return (1);
-    for (n = 0; n < macnum; ++n) {
-	if (!strcmp("init", macros[n].mac_name)) {
-	    strcpy(line, "$init");
-	    makeargv();
-	    domacro(margc, margv);
-	    break;
-	}
-    }
-    sec_set_protection_level();
-    return (1);
-}
-
-void
-cmdabort(int sig)
-{
-
-    printf("\n");
-    fflush(stdout);
-    abrtflag++;
-    if (ptflag)
-	longjmp(ptabort,1);
-}
-
-int
-command(char *fmt, ...)
-{
-    va_list ap;
-    int r;
-    sighand oldintr;
-
-    abrtflag = 0;
-    if (cout == NULL) {
-	warn("No control connection for command");
-	code = -1;
-	return (0);
-    }
-    oldintr = signal(SIGINT, cmdabort);
-    va_start(ap, fmt);
-    if(debug){
-	printf("---> ");
-	if (strncmp("PASS ", fmt, 5) == 0)
-	    printf("PASS XXXX");
-	else 
-	    vfprintf(stdout, fmt, ap);
-	va_start(ap, fmt);
-    }
-    if(auth_complete)
-	krb4_write_enc(cout, fmt, ap);
-    else
-	vfprintf(cout, fmt, ap);
-    va_end(ap);
-    if(debug){
-	printf("\n");
-	fflush(stdout);
-    }
-    fprintf(cout, "\r\n");
-    fflush(cout);
-    cpend = 1;
-    r = getreply(!strcmp(fmt, "QUIT"));
-    if (abrtflag && oldintr != SIG_IGN)
-	(*oldintr)(SIGINT);
-    signal(SIGINT, oldintr);
-    return (r);
-}
-
-char reply_string[BUFSIZ];		/* last line of previous reply */
-
-int
-getreply(int expecteof)
-{
-    char *p;
-    char *lead_string;
-    int c;
-    struct sigaction sa, osa;
-    char buf[1024];
-
-    sigemptyset(&sa.sa_mask);
-    sa.sa_flags = 0;
-    sa.sa_handler = cmdabort;
-    sigaction(SIGINT, &sa, &osa);
-    
-    p = buf;
-
-    while(1){
-	c = getc(cin);
-	switch(c){
-	case EOF:
-	    if (expecteof) {
-		sigaction(SIGINT,&osa, NULL);
-		code = 221;
-		return 0;
-	    }
-	    lostpeer(0);
-	    if (verbose) {
-		printf("421 Service not available, "
-		       "remote server has closed connection\n");
-		fflush(stdout);
-	    }
-	    code = 421;
-	    return (4);
-	    break;
-	case IAC:
-	    c = getc(cin);
-	    if(c == WILL || c == WONT)
-		fprintf(cout, "%c%c%c", IAC, DONT, getc(cin));
-	    if(c == DO || c == DONT)
-		fprintf(cout, "%c%c%c", IAC, WONT, getc(cin));
-	    continue;
-	case '\n':
-	    *p++ = 0;
-	    if(isdigit(buf[0])){
-		sscanf(buf, "%d", &code);
-		if(code == 631){
-		    krb4_read_mic(buf);
-		    sscanf(buf, "%d", &code);
-		    lead_string = "S:";
-		} else if(code == 632){
-		    krb4_read_enc(buf);
-		    sscanf(buf, "%d", &code);
-		    lead_string = "P:";
-		}else if(code == 633){
-		    printf("Received confidential reply!\n");
-		}else if(auth_complete)
-		    lead_string = "!!";
-		else
-		    lead_string = "";
-		if(verbose > 0 || (verbose > -1 && code > 499))
-		    fprintf(stdout, "%s%s\n", lead_string, buf);
-		if(buf[3] == ' '){
-		    strcpy(reply_string, buf);
-		    if (code >= 200)
-			cpend = 0;
-		    sigaction(SIGINT, &osa, NULL);
-		    if (code == 421)
-			lostpeer(0);
-#if 1
-		    if (abrtflag && 
-			osa.sa_handler != cmdabort && 
-			osa.sa_handler != SIG_IGN)
-			osa.sa_handler(SIGINT);
-#endif
-		    if(code == 227){
-			char *p, *q;
-			pasv[0] = 0;
-			p = strchr(reply_string, '(');
-			if(p){
-			    p++;
-			    q = strchr(p, ')');
-			    if(q){
-				strncpy(pasv, p, q - p);
-				pasv[q - p] = 0;
-			    }
-			}
-		    }
-		    return code / 100;
-		}
-	    }else{
-		if(verbose > 0 || (verbose > -1 && code > 499)){
-		    if(auth_complete)
-			fprintf(stdout, "!!");
-		    fprintf(stdout, "%s\n", buf);
-		}
-	    }
-	    p = buf;
-	    continue;
-	default:
-	    *p++ = c;
-	}
-    }
-    
-}
-
-
-#if 0
-int
-getreply(int expecteof)
-{
-    int c, n;
-    int dig;
-    int originalcode = 0, continuation = 0;
-    sighand oldintr;
-    int pflag = 0;
-    char *cp, *pt = pasv;
-
-    oldintr = signal(SIGINT, cmdabort);
-    for (;;) {
-	dig = n = code = 0;
-	cp = reply_string;
-	while ((c = getc(cin)) != '\n') {
-	    if (c == IAC) {     /* handle telnet commands */
-		switch (c = getc(cin)) {
-		case WILL:
-		case WONT:
-		    c = getc(cin);
-		    fprintf(cout, "%c%c%c", IAC, DONT, c);
-		    fflush(cout);
-		    break;
-		case DO:
-		case DONT:
-		    c = getc(cin);
-		    fprintf(cout, "%c%c%c", IAC, WONT, c);
-		    fflush(cout);
-		    break;
-		default:
-		    break;
-		}
-		continue;
-	    }
-	    dig++;
-	    if (c == EOF) {
-		if (expecteof) {
-		    signal(SIGINT,oldintr);
-		    code = 221;
-		    return (0);
-		}
-		lostpeer(0);
-		if (verbose) {
-		    printf("421 Service not available, remote server has closed connection\n");
-		    fflush(stdout);
-		}
-		code = 421;
-		return (4);
-	    }
-	    if (c != '\r' && (verbose > 0 ||
-			      (verbose > -1 && n == '5' && dig > 4))) {
-		if (proxflag &&
-		    (dig == 1 || dig == 5 && verbose == 0))
-		    printf("%s:",hostname);
-		putchar(c);
-	    }
-	    if (dig < 4 && isdigit(c))
-		code = code * 10 + (c - '0');
-	    if (!pflag && code == 227)
-		pflag = 1;
-	    if (dig > 4 && pflag == 1 && isdigit(c))
-		pflag = 2;
-	    if (pflag == 2) {
-		if (c != '\r' && c != ')')
-		    *pt++ = c;
-		else {
-		    *pt = '\0';
-		    pflag = 3;
-		}
-	    }
-	    if (dig == 4 && c == '-') {
-		if (continuation)
-		    code = 0;
-		continuation++;
-	    }
-	    if (n == 0)
-		n = c;
-	    if (cp < &reply_string[sizeof(reply_string) - 1])
-		*cp++ = c;
-	}
-	if (verbose > 0 || verbose > -1 && n == '5') {
-	    putchar(c);
-	    fflush (stdout);
-	}
-	if (continuation && code != originalcode) {
-	    if (originalcode == 0)
-		originalcode = code;
-	    continue;
-	}
-	*cp = '\0';
-	if(auth_complete){
-	    if(code == 631)
-		krb4_read_mic(reply_string);
-	    else
-		krb4_read_enc(reply_string);
-	    n = code / 100 + '0';
-	}
-
-	if (n != '1')
-	    cpend = 0;
-	signal(SIGINT,oldintr);
-	if (code == 421 || originalcode == 421)
-	    lostpeer(0);
-	if (abrtflag && oldintr != cmdabort && oldintr != SIG_IGN)
-	    (*oldintr)(SIGINT);
-	return (n - '0');
-    }
-}
-#endif
-
-int
-empty(fd_set *mask, int sec)
-{
-    struct timeval t;
-
-    t.tv_sec = (long) sec;
-    t.tv_usec = 0;
-    return (select(32, mask, NULL, NULL, &t));
-}
-
-jmp_buf	sendabort;
-
-static RETSIGTYPE
-abortsend(int sig)
-{
-
-    mflag = 0;
-    abrtflag = 0;
-    printf("\nsend aborted\nwaiting for remote to finish abort\n");
-    fflush(stdout);
-    longjmp(sendabort, 1);
-}
-
-#define HASHBYTES 1024
-
-static int
-copy_stream(FILE *from, FILE *to)
-{
-    static size_t bufsize;
-    static char *buf;
-    int n;
-    int bytes = 0;
-    int werr;
-    int hashbytes = HASHBYTES;
-    struct stat st;
-    
-#ifdef HAVE_MMAP
-    void *chunk;
-
-#ifndef MAP_FAILED
-#define MAP_FAILED (-1)
-#endif
-
-    if(fstat(fileno(from), &st) == 0 && S_ISREG(st.st_mode)){
-	chunk = mmap(0, st.st_size, PROT_READ, MAP_SHARED, fileno(from), 0);
-	if (chunk != (void *)MAP_FAILED) {
-	    int res;
-
-	    res = sec_write(fileno(to), chunk, st.st_size);
-	    if (munmap(chunk, st.st_size) < 0)
-		warn ("munmap");
-	    sec_fflush(to);
-	    return res;
-	}
-    }
-#endif
-
-    buf = alloc_buffer (buf, &bufsize,
-			fstat(fileno(from), &st) >= 0 ? &st : NULL);
-    if (buf == NULL)
-	return -1;
-
-    while((n = read(fileno(from), buf, bufsize)) > 0){
-	werr = sec_write(fileno(to), buf, n);
-	if(werr < 0)
-	    break;
-	bytes += werr;
-	while(hash && bytes > hashbytes){
-	    putchar('#');
-	    hashbytes += HASHBYTES;
-	}
-    }
-    sec_fflush(to);
-    if(n < 0)
-	warn("local");
-
-    if(werr < 0){
-	if(errno != EPIPE)
-	    warn("netout");
-	bytes = -1;
-    }
-    return bytes;
-}
-
-void
-sendrequest(char *cmd, char *local, char *remote, int printnames)
-{
-    struct stat st;
-    struct timeval start, stop;
-    int c, d;
-    FILE *fin, *dout = 0;
-    int (*closefunc) (FILE *);
-    RETSIGTYPE (*oldintr)(), (*oldintp)();
-    long bytes = 0, hashbytes = HASHBYTES;
-    char *lmode;
-
-    if (verbose && printnames) {
-	if (local && *local != '-')
-	    printf("local: %s ", local);
-	if (remote)
-	    printf("remote: %s\n", remote);
-    }
-    if (proxy) {
-	proxtrans(cmd, local, remote);
-	return;
-    }
-    if (curtype != type)
-	changetype(type, 0);
-    closefunc = NULL;
-    oldintr = NULL;
-    oldintp = NULL;
-    lmode = "w";
-    if (setjmp(sendabort)) {
-	while (cpend) {
-	    getreply(0);
-	}
-	if (data >= 0) {
-	    close(data);
-	    data = -1;
-	}
-	if (oldintr)
-	    signal(SIGINT,oldintr);
-	if (oldintp)
-	    signal(SIGPIPE,oldintp);
-	code = -1;
-	return;
-    }
-    oldintr = signal(SIGINT, abortsend);
-    if (strcmp(local, "-") == 0)
-	fin = stdin;
-    else if (*local == '|') {
-	oldintp = signal(SIGPIPE,SIG_IGN);
-	fin = popen(local + 1, "r");
-	if (fin == NULL) {
-	    warn("%s", local + 1);
-	    signal(SIGINT, oldintr);
-	    signal(SIGPIPE, oldintp);
-	    code = -1;
-	    return;
-	}
-	closefunc = pclose;
-    } else {
-	fin = fopen(local, "r");
-	if (fin == NULL) {
-	    warn("local: %s", local);
-	    signal(SIGINT, oldintr);
-	    code = -1;
-	    return;
-	}
-	closefunc = fclose;
-	if (fstat(fileno(fin), &st) < 0 ||
-	    (st.st_mode&S_IFMT) != S_IFREG) {
-	    fprintf(stdout, "%s: not a plain file.\n", local);
-	    signal(SIGINT, oldintr);
-	    fclose(fin);
-	    code = -1;
-	    return;
-	}
-    }
-    if (initconn()) {
-	signal(SIGINT, oldintr);
-	if (oldintp)
-	    signal(SIGPIPE, oldintp);
-	code = -1;
-	if (closefunc != NULL)
-	    (*closefunc)(fin);
-	return;
-    }
-    if (setjmp(sendabort))
-	goto abort;
-
-    if (restart_point &&
-	(strcmp(cmd, "STOR") == 0 || strcmp(cmd, "APPE") == 0)) {
-	int rc;
-
-	switch (curtype) {
-	case TYPE_A:
-	    rc = fseek(fin, (long) restart_point, SEEK_SET);
-	    break;
-	case TYPE_I:
-	case TYPE_L:
-	    rc = lseek(fileno(fin), restart_point, SEEK_SET);
-	    break;
-	}
-	if (rc < 0) {
-	    warn("local: %s", local);
-	    restart_point = 0;
-	    if (closefunc != NULL)
-		(*closefunc)(fin);
-	    return;
-	}
-	if (command("REST %ld", (long) restart_point)
-	    != CONTINUE) {
-	    restart_point = 0;
-	    if (closefunc != NULL)
-		(*closefunc)(fin);
-	    return;
-	}
-	restart_point = 0;
-	lmode = "r+w";
-    }
-    if (remote) {
-	if (command("%s %s", cmd, remote) != PRELIM) {
-	    signal(SIGINT, oldintr);
-	    if (oldintp)
-		signal(SIGPIPE, oldintp);
-	    if (closefunc != NULL)
-		(*closefunc)(fin);
-	    return;
-	}
-    } else
-	if (command("%s", cmd) != PRELIM) {
-	    signal(SIGINT, oldintr);
-	    if (oldintp)
-		signal(SIGPIPE, oldintp);
-	    if (closefunc != NULL)
-		(*closefunc)(fin);
-	    return;
-	}
-    dout = dataconn(lmode);
-    if (dout == NULL)
-	goto abort;
-    set_buffer_size(fileno(dout), 0);
-    gettimeofday(&start, (struct timezone *)0);
-    oldintp = signal(SIGPIPE, SIG_IGN);
-    switch (curtype) {
-
-    case TYPE_I:
-    case TYPE_L:
-	errno = d = c = 0;
-	bytes = copy_stream(fin, dout);
-	break;
-
-    case TYPE_A:
-	while ((c = getc(fin)) != EOF) {
-	    if (c == '\n') {
-		while (hash && (bytes >= hashbytes)) {
-		    putchar('#');
-		    fflush(stdout);
-		    hashbytes += HASHBYTES;
-		}
-		if (ferror(dout))
-		    break;
-		sec_putc('\r', dout);
-		bytes++;
-	    }
-	    sec_putc(c, dout);
-	    bytes++;
-	}
-	sec_fflush(dout);
-	if (hash) {
-	    if (bytes < hashbytes)
-		putchar('#');
-	    putchar('\n');
-	    fflush(stdout);
-	}
-	if (ferror(fin))
-	    warn("local: %s", local);
-	if (ferror(dout)) {
-	    if (errno != EPIPE)
-		warn("netout");
-	    bytes = -1;
-	}
-	break;
-    }
-    if (closefunc != NULL)
-	(*closefunc)(fin);
-    fclose(dout);
-    gettimeofday(&stop, (struct timezone *)0);
-    getreply(0);
-    signal(SIGINT, oldintr);
-    if (oldintp)
-	signal(SIGPIPE, oldintp);
-    if (bytes > 0)
-	ptransfer("sent", bytes, &start, &stop);
-    return;
-abort:
-    signal(SIGINT, oldintr);
-    if (oldintp)
-	signal(SIGPIPE, oldintp);
-    if (!cpend) {
-	code = -1;
-	return;
-    }
-    if (data >= 0) {
-	close(data);
-	data = -1;
-    }
-    if (dout)
-	fclose(dout);
-    getreply(0);
-    code = -1;
-    if (closefunc != NULL && fin != NULL)
-	(*closefunc)(fin);
-    gettimeofday(&stop, (struct timezone *)0);
-    if (bytes > 0)
-	ptransfer("sent", bytes, &start, &stop);
-}
-
-jmp_buf	recvabort;
-
-void
-abortrecv(int sig)
-{
-
-    mflag = 0;
-    abrtflag = 0;
-    printf("\nreceive aborted\nwaiting for remote to finish abort\n");
-    fflush(stdout);
-    longjmp(recvabort, 1);
-}
-
-void
-recvrequest(char *cmd, char *local, char *remote, char *lmode, int printnames)
-{
-    FILE *fout, *din = 0;
-    int (*closefunc) (FILE *);
-    sighand oldintr, oldintp;
-    int c, d, is_retr, tcrflag, bare_lfs = 0;
-    static size_t bufsize;
-    static char *buf;
-    long bytes = 0, hashbytes = HASHBYTES;
-    struct timeval start, stop;
-    struct stat st;
-
-    is_retr = strcmp(cmd, "RETR") == 0;
-    if (is_retr && verbose && printnames) {
-	if (local && *local != '-')
-	    printf("local: %s ", local);
-	if (remote)
-	    printf("remote: %s\n", remote);
-    }
-    if (proxy && is_retr) {
-	proxtrans(cmd, local, remote);
-	return;
-    }
-    closefunc = NULL;
-    oldintr = NULL;
-    oldintp = NULL;
-    tcrflag = !crflag && is_retr;
-    if (setjmp(recvabort)) {
-	while (cpend) {
-	    getreply(0);
-	}
-	if (data >= 0) {
-	    close(data);
-	    data = -1;
-	}
-	if (oldintr)
-	    signal(SIGINT, oldintr);
-	code = -1;
-	return;
-    }
-    oldintr = signal(SIGINT, abortrecv);
-    if (strcmp(local, "-") && *local != '|') {
-	if (access(local, 2) < 0) {
-	    char *dir = strrchr(local, '/');
-
-	    if (errno != ENOENT && errno != EACCES) {
-		warn("local: %s", local);
-		signal(SIGINT, oldintr);
-		code = -1;
-		return;
-	    }
-	    if (dir != NULL)
-		*dir = 0;
-	    d = access(dir ? local : ".", 2);
-	    if (dir != NULL)
-		*dir = '/';
-	    if (d < 0) {
-		warn("local: %s", local);
-		signal(SIGINT, oldintr);
-		code = -1;
-		return;
-	    }
-	    if (!runique && errno == EACCES &&
-		chmod(local, 0600) < 0) {
-		warn("local: %s", local);
-		signal(SIGINT, oldintr);
-		signal(SIGINT, oldintr);
-		code = -1;
-		return;
-	    }
-	    if (runique && errno == EACCES &&
-		(local = gunique(local)) == NULL) {
-		signal(SIGINT, oldintr);
-		code = -1;
-		return;
-	    }
-	}
-	else if (runique && (local = gunique(local)) == NULL) {
-	    signal(SIGINT, oldintr);
-	    code = -1;
-	    return;
-	}
-    }
-    if (!is_retr) {
-	if (curtype != TYPE_A)
-	    changetype(TYPE_A, 0);
-    } else if (curtype != type)
-	changetype(type, 0);
-    if (initconn()) {
-	signal(SIGINT, oldintr);
-	code = -1;
-	return;
-    }
-    if (setjmp(recvabort))
-	goto abort;
-    if (is_retr && restart_point &&
-	command("REST %ld", (long) restart_point) != CONTINUE)
-	return;
-    if (remote) {
-	if (command("%s %s", cmd, remote) != PRELIM) {
-	    signal(SIGINT, oldintr);
-	    return;
-	}
-    } else {
-	if (command("%s", cmd) != PRELIM) {
-	    signal(SIGINT, oldintr);
-	    return;
-	}
-    }
-    din = dataconn("r");
-    if (din == NULL)
-	goto abort;
-    set_buffer_size(fileno(din), 1);
-    if (strcmp(local, "-") == 0)
-	fout = stdout;
-    else if (*local == '|') {
-	oldintp = signal(SIGPIPE, SIG_IGN);
-	fout = popen(local + 1, "w");
-	if (fout == NULL) {
-	    warn("%s", local+1);
-	    goto abort;
-	}
-	closefunc = pclose;
-    } else {
-	fout = fopen(local, lmode);
-	if (fout == NULL) {
-	    warn("local: %s", local);
-	    goto abort;
-	}
-	closefunc = fclose;
-    }
-    buf = alloc_buffer (buf, &bufsize,
-			fstat(fileno(fout), &st) >= 0 ? &st : NULL);
-    if (buf == NULL)
-	goto abort;
-
-    gettimeofday(&start, (struct timezone *)0);
-    switch (curtype) {
-
-    case TYPE_I:
-    case TYPE_L:
-	if (restart_point &&
-	    lseek(fileno(fout), restart_point, SEEK_SET) < 0) {
-	    warn("local: %s", local);
-	    if (closefunc != NULL)
-		(*closefunc)(fout);
-	    return;
-	}
-	errno = d = 0;
-	while ((c = sec_read(fileno(din), buf, bufsize)) > 0) {
-	    if ((d = write(fileno(fout), buf, c)) != c)
-		break;
-	    bytes += c;
-	    if (hash) {
-		while (bytes >= hashbytes) {
-		    putchar('#');
-		    hashbytes += HASHBYTES;
-		}
-		fflush(stdout);
-	    }
-	}
-	if (hash && bytes > 0) {
-	    if (bytes < HASHBYTES)
-		putchar('#');
-	    putchar('\n');
-	    fflush(stdout);
-	}
-	if (c < 0) {
-	    if (errno != EPIPE)
-		warn("netin");
-	    bytes = -1;
-	}
-	if (d < c) {
-	    if (d < 0)
-		warn("local: %s", local);
-	    else
-		warnx("%s: short write", local);
-	}
-	break;
-
-    case TYPE_A:
-	if (restart_point) {
-	    int i, n, ch;
-
-	    if (fseek(fout, 0L, SEEK_SET) < 0)
-		goto done;
-	    n = restart_point;
-	    for (i = 0; i++ < n;) {
-		if ((ch = sec_getc(fout)) == EOF)
-		    goto done;
-		if (ch == '\n')
-		    i++;
-	    }
-	    if (fseek(fout, 0L, SEEK_CUR) < 0) {
-	    done:
-		warn("local: %s", local);
-		if (closefunc != NULL)
-		    (*closefunc)(fout);
-		return;
-	    }
-	}
-
-	while ((c = sec_getc(din)) != EOF) {
-	    if (c == '\n')
-		bare_lfs++;
-	    while (c == '\r') {
-		while (hash && (bytes >= hashbytes)) {
-		    putchar('#');
-		    fflush(stdout);
-		    hashbytes += HASHBYTES;
-		}
-		bytes++;
-		if ((c = sec_getc(din)) != '\n' || tcrflag) {
-		    if (ferror(fout))
-			goto break2;
-		    putc('\r', fout);
-		    if (c == '\0') {
-			bytes++;
-			goto contin2;
-		    }
-		    if (c == EOF)
-			goto contin2;
-		}
-	    }
-	    putc(c, fout);
-	    bytes++;
-	contin2:	;
-	}
-    break2:
-	if (bare_lfs) {
-	    printf("WARNING! %d bare linefeeds received in ASCII mode\n",
-		   bare_lfs);
-	    printf("File may not have transferred correctly.\n");
-	}
-	if (hash) {
-	    if (bytes < hashbytes)
-		putchar('#');
-	    putchar('\n');
-	    fflush(stdout);
-	}
-	if (ferror(din)) {
-	    if (errno != EPIPE)
-		warn("netin");
-	    bytes = -1;
-	}
-	if (ferror(fout))
-	    warn("local: %s", local);
-	break;
-    }
-    if (closefunc != NULL)
-	(*closefunc)(fout);
-    signal(SIGINT, oldintr);
-    if (oldintp)
-	signal(SIGPIPE, oldintp);
-    fclose(din);
-    gettimeofday(&stop, (struct timezone *)0);
-    getreply(0);
-    if (bytes > 0 && is_retr)
-	ptransfer("received", bytes, &start, &stop);
-    return;
-abort:
-
-    /* abort using RFC959 recommended IP,SYNC sequence  */
-
-    if (oldintp)
-	signal(SIGPIPE, oldintr);
-    signal(SIGINT, SIG_IGN);
-    if (!cpend) {
-	code = -1;
-	signal(SIGINT, oldintr);
-	return;
-    }
-
-    abort_remote(din);
-    code = -1;
-    if (data >= 0) {
-	close(data);
-	data = -1;
-    }
-    if (closefunc != NULL && fout != NULL)
-	(*closefunc)(fout);
-    if (din)
-	fclose(din);
-    gettimeofday(&stop, (struct timezone *)0);
-    if (bytes > 0)
-	ptransfer("received", bytes, &start, &stop);
-    signal(SIGINT, oldintr);
-}
-
-/*
- * Need to start a listen on the data channel before we send the command,
- * otherwise the server's connect may fail.
- */
-int
-initconn(void)
-{
-    int result, len, tmpno = 0;
-    int on = 1;
-    int a0, a1, a2, a3, p0, p1;
-
-    if (passivemode) {
-	data = socket(AF_INET, SOCK_STREAM, 0);
-	if (data < 0) {
-	    perror("ftp: socket");
-	    return(1);
-	}
-#if defined(SO_DEBUG) && defined(HAVE_SETSOCKOPT)
-	if ((options & SO_DEBUG) &&
-	    setsockopt(data, SOL_SOCKET, SO_DEBUG, (char *)&on,
-		       sizeof (on)) < 0)
-	    perror("ftp: setsockopt (ignored)");
-#endif
-	if (command("PASV") != COMPLETE) {
-	    printf("Passive mode refused.\n");
-	    goto bad;
-	}
-
-	/*
-	 * What we've got at this point is a string of comma
-	 * separated one-byte unsigned integer values.
-	 * The first four are the an IP address. The fifth is
-	 * the MSB of the port number, the sixth is the LSB.
-	 * From that we'll prepare a sockaddr_in.
-	 */
-
-	if (sscanf(pasv,"%d,%d,%d,%d,%d,%d",
-		   &a0, &a1, &a2, &a3, &p0, &p1) != 6) {
-	    printf("Passive mode address scan failure. "
-		   "Shouldn't happen!\n");
-	    goto bad;
-	}
-	if(a0 < 0 || a0 > 255 || 
-	   a1 < 0 || a1 > 255 || 
-	   a2 < 0 || a2 > 255 || 
-	   a3 < 0 || a3 > 255 || 
-	   p0 < 0 || p0 > 255 || 
-	   p1 < 0 || p1 > 255){
-	    printf("Can't parse passive mode string.\n");
-	    goto bad;
-	}
-	
-	memset(&data_addr, 0, sizeof(data_addr));
-	data_addr.sin_family = AF_INET;
-	data_addr.sin_addr.s_addr = htonl((a0 << 24) | (a1 << 16) | 
-					  (a2 << 8) | a3);
-	data_addr.sin_port = htons((p0 << 8) | p1);
-
-	if (connect(data, (struct sockaddr *)&data_addr,
-		    sizeof(data_addr)) < 0) {
-	    perror("ftp: connect");
-	    goto bad;
-	}
-#if defined(IP_TOS) && defined(HAVE_SETSOCKOPT)
-	on = IPTOS_THROUGHPUT;
-	if (setsockopt(data, IPPROTO_IP, IP_TOS, (char *)&on,
-		       sizeof(int)) < 0)
-	    perror("ftp: setsockopt TOS (ignored)");
-#endif
-	return(0);
-    }
-
-noport:
-    data_addr = myctladdr;
-    if (sendport)
-	data_addr.sin_port = 0;	/* let system pick one */ 
-    if (data != -1)
-	close(data);
-    data = socket(AF_INET, SOCK_STREAM, 0);
-    if (data < 0) {
-	warn("socket");
-	if (tmpno)
-	    sendport = 1;
-	return (1);
-    }
-#if defined(SO_REUSEADDR) && defined(HAVE_SETSOCKOPT)
-    if (!sendport)
-	if (setsockopt(data, SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof (on)) < 0) {
-	    warn("setsockopt (reuse address)");
-	    goto bad;
-	}
-#endif
-    if (bind(data, (struct sockaddr *)&data_addr, sizeof (data_addr)) < 0) {
-	warn("bind");
-	goto bad;
-    }
-#if defined(SO_DEBUG) && defined(HAVE_SETSOCKOPT)
-    if (options & SO_DEBUG &&
-	setsockopt(data, SOL_SOCKET, SO_DEBUG, (char *)&on, sizeof (on)) < 0)
-	warn("setsockopt (ignored)");
-#endif
-    len = sizeof (data_addr);
-    if (getsockname(data, (struct sockaddr *)&data_addr, &len) < 0) {
-	warn("getsockname");
-	goto bad;
-    }
-    if (listen(data, 1) < 0)
-	warn("listen");
-    if (sendport) {
-	unsigned int a = ntohl(data_addr.sin_addr.s_addr);
-	unsigned int p = ntohs(data_addr.sin_port);
-	result = command("PORT %d,%d,%d,%d,%d,%d", 
-			 (a >> 24) & 0xff,
-			 (a >> 16) & 0xff,
-			 (a >> 8) & 0xff,
-			 a & 0xff,
-			 (p >> 8) & 0xff,
-			 p & 0xff);
-	if (result == ERROR && sendport == -1) {
-	    sendport = 0;
-	    tmpno = 1;
-	    goto noport;
-	}
-	return (result != COMPLETE);
-    }
-    if (tmpno)
-	sendport = 1;
-#if defined(IP_TOS) && defined(HAVE_SETSOCKOPT)
-    on = IPTOS_THROUGHPUT;
-    if (setsockopt(data, IPPROTO_IP, IP_TOS, (char *)&on, sizeof(int)) < 0)
-	warn("setsockopt TOS (ignored)");
-#endif
-    return (0);
-bad:
-    close(data), data = -1;
-    if (tmpno)
-	sendport = 1;
-    return (1);
-}
-
-FILE *
-dataconn(char *lmode)
-{
-    struct sockaddr_in from;
-    int s, fromlen = sizeof (from), tos;
-
-    if (passivemode)
-	return (fdopen(data, lmode));
-
-    s = accept(data, (struct sockaddr *) &from, &fromlen);
-    if (s < 0) {
-	warn("accept");
-	close(data), data = -1;
-	return (NULL);
-    }
-    close(data);
-    data = s;
-#if defined(IP_TOS) && defined(HAVE_SETSOCKOPT)
-    tos = IPTOS_THROUGHPUT;
-    if (setsockopt(s, IPPROTO_IP, IP_TOS, (char *)&tos, sizeof(int)) < 0)
-	warn("setsockopt TOS (ignored)");
-#endif
-    return (fdopen(data, lmode));
-}
-
-void
-ptransfer(char *direction, long int bytes, 
-	  struct timeval *t0, struct timeval *t1)
-{
-    struct timeval td;
-    float s;
-    float bs;
-    int prec;
-    char *unit;
-    
-    if (verbose) {
-	td.tv_sec = t1->tv_sec - t0->tv_sec;
-	td.tv_usec = t1->tv_usec - t0->tv_usec;
-	if(td.tv_usec < 0){
-	    td.tv_sec--;
-	    td.tv_usec += 1000000;
-	}
-	s = td.tv_sec + (td.tv_usec / 1000000.);
-	bs = bytes / (s?s:1);
-	if(bs >= 1048576){
-	    bs /= 1048576;
-	    unit = "M";
-	    prec = 2;
-	}else if(bs >= 1024){
-	    bs /= 1024;
-	    unit = "k";
-	    prec = 1;
-	}else{
-	    unit = "";
-	    prec = 0;
-	}
-	
-	printf("%ld bytes %s in %.3g seconds (%.*f %sbyte/s)\n",
-	       bytes, direction, s, prec, bs, unit);
-    }
-}
-
-void
-psabort(int sig)
-{
-
-    abrtflag++;
-}
-
-void
-pswitch(int flag)
-{
-    sighand oldintr;
-    static struct comvars {
-	int connect;
-	char name[MaxHostNameLen];
-	struct sockaddr_in mctl;
-	struct sockaddr_in hctl;
-	FILE *in;
-	FILE *out;
-	int tpe;
-	int curtpe;
-	int cpnd;
-	int sunqe;
-	int runqe;
-	int mcse;
-	int ntflg;
-	char nti[17];
-	char nto[17];
-	int mapflg;
-	char mi[MaxPathLen];
-	char mo[MaxPathLen];
-    } proxstruct, tmpstruct;
-    struct comvars *ip, *op;
-
-    abrtflag = 0;
-    oldintr = signal(SIGINT, psabort);
-    if (flag) {
-	if (proxy)
-	    return;
-	ip = &tmpstruct;
-	op = &proxstruct;
-	proxy++;
-    } else {
-	if (!proxy)
-	    return;
-	ip = &proxstruct;
-	op = &tmpstruct;
-	proxy = 0;
-    }
-    ip->connect = connected;
-    connected = op->connect;
-    if (hostname) {
-	strncpy(ip->name, hostname, sizeof(ip->name) - 1);
-	ip->name[strlen(ip->name)] = '\0';
-    } else
-	ip->name[0] = 0;
-    hostname = op->name;
-    ip->hctl = hisctladdr;
-    hisctladdr = op->hctl;
-    ip->mctl = myctladdr;
-    myctladdr = op->mctl;
-    ip->in = cin;
-    cin = op->in;
-    ip->out = cout;
-    cout = op->out;
-    ip->tpe = type;
-    type = op->tpe;
-    ip->curtpe = curtype;
-    curtype = op->curtpe;
-    ip->cpnd = cpend;
-    cpend = op->cpnd;
-    ip->sunqe = sunique;
-    sunique = op->sunqe;
-    ip->runqe = runique;
-    runique = op->runqe;
-    ip->mcse = mcase;
-    mcase = op->mcse;
-    ip->ntflg = ntflag;
-    ntflag = op->ntflg;
-    strncpy(ip->nti, ntin, 16);
-    (ip->nti)[strlen(ip->nti)] = '\0';
-    strcpy(ntin, op->nti);
-    strncpy(ip->nto, ntout, 16);
-    (ip->nto)[strlen(ip->nto)] = '\0';
-    strcpy(ntout, op->nto);
-    ip->mapflg = mapflag;
-    mapflag = op->mapflg;
-    strncpy(ip->mi, mapin, MaxPathLen - 1);
-    (ip->mi)[strlen(ip->mi)] = '\0';
-    strcpy(mapin, op->mi);
-    strncpy(ip->mo, mapout, MaxPathLen - 1);
-    (ip->mo)[strlen(ip->mo)] = '\0';
-    strcpy(mapout, op->mo);
-    signal(SIGINT, oldintr);
-    if (abrtflag) {
-	abrtflag = 0;
-	(*oldintr)(SIGINT);
-    }
-}
-
-void
-abortpt(int sig)
-{
-
-    printf("\n");
-    fflush(stdout);
-    ptabflg++;
-    mflag = 0;
-    abrtflag = 0;
-    longjmp(ptabort, 1);
-}
-
-void
-proxtrans(char *cmd, char *local, char *remote)
-{
-    sighand oldintr;
-    int secndflag = 0, prox_type, nfnd;
-    char *cmd2;
-    fd_set mask;
-
-    if (strcmp(cmd, "RETR"))
-	cmd2 = "RETR";
-    else
-	cmd2 = runique ? "STOU" : "STOR";
-    if ((prox_type = type) == 0) {
-	if (unix_server && unix_proxy)
-	    prox_type = TYPE_I;
-	else
-	    prox_type = TYPE_A;
-    }
-    if (curtype != prox_type)
-	changetype(prox_type, 1);
-    if (command("PASV") != COMPLETE) {
-	printf("proxy server does not support third party transfers.\n");
-	return;
-    }
-    pswitch(0);
-    if (!connected) {
-	printf("No primary connection\n");
-	pswitch(1);
-	code = -1;
-	return;
-    }
-    if (curtype != prox_type)
-	changetype(prox_type, 1);
-    if (command("PORT %s", pasv) != COMPLETE) {
-	pswitch(1);
-	return;
-    }
-    if (setjmp(ptabort))
-	goto abort;
-    oldintr = signal(SIGINT, abortpt);
-    if (command("%s %s", cmd, remote) != PRELIM) {
-	signal(SIGINT, oldintr);
-	pswitch(1);
-	return;
-    }
-    sleep(2);
-    pswitch(1);
-    secndflag++;
-    if (command("%s %s", cmd2, local) != PRELIM)
-	goto abort;
-    ptflag++;
-    getreply(0);
-    pswitch(0);
-    getreply(0);
-    signal(SIGINT, oldintr);
-    pswitch(1);
-    ptflag = 0;
-    printf("local: %s remote: %s\n", local, remote);
-    return;
-abort:
-    signal(SIGINT, SIG_IGN);
-    ptflag = 0;
-    if (strcmp(cmd, "RETR") && !proxy)
-	pswitch(1);
-    else if (!strcmp(cmd, "RETR") && proxy)
-	pswitch(0);
-    if (!cpend && !secndflag) {  /* only here if cmd = "STOR" (proxy=1) */
-	if (command("%s %s", cmd2, local) != PRELIM) {
-	    pswitch(0);
-	    if (cpend)
-		abort_remote((FILE *) NULL);
-	}
-	pswitch(1);
-	if (ptabflg)
-	    code = -1;
-	signal(SIGINT, oldintr);
-	return;
-    }
-    if (cpend)
-	abort_remote((FILE *) NULL);
-    pswitch(!proxy);
-    if (!cpend && !secndflag) {  /* only if cmd = "RETR" (proxy=1) */
-	if (command("%s %s", cmd2, local) != PRELIM) {
-	    pswitch(0);
-	    if (cpend)
-		abort_remote((FILE *) NULL);
-	    pswitch(1);
-	    if (ptabflg)
-		code = -1;
-	    signal(SIGINT, oldintr);
-	    return;
-	}
-    }
-    if (cpend)
-	abort_remote((FILE *) NULL);
-    pswitch(!proxy);
-    if (cpend) {
-	FD_ZERO(&mask);
-	FD_SET(fileno(cin), &mask);
-	if ((nfnd = empty(&mask, 10)) <= 0) {
-	    if (nfnd < 0) {
-		warn("abort");
-	    }
-	    if (ptabflg)
-		code = -1;
-	    lostpeer(0);
-	}
-	getreply(0);
-	getreply(0);
-    }
-    if (proxy)
-	pswitch(0);
-    pswitch(1);
-    if (ptabflg)
-	code = -1;
-    signal(SIGINT, oldintr);
-}
-
-void
-reset(int argc, char **argv)
-{
-    fd_set mask;
-    int nfnd = 1;
-
-    FD_ZERO(&mask);
-    while (nfnd > 0) {
-	FD_SET(fileno(cin), &mask);
-	if ((nfnd = empty(&mask,0)) < 0) {
-	    warn("reset");
-	    code = -1;
-	    lostpeer(0);
-	}
-	else if (nfnd) {
-	    getreply(0);
-	}
-    }
-}
-
-char *
-gunique(char *local)
-{
-    static char new[MaxPathLen];
-    char *cp = strrchr(local, '/');
-    int d, count=0;
-    char ext = '1';
-
-    if (cp)
-	*cp = '\0';
-    d = access(cp ? local : ".", 2);
-    if (cp)
-	*cp = '/';
-    if (d < 0) {
-	warn("local: %s", local);
-	return NULL;
-    }
-    strcpy(new, local);
-    cp = new + strlen(new);
-    *cp++ = '.';
-    while (!d) {
-	if (++count == 100) {
-	    printf("runique: can't find unique file name.\n");
-	    return NULL;
-	}
-	*cp++ = ext;
-	*cp = '\0';
-	if (ext == '9')
-	    ext = '0';
-	else
-	    ext++;
-	if ((d = access(new, 0)) < 0)
-	    break;
-	if (ext != '0')
-	    cp--;
-	else if (*(cp - 2) == '.')
-	    *(cp - 1) = '1';
-	else {
-	    *(cp - 2) = *(cp - 2) + 1;
-	    cp--;
-	}
-    }
-    return (new);
-}
-
-void
-abort_remote(FILE *din)
-{
-    char buf[BUFSIZ];
-    int nfnd;
-    fd_set mask;
-
-    /*
-     * send IAC in urgent mode instead of DM because 4.3BSD places oob mark
-     * after urgent byte rather than before as is protocol now
-     */
-    snprintf(buf, sizeof(buf), "%c%c%c", IAC, IP, IAC);
-    if (send(fileno(cout), buf, 3, MSG_OOB) != 3)
-	warn("abort");
-    fprintf(cout,"%cABOR\r\n", DM);
-    fflush(cout);
-    FD_ZERO(&mask);
-    FD_SET(fileno(cin), &mask);
-    if (din) { 
-	FD_SET(fileno(din), &mask);
-    }
-    if ((nfnd = empty(&mask, 10)) <= 0) {
-	if (nfnd < 0) {
-	    warn("abort");
-	}
-	if (ptabflg)
-	    code = -1;
-	lostpeer(0);
-    }
-    if (din && FD_ISSET(fileno(din), &mask)) {
-	while (read(fileno(din), buf, BUFSIZ) > 0)
-	    /* LOOP */;
-    }
-    if (getreply(0) == ERROR && code == 552) {
-	/* 552 needed for nic style abort */
-	getreply(0);
-    }
-    getreply(0);
-}
diff --git a/crypto/kerberosIV/appl/ftp/ftp/ftp_locl.h b/crypto/kerberosIV/appl/ftp/ftp/ftp_locl.h
deleted file mode 100644
index 6ead7932ddf4..000000000000
--- a/crypto/kerberosIV/appl/ftp/ftp/ftp_locl.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id: ftp_locl.h,v 1.29 1997/05/20 18:40:28 bg Exp $ */
-
-#ifndef __FTP_LOCL_H__
-#define __FTP_LOCL_H__
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <sys/cdefs.h>
-
-#ifdef HAVE_PWD_H
-#include <pwd.h>
-#endif
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#elif defined(HAVE_SYS_TIME_H)
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif
-#ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_NETINET_IN_SYSTM_H
-#include <netinet/in_systm.h>
-#endif
-#ifdef HAVE_NETINET_IP_H
-#include <netinet/ip.h>
-#endif
-
-#ifdef HAVE_ARPA_FTP_H
-#include <arpa/ftp.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#ifdef HAVE_ARPA_TELNET_H
-#include <arpa/telnet.h>
-#endif
-
-#include <errno.h>
-#include <ctype.h>
-#include <glob.h>
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-
-#include <err.h>
-
-#ifdef SOCKS
-#include <socks.h>
-extern int LIBPREFIX(fclose)      __P((FILE *));
-#endif
-
-#include "ftp_var.h"
-#include "extern.h"
-#include "common.h"
-#include "pathnames.h"
-
-#include <des.h>
-
-#include <krb.h>
-
-#include "krb4.h"
-
-#include "roken.h"
-
-#if defined(__sun__) && !defined(__svr4)
-int fclose(FILE*);
-int pclose(FILE*);
-#endif
-
-#endif /* __FTP_LOCL_H__ */
diff --git a/crypto/kerberosIV/appl/ftp/ftp/ftp_var.h b/crypto/kerberosIV/appl/ftp/ftp/ftp_var.h
deleted file mode 100644
index ffac59a50fa9..000000000000
--- a/crypto/kerberosIV/appl/ftp/ftp/ftp_var.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 1985, 1989, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ftp_var.h	8.4 (Berkeley) 10/9/94
- */
-
-/*
- * FTP global variables.
- */
-
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#include <setjmp.h>
-
-/*
- * Options and other state info.
- */
-extern int	trace;			/* trace packets exchanged */
-extern int	hash;			/* print # for each buffer transferred */
-extern int	sendport;		/* use PORT cmd for each data connection */
-extern int	verbose;		/* print messages coming back from server */
-extern int	connected;		/* connected to server */
-extern int	fromatty;		/* input is from a terminal */
-extern int	interactive;		/* interactively prompt on m* cmds */
-extern int	debug;			/* debugging level */
-extern int	bell;			/* ring bell on cmd completion */
-extern int	doglob;			/* glob local file names */
-extern int	autologin;		/* establish user account on connection */
-extern int	proxy;			/* proxy server connection active */
-extern int	proxflag;		/* proxy connection exists */
-extern int	sunique;		/* store files on server with unique name */
-extern int	runique;		/* store local files with unique name */
-extern int	mcase;			/* map upper to lower case for mget names */
-extern int	ntflag;			/* use ntin ntout tables for name translation */
-extern int	mapflag;		/* use mapin mapout templates on file names */
-extern int	code;			/* return/reply code for ftp command */
-extern int	crflag;			/* if 1, strip car. rets. on ascii gets */
-extern char	pasv[64];		/* passive port for proxy data connection */
-extern int	passivemode;		/* passive mode enabled */
-extern char	*altarg;		/* argv[1] with no shell-like preprocessing  */
-extern char	ntin[17];		/* input translation table */
-extern char	ntout[17];		/* output translation table */
-extern char	mapin[MaxPathLen];	/* input map template */
-extern char	mapout[MaxPathLen];	/* output map template */
-extern char	typename[32];		/* name of file transfer type */
-extern int	type;			/* requested file transfer type */
-extern int	curtype;		/* current file transfer type */
-extern char	structname[32];		/* name of file transfer structure */
-extern int	stru;			/* file transfer structure */
-extern char	formname[32];		/* name of file transfer format */
-extern int	form;			/* file transfer format */
-extern char	modename[32];		/* name of file transfer mode */
-extern int	mode;			/* file transfer mode */
-extern char	bytename[32];		/* local byte size in ascii */
-extern int	bytesize;		/* local byte size in binary */
-
-extern char	*hostname;		/* name of host connected to */
-extern int	unix_server;		/* server is unix, can use binary for ascii */
-extern int	unix_proxy;		/* proxy is unix, can use binary for ascii */
-
-extern jmp_buf	toplevel;		/* non-local goto stuff for cmd scanner */
-
-extern char	line[200];		/* input line buffer */
-extern char	*stringbase;		/* current scan point in line buffer */
-extern char	argbuf[200];		/* argument storage buffer */
-extern char	*argbase;		/* current storage point in arg buffer */
-extern int	margc;			/* count of arguments on input line */
-extern char	**margv;		/* args parsed from input line */
-extern int	margvlen;		/* how large margv is currently */
-extern int     cpend;                  /* flag: if != 0, then pending server reply */
-extern int	mflag;			/* flag: if != 0, then active multi command */
-
-extern int	options;		/* used during socket creation */
-
-/*
- * Format of command table.
- */
-struct cmd {
-	char	*c_name;	/* name of command */
-	char	*c_help;	/* help string */
-	char	c_bell;		/* give bell when command completes */
-	char	c_conn;		/* must be connected to use command */
-	char	c_proxy;	/* proxy server may execute */
-	void	(*c_handler) (int, char **); /* function to call */
-};
-
-struct macel {
-	char mac_name[9];	/* macro name */
-	char *mac_start;	/* start of macro in macbuf */
-	char *mac_end;		/* end of macro in macbuf */
-};
-
-extern int macnum;			/* number of defined macros */
-extern struct macel macros[16];
-extern char macbuf[4096];
-
-
diff --git a/crypto/kerberosIV/appl/ftp/ftp/globals.c b/crypto/kerberosIV/appl/ftp/ftp/globals.c
deleted file mode 100644
index 7199e65c8c35..000000000000
--- a/crypto/kerberosIV/appl/ftp/ftp/globals.c
+++ /dev/null
@@ -1,76 +0,0 @@
-#include "ftp_locl.h"
-RCSID("$Id: globals.c,v 1.6 1996/08/26 22:46:26 assar Exp $");
-
-/*
- * Options and other state info.
- */
-int	trace;			/* trace packets exchanged */
-int	hash;			/* print # for each buffer transferred */
-int	sendport;		/* use PORT cmd for each data connection */
-int	verbose;		/* print messages coming back from server */
-int	connected;		/* connected to server */
-int	fromatty;		/* input is from a terminal */
-int	interactive;		/* interactively prompt on m* cmds */
-int	debug;			/* debugging level */
-int	bell;			/* ring bell on cmd completion */
-int	doglob;			/* glob local file names */
-int	autologin;		/* establish user account on connection */
-int	proxy;			/* proxy server connection active */
-int	proxflag;		/* proxy connection exists */
-int	sunique;		/* store files on server with unique name */
-int	runique;		/* store local files with unique name */
-int	mcase;			/* map upper to lower case for mget names */
-int	ntflag;			/* use ntin ntout tables for name translation */
-int	mapflag;		/* use mapin mapout templates on file names */
-int	code;			/* return/reply code for ftp command */
-int	crflag;			/* if 1, strip car. rets. on ascii gets */
-char	pasv[64];		/* passive port for proxy data connection */
-int	passivemode;		/* passive mode enabled */
-char	*altarg;		/* argv[1] with no shell-like preprocessing  */
-char	ntin[17];		/* input translation table */
-char	ntout[17];		/* output translation table */
-char	mapin[MaxPathLen];	/* input map template */
-char	mapout[MaxPathLen];	/* output map template */
-char	typename[32];		/* name of file transfer type */
-int	type;			/* requested file transfer type */
-int	curtype;		/* current file transfer type */
-char	structname[32];		/* name of file transfer structure */
-int	stru;			/* file transfer structure */
-char	formname[32];		/* name of file transfer format */
-int	form;			/* file transfer format */
-char	modename[32];		/* name of file transfer mode */
-int	mode;			/* file transfer mode */
-char	bytename[32];		/* local byte size in ascii */
-int	bytesize;		/* local byte size in binary */
-
-char	*hostname;		/* name of host connected to */
-int	unix_server;		/* server is unix, can use binary for ascii */
-int	unix_proxy;		/* proxy is unix, can use binary for ascii */
-
-jmp_buf	toplevel;		/* non-local goto stuff for cmd scanner */
-
-char	line[200];		/* input line buffer */
-char	*stringbase;		/* current scan point in line buffer */
-char	argbuf[200];		/* argument storage buffer */
-char	*argbase;		/* current storage point in arg buffer */
-int	margc;			/* count of arguments on input line */
-char	**margv;		/* args parsed from input line */
-int	margvlen;		/* how large margv is currently */
-int     cpend;                  /* flag: if != 0, then pending server reply */
-int	mflag;			/* flag: if != 0, then active multi command */
-
-int	options;		/* used during socket creation */
-
-/*
- * Format of command table.
- */
-
-int macnum;			/* number of defined macros */
-struct macel macros[16];
-char macbuf[4096];
-
-char username[32];
-
-/* these are set in ruserpass */
-char myhostname[MaxHostNameLen];
-char *mydomain;
diff --git a/crypto/kerberosIV/appl/ftp/ftp/kauth.c b/crypto/kerberosIV/appl/ftp/ftp/kauth.c
deleted file mode 100644
index 8bc9b9bf28dd..000000000000
--- a/crypto/kerberosIV/appl/ftp/ftp/kauth.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "ftp_locl.h"
-RCSID("$Id: kauth.c,v 1.14 1997/05/11 04:08:04 assar Exp $");
-
-void kauth(int argc, char **argv)
-{
-    int ret;
-    char buf[1024];
-    des_cblock key;
-    des_key_schedule schedule;
-    KTEXT_ST tkt, tktcopy;
-    char *name;
-    char *p;
-    int overbose;
-    char passwd[100];
-    int tmp;
-	
-    if(argc > 2){
-	printf("usage: %s [principal]\n", argv[0]);
-	code = -1;
-	return;
-    }
-    if(argc == 2)
-	name = argv[1];
-    else
-	name = username;
-
-    overbose = verbose;
-    verbose = 0;
-
-    ret = command("SITE KAUTH %s", name);
-    if(ret != CONTINUE){
-	verbose = overbose;
-	code = -1;
-	return;
-    }
-    verbose = overbose;
-    p = strstr(reply_string, "T=");
-    if(!p){
-	printf("Bad reply from server.\n");
-	code = -1;
-	return;
-    }
-    p += 2;
-    tmp = base64_decode(p, &tkt.dat);
-    if(tmp < 0){
-	printf("Failed to decode base64 in reply.\n");
-	code = -1;
-	return;
-    }
-    tkt.length = tmp;
-    tktcopy.length = tkt.length;
-    
-    p = strstr(reply_string, "P=");
-    if(!p){
-	printf("Bad reply from server.\n");
-	verbose = overbose;
-	code = -1;
-	return;
-    }
-    name = p + 2;
-    for(; *p && *p != ' ' && *p != '\r' && *p != '\n'; p++);
-    *p = 0;
-    
-    snprintf(buf, sizeof(buf), "Password for %s:", name);
-    if (des_read_pw_string (passwd, sizeof(passwd)-1, buf, 0))
-        *passwd = '\0';
-    des_string_to_key (passwd, &key);
-
-    des_key_sched(&key, schedule);
-    
-    des_pcbc_encrypt((des_cblock*)tkt.dat, (des_cblock*)tktcopy.dat,
-		     tkt.length,
-		     schedule, &key, DES_DECRYPT);
-    if (strcmp ((char*)tktcopy.dat + 8,
-		KRB_TICKET_GRANTING_TICKET) != 0) {
-        afs_string_to_key (passwd, krb_realmofhost(hostname), &key);
-	des_key_sched (&key, schedule);
-	des_pcbc_encrypt((des_cblock*)tkt.dat, (des_cblock*)tktcopy.dat,
-			 tkt.length,
-			 schedule, &key, DES_DECRYPT);
-    }
-    memset(key, 0, sizeof(key));
-    memset(schedule, 0, sizeof(schedule));
-    memset(passwd, 0, sizeof(passwd));
-    base64_encode(tktcopy.dat, tktcopy.length, &p);
-    memset (tktcopy.dat, 0, tktcopy.length);
-    ret = command("SITE KAUTH %s %s", name, p);
-    free(p);
-    if(ret != COMPLETE){
-	code = -1;
-	return;
-    }
-    code = 0;
-}
-
-void klist(int argc, char **argv)
-{
-    int ret;
-    if(argc != 1){
-	printf("usage: %s\n", argv[0]);
-	code = -1;
-	return;
-    }
-    
-    ret = command("SITE KLIST");
-    code = (ret == COMPLETE);
-}
diff --git a/crypto/kerberosIV/appl/ftp/ftp/krb4.c b/crypto/kerberosIV/appl/ftp/ftp/krb4.c
deleted file mode 100644
index 872c5bc13f91..000000000000
--- a/crypto/kerberosIV/appl/ftp/ftp/krb4.c
+++ /dev/null
@@ -1,567 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "ftp_locl.h"
-
-RCSID("$Id: krb4.c,v 1.18 1997/05/11 04:08:05 assar Exp $");
-
-static KTEXT_ST krb4_adat;
-
-static des_cblock key;
-static des_key_schedule schedule;
-
-static char *data_buffer;
-
-extern struct sockaddr_in hisctladdr, myctladdr;
-
-int auth_complete;
-
-static int command_prot;
-
-static int auth_pbsz;
-static int data_prot;
-
-static int request_data_prot;
-
-
-static struct {
-    int level;
-    char *name;
-} level_names[] = {
-    { prot_clear, "clear" },
-    { prot_safe, "safe" },
-    { prot_confidential, "confidential" },
-    { prot_private, "private" }
-};
-
-static char *level_to_name(int level)
-{
-    int i;
-    for(i = 0; i < sizeof(level_names) / sizeof(level_names[0]); i++)
-	if(level_names[i].level == level)
-	    return level_names[i].name;
-    return "unknown";
-}
-
-static int name_to_level(char *name)
-{
-    int i;
-    for(i = 0; i < sizeof(level_names) / sizeof(level_names[0]); i++)
-	if(!strncasecmp(level_names[i].name, name, strlen(name)))
-	    return level_names[i].level;
-    return -1;
-}
-
-void sec_status(void)
-{
-    if(auth_complete){
-	printf("Using KERBEROS_V4 for authentication.\n");
-
-	command_prot = prot_private; /* this variable is not used */
-
-	printf("Using %s command channel.\n", 
-	       level_to_name(command_prot));
-
-	printf("Using %s data channel.\n", 
-	       level_to_name(data_prot));
-	if(auth_pbsz > 0)
-	    printf("Protection buffer size: %d.\n", auth_pbsz);
-    }else{
-	printf("Not using any security mechanism.\n");
-    }
-}
-
-static int
-sec_prot_internal(int level)
-{
-    int ret;
-    char *p;
-    int s = 1048576;
-
-    int old_verbose = verbose;
-    verbose = 0;
-
-    if(!auth_complete){
-	printf("No security data exchange has taken place.\n");
-	return -1;
-    }
-
-    if(level){
-	ret = command("PBSZ %d", s);
-	if(ret != COMPLETE){
-	    printf("Failed to set protection buffer size.\n");
-	    return -1;
-	}
-	auth_pbsz = s;
-	p = strstr(reply_string, "PBSZ=");
-	if(p)
-	    sscanf(p, "PBSZ=%d", &s);
-	if(s < auth_pbsz)
-	    auth_pbsz = s;
-	if(data_buffer)
-	    free(data_buffer);
-	data_buffer = malloc(auth_pbsz);
-    }
-    verbose = old_verbose;
-    ret = command("PROT %c", level["CSEP"]); /* XXX :-) */
-    if(ret != COMPLETE){
-	printf("Failed to set protection level.\n");
-	return -1;
-    }
-    
-    data_prot = level;
-    return 0;
-}
-
-
-void
-sec_prot(int argc, char **argv)
-{
-    int level = -1;
-
-    if(argc != 2){
-	printf("usage: %s (clear | safe | confidential | private)\n",
-	       argv[0]);
-	code = -1;
-	return;
-    }
-    if(!auth_complete){
-	printf("No security data exchange has taken place.\n");
-	code = -1;
-	return;
-    }
-    level = name_to_level(argv[1]);
-    
-    if(level == -1){
-	printf("usage: %s (clear | safe | confidential | private)\n",
-	       argv[0]);
-	code = -1;
-	return;
-    }
-    
-    if(level == prot_confidential){
-	printf("Confidential protection is not defined with Kerberos.\n");
-	code = -1;
-	return;
-    }
-
-    if(sec_prot_internal(level) < 0){
-	code = -1;
-	return;
-    }
-    code = 0;
-}
-
-void
-sec_set_protection_level(void)
-{
-    if(auth_complete && data_prot != request_data_prot)
-	sec_prot_internal(request_data_prot);
-}
-
-
-int
-sec_request_prot(char *level)
-{
-    int l = name_to_level(level);
-    if(l == -1)
-	return -1;
-    request_data_prot = l;
-    return 0;
-}
-
-
-int sec_getc(FILE *F)
-{
-    if(auth_complete && data_prot)
-	return krb4_getc(F);
-    else
-	return getc(F);
-}
-
-int sec_read(int fd, void *data, int length)
-{
-    if(auth_complete && data_prot)
-	return krb4_read(fd, data, length);
-    else
-	return read(fd, data, length);
-}
-
-static int
-krb4_recv(int fd)
-{
-    int len;
-    MSG_DAT m;
-    int kerror;
-    
-    krb_net_read(fd, &len, sizeof(len));
-    len = ntohl(len);
-    krb_net_read(fd, data_buffer, len);
-    if(data_prot == prot_safe)
-	kerror = krb_rd_safe(data_buffer, len, &key, 
-			     &hisctladdr, &myctladdr, &m);
-    else
-	kerror = krb_rd_priv(data_buffer, len, schedule, &key, 
-			     &hisctladdr, &myctladdr, &m);
-    if(kerror){
-	return -1;
-    }
-    memmove(data_buffer, m.app_data, m.app_length);
-    return m.app_length;
-}
-
-
-int krb4_getc(FILE *F)
-{
-    static int bytes;
-    static int index;
-    if(bytes == 0){
-	bytes = krb4_recv(fileno(F));
-	index = 0;
-    }
-    if(bytes){
-	bytes--;
-	return (unsigned char)data_buffer[index++];
-    }
-    return EOF;
-}
-
-int krb4_read(int fd, char *data, int length)
-{
-    static int left;
-    static int index;
-    static int eof;
-    int len = left;
-    int rx = 0;
-
-    if(eof){
-	eof = 0;
-	return 0;
-    }
-    
-    if(left){
-	if(length < len)
-	    len = length;
-	memmove(data, data_buffer + index, len);
-	length -= len;
-	index += len;
-	rx += len;
-	left -= len;
-    }
-    
-    while(length){
-	len = krb4_recv(fd);
-	if(len == 0){
-	    if(rx)
-		eof = 1;
-	    return rx;
-	}
-	if(len > length){
-	    left = len - length;
-	    len = index = length;
-	}
-	memmove(data, data_buffer, len);
-	length -= len;
-	data += len;
-	rx += len;
-    }
-    return rx;
-}
-
-
-static int
-krb4_encode(char *from, char *to, int length)
-{
-    if(data_prot == prot_safe)
-	return krb_mk_safe(from, to, length, &key, 
-			   &myctladdr, &hisctladdr);
-    else
-	return krb_mk_priv(from, to, length, schedule, &key, 
-			   &myctladdr, &hisctladdr);
-}
-
-static int
-krb4_overhead(int len)
-{
-    if(data_prot == prot_safe)
-	return 31;
-    else
-	return 26;
-}
-
-static char p_buf[1024];
-static int p_index;
-
-int
-sec_putc(int c, FILE *F)
-{
-    if(data_prot){
-	if((c == '\n' && p_index) || p_index == sizeof(p_buf)){
-	    sec_write(fileno(F), p_buf, p_index);
-	    p_index = 0;
-	}
-	p_buf[p_index++] = c;
-	return c;
-    }
-    return putc(c, F);
-}
-
-static int
-sec_send(int fd, char *from, int length)
-{
-    int bytes;
-    bytes = krb4_encode(from, data_buffer, length);
-    bytes = htonl(bytes);
-    krb_net_write(fd, &bytes, sizeof(bytes));
-    krb_net_write(fd, data_buffer, ntohl(bytes));
-    return length;
-}
-
-int
-sec_fflush(FILE *F)
-{
-    if(data_prot){
-	if(p_index){
-	    sec_write(fileno(F), p_buf, p_index);
-	    p_index = 0;
-	}
-	sec_send(fileno(F), NULL, 0);
-    }
-    fflush(F);
-    return 0;
-}
-
-int
-sec_write(int fd, char *data, int length)
-{
-    int len = auth_pbsz;
-    int tx = 0;
-      
-    if(data_prot == prot_clear)
-	return write(fd, data, length);
-
-    len -= krb4_overhead(len);
-    while(length){
-	if(length < len)
-	    len = length;
-	sec_send(fd, data, len);
-	length -= len;
-	data += len;
-	tx += len;
-    }
-    return tx;
-}
-
-static int
-do_auth(char *service, char *host, int checksum)
-{
-    int ret;
-    CREDENTIALS cred;
-    char sname[SNAME_SZ], inst[INST_SZ], realm[REALM_SZ];
-    strcpy(sname, service);
-    strcpy(inst, krb_get_phost(host));
-    strcpy(realm, krb_realmofhost(host));
-    ret = krb_mk_req(&krb4_adat, sname, inst, realm, checksum);
-    if(ret)
-	return ret;
-    strcpy(sname, service);
-    strcpy(inst, krb_get_phost(host));
-    strcpy(realm, krb_realmofhost(host));
-    ret = krb_get_cred(sname, inst, realm, &cred);
-    memmove(&key, &cred.session, sizeof(des_cblock));
-    des_key_sched(&key, schedule);
-    memset(&cred, 0, sizeof(cred));
-    return ret;
-}
-
-
-int
-do_klogin(char *host)
-{
-    int ret;
-    char *p;
-    int len;
-    char adat[1024];
-    MSG_DAT msg_data;
-    int checksum;
-
-    int old_verbose = verbose;
-
-    verbose = 0;
-    printf("Trying KERBEROS_V4...\n");
-    ret = command("AUTH KERBEROS_V4");
-    if(ret != CONTINUE){
-	if(code == 504){
-	    printf("Kerberos 4 is not supported by the server.\n");
-	}else if(code == 534){
-	    printf("KERBEROS_V4 rejected as security mechanism.\n");
-	}else if(ret == ERROR)
-	    printf("The server doesn't understand the FTP "
-		   "security extensions.\n");
-	verbose = old_verbose;
-	return -1;
-    }
-
-    checksum = getpid();
-    ret = do_auth("ftp", host, checksum);
-    if(ret == KDC_PR_UNKNOWN)
-	ret = do_auth("rcmd", host, checksum);
-    if(ret){
-	printf("%s\n", krb_get_err_text(ret));
-	verbose = old_verbose;
-	return ret;
-    }
-
-    base64_encode(krb4_adat.dat, krb4_adat.length, &p);
-    ret = command("ADAT %s", p);
-    free(p);
-
-    if(ret != COMPLETE){
-	printf("Server didn't accept auth data.\n");
-	verbose = old_verbose;
-	return -1;
-    }
-
-    p = strstr(reply_string, "ADAT=");
-    if(!p){
-	printf("Remote host didn't send adat reply.\n");
-	verbose = old_verbose;
-	return -1;
-    }
-    p+=5;
-    len = base64_decode(p, adat);
-    if(len < 0){
-	printf("Failed to decode base64 from server.\n");
-	verbose = old_verbose;
-	return -1;
-    }
-    ret = krb_rd_safe(adat, len, &key, 
-		      &hisctladdr, &myctladdr, &msg_data);
-    if(ret){
-	printf("Error reading reply from server: %s.\n", 
-	       krb_get_err_text(ret));
-	verbose = old_verbose;
-	return -1;
-    }
-    { 
-	/* the draft doesn't tell what size the return has */
-	int i;
-	u_int32_t cs = 0;
-	for(i = 0; i < msg_data.app_length; i++)
-	    cs = (cs<<8) + msg_data.app_data[i];
-	if(cs - checksum != 1){
-	    printf("Bad checksum returned from server.\n");
-	    verbose = old_verbose;
-	    return -1;
-	}
-    }
-    auth_complete = 1;
-    verbose = old_verbose;
-    return 0;
-}
-
-void
-krb4_quit(void)
-{
-  auth_complete = 0;
-}
-
-int krb4_write_enc(FILE *F, char *fmt, va_list ap)
-{
-    int len;
-    char *p;
-    char buf[1024];
-    char enc[1024];
-
-    vsnprintf(buf, sizeof(buf), fmt, ap);
-    len = krb_mk_priv(buf, enc, strlen(buf), schedule, &key, 
-		      &myctladdr, &hisctladdr);
-    base64_encode(enc, len, &p);
-
-    fprintf(F, "ENC %s", p);
-    free (p);
-    return 0;
-}
-
-
-int krb4_read_msg(char *s, int priv)
-{
-    int len;
-    int ret;
-    char buf[1024];
-    MSG_DAT m;
-    int code;
-    
-    len = base64_decode(s + 4, buf);
-    if(priv)
-	ret = krb_rd_priv(buf, len, schedule, &key, 
-			  &hisctladdr, &myctladdr, &m);
-    else
-	ret = krb_rd_safe(buf, len, &key, &hisctladdr, &myctladdr, &m);
-    if(ret){
-	printf("%s\n", krb_get_err_text(ret));
-	return -1;
-    }
-	
-    m.app_data[m.app_length] = 0;
-    if(m.app_data[3] == '-')
-      code = 0;
-    else
-      sscanf((char*)m.app_data, "%d", &code);
-    strncpy(s, (char*)m.app_data, strlen((char*)m.app_data));
-    
-    s[m.app_length] = 0;
-    len = strlen(s);
-    if(s[len-1] == '\n')
-	s[len-1] = 0;
-    
-    return code;
-}
-
-int
-krb4_read_mic(char *s)
-{
-    return krb4_read_msg(s, 0);
-}
-
-int
-krb4_read_enc(char *s)
-{
-    return krb4_read_msg(s, 1);
-}
-
diff --git a/crypto/kerberosIV/appl/ftp/ftp/krb4.h b/crypto/kerberosIV/appl/ftp/ftp/krb4.h
deleted file mode 100644
index 7cf8cece104d..000000000000
--- a/crypto/kerberosIV/appl/ftp/ftp/krb4.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id: krb4.h,v 1.10 1997/04/01 08:17:22 joda Exp $ */
-
-#ifndef __KRB4_H__
-#define __KRB4_H__
-
-#include <stdio.h>
-#include <stdarg.h>
-
-extern int auth_complete;
-
-void sec_status(void);
-
-enum { prot_clear, prot_safe, prot_confidential, prot_private };
-
-void sec_prot(int, char**);
-
-int sec_getc(FILE *F);
-int sec_putc(int c, FILE *F);
-int sec_fflush(FILE *F);
-int sec_read(int fd, void *data, int length);
-int sec_write(int fd, char *data, int length);
-
-int krb4_getc(FILE *F);
-int krb4_read(int fd, char *data, int length);
-
-
-
-void sec_set_protection_level(void);
-int sec_request_prot(char *level);
-
-void kauth(int, char **);
-void klist(int, char **);
-
-void krb4_quit(void);
-
-int krb4_write_enc(FILE *F, char *fmt, va_list ap);
-int krb4_read_msg(char *s, int priv);
-int krb4_read_mic(char *s);
-int krb4_read_enc(char *s);
-
-int do_klogin(char *host);
-
-#endif /* __KRB4_H__ */
diff --git a/crypto/kerberosIV/appl/ftp/ftp/main.c b/crypto/kerberosIV/appl/ftp/ftp/main.c
deleted file mode 100644
index 4d1b6a543cdf..000000000000
--- a/crypto/kerberosIV/appl/ftp/ftp/main.c
+++ /dev/null
@@ -1,542 +0,0 @@
-/*
- * Copyright (c) 1985, 1989, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * FTP User Program -- Command Interface.
- */
-
-#include "ftp_locl.h"
-RCSID("$Id: main.c,v 1.20 1997/04/20 16:14:55 joda Exp $");
-
-int
-main(int argc, char **argv)
-{
-	int ch, top;
-	struct passwd *pw = NULL;
-	char homedir[MaxPathLen];
-	struct servent *sp;
-
-	set_progname(argv[0]);
-
-	sp = getservbyname("ftp", "tcp");
-	if (sp == 0)
-		errx(1, "ftp/tcp: unknown service");
-	doglob = 1;
-	interactive = 1;
-	autologin = 1;
-
-	while ((ch = getopt(argc, argv, "dgintv")) != EOF) {
-		switch (ch) {
-		case 'd':
-			options |= SO_DEBUG;
-			debug++;
-			break;
-			
-		case 'g':
-			doglob = 0;
-			break;
-
-		case 'i':
-			interactive = 0;
-			break;
-
-		case 'n':
-			autologin = 0;
-			break;
-
-		case 't':
-			trace++;
-			break;
-
-		case 'v':
-			verbose++;
-			break;
-
-		default:
-		    fprintf(stderr,
-			    "usage: ftp [-dgintv] [host [port]]\n");
-		    exit(1);
-		}
-	}
-	argc -= optind;
-	argv += optind;
-
-	fromatty = isatty(fileno(stdin));
-	if (fromatty)
-		verbose++;
-	cpend = 0;	/* no pending replies */
-	proxy = 0;	/* proxy not active */
-	passivemode = 0; /* passive mode not active */
-	crflag = 1;	/* strip c.r. on ascii gets */
-	sendport = -1;	/* not using ports */
-	/*
-	 * Set up the home directory in case we're globbing.
-	 */
-	pw = k_getpwuid(getuid());
-	if (pw != NULL) {
-		home = homedir;
-		strcpy(home, pw->pw_dir);
-	}
-	if (argc > 0) {
-	    char *xargv[5];
-	    
-	    if (setjmp(toplevel))
-		exit(0);
-	    signal(SIGINT, intr);
-	    signal(SIGPIPE, lostpeer);
-	    xargv[0] = (char*)__progname;
-	    xargv[1] = argv[0];
-	    xargv[2] = argv[1];
-	    xargv[3] = argv[2];
-	    xargv[4] = NULL;
-	    setpeer(argc+1, xargv);
-	}
-	if(setjmp(toplevel) == 0)
-	    top = 1;
-	else
-	    top = 0;
-	if (top) {
-	    signal(SIGINT, intr);
-	    signal(SIGPIPE, lostpeer);
-	}
-	for (;;) {
-	    cmdscanner(top);
-	    top = 1;
-	}
-}
-
-void
-intr(int sig)
-{
-
-	longjmp(toplevel, 1);
-}
-
-#ifndef SHUT_RDWR
-#define SHUT_RDWR 2
-#endif
-
-RETSIGTYPE
-lostpeer(int sig)
-{
-
-    if (connected) {
-	if (cout != NULL) {
-	    shutdown(fileno(cout), SHUT_RDWR);
-	    fclose(cout);
-	    cout = NULL;
-	}
-	if (data >= 0) {
-	    shutdown(data, SHUT_RDWR);
-	    close(data);
-	    data = -1;
-	}
-	connected = 0;
-    }
-    pswitch(1);
-    if (connected) {
-	if (cout != NULL) {
-	    shutdown(fileno(cout), SHUT_RDWR);
-	    fclose(cout);
-	    cout = NULL;
-	}
-	connected = 0;
-    }
-    proxflag = 0;
-    pswitch(0);
-    SIGRETURN(0);
-}
-
-/*
-char *
-tail(filename)
-	char *filename;
-{
-	char *s;
-	
-	while (*filename) {
-		s = strrchr(filename, '/');
-		if (s == NULL)
-			break;
-		if (s[1])
-			return (s + 1);
-		*s = '\0';
-	}
-	return (filename);
-}
-*/
-
-#ifndef HAVE_READLINE
-
-static char *
-readline(char *prompt)
-{
-    char buf[BUFSIZ];
-    printf ("%s", prompt);
-    fflush (stdout);
-    if(fgets(buf, sizeof(buf), stdin) == NULL)
-	return NULL;
-    if (buf[strlen(buf) - 1] == '\n')
-	buf[strlen(buf) - 1] = '\0';
-    return strdup(buf);
-}
-
-static void
-add_history(char *p)
-{
-}
-
-#else
-
-/* These should not really be here */
-
-char *readline(char *);
-void add_history(char *);
-
-#endif
-
-/*
- * Command parser.
- */
-void
-cmdscanner(int top)
-{
-    struct cmd *c;
-    int l;
-
-    if (!top)
-	putchar('\n');
-    for (;;) {
-	if (fromatty) {
-	    char *p;
-	    p = readline("ftp> ");
-	    if(p == NULL)
-		quit(0, 0);
-	    strncpy(line, p, sizeof(line));
-	    line[sizeof(line) - 1] = 0;
-	    add_history(p);
-	    free(p);
-	} else{
-	    if (fgets(line, sizeof line, stdin) == NULL)
-		quit(0, 0);
-	}
-	/* XXX will break on long lines */
-	l = strlen(line);
-	if (l == 0)
-	    break;
-	if (line[--l] == '\n') {
-	    if (l == 0)
-		break;
-	    line[l] = '\0';
-	} else if (l == sizeof(line) - 2) {
-	    printf("sorry, input line too long\n");
-	    while ((l = getchar()) != '\n' && l != EOF)
-		/* void */;
-	    break;
-	} /* else it was a line without a newline */
-	makeargv();
-	if (margc == 0) {
-	    continue;
-	}
-	c = getcmd(margv[0]);
-	if (c == (struct cmd *)-1) {
-	    printf("?Ambiguous command\n");
-	    continue;
-	}
-	if (c == 0) {
-	    printf("?Invalid command\n");
-	    continue;
-	}
-	if (c->c_conn && !connected) {
-	    printf("Not connected.\n");
-	    continue;
-	}
-	(*c->c_handler)(margc, margv);
-	if (bell && c->c_bell)
-	    putchar('\007');
-	if (c->c_handler != help)
-	    break;
-    }
-    signal(SIGINT, intr);
-    signal(SIGPIPE, lostpeer);
-}
-
-struct cmd *
-getcmd(char *name)
-{
-	char *p, *q;
-	struct cmd *c, *found;
-	int nmatches, longest;
-
-	longest = 0;
-	nmatches = 0;
-	found = 0;
-	for (c = cmdtab; (p = c->c_name); c++) {
-		for (q = name; *q == *p++; q++)
-			if (*q == 0)		/* exact match? */
-				return (c);
-		if (!*q) {			/* the name was a prefix */
-			if (q - name > longest) {
-				longest = q - name;
-				nmatches = 1;
-				found = c;
-			} else if (q - name == longest)
-				nmatches++;
-		}
-	}
-	if (nmatches > 1)
-		return ((struct cmd *)-1);
-	return (found);
-}
-
-/*
- * Slice a string up into argc/argv.
- */
-
-int slrflag;
-
-void
-makeargv(void)
-{
-	char **argp;
-
-	argp = margv;
-	stringbase = line;		/* scan from first of buffer */
-	argbase = argbuf;		/* store from first of buffer */
-	slrflag = 0;
-	for (margc = 0; ; margc++) {
-		/* Expand array if necessary */
-		if (margc == margvlen) {
-			margv = (margvlen == 0)
-				? (char **)malloc(20 * sizeof(char *))
-				: (char **)realloc(margv,
-					(margvlen + 20)*sizeof(char *));
-			if (margv == NULL)
-				errx(1, "cannot realloc argv array");
-			margvlen += 20;
-			argp = margv + margc;
-		}
-
-		if ((*argp++ = slurpstring()) == NULL)
-			break;
-	}
-
-}
-
-/*
- * Parse string into argbuf;
- * implemented with FSM to
- * handle quoting and strings
- */
-char *
-slurpstring(void)
-{
-	int got_one = 0;
-	char *sb = stringbase;
-	char *ap = argbase;
-	char *tmp = argbase;		/* will return this if token found */
-
-	if (*sb == '!' || *sb == '$') {	/* recognize ! as a token for shell */
-		switch (slrflag) {	/* and $ as token for macro invoke */
-			case 0:
-				slrflag++;
-				stringbase++;
-				return ((*sb == '!') ? "!" : "$");
-				/* NOTREACHED */
-			case 1:
-				slrflag++;
-				altarg = stringbase;
-				break;
-			default:
-				break;
-		}
-	}
-
-S0:
-	switch (*sb) {
-
-	case '\0':
-		goto OUT;
-
-	case ' ':
-	case '\t':
-		sb++; goto S0;
-
-	default:
-		switch (slrflag) {
-			case 0:
-				slrflag++;
-				break;
-			case 1:
-				slrflag++;
-				altarg = sb;
-				break;
-			default:
-				break;
-		}
-		goto S1;
-	}
-
-S1:
-	switch (*sb) {
-
-	case ' ':
-	case '\t':
-	case '\0':
-		goto OUT;	/* end of token */
-
-	case '\\':
-		sb++; goto S2;	/* slurp next character */
-
-	case '"':
-		sb++; goto S3;	/* slurp quoted string */
-
-	default:
-		*ap++ = *sb++;	/* add character to token */
-		got_one = 1;
-		goto S1;
-	}
-
-S2:
-	switch (*sb) {
-
-	case '\0':
-		goto OUT;
-
-	default:
-		*ap++ = *sb++;
-		got_one = 1;
-		goto S1;
-	}
-
-S3:
-	switch (*sb) {
-
-	case '\0':
-		goto OUT;
-
-	case '"':
-		sb++; goto S1;
-
-	default:
-		*ap++ = *sb++;
-		got_one = 1;
-		goto S3;
-	}
-
-OUT:
-	if (got_one)
-		*ap++ = '\0';
-	argbase = ap;			/* update storage pointer */
-	stringbase = sb;		/* update scan pointer */
-	if (got_one) {
-		return (tmp);
-	}
-	switch (slrflag) {
-		case 0:
-			slrflag++;
-			break;
-		case 1:
-			slrflag++;
-			altarg = (char *) 0;
-			break;
-		default:
-			break;
-	}
-	return NULL;
-}
-
-#define HELPINDENT ((int) sizeof ("directory"))
-
-/*
- * Help command.
- * Call each command handler with argc == 0 and argv[0] == name.
- */
-void
-help(int argc, char **argv)
-{
-	struct cmd *c;
-
-	if (argc == 1) {
-		int i, j, w, k;
-		int columns, width = 0, lines;
-
-		printf("Commands may be abbreviated.  Commands are:\n\n");
-		for (c = cmdtab; c < &cmdtab[NCMDS]; c++) {
-			int len = strlen(c->c_name);
-
-			if (len > width)
-				width = len;
-		}
-		width = (width + 8) &~ 7;
-		columns = 80 / width;
-		if (columns == 0)
-			columns = 1;
-		lines = (NCMDS + columns - 1) / columns;
-		for (i = 0; i < lines; i++) {
-			for (j = 0; j < columns; j++) {
-				c = cmdtab + j * lines + i;
-				if (c->c_name && (!proxy || c->c_proxy)) {
-					printf("%s", c->c_name);
-				}
-				else if (c->c_name) {
-					for (k=0; k < strlen(c->c_name); k++) {
-						putchar(' ');
-					}
-				}
-				if (c + lines >= &cmdtab[NCMDS]) {
-					printf("\n");
-					break;
-				}
-				w = strlen(c->c_name);
-				while (w < width) {
-					w = (w + 8) &~ 7;
-					putchar('\t');
-				}
-			}
-		}
-		return;
-	}
-	while (--argc > 0) {
-		char *arg;
-		arg = *++argv;
-		c = getcmd(arg);
-		if (c == (struct cmd *)-1)
-			printf("?Ambiguous help command %s\n", arg);
-		else if (c == (struct cmd *)0)
-			printf("?Invalid help command %s\n", arg);
-		else
-			printf("%-*s\t%s\n", HELPINDENT,
-				c->c_name, c->c_help);
-	}
-}
diff --git a/crypto/kerberosIV/appl/ftp/ftp/pathnames.h b/crypto/kerberosIV/appl/ftp/ftp/pathnames.h
deleted file mode 100644
index f7c1fb391d69..000000000000
--- a/crypto/kerberosIV/appl/ftp/ftp/pathnames.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
- */
-
-#ifdef HAVE_PATHS_H
-#include <paths.h>
-#endif
-
-#define	_PATH_TMP_XXX	"/tmp/ftpXXXXXX"
-
-#ifndef _PATH_BSHELL
-#define _PATH_BSHELL	"/bin/sh"
-#endif
diff --git a/crypto/kerberosIV/appl/ftp/ftp/ruserpass.c b/crypto/kerberosIV/appl/ftp/ftp/ruserpass.c
deleted file mode 100644
index 8cea6d432016..000000000000
--- a/crypto/kerberosIV/appl/ftp/ftp/ruserpass.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * Copyright (c) 1985, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "ftp_locl.h"
-RCSID("$Id: ruserpass.c,v 1.10 1997/05/02 14:27:55 assar Exp $");
-
-static	int token (void);
-static	FILE *cfile;
-
-#define	DEFAULT	1
-#define	LOGIN	2
-#define	PASSWD	3
-#define	ACCOUNT 4
-#define MACDEF  5
-#define PROT	6
-#define	ID	10
-#define	MACH	11
-
-static char tokval[100];
-
-static struct toktab {
-	char *tokstr;
-	int tval;
-} toktab[]= {
-	{ "default",	DEFAULT },
-	{ "login",	LOGIN },
-	{ "password",	PASSWD },
-	{ "passwd",	PASSWD },
-	{ "account",	ACCOUNT },
-	{ "machine",	MACH },
-	{ "macdef",	MACDEF },
-	{ "prot", 	PROT }, 
-	{ NULL,		0 }
-};
-
-int
-ruserpass(char *host, char **aname, char **apass, char **aacct)
-{
-	char *hdir, buf[BUFSIZ], *tmp;
-	int t, i, c, usedefault = 0;
-	struct stat stb;
-
-	if(k_gethostname(myhostname, MaxHostNameLen) < 0)
-	    strcpy(myhostname, "");
-	if((mydomain = strchr(myhostname, '.')) == NULL)
-	    mydomain = myhostname;
-	else
-	    mydomain++;
-	hdir = getenv("HOME");
-	if (hdir == NULL)
-		hdir = ".";
-	snprintf(buf, sizeof(buf), "%s/.netrc", hdir);
-	cfile = fopen(buf, "r");
-	if (cfile == NULL) {
-		if (errno != ENOENT)
-			warn("%s", buf);
-		return (0);
-	}
-
-next:
-	while ((t = token())) switch(t) {
-
-	case DEFAULT:
-		usedefault = 1;
-		/* FALL THROUGH */
-
-	case MACH:
-		if (!usedefault) {
-			if (token() != ID)
-				continue;
-			/*
-			 * Allow match either for user's input host name
-			 * or official hostname.  Also allow match of 
-			 * incompletely-specified host in local domain.
-			 */
-			if (strcasecmp(host, tokval) == 0)
-				goto match;
-			if (strcasecmp(hostname, tokval) == 0)
-				goto match;
-			if ((tmp = strchr(hostname, '.')) != NULL &&
-			    tmp++ &&
-			    strcasecmp(tmp, mydomain) == 0 &&
-			    strncasecmp(hostname, tokval, tmp-hostname) == 0 &&
-			    tokval[tmp - hostname] == '\0')
-				goto match;
-			if ((tmp = strchr(host, '.')) != NULL &&
-			    tmp++ &&
-			    strcasecmp(tmp, mydomain) == 0 &&
-			    strncasecmp(host, tokval, tmp - host) == 0 &&
-			    tokval[tmp - host] == '\0')
-				goto match;
-			continue;
-		}
-	match:
-		while ((t = token()) && t != MACH && t != DEFAULT) switch(t) {
-
-		case LOGIN:
-			if (token())
-				if (*aname == 0) { 
-					*aname = strdup(tokval);
-				} else {
-					if (strcmp(*aname, tokval))
-						goto next;
-				}
-			break;
-		case PASSWD:
-			if ((*aname == NULL || strcmp(*aname, "anonymous")) &&
-			    fstat(fileno(cfile), &stb) >= 0 &&
-			    (stb.st_mode & 077) != 0) {
-	warnx("Error: .netrc file is readable by others.");
-	warnx("Remove password or make file unreadable by others.");
-				goto bad;
-			}
-			if (token() && *apass == 0) {
-				*apass = strdup(tokval);
-			}
-			break;
-		case ACCOUNT:
-			if (fstat(fileno(cfile), &stb) >= 0
-			    && (stb.st_mode & 077) != 0) {
-	warnx("Error: .netrc file is readable by others.");
-	warnx("Remove account or make file unreadable by others.");
-				goto bad;
-			}
-			if (token() && *aacct == 0) {
-				*aacct = strdup(tokval);
-			}
-			break;
-		case MACDEF:
-			if (proxy) {
-				fclose(cfile);
-				return (0);
-			}
-			while ((c=getc(cfile)) != EOF && c == ' ' || c == '\t');
-			if (c == EOF || c == '\n') {
-				printf("Missing macdef name argument.\n");
-				goto bad;
-			}
-			if (macnum == 16) {
-				printf("Limit of 16 macros have already been defined\n");
-				goto bad;
-			}
-			tmp = macros[macnum].mac_name;
-			*tmp++ = c;
-			for (i=0; i < 8 && (c=getc(cfile)) != EOF &&
-			    !isspace(c); ++i) {
-				*tmp++ = c;
-			}
-			if (c == EOF) {
-				printf("Macro definition missing null line terminator.\n");
-				goto bad;
-			}
-			*tmp = '\0';
-			if (c != '\n') {
-				while ((c=getc(cfile)) != EOF && c != '\n');
-			}
-			if (c == EOF) {
-				printf("Macro definition missing null line terminator.\n");
-				goto bad;
-			}
-			if (macnum == 0) {
-				macros[macnum].mac_start = macbuf;
-			}
-			else {
-				macros[macnum].mac_start = macros[macnum-1].mac_end + 1;
-			}
-			tmp = macros[macnum].mac_start;
-			while (tmp != macbuf + 4096) {
-				if ((c=getc(cfile)) == EOF) {
-				printf("Macro definition missing null line terminator.\n");
-					goto bad;
-				}
-				*tmp = c;
-				if (*tmp == '\n') {
-					if (*(tmp-1) == '\0') {
-					   macros[macnum++].mac_end = tmp - 1;
-					   break;
-					}
-					*tmp = '\0';
-				}
-				tmp++;
-			}
-			if (tmp == macbuf + 4096) {
-				printf("4K macro buffer exceeded\n");
-				goto bad;
-			}
-			break;
-		case PROT:
-		    token();
-		    if(sec_request_prot(tokval) < 0)
-			warnx("Unknown protection level \"%s\"", tokval);
-		    break;
-		default:
-			warnx("Unknown .netrc keyword %s", tokval);
-			break;
-		}
-		goto done;
-	}
-done:
-	fclose(cfile);
-	return (0);
-bad:
-	fclose(cfile);
-	return (-1);
-}
-
-static int
-token(void)
-{
-	char *cp;
-	int c;
-	struct toktab *t;
-
-	if (feof(cfile) || ferror(cfile))
-		return (0);
-	while ((c = getc(cfile)) != EOF &&
-	    (c == '\n' || c == '\t' || c == ' ' || c == ','))
-		continue;
-	if (c == EOF)
-		return (0);
-	cp = tokval;
-	if (c == '"') {
-		while ((c = getc(cfile)) != EOF && c != '"') {
-			if (c == '\\')
-				c = getc(cfile);
-			*cp++ = c;
-		}
-	} else {
-		*cp++ = c;
-		while ((c = getc(cfile)) != EOF
-		    && c != '\n' && c != '\t' && c != ' ' && c != ',') {
-			if (c == '\\')
-				c = getc(cfile);
-			*cp++ = c;
-		}
-	}
-	*cp = 0;
-	if (tokval[0] == 0)
-		return (0);
-	for (t = toktab; t->tokstr; t++)
-		if (!strcmp(t->tokstr, tokval))
-			return (t->tval);
-	return (ID);
-}
diff --git a/crypto/kerberosIV/appl/ftp/ftpd/Makefile.in b/crypto/kerberosIV/appl/ftp/ftpd/Makefile.in
deleted file mode 100644
index 55981deb7ecd..000000000000
--- a/crypto/kerberosIV/appl/ftp/ftpd/Makefile.in
+++ /dev/null
@@ -1,84 +0,0 @@
-# 
-# $Id: Makefile.in,v 1.31 1997/05/02 17:49:27 assar Exp $
-#
-
-srcdir		= @srcdir@
-top_srcdir	= @top_srcdir@
-VPATH		= @srcdir@
-
-topdir		= ../../..
-
-SHELL		= /bin/sh
-
-CC 	= @CC@
-YACC	= @YACC@
-RANLIB 	= @RANLIB@
-DEFS 	= @DEFS@
-CFLAGS 	= @CFLAGS@
-LD_FLAGS = @LD_FLAGS@
-LIBS	= @LIBS@
-LIB_DBM = @LIB_DBM@
-MKINSTALLDIRS = $(top_srcdir)/mkinstalldirs
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-
-prefix 	= @prefix@
-exec_prefix = @exec_prefix@
-libdir = @libdir@
-libexecdir = @libexecdir@
-transform=@program_transform_name@
-EXECSUFFIX=@EXECSUFFIX@
-
-ATHENA = ../../..
-
-INCTOP = $(ATHENA)/include
-
-LIBTOP = $(ATHENA)/lib
-
-LIBKAFS = @KRB_KAFS_LIB@
-LIBKRB	= -L$(LIBTOP)/krb -lkrb
-LIBDES	= -L$(LIBTOP)/des -ldes
-LIBOTP  = -L$(LIBTOP)/otp -lotp
-LIBROKEN= -L$(LIBTOP)/roken -lroken
-
-PROGS = ftpd$(EXECSUFFIX)
-
-ftpd_SOURCES = ftpd.c ftpcmd.c logwtmp.c popen.c auth.c krb4.c kauth.c
-ftpd_OBJS = ftpd.o ftpcmd.o logwtmp.o popen.o auth.o krb4.o kauth.o
-
-SOURCES = $(ftpd_SOURCES)
-OBJECTS = $(ftpd_OBJS)
-
-all: $(PROGS)
-
-.c.o:
-	$(CC) -c $(CFLAGS) -I$(srcdir) -I$(srcdir)/../common -I$(INCTOP) $(DEFS) $<
-
-install: all
-	$(MKINSTALLDIRS) $(libexecdir)
-	for x in $(PROGS); do \
-	  $(INSTALL_PROGRAM) $$x $(libexecdir)/`echo $$x | sed '$(transform)'`; \
-	done
-
-uninstall:
-	for x in $(PROGS); do \
-	  rm -f $(libexecdir)/`echo $$x | sed '$(transform)'`; \
-	done
-
-ftpd$(EXECSUFFIX): $(ftpd_OBJS)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(ftpd_OBJS) -L../common -lcommon $(LIBKAFS) $(LIBKRB) $(LIBOTP) $(LIBDES) $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
-
-ftpcmd.c: ftpcmd.y
-	$(YACC) $(YFLAGS) $<
-	chmod a-w y.tab.c
-	mv -f y.tab.c ftpcmd.c
-
-TAGS: $(SOURCES)
-	etags $(SOURCES)
-
-clean cleandir:
-	rm -f *~ *.o core ftpd ftpcmd.c \#*
-
-distclean: 
-	rm -f Makefile
diff --git a/crypto/kerberosIV/appl/ftp/ftpd/auth.c b/crypto/kerberosIV/appl/ftp/ftpd/auth.c
deleted file mode 100644
index 862eb6dcc639..000000000000
--- a/crypto/kerberosIV/appl/ftp/ftpd/auth.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: auth.c,v 1.11 1997/05/04 23:09:00 assar Exp $");
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#if defined(HAVE_SYS_IOCTL_H) && SunOS != 4
-#include <sys/ioctl.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include "extern.h"
-#include "krb4.h"
-#include "auth.h"
-
-static struct at auth_types [] = {
-    { "KERBEROS_V4", krb4_auth, krb4_adat, krb4_pbsz, krb4_prot, krb4_ccc, 
-      krb4_mic, krb4_conf, krb4_enc, krb4_read, krb4_write, krb4_userok, 
-      krb4_vprintf },
-    { 0, 0, 0, 0, 0, 0, 0, 0, 0 }
-};
-
-struct at *ct;
-
-int data_protection;
-int buffer_size;
-unsigned char *data_buffer;
-int auth_complete;
-
-
-char *protection_names[] = {
-    "clear", "safe", 
-    "confidential", "private"
-};
-
-
-void auth_init(void)
-{
-}
-
-char *ftp_command;
-int prot_level;
-
-void new_ftp_command(char *command)
-{
-    ftp_command = command;
-}
-
-void delete_ftp_command(void)
-{
-    if(ftp_command){
-	free(ftp_command);
-	ftp_command = NULL;
-    }
-}
-
-int auth_ok(void)
-{
-    return ct && auth_complete;
-}
-
-void auth(char *auth)
-{
-    for(ct=auth_types; ct->name; ct++){
-	if(!strcasecmp(auth, ct->name)){
-	    ct->auth(auth);
-	    return;
-	}
-    }
-    reply(504, "%s is not a known security mechanism", auth);
-}
-
-void adat(char *auth)
-{
-    if(ct && !auth_complete)
-	ct->adat(auth);
-    else
-	reply(503, "You must (re)issue an AUTH first.");
-}
-
-void pbsz(int size)
-{
-    int old = buffer_size;
-    if(auth_ok())
-	ct->pbsz(size);
-    else
-	reply(503, "Incomplete security data exchange.");
-    if(buffer_size != old){
-	if(data_buffer)
-	    free(data_buffer);
-	data_buffer = malloc(buffer_size + 4);
-    }
-}
-
-void prot(char *pl)
-{
-    int p = -1;
-
-    if(buffer_size == 0){
-	reply(503, "No protection buffer size negotiated.");
-	return;
-    }
-
-    if(!strcasecmp(pl, "C"))
-	p = prot_clear;
-    
-    if(!strcasecmp(pl, "S"))
-	p = prot_safe;
-    
-    if(!strcasecmp(pl, "E"))
-	p = prot_confidential;
-    
-    if(!strcasecmp(pl, "P"))
-	p = prot_private;
-    
-    if(p == -1){
-	reply(504, "Unrecognized protection level.");
-	return;
-    }
-    
-    if(auth_ok()){
-	if(ct->prot(p)){
-	    reply(536, "%s does not support %s protection.", 
-		  ct->name, protection_names[p]);
-	}else{
-	    data_protection = p;
-	    reply(200, "Data protection is %s.", 
-		  protection_names[data_protection]);
-	}
-    }else{
-	reply(503, "Incomplete security data exchange.");
-    }
-}
-
-void ccc(void)
-{
-    if(auth_ok()){
-	if(!ct->ccc())
-	    prot_level = prot_clear;
-    }else
-	reply(503, "Incomplete security data exchange.");
-}
-
-void mic(char *msg)
-{
-    if(auth_ok()){
-	if(!ct->mic(msg))
-	    prot_level = prot_safe;
-    }else
-	reply(503, "Incomplete security data exchange.");
-}
-
-void conf(char *msg)
-{
-    if(auth_ok()){
-	if(!ct->conf(msg))
-	    prot_level = prot_confidential;
-    }else
-	reply(503, "Incomplete security data exchange.");
-}
-
-void enc(char *msg)
-{
-    if(auth_ok()){
-	if(!ct->enc(msg))
-	    prot_level = prot_private;
-    }else
-	reply(503, "Incomplete security data exchange.");
-}
-
-int auth_read(int fd, void *data, int length)
-{
-    if(auth_ok() && data_protection)
-	return ct->read(fd, data, length);
-    else
-	return read(fd, data, length);
-}
-
-int auth_write(int fd, void *data, int length)
-{
-    if(auth_ok() && data_protection)
-	return ct->write(fd, data, length);
-    else
-	return write(fd, data, length);
-}
-
-void auth_vprintf(const char *fmt, va_list ap)
-{
-    if(auth_ok() && prot_level){
-	ct->vprintf(fmt, ap);
-    }else
-	vprintf(fmt, ap);
-}
-
-void auth_printf(const char *fmt, ...)
-{
-    va_list ap;
-    va_start(ap, fmt);
-    auth_vprintf(fmt, ap);
-    va_end(ap);
-}
diff --git a/crypto/kerberosIV/appl/ftp/ftpd/auth.h b/crypto/kerberosIV/appl/ftp/ftpd/auth.h
deleted file mode 100644
index 17d9a133f719..000000000000
--- a/crypto/kerberosIV/appl/ftp/ftpd/auth.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id: auth.h,v 1.9 1997/05/11 11:04:28 assar Exp $ */
-
-#ifndef __AUTH_H__
-#define __AUTH_H__
-
-#include <stdarg.h>
-
-struct at {
-  char *name;
-  int (*auth)(char*);
-  int (*adat)(char*);
-  int (*pbsz)(int);
-  int (*prot)(int);
-  int (*ccc)(void);
-  int (*mic)(char*);
-  int (*conf)(char*);
-  int (*enc)(char*);
-  int (*read)(int, void*, int);
-  int (*write)(int, void*, int);
-  int (*userok)(char*);
-  int (*vprintf)(const char*, va_list);
-};
-
-extern struct at *ct;
-
-enum protection_levels {
-  prot_clear, prot_safe, prot_confidential, prot_private
-};
-
-extern char *protection_names[];
-
-extern char *ftp_command;
-extern int prot_level;
-
-void delete_ftp_command(void);
-
-extern int data_protection;
-extern int buffer_size;
-extern unsigned char *data_buffer;
-extern int auth_complete;
-
-void auth_init(void);
-
-int auth_ok(void);
-
-void auth(char*);
-void adat(char*);
-void pbsz(int);
-void prot(char*);
-void ccc(void);
-void mic(char*);
-void conf(char*);
-void enc(char*);
-
-int auth_read(int, void*, int);
-int auth_write(int, void*, int);
-
-void auth_vprintf(const char *fmt, va_list ap)
-#ifdef __GNUC__
-__attribute__ ((format (printf, 1, 0)))
-#endif
-;
-void auth_printf(const char *fmt, ...)
-#ifdef __GNUC__
-__attribute__ ((format (printf, 1, 2)))
-#endif
-;
-
-void new_ftp_command(char *command);
-
-#endif /* __AUTH_H__ */
diff --git a/crypto/kerberosIV/appl/ftp/ftpd/extern.h b/crypto/kerberosIV/appl/ftp/ftpd/extern.h
deleted file mode 100644
index f9b800fee0bb..000000000000
--- a/crypto/kerberosIV/appl/ftp/ftpd/extern.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)extern.h	8.2 (Berkeley) 4/4/94
- */
-
-#ifndef _EXTERN_H_
-#define _EXTERN_H_
-
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <setjmp.h>
-#ifdef HAVE_PWD_H
-#include <pwd.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-void	abor(void);
-void	blkfree(char **);
-char  **copyblk(char **);
-void	cwd(char *);
-void	do_delete(char *);
-void	dologout(int);
-void	fatal(char *);
-int	filename_check(char *);
-int	ftpd_pclose(FILE *);
-FILE   *ftpd_popen(char *, char *, int, int);
-char   *getline(char *, int);
-void	logwtmp(char *, char *, char *);
-void	lreply(int, const char *, ...)
-#ifdef __GNUC__
-__attribute__ ((format (printf, 2, 3)))
-#endif
-;
-void	makedir(char *);
-void	nack(char *);
-void	nreply(const char *, ...)
-#ifdef __GNUC__
-__attribute__ ((format (printf, 1, 2)))
-#endif
-;
-void	pass(char *);
-void	passive(void);
-void	perror_reply(int, char *);
-void	pwd(void);
-void	removedir(char *);
-void	renamecmd(char *, char *);
-char   *renamefrom(char *);
-void	reply(int, const char *, ...)
-#ifdef __GNUC__
-__attribute__ ((format (printf, 2, 3)))
-#endif
-;
-void	retrieve(char *, char *);
-void	send_file_list(char *);
-void	setproctitle(const char *, ...)
-#ifdef __GNUC__
-__attribute__ ((format (printf, 1, 2)))
-#endif
-;
-void	statcmd(void);
-void	statfilecmd(char *);
-void	do_store(char *, char *, int);
-void	upper(char *);
-void	user(char *);
-void	yyerror(char *);
-
-void	kauth(char *, char*);
-void	klist(void);
-
-int	find(char *);
-
-int	do_login(int code, char *passwd);
-int	klogin(char *name, char *password);
-
-const char *ftp_rooted(const char *path);
-
-extern struct sockaddr_in ctrl_addr, his_addr;
-extern char hostname[];
-
-extern	struct sockaddr_in data_dest;
-extern	int logged_in;
-extern	struct passwd *pw;
-extern	int guest;
-extern	int logging;
-extern	int type;
-extern	int oobflag;
-extern off_t file_size;
-extern off_t byte_count;
-extern jmp_buf urgcatch;
-
-extern	int form;
-extern	int debug;
-extern	int ftpd_timeout;
-extern	int maxtimeout;
-extern  int pdata;
-extern	char hostname[], remotehost[];
-extern	char proctitle[];
-extern	int usedefault;
-extern  int transflag;
-extern  char tmpline[];
-
-#endif /* _EXTERN_H_ */
diff --git a/crypto/kerberosIV/appl/ftp/ftpd/ftpcmd.y b/crypto/kerberosIV/appl/ftp/ftpd/ftpcmd.y
deleted file mode 100644
index 9368cdb10893..000000000000
--- a/crypto/kerberosIV/appl/ftp/ftpd/ftpcmd.y
+++ /dev/null
@@ -1,1408 +0,0 @@
-/*	$NetBSD: ftpcmd.y,v 1.6 1995/06/03 22:46:45 mycroft Exp $	*/
-
-/*
- * Copyright (c) 1985, 1988, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ftpcmd.y	8.3 (Berkeley) 4/6/94
- */
-
-/*
- * Grammar for FTP commands.
- * See RFC 959.
- */
-
-%{
-
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-RCSID("$Id: ftpcmd.y,v 1.35 1997/05/25 14:38:49 assar Exp $");
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_FTP_H
-#include <arpa/ftp.h>
-#endif
-
-#include <ctype.h>
-#include <errno.h>
-#include <glob.h>
-#ifdef HAVE_PWD_H
-#include <pwd.h>
-#endif
-#include <setjmp.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifdef HAVE_SYSLOG_H
-#include <syslog.h>
-#endif
-#include <time.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_BSD_BSD_H
-#include <bsd/bsd.h>
-#endif
-
-#include <roken.h>
-
-#ifdef SOCKS
-#include <socks.h>
-extern int LIBPREFIX(fclose)      __P((FILE *));
-#endif
-
-#include "extern.h"
-#include "auth.h"
-
-off_t	restart_point;
-
-static	int cmd_type;
-static	int cmd_form;
-static	int cmd_bytesz;
-char	cbuf[512];
-char	*fromname;
-
-struct tab {
-	char	*name;
-	short	token;
-	short	state;
-	short	implemented;	/* 1 if command is implemented */
-	char	*help;
-};
-
-extern struct tab cmdtab[];
-extern struct tab sitetab[];
-
-static char	*copy (char *);
-static void	 help (struct tab *, char *);
-static struct tab *
-		 lookup (struct tab *, char *);
-static void	 sizecmd (char *);
-static void	 toolong (int);
-static int	 yylex (void);
-
-/* This is for bison */
-
-#if !defined(alloca) && !defined(HAVE_ALLOCA)
-#define alloca(x) malloc(x)
-#endif
-
-%}
-
-%union {
-	int	i;
-	char   *s;
-}
-
-%token
-	A	B	C	E	F	I
-	L	N	P	R	S	T
-
-	SP	CRLF	COMMA
-
-	USER	PASS	ACCT	REIN	QUIT	PORT
-	PASV	TYPE	STRU	MODE	RETR	STOR
-	APPE	MLFL	MAIL	MSND	MSOM	MSAM
-	MRSQ	MRCP	ALLO	REST	RNFR	RNTO
-	ABOR	DELE	CWD	LIST	NLST	SITE
-	STAT	HELP	NOOP	MKD	RMD	PWD
-	CDUP	STOU	SMNT	SYST	SIZE	MDTM
-
-	UMASK	IDLE	CHMOD
-
-	AUTH	ADAT	PROT	PBSZ	CCC	MIC
-	CONF	ENC
-
-	KAUTH	KLIST	FIND	URL
-
-	LEXERR
-
-%token	<s> STRING
-%token	<i> NUMBER
-
-%type	<i> check_login check_login_no_guest octal_number byte_size
-%type	<i> struct_code mode_code type_code form_code
-%type	<s> pathstring pathname password username
-
-%start	cmd_list
-
-%%
-
-cmd_list
-	: /* empty */
-	| cmd_list cmd
-		{
-			fromname = (char *) 0;
-			restart_point = (off_t) 0;
-		}
-	| cmd_list rcmd
-	;
-
-cmd
-	: USER SP username CRLF
-		{
-			user($3);
-			free($3);
-		}
-	| AUTH SP STRING CRLF
-		{
-			auth($3);
-			free($3);
-		}
-	| ADAT SP STRING CRLF
-		{
-			adat($3);
-			free($3);
-		}
-	| PBSZ SP NUMBER CRLF
-		{
-			pbsz($3);
-		}
-	| PROT SP STRING CRLF
-		{
-			prot($3);
-		}
-	| CCC CRLF
-		{
-			ccc();
-		}
-	| MIC SP STRING CRLF
-		{
-			mic($3);
-			free($3);
-		}
-	| CONF SP STRING CRLF
-		{
-			conf($3);
-			free($3);
-		}
-	| PASS SP password CRLF
-		{
-			pass($3);
-			memset ($3, 0, strlen($3));
-			free($3);
-		}
-	| PORT SP host_port CRLF
-		{
-			usedefault = 0;
-			if (pdata >= 0) {
-				close(pdata);
-				pdata = -1;
-			}
-			reply(200, "PORT command successful.");
-		}
-	| PASV CRLF
-		{
-			passive();
-		}
-	| TYPE SP type_code CRLF
-		{
-			switch (cmd_type) {
-
-			case TYPE_A:
-				if (cmd_form == FORM_N) {
-					reply(200, "Type set to A.");
-					type = cmd_type;
-					form = cmd_form;
-				} else
-					reply(504, "Form must be N.");
-				break;
-
-			case TYPE_E:
-				reply(504, "Type E not implemented.");
-				break;
-
-			case TYPE_I:
-				reply(200, "Type set to I.");
-				type = cmd_type;
-				break;
-
-			case TYPE_L:
-#if NBBY == 8
-				if (cmd_bytesz == 8) {
-					reply(200,
-					    "Type set to L (byte size 8).");
-					type = cmd_type;
-				} else
-					reply(504, "Byte size must be 8.");
-#else /* NBBY == 8 */
-				UNIMPLEMENTED for NBBY != 8
-#endif /* NBBY == 8 */
-			}
-		}
-	| STRU SP struct_code CRLF
-		{
-			switch ($3) {
-
-			case STRU_F:
-				reply(200, "STRU F ok.");
-				break;
-
-			default:
-				reply(504, "Unimplemented STRU type.");
-			}
-		}
-	| MODE SP mode_code CRLF
-		{
-			switch ($3) {
-
-			case MODE_S:
-				reply(200, "MODE S ok.");
-				break;
-
-			default:
-				reply(502, "Unimplemented MODE type.");
-			}
-		}
-	| ALLO SP NUMBER CRLF
-		{
-			reply(202, "ALLO command ignored.");
-		}
-	| ALLO SP NUMBER SP R SP NUMBER CRLF
-		{
-			reply(202, "ALLO command ignored.");
-		}
-	| RETR check_login SP pathname CRLF
-		{
-			if ($2 && $4 != NULL)
-				retrieve((char *) 0, $4);
-			if ($4 != NULL)
-				free($4);
-		}
-	| STOR check_login SP pathname CRLF
-		{
-			if ($2 && $4 != NULL)
-				do_store($4, "w", 0);
-			if ($4 != NULL)
-				free($4);
-		}
-	| APPE check_login SP pathname CRLF
-		{
-			if ($2 && $4 != NULL)
-				do_store($4, "a", 0);
-			if ($4 != NULL)
-				free($4);
-		}
-	| NLST check_login CRLF
-		{
-			if ($2)
-				send_file_list(".");
-		}
-	| NLST check_login SP STRING CRLF
-		{
-			if ($2 && $4 != NULL)
-				send_file_list($4);
-			if ($4 != NULL)
-				free($4);
-		}
-	| LIST check_login CRLF
-		{
-#ifdef HAVE_LS_A
-		  char *cmd = "/bin/ls -lA";
-#else
-		  char *cmd = "/bin/ls -la";
-#endif
-			if ($2)
-				retrieve(cmd, "");
-			
-		}
-	| LIST check_login SP pathname CRLF
-		{
-#ifdef HAVE_LS_A
-		  char *cmd = "/bin/ls -lA %s";
-#else
-		  char *cmd = "/bin/ls -la %s";
-#endif
-			if ($2 && $4 != NULL)
-				retrieve(cmd, $4);
-			if ($4 != NULL)
-				free($4);
-		}
-	| STAT check_login SP pathname CRLF
-		{
-			if ($2 && $4 != NULL)
-				statfilecmd($4);
-			if ($4 != NULL)
-				free($4);
-		}
-	| STAT CRLF
-		{
-			if(oobflag){
-				if (file_size != (off_t) -1)
-					reply(213, "Status: %ld of %ld bytes transferred",
-						byte_count, file_size);
-				else
-					reply(213, "Status: %ld bytes transferred", byte_count);
-			}else
-				statcmd();
-	}
-	| DELE check_login_no_guest SP pathname CRLF
-		{
-			if ($2 && $4 != NULL)
-				do_delete($4);
-			if ($4 != NULL)
-				free($4);
-		}
-	| RNTO check_login_no_guest SP pathname CRLF
-		{
-			if($2){
-				if (fromname) {
-					renamecmd(fromname, $4);
-					free(fromname);
-					fromname = (char *) 0;
-				} else {
-					reply(503, "Bad sequence of commands.");
-				}
-			}
-			if ($4 != NULL)
-				free($4);
-		}
-	| ABOR CRLF
-		{
-			if(oobflag){
-				reply(426, "Transfer aborted. Data connection closed.");
-				reply(226, "Abort successful");
-				oobflag = 0;
-				longjmp(urgcatch, 1);
-			}else
-				reply(225, "ABOR command successful.");
-		}
-	| CWD check_login CRLF
-		{
-			if ($2)
-				cwd(pw->pw_dir);
-		}
-	| CWD check_login SP pathname CRLF
-		{
-			if ($2 && $4 != NULL)
-				cwd($4);
-			if ($4 != NULL)
-				free($4);
-		}
-	| HELP CRLF
-		{
-			help(cmdtab, (char *) 0);
-		}
-	| HELP SP STRING CRLF
-		{
-			char *cp = $3;
-
-			if (strncasecmp(cp, "SITE", 4) == 0) {
-				cp = $3 + 4;
-				if (*cp == ' ')
-					cp++;
-				if (*cp)
-					help(sitetab, cp);
-				else
-					help(sitetab, (char *) 0);
-			} else
-				help(cmdtab, $3);
-		}
-	| NOOP CRLF
-		{
-			reply(200, "NOOP command successful.");
-		}
-	| MKD check_login SP pathname CRLF
-		{
-			if ($2 && $4 != NULL)
-				makedir($4);
-			if ($4 != NULL)
-				free($4);
-		}
-	| RMD check_login_no_guest SP pathname CRLF
-		{
-			if ($2 && $4 != NULL)
-				removedir($4);
-			if ($4 != NULL)
-				free($4);
-		}
-	| PWD check_login CRLF
-		{
-			if ($2)
-				pwd();
-		}
-	| CDUP check_login CRLF
-		{
-			if ($2)
-				cwd("..");
-		}
-	| SITE SP HELP CRLF
-		{
-			help(sitetab, (char *) 0);
-		}
-	| SITE SP HELP SP STRING CRLF
-		{
-			help(sitetab, $5);
-		}
-	| SITE SP UMASK check_login CRLF
-		{
-			int oldmask;
-
-			if ($4) {
-				oldmask = umask(0);
-				umask(oldmask);
-				reply(200, "Current UMASK is %03o", oldmask);
-			}
-		}
-	| SITE SP UMASK check_login_no_guest SP octal_number CRLF
-		{
-			int oldmask;
-
-			if ($4) {
-				if (($6 == -1) || ($6 > 0777)) {
-					reply(501, "Bad UMASK value");
-				} else {
-					oldmask = umask($6);
-					reply(200,
-					    "UMASK set to %03o (was %03o)",
-					    $6, oldmask);
-				}
-			}
-		}
-	| SITE SP CHMOD check_login_no_guest SP octal_number SP pathname CRLF
-		{
-			if ($4 && $8 != NULL) {
-				if ($6 > 0777)
-					reply(501,
-				"CHMOD: Mode value must be between 0 and 0777");
-				else if (chmod($8, $6) < 0)
-					perror_reply(550, $8);
-				else
-					reply(200, "CHMOD command successful.");
-			}
-			if ($8 != NULL)
-				free($8);
-		}
-	| SITE SP IDLE CRLF
-		{
-			reply(200,
-			    "Current IDLE time limit is %d seconds; max %d",
-				ftpd_timeout, maxtimeout);
-		}
-	| SITE SP IDLE SP NUMBER CRLF
-		{
-			if ($5 < 30 || $5 > maxtimeout) {
-				reply(501,
-			"Maximum IDLE time must be between 30 and %d seconds",
-				    maxtimeout);
-			} else {
-				ftpd_timeout = $5;
-				alarm((unsigned) ftpd_timeout);
-				reply(200,
-				    "Maximum IDLE time set to %d seconds",
-				    ftpd_timeout);
-			}
-		}
-
-	| SITE SP KAUTH check_login SP STRING CRLF
-		{
-			char *p;
-			
-			if(guest)
-				reply(500, "Can't be done as guest.");
-			else{
-				if($4 && $6 != NULL){
-				    p = strpbrk($6, " \t");
-				    if(p){
-					*p++ = 0;
-					kauth($6, p + strspn(p, " \t"));
-				    }else
-					kauth($6, NULL);
-				}
-			}
-			if($6 != NULL)
-			    free($6);
-		}
-	| SITE SP KLIST check_login CRLF
-		{
-		    if($4)
-			klist();
-		}
-	| SITE SP FIND check_login SP STRING CRLF
-		{
-		    if($4 && $6 != NULL)
-			find($6);
-		    if($6 != NULL)
-			free($6);
-		}
-	| SITE SP URL CRLF
-		{
-			reply(200, "http://www.pdc.kth.se/kth-krb/");
-		}
-	| STOU check_login SP pathname CRLF
-		{
-			if ($2 && $4 != NULL)
-				do_store($4, "w", 1);
-			if ($4 != NULL)
-				free($4);
-		}
-	| SYST CRLF
-		{
-#if defined(unix) || defined(__unix__) || defined(__unix) || defined(_AIX) || defined(_CRAY)
-		    reply(215, "UNIX Type: L%d", NBBY);
-#else
-		    reply(215, "UNKNOWN Type: L%d", NBBY);
-#endif
-		}
-
-		/*
-		 * SIZE is not in RFC959, but Postel has blessed it and
-		 * it will be in the updated RFC.
-		 *
-		 * Return size of file in a format suitable for
-		 * using with RESTART (we just count bytes).
-		 */
-	| SIZE check_login SP pathname CRLF
-		{
-			if ($2 && $4 != NULL)
-				sizecmd($4);
-			if ($4 != NULL)
-				free($4);
-		}
-
-		/*
-		 * MDTM is not in RFC959, but Postel has blessed it and
-		 * it will be in the updated RFC.
-		 *
-		 * Return modification time of file as an ISO 3307
-		 * style time. E.g. YYYYMMDDHHMMSS or YYYYMMDDHHMMSS.xxx
-		 * where xxx is the fractional second (of any precision,
-		 * not necessarily 3 digits)
-		 */
-	| MDTM check_login SP pathname CRLF
-		{
-			if ($2 && $4 != NULL) {
-				struct stat stbuf;
-				if (stat($4, &stbuf) < 0)
-					reply(550, "%s: %s",
-					    $4, strerror(errno));
-				else if (!S_ISREG(stbuf.st_mode)) {
-					reply(550, "%s: not a plain file.", $4);
-				} else {
-					struct tm *t;
-					t = gmtime(&stbuf.st_mtime);
-					reply(213,
-					      "%04d%02d%02d%02d%02d%02d",
-					      t->tm_year + 1900,
-					      t->tm_mon + 1,
-					      t->tm_mday,
-					      t->tm_hour,
-					      t->tm_min,
-					      t->tm_sec);
-				}
-			}
-			if ($4 != NULL)
-				free($4);
-		}
-	| QUIT CRLF
-		{
-			reply(221, "Goodbye.");
-			dologout(0);
-		}
-	| error CRLF
-		{
-			yyerrok;
-		}
-	;
-rcmd
-	: RNFR check_login_no_guest SP pathname CRLF
-		{
-			restart_point = (off_t) 0;
-			if ($2 && $4) {
-				fromname = renamefrom($4);
-				if (fromname == (char *) 0 && $4) {
-					free($4);
-				}
-			}
-		}
-	| REST SP byte_size CRLF
-		{
-			fromname = (char *) 0;
-			restart_point = $3;	/* XXX $3 is only "int" */
-			reply(350, "Restarting at %ld. %s",
-			      (long)restart_point,
-			      "Send STORE or RETRIEVE to initiate transfer.");
-		}
-	| ENC SP STRING CRLF
-		{
-			enc($3);
-			free($3);
-		}
-	;
-
-username
-	: STRING
-	;
-
-password
-	: /* empty */
-		{
-			$$ = (char *)calloc(1, sizeof(char));
-		}
-	| STRING
-	;
-
-byte_size
-	: NUMBER
-	;
-
-host_port
-	: NUMBER COMMA NUMBER COMMA NUMBER COMMA NUMBER COMMA
-		NUMBER COMMA NUMBER
-		{
-			data_dest.sin_family = AF_INET;
-			data_dest.sin_port = htons($9 * 256 + $11);
-			data_dest.sin_addr.s_addr = 
-			    htonl(($1 << 24) | ($3 << 16) | ($5 << 8) | $7);
-		}
-	;
-
-form_code
-	: N
-		{
-			$$ = FORM_N;
-		}
-	| T
-		{
-			$$ = FORM_T;
-		}
-	| C
-		{
-			$$ = FORM_C;
-		}
-	;
-
-type_code
-	: A
-		{
-			cmd_type = TYPE_A;
-			cmd_form = FORM_N;
-		}
-	| A SP form_code
-		{
-			cmd_type = TYPE_A;
-			cmd_form = $3;
-		}
-	| E
-		{
-			cmd_type = TYPE_E;
-			cmd_form = FORM_N;
-		}
-	| E SP form_code
-		{
-			cmd_type = TYPE_E;
-			cmd_form = $3;
-		}
-	| I
-		{
-			cmd_type = TYPE_I;
-		}
-	| L
-		{
-			cmd_type = TYPE_L;
-			cmd_bytesz = NBBY;
-		}
-	| L SP byte_size
-		{
-			cmd_type = TYPE_L;
-			cmd_bytesz = $3;
-		}
-		/* this is for a bug in the BBN ftp */
-	| L byte_size
-		{
-			cmd_type = TYPE_L;
-			cmd_bytesz = $2;
-		}
-	;
-
-struct_code
-	: F
-		{
-			$$ = STRU_F;
-		}
-	| R
-		{
-			$$ = STRU_R;
-		}
-	| P
-		{
-			$$ = STRU_P;
-		}
-	;
-
-mode_code
-	: S
-		{
-			$$ = MODE_S;
-		}
-	| B
-		{
-			$$ = MODE_B;
-		}
-	| C
-		{
-			$$ = MODE_C;
-		}
-	;
-
-pathname
-	: pathstring
-		{
-			/*
-			 * Problem: this production is used for all pathname
-			 * processing, but only gives a 550 error reply.
-			 * This is a valid reply in some cases but not in others.
-			 */
-			if (logged_in && $1 && *$1 == '~') {
-				glob_t gl;
-				int flags =
-				 GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE;
-
-				memset(&gl, 0, sizeof(gl));
-				if (glob($1, flags, NULL, &gl) ||
-				    gl.gl_pathc == 0) {
-					reply(550, "not found");
-					$$ = NULL;
-				} else {
-					$$ = strdup(gl.gl_pathv[0]);
-				}
-				globfree(&gl);
-				free($1);
-			} else
-				$$ = $1;
-		}
-	;
-
-pathstring
-	: STRING
-	;
-
-octal_number
-	: NUMBER
-		{
-			int ret, dec, multby, digit;
-
-			/*
-			 * Convert a number that was read as decimal number
-			 * to what it would be if it had been read as octal.
-			 */
-			dec = $1;
-			multby = 1;
-			ret = 0;
-			while (dec) {
-				digit = dec%10;
-				if (digit > 7) {
-					ret = -1;
-					break;
-				}
-				ret += digit * multby;
-				multby *= 8;
-				dec /= 10;
-			}
-			$$ = ret;
-		}
-	;
-
-
-check_login_no_guest : check_login
-		{
-			$$ = $1 && !guest;
-			if($1 && !$$)
-				reply(550, "Permission denied");
-		}
-	;
-
-check_login
-	: /* empty */
-		{
-		    if(auth_complete && prot_level == prot_clear){
-			reply(533, "Command protection level denied for paranoid reasons.");
-			$$ = 0;
-		    }else
-			if (logged_in)
-			    $$ = 1;
-			else {
-			    reply(530, "Please login with USER and PASS.");
-			    $$ = 0;
-			}
-		}
-	;
-
-%%
-
-extern jmp_buf errcatch;
-
-#define	CMD	0	/* beginning of command */
-#define	ARGS	1	/* expect miscellaneous arguments */
-#define	STR1	2	/* expect SP followed by STRING */
-#define	STR2	3	/* expect STRING */
-#define	OSTR	4	/* optional SP then STRING */
-#define	ZSTR1	5	/* SP then optional STRING */
-#define	ZSTR2	6	/* optional STRING after SP */
-#define	SITECMD	7	/* SITE command */
-#define	NSTR	8	/* Number followed by a string */
-
-struct tab cmdtab[] = {		/* In order defined in RFC 765 */
-	{ "USER", USER, STR1, 1,	"<sp> username" },
-	{ "PASS", PASS, ZSTR1, 1,	"<sp> password" },
-	{ "ACCT", ACCT, STR1, 0,	"(specify account)" },
-	{ "SMNT", SMNT, ARGS, 0,	"(structure mount)" },
-	{ "REIN", REIN, ARGS, 0,	"(reinitialize server state)" },
-	{ "QUIT", QUIT, ARGS, 1,	"(terminate service)", },
-	{ "PORT", PORT, ARGS, 1,	"<sp> b0, b1, b2, b3, b4" },
-	{ "PASV", PASV, ARGS, 1,	"(set server in passive mode)" },
-	{ "TYPE", TYPE, ARGS, 1,	"<sp> [ A | E | I | L ]" },
-	{ "STRU", STRU, ARGS, 1,	"(specify file structure)" },
-	{ "MODE", MODE, ARGS, 1,	"(specify transfer mode)" },
-	{ "RETR", RETR, STR1, 1,	"<sp> file-name" },
-	{ "STOR", STOR, STR1, 1,	"<sp> file-name" },
-	{ "APPE", APPE, STR1, 1,	"<sp> file-name" },
-	{ "MLFL", MLFL, OSTR, 0,	"(mail file)" },
-	{ "MAIL", MAIL, OSTR, 0,	"(mail to user)" },
-	{ "MSND", MSND, OSTR, 0,	"(mail send to terminal)" },
-	{ "MSOM", MSOM, OSTR, 0,	"(mail send to terminal or mailbox)" },
-	{ "MSAM", MSAM, OSTR, 0,	"(mail send to terminal and mailbox)" },
-	{ "MRSQ", MRSQ, OSTR, 0,	"(mail recipient scheme question)" },
-	{ "MRCP", MRCP, STR1, 0,	"(mail recipient)" },
-	{ "ALLO", ALLO, ARGS, 1,	"allocate storage (vacuously)" },
-	{ "REST", REST, ARGS, 1,	"<sp> offset (restart command)" },
-	{ "RNFR", RNFR, STR1, 1,	"<sp> file-name" },
-	{ "RNTO", RNTO, STR1, 1,	"<sp> file-name" },
-	{ "ABOR", ABOR, ARGS, 1,	"(abort operation)" },
-	{ "DELE", DELE, STR1, 1,	"<sp> file-name" },
-	{ "CWD",  CWD,  OSTR, 1,	"[ <sp> directory-name ]" },
-	{ "XCWD", CWD,	OSTR, 1,	"[ <sp> directory-name ]" },
-	{ "LIST", LIST, OSTR, 1,	"[ <sp> path-name ]" },
-	{ "NLST", NLST, OSTR, 1,	"[ <sp> path-name ]" },
-	{ "SITE", SITE, SITECMD, 1,	"site-cmd [ <sp> arguments ]" },
-	{ "SYST", SYST, ARGS, 1,	"(get type of operating system)" },
-	{ "STAT", STAT, OSTR, 1,	"[ <sp> path-name ]" },
-	{ "HELP", HELP, OSTR, 1,	"[ <sp> <string> ]" },
-	{ "NOOP", NOOP, ARGS, 1,	"" },
-	{ "MKD",  MKD,  STR1, 1,	"<sp> path-name" },
-	{ "XMKD", MKD,  STR1, 1,	"<sp> path-name" },
-	{ "RMD",  RMD,  STR1, 1,	"<sp> path-name" },
-	{ "XRMD", RMD,  STR1, 1,	"<sp> path-name" },
-	{ "PWD",  PWD,  ARGS, 1,	"(return current directory)" },
-	{ "XPWD", PWD,  ARGS, 1,	"(return current directory)" },
-	{ "CDUP", CDUP, ARGS, 1,	"(change to parent directory)" },
-	{ "XCUP", CDUP, ARGS, 1,	"(change to parent directory)" },
-	{ "STOU", STOU, STR1, 1,	"<sp> file-name" },
-	{ "SIZE", SIZE, OSTR, 1,	"<sp> path-name" },
-	{ "MDTM", MDTM, OSTR, 1,	"<sp> path-name" },
-
-	/* extensions from draft-ietf-cat-ftpsec-08 */
-	{ "AUTH", AUTH,	STR1, 1,	"<sp> auth-type" },
-	{ "ADAT", ADAT,	STR1, 1,	"<sp> auth-data" },
-	{ "PBSZ", PBSZ,	ARGS, 1,	"<sp> buffer-size" },
-	{ "PROT", PROT,	STR1, 1,	"<sp> prot-level" },
-	{ "CCC",  CCC,	ARGS, 1,	"" },
-	{ "MIC",  MIC,	STR1, 1,	"<sp> integrity command" },
-	{ "CONF", CONF,	STR1, 1,	"<sp> confidentiality command" },
-	{ "ENC",  ENC,	STR1, 1,	"<sp> privacy command" },
-
-	{ NULL,   0,    0,    0,	0 }
-};
-
-struct tab sitetab[] = {
-	{ "UMASK", UMASK, ARGS, 1,	"[ <sp> umask ]" },
-	{ "IDLE", IDLE, ARGS, 1,	"[ <sp> maximum-idle-time ]" },
-	{ "CHMOD", CHMOD, NSTR, 1,	"<sp> mode <sp> file-name" },
-	{ "HELP", HELP, OSTR, 1,	"[ <sp> <string> ]" },
-
-	{ "KAUTH", KAUTH, STR1, 1,	"<sp> principal [ <sp> ticket ]" },
-	{ "KLIST", KLIST, ARGS, 1,	"(show ticket file)" },
-
-	{ "FIND", FIND, STR1, 1,	"<sp> globexpr" },
-
-	{ "URL",  URL,  ARGS, 1,	"?" },
-	
-	{ NULL,   0,    0,    0,	0 }
-};
-
-static struct tab *
-lookup(struct tab *p, char *cmd)
-{
-
-	for (; p->name != NULL; p++)
-		if (strcmp(cmd, p->name) == 0)
-			return (p);
-	return (0);
-}
-
-#include <arpa/telnet.h>
-
-/*
- * getline - a hacked up version of fgets to ignore TELNET escape codes.
- */
-char *
-getline(char *s, int n)
-{
-	int c;
-	char *cs;
-
-	cs = s;
-/* tmpline may contain saved command from urgent mode interruption */
-	if(ftp_command){
-	  strncpy(s, ftp_command, n);
-	  if (debug)
-	    syslog(LOG_DEBUG, "command: %s", s);
-#ifdef XXX
-	  fprintf(stderr, "%s\n", s);
-#endif
-	  return s;
-	}
-	prot_level = prot_clear;
-	while ((c = getc(stdin)) != EOF) {
-		c &= 0377;
-		if (c == IAC) {
-		    if ((c = getc(stdin)) != EOF) {
-			c &= 0377;
-			switch (c) {
-			case WILL:
-			case WONT:
-				c = getc(stdin);
-				printf("%c%c%c", IAC, DONT, 0377&c);
-				fflush(stdout);
-				continue;
-			case DO:
-			case DONT:
-				c = getc(stdin);
-				printf("%c%c%c", IAC, WONT, 0377&c);
-				fflush(stdout);
-				continue;
-			case IAC:
-				break;
-			default:
-				continue;	/* ignore command */
-			}
-		    }
-		}
-		*cs++ = c;
-		if (--n <= 0 || c == '\n')
-			break;
-	}
-	if (c == EOF && cs == s)
-		return (NULL);
-	*cs++ = '\0';
-	if (debug) {
-		if (!guest && strncasecmp("pass ", s, 5) == 0) {
-			/* Don't syslog passwords */
-			syslog(LOG_DEBUG, "command: %.5s ???", s);
-		} else {
-			char *cp;
-			int len;
-
-			/* Don't syslog trailing CR-LF */
-			len = strlen(s);
-			cp = s + len - 1;
-			while (cp >= s && (*cp == '\n' || *cp == '\r')) {
-				--cp;
-				--len;
-			}
-			syslog(LOG_DEBUG, "command: %.*s", len, s);
-		}
-	}
-#ifdef XXX
-	fprintf(stderr, "%s\n", s);
-#endif
-	return (s);
-}
-
-static RETSIGTYPE
-toolong(int signo)
-{
-
-	reply(421,
-	    "Timeout (%d seconds): closing control connection.",
-	      ftpd_timeout);
-	if (logging)
-		syslog(LOG_INFO, "User %s timed out after %d seconds",
-		    (pw ? pw -> pw_name : "unknown"), ftpd_timeout);
-	dologout(1);
-	SIGRETURN(0);
-}
-
-static int
-yylex(void)
-{
-	static int cpos, state;
-	char *cp, *cp2;
-	struct tab *p;
-	int n;
-	char c;
-
-	for (;;) {
-		switch (state) {
-
-		case CMD:
-			signal(SIGALRM, toolong);
-			alarm((unsigned) ftpd_timeout);
-			if (getline(cbuf, sizeof(cbuf)-1) == NULL) {
-				reply(221, "You could at least say goodbye.");
-				dologout(0);
-			}
-			alarm(0);
-#ifdef HASSETPROCTITLE
-			if (strncasecmp(cbuf, "PASS", 4) != NULL)
-				setproctitle("%s: %s", proctitle, cbuf);
-#endif /* HASSETPROCTITLE */
-			if ((cp = strchr(cbuf, '\r'))) {
-				*cp++ = '\n';
-				*cp = '\0';
-			}
-			if ((cp = strpbrk(cbuf, " \n")))
-				cpos = cp - cbuf;
-			if (cpos == 0)
-				cpos = 4;
-			c = cbuf[cpos];
-			cbuf[cpos] = '\0';
-			strupr(cbuf);
-			p = lookup(cmdtab, cbuf);
-			cbuf[cpos] = c;
-			if (p != 0) {
-				if (p->implemented == 0) {
-					nack(p->name);
-					longjmp(errcatch,0);
-					/* NOTREACHED */
-				}
-				state = p->state;
-				yylval.s = p->name;
-				return (p->token);
-			}
-			break;
-
-		case SITECMD:
-			if (cbuf[cpos] == ' ') {
-				cpos++;
-				return (SP);
-			}
-			cp = &cbuf[cpos];
-			if ((cp2 = strpbrk(cp, " \n")))
-				cpos = cp2 - cbuf;
-			c = cbuf[cpos];
-			cbuf[cpos] = '\0';
-			strupr(cp);
-			p = lookup(sitetab, cp);
-			cbuf[cpos] = c;
-			if (p != 0) {
-				if (p->implemented == 0) {
-					state = CMD;
-					nack(p->name);
-					longjmp(errcatch,0);
-					/* NOTREACHED */
-				}
-				state = p->state;
-				yylval.s = p->name;
-				return (p->token);
-			}
-			state = CMD;
-			break;
-
-		case OSTR:
-			if (cbuf[cpos] == '\n') {
-				state = CMD;
-				return (CRLF);
-			}
-			/* FALLTHROUGH */
-
-		case STR1:
-		case ZSTR1:
-		dostr1:
-			if (cbuf[cpos] == ' ') {
-				cpos++;
-				state = state == OSTR ? STR2 : ++state;
-				return (SP);
-			}
-			break;
-
-		case ZSTR2:
-			if (cbuf[cpos] == '\n') {
-				state = CMD;
-				return (CRLF);
-			}
-			/* FALLTHROUGH */
-
-		case STR2:
-			cp = &cbuf[cpos];
-			n = strlen(cp);
-			cpos += n - 1;
-			/*
-			 * Make sure the string is nonempty and \n terminated.
-			 */
-			if (n > 1 && cbuf[cpos] == '\n') {
-				cbuf[cpos] = '\0';
-				yylval.s = copy(cp);
-				cbuf[cpos] = '\n';
-				state = ARGS;
-				return (STRING);
-			}
-			break;
-
-		case NSTR:
-			if (cbuf[cpos] == ' ') {
-				cpos++;
-				return (SP);
-			}
-			if (isdigit(cbuf[cpos])) {
-				cp = &cbuf[cpos];
-				while (isdigit(cbuf[++cpos]))
-					;
-				c = cbuf[cpos];
-				cbuf[cpos] = '\0';
-				yylval.i = atoi(cp);
-				cbuf[cpos] = c;
-				state = STR1;
-				return (NUMBER);
-			}
-			state = STR1;
-			goto dostr1;
-
-		case ARGS:
-			if (isdigit(cbuf[cpos])) {
-				cp = &cbuf[cpos];
-				while (isdigit(cbuf[++cpos]))
-					;
-				c = cbuf[cpos];
-				cbuf[cpos] = '\0';
-				yylval.i = atoi(cp);
-				cbuf[cpos] = c;
-				return (NUMBER);
-			}
-			switch (cbuf[cpos++]) {
-
-			case '\n':
-				state = CMD;
-				return (CRLF);
-
-			case ' ':
-				return (SP);
-
-			case ',':
-				return (COMMA);
-
-			case 'A':
-			case 'a':
-				return (A);
-
-			case 'B':
-			case 'b':
-				return (B);
-
-			case 'C':
-			case 'c':
-				return (C);
-
-			case 'E':
-			case 'e':
-				return (E);
-
-			case 'F':
-			case 'f':
-				return (F);
-
-			case 'I':
-			case 'i':
-				return (I);
-
-			case 'L':
-			case 'l':
-				return (L);
-
-			case 'N':
-			case 'n':
-				return (N);
-
-			case 'P':
-			case 'p':
-				return (P);
-
-			case 'R':
-			case 'r':
-				return (R);
-
-			case 'S':
-			case 's':
-				return (S);
-
-			case 'T':
-			case 't':
-				return (T);
-
-			}
-			break;
-
-		default:
-			fatal("Unknown state in scanner.");
-		}
-		yyerror((char *) 0);
-		state = CMD;
-		longjmp(errcatch,0);
-	}
-}
-
-static char *
-copy(char *s)
-{
-	char *p;
-
-	p = strdup(s);
-	if (p == NULL)
-		fatal("Ran out of memory.");
-	return p;
-}
-
-static void
-help(struct tab *ctab, char *s)
-{
-	struct tab *c;
-	int width, NCMDS;
-	char *type;
-	char buf[1024];
-
-	if (ctab == sitetab)
-		type = "SITE ";
-	else
-		type = "";
-	width = 0, NCMDS = 0;
-	for (c = ctab; c->name != NULL; c++) {
-		int len = strlen(c->name);
-
-		if (len > width)
-			width = len;
-		NCMDS++;
-	}
-	width = (width + 8) &~ 7;
-	if (s == 0) {
-		int i, j, w;
-		int columns, lines;
-
-		lreply(214, "The following %scommands are recognized %s.",
-		    type, "(* =>'s unimplemented)");
-		columns = 76 / width;
-		if (columns == 0)
-			columns = 1;
-		lines = (NCMDS + columns - 1) / columns;
-		for (i = 0; i < lines; i++) {
-		    strcpy (buf, "   ");
-		    for (j = 0; j < columns; j++) {
-			c = ctab + j * lines + i;
-			snprintf (buf + strlen(buf), sizeof(buf) - strlen(buf),
-				  "%s%c", c->name, c->implemented ? ' ' : '*');
-			if (c + lines >= &ctab[NCMDS])
-			    break;
-			w = strlen(c->name) + 1;
-			while (w < width) {
-			    strcat(buf, " ");
-			    w++;
-			}
-		    }
-		    lreply(214, buf);
-		}
-		reply(214, "Direct comments to kth-krb-bugs@pdc.kth.se");
-		return;
-	}
-	strupr(s);
-	c = lookup(ctab, s);
-	if (c == (struct tab *)0) {
-		reply(502, "Unknown command %s.", s);
-		return;
-	}
-	if (c->implemented)
-		reply(214, "Syntax: %s%s %s", type, c->name, c->help);
-	else
-		reply(214, "%s%-*s\t%s; unimplemented.", type, width,
-		    c->name, c->help);
-}
-
-static void
-sizecmd(char *filename)
-{
-	switch (type) {
-	case TYPE_L:
-	case TYPE_I: {
-		struct stat stbuf;
-		if (stat(filename, &stbuf) < 0 || !S_ISREG(stbuf.st_mode))
-			reply(550, "%s: not a plain file.", filename);
-		else
-			reply(213, "%lu", (unsigned long)stbuf.st_size);
-		break; }
-	case TYPE_A: {
-		FILE *fin;
-		int c;
-		off_t count;
-		struct stat stbuf;
-		fin = fopen(filename, "r");
-		if (fin == NULL) {
-			perror_reply(550, filename);
-			return;
-		}
-		if (fstat(fileno(fin), &stbuf) < 0 || !S_ISREG(stbuf.st_mode)) {
-			reply(550, "%s: not a plain file.", filename);
-			fclose(fin);
-			return;
-		}
-
-		count = 0;
-		while((c=getc(fin)) != EOF) {
-			if (c == '\n')	/* will get expanded to \r\n */
-				count++;
-			count++;
-		}
-		fclose(fin);
-
-		reply(213, "%ld", count);
-		break; }
-	default:
-		reply(504, "SIZE not implemented for Type %c.", "?AEIL"[type]);
-	}
-}
diff --git a/crypto/kerberosIV/appl/ftp/ftpd/ftpd.c b/crypto/kerberosIV/appl/ftp/ftpd/ftpd.c
deleted file mode 100644
index e0844d560a1d..000000000000
--- a/crypto/kerberosIV/appl/ftp/ftpd/ftpd.c
+++ /dev/null
@@ -1,2089 +0,0 @@
-/*
- * Copyright (c) 1985, 1988, 1990, 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id$");
-#endif
-
-/*
- * FTP server.
- */
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#if defined(HAVE_SYS_IOCTL_H) && SunOS != 4
-#include <sys/ioctl.h>
-#endif
-#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#elif defined(HAVE_SYS_TIME_H)
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif
-#ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_NETINET_IN_SYSTM_H
-#include <netinet/in_systm.h>
-#endif
-#ifdef HAVE_NETINET_IP_H
-#include <netinet/ip.h>
-#endif
-
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-
-#define	FTP_NAMES
-#include <arpa/ftp.h>
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#ifdef HAVE_ARPA_TELNET_H
-#include <arpa/telnet.h>
-#endif
-
-#include <ctype.h>
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif
-#include <errno.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <glob.h>
-#include <limits.h>
-#ifdef HAVE_PWD_H
-#include <pwd.h>
-#endif
-#include <setjmp.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#ifdef HAVE_SYSLOG_H
-#include <syslog.h>
-#endif
-#include <time.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_GRP_H
-#include <grp.h>
-#endif
-
-#include <err.h>
-
-#include "pathnames.h"
-#include "extern.h"
-#include "common.h"
-
-#include "auth.h"
-
-#include <krb.h>
-
-#include <kafs.h>
-#include "roken.h"
-
-#ifdef OTP
-#include <otp.h>
-#endif
-
-#ifdef SOCKS
-#include <socks.h>
-extern int LIBPREFIX(fclose)      __P((FILE *));
-#endif
-
-void yyparse();
-
-#ifndef LOG_FTP
-#define LOG_FTP LOG_DAEMON
-#endif
-
-static char version[] = "Version 6.00";
-
-extern	off_t restart_point;
-extern	char cbuf[];
-
-struct	sockaddr_in ctrl_addr;
-struct	sockaddr_in data_source;
-struct	sockaddr_in data_dest;
-struct	sockaddr_in his_addr;
-struct	sockaddr_in pasv_addr;
-
-int	data;
-jmp_buf	errcatch, urgcatch;
-int	oobflag;
-int	logged_in;
-struct	passwd *pw;
-int	debug;
-int	ftpd_timeout = 900;    /* timeout after 15 minutes of inactivity */
-int	maxtimeout = 7200;/* don't allow idle time to be set beyond 2 hours */
-int	logging;
-int	guest;
-int	dochroot;
-int	type;
-int	form;
-int	stru;			/* avoid C keyword */
-int	mode;
-int	usedefault = 1;		/* for data transfers */
-int	pdata = -1;		/* for passive mode */
-int	transflag;
-off_t	file_size;
-off_t	byte_count;
-#if !defined(CMASK) || CMASK == 0
-#undef CMASK
-#define CMASK 027
-#endif
-int	defumask = CMASK;		/* default umask value */
-int	guest_umask = 0777;	/* Paranoia for anonymous users */
-char	tmpline[10240];
-char	hostname[MaxHostNameLen];
-char	remotehost[MaxHostNameLen];
-static char ttyline[20];
-
-#define AUTH_PLAIN	(1 << 0) /* allow sending passwords */
-#define AUTH_OTP	(1 << 1) /* passwords are one-time */
-#define AUTH_FTP	(1 << 2) /* allow anonymous login */
-
-static int auth_level = 0; /* Only allow kerberos login by default */
-
-/*
- * Timeout intervals for retrying connections
- * to hosts that don't accept PORT cmds.  This
- * is a kludge, but given the problems with TCP...
- */
-#define	SWAITMAX	90	/* wait at most 90 seconds */
-#define	SWAITINT	5	/* interval between retries */
-
-int	swaitmax = SWAITMAX;
-int	swaitint = SWAITINT;
-
-#ifdef HAVE_SETPROCTITLE
-char	proctitle[BUFSIZ];	/* initial part of title */
-#endif /* HAVE_SETPROCTITLE */
-
-#define LOGCMD(cmd, file) \
-	if (logging > 1) \
-	    syslog(LOG_INFO,"%s %s%s", cmd, \
-		*(file) == '/' ? "" : curdir(), file);
-#define LOGCMD2(cmd, file1, file2) \
-	 if (logging > 1) \
-	    syslog(LOG_INFO,"%s %s%s %s%s", cmd, \
-		*(file1) == '/' ? "" : curdir(), file1, \
-		*(file2) == '/' ? "" : curdir(), file2);
-#define LOGBYTES(cmd, file, cnt) \
-	if (logging > 1) { \
-		if (cnt == (off_t)-1) \
-		    syslog(LOG_INFO,"%s %s%s", cmd, \
-			*(file) == '/' ? "" : curdir(), file); \
-		else \
-		    syslog(LOG_INFO, "%s %s%s = %ld bytes", \
-			cmd, (*(file) == '/') ? "" : curdir(), file, (long)cnt); \
-	}
-
-static void	 ack (char *);
-static void	 myoob (int);
-static int	 checkuser (char *, char *);
-static int	 checkaccess (char *);
-static FILE	*dataconn (char *, off_t, char *);
-static void	 dolog (struct sockaddr_in *);
-static void	 end_login (void);
-static FILE	*getdatasock (char *);
-static char	*gunique (char *);
-static RETSIGTYPE	 lostconn (int);
-static int	 receive_data (FILE *, FILE *);
-static void	 send_data (FILE *, FILE *);
-static struct passwd * sgetpwnam (char *);
-static void	 usage(void);
-
-static char *
-curdir(void)
-{
-	static char path[MaxPathLen+1+1];	/* path + '/' + '\0' */
-
-	if (getcwd(path, sizeof(path)-2) == NULL)
-		return ("");
-	if (path[1] != '\0')		/* special case for root dir. */
-		strcat(path, "/");
-	/* For guest account, skip / since it's chrooted */
-	return (guest ? path+1 : path);
-}
-
-#ifndef LINE_MAX
-#define LINE_MAX 1024
-#endif
-
-static int
-parse_auth_level(char *str)
-{
-    char *p;
-    int ret = 0;
-    char *foo = NULL;
-
-    for(p = strtok_r(str, ",", &foo);
-	p;
-	p = strtok_r(NULL, ",", &foo)) {
-	if(strcmp(p, "user") == 0)
-	    ;
-#ifdef OTP
-	else if(strcmp(p, "otp") == 0)
-	    ret |= AUTH_PLAIN|AUTH_OTP;
-#endif
-	else if(strcmp(p, "ftp") == 0 ||
-		strcmp(p, "safe") == 0)
-	    ret |= AUTH_FTP;
-	else if(strcmp(p, "plain") == 0)
-	    ret |= AUTH_PLAIN;
-	else if(strcmp(p, "none") == 0)
-	    ret |= AUTH_PLAIN|AUTH_FTP;
-	else
-	    warnx("bad value for -a: `%s'", p);
-    }
-    return ret;	    
-}
-
-/*
- * Print usage and die.
- */
-
-static void
-usage (void)
-{
-    fprintf (stderr,
-	     "Usage: %s [-d] [-i] [-g guest_umask] [-l] [-p port]"
-	     " [-t timeout] [-T max_timeout] [-u umask] [-v]"
-	     " [-a auth_level] \n",
-	     __progname);
-    exit (1);
-}
-
-int
-main(int argc, char **argv)
-{
-	int addrlen, ch, on = 1, tos;
-	char *cp, line[LINE_MAX];
-	FILE *fd;
-	int not_inetd = 0;
-	int port;
-	struct servent *sp;
-	char tkfile[1024];
-
-	set_progname (argv[0]);
-
-	/* detach from any tickets and tokens */
-
-	snprintf(tkfile, sizeof(tkfile),
-		 "/tmp/ftp_%u", (unsigned)getpid());
-	krb_set_tkt_string(tkfile);
-	if(k_hasafs())
-	    k_setpag();
-
-	sp = getservbyname("ftp", "tcp");
-	if(sp)
-	    port = sp->s_port;
-	else
-	    port = htons(21);
-
-	while ((ch = getopt(argc, argv, "a:dg:ilp:t:T:u:v")) != EOF) {
-		switch (ch) {
-		case 'a':
-		    auth_level = parse_auth_level(optarg);
-		    break;
-		case 'd':
-		    debug = 1;
-		    break;
-
-		case 'i':
-		    not_inetd = 1;
-		    break;
-		case 'g':
-		    {
-			long val = 0;
-
-			val = strtol(optarg, &optarg, 8);
-			if (*optarg != '\0' || val < 0)
-			    warnx("bad value for -g");
-			else
-			    guest_umask = val;
-			break;
-		    }
-		case 'l':
-		    logging++;	/* > 1 == extra logging */
-		    break;
-
-		case 'p':
-		    sp = getservbyname(optarg, "tcp");
-		    if(sp)
-			port = sp->s_port;
-		    else
-			if(isdigit(optarg[0]))
-			    port = htons(atoi(optarg));
-			else
-			    warnx("bad value for -p");
-		    break;
-		    
-		case 't':
-		    ftpd_timeout = atoi(optarg);
-		    if (maxtimeout < ftpd_timeout)
-			maxtimeout = ftpd_timeout;
-		    break;
-
-		case 'T':
-		    maxtimeout = atoi(optarg);
-		    if (ftpd_timeout > maxtimeout)
-			ftpd_timeout = maxtimeout;
-		    break;
-
-		case 'u':
-		    {
-			long val = 0;
-
-			val = strtol(optarg, &optarg, 8);
-			if (*optarg != '\0' || val < 0)
-			    warnx("bad value for -u");
-			else
-			    defumask = val;
-			break;
-		    }
-
-		case 'v':
-		    debug = 1;
-		    break;
-
-		default:
-		    usage ();
-		}
-	}
-
-	if(not_inetd)
-	    mini_inetd (port);
-
-	/*
-	 * LOG_NDELAY sets up the logging connection immediately,
-	 * necessary for anonymous ftp's that chroot and can't do it later.
-	 */
-	openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_FTP);
-	addrlen = sizeof(his_addr);
-	if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) {
-		syslog(LOG_ERR, "getpeername (%s): %m",argv[0]);
-		exit(1);
-	}
-	addrlen = sizeof(ctrl_addr);
-	if (getsockname(0, (struct sockaddr *)&ctrl_addr, &addrlen) < 0) {
-		syslog(LOG_ERR, "getsockname (%s): %m",argv[0]);
-		exit(1);
-	}
-#if defined(IP_TOS) && defined(HAVE_SETSOCKOPT)
-	tos = IPTOS_LOWDELAY;
-	if (setsockopt(0, IPPROTO_IP, IP_TOS, (void *)&tos, sizeof(int)) < 0)
-		syslog(LOG_WARNING, "setsockopt (IP_TOS): %m");
-#endif
-	data_source.sin_port = htons(ntohs(ctrl_addr.sin_port) - 1);
-	debug = 0;
-
-	/* set this here so it can be put in wtmp */
-	snprintf(ttyline, sizeof(ttyline), "ftp%u", (unsigned)getpid());
-
-
-	/*	freopen(_PATH_DEVNULL, "w", stderr); */
-	signal(SIGPIPE, lostconn);
-	signal(SIGCHLD, SIG_IGN);
-#ifdef SIGURG
-	if (signal(SIGURG, myoob) == SIG_ERR)
-	    syslog(LOG_ERR, "signal: %m");
-#endif
-
-	auth_init();
-
-	/* Try to handle urgent data inline */
-#if defined(SO_OOBINLINE) && defined(HAVE_SETSOCKOPT)
-	if (setsockopt(0, SOL_SOCKET, SO_OOBINLINE, (void *)&on,
-		       sizeof(on)) < 0)
-		syslog(LOG_ERR, "setsockopt: %m");
-#endif
-
-#ifdef	F_SETOWN
-	if (fcntl(fileno(stdin), F_SETOWN, getpid()) == -1)
-		syslog(LOG_ERR, "fcntl F_SETOWN: %m");
-#endif
-	dolog(&his_addr);
-	/*
-	 * Set up default state
-	 */
-	data = -1;
-	type = TYPE_A;
-	form = FORM_N;
-	stru = STRU_F;
-	mode = MODE_S;
-	tmpline[0] = '\0';
-
-	/* If logins are disabled, print out the message. */
-	if ((fd = fopen(_PATH_NOLOGIN,"r")) != NULL) {
-		while (fgets(line, sizeof(line), fd) != NULL) {
-			if ((cp = strchr(line, '\n')) != NULL)
-				*cp = '\0';
-			lreply(530, "%s", line);
-		}
-		fflush(stdout);
-		fclose(fd);
-		reply(530, "System not available.");
-		exit(0);
-	}
-	if ((fd = fopen(_PATH_FTPWELCOME, "r")) != NULL) {
-		while (fgets(line, sizeof(line), fd) != NULL) {
-			if ((cp = strchr(line, '\n')) != NULL)
-				*cp = '\0';
-			lreply(220, "%s", line);
-		}
-		fflush(stdout);
-		fclose(fd);
-		/* reply(220,) must follow */
-	}
-	k_gethostname(hostname, sizeof(hostname));
-	reply(220, "%s FTP server (%s+%s) ready.", hostname, 
-	      version, krb4_version);
-	setjmp(errcatch);
-	for (;;)
-	    yyparse();
-	/* NOTREACHED */
-}
-
-static RETSIGTYPE
-lostconn(int signo)
-{
-
-	if (debug)
-		syslog(LOG_DEBUG, "lost connection");
-	dologout(-1);
-}
-
-/*
- * Helper function for sgetpwnam().
- */
-static char *
-sgetsave(char *s)
-{
-	char *new = strdup(s);
-
-	if (new == NULL) {
-		perror_reply(421, "Local resource failure: malloc");
-		dologout(1);
-		/* NOTREACHED */
-	}
-	return new;
-}
-
-/*
- * Save the result of a getpwnam.  Used for USER command, since
- * the data returned must not be clobbered by any other command
- * (e.g., globbing).
- */
-static struct passwd *
-sgetpwnam(char *name)
-{
-	static struct passwd save;
-	struct passwd *p;
-
-	if ((p = k_getpwnam(name)) == NULL)
-		return (p);
-	if (save.pw_name) {
-		free(save.pw_name);
-		free(save.pw_passwd);
-		free(save.pw_gecos);
-		free(save.pw_dir);
-		free(save.pw_shell);
-	}
-	save = *p;
-	save.pw_name = sgetsave(p->pw_name);
-	save.pw_passwd = sgetsave(p->pw_passwd);
-	save.pw_gecos = sgetsave(p->pw_gecos);
-	save.pw_dir = sgetsave(p->pw_dir);
-	save.pw_shell = sgetsave(p->pw_shell);
-	return (&save);
-}
-
-static int login_attempts;	/* number of failed login attempts */
-static int askpasswd;		/* had user command, ask for passwd */
-static char curname[10];	/* current USER name */
-#ifdef OTP
-OtpContext otp_ctx;
-#endif
-
-/*
- * USER command.
- * Sets global passwd pointer pw if named account exists and is acceptable;
- * sets askpasswd if a PASS command is expected.  If logged in previously,
- * need to reset state.  If name is "ftp" or "anonymous", the name is not in
- * _PATH_FTPUSERS, and ftp account exists, set guest and pw, then just return.
- * If account doesn't exist, ask for passwd anyway.  Otherwise, check user
- * requesting login privileges.  Disallow anyone who does not have a standard
- * shell as returned by getusershell().  Disallow anyone mentioned in the file
- * _PATH_FTPUSERS to allow people such as root and uucp to be avoided.
- */
-void
-user(char *name)
-{
-	char *cp, *shell;
-
-	if(auth_level == 0 && !auth_complete){
-	    reply(530, "No login allowed without authorization.");
-	    return;
-	}
-
-	if (logged_in) {
-		if (guest) {
-			reply(530, "Can't change user from guest login.");
-			return;
-		} else if (dochroot) {
-			reply(530, "Can't change user from chroot user.");
-			return;
-		}
-		end_login();
-	}
-
-	guest = 0;
-	if (strcmp(name, "ftp") == 0 || strcmp(name, "anonymous") == 0) {
-	    if ((auth_level & AUTH_FTP) == 0 ||
-		checkaccess("ftp") || 
-		checkaccess("anonymous"))
-		reply(530, "User %s access denied.", name);
-	    else if ((pw = sgetpwnam("ftp")) != NULL) {
-		guest = 1;
-		defumask = guest_umask;	/* paranoia for incoming */
-		askpasswd = 1;
-		reply(331, "Guest login ok, type your name as password.");
-	    } else
-		reply(530, "User %s unknown.", name);
-	    if (!askpasswd && logging)
-		syslog(LOG_NOTICE,
-		       "ANONYMOUS FTP LOGIN REFUSED FROM %s(%s)",
-		       remotehost, inet_ntoa(his_addr.sin_addr));
-	    return;
-	}
-	if((auth_level & AUTH_PLAIN) == 0 && !auth_complete){
-	    reply(530, "Only authorized and anonymous login allowed.");
-	    return;
-	}
-	if ((pw = sgetpwnam(name))) {
-		if ((shell = pw->pw_shell) == NULL || *shell == 0)
-			shell = _PATH_BSHELL;
-		while ((cp = getusershell()) != NULL)
-			if (strcmp(cp, shell) == 0)
-				break;
-		endusershell();
-
-		if (cp == NULL || checkaccess(name)) {
-			reply(530, "User %s access denied.", name);
-			if (logging)
-				syslog(LOG_NOTICE,
-				       "FTP LOGIN REFUSED FROM %s(%s), %s",
-				       remotehost,
-				       inet_ntoa(his_addr.sin_addr),
-				       name);
-			pw = (struct passwd *) NULL;
-			return;
-		}
-	}
-	if (logging)
-		strncpy(curname, name, sizeof(curname)-1);
-	if(auth_ok())
-		ct->userok(name);
-#ifdef OTP
-	else {
-		char ss[256];
-
-		if (otp_challenge(&otp_ctx, name, ss, sizeof(ss)) == 0) {
-			reply(331, "Password %s for %s required.",
-			      ss, name);
-			askpasswd = 1;
-		} else if ((auth_level & AUTH_OTP) == 0) {
-		    reply(331, "Password required for %s.", name);
-		    askpasswd = 1;
-		} else {
-		    char *s;
-		    
-		    if (s = otp_error (&otp_ctx))
-			lreply(530, "OTP: %s", s);
-		    reply(530,
-			  "Only authorized, anonymous and OTP "
-			  "login allowed.");
-		}
-
-	}
-#endif
-	/*
-	 * Delay before reading passwd after first failed
-	 * attempt to slow down passwd-guessing programs.
-	 */
-	if (login_attempts)
-		sleep(login_attempts);
-}
-
-/*
- * Check if a user is in the file "fname"
- */
-static int
-checkuser(char *fname, char *name)
-{
-	FILE *fd;
-	int found = 0;
-	char *p, line[BUFSIZ];
-
-	if ((fd = fopen(fname, "r")) != NULL) {
-		while (fgets(line, sizeof(line), fd) != NULL)
-			if ((p = strchr(line, '\n')) != NULL) {
-				*p = '\0';
-				if (line[0] == '#')
-					continue;
-				if (strcmp(line, name) == 0) {
-					found = 1;
-					break;
-				}
-			}
-		fclose(fd);
-	}
-	return (found);
-}
-
-
-/*
- * Determine whether a user has access, based on information in 
- * _PATH_FTPUSERS. The users are listed one per line, with `allow'
- * or `deny' after the username. If anything other than `allow', or
- * just nothing, is given after the username, `deny' is assumed.
- *
- * If the user is not found in the file, but the pseudo-user `*' is,
- * the permission is taken from that line.
- *
- * This preserves the old semantics where if a user was listed in the
- * file he was denied, otherwise he was allowed.
- *
- * Return 1 if the user is denied, or 0 if he is allowed.  */
-
-static int
-match(const char *pattern, const char *string)
-{
-#ifdef HAVE_FNMATCH
-    return fnmatch(pattern, string, FNM_NOESCAPE);
-#else
-    return strcmp(pattern, "*") != 0 && strcmp(pattern, string) != 0;
-#endif
-}
-
-static int
-checkaccess(char *name)
-{
-#define ALLOWED		0
-#define	NOT_ALLOWED	1
-    FILE *fd;
-    int allowed = ALLOWED;
-    char *user, *perm, line[BUFSIZ];
-    char *foo;
-    
-    fd = fopen(_PATH_FTPUSERS, "r");
-    
-    if(fd == NULL)
-	return allowed;
-
-    while (fgets(line, sizeof(line), fd) != NULL)  {
-	foo = NULL;
-	user = strtok_r(line, " \t\n", &foo);
-	if (user == NULL || user[0] == '#')
-	    continue;
-	perm = strtok_r(NULL, " \t\n", &foo);
-	if (match(user, name) == 0){
-	    if(perm && strcmp(perm, "allow") == 0)
-		allowed = ALLOWED;
-	    else
-		allowed = NOT_ALLOWED;
-	    break;
-	}
-    }
-    fclose(fd);
-    return allowed;
-}
-#undef	ALLOWED
-#undef	NOT_ALLOWED
-
-int do_login(int code, char *passwd)
-{
-        FILE *fd;
-	login_attempts = 0;		/* this time successful */
-	if (setegid((gid_t)pw->pw_gid) < 0) {
-		reply(550, "Can't set gid.");
-		return -1;
-	}
-	initgroups(pw->pw_name, pw->pw_gid);
-
-	/* open wtmp before chroot */
-	logwtmp(ttyline, pw->pw_name, remotehost);
-	logged_in = 1;
-
-	dochroot = checkuser(_PATH_FTPCHROOT, pw->pw_name);
-	if (guest) {
-		/*
-		 * We MUST do a chdir() after the chroot. Otherwise
-		 * the old current directory will be accessible as "."
-		 * outside the new root!
-		 */
-		if (chroot(pw->pw_dir) < 0 || chdir("/") < 0) {
-			reply(550, "Can't set guest privileges.");
-			return -1;
-		}
-	} else if (dochroot) {
-		if (chroot(pw->pw_dir) < 0 || chdir("/") < 0) {
-			reply(550, "Can't change root.");
-			return -1;
-		}
-	} else if (chdir(pw->pw_dir) < 0) {
-		if (chdir("/") < 0) {
-			reply(530, "User %s: can't change directory to %s.",
-			    pw->pw_name, pw->pw_dir);
-			return -1;
-		} else
-			lreply(code, "No directory! Logging in with home=/");
-	}
-	if (seteuid((uid_t)pw->pw_uid) < 0) {
-		reply(550, "Can't set uid.");
-		return -1;
-	}
-	/*
-	 * Display a login message, if it exists.
-	 * N.B. reply(code,) must follow the message.
-	 */
-	if ((fd = fopen(_PATH_FTPLOGINMESG, "r")) != NULL) {
-		char *cp, line[LINE_MAX];
-
-		while (fgets(line, sizeof(line), fd) != NULL) {
-			if ((cp = strchr(line, '\n')) != NULL)
-				*cp = '\0';
-			lreply(code, "%s", line);
-		}
-	}
-	if (guest) {
-		reply(code, "Guest login ok, access restrictions apply.");
-#ifdef HAVE_SETPROCTITLE
-		snprintf (proctitle, sizeof(proctitle),
-			  "%s: anonymous/%s",
-			  remotehost,
-			  passwd);
-#endif /* HAVE_SETPROCTITLE */
-		if (logging)
-			syslog(LOG_INFO, "ANONYMOUS FTP LOGIN FROM %s(%s), %s",
-			       remotehost, 
-			       inet_ntoa(his_addr.sin_addr),
-			       passwd);
-	} else {
-		reply(code, "User %s logged in.", pw->pw_name);
-#ifdef HAVE_SETPROCTITLE
-		snprintf(proctitle, sizeof(proctitle), "%s: %s", remotehost, pw->pw_name);
-		setproctitle(proctitle);
-#endif /* HAVE_SETPROCTITLE */
-		if (logging)
-			syslog(LOG_INFO, "FTP LOGIN FROM %s(%s) as %s",
-			       remotehost,
-			       inet_ntoa(his_addr.sin_addr),
-			       pw->pw_name);
-	}
-	umask(defumask);
-	return 0;
-}
-
-/*
- * Terminate login as previous user, if any, resetting state;
- * used when USER command is given or login fails.
- */
-static void
-end_login(void)
-{
-
-	seteuid((uid_t)0);
-	if (logged_in)
-		logwtmp(ttyline, "", "");
-	pw = NULL;
-	logged_in = 0;
-	guest = 0;
-	dochroot = 0;
-}
-
-void
-pass(char *passwd)
-{
-	int rval;
-
-	/* some clients insists on sending a password */
-	if (logged_in && askpasswd == 0){
-	     reply(230, "Dumpucko!");
-	     return;
-	}
-
-	if (logged_in || askpasswd == 0) {
-		reply(503, "Login with USER first.");
-		return;
-	}
-	askpasswd = 0;
-	rval = 1;
-	if (!guest) {		/* "ftp" is only account allowed no password */
-		if (pw == NULL)
-			rval = 1;	/* failure below */
-#ifdef OTP
-		else if (otp_verify_user (&otp_ctx, passwd) == 0)
-		    rval = 0;
-#endif
-		else if((auth_level & AUTH_OTP) == 0) {
-		    char realm[REALM_SZ];
-		    if((rval = krb_get_lrealm(realm, 1)) == KSUCCESS)
-			rval = krb_verify_user(pw->pw_name, "", realm, 
-					       passwd, 1, NULL);
-		    if (rval == KSUCCESS ){
-			if(k_hasafs())
-			    k_afsklog(0, 0);
-		    }else 
-			rval = unix_verify_user(pw->pw_name, passwd);
-		}
-#ifdef OTP
-		else {
-		    char *s;
-		    
-		    if (s = otp_error(&otp_ctx))
-			lreply(530, "OTP: %s", s);
-		}
-#endif
-		memset (passwd, 0, strlen(passwd));
-
-		/*
-		 * If rval == 1, the user failed the authentication
-		 * check above.  If rval == 0, either Kerberos or
-		 * local authentication succeeded.
-		 */
-		if (rval) {
-			reply(530, "Login incorrect.");
-			if (logging)
-				syslog(LOG_NOTICE,
-				    "FTP LOGIN FAILED FROM %s(%s), %s",
-				       remotehost,
-				       inet_ntoa(his_addr.sin_addr),
-				       curname);
-			pw = NULL;
-			if (login_attempts++ >= 5) {
-				syslog(LOG_NOTICE,
-				       "repeated login failures from %s(%s)",
-				       remotehost,
-				       inet_ntoa(his_addr.sin_addr));
-				exit(0);
-			}
-			return;
-		}
-	}
-	if(!do_login(230, passwd))
-	  return;
-	
-	/* Forget all about it... */
-	end_login();
-}
-
-void
-retrieve(char *cmd, char *name)
-{
-	FILE *fin = NULL, *dout;
-	struct stat st;
-	int (*closefunc) (FILE *);
-	char line[BUFSIZ];
-
-
-	if (cmd == 0) {
-		fin = fopen(name, "r");
-		closefunc = fclose;
-		st.st_size = 0;
-		if(fin == NULL){
-		    struct cmds {
-			char *ext;
-			char *cmd;
-		    } cmds[] = {
-			{".tar", "/bin/gtar cPf - %s"},
-			{".tar.gz", "/bin/gtar zcPf - %s"},
-			{".tar.Z", "/bin/gtar ZcPf - %s"},
-			{".gz", "/bin/gzip -c %s"},
-			{".Z", "/bin/compress -c %s"},
-			{NULL, NULL}
-		    };
-		    struct cmds *p;
-		    for(p = cmds; p->ext; p++){
-			char *tail = name + strlen(name) - strlen(p->ext);
-			char c = *tail;
-			
-			if(strcmp(tail, p->ext) == 0 &&
-			   (*tail  = 0) == 0 &&
-			   access(name, R_OK) == 0){
-			    snprintf (line, sizeof(line), p->cmd, name);
-			    *tail  = c;
-			    break;
-			}
-			*tail = c;
-		    }
-		    if(p->ext){
-			fin = ftpd_popen(line, "r", 0, 0);
-			closefunc = ftpd_pclose;
-			st.st_size = -1;
-			cmd = line;
-		    }
-		}
-	} else {
-		snprintf(line, sizeof(line), cmd, name);
-		name = line;
-		fin = ftpd_popen(line, "r", 1, 0);
-		closefunc = ftpd_pclose;
-		st.st_size = -1;
-	}
-	if (fin == NULL) {
-		if (errno != 0) {
-			perror_reply(550, name);
-			if (cmd == 0) {
-				LOGCMD("get", name);
-			}
-		}
-		return;
-	}
-	byte_count = -1;
-	if (cmd == 0){
-	    if(fstat(fileno(fin), &st) < 0 || !S_ISREG(st.st_mode)) {
-		reply(550, "%s: not a plain file.", name);
-		goto done;
-	    }
-	}
-	if (restart_point) {
-		if (type == TYPE_A) {
-			off_t i, n;
-			int c;
-
-			n = restart_point;
-			i = 0;
-			while (i++ < n) {
-				if ((c=getc(fin)) == EOF) {
-					perror_reply(550, name);
-					goto done;
-				}
-				if (c == '\n')
-					i++;
-			}
-		} else if (lseek(fileno(fin), restart_point, SEEK_SET) < 0) {
-			perror_reply(550, name);
-			goto done;
-		}
-	}
-	dout = dataconn(name, st.st_size, "w");
-	if (dout == NULL)
-		goto done;
-	set_buffer_size(fileno(dout), 0);
-	send_data(fin, dout);
-	fclose(dout);
-	data = -1;
-	pdata = -1;
-done:
-	if (cmd == 0)
-		LOGBYTES("get", name, byte_count);
-	(*closefunc)(fin);
-}
-
-/* filename sanity check */
-
-int 
-filename_check(char *filename)
-{
-  static const char good_chars[] = "+-=_,.";
-    char *p;
-
-    p = strrchr(filename, '/');
-    if(p)
-	filename = p + 1;
-
-    p = filename;
-
-    if(isalnum(*p)){
-	p++;
-	while(*p && (isalnum(*p) || strchr(good_chars, *p)))
-	    p++;
-	if(*p == '\0')
-	    return 0;
-    }
-    lreply(553, "\"%s\" is an illegal filename.", filename);
-    lreply(553, "The filename must start with an alphanumeric "
-	   "character and must only");
-    reply(553, "consist of alphanumeric characters or any of the following: %s", 
-	  good_chars);
-    return 1;
-}
-
-void
-do_store(char *name, char *mode, int unique)
-{
-	FILE *fout, *din;
-	struct stat st;
-	int (*closefunc) (FILE *);
-
-	if(guest && filename_check(name))
-	    return;
-	if (unique && stat(name, &st) == 0 &&
-	    (name = gunique(name)) == NULL) {
-		LOGCMD(*mode == 'w' ? "put" : "append", name);
-		return;
-	}
-
-	if (restart_point)
-		mode = "r+";
-	fout = fopen(name, mode);
-	closefunc = fclose;
-	if (fout == NULL) {
-		perror_reply(553, name);
-		LOGCMD(*mode == 'w' ? "put" : "append", name);
-		return;
-	}
-	byte_count = -1;
-	if (restart_point) {
-		if (type == TYPE_A) {
-			off_t i, n;
-			int c;
-
-			n = restart_point;
-			i = 0;
-			while (i++ < n) {
-				if ((c=getc(fout)) == EOF) {
-					perror_reply(550, name);
-					goto done;
-				}
-				if (c == '\n')
-					i++;
-			}
-			/*
-			 * We must do this seek to "current" position
-			 * because we are changing from reading to
-			 * writing.
-			 */
-			if (fseek(fout, 0L, SEEK_CUR) < 0) {
-				perror_reply(550, name);
-				goto done;
-			}
-		} else if (lseek(fileno(fout), restart_point, SEEK_SET) < 0) {
-			perror_reply(550, name);
-			goto done;
-		}
-	}
-	din = dataconn(name, (off_t)-1, "r");
-	if (din == NULL)
-		goto done;
-	set_buffer_size(fileno(din), 1);
-	if (receive_data(din, fout) == 0) {
-		if (unique)
-			reply(226, "Transfer complete (unique file name:%s).",
-			    name);
-		else
-			reply(226, "Transfer complete.");
-	}
-	fclose(din);
-	data = -1;
-	pdata = -1;
-done:
-	LOGBYTES(*mode == 'w' ? "put" : "append", name, byte_count);
-	(*closefunc)(fout);
-}
-
-static FILE *
-getdatasock(char *mode)
-{
-	int on = 1, s, t, tries;
-
-	if (data >= 0)
-		return (fdopen(data, mode));
-	seteuid((uid_t)0);
-	s = socket(AF_INET, SOCK_STREAM, 0);
-	if (s < 0)
-		goto bad;
-#if defined(SO_REUSEADDR) && defined(HAVE_SETSOCKOPT)
-	if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
-	    (void *) &on, sizeof(on)) < 0)
-		goto bad;
-#endif
-	/* anchor socket to avoid multi-homing problems */
-	data_source.sin_family = AF_INET;
-	data_source.sin_addr = ctrl_addr.sin_addr;
-	for (tries = 1; ; tries++) {
-		if (bind(s, (struct sockaddr *)&data_source,
-		    sizeof(data_source)) >= 0)
-			break;
-		if (errno != EADDRINUSE || tries > 10)
-			goto bad;
-		sleep(tries);
-	}
-	seteuid((uid_t)pw->pw_uid);
-#if defined(IP_TOS) && defined(HAVE_SETSOCKOPT)
-	on = IPTOS_THROUGHPUT;
-	if (setsockopt(s, IPPROTO_IP, IP_TOS, (void *)&on, sizeof(int)) < 0)
-		syslog(LOG_WARNING, "setsockopt (IP_TOS): %m");
-#endif
-	return (fdopen(s, mode));
-bad:
-	/* Return the real value of errno (close may change it) */
-	t = errno;
-	seteuid((uid_t)pw->pw_uid);
-	close(s);
-	errno = t;
-	return (NULL);
-}
-
-static FILE *
-dataconn(char *name, off_t size, char *mode)
-{
-	char sizebuf[32];
-	FILE *file;
-	int retry = 0, tos;
-
-	file_size = size;
-	byte_count = 0;
-	if (size != (off_t) -1)
-		snprintf(sizebuf, sizeof(sizebuf), " (%ld bytes)", size);
-	else
-		strcpy(sizebuf, "");
-	if (pdata >= 0) {
-		struct sockaddr_in from;
-		int s, fromlen = sizeof(from);
-
-		s = accept(pdata, (struct sockaddr *)&from, &fromlen);
-		if (s < 0) {
-			reply(425, "Can't open data connection.");
-			close(pdata);
-			pdata = -1;
-			return (NULL);
-		}
-		close(pdata);
-		pdata = s;
-#if defined(IP_TOS) && defined(HAVE_SETSOCKOPT)
-		tos = IPTOS_THROUGHPUT;
-		setsockopt(s, IPPROTO_IP, IP_TOS, (void *)&tos,
-		    sizeof(int));
-#endif
-		reply(150, "Opening %s mode data connection for '%s'%s.",
-		     type == TYPE_A ? "ASCII" : "BINARY", name, sizebuf);
-		return (fdopen(pdata, mode));
-	}
-	if (data >= 0) {
-		reply(125, "Using existing data connection for '%s'%s.",
-		    name, sizebuf);
-		usedefault = 1;
-		return (fdopen(data, mode));
-	}
-	if (usedefault)
-		data_dest = his_addr;
-	usedefault = 1;
-	file = getdatasock(mode);
-	if (file == NULL) {
-		reply(425, "Can't create data socket (%s,%d): %s.",
-		    inet_ntoa(data_source.sin_addr),
-		    ntohs(data_source.sin_port), strerror(errno));
-		return (NULL);
-	}
-	data = fileno(file);
-	while (connect(data, (struct sockaddr *)&data_dest,
-	    sizeof(data_dest)) < 0) {
-		if (errno == EADDRINUSE && retry < swaitmax) {
-			sleep((unsigned) swaitint);
-			retry += swaitint;
-			continue;
-		}
-		perror_reply(425, "Can't build data connection");
-		fclose(file);
-		data = -1;
-		return (NULL);
-	}
-	reply(150, "Opening %s mode data connection for '%s'%s.",
-	     type == TYPE_A ? "ASCII" : "BINARY", name, sizebuf);
-	return (file);
-}
-
-/*
- * Tranfer the contents of "instr" to "outstr" peer using the appropriate
- * encapsulation of the data subject * to Mode, Structure, and Type.
- *
- * NB: Form isn't handled.
- */
-static void
-send_data(FILE *instr, FILE *outstr)
-{
-	int c, cnt, filefd, netfd;
-	static char *buf;
-	static size_t bufsize;
-	int i = 0;
-	char s[1024];
-
-	transflag++;
-	if (setjmp(urgcatch)) {
-		transflag = 0;
-		return;
-	}
-	switch (type) {
-
-	case TYPE_A:
-		while ((c = getc(instr)) != EOF) {
-		    byte_count++;
-		    if(i > 1022){
-			auth_write(fileno(outstr), s, i);
-			i = 0;
-		    }
-		    if(c == '\n')
-			s[i++] = '\r';
-		    s[i++] = c;
-		}
-		if(i)
-		    auth_write(fileno(outstr), s, i);
-		auth_write(fileno(outstr), s, 0);
-		fflush(outstr);
-		transflag = 0;
-		if (ferror(instr))
-			goto file_err;
-		if (ferror(outstr))
-			goto data_err;
-		reply(226, "Transfer complete.");
-		return;
-		
-	case TYPE_I:
-	case TYPE_L:
-#ifdef HAVE_MMAP
-#ifndef MAP_FAILED
-#define MAP_FAILED (-1)
-#endif
-	    {
-		struct stat st;
-		char *chunk;
-		int in = fileno(instr);
-		if(fstat(in, &st) == 0 && S_ISREG(st.st_mode)) {
-		    chunk = mmap(0, st.st_size, PROT_READ, MAP_SHARED, in, 0);
-		    if(chunk != (void *)MAP_FAILED) {
-			cnt = st.st_size - restart_point;
-			auth_write(fileno(outstr),
-				   chunk + restart_point,
-				   cnt);
-			munmap(chunk, st.st_size);
-			auth_write(fileno(outstr), NULL, 0);
-			byte_count = cnt;
-			transflag = 0;
-		    }
-		}
-	    }
-	
-#endif
-	if(transflag){
-	    struct stat st;
-
-	    netfd = fileno(outstr);
-	    filefd = fileno(instr);
-	    buf = alloc_buffer (buf, &bufsize,
-				fstat(filefd, &st) >= 0 ? &st : NULL);
-	    if (buf == NULL) {
-		transflag = 0;
-		perror_reply(451, "Local resource failure: malloc");
-		return;
-	    }
-	    while ((cnt = read(filefd, buf, bufsize)) > 0 &&
-		   auth_write(netfd, buf, cnt) == cnt)
-		byte_count += cnt;
-	    auth_write(netfd, buf, 0); /* to end an encrypted stream */
-	    transflag = 0;
-	    if (cnt != 0) {
-		if (cnt < 0)
-		    goto file_err;
-		goto data_err;
-	    }
-	}
-	reply(226, "Transfer complete.");
-	return;
-	default:
-	    transflag = 0;
-	    reply(550, "Unimplemented TYPE %d in send_data", type);
-	    return;
-	}
-
-data_err:
-	transflag = 0;
-	perror_reply(426, "Data connection");
-	return;
-
-file_err:
-	transflag = 0;
-	perror_reply(551, "Error on input file");
-}
-
-/*
- * Transfer data from peer to "outstr" using the appropriate encapulation of
- * the data subject to Mode, Structure, and Type.
- *
- * N.B.: Form isn't handled.
- */
-static int
-receive_data(FILE *instr, FILE *outstr)
-{
-    int cnt, bare_lfs = 0;
-    static char *buf;
-    static size_t bufsize;
-    struct stat st;
-
-    transflag++;
-    if (setjmp(urgcatch)) {
-	transflag = 0;
-	return (-1);
-    }
-
-    buf = alloc_buffer (buf, &bufsize,
-			fstat(fileno(outstr), &st) >= 0 ? &st : NULL);
-    if (buf == NULL) {
-	transflag = 0;
-	perror_reply(451, "Local resource failure: malloc");
-	return -1;
-    }
-    
-    switch (type) {
-
-    case TYPE_I:
-    case TYPE_L:
-	while ((cnt = auth_read(fileno(instr), buf, bufsize)) > 0) {
-	    if (write(fileno(outstr), buf, cnt) != cnt)
-		goto file_err;
-	    byte_count += cnt;
-	}
-	if (cnt < 0)
-	    goto data_err;
-	transflag = 0;
-	return (0);
-
-    case TYPE_E:
-	reply(553, "TYPE E not implemented.");
-	transflag = 0;
-	return (-1);
-
-    case TYPE_A:
-    {
-	char *p, *q;
-	int cr_flag = 0;
-	while ((cnt = auth_read(fileno(instr),
-				buf + cr_flag, 
-				bufsize - cr_flag)) > 0){
-	    byte_count += cnt;
-	    cnt += cr_flag;
-	    cr_flag = 0;
-	    for(p = buf, q = buf; p < buf + cnt;) {
-		if(*p == '\n')
-		    bare_lfs++;
-		if(*p == '\r')
-		    if(p == buf + cnt - 1){
-			cr_flag = 1;
-			p++;
-			continue;
-		    }else if(p[1] == '\n'){
-			*q++ = '\n';
-			p += 2;
-			continue;
-		    }
-		*q++ = *p++;
-	    }
-	    fwrite(buf, q - buf, 1, outstr);
-	    if(cr_flag)
-		buf[0] = '\r';
-	}
-	if(cr_flag)
-	    putc('\r', outstr);
-	fflush(outstr);
-	if (ferror(instr))
-	    goto data_err;
-	if (ferror(outstr))
-	    goto file_err;
-	transflag = 0;
-	if (bare_lfs) {
-	    lreply(226, "WARNING! %d bare linefeeds received in ASCII mode\r\n"
-		   "    File may not have transferred correctly.\r\n",
-		   bare_lfs);
-	}
-	return (0);
-    }
-    default:
-	reply(550, "Unimplemented TYPE %d in receive_data", type);
-	transflag = 0;
-	return (-1);
-    }
-	
-data_err:
-    transflag = 0;
-    perror_reply(426, "Data Connection");
-    return (-1);
-	
-file_err:
-    transflag = 0;
-    perror_reply(452, "Error writing file");
-    return (-1);
-}
-
-void
-statfilecmd(char *filename)
-{
-	FILE *fin;
-	int c;
-	char line[LINE_MAX];
-
-	snprintf(line, sizeof(line), "/bin/ls -la %s", filename);
-	fin = ftpd_popen(line, "r", 1, 0);
-	lreply(211, "status of %s:", filename);
-	while ((c = getc(fin)) != EOF) {
-		if (c == '\n') {
-			if (ferror(stdout)){
-				perror_reply(421, "control connection");
-				ftpd_pclose(fin);
-				dologout(1);
-				/* NOTREACHED */
-			}
-			if (ferror(fin)) {
-				perror_reply(551, filename);
-				ftpd_pclose(fin);
-				return;
-			}
-			putc('\r', stdout);
-		}
-		putc(c, stdout);
-	}
-	ftpd_pclose(fin);
-	reply(211, "End of Status");
-}
-
-void
-statcmd(void)
-{
-#if 0
-	struct sockaddr_in *sin;
-	u_char *a, *p;
-
-	lreply(211, "%s FTP server status:", hostname, version);
-	printf("     %s\r\n", version);
-	printf("     Connected to %s", remotehost);
-	if (!isdigit(remotehost[0]))
-		printf(" (%s)", inet_ntoa(his_addr.sin_addr));
-	printf("\r\n");
-	if (logged_in) {
-		if (guest)
-			printf("     Logged in anonymously\r\n");
-		else
-			printf("     Logged in as %s\r\n", pw->pw_name);
-	} else if (askpasswd)
-		printf("     Waiting for password\r\n");
-	else
-		printf("     Waiting for user name\r\n");
-	printf("     TYPE: %s", typenames[type]);
-	if (type == TYPE_A || type == TYPE_E)
-		printf(", FORM: %s", formnames[form]);
-	if (type == TYPE_L)
-#if NBBY == 8
-		printf(" %d", NBBY);
-#else
-		printf(" %d", bytesize);	/* need definition! */
-#endif
-	printf("; STRUcture: %s; transfer MODE: %s\r\n",
-	    strunames[stru], modenames[mode]);
-	if (data != -1)
-		printf("     Data connection open\r\n");
-	else if (pdata != -1) {
-		printf("     in Passive mode");
-		sin = &pasv_addr;
-		goto printaddr;
-	} else if (usedefault == 0) {
-		printf("     PORT");
-		sin = &data_dest;
-printaddr:
-		a = (u_char *) &sin->sin_addr;
-		p = (u_char *) &sin->sin_port;
-#define UC(b) (((int) b) & 0xff)
-		printf(" (%d,%d,%d,%d,%d,%d)\r\n", UC(a[0]),
-			UC(a[1]), UC(a[2]), UC(a[3]), UC(p[0]), UC(p[1]));
-#undef UC
-	} else
-		printf("     No data connection\r\n");
-#endif
-	reply(211, "End of status");
-}
-
-void
-fatal(char *s)
-{
-
-	reply(451, "Error in server: %s\n", s);
-	reply(221, "Closing connection due to server error.");
-	dologout(0);
-	/* NOTREACHED */
-}
-
-static void
-int_reply(int, char *, const char *, va_list)
-#ifdef __GNUC__
-__attribute__ ((format (printf, 3, 0)))
-#endif
-;
-
-static void
-int_reply(int n, char *c, const char *fmt, va_list ap)
-{
-  char buf[10240];
-  char *p;
-  p=buf;
-  if(n){
-      snprintf(p, sizeof(buf), "%d%s", n, c);
-      p+=strlen(p);
-  }
-  vsnprintf(p, sizeof(buf) - strlen(p), fmt, ap);
-  p+=strlen(p);
-  snprintf(p, sizeof(buf) - strlen(p), "\r\n");
-  p+=strlen(p);
-  auth_printf("%s", buf);
-  fflush(stdout);
-  if (debug)
-    syslog(LOG_DEBUG, "<--- %s- ", buf);
-}
-
-void
-reply(int n, const char *fmt, ...)
-{
-  va_list ap;
-  va_start(ap, fmt);
-  int_reply(n, " ", fmt, ap);
-  delete_ftp_command();
-  va_end(ap);
-}
-
-void
-lreply(int n, const char *fmt, ...)
-{
-  va_list ap;
-  va_start(ap, fmt);
-  int_reply(n, "-", fmt, ap);
-  va_end(ap);
-}
-
-void
-nreply(const char *fmt, ...)
-{
-  va_list ap;
-  va_start(ap, fmt);
-  int_reply(0, NULL, fmt, ap);
-  va_end(ap);
-}
-
-static void
-ack(char *s)
-{
-
-	reply(250, "%s command successful.", s);
-}
-
-void
-nack(char *s)
-{
-
-	reply(502, "%s command not implemented.", s);
-}
-
-/* ARGSUSED */
-void
-yyerror(char *s)
-{
-	char *cp;
-
-	if ((cp = strchr(cbuf,'\n')))
-		*cp = '\0';
-	reply(500, "'%s': command not understood.", cbuf);
-}
-
-void
-do_delete(char *name)
-{
-	struct stat st;
-
-	LOGCMD("delete", name);
-	if (stat(name, &st) < 0) {
-		perror_reply(550, name);
-		return;
-	}
-	if ((st.st_mode&S_IFMT) == S_IFDIR) {
-		if (rmdir(name) < 0) {
-			perror_reply(550, name);
-			return;
-		}
-		goto done;
-	}
-	if (unlink(name) < 0) {
-		perror_reply(550, name);
-		return;
-	}
-done:
-	ack("DELE");
-}
-
-void
-cwd(char *path)
-{
-
-	if (chdir(path) < 0)
-		perror_reply(550, path);
-	else
-		ack("CWD");
-}
-
-void
-makedir(char *name)
-{
-
-	LOGCMD("mkdir", name);
-	if(guest && filename_check(name))
-	    return;
-	if (mkdir(name, 0777) < 0)
-		perror_reply(550, name);
-	else{
-	    if(guest)
-		chmod(name, 0700); /* guest has umask 777 */
-	    reply(257, "MKD command successful.");
-	}
-}
-
-void
-removedir(char *name)
-{
-
-	LOGCMD("rmdir", name);
-	if (rmdir(name) < 0)
-		perror_reply(550, name);
-	else
-		ack("RMD");
-}
-
-void
-pwd(void)
-{
-    char path[MaxPathLen + 1];
-    char *ret;
-
-    /* SunOS has a broken getcwd that does popen(pwd) (!!!), this
-     * failes miserably when running chroot 
-     */
-    ret = getcwd(path, sizeof(path));
-    if (ret == NULL)
-	reply(550, "%s.", strerror(errno));
-    else
-	reply(257, "\"%s\" is current directory.", path);
-}
-
-char *
-renamefrom(char *name)
-{
-	struct stat st;
-
-	if (stat(name, &st) < 0) {
-		perror_reply(550, name);
-		return NULL;
-	}
-	reply(350, "File exists, ready for destination name");
-	return (name);
-}
-
-void
-renamecmd(char *from, char *to)
-{
-
-	LOGCMD2("rename", from, to);
-	if(guest && filename_check(to))
-	    return;
-	if (rename(from, to) < 0)
-		perror_reply(550, "rename");
-	else
-		ack("RNTO");
-}
-
-static void
-dolog(struct sockaddr_in *sin)
-{
-	inaddr2str (sin->sin_addr, remotehost, sizeof(remotehost));
-#ifdef HAVE_SETPROCTITLE
-	snprintf(proctitle, sizeof(proctitle), "%s: connected", remotehost);
-	setproctitle(proctitle);
-#endif /* HAVE_SETPROCTITLE */
-
-	if (logging)
-		syslog(LOG_INFO, "connection from %s(%s)",
-		       remotehost,
-		       inet_ntoa(his_addr.sin_addr));
-}
-
-/*
- * Record logout in wtmp file
- * and exit with supplied status.
- */
-void
-dologout(int status)
-{
-    transflag = 0;
-    if (logged_in) {
-	seteuid((uid_t)0);
-	logwtmp(ttyline, "", "");
-	dest_tkt();
-	if(k_hasafs())
-	    k_unlog();
-    }
-    /* beware of flushing buffers after a SIGPIPE */
-#ifdef XXX
-    exit(status);
-#else
-    _exit(status);
-#endif	
-}
-
-void abor(void)
-{
-}
-
-static void
-myoob(int signo)
-{
-#if 0
-	char *cp;
-#endif
-
-	/* only process if transfer occurring */
-	if (!transflag)
-		return;
-
-	/* This is all XXX */
-	oobflag = 1;
-	/* if the command resulted in a new command, 
-	   parse that as well */
-	do{
-	    yyparse();
-	} while(ftp_command);
-	oobflag = 0;
-
-#if 0 
-	cp = tmpline;
-	if (getline(cp, 7) == NULL) {
-		reply(221, "You could at least say goodbye.");
-		dologout(0);
-	}
-	upper(cp);
-	if (strcmp(cp, "ABOR\r\n") == 0) {
-		tmpline[0] = '\0';
-		reply(426, "Transfer aborted. Data connection closed.");
-		reply(226, "Abort successful");
-		longjmp(urgcatch, 1);
-	}
-	if (strcmp(cp, "STAT\r\n") == 0) {
-		if (file_size != (off_t) -1)
-			reply(213, "Status: %ld of %ld bytes transferred",
-			      (long)byte_count,
-			      (long)file_size);
-		else
-			reply(213, "Status: %ld bytes transferred"
-			      (long)byte_count);
-	}
-#endif
-}
-
-/*
- * Note: a response of 425 is not mentioned as a possible response to
- *	the PASV command in RFC959. However, it has been blessed as
- *	a legitimate response by Jon Postel in a telephone conversation
- *	with Rick Adams on 25 Jan 89.
- */
-void
-passive(void)
-{
-	int len;
-	char *p, *a;
-
-	pdata = socket(AF_INET, SOCK_STREAM, 0);
-	if (pdata < 0) {
-		perror_reply(425, "Can't open passive connection");
-		return;
-	}
-	pasv_addr = ctrl_addr;
-	pasv_addr.sin_port = 0;
-	seteuid((uid_t)0);
-	if (bind(pdata, (struct sockaddr *)&pasv_addr, sizeof(pasv_addr)) < 0) {
-		seteuid((uid_t)pw->pw_uid);
-		goto pasv_error;
-	}
-	seteuid((uid_t)pw->pw_uid);
-	len = sizeof(pasv_addr);
-	if (getsockname(pdata, (struct sockaddr *) &pasv_addr, &len) < 0)
-		goto pasv_error;
-	if (listen(pdata, 1) < 0)
-		goto pasv_error;
-	a = (char *) &pasv_addr.sin_addr;
-	p = (char *) &pasv_addr.sin_port;
-
-#define UC(b) (((int) b) & 0xff)
-
-	reply(227, "Entering Passive Mode (%d,%d,%d,%d,%d,%d)", UC(a[0]),
-		UC(a[1]), UC(a[2]), UC(a[3]), UC(p[0]), UC(p[1]));
-	return;
-
-pasv_error:
-	close(pdata);
-	pdata = -1;
-	perror_reply(425, "Can't open passive connection");
-	return;
-}
-
-/*
- * Generate unique name for file with basename "local".
- * The file named "local" is already known to exist.
- * Generates failure reply on error.
- */
-static char *
-gunique(char *local)
-{
-	static char new[MaxPathLen];
-	struct stat st;
-	int count;
-	char *cp;
-
-	cp = strrchr(local, '/');
-	if (cp)
-		*cp = '\0';
-	if (stat(cp ? local : ".", &st) < 0) {
-		perror_reply(553, cp ? local : ".");
-		return NULL;
-	}
-	if (cp)
-		*cp = '/';
-	for (count = 1; count < 100; count++) {
-		snprintf (new, sizeof(new), "%s.%d", local, count);
-		if (stat(new, &st) < 0)
-			return (new);
-	}
-	reply(452, "Unique file name cannot be created.");
-	return (NULL);
-}
-
-/*
- * Format and send reply containing system error number.
- */
-void
-perror_reply(int code, char *string)
-{
-	reply(code, "%s: %s.", string, strerror(errno));
-}
-
-static char *onefile[] = {
-	"",
-	0
-};
-
-void
-send_file_list(char *whichf)
-{
-  struct stat st;
-  DIR *dirp = NULL;
-  struct dirent *dir;
-  FILE *dout = NULL;
-  char **dirlist, *dirname;
-  int simple = 0;
-  int freeglob = 0;
-  glob_t gl;
-  char buf[MaxPathLen];
-
-  if (strpbrk(whichf, "~{[*?") != NULL) {
-    int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE;
-
-    memset(&gl, 0, sizeof(gl));
-    freeglob = 1;
-    if (glob(whichf, flags, 0, &gl)) {
-      reply(550, "not found");
-      goto out;
-    } else if (gl.gl_pathc == 0) {
-      errno = ENOENT;
-      perror_reply(550, whichf);
-      goto out;
-    }
-    dirlist = gl.gl_pathv;
-  } else {
-    onefile[0] = whichf;
-    dirlist = onefile;
-    simple = 1;
-  }
-
-  if (setjmp(urgcatch)) {
-    transflag = 0;
-    goto out;
-  }
-  while ((dirname = *dirlist++)) {
-    if (stat(dirname, &st) < 0) {
-      /*
-       * If user typed "ls -l", etc, and the client
-       * used NLST, do what the user meant.
-       */
-      if (dirname[0] == '-' && *dirlist == NULL &&
-	  transflag == 0) {
-	retrieve("/bin/ls %s", dirname);
-	goto out;
-      }
-      perror_reply(550, whichf);
-      if (dout != NULL) {
-	fclose(dout);
-	transflag = 0;
-	data = -1;
-	pdata = -1;
-      }
-      goto out;
-    }
-
-    if (S_ISREG(st.st_mode)) {
-      if (dout == NULL) {
-	dout = dataconn("file list", (off_t)-1, "w");
-	if (dout == NULL)
-	  goto out;
-	transflag++;
-      }
-      snprintf(buf, sizeof(buf), "%s%s\n", dirname,
-	      type == TYPE_A ? "\r" : "");
-      auth_write(fileno(dout), buf, strlen(buf));
-      byte_count += strlen(dirname) + 1;
-      continue;
-    } else if (!S_ISDIR(st.st_mode))
-      continue;
-
-    if ((dirp = opendir(dirname)) == NULL)
-      continue;
-
-    while ((dir = readdir(dirp)) != NULL) {
-      char nbuf[MaxPathLen];
-
-      if (!strcmp(dir->d_name, "."))
-	continue;
-      if (!strcmp(dir->d_name, ".."))
-	continue;
-
-      snprintf(nbuf, sizeof(nbuf), "%s/%s", dirname, dir->d_name);
-
-      /*
-       * We have to do a stat to insure it's
-       * not a directory or special file.
-       */
-      if (simple || (stat(nbuf, &st) == 0 &&
-		     S_ISREG(st.st_mode))) {
-	if (dout == NULL) {
-	  dout = dataconn("file list", (off_t)-1, "w");
-	  if (dout == NULL)
-	    goto out;
-	  transflag++;
-	}
-	if(strncmp(nbuf, "./", 2) == 0)
-	  snprintf(buf, sizeof(buf), "%s%s\n", nbuf +2,
-		   type == TYPE_A ? "\r" : "");
-	else
-	  snprintf(buf, sizeof(buf), "%s%s\n", nbuf,
-		   type == TYPE_A ? "\r" : "");
-	auth_write(fileno(dout), buf, strlen(buf));
-	byte_count += strlen(nbuf) + 1;
-      }
-    }
-    closedir(dirp);
-  }
-  if (dout == NULL)
-    reply(550, "No files found.");
-  else if (ferror(dout) != 0)
-    perror_reply(550, "Data connection");
-  else
-    reply(226, "Transfer complete.");
-
-  transflag = 0;
-  if (dout != NULL){
-    auth_write(fileno(dout), buf, 0); /* XXX flush */
-	    
-    fclose(dout);
-  }
-  data = -1;
-  pdata = -1;
-out:
-  if (freeglob) {
-    freeglob = 0;
-    globfree(&gl);
-  }
-}
-
-
-int
-find(char *pattern)
-{
-    char line[1024];
-    FILE *f;
-
-    snprintf(line, sizeof(line),
-	     "/bin/locate -d %s %s",
-	     ftp_rooted("/etc/locatedb"),
-	     pattern);
-    f = ftpd_popen(line, "r", 1, 1);
-    if(f == NULL){
-	perror_reply(550, "/bin/locate");
-	return 1;
-    }
-    lreply(200, "Output from find.");
-    while(fgets(line, sizeof(line), f)){
-	if(line[strlen(line)-1] == '\n')
-	    line[strlen(line)-1] = 0;
-	nreply("%s", line);
-    }
-    reply(200, "Done");
-    ftpd_pclose(f);
-    return 0;
-}
-
diff --git a/crypto/kerberosIV/appl/ftp/ftpd/kauth.c b/crypto/kerberosIV/appl/ftp/ftpd/kauth.c
deleted file mode 100644
index 02d23d65683b..000000000000
--- a/crypto/kerberosIV/appl/ftp/ftpd/kauth.c
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-RCSID("$Id: kauth.c,v 1.14 1997/05/07 02:21:30 assar Exp $");
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <time.h>
-#ifdef HAVE_SYS_TIME_H 
-#include <sys/time.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#include <roken.h>
-
-#include <des.h>
-#include <krb.h>
-#include <kafs.h>
-
-#include "extern.h"
-#include "krb4.h"
-#include "auth.h"
-#include "base64.h"
-
-static KTEXT_ST cip;
-static unsigned int lifetime;
-static time_t local_time;
-
-static krb_principal pr;
-
-static int
-save_tkt(char *user, char *instance, char *realm, void *arg, 
-	 int (*key_proc)(char*, char*, char*, void*, des_cblock*), KTEXT *cipp)
-{
-    local_time = time(0);
-    memmove(&cip, *cipp, sizeof(cip));
-    return -1;
-}
-
-static int
-store_ticket(KTEXT cip)
-{
-    char *ptr;
-    des_cblock session;
-    krb_principal sp;
-    unsigned char kvno;
-    KTEXT_ST tkt;
-    int left = cip->length;
-
-    int kerror;
-    
-    time_t kdc_time;
-
-    ptr = (char *) cip->dat;
-
-    /* extract session key */
-    memmove(session, ptr, 8);
-    ptr += 8;
-    left -= 8;
-
-    if (strnlen(ptr, left) == left)
-	return(INTK_BADPW);
-    
-    /* extract server's name */
-    strcpy(sp.name, ptr);
-    ptr += strlen(sp.name) + 1;
-    left -= strlen(sp.name) + 1;
-
-    if (strnlen(ptr, left) == left)
-	return(INTK_BADPW);
-
-    /* extract server's instance */
-    strcpy(sp.instance, ptr);
-    ptr += strlen(sp.instance) + 1;
-    left -= strlen(sp.instance) + 1;
-
-    if (strnlen(ptr, left) == left)
-	return(INTK_BADPW);
-
-    /* extract server's realm */
-    strcpy(sp.realm,ptr);
-    ptr += strlen(sp.realm) + 1;
-    left -= strlen(sp.realm) + 1;
-
-    if(left < 3)
-	return INTK_BADPW;
-    /* extract ticket lifetime, server key version, ticket length */
-    /* be sure to avoid sign extension on lifetime! */
-    lifetime = (unsigned char) ptr[0];
-    kvno = (unsigned char) ptr[1];
-    tkt.length = (unsigned char) ptr[2];
-    ptr += 3;
-    left -= 3;
-    
-    if (tkt.length > left)
-	return(INTK_BADPW);
-
-    /* extract ticket itself */
-    memmove(tkt.dat, ptr, tkt.length);
-    ptr += tkt.length;
-    left -= tkt.length;
-
-    /* Here is where the time should be verified against the KDC.
-     * Unfortunately everything is sent in host byte order (receiver
-     * makes wrong) , and at this stage there is no way for us to know
-     * which byteorder the KDC has. So we simply ignore the time,
-     * there are no security risks with this, the only thing that can
-     * happen is that we might receive a replayed ticket, which could
-     * at most be useless.
-     */
-    
-#if 0
-    /* check KDC time stamp */
-    memmove(&kdc_time, ptr, sizeof(kdc_time));
-    if (swap_bytes) swap_u_long(kdc_time);
-
-    ptr += 4;
-    
-    if (abs((int)(local_time - kdc_time)) > CLOCK_SKEW) {
-        return(RD_AP_TIME);		/* XXX should probably be better
-					   code */
-    }
-#endif
-
-    /* initialize ticket cache */
-
-    if (tf_create(TKT_FILE) != KSUCCESS)
-	return(INTK_ERR);
-
-    if (tf_put_pname(pr.name) != KSUCCESS ||
-	tf_put_pinst(pr.instance) != KSUCCESS) {
-	tf_close();
-	return(INTK_ERR);
-    }
-
-    
-    kerror = tf_save_cred(sp.name, sp.instance, sp.realm, session, 
-			  lifetime, kvno, &tkt, local_time);
-    tf_close();
-
-    return(kerror);
-}
-
-void kauth(char *principal, char *ticket)
-{
-    char *p;
-    int ret;
-  
-    ret = krb_parse_name(principal, &pr);
-    if(ret){
-	reply(500, "Bad principal: %s.", krb_get_err_text(ret));
-	return;
-    }
-    if(pr.realm[0] == 0)
-	krb_get_lrealm(pr.realm, 1);
-
-    if(ticket){
-	cip.length = base64_decode(ticket, &cip.dat);
-	if(cip.length == -1){
-	    reply(500, "Failed to decode data.");
-	    return;
-	}
-	ret = store_ticket(&cip);
-	if(ret){
-	    reply(500, "Kerberos error: %s.", krb_get_err_text(ret));
-	    memset(&cip, 0, sizeof(cip));
-	    return;
-	}
-	if(k_hasafs())
-	    k_afsklog(0, 0);
-	reply(200, "Tickets will be destroyed on exit.");
-	return;
-    }
-    
-    ret = krb_get_in_tkt (pr.name,
-			  pr.instance,
-			  pr.realm,
-			  KRB_TICKET_GRANTING_TICKET,
-			  pr.realm,
-			  DEFAULT_TKT_LIFE,
-			  NULL, save_tkt, NULL);
-    if(ret != INTK_BADPW){
-	reply(500, "Kerberos error: %s.", krb_get_err_text(ret));
-	return;
-    }
-    base64_encode(cip.dat, cip.length, &p);
-    reply(300, "P=%s T=%s", krb_unparse_name(&pr), p);
-    free(p);
-    memset(&cip, 0, sizeof(cip));
-}
-
-
-static char *
-short_date(int32_t dp)
-{
-    char *cp;
-    time_t t = (time_t)dp;
-
-    if (t == (time_t)(-1L)) return "***  Never  *** ";
-    cp = ctime(&t) + 4;
-    cp[15] = '\0';
-    return (cp);
-}
-
-void klist(void)
-{
-    int err;
-
-    char *file = tkt_string();
-
-    krb_principal pr;
-    
-    char buf1[128], buf2[128];
-    int header = 1;
-    CREDENTIALS c;
-
-    
-
-    err = tf_init(file, R_TKT_FIL);
-    if(err != KSUCCESS){
-	reply(500, "%s", krb_get_err_text(err));
-	return;
-    }
-    tf_close();
-
-    /* 
-     * We must find the realm of the ticket file here before calling
-     * tf_init because since the realm of the ticket file is not
-     * really stored in the principal section of the file, the
-     * routine we use must itself call tf_init and tf_close.
-     */
-    err = krb_get_tf_realm(file, pr.realm);
-    if(err != KSUCCESS){
-	reply(500, "%s", krb_get_err_text(err));
-	return;
-    }
-
-    err = tf_init(file, R_TKT_FIL);
-    if(err != KSUCCESS){
-	reply(500, "%s", krb_get_err_text(err));
-	return;
-    }
-
-    err = tf_get_pname(pr.name);
-    if(err != KSUCCESS){
-	reply(500, "%s", krb_get_err_text(err));
-	return;
-    }
-    err = tf_get_pinst(pr.instance);
-    if(err != KSUCCESS){
-	reply(500, "%s", krb_get_err_text(err));
-	return;
-    }
-
-    /* 
-     * You may think that this is the obvious place to get the
-     * realm of the ticket file, but it can't be done here as the
-     * routine to do this must open the ticket file.  This is why 
-     * it was done before tf_init.
-     */
-       
-    lreply(200, "Principal: %s", krb_unparse_name(&pr));
-    while ((err = tf_get_cred(&c)) == KSUCCESS) {
-	if (header) {
-	    lreply(200, "%-15s  %-15s  %s",
-		   "  Issued", "  Expires", "  Principal (kvno)");
-	    header = 0;
-	}
-	strcpy(buf1, short_date(c.issue_date));
-	c.issue_date = krb_life_to_time(c.issue_date, c.lifetime);
-	if (time(0) < (unsigned long) c.issue_date)
-	    strcpy(buf2, short_date(c.issue_date));
-	else
-	    strcpy(buf2, ">>> Expired <<< ");
-	lreply(200, "%s  %s  %s (%d)", buf1, buf2,
-	       krb_unparse_name_long(c.service, c.instance, c.realm), c.kvno); 
-    }
-    if (header && err == EOF) {
-	lreply(200, "No tickets in file.");
-    }
-    reply(200, "");
-}
diff --git a/crypto/kerberosIV/appl/ftp/ftpd/krb4.c b/crypto/kerberosIV/appl/ftp/ftpd/krb4.c
deleted file mode 100644
index 2457c61cc1fe..000000000000
--- a/crypto/kerberosIV/appl/ftp/ftpd/krb4.c
+++ /dev/null
@@ -1,372 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: krb4.c,v 1.19 1997/05/11 09:00:07 assar Exp $");
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_NETINET_IN_h
-#include <netinet/in.h>
-#endif
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <krb.h>
-
-#include "base64.h"
-#include "extern.h"
-#include "auth.h"
-#include "krb4.h"
-
-#include <roken.h>
-
-static AUTH_DAT auth_dat;
-static des_key_schedule schedule;
-
-int krb4_auth(char *auth)
-{
-    auth_complete = 0;
-    reply(334, "Using authentication type %s; ADAT must follow", auth);
-    return 0;
-}
-
-int krb4_adat(char *auth)
-{
-    KTEXT_ST tkt;
-    char *p;
-    int kerror;
-    u_int32_t cs;
-    char msg[35]; /* size of encrypted block */
-    int len;
-
-    char inst[INST_SZ];
-
-    memset(&tkt, 0, sizeof(tkt));
-    len = base64_decode(auth, tkt.dat);
-
-    if(len < 0){
-	reply(501, "Failed to decode base64 data.");
-	return -1;
-    }
-    tkt.length = len;
-
-    k_getsockinst(0, inst, sizeof(inst));
-    kerror = krb_rd_req(&tkt, "ftp", inst, 0, &auth_dat, "");
-    if(kerror == RD_AP_UNDEC){
-	k_getsockinst(0, inst, sizeof(inst));
-	kerror = krb_rd_req(&tkt, "rcmd", inst, 0, &auth_dat, "");
-    }
-
-    if(kerror){
-	reply(535, "Error reading request: %s.", krb_get_err_text(kerror));
-	return -1;
-    }
-  
-    des_set_key(&auth_dat.session, schedule);
-
-    cs = auth_dat.checksum + 1;
-    {
-	unsigned char tmp[4];
-	tmp[0] = (cs >> 24) & 0xff;
-	tmp[1] = (cs >> 16) & 0xff;
-	tmp[2] = (cs >> 8) & 0xff;
-	tmp[3] = cs & 0xff;
-	len = krb_mk_safe(tmp, msg, 4, &auth_dat.session, 
-			  &ctrl_addr, &his_addr);
-    }
-    if(len < 0){
-	reply(535, "Error creating reply: %s.", strerror(errno));
-	return -1;
-    }
-    base64_encode(msg, len, &p);
-    reply(235, "ADAT=%s", p);
-    auth_complete = 1;
-    free(p);
-    return 0;
-}
-
-int krb4_pbsz(int size)
-{
-    if(size > 1048576) /* XXX arbitrary number */
-	size = 1048576;
-    buffer_size = size;
-    reply(200, "OK PBSZ=%d", buffer_size);
-    return 0;
-}
-
-int krb4_prot(int level)
-{
-    if(level == prot_confidential)
-	return -1;
-    return 0;
-}
-
-int krb4_ccc(void)
-{
-    reply(534, "Don't event think about it.");
-    return -1;
-}
-
-int krb4_mic(char *msg)
-{
-    int len;
-    int kerror;
-    MSG_DAT m_data;
-    char *tmp, *cmd;
-  
-    cmd = strdup(msg);
-    
-    len = base64_decode(msg, cmd);
-    if(len < 0){
-	reply(501, "Failed to decode base 64 data.");
-	free(cmd);
-	return -1;
-    }
-    kerror = krb_rd_safe(cmd, len, &auth_dat.session, 
-			 &his_addr, &ctrl_addr, &m_data);
-
-    if(kerror){
-	reply(535, "Error reading request: %s.", krb_get_err_text(kerror));
-	free(cmd);
-	return -1;
-    }
-    
-    tmp = malloc(strlen(msg) + 1);
-    snprintf(tmp, strlen(msg) + 1, "%.*s", (int)m_data.app_length, m_data.app_data);
-    if(!strstr(tmp, "\r\n"))
-	strcat(tmp, "\r\n");
-    new_ftp_command(tmp);
-    free(cmd);
-    return 0;
-}
-
-int krb4_conf(char *msg)
-{
-    prot_level = prot_safe;
-
-    reply(537, "Protection level not supported.");
-    return -1;
-}
-
-int krb4_enc(char *msg)
-{
-    int len;
-    int kerror;
-    MSG_DAT m_data;
-    char *tmp, *cmd;
-  
-    cmd = strdup(msg);
-    
-    len = base64_decode(msg, cmd);
-    if(len < 0){
-	reply(501, "Failed to decode base 64 data.");
-	free(cmd);
-	return -1;
-    }
-    kerror = krb_rd_priv(cmd, len, schedule, &auth_dat.session, 
-			 &his_addr, &ctrl_addr, &m_data);
-
-    if(kerror){
-	reply(535, "Error reading request: %s.", krb_get_err_text(kerror));
-	free(cmd);
-	return -1;
-    }
-    
-    tmp = strdup(msg);
-    snprintf(tmp, strlen(msg) + 1, "%.*s", (int)m_data.app_length, m_data.app_data);
-    if(!strstr(tmp, "\r\n"))
-	strcat(tmp, "\r\n");
-    new_ftp_command(tmp);
-    free(cmd);
-    return 0;
-}
-
-int krb4_read(int fd, void *data, int length)
-{
-    static int left;
-    static char *extra;
-    static int eof;
-    int len, bytes, tx = 0;
-    
-    MSG_DAT m_data;
-    int kerror;
-
-    if(eof){ /* if we haven't reported an end-of-file, do so */
-	eof = 0;
-	return 0;
-    }
-    
-    if(left){
-	if(length > left)
-	    bytes = left;
-	else
-	    bytes = length;
-	memmove(data, extra, bytes);
-	left -= bytes;
-	if(left)
-	    memmove(extra, extra + bytes, left);
-	else
-	    free(extra);
-	length -= bytes;
-	tx += bytes;
-    }
-
-    while(length){
-	unsigned char tmp[4];
-	if(krb_net_read(fd, tmp, 4) < 4){
-	    reply(400, "Unexpected end of file.\n");
-	    return -1;
-	}
-	len = (tmp[0] << 24) | (tmp[1] << 16) | (tmp[2] << 8) | tmp[3];
-	krb_net_read(fd, data_buffer, len);
-	if(data_protection == prot_safe)
-	    kerror = krb_rd_safe(data_buffer, len, &auth_dat.session, 
-				 &his_addr, &ctrl_addr, &m_data);
-	else
-	    kerror = krb_rd_priv(data_buffer, len, schedule, &auth_dat.session,
-				 &his_addr, &ctrl_addr, &m_data);
-	
-	if(kerror){
-	    reply(400, "Failed to read data: %s.", krb_get_err_text(kerror));
-	    return -1;
-	}
-	
-	bytes = m_data.app_length;
-	if(bytes == 0){
-	    if(tx) eof = 1;
-	    return  tx;
-	}
-	if(bytes > length){
-	    left = bytes - length;
-	    bytes = length;
-	    extra = malloc(left);
-	    memmove(extra, m_data.app_data + bytes, left);
-	}
-	memmove((unsigned char*)data + tx, m_data.app_data, bytes);
-	tx += bytes;
-	length -= bytes;
-    }
-    return tx;
-}
-
-int krb4_write(int fd, void *data, int length)
-{
-    int len, bytes, tx = 0;
-
-    len = buffer_size;
-    if(data_protection == prot_safe)
-	len -= 31; /* always 31 bytes overhead */
-    else
-	len -= 26; /* at most 26 bytes */
-    
-    do{
-	if(length < len)
-	    len = length;
-	if(data_protection == prot_safe)
-	    bytes = krb_mk_safe(data, data_buffer+4, len, &auth_dat.session,
-				&ctrl_addr, &his_addr);
-	else
-	    bytes = krb_mk_priv(data, data_buffer+4, len, schedule, 
-				&auth_dat.session,
-				&ctrl_addr, &his_addr);
-	if(bytes == -1){
-	    reply(535, "Failed to make packet: %s.", strerror(errno));
-	    return -1;
-	}
-	data_buffer[0] = (bytes >> 24) & 0xff;
-	data_buffer[1] = (bytes >> 16) & 0xff;
-	data_buffer[2] = (bytes >> 8) & 0xff;
-	data_buffer[3] = bytes & 0xff;
-	if(krb_net_write(fd, data_buffer, bytes+4) < 0)
-	    return -1;
-	length -= len;
-	data = (unsigned char*)data + len;
-	tx += len;
-    }while(length);
-    return tx;
-}
-
-int krb4_userok(char *name)
-{
-    if(!kuserok(&auth_dat, name)){
-	do_login(232, name);
-    }else{
-	reply(530, "User %s access denied.", name);
-    }
-    return 0;
-}
-
-
-int
-krb4_vprintf(const char *fmt, va_list ap)
-{
-    char buf[10240];
-    char *p;
-    char *enc;
-    int code;
-    int len;
-  
-    vsnprintf (buf, sizeof(buf), fmt, ap);
-    enc = malloc(strlen(buf) + 31);
-    if(prot_level == prot_safe){
-	len = krb_mk_safe((u_char*)buf, (u_char*)enc, strlen(buf), &auth_dat.session, 
-			  &ctrl_addr, &his_addr); 
-	code = 631;
-    }else if(prot_level == prot_private){
-	len = krb_mk_priv((u_char*)buf, (u_char*)enc, strlen(buf), schedule, 
-			  &auth_dat.session, &ctrl_addr, &his_addr); 
-	code = 632;
-    }else{
-	len = 0; /* XXX */
-	code = 631;
-    }
-    base64_encode(enc, len, &p);
-    fprintf(stdout, "%d %s\r\n", code, p);
-    free(enc);
-    free(p);
-    return 0;
-}
diff --git a/crypto/kerberosIV/appl/ftp/ftpd/krb4.h b/crypto/kerberosIV/appl/ftp/ftpd/krb4.h
deleted file mode 100644
index f777dbd5c2a9..000000000000
--- a/crypto/kerberosIV/appl/ftp/ftpd/krb4.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id: krb4.h,v 1.6 1997/04/01 08:17:29 joda Exp $ */
-
-#ifndef __KRB4_H__
-#define __KRB4_H__
-
-#include <stdarg.h>
-
-int krb4_auth(char *auth);
-int krb4_adat(char *auth);
-int krb4_pbsz(int size);
-int krb4_prot(int level);
-int krb4_ccc(void);
-int krb4_mic(char *msg);
-int krb4_conf(char *msg);
-int krb4_enc(char *msg);
-
-int krb4_read(int fd, void *data, int length);
-int krb4_write(int fd, void *data, int length);
-
-int krb4_userok(char *name);
-int krb4_vprintf(const char *fmt, va_list ap);
-
-#endif /* __KRB4_H__ */
diff --git a/crypto/kerberosIV/appl/ftp/ftpd/logwtmp.c b/crypto/kerberosIV/appl/ftp/ftpd/logwtmp.c
deleted file mode 100644
index 95ab216a1718..000000000000
--- a/crypto/kerberosIV/appl/ftp/ftpd/logwtmp.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: logwtmp.c,v 1.10 1997/05/25 15:17:56 assar Exp $");
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#elif defined(HAVE_SYS_TIME_H)
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#ifdef HAVE_UTMP_H
-#include <utmp.h>
-#endif
-#ifdef HAVE_UTMPX_H
-#include <utmpx.h>
-#endif
-#include "extern.h"
-
-#ifndef WTMP_FILE
-#ifdef _PATH_WTMP
-#define WTMP_FILE _PATH_WTMP
-#else
-#define WTMP_FILE "/var/adm/wtmp"
-#endif
-#endif
-
-void
-logwtmp(char *line, char *name, char *host)
-{
-    static int init = 0;
-    static int fd, fdx;
-    struct timeval tv;
-    struct utmp ut;
-#ifdef WTMPX_FILE
-    struct utmpx utx;
-#endif
-
-    memset(&ut, 0, sizeof(struct utmp));
-#ifdef HAVE_UT_TYPE
-    if(name[0])
-	ut.ut_type = USER_PROCESS;
-    else
-	ut.ut_type = DEAD_PROCESS;
-#endif
-    strncpy(ut.ut_line, line, sizeof(ut.ut_line));
-    strncpy(ut.ut_name, name, sizeof(ut.ut_name));
-#ifdef HAVE_UT_PID
-    ut.ut_pid = getpid();
-#endif
-#ifdef HAVE_UT_HOST
-    strncpy(ut.ut_host, host, sizeof(ut.ut_host));
-#endif
-    ut.ut_time = time(NULL);
-
-#ifdef WTMPX_FILE
-    strncpy(utx.ut_line, line, sizeof(utx.ut_line));
-    strncpy(utx.ut_user, name, sizeof(utx.ut_user));
-    strncpy(utx.ut_host, host, sizeof(utx.ut_host));
-#ifdef HAVE_UT_SYSLEN
-    utx.ut_syslen = strlen(host) + 1;
-    if (utx.ut_syslen > sizeof(utx.ut_host))
-        utx.ut_syslen = sizeof(utx.ut_host);
-#endif
-    gettimeofday (&tv, 0);
-    utx.ut_tv.tv_sec = tv.tv_sec;
-    utx.ut_tv.tv_usec = tv.tv_usec;
-
-    if(name[0])
-	utx.ut_type = USER_PROCESS;
-    else
-	utx.ut_type = DEAD_PROCESS;
-#endif
-
-    if(!init){
-	fd = open(WTMP_FILE, O_WRONLY|O_APPEND, 0);
-#ifdef WTMPX_FILE
-	fdx = open(WTMPX_FILE, O_WRONLY|O_APPEND, 0);
-#endif
-	init = 1;
-    }
-    if(fd >= 0) {
-	write(fd, &ut, sizeof(struct utmp)); /* XXX */
-#ifdef WTMPX_FILE
-	write(fdx, &utx, sizeof(struct utmpx));
-#endif	
-    }
-}
diff --git a/crypto/kerberosIV/appl/ftp/ftpd/pathnames.h b/crypto/kerberosIV/appl/ftp/ftpd/pathnames.h
deleted file mode 100644
index 1bd2be1a1efa..000000000000
--- a/crypto/kerberosIV/appl/ftp/ftpd/pathnames.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)pathnames.h	8.1 (Berkeley) 6/4/93
- */
-
-#ifdef HAVE_PATHS_H
-#include <paths.h>
-#endif
-
-#ifndef _PATH_DEVNULL
-#define _PATH_DEVNULL "/dev/null"
-#endif
-
-#ifndef _PATH_NOLOGIN
-#define _PATH_NOLOGIN "/etc/nologin"
-#endif
-
-#ifndef _PATH_BSHELL
-#define _PATH_BSHELL "/bin/sh"
-#endif
-
-#define	_PATH_FTPUSERS		"/etc/ftpusers"
-#define	_PATH_FTPCHROOT		"/etc/ftpchroot"
-#define	_PATH_FTPWELCOME	"/etc/ftpwelcome"
-#define	_PATH_FTPLOGINMESG	"/etc/motd"
diff --git a/crypto/kerberosIV/appl/ftp/ftpd/popen.c b/crypto/kerberosIV/appl/ftp/ftpd/popen.c
deleted file mode 100644
index 58c4985a0b90..000000000000
--- a/crypto/kerberosIV/appl/ftp/ftpd/popen.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Copyright (c) 1988, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software written by Ken Arnold and
- * published in UNIX Review, Vol. 6, No. 8.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: popen.c,v 1.16 1997/06/01 03:14:06 assar Exp $");
-#endif
-
-#include <sys/types.h>
-#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#elif defined(HAVE_SYS_TIME_H)
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif
-#include <sys/wait.h>
-
-#include <errno.h>
-#include <glob.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "extern.h"
-
-#include <roken.h>
-
-/* 
- * Special version of popen which avoids call to shell.  This ensures
- * no one may create a pipe to a hidden program as a side effect of a
- * list or dir command.
- */
-static int *pids;
-static int fds;
-
-extern int dochroot;
-
-/* return path prepended with ~ftp if that file exists, otherwise
- * return path unchanged
- */
-
-const char *
-ftp_rooted(const char *path)
-{
-    static char home[MaxPathLen] = "";
-    static char newpath[MaxPathLen];
-    struct passwd *pwd;
-
-    if(!home[0])
-	if((pwd = k_getpwnam("ftp")))
-	    strcpy(home, pwd->pw_dir);
-    snprintf(newpath, sizeof(newpath), "%s/%s", home, path);
-    if(access(newpath, X_OK))
-	strcpy(newpath, path);
-    return newpath;
-}
-
-
-FILE *
-ftpd_popen(char *program, char *type, int do_stderr, int no_glob)
-{
-	char *cp;
-	FILE *iop;
-	int argc, gargc, pdes[2], pid;
-	char **pop, *argv[100], *gargv[1000];
-	char *foo;
-
-	if (strcmp(type, "r") && strcmp(type, "w"))
-		return (NULL);
-
-	if (!pids) {
-
-	    /* This function is ugly and should be rewritten, in
-	     * modern unices there is no such thing as a maximum
-	     * filedescriptor.
-	     */
-
-	    fds = getdtablesize();
-	    pids = (int*)calloc(fds, sizeof(int));
-	    if(!pids)
-		return NULL;
-	}
-	if (pipe(pdes) < 0)
-		return (NULL);
-
-	/* break up string into pieces */
-	for (argc = 0, cp = program;; cp = NULL) {
-		foo = NULL;
-		if (!(argv[argc++] = strtok_r(cp, " \t\n", &foo)))
-			break;
-	}
-
-	gargv[0] = (char*)ftp_rooted(argv[0]);
-	/* glob each piece */
-	for (gargc = argc = 1; argv[argc]; argc++) {
-		glob_t gl;
-		int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE;
-
-		memset(&gl, 0, sizeof(gl));
-		if (no_glob || glob(argv[argc], flags, NULL, &gl))
-			gargv[gargc++] = strdup(argv[argc]);
-		else
-			for (pop = gl.gl_pathv; *pop; pop++)
-				gargv[gargc++] = strdup(*pop);
-		globfree(&gl);
-	}
-	gargv[gargc] = NULL;
-
-	iop = NULL;
-	switch(pid = fork()) {
-	case -1:			/* error */
-		close(pdes[0]);
-		close(pdes[1]);
-		goto pfree;
-		/* NOTREACHED */
-	case 0:				/* child */
-		if (*type == 'r') {
-			if (pdes[1] != STDOUT_FILENO) {
-				dup2(pdes[1], STDOUT_FILENO);
-				close(pdes[1]);
-			}
-			if(do_stderr)
-			    dup2(STDOUT_FILENO, STDERR_FILENO);
-			close(pdes[0]);
-		} else {
-			if (pdes[0] != STDIN_FILENO) {
-				dup2(pdes[0], STDIN_FILENO);
-				close(pdes[0]);
-			}
-			close(pdes[1]);
-		}
-		execv(gargv[0], gargv);
-		gargv[0] = argv[0];
-		execv(gargv[0], gargv);
-		_exit(1);
-	}
-	/* parent; assume fdopen can't fail...  */
-	if (*type == 'r') {
-		iop = fdopen(pdes[0], type);
-		close(pdes[1]);
-	} else {
-		iop = fdopen(pdes[1], type);
-		close(pdes[0]);
-	}
-	pids[fileno(iop)] = pid;
-	
-pfree:	
-	for (argc = 1; gargv[argc] != NULL; argc++)
-	    free(gargv[argc]);
-
-
-	return (iop);
-}
-
-int
-ftpd_pclose(FILE *iop)
-{
-	int fdes, status;
-	pid_t pid;
-	sigset_t sigset, osigset;
-
-	/*
-	 * pclose returns -1 if stream is not associated with a
-	 * `popened' command, or, if already `pclosed'.
-	 */
-	if (pids == 0 || pids[fdes = fileno(iop)] == 0)
-		return (-1);
-	fclose(iop);
-	sigemptyset(&sigset);
-	sigaddset(&sigset, SIGINT);
-	sigaddset(&sigset, SIGQUIT);
-	sigaddset(&sigset, SIGHUP);
-	sigprocmask(SIG_BLOCK, &sigset, &osigset);
-	while ((pid = waitpid(pids[fdes], &status, 0)) < 0 && errno == EINTR)
-		continue;
-	sigprocmask(SIG_SETMASK, &osigset, NULL);
-	pids[fdes] = 0;
-	if (pid < 0)
-		return (pid);
-	if (WIFEXITED(status))
-		return (WEXITSTATUS(status));
-	return (1);
-}
diff --git a/crypto/kerberosIV/appl/kauth/Makefile.in b/crypto/kerberosIV/appl/kauth/Makefile.in
deleted file mode 100644
index 97bfdb42edf7..000000000000
--- a/crypto/kerberosIV/appl/kauth/Makefile.in
+++ /dev/null
@@ -1,112 +0,0 @@
-# $Id: Makefile.in,v 1.33 1997/04/05 21:24:35 assar Exp $
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-topdir = ../..
-
-CC = @CC@
-AR = ar
-RANLIB = @RANLIB@
-DEFS = @DEFS@ -DBINDIR='"$(bindir)"'
-CFLAGS = @CFLAGS@
-LD_FLAGS = @LD_FLAGS@
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-LIBS = @LIBS@
-MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-libdir = @libdir@
-libexecdir = @libexecdir@
-bindir = @bindir@
-transform=@program_transform_name@
-EXECSUFFIX=@EXECSUFFIX@
-
-PROG_BIN	= kauth$(EXECSUFFIX) ksrvtgt
-PROG_LIBEXEC	= kauthd$(EXECSUFFIX)
-PROGS = $(PROG_BIN) $(PROG_LIBEXEC)
-
-SOURCES_KAUTH  = kauth.c rkinit.c
-SOURCES_KAUTHD = kauthd.c
-SOURCES_COMMON = encdata.c marshall.c
-
-OBJECTS_KAUTH  = kauth.o rkinit.o
-OBJECTS_KAUTHD = kauthd.o
-OBJECTS_COMMON = marshall.o encdata.o
-
-OBJECTS = $(OBJECTS_KAUTH) $(OBJECTS_KAUTHD)
-SOURCES = $(SOURCES_KAUTH) $(SOURCES_KAUTHD) $(SOURCES_COMMON)
-
-KRB_KAFS_LIB = @KRB_KAFS_LIB@
-
-all: $(PROGS)
-
-Wall:
-	make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $<
-
-install: all
-	$(MKINSTALLDIRS) $(bindir) $(libexecdir)
-	for x in $(PROG_BIN); do \
-	  $(INSTALL_PROGRAM) $$x $(bindir)/`echo $$x| sed '$(transform)'`; \
-	done
-	if test -f $(bindir)/zrefresh -o -r  $(bindir)/zrefresh; then \
-	  true; \
-	else \
-	  $(INSTALL_PROGRAM) $(srcdir)/zrefresh $(bindir)/`echo zrefresh | sed '$(transform)'`; \
-	fi
-	for x in $(PROG_LIBEXEC); do \
-	  $(INSTALL_PROGRAM) $$x $(libexecdir)/`echo $$x| sed '$(transform)'`; \
-	done
-
-uninstall:
-	for x in $(PROG_BIN); do \
-	  rm -f $(bindir)/`echo $$x| sed '$(transform)'`; \
-	done
-	for x in $(PROG_LIBEXEC); do \
-	  rm -f $(libexecdir)/`echo $$x| sed '$(transform)'`; \
-	done
-
-TAGS: $(SOURCES)
-	etags $(SOURCES)
-
-check:
-
-clean:
-	rm -f *.a *.o $(PROGS)
-
-mostlyclean: clean
-
-distclean: clean
-	rm -f Makefile *.tab.c *~
-
-realclean: distclean
-	rm -f TAGS
-
-dist: $(DISTFILES)
-	for file in $(DISTFILES); do \
-	  ln $$file ../`cat ../.fname`/lib \
-	    || cp -p $$file ../`cat ../.fname`/lib; \
-	done
-
-KLIB=-L../../lib/krb -lkrb -L../../lib/des -ldes
-LIBROKEN=-L../../lib/roken -lroken
-
-kauth$(EXECSUFFIX): $(OBJECTS_KAUTH) $(OBJECTS_COMMON)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_KAUTH) $(OBJECTS_COMMON) $(KRB_KAFS_LIB) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
-
-kauthd$(EXECSUFFIX): $(OBJECTS_KAUTHD) $(OBJECTS_COMMON)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_KAUTHD) $(OBJECTS_COMMON) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
-
-ksrvtgt: ksrvtgt.in
-	sed -e "s!%bindir%!$(bindir)!" $(srcdir)/ksrvtgt.in > $@
-	chmod +x $@
-
-
-$(OBJECTS): ../../include/config.h
diff --git a/crypto/kerberosIV/appl/kauth/encdata.c b/crypto/kerberosIV/appl/kauth/encdata.c
deleted file mode 100644
index 800326a4fc83..000000000000
--- a/crypto/kerberosIV/appl/kauth/encdata.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "kauth.h"
-
-RCSID("$Id: encdata.c,v 1.9 1997/04/01 08:17:30 joda Exp $");
-
-int
-write_encrypted (int fd, void *buf, size_t len, des_key_schedule schedule,
-		 des_cblock *session, struct sockaddr_in *me,
-		 struct sockaddr_in *him)
-{
-     void *outbuf;
-     int32_t outlen, l;
-     int i;
-     unsigned char tmp[4];
-
-     outbuf = malloc(len + 30);
-     if (outbuf == NULL)
-	  return -1;
-     outlen = krb_mk_priv (buf, outbuf, len, schedule, session, me, him);
-     if (outlen < 0) {
-	  free(outbuf);
-	  return -1;
-     }
-     l = outlen;
-     for(i = 3; i >= 0; i--, l = l >> 8)
-	 tmp[i] = l & 0xff;
-     if (krb_net_write (fd, tmp, 4) != 4 ||
-	 krb_net_write (fd, outbuf, outlen) != outlen) {
-	  free(outbuf);
-	  return -1;
-     }
-     
-     free(outbuf);
-     return 0;
-}
-
-
-int
-read_encrypted (int fd, void *buf, size_t len, void **ret,
-		des_key_schedule schedule, des_cblock *session,
-		struct sockaddr_in *him, struct sockaddr_in *me)
-{
-     int status;
-     int32_t l;
-     MSG_DAT msg;
-     unsigned char tmp[4];
-
-     l = krb_net_read (fd, tmp, 4);
-     if (l != 4)
-	 return l;
-     l = (tmp[0] << 24) | (tmp[1] << 16) | (tmp[2] << 8) | tmp[3];
-     if (l > len)
-	  return -1;
-     if (krb_net_read (fd, buf, l) != l)
-	  return -1;
-     status = krb_rd_priv (buf, l, schedule, session, him, me, &msg);
-     if (status != RD_AP_OK) {
-	  fprintf (stderr, "read_encrypted: %s\n",
-		   krb_get_err_text(status));
-	  return -1;
-     }
-     *ret  = msg.app_data;
-     return  msg.app_length;
-}
diff --git a/crypto/kerberosIV/appl/kauth/kauth.c b/crypto/kerberosIV/appl/kauth/kauth.c
deleted file mode 100644
index 84614b048e4f..000000000000
--- a/crypto/kerberosIV/appl/kauth/kauth.c
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Little program that reads an srvtab or password and
- * creates a suitable ticketfile and associated AFS tokens.
- *
- * If an optional command is given the command is executed in a
- * new PAG and when the command exits the tickets are destroyed.
- */
-
-#include "kauth.h"
-
-RCSID("$Id: kauth.c,v 1.75 1997/05/02 15:09:24 assar Exp $");
-
-krb_principal princ;
-static char srvtab[MaxPathLen + 1];
-static int lifetime = DEFAULT_TKT_LIFE;
-static char remote_tktfile[MaxPathLen + 1];
-static char remoteuser[100];
-static char *cell = 0;
-
-static void
-usage(void)
-{
-    fprintf(stderr,
-	    "Usage: %s [-n <name>] [-r remoteuser] [-t remote ticketfile]"
-	    "[-l lifetime (in minutes) ] [-h hosts... ]"
-	    "[-f srvtab ] [-c AFS cell name ] [command ... ]\n",
-	    __progname);
-    fprintf(stderr, "\nA fully qualified name can be given user[.instance][@realm]\nRealm is converted to uppercase!\n");
-    exit(1);
-}
-
-static void
-doexec(int argc, char **argv)
-{
-    int status;
-    pid_t ret;
-
-    switch (fork()) {
-    case -1:
-	err (1, "fork");
-	break;
-    case 0:
-	/* in child */
-	execvp(argv[0], argv);
-	err (1, "Can't exec program ``%s''", argv[0]);
-	break;
-    default:
-	/* in parent */
-	do {
-	    ret = wait(&status);
-	} while ((ret > 0 && !WIFEXITED(status)) || (ret < 0 && errno == EINTR));
-	if (ret < 0)
-	    perror("wait");
-	dest_tkt();
-	if (k_hasafs())
-	    k_unlog();	 
-	break;
-    }
-}
-
-static RETSIGTYPE
-renew(int sig)
-{
-    int code;
-
-    signal(SIGALRM, renew);
-
-    code = krb_get_svc_in_tkt(princ.name, princ.instance, princ.realm,
-			      KRB_TICKET_GRANTING_TICKET,
-			      princ.realm, lifetime, srvtab);
-    if (code)
-	warnx ("%s", krb_get_err_text(code));
-    else if (k_hasafs())
-	{
-	    if ((code = k_afsklog(cell, NULL)) != 0 && code != KDC_PR_UNKNOWN) {
-		warnx ("%s", krb_get_err_text(code));
-	    }
-	}
-
-    alarm(krb_life_to_time(0, lifetime)/2 - 60);
-    SIGRETURN(0);
-}
-
-static int
-zrefresh(void)
-{
-    switch (fork()) {
-    case -1:
-	err (1, "Warning: Failed to fork zrefresh");
-	return -1;
-    case 0:
-	/* Child */
-	execlp("zrefresh", "zrefresh", 0);
-	execl(BINDIR "/zrefresh", "zrefresh", 0);
-	exit(1);
-    default:
-	/* Parent */
-	break;
-    }
-    return 0;
-}
-
-static int
-key_to_key(char *user, char *instance, char *realm, void *arg,
-	   des_cblock *key)
-{
-    memcpy(key, arg, sizeof(des_cblock));
-    return 0;
-}
-
-int
-main(int argc, char **argv)
-{
-    int code, more_args;
-    int ret;
-    int c;
-    char *file;
-    int pflag = 0;
-    char passwd[100];
-    des_cblock key;
-    char **host;
-    int nhost;
-    char tf[MaxPathLen];
-
-    set_progname (argv[0]);
-
-    if ((file =  getenv("KRBTKFILE")) == 0)
-	file = TKT_FILE;  
-
-    memset(&princ, 0, sizeof(princ));
-    memset(srvtab, 0, sizeof(srvtab));
-    *remoteuser = '\0';
-    nhost = 0;
-  
-    while ((c = getopt(argc, argv, "r:t:f:hl:n:c:")) != EOF)
-	switch (c) {
-	case 'f':
-	    strncpy(srvtab, optarg, sizeof(srvtab));
-	    break;
-	case 't':
-	    strncpy(remote_tktfile, optarg, sizeof(remote_tktfile));
-	    break;
-	case 'r':
-	    strncpy(remoteuser, optarg, sizeof(remoteuser));
-	    break;
-	case 'l':
-	    lifetime = atoi(optarg);
-	    if (lifetime == -1)
-		lifetime = 255;
-	    else if (lifetime < 5)
-		lifetime = 1;
-	    else
-		lifetime = krb_time_to_life(0, lifetime*60);
-	    if (lifetime > 255)
-		lifetime = 255;
-	    break;
-	case 'n':
-	    if ((code = krb_parse_name(optarg, &princ)) != 0) {
-		warnx ("%s", krb_get_err_text(code));
-		usage();
-	    }
-	    strupr(princ.realm);
-	    pflag = 1;
-	    break;
-	case 'c':
-	    cell = optarg;
-	    break;
-	case 'h':
-	    host = argv + optind;
-	    for(nhost = 0; optind < argc && *argv[optind] != '-'; ++optind)
-		++nhost;
-	    break;
-	case '?':
-	default:
-	    usage();
-	    break;
-	}
-  
-    /* Look for kerberos name */
-    if (!pflag && optind < argc && krb_parse_name(argv[optind], &princ) == 0) {
-	++optind;	 
-	strupr(princ.realm);
-    }
-
-    if (princ.name[0] == '\0' && krb_get_default_principal (princ.name, 
-							    princ.instance, 
-							    princ.realm) < 0)
-	errx (1, "Could not get default principal");
-  
-    if (*remoteuser == '\0')
-	strcpy (remoteuser, princ.name);
-
-    more_args = argc - optind;
-  
-    if (princ.realm[0] == '\0')
-	if (krb_get_lrealm(princ.realm, 1) != KSUCCESS)
-	    strcpy(princ.realm, KRB_REALM);
-  
-    if (more_args) {
-	int f;
-      
-	do{
-	    snprintf(tf, sizeof(tf),
-		     TKT_ROOT "%u_%u",
-		     (unsigned)getuid(),
-		     (unsigned)(getpid()*time(0)));
-	    f = open(tf, O_CREAT|O_EXCL|O_RDWR);
-	}while(f < 0);
-	close(f);
-	unlink(tf);
-	setenv("KRBTKFILE", tf, 1);
-	krb_set_tkt_string (tf);
-    }
-    
-    if (srvtab[0])
-	{
-	    signal(SIGALRM, renew);
-
-	    code = read_service_key (princ.name, princ.instance, princ.realm, 0, 
-				     srvtab, (char *)&key);
-	    if (code == KSUCCESS)
-		code = krb_get_in_tkt(princ.name, princ.instance, princ.realm,
-				      KRB_TICKET_GRANTING_TICKET,
-				      princ.realm, lifetime,
-				      key_to_key, NULL, key);
-	    alarm(krb_life_to_time(0, lifetime)/2 - 60);
-	}
-    else {
-	char prompt[128];
-	  
-	snprintf(prompt, sizeof(prompt), "%s's Password: ", krb_unparse_name(&princ));
-	if (des_read_pw_string(passwd, sizeof(passwd)-1, prompt, 0)){
-	    memset(passwd, 0, sizeof(passwd));
-	    exit(1);
-	}
-	des_string_to_key (passwd, &key);
-	code = krb_get_in_tkt (princ.name, princ.instance, princ.realm,
-			       KRB_TICKET_GRANTING_TICKET,
-			       princ.realm, lifetime,
-			       key_to_key, NULL, key);
-	if(code == INTK_BADPW) {
-	    afs_string_to_key (passwd, princ.realm, &key);
-	    code = krb_get_in_tkt (princ.name, princ.instance, princ.realm,
-				   KRB_TICKET_GRANTING_TICKET,
-				   princ.realm, lifetime,
-				   key_to_key, NULL, key);
-	}
-	memset(passwd, 0, sizeof(passwd));
-    }
-    if (code) {
-	memset (key, 0, sizeof(key));
-	errx (1, "%s", krb_get_err_text(code));
-    }
-
-    if (k_hasafs()) {
-	if (more_args)
-	    k_setpag();
-	if ((code = k_afsklog(cell, NULL)) != 0 && code != KDC_PR_UNKNOWN)
-	    warnx ("%s", krb_get_err_text(code));
-    }
-
-    for(ret = 0; nhost-- > 0; host++)
-	ret += rkinit(&princ, lifetime, remoteuser, remote_tktfile, &key, *host);
-  
-    if (ret)
-	return ret;
-
-    if (more_args)
-	doexec(more_args, &argv[optind]);
-    else
-	zrefresh();
-  
-    return 0;
-}
diff --git a/crypto/kerberosIV/appl/kauth/kauth.h b/crypto/kerberosIV/appl/kauth/kauth.h
deleted file mode 100644
index 2c48fcc7e327..000000000000
--- a/crypto/kerberosIV/appl/kauth/kauth.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id: kauth.h,v 1.18 1997/05/20 18:40:31 bg Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-#include <signal.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <errno.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_PWD_H
-#include <pwd.h>
-#endif
-#ifdef HAVE_GRP_H
-#include <grp.h>
-#endif
-
-#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#elif defined(HAVE_SYS_TIME_H)
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif /* HAVE_SYS_RESOURCE_H */
-#ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#ifdef SOCKS
-#include <socks.h>
-#endif
-
-#include <err.h>
-
-#include <krb.h>
-#include <kafs.h>
-
-#include <roken.h>
-
-#define KAUTH_PORT 2120
-
-#define KAUTH_VERSION "RKINIT.0"
-
-int rkinit (krb_principal*, int, char*, char*, des_cblock*, char*);
-
-int write_encrypted (int, void*, size_t, des_key_schedule,
-		     des_cblock*, struct sockaddr_in*, struct sockaddr_in*);
-
-int read_encrypted (int, void*, size_t, void **, des_key_schedule,
-		    des_cblock*, struct sockaddr_in*, struct sockaddr_in*);
-
-unsigned pack_args (char *, krb_principal*, int, char*, char*);
-
-int unpack_args (char*, krb_principal*, int*, char*, char*);
diff --git a/crypto/kerberosIV/appl/kauth/kauthd.c b/crypto/kerberosIV/appl/kauth/kauthd.c
deleted file mode 100644
index b6a40cf9a0ac..000000000000
--- a/crypto/kerberosIV/appl/kauth/kauthd.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "kauth.h"
-
-RCSID("$Id: kauthd.c,v 1.22 1997/05/18 20:37:55 assar Exp $");
-
-krb_principal princ;
-static char locuser[SNAME_SZ + 1];
-static int  lifetime;
-static char tktfile[MaxPathLen + 1];
-
-struct remote_args {
-     int sock;
-     des_key_schedule *schedule;
-     des_cblock *session;
-     struct sockaddr_in *me, *her;
-};
-
-static int
-decrypt_remote_tkt (char *user, char *inst, char *realm, void *varg,
-		    key_proc_t key_proc, KTEXT *cipp)
-{
-     char buf[BUFSIZ];
-     void *ptr;
-     int len;
-     KTEXT cip  = *cipp;
-     struct remote_args *args = (struct remote_args *)varg;
-
-     write_encrypted (args->sock, cip->dat, cip->length,
-		      *args->schedule, args->session, args->me,
-		      args->her);
-     len = read_encrypted (args->sock, buf, sizeof(buf), &ptr, *args->schedule,
-			   args->session, args->her, args->me);
-     memcpy(cip->dat, ptr, cip->length);
-	  
-     return 0;
-}
-
-static int
-doit(int sock)
-{
-     int status;
-     KTEXT_ST ticket;
-     AUTH_DAT auth;
-     char instance[INST_SZ + 1];
-     des_key_schedule schedule;
-     struct sockaddr_in thisaddr, thataddr;
-     int addrlen;
-     int len;
-     char buf[BUFSIZ];
-     void *data;
-     struct passwd *passwd;
-     char version[KRB_SENDAUTH_VLEN + 1];
-     char remotehost[MaxHostNameLen];
-
-     addrlen = sizeof(thisaddr);
-     if (getsockname (sock, (struct sockaddr *)&thisaddr, &addrlen) < 0 ||
-	 addrlen != sizeof(thisaddr)) {
-	  return 1;
-     }
-     addrlen = sizeof(thataddr);
-     if (getpeername (sock, (struct sockaddr *)&thataddr, &addrlen) < 0 ||
-	 addrlen != sizeof(thataddr)) {
-	  return 1;
-     }
-
-     inaddr2str (thataddr.sin_addr, remotehost, sizeof(remotehost));
-
-     k_getsockinst (sock, instance, sizeof(instance));
-     status = krb_recvauth (KOPT_DO_MUTUAL, sock, &ticket, "rcmd", instance,
-			    &thataddr, &thisaddr, &auth, "", schedule,
-			    version);
-     if (status != KSUCCESS ||
-	 strncmp(version, KAUTH_VERSION, KRB_SENDAUTH_VLEN) != 0) {
-	  return 1;
-     }
-     len = read_encrypted (sock, buf, sizeof(buf), &data, schedule,
-			   &auth.session, &thataddr, &thisaddr);
-     if (len < 0) {
-	  write_encrypted (sock, "read_enc failed",
-			   sizeof("read_enc failed") - 1, schedule,
-			   &auth.session, &thisaddr, &thataddr);
-	  return 1;
-     }
-     if (unpack_args(data, &princ, &lifetime, locuser,
-		     tktfile)) {
-	  write_encrypted (sock, "unpack_args failed",
-			   sizeof("unpack_args failed") - 1, schedule,
-			   &auth.session, &thisaddr, &thataddr);
-	  return 1;
-     }
-
-     if( kuserok(&auth, locuser) != 0) {
-	 snprintf(buf, sizeof(buf), "%s cannot get tickets for %s",
-		  locuser, krb_unparse_name(&princ));
-	 syslog (LOG_ERR, buf);
-	 write_encrypted (sock, buf, strlen(buf), schedule,
-			  &auth.session, &thisaddr, &thataddr);
-	 return 1;
-     }
-     passwd = k_getpwnam (locuser);
-     if (passwd == NULL) {
-	  snprintf (buf, sizeof(buf), "No user '%s'", locuser);
-	  syslog (LOG_ERR, buf);
-	  write_encrypted (sock, buf, strlen(buf), schedule,
-			   &auth.session, &thisaddr, &thataddr);
-	  return 1;
-     }
-     if (setgid (passwd->pw_gid) ||
-	 initgroups(passwd->pw_name, passwd->pw_gid) ||
-	 setuid(passwd->pw_uid)) {
-	  snprintf (buf, sizeof(buf), "Could not change user");
-	  syslog (LOG_ERR, buf);
-	  write_encrypted (sock, buf, strlen(buf), schedule,
-			   &auth.session, &thisaddr, &thataddr);
-	  return 1;
-     }
-     write_encrypted (sock, "ok", sizeof("ok") - 1, schedule,
-		      &auth.session, &thisaddr, &thataddr);
-
-     if (*tktfile == 0)
-	 snprintf(tktfile, sizeof(tktfile), "%s%u", TKT_ROOT, (unsigned)getuid());
-     krb_set_tkt_string (tktfile);
-
-     {
-	  struct remote_args arg;
-
-	  arg.sock     = sock;
-	  arg.schedule = &schedule;
-	  arg.session  = &auth.session;
-	  arg.me       = &thisaddr;
-	  arg.her      = &thataddr;
-
-	  status = krb_get_in_tkt (princ.name, princ.instance, princ.realm,
-				   KRB_TICKET_GRANTING_TICKET,
-				   princ.realm,
-				   lifetime, NULL, decrypt_remote_tkt, &arg);
-     }
-     if (status == KSUCCESS) {
-	 syslog (LOG_INFO, "from %s(%s): %s -> %s",
-		 remotehost,
-		 inet_ntoa(thataddr.sin_addr),
-		 locuser,
-		 krb_unparse_name (&princ));
-	  write_encrypted (sock, "ok", sizeof("ok") - 1, schedule,
-			   &auth.session, &thisaddr, &thataddr);
-	  return 0;
-     } else {
-	  snprintf (buf, sizeof(buf), "TGT failed: %s", krb_get_err_text(status));
-	  syslog (LOG_NOTICE, buf);
-	  write_encrypted (sock, buf, strlen(buf), schedule,
-			   &auth.session, &thisaddr, &thataddr);
-	  return 1;
-     }
-}
-
-int
-main (int argc, char **argv)
-{
-    openlog ("kauthd", LOG_ODELAY, LOG_AUTH);
-
-    if(argc > 1 && strcmp(argv[1], "-i") == 0)
-	mini_inetd (k_getportbyname("kauth", "tcp", htons(KAUTH_PORT)));
-    return doit(STDIN_FILENO);
-}
diff --git a/crypto/kerberosIV/appl/kauth/ksrvtgt.in b/crypto/kerberosIV/appl/kauth/ksrvtgt.in
deleted file mode 100644
index 7571d2d0778b..000000000000
--- a/crypto/kerberosIV/appl/kauth/ksrvtgt.in
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-# $Id$
-
-usage="Usage: `basename $0` name instance [[realm] srvtab]"
-
-if [ $# -lt 2 -o $# -gt 4 ]; then
-	echo "$usage"
-	exit 1
-fi
-
-srvtab="${4-${3-/etc/kerberosIV/srvtab}}"
-realm="${4+@$3}"
-
-kauth -n "$1.$2$realm" -l 5 -f "$srvtab "
diff --git a/crypto/kerberosIV/appl/kauth/marshall.c b/crypto/kerberosIV/appl/kauth/marshall.c
deleted file mode 100644
index 4f1bfeb84f6c..000000000000
--- a/crypto/kerberosIV/appl/kauth/marshall.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "kauth.h"
-
-RCSID("$Id: marshall.c,v 1.7 1997/04/01 08:17:32 joda Exp $");
-
-unsigned
-pack_args (char *buf, krb_principal *pr, int lifetime,
-	   char *locuser, char *tktfile)
-{
-    char *p;
-
-    p = buf;
-    strcpy (p, pr->name);
-    p += strlen (pr->name) + 1;
-    strcpy (p, pr->instance);
-    p += strlen (pr->instance) + 1;
-    strcpy (p, pr->realm);
-    p += strlen (pr->realm) + 1;
-    *p++ = (unsigned char)lifetime;
-    strcpy(p, locuser);
-    p += strlen (locuser) + 1;
-    strcpy(p, tktfile);
-    p += strlen(tktfile) + 1;
-    return p - buf;
-}
-
-int
-unpack_args (char *buf, krb_principal *pr, int *lifetime,
-	     char *locuser, char *tktfile)
-{
-    int len;
-
-    len = strlen(buf);
-    if (len > SNAME_SZ)
-	return -1;
-    strncpy(pr->name, buf, len + 1);
-    buf += len + 1;
-    len = strlen (buf);
-    if (len > INST_SZ)
-	return -1;
-    strncpy (pr->instance, buf, len + 1);
-    buf += len + 1;
-    len = strlen (buf);
-    if (len > REALM_SZ)
-	return -1;
-    strncpy (pr->realm, buf, len + 1);
-    buf += len + 1;
-    *lifetime = (unsigned char)*buf++;
-    len = strlen(buf);
-    if (len > SNAME_SZ)
-	return -1;
-    strncpy (locuser, buf, len + 1);
-    buf += len + 1;
-    len = strlen(buf);
-    if (len > MaxPathLen)
-	return -1;
-    strncpy (tktfile, buf, len + 1);
-    buf += len + 1;
-    return 0;
-}
diff --git a/crypto/kerberosIV/appl/kauth/rkinit.c b/crypto/kerberosIV/appl/kauth/rkinit.c
deleted file mode 100644
index ec75d4634b3a..000000000000
--- a/crypto/kerberosIV/appl/kauth/rkinit.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "kauth.h"
-
-RCSID("$Id: rkinit.c,v 1.19 1997/04/01 08:17:33 joda Exp $");
-
-static struct in_addr *
-getalladdrs (char *hostname, unsigned *count)
-{
-    struct hostent *hostent;
-    struct in_addr **h;
-    struct in_addr *addr;
-    unsigned naddr;
-    unsigned maxaddr;
-
-    hostent = gethostbyname (hostname);
-    if (hostent == NULL) {
-	warnx ("gethostbyname '%s' failed: %s\n",
-	       hostname,
-#ifdef HAVE_H_ERRNO
-	       hstrerror(h_errno)
-#else
-	       "unknown error"
-#endif
-	       );
-	return NULL;
-    }
-    maxaddr = 1;
-    naddr = 0;
-    addr = malloc(sizeof(*addr) * maxaddr);
-    if (addr == NULL) {
-	warnx ("out of memory");
-	return NULL;
-    }
-    for (h = (struct in_addr **)(hostent->h_addr_list);
-	 *h != NULL;
-	 h++) {
-	if (naddr >= maxaddr) {
-	    maxaddr *= 2;
-	    addr = realloc (addr, sizeof(*addr) * maxaddr);
-	    if (addr == NULL) {
-		warnx ("out of memory");
-		return NULL;
-	    }
-	}
-	addr[naddr++] = **h;
-    }
-    addr = realloc (addr, sizeof(*addr) * naddr);
-    if (addr == NULL) {
-	warnx ("out of memory");
-	return NULL;
-    }
-    *count = naddr;
-    return addr;
-}
-
-static int
-doit_host (krb_principal *princ, int lifetime, char *locuser, 
-	   char *tktfile, des_cblock *key, int s, char *hostname)
-{
-    char buf[BUFSIZ];
-    int inlen;
-    KTEXT_ST text;
-    CREDENTIALS cred;
-    MSG_DAT msg;
-    int status;
-    des_key_schedule schedule;
-    struct sockaddr_in thisaddr, thataddr;
-    int addrlen;
-    void *ret;
-
-    addrlen = sizeof(thisaddr);
-    if (getsockname (s, (struct sockaddr *)&thisaddr, &addrlen) < 0 ||
-	addrlen != sizeof(thisaddr)) {
-	warn ("getsockname(%s)", hostname);
-	return 1;
-    }
-    addrlen = sizeof(thataddr);
-    if (getpeername (s, (struct sockaddr *)&thataddr, &addrlen) < 0 ||
-	addrlen != sizeof(thataddr)) {
-	warn ("getpeername(%s)", hostname);
-	return 1;
-    }
-
-    status = krb_sendauth (KOPT_DO_MUTUAL, s, &text, "rcmd",
-			   hostname, krb_realmofhost (hostname),
-			   getpid(), &msg, &cred, schedule,
-			   &thisaddr, &thataddr, KAUTH_VERSION);
-    if (status != KSUCCESS) {
-	warnx ("%s: %s\n", hostname, krb_get_err_text(status));
-	return 1;
-    }
-    inlen = pack_args (buf, princ, lifetime, locuser, tktfile);
-
-    if (write_encrypted(s, buf, inlen, schedule, &cred.session,
-			&thisaddr, &thataddr) < 0) {
-	warn ("write to %s", hostname);
-	return 1;
-    }
-
-    inlen = read_encrypted (s, buf, sizeof(buf), &ret, schedule,
-			    &cred.session, &thataddr, &thisaddr);
-    if (inlen < 0) {
-	warn ("read from %s failed", hostname);
-	return 1;
-    }
-
-    if (strncmp(ret, "ok", inlen) != 0) {
-	warnx ("error from %s: %.*s\n",
-	       hostname, inlen, (char *)ret);
-	return 1;
-    }
-
-    inlen = read_encrypted (s, buf, sizeof(buf), &ret, schedule,
-			    &cred.session, &thataddr, &thisaddr);
-    if (inlen < 0) {
-	warn ("read from %s", hostname);
-	return 1;
-    }
-     
-    {
-	des_key_schedule key_s;
-
-	des_key_sched(key, key_s);
-	des_pcbc_encrypt(ret, ret, inlen, key_s, key, DES_DECRYPT);
-	memset(key_s, 0, sizeof(key_s));
-    }
-    write_encrypted (s, ret, inlen, schedule, &cred.session,
-		     &thisaddr, &thataddr);
-
-    inlen = read_encrypted (s, buf, sizeof(buf), &ret, schedule,
-			    &cred.session, &thataddr, &thisaddr);
-    if (inlen < 0) {
-	warn ("read from %s", hostname);
-	return 1;
-    }
-
-    if (strncmp(ret, "ok", inlen) != 0) {
-	warnx ("error from %s: %.*s\n",
-	       hostname, inlen, (char *)ret);
-	return 1;
-    }
-    return 0;
-}
-
-int
-rkinit (krb_principal *princ, int lifetime, char *locuser, 
-	char *tktfile, des_cblock *key, char *hostname)
-{
-    struct in_addr *addr;
-    unsigned naddr;
-    unsigned i;
-    int port;
-    int success;
-
-    addr = getalladdrs (hostname, &naddr);
-    if (addr == NULL)
-	return 1;
-    port = k_getportbyname ("kauth", "tcp", htons(KAUTH_PORT));
-    success = 0;
-    for (i = 0; !success && i < naddr; ++i) {
-	struct sockaddr_in a;
-	int s;
-
-	memset(&a, 0, sizeof(a));
-	a.sin_family = AF_INET;
-	a.sin_port   = port;
-	a.sin_addr   = addr[i];
-
-	s = socket (AF_INET, SOCK_STREAM, 0);
-	if (s < 0) {
-	    warn("socket");
-	    return 1;
-	}
-	if (connect(s, (struct sockaddr *)&a, sizeof(a)) < 0) {
-	    warn("connect(%s)", hostname);
-	    continue;
-	}
-
-	success = success || !doit_host (princ, lifetime,
-					 locuser, tktfile, key,
-					 s, hostname);
-	close (s);
-    }
-    return !success;
-}
diff --git a/crypto/kerberosIV/appl/kauth/zrefresh b/crypto/kerberosIV/appl/kauth/zrefresh
deleted file mode 100644
index 8347a1b33c0c..000000000000
--- a/crypto/kerberosIV/appl/kauth/zrefresh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# 
-# @(#) $Id: zrefresh,v 1.3 1996/06/09 19:21:59 joda Exp $
-#
-# Substitute this script with a real zrefresh if running Zephyr. For
-# instance:
-#
-# if [ -f "$WGFILE" ] ; then
-#     zctl load
-# fi
-
-exit 0
diff --git a/crypto/kerberosIV/appl/kip/Makefile.in b/crypto/kerberosIV/appl/kip/Makefile.in
deleted file mode 100644
index 690a66117d0d..000000000000
--- a/crypto/kerberosIV/appl/kip/Makefile.in
+++ /dev/null
@@ -1,96 +0,0 @@
-# $Id: Makefile.in,v 1.12 1997/03/23 13:04:03 assar Exp $
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-CC = @CC@
-AR = ar
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-LD_FLAGS = @LD_FLAGS@
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-LIBS = @LIBS@
-MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-libexecdir = @libexecdir@
-libdir = @libdir@
-bindir = @bindir@
-transform=@program_transform_name@
-EXECSUFFIX=@EXECSUFFIX@
-
-PROG_BIN	= kip$(EXECSUFFIX)
-PROG_LIBEXEC	= kipd$(EXECSUFFIX)
-PROGS = $(PROG_BIN) $(PROG_LIBEXEC)
-
-SOURCES_KIP     = kip.c
-SOURCES_KIPD    = kipd.c
-SOURCES_COMMON  = common.c
-
-OBJECTS_KIP     = kip.o common.o
-OBJECTS_KIPD    = kipd.o common.o
-
-OBJECTS = $(OBJECTS_KIP) $(OBJECTS_KIPD)
-SOURCES = $(SOURCES_KIP) $(SOURCES_KIPD) $(SOURCES_COMMON)
-
-all: $(PROGS)
-
-Wall:
-	make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $<
-
-install: all
-	$(MKINSTALLDIRS) $(bindir) $(libexecdir)
-	for x in $(PROG_BIN); do \
-	  $(INSTALL_PROGRAM) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \
-	done
-	for x in $(PROG_LIBEXEC); do \
-	  $(INSTALL_PROGRAM) $$x $(libexecdir)/`echo $$x | sed '$(transform)'`; \
-	done
-
-uninstall:
-	for x in $(PROG_BIN); do \
-	  rm -f $(bindir)/`echo $$x | sed '$(transform)'`; \
-	done
-	for x in $(PROG_LIBEXEC); do \
-	  rm -f $(libexecdir)/`echo $$x | sed '$(transform)'`; \
-	done
-
-TAGS: $(SOURCES)
-	etags $(SOURCES)
-
-check:
-
-clean:
-	rm -f *.a *.o $(PROGS)
-
-mostlyclean: clean
-
-distclean: clean
-	rm -f Makefile *.tab.c *~
-
-realclean: distclean
-	rm -f TAGS
-
-dist: $(DISTFILES)
-	for file in $(DISTFILES); do \
-	  ln $$file ../`cat ../.fname`/lib \
-	    || cp -p $$file ../`cat ../.fname`/lib; \
-	done
-
-KLIB=-L../../lib/krb -lkrb -L../../lib/des -ldes
-LIBROKEN=-L../../lib/roken -lroken
-
-kip$(EXECSUFFIX): $(OBJECTS_KIP)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_KIP) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
-
-kipd$(EXECSUFFIX): $(OBJECTS_KIPD)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_KIPD) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
-
-$(OBJECTS): ../../include/config.h
diff --git a/crypto/kerberosIV/appl/kip/common.c b/crypto/kerberosIV/appl/kip/common.c
deleted file mode 100644
index b21d03dc866c..000000000000
--- a/crypto/kerberosIV/appl/kip/common.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "kip.h"
-
-RCSID("$Id: common.c,v 1.12 1997/05/02 14:28:06 assar Exp $");
-
-/*
- * Copy packets from `tundev' to `netdev' or vice versa.
- * Mode is used when reading from `tundev'
- */
-
-int
-copy_packets (int tundev, int netdev, int mtu, des_cblock *iv,
-	      des_key_schedule schedule)
-{
-     des_cblock iv1, iv2;
-     int num1 = 0, num2 = 0;
-     u_char *buf;
-
-     buf = malloc (mtu + 2);
-     if (buf == NULL) {
-	 warnx("malloc(%d) failed", mtu);
-	 return 1;
-     }
-
-     memcpy (&iv1, iv, sizeof(iv1));
-     memcpy (&iv2, iv, sizeof(iv2));
-     for (;;) {
-	  fd_set fdset;
-	  int ret, len;
-
-	  FD_ZERO(&fdset);
-	  FD_SET(tundev, &fdset);
-	  FD_SET(netdev, &fdset);
-
-	  ret = select (max(tundev, netdev)+1, &fdset, NULL, NULL, NULL);
-	  if (ret < 0 && errno != EINTR) {
-	      warn ("select");
-	      return 1;
-	  }
-	  if (FD_ISSET(tundev, &fdset)) {
-	       ret = read (tundev, buf + 2, mtu);
-	       if (ret == 0)
-		    return 0;
-	       if (ret < 0) {
-		    if (errno == EINTR)
-			 continue;
-		    else { 
-			warn("read");
-			return ret;
-		    }
-	       }
-	       buf[0] = ret >> 8;
-	       buf[1] = ret & 0xFF;
-	       ret += 2;
-	       des_cfb64_encrypt (buf, buf, ret, schedule,
-				  &iv1, &num1, DES_ENCRYPT);
-	       ret = krb_net_write (netdev, buf, ret);
-	       if (ret < 0) {
-		   warn("write");
-		   return ret;
-	       }
-	  }
-	  if (FD_ISSET(netdev, &fdset)) {
-	       ret = read (netdev, buf, 2);
-	       if (ret == 0)
-		    return 0;
-	       if (ret < 0) {
-		    if (errno == EINTR)
-			 continue;
-		    else { 
-			warn("read");
-			return ret;
-		    }
-	       }
-	       des_cfb64_encrypt (buf, buf, 2, schedule,
-				  &iv2, &num2, DES_DECRYPT);
-	       len = (buf[0] << 8 ) | buf[1];
-	       ret = krb_net_read (netdev, buf + 2, len);
-	       if (ret == 0)
-		    return 0;
-	       if (ret < 0) {
-		    if (errno == EINTR)
-			 continue;
-		    else { 
-			warn("read");
-			return ret;
-		    }
-	       }
-	       des_cfb64_encrypt (buf + 2, buf + 2, len, schedule,
-				  &iv2, &num2, DES_DECRYPT);
-	       ret = krb_net_write (tundev, buf + 2, len);
-	       if (ret < 0) {
-		   warn("write");
-		   return ret;
-	       }
-	  }
-     }
-}
-
-/*
- * Signal handler that justs waits for the children when they die.
- */
-
-RETSIGTYPE
-childhandler (int sig)
-{
-     pid_t pid;
-     int status;
-
-     do { 
-	  pid = waitpid (-1, &status, WNOHANG|WUNTRACED);
-     } while(pid > 0);
-     signal (SIGCHLD, childhandler);
-     SIGRETURN(0);
-}
-
-/*
- * Find a free tunnel device and open it.
- */
-
-int
-tunnel_open (void)
-{
-     int fd;
-     int i;
-     char name[64];
-
-     for (i = 0; i < 256; ++i) {
-	  snprintf (name, sizeof(name), "%s%s%d", _PATH_DEV, TUNDEV, i);
-	  fd = open (name, O_RDWR, 0);
-	  if (fd >= 0)
-	       break;
-	  if (errno == ENOENT || errno == ENODEV) {
-	      warn("open %s", name);
-	      return fd;
-	  }
-     }
-     if (fd < 0)
-	 warn("open %s" ,name);
-     return fd;
-}
diff --git a/crypto/kerberosIV/appl/kip/kip.c b/crypto/kerberosIV/appl/kip/kip.c
deleted file mode 100644
index e324a280ec49..000000000000
--- a/crypto/kerberosIV/appl/kip/kip.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "kip.h"
-
-RCSID("$Id: kip.c,v 1.15 1997/05/11 10:54:51 assar Exp $");
-
-static void
-usage()
-{
-     fprintf (stderr, "Usage: %s host\n",
-	      __progname);
-     exit (1);
-}
-
-/*
- * Establish authenticated connection
- */
-
-static int
-connect_host (char *host, des_cblock *key, des_key_schedule schedule)
-{
-     CREDENTIALS cred;
-     KTEXT_ST text;
-     MSG_DAT msg;
-     int status;
-     struct sockaddr_in thisaddr, thataddr;
-     int addrlen;
-     struct hostent *hostent;
-     int s;
-     u_char b;
-     char **p;
-
-     hostent = gethostbyname (host);
-     if (hostent == NULL) {
-	 warnx ("gethostbyname '%s': %s", host,
-#ifdef HAVE_H_ERRNO
-		hstrerror(h_errno)
-#else
-		"unknown error"
-#endif
-	     );
-	  return -1;
-     }
-
-     memset (&thataddr, 0, sizeof(thataddr));
-     thataddr.sin_family = AF_INET;
-     thataddr.sin_port   = k_getportbyname ("kip", "tcp", htons(KIPPORT));
-
-     for(p = hostent->h_addr_list; *p; ++p) {
-	 int one = 1;
-
-	 memcpy (&thataddr.sin_addr, *p, sizeof(thataddr.sin_addr));
-
-	 s = socket (AF_INET, SOCK_STREAM, 0);
-	 if (s < 0) {
-	     warn ("socket");
-	     return -1;
-	 }
-
-#if defined(TCP_NODELAY) && defined(HAVE_SETSOCKOPT)
-	 setsockopt (s, IPPROTO_TCP, TCP_NODELAY, (void *)&one, sizeof(one));
-#endif
-
-	 if (connect (s, (struct sockaddr *)&thataddr, sizeof(thataddr)) < 0) {
-	     warn ("connect(%s)", host);
-	     close (s);
-	     continue;
-	 } else {
-	     break;
-	 }
-     }
-     if (*p == NULL)
-	 return -1;
-
-     addrlen = sizeof(thisaddr);
-     if (getsockname (s, (struct sockaddr *)&thisaddr, &addrlen) < 0 ||
-	 addrlen != sizeof(thisaddr)) {
-	 warn ("getsockname(%s)", host);
-	 return -1;
-     }
-     status = krb_sendauth (KOPT_DO_MUTUAL, s, &text, "rcmd",
-			    host, krb_realmofhost (host),
-			    getpid(), &msg, &cred, schedule,
-			    &thisaddr, &thataddr, KIP_VERSION);
-     if (status != KSUCCESS) {
-	 warnx("%s: %s", host,
-	       krb_get_err_text(status));
-	 return -1;
-     }
-     if (read (s, &b, sizeof(b)) != sizeof(b)) {
-	 warn ("read");
-	 return -1;
-     }
-     if (b) {
-	  char buf[BUFSIZ];
-
-	  read (s, buf, sizeof(buf));
-	  buf[BUFSIZ - 1] = '\0';
-
-	  warnx ("%s: %s", host, buf);
-	  return -1;
-     }
-
-     memcpy(key, &cred.session, sizeof(des_cblock));
-     return s;
-}
-
-/*
- * Connect to the given host.
- */
-
-static int
-doit (char *host)
-{
-     des_key_schedule schedule;
-     des_cblock iv;
-     int other, this;
-     struct ifreq ifreq;
-     int sock;
-
-     other = connect_host (host, &iv, schedule);
-     if (other < 0)
-	  return 1;
-     this = tunnel_open ();
-     if (this < 0)
-	  return 1;
-     return copy_packets (this, other, TUNMTU, &iv, schedule);
-}
-
-/*
- * kip - forward IP packets over a kerberos-encrypted channel.
- *
- */
-
-int
-main(int argc, char **argv)
-{
-    set_progname (argv[0]);
-
-    if (argc != 2)
-	usage ();
-    return doit (argv[1]);
-}
diff --git a/crypto/kerberosIV/appl/kip/kip.h b/crypto/kerberosIV/appl/kip/kip.h
deleted file mode 100644
index 94e30a59c104..000000000000
--- a/crypto/kerberosIV/appl/kip/kip.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id: kip.h,v 1.16 1997/05/20 18:40:31 bg Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif /* HAVE_CONFIG_H */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <pwd.h>
-#include <signal.h>
-#include <paths.h>
-#include <fcntl.h>
-#ifdef HAVE_SYSLOG_H
-#include <syslog.h>
-#endif
-#include <sys/types.h>
-#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#elif defined(HAVE_SYS_TIME_H)
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/sockio.h>
-#include <net/if.h>
-#ifdef HAVE_NET_IF_VAR_H
-#include <net/if_var.h>
-#endif
-#include <net/if_tun.h>
-#include <err.h>
-
-#ifdef SOCKS
-#include <socks.h>
-#endif
-
-#include <krb.h>
-
-#include <roken.h>
-
-#define TUNDEV "tun"
-
-#define KIPPORT 2112
-
-#define KIP_VERSION "KIPSRV.0"
-
-int
-copy_packets (int tundev, int netdev, int mtu, des_cblock *iv,
-	      des_key_schedule schedule);
-
-RETSIGTYPE childhandler (int);
-
-int
-tunnel_open (void);
diff --git a/crypto/kerberosIV/appl/kip/kipd.c b/crypto/kerberosIV/appl/kip/kipd.c
deleted file mode 100644
index 6d9d33409381..000000000000
--- a/crypto/kerberosIV/appl/kip/kipd.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "kip.h"
-
-RCSID("$Id: kipd.c,v 1.13 1997/05/18 20:38:01 assar Exp $");
-
-static int
-fatal (int fd, char *s)
-{
-     u_char err = 1;
-
-     write (fd, &err, sizeof(err));
-     write (fd, s, strlen(s)+1);
-     syslog(LOG_ERR, s);
-     return err;
-}
-
-static int
-recv_conn (int sock, des_cblock *key, des_key_schedule schedule,
-	   struct sockaddr_in *retaddr)
-{
-     int status;
-     KTEXT_ST ticket;
-     AUTH_DAT auth;
-     char instance[INST_SZ + 1];
-     struct sockaddr_in thisaddr, thataddr;
-     int addrlen;
-     char version[KRB_SENDAUTH_VLEN + 1];
-     u_char ok = 0;
-     struct passwd *passwd;
-
-     addrlen = sizeof(thisaddr);
-     if (getsockname (sock, (struct sockaddr *)&thisaddr, &addrlen) < 0 ||
-	 addrlen != sizeof(thisaddr)) {
-	  return 1;
-     }
-     addrlen = sizeof(thataddr);
-     if (getpeername (sock, (struct sockaddr *)&thataddr, &addrlen) < 0 ||
-	 addrlen != sizeof(thataddr)) {
-	  return 1;
-     }
-
-     k_getsockinst (sock, instance, sizeof(instance));
-     status = krb_recvauth (KOPT_DO_MUTUAL, sock, &ticket, "rcmd", instance,
-			    &thataddr, &thisaddr, &auth, "", schedule,
-			    version);
-     if (status != KSUCCESS ||
-	 strncmp(version, KIP_VERSION, KRB_SENDAUTH_VLEN) != 0) {
-	  return 1;
-     }
-     passwd = k_getpwnam ("root");
-     if (passwd == NULL)
-	  return fatal (sock, "Cannot find root");
-     if (kuserok(&auth, "root") != 0)
-	  return fatal (sock, "Permission denied");
-     if (write (sock, &ok, sizeof(ok)) != sizeof(ok))
-	  return 1;
-
-     memcpy(key, &auth.session, sizeof(des_cblock));
-     *retaddr = thataddr;
-     return 0;
-}
-
-static int
-doit(int sock)
-{
-     struct sockaddr_in thataddr;
-     des_key_schedule schedule;
-     des_cblock key;
-     int this;
-
-     if (recv_conn (sock, &key, schedule, &thataddr))
-	  return 1;
-     this = tunnel_open ();
-     if (this < 0)
-	  fatal (sock, "Cannot open " _PATH_DEV TUNDEV);
-     return copy_packets (this, sock, TUNMTU, &key, schedule);
-}
-
-/*
- * kipd - receive forwarded IP
- */
-
-int
-main (int argc, char **argv)
-{
-    set_progname (argv[0]);
-
-    openlog(__progname, LOG_PID|LOG_CONS, LOG_DAEMON);
-    signal (SIGCHLD, childhandler);
-    return doit(0);
-}
diff --git a/crypto/kerberosIV/config.guess b/crypto/kerberosIV/config.guess
deleted file mode 100644
index 74253c33bd5c..000000000000
--- a/crypto/kerberosIV/config.guess
+++ /dev/null
@@ -1,696 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 93, 94, 95, 1996 Free Software Foundation, Inc.
-#
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Written by Per Bothner <bothner@cygnus.com>.
-# The master version of this file is at the FSF in /home/gd/gnu/lib.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit system type (host/target name).
-#
-# Only a few systems have been added to this list; please add others
-# (but try to keep the structure clean).
-#
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 8/24/94.)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    alpha:OSF1:*:*)
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//'`
-	exit 0 ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit 0 ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-cbm-sysv4
-	exit 0;;
-    amiga:NetBSD:*:*)
-      echo m68k-cbm-netbsd${UNAME_RELEASE}
-      exit 0 ;;
-    amiga:OpenBSD:*:*)
-      echo m68k-cbm-openbsd${UNAME_RELEASE}
-      exit 0 ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
-    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit 0 ;;
-    NILE:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit 0 ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:NetBSD:*:*)
-	echo m68k-atari-netbsd${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:OpenBSD:*:*)
-	echo m68k-atari-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3*:NetBSD:*:*)
-	echo m68k-sun-netbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3*:OpenBSD:*:*)
-	echo m68k-sun-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:NetBSD:*:*)
-	echo m68k-apple-netbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-apple-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	sed 's/^	//' << EOF >dummy.c
-	int main (argc, argv) int argc; char **argv; {
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	${CC-cc} dummy.c -o dummy \
-	  && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm dummy.c dummy && exit 0
-	rm -f dummy.c dummy
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit 0 ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit 0 ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit 0 ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
-	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
-	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	fi
-        else echo i586-dg-dgux${UNAME_RELEASE}
-        fi
- 	exit 0 ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit 0 ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit 0 ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit 0 ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i?86:AIX:*:*)
-	echo i386-ibm-aix
-	exit 0 ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		sed 's/^		//' << EOF >dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-		rm -f dummy.c dummy
-		echo rs6000-ibm-aix3.2.5
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit 0 ;;
-    *:AIX:*:4)
-	if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=4.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit 0 ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit 0 ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit 0 ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit 0 ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit 0 ;;
-    9000/[3478]??:HP-UX:*:*)
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;;
-	    9000/8?? )            HP_ARCH=hppa1.0 ;;
-	esac
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    3050*:HI-UX:*:*)
-	sed 's/^	//' << EOF >dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-	rm -f dummy.c dummy
-	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit 0 ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit 0 ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit 0 ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit 0 ;;
-    i?86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit 0 ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit 0 ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit 0 ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit 0 ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit 0 ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit 0 ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit 0 ;;
-    CRAY*X-MP:*:*:*)
-	echo xmp-cray-unicos
-        exit 0 ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE}
-	exit 0 ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
-	exit 0 ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE}
-	exit 0 ;;
-    CRAY-2:*:*:*)
-	echo cray2-cray-unicos
-        exit 0 ;;
-    F300:UNIX_System_V:*:*)
-        FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    F301:UNIX_System_V:*:*)
-       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
-       exit 0 ;;
-    hp3[0-9][05]:NetBSD:*:*)
-	echo m68k-hp-netbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp3[0-9][05]:OpenBSD:*:*)
-	echo m68k-hp-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    i?86:BSD/386:*:* | *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
-    *:NetBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
-    i*:CYGWIN*:*)
-	echo i386-pc-cygwin32
-	exit 0 ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin32
-	exit 0 ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    *:GNU:*:*)
-	echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
-    *:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us.
-	ld_help_string=`ld --help 2>&1`
-	if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i.86"; then
-	  echo "${UNAME_MACHINE}-pc-linux-gnu" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86linux"; then
-	  echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86coff"; then
-	  echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68kelf"; then
-	  echo "${UNAME_MACHINE}-unknown-linux-gnu" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68klinux"; then
-	  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf32ppc"; then
-	  echo "powerpc-unknown-linux-gnu" ; exit 0
-	elif test "${UNAME_MACHINE}" = "alpha" ; then
-	  echo alpha-unknown-linux-gnu ; exit 0
-	elif test "${UNAME_MACHINE}" = "sparc" ; then
-	  echo sparc-unknown-linux-gnu ; exit 0
-	else
-	  # Either a pre-BFD a.out linker (linux-gnuoldld) or one that does not give us
-	  # useful --help.  Gcc wants to distinguish between linux-gnuoldld and linux-gnuaout.
-	  test ! -d /usr/lib/ldscripts/. \
-	    && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
-	  # Determine whether the default compiler is a.out or elf
-	  cat >dummy.c <<EOF
-main(argc, argv)
-int argc;
-char *argv[];
-{
-#ifdef __ELF__
-  printf ("%s-pc-linux-gnu\n", argv[1]);
-#else
-  printf ("%s-pc-linux-gnuaout\n", argv[1]);
-#endif
-  return 0;
-}
-EOF
-	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
-	  rm -f dummy.c dummy
-	fi ;;
-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
-# are messed up and put the nodename in both sysname and nodename.
-    i?86:DYNIX/ptx:4*:*)
-	echo i386-sequent-sysv4
-	exit 0 ;;
-    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
-	fi
-	exit 0 ;;
-    i?86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit 0 ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit 0 ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit 0 ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit 0 ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit 0 ;;
-    M68*:*:R3V[567]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit 0 ;;
-    i?86:LynxOS:2.*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit 0 ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit 0 ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
-    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit 0 ;;
-    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                           # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit 0 ;;
-    *:OS/2:*:*)
-	echo ${UNAME_MACHINE}-pc-os2_emx
-	exit 0 ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-cat >dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-#if !defined (ultrix)
-  printf ("vax-dec-bsd\n"); exit (0);
-#else
-  printf ("vax-dec-ultrix\n"); exit (0);
-#endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
-rm -f dummy.c dummy
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit 0 ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit 0 ;;
-    c34*)
-	echo c34-convex-bsd
-	exit 0 ;;
-    c38*)
-	echo c38-convex-bsd
-	exit 0 ;;
-    c4*)
-	echo c4-convex-bsd
-	exit 0 ;;
-    esac
-fi
-
-#echo '(Unable to guess system type)' 1>&2
-
-exit 1
diff --git a/crypto/kerberosIV/config.sub b/crypto/kerberosIV/config.sub
deleted file mode 100644
index 75822a223e66..000000000000
--- a/crypto/kerberosIV/config.sub
+++ /dev/null
@@ -1,932 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-if [ x$1 = x ]
-then
-	echo Configuration name missing. 1>&2
-	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
-	echo "or     $0 ALIAS" 1>&2
-	echo where ALIAS is a recognized configuration type. 1>&2
-	exit 1
-fi
-
-# First pass through any local machine types.
-case $1 in
-	*local*)
-		echo $1
-		exit 0
-		;;
-	*)
-	;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  linux-gnu*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple)
-		os=
-		basic_machine=$1
-		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco5)
-		os=sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | m68k | m68000 | m88k | ns32k | arm \
-		| arme[lb] | pyramid \
-		| tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
-		| alpha | we32k | ns16k | clipper | i370 | sh \
-		| powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \
-		| pdp11 | mips64el | mips64orion | mips64orionel \
-		| sparc | sparclet | sparclite | sparc64)
-		basic_machine=$basic_machine-unknown
-		;;
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i[3456]86)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	vax-* | tahoe-* | i[3456]86-* | i860-* | m68k-* | m68000-* | m88k-* \
-	      | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
-	      | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
-	      | hppa-* | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
-	      | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
-	      | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
-	      | mips64el-* | mips64orion-* | mips64orionel-* | f301-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-cbm
-		;;
-	amigados)
-		basic_machine=m68k-cbm
-		os=-amigados
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-cbm
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	cray2)
-		basic_machine=cray2-cray
-		os=-unicos
-		;;
-	[ctj]90-cray)
-		#basic_machine=c90-cray
-		os=-unicos
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i[3456]86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i[3456]86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i[3456]86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i[3456]86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-        pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pentium | p5)
-		basic_machine=i586-intel
-		;;
-	pentiumpro | p6)
-		basic_machine=i686-intel
-		;;
-	pentium-* | p5-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	k5)
-		# We don't have specific support for AMD's K5 yet, so just call it a Pentium
-		basic_machine=i586-amd
-		;;
-	nexen)
-		# We don't have specific support for Nexgen yet, so just call it a Pentium
-		basic_machine=i586-nexgen
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=rs6000-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-	        ;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-	        ;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-       vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	xmp)
-		basic_machine=xmp-cray
-		os=-unicos
-		;;
-        xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	mips)
-		basic_machine=mips-mips
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sparc)
-		basic_machine=sparc-sun
-		;;
-        cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-unixware* | svr4*)
-		os=-sysv4
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigados* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -linux-gnu* | -uxpv*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-ns2 )
-	        os=-nextstep2
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-os2*)
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-        pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigados
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-        *-gould)
-		os=-sysv
-		;;
-        *-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-        *-sgi)
-		os=-irix
-		;;
-        *-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f301-fujitsu)
-		os=-uxpv
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-vxsim* | -vxworks*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
diff --git a/crypto/kerberosIV/configure b/crypto/kerberosIV/configure
deleted file mode 100644
index e6fefbf0b929..000000000000
--- a/crypto/kerberosIV/configure
+++ /dev/null
@@ -1,9343 +0,0 @@
-#! /bin/sh
-
-# From configure.in Revision: 1.285 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.12 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_default_prefix=/usr/athena
-ac_help="$ac_help
-  --with-socks=dir                use socks in dir"
-ac_help="$ac_help
-  --with-socks-lib=dir            use socks-lib in dir"
-ac_help="$ac_help
-  --with-socks-include=dir        use socks-include in dir"
-ac_help="$ac_help
-  --with-shared           create shared libraries for Kerberos"
-ac_help="$ac_help
-  --with-cracklib=dir     use the cracklib.a in dir"
-ac_help="$ac_help
-  --with-dictpath=path    use this dictionary with cracklib
-"
-ac_help="$ac_help
-  --with-mailspool=dir    this is the mail spool directory
-"
-ac_help="$ac_help
-  --enable-random-mkey    use new code for master keys"
-ac_help="$ac_help
-  --with-mkey=file        where to put the master key"
-ac_help="$ac_help
-  --without-berkeley-db   if you don't want berkeley db"
-ac_help="$ac_help
-  --without-afs-support   if you don't want support for afs"
-ac_help="$ac_help
-  --with-des-quad-checksum=kind
-                           default checksum to use (new, old, or guess)"
-ac_help="$ac_help
-  --with-readline=dir                use readline in dir"
-ac_help="$ac_help
-  --with-readline-lib=dir            use readline-lib in dir"
-ac_help="$ac_help
-  --with-readline-include=dir        use readline-include in dir"
-ac_help="$ac_help
-  --with-x                use the X Window System"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.12"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=lib/krb/getrealm.c
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-
-
-PACKAGE=krb4
-VERSION=0.9.6
-# This may be overridden using --prefix=/usr to configure
-
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-# Make sure we can run config.sub.
-if $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:648: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`$ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`$ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:669: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-
-# We want these before the checks, so the checks can modify their values.
-test -z "$LDFLAGS" && LDFLAGS=-g
-
-
-echo $ac_n "checking for ln -s or something else""... $ac_c" 1>&6
-echo "configure:720: checking for ln -s or something else" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
-  rm -f conftestdata
-  ac_cv_prog_LN_S="ln -s"
-else
-  touch conftestdata1
-  if ln conftestdata1 conftestdata2; then
-    rm -f conftestdata*
-    ac_cv_prog_LN_S=ln
-  else
-    ac_cv_prog_LN_S=cp
-  fi
-fi
-fi
-LN_S="$ac_cv_prog_LN_S"
-echo "$ac_t""$ac_cv_prog_LN_S" 1>&6
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:745: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:774: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  ac_prog_rejected=no
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:822: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-cat > conftest.$ac_ext <<EOF
-#line 832 "configure"
-#include "confdefs.h"
-main(){return(0);}
-EOF
-if { (eval echo configure:836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
-  else
-    ac_cv_prog_cc_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
-fi
-rm -fr conftest*
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:856: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:861: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:870: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:885: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:913: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    # This must be in double quotes, not single quotes, because CPP may get
-  # substituted into the Makefile and "${CC-cc}" will confuse make.
-  CPP="${CC-cc} -E"
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-#line 928 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:934: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-#line 945 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:951: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
-fi
-  CPP="$ac_cv_prog_CPP"
-else
-  ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
-
-echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:974: checking for POSIXized ISC" >&5
-if test -d /etc/conf/kconfig.d &&
-  grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
-then
-  echo "$ac_t""yes" 1>&6
-  ISC=yes # If later tests want to check for ISC.
-  cat >> confdefs.h <<\EOF
-#define _POSIX_SOURCE 1
-EOF
-
-  if test "$GCC" = yes; then
-    CC="$CC -posix"
-  else
-    CC="$CC -Xp"
-  fi
-else
-  echo "$ac_t""no" 1>&6
-  ISC=
-fi
-
-for ac_prog in byacc yacc 'bison -y'
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:999: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$YACC"; then
-  ac_cv_prog_YACC="$YACC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_YACC="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-YACC="$ac_cv_prog_YACC"
-if test -n "$YACC"; then
-  echo "$ac_t""$YACC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$YACC" && break
-done
-
-# Extract the first word of "flex", so it can be a program name with args.
-set dummy flex; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1030: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$LEX"; then
-  ac_cv_prog_LEX="$LEX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LEX="flex"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_LEX" && ac_cv_prog_LEX="lex"
-fi
-fi
-LEX="$ac_cv_prog_LEX"
-if test -n "$LEX"; then
-  echo "$ac_t""$LEX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$LEXLIB"
-then
-  case "$LEX" in
-  flex*) ac_lib=fl ;;
-  *) ac_lib=l ;;
-  esac
-  echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:1063: checking for yywrap in -l$ac_lib" >&5
-ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-l$ac_lib  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1071 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char yywrap();
-
-int main() {
-yywrap()
-; return 0; }
-EOF
-if { (eval echo configure:1082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LEXLIB="-l$ac_lib"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1107: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1144: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      for ac_prog in ginstall installbsd scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    # OSF/1 installbsd also uses dspmsg, but is usable.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-# Extract the first word of "makeinfo", so it can be a program name with args.
-set dummy makeinfo; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1196: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$MAKEINFO"; then
-  ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_MAKEINFO="makeinfo"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_MAKEINFO" && ac_cv_prog_MAKEINFO=":"
-fi
-fi
-MAKEINFO="$ac_cv_prog_MAKEINFO"
-if test -n "$MAKEINFO"; then
-  echo "$ac_t""$MAKEINFO" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-
-echo $ac_n "checking for socks""... $ac_c" 1>&6
-echo "configure:1226: checking for socks" >&5
-# Check whether --with-socks or --without-socks was given.
-if test "${with_socks+set}" = set; then
-  withval="$with_socks"
-  if test "$with_socks" = "no"; then
-  with_socks=
-fi
-
-fi
-
-# Check whether --with-socks-lib or --without-socks-lib was given.
-if test "${with_socks_lib+set}" = set; then
-  withval="$with_socks_lib"
-  if test "$withval" = "yes" -o "$withval" = "no"; then
-  { echo "configure: error: No argument for --with-socks-lib" 1>&2; exit 1; }
-elif test "X$with_socks" = "X"; then
-  with_socks=yes
-fi
-
-fi
-
-# Check whether --with-socks-include or --without-socks-include was given.
-if test "${with_socks_include+set}" = set; then
-  withval="$with_socks_include"
-  if test "$withval" = "yes" -o "$withval" = "no"; then
-  { echo "configure: error: No argument for --with-socks-include" 1>&2; exit 1; }
-elif test "X$with_socks" = "X"; then
-  with_socks=yes
-fi
-
-fi
-
-
-
-: << END
-@@@syms="$syms SOCKS"@@@
-END
-
-if test -n "$with_socks"; then
-  cat >> confdefs.h <<\EOF
-#define SOCKS 1
-EOF
-
-  if test "$with_socks" != "yes"; then
-    socks_dir=$with_socks
-  fi
-  if test -n "$with_socks_include"; then
-    trydir=$with_socks_include
-  elif test "$with_socks" != "yes"; then
-    trydir="$with_socks $with_socks/include"
-  else
-    trydir=
-  fi
-  found=
-  for i in $trydir ""; do
-    if test -n "$i"; then
-      if test -f $i/socks.h; then
-        found=yes; res=$i; break
-      fi
-    else
-      cat > conftest.$ac_ext <<EOF
-#line 1287 "configure"
-#include "confdefs.h"
-#include <socks.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1292: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  found=yes; res=$i; break
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-    fi
-  done
-  if test -n "$found"; then
-    socks_include=$res
-  else
-    { echo "configure: error: Cannot find socks.h" 1>&2; exit 1; }
-  fi
-  if test -n "$with_socks_lib"; then
-    trydir=$with_socks_lib
-  elif test "$with_socks" != "yes"; then
-    trydir="$with_socks $with_socks/lib"
-  else
-    trydir=
-  fi
-  found=
-  for i in $trydir ""; do
-    if test -n "$i"; then
-      if test -f $i/libsocks5.a; then
-        found=yes; res=$i; break
-      fi
-    else
-      old_LIBS=$LIBS
-      LIBS="-lsocks5 $LIBS"
-      cat > conftest.$ac_ext <<EOF
-#line 1327 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:1334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  found=yes; res=$i; LIBS=$old_LIBS; break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-      LIBS=$old_LIBS
-    fi
-  done
-  if test -n "$found"; then
-    socks_lib=$res
-  else
-    { echo "configure: error: Cannot find libsocks5.a" 1>&2; exit 1; }
-  fi
-  echo "$ac_t""headers $socks_include, libraries $socks_lib" 1>&6
-  cat >> confdefs.h <<EOF
-#define SOCKS 1
-EOF
-
-  if test -n "$socks_include"; then
-    SOCKSINCLUDE="-I$socks_include"
-  fi
-  
-  if test -n "$socks_lib"; then
-    SOCKSLIB="-L$socks_lib"
-  fi
-  SOCKSLIB="$SOCKSLIB -lsocks5"
-  
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-CFLAGS="$SOCKSINCLUDE $CFLAGS"
-LIBS="$SOCKSLIB $LIBS"
-
-# Check whether --with-shared or --without-shared was given.
-if test "${with_shared+set}" = set; then
-  withval="$with_shared"
-  :
-fi
-
-
-# Check whether --with-cracklib or --without-cracklib was given.
-if test "${with_cracklib+set}" = set; then
-  withval="$with_cracklib"
-  :
-fi
-
-
-# Check whether --with-dictpath or --without-dictpath was given.
-if test "${with_dictpath+set}" = set; then
-  withval="$with_dictpath"
-  :
-fi
-
-
-(test -z "$with_cracklib" && test -n "$with_dictpath") ||
-(test -n "$with_cracklib" && test -z "$with_dictpath") &&
-{ echo "configure: error: --with-cracklib requires --with-dictpath and vice versa" 1>&2; exit 1; }
-test -n "$with_cracklib" &&
-CRACKLIB="-L$with_cracklib -lcrack" &&
-echo "$ac_t""Using cracklib in $with_cracklib" 1>&6
-test -n "$with_dictpath" &&
-echo "$ac_t""Using dictpath=$with_dictpath" 1>&6 &&
-cat >> confdefs.h <<EOF
-#define DICTPATH "$with_dictpath"
-EOF
-
-
-# Check whether --with-mailspool or --without-mailspool was given.
-if test "${with_mailspool+set}" = set; then
-  withval="$with_mailspool"
-  :
-fi
-
-
-test -n "$with_mailspool" &&
-cat >> confdefs.h <<EOF
-#define KRB4_MAILDIR "$with_mailspool"
-EOF
-
-
-# Check whether --enable-random-mkey or --disable-random-mkey was given.
-if test "${enable_random_mkey+set}" = set; then
-  enableval="$enable_random_mkey"
-  
-if test "$enableval" = "yes"; then
-	cat >> confdefs.h <<\EOF
-#define RANDOM_MKEY 1
-EOF
-
-fi
-
-fi
-
-
-# Check whether --with-mkey or --without-mkey was given.
-if test "${with_mkey+set}" = set; then
-  withval="$with_mkey"
-  
-if test -n "$withval"; then
-	cat >> confdefs.h <<EOF
-#define MKEYFILE "$withval"
-EOF
-
-fi
-
-fi
-
-
-berkeley_db=db
-# Check whether --with-berkeley-db or --without-berkeley-db was given.
-if test "${with_berkeley_db+set}" = set; then
-  withval="$with_berkeley_db"
-  
-if test "$withval" = no; then
-	berkeley_db=""
-fi
-
-fi
-
-
-afs_support=yes
-# Check whether --with-afs-support or --without-afs-support was given.
-if test "${with_afs_support+set}" = set; then
-  withval="$with_afs_support"
-  
-if test "$withval" = no; then
-	cat >> confdefs.h <<\EOF
-#define NO_AFS 1
-EOF
-
-	afs_support=no
-fi
-
-fi
-
-
-des_quad=guess
-# Check whether --with-des-quad-checksum or --without-des-quad-checksum was given.
-if test "${with_des_quad_checksum+set}" = set; then
-  withval="$with_des_quad_checksum"
-  
-des_quad="$withval"
-
-fi
-
-if test "$des_quad" = "new"; then
-	cat >> confdefs.h <<\EOF
-#define DES_QUAD_DEFAULT DES_QUAD_NEW
-EOF
-
-elif test "$des_quad" = "old"; then
-	cat >> confdefs.h <<\EOF
-#define DES_QUAD_DEFAULT DES_QUAD_OLD
-EOF
-
-else
-	cat >> confdefs.h <<\EOF
-#define DES_QUAD_DEFAULT DES_QUAD_GUESS
-EOF
-
-fi	
-
-
-echo $ac_n "checking for readline""... $ac_c" 1>&6
-echo "configure:1503: checking for readline" >&5
-# Check whether --with-readline or --without-readline was given.
-if test "${with_readline+set}" = set; then
-  withval="$with_readline"
-  if test "$with_readline" = "no"; then
-  with_readline=
-fi
-
-fi
-
-# Check whether --with-readline-lib or --without-readline-lib was given.
-if test "${with_readline_lib+set}" = set; then
-  withval="$with_readline_lib"
-  if test "$withval" = "yes" -o "$withval" = "no"; then
-  { echo "configure: error: No argument for --with-readline-lib" 1>&2; exit 1; }
-elif test "X$with_readline" = "X"; then
-  with_readline=yes
-fi
-
-fi
-
-# Check whether --with-readline-include or --without-readline-include was given.
-if test "${with_readline_include+set}" = set; then
-  withval="$with_readline_include"
-  if test "$withval" = "yes" -o "$withval" = "no"; then
-  { echo "configure: error: No argument for --with-readline-include" 1>&2; exit 1; }
-elif test "X$with_readline" = "X"; then
-  with_readline=yes
-fi
-
-fi
-
-
-
-: << END
-@@@syms="$syms READLINE"@@@
-END
-
-if test -n "$with_readline"; then
-  cat >> confdefs.h <<\EOF
-#define READLINE 1
-EOF
-
-  if test "$with_readline" != "yes"; then
-    readline_dir=$with_readline
-  fi
-  if test -n "$with_readline_include"; then
-    trydir=$with_readline_include
-  elif test "$with_readline" != "yes"; then
-    trydir="$with_readline $with_readline/include"
-  else
-    trydir=
-  fi
-  found=
-  for i in $trydir ""; do
-    if test -n "$i"; then
-      if test -f $i/readline.h; then
-        found=yes; res=$i; break
-      fi
-    else
-      cat > conftest.$ac_ext <<EOF
-#line 1564 "configure"
-#include "confdefs.h"
-#include <readline.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  found=yes; res=$i; break
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-    fi
-  done
-  if test -n "$found"; then
-    readline_include=$res
-  else
-    { echo "configure: error: Cannot find readline.h" 1>&2; exit 1; }
-  fi
-  if test -n "$with_readline_lib"; then
-    trydir=$with_readline_lib
-  elif test "$with_readline" != "yes"; then
-    trydir="$with_readline $with_readline/lib"
-  else
-    trydir=
-  fi
-  found=
-  for i in $trydir ""; do
-    if test -n "$i"; then
-      if test -f $i/libreadline.a; then
-        found=yes; res=$i; break
-      fi
-    else
-      old_LIBS=$LIBS
-      LIBS="-lreadline $LIBS"
-      cat > conftest.$ac_ext <<EOF
-#line 1604 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:1611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  found=yes; res=$i; LIBS=$old_LIBS; break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-      LIBS=$old_LIBS
-    fi
-  done
-  if test -n "$found"; then
-    readline_lib=$res
-  else
-    { echo "configure: error: Cannot find libreadline.a" 1>&2; exit 1; }
-  fi
-  echo "$ac_t""headers $readline_include, libraries $readline_lib" 1>&6
-  cat >> confdefs.h <<EOF
-#define READLINE 1
-EOF
-
-  if test -n "$readline_include"; then
-    READLINEINCLUDE="-I$readline_include"
-  fi
-  
-  if test -n "$readline_lib"; then
-    READLINELIB="-L$readline_lib"
-  fi
-  READLINELIB="$READLINELIB -lreadline"
-  
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-
-
-case ${with_shared} in
-  yes ) with_shared=yes;;
-  no  ) with_shared=no;;
-  *   ) with_shared=no;;
-esac
-
-# NOTE: Building shared libraries may not work if you do not use gcc!
-#
-# OS		$SHLIBEXT
-# HP-UX		sl
-# Linux		so
-# NetBSD	so
-# FreeBSD	so
-# OSF		so
-# SunOS5	so
-# SunOS4	so.0.5
-# Irix		so
-#
-# LIBEXT is the extension we should build (.a or $SHLIBEXT)
-REAL_PICFLAGS="-fpic"
-LDSHARED='$(CC) $(PICFLAGS) -shared'
-LIBPREFIX=lib
-REAL_SHLIBEXT=so
-SHLIB_VERSION=`echo $VERSION | sed 's/\([0-9.]*\).*/\1/'`
-case "${host}" in
-*-*-hpux*)
-	REAL_SHLIBEXT=sl
-	REAL_LD_FLAGS='-Wl,+b$(libdir)'
-	if test -z "$GCC"; then
-		LDSHARED="ld -b"
-		REAL_PICFLAGS="+z"
-	fi
-	;;
-*-*-linux*)
-	REAL_LD_FLAGS='-Wl,-rpath,$(libdir)'
-	;;
-*-*-*bsd*)
-	REAL_SHLIBEXT=so.$SHLIB_VERSION
-	LDSHARED='ld -Bshareable'
-	REAL_LD_FLAGS='-Wl,-R$(libdir)'
-	;;
-*-*-osf*)
-	REAL_LD_FLAGS='-Wl,-rpath,$(libdir)'
-	REAL_PICFLAGS=
-	LDSHARED='ld -shared -expect_unresolved \*'
-	;;
-*-*-solaris2*)
-	REAL_LD_FLAGS='-Wl,-R$(libdir)'
-	if test -z "$GCC"; then
-		LDSHARED='$(CC) -G'
-		REAL_PICFLAGS="-Kpic"
-	fi
-	;;
-*-*-sunos*)
-	REAL_SHLIBEXT=so.$SHLIB_VERSION
-	REAL_LD_FLAGS='-Wl,-L$(libdir)'
-	;;
-*-*-irix*)
-	REAL_LD_FLAGS='-Wl,-rpath,$(libdir)'
-	REAL_PICFLAGS=
-	;;
-*-*-os2_emx*)
-	LD_FLAGS='-Zexe'
-	LIBPREFIX=
-	EXECSUFFIX='.exe'
-	RANLIB=EMXOMF
-	REAL_SHLIBEXT=nobuild
-	;;
-*-*-cygwin32*)
-	EXECSUFFIX='.exe'
-	REAL_SHLIBEXT=nobuild
-	;;
-*)	REAL_SHLIBEXT=nobuild
-	REAL_PICFLAGS= 
-	;;
-esac
-
-if test "${with_shared}" != "yes" ; then 
- PICFLAGS=""
- SHLIBEXT="nobuild"
- LIBEXT="a"
-else
- PICFLAGS="$REAL_PICFLAGS"
- SHLIBEXT="$REAL_SHLIBEXT"
- LIBEXT="$SHLIBEXT"
- LD_FLAGS="$REAL_LD_FLAGS"
-fi
-
-   
-       
-
-
-if test "${with_shared}" = "yes"; then
-echo $ac_n "checking for pragma weak""... $ac_c" 1>&6
-echo "configure:1743: checking for pragma weak" >&5
-if eval "test \"`echo '$''{'ac_have_pragma_weak'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-ac_have_pragma_weak=no
-cat > conftest_foo.$ac_ext <<'EOF'
-#line 1750 "configure"
-#include "confdefs.h"
-#pragma weak foo = _foo
-int _foo = 17;
-EOF
-cat > conftest_bar.$ac_ext <<'EOF'
-#line 1756 "configure"
-#include "confdefs.h"
-extern int foo;
-
-int t() {
-  return foo;
-}
-
-int main() {
-  return t();
-}
-EOF
-if { (eval echo configure:1768: \"$'CC -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest_foo.$ac_ext conftest_bar.$ac_ext 1>&5'\") 1>&5; (eval $'CC -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest_foo.$ac_ext conftest_bar.$ac_ext 1>&5') 2>&5; }; then
-ac_have_pragma_weak=yes
-fi
-rm -rf conftest*
-
-fi
-
-if test "$ac_have_pragma_weak" = "yes"; then
-	cat >> confdefs.h <<\EOF
-#define HAVE_PRAGMA_WEAK 1
-EOF
-fi
-echo "$ac_t""$ac_have_pragma_weak" 1>&6
-fi
-
-
-echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:1785: checking whether byte ordering is bigendian" >&5
-if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_cv_c_bigendian=unknown
-# See if sys/param.h defines the BYTE_ORDER macro.
-cat > conftest.$ac_ext <<EOF
-#line 1792 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/param.h>
-int main() {
-
-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
- bogus endian macros
-#endif
-; return 0; }
-EOF
-if { (eval echo configure:1803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  # It does; now see whether it defined to BIG_ENDIAN or not.
-cat > conftest.$ac_ext <<EOF
-#line 1807 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/param.h>
-int main() {
-
-#if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
-; return 0; }
-EOF
-if { (eval echo configure:1818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_c_bigendian=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_c_bigendian=no
-fi
-rm -f conftest*
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-if test $ac_cv_c_bigendian = unknown; then
-if test "$cross_compiling" = yes; then
-    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1838 "configure"
-#include "confdefs.h"
-main () {
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long l;
-    char c[sizeof (long)];
-  } u;
-  u.l = 1;
-  exit (u.c[sizeof (long) - 1] == 1);
-}
-EOF
-if { (eval echo configure:1851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_c_bigendian=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_c_bigendian=yes
-fi
-rm -fr conftest*
-fi
-
-fi
-fi
-
-echo "$ac_t""$ac_cv_c_bigendian" 1>&6
-if test $ac_cv_c_bigendian = yes; then
-  cat >> confdefs.h <<\EOF
-#define WORDS_BIGENDIAN 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1876: checking for working const" >&5
-if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1881 "configure"
-#include "confdefs.h"
-
-int main() {
-
-/* Ultrix mips cc rejects this.  */
-typedef int charset[2]; const charset x;
-/* SunOS 4.1.1 cc rejects this.  */
-char const *const *ccp;
-char **p;
-/* NEC SVR4.0.2 mips cc rejects this.  */
-struct point {int x, y;};
-static struct point const zero = {0,0};
-/* AIX XL C 1.02.0.0 rejects this.
-   It does not let you subtract one const X* pointer from another in an arm
-   of an if-expression whose if-part is not a constant expression */
-const char *g = "string";
-ccp = &g + (g ? g-g : 0);
-/* HPUX 7.0 cc rejects these. */
-++ccp;
-p = (char**) ccp;
-ccp = (char const *const *) p;
-{ /* SCO 3.2v4 cc rejects this.  */
-  char *t;
-  char const *s = 0 ? (char *) 0 : (char const *) 0;
-
-  *t++ = 0;
-}
-{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-  int x[] = {25, 17};
-  const int *foo = &x[0];
-  ++foo;
-}
-{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-  typedef const int *iptr;
-  iptr p = 0;
-  ++p;
-}
-{ /* AIX XL C 1.02.0.0 rejects this saying
-     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-  struct s { int j; const int *ap[3]; };
-  struct s *b; b->j = 5;
-}
-{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-  const int foo = 10;
-}
-
-; return 0; }
-EOF
-if { (eval echo configure:1930: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_c_const=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_c_const=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_c_const" 1>&6
-if test $ac_cv_c_const = no; then
-  cat >> confdefs.h <<\EOF
-#define const 
-EOF
-
-fi
-
-
-
-
-echo $ac_n "checking for NEXTSTEP""... $ac_c" 1>&6
-echo "configure:1954: checking for NEXTSTEP" >&5
-if eval "test \"`echo '$''{'krb_cv_sys_nextstep'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1959 "configure"
-#include "confdefs.h"
-#ifdef NeXT
-	yes
-#endif 
-
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "yes" >/dev/null 2>&1; then
-  rm -rf conftest*
-  krb_cv_sys_nextstep=yes
-else
-  rm -rf conftest*
-  krb_cv_sys_nextstep=no
-fi
-rm -f conftest*
- 
-fi
-
-if test "$krb_cv_sys_nextstep" = "yes"; then
-  CFLAGS="$CFLAGS -posix"
-  LIBS="$LIBS -posix"
-fi
-echo "$ac_t""$krb_cv_sys_nextstep" 1>&6
-
-
-echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:1986: checking for AIX" >&5
-if eval "test \"`echo '$''{'krb_cv_sys_aix'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1991 "configure"
-#include "confdefs.h"
-#ifdef _AIX
-	yes
-#endif 
-
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "yes" >/dev/null 2>&1; then
-  rm -rf conftest*
-  krb_cv_sys_aix=yes
-else
-  rm -rf conftest*
-  krb_cv_sys_aix=no
-fi
-rm -f conftest*
- 
-fi
-
-echo "$ac_t""$krb_cv_sys_aix" 1>&6
-
-
-if test "$krb_cv_sys_aix" = yes ;then
-	AFS_EXTRA_OBJS='$(srcdir)/afsl.exp dlfcn.o'
-	
-	AFS_EXTRA_LIBS=afslib.so
-	
-fi
-
-#
-# AIX needs /lib/pse.exp for getmsg, but alas that file is broken in
-# AIX414
-#
-
-if test -f /lib/pse.exp ;then
-	LIBS="$LIBS -Wl,-bI:/lib/pse.exp"
-fi
-
-
-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2031: checking for ANSI C header files" >&5
-if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2036 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2044: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  ac_cv_header_stdc=yes
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 2061 "configure"
-#include "confdefs.h"
-#include <string.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "memchr" >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 2079 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "free" >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-if test "$cross_compiling" = yes; then
-  :
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2100 "configure"
-#include "confdefs.h"
-#include <ctype.h>
-#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int main () { int i; for (i = 0; i < 256; i++)
-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
-exit (0); }
-
-EOF
-if { (eval echo configure:2111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  :
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_header_stdc=no
-fi
-rm -fr conftest*
-fi
-
-fi
-fi
-
-echo "$ac_t""$ac_cv_header_stdc" 1>&6
-if test $ac_cv_header_stdc = yes; then
-  cat >> confdefs.h <<\EOF
-#define STDC_HEADERS 1
-EOF
-
-fi
-
-
-for ac_hdr in arpa/ftp.h arpa/inet.h arpa/nameser.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2139: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2144 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2149: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in arpa/telnet.h bind/bitypes.h bsd/bsd.h bsdsetjmp.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2179: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2184 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in crypt.h dbm.h dirent.h err.h fcntl.h grp.h io.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2219: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2224 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in lastlog.h login.h maillock.h ndbm.h net/if.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2259: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2264 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in net/if_tun.h net/if_var.h netdb.h netinet/in.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2299: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2304 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2309: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in netinet/in6_machtypes.h netinet/in_systm.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2339: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2344 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2349: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in netinet/ip.h netinet/tcp.h paths.h pty.h pwd.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2379: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2384 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in resolv.h rpcsvc/dbm.h sac.h security/pam_modules.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2419: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2424 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2429: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in shadow.h siad.h signal.h stropts.h sys/bitypes.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2459: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2464 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2469: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in sys/category.h sys/cdefs.h sys/file.h sys/filio.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2499: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2504 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2509: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in sys/ioccom.h sys/ioctl.h sys/locking.h sys/mman.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2539: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2544 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2549: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in sys/param.h sys/proc.h sys/ptyio.h sys/ptyvar.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2579: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2584 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in sys/resource.h sys/select.h sys/socket.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2619: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2624 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2629: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in sys/sockio.h sys/stat.h sys/str_tty.h sys/stream.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2659: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2664 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2669: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in sys/stropts.h sys/strtty.h sys/syscall.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2699: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2704 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2709: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in sys/sysctl.h sys/termio.h sys/time.h sys/timeb.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2739: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2744 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in sys/times.h sys/tty.h sys/types.h sys/uio.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2779: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2784 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2789: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in sys/un.h sys/utsname.h sys/wait.h syslog.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2819: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2824 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2829: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in termio.h termios.h tmpdir.h ttyent.h udb.h ulimit.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2859: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2864 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in unistd.h userpw.h usersec.h util.h utime.h utmp.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2899: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2904 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2909: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in utmpx.h wait.h winsock.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2939: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2944 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2949: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-
-echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:2977: checking whether time.h and sys/time.h may both be included" >&5
-if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2982 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
-int main() {
-struct tm *tp;
-; return 0; }
-EOF
-if { (eval echo configure:2991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_header_time=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_header_time=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_header_time" 1>&6
-if test $ac_cv_header_time = yes; then
-  cat >> confdefs.h <<\EOF
-#define TIME_WITH_SYS_TIME 1
-EOF
-
-fi
-
-echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:3012: checking for sys_siglist declaration in signal.h or unistd.h" >&5
-if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3017 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <signal.h>
-/* NetBSD declares sys_siglist in unistd.h.  */
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-int main() {
-char *msg = *(sys_siglist + 1);
-; return 0; }
-EOF
-if { (eval echo configure:3029: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_decl_sys_siglist=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_decl_sys_siglist=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_decl_sys_siglist" 1>&6
-if test $ac_cv_decl_sys_siglist = yes; then
-  cat >> confdefs.h <<\EOF
-#define SYS_SIGLIST_DECLARED 1
-EOF
-
-fi
-
-
-
-for i in int8_t int16_t int32_t int64_t; do
-	echo $ac_n "checking for $i""... $ac_c" 1>&6
-echo "configure:3053: checking for $i" >&5
-	
-if eval "test \"`echo '$''{'ac_cv_type_$i'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3059 "configure"
-#include "confdefs.h"
-
-#include "confdefs.h"
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-#ifdef HAVE_BIND_BITYPES_H
-#include <bind/bitypes.h>
-#endif
-#ifdef HAVE_NETINET_IN6_MACHTYPES_H
-#include <netinet/in6_machtypes.h>
-#endif
-
-int main() {
-$i x;
-
-; return 0; }
-EOF
-if { (eval echo configure:3081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  eval ac_cv_type_$i=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval ac_cv_type_$i=no
-fi
-rm -f conftest*
-fi
-
-	eval ac_res=\$ac_cv_type_$i
-	if test "$ac_res" = yes; then
-		type=HAVE_`echo $i | tr 'a-z' 'A-Z'`
-		cat >> confdefs.h <<EOF
-#define $type 1
-EOF
-
-	fi
-	echo "$ac_t""$ac_res" 1>&6
-done
-
-
-for i in u_int8_t u_int16_t u_int32_t u_int64_t; do
-	echo $ac_n "checking for $i""... $ac_c" 1>&6
-echo "configure:3107: checking for $i" >&5
-	
-if eval "test \"`echo '$''{'ac_cv_type_$i'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3113 "configure"
-#include "confdefs.h"
-
-#include "confdefs.h"
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-#ifdef HAVE_BIND_BITYPES_H
-#include <bind/bitypes.h>
-#endif
-#ifdef HAVE_NETINET_IN6_MACHTYPES_H
-#include <netinet/in6_machtypes.h>
-#endif
-
-int main() {
-$i x;
-
-; return 0; }
-EOF
-if { (eval echo configure:3135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  eval ac_cv_type_$i=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval ac_cv_type_$i=no
-fi
-rm -f conftest*
-fi
-
-	eval ac_res=\$ac_cv_type_$i
-	if test "$ac_res" = yes; then
-		type=HAVE_`echo $i | tr 'a-z' 'A-Z'`
-		cat >> confdefs.h <<EOF
-#define $type 1
-EOF
-
-	fi
-	echo "$ac_t""$ac_res" 1>&6
-done
-
-
-
-
-
-
-
-echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:3165: checking for socket" >&5
-if eval "test \"`echo '$''{'ac_cv_funclib_socket'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-if eval "test \"\$ac_cv_func_socket\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in "" socket; do
-		if test -n "$ac_lib"; then 
-			ac_lib="-l$ac_lib"
-			LIBS="$ac_lib $ac_save_LIBS"
-		fi
-		cat > conftest.$ac_ext <<EOF
-#line 3178 "configure"
-#include "confdefs.h"
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-int main() {
-socket(0,0,0)
-; return 0; }
-EOF
-if { (eval echo configure:3190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_socket=$ac_lib; else ac_cv_funclib_socket=yes; fi";break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-	done
-	eval "ac_cv_funclib_socket=\${ac_cv_funclib_socket-no}"
-	LIBS="$ac_save_LIBS"
-fi
-
-fi
-
-
-eval "ac_res=\$ac_cv_funclib_socket"
-
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs socket"@@@
-@@@libs="$libs socket"@@@
-END
-
-eval "ac_tr_func=HAVE_`echo socket | tr '[a-z]' '[A-Z]'`"
-eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr '[a-z]' '[A-Z]'`"
-eval "LIB_socket=$ac_res"
-
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_socket=yes"
-	eval "LIB_socket="
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	echo "$ac_t""yes" 1>&6
-	;;
-	no)
-	eval "ac_cv_func_socket=no"
-	eval "LIB_socket="
-	echo "$ac_t""no" 1>&6
-	;;
-	*)
-	eval "ac_cv_func_socket=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-	echo "$ac_t""yes, in $ac_res" 1>&6
-	;;
-esac
-
-
-if test -n "$LIB_socket"; then
-	LIBS="$LIB_socket $LIBS"
-fi
-
-
-
-
-echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:3257: checking for gethostbyname" >&5
-if eval "test \"`echo '$''{'ac_cv_funclib_gethostbyname'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-if eval "test \"\$ac_cv_func_gethostbyname\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in "" nsl; do
-		if test -n "$ac_lib"; then 
-			ac_lib="-l$ac_lib"
-			LIBS="$ac_lib $ac_save_LIBS"
-		fi
-		cat > conftest.$ac_ext <<EOF
-#line 3270 "configure"
-#include "confdefs.h"
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-int main() {
-gethostbyname("foo")
-; return 0; }
-EOF
-if { (eval echo configure:3282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_gethostbyname=$ac_lib; else ac_cv_funclib_gethostbyname=yes; fi";break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-	done
-	eval "ac_cv_funclib_gethostbyname=\${ac_cv_funclib_gethostbyname-no}"
-	LIBS="$ac_save_LIBS"
-fi
-
-fi
-
-
-eval "ac_res=\$ac_cv_funclib_gethostbyname"
-
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs gethostbyname"@@@
-@@@libs="$libs nsl"@@@
-END
-
-eval "ac_tr_func=HAVE_`echo gethostbyname | tr '[a-z]' '[A-Z]'`"
-eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr '[a-z]' '[A-Z]'`"
-eval "LIB_gethostbyname=$ac_res"
-
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_gethostbyname=yes"
-	eval "LIB_gethostbyname="
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	echo "$ac_t""yes" 1>&6
-	;;
-	no)
-	eval "ac_cv_func_gethostbyname=no"
-	eval "LIB_gethostbyname="
-	echo "$ac_t""no" 1>&6
-	;;
-	*)
-	eval "ac_cv_func_gethostbyname=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-	echo "$ac_t""yes, in $ac_res" 1>&6
-	;;
-esac
-
-
-if test -n "$LIB_gethostbyname"; then
-	LIBS="$LIB_gethostbyname $LIBS"
-fi
-
-
-
-
-
-
-echo $ac_n "checking for odm_initialize""... $ac_c" 1>&6
-echo "configure:3351: checking for odm_initialize" >&5
-if eval "test \"`echo '$''{'ac_cv_funclib_odm_initialize'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-if eval "test \"\$ac_cv_func_odm_initialize\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in "" odm; do
-		if test -n "$ac_lib"; then 
-			ac_lib="-l$ac_lib"
-			LIBS="$ac_lib $ac_save_LIBS"
-		fi
-		cat > conftest.$ac_ext <<EOF
-#line 3364 "configure"
-#include "confdefs.h"
-
-int main() {
-odm_initialize()
-; return 0; }
-EOF
-if { (eval echo configure:3371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_odm_initialize=$ac_lib; else ac_cv_funclib_odm_initialize=yes; fi";break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-	done
-	eval "ac_cv_funclib_odm_initialize=\${ac_cv_funclib_odm_initialize-no}"
-	LIBS="$ac_save_LIBS"
-fi
-
-fi
-
-
-eval "ac_res=\$ac_cv_funclib_odm_initialize"
-
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs odm_initialize"@@@
-@@@libs="$libs odm"@@@
-END
-
-eval "ac_tr_func=HAVE_`echo odm_initialize | tr '[a-z]' '[A-Z]'`"
-eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr '[a-z]' '[A-Z]'`"
-eval "LIB_odm_initialize=$ac_res"
-
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_odm_initialize=yes"
-	eval "LIB_odm_initialize="
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	echo "$ac_t""yes" 1>&6
-	;;
-	no)
-	eval "ac_cv_func_odm_initialize=no"
-	eval "LIB_odm_initialize="
-	echo "$ac_t""no" 1>&6
-	;;
-	*)
-	eval "ac_cv_func_odm_initialize=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-	echo "$ac_t""yes, in $ac_res" 1>&6
-	;;
-esac
-
-
-if test -n "$LIB_odm_initialize"; then
-	LIBS="$LIB_odm_initialize $LIBS"
-fi
-
-
-
-
-echo $ac_n "checking for getattr""... $ac_c" 1>&6
-echo "configure:3438: checking for getattr" >&5
-if eval "test \"`echo '$''{'ac_cv_funclib_getattr'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-if eval "test \"\$ac_cv_func_getattr\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in "" cfg; do
-		if test -n "$ac_lib"; then 
-			ac_lib="-l$ac_lib"
-			LIBS="$ac_lib $ac_save_LIBS"
-		fi
-		cat > conftest.$ac_ext <<EOF
-#line 3451 "configure"
-#include "confdefs.h"
-
-int main() {
-getattr()
-; return 0; }
-EOF
-if { (eval echo configure:3458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_getattr=$ac_lib; else ac_cv_funclib_getattr=yes; fi";break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-	done
-	eval "ac_cv_funclib_getattr=\${ac_cv_funclib_getattr-no}"
-	LIBS="$ac_save_LIBS"
-fi
-
-fi
-
-
-eval "ac_res=\$ac_cv_funclib_getattr"
-
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs getattr"@@@
-@@@libs="$libs cfg"@@@
-END
-
-eval "ac_tr_func=HAVE_`echo getattr | tr '[a-z]' '[A-Z]'`"
-eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr '[a-z]' '[A-Z]'`"
-eval "LIB_getattr=$ac_res"
-
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_getattr=yes"
-	eval "LIB_getattr="
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	echo "$ac_t""yes" 1>&6
-	;;
-	no)
-	eval "ac_cv_func_getattr=no"
-	eval "LIB_getattr="
-	echo "$ac_t""no" 1>&6
-	;;
-	*)
-	eval "ac_cv_func_getattr=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-	echo "$ac_t""yes, in $ac_res" 1>&6
-	;;
-esac
-
-
-if test -n "$LIB_getattr"; then
-	LIBS="$LIB_getattr $LIBS"
-fi
-
-
-
-
-echo $ac_n "checking for setpcred""... $ac_c" 1>&6
-echo "configure:3525: checking for setpcred" >&5
-if eval "test \"`echo '$''{'ac_cv_funclib_setpcred'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-if eval "test \"\$ac_cv_func_setpcred\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in "" s; do
-		if test -n "$ac_lib"; then 
-			ac_lib="-l$ac_lib"
-			LIBS="$ac_lib $ac_save_LIBS"
-		fi
-		cat > conftest.$ac_ext <<EOF
-#line 3538 "configure"
-#include "confdefs.h"
-
-int main() {
-setpcred()
-; return 0; }
-EOF
-if { (eval echo configure:3545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_setpcred=$ac_lib; else ac_cv_funclib_setpcred=yes; fi";break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-	done
-	eval "ac_cv_funclib_setpcred=\${ac_cv_funclib_setpcred-no}"
-	LIBS="$ac_save_LIBS"
-fi
-
-fi
-
-
-eval "ac_res=\$ac_cv_funclib_setpcred"
-
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs setpcred"@@@
-@@@libs="$libs s"@@@
-END
-
-eval "ac_tr_func=HAVE_`echo setpcred | tr '[a-z]' '[A-Z]'`"
-eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr '[a-z]' '[A-Z]'`"
-eval "LIB_setpcred=$ac_res"
-
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_setpcred=yes"
-	eval "LIB_setpcred="
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	echo "$ac_t""yes" 1>&6
-	;;
-	no)
-	eval "ac_cv_func_setpcred=no"
-	eval "LIB_setpcred="
-	echo "$ac_t""no" 1>&6
-	;;
-	*)
-	eval "ac_cv_func_setpcred=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-	echo "$ac_t""yes, in $ac_res" 1>&6
-	;;
-esac
-
-
-if test -n "$LIB_setpcred"; then
-	LIBS="$LIB_setpcred $LIBS"
-fi
-
-
-
-
-echo $ac_n "checking for logwtmp""... $ac_c" 1>&6
-echo "configure:3612: checking for logwtmp" >&5
-if eval "test \"`echo '$''{'ac_cv_funclib_logwtmp'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-if eval "test \"\$ac_cv_func_logwtmp\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in "" util; do
-		if test -n "$ac_lib"; then 
-			ac_lib="-l$ac_lib"
-			LIBS="$ac_lib $ac_save_LIBS"
-		fi
-		cat > conftest.$ac_ext <<EOF
-#line 3625 "configure"
-#include "confdefs.h"
-
-int main() {
-logwtmp()
-; return 0; }
-EOF
-if { (eval echo configure:3632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_logwtmp=$ac_lib; else ac_cv_funclib_logwtmp=yes; fi";break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-	done
-	eval "ac_cv_funclib_logwtmp=\${ac_cv_funclib_logwtmp-no}"
-	LIBS="$ac_save_LIBS"
-fi
-
-fi
-
-
-eval "ac_res=\$ac_cv_funclib_logwtmp"
-
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs logwtmp"@@@
-@@@libs="$libs util"@@@
-END
-
-eval "ac_tr_func=HAVE_`echo logwtmp | tr '[a-z]' '[A-Z]'`"
-eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr '[a-z]' '[A-Z]'`"
-eval "LIB_logwtmp=$ac_res"
-
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_logwtmp=yes"
-	eval "LIB_logwtmp="
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	echo "$ac_t""yes" 1>&6
-	;;
-	no)
-	eval "ac_cv_func_logwtmp=no"
-	eval "LIB_logwtmp="
-	echo "$ac_t""no" 1>&6
-	;;
-	*)
-	eval "ac_cv_func_logwtmp=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-	echo "$ac_t""yes, in $ac_res" 1>&6
-	;;
-esac
-
-
-if test -n "$LIB_logwtmp"; then
-	LIBS="$LIB_logwtmp $LIBS"
-fi
-
-
-
-
-
-echo $ac_n "checking for logout""... $ac_c" 1>&6
-echo "configure:3700: checking for logout" >&5
-if eval "test \"`echo '$''{'ac_cv_funclib_logout'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-if eval "test \"\$ac_cv_func_logout\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in "" util; do
-		if test -n "$ac_lib"; then 
-			ac_lib="-l$ac_lib"
-			LIBS="$ac_lib $ac_save_LIBS"
-		fi
-		cat > conftest.$ac_ext <<EOF
-#line 3713 "configure"
-#include "confdefs.h"
-
-int main() {
-logout()
-; return 0; }
-EOF
-if { (eval echo configure:3720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_logout=$ac_lib; else ac_cv_funclib_logout=yes; fi";break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-	done
-	eval "ac_cv_funclib_logout=\${ac_cv_funclib_logout-no}"
-	LIBS="$ac_save_LIBS"
-fi
-
-fi
-
-
-eval "ac_res=\$ac_cv_funclib_logout"
-
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs logout"@@@
-@@@libs="$libs util"@@@
-END
-
-eval "ac_tr_func=HAVE_`echo logout | tr '[a-z]' '[A-Z]'`"
-eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr '[a-z]' '[A-Z]'`"
-eval "LIB_logout=$ac_res"
-
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_logout=yes"
-	eval "LIB_logout="
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	echo "$ac_t""yes" 1>&6
-	;;
-	no)
-	eval "ac_cv_func_logout=no"
-	eval "LIB_logout="
-	echo "$ac_t""no" 1>&6
-	;;
-	*)
-	eval "ac_cv_func_logout=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-	echo "$ac_t""yes, in $ac_res" 1>&6
-	;;
-esac
-
-
-if test -n "$LIB_logout"; then
-	LIBS="$LIB_logout $LIBS"
-fi
-
-
-
-echo $ac_n "checking for tgetent""... $ac_c" 1>&6
-echo "configure:3786: checking for tgetent" >&5
-if eval "test \"`echo '$''{'ac_cv_funclib_tgetent'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-if eval "test \"\$ac_cv_func_tgetent\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in "" termcap; do
-		if test -n "$ac_lib"; then 
-			ac_lib="-l$ac_lib"
-			LIBS="$ac_lib $ac_save_LIBS"
-		fi
-		cat > conftest.$ac_ext <<EOF
-#line 3799 "configure"
-#include "confdefs.h"
-
-int main() {
-tgetent()
-; return 0; }
-EOF
-if { (eval echo configure:3806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_tgetent=$ac_lib; else ac_cv_funclib_tgetent=yes; fi";break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-	done
-	eval "ac_cv_funclib_tgetent=\${ac_cv_funclib_tgetent-no}"
-	LIBS="$ac_save_LIBS"
-fi
-
-fi
-
-
-eval "ac_res=\$ac_cv_funclib_tgetent"
-
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs tgetent"@@@
-@@@libs="$libs termcap"@@@
-END
-
-eval "ac_tr_func=HAVE_`echo tgetent | tr '[a-z]' '[A-Z]'`"
-eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr '[a-z]' '[A-Z]'`"
-eval "LIB_tgetent=$ac_res"
-
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_tgetent=yes"
-	eval "LIB_tgetent="
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	echo "$ac_t""yes" 1>&6
-	;;
-	no)
-	eval "ac_cv_func_tgetent=no"
-	eval "LIB_tgetent="
-	echo "$ac_t""no" 1>&6
-	;;
-	*)
-	eval "ac_cv_func_tgetent=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-	echo "$ac_t""yes, in $ac_res" 1>&6
-	;;
-esac
-
-
-	
-# If we find X, set shell vars x_includes and x_libraries to the
-# paths, otherwise set no_x=yes.
-# Uses ac_ vars as temps to allow command line to override cache and checks.
-# --without-x overrides everything else, but does not touch the cache.
-echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:3871: checking for X" >&5
-
-# Check whether --with-x or --without-x was given.
-if test "${with_x+set}" = set; then
-  withval="$with_x"
-  :
-fi
-
-# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
-if test "x$with_x" = xno; then
-  # The user explicitly disabled X.
-  have_x=disabled
-else
-  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
-    # Both variables are already set.
-    have_x=yes
-  else
-if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  # One or both of the vars are not set, and there is no cached value.
-ac_x_includes=NO ac_x_libraries=NO
-rm -fr conftestdir
-if mkdir conftestdir; then
-  cd conftestdir
-  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
-  cat > Imakefile <<'EOF'
-acfindx:
-	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
-EOF
-  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
-    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
-    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    for ac_extension in a so sl; do
-      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
-        test -f $ac_im_libdir/libX11.$ac_extension; then
-        ac_im_usrlibdir=$ac_im_libdir; break
-      fi
-    done
-    # Screen out bogus values from the imake configuration.  They are
-    # bogus both because they are the default anyway, and because
-    # using them would break gcc on systems where it needs fixed includes.
-    case "$ac_im_incroot" in
-	/usr/include) ;;
-	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;;
-    esac
-    case "$ac_im_usrlibdir" in
-	/usr/lib | /lib) ;;
-	*) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;;
-    esac
-  fi
-  cd ..
-  rm -fr conftestdir
-fi
-
-if test "$ac_x_includes" = NO; then
-  # Guess where to find include files, by looking for this one X11 .h file.
-  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
-
-  # First, try using that file with no special directory specified.
-cat > conftest.$ac_ext <<EOF
-#line 3933 "configure"
-#include "confdefs.h"
-#include <$x_direct_test_include>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  # We can compile using X headers with no special include directory.
-ac_x_includes=
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  # Look for the header file in a standard set of common directories.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-  for ac_dir in               \
-    /usr/X11/include          \
-    /usr/X11R6/include        \
-    /usr/X11R5/include        \
-    /usr/X11R4/include        \
-                              \
-    /usr/include/X11          \
-    /usr/include/X11R6        \
-    /usr/include/X11R5        \
-    /usr/include/X11R4        \
-                              \
-    /usr/local/X11/include    \
-    /usr/local/X11R6/include  \
-    /usr/local/X11R5/include  \
-    /usr/local/X11R4/include  \
-                              \
-    /usr/local/include/X11    \
-    /usr/local/include/X11R6  \
-    /usr/local/include/X11R5  \
-    /usr/local/include/X11R4  \
-                              \
-    /usr/X386/include         \
-    /usr/x386/include         \
-    /usr/XFree86/include/X11  \
-                              \
-    /usr/include              \
-    /usr/local/include        \
-    /usr/unsupported/include  \
-    /usr/athena/include       \
-    /usr/local/x11r5/include  \
-    /usr/lpp/Xamples/include  \
-                              \
-    /usr/openwin/include      \
-    /usr/openwin/share/include \
-    ; \
-  do
-    if test -r "$ac_dir/$x_direct_test_include"; then
-      ac_x_includes=$ac_dir
-      break
-    fi
-  done
-fi
-rm -f conftest*
-fi # $ac_x_includes = NO
-
-if test "$ac_x_libraries" = NO; then
-  # Check for the libraries.
-
-  test -z "$x_direct_test_library" && x_direct_test_library=Xt
-  test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
-
-  # See if we find them without any special options.
-  # Don't add to $LIBS permanently.
-  ac_save_LIBS="$LIBS"
-  LIBS="-l$x_direct_test_library $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4007 "configure"
-#include "confdefs.h"
-
-int main() {
-${x_direct_test_function}()
-; return 0; }
-EOF
-if { (eval echo configure:4014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  LIBS="$ac_save_LIBS"
-# We can link X programs with no special library path.
-ac_x_libraries=
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  LIBS="$ac_save_LIBS"
-# First see if replacing the include by lib works.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
-    /usr/X11/lib          \
-    /usr/X11R6/lib        \
-    /usr/X11R5/lib        \
-    /usr/X11R4/lib        \
-                          \
-    /usr/lib/X11          \
-    /usr/lib/X11R6        \
-    /usr/lib/X11R5        \
-    /usr/lib/X11R4        \
-                          \
-    /usr/local/X11/lib    \
-    /usr/local/X11R6/lib  \
-    /usr/local/X11R5/lib  \
-    /usr/local/X11R4/lib  \
-                          \
-    /usr/local/lib/X11    \
-    /usr/local/lib/X11R6  \
-    /usr/local/lib/X11R5  \
-    /usr/local/lib/X11R4  \
-                          \
-    /usr/X386/lib         \
-    /usr/x386/lib         \
-    /usr/XFree86/lib/X11  \
-                          \
-    /usr/lib              \
-    /usr/local/lib        \
-    /usr/unsupported/lib  \
-    /usr/athena/lib       \
-    /usr/local/x11r5/lib  \
-    /usr/lpp/Xamples/lib  \
-    /lib/usr/lib/X11	  \
-                          \
-    /usr/openwin/lib      \
-    /usr/openwin/share/lib \
-    ; \
-do
-  for ac_extension in a so sl; do
-    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
-      ac_x_libraries=$ac_dir
-      break 2
-    fi
-  done
-done
-fi
-rm -f conftest*
-fi # $ac_x_libraries = NO
-
-if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then
-  # Didn't find X anywhere.  Cache the known absence of X.
-  ac_cv_have_x="have_x=no"
-else
-  # Record where we found X for the cache.
-  ac_cv_have_x="have_x=yes \
-	        ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
-fi
-fi
-  fi
-  eval "$ac_cv_have_x"
-fi # $with_x != no
-
-if test "$have_x" != yes; then
-  echo "$ac_t""$have_x" 1>&6
-  no_x=yes
-else
-  # If each of the values was on the command line, it overrides each guess.
-  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
-  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
-  # Update the cache value to reflect the command line values.
-  ac_cv_have_x="have_x=yes \
-		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6
-fi
-
-if test "$no_x" = yes; then
-  # Not all programs may use this symbol, but it does not hurt to define it.
-  cat >> confdefs.h <<\EOF
-#define X_DISPLAY_MISSING 1
-EOF
-
-  X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
-else
-  if test -n "$x_includes"; then
-    X_CFLAGS="$X_CFLAGS -I$x_includes"
-  fi
-
-  # It would also be nice to do this for all -L options, not just this one.
-  if test -n "$x_libraries"; then
-    X_LIBS="$X_LIBS -L$x_libraries"
-    # For Solaris; some versions of Sun CC require a space after -R and
-    # others require no space.  Words are not sufficient . . . .
-    case "`(uname -sr) 2>/dev/null`" in
-    "SunOS 5"*)
-      echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:4120: checking whether -R must be followed by a space" >&5
-      ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
-      cat > conftest.$ac_ext <<EOF
-#line 4123 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:4130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  ac_R_nospace=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_R_nospace=no
-fi
-rm -f conftest*
-      if test $ac_R_nospace = yes; then
-	echo "$ac_t""no" 1>&6
-	X_LIBS="$X_LIBS -R$x_libraries"
-      else
-	LIBS="$ac_xsave_LIBS -R $x_libraries"
-	cat > conftest.$ac_ext <<EOF
-#line 4146 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:4153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  ac_R_space=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_R_space=no
-fi
-rm -f conftest*
-	if test $ac_R_space = yes; then
-	  echo "$ac_t""yes" 1>&6
-	  X_LIBS="$X_LIBS -R $x_libraries"
-	else
-	  echo "$ac_t""neither works" 1>&6
-	fi
-      fi
-      LIBS="$ac_xsave_LIBS"
-    esac
-  fi
-
-  # Check for system-dependent libraries X programs must link with.
-  # Do this before checking for the system-independent R6 libraries
-  # (-lICE), since we may need -lsocket or whatever for X linking.
-
-  if test "$ISC" = yes; then
-    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
-  else
-    # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X
-    # libraries were built with DECnet support.  And karl@cs.umb.edu says
-    # the Alpha needs dnet_stub (dnet does not exist).
-    echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:4185: checking for dnet_ntoa in -ldnet" >&5
-ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldnet  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4193 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char dnet_ntoa();
-
-int main() {
-dnet_ntoa()
-; return 0; }
-EOF
-if { (eval echo configure:4204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:4226: checking for dnet_ntoa in -ldnet_stub" >&5
-ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldnet_stub  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4234 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char dnet_ntoa();
-
-int main() {
-dnet_ntoa()
-; return 0; }
-EOF
-if { (eval echo configure:4245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-
-    # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-    # to get the SysV transport functions.
-    # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4)
-    # needs -lnsl.
-    # The nsl library prevents programs from opening the X display
-    # on Irix 5.2, according to dickey@clark.net.
-    echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:4274: checking for gethostbyname" >&5
-if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4279 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char gethostbyname(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char gethostbyname();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
-choke me
-#else
-gethostbyname();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:4302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_gethostbyname=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_gethostbyname=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    if test $ac_cv_func_gethostbyname = no; then
-      echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:4323: checking for gethostbyname in -lnsl" >&5
-ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lnsl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4331 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char gethostbyname();
-
-int main() {
-gethostbyname()
-; return 0; }
-EOF
-if { (eval echo configure:4342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-
-    # lieder@skyler.mavd.honeywell.com says without -lsocket,
-    # socket/setsockopt and other routines are undefined under SCO ODT
-    # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
-    # on later versions), says simon@lia.di.epfl.ch: it contains
-    # gethostby* variants that don't use the nameserver (or something).
-    # -lsocket must be given before -lnsl if both are needed.
-    # We assume that if connect needs -lnsl, so does gethostbyname.
-    echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:4372: checking for connect" >&5
-if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4377 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char connect(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char connect();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_connect) || defined (__stub___connect)
-choke me
-#else
-connect();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:4400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_connect=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_connect=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    if test $ac_cv_func_connect = no; then
-      echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:4421: checking for connect in -lsocket" >&5
-ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4429 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char connect();
-
-int main() {
-connect()
-; return 0; }
-EOF
-if { (eval echo configure:4440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-
-    # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
-    echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:4464: checking for remove" >&5
-if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4469 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char remove(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char remove();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_remove) || defined (__stub___remove)
-choke me
-#else
-remove();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:4492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_remove=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_remove=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    if test $ac_cv_func_remove = no; then
-      echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:4513: checking for remove in -lposix" >&5
-ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lposix  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4521 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char remove();
-
-int main() {
-remove()
-; return 0; }
-EOF
-if { (eval echo configure:4532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-
-    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:4556: checking for shmat" >&5
-if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4561 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shmat(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char shmat();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shmat) || defined (__stub___shmat)
-choke me
-#else
-shmat();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:4584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_shmat=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_shmat=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    if test $ac_cv_func_shmat = no; then
-      echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:4605: checking for shmat in -lipc" >&5
-ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lipc  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4613 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char shmat();
-
-int main() {
-shmat()
-; return 0; }
-EOF
-if { (eval echo configure:4624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-  fi
-
-  # Check for libraries that X11R6 Xt/Xaw programs need.
-  ac_save_LDFLAGS="$LDFLAGS"
-  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
-  # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-  # check for ICE first), but we must link in the order -lSM -lICE or
-  # we get undefined symbols.  So assume we have SM if we have ICE.
-  # These have to be linked with before -lX11, unlike the other
-  # libraries we check for below, so use a different variable.
-  #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
-  echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:4657: checking for IceConnectionNumber in -lICE" >&5
-ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lICE  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4665 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char IceConnectionNumber();
-
-int main() {
-IceConnectionNumber()
-; return 0; }
-EOF
-if { (eval echo configure:4676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  LDFLAGS="$ac_save_LDFLAGS"
-
-fi
-
-if test "$no_x" = "yes" ; then
-	MAKE_X_PROGS_BIN=""
-	MAKE_X_PROGS_LIBEXEC=""
-else
-	MAKE_X_PROGS_BIN='$(X_PROGS_BIN)'
-	MAKE_X_PROGS_LIBEXEC='$(X_PROGS_LIBEXEC)'
-fi
-
-save_CFLAGS="$CFLAGS"
-CFLAGS="$X_CFLAGS $CFLAGS"
-save_LIBS="$LIBS"
-LIBS="$X_PRE_LIBS $X_EXTRA_LIBS $LIBS"
-save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS $X_LIBS"
-
-
-
-echo $ac_n "checking for XauReadAuth""... $ac_c" 1>&6
-echo "configure:4718: checking for XauReadAuth" >&5
-if eval "test \"`echo '$''{'ac_cv_funclib_XauReadAuth'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-if eval "test \"\$ac_cv_func_XauReadAuth\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in "" Xau X11; do
-		if test -n "$ac_lib"; then 
-			ac_lib="-l$ac_lib"
-			LIBS="$ac_lib $ac_save_LIBS"
-		fi
-		cat > conftest.$ac_ext <<EOF
-#line 4731 "configure"
-#include "confdefs.h"
-
-int main() {
-XauReadAuth()
-; return 0; }
-EOF
-if { (eval echo configure:4738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_XauReadAuth=$ac_lib; else ac_cv_funclib_XauReadAuth=yes; fi";break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-	done
-	eval "ac_cv_funclib_XauReadAuth=\${ac_cv_funclib_XauReadAuth-no}"
-	LIBS="$ac_save_LIBS"
-fi
-
-fi
-
-
-eval "ac_res=\$ac_cv_funclib_XauReadAuth"
-
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs XauReadAuth"@@@
-@@@libs="$libs Xau X11"@@@
-END
-
-eval "ac_tr_func=HAVE_`echo XauReadAuth | tr '[a-z]' '[A-Z]'`"
-eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr '[a-z]' '[A-Z]'`"
-eval "LIB_XauReadAuth=$ac_res"
-
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_XauReadAuth=yes"
-	eval "LIB_XauReadAuth="
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	echo "$ac_t""yes" 1>&6
-	;;
-	no)
-	eval "ac_cv_func_XauReadAuth=no"
-	eval "LIB_XauReadAuth="
-	echo "$ac_t""no" 1>&6
-	;;
-	*)
-	eval "ac_cv_func_XauReadAuth=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-	echo "$ac_t""yes, in $ac_res" 1>&6
-	;;
-esac
-
-
-ac_xxx="$LIBS"
-LIBS="$LIB_XauReadAuth $LIBS"
-for ac_func in XauWriteAuth
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4802: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4807 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:4830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-if test "$ac_cv_func_XauWriteAuth" != "yes"; then
-  XauWriteAuth_c=writeauth.c
-  XauWriteAuth_o=writeauth.o
-fi
-LIBS="$ac_xxx"
-
-CFLAGS=$save_CFLAGS
-LIBS=$save_LIBS
-LDFLAGS=$save_LDFLAGS
-
-
-save_LIBS="$LIBS"
-
-
-echo $ac_n "checking for dbopen""... $ac_c" 1>&6
-echo "configure:4869: checking for dbopen" >&5
-if eval "test \"`echo '$''{'ac_cv_funclib_dbopen'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-if eval "test \"\$ac_cv_func_dbopen\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in "" $berkeley_db; do
-		if test -n "$ac_lib"; then 
-			ac_lib="-l$ac_lib"
-			LIBS="$ac_lib $ac_save_LIBS"
-		fi
-		cat > conftest.$ac_ext <<EOF
-#line 4882 "configure"
-#include "confdefs.h"
-
-int main() {
-dbopen()
-; return 0; }
-EOF
-if { (eval echo configure:4889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_dbopen=$ac_lib; else ac_cv_funclib_dbopen=yes; fi";break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-	done
-	eval "ac_cv_funclib_dbopen=\${ac_cv_funclib_dbopen-no}"
-	LIBS="$ac_save_LIBS"
-fi
-
-fi
-
-
-eval "ac_res=\$ac_cv_funclib_dbopen"
-
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs dbopen"@@@
-@@@libs="$libs $berkeley_db"@@@
-END
-
-eval "ac_tr_func=HAVE_`echo dbopen | tr '[a-z]' '[A-Z]'`"
-eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr '[a-z]' '[A-Z]'`"
-eval "LIB_dbopen=$ac_res"
-
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_dbopen=yes"
-	eval "LIB_dbopen="
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	echo "$ac_t""yes" 1>&6
-	;;
-	no)
-	eval "ac_cv_func_dbopen=no"
-	eval "LIB_dbopen="
-	echo "$ac_t""no" 1>&6
-	;;
-	*)
-	eval "ac_cv_func_dbopen=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-	echo "$ac_t""yes, in $ac_res" 1>&6
-	;;
-esac
-
-
-LIBS="$LIB_dbopen $LIBS"
-
-
-echo $ac_n "checking for dbm_firstkey""... $ac_c" 1>&6
-echo "configure:4952: checking for dbm_firstkey" >&5
-if eval "test \"`echo '$''{'ac_cv_funclib_dbm_firstkey'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-if eval "test \"\$ac_cv_func_dbm_firstkey\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in "" $berkeley_db gdbm ndbm; do
-		if test -n "$ac_lib"; then 
-			ac_lib="-l$ac_lib"
-			LIBS="$ac_lib $ac_save_LIBS"
-		fi
-		cat > conftest.$ac_ext <<EOF
-#line 4965 "configure"
-#include "confdefs.h"
-
-int main() {
-dbm_firstkey()
-; return 0; }
-EOF
-if { (eval echo configure:4972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_dbm_firstkey=$ac_lib; else ac_cv_funclib_dbm_firstkey=yes; fi";break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-	done
-	eval "ac_cv_funclib_dbm_firstkey=\${ac_cv_funclib_dbm_firstkey-no}"
-	LIBS="$ac_save_LIBS"
-fi
-
-fi
-
-
-eval "ac_res=\$ac_cv_funclib_dbm_firstkey"
-
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs dbm_firstkey"@@@
-@@@libs="$libs $berkeley_db gdbm ndbm"@@@
-END
-
-eval "ac_tr_func=HAVE_`echo dbm_firstkey | tr '[a-z]' '[A-Z]'`"
-eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr '[a-z]' '[A-Z]'`"
-eval "LIB_dbm_firstkey=$ac_res"
-
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_dbm_firstkey=yes"
-	eval "LIB_dbm_firstkey="
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	echo "$ac_t""yes" 1>&6
-	;;
-	no)
-	eval "ac_cv_func_dbm_firstkey=no"
-	eval "LIB_dbm_firstkey="
-	echo "$ac_t""no" 1>&6
-	;;
-	*)
-	eval "ac_cv_func_dbm_firstkey=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-	echo "$ac_t""yes, in $ac_res" 1>&6
-	;;
-esac
-
-
-if test -n "$LIB_dbopen"; then
-  LIB_DBM="$LIB_dbopen"
-else
-  LIB_DBM="$LIB_dbm_firstkey"
-fi
-LIBS="$save_LIBS"
-
-
-
-
-echo $ac_n "checking for syslog""... $ac_c" 1>&6
-echo "configure:5042: checking for syslog" >&5
-if eval "test \"`echo '$''{'ac_cv_funclib_syslog'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-if eval "test \"\$ac_cv_func_syslog\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in "" syslog; do
-		if test -n "$ac_lib"; then 
-			ac_lib="-l$ac_lib"
-			LIBS="$ac_lib $ac_save_LIBS"
-		fi
-		cat > conftest.$ac_ext <<EOF
-#line 5055 "configure"
-#include "confdefs.h"
-
-int main() {
-syslog()
-; return 0; }
-EOF
-if { (eval echo configure:5062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_syslog=$ac_lib; else ac_cv_funclib_syslog=yes; fi";break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-	done
-	eval "ac_cv_funclib_syslog=\${ac_cv_funclib_syslog-no}"
-	LIBS="$ac_save_LIBS"
-fi
-
-fi
-
-
-eval "ac_res=\$ac_cv_funclib_syslog"
-
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs syslog"@@@
-@@@libs="$libs syslog"@@@
-END
-
-eval "ac_tr_func=HAVE_`echo syslog | tr '[a-z]' '[A-Z]'`"
-eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr '[a-z]' '[A-Z]'`"
-eval "LIB_syslog=$ac_res"
-
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_syslog=yes"
-	eval "LIB_syslog="
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	echo "$ac_t""yes" 1>&6
-	;;
-	no)
-	eval "ac_cv_func_syslog=no"
-	eval "LIB_syslog="
-	echo "$ac_t""no" 1>&6
-	;;
-	*)
-	eval "ac_cv_func_syslog=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-	echo "$ac_t""yes, in $ac_res" 1>&6
-	;;
-esac
-
-
-if test -n "$LIB_syslog"; then
-	LIBS="$LIB_syslog $LIBS"
-fi
-
-
-echo $ac_n "checking for working snprintf""... $ac_c" 1>&6
-echo "configure:5127: checking for working snprintf" >&5
-if eval "test \"`echo '$''{'ac_cv_func_snprintf_working'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_cv_func_snprintf_working=yes
-if test "$cross_compiling" = yes; then
-  :
-else
-  cat > conftest.$ac_ext <<EOF
-#line 5136 "configure"
-#include "confdefs.h"
-
-#include <stdio.h>
-#include <string.h>
-int main()
-{
-	char foo[3];
-	snprintf(foo, 2, "12");
-	return strcmp(foo, "1");
-}
-EOF
-if { (eval echo configure:5148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  :
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_func_snprintf_working=no
-fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$ac_cv_func_snprintf_working" 1>&6
-: << END
-@@@funcs="$funcs snprintf"@@@
-END
-if test "$ac_cv_func_snprintf_working" = yes; then
-	foo=HAVE_SNPRINTF
-	cat >> confdefs.h <<EOF
-#define $foo 1
-EOF
-
-fi
-
-for ac_func in asnprintf asprintf vasprintf vasnprintf vsnprintf
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5177: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 5182 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:5205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-
-
-for ac_func in _getpty _scrsize _setsid _stricmp fchmod fcntl flock
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5234: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 5239 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:5262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_func in forkpty frevoke gethostname getlogin getpriority getservbyname
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5289: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 5294 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:5317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_func in getspnam getspuid gettimeofday getuid grantpt
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5344: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 5349 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:5372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_func in innetgr iruserok mktime ptsname rand random
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5399: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 5404 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:5427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_func in revoke setitimer setlogin setpgid setpriority
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5454: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 5459 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:5482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_func in setproctitle setregid setresgid setresuid setreuid setsid
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5509: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 5514 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:5537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_func in setutent swab ttyname ttyslot ulimit uname
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5564: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 5569 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:5592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_func in unlockpt vhangup yp_get_default_domain
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5619: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 5624 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:5647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-
-
-echo $ac_n "checking for getpwnam_r""... $ac_c" 1>&6
-echo "configure:5674: checking for getpwnam_r" >&5
-if eval "test \"`echo '$''{'ac_cv_funclib_getpwnam_r'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-if eval "test \"\$ac_cv_func_getpwnam_r\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in "" c_r; do
-		if test -n "$ac_lib"; then 
-			ac_lib="-l$ac_lib"
-			LIBS="$ac_lib $ac_save_LIBS"
-		fi
-		cat > conftest.$ac_ext <<EOF
-#line 5687 "configure"
-#include "confdefs.h"
-
-int main() {
-getpwnam_r()
-; return 0; }
-EOF
-if { (eval echo configure:5694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_getpwnam_r=$ac_lib; else ac_cv_funclib_getpwnam_r=yes; fi";break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-	done
-	eval "ac_cv_funclib_getpwnam_r=\${ac_cv_funclib_getpwnam_r-no}"
-	LIBS="$ac_save_LIBS"
-fi
-
-fi
-
-
-eval "ac_res=\$ac_cv_funclib_getpwnam_r"
-
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs getpwnam_r"@@@
-@@@libs="$libs c_r"@@@
-END
-
-eval "ac_tr_func=HAVE_`echo getpwnam_r | tr '[a-z]' '[A-Z]'`"
-eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr '[a-z]' '[A-Z]'`"
-eval "LIB_getpwnam_r=$ac_res"
-
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_getpwnam_r=yes"
-	eval "LIB_getpwnam_r="
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	echo "$ac_t""yes" 1>&6
-	;;
-	no)
-	eval "ac_cv_func_getpwnam_r=no"
-	eval "LIB_getpwnam_r="
-	echo "$ac_t""no" 1>&6
-	;;
-	*)
-	eval "ac_cv_func_getpwnam_r=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-	echo "$ac_t""yes, in $ac_res" 1>&6
-	;;
-esac
-
-
-if test "$ac_cv_func_getpwnam_r" = yes; then
-	echo $ac_n "checking if getpwnam_r is posix""... $ac_c" 1>&6
-echo "configure:5755: checking if getpwnam_r is posix" >&5
-if eval "test \"`echo '$''{'ac_cv_func_getpwnam_r_posix'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_libs="$LIBS"
-	LIBS="$LIBS $LIB_getpwnam_r"
-	if test "$cross_compiling" = yes; then
-  :
-else
-  cat > conftest.$ac_ext <<EOF
-#line 5765 "configure"
-#include "confdefs.h"
-
-#include <pwd.h>
-int main()
-{
-	struct passwd pw, *pwd;
-	return getpwnam_r("", &pw, NULL, 0, &pwd) < 0;
-}
-
-EOF
-if { (eval echo configure:5776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_func_getpwnam_r_posix=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_func_getpwnam_r_posix=no
-fi
-rm -fr conftest*
-fi
-
-LIBS="$ac_libs"
-fi
-
-echo "$ac_t""$ac_cv_func_getpwnam_r_posix" 1>&6
-if test "$ac_cv_func_getpwnam_r_posix" = yes; then
-	cat >> confdefs.h <<\EOF
-#define POSIX_GETPWNAM_R 1
-EOF
-
-fi
-fi
-
-
-
-echo $ac_n "checking for getsockopt""... $ac_c" 1>&6
-echo "configure:5803: checking for getsockopt" >&5
-if eval "test \"`echo '$''{'ac_cv_funclib_getsockopt'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-if eval "test \"\$ac_cv_func_getsockopt\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in "" ; do
-		if test -n "$ac_lib"; then 
-			ac_lib="-l$ac_lib"
-			LIBS="$ac_lib $ac_save_LIBS"
-		fi
-		cat > conftest.$ac_ext <<EOF
-#line 5816 "configure"
-#include "confdefs.h"
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-int main() {
-getsockopt(0,0,0,0,0)
-; return 0; }
-EOF
-if { (eval echo configure:5828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_getsockopt=$ac_lib; else ac_cv_funclib_getsockopt=yes; fi";break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-	done
-	eval "ac_cv_funclib_getsockopt=\${ac_cv_funclib_getsockopt-no}"
-	LIBS="$ac_save_LIBS"
-fi
-
-fi
-
-
-eval "ac_res=\$ac_cv_funclib_getsockopt"
-
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs getsockopt"@@@
-@@@libs="$libs "@@@
-END
-
-eval "ac_tr_func=HAVE_`echo getsockopt | tr '[a-z]' '[A-Z]'`"
-eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr '[a-z]' '[A-Z]'`"
-eval "LIB_getsockopt=$ac_res"
-
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_getsockopt=yes"
-	eval "LIB_getsockopt="
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	echo "$ac_t""yes" 1>&6
-	;;
-	no)
-	eval "ac_cv_func_getsockopt=no"
-	eval "LIB_getsockopt="
-	echo "$ac_t""no" 1>&6
-	;;
-	*)
-	eval "ac_cv_func_getsockopt=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-	echo "$ac_t""yes, in $ac_res" 1>&6
-	;;
-esac
-
-
-
-
-echo $ac_n "checking for setsockopt""... $ac_c" 1>&6
-echo "configure:5890: checking for setsockopt" >&5
-if eval "test \"`echo '$''{'ac_cv_funclib_setsockopt'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-if eval "test \"\$ac_cv_func_setsockopt\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in "" ; do
-		if test -n "$ac_lib"; then 
-			ac_lib="-l$ac_lib"
-			LIBS="$ac_lib $ac_save_LIBS"
-		fi
-		cat > conftest.$ac_ext <<EOF
-#line 5903 "configure"
-#include "confdefs.h"
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-int main() {
-setsockopt(0,0,0,0,0)
-; return 0; }
-EOF
-if { (eval echo configure:5915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_setsockopt=$ac_lib; else ac_cv_funclib_setsockopt=yes; fi";break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-	done
-	eval "ac_cv_funclib_setsockopt=\${ac_cv_funclib_setsockopt-no}"
-	LIBS="$ac_save_LIBS"
-fi
-
-fi
-
-
-eval "ac_res=\$ac_cv_funclib_setsockopt"
-
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs setsockopt"@@@
-@@@libs="$libs "@@@
-END
-
-eval "ac_tr_func=HAVE_`echo setsockopt | tr '[a-z]' '[A-Z]'`"
-eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr '[a-z]' '[A-Z]'`"
-eval "LIB_setsockopt=$ac_res"
-
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_setsockopt=yes"
-	eval "LIB_setsockopt="
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	echo "$ac_t""yes" 1>&6
-	;;
-	no)
-	eval "ac_cv_func_setsockopt=no"
-	eval "LIB_setsockopt="
-	echo "$ac_t""no" 1>&6
-	;;
-	*)
-	eval "ac_cv_func_setsockopt=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-	echo "$ac_t""yes, in $ac_res" 1>&6
-	;;
-esac
-
-
-
-for ac_func in getudbnam setlim
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5978: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 5983 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:6006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-
-
-
-
-echo $ac_n "checking for res_search""... $ac_c" 1>&6
-echo "configure:6035: checking for res_search" >&5
-if eval "test \"`echo '$''{'ac_cv_funclib_res_search'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-if eval "test \"\$ac_cv_func_res_search\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in "" resolv; do
-		if test -n "$ac_lib"; then 
-			ac_lib="-l$ac_lib"
-			LIBS="$ac_lib $ac_save_LIBS"
-		fi
-		cat > conftest.$ac_ext <<EOF
-#line 6048 "configure"
-#include "confdefs.h"
-
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-#ifdef HAVE_RESOLV_H
-#include <resolv.h>
-#endif
-
-int main() {
-res_search(0,0,0,0,0)
-; return 0; }
-EOF
-if { (eval echo configure:6069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_res_search=$ac_lib; else ac_cv_funclib_res_search=yes; fi";break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-	done
-	eval "ac_cv_funclib_res_search=\${ac_cv_funclib_res_search-no}"
-	LIBS="$ac_save_LIBS"
-fi
-
-fi
-
-
-eval "ac_res=\$ac_cv_funclib_res_search"
-
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs res_search"@@@
-@@@libs="$libs resolv"@@@
-END
-
-eval "ac_tr_func=HAVE_`echo res_search | tr '[a-z]' '[A-Z]'`"
-eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr '[a-z]' '[A-Z]'`"
-eval "LIB_res_search=$ac_res"
-
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_res_search=yes"
-	eval "LIB_res_search="
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	echo "$ac_t""yes" 1>&6
-	;;
-	no)
-	eval "ac_cv_func_res_search=no"
-	eval "LIB_res_search="
-	echo "$ac_t""no" 1>&6
-	;;
-	*)
-	eval "ac_cv_func_res_search=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-	echo "$ac_t""yes, in $ac_res" 1>&6
-	;;
-esac
-
-
-if test -n "$LIB_res_search"; then
-	LIBS="$LIB_res_search $LIBS"
-fi
-
-
-
-
-
-echo $ac_n "checking for dn_expand""... $ac_c" 1>&6
-echo "configure:6137: checking for dn_expand" >&5
-if eval "test \"`echo '$''{'ac_cv_funclib_dn_expand'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-if eval "test \"\$ac_cv_func_dn_expand\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in "" resolv; do
-		if test -n "$ac_lib"; then 
-			ac_lib="-l$ac_lib"
-			LIBS="$ac_lib $ac_save_LIBS"
-		fi
-		cat > conftest.$ac_ext <<EOF
-#line 6150 "configure"
-#include "confdefs.h"
-
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-#ifdef HAVE_RESOLV_H
-#include <resolv.h>
-#endif
-
-int main() {
-dn_expand(0,0,0,0,0)
-; return 0; }
-EOF
-if { (eval echo configure:6171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_dn_expand=$ac_lib; else ac_cv_funclib_dn_expand=yes; fi";break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-	done
-	eval "ac_cv_funclib_dn_expand=\${ac_cv_funclib_dn_expand-no}"
-	LIBS="$ac_save_LIBS"
-fi
-
-fi
-
-
-eval "ac_res=\$ac_cv_funclib_dn_expand"
-
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs dn_expand"@@@
-@@@libs="$libs resolv"@@@
-END
-
-eval "ac_tr_func=HAVE_`echo dn_expand | tr '[a-z]' '[A-Z]'`"
-eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr '[a-z]' '[A-Z]'`"
-eval "LIB_dn_expand=$ac_res"
-
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_dn_expand=yes"
-	eval "LIB_dn_expand="
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	echo "$ac_t""yes" 1>&6
-	;;
-	no)
-	eval "ac_cv_func_dn_expand=no"
-	eval "LIB_dn_expand="
-	echo "$ac_t""no" 1>&6
-	;;
-	*)
-	eval "ac_cv_func_dn_expand=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-	echo "$ac_t""yes, in $ac_res" 1>&6
-	;;
-esac
-
-
-if test -n "$LIB_dn_expand"; then
-	LIBS="$LIB_dn_expand $LIBS"
-fi
-
-
-
-for ac_hdr in unistd.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6240: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 6245 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6250: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_func in getpagesize
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6279: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 6284 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:6307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:6332: checking for working mmap" >&5
-if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_func_mmap_fixed_mapped=no
-else
-  cat > conftest.$ac_ext <<EOF
-#line 6340 "configure"
-#include "confdefs.h"
-
-/* Thanks to Mike Haertel and Jim Avera for this test.
-   Here is a matrix of mmap possibilities:
-	mmap private not fixed
-	mmap private fixed at somewhere currently unmapped
-	mmap private fixed at somewhere already mapped
-	mmap shared not fixed
-	mmap shared fixed at somewhere currently unmapped
-	mmap shared fixed at somewhere already mapped
-   For private mappings, we should verify that changes cannot be read()
-   back from the file, nor mmap's back from the file at a different
-   address.  (There have been systems where private was not correctly
-   implemented like the infamous i386 svr4.0, and systems where the
-   VM page cache was not coherent with the filesystem buffer cache
-   like early versions of FreeBSD and possibly contemporary NetBSD.)
-   For shared mappings, we should conversely verify that changes get
-   propogated back to all the places they're supposed to be.
-
-   Grep wants private fixed already mapped.
-   The main things grep needs to know about mmap are:
-   * does it exist and is it safe to write into the mmap'd area
-   * how to use it (BSD variants)  */
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/mman.h>
-
-/* This mess was copied from the GNU getpagesize.h.  */
-#ifndef HAVE_GETPAGESIZE
-# ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-# endif
-
-/* Assume that all systems that can run configure have sys/param.h.  */
-# ifndef HAVE_SYS_PARAM_H
-#  define HAVE_SYS_PARAM_H 1
-# endif
-
-# ifdef _SC_PAGESIZE
-#  define getpagesize() sysconf(_SC_PAGESIZE)
-# else /* no _SC_PAGESIZE */
-#  ifdef HAVE_SYS_PARAM_H
-#   include <sys/param.h>
-#   ifdef EXEC_PAGESIZE
-#    define getpagesize() EXEC_PAGESIZE
-#   else /* no EXEC_PAGESIZE */
-#    ifdef NBPG
-#     define getpagesize() NBPG * CLSIZE
-#     ifndef CLSIZE
-#      define CLSIZE 1
-#     endif /* no CLSIZE */
-#    else /* no NBPG */
-#     ifdef NBPC
-#      define getpagesize() NBPC
-#     else /* no NBPC */
-#      ifdef PAGESIZE
-#       define getpagesize() PAGESIZE
-#      endif /* PAGESIZE */
-#     endif /* no NBPC */
-#    endif /* no NBPG */
-#   endif /* no EXEC_PAGESIZE */
-#  else /* no HAVE_SYS_PARAM_H */
-#   define getpagesize() 8192	/* punt totally */
-#  endif /* no HAVE_SYS_PARAM_H */
-# endif /* no _SC_PAGESIZE */
-
-#endif /* no HAVE_GETPAGESIZE */
-
-#ifdef __cplusplus
-extern "C" { void *malloc(unsigned); }
-#else
-char *malloc();
-#endif
-
-int
-main()
-{
-	char *data, *data2, *data3;
-	int i, pagesize;
-	int fd;
-
-	pagesize = getpagesize();
-
-	/*
-	 * First, make a file with some known garbage in it.
-	 */
-	data = malloc(pagesize);
-	if (!data)
-		exit(1);
-	for (i = 0; i < pagesize; ++i)
-		*(data + i) = rand();
-	umask(0);
-	fd = creat("conftestmmap", 0600);
-	if (fd < 0)
-		exit(1);
-	if (write(fd, data, pagesize) != pagesize)
-		exit(1);
-	close(fd);
-
-	/*
-	 * Next, try to mmap the file at a fixed address which
-	 * already has something else allocated at it.  If we can,
-	 * also make sure that we see the same garbage.
-	 */
-	fd = open("conftestmmap", O_RDWR);
-	if (fd < 0)
-		exit(1);
-	data2 = malloc(2 * pagesize);
-	if (!data2)
-		exit(1);
-	data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1);
-	if (data2 != mmap(data2, pagesize, PROT_READ | PROT_WRITE,
-	    MAP_PRIVATE | MAP_FIXED, fd, 0L))
-		exit(1);
-	for (i = 0; i < pagesize; ++i)
-		if (*(data + i) != *(data2 + i))
-			exit(1);
-
-	/*
-	 * Finally, make sure that changes to the mapped area
-	 * do not percolate back to the file as seen by read().
-	 * (This is a bug on some variants of i386 svr4.0.)
-	 */
-	for (i = 0; i < pagesize; ++i)
-		*(data2 + i) = *(data2 + i) + 1;
-	data3 = malloc(pagesize);
-	if (!data3)
-		exit(1);
-	if (read(fd, data3, pagesize) != pagesize)
-		exit(1);
-	for (i = 0; i < pagesize; ++i)
-		if (*(data + i) != *(data3 + i))
-			exit(1);
-	close(fd);
-	unlink("conftestmmap");
-	exit(0);
-}
-
-EOF
-if { (eval echo configure:6480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_func_mmap_fixed_mapped=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_func_mmap_fixed_mapped=no
-fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$ac_cv_func_mmap_fixed_mapped" 1>&6
-if test $ac_cv_func_mmap_fixed_mapped = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_MMAP 1
-EOF
-
-fi
-
-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-# for constant arguments.  Useless!
-echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:6505: checking for working alloca.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 6510 "configure"
-#include "confdefs.h"
-#include <alloca.h>
-int main() {
-char *p = alloca(2 * sizeof(int));
-; return 0; }
-EOF
-if { (eval echo configure:6517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  ac_cv_header_alloca_h=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_header_alloca_h=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_header_alloca_h" 1>&6
-if test $ac_cv_header_alloca_h = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_ALLOCA_H 1
-EOF
-
-fi
-
-echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:6538: checking for alloca" >&5
-if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 6543 "configure"
-#include "confdefs.h"
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# if HAVE_ALLOCA_H
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#   endif
-#  endif
-# endif
-#endif
-
-int main() {
-char *p = (char *) alloca(1);
-; return 0; }
-EOF
-if { (eval echo configure:6566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  ac_cv_func_alloca_works=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_func_alloca_works=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_func_alloca_works" 1>&6
-if test $ac_cv_func_alloca_works = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_ALLOCA 1
-EOF
-
-fi
-
-if test $ac_cv_func_alloca_works = no; then
-  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-  # that cause trouble.  Some versions do not even contain alloca or
-  # contain a buggy version.  If you still want to use their alloca,
-  # use ar to extract alloca.o from them instead of compiling alloca.c.
-  ALLOCA=alloca.o
-  cat >> confdefs.h <<\EOF
-#define C_ALLOCA 1
-EOF
-
-
-echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:6598: checking whether alloca needs Cray hooks" >&5
-if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 6603 "configure"
-#include "confdefs.h"
-#if defined(CRAY) && ! defined(CRAY2)
-webecray
-#else
-wenotbecray
-#endif
-
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "webecray" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_os_cray=yes
-else
-  rm -rf conftest*
-  ac_cv_os_cray=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_os_cray" 1>&6
-if test $ac_cv_os_cray = yes; then
-for ac_func in _getb67 GETB67 getb67; do
-  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6628: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 6633 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:6656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<EOF
-#define CRAY_STACKSEG_END $ac_func
-EOF
-
-  break
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-done
-fi
-
-echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:6683: checking stack direction for C alloca" >&5
-if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_c_stack_direction=0
-else
-  cat > conftest.$ac_ext <<EOF
-#line 6691 "configure"
-#include "confdefs.h"
-find_stack_direction ()
-{
-  static char *addr = 0;
-  auto char dummy;
-  if (addr == 0)
-    {
-      addr = &dummy;
-      return find_stack_direction ();
-    }
-  else
-    return (&dummy > addr) ? 1 : -1;
-}
-main ()
-{
-  exit (find_stack_direction() < 0);
-}
-EOF
-if { (eval echo configure:6710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_c_stack_direction=1
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_c_stack_direction=-1
-fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$ac_cv_c_stack_direction" 1>&6
-cat >> confdefs.h <<EOF
-#define STACK_DIRECTION $ac_cv_c_stack_direction
-EOF
-
-fi
-
-
-#
-# Test for POSIX (broken) getlogin
-#
-
-if test "$ac_cv_func_getlogin" = yes; then
-echo $ac_n "checking if getlogin is posix""... $ac_c" 1>&6
-echo "configure:6738: checking if getlogin is posix" >&5
-if eval "test \"`echo '$''{'ac_cv_func_getlogin_posix'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-if test "$ac_cv_func_getlogin" = yes -a "$ac_cv_func_setlogin" = yes; then
-	ac_cv_func_getlogin_posix=no
-else
-	ac_cv_func_getlogin_posix=yes
-fi
-
-fi
-
-echo "$ac_t""$ac_cv_func_getlogin_posix" 1>&6
-if test "$ac_cv_func_getlogin_posix" = yes; then
-	cat >> confdefs.h <<\EOF
-#define POSIX_GETLOGIN 1
-EOF
-
-fi
-fi
-
-
-
-
-echo $ac_n "checking for hstrerror""... $ac_c" 1>&6
-echo "configure:6764: checking for hstrerror" >&5
-if eval "test \"`echo '$''{'ac_cv_funclib_hstrerror'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-if eval "test \"\$ac_cv_func_hstrerror\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in "" resolv; do
-		if test -n "$ac_lib"; then 
-			ac_lib="-l$ac_lib"
-			LIBS="$ac_lib $ac_save_LIBS"
-		fi
-		cat > conftest.$ac_ext <<EOF
-#line 6777 "configure"
-#include "confdefs.h"
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-int main() {
-hstrerror(17)
-; return 0; }
-EOF
-if { (eval echo configure:6786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_hstrerror=$ac_lib; else ac_cv_funclib_hstrerror=yes; fi";break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-	done
-	eval "ac_cv_funclib_hstrerror=\${ac_cv_funclib_hstrerror-no}"
-	LIBS="$ac_save_LIBS"
-fi
-
-fi
-
-
-eval "ac_res=\$ac_cv_funclib_hstrerror"
-
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs hstrerror"@@@
-@@@libs="$libs resolv"@@@
-END
-
-eval "ac_tr_func=HAVE_`echo hstrerror | tr '[a-z]' '[A-Z]'`"
-eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr '[a-z]' '[A-Z]'`"
-eval "LIB_hstrerror=$ac_res"
-
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_hstrerror=yes"
-	eval "LIB_hstrerror="
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	echo "$ac_t""yes" 1>&6
-	;;
-	no)
-	eval "ac_cv_func_hstrerror=no"
-	eval "LIB_hstrerror="
-	echo "$ac_t""no" 1>&6
-	;;
-	*)
-	eval "ac_cv_func_hstrerror=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-	echo "$ac_t""yes, in $ac_res" 1>&6
-	;;
-esac
-
-
-if test -n "$LIB_hstrerror"; then
-	LIBS="$LIB_hstrerror $LIBS"
-fi
-
-if eval "test \"$ac_cv_func_hstrerror\" != yes"; then
-LIBOBJS="$LIBOBJS hstrerror.o"
-fi
-
-
-for ac_func in chown daemon err errx fchown getcwd getdtablesize getopt
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6857: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 6862 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:6885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
-cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-LIBOBJS="$LIBOBJS ${ac_func}.o"
-fi
-
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs chown daemon err errx fchown getcwd getdtablesize getopt"@@@
-END
-done
-
-for ac_func in getusershell inet_aton initgroups lstat memmove mkstemp
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6919: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 6924 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:6947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
-cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-LIBOBJS="$LIBOBJS ${ac_func}.o"
-fi
-
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs getusershell inet_aton initgroups lstat memmove mkstemp"@@@
-END
-done
-
-for ac_func in putenv rcmd setegid setenv seteuid strcasecmp strdup
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6981: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 6986 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:7009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
-cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-LIBOBJS="$LIBOBJS ${ac_func}.o"
-fi
-
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs putenv rcmd setegid setenv seteuid strcasecmp strdup"@@@
-END
-done
-
-for ac_func in strerror strftime strlwr strnlen strtok_r strupr unsetenv
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7043: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 7048 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:7071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
-cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-LIBOBJS="$LIBOBJS ${ac_func}.o"
-fi
-
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs strerror strftime strlwr strnlen strtok_r strupr unsetenv"@@@
-END
-done
-
-for ac_func in verr verrx vwarn vwarnx warn warnx
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7105: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 7110 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:7133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
-cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-LIBOBJS="$LIBOBJS ${ac_func}.o"
-fi
-
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs verr verrx vwarn vwarnx warn warnx"@@@
-END
-done
-
-
-
-if test "$ac_cv_func_getcwd" = yes; then
-echo $ac_n "checking if getcwd is broken""... $ac_c" 1>&6
-echo "configure:7168: checking if getcwd is broken" >&5
-if eval "test \"`echo '$''{'ac_cv_func_getcwd_broken'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-ac_cv_func_getcwd_broken=no
-
-if test "$cross_compiling" = yes; then
-  :
-else
-  cat > conftest.$ac_ext <<EOF
-#line 7179 "configure"
-#include "confdefs.h"
-
-#include <errno.h>
-char *getcwd(char*, int);
-
-void *popen(char *cmd, char *mode)
-{
-	errno = ENOTTY;
-	return 0;
-}
-
-int main()
-{
-	char *ret;
-	ret = getcwd(0, 1024);
-	if(ret == 0 && errno == ENOTTY)
-		return 0;
-	return 1;
-}
-
-EOF
-if { (eval echo configure:7201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_func_getcwd_broken=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  :
-fi
-rm -fr conftest*
-fi
-
-
-fi
-
-if test "$ac_cv_func_getcwd_broken" = yes; then
-	cat >> confdefs.h <<\EOF
-#define BROKEN_GETCWD 1
-EOF
-	LIBOBJS="$LIBOBJS getcwd.o"
-		echo "$ac_t""$ac_cv_func_getcwd_broken" 1>&6
-else
-	echo "$ac_t""seems ok" 1>&6
-fi
-fi
-
-
-
-echo $ac_n "checking which authentication modules should be built""... $ac_c" 1>&6
-echo "configure:7230: checking which authentication modules should be built" >&5
-
-LIB_AUTH_SUBDIRS=
-
-if test "$ac_cv_header_siad_h" = yes; then
-	LIB_AUTH_SUBDIRS="$LIB_AUTH_SUBDIRS sia"
-fi
-
-if test "$ac_cv_header_security_pam_modules_h" = yes; then
-	LIB_AUTH_SUBDIRS="$LIB_AUTH_SUBDIRS pam"
-fi
-
-case "${host}" in
-*-*-irix[56]*) LIB_AUTH_SUBDIRS="$LIB_AUTH_SUBDIRS afskauthlib" ;;
-esac
-
-echo "$ac_t""$LIB_AUTH_SUBDIRS" 1>&6
-
-
-
-echo $ac_n "checking for tunnel devices""... $ac_c" 1>&6
-echo "configure:7251: checking for tunnel devices" >&5
-
-APPL_KIP_DIR=
-
-if test "$ac_cv_header_net_if_tun_h" = "yes"; then
-	APPL_KIP_DIR=kip
-fi
-
-echo "$ac_t""$ac_cv_header_net_if_tun_h" 1>&6
-
-
-
-
-echo $ac_n "checking if crypt needs a prototype""... $ac_c" 1>&6
-echo "configure:7265: checking if crypt needs a prototype" >&5
-if eval "test \"`echo '$''{'ac_cv_func_crypt_noproto'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 7270 "configure"
-#include "confdefs.h"
-
-#ifdef HAVE_CRYPT_H
-#include <crypt.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-int main() {
-struct foo { int foo; } xx;
-extern int crypt (struct foo*);
-crypt(&xx);
-
-; return 0; }
-EOF
-if { (eval echo configure:7287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  eval "ac_cv_func_crypt_noproto=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_crypt_noproto=no"
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_func_crypt_noproto" 1>&6
-
-if test "$ac_cv_func_crypt_noproto" = yes; then
-	cat >> confdefs.h <<\EOF
-#define NEED_CRYPT_PROTO 1
-EOF
-
-fi
-: << END
-@@@syms="$syms NEED_CRYPT_PROTO"@@@
-END
-
-
-
-
-echo $ac_n "checking if strtok_r needs a prototype""... $ac_c" 1>&6
-echo "configure:7315: checking if strtok_r needs a prototype" >&5
-if eval "test \"`echo '$''{'ac_cv_func_strtok_r_noproto'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 7320 "configure"
-#include "confdefs.h"
-
-#include <string.h>
-
-int main() {
-struct foo { int foo; } xx;
-extern int strtok_r (struct foo*);
-strtok_r(&xx);
-
-; return 0; }
-EOF
-if { (eval echo configure:7332: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  eval "ac_cv_func_strtok_r_noproto=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_strtok_r_noproto=no"
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_func_strtok_r_noproto" 1>&6
-
-if test "$ac_cv_func_strtok_r_noproto" = yes; then
-	cat >> confdefs.h <<\EOF
-#define NEED_STRTOK_R_PROTO 1
-EOF
-
-fi
-: << END
-@@@syms="$syms NEED_STRTOK_R_PROTO"@@@
-END
-
-
-
-
-echo $ac_n "checking for h_errno""... $ac_c" 1>&6
-echo "configure:7360: checking for h_errno" >&5
-if eval "test \"`echo '$''{'ac_cv_var_h_errno'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-cat > conftest.$ac_ext <<EOF
-#line 7366 "configure"
-#include "confdefs.h"
-extern int h_errno;
-int foo() { return h_errno; }
-int main() {
-foo()
-; return 0; }
-EOF
-if { (eval echo configure:7374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  ac_cv_var_h_errno=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_var_h_errno=no
-fi
-rm -f conftest*
-
-fi
-
-eval "ac_tr_var=HAVE_H_ERRNO"
-
-
-: << END
-@@@syms="$syms HAVE_H_ERRNO"@@@
-END
-
-
-echo "$ac_t""`eval echo \\$ac_cv_var_h_errno`" 1>&6
-if test `eval echo \\$ac_cv_var_h_errno` = yes; then
-	cat >> confdefs.h <<EOF
-#define $ac_tr_var 1
-EOF
-
-	
-echo $ac_n "checking if h_errno is properly declared""... $ac_c" 1>&6
-echo "configure:7403: checking if h_errno is properly declared" >&5
-if eval "test \"`echo '$''{'ac_cv_var_h_errno_declaration'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-cat > conftest.$ac_ext <<EOF
-#line 7409 "configure"
-#include "confdefs.h"
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-extern struct { int foo; } h_errno;
-int main() {
-h_errno.foo = 1;
-; return 0; }
-EOF
-if { (eval echo configure:7422: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  eval "ac_cv_var_h_errno_declaration=no"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_var_h_errno_declaration=yes"
-fi
-rm -f conftest*
-
-fi
-
-
-ac_tr_var=HAVE_H_ERRNO_DECLARATION
-
-
-: << END
-@@@syms="$syms HAVE_H_ERRNO_DECLARATION"@@@
-END
-
-
-echo "$ac_t""$ac_cv_var_h_errno_declaration" 1>&6
-if eval "test \"\$ac_cv_var_h_errno_declaration\" = yes"; then
-	cat >> confdefs.h <<EOF
-#define $ac_tr_var 1
-EOF
-
-fi
-
-fi
-
-
-
-echo $ac_n "checking for h_errlist""... $ac_c" 1>&6
-echo "configure:7457: checking for h_errlist" >&5
-if eval "test \"`echo '$''{'ac_cv_var_h_errlist'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-cat > conftest.$ac_ext <<EOF
-#line 7463 "configure"
-#include "confdefs.h"
-extern int h_errlist;
-int foo() { return h_errlist; }
-int main() {
-foo()
-; return 0; }
-EOF
-if { (eval echo configure:7471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  ac_cv_var_h_errlist=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_var_h_errlist=no
-fi
-rm -f conftest*
-
-fi
-
-eval "ac_tr_var=HAVE_H_ERRLIST"
-
-
-: << END
-@@@syms="$syms HAVE_H_ERRLIST"@@@
-END
-
-
-echo "$ac_t""`eval echo \\$ac_cv_var_h_errlist`" 1>&6
-if test `eval echo \\$ac_cv_var_h_errlist` = yes; then
-	cat >> confdefs.h <<EOF
-#define $ac_tr_var 1
-EOF
-
-	
-echo $ac_n "checking if h_errlist is properly declared""... $ac_c" 1>&6
-echo "configure:7500: checking if h_errlist is properly declared" >&5
-if eval "test \"`echo '$''{'ac_cv_var_h_errlist_declaration'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-cat > conftest.$ac_ext <<EOF
-#line 7506 "configure"
-#include "confdefs.h"
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-extern struct { int foo; } h_errlist;
-int main() {
-h_errlist.foo = 1;
-; return 0; }
-EOF
-if { (eval echo configure:7516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  eval "ac_cv_var_h_errlist_declaration=no"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_var_h_errlist_declaration=yes"
-fi
-rm -f conftest*
-
-fi
-
-
-ac_tr_var=HAVE_H_ERRLIST_DECLARATION
-
-
-: << END
-@@@syms="$syms HAVE_H_ERRLIST_DECLARATION"@@@
-END
-
-
-echo "$ac_t""$ac_cv_var_h_errlist_declaration" 1>&6
-if eval "test \"\$ac_cv_var_h_errlist_declaration\" = yes"; then
-	cat >> confdefs.h <<EOF
-#define $ac_tr_var 1
-EOF
-
-fi
-
-fi
-
-
-
-echo $ac_n "checking for h_nerr""... $ac_c" 1>&6
-echo "configure:7551: checking for h_nerr" >&5
-if eval "test \"`echo '$''{'ac_cv_var_h_nerr'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-cat > conftest.$ac_ext <<EOF
-#line 7557 "configure"
-#include "confdefs.h"
-extern int h_nerr;
-int foo() { return h_nerr; }
-int main() {
-foo()
-; return 0; }
-EOF
-if { (eval echo configure:7565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  ac_cv_var_h_nerr=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_var_h_nerr=no
-fi
-rm -f conftest*
-
-fi
-
-eval "ac_tr_var=HAVE_H_NERR"
-
-
-: << END
-@@@syms="$syms HAVE_H_NERR"@@@
-END
-
-
-echo "$ac_t""`eval echo \\$ac_cv_var_h_nerr`" 1>&6
-if test `eval echo \\$ac_cv_var_h_nerr` = yes; then
-	cat >> confdefs.h <<EOF
-#define $ac_tr_var 1
-EOF
-
-	
-echo $ac_n "checking if h_nerr is properly declared""... $ac_c" 1>&6
-echo "configure:7594: checking if h_nerr is properly declared" >&5
-if eval "test \"`echo '$''{'ac_cv_var_h_nerr_declaration'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-cat > conftest.$ac_ext <<EOF
-#line 7600 "configure"
-#include "confdefs.h"
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-extern struct { int foo; } h_nerr;
-int main() {
-h_nerr.foo = 1;
-; return 0; }
-EOF
-if { (eval echo configure:7610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  eval "ac_cv_var_h_nerr_declaration=no"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_var_h_nerr_declaration=yes"
-fi
-rm -f conftest*
-
-fi
-
-
-ac_tr_var=HAVE_H_NERR_DECLARATION
-
-
-: << END
-@@@syms="$syms HAVE_H_NERR_DECLARATION"@@@
-END
-
-
-echo "$ac_t""$ac_cv_var_h_nerr_declaration" 1>&6
-if eval "test \"\$ac_cv_var_h_nerr_declaration\" = yes"; then
-	cat >> confdefs.h <<EOF
-#define $ac_tr_var 1
-EOF
-
-fi
-
-fi
-
-
-
-echo $ac_n "checking for __progname""... $ac_c" 1>&6
-echo "configure:7645: checking for __progname" >&5
-if eval "test \"`echo '$''{'ac_cv_var___progname'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-cat > conftest.$ac_ext <<EOF
-#line 7651 "configure"
-#include "confdefs.h"
-extern int __progname;
-int foo() { return __progname; }
-int main() {
-foo()
-; return 0; }
-EOF
-if { (eval echo configure:7659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  ac_cv_var___progname=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_var___progname=no
-fi
-rm -f conftest*
-
-fi
-
-eval "ac_tr_var=HAVE___PROGNAME"
-
-
-: << END
-@@@syms="$syms HAVE___PROGNAME"@@@
-END
-
-
-echo "$ac_t""`eval echo \\$ac_cv_var___progname`" 1>&6
-if test `eval echo \\$ac_cv_var___progname` = yes; then
-	cat >> confdefs.h <<EOF
-#define $ac_tr_var 1
-EOF
-
-	
-echo $ac_n "checking if __progname is properly declared""... $ac_c" 1>&6
-echo "configure:7688: checking if __progname is properly declared" >&5
-if eval "test \"`echo '$''{'ac_cv_var___progname_declaration'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-cat > conftest.$ac_ext <<EOF
-#line 7694 "configure"
-#include "confdefs.h"
-#ifdef HAVE_ERR_H
-#include <err.h>
-#endif
-extern struct { int foo; } __progname;
-int main() {
-__progname.foo = 1;
-; return 0; }
-EOF
-if { (eval echo configure:7704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  eval "ac_cv_var___progname_declaration=no"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_var___progname_declaration=yes"
-fi
-rm -f conftest*
-
-fi
-
-
-ac_tr_var=HAVE___PROGNAME_DECLARATION
-
-
-: << END
-@@@syms="$syms HAVE___PROGNAME_DECLARATION"@@@
-END
-
-
-echo "$ac_t""$ac_cv_var___progname_declaration" 1>&6
-if eval "test \"\$ac_cv_var___progname_declaration\" = yes"; then
-	cat >> confdefs.h <<EOF
-#define $ac_tr_var 1
-EOF
-
-fi
-
-fi
-
-
-
-echo $ac_n "checking if optarg is properly declared""... $ac_c" 1>&6
-echo "configure:7739: checking if optarg is properly declared" >&5
-if eval "test \"`echo '$''{'ac_cv_var_optarg_declaration'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-cat > conftest.$ac_ext <<EOF
-#line 7745 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-extern struct { int foo; } optarg;
-int main() {
-optarg.foo = 1;
-; return 0; }
-EOF
-if { (eval echo configure:7753: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  eval "ac_cv_var_optarg_declaration=no"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_var_optarg_declaration=yes"
-fi
-rm -f conftest*
-
-fi
-
-
-ac_tr_var=HAVE_OPTARG_DECLARATION
-
-
-: << END
-@@@syms="$syms HAVE_OPTARG_DECLARATION"@@@
-END
-
-
-echo "$ac_t""$ac_cv_var_optarg_declaration" 1>&6
-if eval "test \"\$ac_cv_var_optarg_declaration\" = yes"; then
-	cat >> confdefs.h <<EOF
-#define $ac_tr_var 1
-EOF
-
-fi
-
-
-echo $ac_n "checking if optind is properly declared""... $ac_c" 1>&6
-echo "configure:7785: checking if optind is properly declared" >&5
-if eval "test \"`echo '$''{'ac_cv_var_optind_declaration'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-cat > conftest.$ac_ext <<EOF
-#line 7791 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-extern struct { int foo; } optind;
-int main() {
-optind.foo = 1;
-; return 0; }
-EOF
-if { (eval echo configure:7799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  eval "ac_cv_var_optind_declaration=no"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_var_optind_declaration=yes"
-fi
-rm -f conftest*
-
-fi
-
-
-ac_tr_var=HAVE_OPTIND_DECLARATION
-
-
-: << END
-@@@syms="$syms HAVE_OPTIND_DECLARATION"@@@
-END
-
-
-echo "$ac_t""$ac_cv_var_optind_declaration" 1>&6
-if eval "test \"\$ac_cv_var_optind_declaration\" = yes"; then
-	cat >> confdefs.h <<EOF
-#define $ac_tr_var 1
-EOF
-
-fi
-
-
-echo $ac_n "checking if opterr is properly declared""... $ac_c" 1>&6
-echo "configure:7831: checking if opterr is properly declared" >&5
-if eval "test \"`echo '$''{'ac_cv_var_opterr_declaration'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-cat > conftest.$ac_ext <<EOF
-#line 7837 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-extern struct { int foo; } opterr;
-int main() {
-opterr.foo = 1;
-; return 0; }
-EOF
-if { (eval echo configure:7845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  eval "ac_cv_var_opterr_declaration=no"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_var_opterr_declaration=yes"
-fi
-rm -f conftest*
-
-fi
-
-
-ac_tr_var=HAVE_OPTERR_DECLARATION
-
-
-: << END
-@@@syms="$syms HAVE_OPTERR_DECLARATION"@@@
-END
-
-
-echo "$ac_t""$ac_cv_var_opterr_declaration" 1>&6
-if eval "test \"\$ac_cv_var_opterr_declaration\" = yes"; then
-	cat >> confdefs.h <<EOF
-#define $ac_tr_var 1
-EOF
-
-fi
-
-
-echo $ac_n "checking if optopt is properly declared""... $ac_c" 1>&6
-echo "configure:7877: checking if optopt is properly declared" >&5
-if eval "test \"`echo '$''{'ac_cv_var_optopt_declaration'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-cat > conftest.$ac_ext <<EOF
-#line 7883 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-extern struct { int foo; } optopt;
-int main() {
-optopt.foo = 1;
-; return 0; }
-EOF
-if { (eval echo configure:7891: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  eval "ac_cv_var_optopt_declaration=no"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_var_optopt_declaration=yes"
-fi
-rm -f conftest*
-
-fi
-
-
-ac_tr_var=HAVE_OPTOPT_DECLARATION
-
-
-: << END
-@@@syms="$syms HAVE_OPTOPT_DECLARATION"@@@
-END
-
-
-echo "$ac_t""$ac_cv_var_optopt_declaration" 1>&6
-if eval "test \"\$ac_cv_var_optopt_declaration\" = yes"; then
-	cat >> confdefs.h <<EOF
-#define $ac_tr_var 1
-EOF
-
-fi
-
-
-echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:7923: checking return type of signal handlers" >&5
-if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 7928 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <signal.h>
-#ifdef signal
-#undef signal
-#endif
-#ifdef __cplusplus
-extern "C" void (*signal (int, void (*)(int)))(int);
-#else
-void (*signal ()) ();
-#endif
-
-int main() {
-int i;
-; return 0; }
-EOF
-if { (eval echo configure:7945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_type_signal=void
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_type_signal=int
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_type_signal" 1>&6
-cat >> confdefs.h <<EOF
-#define RETSIGTYPE $ac_cv_type_signal
-EOF
-
-
-if test "$ac_cv_type_signal" = "void" ; then
-	cat >> confdefs.h <<\EOF
-#define VOID_RETSIGTYPE 1
-EOF
-
-fi
-
-cat > conftest.$ac_ext <<EOF
-#line 7971 "configure"
-#include "confdefs.h"
-#include <utmp.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ut_user" >/dev/null 2>&1; then
-  rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define HAVE_UT_USER 1
-EOF
-
-fi
-rm -f conftest*
-
-cat > conftest.$ac_ext <<EOF
-#line 7986 "configure"
-#include "confdefs.h"
-#include <utmp.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ut_host" >/dev/null 2>&1; then
-  rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define HAVE_UT_HOST 1
-EOF
-
-fi
-rm -f conftest*
-
-cat > conftest.$ac_ext <<EOF
-#line 8001 "configure"
-#include "confdefs.h"
-#include <utmp.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ut_addr" >/dev/null 2>&1; then
-  rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define HAVE_UT_ADDR 1
-EOF
-
-fi
-rm -f conftest*
-
-cat > conftest.$ac_ext <<EOF
-#line 8016 "configure"
-#include "confdefs.h"
-#include <utmp.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ut_type" >/dev/null 2>&1; then
-  rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define HAVE_UT_TYPE 1
-EOF
-
-fi
-rm -f conftest*
-
-cat > conftest.$ac_ext <<EOF
-#line 8031 "configure"
-#include "confdefs.h"
-#include <utmp.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ut_pid" >/dev/null 2>&1; then
-  rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define HAVE_UT_PID 1
-EOF
-
-fi
-rm -f conftest*
-
-cat > conftest.$ac_ext <<EOF
-#line 8046 "configure"
-#include "confdefs.h"
-#include <utmp.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ut_id" >/dev/null 2>&1; then
-  rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define HAVE_UT_ID 1
-EOF
-
-fi
-rm -f conftest*
-
-cat > conftest.$ac_ext <<EOF
-#line 8061 "configure"
-#include "confdefs.h"
-#include <utmpx.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ut_syslen" >/dev/null 2>&1; then
-  rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define HAVE_UT_SYSLEN 1
-EOF
-
-fi
-rm -f conftest*
-
-
-echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
-echo "configure:8077: checking for st_blksize in struct stat" >&5
-if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 8082 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-int main() {
-struct stat s; s.st_blksize;
-; return 0; }
-EOF
-if { (eval echo configure:8090: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_struct_st_blksize=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_struct_st_blksize=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_struct_st_blksize" 1>&6
-if test $ac_cv_struct_st_blksize = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_ST_BLKSIZE 1
-EOF
-
-fi
-
-
-
-
-echo $ac_n "checking for struct winsize""... $ac_c" 1>&6
-echo "configure:8114: checking for struct winsize" >&5
-if eval "test \"`echo '$''{'ac_cv_struct_winsize'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-ac_cv_struct_winsize=no
-for i in sys/termios.h sys/ioctl.h; do
-cat > conftest.$ac_ext <<EOF
-#line 8122 "configure"
-#include "confdefs.h"
-#include <$i>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "struct[ 	]*winsize" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_struct_winsize=yes; break
-fi
-rm -f conftest*
-done
-
-fi
-
-if test "$ac_cv_struct_winsize" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_STRUCT_WINSIZE 1
-EOF
-fi
-echo "$ac_t""$ac_cv_struct_winsize" 1>&6
-cat > conftest.$ac_ext <<EOF
-#line 8143 "configure"
-#include "confdefs.h"
-#include <termios.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ws_xpixel" >/dev/null 2>&1; then
-  rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define HAVE_WS_XPIXEL 1
-EOF
-
-fi
-rm -f conftest*
-
-cat > conftest.$ac_ext <<EOF
-#line 8158 "configure"
-#include "confdefs.h"
-#include <termios.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ws_ypixel" >/dev/null 2>&1; then
-  rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define HAVE_WS_YPIXEL 1
-EOF
-
-fi
-rm -f conftest*
-
-
-
-
-echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:8176: checking for pid_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 8181 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_pid_t=yes
-else
-  rm -rf conftest*
-  ac_cv_type_pid_t=no
-fi
-rm -f conftest*
-
-fi
-echo "$ac_t""$ac_cv_type_pid_t" 1>&6
-if test $ac_cv_type_pid_t = no; then
-  cat >> confdefs.h <<\EOF
-#define pid_t int
-EOF
-
-fi
-
-echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:8209: checking for uid_t in sys/types.h" >&5
-if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 8214 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "uid_t" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_uid_t=yes
-else
-  rm -rf conftest*
-  ac_cv_type_uid_t=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_type_uid_t" 1>&6
-if test $ac_cv_type_uid_t = no; then
-  cat >> confdefs.h <<\EOF
-#define uid_t int
-EOF
-
-  cat >> confdefs.h <<\EOF
-#define gid_t int
-EOF
-
-fi
-
-echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:8243: checking for off_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 8248 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_off_t=yes
-else
-  rm -rf conftest*
-  ac_cv_type_off_t=no
-fi
-rm -f conftest*
-
-fi
-echo "$ac_t""$ac_cv_type_off_t" 1>&6
-if test $ac_cv_type_off_t = no; then
-  cat >> confdefs.h <<\EOF
-#define off_t long
-EOF
-
-fi
-
-echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:8276: checking for size_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 8281 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_size_t=yes
-else
-  rm -rf conftest*
-  ac_cv_type_size_t=no
-fi
-rm -f conftest*
-
-fi
-echo "$ac_t""$ac_cv_type_size_t" 1>&6
-if test $ac_cv_type_size_t = no; then
-  cat >> confdefs.h <<\EOF
-#define size_t unsigned
-EOF
-
-fi
-
-
-
-echo $ac_n "checking for sa_len in struct sockaddr""... $ac_c" 1>&6
-echo "configure:8311: checking for sa_len in struct sockaddr" >&5
-if eval "test \"`echo '$''{'krb_cv_struct_sockaddr_sa_len'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-cat > conftest.$ac_ext <<EOF
-#line 8317 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-int main() {
-struct sockaddr sa;
-int foo = sa.sa_len;
-; return 0; }
-EOF
-if { (eval echo configure:8326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  krb_cv_struct_sockaddr_sa_len=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  krb_cv_struct_sockaddr_sa_len=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$krb_cv_struct_sockaddr_sa_len" 1>&6
-if test "$krb_cv_struct_sockaddr_sa_len" = yes; then
-	cat >> confdefs.h <<\EOF
-#define SOCKADDR_HAS_SA_LEN 1
-EOF
-
-fi
-
-
-if test "$ac_cv_header_siad_h" = yes; then
-echo $ac_n "checking for ouid in struct siaentity""... $ac_c" 1>&6
-echo "configure:8350: checking for ouid in struct siaentity" >&5
-if eval "test \"`echo '$''{'krb_cv_struct_siaentity_ouid'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-cat > conftest.$ac_ext <<EOF
-#line 8356 "configure"
-#include "confdefs.h"
-#include <siad.h>
-
-int main() {
-SIAENTITY e;
-int foo = e.ouid;
-; return 0; }
-EOF
-if { (eval echo configure:8365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  krb_cv_struct_siaentity_ouid=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  krb_cv_struct_siaentity_ouid=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$krb_cv_struct_siaentity_ouid" 1>&6
-if test "$krb_cv_struct_siaentity_ouid" = yes; then
-	cat >> confdefs.h <<\EOF
-#define SIAENTITY_HAS_OUID 1
-EOF
-
-fi
-fi
-
-
-echo $ac_n "checking for working getmsg""... $ac_c" 1>&6
-echo "configure:8389: checking for working getmsg" >&5
-if eval "test \"`echo '$''{'ac_cv_func_getmsg'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_func_getmsg=no
-else
-  cat > conftest.$ac_ext <<EOF
-#line 8397 "configure"
-#include "confdefs.h"
-
-#include <stdio.h>
-
-int main()
-{
-  getmsg(open("/dev/null", 0), NULL, NULL, NULL);
-  return 0;
-}
-
-EOF
-if { (eval echo configure:8409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_func_getmsg=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_func_getmsg=no
-fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$ac_cv_func_getmsg" 1>&6
-test "$ac_cv_func_getmsg" = "yes" &&
-cat >> confdefs.h <<\EOF
-#define HAVE_GETMSG 1
-EOF
-
-
-
-save_LIBS="$LIBS"
-LIBS="$LIB_DBM $LIBS"
-echo $ac_n "checking for berkeley db""... $ac_c" 1>&6
-echo "configure:8434: checking for berkeley db" >&5
-if eval "test \"`echo '$''{'krb_cv_lib_berkeleydb'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  krb_cv_lib_berkeleydb=no
-else
-  cat > conftest.$ac_ext <<EOF
-#line 8442 "configure"
-#include "confdefs.h"
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <ndbm.h>
-int main()
-{
-  DBM *d;
-
-  d = dbm_open("conftest", O_RDWR | O_CREAT, 0666);
-  if(d == NULL)
-    return 1;
-  dbm_close(d);
-  return access("conftest.db", F_OK) != 0;
-}
-EOF
-if { (eval echo configure:8459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  krb_cv_lib_berkeleydb=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  krb_cv_lib_berkeleydb=no
-fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$krb_cv_lib_berkeleydb" 1>&6
-test "$krb_cv_lib_berkeleydb" = "yes" &&
-cat >> confdefs.h <<\EOF
-#define HAVE_NEW_DB 1
-EOF
-
-LIBS="$save_LIBS"
-
-
-
-
-echo $ac_n "checking for el_init""... $ac_c" 1>&6
-echo "configure:8485: checking for el_init" >&5
-if eval "test \"`echo '$''{'ac_cv_funclib_el_init'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-if eval "test \"\$ac_cv_func_el_init\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in "" edit; do
-		if test -n "$ac_lib"; then 
-			ac_lib="-l$ac_lib"
-			LIBS="$ac_lib $ac_save_LIBS"
-		fi
-		cat > conftest.$ac_ext <<EOF
-#line 8498 "configure"
-#include "confdefs.h"
-
-int main() {
-el_init()
-; return 0; }
-EOF
-if { (eval echo configure:8505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_el_init=$ac_lib; else ac_cv_funclib_el_init=yes; fi";break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-	done
-	eval "ac_cv_funclib_el_init=\${ac_cv_funclib_el_init-no}"
-	LIBS="$ac_save_LIBS"
-fi
-
-fi
-
-
-eval "ac_res=\$ac_cv_funclib_el_init"
-
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs el_init"@@@
-@@@libs="$libs edit"@@@
-END
-
-eval "ac_tr_func=HAVE_`echo el_init | tr '[a-z]' '[A-Z]'`"
-eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr '[a-z]' '[A-Z]'`"
-eval "LIB_el_init=$ac_res"
-
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_el_init=yes"
-	eval "LIB_el_init="
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	echo "$ac_t""yes" 1>&6
-	;;
-	no)
-	eval "ac_cv_func_el_init=no"
-	eval "LIB_el_init="
-	echo "$ac_t""no" 1>&6
-	;;
-	*)
-	eval "ac_cv_func_el_init=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-	echo "$ac_t""yes, in $ac_res" 1>&6
-	;;
-esac
-
-
-
-
-echo $ac_n "checking for readline""... $ac_c" 1>&6
-echo "configure:8567: checking for readline" >&5
-if eval "test \"`echo '$''{'ac_cv_funclib_readline'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-if eval "test \"\$ac_cv_func_readline\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in "" readline; do
-		if test -n "$ac_lib"; then 
-			ac_lib="-l$ac_lib"
-			LIBS="$ac_lib $ac_save_LIBS"
-		fi
-		cat > conftest.$ac_ext <<EOF
-#line 8580 "configure"
-#include "confdefs.h"
-
-int main() {
-readline()
-; return 0; }
-EOF
-if { (eval echo configure:8587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_readline=$ac_lib; else ac_cv_funclib_readline=yes; fi";break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-	done
-	eval "ac_cv_funclib_readline=\${ac_cv_funclib_readline-no}"
-	LIBS="$ac_save_LIBS"
-fi
-
-fi
-
-
-eval "ac_res=\$ac_cv_funclib_readline"
-
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs readline"@@@
-@@@libs="$libs readline"@@@
-END
-
-eval "ac_tr_func=HAVE_`echo readline | tr '[a-z]' '[A-Z]'`"
-eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr '[a-z]' '[A-Z]'`"
-eval "LIB_readline=$ac_res"
-
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_readline=yes"
-	eval "LIB_readline="
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	echo "$ac_t""yes" 1>&6
-	;;
-	no)
-	eval "ac_cv_func_readline=no"
-	eval "LIB_readline="
-	echo "$ac_t""no" 1>&6
-	;;
-	*)
-	eval "ac_cv_func_readline=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-	echo "$ac_t""yes, in $ac_res" 1>&6
-	;;
-esac
-
-
-
-if test "$with_readline"; then
-	cat >> confdefs.h <<\EOF
-#define HAVE_READLINE 1
-EOF
-
-	editline_OBJS=
-	LIB_readline="$READLINELIB "'$(LIB_tgetent)'
-	INCLUDE_readline="$READLINEINCLUDE"
-elif test "$ac_cv_func_el_init" = yes; then
-	cat >> confdefs.h <<\EOF
-#define HAVE_READLINE 1
-EOF
-
-
-	editline_OBJS=edit_compat.o
-	LIB_readline='-L$(topdir)/lib/editline -leditline '"$LIB_el_init"' $(LIB_tgetent)'
-
-	INCLUDE_readline='-I$(topdir)/lib/editline -I$(top_srcdir)/lib/editline'
-elif test "$ac_cv_func_readline" = yes; then
-	cat >> confdefs.h <<\EOF
-#define HAVE_READLINE 1
-EOF
-
-	editline_OBJS=
-	LIB_readline='-lreadline $(LIB_tgetent)'
-	INCLUDE_readline=
-else
-	cat >> confdefs.h <<\EOF
-#define HAVE_READLINE 1
-EOF
-
-	editline_OBJS="editline.o complete.o sysunix.o"
-	LIB_readline='-L$(topdir)/lib/editline -leditline $(LIB_tgetent)'
-	INCLUDE_readline='-I$(topdir)/lib/editline -I$(top_srcdir)/lib/editline'
-fi
-
-
-
-
-
-cat >> confdefs.h <<\EOF
-#define AUTHENTICATION 1
-EOF
-cat >> confdefs.h <<\EOF
-#define KRB4 1
-EOF
-cat >> confdefs.h <<\EOF
-#define ENCRYPTION 1
-EOF
-cat >> confdefs.h <<\EOF
-#define DES_ENCRYPTION 1
-EOF
-cat >> confdefs.h <<\EOF
-#define DIAGNOSTICS 1
-EOF
-cat >> confdefs.h <<\EOF
-#define OLD_ENVIRON 1
-EOF
-
-# Simple test for streamspty, based on the existance of getmsg(), alas
-# this breaks on SunOS4 which have streams but BSD-like ptys
-#
-# And also something wierd has happend with dec-osf1, fallback to bsd-ptys
-
-echo $ac_n "checking for streamspty""... $ac_c" 1>&6
-echo "configure:8712: checking for streamspty" >&5
-case "`uname -sr`" in
-SunOS\ 4*|OSF1*|IRIX\ 4*|HP-UX\ ?.10.*)
-	krb_cv_sys_streamspty=no
-	;;
-AIX*)
-	os_rel=`uname -v`.`uname -r`
-	if expr "$os_rel" : "3*" >/dev/null 2>&1; then
-		krb_cv_sys_streamspty=no
-	else
-		krb_cv_sys_streamspty="$ac_cv_func_getmsg"
-	fi
-	;;
-*)
-	krb_cv_sys_streamspty="$ac_cv_func_getmsg"
-	;;
-esac
-if test "$krb_cv_sys_streamspty" = yes; then
-	cat >> confdefs.h <<\EOF
-#define STREAMSPTY 1
-EOF
-
-fi
-echo "$ac_t""$krb_cv_sys_streamspty" 1>&6
-
-echo $ac_n "checking if /bin/ls takes -A""... $ac_c" 1>&6
-echo "configure:8738: checking if /bin/ls takes -A" >&5
-if /bin/ls -A > /dev/null 2>&1 ;then
-	cat >> confdefs.h <<\EOF
-#define HAVE_LS_A 1
-EOF
-
-	krb_ls_a=yes
-else
-	krb_ls_a=no
-fi
-echo "$ac_t""$krb_ls_a" 1>&6
-	
-echo $ac_n "checking for suffix of preformatted manual pages""... $ac_c" 1>&6
-echo "configure:8751: checking for suffix of preformatted manual pages" >&5
-if eval "test \"`echo '$''{'krb_cv_sys_cat_suffix'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if grep _version /etc/man.conf > /dev/null 2>&1; then
-	krb_cv_sys_cat_suffix=0
-else
-	krb_cv_sys_cat_suffix=number
-fi
-fi
-
-echo "$ac_t""$krb_cv_sys_cat_suffix" 1>&6
-if test "$krb_cv_sys_cat_suffix" = number; then
-		CATSUFFIX='$$s'
-else
-		CATSUFFIX=0
-fi
-
-
-
-KRB_KAFS_LIB='-L$(topdir)/lib/kafs -lkafs'
-if test "$krb_cv_sys_aix" = yes; then
-	KRB_KAFS_LIB="$KRB_KAFS_LIB -lld"
-fi
-
-
-
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-for i in bin lib libexec sbin; do
-	i=${i}dir
-	foo=`echo $i | tr 'xindiscernible' 'XINDISCERNIBLE'`
-	x="\$${i}"
-	eval y="$x"
-	while test "x$y" != "x$x"; do
-		x="$y"
-		eval y="$x"
-	done
-	cat >> confdefs.h <<EOF
-#define $foo "$x"
-EOF
-
-done
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set) 2>&1 | grep '^ac_space'` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-DEFS=-DHAVE_CONFIG_H
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.12"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "\
-Makefile 					\
-include/Makefile				\
-include/sys/Makefile				\
-						\
-util/Makefile					\
-util/et/Makefile				\
-						\
-man/Makefile					\
-						\
-lib/Makefile					\
-lib/des/Makefile				\
-lib/krb/Makefile				\
-lib/kdb/Makefile				\
-lib/kadm/Makefile				\
-lib/acl/Makefile				\
-lib/kafs/Makefile				\
-lib/roken/Makefile				\
-lib/otp/Makefile				\
-lib/sl/Makefile					\
-lib/editline/Makefile				\
-lib/auth/Makefile				\
-lib/auth/pam/Makefile				\
-lib/auth/sia/Makefile				\
-lib/auth/afskauthlib/Makefile			\
-						\
-kuser/Makefile					\
-server/Makefile					\
-slave/Makefile					\
-admin/Makefile					\
-kadmin/Makefile					\
-						\
-appl/Makefile					\
-						\
-appl/afsutil/Makefile 				\
-appl/ftp/Makefile				\
-appl/ftp/common/Makefile			\
-appl/ftp/ftp/Makefile				\
-appl/ftp/ftpd/Makefile				\
-appl/telnet/Makefile				\
-appl/telnet/libtelnet/Makefile			\
-appl/telnet/telnet/Makefile			\
-appl/telnet/telnetd/Makefile			\
-appl/bsd/Makefile 				\
-appl/kauth/Makefile				\
-appl/kpopper/Makefile				\
-appl/movemail/Makefile				\
-appl/sample/Makefile				\
-appl/xnlock/Makefile				\
-appl/kx/Makefile				\
-appl/kip/Makefile				\
-appl/otp/Makefile				\
-doc/Makefile					\
- include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@LN_S@%$LN_S%g
-s%@CC@%$CC%g
-s%@CPP@%$CPP%g
-s%@YACC@%$YACC%g
-s%@LEX@%$LEX%g
-s%@LEXLIB@%$LEXLIB%g
-s%@RANLIB@%$RANLIB%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SOCKSINCLUDE@%$SOCKSINCLUDE%g
-s%@SOCKSLIB@%$SOCKSLIB%g
-s%@CRACKLIB@%$CRACKLIB%g
-s%@READLINEINCLUDE@%$READLINEINCLUDE%g
-s%@READLINELIB@%$READLINELIB%g
-s%@REAL_PICFLAGS@%$REAL_PICFLAGS%g
-s%@REAL_SHLIBEXT@%$REAL_SHLIBEXT%g
-s%@REAL_LD_FLAGS@%$REAL_LD_FLAGS%g
-s%@PICFLAGS@%$PICFLAGS%g
-s%@SHLIBEXT@%$SHLIBEXT%g
-s%@LDSHARED@%$LDSHARED%g
-s%@LD_FLAGS@%$LD_FLAGS%g
-s%@LIBEXT@%$LIBEXT%g
-s%@LIBPREFIX@%$LIBPREFIX%g
-s%@EXECSUFFIX@%$EXECSUFFIX%g
-s%@AFS_EXTRA_OBJS@%$AFS_EXTRA_OBJS%g
-s%@AFS_EXTRA_LIBS@%$AFS_EXTRA_LIBS%g
-s%@ac_cv_header_sys_cdefs_h@%$ac_cv_header_sys_cdefs_h%g
-s%@ac_cv_header_err_h@%$ac_cv_header_err_h%g
-s%@LIB_socket@%$LIB_socket%g
-s%@LIB_gethostbyname@%$LIB_gethostbyname%g
-s%@LIB_odm_initialize@%$LIB_odm_initialize%g
-s%@LIB_getattr@%$LIB_getattr%g
-s%@LIB_setpcred@%$LIB_setpcred%g
-s%@LIB_logwtmp@%$LIB_logwtmp%g
-s%@LIB_logout@%$LIB_logout%g
-s%@LIB_tgetent@%$LIB_tgetent%g
-s%@X_CFLAGS@%$X_CFLAGS%g
-s%@X_PRE_LIBS@%$X_PRE_LIBS%g
-s%@X_LIBS@%$X_LIBS%g
-s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
-s%@MAKE_X_PROGS_BIN@%$MAKE_X_PROGS_BIN%g
-s%@MAKE_X_PROGS_LIBEXEC@%$MAKE_X_PROGS_LIBEXEC%g
-s%@LIB_XauReadAuth@%$LIB_XauReadAuth%g
-s%@XauWriteAuth_c@%$XauWriteAuth_c%g
-s%@XauWriteAuth_o@%$XauWriteAuth_o%g
-s%@LIB_dbopen@%$LIB_dbopen%g
-s%@LIB_dbm_firstkey@%$LIB_dbm_firstkey%g
-s%@LIB_DBM@%$LIB_DBM%g
-s%@LIB_syslog@%$LIB_syslog%g
-s%@LIB_getpwnam_r@%$LIB_getpwnam_r%g
-s%@LIB_getsockopt@%$LIB_getsockopt%g
-s%@LIB_setsockopt@%$LIB_setsockopt%g
-s%@LIB_res_search@%$LIB_res_search%g
-s%@LIB_dn_expand@%$LIB_dn_expand%g
-s%@ALLOCA@%$ALLOCA%g
-s%@LIB_hstrerror@%$LIB_hstrerror%g
-s%@LIBOBJS@%$LIBOBJS%g
-s%@LIB_AUTH_SUBDIRS@%$LIB_AUTH_SUBDIRS%g
-s%@APPL_KIP_DIR@%$APPL_KIP_DIR%g
-s%@LIB_el_init@%$LIB_el_init%g
-s%@LIB_readline@%$LIB_readline%g
-s%@INCLUDE_readline@%$INCLUDE_readline%g
-s%@editline_OBJS@%$editline_OBJS%g
-s%@CATSUFFIX@%$CATSUFFIX%g
-s%@KRB_KAFS_LIB@%$KRB_KAFS_LIB%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"\
-Makefile 					\
-include/Makefile				\
-include/sys/Makefile				\
-						\
-util/Makefile					\
-util/et/Makefile				\
-						\
-man/Makefile					\
-						\
-lib/Makefile					\
-lib/des/Makefile				\
-lib/krb/Makefile				\
-lib/kdb/Makefile				\
-lib/kadm/Makefile				\
-lib/acl/Makefile				\
-lib/kafs/Makefile				\
-lib/roken/Makefile				\
-lib/otp/Makefile				\
-lib/sl/Makefile					\
-lib/editline/Makefile				\
-lib/auth/Makefile				\
-lib/auth/pam/Makefile				\
-lib/auth/sia/Makefile				\
-lib/auth/afskauthlib/Makefile			\
-						\
-kuser/Makefile					\
-server/Makefile					\
-slave/Makefile					\
-admin/Makefile					\
-kadmin/Makefile					\
-						\
-appl/Makefile					\
-						\
-appl/afsutil/Makefile 				\
-appl/ftp/Makefile				\
-appl/ftp/common/Makefile			\
-appl/ftp/ftp/Makefile				\
-appl/ftp/ftpd/Makefile				\
-appl/telnet/Makefile				\
-appl/telnet/libtelnet/Makefile			\
-appl/telnet/telnet/Makefile			\
-appl/telnet/telnetd/Makefile			\
-appl/bsd/Makefile 				\
-appl/kauth/Makefile				\
-appl/kpopper/Makefile				\
-appl/movemail/Makefile				\
-appl/sample/Makefile				\
-appl/xnlock/Makefile				\
-appl/kx/Makefile				\
-appl/kip/Makefile				\
-appl/otp/Makefile				\
-doc/Makefile					\
-"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
-ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
-ac_dC='\3'
-ac_dD='%g'
-# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
-ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-ac_uB='\([ 	]\)%\1#\2define\3'
-ac_uC=' '
-ac_uD='\4%g'
-# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-ac_eB='$%\1#\2define\3'
-ac_eC=' '
-ac_eD='%g'
-
-if test "${CONFIG_HEADERS+set}" != set; then
-EOF
-cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="include/config.h"
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-fi
-for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  echo creating $ac_file
-
-  rm -f conftest.frag conftest.in conftest.out
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  cat $ac_file_inputs > conftest.in
-
-EOF
-
-# Transform confdefs.h into a sed script conftest.vals that substitutes
-# the proper values into config.h.in to produce config.h.  And first:
-# Protect against being on the right side of a sed subst in config.status.
-# Protect against being in an unquoted here document in config.status.
-rm -f conftest.vals
-cat > conftest.hdr <<\EOF
-s/[\\&%]/\\&/g
-s%[\\$`]%\\&%g
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
-s%ac_d%ac_u%gp
-s%ac_u%ac_e%gp
-EOF
-sed -n -f conftest.hdr confdefs.h > conftest.vals
-rm -f conftest.hdr
-
-# This sed command replaces #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-cat >> conftest.vals <<\EOF
-s%^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
-EOF
-
-# Break up conftest.vals because some shells have a limit on
-# the size of here documents, and old seds have small limits too.
-
-rm -f conftest.tail
-while :
-do
-  ac_lines=`grep -c . conftest.vals`
-  # grep -c gives empty output for an empty file on some AIX systems.
-  if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
-  # Write a limited-size here document to conftest.frag.
-  echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
-  echo 'CEOF
-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-' >> $CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
-  rm -f conftest.vals
-  mv conftest.tail conftest.vals
-done
-rm -f conftest.vals
-
-cat >> $CONFIG_STATUS <<\EOF
-  rm -f conftest.frag conftest.h
-  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
-  cat conftest.in >> conftest.h
-  rm -f conftest.in
-  if cmp -s $ac_file conftest.h 2>/dev/null; then
-    echo "$ac_file is unchanged"
-    rm -f conftest.h
-  else
-    # Remove last slash and all that follows it.  Not all systems have dirname.
-      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-      # The file is in a subdirectory.
-      test ! -d "$ac_dir" && mkdir "$ac_dir"
-    fi
-    rm -f $ac_file
-    mv conftest.h $ac_file
-  fi
-fi; done
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
- 
-KRB4VERSION="$PACKAGE-$VERSION"
-
-cat > include/newversion.h.in <<EOF
-char *krb4_long_version = "@(#)\$Version: $KRB4VERSION by @USER@ on @HOST@ ($host) @DATE@ \$";
-char *krb4_version = "$KRB4VERSION";
-EOF
-
-if test -f include/version.h && cmp -s include/newversion.h.in include/version.h.in; then
-	echo "include/version.h is unchanged"
-	rm -f include/newversion.h.in
-else
- 	echo "creating include/version.h"
- 	User=${USER-${LOGNAME}}
- 	Host=`(hostname || uname -n) 2>/dev/null | sed 1q`
- 	Date=`date`
-	mv -f include/newversion.h.in include/version.h.in
-	sed -e "s/@USER@/$User/" -e "s/@HOST@/$Host/" -e "s/@DATE@/$Date/" include/version.h.in > include/version.h
-fi
diff --git a/crypto/kerberosIV/configure.in b/crypto/kerberosIV/configure.in
deleted file mode 100644
index 9265666139fc..000000000000
--- a/crypto/kerberosIV/configure.in
+++ /dev/null
@@ -1,970 +0,0 @@
-dnl
-dnl *** PLEASE NOTE ***
-dnl *** PLEASE NOTE ***
-dnl *** PLEASE NOTE ***
-dnl
-dnl Update $VERSION before making a new release
-dnl
-
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_REVISION($Revision: 1.285 $)
-AC_INIT(lib/krb/getrealm.c)
-AC_CONFIG_HEADER(include/config.h)
-
-dnl
-dnl definitions
-dnl
-
-PACKAGE=krb4
-AC_SUBST(PACKAGE)dnl
-VERSION=0.9.6
-AC_SUBST(VERSION)dnl
-# This may be overridden using --prefix=/usr to configure
-AC_PREFIX_DEFAULT(/usr/athena)
-
-AC_CANONICAL_HOST
-AC_PROG_MAKE_SET
-AC_ARG_PROGRAM
-
-# We want these before the checks, so the checks can modify their values.
-test -z "$LDFLAGS" && LDFLAGS=-g
-
-dnl
-dnl check for programs
-dnl
-
-AC_KRB_PROG_LN_S
-AC_PROG_CC
-AC_PROG_CPP
-AC_ISC_POSIX
-AC_KRB_PROG_YACC
-AC_PROG_LEX
-AC_PROG_RANLIB
-AC_PROG_INSTALL
-AC_CHECK_PROG(MAKEINFO, makeinfo, makeinfo, :)
-
-dnl
-dnl check for build options
-dnl
-
-AC_TEST_PACKAGE(socks,socks.h,libsocks5.a,-lsocks5)
-CFLAGS="$SOCKSINCLUDE $CFLAGS"
-LIBS="$SOCKSLIB $LIBS"
-
-dnl Check if we want to use shared libraries
-AC_ARG_WITH(shared,
-[  --with-shared           create shared libraries for Kerberos])
-
-AC_ARG_WITH(cracklib,
-[  --with-cracklib=dir     use the cracklib.a in dir],
-)
-
-AC_ARG_WITH(dictpath,
-[  --with-dictpath=path    use this dictionary with cracklib]
-)
-
-(test -z "$with_cracklib" && test -n "$with_dictpath") ||
-(test -n "$with_cracklib" && test -z "$with_dictpath") &&
-AC_MSG_ERROR(--with-cracklib requires --with-dictpath and vice versa)
-test -n "$with_cracklib" &&
-CRACKLIB="-L$with_cracklib -lcrack" &&
-AC_MSG_RESULT(Using cracklib in $with_cracklib)
-AC_SUBST(CRACKLIB)dnl
-test -n "$with_dictpath" &&
-AC_MSG_RESULT(Using dictpath=$with_dictpath) &&
-AC_DEFINE_UNQUOTED(DICTPATH,"$with_dictpath")
-
-AC_ARG_WITH(mailspool,
-[  --with-mailspool=dir    this is the mail spool directory]
-)
-
-test -n "$with_mailspool" &&
-AC_DEFINE_UNQUOTED(KRB4_MAILDIR, "$with_mailspool")
-
-AC_ARG_ENABLE(random-mkey,
-[  --enable-random-mkey    use new code for master keys],[
-if test "$enableval" = "yes"; then
-	AC_DEFINE(RANDOM_MKEY,1)
-fi
-])
-
-AC_ARG_WITH(mkey,
-[  --with-mkey=file        where to put the master key],[
-if test -n "$withval"; then
-	AC_DEFINE_UNQUOTED(MKEYFILE,"$withval")
-fi
-])
-
-berkeley_db=db
-AC_ARG_WITH(berkeley-db,
-[  --without-berkeley-db   if you don't want berkeley db],[
-if test "$withval" = no; then
-	berkeley_db=""
-fi
-])
-
-afs_support=yes
-AC_ARG_WITH(afs-support,
-[  --without-afs-support   if you don't want support for afs],[
-if test "$withval" = no; then
-	AC_DEFINE(NO_AFS)
-	afs_support=no
-fi
-])
-
-des_quad=guess
-AC_ARG_WITH(des-quad-checksum,
-[  --with-des-quad-checksum=kind
-                           default checksum to use (new, old, or guess)],[
-des_quad="$withval"
-])
-if test "$des_quad" = "new"; then
-	AC_DEFINE(DES_QUAD_DEFAULT,DES_QUAD_NEW)
-elif test "$des_quad" = "old"; then
-	AC_DEFINE(DES_QUAD_DEFAULT,DES_QUAD_OLD)
-else
-	AC_DEFINE(DES_QUAD_DEFAULT,DES_QUAD_GUESS)
-fi	
-
-AC_TEST_PACKAGE(readline,readline.h,libreadline.a,-lreadline)
-
-dnl
-dnl Shared library stuff has to be different everywhere
-dnl
-
-AC_SUBST(CFLAGS)dnl
-AC_SUBST(LDFLAGS)dnl
-
-case ${with_shared} in
-  yes ) with_shared=yes;;
-  no  ) with_shared=no;;
-  *   ) with_shared=no;;
-esac
-
-# NOTE: Building shared libraries may not work if you do not use gcc!
-#
-# OS		$SHLIBEXT
-# HP-UX		sl
-# Linux		so
-# NetBSD	so
-# FreeBSD	so
-# OSF		so
-# SunOS5	so
-# SunOS4	so.0.5
-# Irix		so
-#
-# LIBEXT is the extension we should build (.a or $SHLIBEXT)
-REAL_PICFLAGS="-fpic"
-LDSHARED='$(CC) $(PICFLAGS) -shared'
-LIBPREFIX=lib
-REAL_SHLIBEXT=so
-changequote({,})dnl
-SHLIB_VERSION=`echo $VERSION | sed 's/\([0-9.]*\).*/\1/'`
-changequote([,])dnl
-case "${host}" in
-*-*-hpux*)
-	REAL_SHLIBEXT=sl
-	REAL_LD_FLAGS='-Wl,+b$(libdir)'
-	if test -z "$GCC"; then
-		LDSHARED="ld -b"
-		REAL_PICFLAGS="+z"
-	fi
-	;;
-*-*-linux*)
-	REAL_LD_FLAGS='-Wl,-rpath,$(libdir)'
-	;;
-*-*-*bsd*)
-	REAL_SHLIBEXT=so.$SHLIB_VERSION
-	LDSHARED='ld -Bshareable'
-	REAL_LD_FLAGS='-Wl,-R$(libdir)'
-	;;
-*-*-osf*)
-	REAL_LD_FLAGS='-Wl,-rpath,$(libdir)'
-	REAL_PICFLAGS=
-	LDSHARED='ld -shared -expect_unresolved \*'
-	;;
-*-*-solaris2*)
-	REAL_LD_FLAGS='-Wl,-R$(libdir)'
-	if test -z "$GCC"; then
-		LDSHARED='$(CC) -G'
-		REAL_PICFLAGS="-Kpic"
-	fi
-	;;
-*-*-sunos*)
-	REAL_SHLIBEXT=so.$SHLIB_VERSION
-	REAL_LD_FLAGS='-Wl,-L$(libdir)'
-	;;
-*-*-irix*)
-	REAL_LD_FLAGS='-Wl,-rpath,$(libdir)'
-	REAL_PICFLAGS=
-	;;
-*-*-os2_emx*)
-	LD_FLAGS='-Zexe'
-	LIBPREFIX=
-	EXECSUFFIX='.exe'
-	RANLIB=EMXOMF
-	REAL_SHLIBEXT=nobuild
-	;;
-*-*-cygwin32*)
-	EXECSUFFIX='.exe'
-	REAL_SHLIBEXT=nobuild
-	;;
-*)	REAL_SHLIBEXT=nobuild
-	REAL_PICFLAGS= 
-	;;
-esac
-
-if test "${with_shared}" != "yes" ; then 
- PICFLAGS=""
- SHLIBEXT="nobuild"
- LIBEXT="a"
-else
- PICFLAGS="$REAL_PICFLAGS"
- SHLIBEXT="$REAL_SHLIBEXT"
- LIBEXT="$SHLIBEXT"
- LD_FLAGS="$REAL_LD_FLAGS"
-fi
-
-AC_SUBST(REAL_PICFLAGS) dnl
-AC_SUBST(REAL_SHLIBEXT) dnl
-AC_SUBST(REAL_LD_FLAGS) dnl
-
-AC_SUBST(PICFLAGS) dnl
-AC_SUBST(SHLIBEXT) dnl
-AC_SUBST(LDSHARED) dnl
-AC_SUBST(LD_FLAGS) dnl
-AC_SUBST(LIBEXT) dnl
-AC_SUBST(LIBPREFIX) dnl
-AC_SUBST(EXECSUFFIX) dnl
-
-dnl
-dnl Check if we need to use weak-stuff
-dnl
-
-AC_HAVE_PRAGMA_WEAK
-
-dnl
-dnl Check for endian-ness, this breaks cross compilation
-dnl
-AC_C_BIGENDIAN
-
-dnl
-dnl Check for constness
-dnl
-AC_C_CONST
-
-dnl
-dnl Check for strange operating systems that you need to handle differently
-dnl
-
-AC_KRB_SYS_NEXTSTEP
-AC_KRB_SYS_AIX
-
-if test "$krb_cv_sys_aix" = yes ;then
-	AFS_EXTRA_OBJS='$(srcdir)/afsl.exp dlfcn.o'
-	AC_SUBST(AFS_EXTRA_OBJS)
-	AFS_EXTRA_LIBS=afslib.so
-	AC_SUBST(AFS_EXTRA_LIBS)
-fi
-
-#
-# AIX needs /lib/pse.exp for getmsg, but alas that file is broken in
-# AIX414
-#
-
-if test -f /lib/pse.exp ;then
-	LIBS="$LIBS -Wl,-bI:/lib/pse.exp"
-fi
-
-dnl
-dnl Various checks for headers and their contents
-dnl
-
-AC_HEADER_STDC
-
-AC_CHECK_HEADERS(arpa/ftp.h arpa/inet.h arpa/nameser.h)
-AC_CHECK_HEADERS(arpa/telnet.h bind/bitypes.h bsd/bsd.h bsdsetjmp.h)
-AC_CHECK_HEADERS(crypt.h dbm.h dirent.h err.h fcntl.h grp.h io.h)
-AC_CHECK_HEADERS(lastlog.h login.h maillock.h ndbm.h net/if.h)
-AC_CHECK_HEADERS(net/if_tun.h net/if_var.h netdb.h netinet/in.h)
-AC_CHECK_HEADERS(netinet/in6_machtypes.h netinet/in_systm.h)
-AC_CHECK_HEADERS(netinet/ip.h netinet/tcp.h paths.h pty.h pwd.h)
-AC_CHECK_HEADERS(resolv.h rpcsvc/dbm.h sac.h security/pam_modules.h)
-AC_CHECK_HEADERS(shadow.h siad.h signal.h stropts.h sys/bitypes.h)
-AC_CHECK_HEADERS(sys/category.h sys/cdefs.h sys/file.h sys/filio.h)
-AC_CHECK_HEADERS(sys/ioccom.h sys/ioctl.h sys/locking.h sys/mman.h)
-AC_CHECK_HEADERS(sys/param.h sys/proc.h sys/ptyio.h sys/ptyvar.h)
-AC_CHECK_HEADERS(sys/resource.h sys/select.h sys/socket.h)
-AC_CHECK_HEADERS(sys/sockio.h sys/stat.h sys/str_tty.h sys/stream.h)
-AC_CHECK_HEADERS(sys/stropts.h sys/strtty.h sys/syscall.h)
-AC_CHECK_HEADERS(sys/sysctl.h sys/termio.h sys/time.h sys/timeb.h)
-AC_CHECK_HEADERS(sys/times.h sys/tty.h sys/types.h sys/uio.h)
-AC_CHECK_HEADERS(sys/un.h sys/utsname.h sys/wait.h syslog.h)
-AC_CHECK_HEADERS(termio.h termios.h tmpdir.h ttyent.h udb.h ulimit.h)
-AC_CHECK_HEADERS(unistd.h userpw.h usersec.h util.h utime.h utmp.h)
-AC_CHECK_HEADERS(utmpx.h wait.h winsock.h)
-
-AC_HEADER_TIME
-AC_DECL_SYS_SIGLIST
-AC_SUBST(ac_cv_header_sys_cdefs_h)dnl
-AC_SUBST(ac_cv_header_err_h)dnl
-
-AC_GROK_TYPES(int8_t int16_t int32_t int64_t)
-AC_GROK_TYPES(u_int8_t u_int16_t u_int32_t u_int64_t)
-
-dnl
-dnl Various checks for libraries and their contents
-dnl
-
-dnl
-dnl System V is have misplaced the socket routines, should really be in libc
-dnl
-
-AC_FIND_FUNC(socket, socket,
-[#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif],
-[0,0,0])
-AC_FIND_FUNC(gethostbyname, nsl,
-[#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif],
-"foo")
-
-dnl
-dnl Horror AIX needs -lodm -lcfg to link login
-dnl
-
-AC_FIND_FUNC(odm_initialize, odm)
-AC_FIND_FUNC(getattr, cfg)
-AC_FIND_FUNC(setpcred, s)
-AC_FIND_FUNC(logwtmp, util)
-
-AC_FIND_FUNC(logout, util)
-AC_FIND_FUNC_NO_LIBS(tgetent, termcap)
-	
-dnl 
-dnl See if there is any X11 present
-dnl
-AC_PATH_XTRA
-if test "$no_x" = "yes" ; then
-	MAKE_X_PROGS_BIN=""
-	MAKE_X_PROGS_LIBEXEC=""
-else
-	MAKE_X_PROGS_BIN='$(X_PROGS_BIN)'
-	MAKE_X_PROGS_LIBEXEC='$(X_PROGS_LIBEXEC)'
-fi
-AC_SUBST(MAKE_X_PROGS_BIN)dnl
-AC_SUBST(MAKE_X_PROGS_LIBEXEC)dnl
-
-save_CFLAGS="$CFLAGS"
-CFLAGS="$X_CFLAGS $CFLAGS"
-save_LIBS="$LIBS"
-dnl LIBS="$X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS $LIBS"
-LIBS="$X_PRE_LIBS $X_EXTRA_LIBS $LIBS"
-save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS $X_LIBS"
-
-AC_FIND_FUNC_NO_LIBS(XauReadAuth, Xau X11)
-ac_xxx="$LIBS"
-LIBS="$LIB_XauReadAuth $LIBS"
-AC_CHECK_FUNCS(XauWriteAuth)
-if test "$ac_cv_func_XauWriteAuth" != "yes"; then
-  XauWriteAuth_c=writeauth.c
-  XauWriteAuth_o=writeauth.o
-fi
-AC_SUBST(XauWriteAuth_c)dnl
-AC_SUBST(XauWriteAuth_o)dnl
-LIBS="$ac_xxx"
-
-CFLAGS=$save_CFLAGS
-LIBS=$save_LIBS
-LDFLAGS=$save_LDFLAGS
-
-dnl
-dnl Look for berkeley db, gdbm, and ndbm in that order.
-dnl
-
-save_LIBS="$LIBS"
-AC_FIND_FUNC_NO_LIBS(dbopen, $berkeley_db)
-LIBS="$LIB_dbopen $LIBS"
-AC_FIND_FUNC_NO_LIBS(dbm_firstkey, $berkeley_db gdbm ndbm)
-if test -n "$LIB_dbopen"; then
-  LIB_DBM="$LIB_dbopen"
-else
-  LIB_DBM="$LIB_dbm_firstkey"
-fi
-AC_SUBST(LIB_DBM)dnl
-LIBS="$save_LIBS"
-
-AC_FIND_FUNC(syslog, syslog)
-
-AC_CACHE_CHECK(for working snprintf,ac_cv_func_snprintf_working,
-ac_cv_func_snprintf_working=yes
-AC_TRY_RUN([
-#include <stdio.h>
-#include <string.h>
-int main()
-{
-changequote(`,')dnl
-	char foo[3];
-changequote([,])dnl
-	snprintf(foo, 2, "12");
-	return strcmp(foo, "1");
-}],:,ac_cv_func_snprintf_working=no,:))
-: << END
-@@@funcs="$funcs snprintf"@@@
-END
-if test "$ac_cv_func_snprintf_working" = yes; then
-	foo=HAVE_SNPRINTF
-	AC_DEFINE_UNQUOTED($foo)
-fi
-
-AC_CHECK_FUNCS(asnprintf asprintf vasprintf vasnprintf vsnprintf)
-
-
-AC_CHECK_FUNCS(_getpty _scrsize _setsid _stricmp fchmod fcntl flock)
-AC_CHECK_FUNCS(forkpty frevoke gethostname getlogin getpriority getservbyname)
-AC_CHECK_FUNCS(getspnam getspuid gettimeofday getuid grantpt)
-AC_CHECK_FUNCS(innetgr iruserok mktime ptsname rand random)
-AC_CHECK_FUNCS(revoke setitimer setlogin setpgid setpriority)
-AC_CHECK_FUNCS(setproctitle setregid setresgid setresuid setreuid setsid)
-AC_CHECK_FUNCS(setutent swab ttyname ttyslot ulimit uname)
-AC_CHECK_FUNCS(unlockpt vhangup yp_get_default_domain)
-AC_FIND_FUNC_NO_LIBS(getpwnam_r,c_r)
-if test "$ac_cv_func_getpwnam_r" = yes; then
-	AC_CACHE_CHECK(if getpwnam_r is posix,ac_cv_func_getpwnam_r_posix,
-	ac_libs="$LIBS"
-	LIBS="$LIBS $LIB_getpwnam_r"
-	AC_TRY_RUN([
-#include <pwd.h>
-int main()
-{
-	struct passwd pw, *pwd;
-	return getpwnam_r("", &pw, NULL, 0, &pwd) < 0;
-}
-],ac_cv_func_getpwnam_r_posix=yes,ac_cv_func_getpwnam_r_posix=no,:)
-LIBS="$ac_libs")
-if test "$ac_cv_func_getpwnam_r_posix" = yes; then
-	AC_DEFINE(POSIX_GETPWNAM_R)
-fi
-fi
-
-AC_FIND_FUNC_NO_LIBS(getsockopt, ,
-[#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif],
-[0,0,0,0,0])
-AC_FIND_FUNC_NO_LIBS(setsockopt, ,
-[#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif],
-[0,0,0,0,0])
-
-dnl Cray stuff
-AC_CHECK_FUNCS(getudbnam setlim)
-
-AC_FIND_FUNC(res_search, resolv,
-[
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-#ifdef HAVE_RESOLV_H
-#include <resolv.h>
-#endif
-],
-[0,0,0,0,0])
-
-AC_FIND_FUNC(dn_expand, resolv,
-[
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-#ifdef HAVE_RESOLV_H
-#include <resolv.h>
-#endif
-],
-[0,0,0,0,0])
-
-
-AC_FUNC_MMAP
-AC_FUNC_ALLOCA
-
-#
-# Test for POSIX (broken) getlogin
-#
-
-if test "$ac_cv_func_getlogin" = yes; then
-AC_CACHE_CHECK(if getlogin is posix, ac_cv_func_getlogin_posix, [
-if test "$ac_cv_func_getlogin" = yes -a "$ac_cv_func_setlogin" = yes; then
-	ac_cv_func_getlogin_posix=no
-else
-	ac_cv_func_getlogin_posix=yes
-fi
-])
-if test "$ac_cv_func_getlogin_posix" = yes; then
-	AC_DEFINE(POSIX_GETLOGIN, 1)
-fi
-fi
-
-AC_FIND_IF_NOT_BROKEN(hstrerror, resolv,
-[#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif],
-17)
-
-AC_BROKEN(chown daemon err errx fchown getcwd getdtablesize getopt)
-AC_BROKEN(getusershell inet_aton initgroups lstat memmove mkstemp)
-AC_BROKEN(putenv rcmd setegid setenv seteuid strcasecmp strdup)
-AC_BROKEN(strerror strftime strlwr strnlen strtok_r strupr unsetenv)
-AC_BROKEN(verr verrx vwarn vwarnx warn warnx)
-
-AC_KRB_FUNC_GETCWD_BROKEN
-
-dnl
-dnl Figure what authentication modules should be built
-dnl
-
-AC_MSG_CHECKING(which authentication modules should be built)
-
-LIB_AUTH_SUBDIRS=
-
-if test "$ac_cv_header_siad_h" = yes; then
-	LIB_AUTH_SUBDIRS="$LIB_AUTH_SUBDIRS sia"
-fi
-
-if test "$ac_cv_header_security_pam_modules_h" = yes; then
-	LIB_AUTH_SUBDIRS="$LIB_AUTH_SUBDIRS pam"
-fi
-
-case "${host}" in
-changequote(,)dnl
-*-*-irix[56]*) LIB_AUTH_SUBDIRS="$LIB_AUTH_SUBDIRS afskauthlib" ;;
-changequote([,])dnl
-esac
-
-AC_MSG_RESULT($LIB_AUTH_SUBDIRS)
-
-AC_SUBST(LIB_AUTH_SUBDIRS)dnl
-
-dnl
-dnl Figure out if we have tunnels
-dnl
-
-AC_MSG_CHECKING(for tunnel devices)
-
-APPL_KIP_DIR=
-
-if test "$ac_cv_header_net_if_tun_h" = "yes"; then
-	APPL_KIP_DIR=kip
-fi
-
-AC_MSG_RESULT($ac_cv_header_net_if_tun_h)
-
-AC_SUBST(APPL_KIP_DIR)dnl
-
-dnl
-dnl Checks for prototypes and declarations
-dnl
-
-AC_NEED_PROTO([
-#ifdef HAVE_CRYPT_H
-#include <crypt.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-],
-crypt)
-
-AC_NEED_PROTO([
-#include <string.h>
-],
-strtok_r)
-
-AC_CHECK_VAR([#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif],
-h_errno)
-
-AC_CHECK_VAR([#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif],
-h_errlist)
-
-AC_CHECK_VAR([#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif],
-h_nerr)
-
-AC_CHECK_VAR([#ifdef HAVE_ERR_H
-#include <err.h>
-#endif],[__progname])
-
-AC_CHECK_DECLARATION([#include <stdlib.h>], optarg)
-AC_CHECK_DECLARATION([#include <stdlib.h>], optind)
-AC_CHECK_DECLARATION([#include <stdlib.h>], opterr)
-AC_CHECK_DECLARATION([#include <stdlib.h>], optopt)
-
-dnl
-dnl According to ANSI you are explicitly allowed to cast to void,
-dnl but the standard fails to say what should happen. Some compilers
-dnl think this is illegal:
-dnl
-dnl void foo(void)
-dnl {
-dnl   return (void)0;
-dnl }
-dnl
-dnl Thus explicitly test for void
-dnl
-AC_TYPE_SIGNAL
-if test "$ac_cv_type_signal" = "void" ; then
-	AC_DEFINE(VOID_RETSIGTYPE, 1)
-fi
-
-dnl
-dnl Check for fields in struct utmp
-dnl
-AC_EGREP_HEADER(ut_user, utmp.h, AC_DEFINE(HAVE_UT_USER))
-AC_EGREP_HEADER(ut_host, utmp.h, AC_DEFINE(HAVE_UT_HOST))
-AC_EGREP_HEADER(ut_addr, utmp.h, AC_DEFINE(HAVE_UT_ADDR))
-AC_EGREP_HEADER(ut_type, utmp.h, AC_DEFINE(HAVE_UT_TYPE))
-AC_EGREP_HEADER(ut_pid, utmp.h, AC_DEFINE(HAVE_UT_PID))
-AC_EGREP_HEADER(ut_id, utmp.h, AC_DEFINE(HAVE_UT_ID))
-AC_EGREP_HEADER(ut_syslen, utmpx.h, AC_DEFINE(HAVE_UT_SYSLEN))
-
-AC_STRUCT_ST_BLKSIZE
-
-dnl
-dnl Check for struct winsize
-dnl
-
-AC_KRB_STRUCT_WINSIZE
-
-dnl
-dnl Check for some common types
-dnl
-
-AC_TYPE_PID_T
-AC_TYPE_UID_T
-AC_TYPE_OFF_T
-AC_TYPE_SIZE_T
-
-dnl
-dnl Check for sa_len in sys/socket.h
-dnl
-
-AC_MSG_CHECKING(for sa_len in struct sockaddr)
-AC_CACHE_VAL(krb_cv_struct_sockaddr_sa_len, [
-AC_TRY_COMPILE(
-[#include <sys/types.h>
-#include <sys/socket.h>],
-[struct sockaddr sa;
-int foo = sa.sa_len;],
-krb_cv_struct_sockaddr_sa_len=yes,
-krb_cv_struct_sockaddr_sa_len=no)
-])
-AC_MSG_RESULT($krb_cv_struct_sockaddr_sa_len)
-if test "$krb_cv_struct_sockaddr_sa_len" = yes; then
-	AC_DEFINE(SOCKADDR_HAS_SA_LEN)
-fi
-
-dnl
-dnl Check for ouid in sys/siad.h
-dnl
-
-if test "$ac_cv_header_siad_h" = yes; then
-AC_MSG_CHECKING(for ouid in struct siaentity)
-AC_CACHE_VAL(krb_cv_struct_siaentity_ouid, [
-AC_TRY_COMPILE(
-[#include <siad.h>
-],
-[SIAENTITY e;
-int foo = e.ouid;],
-krb_cv_struct_siaentity_ouid=yes,
-krb_cv_struct_siaentity_ouid=no)
-])
-AC_MSG_RESULT($krb_cv_struct_siaentity_ouid)
-if test "$krb_cv_struct_siaentity_ouid" = yes; then
-	AC_DEFINE(SIAENTITY_HAS_OUID)
-fi
-fi
-
-dnl
-dnl you can link with getmsg on AIX 3.2 but you cannot run the program
-dnl
-
-AC_CACHE_CHECK(for working getmsg, ac_cv_func_getmsg,
-AC_TRY_RUN(
-[
-#include <stdio.h>
-
-int main()
-{
-  getmsg(open("/dev/null", 0), NULL, NULL, NULL);
-  return 0;
-}
-], ac_cv_func_getmsg=yes, ac_cv_func_getmsg=no, ac_cv_func_getmsg=no))
-test "$ac_cv_func_getmsg" = "yes" &&
-AC_DEFINE(HAVE_GETMSG)
-
-dnl
-dnl Test if we are using berkeley db
-dnl
-
-save_LIBS="$LIBS"
-LIBS="$LIB_DBM $LIBS"
-AC_CACHE_CHECK(for berkeley db, krb_cv_lib_berkeleydb,
-AC_TRY_RUN(
-[
-#include <unistd.h>
-#include <fcntl.h>
-#include <ndbm.h>
-int main()
-{
-  DBM *d;
-
-  d = dbm_open("conftest", O_RDWR | O_CREAT, 0666);
-  if(d == NULL)
-    return 1;
-  dbm_close(d);
-  return access("conftest.db", F_OK) != 0;
-}], krb_cv_lib_berkeleydb=yes, krb_cv_lib_berkeleydb=no,
-krb_cv_lib_berkeleydb=no))
-test "$krb_cv_lib_berkeleydb" = "yes" &&
-AC_DEFINE(HAVE_NEW_DB)
-LIBS="$save_LIBS"
-
-dnl
-dnl Tests for editline
-dnl
-
-AC_FIND_FUNC_NO_LIBS(el_init, edit)
-AC_FIND_FUNC_NO_LIBS(readline, readline)
-
-if test "$with_readline"; then
-	AC_DEFINE(HAVE_READLINE, 1)
-	editline_OBJS=
-	LIB_readline="$READLINELIB "'$(LIB_tgetent)'
-	INCLUDE_readline="$READLINEINCLUDE"
-elif test "$ac_cv_func_el_init" = yes; then
-	AC_DEFINE(HAVE_READLINE, 1)
-
-	editline_OBJS=edit_compat.o
-	LIB_readline='-L$(topdir)/lib/editline -leditline '"$LIB_el_init"' $(LIB_tgetent)'
-
-	INCLUDE_readline='-I$(topdir)/lib/editline -I$(top_srcdir)/lib/editline'
-elif test "$ac_cv_func_readline" = yes; then
-	AC_DEFINE(HAVE_READLINE, 1)
-	editline_OBJS=
-	LIB_readline='-lreadline $(LIB_tgetent)'
-	INCLUDE_readline=
-else
-	AC_DEFINE(HAVE_READLINE, 1)
-	editline_OBJS="editline.o complete.o sysunix.o"
-	LIB_readline='-L$(topdir)/lib/editline -leditline $(LIB_tgetent)'
-	INCLUDE_readline='-I$(topdir)/lib/editline -I$(top_srcdir)/lib/editline'
-fi
-AC_SUBST(LIB_readline)
-AC_SUBST(INCLUDE_readline)
-AC_SUBST(editline_OBJS)
-
-dnl telnet muck --------------------------------------------------
-
-AC_DEFINE(AUTHENTICATION)dnl
-AC_DEFINE(KRB4)dnl
-AC_DEFINE(ENCRYPTION)dnl
-AC_DEFINE(DES_ENCRYPTION)dnl
-AC_DEFINE(DIAGNOSTICS)dnl
-AC_DEFINE(OLD_ENVIRON)dnl
-
-# Simple test for streamspty, based on the existance of getmsg(), alas
-# this breaks on SunOS4 which have streams but BSD-like ptys
-#
-# And also something wierd has happend with dec-osf1, fallback to bsd-ptys
-
-AC_MSG_CHECKING(for streamspty)
-case "`uname -sr`" in
-SunOS\ 4*|OSF1*|IRIX\ 4*|HP-UX\ ?.10.*)
-	krb_cv_sys_streamspty=no
-	;;
-AIX*)
-	os_rel=`uname -v`.`uname -r`
-	if expr "$os_rel" : "3*" >/dev/null 2>&1; then
-		krb_cv_sys_streamspty=no
-	else
-		krb_cv_sys_streamspty="$ac_cv_func_getmsg"
-	fi
-	;;
-*)
-	krb_cv_sys_streamspty="$ac_cv_func_getmsg"
-	;;
-esac
-if test "$krb_cv_sys_streamspty" = yes; then
-	AC_DEFINE(STREAMSPTY)
-fi
-dnl AC_SUBST(STREAMSPTY)
-AC_MSG_RESULT($krb_cv_sys_streamspty)
-
-AC_MSG_CHECKING([if /bin/ls takes -A])
-if /bin/ls -A > /dev/null 2>&1 ;then
-	AC_DEFINE(HAVE_LS_A)
-	krb_ls_a=yes
-else
-	krb_ls_a=no
-fi
-AC_MSG_RESULT($krb_ls_a)
-	
-dnl ------------------------------------------------------------
-AC_CACHE_CHECK(for suffix of preformatted manual pages, krb_cv_sys_cat_suffix,
-if grep _version /etc/man.conf > /dev/null 2>&1; then
-	krb_cv_sys_cat_suffix=0
-else
-	krb_cv_sys_cat_suffix=number
-fi)
-if test "$krb_cv_sys_cat_suffix" = number; then
-		CATSUFFIX='$$s'
-else
-		CATSUFFIX=0
-fi
-AC_SUBST(CATSUFFIX)
-
-dnl ------------------------------------------------------------
-
-KRB_KAFS_LIB='-L$(topdir)/lib/kafs -lkafs'
-if test "$krb_cv_sys_aix" = yes; then
-	KRB_KAFS_LIB="$KRB_KAFS_LIB -lld"
-fi
-AC_SUBST(KRB_KAFS_LIB)dnl
-
-dnl ------------------------------------------------------------
-
-
-dnl This is done by AC_OUTPUT but we need the result here.
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-for i in bin lib libexec sbin; do
-	i=${i}dir
-	foo=`echo $i | tr 'xindiscernible' 'XINDISCERNIBLE'`
-	x="\$${i}"
-	eval y="$x"
-	while test "x$y" != "x$x"; do
-		x="$y"
-		eval y="$x"
-	done
-	AC_DEFINE_UNQUOTED($foo,"$x")
-done
-
-dnl
-dnl We are all set to emit the Makefiles and config.h
-dnl
-AC_OUTPUT(					\
-Makefile 					\
-include/Makefile				\
-include/sys/Makefile				\
-						\
-util/Makefile					\
-util/et/Makefile				\
-						\
-man/Makefile					\
-						\
-lib/Makefile					\
-lib/des/Makefile				\
-lib/krb/Makefile				\
-lib/kdb/Makefile				\
-lib/kadm/Makefile				\
-lib/acl/Makefile				\
-lib/kafs/Makefile				\
-lib/roken/Makefile				\
-lib/otp/Makefile				\
-lib/sl/Makefile					\
-lib/editline/Makefile				\
-lib/auth/Makefile				\
-lib/auth/pam/Makefile				\
-lib/auth/sia/Makefile				\
-lib/auth/afskauthlib/Makefile			\
-						\
-kuser/Makefile					\
-server/Makefile					\
-slave/Makefile					\
-admin/Makefile					\
-kadmin/Makefile					\
-						\
-appl/Makefile					\
-						\
-appl/afsutil/Makefile 				\
-appl/ftp/Makefile				\
-appl/ftp/common/Makefile			\
-appl/ftp/ftp/Makefile				\
-appl/ftp/ftpd/Makefile				\
-appl/telnet/Makefile				\
-appl/telnet/libtelnet/Makefile			\
-appl/telnet/telnet/Makefile			\
-appl/telnet/telnetd/Makefile			\
-appl/bsd/Makefile 				\
-appl/kauth/Makefile				\
-appl/kpopper/Makefile				\
-appl/movemail/Makefile				\
-appl/sample/Makefile				\
-appl/xnlock/Makefile				\
-appl/kx/Makefile				\
-appl/kip/Makefile				\
-appl/otp/Makefile				\
-doc/Makefile					\
-) dnl end of AC_OUTPUT
-
-dnl
-dnl This is the release version name-number[beta]
-dnl Update before making a new release
-dnl
-KRB4VERSION="$PACKAGE-$VERSION"
-
-cat > include/newversion.h.in <<EOF
-char *krb4_long_version = "@(#)\$Version: $KRB4VERSION by @USER@ on @HOST@ ($host) @DATE@ \$";
-char *krb4_version = "$KRB4VERSION";
-EOF
-
-if test -f include/version.h && cmp -s include/newversion.h.in include/version.h.in; then
-	echo "include/version.h is unchanged"
-	rm -f include/newversion.h.in
-else
- 	echo "creating include/version.h"
- 	User=${USER-${LOGNAME}}
- 	Host=`(hostname || uname -n) 2>/dev/null | sed 1q`
- 	Date=`date`
-	mv -f include/newversion.h.in include/version.h.in
-	sed -e "s/@USER@/$User/" -e "s/@HOST@/$Host/" -e "s/@DATE@/$Date/" include/version.h.in > include/version.h
-fi
diff --git a/crypto/kerberosIV/doc/Makefile.in b/crypto/kerberosIV/doc/Makefile.in
deleted file mode 100644
index 5071e8e7a3f4..000000000000
--- a/crypto/kerberosIV/doc/Makefile.in
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: Makefile.in,v 1.10 1997/05/06 03:05:55 joda Exp $
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-INSTALL = @INSTALL@
-INSTALL_DATA = $(INSTALL)
-MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
-MAKEINFO = @MAKEINFO@
-TEXI2DVI = texi2dvi
-TEXI2HTML = texi2html
-
-prefix = @prefix@
-infodir = @infodir@
-
-all: info
-
-install: all installdirs
-	if test -f kth-krb.info; then \
-	  $(INSTALL_DATA) kth-krb.info $(infodir)/kth-krb.info; \
-	else \
-	  $(INSTALL_DATA) $(srcdir)/kth-krb.info $(infodir)/kth-krb.info; \
-	fi
-	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-	  install-info --dir-file=$(infodir)/dir $(infodir)/kth-krb.info; \
-	else \
-	  true; \
-	fi
-
-uninstall:
-	rm -f $(infodir)/kth-krb.info
-
-installdirs:
-	$(MKINSTALLDIRS) $(infodir)
-
-info: kth-krb.info
-
-kth-krb.info: kth-krb.texi
-	$(MAKEINFO) -I$(srcdir) -o $@ $(srcdir)/kth-krb.texi
-
-dvi: kth-krb.dvi
-
-kth-krb.dvi: kth-krb.texi
-	$(TEXI2DVI) $(srcdir)/kth-krb.texi
-
-html: kth-krb.html
-
-kth-krb.html: kth-krb.texi
-	$(TEXI2HTML) $(srcdir)/kth-krb.texi
-
-clean:
-	rm -f *.aux *.cp *.cps *.dvi *.fn *.ky *.log *.pg *.toc *.tp *.vr
-
-distclean: clean
-
-mostlyclean: clean
-
-maintainer-clean: clean
-	rm -f kth-krb.info
-
-check:
-
-.PHONY: install all installdirs uninstall info dvi html clean check distclean mostlyclean maintainer-clean
diff --git a/crypto/kerberosIV/doc/ack.texi b/crypto/kerberosIV/doc/ack.texi
deleted file mode 100644
index 388f6444bb87..000000000000
--- a/crypto/kerberosIV/doc/ack.texi
+++ /dev/null
@@ -1,80 +0,0 @@
-@node  Acknowledgments, Index, Resolving frequent problems, Top
-@comment  node-name,  next,  previous,  up
-@appendix Acknowledgments
-
-People from the MIT Athena project wrote the original code that this is
-based on. @w{Kerberos 4} @w{patch-level 9} was stripped of both the
-encryption functions and the calls to them. This was exported from the
-US as the ``Bones'' release.  Eric Young put back the calls and hooked
-in his libdes, thereby creating the ``eBones'' release.
-@cindex Bones
-@cindex eBones
-
-The ``rcmd'' programs where initially developed at the University of
-California at Berkeley and then hacked on by the FreeBSD and NetBSD
-projects.
-
-Berkeley also wrote @code{ftp}, @code{ftpd}, @code{telnet}, and
-@code{telnetd}.  The authentication and encryption code of @code{telnet}
-and @code{telnetd} was added by David Borman (then of Cray Research,
-Inc).  The encryption code was removed when this was exported and then
-added back by Juha Eskelinen, @code{<esc@@magic.fi>}.
-
-The @code{popper} was also a Berkeley program initially.
-
-The @code{login} has the same origins but has received code written by
-Wietse Venema at Eindhoven University of Technology, The Netherlands.
-
-@code{movemail} was (at least partially) written by Jonathan Kamens,
-@code{<jik@@security.ov.com>}, and is Copyright @copyright{} 1986, 1991,
-1992, 1993, 1994 Free Software Foundation, Inc.
-
-@code{xnlock} was originally written by Dan Heller in 1985 for sunview.
-The X version was written by him in 1990.
-
-Some of the functions in @file{libroken} also come from Berkeley by the
-way of NetBSD/FreeBSD.
-
-The code to handle the dynamic loading of the AFS module for AIX is
-copyright @copyright{} 1992 HELIOS Software GmbH 30159 Hannover,
-Germany.
-
-@code{editline} was written by Simmule Turner and Rich Salz.
-
-Bugfixes and code has been contributed by:
-@table @asis
-@item Derrick J Brashear
-@code{<shadow@@dementia.org>}
-@item Anders Gertz
-@code{<gertz@@lysator.liu.se>}
-@item Dejan Ilic
-@code{<svedja@@lysator.liu.se>}
-@item Kent Engström
-@code{<kent@@lysator.liu.se>}
-@item Simon Josefsson
-@code{<jas@@pdc.kth.se>}
-@item Robert Malmgren
-@code{<rom@@incolumitas.se>}
-@item Fredrik Ljungberg
-@code{<flag@@it.kth.se>}
-@item Lars Malinowsky
-@code{<lama@@pdc.kth.se>}
-@item Fabien Coelho
-@code{<coelho@@cri.ensmp.fr>}
-@item and we hope that those not mentioned here will forgive us.
-@end table
-
-Ian Marsh @code{<ianm@@sics.se>} removed the worst abuses of the English
-language from this text.
-
-Ilja Hallberg @code{<iha@@incolumitas.se>} is still promising to help us
-finish the documentation.
-
-This work was supported in part by SUNET and the Centre for Parallel
-Computers at KTH.
-
-The port to Windows 95/NT was supported by the Computer Council at KTH
-and done by Jörgen Karlsson @code{<d93-jka@@nada.kth.se>}.
-
-All the bugs were introduced by ourselves.
-
diff --git a/crypto/kerberosIV/doc/index.texi b/crypto/kerberosIV/doc/index.texi
deleted file mode 100644
index ebe5d911ce0c..000000000000
--- a/crypto/kerberosIV/doc/index.texi
+++ /dev/null
@@ -1,6 +0,0 @@
-@node Index, , Acknowledgments, Top
-@comment  node-name,  next,  previous,  up
-@unnumbered Index
-
-@printindex cp
-
diff --git a/crypto/kerberosIV/doc/install.texi b/crypto/kerberosIV/doc/install.texi
deleted file mode 100644
index 240c04e2e2a8..000000000000
--- a/crypto/kerberosIV/doc/install.texi
+++ /dev/null
@@ -1,368 +0,0 @@
-@node Installing programs, How to set up a realm, What is Kerberos?, Top
-@chapter Installing programs
-
-You have a choise to either build the distribution from source code or
-to install binaries, if they are available for your machine.
-
-@c XXX
-
-We recommend building from sources, but using pre-compiled binaries
-might be easier.  If there are no binaries available for your machine or
-you want to do some specific configuration, you will have to compile
-from source.
-
-@menu
-* Installing from source::      
-* Installing a binary distribution::  
-* Finishing the installation::  
-* Authentication modules::      
-@end menu
-
-@node Installing from source, Installing a binary distribution, Installing programs, Installing programs
-@comment  node-name,  next,  previous,  up
-@section Installing from source
-
-To build this software un-tar the distribution and run the
-@code{configure} script.
-
-To compile successfully, you will need an ANSI C compiler, such as
-@code{gcc}. Other compilers might also work, but setting the ``ANSI
-compliance'' too high, might break in parts of the code, not to mention
-the standard include files.
-
-To build in a separate build tree, run @code{configure} in the directory
-where the tree should reside.  You will need a Make that understands
-VPATH correctly.  GNU Make works fine.
-
-After building everything (which will take anywhere from a few minutes
-to a long time), you can install everything in @file{/usr/athena} with
-@kbd{make install} (running as root). It is possible to install in some
-other place, but it isn't recommended. To do this you will have to run
-@code{configure} with @samp{--prefix=/my/path}.
-
-If you need to change the default behavior, configure understands the
-following options:
-
-@table @asis
-@item @kbd{--with-shared}
-Create shared versions of the Kerberos libraries. Not really
-recommended and might not work on all systems.
-
-@item @kbd{--with-cracklib=}@var{dir}
-Use cracklib for password quality control in 
-@pindex kadmind
-@code{kadmind}. This option requires 
-@cindex cracklib
-cracklib with the patch from
-@code{ftp://ftp.pdc.kth.se/pub/krb/src/cracklib.patch}.
-
-@item @kbd{--with-dictpath=}@var{dictpath}
-This is the dictionary that cracklib should use.
-
-@item @kbd{--with-socks=}@var{dir}
-@cindex firewall
-@cindex socks
-If you have to traverse a firewall and it uses the SocksV5 protocol
-(@cite{RFC 1928}), you can build with socks-support.  Point @var{dir} to
-the directory where you have socks5 installed.  For more information
-about socks see @kbd{http://www.socks.nec.com/}.
-
-@item @kbd{--with-readline=}@var{dir}
-@cindex readline
-To enable history/line editing in @code{ftp} and @code{kadmin}, any
-present version of readline will be used.  If you have readline
-installed but in a place where configure does not managed to find it,
-you can use this option.  The code also looks for @code{libedit}.  If
-there is no library at all, the bundled version of @code{editline} will
-be used.
-
-@item @kbd{--with-mailspool=}@var{dir}
-The configuration process tries to determine where your machine stores
-its incoming mail.  This is typically @file{/usr/spool/mail} or
-@file{/var/mail}.  If it does not work or you store your mail in some
-unusual directory, this option can be used to specify where the mail
-spool directory is located.  This directory is only accessed by
-@pindex popper
-@code{popper}, and the mail check in
-@pindex login
-@code{login}.
-
-@c @item @kbd{--enable-random-mkey}
-@c Do not use this option unless you think you know what you are doing.
-
-@item @kbd{--with-mkey=}@var{file}
-Put the master key here, the default is @file{/.k}.
-
-@item @kbd{--without-berkeley-db}
-If you have
-@cindex Berkeley DB
-Berkeley DB installed, it is preferred over
-@c XXX
-dbm. If you already are running Kerberos this option might be useful,
-since there currently isn't an easy way to convert a dbm database to a
-db one (you have to dump the old database and then load it with the new
-binaries).
-@end table
-
-@node Installing a binary distribution, Finishing the installation, Installing from source, Installing programs
-@comment  node-name,  next,  previous,  up
-@section Installing a binary distribution
-
-The binary distribution is supposed to be installed in
-@file{/usr/athena}, installing in some other place may work but is not
-recommended.  A symlink from @file{/usr/athena} to the install directory
-should be fine.
-
-@node Finishing the installation, Authentication modules, Installing a binary distribution, Installing programs
-@section Finishing the installation
-
-@pindex su
-The only program that needs to be installed setuid to root is @code{su}.
-
-If 
-@pindex rlogin
-@pindex rsh
-@code{rlogin} and @code{rsh} are setuid to root they will fall back to
-non-kerberised protocols if the kerberised ones fail for some
-reason. The old protocols use reserved ports as security, and therefore
-the programs have to be setuid to root. If you don't need this
-functionality consider turning off the setuid bit.
-
-@pindex login
-@code{login} does not have to be setuid, as it is always run by root
-(users should use @code{su} rather than @code{login}).  It will print a
-helpful message when not setuid to root and run by a user.
-
-The programs intended to be run by users are located in
-@file{/usr/athena/bin}.  Inform your users to include
-@file{/usr/athena/bin} in their paths, or copy or symlink the binaries
-to some good place.  The programs that you will want to use are:
-@code{kauth}/@code{kinit},
-@pindex kauth
-@pindex kinit
-@code{klist}, @code{kdestroy}, @code{kpasswd}, @code{ftp},
-@pindex klist
-@pindex kdestroy
-@pindex kpasswd
-@pindex ftp
-@code{telnet}, @code{rcp}, @code{rsh}, @code{rlogin}, @code{su},
-@pindex telnet
-@pindex rcp
-@pindex rsh
-@pindex rlogin
-@pindex su
-@pindex xnlock
-@pindex afslog
-@pindex pagsh
-@pindex rxtelnet
-@pindex tenletxr
-@pindex rxterm
-@code{rxtelnet}, @code{tenletxr}, @code{rxterm}, and
-@code{xnlock}. If you are using AFS, @code{afslog} and @code{pagsh}
-might also be useful.  Administrators will want to use @code{kadmin} and
-@code{ksrvutil}, which are located in @file{/usr/athena/sbin}.
-@pindex kadmin
-@pindex ksrvutil
-
-@code{telnetd} and @code{rlogind} assume that @code{login} is located in
-@file{/usr/athena/bin} (or whatever path you used as
-@samp{--prefix}). If for some reason you want to move @code{login}, you
-will have to specify the new location with the @samp{-L} switch when
-configuring
-@pindex telnetd
-telnetd
-and
-@pindex rlogind
-rlogind
-in @file{inetd.conf}.
-
-It should be possible to replace the system's default @code{login} with
-the kerberised @code{login}.  However some systems assume that login
-performs some serious amount of magic that our login might not do (although
-we've tried to do our best). So before replacing it on every machine,
-try and see what happens.  Another thing to try is to use one of the
-authentication modules (@xref{Authentication modules}) supplied.
-
-The @code{login} program that we use was in an earlier life the standard
-login program from NetBSD. In order to use it with a lot of weird
-systems, it has been ``enhanced'' with features from many other logins
-(Solaris, SunOS, IRIX, AIX, and others).  Some of these features are
-actually useful and you might want to use them even on other systems.
-
-@table @file
-@item /etc/fbtab
-@pindex fbtab
-@itemx /etc/logindevperm
-@pindex logindevperm
-Allows you to chown some devices when a user logs in on a certain
-terminal.  Commonly used to change the ownership of @file{/dev/mouse},
-@file{/dev/kbd}, and other devices when someone logs in on
-@file{/dev/console}.
-
-@file{/etc/fbtab} is the SunOS file name and it is tried first.  If
-there is no such file then the Solaris file name
-@file{/etc/logindevperm} is tried.
-@item /etc/environment
-@pindex environment
-This file specifies what environment variables should be set when a user
-logs in. (AIX-style)
-@item /etc/default/login
-@pindex default/login
-Almost the same as @file{/etc/environment}, but the System V style.
-@item /etc/login.access
-@pindex login.access
-Can be used to control who is allowed to login from where and on what
-ttys. (From Wietse Venema)
-@end table
-
-@menu
-* Authentication modules::      
-@end menu
-
-@node  Authentication modules,  , Finishing the installation, Installing programs
-@comment  node-name,  next,  previous,  up
-@section Authentication modules
-The problem of having different authentication mechanisms has been
-recognised by several vendors, and several solutions has appeared. In
-most cases these solutions involve some kind of shared modules that are
-loaded at run-time.  Modules for some of these systems can be found in
-@file{lib/auth}.  Presently there are modules for Digital's SIA, Linux'
-PAM (might also work on Solaris, when PAM gets supported), and IRIX'
-@code{login} and @code{xdm} (in @file{lib/auth/afskauthlib}).
-
-@menu
-* Digital SIA::                 
-* IRIX::                        
-* PAM::                         
-@end menu
-
-@node Digital SIA, IRIX, Authentication modules, Authentication modules
-@subsection Digital SIA
-
-To install the SIA module you will have to do the following:
-
-@itemize @bullet
-
-@item
-Make sure @file{libsia_krb4.so} is available in
-@file{/usr/athena/lib}. If @file{/usr/athena} is not on local disk, you
-might want to put it in @file{/usr/shlib} or someplace else. If you do,
-you'll have to edit @file{krb4_matrix.conf} to reflect the new location
-(you will also have to do this if you installed in some other directory
-than @file{/usr/athena}).
-@item
-Copy (your possibly edited) @file{krb4_matrix.conf} to @file{/etc/sia}.
-@item
-Apply @file{security.patch} to @file{/sbin/init.d/security}.
-@item
-Turn on KRB4 security by issuing @kbd{rcmgr set SECURITY KRB4} and
-@kbd{rcmgr set KRB4_MATRIX_CONF krb4_matrix.conf}.
-@item
-Digital thinks you should reboot your machine, but that really shouldn't
-be necessary.  It's usually sufficient just to run
-@kbd{/sbin/init.d/security start}.
-@end itemize
-
-Users with local passwords (like @samp{root}) should be able to login
-safely.
-
-When using Digital's xdm the @samp{KRBTKFILE} environment variable isn't
-passed along as it should (since xdm zaps the environment). Instead you
-have to set @samp{KRBTKFILE} to the correct value in
-@file{/usr/lib/X11/xdm/Xsession}. Add a line similar to
-@example
-KRBTKFILE=/tmp/tkt`id -u`_`ps -o ppid= -p $$`; export KRBTKFILE
-@end example
-
-There is currently no support for changing passwords. Use @file{kpasswd}
-instead.
-
-@subsubheading Notes to users with Enhanced security
-
-Digital's @samp{ENHANCED} (C2) security, and Kerberos solves two
-different problems. C2 deals with local security, adds better control of
-who can do what, auditing, and similar things. Kerberos deals with
-network security.
-
-To make C2 security work with Kerberos you will have to do the
-following.
-
-@itemize @bullet
-@item
-Replace all occurencies of @file{krb4_matrix.conf} with
-@file{krb4+c2_matrix.conf} in the directions above.
-@item
-You must enable ``vouching'' in the @samp{default} database.  This will
-make the OSFC2 module trust other SIA modules, so you can login without
-giving your C2 password. To do this use @samp{edauth} to edit the
-default entry @kbd{/usr/tcb/bin/edauth -dd default}, and add a
-@samp{d_accept_alternate_vouching} capability, if not already present.
-@item
-For each user that does @emph{not} have a local C2 password, you should
-set the password expiration field to zero. You can do this for each
-user, or in the @samp{default} table. To to this use @samp{edauth} to
-set (or change) the @samp{u_exp} capability to @samp{u_exp#0}.
-@item
-You should make sure that you use Digital's login rather than the one
-distributed by us. The easiest way to do this is to replace
-@file{/usr/athena/bin/login} with @file{/bin/login}.
-@end itemize
-
-At present @samp{su} does not accept the vouching flag, so it will not
-work as expected. 
-
-Also, kerberised ftp will not work with C2 passwords. You can solve this
-by using both Digital's ftpd and our on different ports.
-
-@strong{Remember}, if you do these changes you will get a system that
-most certainly does @emph{not} fulfill the requirements of a C2
-system. If C2 is what you want, for instance if someone else is forcing
-you to use it, you're out of luck.  If you use enhanced security because
-you want a system that is more secure than it would otherwise be, you
-probably got an even more secure system. Passwords will not be sent in
-the clear, for instance.
-
-@node IRIX, PAM, Digital SIA, Authentication modules
-@subsection IRIX
-
-The IRIX support is a module that is compatible with Transarc's
-@file{afskauthlib.so}.  It should work with all programs that use this
-library, this should include @file{login} and @file{xdm}.
-
-The interface is not very documented but it seems that you have to copy
-@file{libkafs.so}, @file{libkrb.so}, and @file{libdes.so} to
-@file{/usr/lib}, or build your @file{afskauthlib.so} statically.
-
-The @file{afskauthlib.so} itself is able to reside in
-@file{/usr/vice/etc}, @file{/usr/afsws/lib}, or the current directory
-(wherever that is).
-
-Appart from this it should ``just work'', there are no configuration
-files.
-
-@node PAM,  , IRIX, Authentication modules
-@subsection PAM
-
-The PAM module was written more out of curiosity that anything else. It
-has not been updated for quite a while, since none of us are using
-Linux, and Solaris does not support PAM yet.  We've had positive reports
-from at least one person using the module, though.
-
-To use this module you should:
-
-@itemize @bullet
-@item
-Make sure @file{pam_krb4.so} is available in @file{/usr/athena/lib}. You
-might actually want it on local disk, so @file{/lib/security} might be a
-better place if @file{/usr/athena} is not local.
-@item
-Look at @file{pam.conf.add} for examples of what to add to
-@file{/etc/pam.conf}.
-@end itemize
-
-There is currently no support for changing kerberos passwords. Use
-kpasswd instead.
-
-See also Derrick J Brashear's @code{<shadow@@dementia.org>} Kerberos PAM
-module at @kbd{ftp://ftp.dementia.org/pub/pam}. It has a lot more
-features, and it is also more in line with other PAM modules.
diff --git a/crypto/kerberosIV/doc/intro.texi b/crypto/kerberosIV/doc/intro.texi
deleted file mode 100644
index 830ca1ad6d59..000000000000
--- a/crypto/kerberosIV/doc/intro.texi
+++ /dev/null
@@ -1,69 +0,0 @@
-@node Introduction, What is Kerberos?, Top, Top
-@comment  node-name,  next,  previous,  up
-@chapter Introduction
-
-This is an attempt at documenting the Kerberos 4 distribution from
-Kungliga Tekniska Högskolan (the Royal Institute of Technology in
-Stockholm, Sweden).  This distribution is based on eBones, but has been
-improved in many ways. It is more portable, and several new features
-have been added. It currently runs on the following systems:
-
-@itemize @bullet
-@item
-AIX 4.1, 4.2
-@item
-BSD/OS 2.0, 2.1
-@item
-Digital UNIX 3.2, 4.0
-@item
-HP-UX 9, 10
-@item
-IRIX 4.0, 5.2, 5.3, 6.1, 6.2, 6.3, 6.4
-@item
-Linux 1.3, 2.0
-@item
-NetBSD 1.2
-@item
-FreeBSD 2.2
-@item
-SunOS 4.1
-@item
-SunOS 5.4/5.5 (aka Solaris 2.4/2.5)
-@item
-Ultrix 4.4
-@item
-Cray UNICOS 9.
-@item
-Fujitsu UXP/V 4.1.
-@end itemize
-
-Some part compile and work on:
-
-@itemize @bullet
-@item
-OS/2 with EMX
-@item
-Windows 95/NT with gnu-win32 (with the proper amount of magic the
-libraries should compile with Microsoft C as well)
-@end itemize
-
-It should work on anything that is almost POSIX, has an ANSI C
-compiler, a dbm library (for the server side), and BSD Sockets.
-
-A web-page is available at @kbd{http://www.pdc.kth.se/kth-krb/}.
-
-@heading Bug reports
-
-If you cannot build the programs or they do not behave as you think they
-should, please send us a bug report.  The bug report should be sent to
-@code{<kth-krb-bugs@@nada.kth.se>}.  Please include information on what
-machine and operating system (including version) you are running, what
-you are trying to do, what happens, what you think should have happened,
-an example for us to repeat, the output you get when trying the example,
-and a patch for the problem if you have one.  Please make any patches
-with @code{diff -u} or @code{diff -c}.  The more detailed the bug report
-is, the easier it will be for us to reproduce, understand, and fix it.
-
-Suggestions, comments and other non bug reports are welcome.  Send them
-to @code{<kth-krb@@nada.kth.se>}.
-
diff --git a/crypto/kerberosIV/doc/kth-krb.texi b/crypto/kerberosIV/doc/kth-krb.texi
deleted file mode 100644
index 8b26349baa0a..000000000000
--- a/crypto/kerberosIV/doc/kth-krb.texi
+++ /dev/null
@@ -1,300 +0,0 @@
-\input texinfo @c -*- texinfo -*-
-@c %**start of header
-@c $Id: kth-krb.texi,v 1.71 1997/05/25 21:31:00 assar Exp $
-@setfilename kth-krb.info
-@settitle KTH-KRB
-@iftex
-@afourpaper
-@end iftex
-@c some sensible characters, please?
-@tex
-\input latin1.tex
-@end tex
-@setchapternewpage on
-@syncodeindex pg cp
-@c %**end of header
-
-@dircategory Kerberos
-@direntry
-* Kth-krb: (kth-krb).           The Kerberos IV distribution from KTH
-@end direntry
-
-@c title page
-@titlepage
-@title KTH-KRB
-@subtitle Kerberos 4 from KTH
-@subtitle Edition -1.0, for version 0.9.5
-@subtitle 1997
-@author Johan Danielsson
-@author Assar Westerlund
-@author last updated $Date: 1997/05/25 21:31:00 $
-
-@def@copynext{@vskip 20pt plus 1fil@penalty-1000}
-@def@copyrightstart{}
-@def@copyrightend{}
-@page
-@copyrightstart
-Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan 
-(Royal Institute of Technology, Stockholm, Sweden).
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement:
-     This product includes software developed by the Kungliga Tekniska
-     Högskolan and its contributors.
-
-4. Neither the name of the Institute nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-@copynext
-
-Copyright (C) 1995 Eric Young (eay@@mincom.oz.au)
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement:
-   This product includes software developed by Eric Young (eay@@mincom.oz.au)
-
-THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-@copynext
-
-Copyright (c) 1983, 1990 The Regents of the University of California.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement:
-     This product includes software developed by the University of
-     California, Berkeley and its contributors.
-
-4. Neither the name of the University nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-@copynext
-
-Copyright (C) 1990 by the Massachusetts Institute of Technology
-
-Export of this software from the United States of America is assumed
-to require a specific license from the United States Government.
-It is the responsibility of any person or organization contemplating
-export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-@copynext
-
-Copyright 1987, 1989 by the Student Information Processing Board
-	of the Massachusetts Institute of Technology
-
-Permission to use, copy, modify, and distribute this software
-and its documentation for any purpose and without fee is
-hereby granted, provided that the above copyright notice
-appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation,
-and that the names of M.I.T. and the M.I.T. S.I.P.B. not be
-used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-M.I.T. and the M.I.T. S.I.P.B. make no representations about
-the suitability of this software for any purpose.  It is
-provided "as is" without express or implied warranty.
-
-@copynext
-
-Copyright 1992 Simmule Turner and Rich Salz.  All rights reserved. 
-
-This software is not subject to any license of the American Telephone 
-and Telegraph Company or of the Regents of the University of California. 
-
-Permission is granted to anyone to use this software for any purpose on
-any computer system, and to alter it and redistribute it freely, subject
-to the following restrictions:
-
-1. The authors are not responsible for the consequences of use of this
-   software, no matter how awful, even if they arise from flaws in it.
-
-2. The origin of this software must not be misrepresented, either by
-   explicit claim or by omission.  Since few users ever read sources,
-   credits must appear in the documentation.
-
-3. Altered versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.  Since few users
-   ever read sources, credits must appear in the documentation.
-
-4. This notice may not be removed or altered.
-
-@copyrightend
-@end titlepage
-
-@c Less filling! Tastes great!
-@iftex
-@parindent=0pt
-@global@parskip 6pt plus 1pt
-@global@chapheadingskip = 15pt plus 4pt minus 2pt 
-@global@secheadingskip = 12pt plus 3pt minus 2pt
-@global@subsecheadingskip = 9pt plus 2pt minus 2pt
-@end iftex
-@ifinfo
-@paragraphindent 0
-@end ifinfo
-
-@ifinfo
-@node Top, Introduction, (dir), (dir)
-@top KTH-krb
-@end ifinfo
-
-@menu
-* Introduction::                
-* What is Kerberos?::           
-* Installing programs::         
-* How to set up a realm::       
-* One-Time Passwords::          
-* Resolving frequent problems::  
-* Acknowledgments::             
-* Index::                       
-
- --- The Detailed Node Listing ---
-
-Installing programs
-
-* Installing from source::      
-* Installing a binary distribution::  
-* Finishing the installation::  
-* Authentication modules::      
-
-Finishing the installation
-
-* Authentication modules::      
-
-Authentication modules
-
-* Digital SIA::                 
-* IRIX::                        
-* PAM::                         
-
-How to set up a realm
-
-* How to set up the kerberos server::  
-* Install the client programs::  
-* Install the kerberised services::  
-* Install a slave kerberos server::  
-* Cross-realm functionality ::  
-
-How to set up the kerberos server
-
-* Choose a realm name::         
-* Choose a kerberos server::    
-* Install the configuration files::  
-* Install the /etc/services::   
-* Install the kerberos server::  
-* Set up the server::           
-* Add a few important principals::  
-* Start the server::            
-* Try to get tickets::          
-* Create initial ACL for the admin server::  
-* Start the admin server::      
-* Add users to the database::   
-* Automate the startup of the servers::  
-
-One-Time Passwords
-
-* What are one time passwords?::  
-* When to use one time passwords?::  
-* Configuring OTPs::            
-
-Resolving frequent problems
-
-* Problems compiling Kerberos::  
-* Common error messages::       
-@end menu
-
-@include intro.texi
-@include whatis.texi
-@include install.texi
-@include setup.texi
-@include otp.texi
-@include problems.texi
-@include ack.texi
-@include index.texi
-
-@c @shortcontents
-@contents
-
-@bye
diff --git a/crypto/kerberosIV/doc/latin1.tex b/crypto/kerberosIV/doc/latin1.tex
deleted file mode 100644
index e683dd271dc1..000000000000
--- a/crypto/kerberosIV/doc/latin1.tex
+++ /dev/null
@@ -1,95 +0,0 @@
-% ISO Latin 1 (ISO 8859/1) encoding for Computer Modern fonts.
-% Jan Michael Rynning <jmr@nada.kth.se> 1990-10-12
-\def\inmathmode#1{\relax\ifmmode#1\else$#1$\fi}
-\global\catcode`\^^a0=\active \global\let^^a0=~		% no-break space
-\global\catcode`\^^a1=\active \global\def^^a1{!`}		% inverted exclamation mark
-\global\catcode`\^^a2=\active \global\def^^a2{{\rm\rlap/c}}	% cent sign
-\global\catcode`\^^a3=\active \global\def^^a3{{\it\$}}	% pound sign
-% currency sign, yen sign, broken bar
-\global\catcode`\^^a7=\active \global\let^^a7=\S		% section sign
-\global\catcode`\^^a8=\active \global\def^^a8{\"{}}		% diaeresis
-\global\catcode`\^^a9=\active \global\let^^a9=\copyright	% copyright sign
-% feminine ordinal indicator, left angle quotation mark
-\global\catcode`\^^ac=\active \global\def^^ac{\inmathmode\neg}% not sign
-\global\catcode`\^^ad=\active \global\let^^ad=\-		% soft hyphen
-% registered trade mark sign
-\global\catcode`\^^af=\active \global\def^^af{\={}}		% macron
-% ...
-\global\catcode`\^^b1=\active \global\def^^b1{\inmathmode\pm}	% plus minus
-\global\catcode`\^^b2=\active \global\def^^b2{\inmathmode{{^2}}}
-\global\catcode`\^^b3=\active \global\def^^b3{\inmathmode{{^3}}}
-\global\catcode`\^^b4=\active \global\def^^b4{\'{}}		% acute accent
-\global\catcode`\^^b5=\active \global\def^^b5{\inmathmode\mu}	% mu
-\global\catcode`\^^b6=\active \global\let^^b6=\P		% pilcroy
-\global\catcode`\^^b7=\active \global\def^^b7{\inmathmode{{\cdot}}}
-\global\catcode`\^^b8=\active \global\def^^b8{\c{}}		% cedilla
-\global\catcode`\^^b9=\active \global\def^^b9{\inmathmode{{^1}}}
-% ...
-\global\catcode`\^^bc=\active \global\def^^bc{\inmathmode{{1\over4}}}
-\global\catcode`\^^bd=\active \global\def^^bd{\inmathmode{{1\over2}}}
-\global\catcode`\^^be=\active \global\def^^be{\inmathmode{{3\over4}}}
-\global\catcode`\^^bf=\active \global\def^^bf{?`}		% inverted question mark
-\global\catcode`\^^c0=\active \global\def^^c0{\`A}
-\global\catcode`\^^c1=\active \global\def^^c1{\'A}
-\global\catcode`\^^c2=\active \global\def^^c2{\^A}
-\global\catcode`\^^c3=\active \global\def^^c3{\~A}
-\global\catcode`\^^c4=\active \global\def^^c4{\"A}		% capital a with diaeresis
-\global\catcode`\^^c5=\active \global\let^^c5=\AA		% capital a with ring above
-\global\catcode`\^^c6=\active \global\let^^c6=\AE
-\global\catcode`\^^c7=\active \global\def^^c7{\c C}
-\global\catcode`\^^c8=\active \global\def^^c8{\`E}
-\global\catcode`\^^c9=\active \global\def^^c9{\'E}
-\global\catcode`\^^ca=\active \global\def^^ca{\^E}
-\global\catcode`\^^cb=\active \global\def^^cb{\"E}
-\global\catcode`\^^cc=\active \global\def^^cc{\`I}
-\global\catcode`\^^cd=\active \global\def^^cd{\'I}
-\global\catcode`\^^ce=\active \global\def^^ce{\^I}
-\global\catcode`\^^cf=\active \global\def^^cf{\"I}
-% capital eth
-\global\catcode`\^^d1=\active \global\def^^d1{\~N}
-\global\catcode`\^^d2=\active \global\def^^d2{\`O}
-\global\catcode`\^^d3=\active \global\def^^d3{\'O}
-\global\catcode`\^^d4=\active \global\def^^d4{\^O}
-\global\catcode`\^^d5=\active \global\def^^d5{\~O}
-\global\catcode`\^^d6=\active \global\def^^d6{\"O}		% capital o with diaeresis
-\global\catcode`\^^d7=\active \global\def^^d7{\inmathmode\times}% multiplication sign
-\global\catcode`\^^d8=\active \global\let^^d8=\O
-\global\catcode`\^^d9=\active \global\def^^d9{\`U}
-\global\catcode`\^^da=\active \global\def^^da{\'U}
-\global\catcode`\^^db=\active \global\def^^db{\^U}
-\global\catcode`\^^dc=\active \global\def^^dc{\"U}
-\global\catcode`\^^dd=\active \global\def^^dd{\'Y}
-% capital thorn
-\global\catcode`\^^df=\active \global\def^^df{\ss}
-\global\catcode`\^^e0=\active \global\def^^e0{\`a}
-\global\catcode`\^^e1=\active \global\def^^e1{\'a}
-\global\catcode`\^^e2=\active \global\def^^e2{\^a}
-\global\catcode`\^^e3=\active \global\def^^e3{\~a}
-\global\catcode`\^^e4=\active \global\def^^e4{\"a}		% small a with diaeresis
-\global\catcode`\^^e5=\active \global\let^^e5=\aa		% small a with ring above
-\global\catcode`\^^e6=\active \global\let^^e6=\ae
-\global\catcode`\^^e7=\active \global\def^^e7{\c c}
-\global\catcode`\^^e8=\active \global\def^^e8{\`e}
-\global\catcode`\^^e9=\active \global\def^^e9{\'e}
-\global\catcode`\^^ea=\active \global\def^^ea{\^e}
-\global\catcode`\^^eb=\active \global\def^^eb{\"e}
-\global\catcode`\^^ec=\active \global\def^^ec{\`\i}
-\global\catcode`\^^ed=\active \global\def^^ed{\'\i}
-\global\catcode`\^^ee=\active \global\def^^ee{\^\i}
-\global\catcode`\^^ef=\active \global\def^^ef{\"\i}
-% small eth
-\global\catcode`\^^f1=\active \global\def^^f1{\~n}
-\global\catcode`\^^f2=\active \global\def^^f2{\`o}
-\global\catcode`\^^f3=\active \global\def^^f3{\'o}
-\global\catcode`\^^f4=\active \global\def^^f4{\^o}
-\global\catcode`\^^f5=\active \global\def^^f5{\~o}
-\global\catcode`\^^f6=\active \global\def^^f6{\"o}		% small o with diaeresis
-\global\catcode`\^^f7=\active \global\def^^f7{\inmathmode\div}% division sign
-\global\catcode`\^^f8=\active \global\let^^f8=\o
-\global\catcode`\^^f9=\active \global\def^^f9{\`u}
-\global\catcode`\^^fa=\active \global\def^^fa{\'u}
-\global\catcode`\^^fb=\active \global\def^^fb{\^u}
-\global\catcode`\^^fc=\active \global\def^^fc{\"u}
-\global\catcode`\^^fd=\active \global\def^^fd{\'y}
-% capital thorn
-\global\catcode`\^^ff=\active \global\def^^ff{\"y}
diff --git a/crypto/kerberosIV/doc/otp.texi b/crypto/kerberosIV/doc/otp.texi
deleted file mode 100644
index 0a5929fa8629..000000000000
--- a/crypto/kerberosIV/doc/otp.texi
+++ /dev/null
@@ -1,127 +0,0 @@
-@node  One-Time Passwords, Resolving frequent problems, How to set up a realm, Top
-@chapter One-Time Passwords
-
-@cindex OTP
-@cindex One time passwords
-There is also support for using @dfn{one time passwords} (OTP) in this
-package.  Specifically @code{login}, @code{ftpd}, and @code{popper} have
-support for using them.
-
-@menu
-* What are one time passwords?::  
-* When to use one time passwords?::  
-* Configuring OTPs::            
-@end menu
-
-@node  What are one time passwords?, When to use one time passwords?, One-Time Passwords, One-Time Passwords
-@comment  node-name,  next,  previous,  up
-@section What are one time passwords?
-
-One time passwords are, as the name implies, passwords that can only
-be used once.  This means that even if someone is eavesdropping on the
-network, they will not be able to make use of the passwords they steal.
-
-The OTPs used in this package support @cite{RFC 1938}.  This standard is
-also backwards compatible with the well-known S/Key.  There are lots of
-programs for generating these on everything from HP 48's to Crays.
-@cindex S/Key
-
-@node  When to use one time passwords?, Configuring OTPs, What are one time passwords?, One-Time Passwords
-@comment  node-name,  next,  previous,  up
-@section When to use one time passwords?
-
-Why would you want to use OTPs instead of Kerberos?  The advantage of
-OTPs is that they don't require a computer to operate.  You can print
-out a list of passwords and take with you, or you could use your
-calculator or hand-held computer to generate them.
-
-The downside is that they only protect you against passive attacks.
-Only the initial connection is authenticated.  After that, anyone can
-eavesdrop on your session, so you should not send or view any sensitive
-data (e.g. passwords) over a OTP-initiated link.  You are also
-vulnerable to active attacks where intruders try to take over your
-TCP-session and/or introduce data in the middle of it.  In other words,
-they provide initial authentication, but neither integrity nor
-confidentiality.
-
-The OTPs are generated from the tuple (@var{seed}, @var{sequence
-number}, @var{pass-phrase}).  The seed and the sequence number will be
-printed as part of the @dfn{challenge} and you will have to generate the
-corresponding password or pick it from a list.
-
-In conclusion, they are simple and can be used everywhere but don't
-protect against all threats that Kerberos does.  Use them when you can't
-use Kerberos.
-
-@node  Configuring OTPs,  , When to use one time passwords?, One-Time Passwords
-@comment  node-name,  next,  previous,  up
-@section Configuring OTPs
-
-@heading Initializing
-
-To initialize your OTPs use the @code{otp} program.  This program will
-write an entry in a local file on this host with your current password
-(in this case the 100th) and the corresponding seed (@samp{foobar}).
-@pindex otp
-
-@example
-@cartouche
-datan:>otp 100 foobar
-Pass-phrase: <pass-phrase>
-Verifying password Pass-phrase: <pass-phrase>
-@end cartouche
-@end example
-
-@heading Generating
-
-To print out a list of them there is a program called
-@code{otpprint}.
-@pindex otpprint
-
-@example
-@cartouche
-datan:>otpprint 100 foobar
-Pass-phrase: <pass-phrase>
-91: SLAM BUY SUP DUSK SKY BEST
-92: DEEM SIGH ROB RASH JUG MAT
-93: DUET FISK HERS AREA TOLL SUP
-94: WOW RAIN LEAK SARA MARK WING
-95: COG YELL MILK CART ABE BAWL
-96: GROW SILK GIST OMEN CAM ANNE
-97: JAG QUAD NUT BEAT BHOY MAGI
-98: ADAM USED GENE NIP EYE SIS
-99: MY SUNG HERO AT DASH RAKE
-100: CORN KNIT BOTH TOGO SOUL BOG
-@end cartouche
-@end example
-
-@heading Using the OTPs
-
-When you try to use one and have initialized a series of
-one-time passwords for yourself you will get a challenge with the
-algorithm being used, the sequence number, and the seed.  Enter those in
-your generator or find the corresponding password in your list.
-
-@example
-@cartouche
-login: assar
-assar's [ otp-md5 99 foobar ] Password: <MY SUNG HERO AT DASH RAKE>
-@end cartouche
-@end example
-
-The sequence number of the password will start at one less that the
-number you gave to @code{otp} and decrease by one every time you use it.
-You should try to keep track of which should be the current one so that
-you can be assured that nobody has stolen some of your passwords and
-used them.  When the number has reached zero you need to acquire a new
-series of passwords.
-
-Once you have initialized your series of passwords, you can always use
-them at any password prompt where you get the challenge as shown above.
-
-@heading Configuring servers
-
-@code{ftpd}, @code{telnetd}, and @code{popper} can be configured to
-require one-time passwords when the connection has not been kerberos
-authenticated.  Check the man pages for these programs for the correct
-options.
diff --git a/crypto/kerberosIV/doc/problems.texi b/crypto/kerberosIV/doc/problems.texi
deleted file mode 100644
index 9e3630e2d0bf..000000000000
--- a/crypto/kerberosIV/doc/problems.texi
+++ /dev/null
@@ -1,156 +0,0 @@
-@node Resolving frequent problems, Acknowledgments, One-Time Passwords, Top
-@chapter Resolving frequent problems
-
-@menu
-* Problems compiling Kerberos::  
-* Common error messages::       
-@end menu
-
-@node Problems compiling Kerberos, Common error messages, Resolving frequent problems, Resolving frequent problems
-@section Problems compiling Kerberos
-
-Many compilers require a switch to become ANSI compliant. Since kth-krb
-is written in ANSI C it is necessary to specify the name of the compiler
-to be used and the required switch to make it ANSI compliant. This is
-most easily done when running configure using the @kbd{env} command. For
-instance to build under HP-UX using the native compiler do:
-
-@cartouche
-@example
-datan$ env CC="cc -Ae" ./configure
-@end example
-@end cartouche
-
-In general @kbd{gcc} works. The following combinations have also been
-verified to successfully compile the distribution:
-
-@table @asis
-
-@item @samp{HP-UX}
-@kbd{cc -Ae}
-@item @samp{Digital UNIX}
-@kbd{cc -std1}
-@item @samp{AIX}
-@kbd{xlc}
-@item @samp{Solaris 2.x}
-@kbd{cc} (unbundled one)
-@item @samp{IRIX}
-@kbd{cc}
-
-@end table
-
-@subheading Linux problems
-
-Some systems have lost @file{/usr/include/ndbm.h} which is necessary to
-build kth-krb correctly. There is a @file{ndbm.h.Linux} right next to
-the source distribution.
-
-There has been reports of non-working @file{libdb} on some Linux
-distributions.  If that happens, use the @kbd{--without-berkeley-db}
-when configuring.
-
-@subheading HP-UX problems
-
-The shared library @file{/usr/lib/libndbm.sl} doesn't exist on all
-systems.  To make problems even worse, there is never an archive version
-for static linking either. Therefore, when building ``truly portable''
-binaries first install GNU gdbm or Berkeley DB, and make sure that you
-are linking against that library.
-
-@subheading Cray problems
-
-@kbd{rlogind} won't work on Crays until @code{forkpty()} has been
-ported, in the mean time use @kbd{telnetd}.
-
-@subheading AIX problems
-
-@kbd{gcc} version 2.7.2.1 has a bug which makes it miscompile
-@file{appl/telnet/telnetd/sys_term.c} (and possibily
-@file{appl/bsd/forkpty.c}), if used with too much optimization.
-
-@subheading C2 problems
-
-@cindex C2
-The programs that checks passwords works with @file{passwd}, OTP, and
-Kerberos paswords. This is problem if you use C2 security (or use some
-other password database), that normally keeps passwords in some obscure
-place. If you want to use Kerberos with C2 security you will have to
-think about what kind of changes are necessary. See also the discussion
-about Digital's SIA and C2 security, see @ref{Digital SIA}.
-
-@node Common error messages,  , Problems compiling Kerberos, Resolving frequent problems
-@section Common error messages
-
-These are some of the more obscure error messages you might encounter:
-
-@table @asis
-
-@item @samp{Time is out of bounds}
-
-The time on your machine differs from the time on either the kerberos
-server or the machine you are trying to login to. If it isn't obvious
-that this is the case, remember that all times are compared in UTC.
-
-On unix systems you usually can find out what the local time is by doing
-@code{telnet machine daytime}. This time (again, usually is the keyword)
-is with correction for time-zone and daylight savings.
-
-If you have problem keeping your clocks synchronized, consider using a
-time keeping system such as NTP (see also the discussion in
-@ref{Install the client programs}).
-
-@item @samp{Ticket issue date too far in the future}
-
-The time on the kerberos server is more than five minutes ahead of the
-time on the server.
-
-@item @samp{Can't decode authenticator}
-
-This means that there is a mismatch between the service key in the
-kerberos server and the service key file on the specific machine.
-Either:
-@itemize @bullet
-@item
-the server couldn't find a service key matching the request
-@item
-the service key (or version number) does not match the key the packet
-was encrypted with
-@end itemize
-
-@item @samp{Incorrect network address}
-
-The address in the ticket does not match the address you sent the
-request from. This happens on systems with more than one network
-address, either physically or logically. You can list addresses which
-should be considered equal in @file{/etc/krb.equiv} on your servers. 
-
-A note to programmers: a server should not pass @samp{*} as the instance
-to @samp{krb_rd_req}. It should try to figure out on which interface the
-request was received, for instance by using @samp{k_getsockinst}.
-
-If you change addresses on your computer you invalidate any tickets you
-might have. The easiest way to fix this is to get new tickets with the
-new address.
-
-@item @samp{Message integrity error}
-
-The packet is broken in some way:
-@itemize @bullet
-@item
-the lengths does not match the size of the packet, or
-@item
-the checksum does not match the contents of the packet
-@end itemize
-
-@item @samp{Can't send request}
-There is some problem contacting the kerberos server. Either the server
-is down, or it is using the wrong port (compare the entries for
-@samp{kerberos-iv} in @file{/etc/services}). The client might also have
-failed to guess what kerberos server to talk to (check
-@file{/etc/krb.conf} and @file{/etc/krb.realms}).
-
-@item @samp{Generic kerberos error}
-This is a generic catch-all error message.
-
-@end table
-
diff --git a/crypto/kerberosIV/doc/setup.texi b/crypto/kerberosIV/doc/setup.texi
deleted file mode 100644
index 1b4b395dfcf1..000000000000
--- a/crypto/kerberosIV/doc/setup.texi
+++ /dev/null
@@ -1,794 +0,0 @@
-@node How to set up a realm, One-Time Passwords, Installing programs, Top
-@chapter How to set up a realm
-
-@quotation
-@flushleft
-	Who willed you? or whose will stands but mine?
-	There's none protector of the realm but I.
-	Break up the gates, I'll be your warrantize.
-	Shall I be flouted thus by dunghill grooms?
-        --- King Henry VI, 6.1
-@end flushleft
-@end quotation
-
-@menu
-* How to set up the kerberos server::  
-* Install the client programs::  
-* Install the kerberised services::  
-* Install a slave kerberos server::  
-* Cross-realm functionality ::  
-@end menu
-
-@node How to set up the kerberos server, Install the client programs, How to set up a realm, How to set up a realm
-@section How to set up the kerberos server
-
-@menu
-* Choose a realm name::         
-* Choose a kerberos server::    
-* Install the configuration files::  
-* Install the /etc/services::   
-* Install the kerberos server::  
-* Set up the server::           
-* Add a few important principals::  
-* Start the server::            
-* Try to get tickets::          
-* Create initial ACL for the admin server::  
-* Start the admin server::      
-* Add users to the database::   
-* Automate the startup of the servers::  
-@end menu
-
-@node Choose a realm name, Choose a kerberos server, How to set up the kerberos server, How to set up the kerberos server
-@subsection Choose a realm name
-
-A 
-@cindex realm
-realm is an administrative domain.  Kerberos realms are usually
-written in uppercase and consist of a Internet domain
-name@footnote{Using lowercase characters in the realm name might break
-in mysterious ways. This really should have been fixed, but has not.}.
-Call your realm the same as your Internet domain name if you do not have
-strong reasons for not doing so.  It will make life easier for you and
-everyone else.
-
-@node Choose a kerberos server, Install the configuration files, Choose a realm name, How to set up the kerberos server
-@subsection Choose a kerberos server
-
-You need to choose a machine to run the 
-@pindex kerberos
-kerberos server program.  If the kerberos database residing on this host
-is compromised, your entire realm will be compromised.  Therefore, this
-machine must be as secure as possible.  Preferably it should not run any
-services other than Kerberos.  The secure-minded administrator might
-only allow logins on the console.
-
-This machine has also to be reliable.  If it is down, you will not be
-able to use any kerberised services unless you have also configured a
-slave server (@xref{Install a slave kerberos server}).
-
-Running the kerberos server requires very little CPU power and a small
-amount of disk. An old PC with some hundreds of megabytes of free disk
-space should do fine. Most of the disk space will be used for various
-logs.
-
-@node Install the configuration files, Install the /etc/services, Choose a kerberos server, How to set up the kerberos server
-@subsection Install the configuration files
-
-There are two important configuration files: @file{/etc/krb.conf} and
-@file{/etc/krb.realms}.
-@pindex krb.conf
-@pindex krb.realms
-
-The @file{krb.conf} file determines which machines are servers for
-different realms.  The format of this file is:
-
-@example
-THIS.REALM
-THIS.REALM              kerberos.this.realm admin server
-THIS.REALM              kerberos-1.this.realm
-ANOTHER.REALM           kerberos.another.realm
-@end example
-
-The first line defines the name of the local realm. Line two defines the
-name of the master kerberos server and the database administration
-server for this realm.  You can define any number of kerberos slave
-servers similar to the one defined in line three.  The clients will try
-to contact the servers in the order they are defined in @file{krb.conf}.
-
-The @samp{admin server} clause at the first entry states that this is
-the master server
-@cindex master server
-(the one to contact when modifying the database, such as changing
-passwords). There should be only one such entry for each realm.
-
-In the original MIT Kerberos 4 (as in most others), the server
-specification could only take the form of a host-name. To facilitate
-having kerberos servers in odd places (such as behind a firewall),
-support has been added for ports other than the default (750), and
-protocols other than UDP.
-
-The formal syntax for an entry is now
-@samp{@var{[proto}/@var{]host[}:@var{port]}}. @var{proto} is either
-@samp{udp} or @samp{tcp}, and @var{port} is the port to talk to. Default
-value for @var{proto} is @samp{udp} and for @var{port} whatever
-@samp{kerberos-iv} is defined to be in @file{/etc/services} or 750 if
-undefined.
-
-If the information about a realm is missing from the @file{krb.conf}
-file, or if the information is wrong, the following methods will be
-tried in order.
-
-@enumerate
-@item
-If you have an SRV-record (@cite{RFC 2052}) for your realm it will be
-used. This record should be of the form
-@samp{kerberos-iv.@var{protocol}.@var{REALM}}, where @var{proto} is
-either @samp{udp} or @samp{tcp}. (Note: the current implementation does
-not look at priority or weight when deciding which server to talk to.)
-@item
-If there isn't any SRV-record, it tries to find a TXT-record for the
-same domain. The contents of the record should have the same format as the
-host specification in @file{krb.conf}. (Note: this is a temporary
-solution if your name server doesn't support SRV records. The clients
-should work fine with SRV records, so if your name server supports them,
-they are very much preferred.)
-@item
-If no valid kerberos server is found, it will try to talk udp to the
-service @samp{kerberos-iv} with fall-back to port 750 with
-@samp{kerberos.@var{REALM}} (which is also assumed to be the master
-server), and then @samp{kerberos-1.@var{REALM}},
-@samp{kerberos-2.@var{REALM}}, and so on.
-@end enumerate
-
-We strongly recommend that you add a CNAME @samp{kerberos.@var{REALM}}
-pointing to your kerberos master server.
-
-The @file{krb.realms} file is used to find out what realm a particular
-host belongs to.  An example of this file could look like:
-
-@example
-this.realm            THIS.REALM
-.this.realm           THIS.REALM
-foo.com               SOME.OTHER.REALM
-www.foo.com           A.STRANGE.REALM
-.foo.com              FOO.REALM
-@end example
-
-Entries starting with a dot are taken as the name of a domain. Entries
-not starting with a dot are taken as a host-name. The first entry matched
-is used. The entry for @samp{this.realm} is only necessary if there is a
-host named @samp{this.realm}.
-
-If no matching realm is found in @file{krb.realms}, DNS is searched for
-the correct realm. For example, if we are looking for host @samp{a.b.c},
-@samp{krb4-realm.a.b.c} is first tried and then @samp{krb4-realm.b.c}
-and so on. The entry should be a TXT record containing the name of the
-realm, such as:
-
-@example
-krb4-realm.pdc.kth.se.  7200    TXT     "NADA.KTH.SE"
-@end example
-
-If this didn't help the domain name sans the first part in uppercase is
-tried.
-
-The plain vanilla version of Kerberos doesn't have any fancy methods of
-getting realms and servers so it is generally a good idea to keep
-@file{krb.conf} and @file{krb.realms} up to date.
-
-@node Install the /etc/services, Install the kerberos server, Install the configuration files, How to set up the kerberos server
-@subsection Updating /etc/services
-
-You should append or merge the contents of @file{services.append} to
-your @file{/etc/services} files or NIS-map. Remove any unused factory
-installed kerberos port definitions to avoid possible conflicts.
-@pindex services
-
-Most of the programs will fall back to the default ports if the port
-numbers are not found in @file{/etc/services}, but it is convenient to
-have them there anyway.
-
-@node Install the kerberos server, Set up the server, Install the /etc/services, How to set up the kerberos server
-@subsection Install the kerberos server
-
-You should have already chosen the machine where you want to run the
-kerberos server and the realm name.  The machine should also be as
-secure as possible (@xref{Choose a kerberos server}) before installing
-the kerberos server.  In this example, we will install a kerberos server
-for the realm @samp{FOO.SE} on a machine called @samp{hemlig.foo.se}.
-
-@node Set up the server, Add a few important principals, Install the kerberos server, How to set up the kerberos server
-@subsection Setup the server
-
-Login as root on the console of the kerberos server.  Add
-@file{/usr/athena/bin} and @file{/usr/athena/sbin} to your path.  Run
-@kbd{kdb_init}:
-@pindex kdb_init
-
-@example
-@cartouche
-hemlig# kdb_init
-Realm name [default  FOO.SE ]: 
-You will be prompted for the database Master Password.
-It is important that you NOT FORGET this password.
-
-Enter Kerberos master password: 
-Verifying password 
-Enter Kerberos master password: 
-@end cartouche
-@end example
-
-If you have set up the configuration files correctly, @kbd{kdb_init}
-should choose the correct realm as the default, otherwise a (good) guess
-is made.  Enter the master password.
-
-This password will only be used for encrypting the kerberos database on
-disk and for generating new random keys.  You will not have to remember
-it, only to type it again when you run @kbd{kstash}.  Choose something
-long and random.  Now run @kbd{kstash} using the same password:
-@pindex kstash
-
-@example
-@cartouche
-hemlig# kstash
-
-Enter Kerberos master password: 
-
-Current Kerberos master key version is 1.
-
-Master key entered.  BEWARE!
-Wrote master key to /.k
-@end cartouche
-@end example
-
-After entering the same master password it will be saved in the file
-@file{/.k} and the kerberos server will read it when needed. Write down
-the master password and put it in a sealed envelope in a safe, you might
-need it if your disk crashes or should you want to set up a slave
-server.
-
-@code{kdb_init} initializes the database with a few entries:
-
-@table @samp
-@item krbtgt.@var{REALM}
-The key used for authenticating to the kerberos server.
-
-@item changepw.kerberos
-The key used for authenticating to the administrative server, i.e. when
-adding users, changing passwords, and so on.
-
-@item default
-This entry is copied to new items when these are added.  Enter here the
-values you want new entries to have, particularly the expiry date.
-
-@item K.M
-This is the master key and it is only used to verify that the master key
-that is saved un-encrypted in @file{/.k} is correct and corresponds to
-this database.
-
-@end table
-
-@code{kstash} only reads the master password and writes it to
-@file{/.k}.  This enables the kerberos server to start without you
-having to enter the master password.  This file (@file{/.k}) is only
-readable by root and resides on a ``secure'' machine.
-
-@node Add a few important principals, Start the server, Set up the server, How to set up the kerberos server
-@subsection Add a few important principals
-
-Now the kerberos database has been created, containing only a few
-principals.  The next step is to add a few more so that you can test
-that it works properly and so that you can administer your realm without
-having to use the console on the kerberos server.  Use @kbd{kdb_edit}
-to edit the kerberos database directly on the server.
-@pindex kdb_edit
-
-@code{kdb_edit} is intended as a bootstrapping and fall-back mechanism
-for editing the database.  For normal purposes, use the @code{kadmin}
-program (@xref{Add users to the database}).
-
-The following example shows the adding of the principal
-@samp{nisse.admin} into the kerberos database.  This principal is used
-by @samp{nisse} when administrating the kerberos database.  Later on the
-normal principal for @samp{nisse} will be created.  Replace @samp{nisse}
-and @samp{password} with your own username and password.
-
-@example
-@cartouche
-hemlig# kdb_edit -n
-Opening database...
-Current Kerberos master key version is 1.
-
-Master key entered.  BEWARE!
-Previous or default values are in [brackets] ,
-enter return to leave the same, or new value.
-
-Principal name: <nisse>
-Instance: <admin>
-
-<Not found>, Create [y] ? <>
-
-Principal: nisse, Instance: admin, kdc_key_ver: 1
-New Password: <password>
-Verifying password 
-New Password: <password>
-
-Principal's new key version = 1
-Expiration date (enter yyyy-mm-dd) [ 2000-01-01 ] ? <>
-Max ticket lifetime (*5 minutes) [ 255 ] ? <>
-Attributes [ 0 ] ? <>
-Edit O.K.
-Principal name: <>
-@end cartouche
-@end example
-
-@code{kdb_edit} will loop until you hit the @kbd{return} key at the
-``Principal name'' prompt. Now you have added nisse as an administrator.
-
-@node Start the server, Try to get tickets, Add a few important principals, How to set up the kerberos server
-@subsection Start the server
-
-@pindex kerberos
-@example
-@cartouche
-hemlig# /usr/athena/libexec/kerberos &
-Kerberos server starting
-Sleep forever on error
-Log file is /var/log/kerberos.log
-Current Kerberos master key version is 1.
-
-Master key entered.  BEWARE!
-
-Current Kerberos master key version is 1
-Local realm: FOO.SE
-@end cartouche
-@end example
-
-@node  Try to get tickets, Create initial ACL for the admin server, Start the server, How to set up the kerberos server
-@subsection Try to get tickets
-
-You can now verify that these principals have been added and that the
-server is working correctly.
-
-@pindex kinit
-@example
-@cartouche
-hemlig# kinit
-eBones International (hemlig.foo.se)
-Kerberos Initialization
-Kerberos name: <nisse.admin>
-Password: <password>
-@end cartouche
-@end example
-
-If you do not get any error message from @code{kinit}, then everything
-is working (otherwise, see @ref{Common error messages}).  Use
-@code{klist} to verify the tickets you acquired with @code{kinit}:
-
-@pindex klist
-@example
-@cartouche
-hemlig# klist
-Ticket file:    /tmp/tkt0
-Principal:      nisse.admin@@FOO.SE
-
-Issued           Expires          Principal
-May 24 21:06:03  May 25 07:06:03  krbtgt.FOO.SE@@FOO.SE
-@end cartouche
-@end example
-
-@node Create initial ACL for the admin server, Start the admin server, Try to get tickets, How to set up the kerberos server
-@subsection Create initial ACL for the admin server
-
-The admin server, @code{kadmind}, uses a series of files to determine who has
-@pindex kadmind
-the right to perform certain operations.  The files are:
-@file{admin_acl.add}, @file{admin_acl.get}, @file{admin_acl.del}, and
-@file{admin_acl.mod}.  Create these with @samp{nisse.admin@@FOO.SE} as
-the contents.
-@pindex admin_acl.add
-@pindex admin_acl.get
-@pindex admin_acl.del
-@pindex admin_acl.mod
-
-@example
-@cartouche
-hemlig# echo "nisse.admin@@FOO.SE" > /var/kerberos/admin_acl.add
-hemlig# echo "nisse.admin@@FOO.SE" > /var/kerberos/admin_acl.get
-hemlig# echo "nisse.admin@@FOO.SE" > /var/kerberos/admin_acl.mod
-hemlig# echo "nisse.admin@@FOO.SE" > /var/kerberos/admin_acl.del
-@end cartouche
-@end example
-
-Later on you may wish to add more users with administration
-privileges. Make sure that you create both the administration principals
-and add them to the admin server ACL.
-
-@node Start the admin server, Add users to the database, Create initial ACL for the admin server, How to set up the kerberos server
-@subsection Start the admin server
-
-@pindex kadmind
-@example
-@cartouche
-hemlig# /usr/athena/libexec/kadmind &
-KADM Server KADM0.0A initializing
-Please do not use 'kill -9' to kill this job, use a
-regular kill instead
-
-Current Kerberos master key version is 1.
-
-Master key entered.  BEWARE!
-@end cartouche
-@end example
-
-@node Add users to the database, Automate the startup of the servers, Start the admin server, How to set up the kerberos server
-@subsection Add users to the database
-
-Use the @code{kadmin} client to add users to the database:
-@pindex kadmin
-
-@example
-@cartouche
-hemlig# kadmin -u nisse.admin -m
-Welcome to the Kerberos Administration Program, version 2
-Type "help" if you need it.
-admin:  <add nisse>
-Admin password: <nisse.admin's password>
-Maximum ticket lifetime?  (255)  [Forever]  
-Attributes?  [0x00]  
-Expiration date (enter yyyy-mm-dd) ?  [Sat Jan  1 05:59:00 2000]  
-Password for nisse:
-Verifying password Password for nisse:
-nisse added to database.
-@end cartouche
-@end example
-
-Add whatever other users you want to have in the same way.  Verify that
-a user is in the database and check the database entry for that user:
-
-@example
-@cartouche
-admin:  <get nisse>
-Info in Database for nisse.:
-Max Life: 255 (Forever)   Exp Date: Sat Jan  1 05:59:59 2000
-
-Attribs: 00  key: 0 0
-admin:  <^D>
-Cleaning up and exiting.
-@end cartouche
-@end example
-
-@node Automate the startup of the servers,  , Add users to the database, How to set up the kerberos server
-@subsection Automate the startup of the servers
-
-Add the lines that were used to start the kerberos server and the
-admin server to your startup scripts (@file{/etc/rc} or similar).
-@pindex rc
-
-@node Install the client programs, Install the kerberised services, How to set up the kerberos server, How to set up a realm
-@section Install the client programs
-
-Making a machine a kerberos client only requires a few steps.  First you
-might need to change the configuration files as with the kerberos
-server.  (@xref{Install the configuration files} and @ref{Install the
-/etc/services}.) Also you need to make the programs in
-@file{/usr/athena/bin} available.  This can be done by adding the
-@file{/usr/athena/bin} directory to the users' paths, by making symbolic
-links, or even by copying the programs.
-
-You should also verify that the local time on the client is synchronised
-with the time on the kerberos server by some means. The maximum allowed
-time difference between the participating servers and a client is 5
-minutes.
-@cindex NTP.
-One good way to synchronize the time is NTP (Network Time Protocol), see
-@code{http://www.eecis.udel.edu/~ntp/}.
-
-If you need to run the client programs on a machine where you do not
-have root-access, you can hopefully just use the binaries and no
-configuration will be needed.  The heuristics used are mentioned above
-(see @ref{Install the configuration files}).  If this is not the case
-and you need to have @file{krb.conf} and/or @file{krb.realms}, you can
-copy them into a directory of your choice and
-@pindex krb.conf
-@pindex krb.realms
-set the environment variable @var{KRBCONFDIR} to point at this
-@cindex KRBCONFDIR
-directory.
-
-To test the client functionality, run the @code{kinit} program:
-
-@example
-@cartouche
-foo$ kinit
-eBones International (foo.foo.se)
-Kerberos Initialization
-Kerberos name: <nisse>
-Password: <password>
-
-foo$ klist
-Ticket file:    /tmp/tkt4711
-Principal:      nisse@@FOO.SE
-
-Issued           Expires          Principal
-May 24 21:06:03  May 25 07:06:03  krbtgt.FOO.SE@@FOO.SE
-@end cartouche
-@end example
-
-@node Install the kerberised services, Install a slave kerberos server, Install the client programs, How to set up a realm
-@section Install the kerberised services
-
-These includes @code{rsh}, @code{rlogin}, @code{telnet}, @code{ftp},
-@code{rxtelnet}, and so on.
-@pindex rsh
-@pindex rlogin
-@pindex telnet
-@pindex ftp
-@pindex rxtelnet
-
-First follow the steps mentioned in the prior section to make it a
-client and verify its operation.  Change @file{inetd.conf} next to use
-the new daemons.  Look at the file
-@pindex inetd.conf
-@file{etc/inetd.conf.changes} to see the changes that we recommend you
-perform on @file{inetd.conf}.
-
-You should at this point decide what services you want to run on
-each machine.
-
-@subsection rsh, rlogin, and rcp
-@pindex rsh
-@pindex rlogin
-@pindex rcp
-
-These exist in kerberised versions and ``old-style'' versions.  The
-different versions use different port numbers, so you can choose none,
-one, or both.  If you do not want to use ``old-style'' r* services, you
-can let the programs output the text ``Remote host requires Kerberos
-authentication'' instead of just refusing connections to that port.
-This is enabled with the @samp{-v} option.  The kerberised services
-exist in encrypted and non-encrypted versions.  The encrypted services
-have an ``e'' prepended to the name and the programs take @samp{-x} as an
-option indicating encryption.
-
-Our recommendation is to only use the kerberised services and give
-explanation messages for the old ports.
-
-@subsection telnet
-@pindex telnet
-
-The telnet service always uses the same port and negotiates as to which
-authentication method should be used.  The @code{telnetd} program has
-@pindex telnetd
-an option ``-a user'' that only allows kerberised and authenticated
-connections.  If this is not included, it falls back to using clear text
-passwords.  For obvious reasons, we recommend that you enable this
-option.  If you want to use one-time passwords (@xref{One-Time
-Passwords}) you can use the ``-a otp'' option which will allow OTPs or
-kerberised connections.
-
-@subsection ftp
-@pindex ftp
-
-The ftp service works as telnet does, with just one port being used.  By
-default only kerberos authenticated connections are allowed.  You can
-specify additional levels that are thus allowed with these options:
-
-@table @asis
-@item @kbd{-a otp}
-Allow one-time passwords (@xref{One-Time Passwords}).
-@item @kbd{-a ftp}
-Allow anonymous login (as user ``ftp'' or ``anonymous'').
-@item @kbd{-a safe}
-The same as @kbd{-a ftp}, for backwards compatibility.
-@item @kbd{-a plain}
-Allow clear-text passwords.
-@item @kbd{-a none}
-The same as @kbd{-a ftp -a plain}.
-@item @kbd{-a user}
-A no-op, also there for backwards compatibility reasons.
-@end table
-
-When running anonymous ftp you should read the man page on @code{ftpd}
-which explains how to set it up.
-
-@subsection pop
-@pindex popper
-
-The Post Office Protocol (POP) is used to retrieve mail from the mail
-hub.  The @code{popper} program implements the standard POP3 protocol
-and the kerberised KPOP.  Use the @samp{-k} option to run the kerberos
-version of the protocol. This service should only be run on your mail
-hub.
-
-@subsection kx
-@pindex kx
-
-@code{kx} allows you to run X over a kerberos-authenticated and
-encrypted connection.  This program is used by @code{rxtelnet},
-@code{tenletxr}, and @code{rxterm}.
-
-If you have some strange kind of operating system with X libraries that
-do not allow you to use unix-sockets, you need to specify the @samp{-t}
-@pindex kxd
-option to @code{kxd}.  Otherwise it should be sufficient by adding the
-daemon in @file{inetd.conf}.
-
-@subsection kauth
-@pindex kauth
-
-This service allows you to create tickets on a remote host.  To
-enable it just insert the corresponding line in @file{inetd.conf}.
-
-@section srvtabs
-@pindex srvtab
-
-In the same way every user needs to have a password registered with
-the kerberos server, every service needs to have a shared key with the
-kerberos server.  The service keys are stored in a file, usually called
-@file{/etc/srvtab}.  This file should not be readable to anyone but
-root, in order to keep the key from being divulged.  The name of this principal
-in the kerberos database is usually the service and the host.  The key
-for the pop service is called @samp{pop.@var{hostname}}.  The one for
-rsh/rlogin/telnet is named @samp{rcmd.@var{hostname}}.  (rcmd comes from
-``remote command'').  To create these keys you will use the the
-@code{ksrvutil} program.  Perform the
-@pindex ksrvutil
-following:
-
-@example
-@cartouche
-bar# ksrvutil -p nisse.admin get
-Name [rcmd]: <>
-Instance [bar]: <>
-Realm [FOO.SE]: <>
-Is this correct? (y,n) [y] <>
-Add more keys? (y,n) [n] <>
-Password for nisse.admin@@FOO.SE: <nisse.admin's password>
-Written rcmd.bar
-rcmd.bar@@FOO.SE
-Old keyfile in /etc/srvtab.old.
-@end cartouche
-@end example
-
-@subsection Complete test of the kerberised services
-
-Obtain a ticket on one machine (@samp{foo}) and use it to login with a
-kerberised service to a second machine (@samp{bar}).  The test should
-look like this if successful:
-
-@example
-@cartouche
-foo$ kinit nisse
-eBones International (foo.foo.se)
-Kerberos Initialization for "nisse"
-Password: <nisse's password>
-foo$ klist
-Ticket file:    /tmp/tkt4711
-Principal:      nisse@@FOO.SE
-
-Issued           Expires          Principal
-May 30 13:48:03  May 30 23:48:03  krbtgt.FOO.SE@@FOO.SE
-foo$ telnet bar
-Trying 17.17.17.17...
-Connected to bar.foo.se
-Escape character is '^]'.
-[ Trying mutual KERBEROS4 ... ]
-[ Kerberos V4 accepts you ]
-[ Kerberos V4 challenge successful ]
-bar$
-@end cartouche
-@end example
-
-You can also try with @code{rsh}, @code{rcp}, @code{rlogin},
-@code{rlogin -x}, and some other commands to see that everything is
-working all right.
-
-@node Install a slave kerberos server, Cross-realm functionality , Install the kerberised services, How to set up a realm
-@section Install a slave kerberos server
-
-It is desirable to have at least one backup (slave) server in case the
-master server fails. It is possible to have any number of such slave
-servers but more than three usually doesn't buy much more redundancy.
-
-First select a good server machine.  @xref{Choose a kerberos
-server}. Since the master and slave servers will use copies of the same
-database, they need to use the same master key.
-
-On the master, add a @samp{rcmd.kerberos} principal (using
-@samp{ksrvutil get}). The
-@pindex kprop
-@code{kprop} program, running on the master, will use this when
-authenticating to the
-@pindex kpropd
-@code{kpropd} daemons running on the slave servers.
-
-On your master server, create a file, e.g. @file{/var/kerberos/slaves},
-that contains the hostnames of your kerberos slave servers.
-
-Start @code{kpropd} with @samp{kpropd -i} on your slave servers.
-
-On your master server, create a dump of the database with @samp{kdb_util
-slave_dump /var/kerberos/slave_dump}, and then run @code{kprop}.
-
-You should now have copies of the database on your slave servers. You
-can verify this by issuing @samp{kdb_util dump @var{file}} on your
-slave servers, and comparing with the original file on the master
-server. Note that the entries will not be in the same order.
-
-This procedure should be automated with a script run regularly by cron,
-for instance once an hour.
-
-To start the kerberos server on slaves, you first have to copy the
-master key from the master server. You can do this either by remembering
-the master password and issuing @samp{kstash}, or you can just copy the
-keyfile. Remember that if you copy the file, do so on a safe media, not
-over the network. Good means include floppy or paper. Paper is better,
-since it is easier to swallow afterwards.
-
-The kerberos server should be started with @samp{-s} on the slave
-servers. This enables sanity checks, for example checking the time since
-the last update from the master.
-
-All changes to the database are made by @code{kadmind} at the master,
-and then propagated to the slaves, so you should @strong{not} run
-@code{kadmind} on the slaves.
-
-Finally add the slave servers to
-@file{/etc/krb.conf}. The clients will ask the servers in the order
-specified by that file.
-
-Consider adding CNAMEs to your slave servers, see @ref{Install the
-configuration files}.
-
-@node Cross-realm functionality ,  , Install a slave kerberos server, How to set up a realm
-@section Cross-realm functionality
-
-Suppose you are residing in the realm @samp{MY.REALM}, how do you
-authenticate to a server in @samp{OTHER.REALM}? Having valid tickets in
-@samp{MY.REALM} allows you to communicate with kerberised services in that
-realm. However, the computer in the other realm does not have a secret
-key shared with the kerberos server in your realm.
-
-It is possible to add a shared key between two realms that trust each
-other. When a client program, such as @code{telnet}, finds that the
-other computer is in a different realm, it will try to get a ticket
-granting ticket for that other realm, but from the local kerberos
-server. With that ticket granting ticket, it will then obtain service
-tickets from the kerberos server in the other realm.
-
-To add this functionality you have to add a principal to each realm. The
-principals should be @samp{krbtgt.OTHER.REALM} in @samp{MY.REALM}, and
-@samp{krbtgt.MY.REALM} in @samp{OTHER.REALM}. The two different
-principals should have the same key (and key version number).  Remember
-to transfer this key in a safe manner. This is all that is required.
-
-@example
-@cartouche
-blubb$ klist
-Ticket file:    /tmp/tkt3008
-Principal:      joda@@NADA.KTH.SE
-
-  Issued           Expires          Principal
-Jun  7 02:26:23  Jun  7 12:26:23  krbtgt.NADA.KTH.SE@@NADA.KTH.SE
-blubb$ telnet agat.e.kth.se
-Trying 130.237.48.12...
-Connected to agat.e.kth.se.
-Escape character is '^]'.
-[ Trying mutual KERBEROS4 ... ]
-[ Kerberos V4 accepts you ]
-[ Kerberos V4 challenge successful ]
-Last login: Sun Jun  2 20:51:50 from emma.pdc.kth.se
-
-agat$ exit
-Connection closed by foreign host.
-blubb$ klist
-Ticket file:    /tmp/tkt3008
-Principal:      joda@@NADA.KTH.SE
-
-  Issued           Expires          Principal
-Jun  7 02:26:23  Jun  7 12:26:23  krbtgt.NADA.KTH.SE@@NADA.KTH.SE
-Jun  7 02:26:50  Jun  7 12:26:50  krbtgt.E.KTH.SE@@NADA.KTH.SE
-Jun  7 02:26:51  Jun  7 12:26:51  rcmd.agat@@E.KTH.SE
-@end cartouche
-@end example
diff --git a/crypto/kerberosIV/doc/whatis.texi b/crypto/kerberosIV/doc/whatis.texi
deleted file mode 100644
index 16989bbec9d0..000000000000
--- a/crypto/kerberosIV/doc/whatis.texi
+++ /dev/null
@@ -1,137 +0,0 @@
-@node What is Kerberos?, Installing programs, Introduction, Top
-@chapter What is Kerberos?
-
-@quotation
-@flushleft
-        Now this Cerberus had three heads of dogs,
-        the tail of a dragon, and on his back the
-        heads of all sorts of snakes.
-        --- Pseudo-Apollodorus Library 2.5.12
-@end flushleft
-@end quotation
-
-Kerberos is a system for authenticating users and services on a network.
-It is built upon the assumption that the network is ``unsafe''.  For
-example, data sent over the network can be eavesdropped and altered, and
-addresses can also be faked.  Therefore they cannot be used for
-authentication purposes.
-@cindex authentication
-
-Kerberos is a trusted third-party service.  That means that there is a
-third party (the kerberos server) that is trusted by all the entities on
-the network (users and services, usually called @dfn{principals}).  All
-principals share a secret password (or key) with the kerberos server and
-this enables principals to verify that the messages from the kerberos
-server are authentic.  Thus trusting the kerberos server, users and
-services can authenticate each other.
-
-@section Basic mechanism
-
-@ifinfo
-@macro sub{arg}
-<\arg\>
-@end macro
-@end ifinfo
-
-@tex
-@def@xsub#1{$_{#1}$}
-@global@let@sub=@xsub
-@end tex
-
-In Kerberos, principals use @dfn{tickets} to prove that they are who
-they claim to be. In the following example, @var{A} is the initiator of
-the authentication exchange, usually a user, and @var{B} is the service
-that @var{A} wishes to use.
-
-To obtain a ticket for a specific service, @var{A} sends a ticket
-request to the kerberos server. The request basically contains @var{A}'s
-and @var{B}'s names. The kerberos server checks that both @var{A} and
-@var{B} are valid principals.
-
-Having verified the validity of the principals, it creates a packet
-containing @var{A}'s and @var{B}'s names, @var{A}'s network address
-(@var{A@sub{addr}}), the current time (@var{t@sub{issue}}), the lifetime
-of the ticket (@var{life}), and a secret @dfn{session key}
-@cindex session key
-(@var{K@sub{AB}}). This packet is encrypted with @var{B}'s secret key
-(@var{K@sub{B}}).  The actual ticket (@var{T@sub{AB}}) looks like this:
-(@{@var{A}, @var{B}, @var{A@sub{addr}}, @var{t@sub{issue}}, @var{life},
-@var{K@sub{AB}}@}@var{K@sub{B}}).
-
-The reply to @var{A} consists of the ticket (@var{T@sub{AB}}), @var{B}'s
-name, the current time, the lifetime of the ticket, and the session key, all
-encrypted in @var{A}'s secret key (@{@var{B}, @var{t@sub{issue}},
-@var{life}, @var{K@sub{AB}}, @var{T@sub{AB}}@}@var{K@sub{A}}). @var{A}
-decrypts the reply and retains it for later use.
-
-@sp 1
-
-Before sending a message to @var{B}, @var{A} creates an authenticator
-consisting of @var{A}'s name, @var{A}'s address, the current time, and a
-``checksum'' chosen by @var{A}, all encrypted with the secret session
-key (@{@var{A}, @var{A@sub{addr}}, @var{t@sub{current}},
-@var{checksum}@}@var{K@sub{AB}}). This is sent together with the ticket
-received from the kerberos server to @var{B}.  Upon reception, @var{B}
-decrypts the ticket using @var{B}'s secret key.  Since the ticket
-contains the session key that the authenticator was encrypted with,
-@var{B} can now also decrypt the authenticator. To verify that @var{A}
-really is @var{A}, @var{B} now has to compare the contents of the ticket
-with that of the authenticator. If everything matches, @var{B} now
-considers @var{A} as properly authenticated.
-
-@c (here we should have some more explanations)
-
-@section Different attacks
-
-@subheading Impersonating A
-
-An impostor, @var{C} could steal the authenticator and the ticket as it
-is transmitted across the network, and use them to impersonate
-@var{A}. The address in the ticket and the authenticator was added to
-make it more difficult to perform this attack.  To succeed @var{C} will
-have to either use the same machine as @var{A} or fake the source
-addresses of the packets. By including the time stamp in the
-authenticator, @var{C} does not have much time in which to mount the
-attack.
-
-@subheading Impersonating B
-
-@var{C} can hijack @var{B}'s network address, and when @var{A} sends
-her credentials, @var{C} just pretend to verify them. @var{C} can't
-be sure that she is talking to @var{A}.
-
-@section Defense strategies
-
-It would be possible to add a @dfn{replay cache}
-@cindex replay cache
-to the server side.  The idea is to save the authenticators sent during
-the last few minutes, so that @var{B} can detect when someone is trying
-to retransmit an already used message. This is somewhat impractical
-(mostly regarding efficiency), and is not part of Kerberos 4; MIT
-Kerberos 5 contains it.
-
-To authenticate @var{B}, @var{A} might request that @var{B} sends
-something back that proves that @var{B} has access to the session
-key. An example of this is the checksum that @var{A} sent as part of the
-authenticator. One typical procedure is to add one to the checksum,
-encrypt it with the session key and send it back to @var{A}.  This is
-called @dfn{mutual authentication}.
-
-The session key can also be used to add cryptographic checksums to the
-messages sent between @var{A} and @var{B} (known as @dfn{message
-integrity}).  Encryption can also be added (@dfn{message
-confidentiality}). This is probably the best approach in all cases.
-@cindex integrity
-@cindex confidentiality
-
-@section Further reading
-
-The original paper on Kerberos from 1988 is @cite{Kerberos: An
-Authentication Service for Open Network Systems}, by Jennifer Steiner,
-Clifford Neuman and Jeffrey I. Schiller.
-
-A less technical description can be found in @cite{Designing an
-Authentication System: a Dialogue in Four Scenes} by Bill Bryant, also
-from 1988.
-
-These and several other documents can be found on our web-page.
diff --git a/crypto/kerberosIV/eBones-p9.README b/crypto/kerberosIV/eBones-p9.README
deleted file mode 100644
index 844298598e23..000000000000
--- a/crypto/kerberosIV/eBones-p9.README
+++ /dev/null
@@ -1,26 +0,0 @@
-The file eBones-p9.patch.Z is the compressed patch for Bones (patchlevel 9)
-that puts back the calls to the DES encryption libraries.
-
-eBones-p9-des.tar.Z is a compressed tar file of MIT compatible
-des encryption routines.  Install these routines in src/lib/des.
-The des_quad_cksum is not compatible with the MIT version
-but I should fix that when I have access to ultrix 4
-* [It has now been fixed and is the same as MIT's]
-(it has a binary copy of libdes.a)).  There are two extra routines,
-des_enc_read and des_enc_write.  These routines are used in the
-kerberos rcp, rlogin and rlogind to encrypt all network traffic.
-
-eBones-p9.tar.Z is a compressed tar file of Bones (patchlevel 9)
-with the eBones-p9.patch applied and eBones-p9-des.tar.Z installed.
-
-When applying the patch to Bones, don't do a
-find src -name "*.orig" -exec /bin/rm {} \;
-There is a file called src/util/ss/ss.h.orig that is needed and
-the above find will remove it.
-
-The Imakefile in src/lib/des assumes you have gcc.  If you don't,
-you will have to change the Imakefile.  Compile this directory with
-the maximum optimization your compiler has available.
-
-These modifications have been successfully unpacked and compiled
-on a microvax 3600.
diff --git a/crypto/kerberosIV/etc/README b/crypto/kerberosIV/etc/README
deleted file mode 100644
index 68865ec7c8fc..000000000000
--- a/crypto/kerberosIV/etc/README
+++ /dev/null
@@ -1,41 +0,0 @@
-
-	How to update your files in the /etc directory!
-
-/etc/services (all machines)
-
-  The contents of services.append can probably just be appended to
-your local file. If you use NIS (YP) you need to do this on the NIS
-master. Delete and duplicate definitions to prevent inconsistencies.
-
-/etc/krb.conf (all machines)
-
-  Create a krb.conf file by substituting MY.REALM.NAME with your
-domain name. If you create a domain name alias (CNAME) kerberos.domain
-pointing to your master server, unconfigured clients will have a
-chance to find your realm.
-
-  It is no longer necessary to put each and every realm in
-krb.{conf,realms}. If the domain name matches your realm name and you
-have a CNAME kerberos.REALMNAME pointing at your kerberos server other
-sites will find your realm even if it is not listed in krb.conf.  
-*** Please add this CNAME to your local DNS ***
-
-/etc/krb.realms (all machines)
-
-  Substitue MY.REALM.NAME in krb.realms with your domain name.
-  Not strictly necessary when domain and realm names match.
-
-/etc/inetd.conf (all machines supporting incoming telnet, rsh etc.)
-
-  Comment out the lines starting with shell, login and telnet and
-append inetd.conf.changes. Be carefull to check that there are no
-additional old entries of kshell, ekshell, klogin and eklogin left.
-
-  The -v option to rshd and rlogin turns off that service and echo
-an informational message to the user.
-
-/etc/srvtab
-
-  With 'ksrvutil get' you can add entries to the Kerberos database and
-put the service keys into your srvtab file.
-
diff --git a/crypto/kerberosIV/etc/default.login b/crypto/kerberosIV/etc/default.login
deleted file mode 100644
index f01b2eee90a4..000000000000
--- a/crypto/kerberosIV/etc/default.login
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Sample /etc/default/login file, read by the login program
-#
-# For more info consult SysV login(1)
-#
-# Most things are environment variables.
-# HZ and TZ are set only if they are still uninitialized.
-
-# This really variable TZ
-#TIMEZONE=EST5EDT
-
-#HZ=100
-
-# File size limit, se ulimit(2).
-# Note that the limit must be specified in units of 512-byte blocks.
-#ULIMIT=0
-
-# If CONSOLE is set, root can only login on that device.
-# When not set root can log in on any device.
-#CONSOLE=/dev/console
-
-# PASSREQ determines if login requires a password.
-PASSREQ=YES
-
-# ALTSHELL, really set SHELL=/bin/bash or other shell
-# Extension: when ALTSHELL=YES, we set the SHELL variable even if it is /bin/sh
-ALTSHELL=YES
-
-# Default PATH
-#PATH=/usr/bin:
-
-# Default PATH for root user
-#SUPATH=/usr/sbin:/usr/bin
-
-# TIMEOUT sets the number of seconds (between 0 and 900) to wait before
-# abandoning a login session.
-# 
-#TIMEOUT=300
-
-# Use this for default umask(2) value
-#UMASK=022
-
-# Sleeptime between failed logins
-# SLEEPTIME
-
-# Maximum number of failed login attempts, well the user can always reconnect
-# MAXTRYS
diff --git a/crypto/kerberosIV/etc/fbtab b/crypto/kerberosIV/etc/fbtab
deleted file mode 100644
index 3e2137691471..000000000000
--- a/crypto/kerberosIV/etc/fbtab
+++ /dev/null
@@ -1,15 +0,0 @@
-# Sample /etc/fbtab file read by the login program
-# This file can also be called /etc/logindevperm.
-
-# Use this to give away devices to the console user. The group of the
-# devices is set to the owner's group specified in /etc/passwd.
-#
-# First column specifies the console device.
-#
-# Second the mode bits of the given away devices
-#
-# Third is a : separated list of devices to give away
-
-# console       mode    devices
-/dev/console	0600	/dev/console:/dev/mouse
-/dev/console	0600	/dev/floppy
diff --git a/crypto/kerberosIV/etc/hosts.equiv b/crypto/kerberosIV/etc/hosts.equiv
deleted file mode 100644
index 2fbb50c4a8dc..000000000000
--- a/crypto/kerberosIV/etc/hosts.equiv
+++ /dev/null
@@ -1 +0,0 @@
-localhost
diff --git a/crypto/kerberosIV/etc/inetd.conf.changes b/crypto/kerberosIV/etc/inetd.conf.changes
deleted file mode 100644
index a9721a0ff161..000000000000
--- a/crypto/kerberosIV/etc/inetd.conf.changes
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# $Id: inetd.conf.changes,v 1.12 1996/10/27 11:58:02 bg Exp $
-#
-# Turn off vanilla rshd and rlogind with an informational message.
-# If you really want this security problem remove the '-v' option!
-shell	stream	tcp nowait root	/usr/athena/libexec/rshd rshd -l -L -v
-login	stream	tcp nowait root /usr/athena/libexec/rlogind rlogind -l -v
-#
-# Kerberos rsh
-kshell	stream	tcp nowait root	/usr/athena/libexec/rshd rshd -L -k
-ekshell	stream	tcp nowait root	/usr/athena/libexec/rshd rshd -L -k -x
-ekshell2 stream	tcp nowait root	/usr/athena/libexec/rshd rshd -L -k -x
-#
-# Kerberos rlogin
-klogin	stream	tcp nowait root	/usr/athena/libexec/rlogind rlogind -k
-eklogin	stream	tcp nowait root	/usr/athena/libexec/rlogind rlogind -k -x
-#
-# Kerberized telnet and ftp, consider adding '-a user' to
-# disallow cleartext passwords to both telnetd and ftpd.
-telnet	stream	tcp nowait root /usr/athena/libexec/telnetd telnetd -a none
-ftp	stream	tcp nowait root	/usr/athena/libexec/ftpd ftpd -a none
-#
-# Kerberized POP. Server principal is pop.hostname, *not* rcmd.hostname!
-#kpop	stream	tcp nowait root	/usr/athena/libexec/popper popper -k
-#
-# Old POP3 with passwords in clear (not recommended, uses cleartext passwords)
-#pop3	stream	tcp nowait root	/usr/athena/libexec/popper popper
-#
-# Kauthd, support for putting tickets on other machines in a secure fashion.
-kauth	stream	tcp nowait root	/usr/athena/libexec/kauthd kauthd
-#
-# Encrypted X connections
-kx	stream	tcp nowait root	/usr/athena/libexec/kxd kxd
diff --git a/crypto/kerberosIV/etc/krb.conf b/crypto/kerberosIV/etc/krb.conf
deleted file mode 100644
index 6114c8520645..000000000000
--- a/crypto/kerberosIV/etc/krb.conf
+++ /dev/null
@@ -1,56 +0,0 @@
-MY.REALM.NAME
-MY.REALM.NAME	kerberos.MY.REALM.NAME admin server
-SICS.SE		kerberos.sics.se admin server
-NADA.KTH.SE	kerberos.nada.kth.se admin server
-NADA.KTH.SE	sysman.nada.kth.se
-NADA.KTH.SE	server.nada.kth.se
-ADMIN.KTH.SE	ulysses.admin.kth.se admin server
-ADMIN.KTH.SE	graziano.admin.kth.se
-ADMIN.KTH.SE	montano.admin.kth.se
-BION.KTH.SE     chaplin.bion.kth.se admin server
-DSV.SU.SE	ssi.dsv.su.se admin server
-DSV.SU.SE	vall.dsv.su.se
-E.KTH.SE	heimdal.e.kth.se admin server
-E.KTH.SE        elixir.e.kth.se
-E.KTH.SE        malt.e.kth.se
-IT.KTH.SE	gaia.it.kth.se
-IT.KTH.SE	isolde.it.kth.se
-IT.KTH.SE	tristan.it.kth.se
-KTH.SE		kth.se admin server
-ML.KVA.SE	gustava.ml.kva.se admin server
-PI.SE		liszt.adm.pi.se admin server
-STACKEN.KTH.SE	linnea.stacken.kth.se admin server
-STACKEN.KTH.SE	marcel.stacken.kth.se
-STACKEN.KTH.SE	sune.stacken.kth.se
-SUNET.SE	bar.pilsnet.sunet.se admin server
-CYGNUS.COM kerberos.cygnus.com admin server
-CYGNUS.COM kerberos-1.cygnus.com
-CYGNUS.COM dumb.cygnus.com
-DEVO.CYGNUS.COM dumber.cygnus.com admin server
-MIRKWOOD.CYGNUS.COM mirkwood.cygnus.com admin server
-KITHRUP.COM KITHRUP.COM admin server
-ATHENA.MIT.EDU kerberos.mit.edu admin server
-ATHENA.MIT.EDU kerberos-1.mit.edu
-ATHENA.MIT.EDU kerberos-2.mit.edu
-ATHENA.MIT.EDU kerberos-3.mit.edu
-LCS.MIT.EDU kerberos.lcs.mit.edu admin server
-SMS_TEST.MIT.EDU dodo.mit.edu admin server
-LS.MIT.EDU ls.mit.edu admin server
-IFS.UMICH.EDU kerberos.ifs.umich.edu
-CS.WASHINGTON.EDU hawk.cs.washington.edu
-CS.WASHINGTON.EDU aspen.cs.washington.edu
-CS.BERKELEY.EDU okeeffe.berkeley.edu
-SOUP.MIT.EDU soup.mit.edu admin server
-TELECOM.MIT.EDU bitsy.mit.edu
-MEDIA.MIT.EDU kerberos.media.mit.edu
-NEAR.NET kerberos.near.net
-CATS.UCSC.EDU mehitabel.ucsc.edu admin server
-CATS.UCSC.EDU ucsch.ucsc.edu
-WATCH.MIT.EDU kerberos.watch.mit.edu admin server
-TELEBIT.COM napa.telebit.com. admin server
-ARMADILLO.COM monad.armadillo.com admin server
-TOAD.COM toad.com admin server
-ZEN.ORG zen.org admin server
-LLOYD.COM harry.lloyd.com admin server
-EPRI.COM kerberos.epri.com admin server
-EPRI.COM kerberos-2.epri.com
diff --git a/crypto/kerberosIV/etc/krb.equiv b/crypto/kerberosIV/etc/krb.equiv
deleted file mode 100644
index 6205c1f38b1c..000000000000
--- a/crypto/kerberosIV/etc/krb.equiv
+++ /dev/null
@@ -1,14 +0,0 @@
-# List of host with multiple adresses.
-#
-193.10.156.253	130.237.232.44	193.10.156.252	# scws scws-fddi scws-2.
-193.10.156.250  130.237.232.15  		# salmon-sp salmon.
-#
-# new krb.equiv syntax for all of SP.
-#
-193.10.156.0/24	193.10.157.0/24	\	# syk-X.pdc.kth.se syk-X-hps.pdc.kth.se
-130.237.232.31	130.237.232.32	\	# syk-0101-fddi syk-0201-fddi
-130.237.232.38	130.237.232.39	\	# syk-0115-fddi syk-0116-fddi
-130.237.232.33	130.237.232.34	\	# syk-0301-fddi syk-0401-fddi
-130.237.232.35	130.237.232.36	\	# syk-0501-fddi syk-0601-fddi
-130.237.232.37	130.237.230.66	\	# syk-0602-fddi syk-0602-fcs
-130.237.230.36				# syk-0606-hippi.
diff --git a/crypto/kerberosIV/etc/krb.realms b/crypto/kerberosIV/etc/krb.realms
deleted file mode 100644
index 85e955a9d9b1..000000000000
--- a/crypto/kerberosIV/etc/krb.realms
+++ /dev/null
@@ -1,51 +0,0 @@
-.MY.REALM.NAME	MY.REALM.NAME
-sics.se		SICS.SE
-.sics.se	SICS.SE
-nada.kth.se	NADA.KTH.SE
-pdc.kth.se	NADA.KTH.SE
-.hydro.kth.se	NADA.KTH.SE
-.math.kth.se	NADA.KTH.SE
-.mech.kth.se	NADA.KTH.SE
-.nada.kth.se	NADA.KTH.SE
-.pdc.kth.se	NADA.KTH.SE
-.sans.kth.se	NADA.KTH.SE
-.admin.kth.se	ADMIN.KTH.SE
-.e.kth.se	E.KTH.SE
-.electrum.kth.se	IT.KTH.SE
-.it.kth.se	IT.KTH.SE
-.sth.sunet.se	SUNET.SE
-.pilsnet.sunet.se	SUNET.SE
-.sunet.se	SUNET.SE
-.ml.kva.se	ML.KVA.SE
-pi.se		PI.SE
-.pi.se		PI.SE
-.adm.pi.se	PI.SE
-.stacken.kth.se	STACKEN.KTH.SE
-kth.se		KTH.SE
-.kth.se		KTH.SE
-.bion.kth.se	BION.KTH.SE
-.dsv.su.se	DSV.SU.SE
-.MIT.EDU ATHENA.MIT.EDU
-.MIT.EDU. ATHENA.MIT.EDU
-MIT.EDU ATHENA.MIT.EDU
-DODO.MIT.EDU SMS_TEST.MIT.EDU
-.UCSC.EDU CATS.UCSC.EDU
-.UCSC.EDU. CATS.UCSC.EDU
-CYGNUS.COM CYGNUS.COM
-.CYGNUS.COM CYGNUS.COM
-MIRKWOOD.CYGNUS.COM MIRKWOOD.CYGNUS.COM
-KITHRUP.COM KITHRUP.COM
-.KITHRUP.COM KITHRUP.COM
-.berkeley.edu   EECS.BERKELEY.EDU
-.CS.berkeley.edu        EECS.BERKELEY.EDU
-.MIT.EDU        ATHENA.MIT.EDU
-.mit.edu        ATHENA.MIT.EDU
-.BSDI.COM       BSDI.COM
-ARMADILLO.COM	ARMADILLO.COM
-.ARMADILLO.COM	ARMADILLO.COM
-ZEN.ORG		ZEN.ORG
-.ZEN.ORG	ZEN.ORG
-toad.com	TOAD.COM
-.toad.com	TOAD.COM
-lloyd.com	LLOYD.COM
-.lloyd.com	LLOYD.COM
diff --git a/crypto/kerberosIV/etc/login.access b/crypto/kerberosIV/etc/login.access
deleted file mode 100644
index f8116161af3a..000000000000
--- a/crypto/kerberosIV/etc/login.access
+++ /dev/null
@@ -1,54 +0,0 @@
-# Sample /etc/login.access file read by the login program
-#
-# Login access control table.
-# 
-# When someone logs in, the table is scanned for the first entry that
-# matches the (user, host) combination, or, in case of non-networked
-# logins, the first entry that matches the (user, tty) combination.  The
-# permissions field of that table entry determines whether the login will 
-# be accepted or refused.
-# 
-# Format of the login access control table is three fields separated by a
-# ":" character:
-# 
-# 	permission : users : origins
-# 
-# The first field should be a "+" (access granted) or "-" (access denied)
-# character. 
-#
-# The second field should be a list of one or more login names, group
-# names, or ALL (always matches). A pattern of the form user@host is
-# matched when the login name matches the "user" part, and when the
-# "host" part matches the local machine name.
-#
-# The third field should be a list of one or more tty names (for
-# non-networked logins), host names, domain names (begin with "."), host
-# addresses, internet network numbers (end with "."), ALL (always
-# matches) or LOCAL (matches any string that does not contain a "."
-# character).
-#
-# If you run NIS you can use @netgroupname in host or user patterns; this
-# even works for @usergroup@@hostgroup patterns. Weird.
-#
-# The EXCEPT operator makes it possible to write very compact rules.
-#
-# The group file is searched only when a name does not match that of the
-# logged-in user. Only groups are matched in which users are explicitly
-# listed: the program does not look at a user's primary group id value.
-#
-##############################################################################
-# 
-# Disallow console logins to all but a few accounts.
-#
--:ALL EXCEPT wheel shutdown sync:console
-#
-# Disallow non-local logins to privileged accounts (group wheel).
-#
--:wheel:ALL EXCEPT LOCAL .win.tue.nl
-#
-# Some accounts are not allowed to login from anywhere:
-#
--:wsbscaro wsbsecr wsbspac wsbsym wscosor wstaiwde:ALL
-#
-# All other accounts are allowed to login from anywhere.
-#
diff --git a/crypto/kerberosIV/etc/services.append b/crypto/kerberosIV/etc/services.append
deleted file mode 100644
index 8101e729b913..000000000000
--- a/crypto/kerberosIV/etc/services.append
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Kerberos
-#
-# $Id: services.append,v 1.11 1996/10/18 15:25:17 bg Exp $
-#
-kerberos-sec	88/udp				# Kerberos secondary port UDP
-kerberos-sec	88/tcp				# Kerberos secondary port TCP
-klogin		543/tcp				# Kerberos authenticated rlogin
-kshell		544/tcp		krcmd		# and remote shell
-ekshell		545/tcp		      # Kerberos encrypted remote shell -kfall
-ekshell2	2106/tcp	      # What U of Colorado @ Boulder uses?
-kerberos-iv	750/udp		kerberos kdc	# Kerberos authentication--udp
-kerberos-iv	750/tcp		kerberos kdc	# Kerberos authentication--tcp
-kerberos_master 751/udp				# Kerberos authentication
-kerberos_master 751/tcp				# Kerberos authentication
-krb_prop	754/tcp				# Kerberos slave propagation
-kpop		1109/tcp			# Pop with Kerberos
-eklogin		2105/tcp			# Kerberos encrypted rlogin
-rkinit		2108/tcp			# Kerberos remote kinit
-kx		2111/tcp			# X over kerberos
-kip		2112/tcp			# IP over kerberos
-kauth		2120/tcp			# Remote kauth
diff --git a/crypto/kerberosIV/include/Makefile.in b/crypto/kerberosIV/include/Makefile.in
deleted file mode 100644
index 5061c085c44a..000000000000
--- a/crypto/kerberosIV/include/Makefile.in
+++ /dev/null
@@ -1,147 +0,0 @@
-# $Id: Makefile.in,v 1.36 1997/05/20 18:58:39 bg Exp $
-
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-SHELL		= /bin/sh
-
-CC		= @CC@
-DEFS		= @DEFS@
-CFLAGS		= @CFLAGS@
-LD_FLAGS	= @LD_FLAGS@
-
-INSTALL		= @INSTALL@
-INSTALL_DATA	= @INSTALL_DATA@
-MKINSTALLDIRS	= @top_srcdir@/mkinstalldirs
-LN_S		= @LN_S@
-EXECSUFFIX	= @EXECSUFFIX@
-
-prefix		= @prefix@
-exec_prefix	= @exec_prefix@
-includedir	= @includedir@
-libdir		= @libdir@
-
-HAVE_ERR_H	= @ac_cv_header_err_h@
-
-@SET_MAKE@
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I. -I$(srcdir) $(CFLAGS) $(PICFLAGS) $<
-
-HEADERS = krb_err.h kadm_err.h acl.h com_err.h des.h kadm.h kafs.h \
-	  kdc.h klog.h krb.h krb_db.h prot.h otp.h sl.h ktypes.h
-
-KTYPES_OBJECTS = ktypes.o
-
-SOURCES = ktypes.c
-
-LOCL_HEADERS = roken.h protos.h resolve.h xdbm.h
-
-MAYBE_HEADERS = err.h
-
-SUBDIRS		= sys
-
-all: stamp-headers
-	for i in $(SUBDIRS); \
-	do (cd $$i && $(MAKE) $(MFLAGS) all); done
-
-Wall:
-	$(MAKE) CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
-
-ALL_INC =  com_err.h des.h kadm.h kafs.h kdc.h klog.h krb.h krb_db.h otp.h
-
-install:
-	$(MKINSTALLDIRS) $(includedir)
-	for x in $(HEADERS); \
-		do $(INSTALL_DATA) $$x $(includedir)/$$x; done
-	-if test "$(HAVE_ERR_H)" != yes; then \
-	  $(INSTALL_DATA) err.h $(includedir)/err.h; \
-	fi
-	for i in $(SUBDIRS); \
-	do (cd $$i && $(MAKE) $(MFLAGS) install); done
-
-uninstall:
-	for x in $(HEADERS); do \
-	  rm -f $(includedir)/$$x; \
-	done
-	-if test "$(HAVE_ERR_H)" != yes; then \
-	  rm -f $(includedir)/err.h; \
-	fi
-	for i in $(SUBDIRS); \
-	do (cd $$i && $(MAKE) $(MFLAGS) uninstall); done
-
-clean:
-	rm -f $(HEADERS) $(LOCL_HEADERS) $(MAYBE_HEADERS) *.o ktypes stamp-headers
-	for i in $(SUBDIRS); \
-	do (cd $$i && $(MAKE) $(MFLAGS) clean); done
-
-mostlyclean:	clean
-
-distclean:
-	$(MAKE) clean		
-	for i in $(SUBDIRS); \
-	do (cd $$i && $(MAKE) $(MFLAGS) distclean); done
-	rm -f Makefile config.status *~
-
-realclean:
-	for i in $(SUBDIRS); \
-	do (cd $$i && $(MAKE) $(MFLAGS) realclean); done
-
-err.h:
-	if test "$(HAVE_ERR_H)" != yes; then \
-	  $(LN_S) $(srcdir)/../lib/roken/err.h err.h; \
-	fi || true
-
-krb_err.h:
-	cd ../lib/krb && $(MAKE) krb_err.h
-	$(LN_S) ../lib/krb/krb_err.h .
-kadm_err.h:
-	cd ../lib/kadm && $(MAKE) kadm_err.h
-	$(LN_S) ../lib/kadm/kadm_err.h .
-acl.h:
-	$(LN_S) $(srcdir)/../lib/acl/acl.h .
-com_err.h:
-	$(LN_S) $(srcdir)/../util/et/com_err.h .
-des.h:
-	$(LN_S) $(srcdir)/../lib/des/des.h .
-kadm.h:
-	$(LN_S) $(srcdir)/../lib/kadm/kadm.h .
-kafs.h:
-	$(LN_S) $(srcdir)/../lib/kafs/kafs.h .
-kdc.h:
-	$(LN_S) $(srcdir)/../lib/kdb/kdc.h .
-klog.h:
-	$(LN_S) $(srcdir)/../lib/krb/klog.h .
-krb.h:
-	$(LN_S) $(srcdir)/../lib/krb/krb.h .
-resolve.h:
-	$(LN_S) $(srcdir)/../lib/krb/resolve.h .
-krb_db.h:
-	$(LN_S) $(srcdir)/../lib/kdb/krb_db.h .
-prot.h:
-	$(LN_S) $(srcdir)/../lib/krb/prot.h .
-
-protos.h:
-	$(LN_S) $(srcdir)/protos.H protos.h
-roken.h:
-	$(LN_S) $(srcdir)/../lib/roken/roken.h .
-xdbm.h:
-	$(LN_S) $(srcdir)/../lib/roken/xdbm.h .
-
-otp.h:
-	$(LN_S) $(srcdir)/../lib/otp/otp.h .
-
-sl.h:
-	$(LN_S) $(srcdir)/../lib/sl/sl.h .
-
-ktypes$(EXECSUFFIX):	$(KTYPES_OBJECTS)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(KTYPES_OBJECTS)
-
-ktypes.o: ktypes.c
-
-ktypes.h:	ktypes$(EXECSUFFIX)
-	./ktypes$(EXECSUFFIX) > $@
-
-stamp-headers: Makefile
-	$(MAKE) $(HEADERS) $(LOCL_HEADERS) $(MAYBE_HEADERS)
-	touch stamp-headers
diff --git a/crypto/kerberosIV/include/config.h.in b/crypto/kerberosIV/include/config.h.in
deleted file mode 100644
index 826dc76c3ed2..000000000000
--- a/crypto/kerberosIV/include/config.h.in
+++ /dev/null
@@ -1,984 +0,0 @@
-/* include/config.h.in.  Generated automatically from configure.in by autoheader.  */
-
-/* Define if using alloca.c.  */
-#undef C_ALLOCA
-
-/* Define to empty if the keyword does not work.  */
-#undef const
-
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
-   This function is required for alloca.c support on those systems.  */
-#undef CRAY_STACKSEG_END
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-#undef gid_t
-
-/* Define if you have alloca, as a function or macro.  */
-#undef HAVE_ALLOCA
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-#undef HAVE_ALLOCA_H
-
-/* Define if you have a working `mmap' system call.  */
-#undef HAVE_MMAP
-
-/* Define if your struct stat has st_blksize.  */
-#undef HAVE_ST_BLKSIZE
-
-/* Define to `long' if <sys/types.h> doesn't define.  */
-#undef off_t
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-#undef pid_t
-
-/* Define if you need to in order for stat and other things to work.  */
-#undef _POSIX_SOURCE
-
-/* Define as the return type of signal handlers (int or void).  */
-#undef RETSIGTYPE
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-#undef size_t
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-#undef STACK_DIRECTION
-
-/* Define if you have the ANSI C header files.  */
-#undef STDC_HEADERS
-
-/* Define if `sys_siglist' is declared by <signal.h>.  */
-#undef SYS_SIGLIST_DECLARED
-
-/* Define if you can safely include both <sys/time.h> and <time.h>.  */
-#undef TIME_WITH_SYS_TIME
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-#undef uid_t
-
-/* Define if your processor stores words with the most significant
-   byte first (like Motorola and SPARC, unlike Intel and VAX).  */
-#undef WORDS_BIGENDIAN
-
-/* Define if the X Window System is missing or not being used.  */
-#undef X_DISPLAY_MISSING
-
-/*  Define this if RETSIGTYPE == void  */
-#undef VOID_RETSIGTYPE
-
-/*  Define this if struct utmp have ut_user  */
-#undef HAVE_UT_USER
-
-/*  Define this if struct utmp have ut_host  */
-#undef HAVE_UT_HOST
-
-/*  Define this if struct utmp have ut_addr  */
-#undef HAVE_UT_ADDR
-
-/*  Define this if struct utmp have ut_type  */
-#undef HAVE_UT_TYPE
-
-/*  Define this if struct utmp have ut_pid  */
-#undef HAVE_UT_PID
-
-/*  Define this if struct utmp have ut_id  */
-#undef HAVE_UT_ID
-
-/*  Define this if struct utmpx have ut_syslen  */
-#undef HAVE_UT_SYSLEN
-
-/*  Define this if struct winsize is declared in sys/termios.h */
-#undef HAVE_STRUCT_WINSIZE
-
-/*  Define this if struct winsize have ws_xpixel */
-#undef HAVE_WS_XPIXEL
-
-/*  Define this if struct winsize have ws_ypixel */
-#undef HAVE_WS_YPIXEL
-
-/*  Define this to be the directory where the dictionary for cracklib */
-/*  resides */
-#undef DICTPATH
-
-/* Define this if you want to use SOCKS v5 */
-#undef SOCKS
-
-/* Define this to the path of the mail spool directory */
-#undef KRB4_MAILDIR
-
-/* Define this if `struct sockaddr' includes sa_len */
-#undef SOCKADDR_HAS_SA_LEN
-
-/* Define this if `struct siaentity' includes ouid */
-#undef SIAENTITY_HAS_OUID
-
-/* Define if getlogin has POSIX flavour, as opposed to BSD */
-#undef POSIX_GETLOGIN
-
-/* Define if getpwnam_r has POSIX flavour */
-#undef POSIX_GETPWNAM_R
-
-/* define if getcwd() is broken (such as in SunOS) */
-#undef BROKEN_GETCWD
-
-/* define if the system is missing a prototype for crypt() */
-#undef NEED_CRYPT_PROTO
-
-/* define if the system is missing a prototype for strtok_r() */
-#undef NEED_STRTOK_R_PROTO
-
-/* define if /bin/ls takes -A */
-#undef HAVE_LS_A
-
-/* define if you have h_errno */
-#undef HAVE_H_ERRNO
-
-/* define if you have h_errlist but not hstrerror */
-#undef HAVE_H_ERRLIST
-
-/* define if you have h_nerr but not hstrerror */
-#undef HAVE_H_NERR
-
-/* define if your system doesn't declare h_errlist */
-#undef HAVE_H_ERRLIST_DECLARATION
-
-/* define if your system doesn't declare h_nerr */
-#undef HAVE_H_NERR_DECLARATION
-
-/* define this if you need a declaration for h_errno */
-#undef HAVE_H_ERRNO_DECLARATION
-
-/* define if you need a declaration for optarg */
-#undef HAVE_OPTARG_DECLARATION
-
-/* define if you need a declaration for optind */
-#undef HAVE_OPTIND_DECLARATION
-
-/* define if you need a declaration for opterr */
-#undef HAVE_OPTERR_DECLARATION
-
-/* define if you need a declaration for optopt */
-#undef HAVE_OPTOPT_DECLARATION
-
-/* define if you need a declaration for __progname */
-#undef HAVE___PROGNAME_DECLARATION
-
-/* Define if you have the XauReadAuth function.  */
-#undef HAVE_XAUREADAUTH
-
-/* Define if you have the XauWriteAuth function.  */
-#undef HAVE_XAUWRITEAUTH
-
-/* Define if you have the _getpty function.  */
-#undef HAVE__GETPTY
-
-/* Define if you have the _scrsize function.  */
-#undef HAVE__SCRSIZE
-
-/* Define if you have the _setsid function.  */
-#undef HAVE__SETSID
-
-/* Define if you have the _stricmp function.  */
-#undef HAVE__STRICMP
-
-/* Define if you have the asnprintf function.  */
-#undef HAVE_ASNPRINTF
-
-/* Define if you have the asprintf function.  */
-#undef HAVE_ASPRINTF
-
-/* Define if you have the chown function.  */
-#undef HAVE_CHOWN
-
-/* Define if you have the daemon function.  */
-#undef HAVE_DAEMON
-
-/* Define if you have the dbm_firstkey function.  */
-#undef HAVE_DBM_FIRSTKEY
-
-/* Define if you have the dbopen function.  */
-#undef HAVE_DBOPEN
-
-/* Define if you have the dn_expand function.  */
-#undef HAVE_DN_EXPAND
-
-/* Define if you have the el_init function.  */
-#undef HAVE_EL_INIT
-
-/* Define if you have the err function.  */
-#undef HAVE_ERR
-
-/* Define if you have the errx function.  */
-#undef HAVE_ERRX
-
-/* Define if you have the fchmod function.  */
-#undef HAVE_FCHMOD
-
-/* Define if you have the fchown function.  */
-#undef HAVE_FCHOWN
-
-/* Define if you have the fcntl function.  */
-#undef HAVE_FCNTL
-
-/* Define if you have the flock function.  */
-#undef HAVE_FLOCK
-
-/* Define if you have the forkpty function.  */
-#undef HAVE_FORKPTY
-
-/* Define if you have the frevoke function.  */
-#undef HAVE_FREVOKE
-
-/* Define if you have the getattr function.  */
-#undef HAVE_GETATTR
-
-/* Define if you have the getcwd function.  */
-#undef HAVE_GETCWD
-
-/* Define if you have the getdtablesize function.  */
-#undef HAVE_GETDTABLESIZE
-
-/* Define if you have the gethostbyname function.  */
-#undef HAVE_GETHOSTBYNAME
-
-/* Define if you have the gethostname function.  */
-#undef HAVE_GETHOSTNAME
-
-/* Define if you have the getlogin function.  */
-#undef HAVE_GETLOGIN
-
-/* Define if you have the getopt function.  */
-#undef HAVE_GETOPT
-
-/* Define if you have the getpagesize function.  */
-#undef HAVE_GETPAGESIZE
-
-/* Define if you have the getpriority function.  */
-#undef HAVE_GETPRIORITY
-
-/* Define if you have the getpwnam_r function.  */
-#undef HAVE_GETPWNAM_R
-
-/* Define if you have the getservbyname function.  */
-#undef HAVE_GETSERVBYNAME
-
-/* Define if you have the getsockopt function.  */
-#undef HAVE_GETSOCKOPT
-
-/* Define if you have the getspnam function.  */
-#undef HAVE_GETSPNAM
-
-/* Define if you have the getspuid function.  */
-#undef HAVE_GETSPUID
-
-/* Define if you have the gettimeofday function.  */
-#undef HAVE_GETTIMEOFDAY
-
-/* Define if you have the getudbnam function.  */
-#undef HAVE_GETUDBNAM
-
-/* Define if you have the getuid function.  */
-#undef HAVE_GETUID
-
-/* Define if you have the getusershell function.  */
-#undef HAVE_GETUSERSHELL
-
-/* Define if you have the grantpt function.  */
-#undef HAVE_GRANTPT
-
-/* Define if you have the hstrerror function.  */
-#undef HAVE_HSTRERROR
-
-/* Define if you have the inet_aton function.  */
-#undef HAVE_INET_ATON
-
-/* Define if you have the initgroups function.  */
-#undef HAVE_INITGROUPS
-
-/* Define if you have the innetgr function.  */
-#undef HAVE_INNETGR
-
-/* Define if you have the iruserok function.  */
-#undef HAVE_IRUSEROK
-
-/* Define if you have the logout function.  */
-#undef HAVE_LOGOUT
-
-/* Define if you have the logwtmp function.  */
-#undef HAVE_LOGWTMP
-
-/* Define if you have the lstat function.  */
-#undef HAVE_LSTAT
-
-/* Define if you have the memmove function.  */
-#undef HAVE_MEMMOVE
-
-/* Define if you have the mkstemp function.  */
-#undef HAVE_MKSTEMP
-
-/* Define if you have the mktime function.  */
-#undef HAVE_MKTIME
-
-/* Define if you have the odm_initialize function.  */
-#undef HAVE_ODM_INITIALIZE
-
-/* Define if you have the ptsname function.  */
-#undef HAVE_PTSNAME
-
-/* Define if you have the putenv function.  */
-#undef HAVE_PUTENV
-
-/* Define if you have the rand function.  */
-#undef HAVE_RAND
-
-/* Define if you have the random function.  */
-#undef HAVE_RANDOM
-
-/* Define if you have the rcmd function.  */
-#undef HAVE_RCMD
-
-/* Define if you have the readline function.  */
-#undef HAVE_READLINE
-
-/* Define if you have the res_search function.  */
-#undef HAVE_RES_SEARCH
-
-/* Define if you have the revoke function.  */
-#undef HAVE_REVOKE
-
-/* Define if you have the setegid function.  */
-#undef HAVE_SETEGID
-
-/* Define if you have the setenv function.  */
-#undef HAVE_SETENV
-
-/* Define if you have the seteuid function.  */
-#undef HAVE_SETEUID
-
-/* Define if you have the setitimer function.  */
-#undef HAVE_SETITIMER
-
-/* Define if you have the setlim function.  */
-#undef HAVE_SETLIM
-
-/* Define if you have the setlogin function.  */
-#undef HAVE_SETLOGIN
-
-/* Define if you have the setpcred function.  */
-#undef HAVE_SETPCRED
-
-/* Define if you have the setpgid function.  */
-#undef HAVE_SETPGID
-
-/* Define if you have the setpriority function.  */
-#undef HAVE_SETPRIORITY
-
-/* Define if you have the setproctitle function.  */
-#undef HAVE_SETPROCTITLE
-
-/* Define if you have the setregid function.  */
-#undef HAVE_SETREGID
-
-/* Define if you have the setresgid function.  */
-#undef HAVE_SETRESGID
-
-/* Define if you have the setresuid function.  */
-#undef HAVE_SETRESUID
-
-/* Define if you have the setreuid function.  */
-#undef HAVE_SETREUID
-
-/* Define if you have the setsid function.  */
-#undef HAVE_SETSID
-
-/* Define if you have the setsockopt function.  */
-#undef HAVE_SETSOCKOPT
-
-/* Define if you have the setutent function.  */
-#undef HAVE_SETUTENT
-
-/* Define if you have the snprintf function.  */
-#undef HAVE_SNPRINTF
-
-/* Define if you have the socket function.  */
-#undef HAVE_SOCKET
-
-/* Define if you have the strcasecmp function.  */
-#undef HAVE_STRCASECMP
-
-/* Define if you have the strdup function.  */
-#undef HAVE_STRDUP
-
-/* Define if you have the strerror function.  */
-#undef HAVE_STRERROR
-
-/* Define if you have the strftime function.  */
-#undef HAVE_STRFTIME
-
-/* Define if you have the strlwr function.  */
-#undef HAVE_STRLWR
-
-/* Define if you have the strnlen function.  */
-#undef HAVE_STRNLEN
-
-/* Define if you have the strtok_r function.  */
-#undef HAVE_STRTOK_R
-
-/* Define if you have the strupr function.  */
-#undef HAVE_STRUPR
-
-/* Define if you have the swab function.  */
-#undef HAVE_SWAB
-
-/* Define if you have the syslog function.  */
-#undef HAVE_SYSLOG
-
-/* Define if you have the tgetent function.  */
-#undef HAVE_TGETENT
-
-/* Define if you have the ttyname function.  */
-#undef HAVE_TTYNAME
-
-/* Define if you have the ttyslot function.  */
-#undef HAVE_TTYSLOT
-
-/* Define if you have the ulimit function.  */
-#undef HAVE_ULIMIT
-
-/* Define if you have the uname function.  */
-#undef HAVE_UNAME
-
-/* Define if you have the unlockpt function.  */
-#undef HAVE_UNLOCKPT
-
-/* Define if you have the unsetenv function.  */
-#undef HAVE_UNSETENV
-
-/* Define if you have the vasnprintf function.  */
-#undef HAVE_VASNPRINTF
-
-/* Define if you have the vasprintf function.  */
-#undef HAVE_VASPRINTF
-
-/* Define if you have the verr function.  */
-#undef HAVE_VERR
-
-/* Define if you have the verrx function.  */
-#undef HAVE_VERRX
-
-/* Define if you have the vhangup function.  */
-#undef HAVE_VHANGUP
-
-/* Define if you have the vsnprintf function.  */
-#undef HAVE_VSNPRINTF
-
-/* Define if you have the vwarn function.  */
-#undef HAVE_VWARN
-
-/* Define if you have the vwarnx function.  */
-#undef HAVE_VWARNX
-
-/* Define if you have the warn function.  */
-#undef HAVE_WARN
-
-/* Define if you have the warnx function.  */
-#undef HAVE_WARNX
-
-/* Define if you have the yp_get_default_domain function.  */
-#undef HAVE_YP_GET_DEFAULT_DOMAIN
-
-/* Define if you have the <arpa/ftp.h> header file.  */
-#undef HAVE_ARPA_FTP_H
-
-/* Define if you have the <arpa/inet.h> header file.  */
-#undef HAVE_ARPA_INET_H
-
-/* Define if you have the <arpa/nameser.h> header file.  */
-#undef HAVE_ARPA_NAMESER_H
-
-/* Define if you have the <arpa/telnet.h> header file.  */
-#undef HAVE_ARPA_TELNET_H
-
-/* Define if you have the <bind/bitypes.h> header file.  */
-#undef HAVE_BIND_BITYPES_H
-
-/* Define if you have the <bsd/bsd.h> header file.  */
-#undef HAVE_BSD_BSD_H
-
-/* Define if you have the <bsdsetjmp.h> header file.  */
-#undef HAVE_BSDSETJMP_H
-
-/* Define if you have the <crypt.h> header file.  */
-#undef HAVE_CRYPT_H
-
-/* Define if you have the <dbm.h> header file.  */
-#undef HAVE_DBM_H
-
-/* Define if you have the <dirent.h> header file.  */
-#undef HAVE_DIRENT_H
-
-/* Define if you have the <err.h> header file.  */
-#undef HAVE_ERR_H
-
-/* Define if you have the <fcntl.h> header file.  */
-#undef HAVE_FCNTL_H
-
-/* Define if you have the <grp.h> header file.  */
-#undef HAVE_GRP_H
-
-/* Define if you have the <io.h> header file.  */
-#undef HAVE_IO_H
-
-/* Define if you have the <lastlog.h> header file.  */
-#undef HAVE_LASTLOG_H
-
-/* Define if you have the <login.h> header file.  */
-#undef HAVE_LOGIN_H
-
-/* Define if you have the <maillock.h> header file.  */
-#undef HAVE_MAILLOCK_H
-
-/* Define if you have the <ndbm.h> header file.  */
-#undef HAVE_NDBM_H
-
-/* Define if you have the <net/if.h> header file.  */
-#undef HAVE_NET_IF_H
-
-/* Define if you have the <net/if_tun.h> header file.  */
-#undef HAVE_NET_IF_TUN_H
-
-/* Define if you have the <net/if_var.h> header file.  */
-#undef HAVE_NET_IF_VAR_H
-
-/* Define if you have the <netdb.h> header file.  */
-#undef HAVE_NETDB_H
-
-/* Define if you have the <netinet/in.h> header file.  */
-#undef HAVE_NETINET_IN_H
-
-/* Define if you have the <netinet/in6_machtypes.h> header file.  */
-#undef HAVE_NETINET_IN6_MACHTYPES_H
-
-/* Define if you have the <netinet/in_systm.h> header file.  */
-#undef HAVE_NETINET_IN_SYSTM_H
-
-/* Define if you have the <netinet/ip.h> header file.  */
-#undef HAVE_NETINET_IP_H
-
-/* Define if you have the <netinet/tcp.h> header file.  */
-#undef HAVE_NETINET_TCP_H
-
-/* Define if you have the <paths.h> header file.  */
-#undef HAVE_PATHS_H
-
-/* Define if you have the <pty.h> header file.  */
-#undef HAVE_PTY_H
-
-/* Define if you have the <pwd.h> header file.  */
-#undef HAVE_PWD_H
-
-/* Define if you have the <resolv.h> header file.  */
-#undef HAVE_RESOLV_H
-
-/* Define if you have the <rpcsvc/dbm.h> header file.  */
-#undef HAVE_RPCSVC_DBM_H
-
-/* Define if you have the <sac.h> header file.  */
-#undef HAVE_SAC_H
-
-/* Define if you have the <security/pam_modules.h> header file.  */
-#undef HAVE_SECURITY_PAM_MODULES_H
-
-/* Define if you have the <shadow.h> header file.  */
-#undef HAVE_SHADOW_H
-
-/* Define if you have the <siad.h> header file.  */
-#undef HAVE_SIAD_H
-
-/* Define if you have the <signal.h> header file.  */
-#undef HAVE_SIGNAL_H
-
-/* Define if you have the <stropts.h> header file.  */
-#undef HAVE_STROPTS_H
-
-/* Define if you have the <sys/bitypes.h> header file.  */
-#undef HAVE_SYS_BITYPES_H
-
-/* Define if you have the <sys/category.h> header file.  */
-#undef HAVE_SYS_CATEGORY_H
-
-/* Define if you have the <sys/cdefs.h> header file.  */
-#undef HAVE_SYS_CDEFS_H
-
-/* Define if you have the <sys/file.h> header file.  */
-#undef HAVE_SYS_FILE_H
-
-/* Define if you have the <sys/filio.h> header file.  */
-#undef HAVE_SYS_FILIO_H
-
-/* Define if you have the <sys/ioccom.h> header file.  */
-#undef HAVE_SYS_IOCCOM_H
-
-/* Define if you have the <sys/ioctl.h> header file.  */
-#undef HAVE_SYS_IOCTL_H
-
-/* Define if you have the <sys/locking.h> header file.  */
-#undef HAVE_SYS_LOCKING_H
-
-/* Define if you have the <sys/mman.h> header file.  */
-#undef HAVE_SYS_MMAN_H
-
-/* Define if you have the <sys/param.h> header file.  */
-#undef HAVE_SYS_PARAM_H
-
-/* Define if you have the <sys/proc.h> header file.  */
-#undef HAVE_SYS_PROC_H
-
-/* Define if you have the <sys/ptyio.h> header file.  */
-#undef HAVE_SYS_PTYIO_H
-
-/* Define if you have the <sys/ptyvar.h> header file.  */
-#undef HAVE_SYS_PTYVAR_H
-
-/* Define if you have the <sys/resource.h> header file.  */
-#undef HAVE_SYS_RESOURCE_H
-
-/* Define if you have the <sys/select.h> header file.  */
-#undef HAVE_SYS_SELECT_H
-
-/* Define if you have the <sys/socket.h> header file.  */
-#undef HAVE_SYS_SOCKET_H
-
-/* Define if you have the <sys/sockio.h> header file.  */
-#undef HAVE_SYS_SOCKIO_H
-
-/* Define if you have the <sys/stat.h> header file.  */
-#undef HAVE_SYS_STAT_H
-
-/* Define if you have the <sys/str_tty.h> header file.  */
-#undef HAVE_SYS_STR_TTY_H
-
-/* Define if you have the <sys/stream.h> header file.  */
-#undef HAVE_SYS_STREAM_H
-
-/* Define if you have the <sys/stropts.h> header file.  */
-#undef HAVE_SYS_STROPTS_H
-
-/* Define if you have the <sys/strtty.h> header file.  */
-#undef HAVE_SYS_STRTTY_H
-
-/* Define if you have the <sys/syscall.h> header file.  */
-#undef HAVE_SYS_SYSCALL_H
-
-/* Define if you have the <sys/sysctl.h> header file.  */
-#undef HAVE_SYS_SYSCTL_H
-
-/* Define if you have the <sys/termio.h> header file.  */
-#undef HAVE_SYS_TERMIO_H
-
-/* Define if you have the <sys/time.h> header file.  */
-#undef HAVE_SYS_TIME_H
-
-/* Define if you have the <sys/timeb.h> header file.  */
-#undef HAVE_SYS_TIMEB_H
-
-/* Define if you have the <sys/times.h> header file.  */
-#undef HAVE_SYS_TIMES_H
-
-/* Define if you have the <sys/tty.h> header file.  */
-#undef HAVE_SYS_TTY_H
-
-/* Define if you have the <sys/types.h> header file.  */
-#undef HAVE_SYS_TYPES_H
-
-/* Define if you have the <sys/uio.h> header file.  */
-#undef HAVE_SYS_UIO_H
-
-/* Define if you have the <sys/un.h> header file.  */
-#undef HAVE_SYS_UN_H
-
-/* Define if you have the <sys/utsname.h> header file.  */
-#undef HAVE_SYS_UTSNAME_H
-
-/* Define if you have the <sys/wait.h> header file.  */
-#undef HAVE_SYS_WAIT_H
-
-/* Define if you have the <syslog.h> header file.  */
-#undef HAVE_SYSLOG_H
-
-/* Define if you have the <termio.h> header file.  */
-#undef HAVE_TERMIO_H
-
-/* Define if you have the <termios.h> header file.  */
-#undef HAVE_TERMIOS_H
-
-/* Define if you have the <tmpdir.h> header file.  */
-#undef HAVE_TMPDIR_H
-
-/* Define if you have the <ttyent.h> header file.  */
-#undef HAVE_TTYENT_H
-
-/* Define if you have the <udb.h> header file.  */
-#undef HAVE_UDB_H
-
-/* Define if you have the <ulimit.h> header file.  */
-#undef HAVE_ULIMIT_H
-
-/* Define if you have the <unistd.h> header file.  */
-#undef HAVE_UNISTD_H
-
-/* Define if you have the <userpw.h> header file.  */
-#undef HAVE_USERPW_H
-
-/* Define if you have the <usersec.h> header file.  */
-#undef HAVE_USERSEC_H
-
-/* Define if you have the <util.h> header file.  */
-#undef HAVE_UTIL_H
-
-/* Define if you have the <utime.h> header file.  */
-#undef HAVE_UTIME_H
-
-/* Define if you have the <utmp.h> header file.  */
-#undef HAVE_UTMP_H
-
-/* Define if you have the <utmpx.h> header file.  */
-#undef HAVE_UTMPX_H
-
-/* Define if you have the <wait.h> header file.  */
-#undef HAVE_WAIT_H
-
-/* Define if you have the <winsock.h> header file.  */
-#undef HAVE_WINSOCK_H
-
-/* Define if you have the X11 library (-lX11).  */
-#undef HAVE_LIBX11
-
-/* Define if you have the Xau library (-lXau).  */
-#undef HAVE_LIBXAU
-
-/* Define if you have the c_r library (-lc_r).  */
-#undef HAVE_LIBC_R
-
-/* Define if you have the cfg library (-lcfg).  */
-#undef HAVE_LIBCFG
-
-/* Define if you have the edit library (-ledit).  */
-#undef HAVE_LIBEDIT
-
-/* Define if you have the gdbm library (-lgdbm).  */
-#undef HAVE_LIBGDBM
-
-/* Define if you have the ndbm library (-lndbm).  */
-#undef HAVE_LIBNDBM
-
-/* Define if you have the nsl library (-lnsl).  */
-#undef HAVE_LIBNSL
-
-/* Define if you have the odm library (-lodm).  */
-#undef HAVE_LIBODM
-
-/* Define if you have the readline library (-lreadline).  */
-#undef HAVE_LIBREADLINE
-
-/* Define if you have the resolv library (-lresolv).  */
-#undef HAVE_LIBRESOLV
-
-/* Define if you have the s library (-ls).  */
-#undef HAVE_LIBS
-
-/* Define if you have the socket library (-lsocket).  */
-#undef HAVE_LIBSOCKET
-
-/* Define if you have the syslog library (-lsyslog).  */
-#undef HAVE_LIBSYSLOG
-
-/* Define if you have the termcap library (-ltermcap).  */
-#undef HAVE_LIBTERMCAP
-
-/* Define if you have the util library (-lutil).  */
-#undef HAVE_LIBUTIL
-
-#undef HAVE_INT8_T
-#undef HAVE_INT16_T
-#undef HAVE_INT32_T
-#undef HAVE_INT64_T
-#undef HAVE_U_INT8_T
-#undef HAVE_U_INT16_T
-#undef HAVE_U_INT32_T
-#undef HAVE_U_INT64_T
-
-#define RCSID(msg) \
-static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
-
-/*
- * Set ORGANIZATION to be the desired organization string printed
- * by the 'kinit' program.  It may have spaces.
- */
-#define ORGANIZATION "eBones International"
-
-#if 0
-#undef BINDIR 
-#undef LIBDIR
-#undef LIBEXECDIR
-#undef SBINDIR
-#endif
-
-#if 0
-#define KRB_CNF_FILES	{ "/etc/krb.conf",   "/etc/kerberosIV/krb.conf", 0}
-#define KRB_RLM_FILES	{ "/etc/krb.realms", "/etc/kerberosIV/krb.realms", 0}
-#define KRB_EQUIV	"/etc/krb.equiv"
-
-#define KEYFILE		"/etc/srvtab"
-
-#define KRBDIR		"/var/kerberos"
-#define DBM_FILE	KRBDIR "/principal"
-#define DEFAULT_ACL_DIR	KRBDIR
-
-#define KRBLOG		"/var/log/kerberos.log"	/* master server  */
-#define KRBSLAVELOG	"/var/log/kerberos_slave.log" /* slave server  */
-#define KADM_SYSLOG	"/var/log/admin_server.syslog"
-#define K_LOGFIL	"/var/log/kpropd.log"
-#endif
-
-/* Maximum values on all known systems */
-#define MaxHostNameLen (64+4)
-#define MaxPathLen (1024+4)
-
-/*
- * Define NDBM if you are using the 4.3 ndbm library (which is part of
- * libc).  If not defined, 4.2 dbm will be assumed.
- */
-#if defined(HAVE_DBM_FIRSTKEY)
-#define NDBM
-#endif
-
-/* ftp stuff -------------------------------------------------- */
-
-#define KERBEROS
-
-/* telnet stuff ----------------------------------------------- */
-
-/* define this if you have kerberos 4 */
-#undef KRB4
-
-/* define this if you want encryption */
-#undef ENCRYPTION
-
-/* define this if you want authentication */
-#undef AUTHENTICATION
-
-#if defined(ENCRYPTION) && !defined(AUTHENTICATION)
-#define AUTHENTICATION 1
-#endif
-
-/* Set this if you want des encryption */
-#undef DES_ENCRYPTION
-
-/* Set this to the default system lead string for telnetd 
- * can contain %-escapes: %s=sysname, %m=machine, %r=os-release
- * %v=os-version, %t=tty, %h=hostname, %d=date and time
- */
-#undef USE_IM
-
-/* define this if you want diagnostics in telnetd */
-#undef DIAGNOSTICS
-
-/* define this if you want support for broken ENV_{VALUE,VAR} systems  */
-#undef ENV_HACK
-
-/*  */
-#undef OLD_ENVIRON
-
-/* Used with login -p */
-#undef LOGIN_ARGS
-
-/* Define if there are working stream ptys */
-#undef STREAMSPTY
-
-/* set this to a sensible login */
-#ifndef LOGIN_PATH
-#define LOGIN_PATH BINDIR "/login"
-#endif
-
-
-/* ------------------------------------------------------------ */
-
-/*
- * Define this if your ndbm-library really is berkeley db and creates
- * files that ends in .db.
- */
-#undef HAVE_NEW_DB
-
-/* Define this if you have a working getmsg */
-#undef HAVE_GETMSG
-
-/* Define to enable new master key code */
-#undef RANDOM_MKEY
-
-/* Location of the master key file, default value lives in <kdc.h> */
-#undef MKEYFILE
-
-/* Define if you don't want support for afs, might be a good idea on
-   AIX if you don't have afs */
-#undef NO_AFS
-
-/* Define if you have a readline compatible library */
-#undef HAVE_READLINE
-
-#ifdef VOID_RETSIGTYPE
-#define SIGRETURN(x) return
-#else
-#define SIGRETURN(x) return (RETSIGTYPE)(x)
-#endif
-
-/* Define this if your compiler supports '#pragma weak' */
-#undef HAVE_PRAGMA_WEAK
-
-/* Temporary fixes for krb_{rd,mk}_safe */
-#define DES_QUAD_GUESS 0
-#define DES_QUAD_NEW 1
-#define DES_QUAD_OLD 2
-
-/* Set this to one of the constants above to specify default checksum
-   type to emit */
-#undef DES_QUAD_DEFAULT
-
-/*
- * AIX braindamage!
- */
-#if _AIX
-#define _ALL_SOURCE
-#define _POSIX_SOURCE
-/* this is left for hysteric reasons :-) */
-#define unix /* well, ok... */
-#endif
-
-/*
- * SunOS braindamage! (Sun include files are generally braindead)
- */
-#if (defined(sun) || defined(__sun))
-#if defined(__svr4__) || defined(__SVR4)
-#define SunOS 5
-#else
-#define SunOS 4
-#endif
-#endif
-
-#if defined(__sgi) || defined(sgi)
-#if defined(__SYSTYPE_SVR4) || defined(_SYSTYPE_SVR4)
-#define IRIX 5
-#else
-#define IRIX 4
-#endif
-#endif
-
-/* IRIX 4 braindamage */
-#if IRIX == 4 && !defined(__STDC__)
-#define __STDC__ 0
-#endif
diff --git a/crypto/kerberosIV/include/ktypes.c b/crypto/kerberosIV/include/ktypes.c
deleted file mode 100644
index eb6ad48c67ad..000000000000
--- a/crypto/kerberosIV/include/ktypes.c
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: ktypes.c,v 1.4 1997/05/31 08:52:09 bg Exp $");
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-#ifdef HAVE_BIND_BITYPES_H
-#include <bind/bitypes.h>
-#endif
-#ifdef HAVE_NETINET_IN6_MACHTYPES_H
-#include <netinet/in6_machtypes.h>
-#endif
-
-int
-main(void)
-{
-    printf ("/*\n"
-	    " * This file was automatically generated by\n"
-	    " * $Id: ktypes.c,v 1.4 1997/05/31 08:52:09 bg Exp $.\n"
-	    " * Please do not edit\n"
-	    " */\n\n");
-
-    printf ("#ifndef __KTYPES_H__\n"
-	    "#define __KTYPES_H__\n\n");
-
-#ifdef HAVE_SYS_TYPES_H
-    printf("#include <sys/types.h>\n");
-#endif
-#ifdef HAVE_SYS_BITYPES_H
-    printf("#include <sys/bitypes.h>\n");
-#endif
-#ifdef HAVE_BIND_BITYPES_H
-    printf("#include <bind/bitypes.h>\n");
-#endif
-#ifdef HAVE_NETINET_IN6_MACHTYPES_H
-    printf("#include <netinet/in6_machtypes.h>\n");
-#endif
-    
-#ifndef HAVE_INT8_T
-    printf("typedef signed char int8_t;\n");
-#endif
-#ifndef HAVE_U_INT8_T
-    printf("typedef unsigned char u_int8_t;\n");
-#endif
-#ifndef HAVE_INT16_T
-    printf("typedef short int16_t;\n");
-#endif
-#ifndef HAVE_U_INT16_T
-    printf("typedef unsigned short u_int16_t;\n");
-#endif
-#ifndef HAVE_INT32_T
-    printf("typedef int int32_t;\n");
-#endif
-#ifndef HAVE_U_INT32_T
-    printf("typedef unsigned int u_int32_t;\n");
-#endif
-
-    printf("\n#endif /* __KTYPES_H__ */\n");
-    return 0;
-}
diff --git a/crypto/kerberosIV/include/protos.h b/crypto/kerberosIV/include/protos.h
deleted file mode 100644
index 0ceb122f2771..000000000000
--- a/crypto/kerberosIV/include/protos.h
+++ /dev/null
@@ -1,276 +0,0 @@
-/* -*- C -*-
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Add here functions that don't have a prototype on your system.
- *
- * $Id: protos.H,v 1.43 1997/05/28 01:09:36 assar Exp $
- */
-
-#ifdef NEED_CRYPT_PROTO
-char *crypt(const char*, const char*);
-#endif
-
-#ifdef NEED_STRTOK_R_PROTO
-char *strtok_r (char *s1, const char *s2, char **lasts);
-#endif
-
-#ifndef HAVE_OPTARG_DECLARATION
-extern char *optarg;
-#endif
-#ifndef HAVE_OPTERR_DECLARATION
-extern int opterr;
-#endif
-#ifndef HAVE_OPTIND_DECLARATION
-extern int optind;
-#endif
-#ifndef HAVE_OPTOPT_DECLARATION
-extern int optopt;
-#endif
-
-#if defined(__GNUC__) && SunOS == 4
-
-/* To get type fd_set */
-#include <sys/types.h>
-#include <sys/time.h>
-
-/* To get struct sockaddr, struct in_addr and struct hostent */
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-
-/* To get struct stat */
-#include <sys/stat.h>
-
-/* To get struct utimbuf */
-#include <utime.h>
-
-int utime(const char *, struct utimbuf *);
-int syscall(int, ...);
-pid_t getpid(void);
-int ftruncate(int, off_t);
-int fchmod(int, mode_t);
-int fchown(int fd, int owner, int group);
-int fsync(int);
-int seteuid(uid_t);
-int setreuid(int, int);
-int flock(int, int);
-int gettimeofday(struct timeval *tp, struct timezone *tzp);
-int lstat(const char *, struct stat *);
-int ioctl(int, int, void *); 
-int getpriority(int which, int who);
-int setpriority(int which, int who, int priority);
-int getdtablesize(void);
-int initgroups(const char *name, int basegid);
-long ulimit(int cmd, long newlimit);
-int vhangup(void);
-
-int sigblock(int);
-int sigsetmask(int);
-int setitimer(int which, struct itimerval *value, struct itimerval *ovalue);
-
-int munmap(caddr_t addr, int len);
-
-int socket(int, int, int);
-int setsockopt(int, int, int, void *, int);
-int bind(int, void *, int);
-int getsockname(int, struct sockaddr *, int *);
-int accept(int, struct sockaddr *, int *);
-int connect(int, struct sockaddr *, int);
-int listen(int, int);
-int recv(int s, void *buf, int len, int flags);
-int recvfrom(int, char *, int, int, void *, int *);
-int sendto(int, const char *, int, int, void *, int);
-int select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
-int shutdown(int, int);
-int getpeername(int, struct sockaddr *, int *);
-int getsockopt(int, int, int, void *, int *);
-int send(int s, const void *msg, int len, int flags);
-struct strbuf;
-int getmsg(int fd, struct strbuf *ctlptr, struct strbuf *dataptr, int *flags);
-
-char *inet_ntoa(struct in_addr in);
-unsigned long inet_addr(const char *cp);
-int gethostname(char *, int);
-struct hostent *gethostbyname(const char *);
-int dn_expand(const u_char *msg,
-	      const u_char *eomorig,
-	      const u_char *comp_dn,
-	      char *exp_dn,
-	      int length);
-int res_search(const char *dname,
-	       int class,
-	       int type,
-	       u_char *answer,
-	       int anslen);
-
-int yp_get_default_domain (char **outdomain);
-int innetgr(const char *netgroup, const char *machine,
-	    const char *user, const char *domain);
-
-char *getwd(char *pathname);
-
-void bzero(char *b, int length);
-int strcasecmp(const char *, const char *);
-void swab(const char *, char *, int);
-int atoi(const char *str);
-char *mktemp(char *);
-void srandom(int seed);
-int random(void);
-
-int rcmd(char **, unsigned short, char *, char *, char *, int *);
-int rresvport(int *);
-int openlog(const char *ident, int logopt, int facility);
-int syslog(int priority, const char *message, ...);
-int ttyslot(void);
-
-char *getpass(const char *);
-
-char *getusershell(void);
-void setpwent();
-void endpwent();
-
-#include <stdio.h>
-int fclose(FILE *);
-
-#endif /* SunOS4 */
-
-#if SunOS == 5
-
-#include <sys/types.h>
-#include <sys/resource.h>
-
-char *getusershell(void);
-char *strtok_r(char *, const char *, char **);
-int getpriority (int which, id_t who);
-int setpriority (int which, id_t who, int prio);
-int getdtablesize (void);
-char *getusershell(void);
-void setusershell(void);
-void endusershell(void);
-
-#if defined(__GNUC__)
-
-int syscall(int, ...);
-int gethostname(char *, int);
-
-struct timeval;
-int gettimeofday(struct timeval *tp, void *);
-
-#endif
-#endif
-
-#if defined(__osf__) /* OSF/1 */
-
-#if 0
-/* To get type fd_set */
-#include <sys/types.h>
-#include <sys/time.h>
-
-int select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
-int fsync(int fildes);
-int gethostname(char *address, int address_len);
-int setreuid(int ruid, int euid);
-int ioctl(int d, unsigned long request, void * arg);
-#endif
-int flock(int fildes, int operation);
-int syscall(int, ...);
-
-unsigned short htons(unsigned short hostshort);
-unsigned int   htonl(unsigned int hostint);
-unsigned short ntohs(unsigned short netshort);
-unsigned int   ntohl(unsigned int netint);
-
-char *mktemp(char *template);
-char *getusershell(void);
-
-int rcmd(char **, unsigned short, char *, char *, char *, int *);
-int rresvport (int *port);
-
-#endif /* OSF/1 */
-
-#if defined(__sgi)
-#include <sys/types.h>
-
-char *ptsname(int fd);
-struct spwd *getspuid(uid_t);
-#endif /* IRIX */
-
-#if defined(__GNUC__) && defined(_AIX) /* AIX */
-
-struct timeval;
-struct timezone;
-int gettimeofday (struct timeval *Tp, void *Tzp);
-
-#endif /* AIX */
-
-#if defined(__GNUC__) && defined(__hpux) /* HP-UX */
-
-int syscall(int, ...);
-
-int vhangup(void);
-
-char *ptsname(int fildes);
-
-void utmpname(const char *file);
-
-int innetgr(const char *netgroup, const char *machine,
-	    const char *user, const char *domain);
-
-int dn_comp(char *exp_dn, char *comp_dn, int length,
-	    char **dnptrs, char **lastdnptr);
-
-int res_query(char *dname, int class, int type,
-	      unsigned char *answer, int anslen);
-
-int dn_expand(char *msg, char *eomorig, char *comp_dn,
-	      char *exp_dn, int length);
-
-int res_search(char *dname, int class, int type,
-	       unsigned char *answer, int anslen);
-
-#endif /* HP-UX */
-
-#if defined(WIN32)	/* Visual C++ 4.0 (Windows95/NT) */
-
-int open(const char *, int, ...);
-int close(int);
-int	read(int, void *, unsigned int);
-int write(int, const void *, unsigned int);
-
-#endif /* WIN32 */
diff --git a/crypto/kerberosIV/include/sys/Makefile.in b/crypto/kerberosIV/include/sys/Makefile.in
deleted file mode 100644
index d6a58e01cd87..000000000000
--- a/crypto/kerberosIV/include/sys/Makefile.in
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: Makefile.in,v 1.18 1997/05/11 04:29:47 assar Exp $
-
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-SHELL		= /bin/sh
-
-LN_S		= @LN_S@
-INSTALL		= @INSTALL@
-INSTALL_DATA	= @INSTALL_DATA@
-MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
-
-prefix		= @prefix@
-includedir	= @includedir@
-HAVE_CDEFS	= @ac_cv_header_sys_cdefs_h@
-
-@SET_MAKE@
-
-HEADERS = cdefs.h
-
-all: stamp-headers
-
-Wall:
-	$(MAKE) CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
-
-install: all
-	$(MKINSTALLDIRS) $(includedir)/sys
-	-if test "$(HAVE_CDEFS)" != yes; then \
-	  $(INSTALL_DATA) cdefs.h $(includedir)/sys/cdefs.h ; \
-	fi
-
-uninstall:
-	-if test "$(HAVE_CDEFS)" != yes; then \
-	  rm -f $(includedir)/sys/cdefs.h ; \
-	fi
-
-clean:
-	rm -f $(HEADERS) stamp-headers
-
-mostlyclean:	clean
-distclean:	clean
-	rm -f Makefile config.status *~
-
-realclean:	clean
-
-cdefs.h:
-	if test "$(HAVE_CDEFS)" != yes; then \
-	  $(LN_S) ${srcdir}/cdefs.H cdefs.h; \
-	fi || true
-
-stamp-headers:
-	$(MAKE) $(HEADERS)
-	touch stamp-headers
diff --git a/crypto/kerberosIV/include/sys/cdefs.H b/crypto/kerberosIV/include/sys/cdefs.H
deleted file mode 100644
index 196d476651db..000000000000
--- a/crypto/kerberosIV/include/sys/cdefs.H
+++ /dev/null
@@ -1,149 +0,0 @@
-/* -*- C -*-
- *
- * ++Copyright++ 1991, 1993
- * -
- * Copyright (c) 1991, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-/*
- *	@(#)cdefs.h	8.1 (Berkeley) 6/2/93
- *	$Id: cdefs.H,v 1.2 1995/09/10 20:18:56 d91-jda Exp $
- */
-
-#ifndef	_CDEFS_H_
-#define	_CDEFS_H_
-
-#if defined(__cplusplus)
-#define	__BEGIN_DECLS	extern "C" {
-#define	__END_DECLS	};
-#else
-#define	__BEGIN_DECLS
-#define	__END_DECLS
-#endif
-
-/*
- * The __CONCAT macro is used to concatenate parts of symbol names, e.g.
- * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo.
- * The __CONCAT macro is a bit tricky -- make sure you don't put spaces
- * in between its arguments.  __CONCAT can also concatenate double-quoted
- * strings produced by the __STRING macro, but this only works with ANSI C.
- */
-#if defined(__STDC__) || defined(__cplusplus)
-#ifndef __P /* it's quite popular to define this */
-#define	__P(protos)	protos		/* full-blown ANSI C */
-#endif
-#define	__CONCAT(x,y)	x ## y
-#define	__STRING(x)	#x
-
-#define	__const		const		/* define reserved names to standard */
-#define	__signed	signed
-#define	__volatile	volatile
-#if defined(__cplusplus)
-#define	__inline	inline		/* convert to C++ keyword */
-#else
-#ifndef __GNUC__
-#define	__inline			/* delete GCC keyword */
-#endif /* !__GNUC__ */
-#endif /* !__cplusplus */
-
-#else	/* !(__STDC__ || __cplusplus) */
-#ifndef __P
-#define	__P(protos)	()		/* traditional C preprocessor */
-#endif
-#define	__CONCAT(x,y)	x/**/y
-#define	__STRING(x)	"x"
-
-#ifndef __GNUC__
-#define	__const				/* delete pseudo-ANSI C keywords */
-#define	__inline
-#define	__signed
-#define	__volatile
-/*
- * In non-ANSI C environments, new programs will want ANSI-only C keywords
- * deleted from the program and old programs will want them left alone.
- * When using a compiler other than gcc, programs using the ANSI C keywords
- * const, inline etc. as normal identifiers should define -DNO_ANSI_KEYWORDS.
- * When using "gcc -traditional", we assume that this is the intent; if
- * __GNUC__ is defined but __STDC__ is not, we leave the new keywords alone.
- */
-#ifndef	NO_ANSI_KEYWORDS
-#define	const				/* delete ANSI C keywords */
-#define	inline
-#define	signed
-#define	volatile
-#endif
-#endif	/* !__GNUC__ */
-#endif	/* !(__STDC__ || __cplusplus) */
-
-/*
- * GCC1 and some versions of GCC2 declare dead (non-returning) and
- * pure (no side effects) functions using "volatile" and "const";
- * unfortunately, these then cause warnings under "-ansi -pedantic".
- * GCC2 uses a new, peculiar __attribute__((attrs)) style.  All of
- * these work for GNU C++ (modulo a slight glitch in the C++ grammar
- * in the distribution version of 2.5.5).
- */
-#if !defined(__GNUC__) || __GNUC__ < 2 || __GNUC_MINOR__ < 5
-#define	__attribute__(x)	/* delete __attribute__ if non-gcc or gcc1 */
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-#define	__dead		__volatile
-#define	__pure		__const
-#endif
-#endif
-
-/* Delete pseudo-keywords wherever they are not available or needed. */
-#ifndef __dead
-#define	__dead
-#define	__pure
-#endif
-
-#endif /* !_CDEFS_H_ */
diff --git a/crypto/kerberosIV/kadmin/Design.txt b/crypto/kerberosIV/kadmin/Design.txt
deleted file mode 100644
index 7763a04f4967..000000000000
--- a/crypto/kerberosIV/kadmin/Design.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-// This file attempts to present the internal functioning of the new kerberos
-// admin server and interface..
-
-//
-// The calling side
-//
-
-// Outer interface (programmers interface)
-kadm_mod_entry(vals *old_dat, vals *new_dat) returns (vals *cur_dat)
-    // sends a command telling the server to change all entries which match
-    //   old_dat to entries matching new_dat
-    // returns in cur_dat the actual current values of the modified records
-    // implemented with calls to _vals_to_stream, _send_out, _take_in, and
-    //   _stream_to_vals, _interpret_ret
-
-// Inner calls
-_vals_to_stream (vals *, unsigned char *)
-    // converts a vals structure to a byte stream for transmission over the net
-
-_stream_to_vals (unsigned char *, vals *)
-    // converts a byte stream recieved into a vals structure
-
-
diff --git a/crypto/kerberosIV/kadmin/Makefile.in b/crypto/kerberosIV/kadmin/Makefile.in
deleted file mode 100644
index 947248ecd54f..000000000000
--- a/crypto/kerberosIV/kadmin/Makefile.in
+++ /dev/null
@@ -1,125 +0,0 @@
-# $Id: Makefile.in,v 1.37 1997/05/02 17:50:35 assar Exp $
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-topdir=..
-
-CC = @CC@
-AR = ar
-RANLIB = @RANLIB@
-LN_S = @LN_S@
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-LD_FLAGS = @LD_FLAGS@
-
-LIB_tgetent = @LIB_tgetent@
-LIB_readline = @LIB_readline@
-LIB_DBM = @LIB_DBM@
-LIBS = @LIBS@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
-
-CRACKLIB = @CRACKLIB@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-libdir = @libdir@
-libexecdir = @libexecdir@
-bindir = @bindir@
-sbindir = @sbindir@
-transform=@program_transform_name@
-EXECSUFFIX=@EXECSUFFIX@
-
-PROG_BIN	= kpasswd$(EXECSUFFIX) \
-		  kadmin$(EXECSUFFIX)
-PROG_SBIN	= ksrvutil$(EXECSUFFIX)
-PROG_LIBEXEC	= kadmind$(EXECSUFFIX)
-PROGS = $(PROG_BIN) $(PROG_SBIN) $(PROG_LIBEXEC)
-
-SOURCES = kpasswd.c kadmin.c kadm_server.c kadm_funcs.c pw_check.c \
-          admin_server.c kadm_ser_wrap.c ksrvutil.c ksrvutil_get.c \
-	  new_pwd.c
-
-OBJECTS = kpasswd.o kadmin.o kadm_server.o kadm_funcs.o \
-          admin_server.o kadm_ser_wrap.o ksrvutil.o ksrvutil_get.o \
-	  new_pwd.o
-
-all: $(PROGS)
-
-Wall:
-	make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../include -I$(srcdir) $(CFLAGS) $<
-
-install: all
-	$(MKINSTALLDIRS) $(bindir)
-	for x in $(PROG_BIN); do \
-	  $(INSTALL_PROGRAM) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \
-	done
-	$(MKINSTALLDIRS) $(sbindir)
-	for x in $(PROG_SBIN); do \
-	  $(INSTALL_PROGRAM) $$x $(sbindir)/`echo $$x | sed '$(transform)'`; \
-	done
-	$(MKINSTALLDIRS) $(libexecdir)
-	for x in $(PROG_LIBEXEC); do \
-	  $(INSTALL_PROGRAM) $$x $(libexecdir)/`echo $$x | sed '$(transform)'`; \
-	done
-	@rm -f $(prefix)/sbin/kadmin
-
-uninstall:
-	for x in $(PROG_BIN); do \
-	  rm -f $(bindir)/`echo $$x | sed '$(transform)'`; \
-	done
-	for x in $(PROG_SBIN); do \
-	  rm -f $(sbindir)/`echo $$x | sed '$(transform)'`; \
-	done
-	for x in $(PROG_LIBEXEC); do \
-	  rm -f $(libexecdir)/`echo $$x | sed '$(transform)'`; \
-	done
-
-TAGS: $(SOURCES)
-	etags $(SOURCES)
-
-check:
-
-clean:
-	rm -f *.a *.o $(PROGS)
-
-mostlyclean: clean
-
-distclean: clean
-	rm -f Makefile *.tab.c *~
-
-realclean: distclean
-	rm -f TAGS
-
-dist: $(DISTFILES)
-	for file in $(DISTFILES); do \
-	  ln $$file ../`cat ../.fname`/lib \
-	    || cp -p $$file ../`cat ../.fname`/lib; \
-	done
-
-KLIB=-L../lib/kadm -lkadm -L../lib/krb -lkrb -L../lib/des -ldes -L../util/et -lcom_err
-LIBROKEN=-L../lib/roken -lroken
-
-kpasswd$(EXECSUFFIX): kpasswd.o new_pwd.o
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ kpasswd.o new_pwd.o $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
-
-kadmin$(EXECSUFFIX): kadmin.o new_pwd.o
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ new_pwd.o kadmin.o -L../lib/kadm -lkadm -L../lib/krb -lkrb -L../lib/des -ldes -L../lib/sl -lsl -L../util/et -lcom_err $(LIBROKEN) $(LIBS) $(LIB_readline) $(LIBROKEN)
-
-KADMIND_OBJECTS=kadm_server.o kadm_funcs.o admin_server.o kadm_ser_wrap.o pw_check.o
-
-kadmind$(EXECSUFFIX): $(KADMIND_OBJECTS)
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(KADMIND_OBJECTS) -L../lib/kdb -lkdb -L../lib/acl -lacl $(KLIB) $(CRACKLIB) $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
-
-ksrvutil$(EXECSUFFIX): ksrvutil.o ksrvutil_get.o
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ ksrvutil.o ksrvutil_get.o $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
-
-$(OBJECTS): ../include/config.h
diff --git a/crypto/kerberosIV/kadmin/admin_server.c b/crypto/kerberosIV/kadmin/admin_server.c
deleted file mode 100644
index 2654c77477de..000000000000
--- a/crypto/kerberosIV/kadmin/admin_server.c
+++ /dev/null
@@ -1,432 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-/*
- * Top-level loop of the kerberos Administration server
- */
-
-/*
-  admin_server.c
-  this holds the main loop and initialization and cleanup code for the server
-*/
-
-#include "kadm_locl.h"
-
-RCSID("$Id: admin_server.c,v 1.41 1997/05/27 15:52:53 bg Exp $");
-
-/* Almost all procs and such need this, so it is global */
-admin_params prm;		/* The command line parameters struct */
-
-/* GLOBAL */
-char *acldir = DEFAULT_ACL_DIR;
-static char krbrlm[REALM_SZ];
-
-static unsigned pidarraysize = 0;
-static int *pidarray = (int *)0;
-
-static int exit_now = 0;
-
-static
-RETSIGTYPE
-doexit(int sig)
-{
-    exit_now = 1;
-    SIGRETURN(0);
-}
-   
-static
-RETSIGTYPE
-do_child(int sig)
-{
-    int pid;
-    int i, j;
-
-    int status;
-
-    pid = wait(&status);
-
-    /* Reinstall signal handlers for SysV. Must be done *after* wait */
-    signal(SIGCHLD, do_child);
-
-    for (i = 0; i < pidarraysize; i++)
-	if (pidarray[i] == pid) {
-	    /* found it */
-	    for (j = i; j < pidarraysize-1; j++)
-		/* copy others down */
-		pidarray[j] = pidarray[j+1];
-	    pidarraysize--;
-	    if ((WIFEXITED(status) && WEXITSTATUS(status) != 0)
-		|| WIFSIGNALED(status))
-	      krb_log("child %d: termsig %d, retcode %d", pid,
-		  WTERMSIG(status), WEXITSTATUS(status));
-	    SIGRETURN(0);
-	}
-    krb_log("child %d not in list: termsig %d, retcode %d", pid,
-	WTERMSIG(status), WEXITSTATUS(status));
-    SIGRETURN(0);
-}
-
-static void
-kill_children(void)
-{
-    int i;
-
-    for (i = 0; i < pidarraysize; i++) {
-	kill(pidarray[i], SIGINT);
-	krb_log("killing child %d", pidarray[i]);
-    }
-}
-
-/* close the system log file */
-static void
-close_syslog(void)
-{
-   krb_log("Shutting down admin server");
-}
-
-static void
-byebye(void)			/* say goodnight gracie */
-{
-   printf("Admin Server (kadm server) has completed operation.\n");
-}
-
-static void
-clear_secrets(void)
-{
-    memset(server_parm.master_key, 0, sizeof(server_parm.master_key));
-    memset(server_parm.master_key_schedule, 0,
-	  sizeof(server_parm.master_key_schedule));
-    server_parm.master_key_version = 0L;
-}
-
-#ifdef DEBUG
-#define cleanexit(code) {kerb_fini(); return;}
-#endif
-
-#ifndef DEBUG
-static void
-cleanexit(int val)
-{
-    kerb_fini();
-    clear_secrets();
-    exit(val);
-}
-#endif
-
-static void
-process_client(int fd, struct sockaddr_in *who)
-{
-    u_char *dat;
-    int dat_len;
-    u_short dlen;
-    int retval;
-    int on = 1;
-    Principal service;
-    des_cblock skey;
-    int more;
-    int status;
-
-#if defined(SO_KEEPALIVE) && defined(HAVE_SETSOCKOPT)
-    if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (void *)&on, sizeof(on)) < 0)
-	krb_log("setsockopt keepalive: %d",errno);
-#endif
-
-    server_parm.recv_addr = *who;
-
-    if (kerb_init()) {			/* Open as client */
-	krb_log("can't open krb db");
-	cleanexit(1);
-    }
-    /* need to set service key to changepw.KRB_MASTER */
-
-    status = kerb_get_principal(server_parm.sname, server_parm.sinst, &service,
-			    1, &more);
-    if (status == -1) {
-      /* db locked */
-      int32_t retcode = KADM_DB_INUSE;
-      char *pdat;
-      
-      dat_len = KADM_VERSIZE + sizeof(retcode);
-      dat = (u_char *) malloc((unsigned)dat_len);
-      pdat = (char *) dat;
-      retcode = htonl((u_int32_t) KADM_DB_INUSE);
-      strncpy(pdat, KADM_ULOSE, KADM_VERSIZE);
-      memcpy(pdat+KADM_VERSIZE, &retcode, sizeof(retcode));
-      goto out;
-    } else if (!status) {
-      krb_log("no service %s.%s",server_parm.sname, server_parm.sinst);
-      cleanexit(2);
-    }
-
-    copy_to_key(&service.key_low, &service.key_high, skey);
-    memset(&service, 0, sizeof(service));
-    kdb_encrypt_key (&skey, &skey, &server_parm.master_key,
-		     server_parm.master_key_schedule, DES_DECRYPT);
-    krb_set_key(skey, 0); /* if error, will show up when
-					    rd_req fails */
-    memset(skey, 0, sizeof(skey));
-
-    while (1) {
-	if ((retval = krb_net_read(fd, &dlen, sizeof(u_short))) !=
-	    sizeof(u_short)) {
-	    if (retval < 0)
-		krb_log("dlen read: %s",error_message(errno));
-	    else if (retval)
-		krb_log("short dlen read: %d",retval);
-	    close(fd);
-	    cleanexit(retval ? 3 : 0);
-	}
-	if (exit_now) {
-	    cleanexit(0);
-	}
-	dat_len = ntohs(dlen);
-	dat = (u_char *) malloc(dat_len);
-	if (!dat) {
-	    krb_log("malloc: No memory");
-	    close(fd);
-	    cleanexit(4);
-	}
-	if ((retval = krb_net_read(fd, dat, dat_len)) != dat_len) {
-	    if (retval < 0)
-		krb_log("data read: %s",error_message(errno));
-	    else
-		krb_log("short read: %d vs. %d", dat_len, retval);
-	    close(fd);
-	    cleanexit(5);
-	}
-    	if (exit_now) {
-	    cleanexit(0);
-	}
-	if ((retval = kadm_ser_in(&dat,&dat_len)) != KADM_SUCCESS)
-	    krb_log("processing request: %s", error_message(retval));
-    
-	/* kadm_ser_in did the processing and returned stuff in
-	   dat & dat_len , return the appropriate data */
-    
-    out:
-	dlen = htons(dat_len);
-    
-	if (krb_net_write(fd, &dlen, sizeof(u_short)) < 0) {
-	    krb_log("writing dlen to client: %s",error_message(errno));
-	    close(fd);
-	    cleanexit(6);
-	}
-    
-	if (krb_net_write(fd, dat, dat_len) < 0) {
-	    krb_log("writing to client: %s", error_message(errno));
-	    close(fd);
-	    cleanexit(7);
-	}
-	free(dat);
-    }
-    /*NOTREACHED*/
-}
-
-/*
-kadm_listen
-listen on the admin servers port for a request
-*/
-static int
-kadm_listen(void)
-{
-    int found;
-    int admin_fd;
-    int peer_fd;
-    fd_set mask, readfds;
-    struct sockaddr_in peer;
-    int addrlen;
-    int pid;
-
-    signal(SIGINT, doexit);
-    signal(SIGTERM, doexit);
-    signal(SIGHUP, doexit);
-    signal(SIGQUIT, doexit);
-    signal(SIGPIPE, SIG_IGN); /* get errors on write() */
-    signal(SIGALRM, doexit);
-    signal(SIGCHLD, do_child);
-    if (setsid() < 0)
-        krb_log("setsid() failed");
-
-    if ((admin_fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-	return KADM_NO_SOCK;
-#if defined(SO_REUSEADDR) && defined(HAVE_SETSOCKOPT)
-    {
-      int one=1;
-      setsockopt(admin_fd, SOL_SOCKET, SO_REUSEADDR, (void *)&one,
-		 sizeof(one));
-    }
-#endif
-    if (bind(admin_fd, (struct sockaddr *)&server_parm.admin_addr,
-	     sizeof(struct sockaddr_in)) < 0)
-	return KADM_NO_BIND;
-    listen(admin_fd, 1);
-    FD_ZERO(&mask);
-    FD_SET(admin_fd, &mask);
-
-    for (;;) {				/* loop nearly forever */
-	if (exit_now) {
-	    clear_secrets();
-	    kill_children();
-	    return(0);
-	}
-	readfds = mask;
-	if ((found = select(admin_fd+1, &readfds, 0,
-			    0, (struct timeval *)0)) == 0)
-	    continue;			/* no things read */
-	if (found < 0) {
-	    if (errno != EINTR)
-		krb_log("select: %s",error_message(errno));
-	    continue;
-	}      
-	if (FD_ISSET(admin_fd, &readfds)) {
-	    /* accept the conn */
-	    addrlen = sizeof(peer);
-	    if ((peer_fd = accept(admin_fd, (struct sockaddr *)&peer,
-				  &addrlen)) < 0) {
-		krb_log("accept: %s",error_message(errno));
-		continue;
-	    }
-#ifndef DEBUG
-	    /* if you want a sep daemon for each server */
-	    if ((pid = fork())) {
-		/* parent */
-		if (pid < 0) {
-		    krb_log("fork: %s",error_message(errno));
-		    close(peer_fd);
-		    continue;
-		}
-		/* fork succeded: keep tabs on child */
-		close(peer_fd);
-		if (pidarray) {
-		    pidarray = (int *)realloc(pidarray, ++pidarraysize);
-		    pidarray[pidarraysize-1] = pid;
-		} else {
-		    pidarray = (int *)malloc(pidarraysize = 1);
-		    pidarray[0] = pid;
-		}
-	    } else {
-		/* child */
-		close(admin_fd);
-#endif /* DEBUG */
-		/*
-		 * If we are multihomed we need to figure out which
-		 * local address that is used this time since it is
-		 * used in "direction" comparison.
-		 */
-		getsockname(peer_fd,
-			    (struct sockaddr *)&server_parm.admin_addr,
-			    &addrlen);
-		/* do stuff */
-		process_client (peer_fd, &peer);
-#ifndef DEBUG
-	    }
-#endif
-	} else {
-	    krb_log("something else woke me up!");
-	    return(0);
-	}
-    }
-    /*NOTREACHED*/
-}
-
-/*
-** Main does the logical thing, it sets up the database and RPC interface,
-**  as well as handling the creation and maintenance of the syslog file...
-*/
-int
-main(int argc, char **argv)		/* admin_server main routine */
-{
-    int errval;
-    int c;
-
-    set_progname (argv[0]);
-
-    umask(077);		/* Create protected files */
-
-    /* initialize the admin_params structure */
-    prm.sysfile = KADM_SYSLOG;		/* default file name */
-    prm.inter = 0;
-
-    memset(krbrlm, 0, sizeof(krbrlm));
-
-    while ((c = getopt(argc, argv, "f:hmnd:a:r:")) != EOF)
-	switch(c) {
-	case 'f':			/* Syslog file name change */
-	    prm.sysfile = optarg;
-	    break;
-	case 'n':
-	    prm.inter = 0;
-	    break;
-	case 'm':
-	    prm.inter = 1;
-	    break;
-	case 'a':			/* new acl directory */
-	    acldir = optarg;
-	    break;
-	case 'd':
-	    /* put code to deal with alt database place */
-	    if ((errval = kerb_db_set_name(optarg)))
-		errx (1, "opening database %s: %s",
-		      optarg, error_message(errval));
-	    break;
-	case 'r':
-	    strncpy(krbrlm, optarg, sizeof(krbrlm) - 1);
-	    break;
-	case 'h':			/* get help on using admin_server */
-	default:
-	    errx(1, "Usage: kadmind [-h] [-n] [-m] [-r realm] [-d dbname] [-f filename] [-a acldir]");
-	}
-
-    if (krbrlm[0] == 0)
-	if (krb_get_lrealm(krbrlm, 0) != KSUCCESS)
-	    errx (1, "Unable to get local realm.  Fix krb.conf or use -r.");
-
-    printf("KADM Server %s initializing\n",KADM_VERSTR);
-    printf("Please do not use 'kill -9' to kill this job, use a\n");
-    printf("regular kill instead\n\n");
-
-    kset_logfile(prm.sysfile);
-    krb_log("Admin server starting");
-
-    kerb_db_set_lockmode(KERB_DBL_NONBLOCKING);
-    errval = kerb_init();		/* Open the Kerberos database */
-    if (errval) {
-	warnx ("error: kerb_init() failed");
-	close_syslog();
-	byebye();
-    }
-    /* set up the server_parm struct */
-    if ((errval = kadm_ser_init(prm.inter, krbrlm))==KADM_SUCCESS) {
-	kerb_fini();			/* Close the Kerberos database--
-					   will re-open later */
-	errval = kadm_listen();		/* listen for calls to server from
-					   clients */
-    }
-    if (errval != KADM_SUCCESS) {
-	warnx("error:  %s",error_message(errval));
-	kerb_fini();			/* Close if error */
-    }
-    close_syslog();			/* Close syslog file, print
-					   closing note */
-    byebye();				/* Say bye bye on the terminal
-					   in use */
-    exit(1);
-}					/* procedure main */
diff --git a/crypto/kerberosIV/kadmin/kadm_funcs.c b/crypto/kerberosIV/kadmin/kadm_funcs.c
deleted file mode 100644
index 34a34b0a9ae9..000000000000
--- a/crypto/kerberosIV/kadmin/kadm_funcs.c
+++ /dev/null
@@ -1,411 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-*/
-
-/*
- * Kerberos administration server-side database manipulation routines
- */
-
-/*
- * kadm_funcs.c
- * the actual database manipulation code
- */
-
-#include "kadm_locl.h"
-
-RCSID("$Id: kadm_funcs.c,v 1.16 1997/05/02 14:28:49 assar Exp $");
-
-static int
-check_access(char *pname, char *pinst, char *prealm, enum acl_types acltype)
-{
-    char checkname[MAX_K_NAME_SZ];
-    char filename[MaxPathLen];
-
-    snprintf(checkname, sizeof(checkname), "%s.%s@%s", pname, pinst, prealm);
-    
-    switch (acltype) {
-    case ADDACL:
-	snprintf(filename, sizeof(filename), "%s%s", acldir, ADD_ACL_FILE);
-	break;
-    case GETACL:
-	snprintf(filename, sizeof(filename), "%s%s", acldir, GET_ACL_FILE);
-	break;
-    case MODACL:
-	snprintf(filename, sizeof(filename), "%s%s", acldir, MOD_ACL_FILE);
-	break;
-    case DELACL:
-	snprintf(filename, sizeof(filename), "%s%s", acldir, DEL_ACL_FILE);
-	break;
-    default:
-	krb_log("WARNING in check_access: default case in switch");
-	return 0;
-    }
-    return(acl_check(filename, checkname));
-}
-
-static int
-wildcard(char *str)
-{
-    if (!strcmp(str, WILDCARD_STR))
-	return(1);
-    return(0);
-}
-
-static int
-fail(int code, char *oper, char *princ)
-{
-    krb_log("ERROR: %s: %s (%s)", oper, princ, error_message(code));
-    return code;
-}
-
-#define failadd(code) { fail(code, "ADD", victim); return code; }
-#define faildelete(code) { fail(code, "DELETE", victim); return code; }
-#define failget(code) { fail(code, "GET", victim); return code; }
-#define failmod(code) { fail(code, "MOD", victim); return code; }
-#define failchange(code) { fail(code, "CHANGE", admin); return code; }
-
-int
-kadm_add_entry (char *rname, char *rinstance, char *rrealm, 
-		Kadm_vals *valsin, Kadm_vals *valsout)
-{
-    long numfound;		/* check how many we get written */
-    int more;			/* pointer to more grabbed records */
-    Principal data_i, data_o;		/* temporary principal */
-    u_char flags[4];
-    des_cblock newpw;
-    Principal default_princ;
-  
-    char admin[MAX_K_NAME_SZ], victim[MAX_K_NAME_SZ];
-
-    strcpy(admin, krb_unparse_name_long(rname, rinstance, rrealm));
-    strcpy(victim, krb_unparse_name_long(valsin->name, valsin->instance, NULL));
-
-    krb_log("ADD: %s by %s", victim, admin);
-
-    if (!check_access(rname, rinstance, rrealm, ADDACL)) {
-	krb_log("WARNING: ADD: %s permission denied", admin);
-	return KADM_UNAUTH;
-    }
-  
-    /* Need to check here for "legal" name and instance */
-    if (wildcard(valsin->name) || wildcard(valsin->instance)) {
-	failadd(KADM_ILL_WILDCARD);
-    }
-
-    numfound = kerb_get_principal(KERB_DEFAULT_NAME, KERB_DEFAULT_INST,
-				  &default_princ, 1, &more);
-    if (numfound == -1) {
-	failadd(KADM_DB_INUSE);
-    } else if (numfound != 1) {
-	failadd(KADM_UK_RERROR);
-    }
-
-    kadm_vals_to_prin(valsin->fields, &data_i, valsin);
-    strncpy(data_i.name, valsin->name, ANAME_SZ);
-    strncpy(data_i.instance, valsin->instance, INST_SZ);
-
-    if (!IS_FIELD(KADM_EXPDATE,valsin->fields))
-	data_i.exp_date = default_princ.exp_date;
-    if (!IS_FIELD(KADM_ATTR,valsin->fields))
-	data_i.attributes = default_princ.attributes;
-    if (!IS_FIELD(KADM_MAXLIFE,valsin->fields))
-	data_i.max_life = default_princ.max_life; 
-
-    memset(&default_princ, 0, sizeof(default_princ));
-
-    /* convert to host order */
-    data_i.key_low = ntohl(data_i.key_low);
-    data_i.key_high = ntohl(data_i.key_high);
-
-
-    copy_to_key(&data_i.key_low, &data_i.key_high, newpw);
-
-    /* encrypt new key in master key */
-    kdb_encrypt_key (&newpw, &newpw, &server_parm.master_key,
-		     server_parm.master_key_schedule, DES_ENCRYPT);
-    copy_from_key(newpw, &data_i.key_low, &data_i.key_high);
-    memset(newpw, 0, sizeof(newpw));
-
-    data_o = data_i;
-    numfound = kerb_get_principal(valsin->name, valsin->instance, 
-				  &data_o, 1, &more);
-    if (numfound == -1) {
-	failadd(KADM_DB_INUSE);
-    } else if (numfound) {
-	failadd(KADM_INUSE);
-    } else {
-	data_i.key_version++;
-	data_i.kdc_key_ver = server_parm.master_key_version;
-	strncpy(data_i.mod_name, rname, sizeof(data_i.mod_name)-1);
-	strncpy(data_i.mod_instance, rinstance,
-		sizeof(data_i.mod_instance)-1);
-
-	numfound = kerb_put_principal(&data_i, 1);
-	if (numfound == -1) {
-	    failadd(KADM_DB_INUSE);
-	} else if (numfound) {
-	    failadd(KADM_UK_SERROR);
-	} else {
-	    numfound = kerb_get_principal(valsin->name, valsin->instance, 
-					  &data_o, 1, &more);
-	    if ((numfound!=1) || (more!=0)) {
-		failadd(KADM_UK_RERROR);
-	    }
-	    memset(flags, 0, sizeof(flags));
-	    SET_FIELD(KADM_NAME,flags);
-	    SET_FIELD(KADM_INST,flags);
-	    SET_FIELD(KADM_EXPDATE,flags);
-	    SET_FIELD(KADM_ATTR,flags);
-	    SET_FIELD(KADM_MAXLIFE,flags);
-	    kadm_prin_to_vals(flags, valsout, &data_o);
-	    krb_log("ADD: %s added", victim);
-	    return KADM_DATA;		/* Set all the appropriate fields */
-	}
-    }
-}
-
-int
-kadm_delete_entry (char *rname, char *rinstance, char *rrealm, 
-		   Kadm_vals *valsin)
-{
-    int ret;
-
-    char admin[MAX_K_NAME_SZ], victim[MAX_K_NAME_SZ];
-    
-    strcpy(admin, krb_unparse_name_long(rname, rinstance, rrealm));
-    strcpy(victim, krb_unparse_name_long(valsin->name, valsin->instance, NULL));
-
-    krb_log("DELETE: %s by %s", victim, admin);
-
-    if (!check_access(rname, rinstance, rrealm, DELACL)) {
-	krb_log("WARNING: DELETE: %s permission denied", admin);
-	return KADM_UNAUTH;
-    }
-    
-    /* Need to check here for "legal" name and instance */
-    if (wildcard(valsin->name) || wildcard(valsin->instance)) {
-	faildelete(KADM_ILL_WILDCARD);
-    }
-  
-#define EQ(V,N,I) (strcmp((V)->name, (N)) == 0 && strcmp((V)->instance, (I)) == 0)
-
-    if(EQ(valsin, PWSERV_NAME, KRB_MASTER) ||
-       EQ(valsin, "K", "M") ||
-       EQ(valsin, "default", "") ||
-       EQ(valsin, KRB_TICKET_GRANTING_TICKET, server_parm.krbrlm)){
-	krb_log("WARNING: DELETE: %s is immutable", victim);
-	return KADM_IMMUTABLE; /* XXX */
-    }
-    
-    ret = kerb_delete_principal(valsin->name, valsin->instance);
-    if(ret == -1)
-	return KADM_DB_INUSE; /* XXX */
-    krb_log("DELETE: %s removed.", victim);
-    return KADM_SUCCESS;
-}
-
-
-int
-kadm_get_entry (char *rname, char *rinstance, char *rrealm, 
-		Kadm_vals *valsin, u_char *flags, Kadm_vals *valsout)
-{
-    long numfound;		/* check how many were returned */
-    int more;			/* To point to more name.instances */
-    Principal data_o;		/* Data object to hold Principal */
-    
-    char admin[MAX_K_NAME_SZ], victim[MAX_K_NAME_SZ];
-    
-    strcpy(admin, krb_unparse_name_long(rname, rinstance, rrealm));
-    strcpy(victim, krb_unparse_name_long(valsin->name, valsin->instance, NULL));
-    
-    krb_log("GET: %s by %s", victim, admin);
-
-    if (!check_access(rname, rinstance, rrealm, GETACL)) {
-	krb_log("WARNING: GET: %s permission denied", admin);
-	return KADM_UNAUTH;
-    }
-  
-    if (wildcard(valsin->name) || wildcard(valsin->instance)) {
-	failget(KADM_ILL_WILDCARD);
-    }
-
-    /* Look up the record in the database */
-    numfound = kerb_get_principal(valsin->name, valsin->instance, 
-				  &data_o, 1, &more);
-    if (numfound == -1) {
-	failget(KADM_DB_INUSE);
-    }  else if (numfound) {	/* We got the record, let's return it */
-	kadm_prin_to_vals(flags, valsout, &data_o);
-	krb_log("GET: %s retrieved", victim);
-	return KADM_DATA; /* Set all the appropriate fields */
-    } else {
-	failget(KADM_NOENTRY);	/* Else whimper and moan */
-    }
-}
-
-int
-kadm_mod_entry (char *rname, char *rinstance, char *rrealm, 
-		Kadm_vals *valsin, Kadm_vals *valsin2, Kadm_vals *valsout)
-{
-    long numfound;
-    int more;
-    Principal data_o, temp_key;
-    u_char fields[4];
-    des_cblock newpw;
-
-    char admin[MAX_K_NAME_SZ], victim[MAX_K_NAME_SZ];
-    
-    strcpy(admin, krb_unparse_name_long(rname, rinstance, rrealm));
-    strcpy(victim, krb_unparse_name_long(valsin->name, valsin->instance, NULL));
-    
-    krb_log("MOD: %s by %s", victim, admin);
-
-    if (wildcard(valsin->name) || wildcard(valsin->instance)) {
-	failmod(KADM_ILL_WILDCARD);
-    }
-  
-    if (!check_access(rname, rinstance, rrealm, MODACL)) {
-	krb_log("WARNING: MOD: %s permission denied", admin);
-	return KADM_UNAUTH;
-    }
-    
-    numfound = kerb_get_principal(valsin->name, valsin->instance, 
-				  &data_o, 1, &more);
-    if (numfound == -1) {
-	failmod(KADM_DB_INUSE);
-    } else if (numfound) {
-	kadm_vals_to_prin(valsin2->fields, &temp_key, valsin2);
-	strncpy(data_o.name, valsin->name, ANAME_SZ);
-	strncpy(data_o.instance, valsin->instance, INST_SZ);
-	if (IS_FIELD(KADM_EXPDATE,valsin2->fields))
-	    data_o.exp_date = temp_key.exp_date;
-	if (IS_FIELD(KADM_ATTR,valsin2->fields))
-	    data_o.attributes = temp_key.attributes;
-	if (IS_FIELD(KADM_MAXLIFE,valsin2->fields))
-	    data_o.max_life = temp_key.max_life; 
-	if (IS_FIELD(KADM_DESKEY,valsin2->fields)) {
-	    data_o.key_version++;
-	    data_o.kdc_key_ver = server_parm.master_key_version;
-
-
-	    /* convert to host order */
-	    temp_key.key_low = ntohl(temp_key.key_low);
-	    temp_key.key_high = ntohl(temp_key.key_high);
-
-
-	    copy_to_key(&temp_key.key_low, &temp_key.key_high, newpw);
-
-	    /* encrypt new key in master key */
-	    kdb_encrypt_key (&newpw, &newpw, &server_parm.master_key,
-			     server_parm.master_key_schedule, DES_ENCRYPT);
-	    copy_from_key(newpw, &data_o.key_low, &data_o.key_high);
-	    memset(newpw, 0, sizeof(newpw));
-	}
-	memset(&temp_key, 0, sizeof(temp_key));
-
-	strncpy(data_o.mod_name, rname, sizeof(data_o.mod_name)-1);
-	strncpy(data_o.mod_instance, rinstance,
-		sizeof(data_o.mod_instance)-1);
-	more = kerb_put_principal(&data_o, 1);
-
-	memset(&data_o, 0, sizeof(data_o));
-
-	if (more == -1) {
-	    failmod(KADM_DB_INUSE);
-	} else if (more) {
-	    failmod(KADM_UK_SERROR);
-	} else {
-	    numfound = kerb_get_principal(valsin->name, valsin->instance, 
-					  &data_o, 1, &more);
-	    if ((more!=0)||(numfound!=1)) {
-		failmod(KADM_UK_RERROR);
-	    }
-	    memset(fields, 0, sizeof(fields));
-	    SET_FIELD(KADM_NAME,fields);
-	    SET_FIELD(KADM_INST,fields);
-	    SET_FIELD(KADM_EXPDATE,fields);
-	    SET_FIELD(KADM_ATTR,fields);
-	    SET_FIELD(KADM_MAXLIFE,fields);
-	    kadm_prin_to_vals(fields, valsout, &data_o);
-	    krb_log("MOD: %s modified", victim);
-	    return KADM_DATA;		/* Set all the appropriate fields */
-	}
-    }
-    else {
-	failmod(KADM_NOENTRY);
-    }
-}
-
-int
-kadm_change (char *rname, char *rinstance, char *rrealm, unsigned char *newpw)
-{
-    long numfound;
-    int more;
-    Principal data_o;
-    des_cblock local_pw;
-
-    char admin[MAX_K_NAME_SZ];
-    
-    strcpy(admin, krb_unparse_name_long(rname, rinstance, rrealm));
-    
-    krb_log("CHANGE: %s", admin);
-
-    if (strcmp(server_parm.krbrlm, rrealm)) {
-	krb_log("ERROR: CHANGE: request from wrong realm %s", rrealm);
-	return(KADM_WRONG_REALM);
-    }
-
-    if (wildcard(rname) || wildcard(rinstance)) {
-	failchange(KADM_ILL_WILDCARD);
-    }
-
-    memcpy(local_pw, newpw, sizeof(local_pw));
-  
-    /* encrypt new key in master key */
-    kdb_encrypt_key (&local_pw, &local_pw, &server_parm.master_key,
-		     server_parm.master_key_schedule, DES_ENCRYPT);
-
-    numfound = kerb_get_principal(rname, rinstance, 
-				  &data_o, 1, &more);
-    if (numfound == -1) {
-	failchange(KADM_DB_INUSE);
-    } else if (numfound) {
-	copy_from_key(local_pw, &data_o.key_low, &data_o.key_high);
-	data_o.key_version++;
-	data_o.kdc_key_ver = server_parm.master_key_version;
-	strncpy(data_o.mod_name, rname, sizeof(data_o.mod_name)-1);
-	strncpy(data_o.mod_instance, rinstance,
-		sizeof(data_o.mod_instance)-1);
-	more = kerb_put_principal(&data_o, 1);
-	memset(local_pw, 0, sizeof(local_pw));
-	memset(&data_o, 0, sizeof(data_o));
-	if (more == -1) {
-	    failchange(KADM_DB_INUSE);
-	} else if (more) {
-	    failchange(KADM_UK_SERROR);
-	} else {
-	    krb_log("CHANGE: %s's password changed", admin);
-	    return KADM_SUCCESS;
-	}
-    }
-    else {
-	failchange(KADM_NOENTRY);
-    }
-}
diff --git a/crypto/kerberosIV/kadmin/kadm_locl.h b/crypto/kerberosIV/kadmin/kadm_locl.h
deleted file mode 100644
index 07f9093a29fb..000000000000
--- a/crypto/kerberosIV/kadmin/kadm_locl.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id: kadm_locl.h,v 1.25 1997/05/20 18:40:43 bg Exp $ */
-
-#include "config.h"
-#include "protos.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#elif defined(HAVE_SYS_TIME_H)
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-
-#include <errno.h>
-#include <signal.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif /* HAVE_SYS_RESOURCE_H */
-#ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
-#ifdef HAVE_PWD_H
-#include <pwd.h>
-#endif
-
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-
-#ifdef HAVE_SYSLOG_H
-#include <syslog.h>
-#endif
-
-#include <err.h>
-
-#ifdef SOCKS
-#include <socks.h>
-#endif
-
-#include <roken.h>
-
-#include <com_err.h>
-#include <sl.h>
-
-#include <des.h>
-#include <krb.h>
-#include <krb_err.h>
-#include <krb_db.h>
-#include <kadm.h>
-#include <kadm_err.h>
-#include <acl.h>
-
-#include "kadm_server.h"
-#include "pw_check.h"
-
-/* from libacl */
-/* int acl_check(char *acl, char *principal); */
-
-/* GLOBALS */
-extern char *acldir;
-extern Kadm_Server server_parm;
-
-/* Utils */
-int kadm_change __P((char *, char *, char *, des_cblock));
-int kadm_add_entry __P((char *, char *, char *, Kadm_vals *, Kadm_vals *));
-int kadm_mod_entry __P((char *, char *, char *, Kadm_vals *, Kadm_vals *, Kadm_vals *));
-int kadm_get_entry __P((char *, char *, char *, Kadm_vals *, u_char *, Kadm_vals *));
-int kadm_delete_entry __P((char *, char *, char *, Kadm_vals *));
-int kadm_ser_cpw __P((u_char *, int, AUTH_DAT *, u_char **, int *));
-int kadm_ser_add __P((u_char *, int, AUTH_DAT *, u_char **, int *));
-int kadm_ser_mod __P((u_char *, int, AUTH_DAT *, u_char **, int *));
-int kadm_ser_get __P((u_char *, int, AUTH_DAT *, u_char **, int *));
-int kadm_ser_delete __P((u_char *, int, AUTH_DAT *, u_char **, int *));
-int kadm_ser_init __P((int inter, char realm[]));
-int kadm_ser_in __P((u_char **, int *));
-
-int get_pw_new_pwd  __P((char *pword, int pwlen, krb_principal *pr, int print_realm));
-
-/* cracklib */
-char *FascistCheck __P((char *password, char *path, char **strings));
diff --git a/crypto/kerberosIV/kadmin/kadm_ser_wrap.c b/crypto/kerberosIV/kadmin/kadm_ser_wrap.c
deleted file mode 100644
index 6909a9f0e0cc..000000000000
--- a/crypto/kerberosIV/kadmin/kadm_ser_wrap.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-/*
- * Kerberos administration server-side support functions
- */
-
-/* 
-kadm_ser_wrap.c
-unwraps wrapped packets and calls the appropriate server subroutine
-*/
-
-#include "kadm_locl.h"
-
-RCSID("$Id: kadm_ser_wrap.c,v 1.20 1997/05/02 10:29:14 joda Exp $");
-
-/* GLOBAL */
-Kadm_Server server_parm;
-
-/* 
-kadm_ser_init
-set up the server_parm structure
-*/
-int
-kadm_ser_init(int inter, char *realm)
-          			/* interactive or from file */
-             
-{
-  struct hostent *hp;
-  char hostname[MaxHostNameLen];
-
-  init_kadm_err_tbl();
-  init_krb_err_tbl();
-  if (k_gethostname(hostname, sizeof(hostname)))
-      return KADM_NO_HOSTNAME;
-
-  strcpy(server_parm.sname, PWSERV_NAME);
-  strcpy(server_parm.sinst, KRB_MASTER);
-  strcpy(server_parm.krbrlm, realm);
-
-  server_parm.admin_fd = -1;
-  /* setting up the addrs */
-  memset(&server_parm.admin_addr,0, sizeof(server_parm.admin_addr));
-
-  server_parm.admin_addr.sin_port = k_getportbyname (KADM_SNAME,
-						     "tcp",
-						     htons(751));
-  server_parm.admin_addr.sin_family = AF_INET;
-  if ((hp = gethostbyname(hostname)) == NULL)
-      return KADM_NO_HOSTNAME;
-  server_parm.admin_addr.sin_addr.s_addr = INADDR_ANY;
-				/* setting up the database */
-  if (kdb_get_master_key((inter==1), &server_parm.master_key,
-			 server_parm.master_key_schedule) != 0)
-    return KADM_NO_MAST;
-  if ((server_parm.master_key_version =
-       kdb_verify_master_key(&server_parm.master_key,
-			     server_parm.master_key_schedule,stderr))<0)
-      return KADM_NO_VERI;
-  return KADM_SUCCESS;
-}
-
-static void errpkt(u_char **dat, int *dat_len, int code)
-{
-    u_int32_t retcode;
-    char *pdat;
-
-    free(*dat);			/* free up req */
-    *dat_len = KADM_VERSIZE + sizeof(u_int32_t);
-    *dat = (u_char *) malloc((unsigned)*dat_len);
-    pdat = (char *) *dat;
-    retcode = htonl((u_int32_t) code);
-    strncpy(pdat, KADM_ULOSE, KADM_VERSIZE);
-    memcpy(&pdat[KADM_VERSIZE], &retcode, sizeof(u_int32_t));
-    return;
-}
-
-/*
-kadm_ser_in
-unwrap the data stored in dat, process, and return it.
-*/
-int
-kadm_ser_in(u_char **dat, int *dat_len)
-{
-    u_char *in_st;			/* pointer into the sent packet */
-    int in_len,retc;			/* where in packet we are, for
-					   returns */
-    u_int32_t r_len;			/* length of the actual packet */
-    KTEXT_ST authent;			/* the authenticator */
-    AUTH_DAT ad;			/* who is this, klink */
-    u_int32_t ncksum;			/* checksum of encrypted data */
-    des_key_schedule sess_sched;	/* our schedule */
-    MSG_DAT msg_st;
-    u_char *retdat, *tmpdat;
-    int retval, retlen;
-
-    if (strncmp(KADM_VERSTR, (char *)*dat, KADM_VERSIZE)) {
-	errpkt(dat, dat_len, KADM_BAD_VER);
-	return KADM_BAD_VER;
-    }
-    in_len = KADM_VERSIZE;
-    /* get the length */
-    if ((retc = stv_long(*dat, &r_len, in_len, *dat_len)) < 0)
-	return KADM_LENGTH_ERROR;
-    in_len += retc;
-    authent.length = *dat_len - r_len - KADM_VERSIZE - sizeof(u_int32_t);
-    memcpy(authent.dat, (char *)(*dat) + in_len, authent.length);
-    authent.mbz = 0;
-    /* service key should be set before here */
-    if ((retc = krb_rd_req(&authent, server_parm.sname, server_parm.sinst,
-			  server_parm.recv_addr.sin_addr.s_addr, &ad, NULL)))
-    {
-	errpkt(dat, dat_len,retc + krb_err_base);
-	return retc + krb_err_base;
-    }
-
-#define clr_cli_secrets() {memset(sess_sched, 0, sizeof(sess_sched)); memset(ad.session, 0,sizeof(ad.session));}
-
-    in_st = *dat + *dat_len - r_len;
-#ifdef NOENCRYPTION
-    ncksum = 0;
-#else
-    ncksum = des_quad_cksum((des_cblock *)in_st, (des_cblock *)0, (long) r_len, 0, &ad.session);
-#endif
-    if (ncksum!=ad.checksum) {		/* yow, are we correct yet */
-	clr_cli_secrets();
-	errpkt(dat, dat_len,KADM_BAD_CHK);
-	return KADM_BAD_CHK;
-    }
-#ifdef NOENCRYPTION
-    memset(sess_sched, 0, sizeof(sess_sched));
-#else
-    des_key_sched(&ad.session, sess_sched);
-#endif
-    if ((retc = (int) krb_rd_priv(in_st, r_len, sess_sched, &ad.session, 
-				 &server_parm.recv_addr,
-				 &server_parm.admin_addr, &msg_st))) {
-	clr_cli_secrets();
-	errpkt(dat, dat_len,retc + krb_err_base);
-	return retc + krb_err_base;
-    }
-    switch (msg_st.app_data[0]) {
-    case CHANGE_PW:
-	retval = kadm_ser_cpw(msg_st.app_data+1,(int) msg_st.app_length - 1,
-			      &ad, &retdat, &retlen);
-	break;
-    case ADD_ENT:
-	retval = kadm_ser_add(msg_st.app_data+1,(int) msg_st.app_length - 1,
-			      &ad, &retdat, &retlen);
-	break;
-    case GET_ENT:
-	retval = kadm_ser_get(msg_st.app_data+1,(int) msg_st.app_length - 1,
-			      &ad, &retdat, &retlen);
-	break;
-    case MOD_ENT:
-	retval = kadm_ser_mod(msg_st.app_data+1,(int) msg_st.app_length - 1,
-			      &ad, &retdat, &retlen);
-	break;
-    case DEL_ENT:
-	retval = kadm_ser_delete(msg_st.app_data + 1, msg_st.app_length - 1, 
-				 &ad, &retdat, &retlen);
-	break;
-    default:
-	clr_cli_secrets();
-	errpkt(dat, dat_len, KADM_NO_OPCODE);
-	return KADM_NO_OPCODE;
-    }
-    /* Now seal the response back into a priv msg */
-    free(*dat);
-    tmpdat = (u_char *) malloc((unsigned)(retlen + KADM_VERSIZE +
-					  sizeof(u_int32_t)));
-    strncpy((char *)tmpdat, KADM_VERSTR, KADM_VERSIZE);
-    retval = htonl((u_int32_t)retval);
-    memcpy((char *)tmpdat + KADM_VERSIZE, &retval, sizeof(u_int32_t));
-    if (retlen) {
-        memcpy((char *)tmpdat + KADM_VERSIZE + sizeof(u_int32_t), retdat,
-	       retlen);
-	free(retdat);
-    }
-    /* slop for mk_priv stuff */
-    *dat = (u_char *) malloc((unsigned) (retlen + KADM_VERSIZE +
-					 sizeof(u_int32_t) + 200));
-    if ((*dat_len = krb_mk_priv(tmpdat, *dat,
-				(u_int32_t) (retlen + KADM_VERSIZE +
-					  sizeof(u_int32_t)),
-				sess_sched,
-				&ad.session, &server_parm.admin_addr,
-				&server_parm.recv_addr)) < 0) {
-	clr_cli_secrets();
-	errpkt(dat, dat_len, KADM_NO_ENCRYPT);
-	return KADM_NO_ENCRYPT;
-    }
-    clr_cli_secrets();
-    return KADM_SUCCESS;
-}
diff --git a/crypto/kerberosIV/kadmin/kadm_server.c b/crypto/kerberosIV/kadmin/kadm_server.c
deleted file mode 100644
index 1006f20c70ad..000000000000
--- a/crypto/kerberosIV/kadmin/kadm_server.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-/*
- * Kerberos administration server-side subroutines
- */
-
-#include "kadm_locl.h"
-
-RCSID("$Id: kadm_server.c,v 1.9 1997/05/02 10:29:08 joda Exp $");
-
-/* 
-kadm_ser_cpw - the server side of the change_password routine
-  recieves    : KTEXT, {key}
-  returns     : CKSUM, RETCODE
-  acl         : caller can change only own password
-
-Replaces the password (i.e. des key) of the caller with that specified in key.
-Returns no actual data from the master server, since this is called by a user
-*/
-int
-kadm_ser_cpw(u_char *dat, int len, AUTH_DAT *ad, u_char **datout, int *outlen)
-{
-    u_int32_t keylow, keyhigh;
-    des_cblock newkey;
-    int status;
-    int stvlen=0;
-    char *pw_msg;
-    char pword[MAX_KPW_LEN];
-    char *strings[4];
-
-    /* take key off the stream, and change the database */
-
-    if ((status = stv_long(dat, &keyhigh, 0, len)) < 0)
-	return(KADM_LENGTH_ERROR);
-    stvlen=status;
-    if ((status = stv_long(dat, &keylow, stvlen, len)) < 0)
-	return(KADM_LENGTH_ERROR);
-    stvlen+=status;
-
-    if((status = stv_string(dat, pword, stvlen, sizeof(pword), len))<0)
-      pword[0]=0;
-
-    keylow = ntohl(keylow);
-    keyhigh = ntohl(keyhigh);
-    memcpy(((char *)newkey) + 4, &keyhigh, 4);
-    memcpy(newkey, &keylow, 4);
-
-    strings[0] = ad->pname;
-    strings[1] = ad->pinst;
-    strings[2] = ad->prealm;
-    strings[3] = NULL;
-    status = kadm_pw_check(pword, &newkey, &pw_msg, strings);
-    
-    memset(pword, 0, sizeof(pword));
-    memset(dat, 0, len);
-
-    if(status != KADM_SUCCESS){
-      *datout=malloc(0);
-      *outlen=vts_string(pw_msg, datout, 0);
-      return status;
-    }
-    *datout=0;
-    *outlen=0;
-
-    return(kadm_change(ad->pname, ad->pinst, ad->prealm, newkey));
-}
-
-
-/*
-kadm_ser_add - the server side of the add_entry routine
-  recieves    : KTEXT, {values}
-  returns     : CKSUM, RETCODE, {values}
-  acl         : su, sms (as alloc)
-
-Adds and entry containing values to the database
-returns the values of the entry, so if you leave certain fields blank you will
-   be able to determine the default values they are set to
-*/
-int
-kadm_ser_add(u_char *dat, int len, AUTH_DAT *ad, u_char **datout, int *outlen)
-{
-  Kadm_vals values, retvals;
-  long status;
-
-  if ((status = stream_to_vals(dat, &values, len)) < 0)
-      return(KADM_LENGTH_ERROR);
-  if ((status = kadm_add_entry(ad->pname, ad->pinst, ad->prealm,
-			      &values, &retvals)) == KADM_DATA) {
-      *outlen = vals_to_stream(&retvals,datout);
-      return KADM_SUCCESS;
-  } else {
-      *outlen = 0;
-      return status;
-  }
-}
-
-/*
-kadm_ser_mod - the server side of the mod_entry routine
-  recieves    : KTEXT, {values, values}
-  returns     : CKSUM, RETCODE, {values}
-  acl         : su, sms (as register or dealloc)
-
-Modifies all entries corresponding to the first values so they match the
-   second values.
-returns the values for the changed entries
-*/
-int
-kadm_ser_mod(u_char *dat, int len, AUTH_DAT *ad, u_char **datout, int *outlen)
-{
-  Kadm_vals vals1, vals2, retvals;
-  int wh;
-  long status;
-
-  if ((wh = stream_to_vals(dat, &vals1, len)) < 0)
-      return KADM_LENGTH_ERROR;
-  if ((status = stream_to_vals(dat+wh,&vals2, len-wh)) < 0)
-      return KADM_LENGTH_ERROR;
-  if ((status = kadm_mod_entry(ad->pname, ad->pinst, ad->prealm, &vals1,
-			       &vals2, &retvals)) == KADM_DATA) {
-      *outlen = vals_to_stream(&retvals,datout);
-      return KADM_SUCCESS;
-  } else {
-      *outlen = 0;
-      return status;
-  }
-}
-
-int
-kadm_ser_delete(u_char *dat, int len, AUTH_DAT *ad, 
-		u_char **datout, int *outlen)
-{
-    Kadm_vals values;
-    int wh;
-    int status;
-    
-    if((wh = stream_to_vals(dat, &values, len)) < 0)
-	return KADM_LENGTH_ERROR;
-    if(wh != len)
-	return KADM_LENGTH_ERROR;
-    status = kadm_delete_entry(ad->pname, ad->pinst, ad->prealm, 
-			       &values);
-    *outlen = 0;
-    return status;
-}
-
-/*
-kadm_ser_get
-  recieves   : KTEXT, {values, flags}
-  returns    : CKSUM, RETCODE, {count, values, values, values}
-  acl        : su
-
-gets the fields requested by flags from all entries matching values
-returns this data for each matching recipient, after a count of how many such
-  matches there were
-*/
-int
-kadm_ser_get(u_char *dat, int len, AUTH_DAT *ad, u_char **datout, int *outlen)
-{
-  Kadm_vals values, retvals;
-  u_char fl[FLDSZ];
-  int loop,wh;
-  long status;
-
-  if ((wh = stream_to_vals(dat, &values, len)) < 0)
-      return KADM_LENGTH_ERROR;
-  if (wh + FLDSZ > len)
-      return KADM_LENGTH_ERROR;
-  for (loop=FLDSZ-1; loop>=0; loop--)
-    fl[loop] = dat[wh++];
-  if ((status = kadm_get_entry(ad->pname, ad->pinst, ad->prealm,
-			      &values, fl, &retvals)) == KADM_DATA) {
-      *outlen = vals_to_stream(&retvals,datout);
-      return KADM_SUCCESS;
-  } else {
-      *outlen = 0;
-      return status;
-  }
-}
-
diff --git a/crypto/kerberosIV/kadmin/kadm_server.h b/crypto/kerberosIV/kadmin/kadm_server.h
deleted file mode 100644
index c730574249dc..000000000000
--- a/crypto/kerberosIV/kadmin/kadm_server.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-/* $Id: kadm_server.h,v 1.10 1997/05/11 04:08:26 assar Exp $ */
-
-/*
- * Definitions for Kerberos administration server & client
- */
-
-#ifndef KADM_SERVER_DEFS
-#define KADM_SERVER_DEFS
-
-/*
- * kadm_server.h
- * Header file for the fourth attempt at an admin server
- * Doug Church, December 28, 1989, MIT Project Athena
- *    ps. Yes that means this code belongs to athena etc...
- *        as part of our ongoing attempt to copyright all greek names
- */
-
-typedef struct {
-  struct sockaddr_in admin_addr;
-  struct sockaddr_in recv_addr;
-  int recv_addr_len;
-  int admin_fd;			/* our link to clients */
-  char sname[ANAME_SZ];
-  char sinst[INST_SZ];
-  char krbrlm[REALM_SZ];
-  des_cblock master_key;
-  des_cblock session_key;
-  des_key_schedule master_key_schedule;
-  long master_key_version;
-} Kadm_Server;
-
-/* the default syslog file */
-#ifndef KADM_SYSLOG
-#define KADM_SYSLOG  "/var/log/admin_server.syslog"
-#endif /* KADM_SYSLOG */
-
-#ifndef DEFAULT_ACL_DIR
-#define DEFAULT_ACL_DIR	"/var/kerberos"
-#endif /* DEFAULT_ACL_DIR */
-#define	ADD_ACL_FILE	"/admin_acl.add"
-#define	GET_ACL_FILE	"/admin_acl.get"
-#define	MOD_ACL_FILE	"/admin_acl.mod"
-#define	DEL_ACL_FILE	"/admin_acl.del"
-
-#endif /* KADM_SERVER_DEFS */
diff --git a/crypto/kerberosIV/kadmin/kadmin.c b/crypto/kerberosIV/kadmin/kadmin.c
deleted file mode 100644
index f117b6b36a35..000000000000
--- a/crypto/kerberosIV/kadmin/kadmin.c
+++ /dev/null
@@ -1,845 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-/*
- * Kerberos database administrator's tool.  
- * 
- * The default behavior of kadmin is if the -m option is given 
- * on the commandline, multiple requests are allowed to be given
- * with one entry of the admin password (until the tickets expire).
- */
-
-#include "kadm_locl.h"
-
-RCSID("$Id: kadmin.c,v 1.48 1997/05/13 09:43:06 bg Exp $");
-
-static void change_password(int argc, char **argv);
-static void change_key(int argc, char **argv);
-static void change_admin_password(int argc, char **argv);
-static void add_new_key(int argc, char **argv);
-static void del_entry(int argc, char **argv);
-static void get_entry(int argc, char **argv);
-static void mod_entry(int argc, char **argv);
-static void help(int argc, char **argv);
-static void clean_up_cmd(int argc, char **argv);
-static void quit_cmd(int argc, char **argv);
-
-static SL_cmd cmds[] = {
-  {"change_password", change_password, "Change a user's password"},
-  {"cpw"},
-  {"passwd"},
-  {"change_key", change_key, "Change a user's password as a DES binary key"},
-  {"ckey"},
-  {"change_admin_password", change_admin_password,
-   "Change your admin password"},
-  {"cap"},
-  {"add_new_key", add_new_key, "Add new user to kerberos database"},
-  {"ank"},
-  {"del_entry", del_entry, "Delete entry from database"},
-  {"del"},
-  {"delete"},
-  {"get_entry", get_entry, "Get entry from kerberos database"},
-  {"mod_entry", mod_entry, "Modify entry in kerberos database"},
-  {"destroy_tickets", clean_up_cmd, "Destroy admin tickets"},
-  {"exit", quit_cmd, "Exit program"},
-  {"quit"},
-  {"help", help, "Help"},
-  {"?"},
-  {NULL}
-};
-
-#define BAD_PW 1
-#define GOOD_PW 0
-#define FUDGE_VALUE 15		/* for ticket expiration time */
-#define PE_NO 0
-#define PE_YES 1
-#define PE_UNSURE 2
-
-/* for get_password, whether it should do the swapping...necessary for
-   using vals structure, unnecessary for change_pw requests */
-#define DONTSWAP 0
-#define SWAP 1
-
-static krb_principal pr;
-static char default_realm[REALM_SZ]; /* default kerberos realm */
-static char krbrlm[REALM_SZ];	/* current realm being administered */
-static int multiple = 0;	/* Allow multiple requests per ticket */
-
-#ifdef NOENCRYPTION
-#define read_long_pw_string placebo_read_pw_string
-#else
-#define read_long_pw_string des_read_pw_string
-#endif
-
-static void
-get_maxlife(Kadm_vals *vals)
-{
-    char buff[BUFSIZ];
-    time_t life;
-    int l;
-
-    do {
-	printf("Maximum ticket lifetime?  (%d)  [%s]  ",
- 	     vals->max_life, krb_life_to_atime(vals->max_life));
-	fflush(stdout);
-	if (fgets(buff, sizeof(buff), stdin) == NULL || *buff == '\n') {
-	    clearerr(stdin);
-	    return;
-	}
-	life = krb_atime_to_life(buff);
-    } while (life <= 0);
-
-    l = strlen(buff);
-    if (buff[l-2] == 'm')
-	life = krb_time_to_life(0L, life*60);
-    if (buff[l-2] == 'h')
-	life = krb_time_to_life(0L, life*60*60);
-
-    vals->max_life = life;
-    SET_FIELD(KADM_MAXLIFE,vals->fields);
-}
-
-static void
-get_attr(Kadm_vals *vals)
-{
-    char buff[BUFSIZ], *out;
-    int attr;
-
-    do {
-	printf("Attributes?  [0x%.2x]  ", vals->attributes);
-	fflush(stdout);
-	if (fgets(buff, sizeof(buff), stdin) == NULL || *buff == '\n') {
-	    clearerr(stdin);
-	    return;
-	}
-        attr = strtol(buff, &out, 0);
-	if (attr == 0 && out == buff)
-	  attr = -1;
-    } while (attr < 0 || attr > 0xffff);
-
-    vals->attributes = attr;
-    SET_FIELD(KADM_ATTR,vals->fields);
-}
-
-static void
-get_expdate(Kadm_vals *vals)
-{
-    char buff[BUFSIZ];
-    struct tm edate;
-
-    memset(&edate, 0, sizeof(edate));
-    do {
-        printf("Expiration date (enter yyyy-mm-dd) ?  [%.24s]  ",
-             asctime(k_localtime(&vals->exp_date)));
-        fflush(stdout);
-        if (fgets(buff, sizeof(buff), stdin) == NULL || *buff == '\n') {
-            clearerr(stdin);
-            return;
-        }
-        if (sscanf(buff, "%d-%d-%d",
-                   &edate.tm_year, &edate.tm_mon, &edate.tm_mday) == 3) {
-            edate.tm_mon--;     /* January is 0, not 1 */
-            edate.tm_hour = 23; /* nearly midnight at the end of the */
-            edate.tm_min = 59;  /* specified day */
-        }
-    } while (krb_check_tm (edate));
-
-    edate.tm_year -= 1900;
-    vals->exp_date = tm2time (edate, 1);
-    SET_FIELD(KADM_EXPDATE,vals->fields);
-}
-
-static int
-princ_exists(char *name, char *instance, char *realm)
-{
-    int status;
-
-    status = krb_get_pw_in_tkt(name, instance, realm,
-			       KRB_TICKET_GRANTING_TICKET,
-			       realm, 1, "");
-
-    if ((status == KSUCCESS) || (status == INTK_BADPW))
-	return(PE_YES);
-    else if (status == KDC_PR_UNKNOWN)
-	return(PE_NO);
-    else
-	return(PE_UNSURE);
-}
-
-static int
-get_password(u_int32_t *low, u_int32_t *high, char *prompt, int byteswap)
-{
-    char new_passwd[MAX_KPW_LEN];	/* new password */
-    des_cblock newkey;
-
-    if (read_long_pw_string(new_passwd, sizeof(new_passwd)-1, prompt, 1))
-    	return(BAD_PW);
-    if (strlen(new_passwd) == 0) {
-    	printf("Using random password.\n");
-#ifdef NOENCRYPTION
-	memset(newkey, 0, sizeof(newkey));
-#else
-	des_new_random_key(&newkey);
-#endif
-    } else {
-#ifdef NOENCRYPTION
-      memset(newkey, 0, sizeof(newkey));
-#else
-      des_string_to_key(new_passwd, &newkey);
-#endif
-      memset(new_passwd, 0, sizeof(new_passwd));
-    }
-
-    memcpy(low, newkey, 4);
-    memcpy(high, ((char *)newkey) + 4, 4);
-
-    memset(newkey, 0, sizeof(newkey));
-
-#ifdef NOENCRYPTION
-    *low = 1;
-#endif
-
-    if (byteswap != DONTSWAP) {
-	*low = htonl(*low);
-	*high = htonl(*high);
-    }
-    return(GOOD_PW);
-}
-
-static int
-get_admin_password(void)
-{
-    int status;
-    char admin_passwd[MAX_KPW_LEN];	/* Admin's password */
-    int ticket_life = 1;	/* minimum ticket lifetime */
-    CREDENTIALS c;
-
-    if (multiple) {
-	/* If admin tickets exist and are valid, just exit. */
-	memset(&c, 0, sizeof(c));
-	if (krb_get_cred(PWSERV_NAME, KADM_SINST, krbrlm, &c) == KSUCCESS)
-	    /* 
-	     * If time is less than lifetime - FUDGE_VALUE after issue date,
-	     * tickets will probably last long enough for the next 
-	     * transaction.
-	     */
-	    if (time(0) < (c.issue_date + (5 * 60 * c.lifetime) - FUDGE_VALUE))
-		return(KADM_SUCCESS);
-	ticket_life = DEFAULT_TKT_LIFE;
-    }
-    
-    if (princ_exists(pr.name, pr.instance, pr.realm) != PE_NO) {
-        char prompt[256];
-	snprintf(prompt, sizeof(prompt), "%s's Password: ", krb_unparse_name(&pr));
-	if (read_long_pw_string(admin_passwd,
-				sizeof(admin_passwd)-1,
-				prompt, 0)) {
-	    warnx ("Error reading admin password.");
-	    goto bad;
-	}
-	status = krb_get_pw_in_tkt(pr.name, pr.instance, pr.realm,
-				   PWSERV_NAME, KADM_SINST,
-				   ticket_life, admin_passwd);
-	memset(admin_passwd, 0, sizeof(admin_passwd));
-
-	/* Initialize non shared random sequence from session key. */
-	memset(&c, 0, sizeof(c));
-	krb_get_cred(PWSERV_NAME, KADM_SINST, krbrlm, &c);
-	des_init_random_number_generator(&c.session);
-    }
-    else
-	status = KDC_PR_UNKNOWN;
-
-    switch(status) {
-    case GT_PW_OK:
-	return(GOOD_PW);
-    case KDC_PR_UNKNOWN:
-	printf("Principal %s does not exist.\n", krb_unparse_name(&pr));
-	goto bad;
-    case GT_PW_BADPW:
-	printf("Incorrect admin password.\n");
-	goto bad;
-    default:
-	com_err("kadmin", status+krb_err_base,
-		"while getting password tickets");
-	goto bad;
-    }
-    
- bad:
-    memset(admin_passwd, 0, sizeof(admin_passwd));
-    dest_tkt();
-    return(BAD_PW);
-}
-
-static void
-usage(void)
-{
-    fprintf (stderr, "Usage: kadmin [[-u|-p] admin_name] [-r default_realm]"
-	     " [-m]\n"
-	     "   -m allows multiple admin requests to be "
-	     "serviced with one entry of admin\n"	     
-	     "   password.\n");
-    exit (1);
-}
-
-/* GLOBAL */
-static void
-clean_up()
-{
-    dest_tkt();
-}
-
-static void
-clean_up_cmd (int argc, char **argv)
-{
-    clean_up();
-}
-
-/* GLOBAL */
-static void 
-quit()
-{
-    printf("Cleaning up and exiting.\n");
-    clean_up();
-    exit(0);
-}
-
-static void
-quit_cmd (int argc, char **argv)
-{
-    quit();
-}
-
-static void
-do_init(int argc, char **argv)
-{
-    int c;
-    int tflag = 0;
-    char tktstring[MaxPathLen];
-    int k_errno;
-    
-    set_progname (argv[0]);
-
-    memset(&pr, 0, sizeof(pr));
-    if (krb_get_default_principal(pr.name, pr.instance, default_realm) < 0)
-	errx (1, "I could not even guess who you might be");
-    while ((c = getopt(argc, argv, "p:u:r:mt")) != EOF) 
-	switch (c) {
-	case 'p':
-	case 'u':
-	    if((k_errno = krb_parse_name(optarg, &pr)) != KSUCCESS)
-		errx (1, "%s", krb_get_err_text(k_errno));
-	    break;
-	case 'r':
-	    memset(default_realm, 0, sizeof(default_realm));
-	    strncpy(default_realm, optarg, sizeof(default_realm) - 1);
-	    break;
-	case 'm':
-	    multiple++;
-	    break;
-	case 't':
-	    tflag++;
-	    break;
-	default:
-	    usage();
-	    break;
-	}
-    if (optind < argc)
-	usage();
-    strcpy(krbrlm, default_realm);
-
-    if (kadm_init_link(PWSERV_NAME, KRB_MASTER, krbrlm) != KADM_SUCCESS)
-	*krbrlm = '\0';
-    if (pr.realm[0] == '\0')
-	strcpy (pr.realm, krbrlm);
-    if (pr.instance[0] == '\0')
-	strcpy(pr.instance, "admin");
-    
-    if (!tflag) {
-	snprintf(tktstring, sizeof(tktstring), TKT_ROOT "_adm_%d",(int)getpid());
-	krb_set_tkt_string(tktstring);
-    }
-    
-}
-
-int
-main(int argc, char **argv)
-{
-    do_init(argc, argv);
-
-    printf("Welcome to the Kerberos Administration Program, version 2\n");
-    printf("Type \"help\" if you need it.\n");
-    sl_loop (cmds, "kadmin: ");
-    printf("\n");
-    quit();
-    exit(0);
-}
-
-static int
-setvals(Kadm_vals *vals, char *string)
-{
-    char realm[REALM_SZ];
-    int status = KADM_SUCCESS;
-
-    memset(vals, 0, sizeof(*vals));
-    memset(realm, 0, sizeof(realm));
-
-    SET_FIELD(KADM_NAME,vals->fields);
-    SET_FIELD(KADM_INST,vals->fields);
-    if ((status = kname_parse(vals->name, vals->instance, realm, string))) {
-	printf("kerberos error: %s\n", krb_get_err_text(status));
-	return status;
-    }
-    if (!realm[0])
-	strcpy(realm, default_realm);
-    if (strcmp(realm, krbrlm)) {
-	strcpy(krbrlm, realm);
-	if ((status = kadm_init_link(PWSERV_NAME, KRB_MASTER, krbrlm)) 
-	    != KADM_SUCCESS)
-	    printf("kadm error for realm %s: %s\n", 
-		   krbrlm, error_message(status));
-    }
-    if (status) 
-	return 1;
-    else
-	return KADM_SUCCESS;
-}    
-
-static void 
-change_password(int argc, char **argv)
-{
-    Kadm_vals old, new;
-    int status;
-    char pw_prompt[BUFSIZ];
-
-    if (argc != 2) {
-	printf("Usage: change_password loginname\n");
-	return;
-    }
-
-    if (setvals(&old, argv[1]) != KADM_SUCCESS)
-	return;
-
-    new = old;
-
-    SET_FIELD(KADM_DESKEY,new.fields);
-
-    if (princ_exists(old.name, old.instance, krbrlm) != PE_NO) {
-	/* get the admin's password */
-        if (get_admin_password() != GOOD_PW)
-	    return;
-
-	/* get the new password */
-	snprintf(pw_prompt, sizeof(pw_prompt), "New password for %s:", argv[1]);
-	
-	if (get_password(&new.key_low, &new.key_high,
-			 pw_prompt, SWAP) == GOOD_PW) {
-	    status = kadm_mod(&old, &new);
-	    if (status == KADM_SUCCESS) {
-		printf("Password changed for %s.\n", argv[1]);
-	    } else {
-		printf("kadmin: %s\nwhile changing password for %s",
-		       error_message(status), argv[1]);
-	    }
-	} else
-	    printf("Error reading password; password unchanged\n");
-	memset(&new, 0, sizeof(new));
-	if (!multiple)
-	    clean_up();
-    }
-    else 
-	printf("kadmin: Principal %s does not exist.\n",
-	       krb_unparse_name_long (old.name, old.instance, krbrlm));
-    return;
-}
-
-static int
-getkey(unsigned char *k)
-{
-    int i, c;
-    for (i = 0; i < 8; i++)
-	{
-	    c = getchar();
-	    if (c == EOF)
-		return 0;
-	    else if (c == '\\')
-		{
-		    int oct = -1;
-		    scanf("%03o", &oct);
-		    if (oct < 0 || oct > 255)
-			return 0;
-		    k[i] = oct;
-		}
-	    else if (!isalpha(c))
-		return 0;
-	    else
-		k[i] = c;
-	}
-    c = getchar();
-    if (c != '\n')
-	return 0;
-    return 1;			/* Success */
-}
-
-static void
-printkey(unsigned char *tkey)
-{
-    int j;
-    for(j = 0; j < 8; j++)
-	if(tkey[j] != '\\' && isalpha(tkey[j]) != 0)
-	    printf("%c", tkey[j]);
-	else
-	    printf("\\%03o",(unsigned char)tkey[j]);
-    printf("\n");
-}
-
-static void 
-change_key(int argc, char **argv)
-{
-    Kadm_vals old, new;
-    unsigned char newkey[8];
-    int status;
-
-    if (argc != 2) {
-	printf("Usage: change_key principal-name\n");
-	return;
-    }
-
-    if (setvals(&old, argv[1]) != KADM_SUCCESS)
-	return;
-
-    new = old;
-
-    SET_FIELD(KADM_DESKEY,new.fields);
-
-    if (princ_exists(old.name, old.instance, krbrlm) != PE_NO) {
-	/* get the admin's password */
-        if (get_admin_password() != GOOD_PW)
-	    return;
-
-	/* get the new password */
-	printf("New DES key for %s: ", argv[1]);
-	
-	if (getkey(newkey)) {
-	    memcpy(&new.key_low, newkey, 4);
-	    memcpy(&new.key_high, ((char *)newkey) + 4, 4);
-	    printf("Entered key for %s: ", argv[1]);
-	    printkey(newkey);
-	    memset(newkey, 0, sizeof(newkey));
-
-	    status = kadm_mod(&old, &new);
-	    if (status == KADM_SUCCESS) {
-		printf("Key changed for %s.\n", argv[1]);
-	    } else {
-		printf("kadmin: %s\nwhile changing key for %s",
-		       error_message(status), argv[1]);
-	    }
-	} else
-	    printf("Error reading key; key unchanged\n");
-	memset(&new, 0, sizeof(new));
-	if (!multiple)
-	    clean_up();
-    }
-    else 
-	printf("kadmin: Principal %s does not exist.\n",
-	       krb_unparse_name_long (old.name, old.instance, krbrlm));
-    return;
-}
-
-static void 
-change_admin_password(int argc, char **argv)
-{
-    des_cblock newkey;
-    int status;
-    char pword[MAX_KPW_LEN];
-    char *pw_msg;
-
-    if (argc != 1) {
-	printf("Usage: change_admin_password\n");
-	return;
-    }
-    if (get_pw_new_pwd(pword, sizeof(pword), &pr, 1) == 0) {
-	 des_string_to_key(pword, &newkey);
-	 status = kadm_change_pw_plain(newkey, pword, &pw_msg);
-	 if(status == KADM_INSECURE_PW)
-	      printf("Insecure password: %s\n", pw_msg);
-	 else if (status == KADM_SUCCESS)
-	      printf("Admin password changed\n");
-	 else
-	      printf("kadm error: %s\n",error_message(status));
-	 memset(newkey, 0, sizeof(newkey));
-	 memset(pword, 0, sizeof(pword));
-    }
-    if (!multiple)
-	clean_up();
-    return;
-}
-
-static void 
-add_new_key(int argc, char **argv)
-{
-    Kadm_vals new;
-    char pw_prompt[BUFSIZ];
-    int status;
-
-    if (argc != 2) {
-	printf("Usage: add_new_key user_name.\n");
-	return;
-    }
-    if (setvals(&new, argv[1]) != KADM_SUCCESS)
-	return;
-
-    SET_FIELD(KADM_EXPDATE,new.fields);
-    SET_FIELD(KADM_ATTR,new.fields);
-    SET_FIELD(KADM_MAXLIFE,new.fields);
-    SET_FIELD(KADM_DESKEY,new.fields);
-
-    if (princ_exists(new.name, new.instance, krbrlm) != PE_YES) {
-	Kadm_vals vals;
-	u_char fields[4];
-	char n[ANAME_SZ + INST_SZ + 1];
-
-	/* get the admin's password */
-	if (get_admin_password() != GOOD_PW)
-	    return;
-	
-	memset(fields, 0, sizeof(fields));
-	SET_FIELD(KADM_NAME,fields);
-	SET_FIELD(KADM_INST,fields);
-	SET_FIELD(KADM_EXPDATE,fields);
-	SET_FIELD(KADM_ATTR,fields);
-	SET_FIELD(KADM_MAXLIFE,fields);
-	snprintf (n, sizeof(n), "default.%s", new.instance);
-	if (setvals(&vals, n) != KADM_SUCCESS)
-	    return;
-
-	if (kadm_get(&vals, fields) != KADM_SUCCESS) {
-	    if (setvals(&vals, "default") != KADM_SUCCESS)
-		return;
-	    if ((status = kadm_get(&vals, fields)) != KADM_SUCCESS) {
-		printf ("kadm error: %s\n", error_message(status));
-		return;
-	    }
-	}
-
-	if (vals.max_life == 255) /* Defaults not set! */ {
-	      /* This is the default maximum lifetime for new principals. */
-	      if (strcmp(new.instance, "admin") == 0)
-		vals.max_life = 1 + (CLOCK_SKEW/(5*60)); /* 5+5 minutes */
-	      else if (strcmp(new.instance, "root") == 0)
-		vals.max_life = 96;    /* 8 hours */
-	      else if (krb_life_to_time(0, 162) >= 24*60*60)
-		vals.max_life = 162;     /* ca 100 hours */
-	      else
-		vals.max_life = 255;     /* ca 21 hours (maximum) */
-
-	      /* Also fix expiration date. */
-	      if (strcmp(new.name, "rcmd") == 0)
-		vals.exp_date = 1104814999; /* Tue Jan 4 06:03:19 2005 */
-	      else
-		vals.exp_date = time(0) + 2*(365*24*60*60); /* + ca 2 years */
-	}
-
-	new.max_life = vals.max_life;
-	new.exp_date = vals.exp_date;
-	new.attributes = vals.attributes;
-	get_maxlife(&new);
-	get_attr(&new);
-	get_expdate(&new);
-
-	/* get the new password */
-	snprintf(pw_prompt, sizeof(pw_prompt), "Password for %s:", argv[1]);
-	
-	if (get_password(&new.key_low, &new.key_high,
-			 pw_prompt, SWAP) == GOOD_PW) {
-	    status = kadm_add(&new);
-	    if (status == KADM_SUCCESS) {
-		printf("%s added to database.\n", argv[1]);
-	    } else {
-		printf("kadm error: %s\n",error_message(status));
-	    }
-	} else
-	    printf("Error reading password; %s not added\n",argv[1]);
-	memset(&new, 0, sizeof(new));
-	if (!multiple)
-	    clean_up();
-    }
-    else
-	printf("kadmin: Principal already exists.\n");
-    return;
-}
-
-static void 
-del_entry(int argc, char **argv)
-{
-    int status;
-    Kadm_vals vals;
-
-    if (argc != 2) {
-	printf("Usage: del_entry username\n");
-	return;
-    }
-
-    if (setvals(&vals, argv[1]) != KADM_SUCCESS)
-	return;
-
-    if (princ_exists(vals.name, vals.instance, krbrlm) != PE_NO) {
-	/* get the admin's password */
-	if (get_admin_password() != GOOD_PW)
-	    return;
-	
-	if ((status = kadm_del(&vals)) == KADM_SUCCESS){
-	    printf("%s removed from database.\n", argv[1]);
-	} else {
-	    printf("kadm error: %s\n",error_message(status));
-	}
-	
-	if (!multiple)
-	    clean_up();
-    }
-    else
-	printf("kadmin: Principal %s does not exist.\n",
-	       krb_unparse_name_long (vals.name, vals.instance, krbrlm));
-    return;
-}
-
-static void 
-get_entry(int argc, char **argv)
-{
-    int status;
-    u_char fields[4];
-    Kadm_vals vals;
-
-    if (argc != 2) {
-	printf("Usage: get_entry username\n");
-	return;
-    }
-
-    memset(fields, 0, sizeof(fields));
-
-    SET_FIELD(KADM_NAME,fields);
-    SET_FIELD(KADM_INST,fields);
-    SET_FIELD(KADM_EXPDATE,fields);
-    SET_FIELD(KADM_ATTR,fields);
-    SET_FIELD(KADM_MAXLIFE,fields);
-#if 0
-    SET_FIELD(KADM_DESKEY,fields); 
-#endif
-
-    if (setvals(&vals, argv[1]) != KADM_SUCCESS)
-	return;
-
-
-    if (princ_exists(vals.name, vals.instance, krbrlm) != PE_NO) {
-	/* get the admin's password */
-	if (get_admin_password() != GOOD_PW)
-	    return;
-	
-	if ((status = kadm_get(&vals, fields)) == KADM_SUCCESS)
-	    prin_vals(&vals);
-	else
-	    printf("kadm error: %s\n",error_message(status));
-	
-	if (!multiple)
-	    clean_up();
-    }
-    else
-	printf("kadmin: Principal %s does not exist.\n",
-	       krb_unparse_name_long (vals.name, vals.instance, krbrlm));
-    return;
-}
-
-static void 
-mod_entry(int argc, char **argv)
-{
-    int status;
-    u_char fields[4];
-    Kadm_vals ovals, nvals;
-
-    if (argc != 2) {
-	printf("Usage: mod_entry username\n");
-	return;
-    }
-
-    memset(fields, 0, sizeof(fields));
-
-    SET_FIELD(KADM_NAME,fields);
-    SET_FIELD(KADM_INST,fields);
-    SET_FIELD(KADM_EXPDATE,fields);
-    SET_FIELD(KADM_ATTR,fields);
-    SET_FIELD(KADM_MAXLIFE,fields);
-
-    if (setvals(&ovals, argv[1]) != KADM_SUCCESS)
-	return;
-
-    nvals = ovals;
-
-    if (princ_exists(ovals.name, ovals.instance, krbrlm) == PE_NO) {
-	printf("kadmin: Principal %s does not exist.\n",
-	       krb_unparse_name_long (ovals.name, ovals.instance, krbrlm));
-	return;
-    }
-
-    /* get the admin's password */
-    if (get_admin_password() != GOOD_PW)
-	return;
-	
-    if ((status = kadm_get(&ovals, fields)) != KADM_SUCCESS) {
-	printf("[ unable to retrieve current settings: %s ]\n",
-	    error_message(status));
-	nvals.max_life = DEFAULT_TKT_LIFE;
-	nvals.exp_date = 0;
-	nvals.attributes = 0;
-    } else {
-	nvals.max_life = ovals.max_life;
-	nvals.exp_date = ovals.exp_date;
-	nvals.attributes = ovals.attributes;
-    }
-
-    get_maxlife(&nvals);
-    get_attr(&nvals);
-    get_expdate(&nvals);
-    
-    if (IS_FIELD(KADM_MAXLIFE, nvals.fields) ||
-	IS_FIELD(KADM_ATTR, nvals.fields) ||
-	IS_FIELD(KADM_EXPDATE, nvals.fields)) {
-	if ((status = kadm_mod(&ovals, &nvals)) != KADM_SUCCESS) {
-	    printf("kadm error: %s\n",error_message(status));
-	    goto out;
-	}
-	if ((status = kadm_get(&ovals, fields)) != KADM_SUCCESS) {
-	    printf("kadm error: %s\n",error_message(status));
-	    goto out;
-	}
-    }
-    prin_vals(&ovals);
-
-out:
-    if (!multiple)
-	clean_up();
-    return;
-}
-
-static void
-help(int argc, char **argv)
-{
-    sl_help (cmds, argc, argv);
-}
diff --git a/crypto/kerberosIV/kadmin/kpasswd.c b/crypto/kerberosIV/kadmin/kpasswd.c
deleted file mode 100644
index f4c0cdabc8dc..000000000000
--- a/crypto/kerberosIV/kadmin/kpasswd.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-/*
- * change your password with kerberos
- */
-
-#include "kadm_locl.h"
-
-RCSID("$Id: kpasswd.c,v 1.25 1997/05/02 14:28:51 assar Exp $");
-
-static void
-usage(int value)
-{
-    fprintf(stderr, "Usage: ");
-    fprintf(stderr, "kpasswd [-h ] [-n user] [-i instance] [-r realm] ");
-    fprintf(stderr, "[-u fullname]\n");
-    exit(value);
-}
-
-int
-main(int argc, char **argv)
-{
-    krb_principal principal;
-    krb_principal default_principal;
-    int realm_given = 0;	/* True if realm was give on cmdline */
-    int use_default = 1;	/* True if we should use default name */
-    int status;			/* return code */
-    char pword[MAX_KPW_LEN];
-    int c;
-    char tktstring[MaxPathLen];
-    
-    set_progname (argv[0]);
-
-    memset (&principal, 0, sizeof(principal));
-    memset (&default_principal, 0, sizeof(default_principal));
-    
-    krb_get_default_principal (default_principal.name,
-			       default_principal.instance,
-			       default_principal.realm);
-
-    while ((c = getopt(argc, argv, "u:n:i:r:h")) != EOF) {
-	switch (c) {
-	case 'u':
-	    status = krb_parse_name (optarg, &principal);
-	    if (status != KSUCCESS)
-		errx (2, "%s", krb_get_err_text(status));
-	    if (principal.realm[0])
-		realm_given++;
-	    else if (krb_get_lrealm(principal.realm, 1) != KSUCCESS)
-		errx (1, "Could not find default realm!");
-	    break;
-	case 'n':
-	    if (k_isname(optarg))
-		strncpy(principal.name, optarg, sizeof(principal.name) - 1);
-	    else {
-		warnx("Bad name: %s", optarg);
-		usage(1);
-	    }
-	    break;
-	case 'i':
-	    if (k_isinst(optarg))
-		strncpy(principal.instance,
-			optarg,
-			sizeof(principal.instance) - 1);
-	    else {
-		warnx("Bad instance: %s", optarg);
-		usage(1);
-	    }
-	    break;
-	case 'r':
-	    if (k_isrealm(optarg)) {
-		strncpy(principal.realm, optarg, sizeof(principal.realm) - 1);
-		realm_given++; 
-	    } else {
-		warnx("Bad realm: %s", optarg);
-		usage(1);
-	    }
-	    break;
-	case 'h':
-	    usage(0);
-	    break;
-	default:
-	    usage(1);
-	    break;
-	}
-	use_default = 0;
-    }
-    if (optind < argc) {
-	use_default = 0;
-	status = krb_parse_name (argv[optind], &principal);
-	if(status != KSUCCESS)
-	    errx (1, "%s", krb_get_err_text (status));
-    }
-
-    if (use_default) {
-	strcpy(principal.name, default_principal.name);
-	strcpy(principal.instance, default_principal.instance);
-	strcpy(principal.realm, default_principal.realm);
-    } else {
-	if (!principal.name[0])
-	    strcpy(principal.name, default_principal.name);
-	if (!principal.realm[0])
-	    strcpy(principal.realm, default_principal.realm);
-    }
-
-    snprintf(tktstring, sizeof(tktstring),
-	     TKT_ROOT "_cpw_%u", (unsigned)getpid());
-    krb_set_tkt_string(tktstring);
-    
-    if (get_pw_new_pwd(pword, sizeof(pword), &principal,
-		       realm_given)) {
-	dest_tkt ();
-	exit(1);
-    }
-    
-    status = kadm_init_link (PWSERV_NAME, KRB_MASTER, principal.realm);
-    if (status != KADM_SUCCESS) 
-	com_err(argv[0], status, "while initializing");
-    else {
-	des_cblock newkey;
-	char *pw_msg; /* message from server */
-
-	des_string_to_key(pword, &newkey);
-	status = kadm_change_pw_plain((unsigned char*)&newkey, pword, &pw_msg);
-	memset(newkey, 0, sizeof(newkey));
-      
-	if (status == KADM_INSECURE_PW)
-	    warnx ("Insecure password: %s", pw_msg);
-	else if (status != KADM_SUCCESS)
-	    com_err(argv[0], status, " attempting to change password.");
-    }
-    memset(pword, 0, sizeof(pword));
-
-    if (status != KADM_SUCCESS)
-	fprintf(stderr,"Password NOT changed.\n");
-    else
-	printf("Password changed.\n");
-
-    dest_tkt();
-    if (status)
-	return 2;
-    else 
-	return 0;
-}
diff --git a/crypto/kerberosIV/kadmin/kpasswd_standalone.c b/crypto/kerberosIV/kadmin/kpasswd_standalone.c
deleted file mode 100644
index 443daa8991ea..000000000000
--- a/crypto/kerberosIV/kadmin/kpasswd_standalone.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Copyright 1988 by the Massachusetts Institute of Technology.
- *
- * For copying and distribution information, please see the file
- * Copyright.MIT.
- *
- * change your password with kerberos
- */
-
-#ifndef	lint
-#if 0
-static char rcsid_kpasswd_c[] =
-    "BonesHeader: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kpasswd.c,v 4.3 89/09/26 09:33:02 jtkohl Exp ";
-#endif
-static const char rcsid[] =
-	"$Id$";
-#endif	lint
-
-/*
- * kpasswd
- * change your password with kerberos
- */
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <com_err.h>
-#include <err.h>
-#include <krb.h>
-#include <string.h>
-#include <pwd.h>
-#include <unistd.h>
-#include "kadm.h"
-
-#include "extern.h"
-
-extern void krb_set_tkt_string();
-static void go_home(char *, int);
-
-
-int krb_passwd(char *uname, char *iflag, char *rflag, char *uflag)
-{
-    char name[ANAME_SZ];	/* name of user */
-    char inst[INST_SZ];		/* instance of user */
-    char realm[REALM_SZ];	/* realm of user */
-    char default_name[ANAME_SZ];
-    char default_inst[INST_SZ];
-    char default_realm[REALM_SZ];
-    int realm_given = 0;	/* True if realm was give on cmdline */
-    int use_default = 1;	/* True if we should use default name */
-    struct passwd *pw;
-    int status;			/* return code */
-    des_cblock new_key;
-    extern char *optarg;
-    extern int optind;
-    char tktstring[MAXPATHLEN];
-
-    void get_pw_new_key();
-
-#ifdef NOENCRYPTION
-#define read_long_pw_string placebo_read_pw_string
-#else
-#define read_long_pw_string des_read_pw_string
-#endif
-    int read_long_pw_string();
-
-    bzero(name, sizeof(name));
-    bzero(inst, sizeof(inst));
-    bzero(realm, sizeof(realm));
-
-    if (krb_get_tf_fullname(TKT_FILE, default_name, default_inst,
-			    default_realm) != KSUCCESS) {
-	pw = getpwuid((int) getuid());
-	if (pw) {
-		strcpy(default_name, pw->pw_name);
-	} else {
-	    /* seems like a null name is kinda silly */
-		strcpy(default_name, "");
-	}
-	strcpy(default_inst, "");
-	if (krb_get_lrealm(default_realm, 1) != KSUCCESS)
-	    strcpy(default_realm, KRB_REALM);
-    }
-
-    if(uflag) {
-	    if ((status = kname_parse(name, inst, realm, uflag))) {
-		    errx(2, "Kerberos error: %s", krb_err_txt[status]);
-	    }
-	    if (realm[0])
-		realm_given++;
-	    else
-		if (krb_get_lrealm(realm, 1) != KSUCCESS)
-		    strcpy(realm, KRB_REALM);
-    }
-
-    if(uname) {
-	    if (k_isname(uname)) {
-		    strncpy(name, uname, sizeof(name) - 1);
-	    } else {
-		    errx(1, "bad name: %s", uname);
-	    }
-    }
-
-    if(iflag) {
-	    if (k_isinst(iflag)) {
-		    strncpy(inst, iflag, sizeof(inst) - 1);
-	    } else {
-		    errx(1, "bad instance: %s", iflag);
-	    }
-    }
-
-    if(rflag) {
-	    if (k_isrealm(rflag)) {
-		    strncpy(realm, rflag, sizeof(realm) - 1);
-		    realm_given++;
-	    } else {
-		    errx(1, "bad realm: %s", rflag);
-	    }
-    }
-
-    if(uname || iflag || rflag || uflag) use_default = 0;
-
-    if (use_default) {
-	strcpy(name, default_name);
-	strcpy(inst, default_inst);
-	strcpy(realm, default_realm);
-    } else {
-	if (!name[0])
-	    strcpy(name, default_name);
-	if (!realm[0])
-	    strcpy(realm, default_realm);
-    }
-
-    (void) sprintf(tktstring, "/tmp/tkt_cpw_%d",getpid());
-    krb_set_tkt_string(tktstring);
-
-    get_pw_new_key(new_key, name, inst, realm, realm_given);
-
-    if ((status = kadm_init_link("changepw", KRB_MASTER, realm))
-	!= KADM_SUCCESS)
-	com_err("kpasswd", status, "while initializing");
-    else if ((status = kadm_change_pw(new_key)) != KADM_SUCCESS)
-	com_err("kpasswd", status, " attempting to change password.");
-
-    if (status != KADM_SUCCESS)
-	fprintf(stderr,"Password NOT changed.\n");
-    else
-	printf("Password changed.\n");
-
-    (void) dest_tkt();
-    if (status)
-	exit(2);
-    else
-	exit(0);
-}
-
-void get_pw_new_key(new_key, name, inst, realm, print_realm)
-  des_cblock new_key;
-  char *name;
-  char *inst;
-  char *realm;
-  int print_realm;		/* True if realm was give on cmdline */
-{
-    char ppromp[40+ANAME_SZ+INST_SZ+REALM_SZ]; /* for the password prompt */
-    char pword[MAX_KPW_LEN];	               /* storage for the password */
-    char npromp[40+ANAME_SZ+INST_SZ+REALM_SZ]; /* for the password prompt */
-
-    char local_realm[REALM_SZ];
-    int status;
-
-    /*
-     * We don't care about failure; this is to determine whether or
-     * not to print the realm in the prompt for a new password.
-     */
-    (void) krb_get_lrealm(local_realm, 1);
-
-    if (strcmp(local_realm, realm))
-	print_realm++;
-
-    (void) sprintf(ppromp,"Old password for %s%s%s%s%s:",
-		   name, *inst ? "." : "", inst,
-		   print_realm ? "@" : "", print_realm ? realm : "");
-    if (read_long_pw_string(pword, sizeof(pword)-1, ppromp, 0)) {
-	fprintf(stderr, "Error reading old password.\n");
-	exit(1);
-    }
-
-    if ((status = krb_get_pw_in_tkt(name, inst, realm, PWSERV_NAME,
-				    KADM_SINST, 1, pword)) != KSUCCESS) {
-	if (status == INTK_BADPW) {
-	    printf("Incorrect old password.\n");
-	    exit(0);
-	}
-	else {
-	    fprintf(stderr, "Kerberos error: %s\n", krb_err_txt[status]);
-	    exit(1);
-	}
-    }
-    bzero(pword, sizeof(pword));
-    do {
-	(void) sprintf(npromp,"New Password for %s%s%s%s%s:",
-		       name, *inst ? "." : "", inst,
-		       print_realm ? "@" : "", print_realm ? realm : "");
-	if (read_long_pw_string(pword, sizeof(pword)-1, npromp, 1))
-	    go_home("Error reading new password, password unchanged.\n",0);
-	if (strlen(pword) == 0)
-	    printf("Null passwords are not allowed; try again.\n");
-    } while (strlen(pword) == 0);
-
-#ifdef NOENCRYPTION
-    bzero((char *) new_key, sizeof(des_cblock));
-    new_key[0] = (unsigned char) 1;
-#else
-    (void) des_string_to_key(pword, (des_cblock *)new_key);
-#endif
-    bzero(pword, sizeof(pword));
-}
-
-static void
-go_home(str,x)
-  char *str;
-  int x;
-{
-    fprintf(stderr, str, x);
-    (void) dest_tkt();
-    exit(1);
-}
diff --git a/crypto/kerberosIV/kadmin/ksrvutil.c b/crypto/kerberosIV/kadmin/ksrvutil.c
deleted file mode 100644
index 108481c0dfef..000000000000
--- a/crypto/kerberosIV/kadmin/ksrvutil.c
+++ /dev/null
@@ -1,601 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-/*
- * list and update contents of srvtab files
- */
-
-/*
- * ksrvutil
- * list and update the contents of srvtab files
- */
-
-#include "kadm_locl.h"
-
-RCSID("$Id: ksrvutil.c,v 1.39 1997/05/02 14:28:52 assar Exp $");
-
-#include "ksrvutil.h"
-
-#ifdef NOENCRYPTION
-#define read_long_pw_string placebo_read_pw_string
-#else /* NOENCRYPTION */
-#define read_long_pw_string des_read_pw_string
-#endif /* NOENCRYPTION */
-
-#define SRVTAB_MODE 0600	/* rw------- */
-#define PAD "  "
-#define VNO_HEADER "Version"
-#define VNO_FORMAT "%4d   "
-#define KEY_HEADER "       Key       " /* 17 characters long */
-#define PRINC_HEADER "  Principal\n"
-#define PRINC_FORMAT "%s"
-
-char u_name[ANAME_SZ];
-char u_inst[INST_SZ];
-char u_realm[REALM_SZ];
-
-int destroyp = FALSE;		/* Should the ticket file be destroyed? */
-
-static unsigned short
-get_mode(char *filename)
-{
-    struct stat statbuf;
-    unsigned short mode;
-
-    memset(&statbuf, 0, sizeof(statbuf));
-    
-    if (stat(filename, &statbuf) < 0) 
-	mode = SRVTAB_MODE;
-    else
-	mode = statbuf.st_mode;
-
-    return(mode);
-}
-
-static void
-copy_keyfile(char *keyfile, char *backup_keyfile)
-{
-    int keyfile_fd;
-    int backup_keyfile_fd;
-    int keyfile_mode;
-    char buf[BUFSIZ];		/* for copying keyfiles */
-    int rcount;			/* for copying keyfiles */
-    int try_again;
-    
-    memset(buf, 0, sizeof(buf));
-    
-    do {
-	try_again = FALSE;
-	if ((keyfile_fd = open(keyfile, O_RDONLY, 0)) < 0) {
-	    if (errno != ENOENT)
-	      err (1, "read %s", keyfile);
-	    else {
-		try_again = TRUE;
-		if ((keyfile_fd = 
-		     open(keyfile, 
-			  O_WRONLY | O_TRUNC | O_CREAT, SRVTAB_MODE)) < 0)
-		  err(1, "create %s", keyfile);
-		else
-		    if (close(keyfile_fd) < 0)
-		      err (1, "close %s", keyfile);
-	    }
-	}
-    } while(try_again);
-
-    keyfile_mode = get_mode(keyfile);
-
-    if ((backup_keyfile_fd = 
-	 open(backup_keyfile, O_WRONLY | O_TRUNC | O_CREAT, 
-	      keyfile_mode)) < 0)
-	err (1, "write %s", backup_keyfile);
-    do {
-	if ((rcount = read(keyfile_fd, buf, sizeof(buf))) < 0)
-	    err (1, "read %s", keyfile);
-	if (rcount && (write(backup_keyfile_fd, buf, rcount) != rcount))
-	    err (1, "write %s", backup_keyfile);
-    } while (rcount);
-    if (close(backup_keyfile_fd) < 0)
-	err(1, "close %s", backup_keyfile);
-    if (close(keyfile_fd) < 0)
-	err(1, "close %s", keyfile);
-}
-
-void
-leave(char *str, int x)
-{
-    if (str)
-	fprintf(stderr, "%s\n", str);
-    if (destroyp)
-	 dest_tkt();
-    exit(x);
-}
-
-void
-safe_read_stdin(char *prompt, char *buf, size_t size)
-{
-    printf("%s", prompt);
-    fflush(stdout);
-    memset(buf, 0, size);
-    if (read(0, buf, size - 1) < 0) {
-	warn("read stdin");
-	leave(NULL, 1);
-    }
-    buf[strlen(buf)-1] = 0;
-}
-
-void
-safe_write(char *filename, int fd, void *buf, size_t len)
-{
-    if (write(fd, buf, len) != len) {
-	warn("write %s", filename);
-	close(fd);
-	leave("In progress srvtab in this file.", 1);
-    }
-}
-
-static int
-yes_no(char *string, int dflt)
-{
-  char ynbuf[5];
-  
-  printf("%s (y,n) [%c]", string, dflt?'y':'n');
-  for (;;) {
-    safe_read_stdin("", ynbuf, sizeof(ynbuf));
-    
-    if ((ynbuf[0] == 'n') || (ynbuf[0] == 'N'))
-      return(0);
-    else if ((ynbuf[0] == 'y') || (ynbuf[0] == 'Y'))
-      return(1);
-    else if(ynbuf[0] == 0)
-      return dflt;
-    else {
-      printf("Please enter 'y' or 'n': ");
-      fflush(stdout);
-    }
-  }
-}
-
-int yn(char *string)
-{
-  return yes_no(string, 1);
-}
-
-int ny(char *string)
-{
-  return yes_no(string, 0);
-}
-
-static void
-append_srvtab(char *filename, int fd, char *sname, char *sinst, char *srealm, unsigned char key_vno, unsigned char *key)
-{
-  /* Add one to append null */
-    safe_write(filename, fd, sname, strlen(sname) + 1);
-    safe_write(filename, fd, sinst, strlen(sinst) + 1);
-    safe_write(filename, fd, srealm, strlen(srealm) + 1);
-    safe_write(filename, fd, &key_vno, 1);
-    safe_write(filename, fd, key, sizeof(des_cblock));
-    fsync(fd);
-}    
-
-static void
-print_key(unsigned char *key)
-{
-    int i;
-
-    for (i = 0; i < 4; i++)
-	printf("%02x", key[i]);
-    printf(" ");
-    for (i = 4; i < 8; i++)
-	printf("%02x", key[i]);
-}
-
-static void
-print_name(char *name, char *inst, char *realm)
-{
-    printf("%s", krb_unparse_name_long(name, inst, realm));
-}
-
-static int
-get_svc_new_key(des_cblock *new_key, char *sname, char *sinst,
-		char *srealm, char *keyfile)
-{
-    int status = KADM_SUCCESS;
-
-    if (((status = krb_get_svc_in_tkt(sname, sinst, srealm, PWSERV_NAME,
-				      KADM_SINST, 1, keyfile)) == KSUCCESS) &&
-	((status = kadm_init_link(PWSERV_NAME, KRB_MASTER, srealm)) == 
-	 KADM_SUCCESS)) {
-#ifdef NOENCRYPTION
-	memset(new_key, 0, sizeof(des_cblock));
-	(*new_key)[0] = (unsigned char) 1;
-#else /* NOENCRYPTION */
-	des_new_random_key(new_key);
-#endif /* NOENCRYPTION */
-	return(KADM_SUCCESS);
-    }
-    
-    return(status);
-}
-
-static void
-get_key_from_password(des_cblock (*key), char *cellname)
-{
-    char password[MAX_KPW_LEN];	/* storage for the password */
-
-    if (read_long_pw_string(password, sizeof(password)-1, "Password: ", 1))
-	leave("Error reading password.", 1);
-
-#ifdef NOENCRYPTION
-    memset(key, 0, sizeof(des_cblock));
-    (*key)[0] = (unsigned char) 1;
-#else /* NOENCRYPTION */
-    if (strlen(cellname) == 0)
-      des_string_to_key(password, key);
-    else
-      afs_string_to_key(password, cellname, key);
-#endif /* NOENCRYPTION */
-    memset(password, 0, sizeof(password));
-}    
-
-static void
-usage(void)
-{
-    fprintf(stderr, "Usage: ksrvutil [-f keyfile] [-i] [-k] ");
-    fprintf(stderr, "[-p principal] [-r realm] ");
-    fprintf(stderr, "[-c AFS cellname] ");
-    fprintf(stderr, "{list | change | add | get}\n");
-    fprintf(stderr, "   -i causes the program to ask for ");
-    fprintf(stderr, "confirmation before changing keys.\n");
-    fprintf(stderr, "   -k causes the key to printed for list or ");
-    fprintf(stderr, "change.\n");
-    exit(1);
-}
-
-int
-main(int argc, char **argv)
-{
-    char sname[ANAME_SZ];	/* name of service */
-    char sinst[INST_SZ];	/* instance of service */
-    char srealm[REALM_SZ];	/* realm of service */
-    unsigned char key_vno;	/* key version number */
-    int status;			/* general purpose error status */
-    des_cblock new_key;
-    des_cblock old_key;
-    char change_tkt[MaxPathLen]; /* Ticket to use for key change */
-    char keyfile[MaxPathLen];	/* Original keyfile */
-    char work_keyfile[MaxPathLen]; /* Working copy of keyfile */
-    char backup_keyfile[MaxPathLen]; /* Backup copy of keyfile */
-    unsigned short keyfile_mode; /* Protections on keyfile */
-    int work_keyfile_fd = -1;	/* Initialize so that */
-    int backup_keyfile_fd = -1;	/* compiler doesn't complain */
-    char local_realm[REALM_SZ];	/* local kerberos realm */
-    char cellname[1024];         /* AFS cell name */
-    int c;
-    int interactive = FALSE;
-    int list = FALSE;
-    int change = FALSE;
-    int add = FALSE;
-    int get = FALSE;
-    int key = FALSE;		/* do we show keys? */
-    int arg_entered = FALSE;
-    int change_this_key = FALSE;
-    char databuf[BUFSIZ];
-    int first_printed = FALSE;	/* have we printed the first item? */
-    
-    memset(sname, 0, sizeof(sname));
-    memset(sinst, 0, sizeof(sinst));
-    memset(srealm, 0, sizeof(srealm));
-    	  
-    memset(change_tkt, 0, sizeof(change_tkt));
-    memset(keyfile, 0, sizeof(keyfile));
-    memset(work_keyfile, 0, sizeof(work_keyfile));
-    memset(backup_keyfile, 0, sizeof(backup_keyfile));
-    memset(local_realm, 0, sizeof(local_realm));
-    memset(cellname, 0, sizeof(cellname));
-    
-    set_progname (argv[0]);
-
-    if (krb_get_default_principal(u_name, u_inst, u_realm) < 0)
-	errx (1, "could not get default principal");
-
-    /* This is used only as a default for adding keys */
-    if (krb_get_lrealm(local_realm, 1) != KSUCCESS)
-	strcpy(local_realm, KRB_REALM);
-    
-    while((c = getopt(argc, argv, "ikc:f:p:r:")) != EOF) {
-	 switch (c) {
-	      case 'i':
-	      interactive++;
-	      break;
-	      case 'k':
-	      key++;
-	      break;
-	      case 'c':
-	      strcpy(cellname, optarg);
-	      break;
-	      case 'f':
-	      strcpy(keyfile, optarg);
-	      break;
-	      case 'p':
-	      if((status = kname_parse (u_name, u_inst, u_realm, optarg)) !=
-		 KSUCCESS)
-		  errx (1, "principal %s: %s", optarg,
-			krb_get_err_text(status));
-	      break;
-	      case 'r':
-	      strcpy(u_realm, optarg);
-	      break;
-	      case '?':
-	      usage();
-	 }
-    }
-    if (optind >= argc)
-	 usage();
-    if (*u_realm == '\0')
-	 strcpy (u_realm, local_realm);
-    if (strcmp(argv[optind], "list") == 0) {
-	 if (arg_entered)
-	      usage();
-	 else {
-	      arg_entered++;
-	      list++;
-	 }
-    }
-    else if (strcmp(argv[optind], "change") == 0) {
-	 if (arg_entered)
-	      usage();
-	 else {
-	      arg_entered++;
-	      change++;
-	 }
-    }
-    else if (strcmp(argv[optind], "add") == 0) {
-	 if (arg_entered)
-	      usage();
-	 else {
-	      arg_entered++;
-	      add++;
-	 }
-    }
-    else if (strcmp(argv[optind], "get") == 0) {
-	 if (arg_entered)
-	      usage();
-	 else {
-	      arg_entered++;
-	      get++;
-	 }
-    }
-    else
-	 usage();
-    ++optind;
-    
-    if (!arg_entered)
-	usage();
-
-    if (!keyfile[0])
-	strcpy(keyfile, KEYFILE);
-    
-    strcpy(work_keyfile, keyfile);
-    strcpy(backup_keyfile, keyfile);
-    
-    if (change || add || get) {
-	strcat(work_keyfile, ".work");
-	strcat(backup_keyfile, ".old");
-	
-	copy_keyfile(keyfile, backup_keyfile);
-    }
-    
-    if (add || get)
-	copy_keyfile(backup_keyfile, work_keyfile);
-
-    keyfile_mode = get_mode(keyfile);
-
-    if (change || list)
-	if ((backup_keyfile_fd = open(backup_keyfile, O_RDONLY, 0)) < 0)
-	    err (1, "open %s", backup_keyfile);
-
-    if (change) {
-	if ((work_keyfile_fd = 
-	     open(work_keyfile, O_WRONLY | O_CREAT | O_TRUNC, 
-		  SRVTAB_MODE)) < 0)
-	    err (1, "creat %s", work_keyfile);
-    }
-    else if (add) {
-	if ((work_keyfile_fd =
-	     open(work_keyfile, O_APPEND | O_WRONLY, SRVTAB_MODE)) < 0)
-	    err (1, "open with append %s", work_keyfile );
-    }
-    else if (get) {
-	if ((work_keyfile_fd =
-	     open(work_keyfile, O_RDWR | O_CREAT, SRVTAB_MODE)) < 0)
-	    err (1, "open for writing %s", work_keyfile);
-    }
-    
-    if (change || list) {
-	while ((getst(backup_keyfile_fd, sname, SNAME_SZ) > 0) &&
-	       (getst(backup_keyfile_fd, sinst, INST_SZ) > 0) &&
-	       (getst(backup_keyfile_fd, srealm, REALM_SZ) > 0) &&
-	       (read(backup_keyfile_fd, &key_vno, 1) > 0) &&
-	       (read(backup_keyfile_fd, old_key, sizeof(old_key)) > 0)) {
-	    if (list) {
-		if (!first_printed) {
-		    printf(VNO_HEADER);
-		    printf(PAD);
-		    if (key) {
-			printf(KEY_HEADER);
-			printf(PAD);
-		    }
-		    printf(PRINC_HEADER);
-		    first_printed = 1;
-		}
-		printf(VNO_FORMAT, key_vno);
-		printf(PAD);
-		if (key) {
-		    print_key(old_key);
-		    printf(PAD);
-		}
-		print_name(sname, sinst, srealm);
-		printf("\n");
-	    }
-	    else if (change) {
-		snprintf(change_tkt, sizeof(change_tkt),
-			 TKT_ROOT "_ksrvutil.%u",
-			 (unsigned)getpid());
-		krb_set_tkt_string(change_tkt);
-		destroyp = TRUE;
-
-		printf("\nPrincipal: ");
-		print_name(sname, sinst, srealm);
-		printf("; version %d\n", key_vno);
-		if (interactive)
-		    change_this_key = yn("Change this key?");
-		else if (change)
-		    change_this_key = 1;
-		else
-		    change_this_key = 0;
-		
-		if (change_this_key)
-		    printf("Changing to version %d.\n", key_vno + 1);
-		else if (change)
-		    printf("Not changing this key.\n");
-		
-		if (change_this_key) {
-		    /*
-		     * This is not a good choice of seed when/if the
-		     * key has been compromised so we also use a
-		     * random sequence number!
-		     */
-		    des_init_random_number_generator(&old_key);
-		    {
-		        des_cblock seqnum;
-			des_generate_random_block(&seqnum);
-			des_set_sequence_number((unsigned char *)&seqnum);
-		    }
-		    /* 
-		     * Pick a new key and determine whether or not
-		     * it is safe to change
-		     */
-		    if ((status = 
-			 get_svc_new_key(&new_key, sname, sinst, 
-					 srealm, keyfile)) == KADM_SUCCESS)
-			key_vno++;
-		    else {
-		        memcpy(new_key, old_key, sizeof(new_key));
-			warnx ("Key NOT changed: %s\n",
-			       krb_get_err_text(status));
-			change_this_key = FALSE;
-		    }
-		}
-		else 
-		    memcpy(new_key, old_key, sizeof(new_key));
-		append_srvtab(work_keyfile, work_keyfile_fd, 
-			      sname, sinst, srealm, key_vno, new_key);
-		if (key && change_this_key) {
-		    printf("Old key: ");
-		    print_key(old_key);
-		    printf("; new key: ");
-		    print_key(new_key);
-		    printf("\n");
-		}
-		if (change_this_key) {
-		    if ((status = kadm_change_pw(new_key)) == KADM_SUCCESS) {
-			printf("Key changed.\n");
-			dest_tkt();
-		    }
-		    else {
-			com_err(__progname, status, 
-				" attempting to change password.");
-			dest_tkt();
-			/* XXX This knows the format of a keyfile */
-			if (lseek(work_keyfile_fd, -9, SEEK_CUR) >= 0) {
-			    key_vno--;
-			    safe_write(work_keyfile,
-				       work_keyfile_fd, &key_vno, 1);
-			    safe_write(work_keyfile, work_keyfile_fd,
-				       old_key, sizeof(des_cblock));
-			    fsync(work_keyfile_fd);
-			    fprintf(stderr,"Key NOT changed.\n");
-			} else {
-			    warn ("Unable to revert keyfile");
-			    leave("", 1);
-			}
-		    }
-		}
-	    }
-	    memset(old_key, 0, sizeof(des_cblock));
-	    memset(new_key, 0, sizeof(des_cblock));
-	}
-    }
-    else if (add) {
-	do {
-	    do {
-		safe_read_stdin("Name: ", databuf, sizeof(databuf));
-		strncpy(sname, databuf, sizeof(sname) - 1);
-		if (strchr(sname, '.') != 0) {
-		  strcpy(sinst, strchr(sname, '.') + 1);
-		  *(strchr(sname, '.')) = 0;
-		} else {
-		  safe_read_stdin("Instance: ", databuf, sizeof(databuf));
-		  strncpy(sinst, databuf, sizeof(sinst) - 1);
-		}
-		safe_read_stdin("Realm: ", databuf, sizeof(databuf));
-		strncpy(srealm, databuf, sizeof(srealm) - 1);
-		safe_read_stdin("Version number: ", databuf, sizeof(databuf));
-		key_vno = atoi(databuf);
-		if (key_vno == 0)
-			key_vno = 1; /* Version numbers are never 0 */
-		if (!srealm[0])
-		    strcpy(srealm, local_realm);
-		printf("New principal: ");
-		print_name(sname, sinst, srealm);
-		printf("; version %d\n", key_vno);
-	    } while (!yn("Is this correct?"));
-	    get_key_from_password(&new_key, cellname);
-	    if (key) {
-		printf("Key: ");
-		print_key(new_key);
-		printf("\n");
-	    }
-	    append_srvtab(work_keyfile, work_keyfile_fd, 
-			  sname, sinst, srealm, key_vno, new_key);
-	    printf("Key successfully added.\n");
-	} while (yn("Would you like to add another key?"));
-    }
-    else if (get) {
-        ksrvutil_get(work_keyfile_fd, work_keyfile,
-		     argc - optind, argv + optind);
-    }
-
-    if (change || list) 
-	if (close(backup_keyfile_fd) < 0)
-	    warn ("close %s", backup_keyfile);
-    
-    if (change || add || get) {
-	if (close(work_keyfile_fd) < 0)
-	    err (1, "close %s", work_keyfile);
-	if (rename(work_keyfile, keyfile) < 0)
-	    err (1, "rename(%s, %s)", work_keyfile, keyfile);
-	chmod(backup_keyfile, keyfile_mode);
-	chmod(keyfile, keyfile_mode);
-	printf("Old keyfile in %s.\n", backup_keyfile);
-    }
-    return 0;
-}
diff --git a/crypto/kerberosIV/kadmin/ksrvutil.h b/crypto/kerberosIV/kadmin/ksrvutil.h
deleted file mode 100644
index 64e2fe4c2e50..000000000000
--- a/crypto/kerberosIV/kadmin/ksrvutil.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan 
- * (Royal Institute of Technology, Stockholm, Sweden).  
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * $Id: ksrvutil.h,v 1.8 1997/04/01 03:58:55 assar Exp $
- *
- */
-
-extern char u_name[], u_inst[], u_realm[];
-extern int destroyp;
-
-void leave(char *str, int x);
-void safe_read_stdin(char *prompt, char *buf, size_t size);
-void safe_write(char *filename, int fd, void *buf, size_t len);
-
-int yn(char *string);
-int ny(char *string);
-
-void ksrvutil_get(int fd, char *filename, int argc, char **argv);
diff --git a/crypto/kerberosIV/kadmin/ksrvutil_get.c b/crypto/kerberosIV/kadmin/ksrvutil_get.c
deleted file mode 100644
index 7b97d35088af..000000000000
--- a/crypto/kerberosIV/kadmin/ksrvutil_get.c
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "kadm_locl.h"
-#include "ksrvutil.h"
-
-RCSID("$Id: ksrvutil_get.c,v 1.32 1997/05/05 21:14:57 assar Exp $");
-
-#define BAD_PW 1
-#define GOOD_PW 0
-#define FUDGE_VALUE 15		/* for ticket expiration time */
-#define PE_NO 0
-#define PE_YES 1
-#define PE_UNSURE 2
-
-static char tktstring[128];
-
-static int
-princ_exists(char *name, char *instance, char *realm)
-{
-    int status;
-
-    status = krb_get_pw_in_tkt(name, instance, realm,
-			       KRB_TICKET_GRANTING_TICKET,
-			       realm, 1, "");
-
-    if ((status == KSUCCESS) || (status == INTK_BADPW))
-	return(PE_YES);
-    else if (status == KDC_PR_UNKNOWN)
-	return(PE_NO);
-    else
-	return(PE_UNSURE);
-}
-
-static int
-get_admin_password(char *myname, char *myinst, char *myrealm)
-{
-  int status;
-  char admin_passwd[MAX_KPW_LEN];	/* Admin's password */
-  int ticket_life = 1;	/* minimum ticket lifetime */
-  char buf[1024];
-  CREDENTIALS c;
-
-  if (princ_exists(myname, myinst, myrealm) != PE_NO) {
-    snprintf(buf, sizeof(buf), "Password for %s: ",
-	    krb_unparse_name_long (myname, myinst, myrealm));
-    if (des_read_pw_string(admin_passwd, sizeof(admin_passwd)-1,
-			    buf, 0)) {
-      fprintf(stderr, "Error reading admin password.\n");
-      goto bad;
-    }
-    status = krb_get_pw_in_tkt(myname, myinst, myrealm, PWSERV_NAME, 
-			       KADM_SINST, ticket_life, admin_passwd);
-    memset(admin_passwd, 0, sizeof(admin_passwd));
-    
-    /* Initialize non shared random sequence from session key. */
-    memset(&c, 0, sizeof(c));
-    krb_get_cred(PWSERV_NAME, KADM_SINST, myrealm, &c);
-    des_init_random_number_generator(&c.session);
-  }
-  else
-    status = KDC_PR_UNKNOWN;
-  
-  switch(status) {
-  case GT_PW_OK:
-    return(GOOD_PW);
-  case KDC_PR_UNKNOWN:
-    printf("Principal %s does not exist.\n",
-	   krb_unparse_name_long(myname, myinst, myrealm));
-    goto bad;
-  case GT_PW_BADPW:
-    printf("Incorrect admin password.\n");
-    goto bad;
-  default:
-    com_err("kadmin", status+krb_err_base,
-	    "while getting password tickets");
-    goto bad;
-  }
-  
-bad:
-  memset(admin_passwd, 0, sizeof(admin_passwd));
-  dest_tkt();
-  return(BAD_PW);
-}
-
-static void
-srvtab_put_key (int fd, char *filename, char *name, char *inst, char *realm,
-		int8_t kvno, des_cblock key)
-{
-  char sname[ANAME_SZ];	/* name of service */
-  char sinst[INST_SZ];	/* instance of service */
-  char srealm[REALM_SZ];	/* realm of service */
-  int8_t skvno;
-  des_cblock skey;
-
-  lseek(fd, 0, SEEK_SET);
-
-  while(getst(fd, sname,  SNAME_SZ) > 0 &&
-	getst(fd, sinst,  INST_SZ) > 0  &&
-	getst(fd, srealm, REALM_SZ) > 0 &&
-	read(fd, &skvno,  sizeof(skvno)) > 0 &&
-	read(fd, skey,    sizeof(skey)) > 0) {
-    if(strcmp(name,  sname)  == 0 &&
-       strcmp(inst,  sinst)  == 0 &&
-       strcmp(realm, srealm) == 0) {
-      lseek(fd, lseek(fd,0,SEEK_CUR)-(sizeof(skvno) + sizeof(skey)), SEEK_SET);
-      safe_write(filename, fd, &kvno, sizeof(kvno));
-      safe_write(filename, fd, key,   sizeof(des_cblock));
-      return;
-    }
-  }
-  safe_write(filename, fd, name,  strlen(name) + 1);
-  safe_write(filename, fd, inst,  strlen(inst) + 1);
-  safe_write(filename, fd, realm, strlen(realm) + 1);
-  safe_write(filename, fd, &kvno, sizeof(kvno));
-  safe_write(filename, fd, key,   sizeof(des_cblock));
-}
-
-/* 
- * node list of services 
- */
-
-struct srv_ent{
-  char name[SNAME_SZ];
-  char inst[INST_SZ];
-  char realm[REALM_SZ];
-  struct srv_ent *next;
-};
-
-static int
-key_to_key(char *user, char *instance, char *realm, void *arg,
-	   des_cblock *key)
-{
-  memcpy(key, arg, sizeof(des_cblock));
-  return 0;
-}
-
-static void
-get_srvtab_ent(int fd, char *filename, char *name, char *inst, char *realm)
-{
-  char chname[128];
-  des_cblock newkey;
-  char old_tktfile[MaxPathLen], new_tktfile[MaxPathLen];
-  char garbage_name[ANAME_SZ];
-  char garbage_inst[ANAME_SZ];
-  CREDENTIALS c;
-  u_int8_t kvno;
-  Kadm_vals values;
-  int ret;
-
-  strncpy(chname, krb_get_phost(inst), sizeof(chname));
-  if(strcmp(inst, chname))
-    fprintf(stderr, 
-	    "Warning: Are you sure `%s' should not be `%s'?\n",
-	    inst, chname);
-    
-  memset(&values, 0, sizeof(values));
-  strcpy(values.name, name);
-  strcpy(values.instance, inst);
-  des_new_random_key(&newkey);
-  values.key_low = (newkey[0] << 24) | (newkey[1] << 16)
-    | (newkey[2] << 8) | (newkey[3] << 0);
-  values.key_high = (newkey[4] << 24) | (newkey[5] << 16)
-    | (newkey[6] << 8) | (newkey[7] << 0);
-
-  SET_FIELD(KADM_NAME,values.fields);
-  SET_FIELD(KADM_INST,values.fields);
-  SET_FIELD(KADM_DESKEY,values.fields);
-
-  ret = kadm_mod(&values, &values);
-  if(ret == KADM_NOENTRY)
-    ret = kadm_add(&values);
-  if (ret != KSUCCESS) {
-    warnx ("Couldn't get srvtab entry for %s.%s: %s",
-	    name, inst, error_message(ret));
-    return;
-  }
-  
-  values.key_low = values.key_high = 0;
-
-  /* get the key version number */
-
-  strcpy(old_tktfile, tkt_string());
-  snprintf(new_tktfile, sizeof(new_tktfile),
-	   TKT_ROOT "_ksrvutil-get.%u",
-	   (unsigned)getpid());
-  krb_set_tkt_string(new_tktfile);
-
-  ret = krb_get_in_tkt(name, inst, realm, name, inst,
-		       1, key_to_key, NULL, &newkey);
-
-  if (ret == KSUCCESS &&
-      (ret = tf_init(tkt_string(), R_TKT_FIL)) == KSUCCESS &&
-      (ret = tf_get_pname(garbage_name)) == KSUCCESS &&
-      (ret = tf_get_pinst(garbage_inst)) == KSUCCESS &&
-      (ret = tf_get_cred(&c)) == KSUCCESS)
-    kvno = c.kvno;
-  else {
-    warnx ("Could not find the cred in the ticket file");
-    return;
-  }
-
-  tf_close();
-  krb_set_tkt_string(old_tktfile);
-  unlink(new_tktfile);
-    
-  if(ret != KSUCCESS) {
-    memset(&newkey, 0, sizeof(newkey));
-    warnx ("Could not get a ticket for %s: %s\n",
-	   krb_unparse_name_long(name, inst, realm),
-	   krb_get_err_text(ret));
-    return;
-  }
-
-  /* Write the new key & c:o to the srvtab file */
-
-  srvtab_put_key (fd, filename, name, inst, realm, kvno, newkey);
-  memset(&newkey, 0, sizeof(newkey));
-
-  fprintf (stderr, "Added %s\n", krb_unparse_name_long (name, inst, realm));
-}
-
-static void
-ksrvutil_kadm(int fd, char *filename, struct srv_ent *p)
-{
-  int ret;
-  CREDENTIALS c;
-  
-  ret = kadm_init_link(PWSERV_NAME, KADM_SINST, u_realm);
-  if (ret != KADM_SUCCESS) {
-    warnx("Couldn't initialize kadmin link: %s", error_message(ret));
-    leave(NULL, 1);
-  }
-  
-  ret = krb_get_cred (PWSERV_NAME, KADM_SINST, u_realm, &c);
-  if (ret == KSUCCESS)
-    des_init_random_number_generator (&c.session);
-  else {
-    umask(077);
-       
-    /*
-     *  create ticket file and get admin tickets
-     */
-    snprintf(tktstring, sizeof(tktstring), TKT_ROOT "_ksrvutil_%d", (int)getpid());
-    krb_set_tkt_string(tktstring);
-    destroyp = TRUE;
-       
-    ret = get_admin_password(u_name, u_inst, u_realm);
-    if (ret) {
-      warnx("Couldn't get admin password.");
-      leave(NULL, 1);
-    }
-  }  
-  for(;p;){
-    get_srvtab_ent(fd, filename, p->name, p->inst, p->realm);
-    p=p->next;
-  }
-  unlink(tktstring);
-}
-
-static void
-parseinput (char *result, size_t sz, char *val, char *def)
-{
-  char *lim;
-  int inq;
-
-  if (val[0] == '\0') {
-    strncpy (result, def, sz-1);
-    return;
-  }
-  lim = result + sz - 1;
-  inq = 0;
-  while(*val && result < lim) {
-    switch(*val) {
-    case '\'' :
-      inq = !inq;
-      ++val;
-      break;
-    case '\\' :
-      if(!inq)
-	val++;
-    default:
-      *result++ = *val++;
-      break;
-    }
-  }
-  *result = '\0';
-}
-
-void
-ksrvutil_get(int fd, char *filename, int argc, char **argv)
-{
-  char sname[ANAME_SZ];		/* name of service */
-  char sinst[INST_SZ];		/* instance of service */
-  char srealm[REALM_SZ];	/* realm of service */
-  char databuf[BUFSIZ];
-  char local_hostname[100];
-  char prompt[100];
-  struct srv_ent *head=NULL;
-  int i;
-
-  k_gethostname(local_hostname, sizeof(local_hostname));
-  strcpy(local_hostname, krb_get_phost(local_hostname));
-
-  if (argc)
-    for(i=0; i < argc; ++i) {
-      struct srv_ent *p=malloc(sizeof(*p));
-
-      if(p == NULL) {
-	warnx ("out of memory in malloc");
-	leave(NULL,1);
-      }
-      p->next = head;
-      strcpy (p->realm, u_realm);
-      if (kname_parse (p->name, p->inst, p->realm, argv[i]) !=
-	  KSUCCESS) {
-	warnx ("parse error on '%s'\n", argv[i]);
-	free(p);
-	continue;
-      }
-      if (p->name[0] == '\0')
-	strcpy(p->name, "rcmd");
-      if (p->inst[0] == '\0')
-	strcpy(p->inst, local_hostname);
-      if (p->realm[0] == '\0')
-	strcpy(p->realm, u_realm);
-      head = p;
-    }
-
-  else
-    do{
-      safe_read_stdin("Name [rcmd]: ", databuf, sizeof(databuf));
-      parseinput (sname, sizeof(sname), databuf, "rcmd");
-    
-      snprintf(prompt, sizeof(prompt), "Instance [%s]: ", local_hostname);
-      safe_read_stdin(prompt, databuf, sizeof(databuf));
-      parseinput (sinst, sizeof(sinst), databuf, local_hostname);
-    
-      snprintf(prompt, sizeof(prompt), "Realm [%s]: ", u_realm);
-      safe_read_stdin(prompt, databuf, sizeof(databuf));
-      parseinput (srealm, sizeof(srealm), databuf, u_realm);
-
-      if(yn("Is this correct?")){
-	struct srv_ent *p=(struct srv_ent*)malloc(sizeof(struct srv_ent));
-	p->next=head;
-	head=p;
-	strcpy(p->name, sname);
-	strcpy(p->inst, sinst);
-	strcpy(p->realm, srealm);
-      }
-    }while(ny("Add more keys?"));
-  
-  
-  ksrvutil_kadm(fd, filename, head);
-
-  {
-    struct srv_ent *p=head, *q;
-    while(p){
-      q=p;
-      p=p->next;
-      free(q);
-    }
-  }
-
-}
diff --git a/crypto/kerberosIV/kadmin/new_pwd.c b/crypto/kerberosIV/kadmin/new_pwd.c
deleted file mode 100644
index 88fb7a9b33be..000000000000
--- a/crypto/kerberosIV/kadmin/new_pwd.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "kadm_locl.h"
-
-RCSID("$Id: new_pwd.c,v 1.11 1997/05/02 14:28:54 assar Exp $");
-
-#ifdef NOENCRYPTION
-#define read_long_pw_string placebo_read_pw_string
-#else
-#define read_long_pw_string des_read_pw_string
-#endif
-
-static char *
-check_pw (char *pword)
-{
-    if (strlen(pword) == 0)
-	return "Null passwords are not allowed - Please enter a longer password.";
-    
-    if (strlen(pword) < MIN_KPW_LEN)
-	return "Password is to short - Please enter a longer password.";
-    
-    /* Don't allow all lower case passwords regardless of length */
-    {
-	char *t;
-	for (t = pword; *t && islower(*t); t++)
-	    ;
-	if (*t == 0)
-	    return "Please don't use an all-lower case password.\n"
-	      "\tUnusual capitalization, delimiter characters or "
-	      "digits are suggested.";
-    }
-
-    return NULL;
-}
-
-int
-get_pw_new_pwd(char *pword, int pwlen, krb_principal *pr, int print_realm)
-{
-    char ppromp[40+ANAME_SZ+INST_SZ+REALM_SZ]; /* for the password prompt */
-    char npromp[40+ANAME_SZ+INST_SZ+REALM_SZ]; /* for the password prompt */
-    
-    char p[MAX_K_NAME_SZ];
-    
-    char local_realm[REALM_SZ];
-    int status;
-    char *expl;
-    
-    /*
-     * We don't care about failure; this is to determine whether or
-     * not to print the realm in the prompt for a new password. 
-     */
-    krb_get_lrealm(local_realm, 1);
-    
-    if (strcmp(local_realm, pr->realm))
-	print_realm++;
-    
-    {
-	char *q;
-	krb_unparse_name_r(pr, p);
-	if(print_realm == 0 && (q = strrchr(p, '@')))
-	    *q = 0;
-    }
-
-    snprintf(ppromp, sizeof(ppromp), "Old password for %s:", p);
-    if (read_long_pw_string(pword, pwlen-1, ppromp, 0)) {
-	fprintf(stderr, "Error reading old password.\n");
-	return -1;
-    }
-
-    status = krb_get_pw_in_tkt(pr->name, pr->instance, pr->realm, 
-			       PWSERV_NAME, KADM_SINST, 1, pword);
-    if (status != KSUCCESS) {
-	if (status == INTK_BADPW) {
-	    printf("Incorrect old password.\n");
-	    return -1;
-	}
-	else {
-	    fprintf(stderr, "Kerberos error: %s\n", krb_get_err_text(status));
-	    return -1;
-	}
-    }
-    memset(pword, 0, pwlen);
-    
-    do {
-	char verify[MAX_KPW_LEN];
-	snprintf(npromp, sizeof(npromp), "New Password for %s:",p);
-	if (read_long_pw_string(pword, pwlen-1, npromp, 0)) {
-	    fprintf(stderr,
-		    "Error reading new password, password unchanged.\n");
-	    return -1;
-        }
-	expl = check_pw (pword);
-	if (expl) {
-	    printf("\n\t%s\n\n", expl);
-	    continue;
-	}
-	/* Now we got an ok password, verify it. */
-	snprintf(npromp, sizeof(npromp), "Verifying New Password for %s:", p);
-	if (read_long_pw_string(verify, MAX_KPW_LEN-1, npromp, 0)) {
-	    fprintf(stderr,
-		    "Error reading new password, password unchanged.\n");
-	    return -1;
-        }
-	if (strcmp(pword, verify) != 0) {
-	    printf("Verify failure - try again\n");
-	    expl = "";		/* continue */
-	}
-    } while (expl);
-    return 0;
-}
diff --git a/crypto/kerberosIV/kadmin/pw_check.c b/crypto/kerberosIV/kadmin/pw_check.c
deleted file mode 100644
index ac6912b6fe97..000000000000
--- a/crypto/kerberosIV/kadmin/pw_check.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "kadm_locl.h"
-
-RCSID("$Id: pw_check.c,v 1.13 1997/04/01 08:17:50 joda Exp $");
-
-/*
- * kadm_pw_check
- *
- * pw		: new password or "" if none passed
- * newkey	: key for pw as passed from client
- * strings	: interesting strings to check for
- *
- * returns NULL if pw is ok, else an explanatory string
- */
-int
-kadm_pw_check(char *pw, des_cblock *newkey, char **pw_msg, 
-	      char **strings)
-{
-  des_cblock pwkey;
-  int status=KADM_SUCCESS;
-  
-  if (pw == NULL || *pw == '\0')
-    return status;		/* XXX - Change this later */
-
-#ifndef NO_PW_CHECK
-  *pw_msg = NULL;
-  des_string_to_key(pw, &pwkey); /* Check AFS string to key also! */
-  if (memcmp(pwkey, *newkey, sizeof(pwkey)) != 0)
-    {
-      /* no password or bad key */
-      status=KADM_PW_MISMATCH;
-      *pw_msg = "Password doesn't match supplied DES key";
-    }
-  else if (strlen(pw) < MIN_KPW_LEN)
-    {
-      status = KADM_INSECURE_PW;
-      *pw_msg="Password is too short";
-    }
-  
-#ifdef DICTPATH
-  *pw_msg = FascistCheck(pw, DICTPATH, strings);
-  if (*pw_msg)
-    return KADM_INSECURE_PW;
-#endif
-
-  memset(pwkey, 0, sizeof(pwkey));
-#endif
-
-  return status;
-}
diff --git a/crypto/kerberosIV/kadmin/pw_check.h b/crypto/kerberosIV/kadmin/pw_check.h
deleted file mode 100644
index c5a5d69eab60..000000000000
--- a/crypto/kerberosIV/kadmin/pw_check.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * $Id: pw_check.h,v 1.6 1997/04/01 08:17:50 joda Exp $ 
- */
-
-int kadm_pw_check(char *pw, des_cblock *newkey, 
-		  char **pw_msg, char **strings);
-
diff --git a/crypto/kerberosIV/kuser/Makefile.in b/crypto/kerberosIV/kuser/Makefile.in
deleted file mode 100644
index aff8c19872d1..000000000000
--- a/crypto/kerberosIV/kuser/Makefile.in
+++ /dev/null
@@ -1,92 +0,0 @@
-# $Id: Makefile.in,v 1.23 1997/03/23 13:04:08 assar Exp $
-
-SHELL	= /bin/sh
-
-srcdir	= @srcdir@
-VPATH	= @srcdir@
-
-topdir	= ..
-
-CC		= @CC@
-AR		= ar
-RANLIB		= @RANLIB@
-DEFS		= @DEFS@
-CFLAGS		= @CFLAGS@
-LD_FLAGS	= @LD_FLAGS@
-INSTALL		= @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-LIBS		= @LIBS@
-KRB_KAFS_LIB	= @KRB_KAFS_LIB@
-MKINSTALLDIRS	= @top_srcdir@/mkinstalldirs
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-libdir = @libdir@
-transform=@program_transform_name@
-EXECSUFFIX=@EXECSUFFIX@
-
-PROGS = kinit$(EXECSUFFIX) \
-	kdestroy$(EXECSUFFIX) \
-	klist$(EXECSUFFIX)
-
-SOURCES = kinit.c kdestroy.c klist.c
-
-OBJECTS = kinit.o kdestroy.o klist.o
-
-all: $(PROGS)
-
-Wall:
-	make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../include -I$(srcdir) $(CFLAGS) $<
-
-install: all
-	$(MKINSTALLDIRS) $(bindir)
-	for x in $(PROGS); do \
-	  $(INSTALL_PROGRAM) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \
-	done
-
-uninstall:
-	for x in $(PROGS); do \
-	  rm -f $(bindir)/`echo $$x | sed '$(transform)'`; \
-	done
-
-TAGS: $(SOURCES)
-	etags $(SOURCES)
-
-check:
-
-clean:
-	rm -f *.a *.o $(PROGS)
-
-mostlyclean: clean
-
-distclean: clean
-	rm -f Makefile *.tab.c *~
-
-realclean: distclean
-	rm -f TAGS
-
-dist: $(DISTFILES)
-	for file in $(DISTFILES); do \
-	  ln $$file ../`cat ../.fname`/lib \
-	    || cp -p $$file ../`cat ../.fname`/lib; \
-	done
-
-KLIB=-L../lib/krb -lkrb -L../lib/des -ldes
-LIBROKEN=-L../lib/roken -lroken
-
-kinit$(EXECSUFFIX): kinit.o
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ kinit.o $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
-
-kdestroy$(EXECSUFFIX): kdestroy.o
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ kdestroy.o $(KRB_KAFS_LIB) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
-
-klist$(EXECSUFFIX): klist.o
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ klist.o $(KRB_KAFS_LIB) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
-
-# su move to appl/bsd
-
-$(OBJECTS): ../include/config.h
diff --git a/crypto/kerberosIV/kuser/kdestroy.c b/crypto/kerberosIV/kuser/kdestroy.c
deleted file mode 100644
index 2fe36c37fac7..000000000000
--- a/crypto/kerberosIV/kuser/kdestroy.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>. 
- *
- * This program causes Kerberos tickets to be destroyed.
- * Options are: 
- *
- *   -q[uiet]	- no bell even if tickets not destroyed
- *   -f[orce]	- no message printed at all 
- *   -t		- do not destroy tokens
- */
-
-#include "kuser_locl.h"
-#include <kafs.h>
-
-RCSID("$Id: kdestroy.c,v 1.8 1997/03/30 16:15:03 joda Exp $");
-
-static void
-usage(void)
-{
-    fprintf(stderr, "Usage: %s [-f] [-q] [-t]\n", __progname);
-    exit(1);
-}
-
-int
-main(int argc, char **argv)
-{
-    int fflag=0, tflag = 0, k_errno;
-    int c;
-
-    set_progname(argv[0]);
-
-    while((c = getopt(argc, argv, "fqt")) >= 0){
-	switch(c){
-	case 'f':
-	case 'q':
-	    fflag++;
-	    break;
-	case 't':
-	    tflag++;
-	    break;
-	default:
-	    usage();
-	}
-    }
-    if(argc - optind > 0)
-	usage();
-
-    k_errno = dest_tkt();
-
-    if(!tflag && k_hasafs())
-	k_unlog();
-
-    if (fflag) {
-	if (k_errno != 0 && k_errno != RET_TKFIL)
-	    exit(1);
-	else
-	    exit(0);
-    } else {
-	if (k_errno == 0)
-	    printf("Tickets destroyed.\n");
-	else if (k_errno == RET_TKFIL)
-	    printf("No tickets to destroy.\n");
-	else {
-	    printf("Tickets NOT destroyed.\n");
-	    exit(1);
-	}
-    }
-    exit(0);
-}
diff --git a/crypto/kerberosIV/kuser/kinit.c b/crypto/kerberosIV/kuser/kinit.c
deleted file mode 100644
index cd2f826bb2cf..000000000000
--- a/crypto/kerberosIV/kuser/kinit.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>. 
- *
- * Routine to initialize user to Kerberos.  Prompts optionally for
- * user, instance and realm.  Authenticates user and gets a ticket
- * for the Kerberos ticket-granting service for future use. 
- *
- * Options are: 
- *
- *   -i[instance]
- *   -r[realm]
- *   -v[erbose]
- *   -l[ifetime]
- *   -p
- */
-
-#include "kuser_locl.h"
-
-RCSID("$Id$");
-
-#define	LIFE	DEFAULT_TKT_LIFE /* lifetime of ticket in 5-minute units */
-#define CHPASSLIFE 2
-
-static void
-get_input(char *s, int size, FILE *stream)
-{
-    char *p;
-
-    if (fgets(s, size, stream) == NULL)
-	exit(1);
-    if ( (p = strchr(s, '\n')) != NULL)
-	*p = '\0';
-}
-
-
-static void
-usage(void)
-{
-    fprintf(stderr, "Usage: %s [-irvlp] [name]\n", __progname);
-    exit(1);
-}
-
-int
-main(int argc, char **argv)
-{
-    char    aname[ANAME_SZ];
-    char    inst[INST_SZ];
-    char    realm[REALM_SZ];
-    char    buf[MaxHostNameLen];
-    char    name[MAX_K_NAME_SZ];
-    char   *username = NULL;
-    int     iflag, rflag, vflag, lflag, pflag, lifetime, k_errno;
-    int	    i;
-
-    set_progname (argv[0]);
-
-    *inst = *realm = '\0';
-    iflag = rflag = vflag = lflag = pflag = 0;
-    lifetime = LIFE;
-    set_progname(argv[0]);
-
-    while (--argc) {
-	if ((*++argv)[0] != '-') {
-	    if (username)
-		usage();
-	    username = *argv;
-	    continue;
-	}
-	for (i = 1; (*argv)[i] != '\0'; i++)
-	    switch ((*argv)[i]) {
-	    case 'i':		/* Instance */
-		++iflag;
-		continue;
-	    case 'r':		/* Realm */
-		++rflag;
-		continue;
-	    case 'v':		/* Verbose */
-		++vflag;
-		continue;
-	    case 'l':
-		++lflag;
-		continue;
-	    case 'p':
-		++pflag;	/* chpass-tickets */
-		lifetime = CHPASSLIFE;
-		break;
-	    default:
-		usage();
-	    }
-    }
-    if (username &&
-	(k_errno = kname_parse(aname, inst, realm, username)) != KSUCCESS) {
-	warnx("%s", krb_get_err_text(k_errno));
-	iflag = rflag = 1;
-	username = NULL;
-    }
-    if (k_gethostname(buf, MaxHostNameLen)) 
-	err(1, "k_gethostname failed");
-    printf("%s (%s)\n", ORGANIZATION, buf);
-    if (username) {
-	printf("Kerberos Initialization for \"%s", aname);
-	if (*inst)
-	    printf(".%s", inst);
-	if (*realm)
-	    printf("@%s", realm);
-	printf("\"\n");
-    } else {
-	if (iflag) {
-		printf("Kerberos Initialization\n");
-		printf("Kerberos name: ");
-		get_input(name, sizeof(name), stdin);
-		if (!*name)
-		    return 0;
-		if ((k_errno = kname_parse(aname, inst, realm, name)) 
-			!= KSUCCESS )
-			errx(1, "%s", krb_get_err_text(k_errno));
-	} else {
-	    int uid = getuid();
-	    char *getenv();
-	    struct passwd *pwd;
-
-	    /* default to current user name unless running as root */
-	    if (uid == 0 && (username = getenv("USER")) &&
-	        strcmp(username, "root") != 0) {
-	    	    strncpy(aname, username, sizeof(aname));
-		    strncpy(inst, "root", sizeof(inst));
-	    } else {
-		    pwd = getpwuid(uid);
-
-		    if (pwd == (struct passwd *) NULL) {
-			fprintf(stderr, "Unknown name for your uid\n");
-			printf("Kerberos name: ");
-			get_input(aname, sizeof(aname), stdin);
-		    } else
-			strncpy(aname, pwd->pw_name, sizeof(aname));
-	    }
-	    if (!*aname)
-	        return 0;
-	    if (!k_isname(aname)) {
-	        errx(1, "%s", "bad Kerberos name format");
-	    }
-	}
-    }
-    /* optional instance */
-    if (iflag) {
-	printf("Kerberos instance: ");
-	get_input(inst, sizeof(inst), stdin);
-	if (!k_isinst(inst))
-	    errx(1, "bad Kerberos instance format");
-    }
-    if (rflag) {
-	printf("Kerberos realm: ");
-	get_input(realm, sizeof(realm), stdin);
-	if (!k_isrealm(realm))
-	    errx(1, "bad Kerberos realm format");
-    }
-    if (lflag) {
-	 printf("Kerberos ticket lifetime (minutes): ");
-	 get_input(buf, sizeof(buf), stdin);
-	 lifetime = atoi(buf);
-	 if (lifetime < 5)
-	      lifetime = 1;
-	 else
-	      lifetime = krb_time_to_life(0, lifetime*60);
-	 /* This should be changed if the maximum ticket lifetime */
-	 /* changes */
-	 if (lifetime > 255)
-	      lifetime = 255;
-    }
-    if (!*realm && krb_get_lrealm(realm, 1))
-	errx(1, "krb_get_lrealm failed");
-    k_errno = krb_get_pw_in_tkt(aname, inst, realm,
-				pflag ? PWSERV_NAME : 
-				KRB_TICKET_GRANTING_TICKET,
-				pflag ? KADM_SINST  : realm,
-				lifetime, 0);
-    if (vflag) {
-	printf("Kerberos realm %s:\n", realm);
-	printf("Ticket file: %s\n", tkt_string());
-	printf("%s\n", krb_get_err_text(k_errno));
-    } else if (k_errno)
-	errx(1, "%s", krb_get_err_text(k_errno));
-    exit(0);
-}
diff --git a/crypto/kerberosIV/kuser/klist.c b/crypto/kerberosIV/kuser/klist.c
deleted file mode 100644
index faf7d6bd6a07..000000000000
--- a/crypto/kerberosIV/kuser/klist.c
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>. 
- *
- * Lists your current Kerberos tickets.
- * Written by Bill Sommerfeld, MIT Project Athena.
- */
-
-#include "kuser_locl.h"
-
-#if defined(HAVE_SYS_IOCTL_H) && SunOS != 4
-#include <sys/ioctl.h>
-#endif
-
-#ifdef HAVE_SYS_IOCCOM_H
-#include <sys/ioccom.h>
-#endif
-
-#include <kafs.h>
-
-RCSID("$Id: klist.c,v 1.28 1997/05/26 17:33:50 bg Exp $");
-
-static int option_verbose = 0;
-
-static char *
-short_date(int32_t dp)
-{
-    char *cp;
-    time_t t = (time_t)dp;
-
-    if (t == (time_t)(-1L)) return "***  Never  *** ";
-    cp = ctime(&t) + 4;
-    cp[15] = '\0';
-    return (cp);
-}
-
-static void
-display_tktfile(char *file, int tgt_test, int long_form)
-{
-    krb_principal pr;
-    char    buf1[20], buf2[20];
-    int     k_errno;
-    CREDENTIALS c;
-    int     header = 1;
-
-    if ((file == NULL) && ((file = getenv("KRBTKFILE")) == NULL))
-	file = TKT_FILE;
-
-    if (long_form)
-	printf("Ticket file:	%s\n", file);
-
-    /* 
-     * Since krb_get_tf_realm will return a ticket_file error, 
-     * we will call tf_init and tf_close first to filter out
-     * things like no ticket file.  Otherwise, the error that 
-     * the user would see would be 
-     * klist: can't find realm of ticket file: No ticket file (tf_util)
-     * instead of
-     * klist: No ticket file (tf_util)
-     */
-
-    /* Open ticket file */
-    if ((k_errno = tf_init(file, R_TKT_FIL))) {
-	if (!tgt_test)
-	    warnx("%s", krb_get_err_text(k_errno));
-	exit(1);
-    }
-    /* Close ticket file */
-    tf_close();
-
-    /* 
-     * We must find the realm of the ticket file here before calling
-     * tf_init because since the realm of the ticket file is not
-     * really stored in the principal section of the file, the
-     * routine we use must itself call tf_init and tf_close.
-     */
-    if ((k_errno = krb_get_tf_realm(file, pr.realm)) != KSUCCESS) {
-	if (!tgt_test)
-	    warnx("can't find realm of ticket file: %s", 
-		  krb_get_err_text(k_errno));
-	exit(1);
-    }
-
-    /* Open ticket file */
-    if ((k_errno = tf_init(file, R_TKT_FIL))) {
-	if (!tgt_test)
-	    warnx("%s", krb_get_err_text(k_errno));
-	exit(1);
-    }
-    /* Get principal name and instance */
-    if ((k_errno = tf_get_pname(pr.name)) ||
-	(k_errno = tf_get_pinst(pr.instance))) {
-	if (!tgt_test)
-	    warnx("%s", krb_get_err_text(k_errno));
-	exit(1);
-    }
-
-    /* 
-     * You may think that this is the obvious place to get the
-     * realm of the ticket file, but it can't be done here as the
-     * routine to do this must open the ticket file.  This is why 
-     * it was done before tf_init.
-     */
-       
-    if (!tgt_test && long_form)
-	printf("Principal:\t%s\n\n", krb_unparse_name(&pr));
-    while ((k_errno = tf_get_cred(&c)) == KSUCCESS) {
-	if (!tgt_test && long_form && header) {
-	    printf("%-15s  %-15s  %s%s\n",
-		   "  Issued", "  Expires", "  Principal", 
-		   option_verbose ? " (kvno)" : "");
-	    header = 0;
-	}
-	if (tgt_test) {
-	    c.issue_date = krb_life_to_time(c.issue_date, c.lifetime);
-	    if (!strcmp(c.service, KRB_TICKET_GRANTING_TICKET) &&
-		!strcmp(c.instance, pr.realm)) {
-		if (time(0) < c.issue_date)
-		    exit(0);		/* tgt hasn't expired */
-		else
-		    exit(1);		/* has expired */
-	    }
-	    continue;			/* not a tgt */
-	}
-	if (long_form) {
-	    strcpy(buf1, short_date(c.issue_date));
-	    c.issue_date = krb_life_to_time(c.issue_date, c.lifetime);
-	    if (time(0) < (unsigned long) c.issue_date)
-	        strcpy(buf2, short_date(c.issue_date));
-	    else
-	        strcpy(buf2, ">>> Expired <<<");
-	    printf("%s  %s  ", buf1, buf2);
-	}
-	printf("%s", krb_unparse_name_long(c.service, c.instance, c.realm));
-	if(long_form && option_verbose)
-	  printf(" (%d)", c.kvno);
-	printf("\n");
-    }
-    if (tgt_test)
-	exit(1);			/* no tgt found */
-    if (header && long_form && k_errno == EOF) {
-	printf("No tickets in file.\n");
-    }
-}
-
-/* adapted from getst() in librkb */
-/*
- * ok_getst() takes a file descriptor, a string and a count.  It reads
- * from the file until either it has read "count" characters, or until
- * it reads a null byte.  When finished, what has been read exists in
- * the given string "s".  If "count" characters were actually read, the
- * last is changed to a null, so the returned string is always null-
- * terminated.  ok_getst() returns the number of characters read, including
- * the null terminator.
- *
- * If there is a read error, it returns -1 (like the read(2) system call)
- */
-
-static int
-ok_getst(int fd, char *s, int n)
-{
-    int count = n;
-    int err;
-    while ((err = read(fd, s, 1)) > 0 && --count)
-        if (*s++ == '\0')
-            return (n - count);
-    if (err < 0)
-	return(-1);
-    *s = '\0';
-    return (n - count);
-}
-
-static void
-display_tokens()
-{
-    u_int32_t i;
-    unsigned char t[128];
-    struct ViceIoctl parms;
-    struct ClearToken ct;
-    int size_secret_tok, size_public_tok;
-
-    parms.in = (void *)&i;
-    parms.in_size = sizeof(i);
-    parms.out = (void *)t;
-    parms.out_size = sizeof(t);
-
-    for (i = 0; k_pioctl(NULL, VIOCGETTOK, &parms, 0) == 0; i++) {
-        char *cell;
-	memcpy(&size_secret_tok, t, 4);
-	memcpy(&size_public_tok, t + 4 + size_secret_tok, 4);
-	memcpy(&ct, t + 4 + size_secret_tok + 4, size_public_tok);
-	cell = t + 4 + size_secret_tok + 4 + size_public_tok + 4;
-
-	printf("%-15s  ", short_date(ct.BeginTimestamp));
-	printf("%-15s  ", short_date(ct.EndTimestamp));
-	if ((ct.EndTimestamp - ct.BeginTimestamp) & 1)
-	  printf("User's (AFS ID %d) tokens for %s", ct.ViceId, cell);
-	else
-	  printf("Tokens for %s", cell);
-	if (option_verbose)
-	    printf(" (%d)", ct.AuthHandle);
-	putchar('\n');
-    }
-}
-
-static void
-display_srvtab(char *file)
-{
-    int stab;
-    char serv[SNAME_SZ];
-    char inst[INST_SZ];
-    char rlm[REALM_SZ];
-    unsigned char key[8];
-    unsigned char vno;
-    int count;
-
-    printf("Server key file:   %s\n", file);
-	
-    if ((stab = open(file, O_RDONLY, 0400)) < 0) {
-	perror(file);
-	exit(1);
-    }
-    printf("%-15s %-15s %-10s %s\n","Service","Instance","Realm",
-	   "Key Version");
-    printf("------------------------------------------------------\n");
-
-    /* argh. getst doesn't return error codes, it silently fails */
-    while (((count = ok_getst(stab, serv, SNAME_SZ)) > 0)
-	   && ((count = ok_getst(stab, inst, INST_SZ)) > 0)
-	   && ((count = ok_getst(stab, rlm, REALM_SZ)) > 0)) {
-	if (((count = read(stab,  &vno,1)) != 1) ||
-	     ((count = read(stab, key,8)) != 8)) {
-	    if (count < 0)
-		err(1, "reading from key file");
-	    else
-		errx(1, "key file truncated");
-	}
-	printf("%-15s %-15s %-15s %d\n",serv,inst,rlm,vno);
-    }
-    if (count < 0)
-	warn(file);
-    close(stab);
-}
-
-static void
-usage(void)
-{
-    fprintf(stderr,
-	    "Usage: %s [ -v | -s | -t ] [ -f filename ] [-tokens] [-srvtab ]\n",
-	    __progname);
-    exit(1);
-}
-
-/* ARGSUSED */
-int
-main(int argc, char **argv)
-{
-    int     long_form = 1;
-    int     tgt_test = 0;
-    int     do_srvtab = 0;
-    int     do_tokens = 0;
-    char   *tkt_file = NULL;
-
-    set_progname(argv[0]);
-
-    while (*(++argv)) {
-	if (!strcmp(*argv, "-v")) {
-	    option_verbose = 1;
-	    continue;
-	}
-	if (!strcmp(*argv, "-s")) {
-	    long_form = 0;
-	    continue;
-	}
-	if (!strcmp(*argv, "-t")) {
-	    tgt_test = 1;
-	    long_form = 0;
-	    continue;
-	}
-	if (strcmp(*argv, "-tokens") == 0
-	    || strcmp(*argv, "-T") == 0) {
-	    do_tokens = k_hasafs();
-	    continue;
-	}
-	if (!strcmp(*argv, "-l")) {	/* now default */
-	    continue;
-	}
-	if (!strncmp(*argv, "-f", 2)) {
-	    if (*(++argv)) {
-		tkt_file = *argv;
-		continue;
-	    } else
-		usage();
-	}
-	if (!strcmp(*argv, "-srvtab")) {
-		if (tkt_file == NULL)	/* if no other file spec'ed,
-					   set file to default srvtab */
-		    tkt_file = KEYFILE;
-		do_srvtab = 1;
-		continue;
-	}
-	usage();
-    }
-
-    if (do_srvtab)
-	display_srvtab(tkt_file);
-    else
-	display_tktfile(tkt_file, tgt_test, long_form);
-    if (long_form && do_tokens)
-	display_tokens();
-    exit(0);
-}
diff --git a/crypto/kerberosIV/kuser/kuser_locl.h b/crypto/kerberosIV/kuser/kuser_locl.h
deleted file mode 100644
index 514a0ac5e597..000000000000
--- a/crypto/kerberosIV/kuser/kuser_locl.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id: kuser_locl.h,v 1.10 1997/05/20 18:40:43 bg Exp $ */
-
-#include "config.h"
-#include "protos.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <time.h>
-#ifdef HAVE_SYS_FILE_H
-#include <sys/file.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-
-#ifdef HAVE_PWD_H
-#include <pwd.h>
-#endif
-
-#ifdef SOCKS
-#include <socks.h>
-#endif
-
-#include <roken.h>
-
-#include <err.h>
-
-#include <krb.h>
-#include <krb_db.h>
-#include <kadm.h>
-#include <prot.h>
diff --git a/crypto/kerberosIV/lib/Makefile.in b/crypto/kerberosIV/lib/Makefile.in
deleted file mode 100644
index b2e662c26e8f..000000000000
--- a/crypto/kerberosIV/lib/Makefile.in
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# $Id: Makefile.in,v 1.21 1997/05/20 18:58:40 bg Exp $
-#
-
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-SHELL		= /bin/sh
-
-@SET_MAKE@
-
-SUBDIRS		= des krb kdb kadm acl kafs roken otp auth sl editline
-
-all:
-		for i in $(SUBDIRS); \
-		do (cd $$i && $(MAKE) $(MFLAGS) all); done
-
-Wall:
-		make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
-
-install:
-		for i in $(SUBDIRS); \
-		do (cd $$i && $(MAKE) $(MFLAGS) install); done
-
-uninstall:
-		for i in $(SUBDIRS); \
-		do (cd $$i && $(MAKE) $(MFLAGS) uninstall); done
-
-check:		all
-		for i in $(SUBDIRS); \
-		do (cd $$i && $(MAKE) $(MFLAGS) check); done
-
-clean:
-		for i in $(SUBDIRS); \
-		do (cd $$i && $(MAKE) $(MFLAGS) clean); done
-
-mostlyclean:	clean
-
-distclean:
-		for i in $(SUBDIRS); \
-		do (cd $$i && $(MAKE) $(MFLAGS) distclean); done
-		rm -f Makefile config.status *~
-
-realclean:
-		for i in $(SUBDIRS); \
-		do (cd $$i && $(MAKE) $(MFLAGS) realclean); done
diff --git a/crypto/kerberosIV/lib/acl/Makefile.in b/crypto/kerberosIV/lib/acl/Makefile.in
deleted file mode 100644
index 59894e488c07..000000000000
--- a/crypto/kerberosIV/lib/acl/Makefile.in
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# $Id: Makefile.in,v 1.21 1997/05/06 03:46:37 assar Exp $
-#
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-CC = @CC@
-AR = ar
-RANLIB = @RANLIB@
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-
-INSTALL = @INSTALL@
-INSTALL_DATA	= @INSTALL_DATA@
-MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-libdir = @libdir@
-
-PICFLAGS = # @PICFLAGS@
-
-LIBNAME = $(LIBPREFIX)acl
-#LIBEXT = @LIBEXT@ Always build archive library!
-LIBEXT = a
-LIBPREFIX = @LIBPREFIX@
-SHLIBEXT = @SHLIBEXT@
-LDSHARED = @LDSHARED@
-LIB = $(LIBNAME).$(LIBEXT)
-
-SOURCES = acl_files.c
-
-OBJECTS = acl_files.o
-
-all: $(LIB)
-
-Wall:
-	make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $<
-
-install: all
-	$(MKINSTALLDIRS) $(libdir)
-	$(INSTALL_DATA) -m 0555 $(LIB) $(libdir)
-
-uninstall:
-	rm -f $(libdir)/$(LIB)
-
-TAGS: $(SOURCES)
-	etags $(SOURCES)
-
-check:
-
-clean:
-	rm -f $(LIB) *.o *.a
-
-mostlyclean: clean
-
-distclean: clean
-	rm -f Makefile *.tab.c *~
-
-realclean: distclean
-	rm -f TAGS
-
-dist: $(DISTFILES)
-	for file in $(DISTFILES); do \
-	  ln $$file ../`cat ../.fname`/lib \
-	    || cp -p $$file ../`cat ../.fname`/lib; \
-	done
-
-$(LIBNAME).a: $(OBJECTS)
-	rm -f $@
-	$(AR) cr $@ $(OBJECTS)
-	-$(RANLIB) $@
-
-$(LIBNAME).$(SHLIBEXT): $(OBJECTS)
-	rm -f $@
-	$(LDSHARED) -o $@ $(OBJECTS)
-
-$(OBJECTS): ../../include/config.h
diff --git a/crypto/kerberosIV/lib/acl/acl.h b/crypto/kerberosIV/lib/acl/acl.h
deleted file mode 100644
index 305b66c9db2a..000000000000
--- a/crypto/kerberosIV/lib/acl/acl.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id: acl.h,v 1.5 1997/04/01 08:17:52 joda Exp $ */
-
-#ifndef __ACL_H
-#define __ACL_H
-
-#include <sys/cdefs.h>
-
-void acl_canonicalize_principal __P((char *principal, char *canon));
-int acl_initialize __P((char *acl_file, int perm));
-int acl_exact_match __P((char *acl, char *principal));
-int acl_check __P((char *acl, char *principal));
-int acl_add __P((char *acl, char *principal));
-int acl_delete __P((char *acl, char *principal));
-
-#endif /* __ACL_H */
diff --git a/crypto/kerberosIV/lib/acl/acl_files.c b/crypto/kerberosIV/lib/acl/acl_files.c
deleted file mode 100644
index fc00b8016be0..000000000000
--- a/crypto/kerberosIV/lib/acl/acl_files.c
+++ /dev/null
@@ -1,540 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-#include "config.h"
-#include "protos.h"
-
-RCSID("$Id: acl_files.c,v 1.10 1997/05/02 14:28:56 assar Exp $");
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#include <time.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#ifdef HAVE_SYS_FILE_H
-#include <sys/file.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
-#include <errno.h>
-#include <ctype.h>
-
-#include <roken.h>
-
-#include <krb.h>
-#include <acl.h>
-
-/*** Routines for manipulating access control list files ***/
-
-/* "aname.inst@realm" */
-#define MAX_PRINCIPAL_SIZE  (ANAME_SZ + INST_SZ + REALM_SZ + 3)
-#define INST_SEP '.'
-#define REALM_SEP '@'
-
-#define LINESIZE 2048		/* Maximum line length in an acl file */
-
-#define NEW_FILE "%s.~NEWACL~"	/* Format for name of altered acl file */
-#define WAIT_TIME 300		/* Maximum time allowed write acl file */
-
-#define CACHED_ACLS 8		/* How many acls to cache */
-				/* Each acl costs 1 open file descriptor */
-#define ACL_LEN 16		/* Twice a reasonable acl length */
-
-#define COR(a,b) ((a!=NULL)?(a):(b))
-
-/* Canonicalize a principal name */
-/* If instance is missing, it becomes "" */
-/* If realm is missing, it becomes the local realm */
-/* Canonicalized form is put in canon, which must be big enough to hold
-   MAX_PRINCIPAL_SIZE characters */
-void
-acl_canonicalize_principal(char *principal, char *canon)
-{
-    char *dot, *atsign, *end;
-    int len;
-
-    dot = strchr(principal, INST_SEP);
-    atsign = strchr(principal, REALM_SEP);
-
-    /* Maybe we're done already */
-    if(dot != NULL && atsign != NULL) {
-	if(dot < atsign) {
-	    /* It's for real */
-	    /* Copy into canon */
-	    strncpy(canon, principal, MAX_PRINCIPAL_SIZE);
-	    canon[MAX_PRINCIPAL_SIZE-1] = '\0';
-	    return;
-	} else {
-	    /* Nope, it's part of the realm */
-	    dot = NULL;
-	}
-    }
-    
-    /* No such luck */
-    end = principal + strlen(principal);
-
-    /* Get the principal name */
-    len = min(ANAME_SZ, COR(dot, COR(atsign, end)) - principal);
-    strncpy(canon, principal, len);
-    canon += len;
-
-    /* Add INST_SEP */
-    *canon++ = INST_SEP;
-
-    /* Get the instance, if it exists */
-    if(dot != NULL) {
-	++dot;
-	len = min(INST_SZ, COR(atsign, end) - dot);
-	strncpy(canon, dot, len);
-	canon += len;
-    }
-
-    /* Add REALM_SEP */
-    *canon++ = REALM_SEP;
-
-    /* Get the realm, if it exists */
-    /* Otherwise, default to local realm */
-    if(atsign != NULL) {
-	++atsign;
-	len = min(REALM_SZ, end - atsign);
-	strncpy(canon, atsign, len);
-	canon += len;
-	*canon++ = '\0';
-    } else if(krb_get_lrealm(canon, 1) != KSUCCESS) {
-	strcpy(canon, KRB_REALM);
-    }
-}
-	    
-/* Get a lock to modify acl_file */
-/* Return new FILE pointer */
-/* or NULL if file cannot be modified */
-/* REQUIRES WRITE PERMISSION TO CONTAINING DIRECTORY */
-static
-FILE *acl_lock_file(char *acl_file)
-{
-    struct stat s;
-    char new[LINESIZE];
-    int nfd;
-    FILE *nf;
-    int mode;
-
-    if(stat(acl_file, &s) < 0) return(NULL);
-    mode = s.st_mode;
-    snprintf(new, sizeof(new), NEW_FILE, acl_file);
-    for(;;) {
-	/* Open the new file */
-	if((nfd = open(new, O_WRONLY|O_CREAT|O_EXCL, mode)) < 0) {
-	    if(errno == EEXIST) {
-		/* Maybe somebody got here already, maybe it's just old */
-		if(stat(new, &s) < 0) return(NULL);
-		if(time(0) - s.st_ctime > WAIT_TIME) {
-		    /* File is stale, kill it */
-		    unlink(new);
-		    continue;
-		} else {
-		    /* Wait and try again */
-		    sleep(1);
-		    continue;
-		}
-	    } else {
-		/* Some other error, we lose */
-		return(NULL);
-	    }
-	}
-
-	/* If we got to here, the lock file is ours and ok */
-	/* Reopen it under stdio */
-	if((nf = fdopen(nfd, "w")) == NULL) {
-	    /* Oops, clean up */
-	    unlink(new);
-	}
-	return(nf);
-    }
-}
-
-/* Abort changes to acl_file written onto FILE *f */
-/* Returns 0 if successful, < 0 otherwise */
-/* Closes f */
-static int
-acl_abort(char *acl_file, FILE *f)
-{
-    char new[LINESIZE];
-    int ret;
-    struct stat s;
-
-    /* make sure we aren't nuking someone else's file */
-    if(fstat(fileno(f), &s) < 0
-       || s.st_nlink == 0) {
-	   fclose(f);
-	   return(-1);
-       } else {
-	   snprintf(new, sizeof(new), NEW_FILE, acl_file);
-	   ret = unlink(new);
-	   fclose(f);
-	   return(ret);
-       }
-}
-
-/* Commit changes to acl_file written onto FILE *f */
-/* Returns zero if successful */
-/* Returns > 0 if lock was broken */
-/* Returns < 0 if some other error occurs */
-/* Closes f */
-static int
-acl_commit(char *acl_file, FILE *f)
-{
-    char new[LINESIZE];
-    int ret;
-    struct stat s;
-
-    snprintf(new, sizeof(new), NEW_FILE, acl_file);
-    if(fflush(f) < 0
-       || fstat(fileno(f), &s) < 0
-       || s.st_nlink == 0) {
-	acl_abort(acl_file, f);
-	return(-1);
-    }
-
-    ret = rename(new, acl_file);
-    fclose(f);
-    return(ret);
-}
-
-/* Initialize an acl_file */
-/* Creates the file with permissions perm if it does not exist */
-/* Erases it if it does */
-/* Returns return value of acl_commit */
-int
-acl_initialize(char *acl_file, int perm)
-{
-    FILE *new;
-    int fd;
-
-    /* Check if the file exists already */
-    if((new = acl_lock_file(acl_file)) != NULL) {
-	return(acl_commit(acl_file, new));
-    } else {
-	/* File must be readable and writable by owner */
-	if((fd = open(acl_file, O_CREAT|O_EXCL, perm|0600)) < 0) {
-	    return(-1);
-	} else {
-	    close(fd);
-	    return(0);
-	}
-    }
-}
-
-/* Eliminate all whitespace character in buf */
-/* Modifies its argument */
-static void
- nuke_whitespace(char *buf)
-{
-    char *pin, *pout;
-
-    for(pin = pout = buf; *pin != '\0'; pin++)
-	if(!isspace(*pin)) *pout++ = *pin;
-    *pout = '\0';		/* Terminate the string */
-}
-
-/* Hash table stuff */
-
-struct hashtbl {
-    int size;			/* Max number of entries */
-    int entries;		/* Actual number of entries */
-    char **tbl;			/* Pointer to start of table */
-};
-
-/* Make an empty hash table of size s */
-static struct hashtbl *
-make_hash(int size)
-{
-    struct hashtbl *h;
-
-    if(size < 1) size = 1;
-    h = (struct hashtbl *) malloc(sizeof(struct hashtbl));
-    h->size = size;
-    h->entries = 0;
-    h->tbl = (char **) calloc(size, sizeof(char *));
-    return(h);
-}
-
-/* Destroy a hash table */
-static void
-destroy_hash(struct hashtbl *h)
-{
-    int i;
-
-    for(i = 0; i < h->size; i++) {
-	if(h->tbl[i] != NULL) free(h->tbl[i]);
-    }
-    free(h->tbl);
-    free(h);
-}
-
-/* Compute hash value for a string */
-static unsigned int
-hashval(char *s)
-{
-    unsigned hv;
-
-    for(hv = 0; *s != '\0'; s++) {
-	hv ^= ((hv << 3) ^ *s);
-    }
-    return(hv);
-}
-
-/* Add an element to a hash table */
-static void
-add_hash(struct hashtbl *h, char *el)
-{
-    unsigned hv;
-    char *s;
-    char **old;
-    int i;
-
-    /* Make space if it isn't there already */
-    if(h->entries + 1 > (h->size >> 1)) {
-	old = h->tbl;
-	h->tbl = (char **) calloc(h->size << 1, sizeof(char *));
-	for(i = 0; i < h->size; i++) {
-	    if(old[i] != NULL) {
-		hv = hashval(old[i]) % (h->size << 1);
-		while(h->tbl[hv] != NULL) hv = (hv+1) % (h->size << 1);
-		h->tbl[hv] = old[i];
-	    }
-	}
-	h->size = h->size << 1;
-	free(old);
-    }
-
-    hv = hashval(el) % h->size;
-    while(h->tbl[hv] != NULL && strcmp(h->tbl[hv], el)) hv = (hv+1) % h->size;
-    s = strdup(el);
-    h->tbl[hv] = s;
-    h->entries++;
-}
-
-/* Returns nonzero if el is in h */
-static int
-check_hash(struct hashtbl *h, char *el)
-{
-    unsigned hv;
-
-    for(hv = hashval(el) % h->size;
-	h->tbl[hv] != NULL;
-	hv = (hv + 1) % h->size) {
-	    if(!strcmp(h->tbl[hv], el)) return(1);
-	}
-    return(0);
-}
-
-struct acl {
-    char filename[LINESIZE];	/* Name of acl file */
-    int fd;			/* File descriptor for acl file */
-    struct stat status;		/* File status at last read */
-    struct hashtbl *acl;	/* Acl entries */
-};
-
-static struct acl acl_cache[CACHED_ACLS];
-
-static int acl_cache_count = 0;
-static int acl_cache_next = 0;
-
-/* Returns < 0 if unsuccessful in loading acl */
-/* Returns index into acl_cache otherwise */
-/* Note that if acl is already loaded, this is just a lookup */
-static int
-acl_load(char *name)
-{
-    int i;
-    FILE *f;
-    struct stat s;
-    char buf[MAX_PRINCIPAL_SIZE];
-    char canon[MAX_PRINCIPAL_SIZE];
-
-    /* See if it's there already */
-    for(i = 0; i < acl_cache_count; i++) {
-	if(!strcmp(acl_cache[i].filename, name)
-	   && acl_cache[i].fd >= 0) goto got_it;
-    }
-
-    /* It isn't, load it in */
-    /* maybe there's still room */
-    if(acl_cache_count < CACHED_ACLS) {
-	i = acl_cache_count++;
-    } else {
-	/* No room, clean one out */
-	i = acl_cache_next;
-	acl_cache_next = (acl_cache_next + 1) % CACHED_ACLS;
-	close(acl_cache[i].fd);
-	if(acl_cache[i].acl) {
-	    destroy_hash(acl_cache[i].acl);
-	    acl_cache[i].acl = (struct hashtbl *) 0;
-	}
-    }
-
-    /* Set up the acl */
-    strcpy(acl_cache[i].filename, name);
-    if((acl_cache[i].fd = open(name, O_RDONLY, 0)) < 0) return(-1);
-    /* Force reload */
-    acl_cache[i].acl = (struct hashtbl *) 0;
-
- got_it:
-    /*
-     * See if the stat matches
-     *
-     * Use stat(), not fstat(), as the file may have been re-created by
-     * acl_add or acl_delete.  If this happens, the old inode will have
-     * no changes in the mod-time and the following test will fail.
-     */
-    if(stat(acl_cache[i].filename, &s) < 0) return(-1);
-    if(acl_cache[i].acl == (struct hashtbl *) 0
-       || s.st_nlink != acl_cache[i].status.st_nlink
-       || s.st_mtime != acl_cache[i].status.st_mtime
-       || s.st_ctime != acl_cache[i].status.st_ctime) {
-	   /* Gotta reload */
-	   if(acl_cache[i].fd >= 0) close(acl_cache[i].fd);
-	   if((acl_cache[i].fd = open(name, O_RDONLY, 0)) < 0) return(-1);
-	   if((f = fdopen(acl_cache[i].fd, "r")) == NULL) return(-1);
-	   if(acl_cache[i].acl) destroy_hash(acl_cache[i].acl);
-	   acl_cache[i].acl = make_hash(ACL_LEN);
-	   while(fgets(buf, sizeof(buf), f) != NULL) {
-	       nuke_whitespace(buf);
-	       acl_canonicalize_principal(buf, canon);
-	       add_hash(acl_cache[i].acl, canon);
-	   }
-	   fclose(f);
-	   acl_cache[i].status = s;
-       }
-    return(i);
-}
-
-/* Returns nonzero if it can be determined that acl contains principal */
-/* Principal is not canonicalized, and no wildcarding is done */
-int
-acl_exact_match(char *acl, char *principal)
-{
-    int idx;
-
-    return((idx = acl_load(acl)) >= 0
-	   && check_hash(acl_cache[idx].acl, principal));
-}
-
-/* Returns nonzero if it can be determined that acl contains principal */
-/* Recognizes wildcards in acl of the form
-   name.*@realm, *.*@realm, and *.*@* */
-int
-acl_check(char *acl, char *principal)
-{
-    char buf[MAX_PRINCIPAL_SIZE];
-    char canon[MAX_PRINCIPAL_SIZE];
-    char *realm;
-
-    acl_canonicalize_principal(principal, canon);
-
-    /* Is it there? */
-    if(acl_exact_match(acl, canon)) return(1);
-
-    /* Try the wildcards */
-    realm = strchr(canon, REALM_SEP);
-    *strchr(canon, INST_SEP) = '\0';	/* Chuck the instance */
-
-    snprintf(buf, sizeof(buf), "%s.*%s", canon, realm);
-    if(acl_exact_match(acl, buf)) return(1);
-
-    snprintf(buf, sizeof(buf), "*.*%s", realm);
-    if(acl_exact_match(acl, buf) || acl_exact_match(acl, "*.*@*")) return(1);
-       
-    return(0);
-}
-
-/* Adds principal to acl */
-/* Wildcards are interpreted literally */
-int
-acl_add(char *acl, char *principal)
-{
-    int idx;
-    int i;
-    FILE *new;
-    char canon[MAX_PRINCIPAL_SIZE];
-
-    acl_canonicalize_principal(principal, canon);
-
-    if((new = acl_lock_file(acl)) == NULL) return(-1);
-    if((acl_exact_match(acl, canon))
-       || (idx = acl_load(acl)) < 0) {
-	   acl_abort(acl, new);
-	   return(-1);
-       }
-    /* It isn't there yet, copy the file and put it in */
-    for(i = 0; i < acl_cache[idx].acl->size; i++) {
-	if(acl_cache[idx].acl->tbl[i] != NULL) {
-	    if(fputs(acl_cache[idx].acl->tbl[i], new) == EOF
-	       || putc('\n', new) != '\n') {
-		   acl_abort(acl, new);
-		   return(-1);
-	       }
-	}
-    }
-    fputs(canon, new);
-    putc('\n', new);
-    return(acl_commit(acl, new));
-}
-
-/* Removes principal from acl */
-/* Wildcards are interpreted literally */
-int
-acl_delete(char *acl, char *principal)
-{
-    int idx;
-    int i;
-    FILE *new;
-    char canon[MAX_PRINCIPAL_SIZE];
-
-    acl_canonicalize_principal(principal, canon);
-
-    if((new = acl_lock_file(acl)) == NULL) return(-1);
-    if((!acl_exact_match(acl, canon))
-       || (idx = acl_load(acl)) < 0) {
-	   acl_abort(acl, new);
-	   return(-1);
-       }
-    /* It isn't there yet, copy the file and put it in */
-    for(i = 0; i < acl_cache[idx].acl->size; i++) {
-	if(acl_cache[idx].acl->tbl[i] != NULL
-	   && strcmp(acl_cache[idx].acl->tbl[i], canon)) {
-	       fputs(acl_cache[idx].acl->tbl[i], new);
-	       putc('\n', new);
-	}
-    }
-    return(acl_commit(acl, new));
-}
diff --git a/crypto/kerberosIV/lib/acl/acl_files.doc b/crypto/kerberosIV/lib/acl/acl_files.doc
deleted file mode 100644
index 78c448a6d698..000000000000
--- a/crypto/kerberosIV/lib/acl/acl_files.doc
+++ /dev/null
@@ -1,107 +0,0 @@
-PROTOTYPE ACL LIBRARY
-
-Introduction
-	
-An access control list (ACL) is a list of principals, where each
-principal is is represented by a text string which cannot contain
-whitespace.  The library allows application programs to refer to named
-access control lists to test membership and to atomically add and
-delete principals using a natural and intuitive interface.  At
-present, the names of access control lists are required to be Unix
-filenames, and refer to human-readable Unix files; in the future, when
-a networked ACL server is implemented, the names may refer to a
-different namespace specific to the ACL service.
-
-
-Usage
-
-cc <files> -lacl -lkrb.
-
-
-
-Principal Names
-
-Principal names have the form
-
-<name>[.<instance>][@<realm>]
-
-e.g.
-
-asp
-asp.root
-asp@ATHENA.MIT.EDU
-asp.@ATHENA.MIT.EDU
-asp.root@ATHENA.MIT.EDU
-
-It is possible for principals to be underspecified.  If instance is
-missing, it is assumed to be "".  If realm is missing, it is assumed
-to be local_realm.  The canonical form contains all of name, instance,
-and realm; the acl_add and acl_delete routines will always
-leave the file in that form.  Note that the canonical form of
-asp@ATHENA.MIT.EDU is actually asp.@ATHENA.MIT.EDU.
-
-
-Routines
-
-acl_canonicalize_principal(principal, buf)
-char *principal;
-char *buf;  	/*RETVAL*/
-
-Store the canonical form of principal in buf.  Buf must contain enough
-space to store a principal, given the limits on the sizes of name,
-instance, and realm specified in /usr/include/krb.h.
-
-acl_check(acl, principal)
-char *acl;
-char *principal;
-
-Returns nonzero if principal appears in acl.  Returns 0 if principal
-does not appear in acl, or if an error occurs.  Canonicalizes
-principal before checking, and allows the ACL to contain wildcards.
-
-acl_exact_match(acl, principal)
-char *acl;
-char *principal;
-
-Like acl_check, but does no canonicalization or wildcarding.
-
-acl_add(acl, principal)
-char *acl;
-char *principal;
-
-Atomically adds principal to acl.  Returns 0 if successful, nonzero
-otherwise.  It is considered a failure if principal is already in acl.
-This routine will canonicalize principal, but will treat wildcards
-literally.
-
-acl_delete(acl, principal)
-char *acl;
-char *principal;
-
-Atomically deletes principal from acl.  Returns 0 if successful,
-nonzero otherwise.  It is consider a failure if principal is not
-already in acl.  This routine will canonicalize principal, but will
-treat wildcards literally.
-
-acl_initialize(acl, mode)
-char *acl;
-int mode;
-
-Initialize acl.  If acl file does not exist, creates it with mode
-mode.  If acl exists, removes all members.  Returns 0 if successful,
-nonzero otherwise.  WARNING: Mode argument is likely to change with
-the eventual introduction of an ACL service.  
-
-
-Known problems
-
-In the presence of concurrency, there is a very small chance that
-acl_add or acl_delete could report success even though it would have
-had no effect.  This is a necessary side effect of using lock files
-for concurrency control rather than flock(2), which is not supported
-by NFS.
-
-The current implementation caches ACLs in memory in a hash-table
-format for increased efficiency in checking membership; one effect of
-the caching scheme is that one file descriptor will be kept open for
-each ACL cached, up to a maximum of 8.
diff --git a/crypto/kerberosIV/lib/kadm/Makefile.in b/crypto/kerberosIV/lib/kadm/Makefile.in
deleted file mode 100644
index 1dafd4f9ff2f..000000000000
--- a/crypto/kerberosIV/lib/kadm/Makefile.in
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-# $Id: Makefile.in,v 1.30 1997/05/06 03:47:28 assar Exp $
-#
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-CC = @CC@
-AR = ar
-RANLIB = @RANLIB@
-LN_S = @LN_S@
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-
-INSTALL = @INSTALL@
-INSTALL_DATA	= @INSTALL_DATA@
-MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
-
-COMPILE_ET = ../../util/et/compile_et$(EXECSUFFIX) -language ansi-c 
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-libdir = @libdir@
-
-PICFLAGS = @PICFLAGS@
-
-LIBNAME = $(LIBPREFIX)kadm
-LIBEXT = @LIBEXT@
-LIBPREFIX = @LIBPREFIX@
-EXECSUFFIX = @EXECSUFFIX@
-SHLIBEXT = @SHLIBEXT@
-LDSHARED = @LDSHARED@
-LIB = $(LIBNAME).$(LIBEXT)
-
-SOURCES = kadm_cli_wrap.c kadm_err.c kadm_stream.c kadm_supp.c
-
-OBJECTS = kadm_cli_wrap.o kadm_err.o kadm_stream.o kadm_supp.o
-
-all: $(LIB)
-
-Wall:
-	make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $<
-
-install: all
-	$(MKINSTALLDIRS) $(libdir)
-	$(INSTALL_DATA) -m 0555 $(LIB) $(libdir)
-
-uninstall:
-	rm -f $(libdir)/$(LIB)
-
-TAGS: $(SOURCES)
-	etags $(SOURCES)
-
-check:
-
-clean:
-	rm -f $(LIB) *.o *.a kadm_err.c kadm_err.h
-
-mostlyclean: clean
-
-distclean: clean
-	rm -f Makefile *.tab.c *~
-
-realclean: distclean
-	rm -f TAGS
-
-dist: $(DISTFILES)
-	for file in $(DISTFILES); do \
-	  ln $$file ../`cat ../.fname`/lib \
-	    || cp -p $$file ../`cat ../.fname`/lib; \
-	done
-
-$(LIBNAME).a: $(OBJECTS)
-	rm -f $@
-	$(AR) cr $@ $(OBJECTS)
-	-$(RANLIB) $@
-
-$(LIBNAME).$(SHLIBEXT): $(OBJECTS)
-	rm -f $@
-	$(LDSHARED) -o $@ $(OBJECTS)
-
-kadm_err.c kadm_err.h: kadm_err.et
-	test -r kadm_err.et || (rm -f kadm_err.et && $(LN_S) $(srcdir)/kadm_err.et .)
-	$(COMPILE_ET) kadm_err.et
-
-$(OBJECTS): ../../include/config.h
-$(OBJECTS): kadm_err.h kadm_locl.h
diff --git a/crypto/kerberosIV/lib/kadm/kadm.h b/crypto/kerberosIV/lib/kadm/kadm.h
deleted file mode 100644
index d18f5921ce5b..000000000000
--- a/crypto/kerberosIV/lib/kadm/kadm.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * $Id: kadm.h,v 1.12 1996/11/17 20:04:39 assar Exp $
- *
- * Copyright 1988 by the Massachusetts Institute of Technology.
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
- *
- * Definitions for Kerberos administration server & client
- */
-
-#ifndef KADM_DEFS
-#define KADM_DEFS
-
-/*
- * kadm.h
- * Header file for the fourth attempt at an admin server
- * Doug Church, December 28, 1989, MIT Project Athena
- */
-
-#include <krb_db.h>
-
-/* The global structures for the client and server */
-typedef struct {
-  struct sockaddr_in admin_addr;
-  struct sockaddr_in my_addr;
-  int my_addr_len;
-  int admin_fd;			/* file descriptor for link to admin server */
-  char sname[ANAME_SZ];		/* the service name */
-  char sinst[INST_SZ];		/* the services instance */
-  char krbrlm[REALM_SZ];
-} Kadm_Client;
-
-typedef struct {		/* status of the server, i.e the parameters */
-   int inter;			/* Space for command line flags */
-   char *sysfile;		/* filename of server */
-} admin_params;			/* Well... it's the admin's parameters */
-
-/* Largest password length to be supported */
-#define MAX_KPW_LEN	128
-/* Minimum allowed password length */
-#define MIN_KPW_LEN	6
-
-/* Largest packet the admin server will ever allow itself to return */
-#define KADM_RET_MAX 2048
-
-/* That's right, versions are 8 byte strings */
-#define KADM_VERSTR	"KADM0.0A"
-#define KADM_ULOSE	"KYOULOSE"	/* sent back when server can't
-					   decrypt client's msg */
-#define KADM_VERSIZE strlen(KADM_VERSTR)
-
-/* the lookups for the server instances */
-#define PWSERV_NAME  "changepw"
-#define KADM_SNAME   "kerberos_master"
-#define KADM_PORT    751
-#define KADM_SINST   "kerberos"
-
-/* Attributes fields constants and macros */
-#define ALLOC        2
-#define RESERVED     3
-#define DEALLOC      4
-#define DEACTIVATED  5
-#define ACTIVE       6
-
-/* Kadm_vals structure for passing db fields into the server routines */
-#define FLDSZ        4
-
-typedef struct {
-    u_int8_t       fields[FLDSZ];     /* The active fields in this struct */
-    char           name[ANAME_SZ];
-    char           instance[INST_SZ];
-    u_int32_t  key_low;
-    u_int32_t  key_high;
-    u_int32_t  exp_date;
-    u_int16_t attributes;
-    u_int8_t  max_life;
-} Kadm_vals;                    /* The basic values structure in Kadm */
-
-/* Kadm_vals structure for passing db fields into the server routines */
-#define FLDSZ        4
-
-/* Need to define fields types here */
-#define KADM_NAME       31
-#define KADM_INST       30
-#define KADM_EXPDATE    29
-#define KADM_ATTR       28
-#define KADM_MAXLIFE    27
-#define KADM_DESKEY     26
-
-/* To set a field entry f in a fields structure d */
-#define SET_FIELD(f,d)  (d[3-(f/8)]|=(1<<(f%8)))
-
-/* To set a field entry f in a fields structure d */
-#define CLEAR_FIELD(f,d)  (d[3-(f/8)]&=(~(1<<(f%8))))
-
-/* Is field f in fields structure d */
-#define IS_FIELD(f,d)   (d[3-(f/8)]&(1<<(f%8)))
-
-/* Various return codes */
-#define KADM_SUCCESS    0
-
-#define WILDCARD_STR "*"
-
-enum acl_types {
-ADDACL,
-GETACL,
-MODACL,
-STABACL, /* not used */
-DELACL
-};
-
-/* Various opcodes for the admin server's functions */
-#define CHANGE_PW    2
-#define ADD_ENT      3
-#define MOD_ENT      4
-#define GET_ENT      5
-#define CHECK_PW     6 /* not used */
-#define CHG_STAB     7 /* not used */
-#define DEL_ENT	     8
-
-void prin_vals __P((Kadm_vals *));
-int stv_long __P((u_char *, u_int32_t *, int, int));
-int vts_long __P((u_int32_t, u_char **, int));
-int vts_string __P((char *, u_char **, int));
-int stv_string __P((u_char *, char *, int, int, int));
-
-int stream_to_vals __P((u_char *, Kadm_vals *, int));
-int vals_to_stream __P((Kadm_vals *, u_char **));
-
-int kadm_init_link __P((char *, char *, char *));
-int kadm_change_pw __P((unsigned char *));
-int kadm_change_pw_plain __P((unsigned char *, char *, char**));
-int kadm_mod __P((Kadm_vals *, Kadm_vals *));
-int kadm_get __P((Kadm_vals *, u_char *));
-int kadm_add __P((Kadm_vals *));
-int kadm_del __P((Kadm_vals *));
-void kadm_vals_to_prin __P((u_char *, Principal *, Kadm_vals *));
-void kadm_prin_to_vals __P((u_char *, Kadm_vals *, Principal *));
-
-
-
-#endif /* KADM_DEFS */
diff --git a/crypto/kerberosIV/lib/kadm/kadm_cli_wrap.c b/crypto/kerberosIV/lib/kadm/kadm_cli_wrap.c
deleted file mode 100644
index 1e5c4f36bde6..000000000000
--- a/crypto/kerberosIV/lib/kadm/kadm_cli_wrap.c
+++ /dev/null
@@ -1,545 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-/*
- * Kerberos administration server client-side routines
- */
-
-/*
- * kadm_cli_wrap.c the client side wrapping of the calls to the admin server 
- */
-
-#include "kadm_locl.h"
-
-RCSID("$Id: kadm_cli_wrap.c,v 1.21 1997/05/02 10:28:11 joda Exp $");
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-static Kadm_Client client_parm;
-
-/* Macros for use in returning data... used in kadm_cli_send */
-#define RET_N_FREE(r) {clear_secrets(); free((char *)act_st); free((char *)priv_pak); return r;}
-
-/* Keys for use in the transactions */
-static des_cblock sess_key;	       /* to be filled in by kadm_cli_keyd */
-static des_key_schedule sess_sched;
-
-static void
-clear_secrets(void)
-{
-	memset(sess_key, 0, sizeof(sess_key));
-	memset(sess_sched, 0, sizeof(sess_sched));
-	return;
-}
-
-static RETSIGTYPE (*opipe)();
-
-static void
-kadm_cli_disconn(void)
-{
-    close(client_parm.admin_fd);
-    signal(SIGPIPE, opipe);
-    return;
-}
-
-/*
- * kadm_init_link
- *	receives    : name, inst, realm
- *
- * initializes client parm, the Kadm_Client structure which holds the 
- * data about the connection between the server and client, the services 
- * used, the locations and other fun things 
- */
-
-int
-kadm_init_link(char *n, char *i, char *r)
-{
-	struct hostent *hop;	       /* host we will talk to */
-	char adm_hostname[MaxHostNameLen];
-
-	init_kadm_err_tbl();
-	init_krb_err_tbl();
-	strcpy(client_parm.sname, n);
-	strcpy(client_parm.sinst, i);
-	strcpy(client_parm.krbrlm, r);
-	client_parm.admin_fd = -1;
-
-	/* set up the admin_addr - fetch name of admin host */
-	if (krb_get_admhst(adm_hostname, client_parm.krbrlm, 1) != KSUCCESS)
-		return KADM_NO_HOST;
-	if ((hop = gethostbyname(adm_hostname)) == NULL)
-		return KADM_UNK_HOST;
-	memset(&client_parm.admin_addr, 0, sizeof(client_parm.admin_addr));
-	client_parm.admin_addr.sin_port = 
-	  k_getportbyname(KADM_SNAME, "tcp", htons(KADM_PORT));
-	client_parm.admin_addr.sin_family = hop->h_addrtype;
-	memcpy(&client_parm.admin_addr.sin_addr, hop->h_addr,
-	       sizeof(client_parm.admin_addr.sin_addr));
-
-	return KADM_SUCCESS;
-}
-
-static int
-kadm_cli_conn(void)
-{					/* this connects and sets my_addr */
-    int on = 1;
-
-    if ((client_parm.admin_fd =
-	 socket(client_parm.admin_addr.sin_family, SOCK_STREAM,0)) < 0)
-	return KADM_NO_SOCK;		/* couldnt create the socket */
-    if (connect(client_parm.admin_fd,
-		(struct sockaddr *) & client_parm.admin_addr,
-		sizeof(client_parm.admin_addr))) {
-	close(client_parm.admin_fd);
-	client_parm.admin_fd = -1;
-	return KADM_NO_CONN;		/* couldnt get the connect */
-    }
-    opipe = signal(SIGPIPE, SIG_IGN);
-    client_parm.my_addr_len = sizeof(client_parm.my_addr);
-    if (getsockname(client_parm.admin_fd,
-		    (struct sockaddr *) & client_parm.my_addr,
-		    &client_parm.my_addr_len) < 0) {
-	close(client_parm.admin_fd);
-	client_parm.admin_fd = -1;
-	signal(SIGPIPE, opipe);
-	return KADM_NO_HERE;		/* couldnt find out who we are */
-    }
-#if defined(SO_KEEPALIVE) && defined(HAVE_SETSOCKOPT)
-    if (setsockopt(client_parm.admin_fd, SOL_SOCKET, SO_KEEPALIVE,
-		   (void *)&on,
-		   sizeof(on)) < 0) {
-	close(client_parm.admin_fd);
-	client_parm.admin_fd = -1;
-	signal(SIGPIPE, opipe);
-	return KADM_NO_CONN;		/* XXX */
-    }
-#endif
-    return KADM_SUCCESS;
-}
-
-/* takes in the sess_key and key_schedule and sets them appropriately */
-static int
-kadm_cli_keyd(des_cblock (*s_k), struct des_ks_struct *s_s)
-                			       /* session key */
-                     		       /* session key schedule */
-{
-	CREDENTIALS cred;	       /* to get key data */
-	int stat;
-
-	/* want .sname and .sinst here.... */
-	if ((stat = krb_get_cred(client_parm.sname, client_parm.sinst,
-				client_parm.krbrlm, &cred)))
-		return stat + krb_err_base;
-	memcpy(s_k, cred.session, sizeof(des_cblock));
-	memset(cred.session, 0, sizeof(des_cblock));
-#ifdef NOENCRYPTION
-	memset(s_s, 0, sizeof(des_key_schedule));
-#else
-	if ((stat = des_key_sched(s_k,s_s)))
-		return(stat+krb_err_base);
-#endif
-	return KADM_SUCCESS;
-}				       /* This code "works" */
-
-static int
-kadm_cli_out(u_char *dat, int dat_len, u_char **ret_dat, int *ret_siz)
-{
-	u_int16_t dlen;
-	int retval;
-	char tmp[4];
-
-	dlen = (u_int16_t) dat_len;
-
-	if (dat_len != (int)dlen)
-		return (KADM_NO_ROOM);
-
-	tmp[0] = (dlen >> 8) & 0xff;
-	tmp[1] = dlen & 0xff;
-	if (krb_net_write(client_parm.admin_fd, tmp, 2) != 2)
-	    return (errno);	       /* XXX */
-
-	if (krb_net_write(client_parm.admin_fd, (char *) dat, dat_len) < 0)
-		return (errno);	       /* XXX */
-
-	
-	if ((retval = krb_net_read(client_parm.admin_fd, tmp, 2)) != 2){
-	    if (retval < 0)
-		return(errno);		/* XXX */
-	    else
-		return(EPIPE);		/* short read ! */
-	}
-	dlen = (tmp[0] << 8) | tmp[1];
-
-	*ret_dat = (u_char *)malloc((unsigned)dlen);
-	if (!*ret_dat)
-	    return(KADM_NOMEM);
-
-	if ((retval = krb_net_read(client_parm.admin_fd,  *ret_dat,
-				  dlen) != dlen)) {
-	    if (retval < 0)
-		return(errno);		/* XXX */
-	    else
-		return(EPIPE);		/* short read ! */
-	}
-	*ret_siz = (int) dlen;
-	return KADM_SUCCESS;
-}
-
-/*
- * kadm_cli_send
- *	recieves   : opcode, packet, packet length, serv_name, serv_inst
- *	returns    : return code from the packet build, the server, or
- *			 something else 
- *
- * It assembles a packet as follows:
- *	 8 bytes    : VERSION STRING
- *	 4 bytes    : LENGTH OF MESSAGE DATA and OPCODE
- *		    : KTEXT
- *		    : OPCODE       \
- *		    : DATA          > Encrypted (with make priv)
- *		    : ......       / 
- *
- * If it builds the packet and it is small enough, then it attempts to open the
- * connection to the admin server.  If the connection is succesfully open
- * then it sends the data and waits for a reply. 
- */
-static int
-kadm_cli_send(u_char *st_dat, int st_siz, u_char **ret_dat, int *ret_siz)
-               				/* the actual data */
-           				/* length of said data */
-                 			/* to give return info */
-             				/* length of returned info */
-{
-	int act_len, retdat;	       /* current offset into packet, return
-				        * data */
-	KTEXT_ST authent;	       /* the authenticator we will build */
-	u_char *act_st;		       /* the pointer to the complete packet */
-	u_char *priv_pak;	       /* private version of the packet */
-	int priv_len;		       /* length of private packet */
-	u_int32_t cksum;		       /* checksum of the packet */
-	MSG_DAT mdat;
-	u_char *return_dat;
-
-	act_st = (u_char *) malloc(KADM_VERSIZE); /* verstr stored first */
-	strncpy((char *)act_st, KADM_VERSTR, KADM_VERSIZE);
-	act_len = KADM_VERSIZE;
-
-	if ((retdat = kadm_cli_keyd(&sess_key, sess_sched)) != KADM_SUCCESS) {
-		free(act_st);
-		return retdat;	       /* couldnt get key working */
-	}
-	priv_pak = (u_char *) malloc((unsigned)(st_siz + 200));
-	/* 200 bytes for extra info case */
-	if ((priv_len = krb_mk_priv(st_dat, priv_pak, (u_int32_t)st_siz,
-				    sess_sched, &sess_key, &client_parm.my_addr,
-				    &client_parm.admin_addr)) < 0)
-		RET_N_FREE(KADM_NO_ENCRYPT);	/* whoops... we got a lose
-						 * here */
-	/* here is the length of priv data.  receiver calcs
-	 size of authenticator by subtracting vno size, priv size, and
-	 sizeof(u_int32_t) (for the size indication) from total size */
-
-	act_len += vts_long((u_int32_t) priv_len, &act_st, act_len);
-#ifdef NOENCRYPTION
-	cksum = 0;
-#else
-	cksum = des_quad_cksum((des_cblock *)priv_pak, (des_cblock *)0, (long)priv_len, 0,
-			   &sess_key);
-#endif
-	if ((retdat = krb_mk_req(&authent, client_parm.sname, client_parm.sinst,
-				client_parm.krbrlm, cksum))) {
-	    /* authenticator? */
-	    RET_N_FREE(retdat + krb_err_base);
-	}
-
-	act_st = (u_char *) realloc(act_st,
-				    act_len + authent.length + priv_len);
-	if (!act_st) {
-	    clear_secrets();
-	    free(priv_pak);
-	    return(KADM_NOMEM);
-	}
-	memcpy((char *)act_st + act_len, authent.dat, authent.length);
-	memcpy((char *)act_st + act_len + authent.length, priv_pak, priv_len);
-	free(priv_pak);
-	if ((retdat = kadm_cli_out(act_st,
-				   act_len + authent.length + priv_len,
-				   ret_dat, ret_siz)) != KADM_SUCCESS)
-	    RET_N_FREE(retdat);
-	free(act_st);
-#define RET_N_FREE2(r) {free(*ret_dat); clear_secrets(); return(r);}
-
-	/* first see if it's a YOULOUSE */
-	if ((*ret_siz >= KADM_VERSIZE) &&
-	    !strncmp(KADM_ULOSE, (char *)*ret_dat, KADM_VERSIZE)) {
-	    unsigned char *p;
-	    /* it's a youlose packet */
-	    if (*ret_siz < KADM_VERSIZE + 4)
-		RET_N_FREE2(KADM_BAD_VER);
-	    p = (*ret_dat)+KADM_VERSIZE;
-	    retdat = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3];
-	    RET_N_FREE2(retdat);
-	}
-	/* need to decode the ret_dat */
-	if ((retdat = krb_rd_priv(*ret_dat, (u_int32_t)*ret_siz, sess_sched,
-				 &sess_key, &client_parm.admin_addr,
-				 &client_parm.my_addr, &mdat)))
-	    RET_N_FREE2(retdat+krb_err_base);
-	if (mdat.app_length < KADM_VERSIZE + 4)
-	    /* too short! */
-	    RET_N_FREE2(KADM_BAD_VER);
-	if (strncmp((char *)mdat.app_data, KADM_VERSTR, KADM_VERSIZE))
-	    /* bad version */
-	    RET_N_FREE2(KADM_BAD_VER);
-	{
-	    unsigned char *p = mdat.app_data+KADM_VERSIZE;
-	    retdat = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3];
-	}
-	{
-	  int s=mdat.app_length - KADM_VERSIZE - 4;
-	  if(s<=0) s=1;
-	  if (!(return_dat = (u_char *)malloc(s)))
-	    RET_N_FREE2(KADM_NOMEM);
-	}
-	memcpy(return_dat,
-	       (char *) mdat.app_data + KADM_VERSIZE + 4,
-	       mdat.app_length - KADM_VERSIZE - 4);
-	free(*ret_dat);
-	clear_secrets();
-	*ret_dat = return_dat;
-	*ret_siz = mdat.app_length - KADM_VERSIZE - 4;
-	return retdat;
-}
-
-
-
-/* 
- * kadm_change_pw_plain
- *
- * see kadm_change_pw
- *
- */
-int kadm_change_pw_plain(unsigned char *newkey, char *password, char **pw_msg)
-{
-	int stsize, retc;	       /* stream size and return code */
-	u_char *send_st;	       /* send stream */
-	u_char *ret_st;
-	int ret_sz;
-	int status;
-	static char msg[128];
-
-	if ((retc = kadm_cli_conn()) != KADM_SUCCESS)
-	    return(retc);
-	/* possible problem with vts_long on a non-multiple of four boundary */
-
-	stsize = 0;		       /* start of our output packet */
-	send_st = (u_char *) malloc(1);/* to make it reallocable */
-	send_st[stsize++] = (u_char) CHANGE_PW;
-
-	/* change key to stream */
-
-	send_st = realloc(send_st, stsize + 8);
-	memcpy(send_st + stsize + 4, newkey, 4); /* yes, this is backwards */
-	memcpy(send_st + stsize, newkey + 4, 4);
-	stsize += 8;
-	
-	if(password && *password)
-	  stsize += vts_string(password, &send_st, stsize);
-
-	retc = kadm_cli_send(send_st, stsize, &ret_st, &ret_sz);
-	free(send_st);
-	
-	if(retc != KADM_SUCCESS){
-	  status = stv_string(ret_st, msg, 0, sizeof(msg), ret_sz);
-	  if(status<0)
-	    msg[0]=0;
-	  *pw_msg=msg;
-	}
-
-	if (ret_st)
-	    free(ret_st);
-	
-	kadm_cli_disconn();
-	return(retc);
-}
-
-/*
- * kadm_change_pw
- * recieves    : key 
- *
- * Replaces the password (i.e. des key) of the caller with that specified in
- * key. Returns no actual data from the master server, since this is called
- * by a user 
- */
-
-int kadm_change_pw(unsigned char *newkey)
-{
-  char *pw_msg;
-  return kadm_change_pw_plain(newkey, "", &pw_msg);
-}
-
-/*
- * kadm_add
- * 	receives    : vals
- * 	returns     : vals 
- *
- * Adds and entry containing values to the database returns the values of the
- * entry, so if you leave certain fields blank you will be able to determine
- * the default values they are set to 
- */
-int
-kadm_add(Kadm_vals *vals)
-{
-	u_char *st, *st2;	       /* st will hold the stream of values */
-	int st_len;		       /* st2 the final stream with opcode */
-	int retc;		       /* return code from call */
-	u_char *ret_st;
-	int ret_sz;
-
-	if ((retc = kadm_cli_conn()) != KADM_SUCCESS)
-	    return(retc);
-	st_len = vals_to_stream(vals, &st);
-	st2 = (u_char *) malloc((unsigned)(1 + st_len));
-	*st2 = (u_char) ADD_ENT;       /* here's the opcode */
-	memcpy((char *) st2 + 1, st, st_len);	/* append st on */
-	retc = kadm_cli_send(st2, st_len + 1, &ret_st, &ret_sz);
-	free(st);
-	free(st2);
-	if (retc == KADM_SUCCESS) {
-	    /* ret_st has vals */
-	    if (stream_to_vals(ret_st, vals, ret_sz) < 0)
-		retc = KADM_LENGTH_ERROR;
-	    free(ret_st);
-	}
-	kadm_cli_disconn();
-	return(retc);
-}
-
-/*
- * kadm_mod
- * 	receives    : KTEXT, {values, values}
- *	returns     : CKSUM,  RETCODE, {values} 
- *	acl         : su, sms (as register or dealloc) 
- *
- * Modifies all entries corresponding to the first values so they match the
- * second values. returns the values for the changed entries in vals2
- */
-int
-kadm_mod(Kadm_vals *vals1, Kadm_vals *vals2)
-{
-	u_char *st, *st2;	       /* st will hold the stream of values */
-	int st_len, nlen;	       /* st2 the final stream with opcode */
-	u_char *ret_st;
-	int ret_sz;
-
-	/* nlen is the length of second vals */
-	int retc;		       /* return code from call */
-
-	if ((retc = kadm_cli_conn()) != KADM_SUCCESS)
-	    return(retc);
-
-	st_len = vals_to_stream(vals1, &st);
-	st2 = (u_char *) malloc((unsigned)(1 + st_len));
-	*st2 = (u_char) MOD_ENT;       /* here's the opcode */
-	memcpy((char *)st2 + 1, st, st_len++); /* append st on */
-	free(st);
-	nlen = vals_to_stream(vals2, &st);
-	st2 = (u_char *) realloc((char *) st2, (unsigned)(st_len + nlen));
-	memcpy((char *) st2 + st_len, st, nlen); /* append st on */
-	retc = kadm_cli_send(st2, st_len + nlen, &ret_st, &ret_sz);
-	free(st);
-	free(st2);
-	if (retc == KADM_SUCCESS) {
-	    /* ret_st has vals */
-	    if (stream_to_vals(ret_st, vals2, ret_sz) < 0)
-		retc = KADM_LENGTH_ERROR;
-	    free(ret_st);
-	}
-	kadm_cli_disconn();
-	return(retc);
-}
-
-
-int
-kadm_del(Kadm_vals *vals)
-{
-    unsigned char *st, *st2;	       /* st will hold the stream of values */
-    int st_len;		       /* st2 the final stream with opcode */
-    int retc;		       /* return code from call */
-    u_char *ret_st;
-    int ret_sz;
-    
-    if ((retc = kadm_cli_conn()) != KADM_SUCCESS)
-	return(retc);
-    st_len = vals_to_stream(vals, &st);
-    st2 = (unsigned char *) malloc(st_len + 1);
-    *st2 = DEL_ENT;       /* here's the opcode */
-    memcpy(st2 + 1, st, st_len);	/* append st on */
-    retc = kadm_cli_send(st2, st_len + 1, &ret_st, &ret_sz);
-    free(st);
-    free(st2);
-    kadm_cli_disconn();
-    return(retc);
-}
-
-
-/*
- * kadm_get
- * 	receives   : KTEXT, {values, flags} 
- *	returns    : CKSUM, RETCODE, {count, values, values, values}
- *	acl        : su 
- *
- * gets the fields requested by flags from all entries matching values returns
- * this data for each matching recipient, after a count of how many such
- * matches there were 
- */
-int
-kadm_get(Kadm_vals *vals, u_char *fl)
-{
-	int loop;		       /* for copying the fields data */
-	u_char *st, *st2;	       /* st will hold the stream of values */
-	int st_len;		       /* st2 the final stream with opcode */
-	int retc;		       /* return code from call */
-	u_char *ret_st;
-	int ret_sz;
-
-	if ((retc = kadm_cli_conn()) != KADM_SUCCESS)
-	    return(retc);
-	st_len = vals_to_stream(vals, &st);
-	st2 = (u_char *) malloc((unsigned)(1 + st_len + FLDSZ));
-	*st2 = (u_char) GET_ENT;       /* here's the opcode */
-	memcpy((char *)st2 + 1, st, st_len); /* append st on */
-	for (loop = FLDSZ - 1; loop >= 0; loop--)
-		*(st2 + st_len + FLDSZ - loop) = fl[loop]; /* append the flags */
-	retc = kadm_cli_send(st2, st_len + 1 + FLDSZ,  &ret_st, &ret_sz);
-	free(st);
-	free(st2);
-	if (retc == KADM_SUCCESS) {
-	    /* ret_st has vals */
-	    if (stream_to_vals(ret_st, vals, ret_sz) < 0)
-		retc = KADM_LENGTH_ERROR;
-	    free(ret_st);
-	}
-	kadm_cli_disconn();
-	return(retc);
-}
diff --git a/crypto/kerberosIV/lib/kadm/kadm_err.et b/crypto/kerberosIV/lib/kadm/kadm_err.et
deleted file mode 100644
index 0a7c7b6b8db8..000000000000
--- a/crypto/kerberosIV/lib/kadm/kadm_err.et
+++ /dev/null
@@ -1,59 +0,0 @@
-#	$Id: kadm_err.et,v 1.4 1996/06/12 08:01:34 bg Exp $
-#	$Author: bg $
-#
-# Copyright 1988 by the Massachusetts Institute of Technology.
-#
-# For copying and distribution information, please see the file
-# <mit-copyright.h>.
-#
-# Kerberos administration server error table
-#
-	et	kadm
-
-# KADM_SUCCESS, as all success codes should be, is zero
-
-ec KADM_RCSID,		"$Id: kadm_err.et,v 1.4 1996/06/12 08:01:34 bg Exp $"
-# /* Building and unbuilding the packet errors */
-ec KADM_NO_REALM,	"Cannot fetch local realm"
-ec KADM_NO_CRED,	"Unable to fetch credentials"
-ec KADM_BAD_KEY,	"Bad key supplied"
-ec KADM_NO_ENCRYPT,	"Can't encrypt data"
-ec KADM_NO_AUTH,	"Cannot encode/decode authentication info"
-ec KADM_WRONG_REALM,	"Principal attemping change is in wrong realm"
-ec KADM_NO_ROOM,	"Packet is too large"
-ec KADM_BAD_VER,	"Version number is incorrect"
-ec KADM_BAD_CHK,	"Checksum does not match"
-ec KADM_NO_READ,	"Unsealing private data failed"
-ec KADM_NO_OPCODE,	"Unsupported operation"
-ec KADM_NO_HOST,	"Could not find administrating host"
-ec KADM_UNK_HOST,	"Administrating host name is unknown"
-ec KADM_NO_SERV,	"Could not find service name in services database"
-ec KADM_NO_SOCK,	"Could not create socket"
-ec KADM_NO_CONN,	"Could not connect to server"
-ec KADM_NO_HERE,	"Could not fetch local socket address"
-ec KADM_NO_MAST,	"Could not fetch master key"
-ec KADM_NO_VERI,	"Could not verify master key"
-
-# /* From the server side routines */
-ec KADM_INUSE,		"Entry already exists in database"
-ec KADM_UK_SERROR,	"Database store error"
-ec KADM_UK_RERROR,	"Database read error"
-ec KADM_UNAUTH,		"Insufficient access to perform requested operation"
-# KADM_DATA isn't really an error, but...
-ec KADM_DATA,		"Data is available for return to client"
-ec KADM_NOENTRY,	"No such entry in the database"
-
-ec KADM_NOMEM,		"Memory exhausted"
-ec KADM_NO_HOSTNAME,	"Could not fetch system hostname"
-ec KADM_NO_BIND,	"Could not bind port"
-ec KADM_LENGTH_ERROR,	"Length mismatch problem"
-ec KADM_ILL_WILDCARD,	"Illegal use of wildcard"
-
-ec KADM_DB_INUSE,	"Database is locked or in use--try again later"
-
-ec KADM_INSECURE_PW,    "Insecure password rejected"
-ec KADM_PW_MISMATCH,    "Cleartext password and DES key did not match"
-
-ec KADM_NOT_SERV_PRINC, "Invalid principal for change srvtab request"
-ec KADM_IMMUTABLE,	"Attempt do delete immutable principal"
-end
diff --git a/crypto/kerberosIV/lib/kadm/kadm_locl.h b/crypto/kerberosIV/lib/kadm/kadm_locl.h
deleted file mode 100644
index e6e374bfe8fa..000000000000
--- a/crypto/kerberosIV/lib/kadm/kadm_locl.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id: kadm_locl.h,v 1.9 1997/05/20 18:40:44 bg Exp $ */
-
-#include "config.h"
-#include "protos.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <signal.h>
-#include <time.h>
-#include <errno.h>
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-
-#ifdef SOCKS
-#include <socks.h>
-#endif
-
-#include <roken.h>
-
-#include <des.h>
-#include <krb.h>
-#include <krb_err.h>
-#include <krb_db.h>
-#include <kadm.h>
-#include <kadm_err.h>
-
-int vts_long __P((u_int32_t, u_char **, int));
-int vals_to_stream __P((Kadm_vals *, u_char **));
-int stream_to_vals __P((u_char *, Kadm_vals *, int));
-
-int kadm_init_link __P((char n[], char i[], char r[]));
-int kadm_change_pw __P((des_cblock));
-int kadm_add __P((Kadm_vals *));
-int kadm_mod __P((Kadm_vals *, Kadm_vals *));
-int kadm_get __P((Kadm_vals *, u_char fl[4]));
-
-
diff --git a/crypto/kerberosIV/lib/kadm/kadm_stream.c b/crypto/kerberosIV/lib/kadm/kadm_stream.c
deleted file mode 100644
index 33fe177cbfcb..000000000000
--- a/crypto/kerberosIV/lib/kadm/kadm_stream.c
+++ /dev/null
@@ -1,299 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-/*
- * Stream conversion functions for Kerberos administration server
- */
-
-/*
-  kadm_stream.c
-  this holds the stream support routines for the kerberos administration server
-
-    vals_to_stream: converts a vals struct to a stream for transmission
-       internals build_field_header, vts_[string, char, long, short]
-    stream_to_vals: converts a stream to a vals struct
-       internals check_field_header, stv_[string, char, long, short]
-    error: prints out a kadm error message, returns
-    fatal: prints out a kadm fatal error message, exits
-*/
-
-#include "kadm_locl.h"
-
-RCSID("$Id: kadm_stream.c,v 1.11 1997/05/02 10:28:05 joda Exp $");
-
-static int
-build_field_header(u_char *cont, u_char **st)
-             			/* container for fields data */
-            			/* stream */
-{
-  *st = (u_char *) malloc (4);
-  memcpy(*st, cont, 4);
-  return 4;			/* return pointer to current stream location */
-}
-
-static int
-check_field_header(u_char *st, u_char *cont, int maxlen)
-           			/* stream */
-             			/* container for fields data */
-           
-{
-  if (4 > maxlen)
-      return(-1);
-  memcpy(cont, st, 4);
-  return 4;			/* return pointer to current stream location */
-}
-
-int
-vts_string(char *dat, u_char **st, int loc)
-          			/* a string to put on the stream */
-            			/* base pointer to the stream */
-        			/* offset into the stream for current data */
-{
-  *st = (u_char *) realloc (*st, (unsigned) (loc + strlen(dat) + 1));
-  memcpy(*st + loc, dat, strlen(dat)+1);
-  return strlen(dat)+1;
-}
-
-
-static int
-vts_short(u_int16_t dat, u_char **st, int loc)
-            			/* the attributes field */
-            			/* a base pointer to the stream */
-        			/* offset into the stream for current data */
-{
-    unsigned char *p;
-    p = realloc(*st, loc + 2);
-    if(p == NULL){
-	abort();
-    }
-    p[loc] = (dat >> 8) & 0xff;
-    p[loc+1] = dat & 0xff;
-    *st = p;
-    return 2;
-}
-
-static int
-vts_char(u_char dat, u_char **st, int loc)
-           			/* the attributes field */
-            			/* a base pointer to the stream */
-        			/* offset into the stream for current data */
-{
-    unsigned char *p = realloc(*st, loc + 1);
-    if(p == NULL){
-	abort();
-    }
-    p[loc] = dat;
-    *st = p;
-    return 1;
-}
-
-int
-vts_long(u_int32_t dat, u_char **st, int loc)
-           			/* the attributes field */
-            			/* a base pointer to the stream */
-        			/* offset into the stream for current data */
-{
-    unsigned char *p = realloc(*st, loc + 4);
-    if(p == NULL){
-	abort();
-    }
-    p[loc] = (dat >> 24) & 0xff;
-    p[loc+1] = (dat >> 16) & 0xff;
-    p[loc+2] = (dat >> 8) & 0xff;
-    p[loc+3] = dat & 0xff;
-    *st = p;
-    return 4;
-}
-    
-int
-stv_string(u_char *st,		/* base pointer to the stream */
-	   char *dat,		/* a string to read from the stream */
-	   int loc,		/* offset into the stream for current data */
-	   int stlen,		/* max length of string to copy in */
-	   int maxlen)		/* max length of input stream */
-{
-  int maxcount;				/* max count of chars to copy */
-
-  maxcount = min(maxlen - loc, stlen);
-
-  if(maxcount <= 0)
-      return -1;
-
-  strncpy(dat, (char *)st + loc, maxcount);
-
-  if (dat[maxcount-1]) /* not null-term --> not enuf room */
-      return(-1);
-  return strlen(dat)+1;
-}
-
-static int
-stv_short(u_char *st, u_int16_t *dat, int loc, int maxlen)
-           			/* a base pointer to the stream */
-             			/* the attributes field */
-        			/* offset into the stream for current data */
-           
-{
-  if (maxlen - loc < 2)
-      return -1;
-  
-  *dat = (st[loc] << 8) | st[loc + 1];
-  return 2;
-}
-
-int
-stv_long(u_char *st, u_int32_t *dat, int loc, int maxlen)
-           			/* a base pointer to the stream */
-            			/* the attributes field */
-        			/* offset into the stream for current data */
-           			/* maximum length of st */
-{
-  if (maxlen - loc < 4)
-      return -1;
-  
-  *dat = (st[loc] << 24) | (st[loc+1] << 16) | (st[loc+2] << 8) | st[loc+3];
-  return 4;
-}
-    
-static int
-stv_char(u_char *st, u_char *dat, int loc, int maxlen)
-           			/* a base pointer to the stream */
-            			/* the attributes field */
-        			/* offset into the stream for current data */
-           
-{
-  if (maxlen - loc < 1)
-      return -1;
-  
-  *dat = st[loc];
-  return 1;
-}
-
-/* 
-vals_to_stream
-  recieves    : kadm_vals *, u_char *
-  returns     : a realloced and filled in u_char *
-     
-this function creates a byte-stream representation of the kadm_vals structure
-*/
-int
-vals_to_stream(Kadm_vals *dt_in, u_char **dt_out)
-{
-  int vsloop, stsize;		/* loop counter, stream size */
-
-  stsize = build_field_header(dt_in->fields, dt_out);
-  for (vsloop=31; vsloop>=0; vsloop--)
-    if (IS_FIELD(vsloop,dt_in->fields)) {
-      switch (vsloop) {
-      case KADM_NAME:
-	  stsize+=vts_string(dt_in->name, dt_out, stsize);
-	  break;
-      case KADM_INST:
-	  stsize+=vts_string(dt_in->instance, dt_out, stsize);
-	  break;
-      case KADM_EXPDATE:
-	  stsize+=vts_long(dt_in->exp_date, dt_out, stsize);
-	  break;
-      case KADM_ATTR:
-	  stsize+=vts_short(dt_in->attributes, dt_out, stsize);
-	  break;
-      case KADM_MAXLIFE:
-	  stsize+=vts_char(dt_in->max_life, dt_out, stsize);
-	  break;
-      case KADM_DESKEY: 
-	  stsize+=vts_long(dt_in->key_high, dt_out, stsize); 
-	  stsize+=vts_long(dt_in->key_low, dt_out, stsize); 
-	  break;
-      default:
-	  break;
-      }
-}
-  return(stsize);
-}  
-
-/* 
-stream_to_vals
-  recieves    : u_char *, kadm_vals *
-  returns     : a kadm_vals filled in according to u_char *
-     
-this decodes a byte stream represntation of a vals struct into kadm_vals
-*/
-int
-stream_to_vals(u_char *dt_in, Kadm_vals *dt_out, int maxlen)
-              
-                  
-           				/* max length to use */
-{
-  int vsloop, stsize;		/* loop counter, stream size */
-  int status;
-
-  memset(dt_out, 0, sizeof(*dt_out));
-
-  stsize = check_field_header(dt_in, dt_out->fields, maxlen);
-  if (stsize < 0)
-      return(-1);
-  for (vsloop=31; vsloop>=0; vsloop--)
-    if (IS_FIELD(vsloop,dt_out->fields))
-      switch (vsloop) {
-      case KADM_NAME:
-	  if ((status = stv_string(dt_in, dt_out->name, stsize,
-				   sizeof(dt_out->name), maxlen)) < 0)
-	      return(-1);
-	  stsize += status;
-	  break;
-      case KADM_INST:
-	  if ((status = stv_string(dt_in, dt_out->instance, stsize,
-				   sizeof(dt_out->instance), maxlen)) < 0)
-	      return(-1);
-	  stsize += status;
-	  break;
-      case KADM_EXPDATE:
-	  if ((status = stv_long(dt_in, &dt_out->exp_date, stsize,
-				 maxlen)) < 0)
-	      return(-1);
-	  stsize += status;
-	  break;
-      case KADM_ATTR:
-	  if ((status = stv_short(dt_in, &dt_out->attributes, stsize,
-				  maxlen)) < 0)
-	      return(-1);
-	  stsize += status;
-	  break;
-      case KADM_MAXLIFE:
-	  if ((status = stv_char(dt_in, &dt_out->max_life, stsize,
-				 maxlen)) < 0)
-	      return(-1);
-	  stsize += status;
-	  break;
-      case KADM_DESKEY:
-	  if ((status = stv_long(dt_in, &dt_out->key_high, stsize,
-				    maxlen)) < 0)
-	      return(-1);
-	  stsize += status;
-	  if ((status = stv_long(dt_in, &dt_out->key_low, stsize,
-				    maxlen)) < 0)
-	      return(-1);
-	  stsize += status;
-	  break;
-      default:
-	  break;
-      }
-  return stsize;
-}  
diff --git a/crypto/kerberosIV/lib/kadm/kadm_supp.c b/crypto/kerberosIV/lib/kadm/kadm_supp.c
deleted file mode 100644
index 984526764770..000000000000
--- a/crypto/kerberosIV/lib/kadm/kadm_supp.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-/*
- * Support functions for Kerberos administration server & clients
- */
-
-/*
-  kadm_supp.c
-  this holds the support routines for the kerberos administration server
-
-    error: prints out a kadm error message, returns
-    fatal: prints out a kadm fatal error message, exits
-    prin_vals: prints out data associated with a Principal in the vals
-           structure
-*/
-
-#include "kadm_locl.h"
-    
-RCSID("$Id: kadm_supp.c,v 1.8 1997/05/02 10:27:58 joda Exp $");
-
-/*
-prin_vals:
-  recieves    : a vals structure
-*/
-void
-prin_vals(Kadm_vals *vals)
-{
-   printf("Info in Database for %s.%s:\n", vals->name, vals->instance);
-   printf("   Max Life: %d (%s)   Exp Date: %s\n",
-	  vals->max_life,
-	  krb_life_to_atime(vals->max_life), 
-	  asctime(k_localtime(&vals->exp_date)));
-   printf("   Attribs: %.2x  key: %#lx %#lx\n",
-	  vals->attributes,
-	  (long)vals->key_low, (long)vals->key_high);
-}
-
-/* kadm_prin_to_vals takes a fields arguments, a Kadm_vals and a Principal,
-   it copies the fields in Principal specified by fields into Kadm_vals, 
-   i.e from old to new */
-
-void
-kadm_prin_to_vals(u_char *fields, Kadm_vals *new, Principal *old)
-{
-  memset(new, 0, sizeof(*new));
-  if (IS_FIELD(KADM_NAME,fields)) {
-      strncpy(new->name, old->name, ANAME_SZ); 
-      SET_FIELD(KADM_NAME, new->fields);
-  }
-  if (IS_FIELD(KADM_INST,fields)) {
-      strncpy(new->instance, old->instance, INST_SZ); 
-      SET_FIELD(KADM_INST, new->fields);
-  }      
-  if (IS_FIELD(KADM_EXPDATE,fields)) {
-      new->exp_date   = old->exp_date; 
-      SET_FIELD(KADM_EXPDATE, new->fields);
-  }      
-  if (IS_FIELD(KADM_ATTR,fields)) {
-    new->attributes = old->attributes; 
-      SET_FIELD(KADM_ATTR, new->fields);
-  }      
-  if (IS_FIELD(KADM_MAXLIFE,fields)) {
-    new->max_life   = old->max_life; 
-      SET_FIELD(KADM_MAXLIFE, new->fields);
-  }      
-  if (IS_FIELD(KADM_DESKEY,fields)) {
-    new->key_low    = old->key_low; 
-    new->key_high   = old->key_high; 
-    SET_FIELD(KADM_DESKEY, new->fields);
-  }
-}
-
-void
-kadm_vals_to_prin(u_char *fields, Principal *new, Kadm_vals *old)
-{
-
-  memset(new, 0, sizeof(*new));
-  if (IS_FIELD(KADM_NAME,fields))
-    strncpy(new->name, old->name, ANAME_SZ); 
-  if (IS_FIELD(KADM_INST,fields))
-    strncpy(new->instance, old->instance, INST_SZ); 
-  if (IS_FIELD(KADM_EXPDATE,fields))
-    new->exp_date   = old->exp_date; 
-  if (IS_FIELD(KADM_ATTR,fields))
-    new->attributes = old->attributes; 
-  if (IS_FIELD(KADM_MAXLIFE,fields))
-    new->max_life   = old->max_life; 
-  if (IS_FIELD(KADM_DESKEY,fields)) {
-    new->key_low    = old->key_low; 
-    new->key_high   = old->key_high; 
-  }
-}
diff --git a/crypto/kerberosIV/lib/kafs/Makefile.in b/crypto/kerberosIV/lib/kafs/Makefile.in
deleted file mode 100644
index e9c9121be2d7..000000000000
--- a/crypto/kerberosIV/lib/kafs/Makefile.in
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# $Id: Makefile.in,v 1.30 1997/05/06 03:47:35 assar Exp $
-#
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-CC = @CC@
-AR = ar
-RANLIB = @RANLIB@
-DEFS = @DEFS@ -DLIBDIR='"$(libdir)"'
-CFLAGS = @CFLAGS@
-
-INSTALL = @INSTALL@
-INSTALL_DATA	= @INSTALL_DATA@
-MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-libdir = @libdir@
-
-PICFLAGS = @PICFLAGS@
- 
-LIBNAME = $(LIBPREFIX)kafs
-LIBEXT = @LIBEXT@
-SHLIBEXT = @SHLIBEXT@
-LIBPREFIX = @LIBPREFIX@
-LDSHARED = @LDSHARED@
-AFS_EXTRA_LIBS	= @AFS_EXTRA_LIBS@
-LIB = $(LIBNAME).$(LIBEXT) $(AFS_EXTRA_LIBS)
-
-SOURCES = afssys.c afskrb.c afslib.c
-
-OBJECTS = afssys.o afskrb.o
-
-all: $(LIB)
-
-Wall:
-	make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $<
-
-install: all
-	$(MKINSTALLDIRS) $(libdir)
-	$(INSTALL_DATA) -m 0555 $(LIB) $(libdir)
-
-uninstall:
-	rm -f $(libdir)/$(LIB)
-
-TAGS: $(SOURCES)
-	etags $(SOURCES)
-
-check:
-
-clean:
-	rm -f $(LIB) *.o *.a
-
-mostlyclean: clean
-
-distclean: clean
-	rm -f Makefile *.tab.c *~
-
-realclean: distclean
-	rm -f TAGS
-
-dist: $(DISTFILES)
-	for file in $(DISTFILES); do \
-	  ln $$file ../`cat ../.fname`/lib \
-	    || cp -p $$file ../`cat ../.fname`/lib; \
-	done
-
-$(LIBNAME).a: $(OBJECTS) @AFS_EXTRA_OBJS@
-	rm -f $@
-	$(AR) cr $@ $(OBJECTS) @AFS_EXTRA_OBJS@
-	-$(RANLIB) $@
-
-
-$(LIBNAME).$(SHLIBEXT): $(OBJECTS)
-	rm -f $@
-	$(LDSHARED) -o $@ $(OBJECTS)
-
-# AIX: this almost works with gcc, but somehow it fails to use the
-# correct ld, use ld instead
-afslib.so: afslib.o
-	ld -o $@ -bM:SRE -bI:$(srcdir)/afsl.exp -bE:$(srcdir)/afslib.exp -bnoentry afslib.o
-
-$(OBJECTS): ../../include/config.h
diff --git a/crypto/kerberosIV/lib/kafs/afskrb.c b/crypto/kerberosIV/lib/kafs/afskrb.c
deleted file mode 100644
index d979ac5b72d6..000000000000
--- a/crypto/kerberosIV/lib/kafs/afskrb.c
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "kafs_locl.h"
-
-RCSID("$Id: afskrb.c,v 1.6 1997/05/26 17:38:24 bg Exp $");
-
-#define AUTH_SUPERUSER "afs"
-
-/*
- * Here only ASCII characters are relevant.
- */
-
-#define IsAsciiLower(c) ('a' <= (c) && (c) <= 'z')
-
-#define ToAsciiUpper(c) ((c) - 'a' + 'A')
-
-static void
-foldup(char *a, const char *b)
-{
-  for (; *b; a++, b++)
-    if (IsAsciiLower(*b))
-      *a = ToAsciiUpper(*b);
-    else
-      *a = *b;
-  *a = '\0';
-}
-
-static int
-get_cred(const char *princ, const char *inst, const char *krealm, 
-	 CREDENTIALS *c, KTEXT_ST *tkt)
-{
-  int k_errno = krb_get_cred((char*)princ, (char*)inst, (char*)krealm, c);
-
-  if (k_errno != KSUCCESS)
-    {
-      k_errno = krb_mk_req(tkt, (char*)princ, (char*)inst, (char*)krealm, 0);
-      if (k_errno == KSUCCESS)
-	k_errno = krb_get_cred((char*)princ, (char*)inst, (char*)krealm, c);
-    }
-  return k_errno;
-}
-
-
-/* Convert a string to a 32 bit ip number in network byte order. 
-   Return 0 on error
-   */
-
-static u_int32_t
-ip_aton(char *ip)
-{
-  u_int32_t addr;
-  unsigned int a, b, c, d;
-
-  if(sscanf(ip, "%u.%u.%u.%u", &a, &b, &c, &d) != 4)
-      return 0;
-  if((a | b | c | d) > 255)
-      return 0;
-  addr = (a << 24) | (b << 16) | (c << 8) | d;
-  addr = htonl(addr);
-  return addr;
-}
-
-/* Try to get a db-server for an AFS cell from a AFSDB record */
-
-static int
-dns_find_cell(const char *cell, char *dbserver)
-{
-    struct dns_reply *r;
-    int ok = -1;
-    r = dns_lookup(cell, "afsdb");
-    if(r){
-	struct resource_record *rr = r->head;
-	while(rr){
-	    if(rr->type == T_AFSDB && rr->u.afsdb->preference == 1){
-		strncpy(dbserver, rr->u.afsdb->domain, MaxHostNameLen);
-		dbserver[MaxHostNameLen - 1] = 0;
-		ok = 0;
-		break;
-	    }
-	    rr = rr->next;
-	}
-	dns_free_data(r);
-    }
-    return ok;
-}
-
-
-/* Find the realm associated with cell. Do this by opening
-   /usr/vice/etc/CellServDB and getting the realm-of-host for the
-   first VL-server for the cell.
-
-   This does not work when the VL-server is living in one cell, but
-   the cell it is serving is living in another cell.
-   */
-
-static char*
-realm_of_cell(const char *cell)
-{
-    FILE *F;
-    char buf[1024];
-    u_int32_t addr;
-    struct hostent *hp;
-    char *realm = NULL;
-
-    if((F = fopen(_PATH_CELLSERVDB, "r"))){
-	while(fgets(buf, sizeof(buf), F)){
-	    if(buf[0] != '>')
-		continue;
-	    if(strncmp(buf + 1, cell, strlen(cell)) == 0){
-		if(fgets(buf, sizeof(buf), F) == NULL)
-		    break;
-		addr = ip_aton(buf);
-		if(addr == 0)
-		    break;
-		hp = gethostbyaddr((char*)&addr, 4, AF_INET);
-		if(hp == NULL)
-		    break;
-		strncpy (buf, hp->h_name, sizeof(buf));
-		buf[sizeof(buf) - 1] = '\0';
-		realm = krb_realmofhost(buf);
-		break;
-	    }
-	}
-	fclose(F);
-    }
-    if(realm == NULL){
-	if(dns_find_cell(cell, buf) == 0)
-	    realm = krb_realmofhost(buf);
-    }
-    return realm;
-}
-
-/*
- * Get tokens for all cells[]
- */
-static int
-k_afslog_cells(char *cells[], int max, const char *krealm, uid_t uid)
-{
-    int err = KSUCCESS;
-    int i;
-    for(i = 0; i < max; i++)
-	err = k_afsklog_uid(cells[i], krealm, uid);
-    return err;
-}
-
-/*
- * Try to find the cells we should try to klog to in "file".
- */
-static void
-k_find_cells(char *file, char *cells[], int size, int *index)
-{
-    FILE *f;
-    char cell[64];
-    int i;
-    f = fopen(file, "r");
-    if (f == NULL)
-	return;
-    while (*index < size && fgets(cell, sizeof(cell), f)) {
-	char *nl = strchr(cell, '\n');
-	if (nl) *nl = 0;
-	for(i = 0; i < *index; i++)
-	    if(strcmp(cells[i], cell) == 0)
-		break;
-	if(i == *index)
-	    cells[(*index)++] = strdup(cell);
-    }
-    fclose(f);
-}
-
-static int
-k_afsklog_all_local_cells(const char *krealm, uid_t uid)
-{
-    int err;
-    char *cells[32]; /* XXX */
-    int num_cells = sizeof(cells) / sizeof(cells[0]);
-    int index = 0;
-
-    char *p;
-    
-    if ((p = getenv("HOME"))) {
-	char home[MaxPathLen];
-
-	if (k_concat(home, sizeof(home), p, "/.TheseCells", NULL) == 0)
-	    k_find_cells(home, cells, num_cells, &index);
-    }
-    k_find_cells(_PATH_THESECELLS, cells, num_cells, &index);
-    k_find_cells(_PATH_THISCELL, cells, num_cells, &index);
-    
-    err = k_afslog_cells(cells, index, krealm, uid);
-    while(index > 0)
-	free(cells[--index]);
-    return err;
-}
-
-int
-k_afsklog_uid(const char *cell, const char *krealm, uid_t uid)
-{
-  int k_errno;
-  CREDENTIALS c;
-  KTEXT_ST ticket;
-  char realm[REALM_SZ];
-  char *vl_realm; /* realm of vl-server */
-  char *lrealm; /* local realm */
-  char CELL[64];
-
-  if (cell == 0 || cell[0] == 0)
-    return k_afsklog_all_local_cells (krealm, uid);
-  foldup(CELL, cell);
-
-  k_errno = krb_get_lrealm(realm , 0);
-  if(k_errno == KSUCCESS && (krealm == NULL || strcmp(krealm, realm)))
-    lrealm = realm;
-  else
-    lrealm = NULL;
-
-  /* We're about to find the the realm that holds the key for afs in
-   * the specified cell. The problem is that null-instance
-   * afs-principals are common and that hitting the wrong realm might
-   * yield the wrong afs key. The following assumptions were made.
-   *
-   * Any realm passed to us is preferred.
-   *
-   * If there is a realm with the same name as the cell, it is most
-   * likely the correct realm to talk to.
-   *
-   * In most (maybe even all) cases the database servers of the cell
-   * will live in the realm we are looking for.
-   *
-   * Try the local realm, but if the previous cases fail, this is
-   * really a long shot.
-   *
-   */
-  
-  /* comments on the ordering of these tests */
-
-  /* If the user passes a realm, she probably knows something we don't
-   * know and we should try afs@krealm (otherwise we're talking with a
-   * blondino and she might as well have it.)
-   */
-  
-  k_errno = -1;
-  if(krealm){
-    k_errno = get_cred(AUTH_SUPERUSER, cell, krealm, &c, &ticket);
-    if(k_errno)
-      k_errno = get_cred(AUTH_SUPERUSER, "", krealm, &c, &ticket);
-  }
-
-  if(k_errno)
-    k_errno = get_cred(AUTH_SUPERUSER, cell, CELL, &c, &ticket);
-  if(k_errno)
-    k_errno = get_cred(AUTH_SUPERUSER, "", CELL, &c, &ticket);
-  
-  /* this might work in some conditions */
-  if(k_errno && (vl_realm = realm_of_cell(cell))){
-    k_errno = get_cred(AUTH_SUPERUSER, cell, vl_realm, &c, &ticket);
-    if(k_errno)
-      k_errno = get_cred(AUTH_SUPERUSER, "", vl_realm, &c, &ticket);
-  }
-  
-  if(k_errno && lrealm){
-    k_errno = get_cred(AUTH_SUPERUSER, cell, lrealm, &c, &ticket);
-#if 0
-    /* this is most likely never right anyway, but won't fail */
-    if(k_errno)
-      k_errno = get_cred(AUTH_SUPERUSER, "", lrealm, &c, &ticket);
-#endif
-  }
-  
-  if (k_errno == KSUCCESS)
-    {
-      struct ViceIoctl parms;
-      struct ClearToken ct;
-      int32_t sizeof_x;
-      char buf[2048], *t;
-
-      /*
-       * Build a struct ClearToken
-       */
-      ct.AuthHandle = c.kvno;
-      memcpy (ct.HandShakeKey, c.session, sizeof(c.session));
-      ct.ViceId = uid;	/* is this always valid? */
-      ct.BeginTimestamp = 1 + c.issue_date;
-      ct.EndTimestamp = krb_life_to_time(c.issue_date, c.lifetime);
-
-#define ODD(x) ((x) & 1)
-      /* If we don't know the numerical ID lifetime should be even? */
-      if (uid == 0 && ODD(ct.EndTimestamp - ct.BeginTimestamp))
-	ct.BeginTimestamp--;
-
-      t = buf;
-      /*
-       * length of secret token followed by secret token
-       */
-      sizeof_x = c.ticket_st.length;
-      memcpy(t, &sizeof_x, sizeof(sizeof_x));
-      t += sizeof(sizeof_x);
-      memcpy(t, c.ticket_st.dat, sizeof_x);
-      t += sizeof_x;
-      /*
-       * length of clear token followed by clear token
-       */
-      sizeof_x = sizeof(ct);
-      memcpy(t, &sizeof_x, sizeof(sizeof_x));
-      t += sizeof(sizeof_x);
-      memcpy(t, &ct, sizeof_x);
-      t += sizeof_x;
-
-      /*
-       * do *not* mark as primary cell
-       */
-      sizeof_x = 0;
-      memcpy(t, &sizeof_x, sizeof(sizeof_x));
-      t += sizeof(sizeof_x);
-      /*
-       * follow with cell name
-       */
-      sizeof_x = strlen(cell) + 1;
-      memcpy(t, cell, sizeof_x);
-      t += sizeof_x;
-
-      /*
-       * Build argument block
-       */
-      parms.in = buf;
-      parms.in_size = t - buf;
-      parms.out = 0;
-      parms.out_size = 0;
-      k_pioctl(0, VIOCSETTOK, &parms, 0);
-    }
-  return k_errno;
-}
-
-int
-k_afsklog(const char *cell, const char *krealm)
-{
-  return k_afsklog_uid (cell, krealm, getuid());
-}
diff --git a/crypto/kerberosIV/lib/kafs/afsl.exp b/crypto/kerberosIV/lib/kafs/afsl.exp
deleted file mode 100644
index 4d2b00e28337..000000000000
--- a/crypto/kerberosIV/lib/kafs/afsl.exp
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/unix
-
-* This mumbo jumbo creates entry points to syscalls in _AIX
-
-lpioctl	syscall
-lsetpag	syscall
diff --git a/crypto/kerberosIV/lib/kafs/afslib.c b/crypto/kerberosIV/lib/kafs/afslib.c
deleted file mode 100644
index 12779bcd72d9..000000000000
--- a/crypto/kerberosIV/lib/kafs/afslib.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* 
- * This file is only used with AIX 
- */
-
-#include "kafs_locl.h"
-
-RCSID("$Id: afslib.c,v 1.5 1997/04/20 13:21:15 joda Exp $");
-
-int
-aix_pioctl(char *a_path,
-	   int o_opcode,
-	   struct ViceIoctl *a_paramsP,
-	   int a_followSymlinks)
-{
-    return lpioctl(a_path, o_opcode, a_paramsP, a_followSymlinks);
-}
-
-int
-aix_setpag(void)
-{
-    return lsetpag();
-}
diff --git a/crypto/kerberosIV/lib/kafs/afslib.exp b/crypto/kerberosIV/lib/kafs/afslib.exp
deleted file mode 100644
index f288717706ea..000000000000
--- a/crypto/kerberosIV/lib/kafs/afslib.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-#!
-aix_pioctl
-aix_setpag
diff --git a/crypto/kerberosIV/lib/kafs/afssys.c b/crypto/kerberosIV/lib/kafs/afssys.c
deleted file mode 100644
index 741225ca3381..000000000000
--- a/crypto/kerberosIV/lib/kafs/afssys.c
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "kafs_locl.h"
-
-RCSID("$Id: afssys.c,v 1.53 1997/05/04 02:30:41 assar Exp $");
-
-/* Magic to get AIX syscalls to work */
-#ifdef _AIX
-
-static int (*Pioctl)(char*, int, void*, int);
-static int (*Setpag)(void);
-
-#include "dlfcn.h"
-
-static int
-isSuid()
-{
-    int uid = getuid();
-    int gid = getgid();
-    int euid = getegid();
-    int egid = getegid();
-    return (uid != euid) || (gid != egid);
-}
-
-static int
-aix_setup(void)
-{
-#ifdef STATIC_AFS_SYSCALLS
-    Pioctl = aix_pioctl;
-    Setpag = aix_setpag;
-#else
-    void *ptr;
-    char path[MaxPathLen], *p;
-    /*
-     * If we are root or running setuid don't trust AFSLIBPATH!
-     */
-    if (getuid() != 0 && !isSuid() && (p = getenv("AFSLIBPATH")) != NULL)
-	strcpy(path, p);
-    else
-	snprintf(path, sizeof(path), "%s/afslib.so", LIBDIR);
-	
-    ptr = dlopen(path, 0);
-    if(ptr){
-	Setpag = (int (*)(void))dlsym(ptr, "aix_setpag");
-	Pioctl = (int (*)(char*, int, void*, int))dlsym(ptr, "aix_pioctl");
-    }
-#endif
-}
-#endif /* _AIX */
-
-#define NO_ENTRY_POINT		0
-#define SINGLE_ENTRY_POINT	1
-#define MULTIPLE_ENTRY_POINT	2
-#define SINGLE_ENTRY_POINT2	3
-#define SINGLE_ENTRY_POINT3	4
-#define AIX_ENTRY_POINTS	5
-#define UNKNOWN_ENTRY_POINT	6
-static int afs_entry_point = UNKNOWN_ENTRY_POINT;
-static int afs_syscalls[2];
-
-
-int
-k_pioctl(char *a_path,
-	 int o_opcode,
-	 struct ViceIoctl *a_paramsP,
-	 int a_followSymlinks)
-{
-#ifndef NO_AFS
-    switch(afs_entry_point){
-#if defined(AFS_SYSCALL) || defined(AFS_SYSCALL2) || defined(AFS_SYSCALL3)
-    case SINGLE_ENTRY_POINT:
-    case SINGLE_ENTRY_POINT2:
-    case SINGLE_ENTRY_POINT3:
-	return syscall(afs_syscalls[0], AFSCALL_PIOCTL,
-		       a_path, o_opcode, a_paramsP, a_followSymlinks);
-#endif
-#if defined(AFS_PIOCTL)
-    case MULTIPLE_ENTRY_POINT:
-	return syscall(afs_syscalls[0],
-		       a_path, o_opcode, a_paramsP, a_followSymlinks);
-#endif
-#ifdef _AIX
-    case AIX_ENTRY_POINTS:
-	return Pioctl(a_path, o_opcode, a_paramsP, a_followSymlinks);
-#endif
-    }
-    
-    errno = ENOSYS;
-#ifdef SIGSYS
-    kill(getpid(), SIGSYS);	/* You loose! */
-#endif
-#endif /* NO_AFS */
-    return -1;
-}
-
-int
-k_afs_cell_of_file(const char *path, char *cell, int len)
-{
-    struct ViceIoctl parms;
-    parms.in = NULL;
-    parms.in_size = 0;
-    parms.out = cell;
-    parms.out_size = len;
-    return k_pioctl((char*)path, VIOC_FILE_CELL_NAME, &parms, 1);
-}
-
-int
-k_unlog(void)
-{
-    struct ViceIoctl parms;
-    memset(&parms, 0, sizeof(parms));
-    return k_pioctl(0, VIOCUNLOG, &parms, 0);
-}
-
-int
-k_setpag(void)
-{
-#ifndef NO_AFS
-    switch(afs_entry_point){
-#if defined(AFS_SYSCALL) || defined(AFS_SYSCALL2) || defined(AFS_SYSCALL3)
-    case SINGLE_ENTRY_POINT:
-    case SINGLE_ENTRY_POINT2:
-    case SINGLE_ENTRY_POINT3:
-	return syscall(afs_syscalls[0], AFSCALL_SETPAG);
-#endif
-#if defined(AFS_PIOCTL)
-    case MULTIPLE_ENTRY_POINT:
-	return syscall(afs_syscalls[1]);
-#endif
-#ifdef _AIX
-    case AIX_ENTRY_POINTS:
-	return Setpag();
-#endif
-    }
-    
-    errno = ENOSYS;
-#ifdef SIGSYS
-    kill(getpid(), SIGSYS);	/* You loose! */
-#endif
-#endif /* NO_AFS */
-    return -1;
-}
-
-static jmp_buf catch_SIGSYS;
-
-#ifdef SIGSYS
-
-static RETSIGTYPE
-SIGSYS_handler(int sig)
-{
-    errno = 0;
-    signal(SIGSYS, SIGSYS_handler); /* Need to reinstall handler on SYSV */
-    longjmp(catch_SIGSYS, 1);
-}
-
-#endif
-
-int
-k_hasafs(void)
-{
-    int saved_errno;
-    RETSIGTYPE (*saved_func)();
-    struct ViceIoctl parms;
-  
-    /*
-     * Already checked presence of AFS syscalls?
-     */
-    if (afs_entry_point != UNKNOWN_ENTRY_POINT)
-	return afs_entry_point != NO_ENTRY_POINT;
-
-    /*
-     * Probe kernel for AFS specific syscalls,
-     * they (currently) come in two flavors.
-     * If the syscall is absent we recive a SIGSYS.
-     */
-    afs_entry_point = NO_ENTRY_POINT;
-    memset(&parms, 0, sizeof(parms));
-  
-    saved_errno = errno;
-#ifndef NO_AFS
-#ifdef SIGSYS
-    saved_func = signal(SIGSYS, SIGSYS_handler);
-#endif
-
-#ifdef AFS_SYSCALL
-    if (setjmp(catch_SIGSYS) == 0)
-	{
-	    syscall(AFS_SYSCALL, AFSCALL_PIOCTL,
-		    0, VIOCSETTOK, &parms, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-	    if (errno == EINVAL)
-		{
-		    afs_entry_point = SINGLE_ENTRY_POINT;
-		    afs_syscalls[0] = AFS_SYSCALL;
-		    goto done;
-		}
-	}
-#endif /* AFS_SYSCALL */
-
-#ifdef AFS_PIOCTL
-    if (setjmp(catch_SIGSYS) == 0)
-	{
-	    syscall(AFS_PIOCTL,
-		    0, VIOCSETTOK, &parms, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-	    if (errno == EINVAL)
-		{
-		    afs_entry_point = MULTIPLE_ENTRY_POINT;
-		    afs_syscalls[0] = AFS_PIOCTL;
-		    afs_syscalls[1] = AFS_SETPAG;
-		    goto done;
-		}
-	}
-#endif /* AFS_PIOCTL */
-
-#ifdef AFS_SYSCALL2
-    if (setjmp(catch_SIGSYS) == 0)
-	{
-	    syscall(AFS_SYSCALL2, AFSCALL_PIOCTL,
-		    0, VIOCSETTOK, &parms, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-	    if (errno == EINVAL)
-		{
-		    afs_entry_point = SINGLE_ENTRY_POINT2;
-		    afs_syscalls[0] = AFS_SYSCALL2;
-		    goto done;
-		}
-	}
-#endif /* AFS_SYSCALL */
-
-#ifdef AFS_SYSCALL3
-    if (setjmp(catch_SIGSYS) == 0)
-	{
-	    syscall(AFS_SYSCALL3, AFSCALL_PIOCTL,
-		    0, VIOCSETTOK, &parms, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-	    if (errno == EINVAL)
-		{
-		    afs_entry_point = SINGLE_ENTRY_POINT3;
-		    afs_syscalls[0] = AFS_SYSCALL3;
-		    goto done;
-		}
-	}
-#endif /* AFS_SYSCALL */
-
-#ifdef _AIX
-    aix_setup();
-    if(Pioctl != NULL && Setpag != NULL){
-	afs_entry_point = AIX_ENTRY_POINTS;
-	goto done;
-    }
-#endif
-
-done:
-#ifdef SIGSYS
-    signal(SIGSYS, saved_func);
-#endif
-#endif /* NO_AFS */
-    errno = saved_errno;
-    return afs_entry_point != NO_ENTRY_POINT;
-}
diff --git a/crypto/kerberosIV/lib/kafs/afssysdefs.h b/crypto/kerberosIV/lib/kafs/afssysdefs.h
deleted file mode 100644
index 028f9b3f59f4..000000000000
--- a/crypto/kerberosIV/lib/kafs/afssysdefs.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id: afssysdefs.h,v 1.15 1997/04/01 08:18:12 joda Exp $ */
-
-/*
- * This section is for machines using single entry point AFS syscalls!
- * and/or
- * This section is for machines using multiple entry point AFS syscalls!
- *
- * SunOS 4 is an example of single entry point and sgi of multiple
- * entry point syscalls.
- */
-
-#if SunOS == 4
-#define AFS_SYSCALL	31
-#endif
-
-#if SunOS == 5
-#define AFS_SYSCALL	105
-#endif
-
-#if defined(__hpux)
-#define AFS_SYSCALL	50
-#define AFS_SYSCALL2	49
-#endif
-
-#if defined(_AIX)
-/* _AIX is too weird */
-#endif
-
-#if defined(__sgi)
-#define AFS_PIOCTL      (64+1000)
-#define AFS_SETPAG      (65+1000)
-#endif
-
-#if defined(__osf__)
-#define AFS_SYSCALL	232
-#define AFS_SYSCALL2	258
-#endif
-
-#if defined(__ultrix)
-#define AFS_SYSCALL	31
-#endif
-
-#if defined(__NetBSD__)
-#define AFS_SYSCALL 210
-#endif
-
-#ifdef SYS_afs_syscall
-#define AFS_SYSCALL3	SYS_afs_syscall
-#endif
diff --git a/crypto/kerberosIV/lib/kafs/dlfcn.c b/crypto/kerberosIV/lib/kafs/dlfcn.c
deleted file mode 100644
index 3f4de9221665..000000000000
--- a/crypto/kerberosIV/lib/kafs/dlfcn.c
+++ /dev/null
@@ -1,570 +0,0 @@
-/*
- * @(#)dlfcn.c	1.11 revision of 96/04/10  20:12:51
- * This is an unpublished work copyright (c) 1992 HELIOS Software GmbH
- * 30159 Hannover, Germany
- */
-
-/*
- * Changes marked with `--jwe' were made on April 7 1996 by John W. Eaton
- * <jwe@bevo.che.wisc.edu> to support g++ and/or use with Octave.
- */
-
-/*
- * This makes my life easier with Octave.  --jwe
- */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/ldr.h>
-#include <a.out.h>
-#include <ldfcn.h>
-#include "dlfcn.h"
-
-/*
- * We simulate dlopen() et al. through a call to load. Because AIX has
- * no call to find an exported symbol we read the loader section of the
- * loaded module and build a list of exported symbols and their virtual
- * address.
- */
-
-typedef struct {
-	char		*name;		/* the symbols's name */
-	void		*addr;		/* its relocated virtual address */
-} Export, *ExportPtr;
-
-/*
- * xlC uses the following structure to list its constructors and
- * destructors. This is gleaned from the output of munch.
- */
-typedef struct {
-	void (*init)(void);		/* call static constructors */
-	void (*term)(void);		/* call static destructors */
-} Cdtor, *CdtorPtr;
-
-typedef void (*GccCDtorPtr)(void);
-
-/*
- * The void * handle returned from dlopen is actually a ModulePtr.
- */
-typedef struct Module {
-	struct Module	*next;
-	char		*name;		/* module name for refcounting */
-	int		refCnt;		/* the number of references */
-	void		*entry;		/* entry point from load */
-	struct dl_info	*info;		/* optional init/terminate functions */
-	CdtorPtr	cdtors;		/* optional C++ constructors */
-	GccCDtorPtr	gcc_ctor;	/* g++ constructors  --jwe */
-	GccCDtorPtr	gcc_dtor;	/* g++ destructors  --jwe */
-	int		nExports;	/* the number of exports found */
-	ExportPtr	exports;	/* the array of exports */
-} Module, *ModulePtr;
-
-/*
- * We keep a list of all loaded modules to be able to call the fini
- * handlers and destructors at atexit() time.
- */
-static ModulePtr modList;
-
-/*
- * The last error from one of the dl* routines is kept in static
- * variables here. Each error is returned only once to the caller.
- */
-static char errbuf[BUFSIZ];
-static int errvalid;
-
-/*
- * The `fixed' gcc header files on AIX 3.2.5 provide a prototype for
- * strdup().  --jwe
- */
-#ifndef HAVE_STRDUP
-extern char *strdup(const char *);
-#endif
-static void caterr(char *);
-static int readExports(ModulePtr);
-static void terminate(void);
-static void *findMain(void);
-
-void *dlopen(const char *path, int mode)
-{
-	ModulePtr mp;
-	static void *mainModule;
-
-	/*
-	 * Upon the first call register a terminate handler that will
-	 * close all libraries. Also get a reference to the main module
-	 * for use with loadbind.
-	 */
-	if (!mainModule) {
-		if ((mainModule = findMain()) == NULL)
-			return NULL;
-		atexit(terminate);
-	}
-	/*
-	 * Scan the list of modules if we have the module already loaded.
-	 */
-	for (mp = modList; mp; mp = mp->next)
-		if (strcmp(mp->name, path) == 0) {
-			mp->refCnt++;
-			return mp;
-		}
-	if ((mp = (ModulePtr)calloc(1, sizeof(*mp))) == NULL) {
-		errvalid++;
-		strcpy(errbuf, "calloc: ");
-		strcat(errbuf, strerror(errno));
-		return NULL;
-	}
-	if ((mp->name = strdup(path)) == NULL) {
-		errvalid++;
-		strcpy(errbuf, "strdup: ");
-		strcat(errbuf, strerror(errno));
-		free(mp);
-		return NULL;
-	}
-	/*
-	 * load should be declared load(const char *...). Thus we
-	 * cast the path to a normal char *. Ugly.
-	 */
-	if ((mp->entry = (void *)load((char *)path, L_NOAUTODEFER, NULL)) == NULL) {
-		free(mp->name);
-		free(mp);
-		errvalid++;
-		strcpy(errbuf, "dlopen: ");
-		strcat(errbuf, path);
-		strcat(errbuf, ": ");
-		/*
-		 * If AIX says the file is not executable, the error
-		 * can be further described by querying the loader about
-		 * the last error.
-		 */
-		if (errno == ENOEXEC) {
-			char *tmp[BUFSIZ/sizeof(char *)];
-			if (loadquery(L_GETMESSAGES, tmp, sizeof(tmp)) == -1)
-				strcpy(errbuf, strerror(errno));
-			else {
-				char **p;
-				for (p = tmp; *p; p++)
-					caterr(*p);
-			}
-		} else
-			strcat(errbuf, strerror(errno));
-		return NULL;
-	}
-	mp->refCnt = 1;
-	mp->next = modList;
-	modList = mp;
-	if (loadbind(0, mainModule, mp->entry) == -1) {
-		dlclose(mp);
-		errvalid++;
-		strcpy(errbuf, "loadbind: ");
-		strcat(errbuf, strerror(errno));
-		return NULL;
-	}
-	/*
-	 * If the user wants global binding, loadbind against all other
-	 * loaded modules.
-	 */
-	if (mode & RTLD_GLOBAL) {
-		ModulePtr mp1;
-		for (mp1 = mp->next; mp1; mp1 = mp1->next)
-			if (loadbind(0, mp1->entry, mp->entry) == -1) {
-				dlclose(mp);
-				errvalid++;
-				strcpy(errbuf, "loadbind: ");
-				strcat(errbuf, strerror(errno));
-				return NULL;
-			}
-	}
-	if (readExports(mp) == -1) {
-		dlclose(mp);
-		return NULL;
-	}
-	/*
-	 * If there is a dl_info structure, call the init function.
-	 */
-	if (mp->info = (struct dl_info *)dlsym(mp, "dl_info")) {
-		if (mp->info->init)
-			(*mp->info->init)();
-	} else
-		errvalid = 0;
-	/*
-	 * If the shared object was compiled using xlC we will need
-	 * to call static constructors (and later on dlclose destructors).
-	 */
-	if (mp->cdtors = (CdtorPtr)dlsym(mp, "__cdtors")) {
-		CdtorPtr cp = mp->cdtors;
-		while (cp->init || cp->term) {
-			if (cp->init && cp->init != (void (*)(void))0xffffffff)
-				(*cp->init)();
-			cp++;
-		}
-	/*
-	 * If the shared object was compiled using g++, we will need
-	 * to call global constructors using the _GLOBAL__DI function,
-	 * and later, global destructors using the _GLOBAL_DD
-	 * funciton.  --jwe
-	 */
-	} else if (mp->gcc_ctor = (GccCDtorPtr)dlsym(mp, "_GLOBAL__DI")) {
-		(*mp->gcc_ctor)();
-		mp->gcc_dtor = (GccCDtorPtr)dlsym(mp, "_GLOBAL__DD"); 
-	} else
-		errvalid = 0;
-	return mp;
-}
-
-/*
- * Attempt to decipher an AIX loader error message and append it
- * to our static error message buffer.
- */
-static void caterr(char *s)
-{
-	char *p = s;
-
-	while (*p >= '0' && *p <= '9')
-		p++;
-	switch(atoi(s)) {
-	case L_ERROR_TOOMANY:
-		strcat(errbuf, "to many errors");
-		break;
-	case L_ERROR_NOLIB:
-		strcat(errbuf, "can't load library");
-		strcat(errbuf, p);
-		break;
-	case L_ERROR_UNDEF:
-		strcat(errbuf, "can't find symbol");
-		strcat(errbuf, p);
-		break;
-	case L_ERROR_RLDBAD:
-		strcat(errbuf, "bad RLD");
-		strcat(errbuf, p);
-		break;
-	case L_ERROR_FORMAT:
-		strcat(errbuf, "bad exec format in");
-		strcat(errbuf, p);
-		break;
-	case L_ERROR_ERRNO:
-		strcat(errbuf, strerror(atoi(++p)));
-		break;
-	default:
-		strcat(errbuf, s);
-		break;
-	}
-}
-
-void *dlsym(void *handle, const char *symbol)
-{
-	ModulePtr mp = (ModulePtr)handle;
-	ExportPtr ep;
-	int i;
-
-	/*
-	 * Could speed up the search, but I assume that one assigns
-	 * the result to function pointers anyways.
-	 */
-	for (ep = mp->exports, i = mp->nExports; i; i--, ep++)
-		if (strcmp(ep->name, symbol) == 0)
-			return ep->addr;
-	errvalid++;
-	strcpy(errbuf, "dlsym: undefined symbol ");
-	strcat(errbuf, symbol);
-	return NULL;
-}
-
-char *dlerror(void)
-{
-	if (errvalid) {
-		errvalid = 0;
-		return errbuf;
-	}
-	return NULL;
-}
-
-int dlclose(void *handle)
-{
-	ModulePtr mp = (ModulePtr)handle;
-	int result;
-	ModulePtr mp1;
-
-	if (--mp->refCnt > 0)
-		return 0;
-	if (mp->info && mp->info->fini)
-		(*mp->info->fini)();
-	if (mp->cdtors) {
-		CdtorPtr cp = mp->cdtors;
-		while (cp->init || cp->term) {
-			if (cp->term && cp->init != (void (*)(void))0xffffffff)
-				(*cp->term)();
-			cp++;
-		}
-	/*
-	 * If the function to handle global destructors for g++
-	 * exists, call it.  --jwe
-	 */
-	} else if (mp->gcc_dtor) {
-	        (*mp->gcc_dtor)();
-	}
-	result = unload(mp->entry);
-	if (result == -1) {
-		errvalid++;
-		strcpy(errbuf, strerror(errno));
-	}
-	if (mp->exports) {
-		ExportPtr ep;
-		int i;
-		for (ep = mp->exports, i = mp->nExports; i; i--, ep++)
-			if (ep->name)
-				free(ep->name);
-		free(mp->exports);
-	}
-	if (mp == modList)
-		modList = mp->next;
-	else {
-		for (mp1 = modList; mp1; mp1 = mp1->next)
-			if (mp1->next == mp) {
-				mp1->next = mp->next;
-				break;
-			}
-	}
-	free(mp->name);
-	free(mp);
-	return result;
-}
-
-static void terminate(void)
-{
-	while (modList)
-		dlclose(modList);
-}
-
-/*
- * Build the export table from the XCOFF .loader section.
- */
-static int readExports(ModulePtr mp)
-{
-	LDFILE *ldp = NULL;
-	SCNHDR sh, shdata;
-	LDHDR *lhp;
-	char *ldbuf;
-	LDSYM *ls;
-	int i;
-	ExportPtr ep;
-
-	if ((ldp = ldopen(mp->name, ldp)) == NULL) {
-		struct ld_info *lp;
-		char *buf;
-		int size = 4*1024;
-		if (errno != ENOENT) {
-			errvalid++;
-			strcpy(errbuf, "readExports: ");
-			strcat(errbuf, strerror(errno));
-			return -1;
-		}
-		/*
-		 * The module might be loaded due to the LIBPATH
-		 * environment variable. Search for the loaded
-		 * module using L_GETINFO.
-		 */
-		if ((buf = malloc(size)) == NULL) {
-			errvalid++;
-			strcpy(errbuf, "readExports: ");
-			strcat(errbuf, strerror(errno));
-			return -1;
-		}
-		while ((i = loadquery(L_GETINFO, buf, size)) == -1 && errno == ENOMEM) {
-			free(buf);
-			size += 4*1024;
-			if ((buf = malloc(size)) == NULL) {
-				errvalid++;
-				strcpy(errbuf, "readExports: ");
-				strcat(errbuf, strerror(errno));
-				return -1;
-			}
-		}
-		if (i == -1) {
-			errvalid++;
-			strcpy(errbuf, "readExports: ");
-			strcat(errbuf, strerror(errno));
-			free(buf);
-			return -1;
-		}
-		/*
-		 * Traverse the list of loaded modules. The entry point
-		 * returned by load() does actually point to the data
-		 * segment origin.
-		 */
-		lp = (struct ld_info *)buf;
-		while (lp) {
-			if (lp->ldinfo_dataorg == mp->entry) {
-				ldp = ldopen(lp->ldinfo_filename, ldp);
-				break;
-			}
-			if (lp->ldinfo_next == 0)
-				lp = NULL;
-			else
-				lp = (struct ld_info *)((char *)lp + lp->ldinfo_next);
-		}
-		free(buf);
-		if (!ldp) {
-			errvalid++;
-			strcpy(errbuf, "readExports: ");
-			strcat(errbuf, strerror(errno));
-			return -1;
-		}
-	}
-	if (TYPE(ldp) != U802TOCMAGIC) {
-		errvalid++;
-		strcpy(errbuf, "readExports: bad magic");
-		while(ldclose(ldp) == FAILURE)
-			;
-		return -1;
-	}
-	/*
-	 * Get the padding for the data section. This is needed for
-	 * AIX 4.1 compilers. This is used when building the final
-	 * function pointer to the exported symbol.
-	 */
-	if (ldnshread(ldp, _DATA, &shdata) != SUCCESS) {
-		errvalid++;
-		strcpy(errbuf, "readExports: cannot read data section header");
-		while(ldclose(ldp) == FAILURE)
-			;
-		return -1;
-	}
-	if (ldnshread(ldp, _LOADER, &sh) != SUCCESS) {
-		errvalid++;
-		strcpy(errbuf, "readExports: cannot read loader section header");
-		while(ldclose(ldp) == FAILURE)
-			;
-		return -1;
-	}
-	/*
-	 * We read the complete loader section in one chunk, this makes
-	 * finding long symbol names residing in the string table easier.
-	 */
-	if ((ldbuf = (char *)malloc(sh.s_size)) == NULL) {
-		errvalid++;
-		strcpy(errbuf, "readExports: ");
-		strcat(errbuf, strerror(errno));
-		while(ldclose(ldp) == FAILURE)
-			;
-		return -1;
-	}
-	if (FSEEK(ldp, sh.s_scnptr, BEGINNING) != OKFSEEK) {
-		errvalid++;
-		strcpy(errbuf, "readExports: cannot seek to loader section");
-		free(ldbuf);
-		while(ldclose(ldp) == FAILURE)
-			;
-		return -1;
-	}
-	if (FREAD(ldbuf, sh.s_size, 1, ldp) != 1) {
-		errvalid++;
-		strcpy(errbuf, "readExports: cannot read loader section");
-		free(ldbuf);
-		while(ldclose(ldp) == FAILURE)
-			;
-		return -1;
-	}
-	lhp = (LDHDR *)ldbuf;
-	ls = (LDSYM *)(ldbuf+LDHDRSZ);
-	/*
-	 * Count the number of exports to include in our export table.
-	 */
-	for (i = lhp->l_nsyms; i; i--, ls++) {
-		if (!LDR_EXPORT(*ls))
-			continue;
-		mp->nExports++;
-	}
-	if ((mp->exports = (ExportPtr)calloc(mp->nExports, sizeof(*mp->exports))) == NULL) {
-		errvalid++;
-		strcpy(errbuf, "readExports: ");
-		strcat(errbuf, strerror(errno));
-		free(ldbuf);
-		while(ldclose(ldp) == FAILURE)
-			;
-		return -1;
-	}
-	/*
-	 * Fill in the export table. All entries are relative to
-	 * the entry point we got from load.
-	 */
-	ep = mp->exports;
-	ls = (LDSYM *)(ldbuf+LDHDRSZ);
-	for (i = lhp->l_nsyms; i; i--, ls++) {
-		char *symname;
-		char tmpsym[SYMNMLEN+1];
-		if (!LDR_EXPORT(*ls))
-			continue;
-		if (ls->l_zeroes == 0)
-			symname = ls->l_offset+lhp->l_stoff+ldbuf;
-		else {
-			/*
-			 * The l_name member is not zero terminated, we
-			 * must copy the first SYMNMLEN chars and make
-			 * sure we have a zero byte at the end.
-			 */
-			strncpy(tmpsym, ls->l_name, SYMNMLEN);
-			tmpsym[SYMNMLEN] = '\0';
-			symname = tmpsym;
-		}
-		ep->name = strdup(symname);
-		ep->addr = (void *)((unsigned long)mp->entry +
-					ls->l_value - shdata.s_vaddr);
-		ep++;
-	}
-	free(ldbuf);
-	while(ldclose(ldp) == FAILURE)
-		;
-	return 0;
-}
-
-/*
- * Find the main modules entry point. This is used as export pointer
- * for loadbind() to be able to resolve references to the main part.
- */
-static void * findMain(void)
-{
-	struct ld_info *lp;
-	char *buf;
-	int size = 4*1024;
-	int i;
-	void *ret;
-
-	if ((buf = malloc(size)) == NULL) {
-		errvalid++;
-		strcpy(errbuf, "findMain: ");
-		strcat(errbuf, strerror(errno));
-		return NULL;
-	}
-	while ((i = loadquery(L_GETINFO, buf, size)) == -1 && errno == ENOMEM) {
-		free(buf);
-		size += 4*1024;
-		if ((buf = malloc(size)) == NULL) {
-			errvalid++;
-			strcpy(errbuf, "findMain: ");
-			strcat(errbuf, strerror(errno));
-			return NULL;
-		}
-	}
-	if (i == -1) {
-		errvalid++;
-		strcpy(errbuf, "findMain: ");
-		strcat(errbuf, strerror(errno));
-		free(buf);
-		return NULL;
-	}
-	/*
-	 * The first entry is the main module. The entry point
-	 * returned by load() does actually point to the data
-	 * segment origin.
-	 */
-	lp = (struct ld_info *)buf;
-	ret = lp->ldinfo_dataorg;
-	free(buf);
-	return ret;
-}
diff --git a/crypto/kerberosIV/lib/kafs/dlfcn.h b/crypto/kerberosIV/lib/kafs/dlfcn.h
deleted file mode 100644
index 5671e9caa3a7..000000000000
--- a/crypto/kerberosIV/lib/kafs/dlfcn.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * @(#)dlfcn.h	1.4 revision of 95/04/25  09:36:52
- * This is an unpublished work copyright (c) 1992 HELIOS Software GmbH
- * 30159 Hannover, Germany
- */
-
-#ifndef __dlfcn_h__
-#define __dlfcn_h__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Mode flags for the dlopen routine.
- */
-#define RTLD_LAZY	1	/* lazy function call binding */
-#define RTLD_NOW	2	/* immediate function call binding */
-#define RTLD_GLOBAL	0x100	/* allow symbols to be global */
-
-/*
- * To be able to intialize, a library may provide a dl_info structure
- * that contains functions to be called to initialize and terminate.
- */
-struct dl_info {
-	void (*init)(void);
-	void (*fini)(void);
-};
-
-#if __STDC__ || defined(_IBMR2)
-void *dlopen(const char *path, int mode);
-void *dlsym(void *handle, const char *symbol);
-char *dlerror(void);
-int dlclose(void *handle);
-#else
-void *dlopen();
-void *dlsym();
-char *dlerror();
-int dlclose();
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __dlfcn_h__ */
diff --git a/crypto/kerberosIV/lib/kafs/kafs.h b/crypto/kerberosIV/lib/kafs/kafs.h
deleted file mode 100644
index 579856a3b91e..000000000000
--- a/crypto/kerberosIV/lib/kafs/kafs.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id$ */
-
-#ifndef __KAFS_H
-#define __KAFS_H
-
-#include <sys/types.h>
-#include <sys/cdefs.h>
-/* sys/ioctl.h must be included manually before kafs.h */
-
-/*
- */
-#define AFSCALL_PIOCTL 20
-#define AFSCALL_SETPAG 21
-
-#ifndef _VICEIOCTL
-#define _VICEIOCTL(id)  ((unsigned int ) _IOW('V', id, struct ViceIoctl))
-#endif /* _VICEIOCTL */
-
-#define VIOCSETTOK		_VICEIOCTL(3)
-#define VIOCGETTOK		_VICEIOCTL(8)
-#define VIOCUNLOG		_VICEIOCTL(9)
-#define VIOC_FILE_CELL_NAME	_VICEIOCTL(30)
-
-struct ViceIoctl {
-  caddr_t in, out;
-  short in_size;
-  short out_size;
-};
-
-struct ClearToken {
-  int32_t AuthHandle;
-  char HandShakeKey[8];
-  int32_t ViceId;
-  int32_t BeginTimestamp;
-  int32_t EndTimestamp;
-};
-
-#ifndef __P
-#define __P(x) x
-#endif
-
-/* Use k_hasafs() to probe if the machine supports AFS syscalls.
-   The other functions will generate a SIGSYS if AFS is not supported */
-
-int k_hasafs __P((void));
-
-int k_afsklog __P((const char *cell, const char *realm));
-int k_afsklog_uid __P((const char *cell, const char *realm, uid_t uid));
-int k_pioctl __P((char *a_path,
-		  int o_opcode,
-		  struct ViceIoctl *a_paramsP,
-		  int a_followSymlinks));
-int k_unlog __P((void));
-int k_setpag __P((void));
-int k_afs_cell_of_file __P((const char *path, char *cell, int len));
-
-#define _PATH_VICE		"/usr/vice/etc/"
-#define _PATH_THISCELL 		_PATH_VICE "ThisCell"
-#define _PATH_CELLSERVDB 	_PATH_VICE "CellServDB"
-#define _PATH_THESECELLS	_PATH_VICE "TheseCells"
-
-#endif /* __KAFS_H */
diff --git a/crypto/kerberosIV/lib/kafs/kafs_locl.h b/crypto/kerberosIV/lib/kafs/kafs_locl.h
deleted file mode 100644
index 6ada6abd907c..000000000000
--- a/crypto/kerberosIV/lib/kafs/kafs_locl.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id: kafs_locl.h,v 1.3 1997/05/04 23:04:44 assar Exp $ */
-
-#ifndef __KAFS_LOCL_H__
-#define __KAFS_LOCL_H__
-
-#include <config.h>
-#include <protos.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <setjmp.h>
-#include <errno.h>
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#if defined(HAVE_SYS_IOCTL_H) && SunOS != 4
-#include <sys/ioctl.h>
-#endif
-#ifdef HAVE_SYS_FILIO_H
-#include <sys/filio.h>
-#endif
-
-#ifdef HAVE_SYS_SYSCALL_H
-#include <sys/syscall.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-#ifdef HAVE_RESOLV_H
-#include <resolv.h>
-#endif
-#include <roken.h>
-
-#include <krb.h>
-#include <kafs.h>
-
-#include <resolve.h>
-
-#include "afssysdefs.h"
-
-
-#endif /* __KAFS_LOCL_H__ */
diff --git a/crypto/kerberosIV/lib/kdb/Makefile.in b/crypto/kerberosIV/lib/kdb/Makefile.in
deleted file mode 100644
index f6fb9620612e..000000000000
--- a/crypto/kerberosIV/lib/kdb/Makefile.in
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# $Id: Makefile.in,v 1.25 1997/05/06 03:47:39 assar Exp $
-#
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-CC = @CC@
-AR = ar
-RANLIB = @RANLIB@
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-
-INSTALL = @INSTALL@
-INSTALL_DATA	= @INSTALL_DATA@
-MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-libdir = @libdir@
-
-PICFLAGS = @PICFLAGS@
- 
-LIBNAME = $(LIBPREFIX)kdb
-LIBEXT = @LIBEXT@
-SHLIBEXT = @SHLIBEXT@
-LIBPREFIX = @LIBPREFIX@
-LDSHARED = @LDSHARED@
-LIB = $(LIBNAME).$(LIBEXT)
-
-SOURCES = krb_cache.c krb_kdb_utils.c copykey.c krb_lib.c krb_dbm.c print_princ.c base64.c
-
-OBJECTS = krb_cache.o krb_kdb_utils.o copykey.o krb_lib.o krb_dbm.o print_princ.o base64.o
-
-all: $(LIB)
-
-Wall:
-		make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $<
-
-install: all
-	$(MKINSTALLDIRS) $(libdir)
-	$(INSTALL_DATA) -m 0555 $(LIB) $(libdir)
-
-uninstall:
-	rm -f $(libdir)/$(LIB)
-
-TAGS: $(SOURCES)
-	etags $(SOURCES)
-
-check:
-
-clean:
-	rm -f $(LIB) *.o *.a
-
-mostlyclean: clean
-
-distclean: clean
-	rm -f Makefile *.tab.c *~
-
-realclean: distclean
-	rm -f TAGS
-
-dist: $(DISTFILES)
-	for file in $(DISTFILES); do \
-	  ln $$file ../`cat ../.fname`/lib \
-	    || cp -p $$file ../`cat ../.fname`/lib; \
-	done
-
-$(LIBNAME).a: $(OBJECTS)
-	rm -f $@
-	$(AR) cr $@ $(OBJECTS)
-	-$(RANLIB) $@
-
-$(LIBNAME).$(SHLIBEXT): $(OBJECTS)
-	rm -f $@
-	$(LDSHARED) -o $@ $(OBJECTS)
-
-$(OBJECTS): ../../include/config.h
diff --git a/crypto/kerberosIV/lib/kdb/base64.c b/crypto/kerberosIV/lib/kdb/base64.c
deleted file mode 100644
index d7e89c476251..000000000000
--- a/crypto/kerberosIV/lib/kdb/base64.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: base64.c,v 1.7 1997/04/01 08:18:16 joda Exp $");
-#endif
-
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-#include "base64.h"
-
-static char base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-static int POS(char c)
-{
-  if(c == '=') return 64;
-  if(isupper(c))
-    return c - 'A';
-  if(islower(c))
-    return c - 'a' + 26;
-  if(isdigit(c))
-    return c - '0' + 52;
-  if(c == '+')
-    return 62;
-  if(c == '/')
-    return 63;
-  return -1;
-}
-
-char *base64_encode(const void *buf, int size)
-{
-  char *str = (char*)malloc((size+3)*4/3+1);
-  char *p=str;
-  unsigned char *q = (unsigned char*)buf;
-  int i;
-  int c;
-  i=0;
-  while(i<size){
-    c=q[i++];
-    c*=256;
-    if(i<size)
-      c+=q[i];
-    i++;
-    c*=256;
-    if(i<size)
-      c+=q[i];
-    i++;
-    p[0]=base64[(c&0x00fc0000) >> 18];
-    p[1]=base64[(c&0x0003f000) >> 12];
-    p[2]=base64[(c&0x00000fc0) >> 6];
-    p[3]=base64[(c&0x0000003f) >> 0];
-    if(i>size)
-      p[3]='=';
-    if(i>size+1)
-      p[2]='=';
-    p+=4;
-  }
-  *p=0;
-  return str;
-}
-
-/* convert string in s to binary data. s should be a multiple of 4
- * bytes long. data should be at least len(s) * 3 / 4 bytes long.
- * returns 
- */
-int base64_decode(char *s, void *data)
-{
-  char *p;
-  unsigned char *q;
-  int n[4];
-
-  if(strlen(s) % 4)
-    return -1;
-  q=(unsigned char*)data;
-  for(p=s; *p; p+=4){
-    n[0] = POS(p[0]);
-    n[1] = POS(p[1]);
-    n[2] = POS(p[2]);
-    n[3] = POS(p[3]);
-    if((n[0] | n[1] | n[2] | n[3]) < 0)
-      return -1;
-
-    if(n[0] == 64 || n[1] == 64)
-      return -1;
-    if(n[2] == 64 && n[3] < 64)
-      return -1;
-    q[0] = (n[0] << 2) + (n[1] >> 4);
-    if(n[2] < 64){
-      q[1] = ((n[1] & 15) << 4) + (n[2] >> 2);
-    }
-    if(n[3] < 64){
-      q[2] = ((n[2] & 3) << 6) + n[3];
-    }
-    q+=3;
-  }
-  q -= (n[2] == 64) + (n[3] == 64);
-  return q - (unsigned char*)data;
-}
-
-#ifdef TEST
-int main(int argc, char **argv)
-{
-  char str[128];
-  char buf[128];
-  char *p;
-  printf("base64_encode(\"%s\") = \"%s\"\n", argv[1], 
-	 p=base64_encode(argv[1], strlen(argv[1])));
-  printf("base64_decode(\"%s\") = %d", p, base64_decode(p, buf));
-  printf(" (\"%s\")\n", buf);
-  printf("base64_decode(\"%s\") = %d", argv[1], base64_decode(argv[1], buf));
-  printf(" (\"%s\")\n", buf);
-}
-#endif
diff --git a/crypto/kerberosIV/lib/kdb/base64.h b/crypto/kerberosIV/lib/kdb/base64.h
deleted file mode 100644
index edfb34415ca2..000000000000
--- a/crypto/kerberosIV/lib/kdb/base64.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id: base64.h,v 1.5 1997/04/01 08:18:16 joda Exp $ */
-
-#ifndef _BASE64_H_
-#define _BASE64_H_
-
-char *base64_encode(const void *buf, int size);
-int base64_decode(char *s, void *data);
-
-#endif
diff --git a/crypto/kerberosIV/lib/kdb/copykey.c b/crypto/kerberosIV/lib/kdb/copykey.c
deleted file mode 100644
index a78baf78e816..000000000000
--- a/crypto/kerberosIV/lib/kdb/copykey.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "kdb_locl.h"
-
-RCSID("$Id: copykey.c,v 1.10 1997/04/01 08:18:17 joda Exp $");
-
-void
-copy_from_key(des_cblock in, u_int32_t *lo, u_int32_t *hi)
-{
-    memcpy(lo, ((char *) in) + 0, 4);
-    memcpy(hi, ((char *) in) + 4, 4);
-}
-
-void
-copy_to_key(u_int32_t *lo, u_int32_t *hi, des_cblock out)
-{
-    memcpy(((char *)out) + 0, lo, 4);
-    memcpy(((char *)out) + 4, hi, 4);
-}
diff --git a/crypto/kerberosIV/lib/kdb/kdb_locl.h b/crypto/kerberosIV/lib/kdb/kdb_locl.h
deleted file mode 100644
index fe4d0793e492..000000000000
--- a/crypto/kerberosIV/lib/kdb/kdb_locl.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id: kdb_locl.h,v 1.9 1997/05/02 14:29:08 assar Exp $ */
-
-#ifndef __kdb_locl_h
-#define __kdb_locl_h
-
-#include "config.h"
-#include "protos.h"
-
-#include "base64.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <unistd.h>
-#include <errno.h>
-
-#include <sys/types.h>
-
-#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#elif defined(HAVE_SYS_TIME_H)
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <utime.h>
-#include <sys/file.h>
-#include <roken.h>
-
-#include <krb.h>
-#include <krb_db.h>
-
-/* --- */
-
-/* Globals! */
-
-/* Utils */
-
-int kerb_db_set_lockmode __P((int));
-void kerb_db_fini __P((void));
-int kerb_db_init __P((void));
-int kerb_db_get_principal __P((char *name, char *, Principal *, unsigned int, int *));
-int kerb_db_get_dba __P((char *, char *, Dba *, unsigned int, int *));
-
-void delta_stat __P((DB_stat *, DB_stat *, DB_stat *));
-
-int kerb_cache_init __P((void));
-int kerb_cache_get_principal __P((char *name, char *, Principal *, unsigned int));
-int kerb_cache_put_principal __P((Principal *, unsigned int));
-int kerb_cache_get_dba __P((char *, char *, Dba *, unsigned int));
-int kerb_cache_put_dba __P((Dba *, unsigned int));
-
-void krb_print_principal __P((Principal *));
-
-#endif /*  __kdb_locl_h */
diff --git a/crypto/kerberosIV/lib/kdb/kdc.h b/crypto/kerberosIV/lib/kdb/kdc.h
deleted file mode 100644
index 08fa94f08f85..000000000000
--- a/crypto/kerberosIV/lib/kdb/kdc.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * $Id$
- *
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>. 
- *
- * Include file for the Kerberos Key Distribution Center. 
- */
-
-#ifndef KDC_DEFS
-#define KDC_DEFS
-
-/* Don't depend on this! */
-#ifndef MKEYFILE
-#if 1
-#define MKEYFILE	"/etc/kerberosIV/master-key"
-#else
-#define MKEYFILE	"/.k"
-#endif
-#endif
-#ifndef K_LOGFIL
-#define K_LOGFIL	"/var/log/kpropd.log"
-#endif
-
-#define ONE_MINUTE	60
-#define FIVE_MINUTES	(5 * ONE_MINUTE)
-#define ONE_HOUR	(60 * ONE_MINUTE)
-#define ONE_DAY		(24 * ONE_HOUR)
-#define THREE_DAYS	(3 * ONE_DAY)
-
-#endif /* KDC_DEFS */
-
diff --git a/crypto/kerberosIV/lib/kdb/krb_cache.c b/crypto/kerberosIV/lib/kdb/krb_cache.c
deleted file mode 100644
index ed4a5b19990f..000000000000
--- a/crypto/kerberosIV/lib/kdb/krb_cache.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-/*
- * This is where a cache would be implemented, if it were necessary.
- */
-
-#include "kdb_locl.h"
-
-RCSID("$Id: krb_cache.c,v 1.6 1997/05/02 10:27:53 joda Exp $");
-
-#ifdef DEBUG
-extern int debug;
-extern long kerb_debug;
-#endif
-static int init = 0;
-
-/*
- * initialization routine for cache 
- */
-
-int
-kerb_cache_init(void)
-{
-    init = 1;
-    return (0);
-}
-
-/*
- * look up a principal in the cache returns number of principals found 
- */
-
-int
-kerb_cache_get_principal(char *serv, char *inst, Principal *principal, unsigned int max)
-                 		/* could have wild card */
-                 		/* could have wild card */
-                         
-                     		/* max number of name structs to return */
-
-{
-    int     found = 0;
-
-    if (!init)
-	kerb_cache_init();
-#ifdef DEBUG
-    if (kerb_debug & 2)
-	fprintf(stderr, "cache_get_principal for %s %s max = %d\n",
-	    serv, inst, max);
-#endif /* DEBUG */
-    
-#ifdef DEBUG
-    if (kerb_debug & 2) {
-	if (found) {
-	    fprintf(stderr, "cache get %s %s found %s %s sid = %d\n",
-		serv, inst, principal->name, principal->instance);
-	} else {
-	    fprintf(stderr, "cache %s %s not found\n", serv,
-		inst);
-	}
-    }
-#endif
-    return (found);
-}
-
-/*
- * insert/replace a principal in the cache returns number of principals
- * inserted 
- */
-
-int
-kerb_cache_put_principal(Principal *principal, unsigned int max)
-                         
-                     		/* max number of principal structs to
-				 * insert */
-
-{
-    u_long  i;
-    int     count = 0;
-
-    if (!init)
-	kerb_cache_init();
-
-#ifdef DEBUG
-    if (kerb_debug & 2) {
-	fprintf(stderr, "kerb_cache_put_principal  max = %d",
-	    max);
-    }
-#endif
-    
-    for (i = 0; i < max; i++) {
-#ifdef DEBUG
-	if (kerb_debug & 2)
-	    fprintf(stderr, "\n %s %s",
-		    principal->name, principal->instance);
-#endif	
-	/* DO IT */
-	count++;
-	principal++;
-    }
-    return count;
-}
-
-/*
- * look up a dba in the cache returns number of dbas found 
- */
-
-int
-kerb_cache_get_dba(char *serv, char *inst, Dba *dba, unsigned int max)
-                 		/* could have wild card */
-                 		/* could have wild card */
-                
-                     		/* max number of name structs to return */
-
-{
-    int     found = 0;
-
-    if (!init)
-	kerb_cache_init();
-
-#ifdef DEBUG
-    if (kerb_debug & 2)
-	fprintf(stderr, "cache_get_dba for %s %s max = %d\n",
-	    serv, inst, max);
-#endif
-
-#ifdef DEBUG
-    if (kerb_debug & 2) {
-	if (found) {
-	    fprintf(stderr, "cache get %s %s found %s %s sid = %d\n",
-		serv, inst, dba->name, dba->instance);
-	} else {
-	    fprintf(stderr, "cache %s %s not found\n", serv, inst);
-	}
-    }
-#endif
-    return (found);
-}
-
-/*
- * insert/replace a dba in the cache returns number of dbas inserted 
- */
-
-int
-kerb_cache_put_dba(Dba *dba, unsigned int max)
-                
-                     		/* max number of dba structs to insert */
-
-{
-    u_long  i;
-    int     count = 0;
-
-    if (!init)
-	kerb_cache_init();
-#ifdef DEBUG
-    if (kerb_debug & 2) {
-	fprintf(stderr, "kerb_cache_put_dba  max = %d", max);
-    }
-#endif
-    for (i = 0; i < max; i++) {
-#ifdef DEBUG
-	if (kerb_debug & 2)
-	    fprintf(stderr, "\n %s %s",
-		    dba->name, dba->instance);
-#endif	
-	/* DO IT */
-	count++;
-	dba++;
-    }
-    return count;
-}
-
diff --git a/crypto/kerberosIV/lib/kdb/krb_db.h b/crypto/kerberosIV/lib/kdb/krb_db.h
deleted file mode 100644
index 00d6bb07b805..000000000000
--- a/crypto/kerberosIV/lib/kdb/krb_db.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * $Id$ 
- *
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>. 
- *
- * spm		Project Athena  8/85 
- *
- * This file defines data structures for the kerberos
- * authentication/authorization database. 
- *
- * They MUST correspond to those defined in *.rel 
- */
-
-#ifndef KRB_DB_DEFS
-#define KRB_DB_DEFS
-
-#include <stdio.h>
-
-#define KERB_M_NAME		"K"	/* Kerberos */
-#define KERB_M_INST		"M"	/* Master */
-#define KERB_DEFAULT_NAME	"default"
-#define KERB_DEFAULT_INST	""
-#ifndef DB_DIR
-#define DB_DIR			"/var/db/kerberos"
-#endif
-#ifndef DBM_FILE
-#define	DBM_FILE		DB_DIR "/principal"
-#endif
-
-/* this also defines the number of queue headers */
-#define KERB_DB_HASH_MODULO 64
-
-
-/* Arguments to kerb_dbl_lock() */
-
-#define KERB_DBL_EXCLUSIVE 1
-#define KERB_DBL_SHARED 0
-
-/* arguments to kerb_db_set_lockmode() */
-
-#define KERB_DBL_BLOCKING 0
-#define KERB_DBL_NONBLOCKING 1
-
-/* arguments to kdb_get_master_key */
-
-#define KDB_GET_PROMPT 1
-#define KDB_GET_TWICE  2
-
-/* Principal defines the structure of a principal's name */
-
-typedef struct {
-    char    name[ANAME_SZ];
-    char    instance[INST_SZ];
-
-    u_int32_t key_low;
-    u_int32_t key_high;
-    u_int32_t exp_date;
-    char    exp_date_txt[DATE_SZ];
-    u_int32_t mod_date;
-    char    mod_date_txt[DATE_SZ];
-    u_int16_t attributes;
-    u_int8_t max_life;
-    u_int8_t kdc_key_ver;
-    u_int8_t key_version;
-
-    char    mod_name[ANAME_SZ];
-    char    mod_instance[INST_SZ];
-    char   *old;		/* cast to (Principal *); not in db,
-				 * ptr to old vals */
-} Principal;
-
-typedef struct {
-    int32_t    cpu;
-    int32_t    elapsed;
-    int32_t    dio;
-    int32_t    pfault;
-    int32_t    t_stamp;
-    int32_t    n_retrieve;
-    int32_t    n_replace;
-    int32_t    n_append;
-    int32_t    n_get_stat;
-    int32_t    n_put_stat;
-} DB_stat;
-
-/* Dba defines the structure of a database administrator */
-
-typedef struct {
-    char    name[ANAME_SZ];
-    char    instance[INST_SZ];
-    u_int16_t attributes;
-    u_int32_t exp_date;
-    char    exp_date_txt[DATE_SZ];
-    char   *old;	/*
-			 * cast to (Dba *); not in db, ptr to
-			 * old vals
-			 */
-} Dba;
-
-typedef int (*k_iter_proc_t)(void*, Principal*);
-
-void copy_from_key __P((des_cblock in, u_int32_t *lo, u_int32_t *hi));
-void copy_to_key __P((u_int32_t *lo, u_int32_t *hi, des_cblock out));
-
-void kdb_encrypt_key __P((des_cblock *, des_cblock *, des_cblock *,
-			  des_key_schedule, int));
-int kdb_get_master_key __P((int prompt, des_cblock *master_key,
-			    des_key_schedule master_key_sched));
-int kdb_get_new_master_key __P((des_cblock *, des_key_schedule, int));
-int kdb_kstash __P((des_cblock *, char *));
-int kdb_new_get_master_key __P((des_cblock *, des_key_schedule));
-int kdb_new_get_new_master_key __P((des_cblock *key, des_key_schedule schedule, int verify));
-long kdb_verify_master_key __P((des_cblock *, des_key_schedule, FILE *));
-long *kerb_db_begin_update __P((void));
-int kerb_db_create __P((char *db_name));
-int kerb_db_delete_principal (char *name, char *inst);
-void kerb_db_end_update __P((long *db));
-int kerb_db_get_dba __P((char *, char *, Dba *, unsigned, int *));
-void kerb_db_get_stat __P((DB_stat *));
-int kerb_db_iterate __P((k_iter_proc_t, void*));
-int kerb_db_put_principal __P((Principal *, unsigned int));
-void kerb_db_put_stat __P((DB_stat *));
-int kerb_db_rename __P((char *, char *));
-int kerb_db_set_lockmode __P((int));
-int kerb_db_set_name __P((char *));
-int kerb_db_update __P((long *db, Principal *principal, unsigned int max));
-int kerb_delete_principal __P((char *name, char *inst));
-void kerb_fini __P((void));
-int kerb_get_dba __P((char *, char *, Dba *, unsigned int, int *));
-time_t kerb_get_db_age __P((void));
-int kerb_get_principal __P((char *, char *, Principal *, unsigned int, int *));
-int kerb_init __P((void));
-int kerb_put_principal __P((Principal *, unsigned int));
-
-#endif /* KRB_DB_DEFS */
diff --git a/crypto/kerberosIV/lib/kdb/krb_dbm.c b/crypto/kerberosIV/lib/kdb/krb_dbm.c
deleted file mode 100644
index 963656a87607..000000000000
--- a/crypto/kerberosIV/lib/kdb/krb_dbm.c
+++ /dev/null
@@ -1,823 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-#include "kdb_locl.h"
-
-RCSID("$Id: krb_dbm.c,v 1.27 1997/05/02 14:29:09 assar Exp $");
-
-#include <xdbm.h>
-
-#define KERB_DB_MAX_RETRY 5
-
-#ifdef DEBUG
-extern int debug;
-extern long kerb_debug;
-extern char *progname;
-#endif
-
-static int init = 0;
-static char default_db_name[] = DBM_FILE;
-static char *current_db_name = default_db_name;
-
-static struct timeval timestamp;/* current time of request */
-static int non_blocking = 0;
-
-/*
- * This module contains all of the code which directly interfaces to
- * the underlying representation of the Kerberos database; this
- * implementation uses a DBM or NDBM indexed "file" (actually
- * implemented as two separate files) to store the relations, plus a
- * third file as a semaphore to allow the database to be replaced out
- * from underneath the KDC server.
- */
-
-/*
- * Locking:
- * 
- * There are two distinct locking protocols used.  One is designed to
- * lock against processes (the admin_server, for one) which make
- * incremental changes to the database; the other is designed to lock
- * against utilities (kdb_util, kpropd) which replace the entire
- * database in one fell swoop.
- *
- * The first locking protocol is implemented using flock() in the 
- * krb_dbl_lock() and krb_dbl_unlock routines.
- *
- * The second locking protocol is necessary because DBM "files" are
- * actually implemented as two separate files, and it is impossible to
- * atomically rename two files simultaneously.  It assumes that the
- * database is replaced only very infrequently in comparison to the time
- * needed to do a database read operation.
- *
- * A third file is used as a "version" semaphore; the modification
- * time of this file is the "version number" of the database.
- * At the start of a read operation, the reader checks the version
- * number; at the end of the read operation, it checks again.  If the
- * version number changed, or if the semaphore was nonexistant at
- * either time, the reader sleeps for a second to let things
- * stabilize, and then tries again; if it does not succeed after
- * KERB_DB_MAX_RETRY attempts, it gives up.
- * 
- * On update, the semaphore file is deleted (if it exists) before any
- * update takes place; at the end of the update, it is replaced, with
- * a version number strictly greater than the version number which
- * existed at the start of the update.
- * 
- * If the system crashes in the middle of an update, the semaphore
- * file is not automatically created on reboot; this is a feature, not
- * a bug, since the database may be inconsistant.  Note that the
- * absence of a semaphore file does not prevent another _update_ from
- * taking place later.  Database replacements take place automatically
- * only on slave servers; a crash in the middle of an update will be
- * fixed by the next slave propagation.  A crash in the middle of an
- * update on the master would be somewhat more serious, but this would
- * likely be noticed by an administrator, who could fix the problem and
- * retry the operation.
- */
-
-
-/*
- * Utility routine: generate name of database file.
- */
-
-static char *gen_dbsuffix (char *db_name, char *sfx);
-
-static char *
-gen_dbsuffix(char *db_name, char *sfx)
-{
-    char *dbsuffix;
-    
-    if (sfx == NULL)
-	sfx = ".ok";
-
-    asprintf (&dbsuffix, "%s%s", db_name, sfx);
-    return dbsuffix;
-}
-
-static void
-decode_princ_key (datum *key, char *name, char *instance);
-
-static void
-decode_princ_key(datum *key, char *name, char *instance)
-{
-    strncpy(name, key->dptr, ANAME_SZ);
-    strncpy(instance, (char *)key->dptr + ANAME_SZ, INST_SZ);
-    name[ANAME_SZ - 1] = '\0';
-    instance[INST_SZ - 1] = '\0';
-}
-
-static void
-encode_princ_contents (datum *contents, Principal *principal);
-
-static void
-encode_princ_contents(datum *contents, Principal *principal)
-{
-    contents->dsize = sizeof(*principal);
-    contents->dptr = (char *) principal;
-}
-
-static void
-decode_princ_contents (datum *contents, Principal *principal)
-{
-    memcpy(principal, contents->dptr, sizeof(*principal));
-}
-
-static void
-encode_princ_key (datum *key, char *name, char *instance)
-{
-    static char keystring[ANAME_SZ + INST_SZ];
-
-    memset(keystring, 0, ANAME_SZ + INST_SZ);
-    strncpy(keystring, name, ANAME_SZ);
-    strncpy(&keystring[ANAME_SZ], instance, INST_SZ);
-    key->dptr = keystring;
-    key->dsize = ANAME_SZ + INST_SZ;
-}
-
-static int dblfd = -1;		/* db LOCK fd */
-static int mylock = 0;
-static int inited = 0;
-
-static int
-kerb_dbl_init (void);
-
-static int
-kerb_dbl_init()
-{
-    if (!inited) {
-	char *filename = gen_dbsuffix (current_db_name, ".ok");
-	if ((dblfd = open(filename, O_RDWR)) < 0) {
-	    fprintf(stderr, "kerb_dbl_init: couldn't open %s\n", filename);
-	    fflush(stderr);
-	    perror("open");
-	    exit(1);
-	}
-	free(filename);
-	inited++;
-    }
-    return (0);
-}
-
-static void
-kerb_dbl_fini (void);
-
-static void
-kerb_dbl_fini()
-{
-    close(dblfd);
-    dblfd = -1;
-    inited = 0;
-    mylock = 0;
-}
-
-static int
-kerb_dbl_lock (int mode);
-
-static int
-kerb_dbl_lock(int mode)
-{
-    int flock_mode;
-    
-    if (!inited)
-	kerb_dbl_init();
-    if (mylock) {		/* Detect lock call when lock already
-				 * locked */
-	fprintf(stderr, "Kerberos locking error (mylock)\n");
-	fflush(stderr);
-	exit(1);
-    }
-    switch (mode) {
-    case KERB_DBL_EXCLUSIVE:
-	flock_mode = K_LOCK_EX;
-	break;
-    case KERB_DBL_SHARED:
-	flock_mode = K_LOCK_SH;
-	break;
-    default:
-	fprintf(stderr, "invalid lock mode %d\n", mode);
-	abort();
-    }
-    if (non_blocking)
-	flock_mode |= K_LOCK_NB;
-    
-    if (k_flock(dblfd, flock_mode) < 0) 
-	return errno;
-    mylock++;
-    return 0;
-}
-
-static void kerb_dbl_unlock (void);
-
-static void
-kerb_dbl_unlock()
-{
-    if (!mylock) {		/* lock already unlocked */
-	fprintf(stderr, "Kerberos database lock not locked when unlocking.\n");
-	fflush(stderr);
-	exit(1);
-    }
-    if (k_flock(dblfd, K_LOCK_UN) < 0) {
-	fprintf(stderr, "Kerberos database lock error. (unlocking)\n");
-	fflush(stderr);
-	perror("k_flock");
-	exit(1);
-    }
-    mylock = 0;
-}
-
-int
-kerb_db_set_lockmode (int mode);
-
-int
-kerb_db_set_lockmode(int mode)
-{
-    int old = non_blocking;
-    non_blocking = mode;
-    return old;
-}
-
-/*
- * initialization for data base routines.
- */
-
-int
-kerb_db_init (void);
-
-int
-kerb_db_init()
-{
-    init = 1;
-    return (0);
-}
-
-/*
- * gracefully shut down database--must be called by ANY program that does
- * a kerb_db_init 
- */
-
-void
-kerb_db_fini (void);
-
-void
-kerb_db_fini()
-{
-}
-
-/*
- * Set the "name" of the current database to some alternate value.
- *
- * Passing a null pointer as "name" will set back to the default.
- * If the alternate database doesn't exist, nothing is changed.
- */
-
-int
-kerb_db_set_name (char *name);
-
-int
-kerb_db_set_name(char *name)
-{
-    DBM *db;
-
-    if (name == NULL)
-	name = default_db_name;
-    db = dbm_open(name, 0, 0);
-    if (db == NULL)
-	return errno;
-    dbm_close(db);
-    kerb_dbl_fini();
-    current_db_name = name;
-    return 0;
-}
-
-/*
- * Return the last modification time of the database.
- */
-
-time_t
-kerb_get_db_age (void);
-
-time_t
-kerb_get_db_age()
-{
-    struct stat st;
-    char *okname;
-    time_t age;
-    
-    okname = gen_dbsuffix(current_db_name, ".ok");
-
-    if (stat (okname, &st) < 0)
-	age = 0;
-    else
-	age = st.st_mtime;
-
-    free (okname);
-    return age;
-}
-
-/*
- * Remove the semaphore file; indicates that database is currently
- * under renovation.
- *
- * This is only for use when moving the database out from underneath
- * the server (for example, during slave updates).
- */
-
-static time_t
-kerb_start_update (char *db_name);
-
-static time_t
-kerb_start_update(char *db_name)
-{
-    char *okname = gen_dbsuffix(db_name, ".ok");
-    time_t age = kerb_get_db_age();
-    
-    if (unlink(okname) < 0
-	&& errno != ENOENT) {
-	    age = -1;
-    }
-    free (okname);
-    return age;
-}
-
-static int
-kerb_end_update (char *db_name, time_t age);
-
-static int
-kerb_end_update(char *db_name, time_t age)
-{
-    int fd;
-    int retval = 0;
-    char *new_okname = gen_dbsuffix(db_name, ".ok#");
-    char *okname = gen_dbsuffix(db_name, ".ok");
-    
-    fd = open (new_okname, O_CREAT|O_RDWR|O_TRUNC, 0600);
-    if (fd < 0)
-	retval = errno;
-    else {
-	struct stat st;
-	struct utimbuf tv;
-	/* make sure that semaphore is "after" previous value. */
-	if (fstat (fd, &st) == 0
-	    && st.st_mtime <= age) {
-	    tv.actime = st.st_atime;
-	    tv.modtime = age;
-	    /* set times.. */
-	    utime (new_okname, &tv);
-	    fsync(fd);
-	}
-	close(fd);
-	if (rename (new_okname, okname) < 0)
-	    retval = errno;
-    }
-
-    free (new_okname);
-    free (okname);
-
-    return retval;
-}
-
-static time_t
-kerb_start_read (void);
-
-static time_t
-kerb_start_read()
-{
-    return kerb_get_db_age();
-}
-
-static int kerb_end_read (time_t age);
-
-static int
-kerb_end_read(time_t age)
-{
-    if (kerb_get_db_age() != age || age == -1) {
-	return -1;
-    }
-    return 0;
-}
-
-/*
- * Create the database, assuming it's not there.
- */
-int
-kerb_db_create(char *db_name)
-{
-    char *okname = gen_dbsuffix(db_name, ".ok");
-    int fd;
-    int ret = 0;
-#ifdef NDBM
-    DBM *db;
-
-    db = dbm_open(db_name, O_RDWR|O_CREAT|O_EXCL, 0600);
-    if (db == NULL)
-	ret = errno;
-    else
-	dbm_close(db);
-#else
-    char *dirname = gen_dbsuffix(db_name, ".dir");
-    char *pagname = gen_dbsuffix(db_name, ".pag");
-
-    fd = open(dirname, O_RDWR|O_CREAT|O_EXCL, 0600);
-    if (fd < 0)
-	ret = errno;
-    else {
-	close(fd);
-	fd = open (pagname, O_RDWR|O_CREAT|O_EXCL, 0600);
-	if (fd < 0)
-	    ret = errno;
-	else
-	    close(fd);
-    }
-    if (dbminit(db_name) < 0)
-	ret = errno;
-#endif
-    if (ret == 0) {
-	fd = open (okname, O_CREAT|O_RDWR|O_TRUNC, 0600);
-	if (fd < 0)
-	    ret = errno;
-	close(fd);
-    }
-    return ret;
-}
-
-/*
- * "Atomically" rename the database in a way that locks out read
- * access in the middle of the rename.
- *
- * Not perfect; if we crash in the middle of an update, we don't
- * necessarily know to complete the transaction the rename, but...
- */
-
-int
-kerb_db_rename(char *from, char *to)
-{
-#ifdef HAVE_NEW_DB
-    char *fromdb = gen_dbsuffix (from, ".db");
-    char *todb = gen_dbsuffix (to, ".db");
-#else
-    char *fromdir = gen_dbsuffix (from, ".dir");
-    char *todir = gen_dbsuffix (to, ".dir");
-    char *frompag = gen_dbsuffix (from , ".pag");
-    char *topag = gen_dbsuffix (to, ".pag");
-#endif
-    char *fromok = gen_dbsuffix(from, ".ok");
-    long trans = kerb_start_update(to);
-    int ok = 0;
-    
-#ifdef HAVE_NEW_DB
-    if (rename (fromdb, todb) == 0) {
-	unlink (fromok);
-	ok = 1;
-    }
-    free (fromdb);
-    free (todb);
-#else
-    if ((rename (fromdir, todir) == 0)
-	&& (rename (frompag, topag) == 0)) {
-	unlink (fromok);
-	ok = 1;
-    }
-    free (fromdir);
-    free (todir);
-    free (frompag);
-    free (topag);
-#endif
-    free (fromok);
-    if (ok)
-	return kerb_end_update(to, trans);
-    else
-	return -1;
-}
-
-int
-kerb_db_delete_principal (char *name, char *inst)
-{
-    DBM *db;
-    int try;
-    int done = 0;
-    int code;
-    datum key;
-    
-    if(!init)
-	kerb_db_init();
-    
-    for(try = 0; try < KERB_DB_MAX_RETRY; try++){
-	if((code = kerb_dbl_lock(KERB_DBL_SHARED)) != 0)
-	    return -1;
-	
-	db = dbm_open(current_db_name, O_RDWR, 0600);
-	if(db == NULL)
-	    return -1;
-	encode_princ_key(&key, name, inst);
-	if(dbm_delete(db, key) == 0)
-	    done = 1;
-	
-	dbm_close(db);
-	kerb_dbl_unlock();
-	if(done)
-	    break;
-	if(!non_blocking)
-	    sleep(1);
-    }
-    if(!done)
-	return -1;
-    return 0;
-}
-
-
-/*
- * look up a principal in the data base returns number of principals
- * found , and whether there were more than requested. 
- */
-
-int
-kerb_db_get_principal (char *name, char *inst, Principal *principal, 
-		       unsigned int max, int *more)
-{
-    int     found = 0, code;
-    int     wildp, wildi;
-    datum   key, contents;
-    char    testname[ANAME_SZ], testinst[INST_SZ];
-    u_long trans;
-    int try;
-    DBM    *db;
-
-    if (!init)
-	kerb_db_init();		/* initialize database routines */
-
-    for (try = 0; try < KERB_DB_MAX_RETRY; try++) {
-	trans = kerb_start_read();
-
-	if ((code = kerb_dbl_lock(KERB_DBL_SHARED)) != 0)
-	    return -1;
-
-	db = dbm_open(current_db_name, O_RDONLY, 0600);
-
-	*more = 0;
-
-#ifdef DEBUG
-	if (kerb_debug & 2)
-	    fprintf(stderr,
-		    "%s: db_get_principal for %s %s max = %d",
-		    progname, name, inst, max);
-#endif
-
-	wildp = !strcmp(name, "*");
-	wildi = !strcmp(inst, "*");
-
-	if (!wildi && !wildp) {	/* nothing's wild */
-	    encode_princ_key(&key, name, inst);
-	    contents = dbm_fetch(db, key);
-	    if (contents.dptr == NULL) {
-		found = 0;
-		goto done;
-	    }
-	    decode_princ_contents(&contents, principal);
-#ifdef DEBUG
-	    if (kerb_debug & 1) {
-		fprintf(stderr, "\t found %s %s p_n length %d t_n length %d\n",
-			principal->name, principal->instance,
-			strlen(principal->name),
-			strlen(principal->instance));
-	    }
-#endif
-	    found = 1;
-	    goto done;
-	}
-	/* process wild cards by looping through entire database */
-
-	for (key = dbm_firstkey(db); key.dptr != NULL;
-	     key = dbm_next(db, key)) {
-	    decode_princ_key(&key, testname, testinst);
-	    if ((wildp || !strcmp(testname, name)) &&
-		(wildi || !strcmp(testinst, inst))) { /* have a match */
-		if (found >= max) {
-		    *more = 1;
-		    goto done;
-		} else {
-		    found++;
-		    contents = dbm_fetch(db, key);
-		    decode_princ_contents(&contents, principal);
-#ifdef DEBUG
-		    if (kerb_debug & 1) {
-			fprintf(stderr,
-				"\tfound %s %s p_n length %d t_n length %d\n",
-				principal->name, principal->instance,
-				strlen(principal->name),
-				strlen(principal->instance));
-		    }
-#endif
-		    principal++; /* point to next */
-		}
-	    }
-	}
-
-    done:
-	kerb_dbl_unlock();	/* unlock read lock */
-	dbm_close(db);
-	if (kerb_end_read(trans) == 0)
-	    break;
-	found = -1;
-	if (!non_blocking)
-	    sleep(1);
-    }
-    return (found);
-}
-
-/* Use long * rather than DBM * so that the database structure is private */
-
-long *
-kerb_db_begin_update(void)
-{
-    int code;
-
-    gettimeofday(&timestamp, NULL);
-
-    if (!init)
-	kerb_db_init();
-
-    if ((code = kerb_dbl_lock(KERB_DBL_EXCLUSIVE)) != 0)
-	return 0;
-
-    return (long *) dbm_open(current_db_name, O_RDWR, 0600);
-}
-
-void
-kerb_db_end_update(long *db)
-{
-    dbm_close((DBM *)db);
-    kerb_dbl_unlock();		/* unlock database */
-}
-
-int
-kerb_db_update(long *db, Principal *principal, unsigned int max)
-{
-    int     found = 0;
-    u_long  i;
-    datum   key, contents;
-
-#ifdef DEBUG
-    if (kerb_debug & 2)
-	fprintf(stderr, "%s: kerb_db_put_principal  max = %d",
-	    progname, max);
-#endif
-
-    /* for each one, stuff temps, and do replace/append */
-    for (i = 0; i < max; i++) {
-	encode_princ_contents(&contents, principal);
-	encode_princ_key(&key, principal->name, principal->instance);
-	dbm_store((DBM *)db, key, contents, DBM_REPLACE);
-#ifdef DEBUG
-	if (kerb_debug & 1) {
-	    fprintf(stderr, "\n put %s %s\n",
-		principal->name, principal->instance);
-	}
-#endif
-	found++;
-	principal++;		/* bump to next struct			   */
-    }
-    return found;
-}
-
-/*
- * Update a name in the data base.  Returns number of names
- * successfully updated.
- */
-
-int
-kerb_db_put_principal (Principal *principal, unsigned int max);
-
-int
-kerb_db_put_principal(Principal *principal,
-		      unsigned max)
-
-{
-    int found;
-    long    *db;
-
-    db = kerb_db_begin_update();
-    if (db == 0)
-	return -1;
-
-    found = kerb_db_update(db, principal, max);
-
-    kerb_db_end_update(db);
-    return (found);
-}
-
-void
-kerb_db_get_stat (DB_stat *s);
-
-void
-kerb_db_get_stat(DB_stat *s)
-{
-    gettimeofday(&timestamp, NULL);
-
-    s->cpu = 0;
-    s->elapsed = 0;
-    s->dio = 0;
-    s->pfault = 0;
-    s->t_stamp = timestamp.tv_sec;
-    s->n_retrieve = 0;
-    s->n_replace = 0;
-    s->n_append = 0;
-    s->n_get_stat = 0;
-    s->n_put_stat = 0;
-    /* update local copy too */
-}
-
-void
-kerb_db_put_stat (DB_stat *s);
-
-void
-kerb_db_put_stat(DB_stat *s)
-{
-}
-
-void
-delta_stat (DB_stat *a, DB_stat *b, DB_stat *c);
-
-void
-delta_stat(DB_stat *a, DB_stat *b, DB_stat *c)
-{
-    /* c = a - b then b = a for the next time */
-
-    c->cpu = a->cpu - b->cpu;
-    c->elapsed = a->elapsed - b->elapsed;
-    c->dio = a->dio - b->dio;
-    c->pfault = a->pfault - b->pfault;
-    c->t_stamp = a->t_stamp - b->t_stamp;
-    c->n_retrieve = a->n_retrieve - b->n_retrieve;
-    c->n_replace = a->n_replace - b->n_replace;
-    c->n_append = a->n_append - b->n_append;
-    c->n_get_stat = a->n_get_stat - b->n_get_stat;
-    c->n_put_stat = a->n_put_stat - b->n_put_stat;
-
-    memcpy(b, a, sizeof(DB_stat));
-    return;
-}
-
-/*
- * look up a dba in the data base returns number of dbas found , and
- * whether there were more than requested. 
- */
-
-int
-kerb_db_get_dba (char *dba_name, char *dba_inst, Dba *dba, unsigned int max, int *more);
-
-int
-kerb_db_get_dba(char *dba_name, char *dba_inst, Dba *dba,
-		unsigned max,
-		int *more)
-		/* could have wild card */
-		/* could have wild card */
-		/* max number of name structs to return */
-		/* where there more than 'max' tuples? */
-{
-    *more = 0;
-    return (0);
-}
-
-int
-kerb_db_iterate (k_iter_proc_t func, void *arg)
-{
-    datum key, contents;
-    Principal *principal;
-    int code;
-    DBM *db;
-    
-    kerb_db_init();		/* initialize and open the database */
-    if ((code = kerb_dbl_lock(KERB_DBL_SHARED)) != 0)
-	return code;
-
-    db = dbm_open(current_db_name, O_RDONLY, 0600);
-
-    for (key = dbm_firstkey (db); key.dptr != NULL; key = dbm_next(db, key)) {
-	contents = dbm_fetch (db, key);
-	/* XXX may not be properly aligned */
-	principal = (Principal *) contents.dptr;
-	if ((code = (*func)(arg, principal)) != 0)
-	    return code;
-    }
-    dbm_close(db);
-    kerb_dbl_unlock();
-    return 0;
-}
diff --git a/crypto/kerberosIV/lib/kdb/krb_kdb_utils.c b/crypto/kerberosIV/lib/kdb/krb_kdb_utils.c
deleted file mode 100644
index f321e9f710b7..000000000000
--- a/crypto/kerberosIV/lib/kdb/krb_kdb_utils.c
+++ /dev/null
@@ -1,261 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-/*
- * Utility routines for Kerberos programs which directly access
- * the database.  This code was duplicated in too many places
- * before I gathered it here.
- *
- * Jon Rochlis, MIT Telecom, March 1988
- */
-
-#include "kdb_locl.h"
-
-#include <kdc.h>
-
-RCSID("$Id: krb_kdb_utils.c,v 1.23 1997/05/02 14:29:10 assar Exp $");
-
-/* always try /.k for backwards compatibility */
-static char *master_key_files[] = { MKEYFILE, "/.k", NULL };
-
-#ifdef HAVE_STRERROR
-#define k_strerror(e) strerror(e)
-#else
-static
-char *
-k_strerror(int eno)
-{
-  extern int sys_nerr;
-  extern char *sys_errlist[];
-
-  static char emsg[128];
-
-  if (eno < 0 || eno >= sys_nerr)
-    snprintf(emsg, sizeof(emsg), "Error %d occurred.", eno);
-  else
-    return sys_errlist[eno];
-
-  return emsg;
-}
-#endif
-
-int
-kdb_new_get_master_key(des_cblock *key, des_key_schedule schedule)
-{
-  int kfile;
-  int i;
-  char buf[1024];
-
-  char **mkey;
-
-  for(mkey = master_key_files; *mkey; mkey++){
-      kfile = open(*mkey, O_RDONLY);
-      if(kfile < 0 && errno != ENOENT)
-	  fprintf(stderr, "Failed to open master key file \"%s\": %s\n", 
-		  *mkey,
-		  k_strerror(errno));
-      if(kfile >= 0)
-	  break;
-  }
-  if(*mkey){
-      int bytes;
-      bytes = read(kfile, (char*)key, sizeof(des_cblock));
-      close(kfile);
-      if(bytes == sizeof(des_cblock)){
-	  des_key_sched(key, schedule);
-	  return 0;
-      }
-      fprintf(stderr, "Could only read %d bytes from master key file %s\n", 
-	      bytes, *mkey);
-  }else{
-      fprintf(stderr, "No master key file found.\n");
-  }
-
-  
-  i=0;
-  while(i < 3){
-      if(des_read_pw_string(buf, sizeof(buf), "Enter master password: ", 0))
-	  break;
-
-      /* buffer now contains either an old format master key password or a
-       * new format base64 encoded master key
-       */
-      
-      /* try to verify as old password */
-      des_string_to_key(buf, key);
-      des_key_sched(key, schedule);
-      
-      if(kdb_verify_master_key(key, schedule, NULL) != -1){
-	  memset(buf, 0, sizeof(buf));
-	  return 0;
-      }
-      
-      /* failed test, so must be base64 encoded */
-      
-      if(base64_decode(buf, key) == 8){
-	  des_key_sched(key, schedule);
-	  if(kdb_verify_master_key(key, schedule, NULL) != -1){
-	      memset(buf, 0, sizeof(buf));
-	      return 0;
-	  }
-      }
-      
-      memset(buf, 0, sizeof(buf));
-      fprintf(stderr, "Failed to verify master key.\n");
-      i++;
-  }
-  
-  /* life sucks */
-  fprintf(stderr, "You loose.\n");
-  exit(1);
-}
-
-int kdb_new_get_new_master_key(des_cblock *key, des_key_schedule schedule, 
-			       int verify)
-{
-#ifndef RANDOM_MKEY
-  des_read_password(key, "\nEnter Kerberos master password: ", verify);
-  printf ("\n");
-#else
-  char buf[1024];
-  des_generate_random_block (key);
-  des_key_sched(key, schedule);
-  
-  des_read_pw_string(buf, sizeof(buf), "Enter master key seed: ", 0);
-  des_cbc_cksum((des_cblock*)buf, key, sizeof(buf), schedule, key);
-  memset(buf, 0, sizeof(buf));
-#endif
-  des_key_sched(key, schedule);
-  return 0;
-}
-
-int kdb_get_master_key(int prompt, des_cblock *master_key, 
-		       des_key_schedule master_key_sched)
-{
-  int ask = (prompt == KDB_GET_TWICE);
-#ifndef RANDOM_MKEY
-  ask |= (prompt == KDB_GET_PROMPT);
-#endif
-  
-  if(ask)
-    kdb_new_get_new_master_key(master_key, master_key_sched, 
-			       prompt == KDB_GET_TWICE);
-  else
-    kdb_new_get_master_key(master_key, master_key_sched);
-  return 0;
-}
-
-int kdb_kstash(des_cblock *master_key, char *file)
-{
-  int kfile;
-  kfile = open(file, O_TRUNC | O_RDWR | O_CREAT, 0600);
-  if (kfile < 0) {
-    return -1;
-  }
-  if (write(kfile, master_key, sizeof(des_cblock)) != sizeof(des_cblock)) {
-    close(kfile);
-    return -1;
-  }
-  close(kfile);
-  return 0;
-}
-
-/* The old algorithm used the key schedule as the initial vector which
-   was byte order depedent ... */
-
-void
-kdb_encrypt_key (des_cblock (*in), des_cblock (*out),
-		 des_cblock (*master_key),
-		 des_key_schedule master_key_sched, int e_d_flag)
-{
-
-#ifdef NOENCRYPTION
-  memcpy(out, in, sizeof(des_cblock));
-#else
-  des_pcbc_encrypt(in,out,(long)sizeof(des_cblock),master_key_sched,master_key,
- 	e_d_flag);
-#endif
-}
-
-/* The caller is reasponsible for cleaning up the master key and sched,
-   even if we can't verify the master key */
-
-/* Returns master key version if successful, otherwise -1 */
-
-long 
-kdb_verify_master_key (des_cblock *master_key,
-		       des_key_schedule master_key_sched,
-		       FILE *out) /* NULL -> no output */
-{
-  des_cblock key_from_db;
-  Principal principal_data[1];
-  int n, more = 0;
-  long master_key_version;
-
-  /* lookup the master key version */
-  n = kerb_get_principal(KERB_M_NAME, KERB_M_INST, principal_data,
-			 1 /* only one please */, &more);
-  if ((n != 1) || more) {
-    if (out != (FILE *) NULL) 
-      fprintf(out,
-	      "verify_master_key: %s, %d found.\n",
-	      "Kerberos error on master key version lookup",
-	      n);
-    return (-1);
-  }
-
-  master_key_version = (long) principal_data[0].key_version;
-
-  /* set up the master key */
-  if (out != (FILE *) NULL)  /* should we punt this? */
-    fprintf(out, "Current Kerberos master key version is %d.\n",
-	    principal_data[0].kdc_key_ver);
-
-  /*
-   * now use the master key to decrypt the key in the db, had better
-   * be the same! 
-   */
-  copy_to_key(&principal_data[0].key_low,
-	      &principal_data[0].key_high,
-	      key_from_db);
-  kdb_encrypt_key (&key_from_db, &key_from_db, 
-		   master_key, master_key_sched, DES_DECRYPT);
-
-  /* the decrypted database key had better equal the master key */
-  n = memcmp(master_key, key_from_db, sizeof(master_key));
-  /* this used to zero the master key here! */
-  memset(key_from_db, 0, sizeof(key_from_db));
-  memset(principal_data, 0, sizeof (principal_data));
-
-  if (n && (out != (FILE *) NULL)) {
-    fprintf(out, "\n\07\07verify_master_key: Invalid master key; ");
-    fprintf(out, "does not match database.\n");
-  }
-  if(n)
-    return (-1);
-
-  if (out != (FILE *) NULL) {
-    fprintf(out, "\nMaster key entered.  BEWARE!\07\07\n");
-    fflush(out);
-  }
-
-  return (master_key_version);
-}
diff --git a/crypto/kerberosIV/lib/kdb/krb_lib.c b/crypto/kerberosIV/lib/kdb/krb_lib.c
deleted file mode 100644
index 19bf3168ac19..000000000000
--- a/crypto/kerberosIV/lib/kdb/krb_lib.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-#include "kdb_locl.h"
-
-RCSID("$Id: krb_lib.c,v 1.11 1997/05/07 01:36:08 assar Exp $");
-
-#ifdef DEBUG
-extern int debug;
-extern char *progname;
-long    kerb_debug;
-#endif
-
-static int init = 0;
-
-/*
- * initialization routine for data base 
- */
-
-int
-kerb_init(void)
-{
-#ifdef DEBUG
-    if (!init) {
-	char *dbg = getenv("KERB_DBG");
-	if (dbg)
-	    sscanf(dbg, "%d", &kerb_debug);
-	init = 1;
-    }
-#endif
-    kerb_db_init();
-
-#ifdef CACHE
-    kerb_cache_init();
-#endif
-
-    /* successful init, return 0, else errcode */
-    return (0);
-}
-
-/*
- * finalization routine for database -- NOTE: MUST be called by any
- * program using kerb_init.  ALSO will have to be modified to finalize
- * caches, if they're ever really implemented. 
- */
-
-void
-kerb_fini(void)
-{
-    kerb_db_fini();
-}
-
-
-int
-kerb_delete_principal(char *name, char *inst)
-{
-    int ret;
-    
-    if (!init)
-	kerb_init();
-
-    ret = kerb_db_delete_principal(name, inst);
-#ifdef CACHE
-    if(ret == 0){
-	kerb_cache_delete_principal(name, inst);
-    }
-#endif
-    return ret;
-}
-
-
-/*
- * look up a principal in the cache or data base returns number of
- * principals found 
- */
-
-int
-kerb_get_principal(char *name, char *inst, Principal *principal,
-		   unsigned int max, int *more)
-                 		/* could have wild card */
-                 		/* could have wild card */
-                         
-                     		/* max number of name structs to return */
-                 		/* more tuples than room for */
-
-{
-    int     found = 0;
-#ifdef CACHE
-    static int wild = 0;
-#endif
-    if (!init)
-	kerb_init();
-
-#ifdef DEBUG
-    if (kerb_debug & 1)
-	fprintf(stderr, "\n%s: kerb_get_principal for %s %s max = %d\n",
-	    progname, name, inst, max);
-#endif
-    
-    /*
-     * if this is a request including a wild card, have to go to db
-     * since the cache may not be exhaustive. 
-     */
-
-    /* clear the principal area */
-    memset(principal, 0, max * sizeof(Principal));
-
-#ifdef CACHE
-    /*
-     * so check to see if the name contains a wildcard "*" or "?", not
-     * preceeded by a backslash. 
-     */
-    wild = 0;
-    if (index(name, '*') || index(name, '?') ||
-	index(inst, '*') || index(inst, '?'))
-	wild = 1;
-
-    if (!wild) {
-	/* try the cache first */
-	found = kerb_cache_get_principal(name, inst, principal, max, more);
-	if (found)
-	    return (found);
-    }
-#endif
-    /* If we didn't try cache, or it wasn't there, try db */
-    found = kerb_db_get_principal(name, inst, principal, max, more);
-    /* try to insert principal(s) into cache if it was found */
-#ifdef CACHE
-    if (found) {
-	kerb_cache_put_principal(principal, found);
-    }
-#endif
-    return (found);
-}
-
-/* principals */
-int
-kerb_put_principal(Principal *principal, unsigned int n)
-                         
-                   		/* number of principal structs to write */
-{
-    struct tm *tp;
-
-    /* set mod date */
-    principal->mod_date = time((time_t *)0);
-    /* and mod date string */
-
-    tp = k_localtime(&principal->mod_date);
-    snprintf(principal->mod_date_txt,
-	     sizeof(principal->mod_date_txt),
-	     "%4d-%2d-%2d",
-	     tp->tm_year + 1900,
-	     tp->tm_mon + 1, tp->tm_mday); /* January is 0, not 1 */
-#ifdef DEBUG
-    if (kerb_debug & 1) {
-	int i;
-	fprintf(stderr, "\nkerb_put_principal...");
-	for (i = 0; i < n; i++) {
-	    krb_print_principal(&principal[i]);
-	}
-    }
-#endif
-    /* write database */
-    if (kerb_db_put_principal(principal, n) < 0) {
-#ifdef DEBUG
-	if (kerb_debug & 1)
-	    fprintf(stderr, "\n%s: kerb_db_put_principal err", progname);
-	/* watch out for cache */
-#endif
-	return -1;
-    }
-#ifdef CACHE
-    /* write cache */
-    if (!kerb_cache_put_principal(principal, n)) {
-#ifdef DEBUG
-	if (kerb_debug & 1)
-	    fprintf(stderr, "\n%s: kerb_cache_put_principal err", progname);
-#endif
-	return -1;
-    }
-#endif
-    return 0;
-}
-
-int
-kerb_get_dba(char *name, char *inst, Dba *dba, unsigned int max, int *more)
-                 		/* could have wild card */
-                 		/* could have wild card */
-                
-                     		/* max number of name structs to return */
-                 		/* more tuples than room for */
-
-{
-    int     found = 0;
-#ifdef CACHE
-    static int wild = 0;
-#endif
-    if (!init)
-	kerb_init();
-
-#ifdef DEBUG
-    if (kerb_debug & 1)
-	fprintf(stderr, "\n%s: kerb_get_dba for %s %s max = %d\n",
-	    progname, name, inst, max);
-#endif
-    /*
-     * if this is a request including a wild card, have to go to db
-     * since the cache may not be exhaustive. 
-     */
-
-    /* clear the dba area */
-    memset(dba, 0, max * sizeof(Dba));
-
-#ifdef CACHE
-    /*
-     * so check to see if the name contains a wildcard "*" or "?", not
-     * preceeded by a backslash. 
-     */
-
-    wild = 0;
-    if (index(name, '*') || index(name, '?') ||
-	index(inst, '*') || index(inst, '?'))
-	wild = 1;
-
-    if (!wild) {
-	/* try the cache first */
-	found = kerb_cache_get_dba(name, inst, dba, max, more);
-	if (found)
-	    return (found);
-    }
-#endif
-    /* If we didn't try cache, or it wasn't there, try db */
-    found = kerb_db_get_dba(name, inst, dba, max, more);
-#ifdef CACHE
-    /* try to insert dba(s) into cache if it was found */
-    if (found) {
-	kerb_cache_put_dba(dba, found);
-    }
-#endif
-    return (found);
-}
diff --git a/crypto/kerberosIV/lib/kdb/print_princ.c b/crypto/kerberosIV/lib/kdb/print_princ.c
deleted file mode 100644
index 786c5a93a218..000000000000
--- a/crypto/kerberosIV/lib/kdb/print_princ.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-#include "kdb_locl.h"
-
-RCSID("$Id: print_princ.c,v 1.5 1997/05/07 01:37:13 assar Exp $");
-
-void
-krb_print_principal(Principal *a_n)
-{
-    struct tm *time_p;
-
-    /* run-time database does not contain string versions */
-    time_p = k_localtime(&(a_n->exp_date));
-
-    fprintf(stderr,
-    "\n%s %s expires %4d-%2d-%2d %2d:%2d, max_life %d*5 = %d min  attr 0x%02x",
-    a_n->name, a_n->instance,
-    time_p->tm_year + 1900,
-    time_p->tm_mon + 1, time_p->tm_mday,
-    time_p->tm_hour, time_p->tm_min,
-    a_n->max_life, 5 * a_n->max_life, a_n->attributes);
-
-    fprintf(stderr,
-    "\n\tkey_ver %d  k_low 0x%08lx  k_high 0x%08lx  akv %d  exists %ld\n",
-    a_n->key_version, (long)a_n->key_low, (long)a_n->key_high,
-    a_n->kdc_key_ver, (long)a_n->old);
-
-    fflush(stderr);
-}
diff --git a/crypto/kerberosIV/lib/krb/Makefile.in b/crypto/kerberosIV/lib/krb/Makefile.in
deleted file mode 100644
index 8b34d651e86c..000000000000
--- a/crypto/kerberosIV/lib/krb/Makefile.in
+++ /dev/null
@@ -1,269 +0,0 @@
-#
-# $Id: Makefile.in,v 1.74 1997/05/19 03:03:05 assar Exp $
-#
-
-# Under SunOS-5.x it is necessary to link with -ldes to be binary compatible.
-LIBDES=`test -r /usr/lib/libkrb.so.1 && echo "-lresolv -L../des -ldes"; true`
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-CC = @CC@
-AR = ar
-RANLIB = @RANLIB@
-LN_S = @LN_S@
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-LD_FLAGS = @LD_FLAGS@
-EXECSUFFIX=@EXECSUFFIX@
-
-INSTALL = @INSTALL@
-INSTALL_DATA	= @INSTALL_DATA@
-MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
-
-COMPILE_ET = ../../util/et/compile_et$(EXECSUFFIX) -language ansi-c 
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-libdir = @libdir@
-
-PICFLAGS = @PICFLAGS@
- 
-PROGS = sizetest$(EXEC_SUFFIX)
-LIBNAME = $(LIBPREFIX)krb
-LIBEXT = @LIBEXT@
-SHLIBEXT = @SHLIBEXT@
-LIBPREFIX = @LIBPREFIX@
-LDSHARED = @LDSHARED@
-LIB = $(LIBNAME).$(LIBEXT)
-
-SOURCES = cr_err_reply.c \
-          create_auth_reply.c \
-          create_ciph.c \
-          create_death_packet.c \
-          create_ticket.c \
-          dest_tkt.c \
-          get_in_tkt.c \
-          get_svc_in_tkt.c \
-          getrealm.c \
-          k_localtime.c \
-          krb_err_txt.c \
-          krb_get_in_tkt.c \
-          kuserok.c \
-	  parse_name.c \
-          kntoln.c \
-	  mk_auth.c \
-	  krb_check_auth.c \
-          mk_err.c \
-          mk_safe.c \
-          rd_err.c \
-          rd_safe.c \
-          recvauth.c \
-          mk_priv.c \
-          rd_req.c \
-          decomp_ticket.c \
-          lifetime.c \
-          month_sname.c \
-	  stime.c \
-          read_service_key.c \
-          getst.c \
-          sendauth.c \
-          netread.c \
-          netwrite.c \
-          rd_priv.c \
-          krb_equiv.c \
-          str2key.c \
-          get_ad_tkt.c \
-          mk_req.c \
-          get_cred.c \
-          get_tf_realm.c \
-          get_tf_fullname.c \
-          one.c \
-          save_credentials.c \
-          send_to_kdc.c \
-	  get_host.c \
-          get_krbrlm.c \
-          k_gethostname.c \
-          tf_util.c \
-          debug_decl.c \
-          k_flock.c \
-          tkt_string.c \
-          getaddrs.c \
-          k_getsockinst.c \
-	  k_getport.c \
-	  lsb_addr_comp.c \
-	  name2name.c \
-	  get_default_principal.c \
-	  realm_parse.c \
-	  verify_user.c \
-	  rw.c \
-	  kdc_reply.c \
-	  encrypt_ktext.c \
-	  swab.c \
-	  gettimeofday.c \
-	  check_time.c \
-	  krb_err.c \
-	  et_list.c \
-	  resolve.c \
-	  unparse_name.c \
-	  logging.c \
-	  k_concat.c
-
-#	  these files reside in ../roken
-#	  snprintf.c \
-#	  strdup.c \
-#	  strtok_r.c \
-#	  strcasecmp.c
-
-OBJECTS = cr_err_reply.o \
-          create_auth_reply.o \
-          create_ciph.o \
-          create_death_packet.o \
-          create_ticket.o \
-          dest_tkt.o \
-          get_in_tkt.o \
-          get_svc_in_tkt.o \
-          getrealm.o \
-          k_localtime.o \
-          krb_err_txt.o \
-          krb_get_in_tkt.o \
-          kuserok.o \
-	  parse_name.o \
-          kntoln.o \
-	  mk_auth.o \
-	  krb_check_auth.o \
-          mk_err.o \
-          mk_safe.o \
-          rd_err.o \
-          rd_safe.o \
-          recvauth.o \
-          mk_priv.o \
-          rd_req.o \
-          decomp_ticket.o \
-          lifetime.o \
-          month_sname.o \
-	  stime.o \
-          read_service_key.o \
-          getst.o \
-          sendauth.o \
-          netread.o \
-          netwrite.o \
-          rd_priv.o \
-          krb_equiv.o \
-          str2key.o \
-          get_ad_tkt.o \
-          mk_req.o \
-          get_cred.o \
-          get_tf_realm.o \
-          get_tf_fullname.o \
-          one.o \
-          save_credentials.o \
-          send_to_kdc.o \
-	  get_host.o \
-          get_krbrlm.o \
-          k_gethostname.o \
-          tf_util.o \
-          debug_decl.o \
-          k_flock.o \
-          tkt_string.o \
-          getaddrs.o \
-          k_getsockinst.o \
-	  k_getport.o \
-	  lsb_addr_comp.o \
-	  name2name.o \
-	  get_default_principal.o \
-	  realm_parse.o \
-	  verify_user.o \
-	  rw.o \
-	  kdc_reply.o \
-	  encrypt_ktext.o \
-	  swab.o \
-	  gettimeofday.o \
-	  check_time.o \
-	  krb_err.o \
-	  resolve.o \
-	  unparse_name.o \
-	  logging.o \
-	  k_concat.o \
-	  snprintf.o \
-	  strdup.o \
-	  strtok_r.o \
-	  strcasecmp.o
-
-# This is only needed by some shared library implementations
-LDOBJ = et_list.o
-
-all: $(LIB) $(PROGS)
-
-Wall:
-		make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $<
-
-install: all
-	$(MKINSTALLDIRS) $(libdir)
-	$(INSTALL_DATA) -m 0555 $(LIB) $(libdir)
-
-uninstall:
-	rm -f $(libdir)/$(LIB)
-
-TAGS: $(SOURCES)
-	etags $(SOURCES)
-
-sizetest.o: sizetest.c
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $<
-
-sizetest$(EXECSUFFIX): sizetest.o
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ sizetest.o
-
-check: sizetest$(EXECSUFFIX)
-	./sizetest$(EXECSUFFIX)
-
-clean:
-	rm -f $(LIB) *.o *.a krb_err.c krb_err.h $(PROGS) 
-
-mostlyclean: clean
-
-distclean: clean
-	rm -f Makefile *.tab.c *~
-
-realclean: distclean
-	rm -f TAGS
-
-dist: $(DISTFILES)
-	for file in $(DISTFILES); do \
-	  ln $$file ../`cat ../.fname`/lib \
-	    || cp -p $$file ../`cat ../.fname`/lib; \
-	done
-
-$(LIBNAME).a: $(OBJECTS)
-	rm -f $@
-	$(AR) cr $@ $(OBJECTS)
-	-$(RANLIB) $@
-
-$(LIBNAME).$(SHLIBEXT): $(OBJECTS) $(LDOBJ)
-	rm -f $@
-	$(LDSHARED) -o $@ $(OBJECTS) $(LDOBJ) $(LIBDES)
-
-krb_err.c krb_err.h: krb_err.et
-	test -r krb_err.et || (rm -f krb_err.et && $(LN_S) $(srcdir)/krb_err.et .)
-	$(COMPILE_ET) krb_err.et
-
-snprintf.c:
-	$(LN_S) $(srcdir)/../roken/snprintf.c .
-
-strdup.c:
-	$(LN_S) $(srcdir)/../roken/strdup.c .
-
-strtok_r.c:
-	$(LN_S) $(srcdir)/../roken/strtok_r.c .
-
-strcasecmp.c:
-	$(LN_S) $(srcdir)/../roken/strcasecmp.c .
-
-$(OBJECTS): ../../include/config.h
-$(OBJECTS): krb_locl.h krb.h krb_err.h
-one.o: ../../include/version.h
diff --git a/crypto/kerberosIV/lib/krb/check_time.c b/crypto/kerberosIV/lib/krb/check_time.c
deleted file mode 100644
index 3c3e6c0730b9..000000000000
--- a/crypto/kerberosIV/lib/krb/check_time.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan 
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: check_time.c,v 1.4 1997/04/01 08:18:18 joda Exp $");
-
-int
-krb_check_tm (struct tm tm)
-{
-     return  tm.tm_mon < 0
-	  || tm.tm_mon > 11
-	  || tm.tm_hour < 0
-	  || tm.tm_hour > 23
-	  || tm.tm_min < 0
-	  || tm.tm_min > 59
-	  || tm.tm_sec < 0
-	  || tm.tm_sec > 59
-	  || tm.tm_year < 1901
-	  || tm.tm_year > 2038;
-}
diff --git a/crypto/kerberosIV/lib/krb/cr_err_reply.c b/crypto/kerberosIV/lib/krb/cr_err_reply.c
deleted file mode 100644
index 2c1956af97d5..000000000000
--- a/crypto/kerberosIV/lib/krb/cr_err_reply.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: cr_err_reply.c,v 1.9 1997/04/01 08:18:19 joda Exp $");
-
-/*
- * This routine is used by the Kerberos authentication server to
- * create an error reply packet to send back to its client.
- *
- * It takes a pointer to the packet to be built, the name, instance,
- * and realm of the principal, the client's timestamp, an error code
- * and an error string as arguments.  Its return value is undefined.
- *
- * The packet is built in the following format:
- * 
- * type			variable	   data
- *			or constant
- * ----			-----------	   ----
- *
- * unsigned char	req_ack_vno	   protocol version number
- * 
- * unsigned char	AUTH_MSG_ERR_REPLY protocol message type
- * 
- * [least significant	HOST_BYTE_ORDER	   sender's (server's) byte
- * bit of above field]			   order
- * 
- * string		pname		   principal's name
- * 
- * string		pinst		   principal's instance
- * 
- * string		prealm		   principal's realm
- * 
- * unsigned long	time_ws		   client's timestamp
- * 
- * unsigned long	e		   error code
- * 
- * string		e_string	   error text
- */
-
-void
-cr_err_reply(KTEXT pkt, char *pname, char *pinst, char *prealm, 
-	     u_int32_t time_ws, u_int32_t e, char *e_string)
-{
-    unsigned char *p = pkt->dat;
-    
-    p += krb_put_int(KRB_PROT_VERSION, p, 1);
-    p += krb_put_int(AUTH_MSG_ERR_REPLY, p, 1);
-
-    if (pname == NULL) pname = "";
-    if (pinst == NULL) pinst = "";
-    if (prealm == NULL) prealm = "";
-
-    p += krb_put_nir(pname, pinst, prealm, p);
-    
-    p += krb_put_int(time_ws, p, 4);
-
-    p += krb_put_int(e, p, 4);
-
-    p += krb_put_string(e_string, p);
-
-    pkt->length = p - pkt->dat;
-}
diff --git a/crypto/kerberosIV/lib/krb/create_auth_reply.c b/crypto/kerberosIV/lib/krb/create_auth_reply.c
deleted file mode 100644
index 4976c464b8d6..000000000000
--- a/crypto/kerberosIV/lib/krb/create_auth_reply.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: create_auth_reply.c,v 1.11 1997/04/01 08:18:20 joda Exp $");
-
-/*
- * This routine is called by the Kerberos authentication server
- * to create a reply to an authentication request.  The routine
- * takes the user's name, instance, and realm, the client's
- * timestamp, the number of tickets, the user's key version
- * number and the ciphertext containing the tickets themselves.
- * It constructs a packet and returns a pointer to it.
- *
- * Notes: The packet returned by this routine is static.  Thus, if you
- * intend to keep the result beyond the next call to this routine, you
- * must copy it elsewhere.
- *
- * The packet is built in the following format:
- * 
- * 			variable
- * type			or constant	   data
- * ----			-----------	   ----
- * 
- * unsigned char	KRB_PROT_VERSION   protocol version number
- * 
- * unsigned char	AUTH_MSG_KDC_REPLY protocol message type
- * 
- * [least significant	HOST_BYTE_ORDER	   sender's (server's) byte
- *  bit of above field]			   order
- * 
- * string		pname		   principal's name
- * 
- * string		pinst		   principal's instance
- * 
- * string		prealm		   principal's realm
- * 
- * unsigned long	time_ws		   client's timestamp
- * 
- * unsigned char	n		   number of tickets
- * 
- * unsigned long	x_date		   expiration date
- * 
- * unsigned char	kvno		   master key version
- * 
- * short		w_1		   cipher length
- * 
- * ---			cipher->dat	   cipher data
- */
-
-KTEXT
-create_auth_reply(char *pname,	/* Principal's name */
-		  char *pinst,	/* Principal's instance */
-		  char *prealm,	/* Principal's authentication domain */
-		  int32_t time_ws, /* Workstation time */
-		  int n,	/* Number of tickets */
-		  u_int32_t x_date, /* Principal's expiration date */
-		  int kvno,	/* Principal's key version number */
-		  KTEXT cipher)	/* Cipher text with tickets and session keys */
-{
-    static  KTEXT_ST pkt_st;
-    KTEXT pkt = &pkt_st;
-    
-    unsigned char *p = pkt->dat;
-
-    p += krb_put_int(KRB_PROT_VERSION, p, 1);
-    p += krb_put_int(AUTH_MSG_KDC_REPLY, p, 1);
-
-    if(n != 0){
-	/* barf on old code */
-	krb_warning("create_auth_reply: don't give me no krb3 crap!"
-		    " (n == %d)\n", n);
-	return NULL;
-    }
-
-
-    p += krb_put_nir(pname, pinst, prealm, p);
-
-    p += krb_put_int(time_ws, p, 4);
-    
-    p += krb_put_int(n, p, 1);
-    
-    p += krb_put_int(x_date, p, 4);
-    
-    p += krb_put_int(kvno, p, 1);
-    
-    p += krb_put_int(cipher->length, p, 2);
-    
-    memcpy(p, cipher->dat, cipher->length);
-    p += cipher->length;
-
-    pkt->length = p - pkt->dat;
-
-    return pkt;
-}
diff --git a/crypto/kerberosIV/lib/krb/create_ciph.c b/crypto/kerberosIV/lib/krb/create_ciph.c
deleted file mode 100644
index 27d27ff604ea..000000000000
--- a/crypto/kerberosIV/lib/krb/create_ciph.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: create_ciph.c,v 1.9 1997/04/01 08:18:20 joda Exp $");
-
-/*
- * This routine is used by the authentication server to create
- * a packet for its client, containing a ticket for the requested
- * service (given in "tkt"), and some information about the ticket,
- *
- * Returns KSUCCESS no matter what.
- *
- * The length of the cipher is stored in c->length; the format of
- * c->dat is as follows:
- *
- * 			variable
- * type			or constant	   data
- * ----			-----------	   ----
- * 
- * 
- * 8 bytes		session		session key for client, service
- * 
- * string		service		service name
- * 
- * string		instance	service instance
- * 
- * string		realm		KDC realm
- * 
- * unsigned char	life		ticket lifetime
- * 
- * unsigned char	kvno		service key version number
- * 
- * unsigned char	tkt->length	length of following ticket
- * 
- * data			tkt->dat	ticket for service
- * 
- * 4 bytes		kdc_time	KDC's timestamp
- *
- * <=7 bytes		null		   null pad to 8 byte multiple
- *
- */
-
-int
-create_ciph(KTEXT c,		/* Text block to hold ciphertext */
-	    unsigned char *session, /* Session key to send to user */
-	    char *service,	/* Service name on ticket */
-	    char *instance,	/* Instance name on ticket */
-	    char *realm,	/* Realm of this KDC */
-	    u_int32_t life,	/* Lifetime of the ticket */
-	    int kvno,		/* Key version number for service */
-	    KTEXT tkt,		/* The ticket for the service */
-	    u_int32_t kdc_time,	/* KDC time */
-	    des_cblock *key)	/* Key to encrypt ciphertext with */
-
-{
-    unsigned char *p = c->dat;
-
-    memset(c, 0, sizeof(KTEXT_ST));
-
-    memcpy(p, session, 8);
-    p += 8;
-    
-    p += krb_put_nir(service, instance, realm, p);
-    
-    p += krb_put_int(life, p, 1);
-    p += krb_put_int(kvno, p, 1);
-
-    p += krb_put_int(tkt->length, p, 1);
-
-    memcpy(p, tkt->dat, tkt->length);
-    p += tkt->length;
-
-    p += krb_put_int(kdc_time, p, 4);
-
-    /* multiple of eight bytes */
-    c->length = (p - c->dat + 7) & ~7;
-
-    encrypt_ktext(c, key, DES_ENCRYPT);
-    return KSUCCESS;
-}
diff --git a/crypto/kerberosIV/lib/krb/create_death_packet.c b/crypto/kerberosIV/lib/krb/create_death_packet.c
deleted file mode 100644
index f74ba30845d6..000000000000
--- a/crypto/kerberosIV/lib/krb/create_death_packet.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: create_death_packet.c,v 1.8 1997/04/01 08:18:21 joda Exp $");
-
-/*
- * This routine creates a packet to type AUTH_MSG_DIE which is sent to
- * the Kerberos server to make it shut down.  It is used only in the
- * development environment.
- *
- * It takes a string "a_name" which is sent in the packet.  A pointer
- * to the packet is returned.
- *
- * The format of the killer packet is:
- *
- * type			variable		data
- *			or constant
- * ----			-----------		----
- *
- * unsigned char	KRB_PROT_VERSION	protocol version number
- * 
- * unsigned char	AUTH_MSG_DIE		message type
- * 
- * [least significant	HOST_BYTE_ORDER		byte order of sender
- *  bit of above field]
- * 
- * string		a_name			presumably, name of
- * 						principal sending killer
- * 						packet
- */
-
-#ifdef DEBUG
-KTEXT
-krb_create_death_packet(char *a_name)
-{
-    static KTEXT_ST pkt_st;
-    KTEXT pkt = &pkt_st;
-
-    unsigned char *p = pkt->dat;
-    
-    p += krb_put_int(KRB_PROT_VERSION, p, 1);
-    p += krb_put_int(AUTH_MSG_DIE, p, 1);
-    
-    p += krb_put_string(a_name, p);
-    pkt->length = p - pkt->dat;
-    return pkt;
-}
-#endif /* DEBUG */
diff --git a/crypto/kerberosIV/lib/krb/create_ticket.c b/crypto/kerberosIV/lib/krb/create_ticket.c
deleted file mode 100644
index b46923223391..000000000000
--- a/crypto/kerberosIV/lib/krb/create_ticket.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: create_ticket.c,v 1.12 1997/04/01 08:18:21 joda Exp $");
-
-/*
- * Create ticket takes as arguments information that should be in a
- * ticket, and the KTEXT object in which the ticket should be
- * constructed.  It then constructs a ticket and returns, leaving the
- * newly created ticket in tkt.
- * The length of the ticket is a multiple of
- * eight bytes and is in tkt->length.
- *
- * If the ticket is too long, the ticket will contain nulls.
- *
- * The corresponding routine to extract information from a ticket it
- * decomp_ticket.  When changes are made to this routine, the
- * corresponding changes should also be made to that file.
- *
- * The packet is built in the following format:
- * 
- * 			variable
- * type			or constant	   data
- * ----			-----------	   ----
- *
- * tkt->length		length of ticket (multiple of 8 bytes)
- * 
- * tkt->dat:
- * 
- * unsigned char	flags		   namely, HOST_BYTE_ORDER
- * 
- * string		pname		   client's name
- * 
- * string		pinstance	   client's instance
- * 
- * string		prealm		   client's realm
- * 
- * 4 bytes		paddress	   client's address
- * 
- * 8 bytes		session		   session key
- * 
- * 1 byte		life		   ticket lifetime
- * 
- * 4 bytes		time_sec	   KDC timestamp
- * 
- * string		sname		   service's name
- * 
- * string		sinstance	   service's instance
- * 
- * <=7 bytes		null		   null pad to 8 byte multiple
- *
- */
-
-int
-krb_create_ticket(KTEXT tkt,	/* Gets filled in by the ticket */
-		  unsigned char flags, /* Various Kerberos flags */
-		  char *pname,	/* Principal's name */
-		  char *pinstance, /* Principal's instance */
-		  char *prealm, /* Principal's authentication domain */
-		  int32_t paddress, /* Net address of requesting entity */
-		  void *session, /* Session key inserted in ticket */
-		  int16_t life,	/* Lifetime of the ticket */
-		  int32_t time_sec, /* Issue time and date */
-		  char *sname,	/* Service Name */
-		  char *sinstance, /* Instance Name */
-		  des_cblock *key) /* Service's secret key */
-{
-    unsigned char *p = tkt->dat;
-
-    memset(tkt, 0, sizeof(KTEXT_ST));
-
-    p += krb_put_int(flags, p, 1);
-    p += krb_put_nir(pname, pinstance, prealm, p);
-    
-    p += krb_put_address(paddress, p);
-    
-    memcpy(p, session, 8);
-    p += 8;
-
-    p += krb_put_int(life, p, 1);
-    p += krb_put_int(time_sec, p, 4);
-
-    p += krb_put_nir(sname, sinstance, NULL, p);
-
-    /* multiple of eight bytes */
-    tkt->length = (p - tkt->dat + 7) & ~7;
-
-    /* Check length of ticket */
-    if (tkt->length > (sizeof(KTEXT_ST) - 7)) {
-        memset(tkt->dat, 0, tkt->length);
-        tkt->length = 0;
-        return KFAILURE /* XXX */;
-    }
-
-    encrypt_ktext(tkt, key, DES_ENCRYPT);
-    return KSUCCESS;
-}
diff --git a/crypto/kerberosIV/lib/krb/debug_decl.c b/crypto/kerberosIV/lib/krb/debug_decl.c
deleted file mode 100644
index 5358bcb65d9f..000000000000
--- a/crypto/kerberosIV/lib/krb/debug_decl.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-#include "krb_locl.h"
-
-RCSID("$Id: debug_decl.c,v 1.6 1997/03/23 03:53:07 joda Exp $");
-
-/* Declare global debugging variables. */
-
-int krb_ap_req_debug = 0;
-int krb_debug = 0;
diff --git a/crypto/kerberosIV/lib/krb/decomp_ticket.c b/crypto/kerberosIV/lib/krb/decomp_ticket.c
deleted file mode 100644
index 8e556a37d2bd..000000000000
--- a/crypto/kerberosIV/lib/krb/decomp_ticket.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: decomp_ticket.c,v 1.16 1997/04/01 08:18:22 joda Exp $");
-
-/*
- * This routine takes a ticket and pointers to the variables that
- * should be filled in based on the information in the ticket.  It
- * fills in values for its arguments.
- *
- * The routine returns KFAILURE if any of the "pname", "pinstance",
- * or "prealm" fields is too big, otherwise it returns KSUCCESS.
- *
- * The corresponding routine to generate tickets is create_ticket.
- * When changes are made to this routine, the corresponding changes
- * should also be made to that file.
- *
- * See create_ticket.c for the format of the ticket packet.
- */
-
-int
-decomp_ticket(KTEXT tkt,	/* The ticket to be decoded */
-	      unsigned char *flags, /* Kerberos ticket flags */
-	      char *pname,	/* Authentication name */
-	      char *pinstance,	/* Principal's instance */
-	      char *prealm,	/* Principal's authentication domain */
-	      u_int32_t *paddress,/* Net address of entity requesting ticket */
-	      unsigned char *session, /* Session key inserted in ticket */
-	      int *life,	/* Lifetime of the ticket */
-	      u_int32_t *time_sec, /* Issue time and date */
-	      char *sname,	/* Service name */
-	      char *sinstance,	/* Service instance */
-	      des_cblock *key,	/* Service's secret key (to decrypt the ticket) */
-	      des_key_schedule schedule) /* The precomputed key schedule */
-
-{
-    unsigned char *p = tkt->dat;
-    
-    int little_endian;
-
-    des_pcbc_encrypt((des_cblock *)tkt->dat, (des_cblock *)tkt->dat,
-		     tkt->length, schedule, key, DES_DECRYPT);
-
-    tkt->mbz = 0;
-
-    *flags = *p++;
-
-    little_endian = (*flags >> K_FLAG_ORDER) & 1;
-
-    if(strlen((char*)p) > ANAME_SZ)
-	return KFAILURE;
-    p += krb_get_string(p, pname);
-
-    if(strlen((char*)p) > INST_SZ)
-	return KFAILURE;
-    p += krb_get_string(p, pinstance);
-
-    if(strlen((char*)p) > REALM_SZ)
-	return KFAILURE;
-    p += krb_get_string(p, prealm);
-
-    if(tkt->length - (p - tkt->dat) < 8 + 1 + 4)
-	return KFAILURE;
-    p += krb_get_address(p, paddress);
-
-    memcpy(session, p, 8);
-    p += 8;
-
-    *life = *p++;
-    
-    p += krb_get_int(p, time_sec, 4, little_endian);
-
-    if(strlen((char*)p) > SNAME_SZ)
-	return KFAILURE;
-    p += krb_get_string(p, sname);
-
-    if(strlen((char*)p) > INST_SZ)
-	return KFAILURE;
-    p += krb_get_string(p, sinstance);
-
-    return KSUCCESS;
-}
diff --git a/crypto/kerberosIV/lib/krb/dest_tkt.c b/crypto/kerberosIV/lib/krb/dest_tkt.c
deleted file mode 100644
index 0487e6b72386..000000000000
--- a/crypto/kerberosIV/lib/krb/dest_tkt.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-#include "krb_locl.h"
-
-RCSID("$Id: dest_tkt.c,v 1.11 1997/05/19 03:03:40 assar Exp $");
-
-/*
- * dest_tkt() is used to destroy the ticket store upon logout.
- * If the ticket file does not exist, dest_tkt() returns RET_TKFIL.
- * Otherwise the function returns RET_OK on success, KFAILURE on
- * failure.
- *
- * The ticket file (TKT_FILE) is defined in "krb.h".
- */
-
-int
-dest_tkt(void)
-{
-    char *file = TKT_FILE;
-    int i,fd;
-    struct stat statb;
-    char buf[BUFSIZ];
-
-    errno = 0;
-    if (
-#ifdef HAVE_LSTAT
-    lstat
-#else
-    stat
-#endif
-    (file, &statb) < 0)      
-	goto out;
-
-    if (!(statb.st_mode & S_IFREG)
-#ifdef notdef
-	|| statb.st_mode & 077
-#endif
-	)
-	goto out;
-
-    if ((fd = open(file, O_RDWR, 0)) < 0)
-	goto out;
-
-    memset(buf, 0, BUFSIZ);
-
-    for (i = 0; i < statb.st_size; i += sizeof(buf))
-	if (write(fd, buf, sizeof(buf)) != sizeof(buf)) {
-	    fsync(fd);
-	    close(fd);
-	    goto out;
-	}
-	
-
-    fsync(fd);
-    close(fd);
-    
-    unlink(file);
-
-out:
-    if (errno == ENOENT) return RET_TKFIL;
-    else if (errno != 0) return KFAILURE;
-    return(KSUCCESS);
-}
diff --git a/crypto/kerberosIV/lib/krb/dllmain.c b/crypto/kerberosIV/lib/krb/dllmain.c
deleted file mode 100644
index e98b7dc6526e..000000000000
--- a/crypto/kerberosIV/lib/krb/dllmain.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* dllmain.c - main function to krb4.dll
- * Author:	J Karlsson <d93-jka@nada.kth.se>
- * Date:	June 1996
- */
-
-#include "krb_locl.h"
-#include "ticket_memory.h"
-#include <Windows.h>
-
-RCSID("$Id: dllmain.c,v 1.6 1997/05/02 14:29:13 assar Exp $");
-
-void
-msg(char *text, int error)
-{
-    char *buf;
-
-    asprintf (&buf, "%s\nAn error of type: %d", text, error);
-
-    MessageBox(GetActiveWindow(),
-	       buf ? buf : "can't tell you",
-	       "kerberos message",
-	       MB_OK|MB_APPLMODAL);
-    free (buf);
-}
-
-BOOL WINAPI
-DllMain (HANDLE hInst, 
-	 ULONG reason,
-	 LPVOID lpReserved)
-{
-    WORD wVersionRequested; 
-    WSADATA wsaData; 
-    PROCESS_INFORMATION p;	
-    int err; 
-
-    switch(reason){
-    case DLL_PROCESS_ATTACH:
-	wVersionRequested = MAKEWORD(1, 1); 
-	err = WSAStartup(wVersionRequested, &wsaData); 
-	if (err != 0) 
-	{
-	    /* Tell the user that we couldn't find a useable */ 
-	    /* winsock.dll.     */ 
-	    msg("Cannot find winsock.dll", err);
-	    return FALSE;
-	}
-	if(newTktMem(0) != KSUCCESS)
-	{
-	    /* Tell the user that we couldn't alloc shared memory. */ 
-	    msg("Cannot allocate shared ticket memory", GetLastError());
-	    return FALSE;
-	}
-	if(GetLastError() != ERROR_ALREADY_EXISTS)
-	{
-	    STARTUPINFO s = 
-	    {
-		sizeof(s),
-		0,
-		0,
-		0,
-		0,0,
-		0,0,
-		0,0,
-		0,
-		0,
-		0,
-		0,0,
-		0,0,0};
-
-	    s.dwFlags = STARTF_USESHOWWINDOW;
-	    s.wShowWindow = SW_HIDE;
-	    if(!CreateProcess(0,"krbmanager",
-			      0,0,FALSE,0,0,
-			      0,&s, &p))
-	    {
-		msg("Unable to create kerberos manager process.\n"
-		    "Make sure krbmanager.exe is in your PATH.",
-		    GetLastError());
-		return FALSE;
-	    }
-	}
-	break;
-    case DLL_PROCESS_DETACH:
-	freeTktMem(0);
-	WSACleanup();
-	break;
-    }
-
-    return TRUE;
-}
diff --git a/crypto/kerberosIV/lib/krb/encrypt_ktext.c b/crypto/kerberosIV/lib/krb/encrypt_ktext.c
deleted file mode 100644
index d97fcc7c8e04..000000000000
--- a/crypto/kerberosIV/lib/krb/encrypt_ktext.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: encrypt_ktext.c,v 1.4 1997/04/01 08:18:26 joda Exp $");
-
-void
-encrypt_ktext(KTEXT cip, des_cblock *key, int encrypt)
-{
-    des_key_schedule schedule;
-    des_set_key(key, schedule);
-    des_pcbc_encrypt((des_cblock*)cip->dat, (des_cblock*)cip->dat, 
-		     cip->length, schedule, key, encrypt);
-    memset(schedule, 0, sizeof(des_key_schedule));
-}
diff --git a/crypto/kerberosIV/lib/krb/et_list.c b/crypto/kerberosIV/lib/krb/et_list.c
deleted file mode 100644
index 3e72b14cef79..000000000000
--- a/crypto/kerberosIV/lib/krb/et_list.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * This is a hack to resolve the reference to _et_list when making a
- * shared library under Psoriasis and possibly other systems. Presumably
- * they define __ELF__, some people say Linux does so.
- */
-
-#include "config.h"
-
-RCSID("$Id: et_list.c,v 1.1.1.1 1997/09/04 06:04:22 markm Exp $");
-
-struct et_list {
-    struct et_list *next;
-    const struct error_table *table;
-};
-
-#if defined(__GNUC__)
-
-struct et_list * _et_list __attribute__ ((weak)) = 0;
-
-#else /* !__GNUC__ */
-
-#ifdef HAVE_PRAGMA_WEAK
-
-#pragma weak _et_list = __et_list
-struct et_list * __et_list = 0;
-
-#else /* !HAVE_PRAGMA_WEAK */
-
-struct et_list * _et_list = 0;
-
-#endif /* !HAVE_PRAGMA_WEAK */
-
-#endif /* !__GNUC__ */
diff --git a/crypto/kerberosIV/lib/krb/get_ad_tkt.c b/crypto/kerberosIV/lib/krb/get_ad_tkt.c
deleted file mode 100644
index 95907600c850..000000000000
--- a/crypto/kerberosIV/lib/krb/get_ad_tkt.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: get_ad_tkt.c,v 1.16 1997/05/30 17:43:34 bg Exp $");
-
-/*
- * get_ad_tkt obtains a new service ticket from Kerberos, using
- * the ticket-granting ticket which must be in the ticket file.
- * It is typically called by krb_mk_req() when the client side
- * of an application is creating authentication information to be
- * sent to the server side.
- *
- * get_ad_tkt takes four arguments: three pointers to strings which
- * contain the name, instance, and realm of the service for which the
- * ticket is to be obtained; and an integer indicating the desired
- * lifetime of the ticket.
- *
- * It returns an error status if the ticket couldn't be obtained,
- * or AD_OK if all went well.  The ticket is stored in the ticket
- * cache.
- *
- * The request sent to the Kerberos ticket-granting service looks
- * like this:
- *
- * pkt->dat
- *
- * TEXT			original contents of	authenticator+ticket
- *			pkt->dat		built in krb_mk_req call
- * 
- * 4 bytes		time_ws			always 0 (?)
- * char			lifetime		lifetime argument passed
- * string		service			service name argument
- * string		sinstance		service instance arg.
- *
- * See "prot.h" for the reply packet layout and definitions of the
- * extraction macros like pkt_version(), pkt_msg_type(), etc.
- */
-
-int
-get_ad_tkt(char *service, char *sinstance, char *realm, int lifetime)
-{
-    static KTEXT_ST pkt_st;
-    KTEXT pkt = & pkt_st;	/* Packet to KDC */
-    static KTEXT_ST rpkt_st;
-    KTEXT rpkt = &rpkt_st;	/* Returned packet */
-
-    CREDENTIALS cr;
-    char lrealm[REALM_SZ];
-    u_int32_t time_ws = 0;
-    int kerror;
-    unsigned char *p;
-
-    /*
-     * First check if we have a "real" TGT for the corresponding
-     * realm, if we don't, use ordinary inter-realm authentication.
-     */
-
-    kerror = krb_get_cred(KRB_TICKET_GRANTING_TICKET, realm, realm, &cr);
-    if (kerror == KSUCCESS)
-      strncpy(lrealm, realm, REALM_SZ);
-    else
-      kerror = krb_get_tf_realm(TKT_FILE, lrealm);
-    
-    if (kerror != KSUCCESS)
-	return(kerror);
-
-    /*
-     * Look for the session key (and other stuff we don't need)
-     * in the ticket file for krbtgt.realm@lrealm where "realm" 
-     * is the service's realm (passed in "realm" argument) and 
-     * lrealm is the realm of our initial ticket.  If we don't 
-     * have this, we will try to get it.
-     */
-    
-    if ((kerror = krb_get_cred(KRB_TICKET_GRANTING_TICKET,
-			       realm, lrealm, &cr)) != KSUCCESS) {
-	/*
-	 * If realm == lrealm, we have no hope, so let's not even try.
-	 */
-	if ((strncmp(realm, lrealm, REALM_SZ)) == 0)
-	    return(AD_NOTGT);
-	else{
-	    if ((kerror = 
-		 get_ad_tkt(KRB_TICKET_GRANTING_TICKET,
-			    realm, lrealm, lifetime)) != KSUCCESS)
-		if (kerror == KDC_PR_UNKNOWN)
-		  return(AD_INTR_RLM_NOTGT);
-		else
-		  return(kerror);
-	    if ((kerror = krb_get_cred(KRB_TICKET_GRANTING_TICKET,
-				       realm, lrealm, &cr)) != KSUCCESS)
-		return(kerror);
-	}
-    }
-    
-    /*
-     * Make up a request packet to the "krbtgt.realm@lrealm".
-     * Start by calling krb_mk_req() which puts ticket+authenticator
-     * into "pkt".  Then tack other stuff on the end.
-     */
-    
-    kerror = krb_mk_req(pkt,
-			KRB_TICKET_GRANTING_TICKET,
-			realm,lrealm,0L);
-
-    if (kerror)
-	return(AD_NOTGT);
-
-    p = pkt->dat + pkt->length;
-
-    p += krb_put_int(time_ws, p, 4);
-    p += krb_put_int(lifetime, p, 1);
-    p += krb_put_nir(service, sinstance, NULL, p);
-    
-    pkt->length = p - pkt->dat;
-    rpkt->length = 0;
-    
-    /* Send the request to the local ticket-granting server */
-    if ((kerror = send_to_kdc(pkt, rpkt, realm))) return(kerror);
-
-    /* check packet version of the returned packet */
-
-    {
-	KTEXT_ST cip;
-	CREDENTIALS cred;
-	struct timeval tv;
-
-	kerror = kdc_reply_cipher(rpkt, &cip);
-	if(kerror != KSUCCESS)
-	    return kerror;
-	
-	encrypt_ktext(&cip, &cr.session, DES_DECRYPT);
-
-	kerror = kdc_reply_cred(&cip, &cred);
-	if(kerror != KSUCCESS)
-	    return kerror;
-
-	if (strcmp(cred.service, service) || strcmp(cred.instance, sinstance) ||
-	    strcmp(cred.realm, realm))	/* not what we asked for */
-	    return INTK_ERR;	/* we need a better code here XXX */
-	
-	gettimeofday(&tv, NULL);
-	if (abs((int)(tv.tv_sec - cred.issue_date)) > CLOCK_SKEW) {
-	    return RD_AP_TIME; /* XXX should probably be better code */
-	}
-	
-
-	kerror = save_credentials(cred.service, cred.instance, cred.realm, 
-				  cred.session, cred.lifetime, cred.kvno, 
-				  &cred.ticket_st, tv.tv_sec);
-	return kerror;
-    }
-}
diff --git a/crypto/kerberosIV/lib/krb/get_cred.c b/crypto/kerberosIV/lib/krb/get_cred.c
deleted file mode 100644
index 1a0016c4670b..000000000000
--- a/crypto/kerberosIV/lib/krb/get_cred.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-#include "krb_locl.h"
-
-RCSID("$Id: get_cred.c,v 1.6 1997/05/30 17:38:29 bg Exp $");
-
-/*
- * krb_get_cred takes a service name, instance, and realm, and a
- * structure of type CREDENTIALS to be filled in with ticket
- * information.  It then searches the ticket file for the appropriate
- * ticket and fills in the structure with the corresponding
- * information from the file.  If successful, it returns KSUCCESS.
- * On failure it returns a Kerberos error code.
- */
-
-int
-krb_get_cred(char *service,	/* Service name */
-	     char *instance,	/* Instance */
-	     char *realm,	/* Auth domain */
-	     CREDENTIALS *c)	/* Credentials struct */
-{
-    int tf_status;              /* return value of tf function calls */
-    CREDENTIALS cr;
-
-    if (c == 0)
-        c = &cr;
-
-    /* Open ticket file and lock it for shared reading */
-    if ((tf_status = tf_init(TKT_FILE, R_TKT_FIL)) != KSUCCESS)
-	return(tf_status);
-
-    /* Copy principal's name and instance into the CREDENTIALS struc c */
-
-    if ( (tf_status = tf_get_pname(c->pname)) != KSUCCESS ||
-    	 (tf_status = tf_get_pinst(c->pinst)) != KSUCCESS )
-	return (tf_status);
-
-    /* Search for requested service credentials and copy into c */
-       
-    while ((tf_status = tf_get_cred(c)) == KSUCCESS) {
-	if ((strcmp(c->service,service) == 0) &&
-           (strcmp(c->instance,instance) == 0) &&
-           (strcmp(c->realm,realm) == 0))
-		   break;
-    }
-    tf_close();
-
-    if (tf_status == EOF)
-	return (GC_NOTKT);
-    return(tf_status);
-}
diff --git a/crypto/kerberosIV/lib/krb/get_default_principal.c b/crypto/kerberosIV/lib/krb/get_default_principal.c
deleted file mode 100644
index 3a111ea52e38..000000000000
--- a/crypto/kerberosIV/lib/krb/get_default_principal.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: get_default_principal.c,v 1.10 1997/04/01 08:18:28 joda Exp $");
-
-int
-krb_get_default_principal(char *name, char *instance, char *realm)
-{
-  char *file;
-  int ret;
-
-  char *p;
-
-  if ((file = getenv("KRBTKFILE")) == NULL)
-      file = TKT_FILE;  
-  
-  ret = krb_get_tf_fullname(file, name, instance, realm);
-  if(ret == KSUCCESS)
-      return 0;
-
-  p = getenv("KRB4PRINCIPAL");
-  if(p && kname_parse(name, instance, realm, p) == KSUCCESS)
-      return 1;
-      
-
-#ifdef HAVE_PWD_H
-  {
-    struct passwd *pw;
-    pw = getpwuid(getuid());
-    if(pw == NULL){
-      return -1;
-    }
-
-    strcpy(name, pw->pw_name);
-    strcpy(instance, "");
-    krb_get_lrealm(realm, 1);
-
-    if(strcmp(name, "root") == 0){
-      p = NULL;
-#if defined(HAVE_GETLOGIN) && !defined(POSIX_GETLOGIN)
-      p = getlogin();
-#endif
-      if(p == NULL)
-	p = getenv("USER");
-      if(p == NULL)
-	p = getenv("LOGNAME");
-      if(p){
-	strncpy (name, p, ANAME_SZ);
-	name[ANAME_SZ - 1] = '\0';
-	strcpy(instance, "root");
-      }
-    }
-    return 1;
-  }
-#endif
-  return -1;
-}
diff --git a/crypto/kerberosIV/lib/krb/get_host.c b/crypto/kerberosIV/lib/krb/get_host.c
deleted file mode 100644
index de80ac4c8efa..000000000000
--- a/crypto/kerberosIV/lib/krb/get_host.c
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: get_host.c,v 1.30 1997/05/02 14:29:13 assar Exp $");
-
-static struct host_list {
-    struct krb_host *this;
-    struct host_list *next;
-} *hosts;
-
-static int krb_port = 0;
-
-static void
-free_hosts(struct host_list *h)
-{
-    struct host_list *t;
-    while(h){
-	if(h->this->realm)
-	    free(h->this->realm);
-	if(h->this->host)
-	    free(h->this->host);
-	t = h;
-	h = h->next;
-	free(t);
-    }
-}
-
-static int
-parse_address(char *address, int *proto, char **host, int *port)
-{
-    char *p, *q;
-    p = strchr(address, '/');
-    *proto = IPPROTO_UDP;
-    if(p){
-	char prot[32];
-	struct protoent *pp;
-	strncpy(prot, address, p - address);
-	prot[p - address] = 0;
-	if((pp = getprotobyname(prot)))
-	    *proto = pp->p_proto;
-	else
-	    krb_warning("Bad protocol name `%s', Using default `udp'.\n", 
-			prot);
-	p++;
-    }else
-	p = address;
-    q = strchr(p, ':');
-    if(q){
-	*host = (char*)malloc(q - p + 1);
-	strncpy(*host, p, q - p);
-	(*host)[q - p] = 0;
-	q++;
-	{
-	    struct servent *sp = getservbyname(q, NULL);
-	    if(sp)
-		*port = ntohs(sp->s_port);
-	    else
-		if(sscanf(q, "%d", port) != 1){
-		    krb_warning("Bad port specification `%s', using port %d.", 
-				q, krb_port);
-		    *port = krb_port;
-		}
-	}
-    }else{
-	*host = strdup(p);
-	*port = krb_port;
-    }
-    return 0;
-}
-
-static int
-add_host(char *realm, char *address, int admin, int validate)
-{
-    struct krb_host *host;
-    struct host_list *p, **last = &hosts;
-    host = (struct krb_host*)malloc(sizeof(struct krb_host));
-    parse_address(address, &host->proto, &host->host, &host->port);
-    if(validate && gethostbyname(host->host) == NULL){
-	free(host->host);
-	free(host);
-	return 1;
-    }
-    host->admin = admin;
-    for(p = hosts; p; p = p->next){
-	if(strcmp(realm, p->this->realm) == 0 &&
-	   strcmp(host->host, p->this->host) == 0 && 
-	   host->proto == p->this->proto &&
-	   host->port == p->this->port){
-	    free(host->host);
-	    free(host);
-	    return 1;
-	}
-	last = &p->next;
-    }
-    host->realm = strdup(realm);
-    p = (struct host_list*)malloc(sizeof(struct host_list));
-    p->this = host;
-    p->next = NULL;
-    *last = p;
-    return 0;
-}
-
-
-
-static int
-read_file(const char *filename, const char *r)
-{
-    char line[1024];
-    char realm[1024];
-    char address[1024];
-    char scratch[1024];
-    int n;
-    int nhosts = 0;
-    
-    FILE *f = fopen(filename, "r");
-    if(f == NULL)
-	return -1;
-    while(fgets(line, sizeof(line), f)){
-	n = sscanf(line, "%s %s admin %s", realm, address, scratch);
-	if(n == 2 || n == 3){
-	    if(strcmp(realm, r))
-		continue;
-	    if(add_host(realm, address, n == 3, 0) == 0)
-		nhosts++;
-	}
-    }
-    fclose(f);
-    return nhosts;
-}
-
-static int
-init_hosts(char *realm)
-{
-    static const char *files[] = KRB_CNF_FILES;
-    int i;
-    char *dir = getenv("KRBCONFDIR");
-
-    krb_port = ntohs(k_getportbyname (KRB_SERVICE, NULL, htons(KRB_PORT)));
-    if(dir){
-	char file[MaxPathLen];
-	if(k_concat(file, sizeof(file), dir, "/krb.conf", NULL) == 0)
-	    read_file(file, realm);
-    }
-    for(i = 0; files[i]; i++)
-	read_file(files[i], realm);
-    return 0;
-}
-
-static void
-srv_find_realm(char *realm, char *proto, char *service)
-{
-    char *domain;
-    struct dns_reply *r;
-    struct resource_record *rr;
-    
-    k_mconcat(&domain, 1024, service, ".", proto, ".", realm, ".", NULL);
-    
-    if(domain == NULL)
-	return;
-    
-    r = dns_lookup(domain, "srv");
-    if(r == NULL)
-	r = dns_lookup(domain, "txt");
-    if(r == NULL){
-	free(domain);
-	return;
-    }
-    for(rr = r->head; rr; rr = rr->next){
-	if(rr->type == T_SRV){
-	    char buf[1024];
-
-	    if (snprintf (buf,
-			  sizeof(buf),
-			  "%s/%s:%u",
-			  proto,
-			  rr->u.srv->target,
-			  rr->u.srv->port) < sizeof(buf))
-		add_host(realm, buf, 0, 0);
-	}else if(rr->type == T_TXT)
-	    add_host(realm, rr->u.txt, 0, 0);
-    }
-    dns_free_data(r);
-    free(domain);
-}
-
-struct krb_host*
-krb_get_host(int nth, char *realm, int admin)
-{
-    struct host_list *p;
-    static char orealm[REALM_SZ];
-    if(orealm[0] == 0 || strcmp(realm, orealm)){
-	/* quick optimization */
-	if(realm && realm[0]){
-	    strncpy(orealm, realm, sizeof(orealm) - 1);
-	    orealm[sizeof(orealm) - 1] = 0;
-	}else{
-	    int ret = krb_get_lrealm(orealm, 1);
-	    if(ret != KSUCCESS)
-		return NULL;
-	}
-	
-	if(hosts){
-	    free_hosts(hosts);
-	    hosts = NULL;
-	}
-	
-	init_hosts(orealm);
-    
-	srv_find_realm(orealm, "udp", KRB_SERVICE);
-	srv_find_realm(orealm, "tcp", KRB_SERVICE);
-	
-	{
-	    /* XXX this assumes no one has more than 99999 kerberos
-	       servers */
-	    char host[REALM_SZ + sizeof("kerberos-XXXXX..")];
-	    int i = 0;
-	    sprintf(host, "kerberos.%s.", orealm);
-	    add_host(orealm, host, 1, 1);
-	    do{
-		i++;
-		sprintf(host, "kerberos-%d.%s.", i, orealm);
-	    }while(i < 100000 && add_host(orealm, host, 0, 1) == 0);
-	}
-    }
-    
-    for(p = hosts; p; p = p->next){
-	if(strcmp(orealm, p->this->realm) == 0 &&
-	   (!admin || p->this->admin))
-	    if(nth == 1)
-		return p->this;
-	    else
-		nth--;
-    }
-    return NULL;
-}
-
-int
-krb_get_krbhst(char *host, char *realm, int nth)
-{
-    struct krb_host *p = krb_get_host(nth, realm, 0);
-    if(p == NULL)
-	return KFAILURE;
-    strcpy(host, p->host);
-    return KSUCCESS;
-}
-
-int
-krb_get_admhst(char *host, char *realm, int nth)
-{
-    struct krb_host *p = krb_get_host(nth, realm, 1);
-    if(p == NULL)
-	return KFAILURE;
-    strcpy(host, p->host);
-    return KSUCCESS;
-}
diff --git a/crypto/kerberosIV/lib/krb/get_in_tkt.c b/crypto/kerberosIV/lib/krb/get_in_tkt.c
deleted file mode 100644
index 435632a665a0..000000000000
--- a/crypto/kerberosIV/lib/krb/get_in_tkt.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-#include "krb_locl.h"
-
-RCSID("$Id: get_in_tkt.c,v 1.15 1997/03/23 03:53:08 joda Exp $");
-
-/*
- * This file contains three routines: passwd_to_key() and
- * passwd_to_afskey() converts a password into a DES key, using the
- * normal strinttokey and the AFS one, respectively, and
- * krb_get_pw_in_tkt() gets an initial ticket for a user.  
- */
-
-/*
- * passwd_to_key() and passwd_to_afskey: given a password, return a DES key.
- */
-
-int
-passwd_to_key(char *user, char *instance, char *realm, void *passwd,
-	      des_cblock *key)
-{
-#ifndef NOENCRYPTION
-    des_string_to_key((char *)passwd, key);
-#endif
-    return 0;
-}
-
-
-int
-passwd_to_afskey(char *user, char *instance, char *realm, void *passwd,
-		  des_cblock *key)
-{
-#ifndef NOENCRYPTION
-    afs_string_to_key((char *)passwd, realm, key);
-#endif
-    return (0);
-}
-
-/*
- * krb_get_pw_in_tkt() takes the name of the server for which the initial
- * ticket is to be obtained, the name of the principal the ticket is
- * for, the desired lifetime of the ticket, and the user's password.
- * It passes its arguments on to krb_get_in_tkt(), which contacts
- * Kerberos to get the ticket, decrypts it using the password provided,
- * and stores it away for future use.
- *
- * krb_get_pw_in_tkt() passes two additional arguments to krb_get_in_tkt():
- * the name of a routine (passwd_to_key()) to be used to get the
- * password in case the "password" argument is null and NULL for the
- * decryption procedure indicating that krb_get_in_tkt should use the 
- * default method of decrypting the response from the KDC.
- *
- * The result of the call to krb_get_in_tkt() is returned.
- */
-
-int
-krb_get_pw_in_tkt(char *user, char *instance, char *realm, char *service,
-		  char *sinstance, int life, char *password)
-{
-    char pword[100];		/* storage for the password */
-    int code;
-
-    /* Only request password once! */
-    if (!password) {
-        if (des_read_pw_string(pword, sizeof(pword)-1, "Password: ", 0)){
-	    memset(pword, 0, sizeof(pword));
-	    return INTK_BADPW;
-	}
-        password = pword;
-    }
-
-    code = krb_get_in_tkt(user,instance,realm,service,sinstance,life,
-                          passwd_to_key, NULL, password);
-    if (code == INTK_BADPW)
-	 code = krb_get_in_tkt(user,instance,realm,service,sinstance,life,
-			       passwd_to_afskey, NULL, password);
-    if (password == pword)
-        memset(pword, 0, sizeof(pword));
-    return(code);
-}
diff --git a/crypto/kerberosIV/lib/krb/get_krbrlm.c b/crypto/kerberosIV/lib/krb/get_krbrlm.c
deleted file mode 100644
index 8c5b0c99392e..000000000000
--- a/crypto/kerberosIV/lib/krb/get_krbrlm.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-#include "krb_locl.h"
-
-RCSID("$Id: get_krbrlm.c,v 1.16 1997/05/02 01:26:22 assar Exp $");
-
-/*
- * krb_get_lrealm takes a pointer to a string, and a number, n.  It fills
- * in the string, r, with the name of the nth realm specified on the
- * first line of the kerberos config file (KRB_CONF, defined in "krb.h").
- * It returns 0 (KSUCCESS) on success, and KFAILURE on failure.  If the
- * config file does not exist, and if n=1, a successful return will occur
- * with r = KRB_REALM (also defined in "krb.h").
- *
- * NOTE: for archaic & compatibility reasons, this routine will only return
- * valid results when n = 1.
- *
- * For the format of the KRB_CONF file, see comments describing the routine
- * krb_get_krbhst().
- */
-
-static int
-krb_get_lrealm_f(char *r, int n, const char *fname)
-{
-    FILE *f;
-    int ret = KFAILURE;
-    f = fopen(fname, "r");
-    if(f){
-	char buf[REALM_SZ];
-	if(fgets(buf, sizeof(buf), f)){
-	    char *p = buf + strspn(buf, " \t");
-	    p[strcspn(p, " \t\r\n")] = 0;
-	    p[REALM_SZ - 1] = 0;
-	    strcpy(r, p);
-	    ret = KSUCCESS;
-	}
-	fclose(f);
-    }
-    return ret;
-}
-
-int
-krb_get_lrealm(char *r, int n)
-{
-  static const char *const files[] = KRB_CNF_FILES;
-  int i;
-  
-  const char *dir = getenv("KRBCONFDIR");
-
-  if (n > 1)
-    return(KFAILURE);		/* Temporary restriction */
-
-  /* First try user specified file */
-  if (dir != 0) {
-    char fname[MaxPathLen];
-    if(k_concat(fname, sizeof(fname), dir, "/krb.conf", NULL) == 0)
-	if (krb_get_lrealm_f(r, n, fname) == KSUCCESS)
-	    return KSUCCESS;
-  }
-
-  for (i = 0; files[i] != 0; i++)
-    if (krb_get_lrealm_f(r, n, files[i]) == KSUCCESS)
-      return KSUCCESS;
-
-  /* If nothing else works try LOCALDOMAIN, if it exists */
-  if (n == 1)
-    {
-      char *t, hostname[MaxHostNameLen];
-      k_gethostname(hostname, sizeof(hostname));
-      t = krb_realmofhost(hostname);
-      if (t) {
-	strcpy (r, t);
-	return KSUCCESS;
-      }
-      t = strchr(hostname, '.');
-      if (t == 0)
-	return KFAILURE;	/* No domain part, you loose */
-
-      t++;			/* Skip leading dot and upcase the rest */
-      for (; *t; t++, r++)
-	*r = toupper(*t);
-      *r = 0;
-      return(KSUCCESS);
-    }
-  else
-    return(KFAILURE);
-}
-
-/* For SunOS5 compat. */
-char *
-krb_get_default_realm(void)
-{
-  static char local_realm[REALM_SZ]; /* local kerberos realm */
-  if (krb_get_lrealm(local_realm, 1) != KSUCCESS)
-    strcpy(local_realm, "NO.DEFAULT.REALM");
-  return local_realm;
-}
diff --git a/crypto/kerberosIV/lib/krb/get_svc_in_tkt.c b/crypto/kerberosIV/lib/krb/get_svc_in_tkt.c
deleted file mode 100644
index c2905245efed..000000000000
--- a/crypto/kerberosIV/lib/krb/get_svc_in_tkt.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-#include "krb_locl.h"
-
-RCSID("$Id: get_svc_in_tkt.c,v 1.8 1997/03/23 03:53:09 joda Exp $");
-
-/*
- * This file contains two routines: srvtab_to_key(), which gets
- * a server's key from a srvtab file, and krb_get_svc_in_tkt() which
- * gets an initial ticket for a server.
- */
-
-/*
- * srvtab_to_key(): given a "srvtab" file (where the keys for the
- * service on a host are stored), return the private key of the
- * given service (user.instance@realm).
- *
- * srvtab_to_key() passes its arguments on to read_service_key(),
- * plus one additional argument, the key version number.
- * (Currently, the key version number is always 0; this value
- * is treated as a wildcard by read_service_key().)
- *
- * If the "srvtab" argument is null, KEYFILE (defined in "krb.h")
- * is passed in its place.
- *
- * It returns the return value of the read_service_key() call.
- * The service key is placed in "key".
- */
-
-int 
-srvtab_to_key(char *user, char *instance, char *realm, void *srvtab,
-	      des_cblock *key)
-{
-    if (!srvtab)
-        srvtab = KEYFILE;
-
-    return(read_service_key(user, instance, realm, 0, (char *)srvtab,
-                            (char *)key));
-}
-
-/*
- * krb_get_svc_in_tkt() passes its arguments on to krb_get_in_tkt(),
- * plus two additional arguments: a pointer to the srvtab_to_key()
- * function to be used to get the key from the key file and a NULL
- * for the decryption procedure indicating that krb_get_in_tkt should 
- * use the default method of decrypting the response from the KDC.
- *
- * It returns the return value of the krb_get_in_tkt() call.
- */
-
-int
-krb_get_svc_in_tkt(char *user, char *instance, char *realm, char *service,
-		   char *sinstance, int life, char *srvtab)
-{
-    return(krb_get_in_tkt(user, instance, realm, service, sinstance,
-                          life, srvtab_to_key, NULL, srvtab));
-}
diff --git a/crypto/kerberosIV/lib/krb/get_tf_fullname.c b/crypto/kerberosIV/lib/krb/get_tf_fullname.c
deleted file mode 100644
index 33733d0c0e7d..000000000000
--- a/crypto/kerberosIV/lib/krb/get_tf_fullname.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-#include "krb_locl.h"
-
-RCSID("$Id: get_tf_fullname.c,v 1.6 1997/03/23 03:53:10 joda Exp $");
-
-/*
- * This file contains a routine to extract the fullname of a user
- * from the ticket file.
- */
-
-/*
- * krb_get_tf_fullname() takes four arguments: the name of the 
- * ticket file, and variables for name, instance, and realm to be
- * returned in.  Since the realm of a ticket file is not really fully 
- * supported, the realm used will be that of the the first ticket in 
- * the file as this is the one that was obtained with a password by
- * krb_get_in_tkt().
- */
-
-int
-krb_get_tf_fullname(char *ticket_file, char *name, char *instance, char *realm)
-{
-    int tf_status;
-    CREDENTIALS c;
-
-    if ((tf_status = tf_init(ticket_file, R_TKT_FIL)) != KSUCCESS)
-	return(tf_status);
-
-    if (((tf_status = tf_get_pname(c.pname)) != KSUCCESS) ||
-	((tf_status = tf_get_pinst(c.pinst)) != KSUCCESS))
-	return (tf_status);
-    
-    if (name)
-	strcpy(name, c.pname);
-    if (instance)
-	strcpy(instance, c.pinst);
-    if ((tf_status = tf_get_cred(&c)) == KSUCCESS) {
-	if (realm)
-	    strcpy(realm, c.realm);
-    }
-    else {
-	if (tf_status == EOF)
-	    return(KFAILURE);
-	else
-	    return(tf_status);
-    }    
-    tf_close();
-    
-    return(tf_status);
-}
diff --git a/crypto/kerberosIV/lib/krb/get_tf_realm.c b/crypto/kerberosIV/lib/krb/get_tf_realm.c
deleted file mode 100644
index 1a3c7d1cb5b8..000000000000
--- a/crypto/kerberosIV/lib/krb/get_tf_realm.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-#include "krb_locl.h"
-
-RCSID("$Id: get_tf_realm.c,v 1.5 1997/03/23 03:53:10 joda Exp $");
-
-/*
- * This file contains a routine to extract the realm of a kerberos
- * ticket file.
- */
-
-/*
- * krb_get_tf_realm() takes two arguments: the name of a ticket 
- * and a variable to store the name of the realm in.
- * 
- */
-
-int
-krb_get_tf_realm(char *ticket_file, char *realm)
-{
-    return(krb_get_tf_fullname(ticket_file, 0, 0, realm));
-}
diff --git a/crypto/kerberosIV/lib/krb/getaddrs.c b/crypto/kerberosIV/lib/krb/getaddrs.c
deleted file mode 100644
index d25ec1bac92d..000000000000
--- a/crypto/kerberosIV/lib/krb/getaddrs.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: getaddrs.c,v 1.19 1997/04/01 08:18:29 joda Exp $");
-
-#if defined(HAVE_SYS_IOCTL_H) && SunOS != 4
-#include <sys/ioctl.h>
-#endif
-#ifdef HAVE_NET_IF_H
-#include <net/if.h>
-#endif
-
-#ifdef HAVE_SYS_SOCKIO_H
-#include <sys/sockio.h>
-#endif /* HAVE_SYS_SOCKIO_H */
-
-/*
- * Return number and list of all local adresses.
- */
-
-int
-k_get_all_addrs (struct in_addr **l)
-{
-#if !defined(SIOCGIFCONF) || !defined(SIOCGIFFLAGS) || !defined(SIOCGIFADDR)
-     char name[MaxHostNameLen];
-     struct hostent *he;
-
-     if (k_gethostname(name, sizeof(name)) < 0)
-	  return -1;
-     he = gethostbyname (name);
-     if (he == NULL)
-	  return -1;
-     *l = malloc(sizeof(**l));
-     if (*l == NULL)
-	  return -1;
-     memcpy (*l, he->h_addr_list[0], sizeof(*l));
-     return 1;
-#else
-     int fd;
-     char buf[BUFSIZ];
-     struct ifreq ifreq;
-     struct ifconf ifconf;
-     int num, j;
-     char *p;
-
-     fd = socket(AF_INET, SOCK_DGRAM, 0);
-     if (fd < 0)
-	  return -1;
-
-     ifconf.ifc_len = sizeof(buf);
-     ifconf.ifc_buf = buf;
-     if(ioctl(fd, SIOCGIFCONF, &ifconf) < 0)
-	  return -1;
-     num = ifconf.ifc_len / sizeof(struct ifreq);
-     *l = malloc(num * sizeof(struct in_addr));
-     if(*l == NULL) {
-	  close (fd);
-	  return -1;
-     }
-
-     j = 0;
-     ifreq.ifr_name[0] = '\0';
-     for (p = ifconf.ifc_buf; p < ifconf.ifc_buf + ifconf.ifc_len;) {
-          struct ifreq *ifr = (struct ifreq *)p;
-#ifdef SOCKADDR_HAS_SA_LEN
-	  size_t sz = sizeof(ifr->ifr_name) + ifr->ifr_addr.sa_len;
-#else
-	  size_t sz = sizeof(*ifr);
-#endif
-	  if(strncmp(ifreq.ifr_name, ifr->ifr_name, sizeof(ifr->ifr_name))) {
-	       if(ioctl(fd, SIOCGIFFLAGS, ifr) < 0) {
-		    close (fd);
-		    free (*l);
-		    return -1;
-	       }
-	       if (ifr->ifr_flags & IFF_UP) {
-		    if(ioctl(fd, SIOCGIFADDR, ifr) < 0) {
-			 close (fd);
-			 free (*l);
-			 return -1;
-		    }
-		    (*l)[j++] = ((struct sockaddr_in *)&ifr->ifr_addr)->sin_addr;
-	       }
-	       ifreq = *ifr;
-	  }
-	  p = p + sz;
-     }
-     if (j != num)
-	  *l = realloc (*l, j * sizeof(struct in_addr));
-     close (fd);
-     return j;
-#endif /* SIOCGIFCONF */
-}
diff --git a/crypto/kerberosIV/lib/krb/getrealm.c b/crypto/kerberosIV/lib/krb/getrealm.c
deleted file mode 100644
index 05dfdabb5740..000000000000
--- a/crypto/kerberosIV/lib/krb/getrealm.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-#include "krb_locl.h"
-
-RCSID("$Id: getrealm.c,v 1.25 1997/05/02 14:29:14 assar Exp $");
-
-#define MATCH_SUBDOMAINS        0
-
-/*
- * krb_realmofhost.
- * Given a fully-qualified domain-style primary host name,
- * return the name of the Kerberos realm for the host.
- * If the hostname contains no discernable domain, or an error occurs,
- * return the local realm name, as supplied by get_krbrlm().
- * If the hostname contains a domain, but no translation is found,
- * the hostname's domain is converted to upper-case and returned.
- *
- * The format of each line of the translation file is:
- * domain_name kerberos_realm
- * -or-
- * host_name kerberos_realm
- *
- * domain_name should be of the form .XXX.YYY (e.g. .LCS.MIT.EDU)
- * host names should be in the usual form (e.g. FOO.BAR.BAZ)
- */
-
-/* To automagically find the correct realm of a host (without
- * krb.realms) add a text record for your domain with the name of your
- * realm, like this:
- *
- * krb4-realm	IN	TXT	FOO.SE
- *
- * The search is recursive, so you can also add entries for specific
- * hosts. To find the realm of host a.b.c, it first tries
- * krb4-realm.a.b.c, then krb4-realm.b.c and so on.
- */
-
-static int
-dns_find_realm(char *hostname, char *realm)
-{
-    char domain[MaxHostNameLen + sizeof("krb4-realm..")];
-    char *p;
-    int level = 0;
-    struct dns_reply *r;
-    
-    p = hostname;
-
-    while(1){
-	snprintf(domain, sizeof(domain), "krb4-realm.%s.", p);
-	r = dns_lookup(domain, "TXT");
-	if(r){
-	    struct resource_record *rr = r->head;
-	    while(rr){
-		if(rr->type == T_TXT){
-		    strncpy(realm, rr->u.txt, REALM_SZ);
-		    realm[REALM_SZ - 1] = 0;
-		    dns_free_data(r);
-		    return level;
-		}
-		rr = rr->next;
-	    }
-	    dns_free_data(r);
-	}
-	level++;
-	p = strchr(p, '.');
-	if(p == NULL)
-	    break;
-	p++;
-    }
-    return -1;
-}
-
-
-static FILE *
-open_krb_realms(void)
-{
-  static const char *const files[] = KRB_RLM_FILES;
-  FILE *res;
-  int i;
-  
-  const char *dir = getenv("KRBCONFDIR");
-
-  /* First try user specified file */
-  if (dir != 0) {
-    char fname[MaxPathLen];
-
-    if(k_concat(fname, sizeof(fname), dir, "/krb.realms", NULL) == 0)
-	if ((res = fopen(fname, "r")) != NULL)
-	    return res;
-  }
-
-  for (i = 0; files[i] != 0; i++)
-    if ((res = fopen(files[i], "r")) != NULL)
-      return res;
-
-  return NULL;
-}
-
-char *
-krb_realmofhost(const char *host)
-{
-  static char ret_realm[REALM_SZ];
-  char *domain;
-  FILE *trans_file;
-  char trans_host[MaxHostNameLen];
-  char trans_realm[REALM_SZ];
-  char buf[1024];
-
-  char phost[MaxHostNameLen];
-	
-  krb_name_to_name(host, phost, sizeof(phost));
-	
-  domain = strchr(phost, '.');
-
-  /* prepare default */
-  if(dns_find_realm(phost, ret_realm) < 0){
-      if (domain) {
-	  char *cp;
-	  
-	  strncpy(ret_realm, &domain[1], REALM_SZ);
-	  ret_realm[REALM_SZ - 1] = 0;
-	  /* Upper-case realm */
-	  for (cp = ret_realm; *cp; cp++)
-	      *cp = toupper(*cp);
-      } else {
-	  krb_get_lrealm(ret_realm, 1);
-      }
-  }
-
-  if ((trans_file = open_krb_realms()) == NULL)
-      return(ret_realm); /* krb_errno = KRB_NO_TRANS */
-
-  while (fgets(buf, sizeof(buf), trans_file)) {
-      char *save = NULL;
-      char *tok = strtok_r(buf, " \t\r\n", &save);
-      if(tok == NULL)
-	  continue;
-      strncpy(trans_host, tok, MaxHostNameLen);
-      trans_host[MaxHostNameLen - 1] = 0;
-      tok = strtok_r(NULL, " \t\r\n", &save);
-      if(tok == NULL)
-	  continue;
-      strcpy(trans_realm, tok);
-      trans_realm[REALM_SZ - 1] = 0;
-      if (!strcasecmp(trans_host, phost)) {
-	  /* exact match of hostname, so return the realm */
-	  strcpy(ret_realm, trans_realm);
-	  fclose(trans_file);
-	  return(ret_realm);
-      }
-      if ((trans_host[0] == '.') && domain) { 
-	  char *cp = domain;
-	  do {
-	      if(strcasecmp(trans_host, domain) == 0){
-		  /* domain match, save for later */ 
-		  strcpy(ret_realm, trans_realm);
-		  break;
-	      }
-	      cp = strchr(cp + 1, '.');
-	  } while(MATCH_SUBDOMAINS && cp);
-      }
-  }
-  fclose(trans_file);
-  return ret_realm;
-}
diff --git a/crypto/kerberosIV/lib/krb/getst.c b/crypto/kerberosIV/lib/krb/getst.c
deleted file mode 100644
index de9996264ee6..000000000000
--- a/crypto/kerberosIV/lib/krb/getst.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-#include "krb_locl.h"
-
-RCSID("$Id: getst.c,v 1.6 1997/03/23 03:53:11 joda Exp $");
-
-/*
- * getst() takes a file descriptor, a string and a count.  It reads
- * from the file until either it has read "count" characters, or until
- * it reads a null byte.  When finished, what has been read exists in
- * the given string "s".  If "count" characters were actually read, the
- * last is changed to a null, so the returned string is always null-
- * terminated.  getst() returns the number of characters read, including
- * the null terminator.
- */
-
-int
-getst(int fd, char *s, int n)
-{
-    int count = n;
-    while (read(fd, s, 1) > 0 && --count)
-        if (*s++ == '\0')
-            return (n - count);
-    *s = '\0';
-    return (n - count);
-}
diff --git a/crypto/kerberosIV/lib/krb/gettimeofday.c b/crypto/kerberosIV/lib/krb/gettimeofday.c
deleted file mode 100644
index 734ca5968ee8..000000000000
--- a/crypto/kerberosIV/lib/krb/gettimeofday.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-RCSID("$Id: gettimeofday.c,v 1.5 1997/04/01 08:18:29 joda Exp $");
-
-#ifndef HAVE_GETTIMEOFDAY
-/*
- * Simple gettimeofday that only returns seconds.
- */
-int
-gettimeofday (struct timeval *tp, void *ignore)
-{
-     time_t t;
-
-     t = time(NULL);
-     tp->tv_sec  = t;
-     tp->tv_usec = 0;
-     return 0;
-}
-#endif
diff --git a/crypto/kerberosIV/lib/krb/k_concat.c b/crypto/kerberosIV/lib/krb/k_concat.c
deleted file mode 100644
index e7daa5f047cb..000000000000
--- a/crypto/kerberosIV/lib/krb/k_concat.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: k_concat.c,v 1.5 1997/05/02 08:56:39 joda Exp $");
-
-int
-k_concat (char *s, size_t len, ...)
-{
-    int ret;
-    va_list args;
-
-    va_start(args, len);
-    ret = k_vconcat (s, len, args);
-    va_end(args);
-    return ret;
-}
-
-int
-k_vconcat (char *s, size_t len, va_list args)
-{
-    const char *a;
-
-    while ((a = va_arg(args, const char*))) {
-	size_t n = strlen (a);
-
-	if (n >= len)
-	    return -1;
-	strncpy (s, a, n);
-	s += n;
-	len -= n;
-    }
-    *s = '\0';
-    return 0;
-}
-
-size_t
-k_vmconcat (char **s, size_t max_len, va_list args)
-{
-    const char *a;
-    char *p, *q;
-    size_t len = 0;
-    *s = NULL;
-    p = malloc(1);
-    if(p == NULL)
-	return 0;
-    *p = 0;
-    len = 1;
-    while ((a = va_arg(args, const char*))) {
-	size_t n = strlen (a);
-	
-	if(max_len && len + n > max_len){
-	    free(p);
-	    return 0;
-	}
-	q = realloc(p, len + n);
-	if(q == NULL){
-	    free(p);
-	    return 0;
-	}
-	p = q;
-	len += n;
-	strcat(p, a);
-    }
-    *s = p;
-    return len;
-}
-
-size_t
-k_mconcat (char **s, size_t max_len, ...)
-{
-    int ret;
-    va_list args;
-
-    va_start(args, max_len);
-    ret = k_vmconcat (s, max_len, args);
-    va_end(args);
-    return ret;
-}
-
diff --git a/crypto/kerberosIV/lib/krb/k_flock.c b/crypto/kerberosIV/lib/krb/k_flock.c
deleted file mode 100644
index 844c34c44305..000000000000
--- a/crypto/kerberosIV/lib/krb/k_flock.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: k_flock.c,v 1.8 1997/04/01 08:18:30 joda Exp $");
-
-#define K_OP_MASK (K_LOCK_SH | K_LOCK_EX | K_LOCK_UN)
-
-int
-k_flock(int fd, int operation)
-{
-#ifdef HAVE_FLOCK
-  int op = 0;
-  if (operation & K_LOCK_SH)
-    op |= LOCK_SH;
-  if (operation & K_LOCK_EX)
-    op |= LOCK_EX;
-  if (operation & K_LOCK_UN)
-    op |= LOCK_UN;
-  if (operation & K_LOCK_NB)
-    op |= LOCK_NB;
-
-  return flock(fd, op);
-#elif defined(HAVE_FCNTL) && defined(F_SETLK)
-  struct flock arg;
-  int code, cmd;
-  
-  arg.l_whence = SEEK_SET;
-  arg.l_start = 0;
-  arg.l_len = 0;		/* means to EOF */
-
-  if (operation & K_LOCK_NB)
-    cmd = F_SETLK;
-  else
-    cmd = F_SETLKW;		/* Blocking */
-
-  switch (operation & K_OP_MASK) {
-  case K_LOCK_UN:
-    arg.l_type = F_UNLCK;
-    code = fcntl(fd, F_SETLK, &arg);
-    break;
-  case K_LOCK_SH:
-    arg.l_type = F_RDLCK;
-    code = fcntl(fd, cmd, &arg);
-    break;
-  case K_LOCK_EX:
-    arg.l_type = F_WRLCK;
-    code = fcntl(fd, cmd, &arg);
-    break;
-  default:
-    errno = EINVAL;
-    code = -1;
-    break;
-  }
-  return code;
-#else
-  return -1;
-#endif /* !HAVE_FLOCK */
-}
diff --git a/crypto/kerberosIV/lib/krb/k_gethostname.c b/crypto/kerberosIV/lib/krb/k_gethostname.c
deleted file mode 100644
index 0f4d57f6581b..000000000000
--- a/crypto/kerberosIV/lib/krb/k_gethostname.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-#include "krb_locl.h"
-RCSID("$Id: k_gethostname.c,v 1.10 1997/03/23 03:53:12 joda Exp $");
-
-#ifdef HAVE_SYS_UTSNAME_H
-#include <sys/utsname.h>
-#endif
-
-/*
- * Return the local host's name in "name", up to "namelen" characters.
- * "name" will be null-terminated if "namelen" is big enough.
- * The return code is 0 on success, -1 on failure.  (The calling
- * interface is identical to gethostname(2).)
- */
-
-int
-k_gethostname(char *name, int namelen)
-{
-#if defined(HAVE_GETHOSTNAME)
-    return gethostname(name, namelen);
-#elif defined(HAVE_UNAME)
-    {
-	struct utsname utsname;
-	int ret;
-
-	ret = uname (&utsname);
-	if (ret < 0)
-	    return ret;
-	strncpy (name, utsname.nodename, namelen);
-	name[namelen-1] = '\0';
-	return 0;
-    }
-#else
-    strncpy (name, "some.random.host", namelen);
-    name[namelen-1] = '\0';
-    return 0;
-#endif
-}
diff --git a/crypto/kerberosIV/lib/krb/k_getport.c b/crypto/kerberosIV/lib/krb/k_getport.c
deleted file mode 100644
index c5f9f15f5310..000000000000
--- a/crypto/kerberosIV/lib/krb/k_getport.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: k_getport.c,v 1.10 1997/04/01 08:18:30 joda Exp $");
-
-int
-k_getportbyname (const char *service, const char *proto, int default_port)
-{
-#ifdef HAVE_GETSERVBYNAME  
-    struct servent *sp;
-    
-    sp = getservbyname(service, proto);
-    if(sp != NULL)
-	return sp->s_port;
-    
-    krb_warning ("%s/%s unknown service, using default port %d\n", 
-		 service, proto ? proto : "*", ntohs(default_port));
-#endif
-    return default_port;
-}
diff --git a/crypto/kerberosIV/lib/krb/k_getsockinst.c b/crypto/kerberosIV/lib/krb/k_getsockinst.c
deleted file mode 100644
index 04676b1e4473..000000000000
--- a/crypto/kerberosIV/lib/krb/k_getsockinst.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: k_getsockinst.c,v 1.10 1997/05/02 14:29:17 assar Exp $");
-
-/*
- * Return in inst the name of the local interface bound to socket
- * fd. On Failure return the 'wildcard' instance "*".
- */
-
-int
-k_getsockinst(int fd, char *inst, size_t inst_size)
-{
-  struct sockaddr_in addr;
-  int len = sizeof(addr);
-  struct hostent *hnam;
-
-  if (getsockname(fd, (struct sockaddr *)&addr, &len) < 0)
-    goto fail;
-
-  hnam = gethostbyaddr((char *)&addr.sin_addr,
-		       sizeof(addr.sin_addr),
-		       addr.sin_family);
-  if (hnam == 0)
-    goto fail;
-
-  strncpy (inst, hnam->h_name, inst_size);
-  inst[inst_size - 1] = '\0';
-  k_ricercar(inst); /* Canonicalize name */
-  return 0;			/* Success */
-
- fail:
-  inst[0] = '*';
-  inst[1] = 0;
-  return -1;
-}
diff --git a/crypto/kerberosIV/lib/krb/k_localtime.c b/crypto/kerberosIV/lib/krb/k_localtime.c
deleted file mode 100644
index a6ffb9b7e785..000000000000
--- a/crypto/kerberosIV/lib/krb/k_localtime.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: k_localtime.c,v 1.7 1997/04/01 08:18:31 joda Exp $");
-
-struct tm *k_localtime(u_int32_t *tp)
-{
-  time_t t;
-  t = *tp;
-  return localtime(&t);
-}
diff --git a/crypto/kerberosIV/lib/krb/kdc_reply.c b/crypto/kerberosIV/lib/krb/kdc_reply.c
deleted file mode 100644
index aa012e06d20a..000000000000
--- a/crypto/kerberosIV/lib/krb/kdc_reply.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: kdc_reply.c,v 1.9 1997/04/15 21:52:14 assar Exp $");
-
-static int little_endian; /* XXX ugly */
-
-int
-kdc_reply_cred(KTEXT cip, CREDENTIALS *cred)
-{
-    unsigned char *p = cip->dat;
-    
-    memcpy(cred->session, p, 8);
-    p += 8;
-    
-    if(p + strlen((char*)p) > cip->dat + cip->length)
-	return INTK_BADPW;
-    p += krb_get_string(p, cred->service);
-    
-    if(p + strlen((char*)p) > cip->dat + cip->length)
-	return INTK_BADPW;
-    p += krb_get_string(p, cred->instance);
-    
-    if(p + strlen((char*)p) > cip->dat + cip->length)
-	return INTK_BADPW;
-    p += krb_get_string(p, cred->realm);
-    
-    if(p + 3 > cip->dat + cip->length)
-	return INTK_BADPW;
-    cred->lifetime = *p++;
-    cred->kvno = *p++;
-    cred->ticket_st.length = *p++;
-    
-    if(p + cred->ticket_st.length + 4 > cip->dat + cip->length)
-	return INTK_BADPW;
-    memcpy(cred->ticket_st.dat, p, cred->ticket_st.length);
-    p += cred->ticket_st.length;
-    
-    p += krb_get_int(p, (u_int32_t *)&cred->issue_date, 4, little_endian);
-    
-    return KSUCCESS;
-}
-
-int
-kdc_reply_cipher(KTEXT reply, KTEXT cip)
-{
-    unsigned char *p;
-    unsigned char pvno;
-    unsigned char type;
-
-    char aname[ANAME_SZ];
-    char inst[INST_SZ];
-    char realm[REALM_SZ];
-    
-    u_int32_t kdc_time;
-    u_int32_t exp_date;
-    u_int32_t clen;
-
-    p = reply->dat;
-
-    pvno = *p++;
-
-    if (pvno != KRB_PROT_VERSION )
-        return INTK_PROT;
-    
-    type = *p++;
-    little_endian = type & 1;
-    
-    type &= ~1;
-
-    if(type == AUTH_MSG_ERR_REPLY){
-	u_int32_t code;
-	p += strlen((char*)p) + 1; /* name */
-	p += strlen((char*)p) + 1; /* instance */
-	p += strlen((char*)p) + 1; /* realm */
-	p += 4; /* time */
-	p += krb_get_int(p, &code, 4, little_endian);
-	return code;
-    }
-    if(type != AUTH_MSG_KDC_REPLY)
-	return INTK_PROT;
-
-    p += krb_get_nir(p, aname, inst, realm);
-    p += krb_get_int(p, &kdc_time, 4, little_endian);
-    p++; /* number of tickets */
-    p += krb_get_int(p, &exp_date, 4, little_endian);
-    p++; /* master key version number */
-    p += krb_get_int(p, &clen, 2, little_endian);
-    cip->length = clen;
-    memcpy(cip->dat, p, clen);
-    p += clen;
-    
-    return KSUCCESS;
-}
diff --git a/crypto/kerberosIV/lib/krb/klog.h b/crypto/kerberosIV/lib/krb/klog.h
deleted file mode 100644
index cee92d973c20..000000000000
--- a/crypto/kerberosIV/lib/krb/klog.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * $Id: klog.h,v 1.5 1997/05/11 11:05:28 assar Exp $
- *
- * Copyright 1988 by the Massachusetts Institute of Technology.
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
- *
- * This file defines the types of log messages logged by klog.  Each
- * type of message may be selectively turned on or off. 
- */
-
-#ifndef KLOG_DEFS
-#define KLOG_DEFS
-
-#ifndef KRBLOG
-#define KRBLOG 		"/var/log/kerberos.log"  /* master server  */
-#endif
-#ifndef KRBSLAVELOG
-#define KRBSLAVELOG	"/var/log/kerberos_slave.log"  /* slave server  */
-#endif
-#define	NLOGTYPE	100	/* Maximum number of log msg types  */
-
-#define L_NET_ERR	  1	/* Error in network code	    */
-#define L_NET_INFO	  2	/* Info on network activity	    */
-#define L_KRB_PERR	  3	/* Kerberos protocol errors	    */
-#define L_KRB_PINFO	  4	/* Kerberos protocol info	    */
-#define L_INI_REQ	  5	/* Request for initial ticket	    */
-#define L_NTGT_INTK       6	/* Initial request not for TGT	    */
-#define L_DEATH_REQ       7	/* Request for server death	    */
-#define L_TKT_REQ	  8	/* All ticket requests using a tgt  */
-#define L_ERR_SEXP	  9	/* Service expired		    */
-#define L_ERR_MKV	 10	/* Master key version incorrect     */
-#define L_ERR_NKY	 11	/* User's key is null		    */
-#define L_ERR_NUN	 12	/* Principal not unique		    */
-#define L_ERR_UNK	 13	/* Principal Unknown		    */
-#define L_ALL_REQ	 14	/* All requests			    */
-#define L_APPL_REQ	 15	/* Application requests (using tgt) */
-#define L_KRB_PWARN      16	/* Protocol warning messages	    */
-
-char * klog __P((int type, const char *format, ...))
-#ifdef __GNUC__
-__attribute__ ((format (printf, 2, 3)))
-#endif
-;
-
-#endif /* KLOG_DEFS */
diff --git a/crypto/kerberosIV/lib/krb/kntoln.c b/crypto/kerberosIV/lib/krb/kntoln.c
deleted file mode 100644
index 88b8b25ebe01..000000000000
--- a/crypto/kerberosIV/lib/krb/kntoln.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-/*
- * krb_kntoln converts an auth name into a local name by looking up
- * the auth name in the /etc/aname file.  The format of the aname
- * file is:
- *
- * +-----+-----+-----+-----+------+----------+-------+-------+
- * | anl | inl | rll | lnl | name | instance | realm | lname |
- * +-----+-----+-----+-----+------+----------+-------+-------+
- * | 1by | 1by | 1by | 1by | name | instance | realm | lname |
- * +-----+-----+-----+-----+------+----------+-------+-------+
- *
- * If the /etc/aname file can not be opened it will set the
- * local name to the auth name.  Thus, in this case it performs as
- * the identity function.
- *
- * The name instance and realm are passed to krb_kntoln through
- * the AUTH_DAT structure (ad).
- *
- * Now here's what it *really* does:
- *
- * Given a Kerberos name in an AUTH_DAT structure, check that the
- * instance is null, and that the realm is the same as the local
- * realm, and return the principal's name in "lname".  Return
- * KSUCCESS if all goes well, otherwise KFAILURE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: kntoln.c,v 1.7 1997/03/23 03:53:12 joda Exp $");
-
-int
-krb_kntoln(AUTH_DAT *ad, char *lname)
-{
-    static char lrealm[REALM_SZ] = "";
-
-    if (!(*lrealm) && (krb_get_lrealm(lrealm,1) == KFAILURE))
-        return(KFAILURE);
-
-    if (strcmp(ad->pinst, ""))
-        return(KFAILURE);
-    if (strcmp(ad->prealm, lrealm))
-        return(KFAILURE);
-    strcpy(lname, ad->pname);
-    return(KSUCCESS);
-}
-
-#if 0
-/* Posted to usenet by "Derrick J. Brashear" <shadow+@andrew.cmu.edu> */
-
-#include <krb.h>
-#include <ndbm.h>
-#include <stdio.h>
-#include <sys/file.h>
-#include <strings.h>
-#include <sys/syslog.h>
-#include <sys/errno.h>
-
-extern int errno;
-/*
- * antoln converts an authentication name into a local name by looking up
- * the authentication name in the /etc/aname dbm database.
- * 
- * If the /etc/aname file can not be opened it will set the 
- * local name to the principal name.  Thus, in this case it performs as 
- * the identity function.
- * 
- * The name instance and realm are passed to antoln through
- * the AUTH_DAT structure (ad).
- */
-
-static char     lrealm[REALM_SZ] = "";
-
-an_to_ln(ad,lname)
-AUTH_DAT        *ad;
-char            *lname;
-{
-        static DBM *aname = NULL;
-        char keyname[ANAME_SZ+INST_SZ+REALM_SZ+2];
-
-        if(!(*lrealm) && (krb_get_lrealm(lrealm,1) == KFAILURE))
-                return(KFAILURE);
-
-        if((strcmp(ad->pinst,"") && strcmp(ad->pinst,"root")) ||
-strcmp(ad->prealm,lrealm)) {
-                datum val;
-                datum key;
-                /*
-                 * Non-local name (or) non-null and non-root instance.
-                 * Look up in dbm file.
-                 */
-                if (!aname) {
-                        if ((aname = dbm_open("/etc/aname", O_RDONLY, 0))
-                            == NULL) return (KFAILURE);
-                }
-                /* Construct dbm lookup key. */
-                an_to_a(ad, keyname);
-                key.dptr = keyname;
-                key.dsize = strlen(keyname)+1;
-                flock(dbm_dirfno(aname), LOCK_SH);
-                val = dbm_fetch(aname, key);
-                flock(dbm_dirfno(aname), LOCK_UN);
-                if (!val.dptr) {
-                  dbm_close(aname);
-                  return(KFAILURE);
-                }
-                /* Got it! */
-                strcpy(lname,val.dptr);
-                return(KSUCCESS);
-        } else strcpy(lname,ad->pname);
-        return(KSUCCESS);
-}
-
-an_to_a(ad, str)
-        AUTH_DAT *ad;
-        char *str;
-{
-        strcpy(str, ad->pname);
-        if(*ad->pinst) {
-                strcat(str, ".");
-                strcat(str, ad->pinst);
-        }
-        strcat(str, "@");
-        strcat(str, ad->prealm);
-}
-
-/*
- * Parse a string of the form "user[.instance][@realm]" 
- * into a struct AUTH_DAT.
- */
-
-a_to_an(str, ad)
-        AUTH_DAT *ad;
-        char *str;
-{
-        char *buf = (char *)malloc(strlen(str)+1);
-        char *rlm, *inst, *princ;
-
-        if(!(*lrealm) && (krb_get_lrealm(lrealm,1) == KFAILURE)) {
-                free(buf);
-                return(KFAILURE);
-        }
-        /* destructive string hacking is more fun.. */
-        strcpy(buf, str);
-
-        if (rlm = index(buf, '@')) {
-                *rlm++ = '\0';
-        }
-        if (inst = index(buf, '.')) {
-                *inst++ = '\0';
-        }
-        strcpy(ad->pname, buf);
-        if(inst) strcpy(ad->pinst, inst);
-        else *ad->pinst = '\0';
-        if (rlm) strcpy(ad->prealm, rlm);
-        else strcpy(ad->prealm, lrealm);
-        free(buf);
-        return(KSUCCESS);
-}
-#endif
diff --git a/crypto/kerberosIV/lib/krb/krb.def b/crypto/kerberosIV/lib/krb/krb.def
deleted file mode 100644
index da2e906ac7dc..000000000000
--- a/crypto/kerberosIV/lib/krb/krb.def
+++ /dev/null
@@ -1,92 +0,0 @@
-LIBRARY	"krb"  BASE=0x07000000
-
-DESCRIPTION "Dynamic link library for kerberos version 4"
-VERSION 1.0
-
-EXPORTS
-	krb_get_err_text
-	
-	newTktMem
-	getTktMem
-	firstCred
-	nextCredIndex
-	currCredIndex
-	nextFreeIndex
-	
-	k_flock
-	k_localtime
-	k_getsockinst
-	k_getportbyname
-	k_get_all_addrs
-
-	krb_equiv
-
-	afs_string_to_key
-
-	krb_life_to_time
-	krb_time_to_life
-	krb_life_to_atime
-	krb_atime_to_life
-
-	tf_get_cred
-	tf_get_pinst
-	tf_get_pname
-	tf_put_pinst
-	tf_put_pname
-	tf_init
-	tf_create
-	tf_save_cred
-	tf_close
-
-	krb_mk_priv
-	krb_rd_priv
-
-	create_auth_reply
-	krb_get_phost
-	krb_realmofhost
-	tkt_string
-	create_ciph
-	decomp_ticket
-	dest_tkt
-	get_ad_tkt
-	in_tkt
-	k_gethostname
-	k_isinst
-	k_isname
-	k_isrealm
-	kname_parse
-	krb_create_ticket
-	krb_get_admhst
-	krb_get_cred
-	krb_get_in_tkt
-	krb_get_krbhst
-	krb_get_lrealm
-	krb_get_default_realm
-	krb_get_pw_in_tkt
-	krb_get_svc_in_tkt
-	krb_get_tf_fullname
-	krb_get_tf_realm
-	krb_kntoln
-	krb_mk_req
-	krb_net_read
-	krb_net_write
-	krb_rd_err
-	krb_rd_req
-	krb_recvauth
-	krb_sendauth
-	krb_set_key
-	krb_set_lifetime 
-	read_service_key
-	save_credentials
-	send_to_kdc
-	krb_mk_err
-	krb_mk_safe
-	krb_rd_safe
-	ad_print
-	cr_err_reply
-	krb_set_tkt_string
-	krb_get_default_principal
-	krb_realm_parse
-	krb_verify_user
-	kset_logfile
-	getst
diff --git a/crypto/kerberosIV/lib/krb/krb.h b/crypto/kerberosIV/lib/krb/krb.h
deleted file mode 100644
index 90ca0aba406c..000000000000
--- a/crypto/kerberosIV/lib/krb/krb.h
+++ /dev/null
@@ -1,566 +0,0 @@
-/*
- * $Id$
- *
- * Copyright 1987, 1988 by the Massachusetts Institute of Technology. 
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>. 
- *
- * Include file for the Kerberos library. 
- */
-
-/* Only one time, please */
-#ifndef	KRB_DEFS
-#define KRB_DEFS
-
-#include <sys/types.h>
-#include <sys/cdefs.h>
-#include <stdarg.h>
-#include <time.h>
-
-__BEGIN_DECLS
-
-#ifndef __P
-#define __P(x) x
-#endif
-
-/* Need some defs from des.h	 */
-#if !defined(NOPROTO) && !defined(__STDC__)
-#define NOPROTO
-#endif
-#include <des.h>
-
-/* Don't use these guys, they are only for compatibility with CNS. */
-#ifndef KRB_INT32
-#define KRB_INT32 int32_t
-#endif
-#ifndef KRB_UINT32
-#define KRB_UINT32 u_int32_t
-#endif
-
-/* Global library variables. */
-extern int krb_ignore_ip_address; /* To turn off IP address comparison */
-extern int krb_no_long_lifetimes; /* To disable AFS compatible lifetimes */
-extern int krbONE;
-#define         HOST_BYTE_ORDER (* (char *) &krbONE)
-
-/* Text describing error codes */
-#define		MAX_KRB_ERRORS	256
-extern const char *krb_err_txt[MAX_KRB_ERRORS];
-
-/* Use this function rather than indexing in krb_err_txt */
-const char *krb_get_err_text __P((int code));
-
-
-/* General definitions */
-#define		KSUCCESS	0
-#define		KFAILURE	255
-
-/*
- * Kerberos specific definitions 
- *
- * KRBLOG is the log file for the kerberos master server. KRB_CONF is
- * the configuration file where different host machines running master
- * and slave servers can be found. KRB_MASTER is the name of the
- * machine with the master database.  The admin_server runs on this
- * machine, and all changes to the db (as opposed to read-only
- * requests, which can go to slaves) must go to it. KRB_HOST is the
- * default machine * when looking for a kerberos slave server.  Other
- * possibilities are * in the KRB_CONF file. KRB_REALM is the name of
- * the realm. 
- */
-
-/* /etc/kerberosIV is only for backwards compatibility, don't use it! */
-/* FreeBSD wants to maintain backwards compatibility */
-#ifndef KRB_CONF
-#define KRB_CONF	"/etc/kerberosIV/krb.conf"
-#endif
-#ifndef KRB_RLM_TRANS
-#define KRB_RLM_TRANS   "/etc/kerberosIV/krb.realms"
-#endif
-#ifndef KRB_CNF_FILES
-#define KRB_CNF_FILES	{ KRB_CONF,   "/etc/krb.conf", 0}
-#endif
-#ifndef KRB_RLM_FILES
-#define KRB_RLM_FILES	{ KRB_RLM_TRANS, "/etc/krb.realms", 0}
-#endif
-#ifndef KRB_EQUIV
-#define KRB_EQUIV	"/etc/kerberosIV/krb.equiv"
-#endif
-#define KRB_MASTER	"kerberos"
-#ifndef KRB_REALM
-#define KRB_REALM	(krb_get_default_realm())
-#endif
-
-/* The maximum sizes for aname, realm, sname, and instance +1 */
-#define 	ANAME_SZ	40
-#define		REALM_SZ	40
-#define		SNAME_SZ	40
-#define		INST_SZ		40
-/* Leave space for quoting */
-#define		MAX_K_NAME_SZ	(2*ANAME_SZ + 2*INST_SZ + 2*REALM_SZ - 3)
-#define		KKEY_SZ		100
-#define		VERSION_SZ	1
-#define		MSG_TYPE_SZ	1
-#define		DATE_SZ		26	/* RTI date output */
-
-#define MAX_HSTNM 100 /* for compatibility */
-
-typedef struct krb_principal{
-    char name[ANAME_SZ];
-    char instance[INST_SZ];
-    char realm[REALM_SZ];
-}krb_principal;
-
-#ifndef DEFAULT_TKT_LIFE	/* allow compile-time override */
-/* default lifetime for krb_mk_req & co., 10 hrs */
-#define	DEFAULT_TKT_LIFE 120
-#endif
-
-#define		KRB_TICKET_GRANTING_TICKET	"krbtgt"
-
-/* Definition of text structure used to pass text around */
-#define		MAX_KTXT_LEN	1250
-
-struct ktext {
-    unsigned int length;		/* Length of the text */
-    unsigned char dat[MAX_KTXT_LEN];	/* The data itself */
-    u_int32_t mbz;		/* zero to catch runaway strings */
-};
-
-typedef struct ktext *KTEXT;
-typedef struct ktext KTEXT_ST;
-
-
-/* Definitions for send_to_kdc */
-#define	CLIENT_KRB_TIMEOUT	4	/* time between retries */
-#define CLIENT_KRB_RETRY	5	/* retry this many times */
-#define	CLIENT_KRB_BUFLEN	512	/* max unfragmented packet */
-
-/* Definitions for ticket file utilities */
-#define	R_TKT_FIL	0
-#define	W_TKT_FIL	1
-
-/* Parameters for rd_ap_req */
-/* Maximum alloable clock skew in seconds */
-#define 	CLOCK_SKEW	5*60
-/* Filename for readservkey */
-#ifndef		KEYFILE
-#define		KEYFILE		"/etc/kerberosIV/srvtab"
-#endif
-
-/* Structure definition for rd_ap_req */
-
-struct auth_dat {
-    unsigned char k_flags;	/* Flags from ticket */
-    char    pname[ANAME_SZ];	/* Principal's name */
-    char    pinst[INST_SZ];	/* His Instance */
-    char    prealm[REALM_SZ];	/* His Realm */
-    u_int32_t checksum;		/* Data checksum (opt) */
-    des_cblock session;		/* Session Key */
-    int     life;		/* Life of ticket */
-    u_int32_t time_sec;		/* Time ticket issued */
-    u_int32_t address;		/* Address in ticket */
-    KTEXT_ST reply;		/* Auth reply (opt) */
-};
-
-typedef struct auth_dat AUTH_DAT;
-
-/* Structure definition for credentials returned by get_cred */
-
-struct credentials {
-    char    service[ANAME_SZ];	/* Service name */
-    char    instance[INST_SZ];	/* Instance */
-    char    realm[REALM_SZ];	/* Auth domain */
-    des_cblock session;		/* Session key */
-    int     lifetime;		/* Lifetime */
-    int     kvno;		/* Key version number */
-    KTEXT_ST ticket_st;		/* The ticket itself */
-    int32_t    issue_date;	/* The issue time */
-    char    pname[ANAME_SZ];	/* Principal's name */
-    char    pinst[INST_SZ];	/* Principal's instance */
-};
-
-typedef struct credentials CREDENTIALS;
-
-/* Structure definition for rd_private_msg and rd_safe_msg */
-
-struct msg_dat {
-    unsigned char *app_data;	/* pointer to appl data */
-    u_int32_t app_length;	/* length of appl data */
-    u_int32_t hash;		/* hash to lookup replay */
-    int     swap;		/* swap bytes? */
-    int32_t    time_sec;		/* msg timestamp seconds */
-    unsigned char time_5ms;	/* msg timestamp 5ms units */
-};
-
-typedef struct msg_dat MSG_DAT;
-
-struct krb_host {
-    char *realm;
-    char *host;
-    int proto;
-    int port;
-    int admin;
-};
-
-struct krb_host *krb_get_host __P((int, char*, int));
-
-
-/* Location of ticket file for save_cred and get_cred */
-#define TKT_FILE        tkt_string()
-#define TKT_ROOT        "/tmp/tkt_"
-
-/* Error codes returned from the KDC */
-#define		KDC_OK		0	/* Request OK */
-#define		KDC_NAME_EXP	1	/* Principal expired */
-#define		KDC_SERVICE_EXP	2	/* Service expired */
-#define		KDC_AUTH_EXP	3	/* Auth expired */
-#define		KDC_PKT_VER	4	/* Protocol version unknown */
-#define		KDC_P_MKEY_VER	5	/* Wrong master key version */
-#define		KDC_S_MKEY_VER 	6	/* Wrong master key version */
-#define		KDC_BYTE_ORDER	7	/* Byte order unknown */
-#define		KDC_PR_UNKNOWN	8	/* Principal unknown */
-#define		KDC_PR_N_UNIQUE 9	/* Principal not unique */
-#define		KDC_NULL_KEY   10	/* Principal has null key */
-#define		KDC_GEN_ERR    20	/* Generic error from KDC */
-
-
-/* Values returned by get_credentials */
-#define		GC_OK		0	/* Retrieve OK */
-#define		RET_OK		0	/* Retrieve OK */
-#define		GC_TKFIL       21	/* Can't read ticket file */
-#define		RET_TKFIL      21	/* Can't read ticket file */
-#define		GC_NOTKT       22	/* Can't find ticket or TGT */
-#define		RET_NOTKT      22	/* Can't find ticket or TGT */
-
-
-/* Values returned by mk_ap_req	 */
-#define		MK_AP_OK	0	/* Success */
-#define		MK_AP_TGTEXP   26	/* TGT Expired */
-
-/* Values returned by rd_ap_req */
-#define		RD_AP_OK	0	/* Request authentic */
-#define		RD_AP_UNDEC    31	/* Can't decode authenticator */
-#define		RD_AP_EXP      32	/* Ticket expired */
-#define		RD_AP_NYV      33	/* Ticket not yet valid */
-#define		RD_AP_REPEAT   34	/* Repeated request */
-#define		RD_AP_NOT_US   35	/* The ticket isn't for us */
-#define		RD_AP_INCON    36	/* Request is inconsistent */
-#define		RD_AP_TIME     37	/* delta_t too big */
-#define		RD_AP_BADD     38	/* Incorrect net address */
-#define		RD_AP_VERSION  39	/* protocol version mismatch */
-#define		RD_AP_MSG_TYPE 40	/* invalid msg type */
-#define		RD_AP_MODIFIED 41	/* message stream modified */
-#define		RD_AP_ORDER    42	/* message out of order */
-#define		RD_AP_UNAUTHOR 43	/* unauthorized request */
-
-/* Values returned by get_pw_tkt */
-#define		GT_PW_OK	0	/* Got password changing tkt */
-#define		GT_PW_NULL     51	/* Current PW is null */
-#define		GT_PW_BADPW    52	/* Incorrect current password */
-#define		GT_PW_PROT     53	/* Protocol Error */
-#define		GT_PW_KDCERR   54	/* Error returned by KDC */
-#define		GT_PW_NULLTKT  55	/* Null tkt returned by KDC */
-
-
-/* Values returned by send_to_kdc */
-#define		SKDC_OK		0	/* Response received */
-#define		SKDC_RETRY     56	/* Retry count exceeded */
-#define		SKDC_CANT      57	/* Can't send request */
-
-/*
- * Values returned by get_intkt
- * (can also return SKDC_* and KDC errors)
- */
-
-#define		INTK_OK		0	/* Ticket obtained */
-#define		INTK_W_NOTALL  61	/* Not ALL tickets returned */
-#define		INTK_BADPW     62	/* Incorrect password */
-#define		INTK_PROT      63	/* Protocol Error */
-#define		INTK_ERR       70	/* Other error */
-
-/* Values returned by get_adtkt */
-#define         AD_OK           0	/* Ticket Obtained */
-#define         AD_NOTGT       71	/* Don't have tgt */
-#define         AD_INTR_RLM_NOTGT 72	/* Can't get inter-realm tgt */
-
-/* Error codes returned by ticket file utilities */
-#define		NO_TKT_FIL	76	/* No ticket file found */
-#define		TKT_FIL_ACC	77	/* Couldn't access tkt file */
-#define		TKT_FIL_LCK	78	/* Couldn't lock ticket file */
-#define		TKT_FIL_FMT	79	/* Bad ticket file format */
-#define		TKT_FIL_INI	80	/* tf_init not called first */
-
-/* Error code returned by kparse_name */
-#define		KNAME_FMT	81	/* Bad Kerberos name format */
-
-/* Error code returned by krb_mk_safe */
-#define		SAFE_PRIV_ERROR	-1	/* syscall error */
-
-/*
- * macros for byte swapping; also scratch space
- * u_quad  0-->7, 1-->6, 2-->5, 3-->4, 4-->3, 5-->2, 6-->1, 7-->0
- * u_int32_t  0-->3, 1-->2, 2-->1, 3-->0
- * u_int16_t 0-->1, 1-->0
- */
-
-#define     swap_u_16(x) {\
- u_int32_t   _krb_swap_tmp[4];\
- swab(((char *) x) +0, ((char *)  _krb_swap_tmp) +14 ,2); \
- swab(((char *) x) +2, ((char *)  _krb_swap_tmp) +12 ,2); \
- swab(((char *) x) +4, ((char *)  _krb_swap_tmp) +10 ,2); \
- swab(((char *) x) +6, ((char *)  _krb_swap_tmp) +8  ,2); \
- swab(((char *) x) +8, ((char *)  _krb_swap_tmp) +6 ,2); \
- swab(((char *) x) +10,((char *)  _krb_swap_tmp) +4 ,2); \
- swab(((char *) x) +12,((char *)  _krb_swap_tmp) +2 ,2); \
- swab(((char *) x) +14,((char *)  _krb_swap_tmp) +0 ,2); \
- memcpy(x, _krb_swap_tmp, 16);\
-                            }
-
-#define     swap_u_12(x) {\
- u_int32_t   _krb_swap_tmp[4];\
- swab(( char *) x,     ((char *)  _krb_swap_tmp) +10 ,2); \
- swab(((char *) x) +2, ((char *)  _krb_swap_tmp) +8 ,2); \
- swab(((char *) x) +4, ((char *)  _krb_swap_tmp) +6 ,2); \
- swab(((char *) x) +6, ((char *)  _krb_swap_tmp) +4 ,2); \
- swab(((char *) x) +8, ((char *)  _krb_swap_tmp) +2 ,2); \
- swab(((char *) x) +10,((char *)  _krb_swap_tmp) +0 ,2); \
- memcpy(x, _krb_swap_tmp, 12);\
-                            }
-
-#define     swap_C_Block(x) {\
- u_int32_t   _krb_swap_tmp[4];\
- swab(( char *) x,    ((char *)  _krb_swap_tmp) +6 ,2); \
- swab(((char *) x) +2,((char *)  _krb_swap_tmp) +4 ,2); \
- swab(((char *) x) +4,((char *)  _krb_swap_tmp) +2 ,2); \
- swab(((char *) x) +6,((char *)  _krb_swap_tmp)    ,2); \
- memcpy(x, _krb_swap_tmp, 8);\
-                            }
-#define     swap_u_quad(x) {\
- u_int32_t   _krb_swap_tmp[4];\
- swab(( char *) &x,    ((char *)  _krb_swap_tmp) +6 ,2); \
- swab(((char *) &x) +2,((char *)  _krb_swap_tmp) +4 ,2); \
- swab(((char *) &x) +4,((char *)  _krb_swap_tmp) +2 ,2); \
- swab(((char *) &x) +6,((char *)  _krb_swap_tmp)    ,2); \
- memcpy(x, _krb_swap_tmp, 8);\
-                            }
-
-#define     swap_u_long(x) {\
- u_int32_t   _krb_swap_tmp[4];\
- swab((char *)  &x,    ((char *)  _krb_swap_tmp) +2 ,2); \
- swab(((char *) &x) +2,((char *)  _krb_swap_tmp),2); \
- x = _krb_swap_tmp[0];   \
-                           }
-
-#define     swap_u_short(x) {\
- u_int16_t	_krb_swap_sh_tmp; \
- swab((char *)  &x,    ( &_krb_swap_sh_tmp) ,2); \
- x = (u_int16_t) _krb_swap_sh_tmp; \
-                            }
-/* Kerberos ticket flag field bit definitions */
-#define K_FLAG_ORDER    0       /* bit 0 --> lsb */
-#define K_FLAG_1                /* reserved */
-#define K_FLAG_2                /* reserved */
-#define K_FLAG_3                /* reserved */
-#define K_FLAG_4                /* reserved */
-#define K_FLAG_5                /* reserved */
-#define K_FLAG_6                /* reserved */
-#define K_FLAG_7                /* reserved, bit 7 --> msb */
-
-/* Defines for krb_sendauth and krb_recvauth */
-
-#define	KOPT_DONT_MK_REQ 0x00000001 /* don't call krb_mk_req */
-#define	KOPT_DO_MUTUAL   0x00000002 /* do mutual auth */
-
-#define	KOPT_DONT_CANON  0x00000004 /*
-				     * don't canonicalize inst as
-				     * a hostname
-				     */
-
-#define	KRB_SENDAUTH_VLEN 8	    /* length for version strings */
-
-
-/* File locking */
-#define   K_LOCK_SH   1		/* Shared lock */
-#define   K_LOCK_EX   2		/* Exclusive lock */
-#define   K_LOCK_NB   4		/* Don't block when locking */
-#define   K_LOCK_UN   8		/* Unlock */
-int k_flock __P((int fd, int operation));
-struct tm *k_localtime __P((u_int32_t *));
-int k_getsockinst __P((int fd, char *inst, size_t));
-int k_getportbyname __P((const char *service, const char *proto, int default_port));
-
-extern char *krb4_version;
-
-struct in_addr;
-
-int k_get_all_addrs __P((struct in_addr **l));
-
-/* Host address comparison */
-int krb_equiv __P((u_int32_t, u_int32_t));
-
-/* Password conversion */
-void mit_string_to_key __P((char *str, char *cell, des_cblock *key));
-void afs_string_to_key __P((char *str, char *cell, des_cblock *key));
-
-/* Lifetime conversion */
-u_int32_t krb_life_to_time __P((u_int32_t start, int life));
-int krb_time_to_life __P((u_int32_t start, u_int32_t end));
-char *krb_life_to_atime __P((int life));
-int krb_atime_to_life __P((char *atime));
-
-/* Ticket manipulation */
-int tf_get_cred __P((CREDENTIALS *));
-int tf_get_pinst __P((char *));
-int tf_get_pname __P((char *));
-int tf_put_pinst __P((char *));
-int tf_put_pname __P((char *));
-int tf_init __P((char *, int));
-int tf_create __P((char *));
-int tf_save_cred __P((char *, char *, char *, unsigned char *, int , int , KTEXT ticket, u_int32_t));
-void tf_close __P((void));
-int tf_setup __P((CREDENTIALS *cred, char *pname, char *pinst));
-
-/* Private communication */
-
-struct sockaddr_in;
-
-int32_t krb_mk_priv __P((void *, void *, u_int32_t, struct des_ks_struct *, des_cblock *, struct sockaddr_in *, struct sockaddr_in *));
-int32_t krb_rd_priv __P((void *, u_int32_t, struct des_ks_struct *, des_cblock *, struct sockaddr_in *, struct sockaddr_in *, MSG_DAT *));
-
-/* Misc */
-KTEXT create_auth_reply __P((char *, char *, char *, int32_t, int, u_int32_t, int, KTEXT));
-
-char *krb_get_phost __P((const char *));
-char *krb_realmofhost __P((const char *));
-char *tkt_string __P((void));
-
-int create_ciph __P((KTEXT, unsigned char *, char *, char *, char *, u_int32_t, int, KTEXT, u_int32_t, des_cblock *));
-int decomp_ticket __P((KTEXT, unsigned char *, char *, char *, char *, u_int32_t *, unsigned char *, int *, u_int32_t *, char *, char *, des_cblock *, struct des_ks_struct *));
-int dest_tkt __P((void));
-int get_ad_tkt __P((char *, char *, char *, int));
-int get_pw_tkt __P((char *, char *, char *, char *));
-int get_request __P((KTEXT, int, char **, char **));
-int in_tkt __P((char *, char *));
-int k_gethostname __P((char *, int ));
-int k_isinst __P((char *));
-int k_isname __P((char *));
-int k_isrealm __P((char *));
-int kname_parse __P((char *, char *, char *, char *));
-int krb_parse_name __P((const char*, krb_principal*));
-char *krb_unparse_name  __P((krb_principal*));
-char *krb_unparse_name_r  __P((krb_principal*, char*));
-char *krb_unparse_name_long  __P((char*, char*, char*));
-char *krb_unparse_name_long_r __P((char *name, char *instance, char *realm, char *fullname));
-int krb_create_ticket __P((KTEXT, unsigned char, char *, char *, char *, int32_t, void *, int16_t, int32_t, char *, char *, des_cblock *));
-int krb_get_admhst __P((char *, char *, int));
-int krb_get_cred __P((char *, char *, char *, CREDENTIALS *));
-
-typedef int (*key_proc_t) __P((char*, char*, char*, void*, des_cblock*));
-
-typedef int (*decrypt_proc_t) __P((char*, char*, char*, void*, 
-			      key_proc_t, KTEXT*));
-
-int krb_get_in_tkt __P((char*, char*, char*, char*, char*, int, key_proc_t, 
-			decrypt_proc_t, void*));
-
-int srvtab_to_key	__P((char *, char *, char *, void *, des_cblock *));
-int passwd_to_key	__P((char *, char *, char *, void *, des_cblock *));
-int passwd_to_afskey	__P((char *, char *, char *, void *, des_cblock *));
-
-int krb_get_krbhst __P((char *, char *, int));
-int krb_get_lrealm __P((char *, int));
-char *krb_get_default_realm __P((void));
-int krb_get_pw_in_tkt __P((char *, char *, char *, char *, char *, int, char *));
-int krb_get_svc_in_tkt __P((char *, char *, char *, char *, char *, int, char *));
-int krb_get_tf_fullname __P((char *, char *, char *, char *));
-int krb_get_tf_realm __P((char *, char *));
-int krb_kntoln __P((AUTH_DAT *, char *));
-int krb_mk_req __P((KTEXT , char *, char *, char *, int32_t));
-int krb_net_read __P((int , void *, size_t));
-int krb_net_write __P((int , const void *, size_t));
-int krb_rd_err __P((u_char *, u_int32_t, int32_t *, MSG_DAT *));
-int krb_rd_req __P((KTEXT , char *, char *, int32_t, AUTH_DAT *, char *));
-int krb_recvauth __P((int32_t, int, KTEXT, char *, char *, struct sockaddr_in *, struct sockaddr_in *, AUTH_DAT *, char *, struct des_ks_struct *, char *));
-int krb_sendauth __P((int32_t, int, KTEXT, char *,char *, char *, u_int32_t, MSG_DAT *, CREDENTIALS *, struct des_ks_struct *, struct sockaddr_in *, struct sockaddr_in *, char *));
-int krb_mk_auth __P((int32_t, KTEXT, char *, char *, char *, u_int32_t, char *, KTEXT));
-int krb_check_auth __P((KTEXT, u_int32_t, MSG_DAT *, des_cblock *, struct des_ks_struct *, struct sockaddr_in *, struct sockaddr_in *));
-int krb_set_key __P((void *, int));
-int krb_set_lifetime __P((int));
-int krb_kuserok __P((char *name, char *inst, char *realm, char *luser));
-int kuserok __P((AUTH_DAT *, char *));
-int read_service_key __P((char *, char *, char *, int , char *, char *));
-int save_credentials __P((char *, char *, char *, unsigned char *, int , int , KTEXT , int32_t));
-int send_to_kdc __P((KTEXT , KTEXT , char *));
-
-int32_t krb_mk_err __P((u_char *, int32_t, char *));
-int32_t krb_mk_safe __P((void *, void *, u_int32_t, des_cblock *, struct sockaddr_in *, struct sockaddr_in *));
-int32_t krb_rd_safe __P((void *, u_int32_t, des_cblock *, struct sockaddr_in *, struct sockaddr_in *, MSG_DAT *));
-
-void ad_print __P((AUTH_DAT *));
-void cr_err_reply __P((KTEXT, char *, char *, char *, u_int32_t, u_int32_t, char *));
-void extract_ticket __P((KTEXT, int, char *, int *, int *, char *, KTEXT));
-void krb_set_tkt_string __P((char *));
-
-int krb_get_default_principal __P((char *, char *, char *));
-int krb_realm_parse __P((char *, int));
-int krb_verify_user __P((char*, char*, char*, char*, int, char *));
-
-/* logging.c */
-
-typedef int (*krb_log_func_t)(FILE *, const char *, va_list);
-
-typedef krb_log_func_t krb_warnfn_t;
-
-struct krb_log_facility;
-
-int krb_vlogger __P((struct krb_log_facility*, const char *, va_list))
-#ifdef __GNUC__
-__attribute__ ((format (printf, 2, 0)))
-#endif
-;
-int krb_logger __P((struct krb_log_facility*, const char *, ...))
-#ifdef __GNUC__
-__attribute__ ((format (printf, 2, 3)))
-#endif
-;
-int krb_openlog __P((struct krb_log_facility*, char*, FILE*, krb_log_func_t));
-
-void krb_set_warnfn  __P((krb_warnfn_t));
-krb_warnfn_t krb_get_warnfn  __P((void));
-void krb_warning  __P((const char*, ...))
-#ifdef __GNUC__
-__attribute__ ((format (printf, 1, 2)))
-#endif
-;
-
-void kset_logfile __P((char*));
-void krb_log __P((const char*, ...))
-#ifdef __GNUC__
-__attribute__ ((format (printf, 1, 2)))
-#endif
-;
-char *klog __P((int, const char*, ...))
-#ifdef __GNUC__
-__attribute__ ((format (printf, 2, 3)))
-#endif
-;
-
-int getst __P((int, char *, int));
-const char *month_sname __P((int));
-const char *krb_stime __P((time_t *));
-int krb_check_tm __P((struct tm));
-
-int krb_get_int __P((void *from, u_int32_t *to, int size, int lsb));
-int krb_put_int __P((u_int32_t from, void *to, int size));
-int krb_get_address __P((void *from, u_int32_t *to));
-int krb_put_address __P((u_int32_t addr, void *to));
-int krb_put_string __P((char *from, void *to));
-int krb_get_string __P((void *from, char *to));
-int krb_get_nir __P((void *from, char *name, char *instance, char *realm));
-int krb_put_nir __P((char *name, char *instance, char *realm, void *to));
-
-__END_DECLS
-
-#endif /* KRB_DEFS */
diff --git a/crypto/kerberosIV/lib/krb/krb.mak b/crypto/kerberosIV/lib/krb/krb.mak
deleted file mode 100644
index 1236261a0818..000000000000
--- a/crypto/kerberosIV/lib/krb/krb.mak
+++ /dev/null
@@ -1,3065 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Format Version 4.10
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-!IF "$(CFG)" == ""
-CFG=krb - Win32 Debug
-!MESSAGE No configuration specified.  Defaulting to krb - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "krb - Win32 Release" && "$(CFG)" != "krb - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE on this makefile
-!MESSAGE by defining the macro CFG on the command line.  For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "krb.mak" CFG="krb - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "krb - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "krb - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-################################################################################
-# Begin Project
-# PROP Target_Last_Scanned "krb - Win32 Debug"
-RSC=rc.exe
-MTL=mktyplib.exe
-CPP=cl.exe
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-OUTDIR=.\Release
-INTDIR=.\Release
-
-ALL : ".\Release\krb.dll"
-
-CLEAN : 
-	-@erase ".\Release\cr_err_reply.obj"
-	-@erase ".\Release\create_auth_reply.obj"
-	-@erase ".\Release\create_ciph.obj"
-	-@erase ".\Release\create_ticket.obj"
-	-@erase ".\Release\debug_decl.obj"
-	-@erase ".\Release\decomp_ticket.obj"
-	-@erase ".\Release\dllmain.obj"
-	-@erase ".\Release\encrypt_ktext.obj"
-	-@erase ".\Release\et_list.obj"
-	-@erase ".\Release\get_ad_tkt.obj"
-	-@erase ".\Release\get_cred.obj"
-	-@erase ".\Release\get_default_principal.obj"
-	-@erase ".\Release\get_host.obj"
-	-@erase ".\Release\get_in_tkt.obj"
-	-@erase ".\Release\get_krbrlm.obj"
-	-@erase ".\Release\get_phost.obj"
-	-@erase ".\Release\get_svc_in_tkt.obj"
-	-@erase ".\Release\get_tf_fullname.obj"
-	-@erase ".\Release\get_tf_realm.obj"
-	-@erase ".\Release\getaddrs.obj"
-	-@erase ".\Release\getrealm.obj"
-	-@erase ".\Release\getst.obj"
-	-@erase ".\Release\k_flock.obj"
-	-@erase ".\Release\k_gethostname.obj"
-	-@erase ".\Release\k_getport.obj"
-	-@erase ".\Release\k_getsockinst.obj"
-	-@erase ".\Release\k_localtime.obj"
-	-@erase ".\Release\kdc_reply.obj"
-	-@erase ".\Release\kntoln.obj"
-	-@erase ".\Release\krb.dll"
-	-@erase ".\Release\krb.exp"
-	-@erase ".\Release\krb.lib"
-	-@erase ".\Release\krb_check_auth.obj"
-	-@erase ".\Release\krb_equiv.obj"
-	-@erase ".\Release\krb_err_txt.obj"
-	-@erase ".\Release\krb_get_in_tkt.obj"
-	-@erase ".\Release\lifetime.obj"
-	-@erase ".\Release\logging.obj"
-	-@erase ".\Release\lsb_addr_comp.obj"
-	-@erase ".\Release\mk_auth.obj"
-	-@erase ".\Release\mk_err.obj"
-	-@erase ".\Release\mk_priv.obj"
-	-@erase ".\Release\mk_req.obj"
-	-@erase ".\Release\mk_safe.obj"
-	-@erase ".\Release\month_sname.obj"
-	-@erase ".\Release\name2name.obj"
-	-@erase ".\Release\netread.obj"
-	-@erase ".\Release\netwrite.obj"
-	-@erase ".\Release\one.obj"
-	-@erase ".\Release\parse_name.obj"
-	-@erase ".\Release\rd_err.obj"
-	-@erase ".\Release\rd_priv.obj"
-	-@erase ".\Release\rd_req.obj"
-	-@erase ".\Release\rd_safe.obj"
-	-@erase ".\Release\read_service_key.obj"
-	-@erase ".\Release\realm_parse.obj"
-	-@erase ".\Release\recvauth.obj"
-	-@erase ".\Release\resolve.obj"
-	-@erase ".\Release\rw.obj"
-	-@erase ".\Release\save_credentials.obj"
-	-@erase ".\Release\send_to_kdc.obj"
-	-@erase ".\Release\sendauth.obj"
-	-@erase ".\Release\stime.obj"
-	-@erase ".\Release\str2key.obj"
-	-@erase ".\Release\swab.obj"
-	-@erase ".\Release\ticket_memory.obj"
-	-@erase ".\Release\tkt_string.obj"
-	-@erase ".\Release\unparse_name.obj"
-	-@erase ".\Release\util.obj"
-	-@erase ".\Release\verify_user.obj"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "..\..\include" /I "..\..\include\win32" /I "..\des" /I "..\roken" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "HAVE_CONFIG_H" /YX /c
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "." /I "..\..\include" /I\
- "..\..\include\win32" /I "..\des" /I "..\roken" /D "NDEBUG" /D "WIN32" /D\
- "_WINDOWS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)/krb.pch" /YX /Fo"$(INTDIR)/" /c 
-CPP_OBJS=.\Release/
-CPP_SBRS=.\.
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /win32
-MTL_PROJ=/nologo /D "NDEBUG" /win32 
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/krb.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 ..\roken\Release\roken.lib ..\des\Release\des.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-LINK32_FLAGS=..\roken\Release\roken.lib ..\des\Release\des.lib wsock32.lib\
- kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib\
- shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo\
- /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)/krb.pdb" /machine:I386\
- /def:".\krb.def" /out:"$(OUTDIR)/krb.dll" /implib:"$(OUTDIR)/krb.lib" 
-DEF_FILE= \
-	".\krb.def"
-LINK32_OBJS= \
-	".\Release\cr_err_reply.obj" \
-	".\Release\create_auth_reply.obj" \
-	".\Release\create_ciph.obj" \
-	".\Release\create_ticket.obj" \
-	".\Release\debug_decl.obj" \
-	".\Release\decomp_ticket.obj" \
-	".\Release\dllmain.obj" \
-	".\Release\encrypt_ktext.obj" \
-	".\Release\et_list.obj" \
-	".\Release\get_ad_tkt.obj" \
-	".\Release\get_cred.obj" \
-	".\Release\get_default_principal.obj" \
-	".\Release\get_host.obj" \
-	".\Release\get_in_tkt.obj" \
-	".\Release\get_krbrlm.obj" \
-	".\Release\get_phost.obj" \
-	".\Release\get_svc_in_tkt.obj" \
-	".\Release\get_tf_fullname.obj" \
-	".\Release\get_tf_realm.obj" \
-	".\Release\getaddrs.obj" \
-	".\Release\getrealm.obj" \
-	".\Release\getst.obj" \
-	".\Release\k_flock.obj" \
-	".\Release\k_gethostname.obj" \
-	".\Release\k_getport.obj" \
-	".\Release\k_getsockinst.obj" \
-	".\Release\k_localtime.obj" \
-	".\Release\kdc_reply.obj" \
-	".\Release\kntoln.obj" \
-	".\Release\krb_check_auth.obj" \
-	".\Release\krb_equiv.obj" \
-	".\Release\krb_err_txt.obj" \
-	".\Release\krb_get_in_tkt.obj" \
-	".\Release\lifetime.obj" \
-	".\Release\logging.obj" \
-	".\Release\lsb_addr_comp.obj" \
-	".\Release\mk_auth.obj" \
-	".\Release\mk_err.obj" \
-	".\Release\mk_priv.obj" \
-	".\Release\mk_req.obj" \
-	".\Release\mk_safe.obj" \
-	".\Release\month_sname.obj" \
-	".\Release\name2name.obj" \
-	".\Release\netread.obj" \
-	".\Release\netwrite.obj" \
-	".\Release\one.obj" \
-	".\Release\parse_name.obj" \
-	".\Release\rd_err.obj" \
-	".\Release\rd_priv.obj" \
-	".\Release\rd_req.obj" \
-	".\Release\rd_safe.obj" \
-	".\Release\read_service_key.obj" \
-	".\Release\realm_parse.obj" \
-	".\Release\recvauth.obj" \
-	".\Release\resolve.obj" \
-	".\Release\rw.obj" \
-	".\Release\save_credentials.obj" \
-	".\Release\send_to_kdc.obj" \
-	".\Release\sendauth.obj" \
-	".\Release\stime.obj" \
-	".\Release\str2key.obj" \
-	".\Release\swab.obj" \
-	".\Release\ticket_memory.obj" \
-	".\Release\tkt_string.obj" \
-	".\Release\unparse_name.obj" \
-	".\Release\util.obj" \
-	".\Release\verify_user.obj"
-
-".\Release\krb.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-OUTDIR=.\Debug
-INTDIR=.\Debug
-
-ALL : ".\Debug\krb.dll"
-
-CLEAN : 
-	-@erase ".\Debug\cr_err_reply.obj"
-	-@erase ".\Debug\create_auth_reply.obj"
-	-@erase ".\Debug\create_ciph.obj"
-	-@erase ".\Debug\create_ticket.obj"
-	-@erase ".\Debug\debug_decl.obj"
-	-@erase ".\Debug\decomp_ticket.obj"
-	-@erase ".\Debug\dllmain.obj"
-	-@erase ".\Debug\encrypt_ktext.obj"
-	-@erase ".\Debug\et_list.obj"
-	-@erase ".\Debug\get_ad_tkt.obj"
-	-@erase ".\Debug\get_cred.obj"
-	-@erase ".\Debug\get_default_principal.obj"
-	-@erase ".\Debug\get_host.obj"
-	-@erase ".\Debug\get_in_tkt.obj"
-	-@erase ".\Debug\get_krbrlm.obj"
-	-@erase ".\Debug\get_phost.obj"
-	-@erase ".\Debug\get_svc_in_tkt.obj"
-	-@erase ".\Debug\get_tf_fullname.obj"
-	-@erase ".\Debug\get_tf_realm.obj"
-	-@erase ".\Debug\getaddrs.obj"
-	-@erase ".\Debug\getrealm.obj"
-	-@erase ".\Debug\getst.obj"
-	-@erase ".\Debug\k_flock.obj"
-	-@erase ".\Debug\k_gethostname.obj"
-	-@erase ".\Debug\k_getport.obj"
-	-@erase ".\Debug\k_getsockinst.obj"
-	-@erase ".\Debug\k_localtime.obj"
-	-@erase ".\Debug\kdc_reply.obj"
-	-@erase ".\Debug\kntoln.obj"
-	-@erase ".\Debug\krb.dll"
-	-@erase ".\Debug\krb.exp"
-	-@erase ".\Debug\krb.ilk"
-	-@erase ".\Debug\krb.lib"
-	-@erase ".\Debug\krb.pdb"
-	-@erase ".\Debug\krb_check_auth.obj"
-	-@erase ".\Debug\krb_equiv.obj"
-	-@erase ".\Debug\krb_err_txt.obj"
-	-@erase ".\Debug\krb_get_in_tkt.obj"
-	-@erase ".\Debug\lifetime.obj"
-	-@erase ".\Debug\logging.obj"
-	-@erase ".\Debug\lsb_addr_comp.obj"
-	-@erase ".\Debug\mk_auth.obj"
-	-@erase ".\Debug\mk_err.obj"
-	-@erase ".\Debug\mk_priv.obj"
-	-@erase ".\Debug\mk_req.obj"
-	-@erase ".\Debug\mk_safe.obj"
-	-@erase ".\Debug\month_sname.obj"
-	-@erase ".\Debug\name2name.obj"
-	-@erase ".\Debug\netread.obj"
-	-@erase ".\Debug\netwrite.obj"
-	-@erase ".\Debug\one.obj"
-	-@erase ".\Debug\parse_name.obj"
-	-@erase ".\Debug\rd_err.obj"
-	-@erase ".\Debug\rd_priv.obj"
-	-@erase ".\Debug\rd_req.obj"
-	-@erase ".\Debug\rd_safe.obj"
-	-@erase ".\Debug\read_service_key.obj"
-	-@erase ".\Debug\realm_parse.obj"
-	-@erase ".\Debug\recvauth.obj"
-	-@erase ".\Debug\resolve.obj"
-	-@erase ".\Debug\rw.obj"
-	-@erase ".\Debug\save_credentials.obj"
-	-@erase ".\Debug\send_to_kdc.obj"
-	-@erase ".\Debug\sendauth.obj"
-	-@erase ".\Debug\stime.obj"
-	-@erase ".\Debug\str2key.obj"
-	-@erase ".\Debug\swab.obj"
-	-@erase ".\Debug\ticket_memory.obj"
-	-@erase ".\Debug\tkt_string.obj"
-	-@erase ".\Debug\unparse_name.obj"
-	-@erase ".\Debug\util.obj"
-	-@erase ".\Debug\vc40.idb"
-	-@erase ".\Debug\vc40.pdb"
-	-@erase ".\Debug\verify_user.obj"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "." /I "..\..\include" /I "..\..\include\win32" /I "..\des" /I "..\roken" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "HAVE_CONFIG_H" /YX /c
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "." /I "..\..\include" /I\
- "..\..\include\win32" /I "..\des" /I "..\roken" /D "_DEBUG" /D "WIN32" /D\
- "_WINDOWS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)/krb.pch" /YX /Fo"$(INTDIR)/"\
- /Fd"$(INTDIR)/" /c 
-CPP_OBJS=.\Debug/
-CPP_SBRS=.\.
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /win32
-MTL_PROJ=/nologo /D "_DEBUG" /win32 
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/krb.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
-# ADD LINK32 ..\roken\Debug\roken.lib ..\des\Debug\des.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
-LINK32_FLAGS=..\roken\Debug\roken.lib ..\des\Debug\des.lib wsock32.lib\
- kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib\
- shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo\
- /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)/krb.pdb" /debug\
- /machine:I386 /def:".\krb.def" /out:"$(OUTDIR)/krb.dll"\
- /implib:"$(OUTDIR)/krb.lib" 
-DEF_FILE= \
-	".\krb.def"
-LINK32_OBJS= \
-	".\Debug\cr_err_reply.obj" \
-	".\Debug\create_auth_reply.obj" \
-	".\Debug\create_ciph.obj" \
-	".\Debug\create_ticket.obj" \
-	".\Debug\debug_decl.obj" \
-	".\Debug\decomp_ticket.obj" \
-	".\Debug\dllmain.obj" \
-	".\Debug\encrypt_ktext.obj" \
-	".\Debug\et_list.obj" \
-	".\Debug\get_ad_tkt.obj" \
-	".\Debug\get_cred.obj" \
-	".\Debug\get_default_principal.obj" \
-	".\Debug\get_host.obj" \
-	".\Debug\get_in_tkt.obj" \
-	".\Debug\get_krbrlm.obj" \
-	".\Debug\get_phost.obj" \
-	".\Debug\get_svc_in_tkt.obj" \
-	".\Debug\get_tf_fullname.obj" \
-	".\Debug\get_tf_realm.obj" \
-	".\Debug\getaddrs.obj" \
-	".\Debug\getrealm.obj" \
-	".\Debug\getst.obj" \
-	".\Debug\k_flock.obj" \
-	".\Debug\k_gethostname.obj" \
-	".\Debug\k_getport.obj" \
-	".\Debug\k_getsockinst.obj" \
-	".\Debug\k_localtime.obj" \
-	".\Debug\kdc_reply.obj" \
-	".\Debug\kntoln.obj" \
-	".\Debug\krb_check_auth.obj" \
-	".\Debug\krb_equiv.obj" \
-	".\Debug\krb_err_txt.obj" \
-	".\Debug\krb_get_in_tkt.obj" \
-	".\Debug\lifetime.obj" \
-	".\Debug\logging.obj" \
-	".\Debug\lsb_addr_comp.obj" \
-	".\Debug\mk_auth.obj" \
-	".\Debug\mk_err.obj" \
-	".\Debug\mk_priv.obj" \
-	".\Debug\mk_req.obj" \
-	".\Debug\mk_safe.obj" \
-	".\Debug\month_sname.obj" \
-	".\Debug\name2name.obj" \
-	".\Debug\netread.obj" \
-	".\Debug\netwrite.obj" \
-	".\Debug\one.obj" \
-	".\Debug\parse_name.obj" \
-	".\Debug\rd_err.obj" \
-	".\Debug\rd_priv.obj" \
-	".\Debug\rd_req.obj" \
-	".\Debug\rd_safe.obj" \
-	".\Debug\read_service_key.obj" \
-	".\Debug\realm_parse.obj" \
-	".\Debug\recvauth.obj" \
-	".\Debug\resolve.obj" \
-	".\Debug\rw.obj" \
-	".\Debug\save_credentials.obj" \
-	".\Debug\send_to_kdc.obj" \
-	".\Debug\sendauth.obj" \
-	".\Debug\stime.obj" \
-	".\Debug\str2key.obj" \
-	".\Debug\swab.obj" \
-	".\Debug\ticket_memory.obj" \
-	".\Debug\tkt_string.obj" \
-	".\Debug\unparse_name.obj" \
-	".\Debug\util.obj" \
-	".\Debug\verify_user.obj"
-
-".\Debug\krb.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-.c{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.c{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-################################################################################
-# Begin Target
-
-# Name "krb - Win32 Release"
-# Name "krb - Win32 Debug"
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-!ENDIF 
-
-################################################################################
-# Begin Source File
-
-SOURCE=.\krb.def
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\get_tf_fullname.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_GET_T=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\get_tf_fullname.obj" : $(SOURCE) $(DEP_CPP_GET_T) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_GET_T=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\get_tf_fullname.obj" : $(SOURCE) $(DEP_CPP_GET_T) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\cr_err_reply.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_CR_ER=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\cr_err_reply.obj" : $(SOURCE) $(DEP_CPP_CR_ER) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_CR_ER=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\cr_err_reply.obj" : $(SOURCE) $(DEP_CPP_CR_ER) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\create_auth_reply.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_CREAT=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\create_auth_reply.obj" : $(SOURCE) $(DEP_CPP_CREAT) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_CREAT=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\create_auth_reply.obj" : $(SOURCE) $(DEP_CPP_CREAT) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\create_ciph.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_CREATE=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\create_ciph.obj" : $(SOURCE) $(DEP_CPP_CREATE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_CREATE=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\create_ciph.obj" : $(SOURCE) $(DEP_CPP_CREATE) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\create_ticket.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_CREATE_=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\create_ticket.obj" : $(SOURCE) $(DEP_CPP_CREATE_) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_CREATE_=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\create_ticket.obj" : $(SOURCE) $(DEP_CPP_CREATE_) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\decomp_ticket.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_DECOM=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\decomp_ticket.obj" : $(SOURCE) $(DEP_CPP_DECOM) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_DECOM=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\decomp_ticket.obj" : $(SOURCE) $(DEP_CPP_DECOM) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\dllmain.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_DLLMA=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	".\ticket_memory.h"\
-	
-
-".\Release\dllmain.obj" : $(SOURCE) $(DEP_CPP_DLLMA) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_DLLMA=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	".\ticket_memory.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\dllmain.obj" : $(SOURCE) $(DEP_CPP_DLLMA) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\encrypt_ktext.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_ENCRY=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\encrypt_ktext.obj" : $(SOURCE) $(DEP_CPP_ENCRY) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_ENCRY=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\encrypt_ktext.obj" : $(SOURCE) $(DEP_CPP_ENCRY) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\et_list.c
-DEP_CPP_ET_LI=\
-	"..\..\include\win32\config.h"\
-	
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-
-".\Release\et_list.obj" : $(SOURCE) $(DEP_CPP_ET_LI) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-
-".\Debug\et_list.obj" : $(SOURCE) $(DEP_CPP_ET_LI) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\get_ad_tkt.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_GET_A=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\get_ad_tkt.obj" : $(SOURCE) $(DEP_CPP_GET_A) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_GET_A=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\get_ad_tkt.obj" : $(SOURCE) $(DEP_CPP_GET_A) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\get_cred.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_GET_C=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\get_cred.obj" : $(SOURCE) $(DEP_CPP_GET_C) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_GET_C=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\get_cred.obj" : $(SOURCE) $(DEP_CPP_GET_C) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\get_default_principal.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_GET_D=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\get_default_principal.obj" : $(SOURCE) $(DEP_CPP_GET_D) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_GET_D=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\get_default_principal.obj" : $(SOURCE) $(DEP_CPP_GET_D) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\get_host.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_GET_H=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\get_host.obj" : $(SOURCE) $(DEP_CPP_GET_H) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_GET_H=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\get_host.obj" : $(SOURCE) $(DEP_CPP_GET_H) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\get_in_tkt.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_GET_I=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\get_in_tkt.obj" : $(SOURCE) $(DEP_CPP_GET_I) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_GET_I=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\get_in_tkt.obj" : $(SOURCE) $(DEP_CPP_GET_I) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\get_krbrlm.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_GET_K=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\get_krbrlm.obj" : $(SOURCE) $(DEP_CPP_GET_K) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_GET_K=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\get_krbrlm.obj" : $(SOURCE) $(DEP_CPP_GET_K) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\get_phos
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\get_svc_in_tkt.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_GET_S=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\get_svc_in_tkt.obj" : $(SOURCE) $(DEP_CPP_GET_S) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_GET_S=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\get_svc_in_tkt.obj" : $(SOURCE) $(DEP_CPP_GET_S) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\get_phost.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_GET_P=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\get_phost.obj" : $(SOURCE) $(DEP_CPP_GET_P) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_GET_P=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\get_phost.obj" : $(SOURCE) $(DEP_CPP_GET_P) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\krb_equiv.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_KRB_E=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\krb_equiv.obj" : $(SOURCE) $(DEP_CPP_KRB_E) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_KRB_E=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\krb_equiv.obj" : $(SOURCE) $(DEP_CPP_KRB_E) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\getaddrs.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_GETAD=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\getaddrs.obj" : $(SOURCE) $(DEP_CPP_GETAD) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_GETAD=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\getaddrs.obj" : $(SOURCE) $(DEP_CPP_GETAD) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\getrealm.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_GETRE=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\getrealm.obj" : $(SOURCE) $(DEP_CPP_GETRE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_GETRE=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\getrealm.obj" : $(SOURCE) $(DEP_CPP_GETRE) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\getst.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_GETST=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\getst.obj" : $(SOURCE) $(DEP_CPP_GETST) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_GETST=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\getst.obj" : $(SOURCE) $(DEP_CPP_GETST) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\k_flock.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_K_FLO=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\k_flock.obj" : $(SOURCE) $(DEP_CPP_K_FLO) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_K_FLO=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\k_flock.obj" : $(SOURCE) $(DEP_CPP_K_FLO) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\k_gethostname.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_K_GET=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\k_gethostname.obj" : $(SOURCE) $(DEP_CPP_K_GET) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_K_GET=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\k_gethostname.obj" : $(SOURCE) $(DEP_CPP_K_GET) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\k_getport.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_K_GETP=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\k_getport.obj" : $(SOURCE) $(DEP_CPP_K_GETP) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_K_GETP=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\k_getport.obj" : $(SOURCE) $(DEP_CPP_K_GETP) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\k_getsockinst.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_K_GETS=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\k_getsockinst.obj" : $(SOURCE) $(DEP_CPP_K_GETS) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_K_GETS=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\k_getsockinst.obj" : $(SOURCE) $(DEP_CPP_K_GETS) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\k_localtime.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_K_LOC=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\k_localtime.obj" : $(SOURCE) $(DEP_CPP_K_LOC) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_K_LOC=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\k_localtime.obj" : $(SOURCE) $(DEP_CPP_K_LOC) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\kdc_reply.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_KDC_R=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\kdc_reply.obj" : $(SOURCE) $(DEP_CPP_KDC_R) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_KDC_R=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\kdc_reply.obj" : $(SOURCE) $(DEP_CPP_KDC_R) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\kntoln.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_KNTOL=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Release\kntoln.obj" : $(SOURCE) $(DEP_CPP_KNTOL) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_KNTOL=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\kntoln.obj" : $(SOURCE) $(DEP_CPP_KNTOL) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\krb_check_auth.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_KRB_C=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\krb_check_auth.obj" : $(SOURCE) $(DEP_CPP_KRB_C) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_KRB_C=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\krb_check_auth.obj" : $(SOURCE) $(DEP_CPP_KRB_C) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\get_tf_realm.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_GET_TF=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\get_tf_realm.obj" : $(SOURCE) $(DEP_CPP_GET_TF) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_GET_TF=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\get_tf_realm.obj" : $(SOURCE) $(DEP_CPP_GET_TF) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\rd_safe.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_RD_SA=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	".\lsb_addr_comp.h"\
-	
-
-".\Release\rd_safe.obj" : $(SOURCE) $(DEP_CPP_RD_SA) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_RD_SA=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\lsb_addr_comp.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\rd_safe.obj" : $(SOURCE) $(DEP_CPP_RD_SA) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\krb_get_in_tkt.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_KRB_G=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\krb_get_in_tkt.obj" : $(SOURCE) $(DEP_CPP_KRB_G) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_KRB_G=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\krb_get_in_tkt.obj" : $(SOURCE) $(DEP_CPP_KRB_G) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\lifetime.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_LIFET=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\lifetime.obj" : $(SOURCE) $(DEP_CPP_LIFET) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_LIFET=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\lifetime.obj" : $(SOURCE) $(DEP_CPP_LIFET) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\lsb_addr_comp.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_LSB_A=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	".\lsb_addr_comp.h"\
-	
-
-".\Release\lsb_addr_comp.obj" : $(SOURCE) $(DEP_CPP_LSB_A) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_LSB_A=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\lsb_addr_comp.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\lsb_addr_comp.obj" : $(SOURCE) $(DEP_CPP_LSB_A) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\mk_auth.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_MK_AU=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\mk_auth.obj" : $(SOURCE) $(DEP_CPP_MK_AU) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_MK_AU=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\mk_auth.obj" : $(SOURCE) $(DEP_CPP_MK_AU) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\mk_err.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_MK_ER=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\mk_err.obj" : $(SOURCE) $(DEP_CPP_MK_ER) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_MK_ER=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\mk_err.obj" : $(SOURCE) $(DEP_CPP_MK_ER) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\mk_priv.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_MK_PR=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	".\lsb_addr_comp.h"\
-	
-
-".\Release\mk_priv.obj" : $(SOURCE) $(DEP_CPP_MK_PR) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_MK_PR=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\lsb_addr_comp.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\mk_priv.obj" : $(SOURCE) $(DEP_CPP_MK_PR) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\mk_req.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_MK_RE=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\mk_req.obj" : $(SOURCE) $(DEP_CPP_MK_RE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_MK_RE=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\mk_req.obj" : $(SOURCE) $(DEP_CPP_MK_RE) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\mk_safe.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_MK_SA=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	".\lsb_addr_comp.h"\
-	
-
-".\Release\mk_safe.obj" : $(SOURCE) $(DEP_CPP_MK_SA) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_MK_SA=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\lsb_addr_comp.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\mk_safe.obj" : $(SOURCE) $(DEP_CPP_MK_SA) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\month_sname.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_MONTH=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\month_sname.obj" : $(SOURCE) $(DEP_CPP_MONTH) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_MONTH=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\month_sname.obj" : $(SOURCE) $(DEP_CPP_MONTH) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\name2name.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_NAME2=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\name2name.obj" : $(SOURCE) $(DEP_CPP_NAME2) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_NAME2=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\name2name.obj" : $(SOURCE) $(DEP_CPP_NAME2) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\netread.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_NETRE=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\netread.obj" : $(SOURCE) $(DEP_CPP_NETRE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_NETRE=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\netread.obj" : $(SOURCE) $(DEP_CPP_NETRE) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\netwrite.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_NETWR=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\netwrite.obj" : $(SOURCE) $(DEP_CPP_NETWR) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_NETWR=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\netwrite.obj" : $(SOURCE) $(DEP_CPP_NETWR) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\one.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-
-".\Release\one.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-
-".\Debug\one.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\parse_name.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_PARSE=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\parse_name.obj" : $(SOURCE) $(DEP_CPP_PARSE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_PARSE=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\parse_name.obj" : $(SOURCE) $(DEP_CPP_PARSE) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\rd_err.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_RD_ER=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\rd_err.obj" : $(SOURCE) $(DEP_CPP_RD_ER) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_RD_ER=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\rd_err.obj" : $(SOURCE) $(DEP_CPP_RD_ER) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\rd_priv.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_RD_PR=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	".\lsb_addr_comp.h"\
-	
-
-".\Release\rd_priv.obj" : $(SOURCE) $(DEP_CPP_RD_PR) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_RD_PR=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\lsb_addr_comp.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\rd_priv.obj" : $(SOURCE) $(DEP_CPP_RD_PR) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\rd_req.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_RD_RE=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\rd_req.obj" : $(SOURCE) $(DEP_CPP_RD_RE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_RD_RE=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\rd_req.obj" : $(SOURCE) $(DEP_CPP_RD_RE) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\krb_err_txt.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_KRB_ER=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\krb_err_txt.obj" : $(SOURCE) $(DEP_CPP_KRB_ER) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_KRB_ER=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\krb_err_txt.obj" : $(SOURCE) $(DEP_CPP_KRB_ER) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\send_to_kdc.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_SEND_=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\send_to_kdc.obj" : $(SOURCE) $(DEP_CPP_SEND_) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_SEND_=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\send_to_kdc.obj" : $(SOURCE) $(DEP_CPP_SEND_) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\realm_parse.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_REALM=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\realm_parse.obj" : $(SOURCE) $(DEP_CPP_REALM) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_REALM=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\realm_parse.obj" : $(SOURCE) $(DEP_CPP_REALM) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\recvauth.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_RECVA=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\recvauth.obj" : $(SOURCE) $(DEP_CPP_RECVA) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_RECVA=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\recvauth.obj" : $(SOURCE) $(DEP_CPP_RECVA) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\resolve.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_RESOL=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	".\resolve.h"\
-	
-
-".\Release\resolve.obj" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_RESOL=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\resolve.obj" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\rw.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_RW_C68=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\version.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\rw.obj" : $(SOURCE) $(DEP_CPP_RW_C68) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_RW_C68=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\des\version.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\rw.obj" : $(SOURCE) $(DEP_CPP_RW_C68) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\save_credentials.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_SAVE_=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\save_credentials.obj" : $(SOURCE) $(DEP_CPP_SAVE_) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_SAVE_=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\save_credentials.obj" : $(SOURCE) $(DEP_CPP_SAVE_) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\read_service_key.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_READ_=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\read_service_key.obj" : $(SOURCE) $(DEP_CPP_READ_) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_READ_=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\read_service_key.obj" : $(SOURCE) $(DEP_CPP_READ_) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\verify_user.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_VERIF=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\verify_user.obj" : $(SOURCE) $(DEP_CPP_VERIF) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_VERIF=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\verify_user.obj" : $(SOURCE) $(DEP_CPP_VERIF) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\stime.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_STIME=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\stime.obj" : $(SOURCE) $(DEP_CPP_STIME) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_STIME=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\stime.obj" : $(SOURCE) $(DEP_CPP_STIME) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\swab.c
-DEP_CPP_SWAB_=\
-	"..\..\include\win32\config.h"\
-	
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-
-".\Release\swab.obj" : $(SOURCE) $(DEP_CPP_SWAB_) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-
-".\Debug\swab.obj" : $(SOURCE) $(DEP_CPP_SWAB_) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\ticket_memory.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_TICKE=\
-	".\krb_locl.h"\
-	".\ticket_memory.h"\
-	
-
-".\Release\ticket_memory.obj" : $(SOURCE) $(DEP_CPP_TICKE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_TICKE=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	".\ticket_memory.h"\
-	
-
-".\Debug\ticket_memory.obj" : $(SOURCE) $(DEP_CPP_TICKE) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\tkt_string.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_TKT_S=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\tkt_string.obj" : $(SOURCE) $(DEP_CPP_TKT_S) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_TKT_S=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\tkt_string.obj" : $(SOURCE) $(DEP_CPP_TKT_S) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\unparse_name.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_UNPAR=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\unparse_name.obj" : $(SOURCE) $(DEP_CPP_UNPAR) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_UNPAR=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\unparse_name.obj" : $(SOURCE) $(DEP_CPP_UNPAR) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\util.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_UTIL_=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\util.obj" : $(SOURCE) $(DEP_CPP_UTIL_) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_UTIL_=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\util.obj" : $(SOURCE) $(DEP_CPP_UTIL_) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\sendauth.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_SENDA=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\sendauth.obj" : $(SOURCE) $(DEP_CPP_SENDA) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_SENDA=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\sendauth.obj" : $(SOURCE) $(DEP_CPP_SENDA) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\logging.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_LOGGI=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\klog.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\logging.obj" : $(SOURCE) $(DEP_CPP_LOGGI) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_LOGGI=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\klog.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\logging.obj" : $(SOURCE) $(DEP_CPP_LOGGI) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\str2key.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_STR2K=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\str2key.obj" : $(SOURCE) $(DEP_CPP_STR2K) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_STR2K=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\str2key.obj" : $(SOURCE) $(DEP_CPP_STR2K) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\debug_decl.c
-
-!IF  "$(CFG)" == "krb - Win32 Release"
-
-DEP_CPP_DEBUG=\
-	"..\..\include\protos.h"\
-	"..\..\include\win32\config.h"\
-	".\krb_locl.h"\
-	
-
-".\Release\debug_decl.obj" : $(SOURCE) $(DEP_CPP_DEBUG) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "krb - Win32 Debug"
-
-DEP_CPP_DEBUG=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\roken\roken.h"\
-	".\krb.h"\
-	".\krb_locl.h"\
-	".\prot.h"\
-	".\resolve.h"\
-	{$(INCLUDE)}"\sys\STAT.H"\
-	{$(INCLUDE)}"\sys\TYPES.H"\
-	
-
-".\Debug\debug_decl.obj" : $(SOURCE) $(DEP_CPP_DEBUG) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
-################################################################################
diff --git a/crypto/kerberosIV/lib/krb/krb_check_auth.c b/crypto/kerberosIV/lib/krb/krb_check_auth.c
deleted file mode 100644
index 8bddbf55739b..000000000000
--- a/crypto/kerberosIV/lib/krb/krb_check_auth.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: krb_check_auth.c,v 1.4 1997/04/01 08:18:33 joda Exp $");
-
-/*
- *
- * Receive an mutual-authenticator for a server in `packet', with
- * `checksum', `session', and `schedule' having the appropriate values
- * and return the data in `msg_data'.
- *
- * Return KSUCCESS if the received checksum is correct.
- *
- */
-
-int
-krb_check_auth(KTEXT packet,
-	       u_int32_t checksum,
-	       MSG_DAT *msg_data,
-	       des_cblock *session,
-	       struct des_ks_struct *schedule,
-	       struct sockaddr_in *laddr,
-	       struct sockaddr_in *faddr)
-{
-  int ret;
-  u_int32_t checksum2;
-
-  ret = krb_rd_priv (packet->dat, packet->length, schedule, session, faddr,
-		     laddr, msg_data);
-  if (ret != RD_AP_OK)
-    return ret;
-  if (msg_data->app_length != 4)
-    return KFAILURE;
-  krb_get_int (msg_data->app_data, &checksum2, 4, 0);
-  if (checksum2 == checksum + 1)
-    return KSUCCESS;
-  else
-    return KFAILURE;
-}
diff --git a/crypto/kerberosIV/lib/krb/krb_equiv.c b/crypto/kerberosIV/lib/krb/krb_equiv.c
deleted file mode 100644
index 06f42f5ff61e..000000000000
--- a/crypto/kerberosIV/lib/krb/krb_equiv.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * int krb_equiv(u_int32_t ipaddr_a, u_int32_t ipaddr_b);
- *
- * Given two IP adresses return true if they match
- * or are considered to belong to the same host.
- *
- * For example if /etc/krb.equiv looks like
- *
- *    130.237.223.3   192.16.126.3    # alv alv1
- *    130.237.223.4   192.16.126.4    # byse byse1
- *    130.237.228.152 192.16.126.9    # topsy topsy1
- *
- * krb_equiv(alv, alv1) would return true but
- * krb_equiv(alv, byse1) would not.
- *
- * A comment starts with an '#' and ends with '\n'.
- *
- */
-#include "krb_locl.h"
-
-RCSID("$Id: krb_equiv.c,v 1.13 1997/04/01 08:18:33 joda Exp $");
-
-int krb_ignore_ip_address = 0;
-
-int
-krb_equiv(u_int32_t a, u_int32_t b)
-{
-  FILE *fil;
-  char line[256];
-  int hit_a, hit_b;
-  int iscomment;
-  
-  if (a == b)			/* trivial match, also the common case */
-    return 1;
-  
-  if (krb_ignore_ip_address)
-    return 1;			/* if we have decided not to compare */
-
-  a = ntohl(a);
-  b = ntohl(b);
-
-  fil = fopen(KRB_EQUIV, "r");
-  if (fil == NULL)		/* open failed */
-    return 0;
-  
-  hit_a = hit_b = 0;
-  iscomment = 0;
-  while (fgets(line, sizeof(line)-1, fil) != NULL) /* for each line */
-    {
-      char *t = line;
-      int len = strlen(t);
-      
-      /* for each item on this line */
-      while (*t != 0)		/* more addresses on this line? */
-	if (*t == '\n') {
-	  iscomment = hit_a = hit_b = 0;
-	  break;
-	} else if (iscomment)
-	  t = line + len - 1;
-	else if (*t == '#') {		/* rest is comment */
-	  iscomment = 1;
-	  ++t;
-	} else if (*t == '\\' ) /* continuation */
-	  break;
-	else if (isspace(*t))	/* skip space */
-	  t++;
-	else if (isdigit(*t))	/* an address? */
-	  {
-	    u_int32_t tmp;
-	    u_int32_t tmpa, tmpb, tmpc, tmpd;
-	    
-	    sscanf(t, "%d.%d.%d.%d", &tmpa, &tmpb, &tmpc, &tmpd);
-	    tmp = (tmpa << 24) | (tmpb << 16) | (tmpc << 8) | tmpd;
-
-	    while (*t == '.' || isdigit(*t)) /* done with this address */
-	      t++;
-
-	    if (tmp != -1) {	/* an address (and not broadcast) */
-	      u_int32_t mask = (u_int32_t)~0;
-
-	      if (*t == '/') {
-		++t;
-		mask <<= 32 - atoi(t);
-
-		while(isdigit(*t))
-		  ++t;
-	      }
-
-	      if ((tmp & mask) == (a & mask))
-		hit_a = 1;
-	      if ((tmp & mask) == (b & mask))
-		hit_b = 1;
-	      if (hit_a && hit_b) {
-		fclose(fil);
-		return 1;
-	      }
-	    }
-	  }
-	else
-	  ++t;		/* garbage on this line, skip it */
-
-    }
-
-  fclose(fil);
-  return 0;
-}
diff --git a/crypto/kerberosIV/lib/krb/krb_err.et b/crypto/kerberosIV/lib/krb/krb_err.et
deleted file mode 100644
index 4e32aed5d102..000000000000
--- a/crypto/kerberosIV/lib/krb/krb_err.et
+++ /dev/null
@@ -1,257 +0,0 @@
-#	Copyright 1987,1988 Massachusetts Institute of Technology
-#
-#	For copying and distribution information, see the file
-#	"mit-copyright.h".
-# 
-#	$Id: krb_err.et,v 1.4 1996/10/27 13:30:28 bg Exp $
-#
-	error_table	krb
-
-	ec		KRBET_KSUCCESS,
-			"Kerberos successful"
-
-	ec		KRBET_KDC_NAME_EXP,
-			"Kerberos principal expired"
-
-	ec		KRBET_KDC_SERVICE_EXP,
-			"Kerberos service expired"
-
-	ec		KRBET_KDC_AUTH_EXP,
-			"Kerberos auth expired"
-
-	ec		KRBET_KDC_PKT_VER,
-			"Incorrect kerberos master key version"
-
-	ec		KRBET_KDC_P_MKEY_VER,
-			"Incorrect kerberos master key version"
-
-	ec		KRBET_KDC_S_MKEY_VER,
-			"Incorrect kerberos master key version"
-
-	ec		KRBET_KDC_BYTE_ORDER,
-			"Kerberos error: byte order unknown"
-
-	ec		KRBET_KDC_PR_UNKNOWN,
-			"Kerberos principal unknown"
-
-	ec		KRBET_KDC_PR_N_UNIQUE,
-			"Kerberos principal not unique"
-
-	ec		KRBET_KDC_NULL_KEY,
-			"Kerberos principal has null key"
-
-	ec		KRBET_KRB_RES11,
-		        "Reserved 11"
-
-	ec		KRBET_KRB_RES12,
-		        "Reserved 12"
-  
-	ec		KRBET_KRB_RES13,
-		        "Reserved 13"
-
-	ec		KRBET_KRB_RES14,
-		        "Reserved 14"
-
-	ec		KRBET_KRB_RES15,
-		        "Reserved 15"
-
-	ec		KRBET_KRB_RES16,
-		        "Reserved 16"
-
-	ec		KRBET_KRB_RES17,
-		        "Reserved 17"
-
-	ec		KRBET_KRB_RES18,
-		        "Reserved 18"
-
-	ec		KRBET_KRB_RES19,
-		        "Reserved 19"
-
-	ec		KRBET_KDC_GEN_ERR,
-			"Generic error from Kerberos KDC"
-
-	ec		KRBET_GC_TKFIL,
-			"Can't read Kerberos ticket file"
-
-	ec		KRBET_GC_NOTKT,
-			"Can't find Kerberos ticket or TGT"
-
-	ec		KRBET_KRB_RES23,
-			"Reserved 23"
-
-	ec		KRBET_KRB_RES24,
-			"Reserved 24"
-
-	ec		KRBET_KRB_RES25,
-			"Reserved 25"
-
-	ec		KRBET_MK_AP_TGTEXP,
-			"Kerberos TGT Expired"
-
-	ec		KRBET_KRB_RES27,
-			"Reserved 27"
-
-	ec		KRBET_KRB_RES28,
-			"Reserved 28"
-
-	ec		KRBET_KRB_RES29,
-			"Reserved 29"
-
-	ec		KRBET_KRB_RES30,
-			"Reserved 30"
-
-	ec		KRBET_RD_AP_UNDEC,
-			"Kerberos error: Can't decode authenticator"
-
-	ec		KRBET_RD_AP_EXP,
-			"Kerberos ticket expired"
-
-	ec		KRBET_RD_AP_NYV,
-			"Kerberos ticket not yet valid"
-
-	ec		KRBET_RD_AP_REPEAT,
-			"Kerberos error: Repeated request"
-
-	ec		KRBET_RD_AP_NOT_US,
-			"The kerberos ticket isn't for us"
-
-	ec		KRBET_RD_AP_INCON,
-			"Kerberos request inconsistent"
-
-	ec		KRBET_RD_AP_TIME,
-			"Kerberos error: delta_t too big"
-
-	ec		KRBET_RD_AP_BADD,
-			"Kerberos error: incorrect net address"
-
-	ec		KRBET_RD_AP_VERSION,
-			"Kerberos protocol version mismatch"
-
-	ec		KRBET_RD_AP_MSG_TYPE,
-			"Kerberos error: invalid msg type"
-
-	ec		KRBET_RD_AP_MODIFIED,
-			"Kerberos error: message stream modified"
-
-	ec		KRBET_RD_AP_ORDER,
-			"Kerberos error: message out of order"
-
-	ec		KRBET_RD_AP_UNAUTHOR,
-			"Kerberos error: unauthorized request"
-
-	ec		KRBET_KRB_RES44,
-			"Reserved 44"
-
-	ec		KRBET_KRB_RES45,
-			"Reserved 45"
-
-	ec		KRBET_KRB_RES46,
-			"Reserved 46"
-
-	ec		KRBET_KRB_RES47,
-			"Reserved 47"
-
-	ec		KRBET_KRB_RES48,
-			"Reserved 48"
-
-	ec		KRBET_KRB_RES49,
-			"Reserved 49"
-
-	ec		KRBET_KRB_RES50,
-			"Reserved 50"
-
-	ec		KRBET_GT_PW_NULL,
-			"Kerberos error: current PW is null"
-
-	ec		KRBET_GT_PW_BADPW,
-			"Kerberos error: Incorrect current password"
-
-	ec		KRBET_GT_PW_PROT,
-			"Kerberos protocol error"
-
-	ec		KRBET_GT_PW_KDCERR,
-			"Error returned by Kerberos KDC"
-
-	ec		KRBET_GT_PW_NULLTKT,
-			"Null Kerberos ticket returned by KDC"
-
-	ec		KRBET_SKDC_RETRY,
-			"Kerberos error: Retry count exceeded"
-
-	ec		KRBET_SKDC_CANT,
-			"Kerberos error: Can't send request"
-
-	ec		KRBET_KRB_RES58,
-			"Reserved 58"
-
-	ec		KRBET_KRB_RES59,
-			"Reserved 59"
-
-	ec		KRBET_KRB_RES60,
-			"Reserved 60"
-
-	ec		KRBET_INTK_W_NOTALL,
-			"Kerberos error: not all tickets returned"
-
-	ec		KRBET_INTK_BADPW,
-			"Kerberos error: incorrect password"
-
-	ec		KRBET_INTK_PROT,
-			"Kerberos error: Protocol Error"
-
-	ec		KRBET_KRB_RES64,
-			"Reserved 64"
-
-	ec		KRBET_KRB_RES65,
-			"Reserved 65"
-
-	ec		KRBET_KRB_RES66,
-			"Reserved 66"
-
-	ec		KRBET_KRB_RES67,
-			"Reserved 67"
-
-	ec		KRBET_KRB_RES68,
-			"Reserved 68"
-
-	ec		KRBET_KRB_RES69,
-			"Reserved 69"
-
-	ec		KRBET_INTK_ERR,
-			"Other error"
-
-	ec		KRBET_AD_NOTGT,
-			"Don't have Kerberos ticket-granting ticket"
-
-	ec		KRBET_KRB_RES72,
-			"Can't get Kerberos inter-realm ticket-granting ticket"
-
-	ec		KRBET_KRB_RES73,
-			"Reserved 73"
-
-	ec		KRBET_KRB_RES74,
-			"Reserved 74"
-
-	ec		KRBET_KRB_RES75,
-			"Reserved 75"
-
-	ec		KRBET_NO_TKT_FIL,
-			"No ticket file found"
-
-	ec		KRBET_TKT_FIL_ACC,
-			"Couldn't access ticket file"
-
-	ec		KRBET_TKT_FIL_LCK,
-			"Couldn't lock ticket file"
-
-	ec		KRBET_TKT_FIL_FMT,
-			"Bad ticket file format"
-
-	ec		KRBET_TKT_FIL_INI,
-			"tf_init not called first"
-
-	ec		KRBET_KNAME_FMT,
-			"Bad Kerberos name format"
-
-	end
-
diff --git a/crypto/kerberosIV/lib/krb/krb_err_txt.c b/crypto/kerberosIV/lib/krb/krb_err_txt.c
deleted file mode 100644
index 161aa0ffcca6..000000000000
--- a/crypto/kerberosIV/lib/krb/krb_err_txt.c
+++ /dev/null
@@ -1,299 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-#include "krb_locl.h"
-
-RCSID("$Id: krb_err_txt.c,v 1.12 1997/04/02 05:37:10 joda Exp $");
-
-/*
- * This file contains an array of error text strings.
- * The associated error codes (which are defined in "krb.h")
- * follow the string in the comments at the end of each line.
- */
-
-const char *krb_err_txt[256] = {
-  "OK",							/* 000 */
-  "Principal expired (kerberos)",			/* 001 */
-  "Service expired (kerberos)",				/* 002 */
-  "Authentication expired (kerberos)",			/* 003 */
-  "Unknown protocol version number (kerberos)", 	/* 004 */
-  "Principal: Incorrect master key version (kerberos)", /* 005 */
-  "Service: Incorrect master key version (kerberos)",   /* 006 */
-  "Bad byte order (kerberos)",				/* 007 */
-  "Principal unknown (kerberos)",			/* 008 */
-  "Principal not unique (kerberos)",			/* 009 */
-  "Principal has null key (kerberos)",			/* 010 */
-  "Timeout in request (kerberos)",			/* 011 */
-  "Reserved error message 12 (kerberos)",		/* 012 */
-  "Reserved error message 13 (kerberos)",		/* 013 */
-  "Reserved error message 14 (kerberos)",		/* 014 */
-  "Reserved error message 15 (kerberos)",		/* 015 */
-  "Reserved error message 16 (kerberos)",		/* 016 */
-  "Reserved error message 17 (kerberos)",		/* 017 */
-  "Reserved error message 18 (kerberos)",		/* 018 */
-  "Reserved error message 19 (kerberos)",		/* 019 */
-  "Permission Denied (kerberos)",			/* 020 */
-  "Can't read ticket file (krb_get_cred)",		/* 021 */
-  "Can't find ticket (krb_get_cred)",			/* 022 */
-  "Reserved error message 23 (krb_get_cred)",		/* 023 */
-  "Reserved error message 24 (krb_get_cred)",		/* 024 */
-  "Reserved error message 25 (krb_get_cred)",		/* 025 */
-  "Ticket granting ticket expired (krb_mk_req)",	/* 026 */
-  "Reserved error message 27 (krb_mk_req)",		/* 027 */
-  "Reserved error message 28 (krb_mk_req)",		/* 028 */
-  "Reserved error message 29 (krb_mk_req)",		/* 029 */
-  "Reserved error message 30 (krb_mk_req)",		/* 030 */
-  "Can't decode authenticator (krb_rd_req)",		/* 031 */
-  "Ticket expired (krb_rd_req)",			/* 032 */
-  "Ticket issue date too far in the future (krb_rd_req)",/* 033 */
-  "Repeat request (krb_rd_req)",			/* 034 */
-  "Ticket for wrong server (krb_rd_req)",		/* 035 */
-  "Request inconsistent (krb_rd_req)",			/* 036 */
-  "Time is out of bounds (krb_rd_req)",			/* 037 */
-  "Incorrect network address (krb_rd_req)",		/* 038 */
-  "Protocol version mismatch (krb_rd_req)",		/* 039 */
-  "Illegal message type (krb_rd_req)",			/* 040 */
-  "Message integrity error (krb_rd_req)",		/* 041 */
-  "Message duplicate or out of order (krb_rd_req)",	/* 042 */
-  "Unauthorized request (krb_rd_req)",			/* 043 */
-  "Reserved error message 44 (krb_rd_req)",		/* 044 */
-  "Reserved error message 45 (krb_rd_req)",		/* 045 */
-  "Reserved error message 46 (krb_rd_req)",		/* 046 */
-  "Reserved error message 47 (krb_rd_req)",		/* 047 */
-  "Reserved error message 48 (krb_rd_req)",		/* 048 */
-  "Reserved error message 49 (krb_rd_req)",		/* 049 */
-  "Reserved error message 50 (krb_rd_req)",		/* 050 */
-  "Current password is NULL (get_pw_tkt)",		/* 051 */
-  "Current password incorrect (get_pw_tkt)",		/* 052 */
-  "Protocol error (gt_pw_tkt)",				/* 053 */
-  "Error returned by KDC (gt_pw_tkt)",			/* 054 */
-  "Null ticket returned by KDC (gt_pw_tkt)",		/* 055 */
-  "Retry count exceeded (send_to_kdc)",			/* 056 */
-  "Can't send request (send_to_kdc)",			/* 057 */
-  "Reserved error message 58 (send_to_kdc)",		/* 058 */
-  "Reserved error message 59 (send_to_kdc)",		/* 059 */
-  "Reserved error message 60 (send_to_kdc)",		/* 060 */
-  "Warning: Not ALL tickets returned",			/* 061 */
-  "Password incorrect",					/* 062 */
-  "Protocol error (get_in_tkt)",			/* 063 */
-  "Reserved error message 64 (get_in_tkt)",		/* 064 */
-  "Reserved error message 65 (get_in_tkt)",		/* 065 */
-  "Reserved error message 66 (get_in_tkt)",		/* 066 */
-  "Reserved error message 67 (get_in_tkt)",		/* 067 */
-  "Reserved error message 68 (get_in_tkt)",		/* 068 */
-  "Reserved error message 69 (get_in_tkt)",		/* 069 */
-  "Generic error (get_in_tkt)(can't write ticket file)", /* 070 */
-  "Don't have ticket granting ticket (get_ad_tkt)",	/* 071 */
-  "Can't get inter-realm ticket granting ticket (get_ad_tkt)",	/* 072 */
-  "Reserved error message 73 (get_ad_tkt)",		/* 073 */
-  "Reserved error message 74 (get_ad_tkt)",		/* 074 */
-  "Reserved error message 75 (get_ad_tkt)",		/* 075 */
-  "No ticket file (tf_util)",				/* 076 */
-  "Can't access ticket file (tf_util)",			/* 077 */
-  "Can't lock ticket file; try later (tf_util)",	/* 078 */
-  "Bad ticket file format (tf_util)",			/* 079 */
-  "Read ticket file before tf_init (tf_util)",		/* 080 */
-  "Bad Kerberos name format (kname_parse)",		/* 081 */
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "(reserved)",
-  "Generic kerberos error (kfailure)",			/* 255 */
-};
-
-static const char err_failure[] = "Illegal error code passed (krb_get_err_text)";
-
-const char *
-krb_get_err_text(int code)
-{
-  if(code < 0 || code >= MAX_KRB_ERRORS)
-    return err_failure;
-  return krb_err_txt[code];
-}
diff --git a/crypto/kerberosIV/lib/krb/krb_get_in_tkt.c b/crypto/kerberosIV/lib/krb/krb_get_in_tkt.c
deleted file mode 100644
index d3e6cc171a70..000000000000
--- a/crypto/kerberosIV/lib/krb/krb_get_in_tkt.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: krb_get_in_tkt.c,v 1.20 1997/04/01 08:18:34 joda Exp $");
-
-/*
- * decrypt_tkt(): Given user, instance, realm, passwd, key_proc
- * and the cipher text sent from the KDC, decrypt the cipher text
- * using the key returned by key_proc.
- */
-
-static int
-decrypt_tkt(char *user, char *instance, char *realm,
-	    void *arg, key_proc_t key_proc, KTEXT *cip)
-{
-    des_cblock key;		/* Key for decrypting cipher */
-    int ret;
-
-    ret = key_proc(user, instance, realm, arg, &key);
-    if (ret != 0)
-	return ret;
-    
-    encrypt_ktext(*cip, &key, DES_DECRYPT);
-
-    memset(&key, 0, sizeof(key));
-    return 0;
-}
-
-/*
- * krb_get_in_tkt() gets a ticket for a given principal to use a given
- * service and stores the returned ticket and session key for future
- * use.
- *
- * The "user", "instance", and "realm" arguments give the identity of
- * the client who will use the ticket.  The "service" and "sinstance"
- * arguments give the identity of the server that the client wishes
- * to use.  (The realm of the server is the same as the Kerberos server
- * to whom the request is sent.)  The "life" argument indicates the
- * desired lifetime of the ticket; the "key_proc" argument is a pointer
- * to the routine used for getting the client's private key to decrypt
- * the reply from Kerberos.  The "decrypt_proc" argument is a pointer
- * to the routine used to decrypt the reply from Kerberos; and "arg"
- * is an argument to be passed on to the "key_proc" routine.
- *
- * If all goes well, krb_get_in_tkt() returns INTK_OK, otherwise it
- * returns an error code:  If an AUTH_MSG_ERR_REPLY packet is returned
- * by Kerberos, then the error code it contains is returned.  Other
- * error codes returned by this routine include INTK_PROT to indicate
- * wrong protocol version, INTK_BADPW to indicate bad password (if
- * decrypted ticket didn't make sense), INTK_ERR if the ticket was for
- * the wrong server or the ticket store couldn't be initialized.
- *
- * The format of the message sent to Kerberos is as follows:
- *
- * Size			Variable		Field
- * ----			--------		-----
- *
- * 1 byte		KRB_PROT_VERSION	protocol version number
- * 1 byte		AUTH_MSG_KDC_REQUEST |	message type
- *			HOST_BYTE_ORDER		local byte order in lsb
- * string		user			client's name
- * string		instance		client's instance
- * string		realm			client's realm
- * 4 bytes		tlocal.tv_sec		timestamp in seconds
- * 1 byte		life			desired lifetime
- * string		service			service's name
- * string		sinstance		service's instance
- */
-
-int
-krb_get_in_tkt(char *user, char *instance, char *realm, 
-	       char *service, char *sinstance, int life,
-	       key_proc_t key_proc, decrypt_proc_t decrypt_proc, void *arg)
-{
-    KTEXT_ST pkt_st;
-    KTEXT pkt = &pkt_st;	/* Packet to KDC */
-    KTEXT_ST rpkt_st;
-    KTEXT rpkt = &rpkt_st;	/* Returned packet */
-
-    int kerror;
-    struct timeval tv;
-
-    /* BUILD REQUEST PACKET */
-
-    unsigned char *p = pkt->dat;
-    
-    p += krb_put_int(KRB_PROT_VERSION, p, 1);
-    p += krb_put_int(AUTH_MSG_KDC_REQUEST, p, 1);
-
-    p += krb_put_nir(user, instance, realm, p);
-
-    gettimeofday(&tv, NULL);
-    p += krb_put_int(tv.tv_sec, p, 4);
-    p += krb_put_int(life, p, 1);
-
-    p += krb_put_nir(service, sinstance, NULL, p);
-
-    pkt->length = p - pkt->dat;
-
-    rpkt->length = 0;
-
-    /* SEND THE REQUEST AND RECEIVE THE RETURN PACKET */
-
-    if ((kerror = send_to_kdc(pkt, rpkt, realm))) return(kerror);
-    
-    p = rpkt->dat;
-    
-    {
-	CREDENTIALS cred;
-	KTEXT_ST cip;
-	KTEXT foo = &cip; /* braindamage */
-	
-	kerror = kdc_reply_cipher(rpkt, &cip);
-	if(kerror != KSUCCESS)
-	    return kerror;
-
-	if (decrypt_proc == NULL)
-	    decrypt_proc = decrypt_tkt;
-	(*decrypt_proc)(user, instance, realm, arg, key_proc, &foo);
-
-	kerror = kdc_reply_cred(&cip, &cred);
-	if(kerror != KSUCCESS)
-	    return kerror;
-	
-	if (strcmp(cred.service, service) || 
-	    strcmp(cred.instance, sinstance) ||
-	    strcmp(cred.realm, realm))	/* not what we asked for */
-	    return INTK_ERR;	/* we need a better code here XXX */
-
-	if (abs((int)(tv.tv_sec - cred.issue_date)) > CLOCK_SKEW) {
-	    return RD_AP_TIME; /* XXX should probably be better code */
-	}
-
-	/* initialize ticket cache */
-
-	return tf_setup(&cred, user, instance);
-    }
-}
diff --git a/crypto/kerberosIV/lib/krb/krb_locl.h b/crypto/kerberosIV/lib/krb/krb_locl.h
deleted file mode 100644
index 4475883188ea..000000000000
--- a/crypto/kerberosIV/lib/krb/krb_locl.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id: krb_locl.h,v 1.42 1997/05/20 18:40:45 bg Exp $ */
-
-#ifndef __krb_locl_h
-#define __krb_locl_h
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "protos.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <assert.h>
-#include <stdarg.h>
-
-#include <errno.h>
-
-#ifdef HAVE_PWD_H
-#include <pwd.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#ifdef HAVE_IO_H
-#include <io.h>
-#endif
-
-#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#elif defined(HAVE_SYS_TIME_H)
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#ifdef HAVE_SYS_FILE_H
-#include <sys/file.h>
-#endif
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>
-#endif
-
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-#ifdef HAVE_RESOLV_H
-#include <resolv.h>
-#endif
-
-#ifdef SOCKS
-#include <socks.h>
-#endif
-
-#include <roken.h>
-
-#include <krb.h>
-#include <prot.h>
-
-#include "resolve.h"
-
-/* --- */
-
-/* Globals! */
-extern int krb_debug;
-extern int krb_ap_req_debug;
-
-/* Utils */
-int krb_name_to_name(const char *, char *, size_t);
-
-void encrypt_ktext(KTEXT cip, des_cblock *key, int encrypt);
-int kdc_reply_cred(KTEXT cip, CREDENTIALS *cred);
-int kdc_reply_cipher(KTEXT reply, KTEXT cip);
-
-#ifndef HAVE_GETTIMEOFDAY
-int gettimeofday (struct timeval *, void *);
-#endif
-
-void k_ricercar(char*);
-
-/* safe multiple strcat */
-int k_concat(char*, size_t, ...);
-int k_vconcat(char*, size_t, va_list);
-
-/* mallocing versions of the above */
-size_t k_vmconcat (char**, size_t, va_list); 
-size_t k_mconcat (char**, size_t, ...);
-
-/* used in rd_safe.c and mk_safe.c */
-
-void fixup_quad_cksum(void *start, size_t len, des_cblock *key, 
-		      void *new_checksum, void *old_checksum, int little);
-
-#endif /*  __krb_locl_h */
diff --git a/crypto/kerberosIV/lib/krb/kuserok.c b/crypto/kerberosIV/lib/krb/kuserok.c
deleted file mode 100644
index e3d5e6b9f9c5..000000000000
--- a/crypto/kerberosIV/lib/krb/kuserok.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: kuserok.c,v 1.21 1997/04/01 08:18:35 joda Exp $");
-
-#define OK 0
-#define NOTOK 1
-#define MAX_USERNAME 10
-
-/* 
- * Given a Kerberos principal and a local username, determine whether
- * user is authorized to login according to the authorization file
- * ("~luser/.klogin" by default).  Returns OK if authorized, NOTOK if
- * not authorized.
- *
- * IMPORTANT CHANGE: To eliminate the need of making a distinction
- * between the 3 cases:
- *
- * 1. We can't verify that a .klogin file doesn't exist (no home dir).
- * 2. It's there but we aren't allowed to read it.
- * 3. We can read it and ~luser@LOCALREALM is (not) included.
- *
- * We instead make the assumption that luser@LOCALREALM is *always*
- * included. Thus it is impossible to have an empty .klogin file and
- * also to exclude luser@LOCALREALM from it. Root is treated differently
- * since it's home should always be available.
- *
- * OLD STRATEGY:
- * If there is no account for "luser" on the local machine, returns
- * NOTOK.  If there is no authorization file, and the given Kerberos
- * name "kdata" translates to the same name as "luser" (using
- * krb_kntoln()), returns OK.  Otherwise, if the authorization file
- * can't be accessed, returns NOTOK.  Otherwise, the file is read for
- * a matching principal name, instance, and realm.  If one is found,
- * returns OK, if none is found, returns NOTOK.
- *
- * The file entries are in the format:
- *
- *	name.instance@realm
- *
- * one entry per line.
- *
- */
-
-int
-krb_kuserok(char *name, char *instance, char *realm, char *luser)
-{
-    struct passwd *pwd;
-    char lrealm[REALM_SZ];
-    FILE *f;
-    char line[1024];
-    char file[MaxPathLen];
-    struct stat st;
-
-    pwd = getpwnam(luser);
-    if(pwd == NULL)
-	return NOTOK;
-    if(krb_get_lrealm(lrealm, 1))
-	return NOTOK;
-    if(pwd->pw_uid != 0 &&
-       strcmp(name, luser) == 0 &&
-       strcmp(instance, "") == 0 &&
-       strcmp(realm, lrealm) == 0)
-	return OK;
-    strcpy(file, pwd->pw_dir);
-    strcat(file, "/.klogin");
-
-    f = fopen(file, "r");
-    if(f == NULL)
-	return NOTOK;
-    
-    /* this is not a working test in filesystems like AFS and DFS */
-    if(fstat(fileno(f), &st) < 0){
-	fclose(f);
-	return NOTOK;
-    }
-    
-    if(st.st_uid != pwd->pw_uid){
-	fclose(f);
-	return NOTOK;
-    }
-    
-    while(fgets(line, sizeof(line), f)){
-	char fname[ANAME_SZ], finst[INST_SZ], frealm[REALM_SZ];
-	if(line[strlen(line) - 1] != '\n')
-	    /* read till end of line */
-	    while(1){
-		int c = fgetc(f);
-		if(c == '\n' || c == EOF)
-		    break;
-	    }
-	else
-	    line[strlen(line) - 1] = 0;
-	
-	if(kname_parse(fname, finst, frealm, line))
-	    continue;
-	if(strcmp(name, fname))
-	    continue;
-	if(strcmp(instance, finst))
-	    continue;
-	if(frealm[0] == 0)
-	    strcpy(frealm, lrealm);
-	if(strcmp(realm, frealm))
-	    continue;
-	fclose(f);
-	return OK;
-    }
-    fclose(f);
-    return NOTOK;
-}
-
-/* compatibility interface */
-
-int
-kuserok(AUTH_DAT *auth, char *luser)
-{
-    return krb_kuserok(auth->pname, auth->pinst, auth->prealm, luser);
-}
-
diff --git a/crypto/kerberosIV/lib/krb/lifetime.c b/crypto/kerberosIV/lib/krb/lifetime.c
deleted file mode 100644
index 1866996669cf..000000000000
--- a/crypto/kerberosIV/lib/krb/lifetime.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Ticket lifetime.  This defines the table used to lookup lifetime
- * for the fixed part of rande of the one byte lifetime field.  Values
- * less than 0x80 are intrpreted as the number of 5 minute intervals.
- * Values from 0x80 to 0xBF should be looked up in this table.  The
- * value of 0x80 is the same using both methods: 10 and two-thirds
- * hours .  The lifetime of 0xBF is 30 days.  The intervening values
- * of have a fixed ratio of roughly 1.06914.  The value 0xFF is
- * defined to mean a ticket has no expiration time.  This should be
- * used advisedly since individual servers may impose defacto
- * upperbounds on ticket lifetimes.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: lifetime.c,v 1.9 1997/05/02 14:29:18 assar Exp $");
-
-/* If you want to disable this feature */
-int krb_no_long_lifetimes = 0;
-
-#define TKTLIFENUMFIXED 64
-#define TKTLIFEMINFIXED 0x80
-#define TKTLIFEMAXFIXED 0xBF
-#define TKTLIFENOEXPIRE 0xFF
-#define MAXTKTLIFETIME	(30*24*3600)	/* 30 days */
-#ifndef NEVERDATE
-#define NEVERDATE ((unsigned long)0x7fffffffL)
-#endif
-
-static const int tkt_lifetimes[TKTLIFENUMFIXED] = {
-    38400,				/* 10.67 hours, 0.44 days */ 
-    41055,				/* 11.40 hours, 0.48 days */ 
-    43894,				/* 12.19 hours, 0.51 days */ 
-    46929,				/* 13.04 hours, 0.54 days */ 
-    50174,				/* 13.94 hours, 0.58 days */ 
-    53643,				/* 14.90 hours, 0.62 days */ 
-    57352,				/* 15.93 hours, 0.66 days */ 
-    61318,				/* 17.03 hours, 0.71 days */ 
-    65558,				/* 18.21 hours, 0.76 days */ 
-    70091,				/* 19.47 hours, 0.81 days */ 
-    74937,				/* 20.82 hours, 0.87 days */ 
-    80119,				/* 22.26 hours, 0.93 days */ 
-    85658,				/* 23.79 hours, 0.99 days */ 
-    91581,				/* 25.44 hours, 1.06 days */ 
-    97914,				/* 27.20 hours, 1.13 days */ 
-    104684,				/* 29.08 hours, 1.21 days */ 
-    111922,				/* 31.09 hours, 1.30 days */ 
-    119661,				/* 33.24 hours, 1.38 days */ 
-    127935,				/* 35.54 hours, 1.48 days */ 
-    136781,				/* 37.99 hours, 1.58 days */ 
-    146239,				/* 40.62 hours, 1.69 days */ 
-    156350,				/* 43.43 hours, 1.81 days */ 
-    167161,				/* 46.43 hours, 1.93 days */ 
-    178720,				/* 49.64 hours, 2.07 days */ 
-    191077,				/* 53.08 hours, 2.21 days */ 
-    204289,				/* 56.75 hours, 2.36 days */ 
-    218415,				/* 60.67 hours, 2.53 days */ 
-    233517,				/* 64.87 hours, 2.70 days */ 
-    249664,				/* 69.35 hours, 2.89 days */ 
-    266926,				/* 74.15 hours, 3.09 days */ 
-    285383,				/* 79.27 hours, 3.30 days */ 
-    305116,				/* 84.75 hours, 3.53 days */ 
-    326213,				/* 90.61 hours, 3.78 days */ 
-    348769,				/* 96.88 hours, 4.04 days */ 
-    372885,				/* 103.58 hours, 4.32 days */ 
-    398668,				/* 110.74 hours, 4.61 days */ 
-    426234,				/* 118.40 hours, 4.93 days */ 
-    455705,				/* 126.58 hours, 5.27 days */ 
-    487215,				/* 135.34 hours, 5.64 days */ 
-    520904,				/* 144.70 hours, 6.03 days */ 
-    556921,				/* 154.70 hours, 6.45 days */ 
-    595430,				/* 165.40 hours, 6.89 days */ 
-    636601,				/* 176.83 hours, 7.37 days */ 
-    680618,				/* 189.06 hours, 7.88 days */ 
-    727680,				/* 202.13 hours, 8.42 days */ 
-    777995,				/* 216.11 hours, 9.00 days */ 
-    831789,				/* 231.05 hours, 9.63 days */ 
-    889303,				/* 247.03 hours, 10.29 days */ 
-    950794,				/* 264.11 hours, 11.00 days */ 
-    1016537,				/* 282.37 hours, 11.77 days */ 
-    1086825,				/* 301.90 hours, 12.58 days */ 
-    1161973,				/* 322.77 hours, 13.45 days */ 
-    1242318,				/* 345.09 hours, 14.38 days */ 
-    1328218,				/* 368.95 hours, 15.37 days */ 
-    1420057,				/* 394.46 hours, 16.44 days */ 
-    1518247,				/* 421.74 hours, 17.57 days */ 
-    1623226,				/* 450.90 hours, 18.79 days */ 
-    1735464,				/* 482.07 hours, 20.09 days */ 
-    1855462,				/* 515.41 hours, 21.48 days */ 
-    1983758,				/* 551.04 hours, 22.96 days */ 
-    2120925,				/* 589.15 hours, 24.55 days */ 
-    2267576,				/* 629.88 hours, 26.25 days */ 
-    2424367,				/* 673.44 hours, 28.06 days */ 
-    2592000};				/* 720.00 hours, 30.00 days */ 
-
-/*
- * krb_life_to_time - takes a start time and a Kerberos standard
- * lifetime char and returns the corresponding end time.  There are
- * four simple cases to be handled.  The first is a life of 0xff,
- * meaning no expiration, and results in an end time of 0xffffffff.
- * The second is when life is less than the values covered by the
- * table.  In this case, the end time is the start time plus the
- * number of 5 minute intervals specified by life.  The third case
- * returns start plus the MAXTKTLIFETIME if life is greater than
- * TKTLIFEMAXFIXED.  The last case, uses the life value (minus
- * TKTLIFEMINFIXED) as an index into the table to extract the lifetime
- * in seconds, which is added to start to produce the end time.
- */
-u_int32_t
-krb_life_to_time(u_int32_t start, int life_)
-{
-    unsigned char life = (unsigned char) life_;
-
-    if (krb_no_long_lifetimes) return start + life*5*60;
-
-    if (life == TKTLIFENOEXPIRE) return NEVERDATE;
-    if (life < TKTLIFEMINFIXED) return start + life*5*60;
-    if (life > TKTLIFEMAXFIXED) return start + MAXTKTLIFETIME;
-    return start + tkt_lifetimes[life - TKTLIFEMINFIXED];
-}
-
-/*
- * krb_time_to_life - takes start and end times for the ticket and
- * returns a Kerberos standard lifetime char, possibily using the
- * tkt_lifetimes table for lifetimes above 127*5 minutes.  First, the
- * special case of (end == NEVERDATE) is handled to mean no
- * expiration.  Then negative lifetimes and those greater than the
- * maximum ticket lifetime are rejected.  Then lifetimes less than the
- * first table entry are handled by rounding the requested lifetime
- * *up* to the next 5 minute interval.  The final step is to search
- * the table for the smallest entry *greater than or equal* to the
- * requested entry.
- */
-int krb_time_to_life(u_int32_t start, u_int32_t end)
-{
-    int i;
-    long lifetime = end - start;
-
-    if (krb_no_long_lifetimes) return (lifetime + 5*60 - 1)/(5*60);
-
-    if (end >= NEVERDATE) return TKTLIFENOEXPIRE;
-    if (lifetime > MAXTKTLIFETIME || lifetime <= 0) return 0;
-    if (lifetime < tkt_lifetimes[0]) return (lifetime + 5*60 - 1)/(5*60);
-    for (i=0; i<TKTLIFENUMFIXED; i++) {
-	if (lifetime <= tkt_lifetimes[i]) {
-	    return i+TKTLIFEMINFIXED;
-	}
-    }
-    return 0;
-}
-
-char *
-krb_life_to_atime(int life)
-{
-    static char atime[11+1+2+1+2+1+2+1];
-    unsigned long when;
-    int secs, mins, hours;
-
-    if (life == TKTLIFENOEXPIRE && !krb_no_long_lifetimes)
-	return("Forever");
-    when = krb_life_to_time(0, life);
-    secs = when%60;
-    when /= 60;
-    mins = when%60;
-    when /= 60;
-    hours = when%24;
-    when /= 24;
-    snprintf(atime, sizeof(atime), "%d+%02d:%02d:%02d", (int)when, hours, mins, secs);
-    return(atime);
-}
-
-int
-krb_atime_to_life(char *atime)
-{
-    unsigned long when = 0;
-    char *cp;
-    int colon = 0, plus = 0;
-    int n = 0;
-
-    if (strcasecmp(atime, "forever") == 0)
-	return(TKTLIFENOEXPIRE);
-    
-    for (cp=atime; *cp; cp++) {
-	switch(*cp) {
-	    case '0': case '1': case '2': case '3': case '4':
-	    case '5': case '6': case '7': case '8': case '9':
-		n = n*10 + *cp-'0';
-		break;
-	    case '+':
-		plus++;
-		when += n;
-		when *= 24;
-		n = 0;
-		break;
-	    case ':':
-		colon++;
-		when += n;
-		when *= 60;
-		n = 0;
-		break;
-	    default:
-		break;
-	}
-    }
-    when += n;
-    if (plus == 0 && colon == 0)
-	return((unsigned char)when);
-    while (colon < 2) {
-	when *= 60;
-	colon++;
-    }
-    return(krb_time_to_life(0,when));
-}
diff --git a/crypto/kerberosIV/lib/krb/logging.c b/crypto/kerberosIV/lib/krb/logging.c
deleted file mode 100644
index 15e5bde9707f..000000000000
--- a/crypto/kerberosIV/lib/krb/logging.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-#include <klog.h>
-
-RCSID("$Id: logging.c,v 1.14 1997/05/11 09:01:40 assar Exp $");
-
-struct krb_log_facility {
-    char filename[MaxPathLen]; 
-    FILE *file; 
-    krb_log_func_t func;
-};
-
-int
-krb_vlogger(struct krb_log_facility *f, const char *format, va_list args)
-{
-    FILE *file = NULL;
-    int ret;
-
-    if (f->file != NULL)
-	file = f->file;
-    else if (f->filename && f->filename[0])
-	file = fopen(f->filename, "a");
-
-    ret = f->func(file, format, args);
-
-    if (file != f->file)
-	fclose(file);
-    return ret;
-}
-
-int
-krb_logger(struct krb_log_facility *f, const char *format, ...)
-{
-    va_list args;
-    int ret;
-    va_start(args, format);
-    ret = krb_vlogger(f, format, args);
-    va_end(args);
-    return ret;
-}
-
-/*
- * If FILE * is given log to it, otherwise, log to filename. When
- * given a file name the file is opened and closed for each log
- * record.
- */
-int
-krb_openlog(struct krb_log_facility *f,
-	    char *filename,
-	    FILE *file,
-	    krb_log_func_t func)
-{
-    strcpy(f->filename, filename);
-    f->file = file;
-    f->func = func;
-    return KSUCCESS;
-}
-
-/* ------------------------------------------------------------
-   Compatibility functions from warning.c
-   ------------------------------------------------------------ */
-
-static int
-log_tty(FILE *f, const char *format,  va_list args)
-{
-    if (f != NULL && isatty(fileno(f)))
-	vfprintf(f, format, args);
-    return KSUCCESS;
-}
-
-/* stderr */
-static struct krb_log_facility std_log = { "/dev/tty", NULL, log_tty };
-
-static void
-init_std_log ()
-{
-  static int done = 0;
-
-  if (!done) {
-    std_log.file = stderr;
-    done = 1;
-  }
-}
-
-/*
- *
- */
-void
-krb_set_warnfn (krb_warnfn_t newfunc)
-{
-    init_std_log ();
-    std_log.func =  newfunc;
-}
-
-/*
- *
- */
-krb_warnfn_t
-krb_get_warnfn (void)
-{
-    init_std_log ();
-    return std_log.func;
-}
-
-/*
- * Log warnings to stderr if it's a tty.
- */
-void
-krb_warning (const char *format, ...)
-{
-    va_list args;
-    
-    init_std_log ();
-    va_start(args, format);
-    krb_vlogger(&std_log, format, args);
-    va_end(args);
-}
-
-/* ------------------------------------------------------------
-   Compatibility functions from klog.c and log.c
-   ------------------------------------------------------------ */
-
-/*
- * Used by kerberos and kadmind daemons and in libkrb (rd_req.c).
- *
- * By default they log to the kerberos server log-file (KRBLOG) to be
- * backwards compatible.
- */
-
-static int
-log_with_timestamp_and_nl(FILE *file, const char *format, va_list args)
-{
-    time_t now;
-    if(file == NULL)
-	return KFAILURE;
-    time(&now);
-    fputs(krb_stime(&now), file);
-    fputs(": ", file);
-    vfprintf(file, format, args);
-    fputs("\n", file);
-    fflush(file);
-    return KSUCCESS;
-}
-
-static struct krb_log_facility
-file_log = { KRBLOG, NULL, log_with_timestamp_and_nl };
-
-/*
- * kset_logfile() changes the name of the file to which
- * messages are logged.  If kset_logfile() is not called,
- * the logfile defaults to KRBLOG, defined in "krb.h".
- */
-
-void
-kset_logfile(char *filename)
-{
-    krb_openlog(&file_log, filename, NULL, log_with_timestamp_and_nl);
-}
-
-/*
- * krb_log() and klog() is used to add entries to the logfile.
- *
- * The log entry consists of a timestamp and the given arguments
- * printed according to the given "format" string.
- *
- * The log file is opened and closed for each log entry.
- *
- * If the given log type "type" is unknown, or if the log file
- * cannot be opened, no entry is made to the log file.
- *
- * CHANGE: the type is always ignored
- *
- * The return value of klog() is always a pointer to the formatted log
- * text string "logtxt".
- */
-
-/* Used in kerberos.c only. */
-char *
-klog(int type, const char *format, ...)
-{
-    static char logtxt[1024];
-
-    va_list ap;
-
-    va_start(ap, format);
-    vsnprintf(logtxt, sizeof(logtxt), format, ap);
-    va_end(ap);
-    
-    krb_logger(&file_log, "%s", logtxt);
-    
-    return logtxt;
-}
-
-/* Used in kadmind and rd_req.c */
-void
-krb_log(const char *format, ...)
-{
-    va_list args;
-
-    va_start(args, format);
-    krb_vlogger(&file_log, format, args);
-    va_end(args);
-}
diff --git a/crypto/kerberosIV/lib/krb/lsb_addr_comp.c b/crypto/kerberosIV/lib/krb/lsb_addr_comp.c
deleted file mode 100644
index bc3c484dd613..000000000000
--- a/crypto/kerberosIV/lib/krb/lsb_addr_comp.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: lsb_addr_comp.c,v 1.9 1997/04/01 08:18:37 joda Exp $");
-
-#include "lsb_addr_comp.h"
-
-int
-krb_lsb_antinet_ulong_cmp(u_int32_t x, u_int32_t y)
-{
-    int i;
-    u_int32_t a = 0, b = 0;
-    u_int8_t *p = (u_int8_t*) &x;
-    u_int8_t *q = (u_int8_t*) &y;
-
-    for(i = sizeof(u_int32_t) - 1; i >= 0; i--){
-	a = (a << 8) | p[i];
-	b = (b << 8) | q[i];
-    }
-    if(a > b)
-	return 1;
-    if(a < b)
-	return -1;
-    return 0;
-}
-
-int
-krb_lsb_antinet_ushort_cmp(u_int16_t x, u_int16_t y)
-{
-    int i;
-    u_int16_t a = 0, b = 0;
-    u_int8_t *p = (u_int8_t*) &x;
-    u_int8_t *q = (u_int8_t*) &y;
-
-    for(i = sizeof(u_int16_t) - 1; i >= 0; i--){
-	a = (a << 8) | p[i];
-	b = (b << 8) | q[i];
-    }
-    if(a > b)
-	return 1;
-    if(a < b)
-	return -1;
-    return 0;
-}
-
-u_int32_t
-lsb_time(time_t t, struct sockaddr_in *src, struct sockaddr_in *dst)
-{
-    /*
-     * direction bit is the sign bit of the timestamp.  Ok until
-     * 2038??
-     */
-    /* For compatibility with broken old code, compares are done in VAX 
-       byte order (LSBFIRST) */ 
-    if (krb_lsb_antinet_ulong_less(src->sin_addr.s_addr, /* src < recv */ 
-				   dst->sin_addr.s_addr) < 0) 
-        t = -t;
-    else if (krb_lsb_antinet_ulong_less(src->sin_addr.s_addr, 
-					dst->sin_addr.s_addr)==0) 
-        if (krb_lsb_antinet_ushort_less(src->sin_port, dst->sin_port) < 0)
-            t = -t;
-    /*
-     * all that for one tiny bit!  Heaven help those that talk to
-     * themselves.
-     */
-    t = t & 0xffffffff;
-    return t;
-}
diff --git a/crypto/kerberosIV/lib/krb/lsb_addr_comp.h b/crypto/kerberosIV/lib/krb/lsb_addr_comp.h
deleted file mode 100644
index 21adf062c3eb..000000000000
--- a/crypto/kerberosIV/lib/krb/lsb_addr_comp.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * $Id: lsb_addr_comp.h,v 1.6 1996/10/05 00:18:02 joda Exp $
- *
- * Copyright 1988 by the Massachusetts Institute of Technology.
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
- *
- * Comparison macros to emulate LSBFIRST comparison results of network
- * byte-order quantities
- */
-
-#ifndef LSB_ADDR_COMP_DEFS
-#define LSB_ADDR_COMP_DEFS
-
-/* Compare x and y in VAX byte order, result is -1, 0 or 1. */
-
-#define krb_lsb_antinet_ulong_less(x, y) (((x) == (y)) ? 0 :  krb_lsb_antinet_ulong_cmp(x, y))
-
-#define krb_lsb_antinet_ushort_less(x, y) (((x) == (y)) ? 0 : krb_lsb_antinet_ushort_cmp(x, y))
-
-int krb_lsb_antinet_ulong_cmp(u_int32_t x, u_int32_t y);
-int krb_lsb_antinet_ushort_cmp(u_int16_t x, u_int16_t y);
-u_int32_t lsb_time(time_t t, struct sockaddr_in *src, struct sockaddr_in *dst);
-
-#endif /*  LSB_ADDR_COMP_DEFS */
diff --git a/crypto/kerberosIV/lib/krb/mk_auth.c b/crypto/kerberosIV/lib/krb/mk_auth.c
deleted file mode 100644
index 7cfb36bb2a46..000000000000
--- a/crypto/kerberosIV/lib/krb/mk_auth.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: mk_auth.c,v 1.4 1997/04/01 08:18:35 joda Exp $");
-
-/*
- * Generate an authenticator for service.instance@realm.
- * instance is canonicalized by `krb_get_phost'
- * realm is set to the local realm if realm == NULL
- * The ticket acquired by `krb_mk_req' is returned in `ticket' and the
- * authenticator in `buf'.  
- * Options control the behaviour (see krb_sendauth).
- */
-
-int
-krb_mk_auth(int32_t options,
-	    KTEXT ticket,
-	    char *service,
-	    char *instance,
-	    char *realm,
-	    u_int32_t checksum,
-	    char *version,
-	    KTEXT buf)
-{
-  char realinst[INST_SZ];
-  char realrealm[REALM_SZ];
-  int ret;
-  unsigned char *p;
-
-  if (options & KOPT_DONT_CANON)
-    strncpy(realinst, instance, sizeof(realinst));
-  else
-    strncpy(realinst, krb_get_phost (instance), sizeof(realinst));
-
-  if (realm == NULL) {
-    ret = krb_get_lrealm (realrealm, 1);
-    if (ret != KSUCCESS)
-      return ret;
-    realm = realrealm;
-  }
-  
-  if(!(options & KOPT_DONT_MK_REQ)) {
-    ret = krb_mk_req (ticket, service, realinst, realm, checksum);
-    if (ret != KSUCCESS)
-      return ret;
-  }
-    
-  p = buf->dat;
-
-  memcpy (p, KRB_SENDAUTH_VERS, KRB_SENDAUTH_VLEN);
-  p += KRB_SENDAUTH_VLEN;
-  memcpy (p, version, KRB_SENDAUTH_VLEN);
-  p += KRB_SENDAUTH_VLEN;
-  p += krb_put_int(ticket->length, p, 4);
-  memcpy(p, ticket->dat, ticket->length);
-  p += ticket->length;
-  buf->length = p - buf->dat;
-  return KSUCCESS;
-}
diff --git a/crypto/kerberosIV/lib/krb/mk_err.c b/crypto/kerberosIV/lib/krb/mk_err.c
deleted file mode 100644
index 710587a5e075..000000000000
--- a/crypto/kerberosIV/lib/krb/mk_err.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-#include "krb_locl.h"
-
-RCSID("$Id: mk_err.c,v 1.6 1997/03/23 03:53:14 joda Exp $");
-
-/*
- * This routine creates a general purpose error reply message.  It
- * doesn't use KTEXT because application protocol may have long
- * messages, and may want this part of buffer contiguous to other
- * stuff.
- *
- * The error reply is built in "p", using the error code "e" and
- * error text "e_string" given.  The length of the error reply is
- * returned.
- *
- * The error reply is in the following format:
- *
- * unsigned char	KRB_PROT_VERSION	protocol version no.
- * unsigned char	AUTH_MSG_APPL_ERR	message type
- * (least significant
- * bit of above)	HOST_BYTE_ORDER		local byte order
- * 4 bytes		e			given error code
- * string		e_string		given error text
- */
-
-int32_t
-krb_mk_err(u_char *p, int32_t e, char *e_string)
-{
-    unsigned char *start = p;
-    p += krb_put_int(KRB_PROT_VERSION, p, 1);
-    p += krb_put_int(AUTH_MSG_APPL_ERR, p, 1);
-    
-    p += krb_put_int(e, p, 4);
-    p += krb_put_string(e_string, p);
-    return p - start;
-}
diff --git a/crypto/kerberosIV/lib/krb/mk_priv.c b/crypto/kerberosIV/lib/krb/mk_priv.c
deleted file mode 100644
index b6a9cc4a24b6..000000000000
--- a/crypto/kerberosIV/lib/krb/mk_priv.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: mk_priv.c,v 1.18 1997/04/01 08:18:37 joda Exp $");
-
-/* application include files */
-#include "lsb_addr_comp.h"
-
-/*
- * krb_mk_priv() constructs an AUTH_MSG_PRIVATE message.  It takes
- * some user data "in" of "length" bytes and creates a packet in "out"
- * consisting of the user data, a timestamp, and the sender's network
- * address.
- * The packet is encrypted by pcbc_encrypt(), using the given
- * "key" and "schedule".
- * The length of the resulting packet "out" is
- * returned.
- *
- * It is similar to krb_mk_safe() except for the additional key
- * schedule argument "schedule" and the fact that the data is encrypted
- * rather than appended with a checksum.  The protocol version is
- * KRB_PROT_VERSION, defined in "krb.h".
- *
- * The "out" packet consists of:
- *
- * Size			Variable		Field
- * ----			--------		-----
- *
- * 1 byte		KRB_PROT_VERSION	protocol version number
- * 1 byte		AUTH_MSG_PRIVATE |	message type plus local
- *			HOST_BYTE_ORDER		byte order in low bit
- *
- * 4 bytes		c_length		length of data
- * we encrypt from here with pcbc_encrypt
- * 
- * 4 bytes		length			length of user data
- * length		in			user data
- * 1 byte		msg_time_5ms		timestamp milliseconds
- * 4 bytes		sender->sin.addr.s_addr	sender's IP address
- *
- * 4 bytes		msg_time_sec or		timestamp seconds with
- *			-msg_time_sec		direction in sign bit
- *
- * 0<=n<=7  bytes	pad to 8 byte multiple	zeroes
- */
-
-int32_t
-krb_mk_priv(void *in, void *out, u_int32_t length, 
-	    struct des_ks_struct *schedule, des_cblock *key, 
-	    struct sockaddr_in *sender, struct sockaddr_in *receiver)
-{
-    unsigned char *p = (unsigned char*)out;
-    unsigned char *cipher;
-
-    struct timeval tv;
-    u_int32_t src_addr;
-    u_int32_t len;
-
-    p += krb_put_int(KRB_PROT_VERSION, p, 1);
-    p += krb_put_int(AUTH_MSG_PRIVATE, p, 1);
-
-    len = 4 + length + 1 + 4 + 4;
-    len = (len + 7) & ~7;
-    p += krb_put_int(len, p, 4);
-    
-    cipher = p;
-
-    p += krb_put_int(length, p, 4);
-    
-    memcpy(p, in, length);
-    p += length;
-    
-    gettimeofday(&tv, NULL);
-
-    *p++ =tv.tv_usec / 5000;
-    
-    src_addr = sender->sin_addr.s_addr;
-    p += krb_put_address(src_addr, p);
-
-    p += krb_put_int(lsb_time(tv.tv_sec, sender, receiver), p, 4);
-    
-    memset(p, 0, 7);
-
-    des_pcbc_encrypt((des_cblock *)cipher, (des_cblock *)cipher,
-		     len, schedule, key, DES_ENCRYPT);
-
-    return  (cipher - (unsigned char*)out) + len;
-}
diff --git a/crypto/kerberosIV/lib/krb/mk_req.c b/crypto/kerberosIV/lib/krb/mk_req.c
deleted file mode 100644
index 313ea0408f17..000000000000
--- a/crypto/kerberosIV/lib/krb/mk_req.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: mk_req.c,v 1.17 1997/05/30 17:42:38 bg Exp $");
-
-static int lifetime = 255;	/* But no longer than TGT says. */
-
-
-static void
-build_request(KTEXT req, char *name, char *inst, char *realm, 
-	      u_int32_t checksum)
-{
-    struct timeval tv;
-    unsigned char *p = req->dat;
-    
-    p += krb_put_nir(name, inst, realm, p);
-    
-    p += krb_put_int(checksum, p, 4);
-
-
-    /* Fill in the times on the request id */
-    gettimeofday(&tv, NULL);
-
-    *p++ = tv.tv_usec / 5000; /* 5ms */
-    
-    p += krb_put_int(tv.tv_sec, p, 4);
-
-    /* Fill to a multiple of 8 bytes for DES */
-    req->length = ((p - req->dat + 7)/8) * 8;
-}
-
-
-/*
- * krb_mk_req takes a text structure in which an authenticator is to
- * be built, the name of a service, an instance, a realm,
- * and a checksum.  It then retrieves a ticket for
- * the desired service and creates an authenticator in the text
- * structure passed as the first argument.  krb_mk_req returns
- * KSUCCESS on success and a Kerberos error code on failure.
- *
- * The peer procedure on the other end is krb_rd_req.  When making
- * any changes to this routine it is important to make corresponding
- * changes to krb_rd_req.
- *
- * The authenticator consists of the following:
- *
- * authent->dat
- *
- * unsigned char	KRB_PROT_VERSION	protocol version no.
- * unsigned char	AUTH_MSG_APPL_REQUEST	message type
- * (least significant
- * bit of above)	HOST_BYTE_ORDER		local byte ordering
- * unsigned char	kvno from ticket	server's key version
- * string		realm			server's realm
- * unsigned char	tl			ticket length
- * unsigned char	idl			request id length
- * text			ticket->dat		ticket for server
- * text			req_id->dat		request id
- *
- * The ticket information is retrieved from the ticket cache or
- * fetched from Kerberos.  The request id (called the "authenticator"
- * in the papers on Kerberos) contains the following:
- *
- * req_id->dat
- *
- * string		cr.pname		{name, instance, and
- * string		cr.pinst		realm of principal
- * string		myrealm			making this request}
- * 4 bytes		checksum		checksum argument given
- * unsigned char	tv_local.tf_usec	time (milliseconds)
- * 4 bytes		tv_local.tv_sec		time (seconds)
- *
- * req_id->length = 3 strings + 3 terminating nulls + 5 bytes for time,
- *                  all rounded up to multiple of 8.
- */
-
-int
-krb_mk_req(KTEXT authent, char *service, char *instance, char *realm, 
-	   int32_t checksum)
-{
-    KTEXT_ST req_st;
-    KTEXT req_id = &req_st;
-
-    CREDENTIALS cr;             /* Credentials used by retr */
-    KTEXT ticket = &(cr.ticket_st); /* Pointer to tkt_st */
-    int retval;                 /* Returned by krb_get_cred */
-
-    char myrealm[REALM_SZ];
-
-    unsigned char *p = authent->dat;
-
-    p += krb_put_int(KRB_PROT_VERSION, p, 1);
-    
-    p += krb_put_int(AUTH_MSG_APPL_REQUEST, p, 1);
-    
-    /* Get the ticket and move it into the authenticator */
-    if (krb_ap_req_debug)
-        krb_warning("Realm: %s\n", realm);
-
-    retval = krb_get_cred(service,instance,realm,&cr);
-
-    if (retval == RET_NOTKT) {
-	retval = get_ad_tkt(service, instance, realm, lifetime);
-	if (retval == KSUCCESS)
-	    retval = krb_get_cred(service, instance, realm, &cr);
-    }
-
-    if (retval != KSUCCESS)
-	return retval;
-
-
-    /*
-     * With multi realm ticket files either find a matching TGT or
-     * else use the first TGT for inter-realm authentication.
-     *
-     * In myrealm hold the realm of the principal "owning" the
-     * corresponding ticket-granting-ticket.
-     */
-
-    retval = krb_get_cred(KRB_TICKET_GRANTING_TICKET, realm, realm, 0);
-    if (retval == KSUCCESS)
-      strncpy(myrealm, realm, REALM_SZ);
-    else
-      retval = krb_get_tf_realm(TKT_FILE, myrealm);
-    
-    if (retval != KSUCCESS)
-	return retval;
-    
-    if (krb_ap_req_debug)
-        krb_warning("serv=%s.%s@%s princ=%s.%s@%s\n", service, instance, realm,
-		    cr.pname, cr.pinst, myrealm);
-
-    p += krb_put_int(cr.kvno, p, 1);
-
-    p += krb_put_string(realm, p);
-
-    p += krb_put_int(ticket->length, p, 1);
-
-    build_request(req_id, cr.pname, cr.pinst, myrealm, checksum);
-    
-    encrypt_ktext(req_id, &cr.session, DES_ENCRYPT);
-
-    p += krb_put_int(req_id->length, p, 1);
-
-    memcpy(p, ticket->dat, ticket->length);
-    
-    p += ticket->length;
-    
-    memcpy(p, req_id->dat, req_id->length);
-    
-    p += req_id->length;
-
-    authent->length = p - authent->dat;
-    
-    memset(&cr, 0, sizeof(cr));
-    memset(&req_st, 0, sizeof(req_st));
-
-    if (krb_ap_req_debug)
-        krb_warning("Authent->length = %d\n", authent->length);
-
-    return KSUCCESS;
-}
-
-/* 
- * krb_set_lifetime sets the default lifetime for additional tickets
- * obtained via krb_mk_req().
- * 
- * It returns the previous value of the default lifetime.
- */
-
-int
-krb_set_lifetime(int newval)
-{
-    int olife = lifetime;
-
-    lifetime = newval;
-    return(olife);
-}
diff --git a/crypto/kerberosIV/lib/krb/mk_safe.c b/crypto/kerberosIV/lib/krb/mk_safe.c
deleted file mode 100644
index df5ca21ed0a7..000000000000
--- a/crypto/kerberosIV/lib/krb/mk_safe.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: mk_safe.c,v 1.21 1997/04/19 23:18:03 joda Exp $");
-
-/* application include files */
-#include "lsb_addr_comp.h"
-
-
-/* from rd_safe.c */
-extern int dqc_type;
-void fixup_quad_cksum(void*, size_t, des_cblock*, void*, void*, int);
-
-/*
- * krb_mk_safe() constructs an AUTH_MSG_SAFE message.  It takes some
- * user data "in" of "length" bytes and creates a packet in "out"
- * consisting of the user data, a timestamp, and the sender's network
- * address, followed by a checksum computed on the above, using the
- * given "key".  The length of the resulting packet is returned.
- *
- * The "out" packet consists of:
- *
- * Size			Variable		Field
- * ----			--------		-----
- *
- * 1 byte		KRB_PROT_VERSION	protocol version number
- * 1 byte		AUTH_MSG_SAFE |		message type plus local
- *			HOST_BYTE_ORDER		byte order in low bit
- *
- * ===================== begin checksum ================================
- * 
- * 4 bytes		length			length of user data
- * length		in			user data
- * 1 byte		msg_time_5ms		timestamp milliseconds
- * 4 bytes		sender->sin.addr.s_addr	sender's IP address
- *
- * 4 bytes		msg_time_sec or		timestamp seconds with
- *			-msg_time_sec		direction in sign bit
- *
- * ======================= end checksum ================================
- *
- * 16 bytes		big_cksum		quadratic checksum of
- *						above using "key"
- */
-
-int32_t
-krb_mk_safe(void *in, void *out, u_int32_t length, des_cblock *key, 
-	    struct sockaddr_in *sender, struct sockaddr_in *receiver)
-{
-    unsigned char * p = (unsigned char*)out;
-    struct timeval tv;
-    unsigned char *start;
-    u_int32_t src_addr;
-
-    p += krb_put_int(KRB_PROT_VERSION, p, 1);
-    p += krb_put_int(AUTH_MSG_SAFE, p, 1);
-    
-    start = p;
-
-    p += krb_put_int(length, p, 4);
-
-    memcpy(p, in, length);
-    p += length;
-    
-    gettimeofday(&tv, NULL);
-
-    *p++ = tv.tv_usec/5000; /* 5ms */
-    
-    src_addr = sender->sin_addr.s_addr;
-    p += krb_put_address(src_addr, p);
-
-    p += krb_put_int(lsb_time(tv.tv_sec, sender, receiver), p, 4);
-
-    {
-	/* We are faking big endian mode, so we need to fix the
-	 * checksum (that is byte order dependent). We always send a
-	 * checksum of the new type, unless we know that we are
-	 * talking to an old client (this requires a call to
-	 * krb_rd_safe first).  
-	 */
-	unsigned char new_checksum[16];
-	unsigned char old_checksum[16];
-	fixup_quad_cksum(start, p - start, key, new_checksum, old_checksum, 0);
-	
-	if((dqc_type == DES_QUAD_GUESS && DES_QUAD_DEFAULT == DES_QUAD_OLD) || 
-	   dqc_type == DES_QUAD_OLD)
-	    memcpy(p, old_checksum, 16);
-	else
-	    memcpy(p, new_checksum, 16);
-    }
-    p += 16;
-
-    return p - (unsigned char*)out;
-}
diff --git a/crypto/kerberosIV/lib/krb/month_sname.c b/crypto/kerberosIV/lib/krb/month_sname.c
deleted file mode 100644
index aaceee5f094b..000000000000
--- a/crypto/kerberosIV/lib/krb/month_sname.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-#include "krb_locl.h"
-
-RCSID("$Id: month_sname.c,v 1.5 1997/03/23 03:53:14 joda Exp $");
-
-/*
- * Given an integer 1-12, month_sname() returns a string
- * containing the first three letters of the corresponding
- * month.  Returns 0 if the argument is out of range.
- */
-
-const char *month_sname(int n)
-{
-    static const char *name[] = {
-        "Jan","Feb","Mar","Apr","May","Jun",
-        "Jul","Aug","Sep","Oct","Nov","Dec"
-    };
-    return((n < 1 || n > 12) ? 0 : name [n-1]);
-}
diff --git a/crypto/kerberosIV/lib/krb/name2name.c b/crypto/kerberosIV/lib/krb/name2name.c
deleted file mode 100644
index fa95b8914fb0..000000000000
--- a/crypto/kerberosIV/lib/krb/name2name.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: name2name.c,v 1.15 1997/04/30 04:30:36 assar Exp $");
-
-/* convert host to a more fully qualified domain name, returns 0 if
- * phost is the same as host, 1 otherwise. phost should be
- * phost_size bytes long.
- */
-
-int
-krb_name_to_name(const char *host, char *phost, size_t phost_size)
-{
-    struct hostent *hp;
-    struct in_addr adr;
-    const char *tmp;
-    
-    adr.s_addr = inet_addr(host);
-    hp = gethostbyname(host);
-    if (hp == NULL && adr.s_addr != INADDR_NONE)
-	hp = gethostbyaddr((char *)&adr, sizeof(adr), AF_INET);
-    if (hp == NULL)
-	tmp = host;
-    else
-	tmp = hp->h_name;
-    strncpy (phost, tmp, phost_size);
-    phost[phost_size - 1] = '\0';
-
-    if (strcmp(phost, host) == 0)
-	return 0;
-    else
-	return 1;
-}
-
-/* lowercase and truncate */
-
-void
-k_ricercar(char *name)
-{
-    char *p = name;
-    while(*p && *p != '.'){
-	if(isupper(*p))
-	    *p = tolower(*p);
-	p++;
-    }
-    if(*p == '.')
-	*p = 0;
-}
-
-/*
- * This routine takes an alias for a host name and returns the first
- * field, in lower case, of its domain name.
- *
- * Example: "fOo.BAR.com" -> "foo"
- */
-
-char *
-krb_get_phost(const char *alias)
-{
-    static char phost[MaxHostNameLen+1];
-    
-    krb_name_to_name(alias, phost, sizeof(phost));
-    k_ricercar(phost);
-    return phost;
-}
diff --git a/crypto/kerberosIV/lib/krb/netread.c b/crypto/kerberosIV/lib/krb/netread.c
deleted file mode 100644
index cbc1bd12ce28..000000000000
--- a/crypto/kerberosIV/lib/krb/netread.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-#include "krb_locl.h"
-
-RCSID("$Id: netread.c,v 1.6 1997/03/23 03:53:15 joda Exp $");
-
-/*
- * krb_net_read() reads from the file descriptor "fd" to the buffer
- * "buf", until either 1) "len" bytes have been read or 2) cannot
- * read anymore from "fd".  It returns the number of bytes read
- * or a read() error.  (The calling interface is identical to
- * read(2).)
- *
- * XXX must not use non-blocking I/O
- */
-
-int
-krb_net_read (int fd, void *v, size_t len)
-{
-    int cc, len2 = 0;
-    char *buf = v;
-
-    do {
-	cc = read(fd, buf, len);
-	if (cc < 0)
-	    return(cc);		 /* errno is already set */
-	else if (cc == 0) {
-	    return(len2);
-	} else {
-	    buf += cc;
-	    len2 += cc;
-	    len -= cc;
-	}
-    } while (len > 0);
-    return(len2);
-}
diff --git a/crypto/kerberosIV/lib/krb/netwrite.c b/crypto/kerberosIV/lib/krb/netwrite.c
deleted file mode 100644
index 0703d91b321f..000000000000
--- a/crypto/kerberosIV/lib/krb/netwrite.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-#include "krb_locl.h"
-
-RCSID("$Id: netwrite.c,v 1.7 1997/03/23 03:53:15 joda Exp $");
-
-/*
- * krb_net_write() writes "len" bytes from "buf" to the file
- * descriptor "fd".  It returns the number of bytes written or
- * a write() error.  (The calling interface is identical to
- * write(2).)
- *
- * XXX must not use non-blocking I/O
- */
-
-int
-krb_net_write(int fd, const void *v, size_t len)
-{
-    int cc;
-    int wrlen = len;
-    const char *buf = (const char*)v;
-
-    do {
-	cc = write(fd, buf, wrlen);
-	if (cc < 0)
-	    return(cc);
-	else {
-	    buf += cc;
-	    wrlen -= cc;
-	}
-    } while (wrlen > 0);
-    return(len);
-}
diff --git a/crypto/kerberosIV/lib/krb/one.c b/crypto/kerberosIV/lib/krb/one.c
deleted file mode 100644
index d43b2840e08c..000000000000
--- a/crypto/kerberosIV/lib/krb/one.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-  Export of this software from the United States of America is assumed
-  to require a specific license from the United States Government.
-  It is the responsibility of any person or organization contemplating
-  export to obtain such a license before exporting.
-  
-  WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-  distribute this software and its documentation for any purpose and
-  without fee is hereby granted, provided that the above copyright
-  notice appear in all copies and that both that copyright notice and
-  this permission notice appear in supporting documentation, and that
-  the name of M.I.T. not be used in advertising or publicity pertaining
-  to distribution of the software without specific, written prior
-  permission.  M.I.T. makes no representations about the suitability of
-  this software for any purpose.  It is provided "as is" without express
-  or implied warranty.
-  
-  */
-
-/*
- * definition of variable set to 1.
- * used in krb_conf.h to determine host byte order.
- */
-
-int krbONE = 1;
diff --git a/crypto/kerberosIV/lib/krb/parse_name.c b/crypto/kerberosIV/lib/krb/parse_name.c
deleted file mode 100644
index 1184330bd3c3..000000000000
--- a/crypto/kerberosIV/lib/krb/parse_name.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: parse_name.c,v 1.4 1997/04/01 08:18:39 joda Exp $");
-
-int
-krb_parse_name(const char *fullname, krb_principal *principal)
-{
-    const char *p;
-    char *ns, *np;
-    enum {n, i, r} pos = n;
-    int quote = 0;
-    ns = np = principal->name;
-
-    principal->name[0] = 0;
-    principal->instance[0] = 0;
-    principal->realm[0] = 0;
-
-    for(p = fullname; *p; p++){
-	if(np - ns == ANAME_SZ - 1) /* XXX they have the same size */
-	    return KNAME_FMT;
-	if(quote){
-	    *np++ = *p;
-	    quote = 0;
-	    continue;
-	}
-	if(*p == '\\')
-	    quote = 1;
-	else if(*p == '.' && pos == n){
-	    *np = 0;
-	    ns = np = principal->instance;
-	    pos = i;
-	}else if(*p == '@' && (pos == n || pos == i)){
-	    *np = 0;
-	    ns = np = principal->realm;
-	    pos = r;
-	}else
-	    *np++ = *p;
-    }
-    *np = 0;
-    if(quote || principal->name[0] == 0)
-	return KNAME_FMT;
-    return KSUCCESS;
-}
-
-int
-kname_parse(char *np, char *ip, char *rp, char *fullname)
-{
-    krb_principal p;
-    int ret;
-    if((ret = krb_parse_name(fullname, &p)) == 0){
-	strcpy(np, p.name);
-	strcpy(ip, p.instance);
-	if(p.realm[0])
-	    strcpy(rp, p.realm);
-    }
-    return ret;
-}
-/*
- * k_isname() returns 1 if the given name is a syntactically legitimate
- * Kerberos name; returns 0 if it's not.
- */
-
-int
-k_isname(char *s)
-{
-    char c;
-    int backslash = 0;
-
-    if (!*s)
-        return 0;
-    if (strlen(s) > ANAME_SZ - 1)
-        return 0;
-    while ((c = *s++)) {
-        if (backslash) {
-            backslash = 0;
-            continue;
-        }
-        switch(c) {
-        case '\\':
-            backslash = 1;
-            break;
-        case '.':
-            return 0;
-            /* break; */
-        case '@':
-            return 0;
-            /* break; */
-        }
-    }
-    return 1;
-}
-
-
-/*
- * k_isinst() returns 1 if the given name is a syntactically legitimate
- * Kerberos instance; returns 0 if it's not.
- */
-
-int
-k_isinst(char *s)
-{
-    char c;
-    int backslash = 0;
-
-    if (strlen(s) > INST_SZ - 1)
-        return 0;
-    while ((c = *s++)) {
-        if (backslash) {
-            backslash = 0;
-            continue;
-        }
-        switch(c) {
-        case '\\':
-            backslash = 1;
-            break;
-        case '.':
-#if     INSTANCE_DOTS_OK
-            break;
-#else   /* INSTANCE_DOTS_OK */
-            return 0; 
-#endif  /* INSTANCE_DOTS_OK */
-            /* break; */
-        case '@':
-            return 0;
-            /* break; */
-        }
-    }
-    return 1;
-}
-
-/*
- * k_isrealm() returns 1 if the given name is a syntactically legitimate
- * Kerberos realm; returns 0 if it's not.
- */
-
-int
-k_isrealm(char *s)
-{
-    char c;
-    int backslash = 0;
-
-    if (!*s)
-        return 0;
-    if (strlen(s) > REALM_SZ - 1)
-        return 0;
-    while ((c = *s++)) {
-        if (backslash) {
-            backslash = 0;
-            continue;
-        }
-        switch(c) {
-        case '\\':
-            backslash = 1;
-            break;
-        case '@':
-            return 0;
-            /* break; */
-        }
-    }
-    return 1;
-}
diff --git a/crypto/kerberosIV/lib/krb/prot.h b/crypto/kerberosIV/lib/krb/prot.h
deleted file mode 100644
index e4825e1df911..000000000000
--- a/crypto/kerberosIV/lib/krb/prot.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * $Id: prot.h,v 1.7 1997/03/23 03:52:27 joda Exp $
- *
- * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute
- * of Technology.
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
- *
- * Include file with authentication protocol information.
- */
-
-#ifndef PROT_DEFS
-#define PROT_DEFS
-
-#define		KRB_SERVICE		"kerberos-iv"
-#define		KRB_PORT		750	/* PC's don't have
-						 * /etc/services */
-#define		KRB_PROT_VERSION 	4
-#define 	MAX_PKT_LEN		1000
-#define		MAX_TXT_LEN		1000
-
-/* Macro's to obtain various fields from a packet */
-
-#define pkt_version(packet)  (unsigned int) *(packet->dat)
-#define pkt_msg_type(packet) (unsigned int) *(packet->dat+1)
-#define pkt_a_name(packet)   (packet->dat+2)
-#define pkt_a_inst(packet)   \
-	(packet->dat+3+strlen((char *)pkt_a_name(packet)))
-#define pkt_a_realm(packet)  \
-	(pkt_a_inst(packet)+1+strlen((char *)pkt_a_inst(packet)))
-
-/* Macro to obtain realm from application request */
-#define apreq_realm(auth)     (auth->dat + 3)
-
-#define pkt_time_ws(packet) (char *) \
-        (packet->dat+5+strlen((char *)pkt_a_name(packet)) + \
-	 strlen((char *)pkt_a_inst(packet)) + \
-	 strlen((char *)pkt_a_realm(packet)))
-
-#define pkt_no_req(packet) (unsigned short) \
-        *(packet->dat+9+strlen((char *)pkt_a_name(packet)) + \
-	  strlen((char *)pkt_a_inst(packet)) + \
-	  strlen((char *)pkt_a_realm(packet)))
-#define pkt_x_date(packet) (char *) \
-        (packet->dat+10+strlen((char *)pkt_a_name(packet)) + \
-	 strlen((char *)pkt_a_inst(packet)) + \
-	 strlen((char *)pkt_a_realm(packet)))
-#define pkt_err_code(packet) ( (char *) \
-        (packet->dat+9+strlen((char *)pkt_a_name(packet)) + \
-	 strlen((char *)pkt_a_inst(packet)) + \
-	 strlen((char *)pkt_a_realm(packet))))
-#define pkt_err_text(packet) \
-        (packet->dat+13+strlen((char *)pkt_a_name(packet)) + \
-	 strlen((char *)pkt_a_inst(packet)) + \
-	 strlen((char *)pkt_a_realm(packet)))
-
-/* Routines to create and read packets may be found in prot.c */
-
-KTEXT create_auth_reply(char *pname, char *pinst, char *prealm, 
-			int32_t time_ws, int n, u_int32_t x_date, 
-			int kvno, KTEXT cipher);
-#ifdef DEBUG
-KTEXT krb_create_death_packet(char *a_name);
-#endif
-
-/* Message types , always leave lsb for byte order */
-
-#define		AUTH_MSG_KDC_REQUEST			 1<<1
-#define 	AUTH_MSG_KDC_REPLY			 2<<1
-#define		AUTH_MSG_APPL_REQUEST			 3<<1
-#define		AUTH_MSG_APPL_REQUEST_MUTUAL		 4<<1
-#define		AUTH_MSG_ERR_REPLY			 5<<1
-#define		AUTH_MSG_PRIVATE			 6<<1
-#define		AUTH_MSG_SAFE				 7<<1
-#define		AUTH_MSG_APPL_ERR			 8<<1
-#define		AUTH_MSG_KDC_FORWARD			 9<<1
-#define		AUTH_MSG_KDC_RENEW			10<<1
-#define 	AUTH_MSG_DIE				63<<1
-
-/* values for kerb error codes */
-
-#define		KERB_ERR_OK				 0
-#define		KERB_ERR_NAME_EXP			 1
-#define		KERB_ERR_SERVICE_EXP			 2
-#define		KERB_ERR_AUTH_EXP			 3
-#define		KERB_ERR_PKT_VER			 4
-#define		KERB_ERR_NAME_MAST_KEY_VER		 5
-#define		KERB_ERR_SERV_MAST_KEY_VER		 6
-#define		KERB_ERR_BYTE_ORDER			 7
-#define		KERB_ERR_PRINCIPAL_UNKNOWN		 8
-#define		KERB_ERR_PRINCIPAL_NOT_UNIQUE		 9
-#define		KERB_ERR_NULL_KEY			10
-#define		KERB_ERR_TIMEOUT			11
-
-/* sendauth - recvauth */
-
-/*
- * If the protocol changes, you will need to change the version string
- * be sure to support old versions of krb_sendauth!
- */
-
-#define	KRB_SENDAUTH_VERS "AUTHV0.1" /* MUST be KRB_SENDAUTH_VLEN chars */
-
-#endif /* PROT_DEFS */
diff --git a/crypto/kerberosIV/lib/krb/rd_err.c b/crypto/kerberosIV/lib/krb/rd_err.c
deleted file mode 100644
index 3382eabddf89..000000000000
--- a/crypto/kerberosIV/lib/krb/rd_err.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: rd_err.c,v 1.8 1997/04/01 08:18:40 joda Exp $");
-
-/*
- * Given an AUTH_MSG_APPL_ERR message, "in" and its length "in_length",
- * return the error code from the message in "code" and the text in
- * "m_data" as follows:
- *
- *	m_data->app_data	points to the error text
- *	m_data->app_length	points to the length of the error text
- *
- * If all goes well, return RD_AP_OK.  If the version number
- * is wrong, return RD_AP_VERSION, and if it's not an AUTH_MSG_APPL_ERR
- * type message, return RD_AP_MSG_TYPE.
- *
- * The AUTH_MSG_APPL_ERR message format can be found in mk_err.c
- */
-
-int
-krb_rd_err(u_char *in, u_int32_t in_length, int32_t *code, MSG_DAT *m_data)
-{
-    unsigned char *p = (unsigned char*)in;
-    
-    unsigned char pvno, type;
-    int little_endian;
-
-    pvno = *p++;
-    if(pvno != KRB_PROT_VERSION)
-	return RD_AP_VERSION;
-    
-    type = *p++;
-    little_endian = type & 1;
-    type &= ~1;
-    
-    if(type != AUTH_MSG_APPL_ERR)
-	return RD_AP_MSG_TYPE;
-    
-    p += krb_get_int(p, (u_int32_t *)&code, 4, little_endian);
-    
-    m_data->app_data = p;
-    m_data->app_length = in_length; /* XXX is this correct? */
-    return KSUCCESS;
-}
diff --git a/crypto/kerberosIV/lib/krb/rd_priv.c b/crypto/kerberosIV/lib/krb/rd_priv.c
deleted file mode 100644
index 58ecd9f7e38e..000000000000
--- a/crypto/kerberosIV/lib/krb/rd_priv.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: rd_priv.c,v 1.24 1997/05/14 17:53:29 joda Exp $");
-
-/* application include files */
-#include "lsb_addr_comp.h"
-
-/*
- * krb_rd_priv() decrypts and checks the integrity of an
- * AUTH_MSG_PRIVATE message.  Given the message received, "in",
- * the length of that message, "in_length", the key "schedule"
- * and "key", and the network addresses of the
- * "sender" and "receiver" of the message, krb_rd_safe() returns
- * RD_AP_OK if the message is okay, otherwise some error code.
- *
- * The message data retrieved from "in" are returned in the structure
- * "m_data".  The pointer to the application data
- * (m_data->app_data) refers back to the appropriate place in "in".
- *
- * See the file "mk_priv.c" for the format of the AUTH_MSG_PRIVATE
- * message.  The structure containing the extracted message
- * information, MSG_DAT, is defined in "krb.h".
- */
-
-int32_t
-krb_rd_priv(void *in, u_int32_t in_length, 
-	    struct des_ks_struct *schedule, des_cblock *key, 
-	    struct sockaddr_in *sender, struct sockaddr_in *receiver, 
-	    MSG_DAT *m_data)
-{
-    unsigned char *p = (unsigned char*)in;
-    int little_endian;
-    u_int32_t clen;
-    struct timeval tv;
-    u_int32_t src_addr;
-    int delta_t;
-
-    unsigned char pvno, type;
-
-    pvno = *p++;
-    if(pvno != KRB_PROT_VERSION)
-	return RD_AP_VERSION;
-    
-    type = *p++;
-    little_endian = type & 1;
-    type &= ~1;
-
-    p += krb_get_int(p, &clen, 4, little_endian);
-    
-    if(clen + 2 > in_length)
-	return RD_AP_MODIFIED;
-
-    des_pcbc_encrypt((des_cblock*)p, (des_cblock*)p, clen, 
-		     schedule, key, DES_DECRYPT);
-    
-    p += krb_get_int(p, &m_data->app_length, 4, little_endian);
-    if(m_data->app_length + 17 > in_length)
-	return RD_AP_MODIFIED;
-
-    m_data->app_data = p;
-    p += m_data->app_length;
-    
-    m_data->time_5ms = *p++;
-
-    p += krb_get_address(p, &src_addr);
-
-    if (!krb_equiv(src_addr, sender->sin_addr.s_addr))
-	return RD_AP_BADD;
-
-    p += krb_get_int(p, (u_int32_t *)&m_data->time_sec, 4, little_endian);
-
-    m_data->time_sec = lsb_time(m_data->time_sec, sender, receiver);
-    
-    gettimeofday(&tv, NULL);
-
-    /* check the time integrity of the msg */
-    delta_t = abs((int)((long) tv.tv_sec - m_data->time_sec));
-    if (delta_t > CLOCK_SKEW)
-	return RD_AP_TIME;
-    if (krb_debug)
-      krb_warning("\ndelta_t = %d", (int) delta_t);
-
-    /*
-     * caller must check timestamps for proper order and
-     * replays, since server might have multiple clients
-     * each with its own timestamps and we don't assume
-     * tightly synchronized clocks.
-     */
-
-    return KSUCCESS;
-}
diff --git a/crypto/kerberosIV/lib/krb/rd_req.c b/crypto/kerberosIV/lib/krb/rd_req.c
deleted file mode 100644
index 1a3e848137b0..000000000000
--- a/crypto/kerberosIV/lib/krb/rd_req.c
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: rd_req.c,v 1.24 1997/05/11 11:05:28 assar Exp $");
-
-static struct timeval t_local = { 0, 0 };
-
-/*
- * Keep the following information around for subsequent calls
- * to this routine by the same server using the same key.
- */
-
-static des_key_schedule serv_key;	/* Key sched to decrypt ticket */
-static des_cblock ky;              /* Initialization vector */
-static int st_kvno;		/* version number for this key */
-static char st_rlm[REALM_SZ];	/* server's realm */
-static char st_nam[ANAME_SZ];	/* service name */
-static char st_inst[INST_SZ];	/* server's instance */
-
-/*
- * This file contains two functions.  krb_set_key() takes a DES
- * key or password string and returns a DES key (either the original
- * key, or the password converted into a DES key) and a key schedule
- * for it.
- *
- * krb_rd_req() reads an authentication request and returns information
- * about the identity of the requestor, or an indication that the
- * identity information was not authentic.
- */
-
-/*
- * krb_set_key() takes as its first argument either a DES key or a
- * password string.  The "cvt" argument indicates how the first
- * argument "key" is to be interpreted: if "cvt" is null, "key" is
- * taken to be a DES key; if "cvt" is non-null, "key" is taken to
- * be a password string, and is converted into a DES key using
- * string_to_key().  In either case, the resulting key is returned
- * in the external static variable "ky".  A key schedule is
- * generated for "ky" and returned in the external static variable
- * "serv_key".
- *
- * This routine returns the return value of des_key_sched.
- *
- * krb_set_key() needs to be in the same .o file as krb_rd_req() so that
- * the key set by krb_set_key() is available in private storage for
- * krb_rd_req().
- */
-
-int
-krb_set_key(void *key, int cvt)
-{
-#ifdef NOENCRYPTION
-    memset(ky, 0, sizeof(ky));
-    return KSUCCESS;
-#else /* Encrypt */
-    if (cvt)
-        des_string_to_key((char*)key, &ky);
-    else
-        memcpy((char*)ky, key, 8);
-    return(des_key_sched(&ky, serv_key));
-#endif /* NOENCRYPTION */
-}
-
-
-/*
- * krb_rd_req() takes an AUTH_MSG_APPL_REQUEST or
- * AUTH_MSG_APPL_REQUEST_MUTUAL message created by krb_mk_req(),
- * checks its integrity and returns a judgement as to the requestor's
- * identity.
- *
- * The "authent" argument is a pointer to the received message.
- * The "service" and "instance" arguments name the receiving server,
- * and are used to get the service's ticket to decrypt the ticket
- * in the message, and to compare against the server name inside the
- * ticket.  "from_addr" is the network address of the host from which
- * the message was received; this is checked against the network
- * address in the ticket.  If "from_addr" is zero, the check is not
- * performed.  "ad" is an AUTH_DAT structure which is
- * filled in with information about the sender's identity according
- * to the authenticator and ticket sent in the message.  Finally,
- * "fn" contains the name of the file containing the server's key.
- * (If "fn" is NULL, the server's key is assumed to have been set
- * by krb_set_key().  If "fn" is the null string ("") the default
- * file KEYFILE, defined in "krb.h", is used.)
- *
- * krb_rd_req() returns RD_AP_OK if the authentication information
- * was genuine, or one of the following error codes (defined in
- * "krb.h"):
- *
- *	RD_AP_VERSION		- wrong protocol version number
- *	RD_AP_MSG_TYPE		- wrong message type
- *	RD_AP_UNDEC		- couldn't decipher the message
- *	RD_AP_INCON		- inconsistencies found
- *	RD_AP_BADD		- wrong network address
- *	RD_AP_TIME		- client time (in authenticator)
- *				  too far off server time
- *	RD_AP_NYV		- Kerberos time (in ticket) too
- *				  far off server time
- *	RD_AP_EXP		- ticket expired
- *
- * For the message format, see krb_mk_req().
- *
- * Mutual authentication is not implemented.
- */
-
-int
-krb_rd_req(KTEXT authent,	/* The received message */
-	   char *service,	/* Service name */
-	   char *instance,	/* Service instance */
-	   int32_t from_addr,	/* Net address of originating host */
-	   AUTH_DAT *ad,	/* Structure to be filled in */
-	   char *fn)		/* Filename to get keys from */
-{
-    static KTEXT_ST ticket;     /* Temp storage for ticket */
-    static KTEXT tkt = &ticket;
-    static KTEXT_ST req_id_st;  /* Temp storage for authenticator */
-    KTEXT req_id = &req_id_st;
-
-    char realm[REALM_SZ];	/* Realm of issuing kerberos */
-
-    unsigned char skey[KKEY_SZ]; /* Session key from ticket */
-    char sname[SNAME_SZ];	/* Service name from ticket */
-    char iname[INST_SZ];	/* Instance name from ticket */
-    char r_aname[ANAME_SZ];	/* Client name from authenticator */
-    char r_inst[INST_SZ];	/* Client instance from authenticator */
-    char r_realm[REALM_SZ];	/* Client realm from authenticator */
-    u_int32_t r_time_sec;	/* Coarse time from authenticator */
-    unsigned long delta_t;      /* Time in authenticator - local time */
-    long tkt_age;		/* Age of ticket */
-    static unsigned char s_kvno;/* Version number of the server's key
-				 * Kerberos used to encrypt ticket */
-
-    struct timeval tv;
-    int status;
-
-    int pvno;
-    int type;
-    int little_endian;
-
-    unsigned char *p;
-
-    if (authent->length <= 0)
-	return(RD_AP_MODIFIED);
-
-    p = authent->dat;
-
-    /* get msg version, type and byte order, and server key version */
-
-    pvno = *p++;
-
-    if(pvno != KRB_PROT_VERSION)
-	return RD_AP_VERSION;
-    
-    type = *p++;
-    
-    little_endian = type & 1;
-    type &= ~1;
-    
-    if(type != AUTH_MSG_APPL_REQUEST && type != AUTH_MSG_APPL_REQUEST_MUTUAL)
-	return RD_AP_MSG_TYPE;
-
-    s_kvno = *p++;
-
-    p += krb_get_string(p, realm);
-
-    /*
-     * If "fn" is NULL, key info should already be set; don't
-     * bother with ticket file.  Otherwise, check to see if we
-     * already have key info for the given server and key version
-     * (saved in the static st_* variables).  If not, go get it
-     * from the ticket file.  If "fn" is the null string, use the
-     * default ticket file.
-     */
-    if (fn && (strcmp(st_nam,service) || strcmp(st_inst,instance) ||
-               strcmp(st_rlm,realm) || (st_kvno != s_kvno))) {
-        if (*fn == 0) fn = KEYFILE;
-        st_kvno = s_kvno;
-        if (read_service_key(service, instance, realm, s_kvno,
-			     fn, (char *)skey))
-            return(RD_AP_UNDEC);
-        if ((status = krb_set_key((char*)skey, 0)))
-	    return(status);
-        strcpy(st_rlm, realm);
-        strcpy(st_nam, service);
-        strcpy(st_inst, instance);
-    }
-
-    tkt->length = *p++;
-
-    req_id->length = *p++;
-
-    if(tkt->length + (p - authent->dat) > authent->length)
-	return RD_AP_MODIFIED;
-
-    memcpy(tkt->dat, p, tkt->length);
-    p += tkt->length;
-
-    if (krb_ap_req_debug)
-        krb_log("ticket->length: %d",tkt->length);
-
-    /* Decrypt and take apart ticket */
-    if (decomp_ticket(tkt, &ad->k_flags, ad->pname, ad->pinst, ad->prealm,
-                      &ad->address, ad->session, &ad->life,
-                      &ad->time_sec, sname, iname, &ky, serv_key))
-        return RD_AP_UNDEC;
-    
-    if (krb_ap_req_debug) {
-        krb_log("Ticket Contents.");
-        krb_log(" Aname:   %s.%s",ad->pname, ad->prealm);
-        krb_log(" Service: %s", krb_unparse_name_long(sname, iname, NULL));
-    }
-
-    /* Extract the authenticator */
-    
-    if(req_id->length + (p - authent->dat) > authent->length)
-	return RD_AP_MODIFIED;
-
-    memcpy(req_id->dat, p, req_id->length);
-    p = req_id->dat;
-    
-#ifndef NOENCRYPTION
-    /* And decrypt it with the session key from the ticket */
-    if (krb_ap_req_debug) krb_log("About to decrypt authenticator");
-
-    encrypt_ktext(req_id, &ad->session, DES_DECRYPT);
-
-    if (krb_ap_req_debug) krb_log("Done.");
-#endif /* NOENCRYPTION */
-
-    /* cast req_id->length to int? */
-#define check_ptr() if ((ptr - (char *) req_id->dat) > req_id->length) return(RD_AP_MODIFIED);
-
-    p += krb_get_nir(p, r_aname, r_inst, r_realm); /* XXX no rangecheck */
-
-    p += krb_get_int(p, &ad->checksum, 4, little_endian);
-
-    p++; /* time_5ms is not used */
-
-    p += krb_get_int(p, &r_time_sec, 4, little_endian);
-
-    /* Check for authenticity of the request */
-    if (krb_ap_req_debug)
-        krb_log("Principal: %s.%s@%s / %s.%s@%s",ad->pname,ad->pinst, ad->prealm, 
-	      r_aname, r_inst, r_realm);
-    if (strcmp(ad->pname, r_aname) != 0 ||
-	strcmp(ad->pinst, r_inst) != 0 ||
-	strcmp(ad->prealm, r_realm) != 0)
-	return RD_AP_INCON;
-    
-    if (krb_ap_req_debug)
-        krb_log("Address: %x %x", ad->address, from_addr);
-
-    if (from_addr && (!krb_equiv(ad->address, from_addr)))
-        return RD_AP_BADD;
-
-    gettimeofday(&tv, NULL);
-    delta_t = abs((int)(tv.tv_sec - r_time_sec));
-    if (delta_t > CLOCK_SKEW) {
-        if (krb_ap_req_debug)
-            krb_log("Time out of range: %lu - %lu = %lu",
-		    (unsigned long)t_local.tv_sec,
-		    (unsigned long)r_time_sec,
-		    (unsigned long)delta_t);
-        return RD_AP_TIME;
-    }
-
-    /* Now check for expiration of ticket */
-
-    tkt_age = tv.tv_sec - ad->time_sec;
-    if (krb_ap_req_debug)
-        krb_log("Time: %ld Issue Date: %lu Diff: %ld Life %x",
-		(long)tv.tv_sec,
-		(unsigned long)ad->time_sec,
-		tkt_age,
-		ad->life);
-    
-    if ((tkt_age < 0) && (-tkt_age > CLOCK_SKEW))
-	return RD_AP_NYV;
-
-    if (tv.tv_sec > krb_life_to_time(ad->time_sec, ad->life))
-        return RD_AP_EXP;
-
-    /* All seems OK */
-    ad->reply.length = 0;
-
-    return(RD_AP_OK);
-}
diff --git a/crypto/kerberosIV/lib/krb/rd_safe.c b/crypto/kerberosIV/lib/krb/rd_safe.c
deleted file mode 100644
index 8471df02648c..000000000000
--- a/crypto/kerberosIV/lib/krb/rd_safe.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: rd_safe.c,v 1.24 1997/04/19 23:18:20 joda Exp $");
-
-/* application include files */
-#include "lsb_addr_comp.h"
-
-/* Generate two checksums in the given byteorder of the data, one
- * new-form and one old-form. It has to be done this way to be
- * compatible with the old version of des_quad_cksum.
- */
-
-/* des_quad_chsum-type; 0 == unknown, 1 == new PL10++, 2 == old */
-int dqc_type = DES_QUAD_DEFAULT;
-
-void
-fixup_quad_cksum(void *start, size_t len, des_cblock *key, 
-		 void *new_checksum, void *old_checksum, int little)
-{
-    des_quad_cksum((des_cblock*)start, (des_cblock*)new_checksum, len, 2, key);
-    if(HOST_BYTE_ORDER){
-	if(little){
-	    memcpy(old_checksum, new_checksum, 16);
-	}else{
-	    u_int32_t *tmp = (u_int32_t*)new_checksum;
-	    memcpy(old_checksum, new_checksum, 16);
-	    swap_u_16(old_checksum);
-	    swap_u_long(tmp[0]);
-	    swap_u_long(tmp[1]);
-	    swap_u_long(tmp[2]);
-	    swap_u_long(tmp[3]);
-	}
-    }else{
-	if(little){
-	    u_int32_t *tmp = (u_int32_t*)new_checksum;
-	    swap_u_long(tmp[0]);
-	    swap_u_long(tmp[1]);
-	    swap_u_long(tmp[2]);
-	    swap_u_long(tmp[3]);
-	    memcpy(old_checksum, new_checksum, 16);
-	}else{
-	    u_int32_t tmp[4];
-	    tmp[0] = ((u_int32_t*)new_checksum)[3];
-	    tmp[1] = ((u_int32_t*)new_checksum)[2];
-	    tmp[2] = ((u_int32_t*)new_checksum)[1];
-	    tmp[3] = ((u_int32_t*)new_checksum)[0];
-	    memcpy(old_checksum, tmp, 16);
-	}
-    }
-}
-
-/*
- * krb_rd_safe() checks the integrity of an AUTH_MSG_SAFE message.
- * Given the message received, "in", the length of that message,
- * "in_length", the "key" to compute the checksum with, and the
- * network addresses of the "sender" and "receiver" of the message,
- * krb_rd_safe() returns RD_AP_OK if message is okay, otherwise
- * some error code.
- *
- * The message data retrieved from "in" is returned in the structure
- * "m_data".  The pointer to the application data (m_data->app_data)
- * refers back to the appropriate place in "in".
- *
- * See the file "mk_safe.c" for the format of the AUTH_MSG_SAFE
- * message.  The structure containing the extracted message
- * information, MSG_DAT, is defined in "krb.h".
- */
-
-int32_t
-krb_rd_safe(void *in, u_int32_t in_length, des_cblock *key, 
-	    struct sockaddr_in *sender, struct sockaddr_in *receiver, 
-	    MSG_DAT *m_data)
-{
-    unsigned char *p = (unsigned char*)in, *start;
-
-    unsigned char pvno, type;
-    int little_endian;
-    struct timeval tv;
-    u_int32_t src_addr;
-    int delta_t;
-    
-
-    pvno = *p++;
-    if(pvno != KRB_PROT_VERSION)
-	return RD_AP_VERSION;
-    
-    type = *p++;
-    little_endian = type & 1;
-    type &= ~1;
-    if(type != AUTH_MSG_SAFE)
-	return RD_AP_MSG_TYPE;
-
-    start = p;
-    
-    p += krb_get_int(p, &m_data->app_length, 4, little_endian);
-    
-    if(m_data->app_length + 31 > in_length)
-	return RD_AP_MODIFIED;
-    
-    m_data->app_data = p;
-
-    p += m_data->app_length;
-
-    m_data->time_5ms = *p++;
-
-    p += krb_get_address(p, &src_addr);
-
-    if (!krb_equiv(src_addr, sender->sin_addr.s_addr))
-        return RD_AP_BADD;
-
-    p += krb_get_int(p, (u_int32_t *)&m_data->time_sec, 4, little_endian);
-    m_data->time_sec = lsb_time(m_data->time_sec, sender, receiver);
-    
-    gettimeofday(&tv, NULL);
-
-    delta_t = abs((int)((long) tv.tv_sec - m_data->time_sec));
-    if (delta_t > CLOCK_SKEW) return RD_AP_TIME;
-
-    /*
-     * caller must check timestamps for proper order and replays, since
-     * server might have multiple clients each with its own timestamps
-     * and we don't assume tightly synchronized clocks.
-     */
-
-    {
-	unsigned char new_checksum[16];
-	unsigned char old_checksum[16];
-	fixup_quad_cksum(start, p - start, key, 
-			 new_checksum, old_checksum, little_endian);
-	if((dqc_type == DES_QUAD_GUESS || dqc_type == DES_QUAD_NEW) && 
-	   memcmp(new_checksum, p, 16) == 0)
-	    dqc_type = DES_QUAD_NEW;
-	else if((dqc_type == DES_QUAD_GUESS || dqc_type == DES_QUAD_OLD) && 
-		memcmp(old_checksum, p, 16) == 0)
-	    dqc_type = DES_QUAD_OLD;
-	else
-	    return RD_AP_MODIFIED;
-    }
-    return KSUCCESS;
-}
diff --git a/crypto/kerberosIV/lib/krb/read_service_key.c b/crypto/kerberosIV/lib/krb/read_service_key.c
deleted file mode 100644
index 6de5db273539..000000000000
--- a/crypto/kerberosIV/lib/krb/read_service_key.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-#include "krb_locl.h"
-
-RCSID("$Id: read_service_key.c,v 1.8 1997/03/23 03:53:16 joda Exp $");
-
-/*
- * The private keys for servers on a given host are stored in a
- * "srvtab" file (typically "/etc/srvtab").  This routine extracts
- * a given server's key from the file.
- *
- * read_service_key() takes the server's name ("service"), "instance",
- * and "realm" and a key version number "kvno", and looks in the given
- * "file" for the corresponding entry, and if found, returns the entry's
- * key field in "key".
- * 
- * If "instance" contains the string "*", then it will match
- * any instance, and the chosen instance will be copied to that
- * string.  For this reason it is important that the there is enough
- * space beyond the "*" to receive the entry.
- *
- * If "kvno" is 0, it is treated as a wild card and the first
- * matching entry regardless of the "vno" field is returned.
- *
- * This routine returns KSUCCESS on success, otherwise KFAILURE.
- *
- * The format of each "srvtab" entry is as follows:
- *
- * Size			Variable		Field in file
- * ----			--------		-------------
- * string		serv			server name
- * string		inst			server instance
- * string		realm			server realm
- * 1 byte		vno			server key version #
- * 8 bytes		key			server's key
- * ...			...			...
- */
-
-
-int
-read_service_key(char *service,	/* Service Name */
-		 char *instance, /* Instance name or "*" */
-		 char *realm,	/* Realm */
-		 int kvno,	/* Key version number */
-		 char *file,	/* Filename */
-		 char *key)	/* Pointer to key to be filled in */
-{
-    char serv[SNAME_SZ];
-    char inst[INST_SZ];
-    char rlm[REALM_SZ];
-    unsigned char vno;          /* Key version number */
-    int wcard;
-
-    int stab;
-
-    if ((stab = open(file, O_RDONLY, 0)) < 0)
-        return(KFAILURE);
-
-    wcard = (instance[0] == '*') && (instance[1] == '\0');
-
-    while (getst(stab,serv,SNAME_SZ) > 0) { /* Read sname */
-        getst(stab,inst,INST_SZ); /* Instance */
-        getst(stab,rlm,REALM_SZ); /* Realm */
-        /* Vers number */
-        if (read(stab, &vno, 1) != 1) {
-	    close(stab);
-            return(KFAILURE);
-	}
-        /* Key */
-        if (read(stab,key,8) != 8) {
-	    close(stab);
-            return(KFAILURE);
-	}
-        /* Is this the right service */
-        if (strcmp(serv,service))
-            continue;
-        /* How about instance */
-        if (!wcard && strcmp(inst,instance))
-            continue;
-        if (wcard)
-            strncpy(instance,inst,INST_SZ);
-        /* Is this the right realm */
-        if (strcmp(rlm,realm)) 
-	    continue;
-
-        /* How about the key version number */
-        if (kvno && kvno != (int) vno)
-            continue;
-
-        close(stab);
-        return(KSUCCESS);
-    }
-
-    /* Can't find the requested service */
-    close(stab);
-    return(KFAILURE);
-}
diff --git a/crypto/kerberosIV/lib/krb/realm_parse.c b/crypto/kerberosIV/lib/krb/realm_parse.c
deleted file mode 100644
index 2ce852a340d4..000000000000
--- a/crypto/kerberosIV/lib/krb/realm_parse.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: realm_parse.c,v 1.10 1997/06/01 03:14:50 assar Exp $");
-
-static int
-realm_parse(char *realm, int length, const char *file)
-{
-    FILE *F;
-    char tr[128];
-    char *p;
-    
-    if ((F = fopen(file,"r")) == NULL)
-	return -1;
-    
-    while(fgets(tr, sizeof(tr), F)){
-	char *unused = NULL;
-	p = strtok_r(tr, " \t\n\r", &unused);
-	if(p && strcasecmp(p, realm) == 0){
-	    fclose(F);
-	    strncpy(realm, p, length);
-	    return 0;
-	}
-    }
-    fclose(F);
-    return -1;
-}
-
-static const char *const files[] = KRB_CNF_FILES;
-
-int
-krb_realm_parse(char *realm, int length)
-{
-    int i;
-  
-    const char *dir = getenv("KRBCONFDIR");
-
-    /* First try user specified file */
-    if (dir != 0) {
-      char fname[MaxPathLen];
-
-      if(k_concat(fname, sizeof(fname), dir, "/krb.conf", NULL) == 0)
-	  if (realm_parse(realm, length, fname) == 0)
-	      return 0;
-    }
-
-    for (i = 0; files[i] != NULL; i++)
-	if (realm_parse(realm, length, files[i]) == 0)
-	    return 0;
-    return -1;
-}
diff --git a/crypto/kerberosIV/lib/krb/recvauth.c b/crypto/kerberosIV/lib/krb/recvauth.c
deleted file mode 100644
index 6c968974c4c1..000000000000
--- a/crypto/kerberosIV/lib/krb/recvauth.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-#include "krb_locl.h"
-
-RCSID("$Id: recvauth.c,v 1.17 1997/03/23 03:53:16 joda Exp $");
-
-/*
- * krb_recvauth() reads (and optionally responds to) a message sent
- * using krb_sendauth().  The "options" argument is a bit-field of
- * selected options (see "sendauth.c" for options description).
- * The only option relevant to krb_recvauth() is KOPT_DO_MUTUAL
- * (mutual authentication requested).  The "fd" argument supplies
- * a file descriptor to read from (and write to, if mutual authenti-
- * cation is requested).
- *
- * Part of the received message will be a Kerberos ticket sent by the
- * client; this is read into the "ticket" argument.  The "service" and
- * "instance" arguments supply the server's Kerberos name.  If the
- * "instance" argument is the string "*", it is treated as a wild card
- * and filled in during the krb_rd_req() call (see read_service_key()).
- *
- * The "faddr" and "laddr" give the sending (client) and receiving
- * (local server) network addresses.  ("laddr" may be left NULL unless
- * mutual authentication is requested, in which case it must be set.)
- *
- * The authentication information extracted from the message is returned
- * in "kdata".  The "filename" argument indicates the file where the
- * server's key can be found.  (It is passed on to krb_rd_req().)  If
- * left null, the default "/etc/srvtab" will be used.
- *
- * If mutual authentication is requested, the session key schedule must
- * be computed in order to reply; this schedule is returned in the
- * "schedule" argument.  A string containing the application version
- * number from the received message is returned in "version", which
- * should be large enough to hold a KRB_SENDAUTH_VLEN-character string.
- *
- * See krb_sendauth() for the format of the received client message.
- *
- * krb_recvauth() first reads the protocol version string from the
- * given file descriptor.  If it doesn't match the current protocol
- * version (KRB_SENDAUTH_VERS), the old-style format is assumed.  In
- * that case, the string of characters up to the first space is read
- * and interpreted as the ticket length, then the ticket is read.
- *
- * If the first string did match KRB_SENDAUTH_VERS, krb_recvauth()
- * next reads the application protocol version string.  Then the
- * ticket length and ticket itself are read.
- *
- * The ticket is decrypted and checked by the call to krb_rd_req().
- * If no mutual authentication is required, the result of the
- * krb_rd_req() call is retured by this routine.  If mutual authenti-
- * cation is required, a message in the following format is returned
- * on "fd":
- *
- * Size			Variable		Field
- * ----			--------		-----
- *
- * 4 bytes		tkt_len			length of ticket or -1
- *						if error occurred
- *
- * priv_len		tmp_buf			"private" message created
- *						by krb_mk_priv() which
- *						contains the incremented
- *						checksum sent by the client
- *						encrypted in the session
- *						key.  (This field is not
- *						present in case of error.)
- *
- * If all goes well, KSUCCESS is returned; otherwise KFAILURE or some
- * other error code is returned.
- */
-
-static int
-send_error_reply(int fd)
-{
-    unsigned char tmp[4] = { 255, 255, 255, 255 };
-    if(krb_net_write(fd, tmp, sizeof(tmp)) != sizeof(tmp))
-	return -1;
-    return 0;
-}
-
-int
-krb_recvauth(int32_t options,	/* bit-pattern of options */
-	     int fd,		/* file descr. to read from */
-	     KTEXT ticket,	/* storage for client's ticket */
-	     char *service,	/* service expected */
-	     char *instance,	/* inst expected (may be filled in) */
-	     struct sockaddr_in *faddr,	/* address of foreign host on fd */
-	     struct sockaddr_in *laddr,	/* local address */
-	     AUTH_DAT *kdata,	/* kerberos data (returned) */
-	     char *filename,	/* name of file with service keys */
-	     struct des_ks_struct *schedule, /* key schedule (return) */
-	     char *version)	/* version string (filled in) */
-{
-    int cc;
-    char krb_vers[KRB_SENDAUTH_VLEN + 1]; /* + 1 for the null terminator */
-    int rem;
-    int32_t priv_len;
-    u_char tmp_buf[MAX_KTXT_LEN+max(KRB_SENDAUTH_VLEN+1,21)];
-
-    /* read the protocol version number */
-    if (krb_net_read(fd, krb_vers, KRB_SENDAUTH_VLEN) != KRB_SENDAUTH_VLEN)
-	return(errno);
-    krb_vers[KRB_SENDAUTH_VLEN] = '\0';
-
-    /* read the application version string */
-    if (krb_net_read(fd, version, KRB_SENDAUTH_VLEN) != KRB_SENDAUTH_VLEN)
-	return(errno);
-    version[KRB_SENDAUTH_VLEN] = '\0';
-
-    /* get the length of the ticket */
-    {
-	char tmp[4];
-	if (krb_net_read(fd, tmp, 4) != 4)
-	    return -1;
-	krb_get_int(tmp, &ticket->length, 4, 0);
-    }
-    
-    /* sanity check */
-    if (ticket->length <= 0 || ticket->length > MAX_KTXT_LEN) {
-	if (options & KOPT_DO_MUTUAL) {
-	    if(send_error_reply(fd))
-		return -1;
-	    return KFAILURE;
-	} else
-	    return KFAILURE; /* XXX there may still be junk on the fd? */
-    }
-
-    /* read the ticket */
-    if (krb_net_read(fd, ticket->dat, ticket->length) != ticket->length)
-	return -1;
-    /*
-     * now have the ticket.  decrypt it to get the authenticated
-     * data.
-     */
-    rem = krb_rd_req(ticket, service, instance, faddr->sin_addr.s_addr,
-		     kdata, filename);
-
-    /* if we are doing mutual auth, compose a response */
-    if (options & KOPT_DO_MUTUAL) {
-	if (rem != KSUCCESS){
-	    /* the krb_rd_req failed */
-	    if(send_error_reply(fd))
-		return -1;
-	    return rem;
-	}
-	
-	/* add one to the (formerly) sealed checksum, and re-seal it
-	   for return to the client */
-	{ 
-	    unsigned char cs[4];
-	    krb_put_int(kdata->checksum + 1, cs, 4);
-#ifndef NOENCRYPTION
-	    des_key_sched(&kdata->session,schedule);
-#endif
-	    priv_len = krb_mk_priv(cs, 
-				   tmp_buf+4, 
-				   4,
-				   schedule,
-				   &kdata->session,
-				   laddr,
-				   faddr);
-	}
-	/* mk_priv will never fail */
-	priv_len += krb_put_int(priv_len, tmp_buf, 4);
-	
-	if((cc = krb_net_write(fd, tmp_buf, priv_len)) != priv_len)
-	    return -1;
-    }
-    return rem;
-}
diff --git a/crypto/kerberosIV/lib/krb/resolve.c b/crypto/kerberosIV/lib/krb/resolve.c
deleted file mode 100644
index 7777c0e854b2..000000000000
--- a/crypto/kerberosIV/lib/krb/resolve.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-#include "resolve.h"
-
-RCSID("$Id: resolve.c,v 1.11 1997/06/01 04:19:20 assar Exp $");
-
-#if defined(HAVE_RES_SEARCH) && defined(HAVE_DN_EXPAND)
-
-#define DECL(X) {#X, T_##X}
-
-static struct stot{
-    char *name;
-    int type;
-}stot[] = {
-    DECL(A),
-    DECL(NS),
-    DECL(CNAME),
-    DECL(PTR),
-    DECL(MX),
-    DECL(TXT),
-    DECL(AFSDB),
-    DECL(SRV),
-    {NULL, 	0}
-};
-
-static int
-string_to_type(const char *name)
-{
-    struct stot *p = stot;
-    for(p = stot; p->name; p++)
-	if(strcasecmp(name, p->name) == 0)
-	    return p->type;
-    return -1;
-}
-
-#if 0
-static char *
-type_to_string(int type)
-{
-    struct stot *p = stot;
-    for(p = stot; p->name; p++)
-	if(type == p->type)
-	    return p->name;
-    return NULL;
-}
-#endif
-
-void
-dns_free_data(struct dns_reply *r)
-{
-    struct resource_record *rr;
-    if(r->q.domain)
-	free(r->q.domain);
-    for(rr = r->head; rr;){
-	struct resource_record *tmp = rr;
-	if(rr->domain)
-	    free(rr->domain);
-	if(rr->u.data)
-	    free(rr->u.data);
-	rr = rr->next;
-	free(tmp);
-    }
-    free (r);
-}
-
-static struct dns_reply*
-parse_reply(unsigned char *data, int len)
-{
-    unsigned char *p;
-    char host[128];
-    int status;
-    
-    struct dns_reply *r;
-    struct resource_record **rr;
-    
-    r = (struct dns_reply*)malloc(sizeof(struct dns_reply));
-    memset(r, 0, sizeof(struct dns_reply));
-
-    p = data;
-    memcpy(&r->h, p, sizeof(HEADER));
-    p += sizeof(HEADER);
-    status = dn_expand(data, data + len, p, host, sizeof(host));
-    if(status < 0){
-	dns_free_data(r);
-	return NULL;
-    }
-    r->q.domain = strdup(host);
-    p += status;
-    r->q.type = (p[0] << 8 | p[1]);
-    p += 2;
-    r->q.class = (p[0] << 8 | p[1]);
-    p += 2;
-    rr = &r->head;
-    while(p < data + len){
-	int type, class, ttl, size;
-	status = dn_expand(data, data + len, p, host, sizeof(host));
-	if(status < 0){
-	    dns_free_data(r);
-	    return NULL;
-	}
-	p += status;
-	type = (p[0] << 8) | p[1];
-	p += 2;
-	class = (p[0] << 8) | p[1];
-	p += 2;
-	ttl = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3];
-	p += 4;
-	size = (p[0] << 8) | p[1];
-	p += 2;
-	*rr = (struct resource_record*)calloc(1, 
-					      sizeof(struct resource_record));
-	(*rr)->domain = strdup(host);
-	(*rr)->type = type;
-	(*rr)->class = class;
-	(*rr)->ttl = ttl;
-	(*rr)->size = size;
-	switch(type){
-	case T_NS:
-	case T_CNAME:
-	case T_PTR:
-	    status = dn_expand(data, data + len, p, host, sizeof(host));
-	    if(status < 0){
-		dns_free_data(r);
-		return NULL;
-	    }
-	    (*rr)->u.txt = strdup(host);
-	    break;
-	case T_MX:
-	case T_AFSDB:{
-	    status = dn_expand(data, data + len, p + 2, host, sizeof(host));
-	    if(status < 0){
-		dns_free_data(r);
-		return NULL;
-	    }
-	    (*rr)->u.mx = (struct mx_record*)malloc(sizeof(struct mx_record) + 
-						    strlen(host));
-	    (*rr)->u.mx->preference = (p[0] << 8) | p[1];
-	    strcpy((*rr)->u.mx->domain, host);
-	    break;
-	}
-	case T_SRV:{
-	    status = dn_expand(data, data + len, p + 6, host, sizeof(host));
-	    if(status < 0){
-		dns_free_data(r);
-		return NULL;
-	    }
-	    (*rr)->u.srv = 
-		(struct srv_record*)malloc(sizeof(struct srv_record) + 
-					   strlen(host));
-	    (*rr)->u.srv->priority = (p[0] << 8) | p[1];
-	    (*rr)->u.srv->weight = (p[2] << 8) | p[3];
-	    (*rr)->u.srv->port = (p[4] << 8) | p[5];
-	    strcpy((*rr)->u.srv->target, host);
-	    break;
-	}
-	case T_TXT:{
-	    (*rr)->u.txt = (char*)malloc(size + 1);
-	    strncpy((*rr)->u.txt, (char*)p + 1, *p);
-	    (*rr)->u.txt[*p] = 0;
-	    break;
-	}
-	    
-	default:
-	    (*rr)->u.data = (unsigned char*)malloc(size);
-	    memcpy((*rr)->u.data, p, size);
-	}
-	p += size;
-	rr = &(*rr)->next;
-    }
-    *rr = NULL;
-    return r;
-}
-
-
-
-struct dns_reply *
-dns_lookup(const char *domain, const char *type_name)
-{
-    unsigned char reply[1024];
-    int len;
-    int type;
-    struct dns_reply *r = NULL;
-    
-    type = string_to_type(type_name);
-    len = res_search(domain, C_IN, type, reply, sizeof(reply));
-    if(len >= 0)
-	r = parse_reply(reply, len);
-    return r;
-}
-
-#else /* defined(HAVE_RES_SEARCH) && defined(HAVE_DN_EXPAND) */
-
-struct dns_reply *
-dns_lookup(const char *domain, const char *type_name)
-{
-    return NULL;
-}
-
-void
-dns_free_data(struct dns_reply *r)
-{
-}
-
-#endif
-
-#ifdef TEST
-
-int 
-main(int argc, char **argv)
-{
-    struct dns_reply *r;
-    struct resource_record *rr;
-    r = dns_lookup(argv[1], argv[2]);
-    if(r == NULL){
-	printf("No reply.\n");
-	return 1;
-    }
-    for(rr = r->head; rr;rr=rr->next){
-	printf("%s %s %d ", rr->domain, type_to_string(rr->type), rr->ttl);
-	switch(rr->type){
-	case T_NS:
-	    printf("%s\n", (char*)rr->data);
-	    break;
-	case T_A:
-	    printf("%d.%d.%d.%d\n", 
-		   ((unsigned char*)rr->data)[0],
-		   ((unsigned char*)rr->data)[1],
-		   ((unsigned char*)rr->data)[2],
-		   ((unsigned char*)rr->data)[3]);
-	    break;
-	case T_MX:
-	case T_AFSDB:{
-	    struct mx_record *mx = (struct mx_record*)rr->data;
-	    printf("%d %s\n", mx->preference, mx->domain);
-	    break;
-	}
-	case T_SRV:{
-	    struct srv_record *srv = (struct srv_record*)rr->data;
-	    printf("%d %d %d %s\n", srv->priority, srv->weight, 
-		   srv->port, srv->target);
-	    break;
-	}
-	default:
-	    printf("\n");
-	    break;
-	}
-    }
-    
-    return 0;
-}
-#endif
diff --git a/crypto/kerberosIV/lib/krb/resolve.h b/crypto/kerberosIV/lib/krb/resolve.h
deleted file mode 100644
index dac9993f91fa..000000000000
--- a/crypto/kerberosIV/lib/krb/resolve.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id: resolve.h,v 1.5 1997/05/14 17:41:25 joda Exp $ */
-
-/* THIS IS NOT (yet) A PUBLIC INTERFACE */
-
-
-#ifndef __RESOLVE_H__
-#define __RESOLVE_H__
-
-/* We use these, but they are not always present in <arpa/nameser.h> */
-
-#ifndef T_TXT
-#define T_TXT		16
-#endif
-#ifndef T_AFSDB
-#define T_AFSDB		18
-#endif
-#ifndef T_SRV
-#define T_SRV		 33
-#endif
-
-struct dns_query{
-    char *domain;
-    unsigned type;
-    unsigned class;
-};
-
-struct mx_record{
-    unsigned  preference;
-    char domain[1];
-};
-
-struct srv_record{
-    unsigned priority;
-    unsigned weight;
-    unsigned port;
-    char target[1];
-};
-
-struct resource_record{
-    char *domain;
-    unsigned type;
-    unsigned class;
-    unsigned ttl;
-    unsigned size;
-    union {
-	void *data;
-	struct mx_record *mx;
-	struct mx_record *afsdb; /* mx and afsdb are identical */
-	struct srv_record *srv;
-	struct in_addr *a;
-	char *txt;
-    }u;
-    struct resource_record *next;
-};
-
-
-#ifndef HAVE_ARPA_NAMESER_H /* XXX */
-typedef int HEADER; /* will never be used */
-#endif
-
-struct dns_reply{
-    HEADER h;
-    struct dns_query q;
-    struct resource_record *head;
-};
-
-
-struct dns_reply* dns_lookup(const char *, const char *);
-
-void dns_free_data(struct dns_reply *r);
-
-#endif /* __RESOLVE_H__ */
diff --git a/crypto/kerberosIV/lib/krb/rw.c b/crypto/kerberosIV/lib/krb/rw.c
deleted file mode 100644
index 4b136aa097be..000000000000
--- a/crypto/kerberosIV/lib/krb/rw.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* Almost all programs use these routines (implicitly) so it's a good
- * place to put the version string. */
-
-#include "version.h"
-
-#include "krb_locl.h"
-
-RCSID("$Id: rw.c,v 1.8 1997/04/01 08:18:44 joda Exp $");
-
-int
-krb_get_int(void *f, u_int32_t *to, int size, int lsb)
-{
-    int i;
-    unsigned char *from = (unsigned char *)f;
-
-    *to = 0;
-    if(lsb){
-	for(i = size-1; i >= 0; i--)
-	    *to = (*to << 8) | from[i];
-    }else{
-	for(i = 0; i < size; i++)
-	    *to = (*to << 8) | from[i];
-    }
-    return size;
-}
-
-int
-krb_put_int(u_int32_t from, void *to, int size)
-{
-    int i;
-    unsigned char *p = (unsigned char *)to;
-    for(i = size - 1; i >= 0; i--){
-	p[i] = from & 0xff;
-	from >>= 8;
-    }
-    return size;
-}
-
-
-/* addresses are always sent in network byte order */
-
-int
-krb_get_address(void *from, u_int32_t *to)
-{
-    unsigned char *p = (unsigned char*)from;
-    *to = htonl((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]);
-    return 4;
-}
-
-int
-krb_put_address(u_int32_t addr, void *to)
-{
-    return krb_put_int(ntohl(addr), to, 4);
-}
-
-int
-krb_put_string(char *from, void *to)
-{
-    strcpy((char *)to, from);
-    return strlen(from) + 1;
-}
-
-int
-krb_get_string(void *from, char *to)
-{
-    return krb_put_string(from, to);
-}
-
-int
-krb_get_nir(void *from, char *name, char *instance, char *realm)
-{
-    char *p = (char *)from;
-
-    p += krb_get_string(p, name);
-    p += krb_get_string(p, instance);
-    if(realm)
-	p += krb_get_string(p, realm);
-    return p - (char *)from;
-}
-
-int
-krb_put_nir(char *name, char *instance, char *realm, void *to)
-{
-    char *p = (char *)to;
-    p += krb_put_string(name, p);
-    p += krb_put_string(instance, p);
-    if(realm)
-	p += krb_put_string(realm, p);
-    return p - (char *)to;
-}
diff --git a/crypto/kerberosIV/lib/krb/save_credentials.c b/crypto/kerberosIV/lib/krb/save_credentials.c
deleted file mode 100644
index cfd6c07eeceb..000000000000
--- a/crypto/kerberosIV/lib/krb/save_credentials.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-#include "krb_locl.h"
-
-RCSID("$Id: save_credentials.c,v 1.5 1997/03/23 03:53:17 joda Exp $");
-
-/*
- * This routine takes a ticket and associated info and calls
- * tf_save_cred() to store them in the ticket cache.  The peer
- * routine for extracting a ticket and associated info from the
- * ticket cache is krb_get_cred().  When changes are made to
- * this routine, the corresponding changes should be made
- * in krb_get_cred() as well.
- *
- * Returns KSUCCESS if all goes well, otherwise an error returned
- * by the tf_init() or tf_save_cred() routines.
- */
-
-int
-save_credentials(char *service,	/* Service name */
-		 char *instance, /* Instance */
-		 char *realm,	/* Auth domain */
-		 unsigned char *session, /* Session key */
-		 int lifetime,	/* Lifetime */
-		 int kvno,	/* Key version number */
-		 KTEXT ticket,	/* The ticket itself */
-		 int32_t issue_date) /* The issue time */
-{
-    int tf_status;   /* return values of the tf_util calls */
-
-    /* Open and lock the ticket file for writing */
-    if ((tf_status = tf_init(TKT_FILE, W_TKT_FIL)) != KSUCCESS)
-	return(tf_status);
-
-    /* Save credentials by appending to the ticket file */
-    tf_status = tf_save_cred(service, instance, realm, session,
-			     lifetime, kvno, ticket, issue_date);
-    tf_close();
-    return (tf_status);
-}
diff --git a/crypto/kerberosIV/lib/krb/send_to_kdc.c b/crypto/kerberosIV/lib/krb/send_to_kdc.c
deleted file mode 100644
index 828b34d15138..000000000000
--- a/crypto/kerberosIV/lib/krb/send_to_kdc.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-#include "krb_locl.h"
-
-RCSID("$Id: send_to_kdc.c,v 1.39 1997/05/15 21:02:31 joda Exp $");
-
-struct host {
-  struct sockaddr_in addr;
-  int proto;
-};
-
-static const char *prog = "send_to_kdc";
-static send_recv(KTEXT pkt, KTEXT rpkt, int f,
-		 struct sockaddr_in *_to, struct host *addrs,
-		 int h_hosts);
-
-/*
- * This file contains two routines, send_to_kdc() and send_recv().
- * send_recv() is a static routine used by send_to_kdc().
- */
-
-/*
- * send_to_kdc() sends a message to the Kerberos authentication
- * server(s) in the given realm and returns the reply message.
- * The "pkt" argument points to the message to be sent to Kerberos;
- * the "rpkt" argument will be filled in with Kerberos' reply.
- * The "realm" argument indicates the realm of the Kerberos server(s)
- * to transact with.  If the realm is null, the local realm is used.
- *
- * If more than one Kerberos server is known for a given realm,
- * different servers will be queried until one of them replies.
- * Several attempts (retries) are made for each server before
- * giving up entirely.
- *
- * If an answer was received from a Kerberos host, KSUCCESS is
- * returned.  The following errors can be returned:
- *
- * SKDC_CANT    - can't get local realm
- *              - can't find "kerberos" in /etc/services database
- *              - can't open socket
- *              - can't bind socket
- *              - all ports in use
- *              - couldn't find any Kerberos host
- *
- * SKDC_RETRY   - couldn't get an answer from any Kerberos server,
- *		  after several retries
- */
-
-int
-send_to_kdc(KTEXT pkt, KTEXT rpkt, char *realm)
-{
-    int i;
-    int no_host; /* was a kerberos host found? */
-    int retry;
-    int n_hosts;
-    int retval;
-    struct hostent *host;
-    char lrealm[REALM_SZ];
-    struct krb_host *k_host;
-    struct host *hosts = malloc(sizeof(*hosts));
-
-    if (hosts == NULL)
-      return SKDC_CANT;
-
-    /*
-     * If "realm" is non-null, use that, otherwise get the
-     * local realm.
-     */
-    if (realm)
-	strcpy(lrealm, realm);
-    else
-	if (krb_get_lrealm(lrealm,1)) {
-	    if (krb_debug)
-		krb_warning("%s: can't get local realm\n", prog);
-	    return(SKDC_CANT);
-	}
-    if (krb_debug)
-      krb_warning("lrealm is %s\n", lrealm);
-
-    no_host = 1;
-    /* get an initial allocation */
-    n_hosts = 0;
-    for (i = 1; (k_host = krb_get_host(i, lrealm, 0)); ++i) {
-	char *p;
-
-        if (krb_debug)
-	  krb_warning("Getting host entry for %s...", k_host->host);
-        host = gethostbyname(k_host->host);
-        if (krb_debug) {
-	  krb_warning("%s.\n",
-		      host ? "Got it" : "Didn't get it");
-        }
-        if (!host)
-            continue;
-        no_host = 0;    /* found at least one */
-	while ((p = *(host->h_addr_list)++)) {
-	    hosts = realloc(hosts, sizeof(*hosts) * (n_hosts + 1));
-	    if (hosts == NULL)
-		return SKDC_CANT;
-	    memset (&hosts[n_hosts].addr, 0, sizeof(hosts[n_hosts].addr));
-	    hosts[n_hosts].addr.sin_family = host->h_addrtype;
-	    hosts[n_hosts].addr.sin_port = htons(k_host->port);
-	    hosts[n_hosts].proto = k_host->proto;
-	    memcpy(&hosts[n_hosts].addr.sin_addr, p,
-		   sizeof(hosts[n_hosts].addr.sin_addr));
-	    ++n_hosts;
-	    if (send_recv(pkt, rpkt, hosts[n_hosts-1].proto,
-			  &hosts[n_hosts-1].addr, hosts, n_hosts)) {
-		retval = KSUCCESS;
-		goto rtn;
-	    }
-	    if (krb_debug) {
-		krb_warning("Timeout, error, or wrong descriptor\n");
-	    }
-	}
-    }
-    if (no_host) {
-	if (krb_debug)
-	    krb_warning("%s: can't find any Kerberos host.\n",
-			prog);
-        retval = SKDC_CANT;
-        goto rtn;
-    }
-    /* retry each host in sequence */
-    for (retry = 0; retry < CLIENT_KRB_RETRY; ++retry) {
-	for (i = 0; i < n_hosts; ++i) {
-	    if (send_recv(pkt, rpkt,
-			  hosts[i].proto,
-			  &hosts[i].addr,
-			  hosts,
-			  n_hosts)) {
-		retval = KSUCCESS;
-		goto rtn;
-	    }
-        }
-    }
-    retval = SKDC_RETRY;
-rtn:
-    free(hosts);
-    return(retval);
-}
-
-/*
- * try to send out and receive message.
- * return 1 on success, 0 on failure
- */
-
-static int
-send_recv_it(KTEXT pkt, KTEXT rpkt, int stream, int f, 
-	     struct sockaddr_in *_to, struct host *addrs, int n_hosts)
-{
-    fd_set readfds;
-    int numsent;
-    
-    /* CLIENT_KRB_TIMEOUT indicates the time to wait before
-     * retrying a server.  It's defined in "krb.h".
-     */
-    struct timeval timeout;
-    timeout.tv_sec = CLIENT_KRB_TIMEOUT;
-    timeout.tv_usec = 0;
-
-    if (krb_debug) {
-        if (_to->sin_family == AF_INET)
-	    krb_warning("Sending message to %s...",
-			inet_ntoa(_to->sin_addr));
-        else
-	    krb_warning("Sending message...");
-    }
-    if(stream){
-	unsigned char tmp[4];
-	krb_put_int(pkt->length, tmp, 4);
-	if((numsent = send(f, tmp, 4, 0)) != 4){
-	    if (krb_debug)
-		krb_warning("sent only %d/%d\n", numsent, 4);
-	    return 0;
-	}
-    }
-    if ((numsent = send(f, pkt->dat, pkt->length, 0)) != pkt->length) {
-        if (krb_debug)
-            krb_warning("sent only %d/%d\n",numsent, pkt->length);
-        return 0;
-    }
-    if (krb_debug)
-	krb_warning("Sent\nWaiting for reply...");
-    FD_ZERO(&readfds);
-    FD_SET(f, &readfds);
-    /* select - either recv is ready, or timeout */
-    /* see if timeout or error or wrong descriptor */
-    if (select(f + 1, &readfds, 0, 0, &timeout) < 1
-        || !FD_ISSET(f, &readfds)) {
-        if (krb_debug)
-            krb_warning("select failed: errno = %d", errno);
-        return 0;
-    }
-    if(stream){
-	if(krb_net_read(f, rpkt->dat, sizeof(rpkt->dat)) <= 0)
-	    return 0;
-    }else{
-	if (recv (f, rpkt->dat, sizeof(rpkt->dat), 0) < 0) {
-	    if (krb_debug)
-		krb_warning("recvfrom: errno = %d\n", errno);
-	    return 0;
-	}
-    }
-    return 1;
-}
-
-static int
-send_recv(KTEXT pkt, KTEXT rpkt, int proto, struct sockaddr_in *_to,
-	  struct host *addrs, int n_hosts)
-{
-    int f;
-    int ret = 0;
-    if(proto == IPPROTO_UDP)
-	f = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-    else if(proto == IPPROTO_TCP)
-	f = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-    else{
-	krb_warning("Unknown protocol `%d'.\n", proto);
-	return 0;
-    }
-    
-    if(connect(f, (struct sockaddr*)_to, sizeof(*_to)) < 0)
-	krb_warning("Connecting socket: errno = %d\n", errno);
-    else
-	ret = send_recv_it(pkt, rpkt, proto == IPPROTO_TCP, f, 
-			   _to, addrs, n_hosts);
-    
-    close(f);
-    return ret;
-}
-
diff --git a/crypto/kerberosIV/lib/krb/sendauth.c b/crypto/kerberosIV/lib/krb/sendauth.c
deleted file mode 100644
index 4240bcf98257..000000000000
--- a/crypto/kerberosIV/lib/krb/sendauth.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-#include "krb_locl.h"
-
-RCSID("$Id: sendauth.c,v 1.15 1997/04/18 14:11:36 joda Exp $");
-
-/*
- * krb_sendauth() transmits a ticket over a file descriptor for a
- * desired service, instance, and realm, doing mutual authentication
- * with the server if desired.
- */
-
-/*
- * The first argument to krb_sendauth() contains a bitfield of
- * options (the options are defined in "krb.h"):
- *
- * KOPT_DONT_CANON	Don't canonicalize instance as a hostname.
- *			(If this option is not chosen, krb_get_phost()
- *			is called to canonicalize it.)
- *
- * KOPT_DONT_MK_REQ 	Don't request server ticket from Kerberos.
- *			A ticket must be supplied in the "ticket"
- *			argument.
- *			(If this option is not chosen, and there
- *			is no ticket for the given server in the
- *			ticket cache, one will be fetched using
- *			krb_mk_req() and returned in "ticket".)
- *
- * KOPT_DO_MUTUAL	Do mutual authentication, requiring that the
- * 			receiving server return the checksum+1 encrypted
- *			in the session key.  The mutual authentication
- *			is done using krb_mk_priv() on the other side
- *			(see "recvauth.c") and krb_rd_priv() on this
- *			side.
- *
- * The "fd" argument is a file descriptor to write to the remote
- * server on.  The "ticket" argument is used to store the new ticket
- * from the krb_mk_req() call. If the KOPT_DONT_MK_REQ options is
- * chosen, the ticket must be supplied in the "ticket" argument.
- * The "service", "inst", and "realm" arguments identify the ticket.
- * If "realm" is null, the local realm is used.
- *
- * The following arguments are only needed if the KOPT_DO_MUTUAL option
- * is chosen:
- *
- *   The "checksum" argument is a number that the server will add 1 to
- *   to authenticate itself back to the client; the "msg_data" argument
- *   holds the returned mutual-authentication message from the server
- *   (i.e., the checksum+1); the "cred" structure is used to hold the
- *   session key of the server, extracted from the ticket file, for use
- *   in decrypting the mutual authentication message from the server;
- *   and "schedule" holds the key schedule for that decryption.  The
- *   the local and server addresses are given in "laddr" and "faddr".
- *
- * The application protocol version number (of up to KRB_SENDAUTH_VLEN
- * characters) is passed in "version".
- *
- * If all goes well, KSUCCESS is returned, otherwise some error code.
- *
- * The format of the message sent to the server is:
- *
- * Size			Variable		Field
- * ----			--------		-----
- *
- * KRB_SENDAUTH_VLEN	KRB_SENDAUTH_VER	sendauth protocol
- * bytes					version number
- *
- * KRB_SENDAUTH_VLEN	version			application protocol
- * bytes					version number
- *
- * 4 bytes		ticket->length		length of ticket
- *
- * ticket->length	ticket->dat		ticket itself
- */
-
-int
-krb_sendauth(int32_t options,	/* bit-pattern of options */
-	     int fd,		/* file descriptor to write onto */
-	     KTEXT ticket,	/* where to put ticket (return); or
-				 * supplied in case of KOPT_DONT_MK_REQ */
-	     char *service,	/* service name, instance, realm */
-	     char *instance,
-	     char *realm,
-	     u_int32_t checksum, /* checksum to include in request */
-	     MSG_DAT *msg_data,	/* mutual auth MSG_DAT (return) */
-	     CREDENTIALS *cred,	/* credentials (return) */
-	     struct des_ks_struct *schedule, /* key schedule (return) */
-	     struct sockaddr_in *laddr, /* local address */
-	     struct sockaddr_in *faddr,	/* address of foreign host on fd */
-	     char *version)	/* version string */
-{
-    int ret;
-    KTEXT_ST buf;
-    char realrealm[REALM_SZ];
-
-    if (realm == NULL) {
-	ret = krb_get_lrealm (realrealm, 1);
-	if (ret != KSUCCESS)
-	    return ret;
-	realm = realrealm;
-    }
-    ret = krb_mk_auth (options, ticket, service, instance, realm, checksum,
-		       version, &buf);
-    if (ret != KSUCCESS)
-	return ret;
-    ret = krb_net_write(fd, buf.dat, buf.length);
-    if(ret < 0)
-	return -1;
-      
-    if (options & KOPT_DO_MUTUAL) {
-	char tmp[4];
-	u_int32_t len;
-	char inst[INST_SZ];
-
-	ret = krb_net_read (fd, tmp, 4);
-	if (ret < 0)
-	    return -1;
-
-	krb_get_int (tmp, &len, 4, 0);
-	if (len == 0xFFFFFFFF || len > sizeof(buf.dat))
-	    return KFAILURE;
-	buf.length = len;
-	ret = krb_net_read (fd, buf.dat, len);
-	if (ret < 0)
-	    return -1;
-
-	if (options & KOPT_DONT_CANON)
-	    strncpy (inst, instance, sizeof(inst));
-	else
-	    strncpy (inst, krb_get_phost(instance), sizeof(inst));
-
-	ret = krb_get_cred (service, inst, realm, cred);
-	if (ret != KSUCCESS)
-	    return ret;
-
-	des_key_sched(&cred->session, schedule);
-
-	ret = krb_check_auth (&buf, checksum, msg_data, &cred->session, 
-			      schedule, laddr, faddr);
-	if (ret != KSUCCESS)
-	    return ret;
-    }
-    return KSUCCESS;
-}
diff --git a/crypto/kerberosIV/lib/krb/sizetest.c b/crypto/kerberosIV/lib/krb/sizetest.c
deleted file mode 100644
index d64bbeb88ecc..000000000000
--- a/crypto/kerberosIV/lib/krb/sizetest.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "krb_locl.h"
-
-RCSID("$Id: sizetest.c,v 1.5 1996/11/15 18:39:19 bg Exp $");
-
-static
-void
-err(const char *msg)
-{
-  fputs(msg, stderr);
-  exit(1);
-}
-
-int
-main()
-{
-  if (sizeof(u_int8_t) < 1)
-    err("sizeof(u_int8_t) is smaller than 1 byte\n");
-  if (sizeof(u_int16_t) < 2)
-    err("sizeof(u_int16_t) is smaller than 2 bytes\n");
-  if (sizeof(u_int32_t) < 4)
-    err("sizeof(u_int32_t) is smaller than 4 bytes\n");
-
-  if (sizeof(u_int8_t) > 1)
-    fputs("warning: sizeof(u_int8_t) is larger than 1 byte, "
-	  "some stuff may not work properly!\n", stderr);
-
-  {
-    u_int8_t u = 1;
-    int i;
-    for (i = 0; u != 0 && i < 100; i++)
-      u <<= 1;
-
-    if (i < 8)
-      err("u_int8_t is smaller than 8 bits\n");
-    else if (i > 8)
-      fputs("warning: u_int8_t is larger than 8 bits, "
-	    "some stuff may not work properly!\n", stderr);
-  }
-
-  exit(0);
-}
diff --git a/crypto/kerberosIV/lib/krb/stime.c b/crypto/kerberosIV/lib/krb/stime.c
deleted file mode 100644
index ec57d8fd301b..000000000000
--- a/crypto/kerberosIV/lib/krb/stime.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * $Id: stime.c,v 1.6 1997/05/02 14:29:20 assar Exp $
- *
- * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute
- * of Technology.
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: stime.c,v 1.6 1997/05/02 14:29:20 assar Exp $");
-
-/*
- * Given a pointer to a long containing the number of seconds
- * since the beginning of time (midnight 1 Jan 1970 GMT), return
- * a string containing the local time in the form:
- *
- * "25-Jan-1988 10:17:56"
- */
-
-const char *
-krb_stime(time_t *t)
-{
-    static char st[40];
-    struct tm *tm;
-
-    tm = localtime(t);
-    snprintf(st, sizeof(st),
-	     "%2d-%s-%04d %02d:%02d:%02d",tm->tm_mday,
-	     month_sname(tm->tm_mon + 1),tm->tm_year + 1900,
-	     tm->tm_hour, tm->tm_min, tm->tm_sec);
-    return st;
-}
diff --git a/crypto/kerberosIV/lib/krb/str2key.c b/crypto/kerberosIV/lib/krb/str2key.c
deleted file mode 100644
index 2b00fc176eda..000000000000
--- a/crypto/kerberosIV/lib/krb/str2key.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/* This defines the Andrew string_to_key function.  It accepts a password
- * string as input and converts its via a one-way encryption algorithm to a DES
- * encryption key.  It is compatible with the original Andrew authentication
- * service password database.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: str2key.c,v 1.10 1997/03/23 03:53:19 joda Exp $");
-
-static void
-mklower(char *s)
-{
-    for (; *s; s++)
-        if ('A' <= *s && *s <= 'Z')
-            *s = *s - 'A' + 'a';
-}
-
-/*
- * Short passwords, i.e 8 characters or less.
- */
-static void
-afs_cmu_StringToKey (char *str, char *cell, des_cblock *key)
-{
-    char  password[8+1];	/* crypt is limited to 8 chars anyway */
-    int   i;
-    int   passlen;
-
-    memset (key, 0, sizeof(key));
-    memset(password, 0, sizeof(password));
-
-    strncpy (password, cell, 8);
-    passlen = strlen (str);
-    if (passlen > 8) passlen = 8;
-
-    for (i=0; i<passlen; i++)
-        password[i] = str[i] ^ cell[i];	/* make sure cell is zero padded */
-
-    for (i=0; i<8; i++)
-        if (password[i] == '\0') password[i] = 'X';
-
-    /* crypt only considers the first 8 characters of password but for some
-       reason returns eleven characters of result (plus the two salt chars). */
-    strncpy((char *)key, (char *)crypt(password, "#~") + 2, sizeof(des_cblock));
-
-    /* parity is inserted into the LSB so leftshift each byte up one bit.  This
-       allows ascii characters with a zero MSB to retain as much significance
-       as possible. */
-    {   char *keybytes = (char *)key;
-        unsigned int temp;
-
-        for (i = 0; i < 8; i++) {
-            temp = (unsigned int) keybytes[i];
-            keybytes[i] = (unsigned char) (temp << 1);
-        }
-    }
-    des_fixup_key_parity (key);
-}
-
-/*
- * Long passwords, i.e 9 characters or more.
- */
-static void
-afs_transarc_StringToKey (char *str, char *cell, des_cblock *key)
-{
-    des_key_schedule schedule;
-    des_cblock temp_key;
-    des_cblock ivec;
-    char password[512];
-    int  passlen;
-
-    strncpy (password, str, sizeof(password));
-    if ((passlen = strlen (password)) < sizeof(password)-1)
-        strncat (password, cell, sizeof(password)-passlen);
-    if ((passlen = strlen(password)) > sizeof(password)) passlen = sizeof(password);
-
-    memcpy(&ivec, "kerberos", 8);
-    memcpy(&temp_key, "kerberos", 8);
-    des_fixup_key_parity (&temp_key);
-    des_key_sched (&temp_key, schedule);
-    des_cbc_cksum ((des_cblock *)password, &ivec, passlen, schedule, &ivec);
-
-    memcpy(&temp_key, &ivec, 8);
-    des_fixup_key_parity (&temp_key);
-    des_key_sched (&temp_key, schedule);
-    des_cbc_cksum ((des_cblock *)password, key, passlen, schedule, &ivec);
-
-    des_fixup_key_parity (key);
-}
-
-void
-afs_string_to_key(char *str, char *cell, des_cblock *key)
-{
-    char realm[REALM_SZ+1];
-    strncpy(realm, cell, REALM_SZ);
-    realm[REALM_SZ] = 0;
-    mklower(realm);
-
-    if (strlen(str) > 8)
-        afs_transarc_StringToKey (str, realm, key);
-    else
-        afs_cmu_StringToKey (str, realm, key);
-}
diff --git a/crypto/kerberosIV/lib/krb/swab.c b/crypto/kerberosIV/lib/krb/swab.c
deleted file mode 100644
index d68ce3d52246..000000000000
--- a/crypto/kerberosIV/lib/krb/swab.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: swab.c,v 1.4 1997/04/01 08:18:45 joda Exp $");
-#endif
-
-#ifndef HAVE_SWAB
-void
-swab (char *from, char *to, int nbytes)
-{
-     while(nbytes >= 2) {
-	  *(to + 1) = *from;
-	  *to = *(from + 1);
-	  to += 2;
-	  from += 2;
-	  nbytes -= 2;
-     }
-}
-#endif
diff --git a/crypto/kerberosIV/lib/krb/tf_util.c b/crypto/kerberosIV/lib/krb/tf_util.c
deleted file mode 100644
index a196448e1f16..000000000000
--- a/crypto/kerberosIV/lib/krb/tf_util.c
+++ /dev/null
@@ -1,645 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-        
-#include "krb_locl.h"
-
-RCSID("$Id: tf_util.c,v 1.24 1997/04/20 06:24:32 assar Exp $");
-
-
-#define TOO_BIG -1
-#define TF_LCK_RETRY ((unsigned)2)	/* seconds to sleep before
-					 * retry if ticket file is
-					 * locked */
-#define	TF_LCK_RETRY_COUNT	(50)	/* number of retries	*/
-
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
-/*
- * fd must be initialized to something that won't ever occur as a real
- * file descriptor. Since open(2) returns only non-negative numbers as
- * valid file descriptors, and tf_init always stuffs the return value
- * from open in here even if it is an error flag, we must
- * 	a. Initialize fd to a negative number, to indicate that it is
- * 	   not initially valid.
- *	b. When checking for a valid fd, assume that negative values
- *	   are invalid (ie. when deciding whether tf_init has been
- *	   called.)
- *	c. In tf_close, be sure it gets reinitialized to a negative
- *	   number. 
- */
-static  int fd = -1;
-static	int curpos;				/* Position in tfbfr */
-static	int lastpos;			/* End of tfbfr */
-static	char tfbfr[BUFSIZ];		/* Buffer for ticket data */
-
-static int tf_gets(char *s, int n);
-static int tf_read(void *s, int n);
-
-/*
- * This file contains routines for manipulating the ticket cache file.
- *
- * The ticket file is in the following format:
- *
- *      principal's name        (null-terminated string)
- *      principal's instance    (null-terminated string)
- *      CREDENTIAL_1
- *      CREDENTIAL_2
- *      ...
- *      CREDENTIAL_n
- *      EOF
- *
- *      Where "CREDENTIAL_x" consists of the following fixed-length
- *      fields from the CREDENTIALS structure (see "krb.h"):
- *
- *              char            service[ANAME_SZ]
- *              char            instance[INST_SZ]
- *              char            realm[REALM_SZ]
- *              C_Block         session
- *              int             lifetime
- *              int             kvno
- *              KTEXT_ST        ticket_st
- *              u_int32_t            issue_date
- *
- * Short description of routines:
- *
- * tf_init() opens the ticket file and locks it.
- *
- * tf_get_pname() returns the principal's name.
- *
- * tf_put_pname() writes the principal's name to the ticket file.
- *
- * tf_get_pinst() returns the principal's instance (may be null).
- *
- * tf_put_pinst() writes the instance.
- *
- * tf_get_cred() returns the next CREDENTIALS record.
- *
- * tf_save_cred() appends a new CREDENTIAL record to the ticket file.
- *
- * tf_close() closes the ticket file and releases the lock.
- *
- * tf_gets() returns the next null-terminated string.  It's an internal
- * routine used by tf_get_pname(), tf_get_pinst(), and tf_get_cred().
- *
- * tf_read() reads a given number of bytes.  It's an internal routine
- * used by tf_get_cred().
- */
-
-/*
- * tf_init() should be called before the other ticket file routines.
- * It takes the name of the ticket file to use, "tf_name", and a
- * read/write flag "rw" as arguments. 
- *
- * It tries to open the ticket file, checks the mode, and if everything
- * is okay, locks the file.  If it's opened for reading, the lock is
- * shared.  If it's opened for writing, the lock is exclusive. 
- *
- * Returns KSUCCESS if all went well, otherwise one of the following: 
- *
- * NO_TKT_FIL   - file wasn't there
- * TKT_FIL_ACC  - file was in wrong mode, etc.
- * TKT_FIL_LCK  - couldn't lock the file, even after a retry
- */
-
-int
-tf_init(char *tf_name, int rw)
-{
-  /* Unix implementation */
-  int wflag;
-  struct stat stat_buf;
-  int i_retry;
-
-  switch (rw) {
-  case R_TKT_FIL:
-    wflag = 0;
-    break;
-  case W_TKT_FIL:
-    wflag = 1;
-    break;
-  default:
-    if (krb_debug)
-      krb_warning("tf_init: illegal parameter\n");
-    return TKT_FIL_ACC;
-  }
-  if (lstat(tf_name, &stat_buf) < 0)
-    switch (errno) {
-    case ENOENT:
-      return NO_TKT_FIL;
-    default:
-      return TKT_FIL_ACC;
-    }
-  /* The old code tried to guess when the calling program was
-   * running set-uid, this is now removed - the kerberos library
-   * does not (or shouldn't) know anything about user-ids.
-
-   * All library functions now assume that the right userids are set
-   * upon entry, therefore there is no need to test permissions like
-   * before. If the file is openable, just open it.
-   */
-
-  if(!S_ISREG(stat_buf.st_mode))
-    return TKT_FIL_ACC;
-
-
-  /*
-   * If "wflag" is set, open the ticket file in append-writeonly mode
-   * and lock the ticket file in exclusive mode.  If unable to lock
-   * the file, sleep and try again.  If we fail again, return with the
-   * proper error message. 
-   */
-
-  curpos = sizeof(tfbfr);
-
-    
-  if (wflag) {
-    fd = open(tf_name, O_RDWR | O_BINARY, 0600);
-    if (fd < 0) {
-      return TKT_FIL_ACC;
-    }
-    for (i_retry = 0; i_retry < TF_LCK_RETRY_COUNT; i_retry++) {
-      if (k_flock(fd, K_LOCK_EX | K_LOCK_NB) < 0) {
-	if (krb_debug)
-	  krb_warning("tf_init: retry %d of write lock of `%s'.\n",
-		      i_retry, tf_name);
-	sleep (TF_LCK_RETRY);
-      } else {
-	return KSUCCESS;		/* all done */
-      }
-    }
-    close (fd);
-    fd = -1;
-    return TKT_FIL_LCK;
-  }
-  /*
-   * Otherwise "wflag" is not set and the ticket file should be opened
-   * for read-only operations and locked for shared access. 
-   */
-
-  fd = open(tf_name, O_RDONLY | O_BINARY, 0600);
-  if (fd < 0) {
-    return TKT_FIL_ACC;
-  }
-
-  for (i_retry = 0; i_retry < TF_LCK_RETRY_COUNT; i_retry++) {
-    if (k_flock(fd, K_LOCK_SH | K_LOCK_NB) < 0) {
-      if (krb_debug)
-	krb_warning("tf_init: retry %d of read lock of `%s'.\n",
-		    i_retry, tf_name);
-      sleep (TF_LCK_RETRY);
-    } else {
-      return KSUCCESS;		/* all done */
-    }
-  }
-  /* failure */
-  close(fd);
-  fd = -1;
-  return TKT_FIL_LCK;
-}
-
-/*
- * tf_create() should be called when creating a new ticket file.
- * The only argument is the name of the ticket file.
- * After calling this, it should be possible to use other tf_* functions.
- *
- * New algoritm for creating ticket file:
- * 1. try to erase contents of existing file.
- * 2. try to remove old file.
- * 3. try to open with O_CREAT and O_EXCL
- * 4. if this fails, someone has created a file in between 1 and 2 and
- *    we should fail.  Otherwise, all is wonderful.
- */
-
-int
-tf_create(char *tf_name)
-{
-  struct stat statbuf;
-  char garbage[BUFSIZ];
-
-  fd = open(tf_name, O_RDWR | O_BINARY, 0);
-  if (fd >= 0) {
-    if (fstat (fd, &statbuf) == 0) {
-      int i;
-
-      for (i = 0; i < statbuf.st_size; i += sizeof(garbage))
-	write (fd, garbage, sizeof(garbage));
-    }
-    close (fd);
-  }
-
-  if (unlink (tf_name) && errno != ENOENT)
-    return TKT_FIL_ACC;
-
-  fd = open(tf_name, O_RDWR | O_CREAT | O_EXCL | O_BINARY, 0600);
-  if (fd < 0)
-    return TKT_FIL_ACC;
-  if (k_flock(fd, K_LOCK_EX | K_LOCK_NB) < 0) {
-    sleep(TF_LCK_RETRY);
-    if (k_flock(fd, K_LOCK_EX | K_LOCK_NB) < 0) {
-      close(fd);
-      fd = -1;
-      return TKT_FIL_LCK;
-    }
-  }
-  return KSUCCESS;
-}
-
-/*
- * tf_get_pname() reads the principal's name from the ticket file. It
- * should only be called after tf_init() has been called.  The
- * principal's name is filled into the "p" parameter.  If all goes well,
- * KSUCCESS is returned.  If tf_init() wasn't called, TKT_FIL_INI is
- * returned.  If the name was null, or EOF was encountered, or the name
- * was longer than ANAME_SZ, TKT_FIL_FMT is returned. 
- */
-
-int
-tf_get_pname(char *p)
-{
-  if (fd < 0) {
-    if (krb_debug)
-      krb_warning("tf_get_pname called before tf_init.\n");
-    return TKT_FIL_INI;
-  }
-  if (tf_gets(p, ANAME_SZ) < 2)	/* can't be just a null */
-    {
-      if (krb_debug) 
-	krb_warning ("tf_get_pname: pname < 2.\n");
-      return TKT_FIL_FMT;
-    }
-  return KSUCCESS;
-}
-
-/*
- * tf_put_pname() sets the principal's name in the ticket file. Call
- * after tf_create().
- */
-
-int
-tf_put_pname(char *p)
-{
-  unsigned count;
-
-  if (fd < 0) {
-    if (krb_debug)
-      krb_warning("tf_put_pname called before tf_create.\n");
-    return TKT_FIL_INI;
-  }
-  count = strlen(p)+1;
-  if (write(fd,p,count) != count)
-    return(KFAILURE);
-  return KSUCCESS;
-}
-
-/*
- * tf_get_pinst() reads the principal's instance from a ticket file.
- * It should only be called after tf_init() and tf_get_pname() have been
- * called.  The instance is filled into the "inst" parameter.  If all
- * goes well, KSUCCESS is returned.  If tf_init() wasn't called,
- * TKT_FIL_INI is returned.  If EOF was encountered, or the instance
- * was longer than ANAME_SZ, TKT_FIL_FMT is returned.  Note that the
- * instance may be null. 
- */
-
-int
-tf_get_pinst(char *inst)
-{
-  if (fd < 0) {
-    if (krb_debug)
-      krb_warning("tf_get_pinst called before tf_init.\n");
-    return TKT_FIL_INI;
-  }
-  if (tf_gets(inst, INST_SZ) < 1)
-    {
-      if (krb_debug)
-	krb_warning("tf_get_pinst: inst_sz < 1.\n");
-      return TKT_FIL_FMT;
-    }
-  return KSUCCESS;
-}
-
-/*
- * tf_put_pinst writes the principal's instance to the ticket file.
- * Call after tf_create.
- */
-
-int
-tf_put_pinst(char *inst)
-{
-  unsigned count;
-
-  if (fd < 0) {
-    if (krb_debug)
-      krb_warning("tf_put_pinst called before tf_create.\n");
-    return TKT_FIL_INI;
-  }
-  count = strlen(inst)+1;
-  if (write(fd,inst,count) != count)
-    return(KFAILURE);
-  return KSUCCESS;
-}
-
-/*
- * tf_get_cred() reads a CREDENTIALS record from a ticket file and fills
- * in the given structure "c".  It should only be called after tf_init(),
- * tf_get_pname(), and tf_get_pinst() have been called. If all goes well,
- * KSUCCESS is returned.  Possible error codes are: 
- *
- * TKT_FIL_INI  - tf_init wasn't called first
- * TKT_FIL_FMT  - bad format
- * EOF          - end of file encountered
- */
-
-int
-tf_get_cred(CREDENTIALS *c)
-{
-  KTEXT   ticket = &c->ticket_st;	/* pointer to ticket */
-  int     k_errno;
-
-  if (fd < 0) {
-    if (krb_debug)
-      krb_warning ("tf_get_cred called before tf_init.\n");
-    return TKT_FIL_INI;
-  }
-  if ((k_errno = tf_gets(c->service, SNAME_SZ)) < 2)
-    switch (k_errno) {
-    case TOO_BIG:
-      if (krb_debug)
-	krb_warning("tf_get_cred: too big service cred.\n");
-    case 1:		/* can't be just a null */
-      tf_close();
-      if (krb_debug)
-	krb_warning("tf_get_cred: null service cred.\n");
-      return TKT_FIL_FMT;
-    case 0:
-      return EOF;
-    }
-  if ((k_errno = tf_gets(c->instance, INST_SZ)) < 1)
-    switch (k_errno) {
-    case TOO_BIG:
-      if (krb_debug)
-	krb_warning ("tf_get_cred: too big instance cred.\n");
-      return TKT_FIL_FMT;
-    case 0:
-      return EOF;
-    }
-  if ((k_errno = tf_gets(c->realm, REALM_SZ)) < 2)
-    switch (k_errno) {
-    case TOO_BIG:
-      if (krb_debug)
-	krb_warning ("tf_get_cred: too big realm cred.\n");
-    case 1:		/* can't be just a null */
-      tf_close();
-      if (krb_debug)
-	krb_warning ("tf_get_cred: null realm cred.\n");
-      return TKT_FIL_FMT;
-    case 0:
-      return EOF;
-    }
-  if (
-      tf_read((c->session), DES_KEY_SZ) < 1 ||
-      tf_read(&(c->lifetime), sizeof(c->lifetime)) < 1 ||
-      tf_read(&(c->kvno), sizeof(c->kvno)) < 1 ||
-      tf_read(&(ticket->length), sizeof(ticket->length))
-      < 1 ||
-      /* don't try to read a silly amount into ticket->dat */
-      ticket->length > MAX_KTXT_LEN ||
-      tf_read((ticket->dat), ticket->length) < 1 ||
-      tf_read(&(c->issue_date), sizeof(c->issue_date)) < 1
-      ) {
-    tf_close();
-    if (krb_debug)
-      krb_warning ("tf_get_cred: failed tf_read.\n");
-    return TKT_FIL_FMT;
-  }
-  return KSUCCESS;
-}
-
-/*
- * tf_close() closes the ticket file and sets "fd" to -1. If "fd" is
- * not a valid file descriptor, it just returns.  It also clears the
- * buffer used to read tickets.
- *
- * The return value is not defined.
- */
-
-void
-tf_close(void)
-{
-  if (!(fd < 0)) {
-    k_flock(fd, K_LOCK_UN);
-    close(fd);
-    fd = -1;		/* see declaration of fd above */
-  }
-  memset(tfbfr, 0, sizeof(tfbfr));
-}
-
-/*
- * tf_gets() is an internal routine.  It takes a string "s" and a count
- * "n", and reads from the file until either it has read "n" characters,
- * or until it reads a null byte. When finished, what has been read exists
- * in "s". If it encounters EOF or an error, it closes the ticket file. 
- *
- * Possible return values are:
- *
- * n            the number of bytes read (including null terminator)
- *              when all goes well
- *
- * 0            end of file or read error
- *
- * TOO_BIG      if "count" characters are read and no null is
- *		encountered. This is an indication that the ticket
- *		file is seriously ill.
- */
-
-static int
-tf_gets(char *s, int n)
-{
-  int count;
-
-  if (fd < 0) {
-    if (krb_debug)
-      krb_warning ("tf_gets called before tf_init.\n");
-    return TKT_FIL_INI;
-  }
-  for (count = n - 1; count > 0; --count) {
-    if (curpos >= sizeof(tfbfr)) {
-      lastpos = read(fd, tfbfr, sizeof(tfbfr));
-      curpos = 0;
-    }
-    if (curpos == lastpos) {
-      tf_close();
-      return 0;
-    }
-    *s = tfbfr[curpos++];
-    if (*s++ == '\0')
-      return (n - count);
-  }
-  tf_close();
-  return TOO_BIG;
-}
-
-/*
- * tf_read() is an internal routine.  It takes a string "s" and a count
- * "n", and reads from the file until "n" bytes have been read.  When
- * finished, what has been read exists in "s".  If it encounters EOF or
- * an error, it closes the ticket file.
- *
- * Possible return values are:
- *
- * n		the number of bytes read when all goes well
- *
- * 0		on end of file or read error
- */
-
-static int
-tf_read(void *v, int n)
-{
-  char *s = (char *)v;
-  int count;
-    
-  for (count = n; count > 0; --count) {
-    if (curpos >= sizeof(tfbfr)) {
-      lastpos = read(fd, tfbfr, sizeof(tfbfr));
-      curpos = 0;
-    }
-    if (curpos == lastpos) {
-      tf_close();
-      return 0;
-    }
-    *s++ = tfbfr[curpos++];
-  }
-  return n;
-}
-     
-/*
- * tf_save_cred() appends an incoming ticket to the end of the ticket
- * file.  You must call tf_init() before calling tf_save_cred().
- *
- * The "service", "instance", and "realm" arguments specify the
- * server's name; "session" contains the session key to be used with
- * the ticket; "kvno" is the server key version number in which the
- * ticket is encrypted, "ticket" contains the actual ticket, and
- * "issue_date" is the time the ticket was requested (local host's time).
- *
- * Returns KSUCCESS if all goes well, TKT_FIL_INI if tf_init() wasn't
- * called previously, and KFAILURE for anything else that went wrong.
- */
- 
-int
-tf_save_cred(char *service,	/* Service name */
-	     char *instance,	/* Instance */
-	     char *realm,	/* Auth domain */
-	     unsigned char *session, /* Session key */
-	     int lifetime,	/* Lifetime */
-	     int kvno,		/* Key version number */
-	     KTEXT ticket,	/* The ticket itself */
-	     u_int32_t issue_date) /* The issue time */
-{
-  int count;			/* count for write */
-
-  if (fd < 0) {			/* fd is ticket file as set by tf_init */
-    if (krb_debug)
-      krb_warning ("tf_save_cred called before tf_init.\n");
-    return TKT_FIL_INI;
-  }
-  /* Find the end of the ticket file */
-  lseek(fd, 0L, SEEK_END);
-
-  /* Write the ticket and associated data */
-  /* Service */
-  count = strlen(service) + 1;
-  if (write(fd, service, count) != count)
-    goto bad;
-  /* Instance */
-  count = strlen(instance) + 1;
-  if (write(fd, instance, count) != count)
-    goto bad;
-  /* Realm */
-  count = strlen(realm) + 1;
-  if (write(fd, realm, count) != count)
-    goto bad;
-  /* Session key */
-  if (write(fd, session, 8) != 8)
-    goto bad;
-  /* Lifetime */
-  if (write(fd, &lifetime, sizeof(int)) != sizeof(int))
-    goto bad;
-  /* Key vno */
-  if (write(fd, &kvno, sizeof(int)) != sizeof(int))
-    goto bad;
-  /* Tkt length */
-  if (write(fd, &(ticket->length), sizeof(int)) !=
-      sizeof(int))
-    goto bad;
-  /* Ticket */
-  count = ticket->length;
-  if (write(fd, ticket->dat, count) != count)
-    goto bad;
-  /* Issue date */
-  if (write(fd, &issue_date, sizeof(issue_date)) != sizeof(issue_date))
-    goto bad;
-
-  return (KSUCCESS);
-bad:
-  return (KFAILURE);
-}
-	  
-int
-tf_setup(CREDENTIALS *cred, char *pname, char *pinst)
-{
-    int ret;
-    ret = tf_create(tkt_string());
-    if (ret != KSUCCESS)
-	return ret;
-
-    if (tf_put_pname(pname) != KSUCCESS ||
-	tf_put_pinst(pinst) != KSUCCESS) {
-	tf_close();
-	return INTK_ERR;
-    }
-
-    ret = tf_save_cred(cred->service, cred->instance, cred->realm, 
-		       cred->session, cred->lifetime, cred->kvno,
-		       &cred->ticket_st, cred->issue_date);
-    tf_close();
-    return ret;
-}
-
-int
-in_tkt(char *pname, char *pinst)
-{
-  int ret;
-  
-  ret = tf_create (tkt_string());
-  if (ret != KSUCCESS)
-    return ret;
-
-    if (tf_put_pname(pname) != KSUCCESS ||
-	tf_put_pinst(pinst) != KSUCCESS) {
-	tf_close();
-	return INTK_ERR;
-    }
-
-    tf_close();
-    return KSUCCESS;
-}
diff --git a/crypto/kerberosIV/lib/krb/ticket_memory.c b/crypto/kerberosIV/lib/krb/ticket_memory.c
deleted file mode 100644
index 04e20b648d66..000000000000
--- a/crypto/kerberosIV/lib/krb/ticket_memory.c
+++ /dev/null
@@ -1,438 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* ticket_memory.c - Storage for tickets in memory
- * Author: d93-jka@nada.kth.se - June 1996
- */
-
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-#include "krb_locl.h"
-#include "ticket_memory.h"
-
-RCSID("$Id: ticket_memory.c,v 1.9 1997/04/20 18:07:36 assar Exp $");
-
-void msg(char *text, int error);
-
-/* Global variables for memory mapping. */
-HANDLE	SharedMemoryHandle;
-tktmem	*SharedMemory;
-
-static int CredIndex = -1;
-
-int
-newTktMem(const char *tf_name)
-{
-    if(!SharedMemory)
-    {
-	unsigned int MemorySize = sizeof(tktmem);
-	unsigned int MemorySizeHi = sizeof(tktmem)>>16;
-	unsigned int MemorySizeLo = MemorySize&0xFFFF;
-	SharedMemoryHandle = CreateFileMapping((HANDLE)(int)-1, 0,
-					       PAGE_READWRITE,
-					       MemorySizeHi, MemorySizeLo,
-					       "krb_memory");
-
-	if(!SharedMemoryHandle)
-	{
-	    msg("Could not create shared memory.", GetLastError());
-	    return KFAILURE;
-	}
-		
-	SharedMemory = MapViewOfFile(SharedMemoryHandle,
-				     FILE_MAP_WRITE, 0, 0, 0);
-	if(!SharedMemory)
-	{
-	    msg("Unable to alloc shared memory.", GetLastError());
-	    return KFAILURE;
-	}
-	if(GetLastError() != ERROR_ALREADY_EXISTS)
-	{
-	    if(tf_name)
-		strcpy(SharedMemory->tmname, tf_name);
-	    SharedMemory->last_cred_no = 0;
-	}
-    }
-	
-    CredIndex = 0;
-    return KSUCCESS;
-}
-
-int
-freeTktMem(const char *tf_name)
-{
-    if(SharedMemory)
-    {
-	UnmapViewOfFile(SharedMemory);
-	CloseHandle(SharedMemoryHandle);
-    }
-    return KSUCCESS;
-}
-
-
-
-tktmem *
-getTktMem(const char *tf_name)
-{
-    return SharedMemory;
-}
-
-void
-firstCred(void)
-{
-    if(getTktMem(0)->last_cred_no > 0)
-	CredIndex = 0;
-    else
-	CredIndex = -1;
-}
-	
-int
-nextCredIndex(void)
-{
-    const tktmem *mem;
-    int last;
-    mem = getTktMem(0);
-    last = mem->last_cred_no;
-    if(CredIndex >= 0 && CredIndex < last )
-	return CredIndex++;
-    else
-	return CredIndex = -1;
-}
-
-int
-currCredIndex(void)
-{
-    const tktmem *mem;
-    int last;
-    mem = getTktMem(0);
-    last = mem->last_cred_no;
-    if(CredIndex >= 0 && CredIndex < last)
-	return CredIndex;
-    else
-	return CredIndex = -1;
-}
-
-int
-nextFreeIndex(void)
-{
-    tktmem *mem = getTktMem(0);
-    if(mem->last_cred_no > CRED_VEC_SZ)
-	return -1;
-    else
-	return mem->last_cred_no++;
-}
-
-/*
- * in_tkt() is used to initialize the ticket store.  It creates the
- * file to contain the tickets and writes the given user's name "pname"
- * and instance "pinst" in the file.  in_tkt() returns KSUCCESS on
- * success, or KFAILURE if something goes wrong.
- */
-
-int
-in_tkt(char *pname, char *pinst)
-{
-    /* Here goes code to initialize shared memory, to store tickets in. */
-    /* Implemented somewhere else. */
-    return KFAILURE;
-}
-
-/*
- * dest_tkt() is used to destroy the ticket store upon logout.
- * If the ticket file does not exist, dest_tkt() returns RET_TKFIL.
- * Otherwise the function returns RET_OK on success, KFAILURE on
- * failure.
- *
- * The ticket file (TKT_FILE) is defined in "krb.h".
- */
-
-int
-dest_tkt(void)
-{
-    /* Here goes code to destroy tickets in shared memory. */
-    /* Not implemented yet. */
-    return KFAILURE;
-}
-
-/* Short description of routines:
- *
- * tf_init() opens the ticket file and locks it.
- *
- * tf_get_pname() returns the principal's name.
- *
- * tf_put_pname() writes the principal's name to the ticket file.
- *
- * tf_get_pinst() returns the principal's instance (may be null).
- *
- * tf_put_pinst() writes the instance.
- *
- * tf_get_cred() returns the next CREDENTIALS record.
- *
- * tf_save_cred() appends a new CREDENTIAL record to the ticket file.
- *
- * tf_close() closes the ticket file and releases the lock.
- *
- * tf_gets() returns the next null-terminated string.  It's an internal
- * routine used by tf_get_pname(), tf_get_pinst(), and tf_get_cred().
- *
- * tf_read() reads a given number of bytes.  It's an internal routine
- * used by tf_get_cred().
- */
-
-/*
- * tf_init() should be called before the other ticket file routines.
- * It takes the name of the ticket file to use, "tf_name", and a
- * read/write flag "rw" as arguments. 
- *
- * Returns KSUCCESS if all went well, otherwise one of the following: 
- *
- * NO_TKT_FIL   - file wasn't there
- * TKT_FIL_ACC  - file was in wrong mode, etc.
- * TKT_FIL_LCK  - couldn't lock the file, even after a retry
- */
-
-int
-tf_init(char *tf_name, int rw)
-{
-    if(!getTktMem(tf_name))
-	return NO_TKT_FIL;
-    firstCred();
-    return KSUCCESS;
-}
-
-/*
- * tf_create() should be called when creating a new ticket file.
- * The only argument is the name of the ticket file.
- * After calling this, it should be possible to use other tf_* functions.
- */
-
-int
-tf_create(char *tf_name)
-{
-    if(newTktMem(tf_name) != KSUCCESS)
-	return NO_TKT_FIL;
-    return KSUCCESS;
-}
-
-/*
- * tf_get_pname() reads the principal's name from the ticket file. It
- * should only be called after tf_init() has been called.  The
- * principal's name is filled into the "p" parameter.  If all goes well,
- * KSUCCESS is returned.  If tf_init() wasn't called, TKT_FIL_INI is
- * returned.  If the name was null, or EOF was encountered, or the name
- * was longer than ANAME_SZ, TKT_FIL_FMT is returned. 
- */
-
-int
-tf_get_pname(char *p)
-{
-    tktmem *TktStore;
-
-    if(!(TktStore =  getTktMem(0)))
-	return KFAILURE;
-    if(!TktStore->pname)
-	return KFAILURE;
-    strcpy(p, TktStore->pname);
-    return KSUCCESS;
-}
-
-/*
- * tf_put_pname() sets the principal's name in the ticket file. Call
- * after tf_create().
- */
-
-int
-tf_put_pname(char *p)
-{
-    tktmem *TktStore;
-
-    if(!(TktStore =  getTktMem(0)))
-	return KFAILURE;
-    if(!TktStore->pname)
-	return KFAILURE;
-    strcpy(TktStore->pname, p);
-    return KSUCCESS;
-}
-
-/*
- * tf_get_pinst() reads the principal's instance from a ticket file.
- * It should only be called after tf_init() and tf_get_pname() have been
- * called.  The instance is filled into the "inst" parameter.  If all
- * goes well, KSUCCESS is returned.  If tf_init() wasn't called,
- * TKT_FIL_INI is returned.  If EOF was encountered, or the instance
- * was longer than ANAME_SZ, TKT_FIL_FMT is returned.  Note that the
- * instance may be null. 
- */
-
-int
-tf_get_pinst(char *inst)
-{
-    tktmem *TktStore;
-
-    if(!(TktStore =  getTktMem(0)))
-	return KFAILURE;
-    if(!TktStore->pinst)
-	return KFAILURE;
-    strcpy(inst, TktStore->pinst);
-    return KSUCCESS;
-}
-
-/*
- * tf_put_pinst writes the principal's instance to the ticket file.
- * Call after tf_create.
- */
-
-int
-tf_put_pinst(char *inst)
-{
-    tktmem *TktStore;
-
-    if(!(TktStore =  getTktMem(0)))
-	return KFAILURE;
-    if(!TktStore->pinst)
-	return KFAILURE;
-    strcpy(TktStore->pinst, inst);
-    return KSUCCESS;
-}
-
-/*
- * tf_get_cred() reads a CREDENTIALS record from a ticket file and fills
- * in the given structure "c".  It should only be called after tf_init(),
- * tf_get_pname(), and tf_get_pinst() have been called. If all goes well,
- * KSUCCESS is returned.  Possible error codes are: 
- *
- * TKT_FIL_INI  - tf_init wasn't called first
- * TKT_FIL_FMT  - bad format
- * EOF          - end of file encountered
- */
-
-int
-tf_get_cred(CREDENTIALS *c)
-{
-    int index;
-    CREDENTIALS *cred;
-    tktmem *TktStore;
-
-    if(!(TktStore =  getTktMem(0)))
-	return KFAILURE;
-    if((index = nextCredIndex()) == -1)
-	return EOF;
-    if(!(cred = TktStore->cred_vec+index))
-       return KFAILURE;
-    if(!c)
-	return KFAILURE;
-    memcpy(c, cred, sizeof(*c));
-    return KSUCCESS;
-}
-
-/*
- * tf_close() closes the ticket file and sets "fd" to -1. If "fd" is
- * not a valid file descriptor, it just returns.  It also clears the
- * buffer used to read tickets.
- */
-
-void
-tf_close(void)
-{
-}
-
-/*
- * tf_save_cred() appends an incoming ticket to the end of the ticket
- * file.  You must call tf_init() before calling tf_save_cred().
- *
- * The "service", "instance", and "realm" arguments specify the
- * server's name; "session" contains the session key to be used with
- * the ticket; "kvno" is the server key version number in which the
- * ticket is encrypted, "ticket" contains the actual ticket, and
- * "issue_date" is the time the ticket was requested (local host's time).
- *
- * Returns KSUCCESS if all goes well, TKT_FIL_INI if tf_init() wasn't
- * called previously, and KFAILURE for anything else that went wrong.
- */
- 
-int
-tf_save_cred(char *service,	/* Service name */
-	     char *instance,	/* Instance */
-	     char *realm,	/* Auth domain */
-	     unsigned char *session, /* Session key */
-	     int lifetime,	/* Lifetime */
-	     int kvno,		/* Key version number */
-	     KTEXT ticket,	/* The ticket itself */
-	     u_int32_t issue_date) /* The issue time */
-{
-    CREDENTIALS *cred;
-    tktmem *mem =  getTktMem(0);
-    int last = nextFreeIndex();
-
-    if(last == -1)
-	return KFAILURE;
-    cred = mem->cred_vec+last;
-    strcpy(cred->service, service);
-    strcpy(cred->instance, instance);
-    strcpy(cred->realm, realm);
-    strcpy(cred->session, session);
-    cred->lifetime = lifetime;
-    cred->kvno = kvno;
-    memcpy(&(cred->ticket_st), ticket, sizeof(*ticket));
-    cred->issue_date = issue_date;
-    strcpy(cred->pname, mem->pname);
-    strcpy(cred->pinst, mem->pinst);
-    return KSUCCESS;
-}
-
-
-int
-tf_setup(CREDENTIALS *cred, char *pname, char *pinst)
-{
-    int ret;
-    ret = tf_create(tkt_string());
-    if (ret != KSUCCESS)
-	return ret;
-
-    if (tf_put_pname(pname) != KSUCCESS ||
-	tf_put_pinst(pinst) != KSUCCESS) {
-	tf_close();
-	return INTK_ERR;
-    }
-
-    ret = tf_save_cred(cred->service, cred->instance, cred->realm, 
-		       cred->session, cred->lifetime, cred->kvno,
-		       &cred->ticket_st, cred->issue_date);
-    tf_close();
-    return ret;
-}
diff --git a/crypto/kerberosIV/lib/krb/ticket_memory.h b/crypto/kerberosIV/lib/krb/ticket_memory.h
deleted file mode 100644
index e85e1a4cc6a3..000000000000
--- a/crypto/kerberosIV/lib/krb/ticket_memory.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* ticket_memory.h - Storage for tickets in memory
- * Author: d93-jka@nada.kth.se - June 1996
- */
-
-/* $Id: ticket_memory.h,v 1.6 1997/04/20 06:25:12 assar Exp $ */
-
-#ifndef	TICKET_MEMORY_H
-#define TICKET_MEMORY_H
-
-#include "krb_locl.h"
-
-#define CRED_VEC_SZ	20
-
-typedef struct _tktmem
-{
-  char tmname[64];
-  char pname[ANAME_SZ];	/* Principal's name */
-  char pinst[INST_SZ];	/* Principal's instance */
-  int last_cred_no;
-  CREDENTIALS cred_vec[CRED_VEC_SZ];
-} tktmem;
-
-int newTktMem(const char *tf_name);
-int freeTktMem(const char *tf_name);
-tktmem *getTktMem(const char *tf_name);
-void firstCred(void);
-int nextCredIndex(void);
-int currCredIndex(void);
-int nextFreeIndex(void);
-
-#endif /* TICKET_MEMORY_H */
diff --git a/crypto/kerberosIV/lib/krb/tkt_string.c b/crypto/kerberosIV/lib/krb/tkt_string.c
deleted file mode 100644
index 2914abb12dca..000000000000
--- a/crypto/kerberosIV/lib/krb/tkt_string.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* 
-  Copyright (C) 1989 by the Massachusetts Institute of Technology
-
-   Export of this software from the United States of America is assumed
-   to require a specific license from the United States Government.
-   It is the responsibility of any person or organization contemplating
-   export to obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  M.I.T. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-  */
-
-#include "krb_locl.h"
-
-RCSID("$Id: tkt_string.c,v 1.10 1997/05/02 14:54:26 assar Exp $");
-
-/*
- * This routine is used to generate the name of the file that holds
- * the user's cache of server tickets and associated session keys.
- *
- * If it is set, krb_ticket_string contains the ticket file name.
- * Otherwise, the filename is constructed as follows:
- *
- * If it is set, the environment variable "KRBTKFILE" will be used as
- * the ticket file name.  Otherwise TKT_ROOT (defined in "krb.h") and
- * the user's uid are concatenated to produce the ticket file name
- * (e.g., "/tmp/tkt123").  A pointer to the string containing the ticket
- * file name is returned.
- */
-
-static char krb_ticket_string[MaxPathLen] = "";
-
-#ifndef HAVE_GETUID
-int getuid(void)
-{
-    return 27;
-}
-#endif
-
-char *tkt_string(void)
-{
-    char *env;
-
-    if (!*krb_ticket_string) {
-        if ((env = getenv("KRBTKFILE"))) {
-	    strncpy(krb_ticket_string, env,
-			   sizeof(krb_ticket_string)-1);
-	    krb_ticket_string[sizeof(krb_ticket_string)-1] = '\0';
-	} else {
-	    snprintf(krb_ticket_string, sizeof(krb_ticket_string),
-		     "%s%u",TKT_ROOT,(unsigned)getuid());
-        }
-    }
-    return krb_ticket_string;
-}
-
-/*
- * This routine is used to set the name of the file that holds the user's
- * cache of server tickets and associated session keys.
- *
- * The value passed in is copied into local storage.
- *
- * NOTE:  This routine should be called during initialization, before other
- * Kerberos routines are called; otherwise tkt_string() above may be called
- * and return an undesired ticket file name until this routine is called.
- */
-
-void
-krb_set_tkt_string(char *val)
-{
-
-    strncpy(krb_ticket_string, val, sizeof(krb_ticket_string)-1);
-    krb_ticket_string[sizeof(krb_ticket_string)-1] = '\0';
-
-    return;
-}
diff --git a/crypto/kerberosIV/lib/krb/unparse_name.c b/crypto/kerberosIV/lib/krb/unparse_name.c
deleted file mode 100644
index ddb938f49d53..000000000000
--- a/crypto/kerberosIV/lib/krb/unparse_name.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: unparse_name.c,v 1.7 1997/04/01 08:18:46 joda Exp $");
-
-static void
-quote_string(char *quote, char *from, char *to)
-{
-    while(*from){
-	if(strchr(quote, *from))
-	    *to++ = '\\';
-	*to++ = *from++;
-    }
-    *to = 0;
-}
-
-/* To be compatible with old functions, we quote differently in each
-   part of the principal*/
-
-char *
-krb_unparse_name_r(krb_principal *pr, char *fullname)
-{
-    quote_string("'@\\", pr->name, fullname);
-    if(pr->instance[0]){
-	strcat(fullname, ".");
-	quote_string("@\\", pr->instance, fullname + strlen(fullname));
-    }
-    if(pr->realm[0]){
-	strcat(fullname, "@");
-	quote_string("\\", pr->realm, fullname + strlen(fullname));
-    }
-    return fullname;
-}
-
-char *
-krb_unparse_name_long_r(char *name, char *instance, char *realm,
-			char *fullname)
-{
-    krb_principal pr;
-    memset(&pr, 0, sizeof(pr));
-    strcpy(pr.name, name);
-    if(instance)
-	strcpy(pr.instance, instance);
-    if(realm)
-	strcpy(pr.realm, realm);
-    return krb_unparse_name_r(&pr, fullname);
-}
-
-char *
-krb_unparse_name(krb_principal *pr)
-{
-    static char principal[MAX_K_NAME_SZ];
-    krb_unparse_name_r(pr, principal);
-    return principal;
-}
-
-char *
-krb_unparse_name_long(char *name, char *instance, char *realm)
-{
-    krb_principal pr;
-    memset(&pr, 0, sizeof(pr));
-    strcpy(pr.name, name);
-    if(instance)
-	strcpy(pr.instance, instance);
-    if(realm)
-	strcpy(pr.realm, realm);
-    return krb_unparse_name(&pr);
-}
diff --git a/crypto/kerberosIV/lib/krb/util.c b/crypto/kerberosIV/lib/krb/util.c
deleted file mode 100644
index 7b77bb8b0d32..000000000000
--- a/crypto/kerberosIV/lib/krb/util.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *
- * Copyright 1988 by the Massachusetts Institute of Technology.
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
- *
- * Miscellaneous debug printing utilities
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: util.c,v 1.6 1996/10/05 00:18:34 joda Exp $");
-
-/*
- * Print some of the contents of the given authenticator structure
- * (AUTH_DAT defined in "krb.h").  Fields printed are:
- *
- * pname, pinst, prealm, netaddr, flags, cksum, timestamp, session
- */
-
-void
-ad_print(AUTH_DAT *x)
-{
-    /*
-     * Print the contents of an auth_dat struct.
-     */
-    struct in_addr address;
-    address.s_addr = x->address;
-    printf("\n%s %s %s %s flags %u cksum 0x%X\n\ttkt_tm 0x%X sess_key",
-           x->pname, x->pinst, x->prealm,
-           inet_ntoa(address), x->k_flags,
-           x->checksum, x->time_sec);
-    printf("[8] =");
-#ifdef NOENCRYPTION
-    placebo_cblock_print(x->session);
-#else
-    des_cblock_print_file(&x->session,stdout);
-#endif
-    /* skip reply for now */
-}
-
-/*
- * Print in hex the 8 bytes of the given session key.
- *
- * Printed format is:  " 0x { x, x, x, x, x, x, x, x }"
- */
-
-#ifdef NOENCRYPTION
-placebo_cblock_print(x)
-    des_cblock x;
-{
-    unsigned char *y = (unsigned char *) x;
-    int i = 0;
-
-    printf(" 0x { ");
-
-    while (i++ <8) {
-        printf("%x",*y++);
-        if (i<8) printf(", ");
-    }
-    printf(" }");
-}
-#endif
diff --git a/crypto/kerberosIV/lib/krb/verify_user.c b/crypto/kerberosIV/lib/krb/verify_user.c
deleted file mode 100644
index ce22b59a049c..000000000000
--- a/crypto/kerberosIV/lib/krb/verify_user.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "krb_locl.h"
-
-RCSID("$Id: verify_user.c,v 1.8 1997/04/01 08:18:46 joda Exp $");
-
-/* Verify user with password. If secure, also verify against local
- * service key, this can (usually) only be done by root.
- *
- * As a side effect, fresh tickets are obtained.
- *
- * Returns zero if ok, a positive kerberos error or -1 for system
- * errors.
- */
-
-int
-krb_verify_user(char *name, char *instance, char *realm, char *password, 
-		int secure, char *linstance)
-{
-    int ret;
-    ret = krb_get_pw_in_tkt(name, instance, realm,
-			    KRB_TICKET_GRANTING_TICKET,
-			    realm,
-			    DEFAULT_TKT_LIFE, password);
-    if(ret != KSUCCESS)
-	return ret;
-
-    if(secure){
-	struct hostent *hp;
-	int32_t addr;
-	
-	KTEXT_ST ticket;
-	AUTH_DAT auth;
-
-	char lrealm[REALM_SZ];
-	char hostname[MaxHostNameLen];
-	char *phost;
-
-	if (k_gethostname(hostname, sizeof(hostname)) == -1) {
-	    dest_tkt();
-	    return -1;
-	}
-
-	hp = gethostbyname(hostname);
-	if(hp == NULL){
-	    dest_tkt();
-	    return -1;
-	}
-	memcpy(&addr, hp->h_addr, sizeof(addr));
-
-	ret = krb_get_lrealm(lrealm, 1);
-	if(ret != KSUCCESS){
-	    dest_tkt();
-	    return ret;
-	}
-	phost = krb_get_phost(hostname);
-	
-	if (linstance == NULL)
-	    linstance = "rcmd";
-
-	ret = krb_mk_req(&ticket, linstance, phost, lrealm, 33);
-	if(ret != KSUCCESS){
-	    dest_tkt();
-	    return ret;
-	}
-	
-	ret = krb_rd_req(&ticket, linstance, phost, addr, &auth, "");
-	if(ret != KSUCCESS){
-	    dest_tkt();
-	    return ret;
-	}
-    }
-    return 0;
-}
-		
diff --git a/crypto/kerberosIV/lib/roken/Makefile.in b/crypto/kerberosIV/lib/roken/Makefile.in
deleted file mode 100644
index 26f31425789d..000000000000
--- a/crypto/kerberosIV/lib/roken/Makefile.in
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-# $Id: Makefile.in,v 1.34 1997/05/28 05:23:39 assar Exp $
-#
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-CC	= @CC@
-CPP	= @CPP@
-AR	= ar
-RANLIB	= @RANLIB@
-DEFS	= @DEFS@
-CFLAGS	= @CFLAGS@
-
-INSTALL = @INSTALL@
-INSTALL_DATA	= @INSTALL_DATA@
-MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-libdir = @libdir@
-
-PICFLAGS = # @PICFLAGS@
- 
-LIBNAME = $(LIBPREFIX)roken
-#LIBEXT = @LIBEXT@ Always build archive library and don't install!
-LIBEXT = a
-LIBPREFIX = @LIBPREFIX@
-SHLIBEXT = @SHLIBEXT@
-LDSHARED = @LDSHARED@
-LIB = $(LIBNAME).$(LIBEXT)
-
-SOURCES = \
-	chown.c daemon.c err.c errx.c fchown.c get_window_size.c \
-	getcwd.c getdtablesize.c getopt.c getusershell.c \
-	hstrerror.c inaddr2str.c inet_aton.c \
-	initgroups.c k_getpwnam.c k_getpwuid.c lstat.c \
-	memmove.c mini_inetd.c mkstemp.c putenv.c rcmd.c setegid.c \
-	setenv.c seteuid.c signal.c snprintf.c \
-	strcasecmp.c strdup.c strerror.c strftime.c \
-	strlwr.c strnlen.c strtok_r.c strupr.c tm2time.c \
-	unsetenv.c verify.c verr.c verrx.c vwarn.c \
-	vwarnx.c warn.c warnerr.c warnx.c
-
-OBJECTS = k_getpwuid.o k_getpwnam.o signal.o tm2time.o \
-	  verify.o inaddr2str.o mini_inetd.o get_window_size.o \
-	  warnerr.o snprintf.o @LIBOBJS@
-
-all: $(LIB)
-
-Wall:
-	make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $<
-
-install: all
-
-uninstall:
-
-TAGS: $(SOURCES)
-	etags $(SOURCES)
-
-check:
-
-clean:
-	rm -f $(LIB) *.o *.a
-
-mostlyclean: clean
-
-distclean: clean
-	rm -f Makefile *.tab.c *~
-
-realclean: distclean
-	rm -f TAGS
-
-dist: $(DISTFILES)
-	for file in $(DISTFILES); do \
-	  ln $$file ../`cat ../.fname`/lib \
-	    || cp -p $$file ../`cat ../.fname`/lib; \
-	done
-
-$(LIBNAME).a: $(OBJECTS)
-	rm -f $@
-	$(AR) cr $@ $(OBJECTS)
-	-$(RANLIB) $@
-
-$(LIBNAME).$(SHLIBEXT): $(OBJECTS)
-	rm -f $@
-	$(LDSHARED) -o $@ $(OBJECTS)
-
-$(OBJECTS): ../../include/config.h
diff --git a/crypto/kerberosIV/lib/roken/chown.c b/crypto/kerberosIV/lib/roken/chown.c
deleted file mode 100644
index 28550d982c1f..000000000000
--- a/crypto/kerberosIV/lib/roken/chown.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: chown.c,v 1.2 1997/04/01 08:18:58 joda Exp $");
-#endif
-
-#include "roken.h"
-
-int
-chown(const char *path, uid_t owner, gid_t group)
-{
-  return 0;
-}
diff --git a/crypto/kerberosIV/lib/roken/daemon.c b/crypto/kerberosIV/lib/roken/daemon.c
deleted file mode 100644
index ffab298c76b0..000000000000
--- a/crypto/kerberosIV/lib/roken/daemon.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)daemon.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-RCSID("$Id: daemon.c,v 1.2 1997/05/28 05:38:09 assar Exp $");
-
-#ifndef HAVE_DAEMON
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#ifdef HAVE_PATHS_H
-#include <paths.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include "roken.h"
-
-int
-daemon(nochdir, noclose)
-	int nochdir, noclose;
-{
-	int fd;
-
-	switch (fork()) {
-	case -1:
-		return (-1);
-	case 0:
-		break;
-	default:
-		_exit(0);
-	}
-
-	if (setsid() == -1)
-		return (-1);
-
-	if (!nochdir)
-		(void)chdir("/");
-
-	if (!noclose && (fd = open(_PATH_DEVNULL, O_RDWR, 0)) != -1) {
-		(void)dup2(fd, STDIN_FILENO);
-		(void)dup2(fd, STDOUT_FILENO);
-		(void)dup2(fd, STDERR_FILENO);
-		if (fd > 2)
-			(void)close (fd);
-	}
-	return (0);
-}
-
-#endif /* HAVE_DAEMON */
diff --git a/crypto/kerberosIV/lib/roken/err.c b/crypto/kerberosIV/lib/roken/err.c
deleted file mode 100644
index 029faa92c4d5..000000000000
--- a/crypto/kerberosIV/lib/roken/err.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan 
- * (Royal Institute of Technology, Stockholm, Sweden).  
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: err.c,v 1.5 1997/03/30 08:05:37 joda Exp $");
-#endif
-
-#include "err.h"
-
-void
-err(int eval, const char *fmt, ...)
-{
-  va_list ap;
-  va_start(ap, fmt);
-  verr(eval, fmt, ap);
-  va_end(ap);
-}
diff --git a/crypto/kerberosIV/lib/roken/err.h b/crypto/kerberosIV/lib/roken/err.h
deleted file mode 100644
index 6f25435250b7..000000000000
--- a/crypto/kerberosIV/lib/roken/err.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan 
- * (Royal Institute of Technology, Stockholm, Sweden).  
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id: err.h,v 1.13 1997/05/02 14:29:30 assar Exp $ */
-
-#ifndef __ERR_H__
-#define __ERR_H__
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-
-extern const char *__progname;
-
-#if !defined(__GNUC__) && !defined(__attribute__)
-#define __attribute__(x)
-#endif
-
-void warnerr(int doexit, int eval, int doerrno, const char *fmt, va_list ap)
-     __attribute__ ((format (printf, 4, 0)));
-
-void verr(int eval, const char *fmt, va_list ap)
-     __attribute__ ((noreturn, format (printf, 2, 0)));
-void err(int eval, const char *fmt, ...)
-     __attribute__ ((noreturn, format (printf, 2, 3)));
-void verrx(int eval, const char *fmt, va_list ap)
-     __attribute__ ((noreturn, format (printf, 2, 0)));
-void errx(int eval, const char *fmt, ...)
-     __attribute__ ((noreturn, format (printf, 2, 3)));
-void vwarn(const char *fmt, va_list ap)
-     __attribute__ ((format (printf, 1, 0)));
-void warn(const char *fmt, ...)
-     __attribute__ ((format (printf, 1, 2)));
-void vwarnx(const char *fmt, va_list ap)
-     __attribute__ ((format (printf, 1, 0)));
-void warnx(const char *fmt, ...)
-     __attribute__ ((format (printf, 1, 2)));
-
-#endif /* __ERR_H__ */
diff --git a/crypto/kerberosIV/lib/roken/errx.c b/crypto/kerberosIV/lib/roken/errx.c
deleted file mode 100644
index 18969d51de67..000000000000
--- a/crypto/kerberosIV/lib/roken/errx.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan 
- * (Royal Institute of Technology, Stockholm, Sweden).  
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: errx.c,v 1.5 1997/03/30 08:05:38 joda Exp $");
-#endif
-
-#include "err.h"
-
-void
-errx(int eval, const char *fmt, ...)
-{
-  va_list ap;
-  va_start(ap, fmt);
-  verrx(eval, fmt, ap);
-  va_end(ap);
-}
diff --git a/crypto/kerberosIV/lib/roken/fchown.c b/crypto/kerberosIV/lib/roken/fchown.c
deleted file mode 100644
index 2a94e3ac8704..000000000000
--- a/crypto/kerberosIV/lib/roken/fchown.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: fchown.c,v 1.2 1997/04/01 08:18:58 joda Exp $");
-#endif
-
-#include "roken.h"
-
-int
-fchown(int fd, uid_t owner, gid_t group)
-{
-  return 0;
-}
diff --git a/crypto/kerberosIV/lib/roken/get_window_size.c b/crypto/kerberosIV/lib/roken/get_window_size.c
deleted file mode 100644
index d31d18d431a8..000000000000
--- a/crypto/kerberosIV/lib/roken/get_window_size.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: get_window_size.c,v 1.4 1997/04/01 08:18:59 joda Exp $");
-#endif
-
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#if 0 /* Where were those needed? /confused */
-#ifdef HAVE_SYS_PROC_H
-#include <sys/proc.h>
-#endif
-
-#ifdef HAVE_SYS_TTY_H
-#include <sys/tty.h>
-#endif
-#endif
-
-#ifdef HAVE_TERMIOS_H
-#include <termios.h>
-#endif
-
-#include <roken.h>
-
-int
-get_window_size(int fd, struct winsize *wp)
-{
-#if defined(TIOCGWINSZ)
-  return ioctl(fd, TIOCGWINSZ, wp);
-#elif defined(TIOCGSIZE)
-  struct ttysize ts;
-  int error;
-
-  if ((error = ioctl(0, TIOCGSIZE, &ts)) != 0)
-    return (error);
-  wp->ws_row = ts.ts_lines;
-  wp->ws_col = ts.ts_cols;
-  wp->ws_xpixel = 0;
-  wp->ws_ypixel = 0;
-  return 0;
-#elif defined(HAVE__SCRSIZE)
-  int dst[2];
-
-  _scrsize(dst);
-  wp->ws_row = dst[1];
-  wp->ws_col = dst[0];
-  wp->ws_xpixel = 0;
-  wp->ws_ypixel = 0;
-  return 0;
-#else
-  return -1;
-#endif
-}
diff --git a/crypto/kerberosIV/lib/roken/getcwd.c b/crypto/kerberosIV/lib/roken/getcwd.c
deleted file mode 100644
index a27451fd9931..000000000000
--- a/crypto/kerberosIV/lib/roken/getcwd.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: getcwd.c,v 1.7 1997/04/01 08:19:00 joda Exp $");
-#endif
-
-#include <unistd.h>
-#include <sys/param.h>
-
-#include "protos.h"
-#include "roken.h"
-
-char*
-getcwd(char *path, size_t size)
-{
-    char xxx[MaxPathLen];
-    char *ret;
-    ret = getwd(xxx);
-    if(ret)
-	strncpy(path, xxx, size);
-    return ret;
-}
diff --git a/crypto/kerberosIV/lib/roken/getdtablesize.c b/crypto/kerberosIV/lib/roken/getdtablesize.c
deleted file mode 100644
index afd47d2b23f2..000000000000
--- a/crypto/kerberosIV/lib/roken/getdtablesize.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: getdtablesize.c,v 1.8 1997/04/20 05:51:06 assar Exp $");
-#endif
-
-#include "roken.h"
-
-#include <sys/types.h>
-#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#elif defined(HAVE_SYS_TIME_H)
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#include <unistd.h>
-
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif
-
-#ifdef HAVE_SYS_SYSCTL_H
-#include <sys/sysctl.h>
-#endif
-
-int getdtablesize(void)
-{
-  int files = -1;
-#if defined(HAVE_SYSCONF) && defined(_SC_OPEN_MAX)
-  files = sysconf(_SC_OPEN_MAX);
-#else /* !defined(HAVE_SYSCONF) */
-#if defined(HAVE_GETRLIMIT) && defined(RLIMIT_NOFILE)
-  struct rlimit res;
-  if (getrlimit(RLIMIT_NOFILE, &res) == 0)
-    files = res.rlim_cur;
-#else /* !definded(HAVE_GETRLIMIT) */
-#if defined(HAVE_SYSCTL) && defined(CTL_KERN) && defined(KERN_MAXFILES)
-  int mib[2];
-  size_t len;
-    
-  mib[0] = CTL_KERN;
-  mib[1] = KERN_MAXFILES;
-  len = sizeof(files);
-  sysctl(&mib, 2, &files, sizeof(nfil), NULL, 0);
-#endif /* defined(HAVE_SYSCTL) */
-#endif /* !definded(HAVE_GETRLIMIT) */
-#endif /* !defined(HAVE_SYSCONF) */
-
-#ifdef OPEN_MAX
-  if (files < 0)
-    files = OPEN_MAX;
-#endif
-
-#ifdef NOFILE
-  if (files < 0)
-    files = NOFILE;
-#endif    
-    
-  return files;
-}
diff --git a/crypto/kerberosIV/lib/roken/getopt.c b/crypto/kerberosIV/lib/roken/getopt.c
deleted file mode 100644
index fea4635fb524..000000000000
--- a/crypto/kerberosIV/lib/roken/getopt.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 1987, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getopt.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#ifndef __STDC__
-#define const
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/*
- * get option letter from argument vector
- */
-int	opterr = 1,		/* if error message should be printed */
-	optind = 1,		/* index into parent argv vector */
-	optopt,			/* character checked for validity */
-	optreset;		/* reset getopt */
-char	*optarg;		/* argument associated with option */
-
-#define	BADCH	(int)'?'
-#define	BADARG	(int)':'
-#define	EMSG	""
-
-int
-getopt(nargc, nargv, ostr)
-	int nargc;
-	char * const *nargv;
-	const char *ostr;
-{
-	static char *place = EMSG;		/* option letter processing */
-	char *oli;			/* option letter list index */
-	char *p;
-
-	if (optreset || !*place) {		/* update scanning pointer */
-		optreset = 0;
-		if (optind >= nargc || *(place = nargv[optind]) != '-') {
-			place = EMSG;
-			return(EOF);
-		}
-		if (place[1] && *++place == '-') {	/* found "--" */
-			++optind;
-			place = EMSG;
-			return(EOF);
-		}
-	}					/* option letter okay? */
-	if ((optopt = (int)*place++) == (int)':' ||
-	    !(oli = strchr(ostr, optopt))) {
-		/*
-		 * if the user didn't specify '-' as an option,
-		 * assume it means EOF.
-		 */
-		if (optopt == (int)'-')
-			return(EOF);
-		if (!*place)
-			++optind;
-		if (opterr && *ostr != ':') {
-			if (!(p = strrchr(*nargv, '/')))
-				p = *nargv;
-			else
-				++p;
-			fprintf(stderr, "%s: illegal option -- %c\n",
-			    p, optopt);
-		}
-		return(BADCH);
-	}
-	if (*++oli != ':') {			/* don't need argument */
-		optarg = NULL;
-		if (!*place)
-			++optind;
-	}
-	else {					/* need an argument */
-		if (*place)			/* no white space */
-			optarg = place;
-		else if (nargc <= ++optind) {	/* no arg */
-			place = EMSG;
-			if (!(p = strrchr(*nargv, '/')))
-				p = *nargv;
-			else
-				++p;
-			if (*ostr == ':')
-				return(BADARG);
-			if (opterr)
-				fprintf(stderr,
-				    "%s: option requires an argument -- %c\n",
-				    p, optopt);
-			return(BADCH);
-		}
-	 	else				/* white space */
-			optarg = nargv[optind];
-		place = EMSG;
-		++optind;
-	}
-	return(optopt);				/* dump back option letter */
-}
diff --git a/crypto/kerberosIV/lib/roken/getusershell.c b/crypto/kerberosIV/lib/roken/getusershell.c
deleted file mode 100644
index 87a48ece19b5..000000000000
--- a/crypto/kerberosIV/lib/roken/getusershell.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (c) 1985, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-RCSID("$Id: getusershell.c,v 1.8 1997/04/20 06:18:03 assar Exp $");
-
-#ifndef HAVE_GETUSERSHELL
-
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef HAVE_PATHS_H
-#include <paths.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
-#ifndef _PATH_SHELLS
-#define _PATH_SHELLS "/etc/shells"
-#endif
-
-#ifndef _PATH_BSHELL
-#define _PATH_BSHELL "/bin/sh"
-#endif
-
-#ifndef _PATH_CSHELL
-#define _PATH_CSHELL "/bin/csh"
-#endif
-
-/*
- * Local shells should NOT be added here.  They should be added in
- * /etc/shells.
- */
-
-static char *okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL };
-static char **curshell, **shells, *strings;
-static char **initshells (void);
-
-/*
- * Get a list of shells from _PATH_SHELLS, if it exists.
- */
-char *
-getusershell()
-{
-	char *ret;
-
-	if (curshell == NULL)
-		curshell = initshells();
-	ret = *curshell;
-	if (ret != NULL)
-		curshell++;
-	return (ret);
-}
-
-void
-endusershell()
-{
-	
-	if (shells != NULL)
-		free(shells);
-	shells = NULL;
-	if (strings != NULL)
-		free(strings);
-	strings = NULL;
-	curshell = NULL;
-}
-
-void
-setusershell()
-{
-
-	curshell = initshells();
-}
-
-static char **
-initshells()
-{
-	char **sp, *cp;
-	FILE *fp;
-	struct stat statb;
-
-	if (shells != NULL)
-		free(shells);
-	shells = NULL;
-	if (strings != NULL)
-		free(strings);
-	strings = NULL;
-	if ((fp = fopen(_PATH_SHELLS, "r")) == NULL)
-		return (okshells);
-	if (fstat(fileno(fp), &statb) == -1) {
-		fclose(fp);
-		return (okshells);
-	}
-	if ((strings = malloc((u_int)statb.st_size)) == NULL) {
-		fclose(fp);
-		return (okshells);
-	}
-	shells = calloc((unsigned)statb.st_size / 3, sizeof (char *));
-	if (shells == NULL) {
-		fclose(fp);
-		free(strings);
-		strings = NULL;
-		return (okshells);
-	}
-	sp = shells;
-	cp = strings;
-	while (fgets(cp, MaxPathLen + 1, fp) != NULL) {
-		while (*cp != '#' && *cp != '/' && *cp != '\0')
-			cp++;
-		if (*cp == '#' || *cp == '\0')
-			continue;
-		*sp++ = cp;
-		while (!isspace(*cp) && *cp != '#' && *cp != '\0')
-			cp++;
-		*cp++ = '\0';
-	}
-	*sp = NULL;
-	fclose(fp);
-	return (shells);
-}
-#endif /* HAVE_GETUSERSHELL */
diff --git a/crypto/kerberosIV/lib/roken/hstrerror.c b/crypto/kerberosIV/lib/roken/hstrerror.c
deleted file mode 100644
index 9e47cb57dbb5..000000000000
--- a/crypto/kerberosIV/lib/roken/hstrerror.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: hstrerror.c,v 1.17 1997/06/01 03:37:25 assar Exp $");
-#endif
-
-#include "roken.h"
-
-#ifndef HAVE_HSTRERROR
-
-#include <stdio.h>
-#include <netdb.h>
-
-#ifndef HAVE_H_ERRNO
-int h_errno = -17; /* Some magic number */
-#endif
-
-#if !(defined(HAVE_H_ERRLIST) && defined(HAVE_H_NERR))
-static const char *const h_errlist[] = {
-    "Resolver Error 0 (no error)",
-    "Unknown host",		/* 1 HOST_NOT_FOUND */
-    "Host name lookup failure",	/* 2 TRY_AGAIN */
-    "Unknown server error",	/* 3 NO_RECOVERY */
-    "No address associated with name", /* 4 NO_ADDRESS */
-};
-
-static
-const
-int h_nerr = { sizeof h_errlist / sizeof h_errlist[0] };
-#else
-
-#ifndef HAVE_H_ERRLIST_DECLARATION
-extern const char *h_errlist[];
-extern int h_nerr;
-#endif
-
-#endif
-
-char *
-hstrerror(int herr)
-{
-    if (0 <= herr && herr < h_nerr)
-	return (char *) h_errlist[herr];
-    else if(herr == -17)
-	return "unknown error";
-    else
-	return "Error number out of range (hstrerror)";
-}
-
-#endif
diff --git a/crypto/kerberosIV/lib/roken/inaddr2str.c b/crypto/kerberosIV/lib/roken/inaddr2str.c
deleted file mode 100644
index af158aa29374..000000000000
--- a/crypto/kerberosIV/lib/roken/inaddr2str.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: inaddr2str.c,v 1.6 1997/04/01 08:19:02 joda Exp $");
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#include "roken.h"
-
-/*
- * Get a verified name for `addr'.
- * If unable to find it in the DNS, return x.y.z.a
- */
-
-void
-inaddr2str(struct in_addr addr, char *s, size_t len)
-{
-  struct hostent *h;
-  char *p;
-
-  h = gethostbyaddr ((const char *)&addr, sizeof(addr), AF_INET);
-  if (h) {
-    h = gethostbyname (h->h_name);
-    if(h)
-      while ((p = *(h->h_addr_list)++))
-	if (memcmp (p, &addr, sizeof(addr)) == 0) {
-	  strncpy (s, h->h_name, len);
-	  s[len - 1] = '\0';
-	  return;
-	}
-  }
-  strncpy (s, inet_ntoa (addr), len);
-  s[len - 1] = '\0';
-  return;
-}
diff --git a/crypto/kerberosIV/lib/roken/inet_aton.c b/crypto/kerberosIV/lib/roken/inet_aton.c
deleted file mode 100644
index c97ef744c73b..000000000000
--- a/crypto/kerberosIV/lib/roken/inet_aton.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: inet_aton.c,v 1.10 1997/05/20 19:57:03 bg Exp $");
-#endif
-
-#include "roken.h"
-
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-
-/* Minimal implementation of inet_aton.
- * Cannot distinguish between failure and a local broadcast address. */
-
-int
-inet_aton(const char *cp, struct in_addr *addr)
-{
-  addr->s_addr = inet_addr(cp);
-  return (addr->s_addr == INADDR_NONE) ? 0 : 1;
-}
diff --git a/crypto/kerberosIV/lib/roken/initgroups.c b/crypto/kerberosIV/lib/roken/initgroups.c
deleted file mode 100644
index a68aa6354aa5..000000000000
--- a/crypto/kerberosIV/lib/roken/initgroups.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: initgroups.c,v 1.2 1997/04/01 08:19:03 joda Exp $");
-#endif
-
-#include "roken.h"
-
-int
-initgroups(const char *name, gid_t basegid)
-{
-  return 0;
-}
diff --git a/crypto/kerberosIV/lib/roken/k_getpwnam.c b/crypto/kerberosIV/lib/roken/k_getpwnam.c
deleted file mode 100644
index 580b1a282888..000000000000
--- a/crypto/kerberosIV/lib/roken/k_getpwnam.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: k_getpwnam.c,v 1.6 1997/04/01 08:19:03 joda Exp $");
-#endif /* HAVE_CONFIG_H */
-
-#include "roken.h"
-#ifdef HAVE_SHADOW_H
-#include <shadow.h>
-#endif
-
-struct passwd *
-k_getpwnam (char *user)
-{
-     struct passwd *p;
-
-     p = getpwnam (user);
-#ifdef HAVE_GETSPNAM
-     if(p)
-     {
-	  struct spwd *spwd;
-
-	  spwd = getspnam (user);
-	  if (spwd)
-	       p->pw_passwd = spwd->sp_pwdp;
-	  endspent ();
-     }
-#else
-     endpwent ();
-#endif
-     return p;
-}
diff --git a/crypto/kerberosIV/lib/roken/k_getpwuid.c b/crypto/kerberosIV/lib/roken/k_getpwuid.c
deleted file mode 100644
index a3a8f0437787..000000000000
--- a/crypto/kerberosIV/lib/roken/k_getpwuid.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: k_getpwuid.c,v 1.6 1997/04/01 08:19:04 joda Exp $");
-#endif /* HAVE_CONFIG_H */
-
-#include "roken.h"
-#ifdef HAVE_SHADOW_H
-#include <shadow.h>
-#endif
-
-struct passwd *
-k_getpwuid (uid_t uid)
-{
-     struct passwd *p;
-
-     p = getpwuid (uid);
-#ifdef HAVE_GETSPUID
-     if (p)
-     {
-	  struct spwd *spwd;
-
-	  spwd = getspuid (uid);
-	  if (spwd)
-	       p->pw_passwd = spwd->sp_pwdp;
-	  endspent ();
-     }
-#else
-     endpwent ();
-#endif
-     return p;
-}
diff --git a/crypto/kerberosIV/lib/roken/lstat.c b/crypto/kerberosIV/lib/roken/lstat.c
deleted file mode 100644
index 881ad9aed566..000000000000
--- a/crypto/kerberosIV/lib/roken/lstat.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: lstat.c,v 1.3 1997/04/01 08:19:04 joda Exp $");
-#endif
-
-#include "roken.h"
-
-int
-lstat(const char *path, struct stat *buf)
-{
-  return stat(path, buf);
-}
diff --git a/crypto/kerberosIV/lib/roken/memmove.c b/crypto/kerberosIV/lib/roken/memmove.c
deleted file mode 100644
index 315ff05a1ef0..000000000000
--- a/crypto/kerberosIV/lib/roken/memmove.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: memmove.c,v 1.5 1997/04/01 08:19:05 joda Exp $");
-#endif
-
-/* 
- * memmove for systems that doesn't have it 
- */
-
-#include <sys/types.h>
-
-void* memmove(void *s1, const void *s2, size_t n)
-{
-  char *s=(char*)s2, *d=(char*)s1;
-
-  if(d > s){
-    s+=n-1;
-    d+=n-1;
-    while(n){
-      *d--=*s--;
-      n--;
-    }
-  }else if(d < s)
-    while(n){
-      *d++=*s++;
-      n--;
-    }
-  return s1;
-}
diff --git a/crypto/kerberosIV/lib/roken/mini_inetd.c b/crypto/kerberosIV/lib/roken/mini_inetd.c
deleted file mode 100644
index ccfcfe75eaf0..000000000000
--- a/crypto/kerberosIV/lib/roken/mini_inetd.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: mini_inetd.c,v 1.10 1997/05/02 14:30:07 assar Exp $");
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-
-#include <roken.h>
-
-void
-mini_inetd (int port)
-{
-     struct sockaddr_in sa;
-     int s = socket(AF_INET, SOCK_STREAM, 0);
-     int s2;
-     int one = 1;
-     if(s < 0){
-	  perror("socket");
-	  exit(1);
-     }
-#if defined(SO_REUSEADDR) && defined(HAVE_SETSOCKOPT)
-     if(setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void *)&one,
-		   sizeof(one)) < 0){
-	  perror("setsockopt");
-	  exit(1);
-     }
-#endif
-     memset(&sa, 0, sizeof(sa));
-     sa.sin_family = AF_INET;
-     sa.sin_port = port;
-     sa.sin_addr.s_addr = INADDR_ANY;
-     if(bind(s, (struct sockaddr*)&sa, sizeof(sa)) < 0){
-	  perror("bind");
-	  exit(1);
-     }
-     if(listen(s, SOMAXCONN) < 0){
-	  perror("listen");
-	  exit(1);
-     }
-     s2 = accept(s, NULL, 0);
-     if(s2 < 0){
-	  perror("accept");
-	  exit(1);
-     }
-     close(s);
-     dup2(s2, STDIN_FILENO);
-     dup2(s2, STDOUT_FILENO);
-     /* dup2(s2, STDERR_FILENO); */
-     close(s2);
-}
diff --git a/crypto/kerberosIV/lib/roken/mkstemp.c b/crypto/kerberosIV/lib/roken/mkstemp.c
deleted file mode 100644
index e55398a518e2..000000000000
--- a/crypto/kerberosIV/lib/roken/mkstemp.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <errno.h>
-
-RCSID("$Id: mkstemp.c,v 1.2 1997/05/25 02:36:43 joda Exp $");
-
-#ifndef HAVE_MKSTEMP
-
-int
-mkstemp(char *template)
-{
-    int start, i;
-    pid_t val;
-    val = getpid();
-    start = strlen(template) - 1;
-    while(template[start] == 'X') {
-	template[start] = '0' + val % 10;
-	val /= 10;
-	start--;
-    }
-    
-    do{
-	int fd;
-	fd = open(template, O_RDWR | O_CREAT | O_EXCL, 0600);
-	if(fd >= 0 || errno != EEXIST)
-	    return fd;
-	i = start + 1;
-	do{
-	    if(template[i] == 0)
-		return -1;
-	    template[i]++;
-	    if(template[i] == '9' + 1)
-		template[i] = 'a';
-	    if(template[i] <= 'z')
-		break;
-	    template[i] = 'a';
-	    i++;
-	}while(1);
-    }while(1);
-}
-
-#endif
diff --git a/crypto/kerberosIV/lib/roken/putenv.c b/crypto/kerberosIV/lib/roken/putenv.c
deleted file mode 100644
index 20d5a10dadf0..000000000000
--- a/crypto/kerberosIV/lib/roken/putenv.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: putenv.c,v 1.5 1997/04/01 08:19:06 joda Exp $");
-#endif
-
-#include <stdlib.h>
-
-extern char **environ;
-
-/*
- * putenv --
- *	String points to a string of the form name=value.
- *
- *      Makes the value of the environment variable name equal to
- *      value by altering an existing variable or creating a new one.
- */
-int putenv(const char *string)
-{
-    int i;
-    int len;
-    
-    len = string - strchr(string, '=') + 1;
-
-    if(environ == NULL){
-	environ = malloc(sizeof(char*));
-	if(environ == NULL)
-	    return 1;
-	environ[0] = NULL;
-    }
-
-    for(i = 0; environ[i]; i++)
-	if(strncmp(string, environ[i], len)){
-	    environ[len] = string;
-	    return 0;
-	}
-    environ = realloc(environ, sizeof(char*) * (i + 1));
-    if(environ == NULL)
-	return 1;
-    environ[i] = string;
-    environ[i+1] = NULL;
-    return 0;
-}
-
diff --git a/crypto/kerberosIV/lib/roken/rcmd.c b/crypto/kerberosIV/lib/roken/rcmd.c
deleted file mode 100644
index 6064d5074ac9..000000000000
--- a/crypto/kerberosIV/lib/roken/rcmd.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: rcmd.c,v 1.2 1997/04/01 08:19:06 joda Exp $");
-#endif
-
-#include "roken.h"
-#include <stdio.h>
-
-int
-rcmd(char **ahost,
-     unsigned short inport,
-     const char *locuser,
-     const char *remuser,
-     const char *cmd,
-     int *fd2p)
-{
-  fprintf(stderr, "Only kerberized services are implemented\n");
-  return -1;
-}
diff --git a/crypto/kerberosIV/lib/roken/roken.def b/crypto/kerberosIV/lib/roken/roken.def
deleted file mode 100644
index 13e357217546..000000000000
--- a/crypto/kerberosIV/lib/roken/roken.def
+++ /dev/null
@@ -1,4 +0,0 @@
-LIBRARY roken
-EXPORTS
-	gettimeofday
-	strcasecmp
diff --git a/crypto/kerberosIV/lib/roken/roken.h b/crypto/kerberosIV/lib/roken/roken.h
deleted file mode 100644
index 1204e3e2580e..000000000000
--- a/crypto/kerberosIV/lib/roken/roken.h
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id: roken.h,v 1.63 1997/05/28 05:38:09 assar Exp $ */
-
-#ifndef __ROKEN_H__
-#define __ROKEN_H__
-
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <signal.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_GRP_H
-#include <grp.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-
-#ifdef HAVE_TERMIOS_H
-#include <termios.h>
-#endif
-
-#if defined(HAVE_SYS_IOCTL_H) && SunOS != 4
-#include <sys/ioctl.h>
-#endif
-
-#include "protos.h"
-
-#if !defined(HAVE_SETSID) && defined(HAVE__SETSID)
-#define setsid _setsid
-#endif
-
-#ifndef HAVE_PUTENV
-int putenv(const char *string);
-#endif
-
-#ifndef HAVE_SETENV
-int setenv(const char *var, const char *val, int rewrite);
-#endif
-
-#ifndef HAVE_UNSETENV
-void unsetenv(const char *name);
-#endif
-
-#ifndef HAVE_GETUSERSHELL
-char *getusershell(void);
-#endif
-
-#if !defined(__GNUC__) && !defined(__attribute__)
-#define __attribute__(x)
-#endif
-
-#ifndef HAVE_SNPRINTF
-int snprintf (char *str, size_t sz, const char *format, ...)
-     __attribute__ ((format (printf, 3, 4)));
-#endif
-
-#ifndef HAVE_VSNPRINTF
-int vsnprintf (char *str, size_t sz, const char *format, va_list ap)
-     __attribute__((format (printf, 3, 0)));
-#endif
-
-#ifndef HAVE_ASPRINTF
-int asprintf (char **ret, const char *format, ...)
-     __attribute__ ((format (printf, 2, 3)));
-#endif
-
-#ifndef HAVE_VASPRINTF
-int vasprintf (char **ret, const char *format, va_list ap)
-     __attribute__((format (printf, 2, 0)));
-#endif
-
-#ifndef HAVE_ASNPRINTF
-int asnprintf (char **ret, size_t max_sz, const char *format, ...)
-     __attribute__ ((format (printf, 3, 4)));
-#endif
-
-#ifndef HAVE_VASNPRINTF
-int vasnprintf (char **ret, size_t max_sz, const char *format, va_list ap)
-     __attribute__((format (printf, 3, 0)));
-#endif
-
-#ifndef HAVE_STRDUP
-char * strdup(const char *old);
-#endif
-
-#ifndef HAVE_STRLWR
-char * strlwr(char *);
-#endif
-
-#ifndef HAVE_STRNLEN
-int strnlen(char*, int);
-#endif
-
-#ifndef HAVE_STRTOK_R
-char *strtok_r(char *s1, const char *s2, char **lasts);
-#endif
-
-#ifndef HAVE_STRUPR
-char * strupr(char *);
-#endif
-
-#ifndef HAVE_GETDTABLESIZE
-int getdtablesize(void);
-#endif
-
-#if IRIX != 4 /* fix for compiler bug */
-#ifdef RETSIGTYPE
-typedef RETSIGTYPE (*SigAction)(/* int??? */);
-SigAction signal(int iSig, SigAction pAction); /* BSD compatible */
-#endif
-#endif
-
-#ifndef SIG_ERR
-#define SIG_ERR ((RETSIGTYPE (*)())-1)
-#endif
-
-#if !defined(HAVE_STRERROR) && !defined(strerror)
-char *strerror(int eno);
-#endif
-
-#ifndef HAVE_HSTRERROR
-char *hstrerror(int herr);
-#endif
-
-#ifndef HAVE_H_ERRNO_DECLARATION
-extern int h_errno;
-#endif
-
-#ifndef HAVE_INET_ATON
-/* Minimal implementation of inet_aton. Doesn't handle hex numbers. */
-int inet_aton(const char *cp, struct in_addr *adr);
-#endif
-
-#if !defined(HAVE_GETCWD)
-char* getcwd(char *path, size_t size);
-#endif
-
-#ifndef HAVE_GETENT
-int getent(char *cp, char *name);
-#endif
-
-#ifdef HAVE_PWD_H
-#include <pwd.h>
-struct passwd *k_getpwnam (char *user);
-struct passwd *k_getpwuid (uid_t uid);
-#endif
-
-#ifndef HAVE_SETEUID
-int seteuid(int euid);
-#endif
-
-#ifndef HAVE_SETEGID
-int setegid(int egid);
-#endif
-
-#ifndef HAVE_LSTAT
-int lstat(const char *path, struct stat *buf);
-#endif
-
-#ifndef HAVE_MKSTEMP
-int mkstemp(char *);
-#endif
-
-#ifndef HAVE_INITGROUPS
-int initgroups(const char *name, gid_t basegid);
-#endif
-
-#ifndef HAVE_FCHOWN
-int fchown(int fd, uid_t owner, gid_t group);
-#endif
-
-#ifndef HAVE_CHOWN
-int chown(const char *path, uid_t owner, gid_t group);
-#endif
-
-#ifndef HAVE_RCMD
-int rcmd(char **ahost, unsigned short inport, const char *locuser,
-	 const char *remuser, const char *cmd, int *fd2p);
-#endif
-
-#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#elif defined(HAVE_SYS_TIME_H)
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-
-time_t tm2time (struct tm tm, int local);
-
-int unix_verify_user(char *user, char *password);
-
-void inaddr2str(struct in_addr addr, char *s, size_t len);
-
-void mini_inetd (int port);
-
-#ifndef HAVE_STRUCT_WINSIZE
-struct winsize {
-	unsigned short ws_row, ws_col;
-	unsigned short ws_xpixel, ws_ypixel;
-};
-#endif
-
-int get_window_size(int fd, struct winsize *);
-
-#ifndef INADDR_NONE
-#define INADDR_NONE 0xffffffff
-#endif
-
-#ifndef SOMAXCONN
-#define SOMAXCONN 5
-#endif
-
-#ifndef STDIN_FILENO
-#define STDIN_FILENO 0
-#endif
-
-#ifndef STDOUT_FILENO
-#define STDOUT_FILENO 1
-#endif
-
-#ifndef STDERR_FILENO
-#define STDERR_FILENO 2
-#endif
-
-#ifndef max
-#define max(a,b) (((a)>(b))?(a):(b))
-#endif
-
-#ifndef min
-#define min(a,b) (((a)<(b))?(a):(b))
-#endif
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-
-#ifndef FALSE
-#define FALSE 0
-#endif
-
-#ifdef HAVE_SYSLOG_H
-#include <syslog.h>
-/* Misc definitions for old syslogs */
-
-#ifndef LOG_DAEMON
-#define openlog(id,option,facility) openlog((id),(option))
-#define	LOG_DAEMON	0
-#endif
-#ifndef LOG_ODELAY
-#define LOG_ODELAY 0
-#endif
-#ifndef LOG_NDELAY
-#define LOG_NDELAY 0x08
-#endif
-#ifndef LOG_CONS
-#define LOG_CONS 0
-#endif
-#ifndef LOG_AUTH
-#define LOG_AUTH 0
-#endif
-#ifndef LOG_AUTHPRIV
-#define LOG_AUTHPRIV LOG_AUTH
-#endif
-#endif
-
-#ifndef HAVE_OPTARG_DECLARATION
-extern char *optarg;
-#endif
-#ifndef HAVE_OPTIND_DECLARATION
-extern int optind;
-#endif
-#ifndef HAVE_OPTERR_DECLARATION
-extern int opterr;
-#endif
-
-#ifndef HAVE___PROGNAME_DECLARATION
-extern const char *__progname;
-#endif
-
-void set_progname(char *argv0);
-
-#ifdef HAVE_PATHS_H
-#include <paths.h>
-#endif
-
-#ifndef _PATH_DEVNULL
-#define _PATH_DEVNULL "/dev/null"
-#endif
-
-#endif /*  __ROKEN_H__ */
diff --git a/crypto/kerberosIV/lib/roken/roken.mak b/crypto/kerberosIV/lib/roken/roken.mak
deleted file mode 100644
index d0c4a6fa67e5..000000000000
--- a/crypto/kerberosIV/lib/roken/roken.mak
+++ /dev/null
@@ -1,278 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Format Version 4.10
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-!IF "$(CFG)" == ""
-CFG=roken - Win32 Debug
-!MESSAGE No configuration specified.  Defaulting to roken - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "roken - Win32 Release" && "$(CFG)" != "roken - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE on this makefile
-!MESSAGE by defining the macro CFG on the command line.  For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "roken.mak" CFG="roken - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "roken - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "roken - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-################################################################################
-# Begin Project
-# PROP Target_Last_Scanned "roken - Win32 Debug"
-RSC=rc.exe
-MTL=mktyplib.exe
-CPP=cl.exe
-
-!IF  "$(CFG)" == "roken - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-OUTDIR=.\Release
-INTDIR=.\Release
-
-ALL : ".\Release\roken.dll"
-
-CLEAN : 
-	-@erase ".\Release\gettimeofday.obj"
-	-@erase ".\Release\roken.dll"
-	-@erase ".\Release\roken.exp"
-	-@erase ".\Release\roken.lib"
-	-@erase ".\Release\strcasecmp.obj"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\krb" /I "..\des" /I "..\..\include" /I "..\..\include\win32" /I "." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "HAVE_CONFIG_H" /YX /c
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "..\krb" /I "..\des" /I "..\..\include" /I\
- "..\..\include\win32" /I "." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\
- "HAVE_CONFIG_H" /Fp"$(INTDIR)/roken.pch" /YX /Fo"$(INTDIR)/" /c 
-CPP_OBJS=.\Release/
-CPP_SBRS=.\.
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /win32
-MTL_PROJ=/nologo /D "NDEBUG" /win32 
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/roken.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)/roken.pdb" /machine:I386 /def:".\roken.def"\
- /out:"$(OUTDIR)/roken.dll" /implib:"$(OUTDIR)/roken.lib" 
-DEF_FILE= \
-	".\roken.def"
-LINK32_OBJS= \
-	".\Release\gettimeofday.obj" \
-	".\Release\strcasecmp.obj"
-
-".\Release\roken.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "roken - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-OUTDIR=.\Debug
-INTDIR=.\Debug
-
-ALL : ".\Debug\roken.dll"
-
-CLEAN : 
-	-@erase ".\Debug\gettimeofday.obj"
-	-@erase ".\Debug\roken.dll"
-	-@erase ".\Debug\roken.exp"
-	-@erase ".\Debug\roken.ilk"
-	-@erase ".\Debug\roken.lib"
-	-@erase ".\Debug\roken.pdb"
-	-@erase ".\Debug\strcasecmp.obj"
-	-@erase ".\Debug\vc40.idb"
-	-@erase ".\Debug\vc40.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\krb" /I "..\des" /I "..\..\include" /I "..\..\include\win32" /I "." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "HAVE_CONFIG_H" /YX /c
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\krb" /I "..\des" /I\
- "..\..\include" /I "..\..\include\win32" /I "." /D "_DEBUG" /D "WIN32" /D\
- "_WINDOWS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)/roken.pch" /YX /Fo"$(INTDIR)/"\
- /Fd"$(INTDIR)/" /c 
-CPP_OBJS=.\Debug/
-CPP_SBRS=.\.
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /win32
-MTL_PROJ=/nologo /D "_DEBUG" /win32 
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/roken.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib /nologo /subsystem:windows /dll /incremental:yes\
- /pdb:"$(OUTDIR)/roken.pdb" /debug /machine:I386 /def:".\roken.def"\
- /out:"$(OUTDIR)/roken.dll" /implib:"$(OUTDIR)/roken.lib" 
-DEF_FILE= \
-	".\roken.def"
-LINK32_OBJS= \
-	".\Debug\gettimeofday.obj" \
-	".\Debug\strcasecmp.obj"
-
-".\Debug\roken.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-.c{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.c{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-################################################################################
-# Begin Target
-
-# Name "roken - Win32 Release"
-# Name "roken - Win32 Debug"
-
-!IF  "$(CFG)" == "roken - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "roken - Win32 Debug"
-
-!ENDIF 
-
-################################################################################
-# Begin Source File
-
-SOURCE=\TEMP\jimpa3\lib\krb\gettimeofday.c
-DEP_CPP_GETTI=\
-	"..\..\include\protos.h"\
-	"..\..\include\sys/bitypes.h"\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	"..\des\des.h"\
-	"..\krb\krb.h"\
-	"..\krb\krb_locl.h"\
-	"..\krb\prot.h"\
-	"..\krb\resolve.h"\
-	".\roken.h"\
-	{$(INCLUDE)}"\sys\stat.h"\
-	{$(INCLUDE)}"\sys\types.h"\
-	
-
-!IF  "$(CFG)" == "roken - Win32 Release"
-
-
-".\Release\gettimeofday.obj" : $(SOURCE) $(DEP_CPP_GETTI) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "roken - Win32 Debug"
-
-
-".\Debug\gettimeofday.obj" : $(SOURCE) $(DEP_CPP_GETTI) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\roken.def
-
-!IF  "$(CFG)" == "roken - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "roken - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\strcasecmp.c
-DEP_CPP_STRCA=\
-	"..\..\include\sys/cdefs.h"\
-	"..\..\include\win32\config.h"\
-	{$(INCLUDE)}"\sys\types.h"\
-	
-
-!IF  "$(CFG)" == "roken - Win32 Release"
-
-
-".\Release\strcasecmp.obj" : $(SOURCE) $(DEP_CPP_STRCA) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "roken - Win32 Debug"
-
-
-".\Debug\strcasecmp.obj" : $(SOURCE) $(DEP_CPP_STRCA) "$(INTDIR)"
-
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
-################################################################################
diff --git a/crypto/kerberosIV/lib/roken/setegid.c b/crypto/kerberosIV/lib/roken/setegid.c
deleted file mode 100644
index b79bdd51adad..000000000000
--- a/crypto/kerberosIV/lib/roken/setegid.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: setegid.c,v 1.7 1997/04/01 08:19:07 joda Exp $");
-#endif
-
-#include <unistd.h>
-
-#include "roken.h"
-
-int
-setegid(int egid)
-{
-#ifdef HAVE_SETREGID
-    return setregid(-1, egid);
-#endif
-
-#ifdef HAVE_SETRESGID
-    return setresgid(-1, egid, -1);
-#endif
-
-    return -1;
-}
diff --git a/crypto/kerberosIV/lib/roken/setenv.c b/crypto/kerberosIV/lib/roken/setenv.c
deleted file mode 100644
index c83591f65090..000000000000
--- a/crypto/kerberosIV/lib/roken/setenv.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: setenv.c,v 1.8 1997/05/02 14:29:32 assar Exp $");
-#endif
-
-#include "roken.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-/*
- * This is the easy way out, use putenv to implement setenv. We might
- * leak some memory but that is ok since we are usally about to exec
- * anyway.
- */
-
-int
-setenv(const char *var, const char *val, int rewrite)
-{
-    char *t;
-
-    if (!rewrite && getenv(var) != 0)
-	return 0;
-  
-    asprintf (&t, "%s=%s", var, val);
-    if (t == NULL)
-	return -1;
-
-    if (putenv(t) == 0)
-	return 0;
-    else
-	return -1;
-}
diff --git a/crypto/kerberosIV/lib/roken/seteuid.c b/crypto/kerberosIV/lib/roken/seteuid.c
deleted file mode 100644
index b83131821bf3..000000000000
--- a/crypto/kerberosIV/lib/roken/seteuid.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: seteuid.c,v 1.7 1997/04/01 08:19:08 joda Exp $");
-#endif
-
-#include <unistd.h>
-
-#include "roken.h"
-
-int
-seteuid(int euid)
-{
-#ifdef HAVE_SETREUID
-    return setreuid(-1, euid);
-#endif
-
-#ifdef HAVE_SETRESUID
-    return setresuid(-1, euid, -1);
-#endif
-
-    return -1;
-}
diff --git a/crypto/kerberosIV/lib/roken/signal.c b/crypto/kerberosIV/lib/roken/signal.c
deleted file mode 100644
index a39a19451c24..000000000000
--- a/crypto/kerberosIV/lib/roken/signal.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: signal.c,v 1.8 1997/04/01 08:19:09 joda Exp $");
-#endif
-
-#include <signal.h>
-
-/*
- * We would like to always use this signal but there is a link error
- * on NEXTSTEP
- */
-#ifndef NeXT
-/*
- * Bugs:
- *
- * Do we need any extra hacks for SIGCLD and/or SIGCHLD?
- */
-
-typedef RETSIGTYPE (*SigAction)(/* int??? */);
-
-SigAction
-signal(int iSig, SigAction pAction)
-{
-    struct sigaction saNew, saOld;
-
-    saNew.sa_handler = pAction;
-    sigemptyset(&saNew.sa_mask);
-    saNew.sa_flags = 0;
-
-    if (iSig == SIGALRM)
-	{
-#ifdef SA_INTERRUPT
-	    saNew.sa_flags |= SA_INTERRUPT;
-#endif
-	}
-    else
-	{
-#ifdef SA_RESTART
-	    saNew.sa_flags |= SA_RESTART;
-#endif
-	}
-
-    if (sigaction(iSig, &saNew, &saOld) < 0)
-	return(SIG_ERR);
-
-    return(saOld.sa_handler);
-}
-#endif
diff --git a/crypto/kerberosIV/lib/roken/snprintf.c b/crypto/kerberosIV/lib/roken/snprintf.c
deleted file mode 100644
index b0757e551df1..000000000000
--- a/crypto/kerberosIV/lib/roken/snprintf.c
+++ /dev/null
@@ -1,520 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: snprintf.c,v 1.13 1997/05/25 02:00:31 assar Exp $");
-#endif
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <roken.h>
-
-/*
- * Common state
- */
-
-struct state {
-  char *str;
-  char *s;
-  char *theend;
-  size_t sz;
-  size_t max_sz;
-  int (*append_char)(struct state *, char);
-  int (*reserve)(struct state *, size_t);
-  /* XXX - methods */
-};
-
-static int
-sn_reserve (struct state *state, size_t n)
-{
-  return state->s + n > state->theend;
-}
-
-static int
-sn_append_char (struct state *state, char c)
-{
-  if (sn_reserve (state, 1)) {
-    *state->s++ = '\0';
-    return 1;
-  } else {
-    *state->s++ = c;
-    return 0;
-  }
-}
-
-static int
-as_reserve (struct state *state, size_t n)
-{
-  while (state->s + n > state->theend) {
-    int off = state->s - state->str;
-    char *tmp;
-
-    if (state->max_sz && state->sz >= state->max_sz)
-      return 1;
-
-    if (state->max_sz)
-      state->sz = min(state->max_sz, state->sz*2);
-    else
-      state->sz *= 2;
-    tmp = realloc (state->str, state->sz);
-    if (tmp == NULL)
-      return 1;
-    state->str = tmp;
-    state->s = state->str + off;
-    state->theend = state->str + state->sz - 1;
-  }
-  return 0;
-}
-
-static int
-as_append_char (struct state *state, char c)
-{
-  if(as_reserve (state, 1))
-    return 1;
-  else {
-    *state->s++ = c;
-    return 0;
-  }
-}
-
-static int
-append_number (struct state *state,
-	       unsigned long num, unsigned base, char *rep,
-	       int width, int zerop, int minusp)
-{
-  int i, len;
-
-  len = 0;
-  if (num == 0) {
-    ++len;
-    if((*state->append_char) (state, '0'))
-      return 1;
-  }
-  while (num > 0) {
-    ++len;
-    if ((*state->append_char) (state, rep[num % base]))
-      return 1;
-    num /= base;
-  }
-  if (minusp) {
-    ++len;
-    if ((*state->append_char) (state, '-'))
-      return 1;
-  }
-
-  for (i = 0; i < len / 2; ++i) {
-    char c;
-
-    c = state->s[-i-1];
-    state->s[-i-1] = state->s[-len+i];
-    state->s[-len+i] = c;
-  }
-
-  if (width > len) {
-    if ((*state->reserve) (state, width - len))
-      return 1;
-
-#ifdef HAVE_MEMMOVE
-    memmove (state->s + width - 2 * len, state->s - len, len);
-#else
-    bcopy (state->s - len, state->s + width - 2 * len, len);
-#endif
-    for (i = 0; i < width - len; ++i)
-      state->s[-len+i] = (zerop ? '0' : ' ');
-    state->s += width - len;
-
-  }
-  return 0;
-}
-
-static int
-append_string (struct state *state,
-	       char *arg,
-	       int prec)
-{
-  if (prec) {
-    while (*arg && prec--)
-      if ((*state->append_char) (state, *arg++))
-	return 1;
-  } else {
-    while (*arg)
-      if ((*state->append_char) (state, *arg++))
-	return 1;
-  }
-  return 0;
-}
-
-/*
- * This can't be made into a function...
- */
-
-#define PARSE_INT_FORMAT(res, arg, unsig) \
-if (long_flag) \
-     res = va_arg(arg, unsig long); \
-else if (short_flag) \
-     res = va_arg(arg, unsig short); \
-else \
-     res = va_arg(arg, unsig int)
-
-/*
- * zyxprintf - return 0 or -1
- */
-
-static int
-xyzprintf (struct state *state, const char *format, va_list ap)
-{
-  char c;
-
-  while((c = *format++)) {
-    if (c == '%') {
-      int zerop      = 0;
-      int width      = 0;
-      int prec       = 0;
-      int long_flag  = 0;
-      int short_flag = 0;
-
-      c = *format++;
-
-      /* flags */
-      if (c == '0') {
-	zerop = 1;
-	c = *format++;
-      }
-
-      /* width */
-      if (isdigit(c))
-	do {
-	  width = width * 10 + c - '0';
-	  c = *format++;
-	} while(isdigit(c));
-      else if(c == '*') {
-	width = va_arg(ap, int);
-	c = *format++;
-      }
-
-      /* precision */
-      if (c == '.') {
-	c = *format++;
-	if (isdigit(c))
-	  do {
-	    prec = prec * 10 + c - '0';
-	    c = *format++;
-	  } while(isdigit(c));
-	else if (c == '*') {
-	  prec = va_arg(ap, int);
-	  c = *format++;
-	}
-      }
-
-      /* size */
-
-      if (c == 'h') {
-	short_flag = 1;
-	c = *format++;
-      } else if (c == 'l') {
-	long_flag = 1;
-	c = *format++;
-      }
-
-      switch (c) {
-      case 'c' :
-	if ((*state->append_char)(state, (unsigned char)va_arg(ap, int)))
-	  return -1;
-	break;
-      case 's' :
-	if (append_string(state,
-			  va_arg(ap, char*),
-			  prec))
-	  return -1;
-	break;
-      case 'd' :
-      case 'i' : {
-	long arg;
-	unsigned long num;
-	int minusp = 0;
-
-	PARSE_INT_FORMAT(arg, ap, );
-
-	if (arg < 0) {
-	  minusp = 1;
-	  num = -arg;
-	} else
-	  num = arg;
-
-	if (append_number (state, num, 10, "0123456789",
-			   width, zerop, minusp))
-	  return -1;
-	break;
-      }
-      case 'u' : {
-	unsigned long arg;
-
-	PARSE_INT_FORMAT(arg, ap, unsigned);
-
-	if (append_number (state, arg, 10, "0123456789",
-			   width, zerop, 0))
-	  return -1;
-	break;
-      }
-      case 'o' : {
-	unsigned long arg;
-
-	PARSE_INT_FORMAT(arg, ap, unsigned);
-
-	if (append_number (state, arg, 010, "01234567",
-			   width, zerop, 0))
-	  return -1;
-	break;
-      }
-      case 'x' : {
-	unsigned long arg;
-
-	PARSE_INT_FORMAT(arg, ap, unsigned);
-
-	if (append_number (state, arg, 0x10, "0123456789abcdef",
-			   width, zerop, 0))
-	  return -1;
-	break;
-      }
-      case 'X' :{
-	unsigned long arg;
-
-	PARSE_INT_FORMAT(arg, ap, unsigned);
-
-	if (append_number (state, arg, 0x10, "0123456789ABCDEF",
-			   width, zerop, 0))
-	  return -1;
-	break;
-      }
-      case 'p' : {
-	unsigned long arg = (unsigned long)va_arg(ap, void*);
-
-	if (append_number (state, arg, 0x10, "0123456789ABCDEF",
-			   width, zerop, 0))
-	  return -1;
-	break;
-      }
-      case '%' :
-	if ((*state->append_char)(state, c))
-	  return -1;
-	break;
-      default :
-	if (   (*state->append_char)(state, '%')
-	    || (*state->append_char)(state, c))
-	  return -1;
-	break;
-      }
-    } else
-      if ((*state->append_char) (state, c))
-	return -1;
-  }
-  return 0;
-}
-
-#ifndef HAVE_SNPRINTF
-int
-snprintf (char *str, size_t sz, const char *format, ...)
-{
-  va_list args;
-  int ret;
-
-  va_start(args, format);
-  ret = vsnprintf (str, sz, format, args);
-
-#ifdef PARANOIA
-  {
-    int ret2;
-    char *tmp;
-
-    tmp = malloc (sz);
-    if (tmp == NULL)
-      abort ();
-
-    ret2 = vsprintf (tmp, format, args);
-    if (ret != ret2 || strcmp(str, tmp))
-      abort ();
-    free (tmp);
-  }
-#endif
-
-  va_end(args);
-  return ret;
-}
-#endif
-
-#ifndef HAVE_ASPRINTF
-int
-asprintf (char **ret, const char *format, ...)
-{
-  va_list args;
-  int val;
-
-  va_start(args, format);
-  val = vasprintf (ret, format, args);
-
-#ifdef PARANOIA
-  {
-    int ret2;
-    char *tmp;
-    tmp = malloc (val + 1);
-    if (tmp == NULL)
-      abort ();
-
-    ret2 = vsprintf (tmp, format, args);
-    if (val != ret2 || strcmp(*ret, tmp))
-      abort ();
-    free (tmp);
-  }
-#endif
-
-  va_end(args);
-  return val;
-}
-#endif
-
-#ifndef HAVE_ASNPRINTF
-int
-asnprintf (char **ret, size_t max_sz, const char *format, ...)
-{
-  va_list args;
-  int val;
-
-  va_start(args, format);
-  val = vasnprintf (ret, max_sz, format, args);
-
-#ifdef PARANOIA
-  {
-    int ret2;
-    char *tmp;
-    tmp = malloc (val + 1);
-    if (tmp == NULL)
-      abort ();
-
-    ret2 = vsprintf (tmp, format, args);
-    if (val != ret2 || strcmp(*ret, tmp))
-      abort ();
-    free (tmp);
-  }
-#endif
-
-  va_end(args);
-  return val;
-}
-#endif
-
-#ifndef HAVE_VASPRINTF
-int
-vasprintf (char **ret, const char *format, va_list args)
-{
-  return vasnprintf (ret, 0, format, args);
-}
-#endif
-
-
-#ifndef HAVE_VASNPRINTF
-int
-vasnprintf (char **ret, size_t max_sz, const char *format, va_list args)
-{
-  int st;
-  size_t len;
-  struct state state;
-
-  state.max_sz = max_sz;
-  if (max_sz)
-    state.sz   = min(1, max_sz);
-  else
-    state.sz   = 1;
-  state.str    = malloc(state.sz);
-  if (state.str == NULL) {
-    *ret = NULL;
-    return -1;
-  }
-  state.s = state.str;
-  state.theend = state.s + state.sz - 1;
-  state.append_char = as_append_char;
-  state.reserve     = as_reserve;
-
-  st = xyzprintf (&state, format, args);
-  if (st) {
-    free (state.str);
-    *ret = NULL;
-    return -1;
-  } else {
-    char *tmp;
-
-    *state.s = '\0';
-    len = state.s - state.str;
-    tmp = realloc (state.str, len+1);
-    if (state.str == NULL) {
-      free (state.str);
-      *ret = NULL;
-      return -1;
-    }
-    *ret = tmp;
-    return len;
-  }
-}
-#endif
-
-#ifndef HAVE_VSNPRINTF
-int
-vsnprintf (char *str, size_t sz, const char *format, va_list args)
-{
-  struct state state;
-  int ret;
-
-  state.max_sz = 0;
-  state.sz     = sz;
-  state.str    = str;
-  state.s      = str;
-  state.theend = str + sz - 1;
-  state.append_char = sn_append_char;
-  state.reserve     = sn_reserve;
-
-  ret = xyzprintf (&state, format, args);
-  *state.s = '\0';
-  if (ret)
-    return sz;
-  else
-    return state.s - state.str;
-}
-#endif
-
diff --git a/crypto/kerberosIV/lib/roken/strcasecmp.c b/crypto/kerberosIV/lib/roken/strcasecmp.c
deleted file mode 100644
index a268c295e067..000000000000
--- a/crypto/kerberosIV/lib/roken/strcasecmp.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 1987, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: strcasecmp.c,v 1.3 1997/04/20 18:04:23 assar Exp $");
-#endif
-
-#include <string.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#include <sys/cdefs.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strcasecmp.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * This array is designed for mapping upper and lower case letter
- * together for a case independent comparison.  The mappings are
- * based upon ascii character sequences.
- */
-static const unsigned char charmap[] = {
-	'\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
-	'\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
-	'\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
-	'\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
-	'\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
-	'\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
-	'\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
-	'\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
-	'\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-	'\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-	'\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-	'\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
-	'\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-	'\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-	'\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-	'\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
-	'\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
-	'\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
-	'\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
-	'\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
-	'\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
-	'\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
-	'\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
-	'\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
-	'\300', '\301', '\302', '\303', '\304', '\305', '\306', '\307',
-	'\310', '\311', '\312', '\313', '\314', '\315', '\316', '\317',
-	'\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
-	'\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337',
-	'\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-	'\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-	'\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
-	'\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377',
-};
-
-int
-strcasecmp(const char *s1, const char *s2)
-{
-	const unsigned char *cm = charmap,
-			*us1 = (const unsigned char *)s1,
-			*us2 = (const unsigned char *)s2;
-
-	while (cm[*us1] == cm[*us2++])
-		if (*us1++ == '\0')
-			return (0);
-	return (cm[*us1] - cm[*--us2]);
-}
-
-int
-strncasecmp(const char *s1, const char *s2, size_t n)
-{
-	if (n != 0) {
-		const unsigned char *cm = charmap,
-				*us1 = (const unsigned char *)s1,
-				*us2 = (const unsigned char *)s2;
-
-		do {
-			if (cm[*us1] != cm[*us2++])
-				return (cm[*us1] - cm[*--us2]);
-			if (*us1++ == '\0')
-				break;
-		} while (--n != 0);
-	}
-	return (0);
-}
diff --git a/crypto/kerberosIV/lib/roken/strdup.c b/crypto/kerberosIV/lib/roken/strdup.c
deleted file mode 100644
index b16992ff272a..000000000000
--- a/crypto/kerberosIV/lib/roken/strdup.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: strdup.c,v 1.9 1997/04/01 08:19:10 joda Exp $");
-#endif
-#include <stdlib.h>
-#include <string.h>
-
-#ifndef HAVE_STRDUP
-char *
-strdup(const char *old)
-{
-	char *t = malloc(strlen(old)+1);
-	if (t != 0)
-		strcpy(t, old);
-	return t;
-}
-#endif
diff --git a/crypto/kerberosIV/lib/roken/strerror.c b/crypto/kerberosIV/lib/roken/strerror.c
deleted file mode 100644
index 3d7b45c08822..000000000000
--- a/crypto/kerberosIV/lib/roken/strerror.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: strerror.c,v 1.8 1997/05/02 14:29:33 assar Exp $");
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
-extern int sys_nerr;
-extern char *sys_errlist[];
-
-char*
-strerror(int eno)
-{
-    static char emsg[1024];
-
-    if(eno < 0 || eno >= sys_nerr)
-	snprintf(emsg, sizeof(emsg), "Error %d occurred.", eno);
-    else
-	strcpy(emsg, sys_errlist[eno]);
-
-    return emsg;
-}
diff --git a/crypto/kerberosIV/lib/roken/strftime.c b/crypto/kerberosIV/lib/roken/strftime.c
deleted file mode 100644
index 3473778fd826..000000000000
--- a/crypto/kerberosIV/lib/roken/strftime.c
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <sys/types.h>
-#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#elif defined(HAVE_SYS_TIME_H)
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#define TM_YEAR_BASE	1900	/* from <tzfile.h> */
-#include <string.h>
-
-static char *afmt[] = {
-	"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat",
-};
-static char *Afmt[] = {
-	"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday",
-	"Saturday",
-};
-static char *bfmt[] = {
-	"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep",
-	"Oct", "Nov", "Dec",
-};
-static char *Bfmt[] = {
-	"January", "February", "March", "April", "May", "June", "July",
-	"August", "September", "October", "November", "December",
-};
-
-static size_t gsize;
-static char *pt;
-
-static int _add (char *);
-static int _conv (int, int, int);
-#ifdef	HAVE_MKTIME
-static int _secs (const struct tm *);
-#endif	/* HAVE_MKTIME */
-static size_t _fmt (const char *, const struct tm *);
-
-size_t
-strftime(char *s, size_t maxsize, const char *format, const struct tm *t)
-{
-
-	pt = s;
-	if ((gsize = maxsize) < 1)
-		return(0);
-	if (_fmt(format, t)) {
-		*pt = '\0';
-		return(maxsize - gsize);
-	}
-	return(0);
-}
-
-static size_t
-_fmt(const char *format, const struct tm *t)
-{
-	for (; *format; ++format) {
-		if (*format == '%')
-			switch(*++format) {
-			case '\0':
-				--format;
-				break;
-			case 'A':
-				if (t->tm_wday < 0 || t->tm_wday > 6)
-					return(0);
-				if (!_add(Afmt[t->tm_wday]))
-					return(0);
-				continue;
-			case 'a':
-				if (t->tm_wday < 0 || t->tm_wday > 6)
-					return(0);
-				if (!_add(afmt[t->tm_wday]))
-					return(0);
-				continue;
-			case 'B':
-				if (t->tm_mon < 0 || t->tm_mon > 11)
-					return(0);
-				if (!_add(Bfmt[t->tm_mon]))
-					return(0);
-				continue;
-			case 'b':
-			case 'h':
-				if (t->tm_mon < 0 || t->tm_mon > 11)
-					return(0);
-				if (!_add(bfmt[t->tm_mon]))
-					return(0);
-				continue;
-			case 'C':
-				if (!_fmt("%a %b %e %H:%M:%S %Y", t))
-					return(0);
-				continue;
-			case 'c':
-				if (!_fmt("%m/%d/%y %H:%M:%S", t))
-					return(0);
-				continue;
-			case 'D':
-				if (!_fmt("%m/%d/%y", t))
-					return(0);
-				continue;
-			case 'd':
-				if (!_conv(t->tm_mday, 2, '0'))
-					return(0);
-				continue;
-			case 'e':
-				if (!_conv(t->tm_mday, 2, ' '))
-					return(0);
-				continue;
-			case 'H':
-				if (!_conv(t->tm_hour, 2, '0'))
-					return(0);
-				continue;
-			case 'I':
-				if (!_conv(t->tm_hour % 12 ?
-				    t->tm_hour % 12 : 12, 2, '0'))
-					return(0);
-				continue;
-			case 'j':
-				if (!_conv(t->tm_yday + 1, 3, '0'))
-					return(0);
-				continue;
-			case 'k':
-				if (!_conv(t->tm_hour, 2, ' '))
-					return(0);
-				continue;
-			case 'l':
-				if (!_conv(t->tm_hour % 12 ?
-				    t->tm_hour % 12 : 12, 2, ' '))
-					return(0);
-				continue;
-			case 'M':
-				if (!_conv(t->tm_min, 2, '0'))
-					return(0);
-				continue;
-			case 'm':
-				if (!_conv(t->tm_mon + 1, 2, '0'))
-					return(0);
-				continue;
-			case 'n':
-				if (!_add("\n"))
-					return(0);
-				continue;
-			case 'p':
-				if (!_add(t->tm_hour >= 12 ? "PM" : "AM"))
-					return(0);
-				continue;
-			case 'R':
-				if (!_fmt("%H:%M", t))
-					return(0);
-				continue;
-			case 'r':
-				if (!_fmt("%I:%M:%S %p", t))
-					return(0);
-				continue;
-			case 'S':
-				if (!_conv(t->tm_sec, 2, '0'))
-					return(0);
-				continue;
-#ifdef HAVE_MKTIME
-			case 's':
-				if (!_secs(t))
-					return(0);
-				continue;
-#endif	/* HAVE_MKTIME */
-			case 'T':
-			case 'X':
-				if (!_fmt("%H:%M:%S", t))
-					return(0);
-				continue;
-			case 't':
-				if (!_add("\t"))
-					return(0);
-				continue;
-			case 'U':
-				if (!_conv((t->tm_yday + 7 - t->tm_wday) / 7,
-				    2, '0'))
-					return(0);
-				continue;
-			case 'W':
-				if (!_conv((t->tm_yday + 7 -
-				    (t->tm_wday ? (t->tm_wday - 1) : 6))
-				    / 7, 2, '0'))
-					return(0);
-				continue;
-			case 'w':
-				if (!_conv(t->tm_wday, 1, '0'))
-					return(0);
-				continue;
-			case 'x':
-				if (!_fmt("%m/%d/%y", t))
-					return(0);
-				continue;
-			case 'y':
-				if (!_conv((t->tm_year + TM_YEAR_BASE)
-				    % 100, 2, '0'))
-					return(0);
-				continue;
-			case 'Y':
-				if (!_conv(t->tm_year + TM_YEAR_BASE, 4, '0'))
-					return(0);
-				continue;
-#ifdef notdef
-			case 'Z':
-				if (!t->tm_zone || !_add(t->tm_zone))
-					return(0);
-				continue;
-#endif
-			case '%':
-			/*
-			 * X311J/88-090 (4.12.3.5): if conversion char is
-			 * undefined, behavior is undefined.  Print out the
-			 * character itself as printf(3) does.
-			 */
-			default:
-				break;
-		}
-		if (!gsize--)
-			return(0);
-		*pt++ = *format;
-	}
-	return(gsize);
-}
-
-#ifdef HAVE_MKTIME
-static int
-_secs(const struct tm *t)
-{
-	static char buf[15];
-	time_t s;
-	char *p;
-	struct tm tmp;
-
-	/* Make a copy, mktime(3) modifies the tm struct. */
-	tmp = *t;
-	s = mktime(&tmp);
-	for (p = buf + sizeof(buf) - 2; s > 0 && p > buf; s /= 10)
-		*p-- = s % 10 + '0';
-	return(_add(++p));
-}
-#endif	/* HAVE_MKTIME */
-
-static int
-_conv(int n, int digits, int pad)
-{
-	static char buf[10];
-	char *p;
-
-	for (p = buf + sizeof(buf) - 2; n > 0 && p > buf; n /= 10, --digits)
-		*p-- = n % 10 + '0';
-	while (p > buf && digits-- > 0)
-		*p-- = pad;
-	return(_add(++p));
-}
-
-static int
-_add(str)
-	char *str;
-{
-	for (;; ++pt, --gsize) {
-		if (!gsize)
-			return(0);
-		if (!(*pt = *str++))
-			return(1);
-	}
-}
diff --git a/crypto/kerberosIV/lib/roken/strlwr.c b/crypto/kerberosIV/lib/roken/strlwr.c
deleted file mode 100644
index 0222d8cbbdae..000000000000
--- a/crypto/kerberosIV/lib/roken/strlwr.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: strlwr.c,v 1.3 1997/04/01 08:19:11 joda Exp $");
-#endif
-#include <string.h>
-#include <ctype.h>
-
-#include <roken.h>
-
-#ifndef HAVE_STRLWR
-char *
-strlwr(char *str)
-{
-  char *s;
-
-  for(s = str; *s; s++)
-    *s = tolower(*s);
-  return str;
-}
-#endif
diff --git a/crypto/kerberosIV/lib/roken/strnlen.c b/crypto/kerberosIV/lib/roken/strnlen.c
deleted file mode 100644
index 51588f69b51f..000000000000
--- a/crypto/kerberosIV/lib/roken/strnlen.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: strnlen.c,v 1.5 1997/04/01 08:19:11 joda Exp $");
-#endif
-
-#include "roken.h"
-
-int
-strnlen(char *s, int len)
-{
-    int i;
-    for(i = 0; i < len && s[i]; i++)
-	;
-    return i;
-}
diff --git a/crypto/kerberosIV/lib/roken/strtok_r.c b/crypto/kerberosIV/lib/roken/strtok_r.c
deleted file mode 100644
index 49164d9dde28..000000000000
--- a/crypto/kerberosIV/lib/roken/strtok_r.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: strtok_r.c,v 1.4 1997/05/19 03:05:47 assar Exp $");
-#endif
-
-#include <string.h>
-
-#include "roken.h"
-
-#ifndef HAVE_STRTOK_R
-
-char *
-strtok_r(char *s1, const char *s2, char **lasts)
-{
-  char *ret;
-
-  if (s1 == NULL)
-    s1 = *lasts;
-  while(*s1 && strchr(s2, *s1))
-    ++s1;
-  if(*s1 == '\0')
-    return NULL;
-  ret = s1;
-  while(*s1 && !strchr(s2, *s1))
-    ++s1;
-  if(*s1)
-    *s1++ = '\0';
-  *lasts = s1;
-  return ret;
-}
-
-#endif /* HAVE_STRTOK_R */
diff --git a/crypto/kerberosIV/lib/roken/strupr.c b/crypto/kerberosIV/lib/roken/strupr.c
deleted file mode 100644
index c5674f76c6f8..000000000000
--- a/crypto/kerberosIV/lib/roken/strupr.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: strupr.c,v 1.3 1997/04/01 08:19:13 joda Exp $");
-#endif
-#include <string.h>
-#include <ctype.h>
-
-#include <roken.h>
-
-#ifndef HAVE_STRUPR
-char *
-strupr(char *str)
-{
-  char *s;
-
-  for(s = str; *s; s++)
-    *s = toupper(*s);
-  return str;
-}
-#endif
diff --git a/crypto/kerberosIV/lib/roken/tm2time.c b/crypto/kerberosIV/lib/roken/tm2time.c
deleted file mode 100644
index f4423ffe092e..000000000000
--- a/crypto/kerberosIV/lib/roken/tm2time.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: tm2time.c,v 1.6 1997/04/20 05:51:30 assar Exp $");
-#endif
-
-#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#elif defined(HAVE_SYS_TIME_H)
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#include "roken.h"
-
-time_t
-tm2time (struct tm tm, int local)
-{
-     time_t t;
-
-     tm.tm_isdst = -1;
-
-     t = mktime (&tm);
-
-     if (!local)
-       t += t - mktime (gmtime (&t));
-     return t;
-}
diff --git a/crypto/kerberosIV/lib/roken/unsetenv.c b/crypto/kerberosIV/lib/roken/unsetenv.c
deleted file mode 100644
index 67fb750138d4..000000000000
--- a/crypto/kerberosIV/lib/roken/unsetenv.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: unsetenv.c,v 1.6 1997/04/01 08:19:14 joda Exp $");
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "roken.h"
-
-extern char **environ;
-
-/*
- * unsetenv --
- */
-void
-unsetenv(const char *name)
-{
-  int len;
-  const char *np;
-  char **p;
-
-  if (name == 0 || environ == 0)
-    return;
-
-  for (np = name; *np && *np != '='; np++)
-    /* nop */;
-  len = np - name;
-  
-  for (p = environ; *p != 0; p++)
-    if (strncmp(*p, name, len) == 0 && (*p)[len] == '=')
-      break;
-
-  for (; *p != 0; p++)
-    *p = *(p + 1);
-}
-
diff --git a/crypto/kerberosIV/lib/roken/verify.c b/crypto/kerberosIV/lib/roken/verify.c
deleted file mode 100644
index 65eafccb7e01..000000000000
--- a/crypto/kerberosIV/lib/roken/verify.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: verify.c,v 1.12 1997/04/01 08:19:15 joda Exp $");
-#endif
-
-#include <stdio.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_CRYPT_H
-#include <crypt.h>
-#endif
-#include "roken.h"
-
-int
-unix_verify_user(char *user, char *password)
-{
-    struct passwd *pw;
-    
-    pw = k_getpwnam(user);
-    if(pw == NULL)
-	return -1;
-    if(strlen(pw->pw_passwd) == 0 && strlen(password) == 0)
-	return 0;
-    if(strcmp(crypt(password, pw->pw_passwd), pw->pw_passwd) == 0)
-        return 0;
-    return -1;
-}
-
diff --git a/crypto/kerberosIV/lib/roken/verr.c b/crypto/kerberosIV/lib/roken/verr.c
deleted file mode 100644
index f5d8f25c48dc..000000000000
--- a/crypto/kerberosIV/lib/roken/verr.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan 
- * (Royal Institute of Technology, Stockholm, Sweden).  
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: verr.c,v 1.6 1997/03/30 08:05:38 joda Exp $");
-#endif
-
-#include "err.h"
-
-void
-verr(int eval, const char *fmt, va_list ap)
-{
-    warnerr(1, eval, 1, fmt, ap);
-}
diff --git a/crypto/kerberosIV/lib/roken/verrx.c b/crypto/kerberosIV/lib/roken/verrx.c
deleted file mode 100644
index bc25aa0cd8a4..000000000000
--- a/crypto/kerberosIV/lib/roken/verrx.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan 
- * (Royal Institute of Technology, Stockholm, Sweden).  
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: verrx.c,v 1.6 1997/03/30 08:05:39 joda Exp $");
-#endif
-
-#include "err.h"
-
-void
-verrx(int eval, const char *fmt, va_list ap)
-{
-    warnerr(1, eval, 0, fmt, ap);
-}
diff --git a/crypto/kerberosIV/lib/roken/vwarn.c b/crypto/kerberosIV/lib/roken/vwarn.c
deleted file mode 100644
index 144dd088f1fc..000000000000
--- a/crypto/kerberosIV/lib/roken/vwarn.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan 
- * (Royal Institute of Technology, Stockholm, Sweden).  
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: vwarn.c,v 1.6 1997/03/30 08:05:39 joda Exp $");
-#endif
-
-#include "err.h"
-
-void
-vwarn(const char *fmt, va_list ap)
-{
-    warnerr(0, 0, 1, fmt, ap);
-}
diff --git a/crypto/kerberosIV/lib/roken/vwarnx.c b/crypto/kerberosIV/lib/roken/vwarnx.c
deleted file mode 100644
index 540c2a650797..000000000000
--- a/crypto/kerberosIV/lib/roken/vwarnx.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan 
- * (Royal Institute of Technology, Stockholm, Sweden).  
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: vwarnx.c,v 1.6 1997/03/30 08:05:40 joda Exp $");
-#endif
-
-#include "err.h"
-
-void
-vwarnx(const char *fmt, va_list ap)
-{
-    warnerr(0, 0, 0, fmt, ap);
-}
-
diff --git a/crypto/kerberosIV/lib/roken/warn.c b/crypto/kerberosIV/lib/roken/warn.c
deleted file mode 100644
index 5af5d8de1925..000000000000
--- a/crypto/kerberosIV/lib/roken/warn.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan 
- * (Royal Institute of Technology, Stockholm, Sweden).  
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: warn.c,v 1.5 1997/03/30 08:05:40 joda Exp $");
-#endif
-
-#include "err.h"
-
-void
-warn(const char *fmt, ...)
-{
-  va_list ap;
-  va_start(ap, fmt);
-  vwarn(fmt, ap);
-  va_end(ap);
-}
diff --git a/crypto/kerberosIV/lib/roken/warnerr.c b/crypto/kerberosIV/lib/roken/warnerr.c
deleted file mode 100644
index 61fa26a2cbd2..000000000000
--- a/crypto/kerberosIV/lib/roken/warnerr.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan 
- * (Royal Institute of Technology, Stockholm, Sweden).  
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: warnerr.c,v 1.6 1997/04/02 14:59:54 bg Exp $");
-#endif
-
-#include "roken.h"
-#include "err.h"
-
-#ifndef HAVE___PROGNAME
-const char *__progname;
-#endif
-
-void
-set_progname(char *argv0)
-{
-#ifndef HAVE___PROGNAME
-    char *p;
-    if(argv0 == NULL)
-	return;
-    p = strrchr(argv0, '/');
-    if(p == NULL)
-	p = argv0;
-    else
-	p++;
-    __progname = p;
-#endif
-}
-
-void
-warnerr(int doexit, int eval, int doerrno, const char *fmt, va_list ap)
-{
-    int sverrno = errno;
-    if(__progname != NULL){
-	fprintf(stderr, "%s", __progname);
-	if(fmt != NULL || doerrno)
-	    fprintf(stderr, ": ");
-    }
-    if (fmt != NULL){
-	vfprintf(stderr, fmt, ap);
-	if(doerrno)
-	    fprintf(stderr, ": ");
-    }
-    if(doerrno)
-	fprintf(stderr, "%s", strerror(sverrno));
-    fprintf(stderr, "\n");
-    if(doexit)
-	exit(eval);
-}
diff --git a/crypto/kerberosIV/lib/roken/warnx.c b/crypto/kerberosIV/lib/roken/warnx.c
deleted file mode 100644
index bf7b07664d38..000000000000
--- a/crypto/kerberosIV/lib/roken/warnx.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan 
- * (Royal Institute of Technology, Stockholm, Sweden).  
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: warnx.c,v 1.5 1997/03/30 08:05:41 joda Exp $");
-#endif
-
-#include "err.h"
-
-void
-warnx(const char *fmt, ...)
-{
-  va_list ap;
-  va_start(ap, fmt);
-  vwarnx(fmt, ap);
-  va_end(ap);
-}
diff --git a/crypto/kerberosIV/lib/roken/xdbm.h b/crypto/kerberosIV/lib/roken/xdbm.h
deleted file mode 100644
index c3e4781bc244..000000000000
--- a/crypto/kerberosIV/lib/roken/xdbm.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id: xdbm.h,v 1.2 1997/04/01 08:19:16 joda Exp $ */
-
-/* Generic *dbm include file */
-
-#ifndef __XDBM_H__
-#define __XDBM_H__
-
-#ifdef HAVE_NDBM_H
-#include <ndbm.h>
-#elif defined(HAVE_DBM_H)
-#include <dbm.h>
-#elif defined(HAVE_RPCSVC_DBM_H)
-#include <rpcsvc/dbm.h>
-#endif
-
-/* Macros to convert ndbm names to dbm names.
- * Note that dbm_nextkey() cannot be simply converted using a macro, since
- * it is invoked giving the database, and nextkey() needs the previous key.
- *
- * Instead, all routines call "dbm_next" instead.
- */
-
-#ifndef NDBM
-typedef char DBM;
-
-#define dbm_open(file, flags, mode) ((dbminit(file) == 0)?"":((char *)0))
-#define dbm_fetch(db, key) fetch(key)
-#define dbm_store(db, key, content, flag) store(key, content)
-#define dbm_delete(db, key) delete(key)
-#define dbm_firstkey(db) firstkey()
-#define dbm_next(db,key) nextkey(key)
-#define dbm_close(db) dbmclose()
-#else
-#define dbm_next(db,key) dbm_nextkey(db)
-#endif
-
-#endif /* __XDBM_H__ */
diff --git a/crypto/kerberosIV/lib/sl/Makefile.in b/crypto/kerberosIV/lib/sl/Makefile.in
deleted file mode 100644
index b89799b8cc6c..000000000000
--- a/crypto/kerberosIV/lib/sl/Makefile.in
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# $Id: Makefile.in,v 1.8 1997/05/06 03:47:56 assar Exp $
-#
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-CC = @CC@
-AR = ar
-RANLIB = @RANLIB@
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-
-INSTALL = @INSTALL@
-INSTALL_DATA	= @INSTALL_DATA@
-MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-libdir = @libdir@
-
-PICFLAGS = @PICFLAGS@
- 
-LIBNAME = $(LIBPREFIX)sl
-LIBEXT = @LIBEXT@
-SHLIBEXT = @SHLIBEXT@
-LIBPREFIX = @LIBPREFIX@
-LDSHARED = @LDSHARED@
-LIB = $(LIBNAME).$(LIBEXT)
-PROGS =
-
-LIB_SOURCES = sl.c
-
-SOURCES = $(LIB_SOURCES)
-
-LIB_OBJECTS = sl.o
-
-OBJECTS = $(LIB_OBJECTS)
-
-all: $(LIB) $(PROGS)
-
-Wall:
-	make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) -I$(srcdir)/../des $(CFLAGS) $(PICFLAGS) $<
-
-install: all
-	$(MKINSTALLDIRS) $(libdir)
-	$(INSTALL_DATA) -m 0555 $(LIB) $(libdir)
-
-uninstall:
-	rm -f $(libdir)/$(LIB)
-
-TAGS: $(SOURCES)
-	etags $(SOURCES)
-
-check:
-
-clean:
-	rm -f $(LIB) $(PROGS) *.o *.a
-
-mostlyclean: clean
-
-distclean: clean
-	rm -f Makefile *~
-
-realclean: distclean
-	rm -f TAGS
-
-$(LIBNAME).a: $(LIB_OBJECTS)
-	rm -f $@
-	$(AR) cr $@ $(LIB_OBJECTS)
-	-$(RANLIB) $@
-
-$(LIBNAME).$(SHLIBEXT): $(LIB_OBJECTS)
-	rm -f $@
-	$(LDSHARED) -o $@ $(LIB_OBJECTS)
-
-$(OBJECTS): ../../include/config.h
-
-.PHONY: all install uninstall check clean mostlyclean distclean realclean
diff --git a/crypto/kerberosIV/lib/sl/sl.c b/crypto/kerberosIV/lib/sl/sl.c
deleted file mode 100644
index adf71f534107..000000000000
--- a/crypto/kerberosIV/lib/sl/sl.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-RCSID("$Id: sl.c,v 1.12 1997/06/01 03:15:07 assar Exp $");
-#endif
-
-#include "sl_locl.h"
-
-static SL_cmd *
-sl_match (SL_cmd *cmds, char *cmd, int exactp)
-{
-    SL_cmd *c, *current = NULL, *partial_cmd = NULL;
-    int partial_match = 0;
-
-    for (c = cmds; c->name; ++c) {
-	if (c->func)
-	    current = c;
-	if (strcmp (cmd, c->name) == 0)
-	    return current;
-	else if (strncmp (cmd, c->name, strlen(cmd)) == 0 &&
-		 partial_cmd != current) {
-	    ++partial_match;
-	    partial_cmd = current;
-	}
-    }
-    if (partial_match == 1 && !exactp)
-	return partial_cmd;
-    else
-	return NULL;
-}
-
-void
-sl_help (SL_cmd *cmds, int argc, char **argv)
-{
-    SL_cmd *c, *prev_c;
-
-    if (argc == 1) {
-	prev_c = NULL;
-	for (c = cmds; c->name; ++c) {
-	    if (c->func) {
-		if(prev_c)
-		    printf ("\n\t%s%s", prev_c->usage ? prev_c->usage : "",
-			    prev_c->usage ? "\n" : "");
-		prev_c = c;
-		printf ("%s", c->name);
-	    } else
-		printf (", %s", c->name);
-	}
-	if(prev_c)
-	    printf ("\n\t%s%s", prev_c->usage ? prev_c->usage : "",
-		    prev_c->usage ? "\n" : "");
-    } else { 
-	c = sl_match (cmds, argv[1], 0);
-	if (c == NULL)
-	    printf ("No such command: %s. Try \"help\" for a list of all commands\n",
-		    argv[1]);
-	else {
-	    printf ("%s\t%s", c->name, c->usage);
-	    if((++c)->name && c->func == NULL) {
-		printf ("\nSynonyms:");
-		while (c->name && c->func == NULL)
-		    printf ("\t%s", (c++)->name);
-	    }
-	    printf ("\n");
-	}
-    }
-}
-
-#ifdef HAVE_READLINE
-
-char *readline(char *prompt);
-void add_history(char *p);
-
-#else
-
-static char *
-readline(char *prompt)
-{
-    char buf[BUFSIZ];
-    printf ("%s", prompt);
-    fflush (stdout);
-    if(fgets(buf, sizeof(buf), stdin) == NULL)
-	return NULL;
-    if (buf[strlen(buf) - 1] == '\n')
-	buf[strlen(buf) - 1] = '\0';
-    return strdup(buf);
-}
-
-static void
-add_history(char *p)
-{
-}
-
-#endif
-
-int
-sl_loop (SL_cmd *cmds, char *prompt)
-{
-    unsigned max_count;
-    char **ptr;
-
-    max_count = 17;
-    ptr = malloc(max_count * sizeof(*ptr));
-    if (ptr == NULL) {
-	printf ("sl_loop: failed to allocate %u bytes of memory\n",
-		(int) max_count * sizeof(*ptr));
-	return -1;
-    }
-
-    for (;;) {
-	char *buf;
-	unsigned count;
-	SL_cmd *c;
-
-	buf = readline(prompt);
-	if(buf == NULL)
-	    break;
-
-	if(*buf)
-	    add_history(buf);
-	count = 0;
-	{
-	    char *foo = NULL;
-	    char *p;
-
-	    for(p = strtok_r (buf, " \t", &foo);
-		p;
-		p = strtok_r (NULL, " \t", &foo)) {
-		if(count == max_count) {
-		    max_count *= 2;
-		    ptr = realloc (ptr, max_count * sizeof(*ptr));
-		    if (ptr == NULL) {
-			printf ("sl_loop: failed to allocate %u "
-				"bytes of memory\n",
-				(unsigned) max_count * sizeof(*ptr));
-			return -1;
-		    }
-		}
-		ptr[count++] = p;
-	    }
-	}
-	if (count > 0) {
-	    c = sl_match (cmds, ptr[0], 0);
-	    if (c)
-		(*c->func)(count, ptr);
-	    else
-		printf ("Unrecognized command: %s\n", ptr[0]);
-	}
-	free(buf);
-    }
-    free (ptr);
-    return 0;
-}
diff --git a/crypto/kerberosIV/lib/sl/sl.h b/crypto/kerberosIV/lib/sl/sl.h
deleted file mode 100644
index 158e5901d0a2..000000000000
--- a/crypto/kerberosIV/lib/sl/sl.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id: sl.h,v 1.2 1997/04/01 08:19:18 joda Exp $ */
-
-#ifndef _SL_H
-#define _SL_H
-
-typedef void (*cmd_func)(int, char **);
-
-struct sl_cmd {
-  char *name;
-  cmd_func func;
-  char *usage;
-  char *help;
-};
-
-typedef struct sl_cmd SL_cmd;
-
-void sl_help (SL_cmd *, int argc, char **argv);
-int  sl_loop (SL_cmd *, char *prompt);
-
-#endif /* _SL_H */
diff --git a/crypto/kerberosIV/lib/sl/sl_locl.h b/crypto/kerberosIV/lib/sl/sl_locl.h
deleted file mode 100644
index ddf25bbbdc90..000000000000
--- a/crypto/kerberosIV/lib/sl/sl_locl.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id: sl_locl.h,v 1.3 1997/04/01 08:19:18 joda Exp $ */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <roken.h>
-#include <protos.h>
-
-#include <sl.h>
diff --git a/crypto/kerberosIV/man/Makefile.in b/crypto/kerberosIV/man/Makefile.in
deleted file mode 100644
index a1b6e741c46e..000000000000
--- a/crypto/kerberosIV/man/Makefile.in
+++ /dev/null
@@ -1,95 +0,0 @@
-# Makefile.in,v 1.2 1994/05/13 05:02:46 assar Exp
-
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-SHELL		= /bin/sh
-
-INSTALL		= @INSTALL@
-INSTALL_DATA	= @INSTALL_DATA@
-MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
-
-prefix		= @prefix@
-mandir		= @mandir@
-transform=@program_transform_name@
-EXECSUFFIX=@EXECSUFFIX@
-
-MANRX = .*\.\([0-9]\)
-CATRX = \(.*\)\.cat\([0-9]\)
-CATSUFFIX=@CATSUFFIX@
-
-MAN1 = afslog.1 kauth.1 ftp.1 kdestroy.1 kinit.1 kpasswd.1 \
-	login.1 rlogin.1 su.1 kerberos.1 klist.1 ksrvtgt.1 pagsh.1 \
-	rcp.1 rsh.1 telnet.1 kx.1 rxterm.1 rxtelnet.1 tenletxr.1 \
-	des.1 movemail.1 \
-	otp.1 otpprint.1
-
-CAT1 = afslog.cat1 kauth.cat1 ftp.cat1 login.cat1 \
-	pagsh.cat1 rcp.cat1 rlogin.cat1 rsh.cat1 su.cat1 telnet.cat1 kx.cat1 \
-	rxterm.cat1 rxtelnet.cat1 tenletxr.cat1 movemail.cat1 \
-	otp.cat1 otpprint.cat1
-
-MAN3 =	acl_check.3 kafs.3 kerberos.3 krb_set_tkt_string.3 des_crypt.3 \
-	krb_realmofhost.3 kuserok.3 getusershell.3 krb_sendauth.3 \
-	tf_util.3
-
-CAT3 =	getusershell.cat3 kafs.cat3
-
-MAN5 =	krb.conf.5 krb.realms.5 krb.equiv.5 login.access.5 ftpusers.5
-
-CAT5 =	login.access.cat5 krb.equiv.cat5 ftpusers.cat5
-
-MAN8 =	ext_srvtab.8 kdb_destroy.8 kdb_util.8 ksrvutil.8 telnetd.8 rlogind.8 \
-	kadmin.8 kdb_edit.8 kstash.8 kadmind.8 kdb_init.8 rshd.8 kauthd.8 \
-	popper.8 kxd.8 kerberos.8
-
-CAT8 =	ftpd.cat8 rshd.cat8 telnetd.cat8 ksrvutil.cat8 rlogind.cat8 \
-	kauthd.cat8 kprop.cat8 kpropd.cat8 kxd.cat8 kerberos.cat8
-
-all: 
-
-cat: $(CAT1) $(CAT3) $(CAT5) $(CAT8)
-
-%.cat1: %.1
-	`grog -Tascii $<` > $@
-%.cat3: %.3
-	`grog -Tascii $<` > $@
-%.cat5: %.5
-	`grog -Tascii $<` > $@
-%.cat8: %.8
-	`grog -Tascii $<` > $@
-
-
-Wall:
-
-install: all
-		for x in man1 man3 man5 man8 cat1 cat3 cat5 cat8; do \
-			$(MKINSTALLDIRS) $(mandir)/$$x; done
-		(cd $(srcdir); \
-			for x in $(MAN1) $(MAN3) $(MAN5) $(MAN8); do \
-				s=`echo $$x | sed 's!$(MANRX)!\1!'` ; \
-				$(INSTALL_DATA) $$x $(mandir)/man$$s; done ;\
-			for x in $(CAT1) $(CAT3) $(CAT5) $(CAT8); do \
-				s=`echo $$x | sed 's!$(CATRX)!\2!'`; \
-				b=`echo $$x | sed 's!$(CATRX)!\1!'`; \
-			$(INSTALL_DATA) $$x $(mandir)/cat$$s/$$b.$(CATSUFFIX);\
-			 done )
-
-uninstall:
-		for x in $(MAN1) $(MAN3) $(MAN5) $(MAN8); do \
-			s=`echo $$x | sed 's!$(MANRX)!\1!'` ; \
-			rm -f $(mandir)/man$$s/$$x; done
-		for x in $(CAT1) $(CAT3) $(CAT5) $(CAT8); do \
-			s=`echo $$x | sed 's!$(CATRX)!\2!'`; \
-			b=`echo $$x | sed 's!$(CATRX)!\1!'`; \
-			rm -f $(mandir)/cat$$s/$$b.$(CATSUFFIX); done
-
-clean:
-
-mostlyclean:	clean
-
-distclean:
-	rm -f Makefile *~
-
-realclean:
-
diff --git a/crypto/kerberosIV/man/acl_check.3 b/crypto/kerberosIV/man/acl_check.3
deleted file mode 100644
index 53bb7c8bf961..000000000000
--- a/crypto/kerberosIV/man/acl_check.3
+++ /dev/null
@@ -1,182 +0,0 @@
-.\" $Id: acl_check.3,v 1.2 1996/06/12 21:29:08 bg Exp $
-.\" Copyright 1989 by the Massachusetts Institute of Technology.
-.\"
-.\" For copying and distribution information,
-.\" please see the file <mit-copyright.h>.
-.\"
-.TH ACL_CHECK 3 "Kerberos Version 4.0" "MIT Project Athena"
-.SH NAME
-acl_canonicalize_principal, acl_check, acl_exact_match, acl_add,
-acl_delete, acl_initialize \- Access control list routines
-.SH SYNOPSIS
-.nf
-.nj
-.ft B
-cc <files> \-lacl \-lkrb
-.PP
-.ft B
-#include <krb.h>
-.PP
-.ft B
-acl_canonicalize_principal(principal, buf)
-char *principal;
-char *buf;
-.PP
-.ft B
-acl_check(acl, principal)
-char *acl;
-char *principal;
-.PP
-.ft B
-acl_exact_match(acl, principal)
-char *acl;
-char *principal;
-.PP
-.ft B
-acl_add(acl, principal)
-char *acl;
-char *principal;
-.PP
-.ft B
-acl_delete(acl, principal)
-char *acl;
-char *principal;
-.PP
-.ft B
-acl_initialize(acl_file, mode)
-char *acl_file;
-int mode;
-.fi
-.ft R
-.SH DESCRIPTION
-.SS Introduction
-.PP
-An access control list (ACL) is a list of principals, where each
-principal is represented by a text string which cannot contain
-whitespace.  The library allows application programs to refer to named
-access control lists to test membership and to atomically add and
-delete principals using a natural and intuitive interface.  At
-present, the names of access control lists are required to be Unix
-filenames, and refer to human-readable Unix files; in the future, when
-a networked ACL server is implemented, the names may refer to a
-different namespace specific to the ACL service.
-.PP
-.SS Principal Names
-.PP
-Principal names have the form
-.nf
-.in +5n
-<name>[.<instance>][@<realm>]
-.in -5n
-e.g.:
-.in +5n
-asp
-asp.root
-asp@ATHENA.MIT.EDU
-asp.@ATHENA.MIT.EDU
-asp.root@ATHENA.MIT.EDU
-.in -5n
-.fi
-It is possible for principals to be underspecified.  If an instance is
-missing, it is assumed to be "".  If realm is missing, it is assumed
-to be the local realm as determined by
-.IR krb_get_lrealm (3).
-The canonical form contains all of name, instance,
-and realm; the acl_add and acl_delete routines will always
-leave the file in that form.  Note that the canonical form of
-asp@ATHENA.MIT.EDU is actually asp.@ATHENA.MIT.EDU.
-.SS Routines
-.PP
-.I acl_canonicalize_principal
-stores the canonical form of 
-.I principal
-in 
-.IR buf .
-.I Buf
-must contain enough
-space to store a principal, given the limits on the sizes of name,
-instance, and realm specified as ANAME_SZ, INST_SZ, and REALM_SZ,
-respectively, in
-.IR /usr/include/krb.h .
-.PP
-.I acl_check
-returns nonzero if
-.I principal
-appears in 
-.IR acl .
-Returns 0 if principal
-does not appear in acl, or if an error occurs.  Canonicalizes
-principal before checking, and allows the ACL to contain wildcards.  The
-only supported wildcards are entries of the form
-name.*@realm, *.*@realm, and *.*@*.  An asterisk matches any value for the
-its component field.  For example, "jtkohl.*@*" would match principal
-jtkohl, with any instance and any realm.
-.PP
-.I acl_exact_match
-performs like 
-.IR acl_check ,
-but does no canonicalization or wildcard matching.
-.PP
-.I acl_add
-atomically adds 
-.I principal
-to 
-.IR acl .
-Returns 0 if successful, nonzero otherwise.  It is considered a failure
-if
-.I principal
-is already in 
-.IR acl .
-This routine will canonicalize
-.IR principal ,
-but will treat wildcards literally.
-.PP
-.I acl_delete
-atomically deletes 
-.I principal
-from 
-.IR acl .
-Returns 0 if successful,
-nonzero otherwise.  It is considered a failure if 
-.I principal
-is not
-already in 
-.IR acl .
-This routine will canonicalize 
-.IR principal ,
-but will treat wildcards literally.
-.PP
-.I acl_initialize
-initializes
-.IR acl_file .
-If the file 
-.I acl_file
-does not exist,
-.I acl_initialize
-creates it with mode
-.IR mode .
-If the file
-.I acl_file
-exists,
-.I acl_initialize
-removes all members.  Returns 0 if successful,
-nonzero otherwise.  WARNING: Mode argument is likely to change with
-the eventual introduction of an ACL service.  
-.SH NOTES
-In the presence of concurrency, there is a very small chance that
-.I acl_add
-or
-.I acl_delete
-could report success even though it would have
-had no effect.  This is a necessary side effect of using lock files
-for concurrency control rather than flock(2), which is not supported
-by NFS.
-.PP
-The current implementation caches ACLs in memory in a hash-table
-format for increased efficiency in checking membership; one effect of
-the caching scheme is that one file descriptor will be kept open for
-each ACL cached, up to a maximum of 8.
-.SH SEE ALSO
-kerberos(3), krb_get_lrealm(3)
-.SH AUTHOR
-James Aspnes (MIT Project Athena)
diff --git a/crypto/kerberosIV/man/ext_srvtab.8 b/crypto/kerberosIV/man/ext_srvtab.8
deleted file mode 100644
index 4f2c12006be5..000000000000
--- a/crypto/kerberosIV/man/ext_srvtab.8
+++ /dev/null
@@ -1,62 +0,0 @@
-.\" $Id: ext_srvtab.8,v 1.3 1997/04/02 21:09:51 assar Exp $
-.\" Copyright 1989 by the Massachusetts Institute of Technology.
-.\"
-.\" For copying and distribution information,
-.\" please see the file <mit-copyright.h>.
-.\"
-.TH EXT_SRVTAB 8 "Kerberos Version 4.0" "MIT Project Athena"
-.SH NAME
-ext_srvtab \- extract service key files from Kerberos key distribution center database
-.SH SYNOPSIS
-ext_srvtab [
-.B \-n
-] [
-.B \-r realm
-] [
-.B hostname ...
-]
-.SH DESCRIPTION
-.I ext_srvtab
-extracts service key files from the Kerberos key distribution center
-(KDC) database.
-.PP
-Upon execution, it prompts the user to enter the master key string for
-the database.  If the
-.B \-n
-option is specified, the master key is instead fetched from the master
-key cache file.
-.PP
-For each
-.I hostname
-specified on the command line, 
-.I ext_srvtab
-creates the service key file
-.IR hostname -new-srvtab,
-containing all the entries in the database with an instance field of
-.I hostname.
-This new file contains all the keys registered for Kerberos-mediated
-service providing programs which use the 
-.IR krb_get_phost (3)
-principal and instance conventions to run on the host
-.IR hostname .
-If the
-.B \-r
-option is specified, the realm fields in the extracted file will
-match the given realm rather than the local realm.
-.SH DIAGNOSTICS
-.TP 20n
-"verify_master_key: Invalid master key, does not match database."
-The master key string entered was incorrect.
-.SH FILES
-.TP 20n
-.IR hostname -new-srvtab
-Service key file generated for
-.I hostname
-.TP
-/var/kerberos/principal.pag, /var/kerberos/principal.dir
-DBM files containing database
-.TP
-/.k
-Master key cache file.
-.SH SEE ALSO
-read_service_key(3), krb_get_phost(3)
diff --git a/crypto/kerberosIV/man/getusershell.3 b/crypto/kerberosIV/man/getusershell.3
deleted file mode 100644
index 84dc3ad932ba..000000000000
--- a/crypto/kerberosIV/man/getusershell.3
+++ /dev/null
@@ -1,99 +0,0 @@
-.\"	$NetBSD: getusershell.3,v 1.3 1995/02/27 04:13:24 cgd Exp $
-.\"
-.\" Copyright (c) 1985, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)getusershell.3	8.1 (Berkeley) 6/4/93
-.\"
-.Dd June 4, 1993
-.Dt GETUSERSHELL 3
-.Os BSD 4.3
-.Sh NAME
-.Nm getusershell ,
-.Nm setusershell ,
-.Nm endusershell
-.Nd get legal user shells
-.Sh SYNOPSIS
-.Ft char *
-.Fn getusershell void
-.Ft void
-.Fn setusershell void
-.Ft void
-.Fn endusershell void
-.Sh DESCRIPTION
-The
-.Fn getusershell
-function
-returns a pointer to a legal user shell as defined by the
-system manager in the file 
-.Pa /etc/shells .
-If 
-.Pa /etc/shells
-is unreadable or does not exist,
-.Fn getusershell
-behaves as if
-.Pa /bin/sh
-and
-.Pa /bin/csh
-were listed in the file.
-.Pp
-The
-.Fn getusershell
-function
-reads the next
-line (opening the file if necessary);
-.Fn setusershell
-rewinds the file;
-.Fn endusershell
-closes it.
-.Sh FILES
-.Bl -tag -width /etc/shells -compact
-.It Pa /etc/shells
-.El
-.Sh DIAGNOSTICS
-The routine
-.Fn getusershell
-returns a null pointer (0) on
-.Dv EOF .
-.Sh SEE ALSO
-.Xr shells 5
-.Sh HISTORY
-The
-.Fn getusershell
-function appeared in 
-.Bx 4.3 .
-.Sh BUGS
-The
-.Fn getusershell
-function leaves its result in an internal static object and returns
-a pointer to that object. Subsequent calls to
-.Fn getusershell
-will modify the same object.
diff --git a/crypto/kerberosIV/man/kadmin.8 b/crypto/kerberosIV/man/kadmin.8
deleted file mode 100644
index 3139b2513cc8..000000000000
--- a/crypto/kerberosIV/man/kadmin.8
+++ /dev/null
@@ -1,176 +0,0 @@
-.\" $Id: kadmin.8,v 1.4 1997/04/02 21:09:53 assar Exp $
-.\" Copyright 1989 by the Massachusetts Institute of Technology.
-.\"
-.\" For copying and distribution information,
-.\" please see the file <mit-copyright.h>.
-.\"
-.TH KADMIN 8 "Kerberos Version 4.0" "MIT Project Athena"
-.SH NAME
-kadmin \- network utility for Kerberos database administration
-.SH SYNOPSIS
-.B kadmin [-u user] [-r default_realm] [-m] [-t]
-.SH DESCRIPTION
-This utility provides a unified administration interface to
-the
-Kerberos
-master database.
-Kerberos
-administrators
-use
-.I kadmin
-to register new users and services to the master database,
-and to change information about existing database entries.
-For instance, an administrator can use
-.I kadmin
-to change a user's
-Kerberos
-password.
-A Kerberos administrator is a user with an ``admin'' instance
-whose name appears on one of the Kerberos administration access control
-lists.  If the \-u option is used, 
-.I user 
-will be used as the administrator instead of the local user.
-If the \-r option is used, 
-.I default_realm
-will be used as the default realm for transactions.  Otherwise,
-the local realm will be used by default.
-If the \-m option is used, multiple requests will be permitted 
-on only one entry of the admin password.  Some sites won't
-support this option.  The \-t option is used to tell kadmin to use the
-existing ticket file instead of creating a new one.
-
-The
-.I kadmin
-program communicates over the network with the
-.I kadmind
-program, which runs on the machine housing the Kerberos master
-database.
-The
-.I kadmind
-creates new entries and makes modifications to the database.
-
-When you enter the
-.I kadmin
-command,
-the program displays a message that welcomes you and explains
-how to ask for help.
-Then
-.I kadmin
-waits for you to enter commands (which are described below).
-It then asks you for your
-.I admin
-password before accessing the database.
-
-All commands can be abbreviated as long as they are unique.  Some
-short versions of the commands are also recognized for backwards
-compatibility.
-
-Use the
-.I add_new_key
-(or
-.I ank
-for short)
-command to register a new principal
-with the master database.
-The command requires one argument,
-the principal's name.  The name
-given can be fully qualified using 
-the standard 
-.I name.instance@realm
-convention.
-You are asked to enter your
-.I admin
-password,
-then prompted twice to enter the principal's
-new password.  If no realm is specified, 
-the local realm is used unless another was
-given on the commandline with the \-r flag.  
-If no instance is
-specified, a null instance is used.  If
-a realm other than the default realm is specified,
-you will need to supply your admin password for
-the other realm.
-
-Use the
-.I change_password (cpw)
-to change a principal's
-Kerberos
-password.
-The command requires one argument,
-the principal's
-name.
-You are asked to enter your
-.I admin
-password,
-then prompted twice to enter the principal's new password.
-The name
-given can be fully qualified using 
-the standard 
-.I name.instance@realm
-convention.
-
-Use the
-.I change_key (ckey)
-if you have a need to change the raw key of a particular principal.
-In other words, if you do not want to input a DES key instead of a
-password that will get converted into a DES key.
-
-Use the
-.I change_admin_password (cap)
-to change your
-.I admin
-instance password.
-This command requires no arguments.
-It prompts you for your old
-.I admin
-password, then prompts you twice to enter the new
-.I admin
-password.  If this is your first command, 
-the default realm is used.  Otherwise, the realm
-used in the last command is used.
-
-Use the
-.I del_entry (del)
-to remove an entry from the kerberos database.
-
-Use the
-.I mod_entry (mod)
-to modify a particular entry, for example to change the expire date.
-
-Use the
-.I destroy_tickets (dest)
-command to destroy your admin tickets explicitly.
-
-Use the
-.I list_requests (lr)
-command to get a list of possible commands.
-
-Use the
-.I help
-command to display
-.IR kadmin's
-various help messages.
-If entered without an argument,
-.I help
-displays a general help message.
-You can get detailed information on specific
-.I kadmin
-commands
-by entering 
-.I help
-.IR command_name .
-
-To quit the program, type
-.IR quit .
-
-.SH BUGS
-The user interface is primitive, and the command names could be better.
-
-.SH "SEE ALSO"
-kerberos(1), kadmind(8), kpasswd(1), ksrvutil(8)
-.br
-``A Subsystem Utilities Package for UNIX'' by Ken Raeburn
-.SH AUTHORS
-Jeffrey I. Schiller, MIT Project Athena
-.br
-Emanuel Jay Berkenbilt, MIT Project Athena
diff --git a/crypto/kerberosIV/man/kadmind.8 b/crypto/kerberosIV/man/kadmind.8
deleted file mode 100644
index 477511bb1d33..000000000000
--- a/crypto/kerberosIV/man/kadmind.8
+++ /dev/null
@@ -1,125 +0,0 @@
-.\" $Id: kadmind.8,v 1.4 1997/04/02 21:09:53 assar Exp $
-.\" Copyright 1989 by the Massachusetts Institute of Technology.
-.\"
-.\" For copying and distribution information,
-.\" please see the file <mit-copyright.h>.
-.\"
-.TH KADMIND 8 "Kerberos Version 4.0" "MIT Project Athena"
-.SH NAME
-kadmind \- network daemon for Kerberos database administration
-.SH SYNOPSIS
-.B kadmind
-[
-.B \-n
-] [
-.B \-m
-] [
-.B \-h
-] [
-.B \-r realm
-] [
-.B \-f filename
-] [
-.B \-d dbname
-] [
-.B \-a acldir
-]
-.SH DESCRIPTION
-.I kadmind
-is the network database server for the Kerberos password-changing and
-administration tools.
-.PP
-Upon execution, it fetches the master key from the key cache file.
-.PP
-If the
-.B \-m
-option is specified, it instead prompts the user to enter the master
-key string for the database.
-.PP
-The
-.B \-n
-option is a no-op and is left for compatibility reasons.
-.PP
-If the
-.B \-r
-.I realm
-option is specified, the admin server will pretend that its
-local realm is 
-.I realm
-instead of the actual local realm of the host it is running on.
-This makes it possible to run a server for a foreign kerberos
-realm.
-.PP
-If the
-.B \-f
-.I filename
-option is specified, then that file is used to hold the log information
-instead of the default.
-.PP
-If the
-.B \-d
-.I dbname
-option is specified, then that file is used as the database name instead
-of the default.
-.PP
-If the
-.B \-a
-.I acldir
-option is specified, then
-.I acldir
-is used as the directory in which to search for access control lists
-instead of the default.
-.PP
-If the
-.B \-h
-option is specified,
-.I kadmind
-prints out a short summary of the permissible control arguments, and
-then exits.
-.PP
-When performing requests on behalf of clients,
-.I kadmind
-checks access control lists (ACLs) to determine the authorization of the client
-to perform the requested action.
-Currently four distinct access types are supported:
-.TP 1i
-Addition
-(.add ACL file).  If a principal is on this list, it may add new
-principals to the database.
-.TP
-Retrieval
-(.get ACL file).  If a principal is on this list, it may retrieve
-database entries.  NOTE:  A principal's private key is never returned by
-the get functions.
-.TP
-Modification
-(.mod ACL file).  If a principal is on this list, it may modify entries
-in the database.
-.TP
-Deletions
-(.del ACL file).  If a principal is on this list, if may delete
-entries from the database.
-.PP
-A principal is always granted authorization to change its own password.
-.SH FILES
-.TP 20n
-/kerberos/admin_server.syslog
-Default log file.
-.TP 
-/kerberos
-Default access control list directory.
-.TP
-admin_acl.{add,get,mod}
-Access control list files (within the directory)
-.TP
-/kerberos/principal.pag, /kerberos/principal.dir
-Default DBM files containing database
-.TP
-/.k
-Master key cache file.
-.SH "SEE ALSO"
-kerberos(1), kpasswd(1), kadmin(8), acl_check(3)
-.SH AUTHORS
-Douglas A. Church, MIT Project Athena
-.br
-John T. Kohl, Project Athena/Digital Equipment Corporation
diff --git a/crypto/kerberosIV/man/kafs.3 b/crypto/kerberosIV/man/kafs.3
deleted file mode 100644
index 0e0a5cb33879..000000000000
--- a/crypto/kerberosIV/man/kafs.3
+++ /dev/null
@@ -1,122 +0,0 @@
-.\"	$Id: kafs.3,v 1.1 1997/05/07 21:49:02 joda Exp $
-.\"
-.Dd May 7, 1997
-.Os KTH-KRB
-.Dt KAFS 3
-.Sh NAME
-.Nm k_hasafs ,
-.Nm k_afsklog ,
-.Nm k_afsklog_uid ,
-.Nm k_pioctl ,
-.Nm k_unlog ,
-.Nm k_setpag ,
-.Nm k_afs_cell_of_file
-.Nd AFS library
-.Sh SYNOPSIS
-.Fd #include <kafs.h>
-.Ft int
-.Fn k_afsklog "char *cell" "char *realm"
-.Ft int
-.Fn k_afsklog_uid "char *cell" "char *realm" "uid_t uid"
-.Ft int
-.Fn k_afs_cell_of_file "const char *path" "char *cell" "int len"
-.Ft int
-.Fn k_hasafs
-.Ft int
-.Fn k_pioctl "char *a_path" "int o_opcode" "struct ViceIoctl *a_paramsP" "int a_followSymlinks"
-.Ft int
-.Fn k_setpag
-.Ft int
-.Fn k_unlog
-.Sh DESCRIPTION
-.Fn k_hasafs
-initializes some library internal structures, and tests for the
-presense of AFS in the kernel, none of the other functions should be
-called before 
-.Fn k_hasafs
-is called, or if it fails.
-
-.Fn k_afsklog ,
-and
-.Fn k_afsklog_uid
-obtains new tokens (and possibly tickets) for the specified
-.Fa cell
-and
-.Fa realm .
-If 
-.Fa cell
-is 
-.Dv NULL ,
-the local cell is used. If 
-.Fa realm 
-is
-.Dv NULL ,
-the function tries to guess what realm to use. Unless you  have some good knowledge of what cell or realm to use, you should pass
-.Dv NULL . 
-.Fn k_afsklog 
-will use the real user-id for the
-.Dv ViceId
-field in the token, 
-.Fn k_afsklog_uid
-will use
-.Fa uid .
-
-.Fn k_afs_cell_of_file
-will in 
-.Fa cell
-return the cell of a specified file, no more than
-.Fa len
-characters is put in 
-.Fa cell .
-
-.Fn k_pioctl
-does a 
-.Fn pioctl
-syscall with the specified arguments. This function is equivalent to
-.Fn lpioctl .
-
-.Fn k_setpag
-initializes a new PAG.
-
-.Fn k_unlog
-removes destroys all tokens in the current PAG.
-
-.Sh RETURN VALUES
-.Fn k_hasafs
-returns 1 if AFS is present in the kernel, 0 otherwise.
-.Fn k_afsklog
-and
-.Fn k_afsklog_uid
-returns 0 on success, or a kerberos error number on failure.
-.Fn k_afs_cell_of_file ,
-.Fn k_pioctl , 
-.Fn k_setpag ,
-and
-.Fn k_unlog
-all return the value of the underlaying system call, 0 on success.
-.Sh EXAMPLES
-The following code from
-.Nm login 
-will obtain a new PAG and tokens for the local cell and the cell of
-the users home directory.
-.Bd -literal
-if (k_hasafs()) {
-	char cell[64];
-	k_setpag();
-	if(k_afs_cell_of_file(pwd->pw_dir, cell, sizeof(cell)) == 0)
-		k_afsklog(cell, 0);
-	k_afsklog(0, 0);
-}
-.Ed
-.Sh ERRORS
-If any of these functions (appart from 
-.Fn k_hasafs )
-is called without AFS beeing present in the kernel, the process will
-usually (depending on the operating system) receive a SIGSYS signal.
-.Sh SEE ALSO
-.Rs
-.%A Transarc Corporation
-.%J AFS-3 Programmer's Reference
-.%T File Server/Cache Manager Interface
-.%D 1991
-.Re
diff --git a/crypto/kerberosIV/man/kauth.1 b/crypto/kerberosIV/man/kauth.1
deleted file mode 100644
index cc71b2913672..000000000000
--- a/crypto/kerberosIV/man/kauth.1
+++ /dev/null
@@ -1,65 +0,0 @@
-.\" $Id: kauth.1,v 1.1 1996/05/04 01:49:34 d91-jda Exp $
-.\"
-.Dd May 4, 1996
-.Dt KAUTH 1
-.Os KTH-KRB
-.Sh NAME
-.Nm kauth
-.Nd
-overworked Kerberos login program
-.Sh SYNOPSIS
-.Nm
-.Op Fl n Ar name
-.Op Fl r Ar remote user
-.Op Fl t Pa remote ticket file
-.Op Fl h Ar hosts...
-.Op Fl l Ar lifetime
-.Op Fl f Pa srvtab
-.Op Fl c Ar cell
-.Op Ar command ...
-.Sh DESCRIPTION
-The
-.Nm
-command obtains ticket granting tickets as well as AFS ticket and
-tokens. It also does a whole lot of other stuff.
-.Pp
-The following flags are supported:
-.Bl -tag -width xxxx
-.It Fl n
-Principal to get tickets for. If no other arguments are present this
-can be given without the
-.Fl n
-flag.
-.It Fl h
-Remote hosts to obtain tickets for. This works similar to the MIT
-Athena Kerberos 4 patchlevel 10 command
-.Xr rkinit 1 ,
-however not in a compatible way. It requires that the remote host runs
-the
-.Xr kauthd 8 ,
-server. The 
-.Fl r
-and
-.Fl t
-flags are useful only with this option.
-.It Fl r
-User on the remote host that should own the ticket file.
-.It Fl t 
-Ticket file on remote host.
-.It Fl l
-Lifetime of tickets i minutes
-.It Fl f
-Srvtab to get service keys from. Default is 
-.Pa /etc/srvtab .
-This is mainly used with batch services that need to run
-authenticated. If any command is given, it will be executed in an
-authenticated fashion and when the program exits the tickets are
-destroyed. For long running jobs the tickets will be renewed.
-.It Fl c
-AFS cell to get tokens for, default is your local cell.
-.El
-.Sh SEE ALSO
-.Xr kinit 1 ,
-.Xr kauthd 8
-.Sh BUGS
-There is no help-switch.
diff --git a/crypto/kerberosIV/man/kauthd.8 b/crypto/kerberosIV/man/kauthd.8
deleted file mode 100644
index 4978ff2c5c71..000000000000
--- a/crypto/kerberosIV/man/kauthd.8
+++ /dev/null
@@ -1,27 +0,0 @@
-.\" $Id: kauthd.8,v 1.2 1996/09/28 22:04:48 assar Exp $
-.\"
-.Dd September 27, 1996
-.Dt KAUTHD 8
-.Os KTH-KRB
-.Sh NAME
-.Nm kauthd
-.Nd
-remote Kerberos login daemon
-.Sh SYNOPSIS
-.Nm
-.Sh DESCRIPTION
-Daemon for the
-.Xr kauth 1
-command.
-.Pp
-Options supported by
-.Nm kauthd :
-.Bl -tag -width Ds
-.It Fl i
-Interactive.  Do not expect to be started by
-.Nm inetd,
-but allocate and listen to the socket yourself.  Handy for testing
-and debugging.
-.El
-.Sh SEE ALSO
-.Xr kauth 1
diff --git a/crypto/kerberosIV/man/kdb_destroy.8 b/crypto/kerberosIV/man/kdb_destroy.8
deleted file mode 100644
index c6e47396fa0f..000000000000
--- a/crypto/kerberosIV/man/kdb_destroy.8
+++ /dev/null
@@ -1,32 +0,0 @@
-.\" $Id: kdb_destroy.8,v 1.3 1997/04/02 21:09:54 assar Exp $
-.\" Copyright 1989 by the Massachusetts Institute of Technology.
-.\"
-.\" For copying and distribution information,
-.\" please see the file <mit-copyright.h>.
-.\"
-.TH KDB_DESTROY 8 "Kerberos Version 4.0" "MIT Project Athena"
-.SH NAME
-kdb_destroy \- destroy Kerberos key distribution center database
-.SH SYNOPSIS
-kdb_destroy
-.SH DESCRIPTION
-.I kdb_destroy
-deletes a Kerberos key distribution center database.
-.PP
-The user is prompted to verify that the database should be destroyed.  A
-response beginning with `y' or `Y' confirms deletion.
-Any other response aborts deletion.
-.SH DIAGNOSTICS
-.TP 20n
-"Database cannot be deleted at /var/kerberos/principal"
-The attempt to delete the database failed (probably due to a system or
-access permission error).
-.TP
-"Database not deleted."
-The user aborted the deletion.
-.SH FILES
-.TP 20n
-/var/kerberos/principal.pag, /var/kerberos/principal.dir
-DBM files containing database
-.SH SEE ALSO
-kdb_init(8)
diff --git a/crypto/kerberosIV/man/kdb_edit.8 b/crypto/kerberosIV/man/kdb_edit.8
deleted file mode 100644
index 14f7e92a0fd0..000000000000
--- a/crypto/kerberosIV/man/kdb_edit.8
+++ /dev/null
@@ -1,54 +0,0 @@
-.\" $Id: kdb_edit.8,v 1.3 1997/04/02 21:09:54 assar Exp $
-.\" Copyright 1989 by the Massachusetts Institute of Technology.
-.\"
-.\" For copying and distribution information,
-.\" please see the file <mit-copyright.h>.
-.\"
-.TH KDB_EDIT 8 "Kerberos Version 4.0" "MIT Project Athena"
-.SH NAME
-kdb_edit \-  Kerberos key distribution center database editing utility
-.SH SYNOPSIS
-kdb_edit [
-.B \-n
-]
-.SH DESCRIPTION
-.I kdb_edit
-is used to create or change principals stored in the Kerberos key
-distribution center (KDC) database.
-.PP
-When executed,
-.I kdb_edit
-prompts for the master key string and verifies that it matches the
-master key stored in the database.
-If the
-.B \-n
-option is specified, the master key is instead fetched from the master
-key cache file.
-.PP
-Once the master key has been verified,
-.I kdb_edit
-begins a prompt loop.  The user is prompted for the principal and
-instance to be modified.  If the entry is not found the user may create
-it.
-Once an entry is found or created, the user may set the password,
-expiration date, maximum ticket lifetime, and attributes.
-Default expiration dates, maximum ticket lifetimes, and attributes are
-presented in brackets; if the user presses return the default is selected.
-There is no default password.
-The password RANDOM is interpreted specially, and if entered
-the user may have the program select a random DES key for the
-principal.
-.PP
-Upon successfully creating or changing the entry, ``Edit O.K.'' is
-printed.
-.SH DIAGNOSTICS
-.TP 20n
-"verify_master_key: Invalid master key, does not match database."
-The master key string entered was incorrect.
-.SH FILES
-.TP 20n
-/var/kerberos/principal.pag, /var/kerberos/principal.dir
-DBM files containing database
-.TP
-/.k
-Master key cache file.
diff --git a/crypto/kerberosIV/man/kdb_init.8 b/crypto/kerberosIV/man/kdb_init.8
deleted file mode 100644
index f019dd4a413e..000000000000
--- a/crypto/kerberosIV/man/kdb_init.8
+++ /dev/null
@@ -1,37 +0,0 @@
-.\" $Id: kdb_init.8,v 1.3 1997/04/02 21:09:54 assar Exp $
-.\" Copyright 1989 by the Massachusetts Institute of Technology.
-.\"
-.\" For copying and distribution information,
-.\" please see the file <mit-copyright.h>.
-.\"
-.TH KDB_INIT 8 "Kerberos Version 4.0" "MIT Project Athena"
-.SH NAME
-kdb_init \- Initialize Kerberos key distribution center database
-.SH SYNOPSIS
-kdb_init [ 
-.B realm
-]
-.SH DESCRIPTION
-.I kdb_init
-initializes a Kerberos key distribution center database, creating the
-necessary principals.
-.PP
-If the optional
-.I realm
-argument is not present,
-.I kdb_init
-prompts for a realm name.
-After determining the realm to be created, it prompts for
-a master key password.  The master key password is used to encrypt
-every encryption key stored in the database.
-.SH DIAGNOSTICS
-.TP 20n
-"/var/kerberos/principal: File exists"
-An attempt was made to create a database on a machine which already had
-an existing database.
-.SH FILES
-.TP 20n
-/var/kerberos/principal.pag, /var/kerberos/principal.dir
-DBM files containing database
-.SH SEE ALSO
-kdb_destroy(8)
diff --git a/crypto/kerberosIV/man/kdb_util.8 b/crypto/kerberosIV/man/kdb_util.8
deleted file mode 100644
index 0e3c201a514c..000000000000
--- a/crypto/kerberosIV/man/kdb_util.8
+++ /dev/null
@@ -1,68 +0,0 @@
-.\" $Id: kdb_util.8,v 1.3 1997/04/02 20:45:38 assar Exp $
-.\" Copyright 1989 by the Massachusetts Institute of Technology.
-.\"
-.\" For copying and distribution information,
-.\" please see the file <mit-copyright.h>.
-.\"
-.TH KDB_UTIL 8 "Kerberos Version 4.0" "MIT Project Athena"
-.SH NAME
-kdb_util \-  Kerberos key distribution center database utility
-.SH SYNOPSIS
-kdb_util 
-.B operation filename
-.SH DESCRIPTION
-.I kdb_util
-allows the Kerberos key distribution center (KDC) database administrator to
-perform utility functions on the database.
-.PP
-.I Operation
-must be one of the following:
-.TP 10n
-.I load
-initializes the KDC database with the records described by the
-text contained in the file
-.IR filename .
-Any existing database is overwritten.
-.TP
-.I dump
-dumps the KDC database into a text representation in the file
-.IR filename .
-.TP
-.I slave_dump
-performs a database dump like the
-.I dump
-operation, and additionally creates a semaphore file signalling the
-propagation software that an update is available for distribution to
-slave KDC databases.
-.TP
-.I merge
-merges in the entries from
-.IR filename
-into the database.
-.TP
-.I new_master_key
-prompts for the old and new master key strings, and then dumps the KDC
-database into a text representation in the file
-.IR filename .
-The keys in the text representation are encrypted in the new master key.
-.TP
-.I convert_old_db
-prompts for the master key string, and then dumps the KDC database into
-a text representation in the file
-.IR filename .
-The existing database is assumed to be encrypted using the old format
-(encrypted by the key schedule of the master key); the dumped database
-is encrypted using the new format (encrypted directly with master key).
-.PP
-.SH DIAGNOSTICS
-.TP 20n
-"verify_master_key: Invalid master key, does not match database."
-The master key string entered was incorrect.
-.SH FILES
-.TP 20n
-/kerberos/principal.pag, /kerberos/principal.dir
-DBM files containing database
-.TP
-.IR filename .ok
-semaphore file created by
-.IR slave_dump.
diff --git a/crypto/kerberosIV/man/kdestroy.1 b/crypto/kerberosIV/man/kdestroy.1
deleted file mode 100644
index 66ffd39a7654..000000000000
--- a/crypto/kerberosIV/man/kdestroy.1
+++ /dev/null
@@ -1,88 +0,0 @@
-.\" $Id: kdestroy.1,v 1.3 1996/06/12 21:29:16 bg Exp $
-.\" Copyright 1989 by the Massachusetts Institute of Technology.
-.\"
-.\" For copying and distribution information,
-.\" please see the file <mit-copyright.h>.
-.\"
-.TH KDESTROY 1 "Kerberos Version 4.0" "MIT Project Athena"
-.SH NAME
-kdestroy \- destroy Kerberos tickets
-.SH SYNOPSIS
-.B kdestroy
-[
-.B \-f
-]
-[
-.B \-q
-]
-[
-.B \-t
-]
-.SH DESCRIPTION
-The
-.I kdestroy
-utility destroys the user's active
-Kerberos
-authorization tickets by writing zeros to the file that contains them.
-If the ticket file does not exist,
-.I kdestroy
-displays a message to that effect.
-.PP
-After overwriting the file,
-.I kdestroy
-removes the file from the system.
-The utility
-displays a message indicating the success or failure of the
-operation.
-If
-.I kdestroy
-is unable to destroy the ticket file,
-the utility will warn you by making your terminal beep.
-.PP
-In the Athena workstation environment,
-the
-.I toehold
-service automatically destroys your tickets when you
-end a workstation session.
-If your site does not provide a similar ticket-destroying mechanism,
-you can place the
-.I kdestroy
-command in your
-.I .logout
-file so that your tickets are destroyed automatically
-when you logout.
-.PP
-The options to
-.I kdestroy
-are as follows:
-.TP 7
-.B \-f
-.I kdestroy
-runs without displaying the status message.
-.TP
-.B \-q
-.I kdestroy
-will not make your terminal beep if it fails to destroy the tickets.
-.TP
-.B \-t
-.I kdestroy
-will not remove any afs-tokens. Without this flag the tokens
-associated with the current PAG is destroyed.
-.SH FILES
-KRBTKFILE environment variable if set, otherwise
-.br
-/tmp/tkt[uid]
-.SH SEE ALSO
-kerberos(1), kinit(1), klist(1)
-.SH BUGS
-.PP
-Only the tickets in the user's current ticket file are destroyed.
-Separate ticket files are used to hold root instance and password
-changing tickets.  These files should probably be destroyed too, or
-all of a user's tickets kept in a single ticket file.
-.SH AUTHORS
-Steve Miller, MIT Project Athena/Digital Equipment Corporation
-.br
-Clifford Neuman, MIT Project Athena
-.br
-Bill Sommerfeld, MIT Project Athena
diff --git a/crypto/kerberosIV/man/kerberos.1 b/crypto/kerberosIV/man/kerberos.1
deleted file mode 100644
index aced5a574066..000000000000
--- a/crypto/kerberosIV/man/kerberos.1
+++ /dev/null
@@ -1,258 +0,0 @@
-.\" $Id: kerberos.1,v 1.2 1996/06/12 21:29:16 bg Exp $
-.\" Copyright 1989 by the Massachusetts Institute of Technology.
-.\"
-.\" For copying and distribution information,
-.\" please see the file <mit-copyright.h>.
-.\"
-.TH KERBEROS 1 "Kerberos Version 4.0" "MIT Project Athena"
-.SH NAME
-kerberos \- introduction to the Kerberos system
-
-.SH DESCRIPTION
-The
-Kerberos
-system authenticates
-individual users in a network environment.
-After authenticating yourself to
-Kerberos,
-you can use network utilities such as
-.IR rlogin ,
-.IR rcp ,
-and
-.IR rsh
-without
-having to present passwords to remote hosts and without having to bother
-with
-.I \.rhosts
-files.
-Note that these utilities will work without passwords only if
-the remote machines you deal with
-support the
-Kerberos
-system.
-All Athena timesharing machines and public workstations support
-Kerberos.
-.PP
-Before you can use
-Kerberos,
-you must register as an Athena user,
-and you must make sure you have been added to
-the
-Kerberos
-database.
-You can use the
-.I kinit
-command to find out.
-This command
-tries to log you into the
-Kerberos
-system.
-.I kinit
-will prompt you for a username and password.
-Enter your username and password.
-If the utility lets you login without giving you a message,
-you have already been registered.
-.PP
-If you enter your username and
-.I kinit
-responds with this message:
-.nf
-
-Principal unknown (kerberos)
-
-.fi
-you haven't been registered as a
-Kerberos
-user.
-See your system administrator.
-.PP
-A Kerberos name contains three parts.
-The first is the
-.I principal name,
-which is usually a user's or service's name.
-The second is the
-.I instance,
-which in the case of a user is usually null.
-Some users may have privileged instances, however,
-such as ``root'' or ``admin''.
-In the case of a service, the instance is the
-name of the machine on which it runs; i.e. there
-can be an
-.I rlogin
-service running on the machine ABC, which
-is different from the rlogin service running on
-the machine XYZ.
-The third part of a Kerberos name
-is the
-.I realm.
-The realm corresponds to the Kerberos service providing
-authentication for the principal.
-For example, at MIT there is a Kerberos running at the
-Laboratory for Computer Science and one running at
-Project Athena.
-.PP
-When writing a Kerberos name, the principal name is
-separated from the instance (if not null) by a period,
-and the realm (if not the local realm) follows, preceded by
-an ``@'' sign.
-The following are examples of valid Kerberos names:
-.sp
-.nf
-.in +8
-billb
-jis.admin
-srz@lcs.mit.edu
-treese.root@athena.mit.edu
-.in -8
-.fi
-.PP
-When you authenticate yourself with
-Kerberos,
-through either the workstation
-.I toehold
-system or the
-.I kinit
-command,
-Kerberos
-gives you an initial
-Kerberos
-.IR ticket .
-(A
-Kerberos
-ticket
-is an encrypted protocol message that provides authentication.)
-Kerberos
-uses this ticket for network utilities
-such as
-.I rlogin
-and
-.IR rcp .
-The ticket transactions are done transparently,
-so you don't have to worry about their management.
-.PP
-Note, however, that tickets expire.
-Privileged tickets, such as root instance tickets,
-expire in a few minutes, while tickets that carry more ordinary
-privileges may be good for several hours or a day, depending on the
-installation's policy.
-If your login session extends beyond the time limit,
-you will have to re-authenticate yourself to
-Kerberos
-to get new tickets.
-Use the
-.IR kinit
-command to re-authenticate yourself.
-.PP
-If you use the
-.I kinit
-command to get your tickets,
-make sure you use the
-.I kdestroy
-command
-to destroy your tickets before you end your login session.
-You should probably put the
-.I kdestroy
-command in your
-.I \.logout
-file so that your tickets will be destroyed automatically when you logout.
-For more information about the
-.I kinit
-and
-.I kdestroy
-commands,
-see the
-.I kinit(1)
-and
-.I kdestroy(1)
-manual pages.
-.PP
-Currently,
-Kerberos
-supports the following network services:
-.IR rlogin ,
-.IR rsh ,
-and
-.IR rcp .
-Other services are being worked on,
-such as the
-.IR pop
-mail system and NFS (network file system),
-but are not yet available.
-
-.SH "SEE ALSO"
-kdestroy(1), kinit(1), klist(1), kpasswd(1), des_crypt(3), kerberos(3),
-kadmin(8)
-.SH BUGS
-Kerberos
-will not do authentication forwarding.
-In other words,
-if you use
-.I rlogin
-to login to a remote host,
-you cannot use
-Kerberos
-services from that host
-until you authenticate yourself explicitly on that host.
-Although you may need to authenticate yourself on the remote
-host,
-be aware that when you do so,
-.I rlogin
-sends your password across the network in clear text.
-
-.SH AUTHORS
-Steve Miller, MIT Project Athena/Digital Equipment Corporation
-.br
-Clifford Neuman, MIT Project Athena
-
-The following people helped out on various aspects of the system:
-
-Jeff Schiller designed and wrote the administration server and its
-user interface, kadmin.
-He also wrote the dbm version of the database management system.
-
-Mark Colan developed the
-Kerberos
-versions of
-.IR rlogin ,
-.IR rsh ,
-and
-.IR rcp ,
-as well as contributing work on the servers.
-
-John Ostlund developed the
-Kerberos
-versions of
-.I passwd
-and
-.IR userreg .
-
-Stan Zanarotti pioneered Kerberos in a foreign realm (LCS),
-and made many contributions based on that experience.
-
-Many people contributed code and/or useful ideas, including
-Jim Aspnes,
-Bob Baldwin,
-John Barba,
-Richard Basch,
-Jim Bloom,
-Bill Bryant,
-Rob French,
-Dan Geer,
-David Jedlinsky,
-John Kohl,
-John Kubiatowicz,
-Bob McKie,
-Brian Murphy,
-Ken Raeburn,
-Chris Reed,
-Jon Rochlis,
-Mike Shanzer,
-Bill Sommerfeld,
-Jennifer Steiner,
-Ted Ts'o,
-and
-Win Treese.
-
-.SH RESTRICTIONS
-
-COPYRIGHT 1985,1986 Massachusetts Institute of Technology
diff --git a/crypto/kerberosIV/man/kerberos.3 b/crypto/kerberosIV/man/kerberos.3
deleted file mode 100644
index 71da54dd2cd0..000000000000
--- a/crypto/kerberosIV/man/kerberos.3
+++ /dev/null
@@ -1,460 +0,0 @@
-.\" $Id: kerberos.3,v 1.2 1996/06/12 21:29:18 bg Exp $
-.\" Copyright 1989 by the Massachusetts Institute of Technology.
-.\"
-.\" For copying and distribution information,
-.\" please see the file <mit-copyright.h>.
-.\"
-.TH KERBEROS 3 "Kerberos Version 4.0" "MIT Project Athena"
-.SH NAME
-krb_mk_req, krb_rd_req, krb_kntoln, krb_set_key, krb_get_cred,
-krb_mk_priv, krb_rd_priv, krb_mk_safe, krb_rd_safe, krb_mk_err,
-krb_rd_err, krb_ck_repl \- Kerberos authentication library
-.SH SYNOPSIS
-.nf
-.nj
-.ft B
-#include <des.h>
-#include <krb.h>
-.PP
-.ft B
-extern char *krb_err_txt[];
-.PP
-.ft B
-int krb_mk_req(authent,service,instance,realm,checksum)
-KTEXT authent;
-char *service;
-char *instance;
-char *realm;
-u_long checksum;
-.PP
-.ft B
-int krb_rd_req(authent,service,instance,from_addr,ad,fn)
-KTEXT authent;
-char *service;
-char *instance;
-u_long from_addr;
-AUTH_DAT *ad;
-char *fn;
-.PP
-.ft B
-int krb_kntoln(ad,lname)
-AUTH_DAT *ad;
-char *lname;
-.PP
-.ft B
-int krb_set_key(key,cvt)
-char *key;
-int cvt;
-.PP
-.ft B
-int krb_get_cred(service,instance,realm,c)
-char *service;
-char *instance;
-char *realm;
-CREDENTIALS *c;
-.PP
-.ft B
-long krb_mk_priv(in,out,in_length,schedule,key,sender,receiver)
-u_char *in;
-u_char *out;
-u_long in_length;
-des_cblock key;
-des_key_schedule schedule;
-struct sockaddr_in *sender;
-struct sockaddr_in *receiver;
-.PP
-.ft B
-long krb_rd_priv(in,in_length,schedule,key,sender,receiver,msg_data)
-u_char *in;
-u_long in_length;
-Key_schedule schedule;
-des_cblock key;
-struct sockaddr_in *sender;
-struct sockaddr_in *receiver;
-MSG_DAT *msg_data;
-.PP
-.ft B
-long krb_mk_safe(in,out,in_length,key,sender,receiver)
-u_char *in;
-u_char *out;
-u_long in_length;
-des_cblock key;
-struct sockaddr_in *sender;
-struct sockaddr_in *receiver;
-.PP
-.ft B
-long krb_rd_safe(in,length,key,sender,receiver,msg_data)
-u_char *in;
-u_long length;
-des_cblock key;
-struct sockaddr_in *sender;
-struct sockaddr_in *receiver;
-MSG_DAT *msg_data;
-.PP
-.ft B
-long krb_mk_err(out,code,string)
-u_char *out;
-long code;
-char *string;
-.PP
-.ft B
-long krb_rd_err(in,length,code,msg_data)
-u_char *in;
-u_long length;
-long code;
-MSG_DAT *msg_data;
-.fi
-.ft R
-.SH DESCRIPTION
-This library supports network authentication and various related
-operations.  The library contains many routines beyond those described
-in this man page, but they are not intended to be used directly.
-Instead, they are called by the routines that are described, the
-authentication server and the login program.
-.PP
-.I krb_err_txt[]
-contains text string descriptions of various Kerberos error codes returned
-by some of the routines below.
-.PP
-.I krb_mk_req
-takes a pointer to a text structure in which an authenticator is to be
-built.  It also takes the name, instance, and realm of the service to be
-used and an optional checksum.  It is up to the application to decide
-how to generate the checksum.
-.I krb_mk_req
-then retrieves a ticket for the desired service and creates an
-authenticator.  The authenticator is built in
-.I authent
-and is accessible
-to the calling procedure.
-.PP
-It is up to the application to get the authenticator to the service
-where it will be read by
-.I krb_rd_req.
-Unless an attacker posesses the session key contained in the ticket, it
-will be unable to modify the authenticator.  Thus, the checksum can be
-used to verify the authenticity of the other data that will pass through
-a connection.
-.PP
-.I krb_rd_req
-takes an authenticator of type
-.B KTEXT,
-a service name, an instance, the address of the
-host originating the request, and a pointer to a structure of type
-.B AUTH_DAT
-which is filled in with information obtained from the authenticator.
-It also optionally takes the name of the file in which it will find the
-secret key(s) for the service.
-If the supplied
-.I instance
-contains "*", then the first service key with the same service name
-found in the service key file will be used, and the
-.I instance
-argument will be filled in with the chosen instance.  This means that
-the caller must provide space for such an instance name.
-.PP
-It is used to find out information about the principal when a request
-has been made to a service.  It is up to the application protocol to get
-the authenticator from the client to the service.  The authenticator is
-then passed to
-.I krb_rd_req
-to extract the desired information.
-.PP
-.I krb_rd_req
-returns zero (RD_AP_OK) upon successful authentication.  If a packet was
-forged, modified, or replayed, authentication will fail.  If the
-authentication fails, a non-zero value is returned indicating the
-particular problem encountered.  See
-.I krb.h
-for the list of error codes.
-.PP
-If the last argument is the null string (""), krb_rd_req will use the
-file /etc/srvtab to find its keys.  If the last argument is NULL, it
-will assume that the key has been set by
-.I krb_set_key
-and will not bother looking further.
-.PP
-.I krb_kntoln
-converts a Kerberos name to a local name.  It takes a structure
-of type AUTH_DAT and uses the name and instance to look in the database
-/etc/aname to find the corresponding local name.  The local name is
-returned and can be used by an application to change uids, directories,
-or other parameters.  It is not an integral part of Kerberos, but is
-instead provided to support the use of Kerberos in existing utilities.
-.PP
-.I krb_set_key
-takes as an argument a des key.  It then creates
-a key schedule from it and saves the original key to be used as an
-initialization vector.
-It is used to set the server's key which
-must be used to decrypt tickets.
-.PP
-If called with a non-zero second argument,
-.I krb_set_key
-will first convert the input from a string of arbitrary length to a DES
-key by encrypting it with a one-way function.
-.PP
-In most cases it should not be necessary to call
-.I krb_set_key.
-The necessary keys will usually be obtained and set inside
-.I krb_rd_req.  krb_set_key
-is provided for those applications that do not wish to place the
-application keys on disk.
-.PP
-.I krb_get_cred
-searches the caller's ticket file for a ticket for the given service, instance,
-and realm; and, if a ticket is found, fills in the given CREDENTIALS structure
-with the ticket information.
-.PP
-If the ticket was found,
-.I krb_get_cred
-returns GC_OK.
-If the ticket file can't be found, can't be read, doesn't belong to
-the user (other than root), isn't a regular file, or is in the wrong
-mode, the error GC_TKFIL is returned.
-.PP
-.I krb_mk_priv
-creates an encrypted, authenticated
-message from any arbitrary application data, pointed to by
-.I in
-and
-.I in_length
-bytes long.
-The private session key, pointed to by
-.I key
-and the key schedule,
-.I schedule,
-are used to encrypt the data and some header information using
-.I pcbc_encrypt.
-.I sender
-and
-.I receiver
-point to the Internet address of the two parties.
-In addition to providing privacy, this protocol message protects
-against modifications, insertions or replays.  The encapsulated message and
-header are placed in the area pointed to by
-.I out
-and the routine returns the length of the output, or -1 indicating
-an error.
-.PP
-.I krb_rd_priv
-decrypts and authenticates a received
-.I krb_mk_priv
-message.
-.I in
-points to the beginning of the received message, whose length
-is specified in
-.I in_length.
-The private session key, pointed to by
-.I key,
-and the key schedule,
-.I schedule,
-are used to decrypt and verify the received message.
-.I msg_data
-is a pointer to a
-.I MSG_DAT
-struct, defined in
-.I krb.h.
-The routine fills in the
-.I app_data
-field with a pointer to the decrypted application data,
-.I app_length
-with the length of the
-.I app_data
-field,
-.I time_sec
-and
-.I time_5ms
-with the timestamps in the message, and
-.I swap
-with a 1 if the byte order of the receiver is different than that of
-the sender.  (The application must still determine if it is appropriate
-to byte-swap application data; the Kerberos protocol fields are already taken
-care of).  The
-.I hash
-field returns a value useful as input to the
-.I krb_ck_repl
-routine.
-
-The routine returns zero if ok, or a Kerberos error code. Modified messages
-and old messages cause errors, but it is up to the caller to
-check the time sequence of messages, and to check against recently replayed
-messages using
-.I krb_ck_repl
-if so desired.
-.PP
-.I krb_mk_safe
-creates an authenticated, but unencrypted message from any arbitrary
-application data,
-pointed to by
-.I in
-and
-.I in_length
-bytes long.
-The private session key, pointed to by
-.I key,
-is used to seed the
-.I quad_cksum()
-checksum algorithm used as part of the authentication.
-.I sender
-and
-.I receiver
-point to the Internet address of the two parties.
-This message does not provide privacy, but does protect (via detection)
-against modifications, insertions or replays.  The encapsulated message and
-header are placed in the area pointed to by
-.I out
-and the routine returns the length of the output, or -1 indicating
-an error.
-The authentication provided by this routine is not as strong as that
-provided by
-.I krb_mk_priv
-or by computing the checksum using
-.I cbc_cksum
-instead, both of which authenticate via DES.
-.PP
-
-.I krb_rd_safe
-authenticates a received
-.I krb_mk_safe
-message.
-.I in
-points to the beginning of the received message, whose length
-is specified in
-.I in_length.
-The private session key, pointed to by
-.I key,
-is used to seed the quad_cksum() routine as part of the authentication.
-.I msg_data
-is a pointer to a
-.I MSG_DAT
-struct, defined in
-.I krb.h .
-The routine fills in these
-.I MSG_DAT
-fields:
-the
-.I app_data
-field with a pointer to the application data,
-.I app_length
-with the length of the
-.I app_data
-field,
-.I time_sec
-and
-.I time_5ms
-with the timestamps in the message, and
-.I swap
-with a 1 if the byte order of the receiver is different than that of
-the sender.
-(The application must still determine if it is appropriate
-to byte-swap application data; the Kerberos protocol fields are already taken
-care of).  The
-.I hash
-field returns a value useful as input to the
-.I krb_ck_repl
-routine.
-
-The routine returns zero if ok, or a Kerberos error code. Modified messages
-and old messages cause errors, but it is up to the caller to
-check the time sequence of messages, and to check against recently replayed
-messages using
-.I krb_ck_repl
-if so desired.
-.PP
-.I krb_mk_err
-constructs an application level error message that may be used along
-with
-.I krb_mk_priv
-or
-.I krb_mk_safe.
-.I out
-is a pointer to the output buffer,
-.I code
-is an application specific error code, and
-.I string
-is an application specific error string.
-
-.PP
-.I krb_rd_err
-unpacks a received
-.I krb_mk_err
-message.
-.I in
-points to the beginning of the received message, whose length
-is specified in
-.I in_length.
-.I code
-is a pointer to a value to be filled in with the error
-value provided by the application.
-.I msg_data
-is a pointer to a
-.I MSG_DAT
-struct, defined in
-.I krb.h .
-The routine fills in these
-.I MSG_DAT
-fields: the
-.I app_data
-field with a pointer to the application error text,
-.I app_length
-with the length of the
-.I app_data
-field, and
-.I swap
-with a 1 if the byte order of the receiver is different than that of
-the sender.  (The application must still determine if it is appropriate
-to byte-swap application data; the Kerberos protocol fields are already taken
-care of).
-
-The routine returns zero if the error message has been successfully received,
-or a Kerberos error code.
-.PP
-The
-.I KTEXT
-structure is used to pass around text of varying lengths.  It consists
-of a buffer for the data, and a length.  krb_rd_req takes an argument of this
-type containing the authenticator, and krb_mk_req returns the
-authenticator in a structure of this type.  KTEXT itself is really a
-pointer to the structure.   The actual structure is of type KTEXT_ST.
-.PP
-The
-.I AUTH_DAT
-structure is filled in by krb_rd_req.  It must be allocated before
-calling krb_rd_req, and a pointer to it is passed.  The structure is
-filled in with data obtained from Kerberos.
-.I MSG_DAT
-structure is filled in by either krb_rd_priv, krb_rd_safe, or
-krb_rd_err.  It must be allocated before the call and a pointer to it
-is passed.  The structure is
-filled in with data obtained from Kerberos.
-.PP
-.SH FILES
-/usr/include/krb.h
-.br
-/usr/lib/libkrb.a
-.br
-/usr/include/des.h
-.br
-/usr/lib/libdes.a
-.br
-/etc/aname
-.br
-/etc/srvtab
-.br
-/tmp/tkt[uid]
-.SH "SEE ALSO"
-kerberos(1), des_crypt(3)
-.SH DIAGNOSTICS
-.SH BUGS
-The caller of
-.I krb_rd_req, krb_rd_priv, and krb_rd_safe
-must check time order and for replay attempts.
-.I krb_ck_repl
-is not implemented yet.
-.SH AUTHORS
-Clifford Neuman, MIT Project Athena
-.br
-Steve Miller, MIT Project Athena/Digital Equipment Corporation
-.SH RESTRICTIONS
-COPYRIGHT 1985,1986,1989 Massachusetts Institute of Technology
diff --git a/crypto/kerberosIV/man/kerberos.8 b/crypto/kerberosIV/man/kerberos.8
deleted file mode 100644
index 6a64c57bbb6c..000000000000
--- a/crypto/kerberosIV/man/kerberos.8
+++ /dev/null
@@ -1,44 +0,0 @@
-.\" $Id: kerberos.8,v 1.1 1996/11/14 22:14:55 assar Exp $
-.\"
-.Dd November 14, 1996
-.Dt KERBEROS 8
-.Os KTH-KRB
-.Sh NAME
-.Nm kerberos
-.Nd The kerberos daemon
-.Sh SYNPOSIS
-.Nm
-.Op Fl snm
-.Op Fl p Ar pause
-.Op Fl a Ar max age
-.Op Fl l Ar log
-.Op Fl r Ar realm
-.Ar database
-.Sh DESCRIPTION
-This is the
-.Nm
-daemon.
-.Pp
-Options:
-.Bl -tag -width -ident
-.It Fl s
-Set slave parameters.  This will enable check to see if data is
-getting too stale relative to the master.
-.It Fl n
-Do not check max age. 
-.It Fl m
-Run manually and prompt for master key.
-.It Fl p
-Pause for
-.Ar pause
-before dying.
-.It Fl a
-Set the
-.Ar max age
-before the database is considered stale.
-.It Fl l
-Write the log to
-.Ar log
-.It Fl r
-Run as a server for realm
-.Ar realm
diff --git a/crypto/kerberosIV/man/kinit.1 b/crypto/kerberosIV/man/kinit.1
deleted file mode 100644
index 75f0e709c7d7..000000000000
--- a/crypto/kerberosIV/man/kinit.1
+++ /dev/null
@@ -1,136 +0,0 @@
-.\" $Id$
-.\" Copyright 1989 by the Massachusetts Institute of Technology.
-.\"
-.\" For copying and distribution information,
-.\" please see the file <mit-copyright.h>.
-.\"
-.TH KINIT 1 "Kerberos Version 4.0" "MIT Project Athena"
-.SH NAME
-kinit \- Kerberos login utility
-.SH SYNOPSIS
-.B kinit
-[
-.B \-irvlp
-]
-.SH DESCRIPTION
-The
-.I kinit
-command is used to login to the
-Kerberos
-authentication and authorization system.
-Note that only registered
-Kerberos
-users can use the
-Kerberos
-system.
-For information about registering as a
-Kerberos
-user,
-see the
-.I kerberos(1)
-manual page.
-.PP
-If you are logged in to a workstation that is running the
-.I toehold
-service,
-you do not have to use
-.I kinit.
-The
-.I toehold
-login procedure will log you into
-Kerberos
-automatically.
-You will need to use
-.I kinit
-only in those situations in which
-your original tickets have expired.
-(Tickets expire in about a day.)
-Note as well that
-.I toehold
-will automatically destroy your tickets when you logout from the workstation.
-.PP
-When you use
-.I kinit
-without options,
-the utility
-prompts for your username and Kerberos password,
-and tries to authenticate your login with the local
-Kerberos
-server.
-.PP
-If
-Kerberos
-authenticates the login attempt,
-.I kinit
-retrieves your initial ticket and puts it in the ticket file specified by
-your KRBTKFILE environment variable.
-If this variable is undefined,
-your ticket will be stored in the
-.IR /tmp
-directory,
-in the file
-.I tktuid ,
-where
-.I uid
-specifies your user identification number.
-.PP
-If you have logged in to
-Kerberos
-without the benefit of the workstation
-.I toehold
-system,
-make sure you use the
-.I kdestroy
-command to destroy any active tickets before you end your login session.
-You may want to put the
-.I kdestroy
-command in your
-.I \.logout
-file so that your tickets will be destroyed automatically when you logout.
-.PP
-The options to
-.I kinit
-are as follows:
-.TP 7
-.B \-i
-.I kinit
-prompts you for a
-Kerberos
-instance.
-.TP
-.B \-r
-.I kinit
-prompts you for a
-Kerberos
-realm.
-This option lets you authenticate yourself with a remote
-Kerberos
-server.
-.TP
-.B \-v
-Verbose mode.
-.I kinit
-prints the realm you are in, the name of the ticket file used, and
-a status message indicating the success or failure of
-your login attempt.
-.TP
-.B \-l
-.I kinit
-prompts you for a ticket lifetime in minutes.  Due to protocol
-restrictions in Kerberos Version 4, this value must be between 5 and
-1275 minutes.
-.TP
-.B \-p
-.I kinit
-will acquires a ticket for chpass.kerberos.
-.SH SEE ALSO
-.PP
-kerberos(1), kdestroy(1), klist(1), toehold(1)
-.SH BUGS
-The
-.B \-r
-option has not been fully implemented.
-.SH AUTHORS
-Steve Miller, MIT Project Athena/Digital Equipment Corporation
-.br
-Clifford Neuman, MIT Project Athena
diff --git a/crypto/kerberosIV/man/klist.1 b/crypto/kerberosIV/man/klist.1
deleted file mode 100644
index 76dec027bc95..000000000000
--- a/crypto/kerberosIV/man/klist.1
+++ /dev/null
@@ -1,83 +0,0 @@
-.\" $Id: klist.1,v 1.2 1996/06/12 21:29:19 bg Exp $
-.\" Copyright 1989 by the Massachusetts Institute of Technology.
-.\"
-.\" For copying and distribution information,
-.\" please see the file <mit-copyright.h>.
-.\"
-.TH KLIST 1 "Kerberos Version 4.0" "MIT Project Athena"
-.SH NAME
-klist \- list currently held Kerberos tickets
-.SH SYNOPSIS
-.B klist
-[
-\fB\-s \fR|\fB \-t\fR
-] [
-.B \-file
-name ] [
-.B \-srvtab
-]
-.br
-.SH DESCRIPTION
-.I klist
-prints the name of the tickets file and the
-identity of the principal the tickets are for (as listed in the
-tickets file), and 
-lists the principal names of all Kerberos tickets currently held by
-the user, along with the issue and expire time for each authenticator.
-Principal names are listed in the form
-.I name.instance@realm,
-with the '.' omitted if the instance is null,
-and the '@' omitted if the realm is null.
-
-If given the
-.B \-s
-option,
-.I klist
-does not print the issue and expire times, the name of the tickets file,
-or the identity of the principal.
-
-If given the
-.B \-t
-option, 
-.B klist
-checks for the existence of a non-expired ticket-granting-ticket in the
-ticket file.  If one is present, it exits with status 0, else it exits
-with status 1.  No output is generated when this option is specified. 
-
-If given the
-.B \-file
-option, the following argument is used as the ticket file.
-Otherwise, if the
-.B KRBTKFILE
-environment variable is set, it is used.
-If this environment variable
-is not set, the file
-.B /tmp/tkt[uid]
-is used, where
-.B uid
-is the current user-id of the user.
-
-If given the
-.B \-srvtab
-option, the file is treated as a service key file, and the names of the
-keys contained therein are printed.  If no file is
-specified with a
-.B \-file
-option, the default is
-.IR /etc/srvtab .
-.SH FILES
-.TP 2i
-/etc/krb.conf
-to get the name of the local realm
-.TP
-/tmp/tkt[uid]
-as the default ticket file ([uid] is the decimal UID of the user).
-.TP
-/etc/srvtab
-as the default service key file
-.SH SEE ALSO
-.PP
-kerberos(1), kinit(1), kdestroy(1)
-.SH BUGS
-When reading a file as a service key file, very little sanity or error
-checking is performed.
diff --git a/crypto/kerberosIV/man/kprop.8 b/crypto/kerberosIV/man/kprop.8
deleted file mode 100644
index 9f9acc228e25..000000000000
--- a/crypto/kerberosIV/man/kprop.8
+++ /dev/null
@@ -1,58 +0,0 @@
-.\" $Id: kprop.8,v 1.1.1.1 1997/09/04 06:04:32 markm Exp $
-.\"
-.Dd June 7, 1996
-.Dt KPROP 8
-.Os KTH-KRB
-.Sh NAME
-.Nm kprop
-.Nd
-the kerberos slave server update client
-.Sh SYNOPSIS
-.Nm
-.Op Fl force
-.Op Fl realm Ar realm
-.Op Ar dump-file
-.Op Ar slave-file
-.Sh DESCRIPTION
-Changes to the database, such as changed passwords, are only made to
-the master server through the
-.Nm kadmind
-service. To propagate these changes to the slave servers, 
-.Nm 
-should be run regularly on the master server.
-
-The following options are recognised.
-
-.Bl -tag -width -force
-.It Fl force
-Propagate even if there hasn't been an update to the dump file since
-last time.
-.It Fl realm
-Realm if other than the default.
-.It dump-file
-is a file created with 
-.Ic kdb_util slave_dump ,
-default is
-.Pa /var/kerberos/slave_dump .
-.It slave-file
-Contains the names of the slave servers. Default is
-.Pa /var/kerberos/slaves .
-.El
-
-.Nm
-will use the principal 
-.Nm rcmd.kerberos
-to authenticate to the master servers. This principal has to be added
-to the database, and it should also be put into the service key file
-on the master server.
-
-.Sh FILES
-.Bl -tag -width indent -compact
-.It Pa /var/kerberos/slave_dump
-.It Pa /var/kerberos/slaves
-.It Pa /etc/srvtab
-.El
-.Sh SEE ALSO
-.Xr kadmind 8 ,
-.Xr kerberos 8 ,
-.Xr kpropd 8
diff --git a/crypto/kerberosIV/man/kpropd.8 b/crypto/kerberosIV/man/kpropd.8
deleted file mode 100644
index 6b3046354bc1..000000000000
--- a/crypto/kerberosIV/man/kpropd.8
+++ /dev/null
@@ -1,63 +0,0 @@
-.\" $Id: kpropd.8,v 1.1.1.1 1997/09/04 06:04:32 markm Exp $
-.\"
-.Dd June 7, 1996
-.Dt KPROPD 8
-.Os KTH-KRB
-.Sh NAME
-.Nm kpropd
-.Nd
-the kerberos slave server update facility
-.Sh SYNOPSIS
-.Nm
-.Op Fl i
-.Op Fl d Ar database
-.Op Fl l Ar logfile
-.Op Fl m
-.Op Fl p Ar kdb_util
-.Op Fl r Ar realm
-.Op Fl s Ar srvtab
-.Sh DESCRIPTION
-The
-.Nm
-responds to database update requests from the
-.Nm kprop
-command. It can either be started from
-.Nm inetd
-or as an ordinary program.
-
-The following options are recognised:
-
-.Bl -tag -width xxxx
-.It Fl i
-Run stand-alone.  If this flag is not given, it is assumed to have
-been started by
-.Nm inetd .
-.It Fl d
-What database file to use, default is
-.Pa /var/kerberos/principal .
-.It Fl l
-Logfile to use, default is
-.Pa /var/log/kpropd.log .
-.It Fl m
-Treat data as changes to the database rather than a complete database.
-.It Fl p
-The path to
-.Nm kdb_util ,
-default is
-.Pa /usr/athena/sbin/kdb_util .
-.It Fl r
-Realm if other than the default realm.
-.It Fl s
-Srvtab if other than
-.Pa /etc/srvtab .
-.El
-.Sh FILES
-.Bl -tag -width indent -compact
-.It Pa /var/kerberos/principal.{db,dir,pag}
-.It Pa /var/log/kpropd.log
-.It Pa /etc/srvtab
-.El
-.Sh SEE ALSO
-.Xr kadmind 8 ,
-.Xr kerberos 8 ,
-.Xr kprop 8
diff --git a/crypto/kerberosIV/man/krb.conf.5 b/crypto/kerberosIV/man/krb.conf.5
deleted file mode 100644
index b122b9c391d3..000000000000
--- a/crypto/kerberosIV/man/krb.conf.5
+++ /dev/null
@@ -1,31 +0,0 @@
-.\" $Id: krb.conf.5,v 1.2 1996/06/12 21:29:21 bg Exp $
-.\" Copyright 1989 by the Massachusetts Institute of Technology.
-.\"
-.\" For copying and distribution information,
-.\" please see the file <mit-copyright.h>.
-.\"
-.TH KRB.CONF 5 "Kerberos Version 4.0" "MIT Project Athena"
-.SH NAME
-/etc/krb.conf \- Kerberos configuration file
-.SH DESCRIPTION
-.I krb.conf
-contains configuration information describing the Kerberos realm and the
-Kerberos key distribution center (KDC) servers for known realms.
-.PP
-.I krb.conf
-contains the name of the local realm in the first
-line, followed by lines indicating realm/host
-entries.  The first token is a realm name, and the second is the hostname
-of a host running a KDC for that realm.
-The words "admin server" following the hostname indicate that 
-the host also provides an administrative database server.
-For example:
-.nf
-.in +1i
-ATHENA.MIT.EDU
-ATHENA.MIT.EDU kerberos-1.mit.edu admin server
-ATHENA.MIT.EDU kerberos-2.mit.edu
-LCS.MIT.EDU kerberos.lcs.mit.edu admin server
-.in -1i
-.SH SEE ALSO
-krb.realms(5), krb_get_krbhst(3), krb_get_lrealm(3)
diff --git a/crypto/kerberosIV/man/krb.equiv.5 b/crypto/kerberosIV/man/krb.equiv.5
deleted file mode 100644
index e38f94bf6179..000000000000
--- a/crypto/kerberosIV/man/krb.equiv.5
+++ /dev/null
@@ -1,28 +0,0 @@
-.\"	$Id: krb.equiv.5,v 1.3 1996/06/18 16:26:20 joda Exp $
-.\"
-.Dd June 18, 1996
-.Dt KRB.EQUIV 5
-.Os KTH-KRB
-.Sh NAME
-.Nm krb.equiv
-.Nd
-Kerberos equivalent hosts file
-.Sh DESCRIPTION
-.Nm
-contains a list of IP addresses that is to be considered being the
-same host for Kerberos purposes. Plain addresses match a single
-host. Addresses followed by a slash (/) and a number is taken as a
-sub-network that should be considered equal.
-.Pp
-Hash (#) starts a comment. Backslash (\\) is a continuation character.
-.Sh EXAMPLES
-.Bd -literal
-# A machine with two interfaces.
-130.237.232.113 130.237.221.42  # emma emma-ether
-# A machine with *many* interfaces
-193.10.156.0/24 193.10.157.0/24 # syk-* syk-*-hps
-.Ed
-.Sh SEE ALSO
-.Xr krb_equiv 3 ,
-.Xr krb.conf 5 ,
-.Xr krb.realms 5
diff --git a/crypto/kerberosIV/man/krb.realms.5 b/crypto/kerberosIV/man/krb.realms.5
deleted file mode 100644
index 427c4550261e..000000000000
--- a/crypto/kerberosIV/man/krb.realms.5
+++ /dev/null
@@ -1,38 +0,0 @@
-.\" $Id: krb.realms.5,v 1.2 1996/06/12 21:29:22 bg Exp $
-.\" Copyright 1989 by the Massachusetts Institute of Technology.
-.\"
-.\" For copying and distribution information,
-.\" please see the file <mit-copyright.h>.
-.\"
-.TH KRB.REALMS 5 "Kerberos Version 4.0" "MIT Project Athena"
-.SH NAME
-/etc/krb.realms \- host to Kerberos realm translation file
-.SH DESCRIPTION
-.I krb.realms
-provides a translation from a hostname to the Kerberos realm name for
-the services provided by that host.
-.PP
-Each line of the translation file is in one of the following forms
-(domain_name should be of the form .XXX.YYY, e.g. .LCS.MIT.EDU):
-.nf
-.in +5n
-host_name kerberos_realm
-domain_name kerberos_realm
-.in -5n
-.fi
-If a hostname exactly matches the 
-.I host_name
-field in a line of the first
-form, the corresponding realm is the realm of the host.
-If a hostname does not match any 
-.I host_name
-in the file, but its
-domain exactly matches the 
-.I domain_name
-field in a line of the second
-form, the corresponding realm is the realm of the host.
-.PP
-If no translation entry applies, the host's realm is considered to be
-the hostname's domain portion converted to upper case.
-.SH SEE ALSO
-krb_realmofhost(3)
diff --git a/crypto/kerberosIV/man/krb_realmofhost.3 b/crypto/kerberosIV/man/krb_realmofhost.3
deleted file mode 100644
index ddbda7495074..000000000000
--- a/crypto/kerberosIV/man/krb_realmofhost.3
+++ /dev/null
@@ -1,160 +0,0 @@
-.\" $Id: krb_realmofhost.3,v 1.2 1996/06/12 21:29:23 bg Exp $
-.\" Copyright 1989 by the Massachusetts Institute of Technology.
-.\"
-.\" For copying and distribution information,
-.\" please see the file <mit-copyright.h>.
-.\"
-.TH KRB_REALMOFHOST 3 "Kerberos Version 4.0" "MIT Project Athena"
-.SH NAME
-krb_realmofhost, krb_get_phost, krb_get_krbhst, krb_get_admhst,
-krb_get_lrealm \- additional Kerberos utility routines
-.SH SYNOPSIS
-.nf
-.nj
-.ft B
-#include <krb.h>
-#include <des.h>
-#include <netinet/in.h>
-.PP
-.ft B
-char *krb_realmofhost(host)
-char *host;
-.PP
-.ft B
-char *krb_get_phost(alias)
-char *alias;
-.PP
-.ft B
-krb_get_krbhst(host,realm,n)
-char *host;
-char *realm;
-int n;
-.PP
-.ft B
-krb_get_admhst(host,realm,n)
-char *host;
-char *realm;
-int n;
-.PP
-.ft B
-krb_get_lrealm(realm,n)
-char *realm;
-int n;
-.fi
-.ft R
-.SH DESCRIPTION
-.I krb_realmofhost
-returns the Kerberos realm of the host
-.IR host ,
-as determined by the translation table
-.IR /etc/krb.realms .
-.I host
-should be the fully-qualified domain-style primary host name of the host
-in question.  In order to prevent certain security attacks, this routine
-must either have 
-.I a priori
-knowledge of a host's realm, or obtain such information securely.
-.PP
-The format of the translation file is described by 
-.IR krb.realms (5).
-If
-.I host
-exactly matches a host_name line, the corresponding realm
-is returned.
-Otherwise, if the domain portion of
-.I host
-matches a domain_name line, the corresponding realm
-is returned.
-If
-.I host
-contains a domain, but no translation is found,
-.IR host 's
-domain is converted to upper-case and returned.
-If 
-.I host
-contains no discernable domain, or an error occurs,
-the local realm name, as supplied by 
-.IR krb_get_lrealm (3),
-is returned.
-.PP
-.I krb_get_phost
-converts the hostname
-.I alias
-(which can be either an official name or an alias) into the instance
-name to be used in obtaining Kerberos tickets for most services,
-including the Berkeley rcmd suite (rlogin, rcp, rsh).
-.br
-The current convention is to return the first segment of the official
-domain-style name after conversion to lower case.
-.PP
-.I krb_get_krbhst
-fills in
-.I host
-with the hostname of the
-.IR n th
-host running a Kerberos key distribution center (KDC)
-for realm
-.IR realm ,
-as specified in the configuration file (\fI/etc/krb.conf\fR).
-The configuration file is described by 
-.IR krb.conf (5).
-If the host is successfully filled in, the routine
-returns KSUCCESS.
-If the file cannot be opened, and
-.I n
-equals 1, then the value of KRB_HOST as defined in
-.I <krb.h>
-is filled in, and KSUCCESS is returned.  If there are fewer than
-.I n
-hosts running a Kerberos KDC for the requested realm, or the
-configuration file is malformed, the routine
-returns KFAILURE.
-.PP
-.I krb_get_admhst
-fills in
-.I host
-with the hostname of the
-.IR n th
-host running a Kerberos KDC database administration server
-for realm
-.IR realm ,
-as specified in the configuration file (\fI/etc/krb.conf\fR).
-If the file cannot be opened or is malformed, or there are fewer than
-.I n
-hosts running a Kerberos KDC database administration server,
-the routine returns KFAILURE.
-.PP
-The character arrays used as return values for
-.IR krb_get_krbhst ,
-.IR krb_get_admhst ,
-should be large enough to
-hold any hostname (MAXHOSTNAMELEN from <sys/param.h>).
-.PP
-.I krb_get_lrealm
-fills in
-.I realm
-with the
-.IR n th
-realm of the local host, as specified in the configuration file.
-.I realm
-should be at least REALM_SZ (from
-.IR <krb.h>) characters long.
-.PP
-.SH SEE ALSO
-kerberos(3), krb.conf(5), krb.realms(5)
-.SH FILES
-.TP 20n
-/etc/krb.realms
-translation file for host-to-realm mapping.
-.TP
-/etc/krb.conf
-local realm-name and realm/server configuration file.
-.SH BUGS
-The current convention for instance names is too limited; the full
-domain name should be used.
-.PP
-.I krb_get_lrealm
-currently only supports 
-.I n
-= 1.  It should really consult the user's ticket cache to determine the
-user's current realm, rather than consulting a file on the host.
diff --git a/crypto/kerberosIV/man/krb_sendauth.3 b/crypto/kerberosIV/man/krb_sendauth.3
deleted file mode 100644
index 208b6bc90a7e..000000000000
--- a/crypto/kerberosIV/man/krb_sendauth.3
+++ /dev/null
@@ -1,347 +0,0 @@
-.\" $Id: krb_sendauth.3,v 1.2 1996/06/12 21:29:24 bg Exp $
-.\" Copyright 1988 by the Massachusetts Institute of Technology.
-.\"
-.\" For copying and distribution information,
-.\" please see the file <mit-copyright.h>.
-.\"
-.TH KRB_SENDAUTH 3 "Kerberos Version 4.0" "MIT Project Athena"
-.SH NAME
-krb_sendauth, krb_recvauth, krb_net_write, krb_net_read \-
-Kerberos routines for sending authentication via network stream sockets
-.SH SYNOPSIS
-.nf
-.nj
-.ft B
-#include <krb.h>
-#include <des.h>
-#include <netinet/in.h>
-.PP
-.fi
-.HP 1i
-.ft B
-int krb_sendauth(options, fd, ktext, service, inst, realm, checksum,
-msg_data, cred, schedule, laddr, faddr, version)
-.nf
-.RS 0
-.ft B
-long options;
-int fd;
-KTEXT ktext;
-char *service, *inst, *realm;
-u_long checksum;
-MSG_DAT *msg_data;
-CREDENTIALS *cred;
-Key_schedule schedule;
-struct sockaddr_in *laddr, *faddr;
-char *version;
-.PP
-.fi
-.HP 1i
-.ft B
-int krb_recvauth(options, fd, ktext, service, inst, faddr, laddr,
-auth_data, filename, schedule, version)
-.nf
-.RS 0
-.ft B
-long options;
-int fd;
-KTEXT ktext;
-char *service, *inst;
-struct sockaddr_in *faddr, *laddr;
-AUTH_DAT *auth_data;
-char *filename;
-Key_schedule schedule;
-char *version;			
-.PP
-.ft B
-int krb_net_write(fd, buf, len)
-int fd;
-char *buf;
-int len;
-.PP
-.ft B
-int krb_net_read(fd, buf, len)
-int fd;
-char *buf;
-int len;
-.fi
-.SH DESCRIPTION
-.PP
-These functions,
-which are built on top of the core Kerberos library,
-provide a convenient means for client and server
-programs to send authentication messages
-to one another through network connections.
-The
-.I krb_sendauth
-function sends an authenticated ticket from the client program to
-the server program by writing the ticket to a network socket.
-The
-.I krb_recvauth
-function receives the ticket from the client by
-reading from a network socket.
-
-.SH KRB_SENDAUTH
-.PP
-This function writes the ticket to
-the network socket specified by the
-file descriptor
-.IR fd,
-returning KSUCCESS if the write proceeds successfully,
-and an error code if it does not.
-
-The
-.I ktext
-argument should point to an allocated KTEXT_ST structure.
-The
-.IR service,
-.IR inst,
-and
-.IR realm
-arguments specify the server program's Kerberos principal name,
-instance, and realm.
-If you are writing a client that uses the local realm exclusively,
-you can set the
-.I realm
-argument to NULL.
-
-The
-.I version
-argument allows the client program to pass an application-specific
-version string that the server program can then match against
-its own version string.
-The
-.I version
-string can be up to KSEND_VNO_LEN (see 
-.IR <krb.h> )
-characters in length.
-
-The
-.I checksum
-argument can be used to pass checksum information to the
-server program.
-The client program is responsible for specifying this information.
-This checksum information is difficult to corrupt because
-.I krb_sendauth
-passes it over the network in encrypted form.
-The
-.I checksum
-argument is passed as the checksum argument to
-.IR krb_mk_req .
-
-You can set
-.IR krb_sendauth's
-other arguments to NULL unless you want the
-client and server programs to mutually authenticate
-themselves.
-In the case of mutual authentication,
-the client authenticates itself to the server program,
-and demands that the server in turn authenticate itself to
-the client.
-
-.SH KRB_SENDAUTH AND MUTUAL AUTHENTICATION
-.PP
-If you want mutual authentication,
-make sure that you read all pending data from the local socket
-before calling
-.IR krb_sendauth.
-Set
-.IR krb_sendauth's
-.I options
-argument to
-.BR KOPT_DO_MUTUAL
-(this macro is defined in the
-.IR krb.h
-file);
-make sure that the
-.I laddr
-argument points to
-the address of the local socket,
-and that
-.I faddr
-points to the foreign socket's network address.
-
-.I Krb_sendauth
-fills in the other arguments--
-.IR msg_data ,
-.IR cred ,
-and
-.IR schedule --before
-sending the ticket to the server program.
-You must, however, allocate space for these arguments
-before calling the function.
-
-.I Krb_sendauth
-supports two other options:
-.BR KOPT_DONT_MK_REQ,
-and
-.BR KOPT_DONT_CANON.
-If called with
-.I options
-set as KOPT_DONT_MK_REQ,
-.I krb_sendauth
-will not use the
-.I krb_mk_req
-function to retrieve the ticket from the Kerberos server.
-The
-.I ktext
-argument must point to an existing ticket and authenticator (such as
-would be created by 
-.IR krb_mk_req ),
-and the
-.IR service,
-.IR inst,
-and
-.IR realm
-arguments can be set to NULL.
-
-If called with
-.I options
-set as KOPT_DONT_CANON,
-.I krb_sendauth
-will not convert the service's instance to canonical form using 
-.IR krb_get_phost (3).
-
-If you want to call
-.I krb_sendauth
-with a multiple
-.I options
-specification,
-construct
-.I options
-as a bitwise-OR of the options you want to specify.
-
-.SH KRB_RECVAUTH
-.PP
-The
-.I krb_recvauth
-function
-reads a ticket/authenticator pair from the socket pointed to by the
-.I fd
-argument.
-Set the
-.I options
-argument
-as a bitwise-OR of the options desired.
-Currently only KOPT_DO_MUTUAL is useful to the receiver.
-
-The
-.I ktext
-argument
-should point to an allocated KTEXT_ST structure.
-.I Krb_recvauth
-fills
-.I ktext
-with the
-ticket/authenticator pair read from
-.IR fd ,
-then passes it to
-.IR krb_rd_req .
-
-The
-.I service
-and
-.I inst
-arguments
-specify the expected service and instance for which the ticket was
-generated.  They are also passed to
-.IR krb_rd_req.
-The
-.I inst
-argument may be set to "*" if the caller wishes
-.I krb_mk_req
-to fill in the instance used (note that there must be space in the
-.I inst
-argument to hold a full instance name, see 
-.IR krb_mk_req (3)).
-
-The
-.I faddr
-argument
-should point to the address of the peer which is presenting the ticket.
-It is also passed to
-.IR krb_rd_req .
-
-If the client and server plan to mutually authenticate
-one another,
-the
-.I laddr
-argument
-should point to the local address of the file descriptor.
-Otherwise you can set this argument to NULL.
-
-The
-.I auth_data
-argument
-should point to an allocated AUTH_DAT area.
-It is passed to and filled in by
-.IR krb_rd_req .
-The checksum passed to the corresponding
-.I krb_sendauth
-is available as part of the filled-in AUTH_DAT area.
-
-The
-.I filename
-argument
-specifies the filename
-which the service program should use to obtain its service key.
-.I Krb_recvauth
-passes
-.I filename
-to the
-.I krb_rd_req
-function.
-If you set this argument to "",
-.I krb_rd_req
-looks for the service key in the file
-.IR /etc/srvtab.
-
-If the client and server are performing mutual authenication,
-the
-.I schedule
-argument
-should point to an allocated Key_schedule.
-Otherwise it is ignored and may be NULL.
-
-The
-.I version
-argument should point to a character array of at least KSEND_VNO_LEN
-characters.  It is filled in with the version string passed by the client to
-.IR krb_sendauth.
-.PP
-.SH KRB_NET_WRITE AND KRB_NET_READ
-.PP
-The
-.I krb_net_write
-function
-emulates the write(2) system call, but guarantees that all data
-specified is written to
-.I fd
-before returning, unless an error condition occurs.
-.PP
-The
-.I krb_net_read
-function
-emulates the read(2) system call, but guarantees that the requested
-amount of data is read from
-.I fd
-before returning, unless an error condition occurs.
-.PP
-.SH BUGS
-.IR krb_sendauth,
-.IR krb_recvauth,
-.IR krb_net_write,
-and
-.IR krb_net_read
-will not work properly on sockets set to non-blocking I/O mode.
-
-.SH SEE ALSO
-
-krb_mk_req(3), krb_rd_req(3), krb_get_phost(3)
-
-.SH AUTHOR
-John T. Kohl, MIT Project Athena
-.SH RESTRICTIONS
-Copyright 1988, Massachusetts Instititute of Technology.
-For copying and distribution information,
-please see the file <mit-copyright.h>.
diff --git a/crypto/kerberosIV/man/krb_set_tkt_string.3 b/crypto/kerberosIV/man/krb_set_tkt_string.3
deleted file mode 100644
index 9d941435a8b8..000000000000
--- a/crypto/kerberosIV/man/krb_set_tkt_string.3
+++ /dev/null
@@ -1,42 +0,0 @@
-.\" $Id: krb_set_tkt_string.3,v 1.2 1996/06/12 21:29:24 bg Exp $
-.\" Copyright 1989 by the Massachusetts Institute of Technology.
-.\"
-.\" For copying and distribution information,
-.\" please see the file <mit-copyright.h>.
-.\"
-.TH KRB_SET_TKT_STRING 3 "Kerberos Version 4.0" "MIT Project Athena"
-.SH NAME
-krb_set_tkt_string \- set Kerberos ticket cache file name
-.SH SYNOPSIS
-.nf
-.nj
-.ft B
-#include <krb.h>
-.PP
-.ft B
-void krb_set_tkt_string(filename)
-char *filename;
-.fi
-.ft R
-.SH DESCRIPTION
-.I krb_set_tkt_string
-sets the name of the file that holds the user's
-cache of Kerberos server tickets and associated session keys.
-.PP
-The string 
-.I filename
-passed in is copied into local storage.
-Only MAXPATHLEN-1 (see <sys/param.h>) characters of the filename are
-copied in for use as the cache file name.
-.PP
-This routine should be called during initialization, before other
-Kerberos routines are called; otherwise the routines which fetch the
-ticket cache file name may be called and return an undesired ticket file
-name until this routine is called.
-.SH FILES
-.TP 20n
-/tmp/tkt[uid]
-default ticket file name, unless the environment variable KRBTKFILE is set.
-[uid] denotes the user's uid, in decimal.
-.SH SEE ALSO
-kerberos(3), setenv(3)
diff --git a/crypto/kerberosIV/man/ksrvtgt.1 b/crypto/kerberosIV/man/ksrvtgt.1
deleted file mode 100644
index ff8563cfbb9f..000000000000
--- a/crypto/kerberosIV/man/ksrvtgt.1
+++ /dev/null
@@ -1,50 +0,0 @@
-.\" $Id: ksrvtgt.1,v 1.2 1996/06/12 21:29:26 bg Exp $
-.\" Copyright 1989 by the Massachusetts Institute of Technology.
-.\"
-.\" For copying and distribution information,
-.\" please see the file <mit-copyright.h>.
-.\"
-.TH KSRVTGT 1 "Kerberos Version 4.0" "MIT Project Athena"
-.SH NAME
-ksrvtgt \- fetch and store Kerberos ticket-granting-ticket using a
-service key
-.SH SYNOPSIS
-.B ksrvtgt
-name instance [[realm] srvtab]
-.SH DESCRIPTION
-.I ksrvtgt
-retrieves a ticket-granting ticket with a lifetime of five (5) minutes
-for the principal
-.I name.instance@realm
-(or 
-.I name.instance@localrealm
-if
-.I realm
-is not supplied on the command line), decrypts the response using
-the service key found in
-.I srvtab
-(or in 
-.B /etc/srvtab
-if
-.I srvtab
-is not specified on the command line), and stores the ticket in the
-standard ticket cache.
-.PP
-This command is intended primarily for use in shell scripts and other
-batch-type facilities.
-.SH DIAGNOSTICS
-"Generic kerberos failure (kfailure)" can indicate a whole range of
-problems, the most common of which is the inability to read the service
-key file.
-.SH FILES
-.TP 2i
-/etc/krb.conf
-to get the name of the local realm.
-.TP
-/tmp/tkt[uid]
-The default ticket file.
-.TP
-/etc/srvtab
-The default service key file.
-.SH SEE ALSO
-kerberos(1), kinit(1), kdestroy(1)
diff --git a/crypto/kerberosIV/man/ksrvutil.8 b/crypto/kerberosIV/man/ksrvutil.8
deleted file mode 100644
index aee24d797986..000000000000
--- a/crypto/kerberosIV/man/ksrvutil.8
+++ /dev/null
@@ -1,104 +0,0 @@
-.\" $Id: ksrvutil.8,v 1.1.1.1 1997/09/04 06:04:32 markm Exp $
-.\" Copyright 1989 by the Massachusetts Institute of Technology.
-.\"
-.\" For copying and distribution information,
-.\" please see the file <mit-copyright.h>.
-.\"
-.Dd May 4, 1996
-.Dt KSRVUTIL 8
-.Os KTH-KRB
-
-.Sh NAME
-.Nm ksrvutil 
-host kerberos keyfile (srvtab) manipulation utility
-.Sh SYNOPSIS
-.Nm
-.Op Fl f Pa keyfile
-.Op Fl i
-.Op Fl k 
-.Op Fl p Ar principal
-.Op Fl r Ar realm
-.Ar operation
-
-.Sh DESCRIPTION
-.Nm
-allows a system manager to list or change keys currently in his
-keyfile or to add new keys to the keyfile.
-.Pp
-Operation must be one of the following:
-.Bl -tag -width indent
-.It list
-lists the keys in a keyfile showing version number and principal name.
-If the
-.Fl k
-option is given, keys will also be shown.
-.It change
-changes all the keys in the keyfile by using the regular admin
-protocol.  If the
-.Fl i
-flag is given,
-.Nm ksrvutil
-will prompt for yes or no before changing each key.  If the 
-.Fl k
-option is used, the old and new keys will be displayed.
-.It add
-allows the user to add a key.
-add
-prompts for name, instance, realm, and key version number, asks
-for confirmation, and then asks for a password.  
-.Nm
-then converts the password to a key and appends the keyfile with the
-new information.  If the
-.Fl k
-option is used, the key is displayed.
-.It get
-gets a service from the Kerberos server, possibly creating the
-principal. Names, instances and realms for the service keys to get are
-prompted for. The default principal used in the kadmin transcation is
-your root instance. This can be changed with the
-.Fl p
-option.
-.El
-.Pp
-In all cases, the default file used is KEY_FILE as defined in krb.h
-unless this is overridden by the
-.Fl f
-option.
-.Pp
-A good use for
-.Nm
-would be for adding keys to a keyfile.  A system manager could
-ask a kerberos administrator to create a new service key with 
-.Xr kadmin 8
-and could supply an initial password.  Then, he could use 
-.Nm
-to add the key to the keyfile and then to change the key so that it
-will be random and unknown to either the system manager or the
-kerberos administrator.
-
-.Nm
-always makes a backup copy of the keyfile before making any changes.
-
-.Sh DIAGNOSTICS
-If 
-.Nm
-should exit on an error condition at any time during a change or add,
-a copy of the original keyfile can be found in
-.Pa filename Ns .old
-where 
-.Pa filename
-is the name of the keyfile, and a copy of the file with all new
-keys changed or added so far can be found in 
-.Pa filename Ns .work.
-The original keyfile is left unmodified until the program exits at
-which point it is removed and replaced it with the workfile.
-Appending the workfile to the backup copy and replacing the keyfile
-with the result should always give a usable keyfile, although the
-resulting keyfile will have some out of date keys in it.
-
-.Sh SEE ALSO
-.Xr ksrvtgt 1 ,
-.Xr kadmin 8
-
-.Sh AUTHOR
-Emanuel Jay Berkenbilt, MIT Project Athena
diff --git a/crypto/kerberosIV/man/kstash.8 b/crypto/kerberosIV/man/kstash.8
deleted file mode 100644
index 0197a3d2d11a..000000000000
--- a/crypto/kerberosIV/man/kstash.8
+++ /dev/null
@@ -1,40 +0,0 @@
-.\" $Id: kstash.8,v 1.3 1997/04/02 21:09:56 assar Exp $
-.\" Copyright 1989 by the Massachusetts Institute of Technology.
-.\"
-.\" For copying and distribution information,
-.\" please see the file <mit-copyright.h>.
-.\"
-.TH KSTASH 8 "Kerberos Version 4.0" "MIT Project Athena"
-.SH NAME
-kstash \- stash Kerberos key distribution center database master key
-.SH SYNOPSIS
-kstash
-.SH DESCRIPTION
-.I kstash
-saves the Kerberos key distribution center (KDC) database master key in
-the master key cache file.
-.PP
-The user is prompted to enter the key, to verify the authenticity of the
-key and the authorization to store the key in the file.
-.SH DIAGNOSTICS
-.TP 20n
-"verify_master_key: Invalid master key, does not match database."
-The master key string entered was incorrect.
-.TP
-"kstash: Unable to open master key file"
-The attempt to open the cache file for writing failed (probably due to a
-system or access permission error).
-.TP
-"kstash: Write I/O error on master key file"
-The 
-.BR write (2)
-system call returned an error while
-.I kstash
-was attempting to write the key to the file.
-.SH FILES
-.TP 20n
-/var/kerberos/principal.pag, /var/kerberos/principal.dir
-DBM files containing database
-.TP
-/.k
-Master key cache file.
diff --git a/crypto/kerberosIV/man/kuserok.3 b/crypto/kerberosIV/man/kuserok.3
deleted file mode 100644
index 098730898be7..000000000000
--- a/crypto/kerberosIV/man/kuserok.3
+++ /dev/null
@@ -1,66 +0,0 @@
-.\" $Id: kuserok.3,v 1.3 1996/10/13 17:51:18 bg Exp $
-.\" Copyright 1989 by the Massachusetts Institute of Technology.
-.\"
-.\" For copying and distribution information,
-.\" please see the file <mit-copyright.h>.
-.\"
-.TH KUSEROK 3 "Kerberos Version 4.0" "MIT Project Athena"
-.SH NAME
-kuserok \- Kerberos version of ruserok
-.SH SYNOPSIS
-.nf
-.nj
-.ft B
-#include <krb.h>
-.PP
-.ft B
-kuserok(kdata, localuser)
-AUTH_DAT *auth_data;
-char   *localuser;
-.fi
-.ft R
-.SH DESCRIPTION
-.I kuserok
-determines whether a Kerberos principal described by the structure
-.I auth_data
-is authorized to login as user
-.I localuser
-according to the authorization file
-("~\fIlocaluser\fR/.klogin" by default).  It returns 0 (zero) if authorized,
-1 (one) if not authorized.
-.PP
-If there is no account for 
-.I localuser
-on the local machine, authorization is not granted.
-If there is no authorization file, and the Kerberos principal described
-by 
-.I auth_data
-translates to 
-.I localuser
-(using 
-.IR krb_kntoln (3)),
-authorization is granted.
-If the authorization file
-can't be accessed, or the file is not owned by
-.IR localuser,
-authorization is denied.  Otherwise, the file is searched for
-a matching principal name, instance, and realm.  If a match is found,
-authorization is granted, else authorization is denied.
-.PP
-The file entries are in the format:
-.nf
-.in +5n
-	name.instance@realm
-.in -5n
-.fi
-with one entry per line.
-
-For convenience ~localuser@LOCALREALM is
-always considered to be an entry in the file even when there is no
-file or the file is unreadable.
-.SH SEE ALSO
-kerberos(3), ruserok(3), krb_kntoln(3)
-.SH FILES
-.TP 20n
-~\fIlocaluser\fR/.klogin
-authorization list
diff --git a/crypto/kerberosIV/man/tf_util.3 b/crypto/kerberosIV/man/tf_util.3
deleted file mode 100644
index 3f98321d491c..000000000000
--- a/crypto/kerberosIV/man/tf_util.3
+++ /dev/null
@@ -1,150 +0,0 @@
-.\" $Id: tf_util.3,v 1.2 1996/06/12 21:29:29 bg Exp $
-.\" Copyright 1989 by the Massachusetts Institute of Technology.
-.\"
-.\" For copying and distribution information,
-.\" please see the file <mit-copyright.h>.
-.\"
-.TH TF_UTIL 3 "Kerberos Version 4.0" "MIT Project Athena"
-.SH NAME
-tf_init, tf_get_pname, tf_get_pinst, tf_get_cred, tf_close \
-\- Routines for manipulating a Kerberos ticket file
-.SH SYNOPSIS
-.nf
-.nj
-.ft B
-#include <krb.h>
-.PP
-.ft B
-extern char *krb_err_txt[];
-.PP
-.ft B
-tf_init(tf_name, rw)
-char *tf_name;
-int rw;
-.PP
-.ft B
-tf_get_pname(pname)
-char *pname;
-.PP
-.ft B
-tf_get_pinst(pinst)
-char *pinst;
-.PP
-.ft B
-tf_get_cred(c)
-CREDENTIALS *c;
-.PP
-.ft B
-tf_close()
-.PP
-.fi
-.SH DESCRIPTION
-This group of routines are provided to manipulate the Kerberos tickets
-file.  A ticket file has the following format:
-.nf
-.in +4
-.sp
-principal's name          (null-terminated string)
-principal's instance      (null-terminated string)
-CREDENTIAL_1
-CREDENTIAL_2
-  ...
-CREDENTIAL_n
-EOF
-.sp
-.in -4
-.LP
-Where "CREDENTIAL_x" consists of the following fixed-length
-fields from the CREDENTIALS structure (defined in <krb.h>):
-.nf
-.sp
-.in +4
-	char		service[ANAME_SZ]
-	char		instance[INST_SZ]
-	char		realm[REALM_SZ]
-	des_cblock	session
-	int		lifetime
-	int		kvno
-	KTEXT_ST	ticket_st
-	long		issue_date
-.in -4
-.sp
-.fi
-.PP
-.I tf_init
-must be called before the other ticket file
-routines.
-It takes the name of the ticket file to use,
-and a read/write flag as arguments.
-It tries to open the ticket file, checks the mode and if
-everything is okay, locks the file.  If it's opened for
-reading, the lock is shared.  If it's opened for writing,
-the lock is exclusive.
-KSUCCESS is returned if all went well, otherwise one of the
-following:
-.nf
-.sp
-NO_TKT_FIL	- file wasn't there
-TKT_FIL_ACC	- file was in wrong mode, etc.
-TKT_FIL_LCK	- couldn't lock the file, even after a retry
-.sp
-.fi
-.PP
-The
-.I tf_get_pname
-reads the principal's name from a ticket file.
-It should only be called after tf_init has been called.  The
-principal's name is filled into the 
-.I pname
-parameter.  If all goes
-well, KSUCCESS is returned.
-If tf_init wasn't called, TKT_FIL_INI
-is returned.
-If the principal's name was null, or EOF was encountered, or the
-name was longer than ANAME_SZ, TKT_FIL_FMT is returned.
-.PP
-The
-.I tf_get_pinst
-reads the principal's instance from a ticket file.
-It should only be called after tf_init and tf_get_pname
-have been called.
-The principal's instance is filled into the 
-.I pinst
-parameter.
-If all goes
-well, KSUCCESS is returned.
-If tf_init wasn't called, TKT_FIL_INI
-is returned.
-If EOF was encountered, or the
-name was longer than INST_SZ, TKT_FIL_FMT is returned.
-Note that, unlike the principal name, the instance name may be null.
-.PP
-The
-.I tf_get_cred
-routine reads a CREDENTIALS record from a ticket file and
-fills in the given structure.
-It should only be called after
-tf_init, tf_get_pname, and tf_get_pinst have been called.
-If all goes well, KSUCCESS is returned.  Possible error codes
-are:
-.nf
-.sp
-TKT_FIL_INI	- tf_init wasn't called first
-TKT_FIL_FMT	- bad format
-EOF		- end of file encountered
-.sp
-.fi
-.PP
-.I tf_close
-closes the ticket file and releases the lock on it.
-.SH "SEE ALSO"
-krb(3)
-.SH DIAGNOSTICS
-.SH BUGS
-The ticket file routines have to be called in a certain order.
-.SH AUTHORS
-Jennifer Steiner, MIT Project Athena
-.br
-Bill Bryant, MIT Project Athena
-.SH RESTRICTIONS
-Copyright 1987 Massachusetts Institute of Technology
diff --git a/crypto/kerberosIV/mkinstalldirs b/crypto/kerberosIV/mkinstalldirs
deleted file mode 100644
index 1c13a50fadb2..000000000000
--- a/crypto/kerberosIV/mkinstalldirs
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-# $Id: mkinstalldirs,v 1.1 1996/06/27 01:12:51 joda Exp $
-
-errstatus=0
-
-for file
-do
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
-
-   pathcomp=
-   for d
-   do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
-
-     if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp" 1>&2
-
-        mkdir "$pathcomp" || lasterr=$?
-
-        if test ! -d "$pathcomp"; then
-  	  errstatus=$lasterr
-        fi
-     fi
-
-     pathcomp="$pathcomp/"
-   done
-done
-
-exit $errstatus
-
-# mkinstalldirs ends here
diff --git a/crypto/kerberosIV/server/Makefile.in b/crypto/kerberosIV/server/Makefile.in
deleted file mode 100644
index 64e7eb1ef21c..000000000000
--- a/crypto/kerberosIV/server/Makefile.in
+++ /dev/null
@@ -1,79 +0,0 @@
-# $Id: Makefile.in,v 1.24 1997/05/02 17:52:00 assar Exp $
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-CC = @CC@
-AR = ar
-RANLIB = @RANLIB@
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-LD_FLAGS = @LD_FLAGS@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
-
-LIBS = @LIBS@
-LIB_DBM = @LIB_DBM@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-libdir = @libdir@
-libexecdir = @libexecdir@
-transform=@program_transform_name@
-EXECSUFFIX=@EXECSUFFIX@
-
-PROGS = kerberos$(EXECSUFFIX)
-
-SOURCES = kerberos.c
-
-OBJECTS = kerberos.o
-
-all: $(PROGS)
-
-Wall:
-	make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../include -I$(srcdir) $(CFLAGS) $<
-
-install: all
-	$(MKINSTALLDIRS) $(libexecdir)
-	for x in $(PROGS); do \
-	  $(INSTALL_PROGRAM) $$x $(libexecdir)/`echo $$x | sed '$(transform)'`; \
-	done
-
-uninstall:
-	for x in $(PROGS); do \
-	  rm -f $(libexecdir)/`echo $$x | sed '$(transform)'`; \
-	done
-
-TAGS: $(SOURCES)
-	etags $(SOURCES)
-
-check:
-
-clean:
-	rm -f *.a *.o $(PROGS)
-
-mostlyclean: clean
-
-distclean: clean
-	rm -f Makefile *.tab.c *~
-
-realclean: distclean
-	rm -f TAGS
-
-dist: $(DISTFILES)
-	for file in $(DISTFILES); do \
-	  ln $$file ../`cat ../.fname`/lib \
-	    || cp -p $$file ../`cat ../.fname`/lib; \
-	done
-
-kerberos$(EXECSUFFIX): kerberos.o
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ kerberos.o -L../lib/kdb -lkdb -L../lib/krb -lkrb -L../lib/des -ldes -L../lib/roken -lroken $(LIB_DBM) $(LIBS) -lroken
-
-$(OBJECTS): ../include/config.h
diff --git a/crypto/kerberosIV/server/kerberos.c b/crypto/kerberosIV/server/kerberos.c
deleted file mode 100644
index 405e48d4837a..000000000000
--- a/crypto/kerberosIV/server/kerberos.c
+++ /dev/null
@@ -1,846 +0,0 @@
-/*
- * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute
- * of Technology.
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
- */
-
-#include "config.h"
-#include "protos.h"
-
-RCSID("$Id: kerberos.c,v 1.64 1997/05/20 18:40:46 bg Exp $");
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#elif defined(HAVE_SYS_TIME_H)
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
-#include <errno.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#if defined(HAVE_SYS_IOCTL_H) && SunOS != 4
-#include <sys/ioctl.h>
-#endif
-#ifdef HAVE_SYS_FILIO_H
-#include <sys/filio.h>
-#endif /* HAVE_SYS_FILIO_H */
-
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#include <err.h>
-
-#ifdef SOCKS
-#include <socks.h>
-#endif
-
-#include <roken.h>
-
-#include <des.h>
-#include <krb.h>
-#include <krb_db.h>
-#include <prot.h>
-#include <klog.h>
-
-#include <kdc.h>
-
-static des_key_schedule master_key_schedule;
-static des_cblock master_key;
-
-static struct timeval kerb_time;
-static u_char master_key_version;
-static char k_instance[INST_SZ];
-static char *lt;
-static int more;
-
-static int mflag;		/* Are we invoked manually? */
-static char *log_file;		/* name of alt. log file */
-static int nflag;		/* don't check max age */
-static int rflag;		/* alternate realm specified */
-
-/* fields within the received request packet */
-static char *req_name_ptr;
-static char *req_inst_ptr;
-static char *req_realm_ptr;
-static u_int32_t req_time_ws;
-
-static char local_realm[REALM_SZ];
-
-/* options */
-static int max_age = -1;
-static int pause_int = -1;
-
-/*
- * Print usage message and exit.
- */
-static void
-usage(void)
-{
-    fprintf(stderr, "Usage: %s [-s] [-m] [-n] [-p pause_seconds]"
-	    " [-a max_age] [-l log_file] [-r realm] [database_pathname]\n",
-	    __progname);
-    exit(1);
-}
-
-/*
- * kerb_err_reply creates an error reply packet and sends it to the
- * client. 
- */
-
-static void
-kerb_err_reply(int f, struct sockaddr_in *client, int err, char *string)
-{
-    static KTEXT_ST e_pkt_st;
-    KTEXT   e_pkt = &e_pkt_st;
-    static char e_msg[128];
-
-    strcpy(e_msg, "\nKerberos error -- ");
-    strcat(e_msg, string);
-    cr_err_reply(e_pkt, req_name_ptr, req_inst_ptr, req_realm_ptr,
-		 req_time_ws, err, e_msg);
-    sendto(f, (char*)e_pkt->dat, e_pkt->length, 0, (struct sockaddr *)client,
-	   sizeof(*client));
-}
-
-static void
-hang(void)
-{
-    if (pause_int == -1) {
-	klog(L_KRB_PERR, "Kerberos will pause so as not to loop init");
-	for (;;)
-	    pause();
-    } else {
-	char buf[256];
-	snprintf(buf, sizeof(buf),
-		 "Kerberos will wait %d seconds before dying so as not to loop init",
-		 pause_int);
-	klog(L_KRB_PERR, buf);
-	sleep(pause_int);
-	klog(L_KRB_PERR, "Do svedania....\n");
-	exit(1);
-    }
-}
-
-static int
-check_princ(char *p_name, char *instance, unsigned int lifetime, Principal *p)
-{
-    static int n;
-    static int more;
-
-    n = kerb_get_principal(p_name, instance, p, 1, &more);
-    
-    if (n < 0) {
-	lt = klog(L_KRB_PERR, "Database unavailable!");
-	hang();
-    }
-    
-    /*
-     * if more than one p_name, pick one, randomly create a session key,
-     * compute maximum lifetime, lookup authorizations if applicable,
-     * and stuff into cipher. 
-     */
-    if (n == 0) {
-	/* service unknown, log error, skip to next request */
-	lt = klog(L_ERR_UNK, "UNKNOWN %s.%s", p_name, instance);
-	return KERB_ERR_PRINCIPAL_UNKNOWN;
-    }
-    if (more) {
-	/* not unique, log error */
-	lt = klog(L_ERR_NUN, "Principal not unique %s.%s", p_name, instance);
-	return KERB_ERR_PRINCIPAL_NOT_UNIQUE;
-    }
-    /* If the user's key is null, we want to return an error */
-    if ((p->key_low == 0) && (p->key_high == 0)) {
-	/* User has a null key */
-	lt = klog(L_ERR_NKY, "Null key %s.%s", p_name, instance);
-	return KERB_ERR_NULL_KEY;
-    }
-    if (master_key_version != p->kdc_key_ver) {
-	/* log error reply */
-	lt = klog(L_ERR_MKV,
-		  "Incorrect master key version for %s.%s: %d (should be %d)",
-		  p->name, p->instance, p->kdc_key_ver, master_key_version);
-	return KERB_ERR_NAME_MAST_KEY_VER;
-    }
-    /* make sure the service hasn't expired */
-    if ((u_int32_t) p->exp_date < (u_int32_t) kerb_time.tv_sec) {
-	/* service did expire, log it */
-	time_t t = p->exp_date;
-	lt = klog(L_ERR_SEXP,
-		  "Principal %s.%s expired at %s", p->name, p->instance,
-		  krb_stime(&t));
-	return KERB_ERR_NAME_EXP;
-    }
-    /* ok is zero */
-    return 0;
-}
-
-static void
-unseal(des_cblock *key)
-{
-    kdb_encrypt_key(key, key, &master_key, master_key_schedule, DES_DECRYPT);
-}
-
-
-/* Set the key for krb_rd_req so we can check tgt */
-static int
-set_tgtkey(char *r)
-              			/* Realm for desired key */
-{
-    int     n;
-    static char lastrealm[REALM_SZ];
-    Principal p_st;
-    Principal *p = &p_st;
-    des_cblock key;
-
-    if (!strcmp(lastrealm, r))
-	return (KSUCCESS);
-
-    klog(L_ALL_REQ, "Getting key for %s", r);
-
-    n = kerb_get_principal(KRB_TICKET_GRANTING_TICKET, r, p, 1, &more);
-    if (n == 0)
-	return (KFAILURE);
-
-    /* unseal tgt key from master key */
-    copy_to_key(&p->key_low, &p->key_high, key);
-    unseal(&key);
-    krb_set_key(key, 0);
-    strcpy(lastrealm, r);
-    return (KSUCCESS);
-}
-
-
-static int
-kerberos(unsigned char *buf, int len, struct in_addr client, KTEXT rpkt)
-{
-    int pvno;
-    int msg_type;
-    int lsb;
-    int life;
-    int flags = 0;
-    char name[ANAME_SZ], inst[INST_SZ], realm[REALM_SZ];
-    char service[SNAME_SZ], sinst[INST_SZ];
-    u_int32_t req_time;
-    static KTEXT_ST ticket, cipher, adat;
-    KTEXT tk = &ticket, ciph = &cipher, auth = &adat;
-    AUTH_DAT ad;
-    des_cblock session, key;
-    int err;
-    Principal a_name, s_name;
-    
-    char *msg;
-    
-    
-    unsigned char *p = buf;
-    if(len < 2){
-	strcpy((char*)rpkt->dat, "Packet too short");
-	return KFAILURE;
-    }
-
-    gettimeofday(&kerb_time, NULL);
-
-    pvno = *p++;
-    if(pvno != KRB_PROT_VERSION){
-	msg = klog(L_KRB_PERR, "KRB protocol version mismatch (%d)", pvno);
-	strcpy((char*)rpkt->dat, msg);
-	return KERB_ERR_PKT_VER;
-    }
-    msg_type = *p++;
-    lsb = msg_type & 1;
-    msg_type &= ~1;
-    switch(msg_type){
-    case AUTH_MSG_KDC_REQUEST:
-	/* XXX range check */
-	p += krb_get_nir(p, name, inst, realm);
-	p += krb_get_int(p, &req_time, 4, lsb);
-	life = *p++;
-	p += krb_get_nir(p, service, sinst, NULL);
-	klog(L_INI_REQ, "AS REQ %s.%s@%s for %s.%s from %s", 
-	     name, inst, realm, service, sinst, inet_ntoa(client));
-	if((err = check_princ(name, inst, 0, &a_name))){
-	    strcpy((char*)rpkt->dat, krb_get_err_text(err));
-	    return err;
-	}
-	tk->length = 0;
-	if((err = check_princ(service, sinst, 0, &s_name))){
-	    strcpy((char*)rpkt->dat, krb_get_err_text(err));
-	    return err;
-	}
-	life = min(life, s_name.max_life);
-	life = min(life, a_name.max_life);
-    
-	des_new_random_key(&session);
-	copy_to_key(&s_name.key_low, &s_name.key_high, key);
-	unseal(&key);
-	krb_create_ticket(tk, flags, a_name.name, a_name.instance, 
-			  local_realm, client.s_addr, session, 
-			  life, kerb_time.tv_sec, 
-			  s_name.name, s_name.instance, &key);
-	copy_to_key(&a_name.key_low, &a_name.key_high, key);
-	unseal(&key);
-	create_ciph(ciph, session, s_name.name, s_name.instance,
-		    local_realm, life, s_name.key_version, tk, 
-		    kerb_time.tv_sec, &key);
-	memset(&session, 0, sizeof(session));
-	memset(&key, 0, sizeof(key));
-	{
-	    KTEXT r;
-	    r = create_auth_reply(name, inst, realm, req_time, 0, 
-				  a_name.exp_date, a_name.key_version, ciph);
-	    memcpy(rpkt, r, sizeof(*rpkt));
-	}
-	return 0;
-    case AUTH_MSG_APPL_REQUEST:
-	strcpy(realm, (char*)buf + 3);
-	if((err = set_tgtkey(realm))){
-	    msg = klog(L_ERR_UNK, "Unknown realm %s from %s", 
-		       realm, inet_ntoa(client));
-	    strcpy((char*)rpkt->dat, msg);
-	    return err;
-	}
-	p = buf + strlen(realm) + 4;
-	p = p + p[0] + p[1] + 2;
-	auth->length = p - buf;
-	memcpy(auth->dat, buf, auth->length);
-	err = krb_rd_req(auth, KRB_TICKET_GRANTING_TICKET,
-			 realm, client.s_addr, &ad, 0);
-	if(err){
-	    msg = klog(L_ERR_UNK, "krb_rd_req from %s: %s", 
-		       inet_ntoa(client), krb_get_err_text(err));
-	    strcpy((char*)rpkt->dat, msg);
-	    return err;
-	}
-	p += krb_get_int(p, &req_time, 4, lsb);
-	life = *p++;
-	p += krb_get_nir(p, service, sinst, NULL);
-	klog(L_APPL_REQ, "APPL REQ %s.%s@%s for %s.%s from %s",
-	     ad.pname, ad.pinst, ad.prealm, 
-	     service, sinst, 
-	     inet_ntoa(client));
-	if(strcmp(ad.prealm, realm)){
-	    msg = klog(L_ERR_UNK, "Can't hop realms: %s -> %s", 
-		       realm, ad.prealm);
-	    strcpy((char*)rpkt->dat, msg);
-	    return KERB_ERR_PRINCIPAL_UNKNOWN;
-	}
-
-	if(!strcmp(service, "changepw")){
-	    strcpy((char*)rpkt->dat, 
-		   "Can't authorize password changed based on TGT");
-	    return KERB_ERR_PRINCIPAL_UNKNOWN;
-	}
-
-	err = check_princ(service, sinst, life, &s_name);
-	if(err){
-	    strcpy((char*)rpkt->dat, krb_get_err_text(err));
-	    return err;
-	}
-	life = min(life, 
-		   krb_time_to_life(kerb_time.tv_sec, 
-				    krb_life_to_time(ad.time_sec, 
-						     ad.life)));
-	life = min(life, s_name.max_life);
-	copy_to_key(&s_name.key_low, &s_name.key_high, key);
-	unseal(&key);
-	des_new_random_key(&session);
-	krb_create_ticket(tk, flags, ad.pname, ad.pinst, ad.prealm,
-			  client.s_addr, &session, life, kerb_time.tv_sec,
-			  s_name.name, s_name.instance,
-			  &key);
-	
-	memset(&key, 0, sizeof(key));
-
-	create_ciph(ciph, session, service, sinst, local_realm,
-		    life, s_name.key_version, tk,
-		    kerb_time.tv_sec, &ad.session);
-
-	memset(&session, 0, sizeof(session));
-	memset(ad.session, 0, sizeof(ad.session));
-	{
-	    KTEXT r;
-	    r =create_auth_reply(ad.pname, ad.pinst, ad.prealm, 
-				 req_time, 0, 0, 0, ciph);
-	    memcpy(rpkt, r, sizeof(*rpkt));
-	}
-	memset(&s_name, 0, sizeof(s_name));
-	return 0;
-	
-    case AUTH_MSG_ERR_REPLY:
-	return -1;
-    default:
-	msg = klog(L_KRB_PERR, "Unknown message type: %d from %s", 
-		   msg_type, inet_ntoa(client));
-	strcpy((char*)rpkt->dat, msg);
-	return KFAILURE;
-    }
-}
-
-
-static void
-kerberos_wrap(int s, KTEXT data, struct sockaddr_in *client)
-{
-    KTEXT_ST pkt;
-    int err = kerberos(data->dat, data->length, client->sin_addr, &pkt);
-    if(err == -1)
-	return;
-    if(err){
-	kerb_err_reply(s, client, err, (char*)pkt.dat);
-	return;
-    }
-    sendto(s, pkt.dat, pkt.length, 0, (struct sockaddr *)client,
-	   sizeof(*client));
-}
-
-
-/*
- * setup_disc 
- *
- * disconnect all descriptors, remove ourself from the process
- * group that spawned us. 
- */
-
-static void
-setup_disc(void)
-{
-    int     s;
-
-    for (s = 0; s < 3; s++) {
-	close(s);
-    }
-
-    open("/dev/null", 0);
-    dup2(0, 1);
-    dup2(0, 2);
-
-    setsid();
-
-    chdir("/tmp");
-    return;
-}
-
-/*
- * Make sure that database isn't stale.
- *
- * Exit if it is; we don't want to tell lies.
- */
-
-static void
-check_db_age(void)
-{
-    long age;
-    
-    if (max_age != -1) {
-	/* Requires existance of kerb_get_db_age() */
-	gettimeofday(&kerb_time, 0);
-	age = kerb_get_db_age();
-	if (age == 0) {
-	    klog(L_KRB_PERR, "Database currently being updated!");
-	    hang();
-	}
-	if ((age + max_age) < kerb_time.tv_sec) {
-	    klog(L_KRB_PERR, "Database out of date!");
-	    hang();
-	    /* NOTREACHED */
-	}
-    }
-}
-
-struct descr{
-    int s;
-    KTEXT_ST buf;
-    int type;
-    int timeout;
-};
-
-static void
-mksocket(struct descr *d, struct in_addr addr, int type, 
-	 const char *service, int port)
-{
-    struct sockaddr_in sina;
-    int     on = 1;
-    int sock;
-
-    memset(d, 0, sizeof(struct descr));
-    if ((sock = socket(AF_INET, type, 0)) < 0)
-	err (1, "socket");
-#if defined(SO_REUSEADDR) && defined(HAVE_SETSOCKOPT)
-    if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *)&on,
-		   sizeof(on)) < 0)
-	warn ("setsockopt (SO_REUSEADDR)");
-#endif
-    memset(&sina, 0, sizeof(sina));
-    sina.sin_family = AF_INET;
-    sina.sin_port   = port;
-    sina.sin_addr   = addr;
-    if (bind(sock, (struct sockaddr *)&sina, sizeof(sina)) < 0)
-	err (1, "bind '%s/%s' (%d)",
-	     service, (type == SOCK_DGRAM) ? "udp" : "tcp",
-	     ntohs(sina.sin_port));
-    
-    if(type == SOCK_STREAM)
-	listen(sock, SOMAXCONN);
-    d->s = sock;
-    d->type = type;
-}
-
-
-static void loop(struct descr *fds, int maxfd);
-
-int
-main(int argc, char **argv)
-{
-    int     child;
-    int c;
-    struct descr *fds;
-    int nfds;
-    int i;
-    int n;
-    int     kerror;
-
-    umask(077);		/* Create protected files */
-
-    set_progname (argv[0]);
-
-    while ((c = getopt(argc, argv, "snmp:a:l:r:")) != EOF) {
-	switch(c) {
-	case 's':
-	    /*
-	     * Set parameters to slave server defaults.
-	     */
-	    if (max_age == -1 && !nflag)
-		max_age = ONE_DAY;	/* 24 hours */
-	    if (pause_int == -1)
-		pause_int = FIVE_MINUTES; /* 5 minutes */
-#if 0
-	    if (log_file == NULL) {
-		/* this is only silly */
-		log_file = KRBSLAVELOG;
-	    }
-#endif
-	    break;
-	case 'n':
-	    max_age = -1;	/* don't check max age. */
-	    nflag++;
-	    break;
-	case 'm':
-	    mflag++;		/* running manually; prompt for master key */
-	    break;
-	case 'p':
-	    /* Set pause interval. */
-	    if (!isdigit(optarg[0]))
-		usage();
-	    pause_int = atoi(optarg);
-	    if ((pause_int < 5) ||  (pause_int > ONE_HOUR)) {
-		fprintf(stderr, "pause_int must be between 5 and 3600 seconds.\n");
-		usage();
-	    }
-	    break;
-	case 'a':
-	    /* Set max age. */
-	    if (!isdigit(optarg[0])) 
-		usage();
-	    max_age = atoi(optarg);
-	    if ((max_age < ONE_HOUR) || (max_age > THREE_DAYS)) {
-		fprintf(stderr, "max_age must be between one hour and three days, in seconds\n");
-		usage();
-	    }
-	    break;
-	case 'l':
-	    /* Set alternate log file */
-	    log_file = optarg;
-	    break;
-	case 'r':
-	    /* Set realm name */
-	    rflag++;
-	    strcpy(local_realm, optarg);
-	    break;
-	default:
-	    usage();
-	    break;
-	}
-    }
-    
-    if(log_file == NULL)
-	log_file = KRBLOG;
-
-    if (optind == (argc-1)) {
-	if (kerb_db_set_name(argv[optind]) != 0) {
-	    fprintf(stderr, "Could not set alternate database name\n");
-	    exit(1);
-	}
-	optind++;
-    }
-
-    if (optind != argc)
-	usage();
-	
-    printf("Kerberos server starting\n");
-    
-    if ((!nflag) && (max_age != -1))
-	printf("\tMaximum database age: %d seconds\n", max_age);
-    if (pause_int != -1)
-	printf("\tSleep for %d seconds on error\n", pause_int);
-    else
-	printf("\tSleep forever on error\n");
-    if (mflag)
-	printf("\tMaster key will be entered manually\n");
-    
-    printf("\tLog file is %s\n", log_file);
-
-    kset_logfile(log_file);
-    
-    /* find our hostname, and use it as the instance */
-    if (k_gethostname(k_instance, INST_SZ))
-	err (1, "gethostname");
-
-    /*
-     * Yes this looks backwards but it has to be this way to enable a
-     * smooth migration to the new port 88.
-     */
-    {
-      int p1, p2;
-      struct in_addr *a;
-
-      p1 = k_getportbyname ("kerberos-iv", "udp", htons(750));
-      p2 = k_getportbyname ("kerberos-sec", "udp", htons(88));
-
-      if (p1 == p2)
-	{
-	  fprintf(stderr, "Either define kerberos-iv/udp as 750\n");
-	  fprintf(stderr, "      and kerberos-sec/udp as 88\n");
-	  fprintf(stderr, "or the other way around!");
-	  exit(1);
-	}
-
-      nfds = k_get_all_addrs (&a);
-      if (nfds < 0) {
-	   struct in_addr any;
-
-	   any.s_addr = INADDR_ANY;
-
-	   fprintf (stderr, "Could not get local addresses, "
-		    "binding to INADDR_ANY\n");
-	   nfds = 1;
-	   a = malloc(sizeof(*a) * nfds);
-	   memcpy(a, &any, sizeof(struct in_addr));
-      }
-      nfds *= 4;
-      fds = (struct descr*)malloc(nfds * sizeof(struct descr));
-      for (i = 0; i < nfds/4; i++) {
-	  mksocket(fds + 4 * i + 0, a[i], SOCK_DGRAM, "kerberos-iv", p1);
-	  mksocket(fds + 4 * i + 1, a[i], SOCK_DGRAM, "kerberos-sec", p2);
-	  mksocket(fds + 4 * i + 2, a[i], SOCK_STREAM, "kerberos-iv", p1);
-	  mksocket(fds + 4 * i + 3, a[i], SOCK_STREAM, "kerberos-sec", p2);
-      }
-      free (a);
-    }
-    /* do all the database and cache inits */
-    if ((n = kerb_init())) {
-	if (mflag) {
-	    printf("Kerberos db and cache init ");
-	    printf("failed = %d ...exiting\n", n);
-	    exit (1);
-	} else {
-	    klog(L_KRB_PERR,
-	    "Kerberos db and cache init failed = %d ...exiting", n);
-	    hang();
-	}
-    }
-
-    /* Make sure database isn't stale */
-    check_db_age();
-    
-    /* setup master key */
-    if (kdb_get_master_key (mflag, &master_key, master_key_schedule) != 0) {
-      klog (L_KRB_PERR, "kerberos: couldn't get master key.\n");
-      exit (1);
-    }
-    kerror = kdb_verify_master_key (&master_key, master_key_schedule, stdout);
-    if (kerror < 0) {
-      klog (L_KRB_PERR, "Can't verify master key.");
-      memset(master_key, 0, sizeof (master_key));
-      memset (master_key_schedule, 0, sizeof (master_key_schedule));
-      exit (1);
-    }
-
-    master_key_version = (u_char) kerror;
-
-    fprintf(stdout, "\nCurrent Kerberos master key version is %d\n",
-	    master_key_version);
-    des_init_random_number_generator(&master_key);
-
-    if (!rflag) {
-	/* Look up our local realm */
-	krb_get_lrealm(local_realm, 1);
-    }
-    fprintf(stdout, "Local realm: %s\n", local_realm);
-    fflush(stdout);
-
-    if (set_tgtkey(local_realm)) {
-	/* Ticket granting service unknown */
-	klog(L_KRB_PERR, "Ticket granting ticket service unknown");
-	fprintf(stderr, "Ticket granting ticket service unknown\n");
-	exit(1);
-    }
-    if (mflag) {
-	if ((child = fork()) != 0) {
-	    printf("Kerberos started, PID=%d\n", child);
-	    exit(0);
-	}
-	setup_disc();
-    }
-    
-    klog(L_ALL_REQ, "Starting Kerberos for %s (kvno %d)", 
-	 local_realm, master_key_version);
-    
-    /* receive loop */
-    loop(fds, nfds);
-    exit(1);
-}
-
-
-static void
-loop(struct descr *fds, int nfds)
-{
-    for (;;) {
-	int ret;
-        fd_set readfds;
-	struct timeval tv;
-	int maxfd = 0;
-	struct descr *n, *minfree;
-	
-	FD_ZERO(&readfds);
-	gettimeofday(&tv, NULL);
-	maxfd = 0;
-	minfree = NULL;
-	/* Remove expired TCP sockets, and add all other 
-	   to the set we are selecting on */
-	for(n = fds; n < fds + nfds; n++){
-	    if(n->s >= 0 && n->timeout && tv.tv_sec > n->timeout){
-		kerb_err_reply(n->s, NULL, KERB_ERR_TIMEOUT, "Timeout");
-		close(n->s);
-		n->s = -1;
-	    }
-	    if(n->s < 0){
-		if(minfree == NULL) minfree = n;
-		continue;
-	    }
-	    FD_SET(n->s, &readfds);
-	    maxfd = max(maxfd, n->s);
-	}
-	/* add more space for sockets */
-	if(minfree == NULL){
-	    int i = nfds;
-	    struct descr *new;
-	    nfds *=2;
-	    new = realloc(fds, sizeof(struct descr) * nfds);
-	    if(new){
-		fds = new;
-		minfree = fds + i;
-		for(; i < nfds; i++) fds[i].s = -1;
-	    }
-	}
-	ret = select(maxfd + 1, &readfds, 0, 0, 0);
-	for (n = fds; n < fds + nfds; n++){
-	    if(n->s < 0) continue;
-	    if (FD_ISSET(n->s, &readfds)){
-		if(n->type == SOCK_STREAM && n->timeout == 0){
-		    /* add accepted socket to list of sockets we are
-                       selecting on */
-		    int s = accept(n->s, NULL, 0);
-		    if(minfree == NULL){
-			kerb_err_reply(s, NULL, KFAILURE, "Out of memory");
-			close(s);
-		    }else{
-			minfree->s = s;
-			minfree->type = SOCK_STREAM;
-			gettimeofday(&tv, NULL);
-			minfree->timeout = tv.tv_sec + 4; /* XXX */
-		    }
-		}else{
-		    int b;
-		    struct sockaddr_in from;
-		    int fromlen = sizeof(from);
-		    b = recvfrom(n->s, n->buf.dat + n->buf.length, 
-				 MAX_PKT_LEN - n->buf.length, 0, 
-				 (struct sockaddr *)&from, &fromlen);
-		    if(b < 0){
-			if(n->type == SOCK_STREAM){
-			    close(n->s);
-			    n->s = -1;
-			}
-			n->buf.length = 0;
-			continue;
-		    }
-		    n->buf.length += b;
-		    if(n->type == SOCK_STREAM){
-			if(n->buf.length >= 4 && n->buf.dat[0] == 0){
-			    /* if this is a new type of packet (with
-                               the length attached to the head of the
-                               packet), and there is no more data to
-                               be read, fake an old packet, so the
-                               code below will work */
-			    u_int32_t len;
-			    krb_get_int(n->buf.dat, &len, 4, 0);
-			    if(n->buf.length == len + 4){
-				memmove(n->buf.dat, n->buf.dat + 4, len);
-				b = 0;
-			    }
-			}
-			if(b == 0){
-			    /* handle request if there are 
-			       no more bytes to read */
-			    fromlen = sizeof(from);
-			    getpeername(n->s,(struct sockaddr*)&from, &fromlen);
-			    kerberos_wrap(n->s, &n->buf, &from);
-			    n->buf.length = 0;
-			    close(n->s);
-			    n->s = -1;
-			}
-		    }else{
-			/* udp packets are atomic */
-			kerberos_wrap(n->s, &n->buf, &from);
-			n->buf.length = 0;
-		    }
-		}
-	    }
-	}
-    }
-}
diff --git a/crypto/kerberosIV/slave/Makefile.in b/crypto/kerberosIV/slave/Makefile.in
deleted file mode 100644
index ce355465d78a..000000000000
--- a/crypto/kerberosIV/slave/Makefile.in
+++ /dev/null
@@ -1,82 +0,0 @@
-# $Id: Makefile.in,v 1.27 1997/05/04 04:16:28 assar Exp $
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-CC = @CC@
-AR = ar
-RANLIB = @RANLIB@
-DEFS = @DEFS@ -DSBINDIR=\"$(sbindir)\"
-CFLAGS = @CFLAGS@
-LD_FLAGS = @LD_FLAGS@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-LIBS = @LIBS@
-MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-libdir = @libdir@
-libexecdir = @libexecdir@
-sbindir = @sbindir@
-transform=@program_transform_name@
-EXECSUFFIX=@EXECSUFFIX@
-
-PROGS = kpropd$(EXECSUFFIX) \
-	kprop$(EXECSUFFIX)
-
-SOURCES = kpropd.c kprop.c
-
-OBJECTS = kpropd.o kprop.o
-
-all: $(PROGS)
-
-Wall:
-	make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I../include -I$(srcdir) $(CFLAGS) $<
-
-install: all
-	$(MKINSTALLDIRS) $(libexecdir)
-	for x in $(PROGS); do \
-	  $(INSTALL_PROGRAM) $$x $(libexecdir)/`echo $$x | sed '$(transform)'`; \
-	done
-
-uninstall:
-	for x in $(PROGS); do \
-	  rm -f $(libexecdir)/`echo $$x | sed '$(transform)'`; \
-	done
-
-TAGS: $(SOURCES)
-	etags $(SOURCES)
-
-check:
-
-clean:
-	rm -f *.a *.o $(PROGS)
-
-mostlyclean: clean
-
-distclean: clean
-	rm -f Makefile *.tab.c *~
-
-realclean: distclean
-	rm -f TAGS
-
-dist: $(DISTFILES)
-	for file in $(DISTFILES); do \
-	  ln $$file ../`cat ../.fname`/lib \
-	    || cp -p $$file ../`cat ../.fname`/lib; \
-	done
-
-kprop$(EXECSUFFIX): kprop.o
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ kprop.o -L../lib/krb -lkrb -L../lib/des -ldes -L../lib/roken -lroken $(LIBS) -lroken
-
-kpropd$(EXECSUFFIX): kpropd.o
-	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ kpropd.o -L../lib/krb -lkrb -L../lib/des -ldes -L../lib/roken -lroken $(LIBS) -lroken
-
-$(OBJECTS): ../include/config.h
diff --git a/crypto/kerberosIV/slave/kprop.c b/crypto/kerberosIV/slave/kprop.c
deleted file mode 100644
index 89011212ea9a..000000000000
--- a/crypto/kerberosIV/slave/kprop.c
+++ /dev/null
@@ -1,530 +0,0 @@
-/*
-
-Copyright 1987, 1988 by the Student Information Processing Board
-	of the Massachusetts Institute of Technology
-
-Permission to use, copy, modify, and distribute this software
-and its documentation for any purpose and without fee is
-hereby granted, provided that the above copyright notice
-appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation,
-and that the names of M.I.T. and the M.I.T. S.I.P.B. not be
-used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-M.I.T. and the M.I.T. S.I.P.B. make no representations about
-the suitability of this software for any purpose.  It is
-provided "as is" without express or implied warranty.
-
-*/
-
-#include "slav_locl.h"
-
-RCSID("$Id: kprop.c,v 1.29 1997/05/25 02:43:54 joda Exp $");
-
-#include "kprop.h"
-
-static char kprop_version[KPROP_PROT_VERSION_LEN] = KPROP_PROT_VERSION;
-
-int     debug = 0;
-
-char    my_realm[REALM_SZ];
-int     princ_data_size = 3 * sizeof(int32_t) + 3 * sizeof(unsigned char);
-short   transfer_mode, net_transfer_mode;
-int force_flag;
-static char ok[] = ".dump_ok";
-
-struct slave_host {
-    u_int32_t  net_addr;
-    char   *name;
-    char   *instance;
-    char   *realm;
-    int	   not_time_yet;
-    int    succeeded;
-    struct slave_host *next;
-};
-
-static
-int get_slaves(struct slave_host **psl, char *file, time_t ok_mtime)
-{
-    FILE   *fin;
-    char    namebuf[128], *inst;
-    char   *pc;
-    struct hostent *host;
-    struct slave_host **th;
-    char    path[256];
-    char   *ppath;
-    struct stat stbuf;
-
-    if ((fin = fopen(file, "r")) == NULL)
-	err (1, "open(%s)", file);
-    strcpy(path, file);
-    if ((ppath = strrchr(path, '/'))) {
-	ppath += 1;
-    } else {
-	ppath = path;
-    }
-    th = psl;
-    while(fgets(namebuf, sizeof(namebuf), fin)){
-	if ((pc = strchr(namebuf, '\n'))) {
-	    *pc = '\0';
-	} else {
-	    if(strlen(namebuf) == sizeof(namebuf) - 1){
-		warnx ("Hostname too long (>= %d chars) in '%s'.",
-		       (int) sizeof(namebuf), file);
-		do{
-		    if(fgets(namebuf, sizeof(namebuf), fin) == NULL)
-			break;
-		}while(strchr(namebuf, '\n') == NULL);
-		continue;
-	    }
-	}
-	if(namebuf[0] == 0 || namebuf[0] == '#')
-	    continue;
-	host = gethostbyname(namebuf);
-	if (host == NULL) {
-	    warnx ("Ignoring host '%s' in '%s': %s", 
-		   namebuf, file,
-#ifdef HAVE_H_ERRNO
-		   hstrerror(h_errno)
-#else
-		   "unknown error"
-#endif
-		   );
-	    continue;
-	}
-	(*th) = (struct slave_host *) malloc(sizeof(struct slave_host));
-	if (!*th)
-	    errx (1, "No memory reading host list from '%s'.",
-		    file);
-	memset(*th, 0, sizeof(struct slave_host));
-	(*th)->name = strdup(namebuf);
-	if ((*th)->name == NULL)
-	    errx (1, "No memory reading host list from '%s'.",
-		  file);
-	/* get kerberos cannonical instance name */
-	inst = krb_get_phost ((*th)->name);
-	(*th)->instance = strdup(inst);
-	if ((*th)->instance == NULL)
-	    errx (1, "No memory reading host list from '%s'.",
-		  file);
-	/* what a concept, slave servers in different realms! */
-	(*th)->realm = my_realm;
-	memcpy(&(*th)->net_addr, host->h_addr, sizeof((*th)->net_addr));
-	(*th)->not_time_yet = 0;
-	(*th)->succeeded = 0;
-	(*th)->next = NULL;
-	strcat(strcpy(ppath, (*th)->name), "-last-prop");
-	if (!force_flag && !stat(path, &stbuf) && stbuf.st_mtime > ok_mtime) {
-	    (*th)->not_time_yet = 1;
-	    (*th)->succeeded = 1;	/* no change since last success */
-	}
-	th = &(*th)->next;
-    }
-    fclose(fin);
-    return (1);
-}
-
-/* The master -> slave protocol looks like this:
-     1) 8 byte version string
-     2) 2 bytes of "transfer mode" (net byte order of course)
-     3) ticket/authentication send by sendauth
-     4) 4 bytes of "block" length (u_int32_t)
-     5) data
-
-     4 and 5 repeat til EOF ...
-*/
-
-static int
-prop_to_slaves(struct slave_host *sl, int fd, char *fslv)
-{
-    u_char buf[KPROP_BUFSIZ];
-    u_char obuf[KPROP_BUFSIZ + 64]; /* leave room for private msg overhead */
-    struct sockaddr_in sin, my_sin;
-    int     i, n, s;
-    struct slave_host *cs;	/* current slave */
-    char   path[256], my_host_name[MaxHostNameLen], *p_my_host_name;
-    char   kprop_service_instance[INST_SZ];
-    char   *pc;
-    u_int32_t cksum;
-    u_int32_t length, nlength;
-    long   kerror;
-    KTEXT_ST     ticket;
-    CREDENTIALS  cred;
-    MSG_DAT msg_dat;
-    static char tkstring[] = "/tmp/kproptktXXXXXX";
-    
-    des_key_schedule session_sched;
-
-    close(mkstemp(tkstring));
-    krb_set_tkt_string(tkstring);
-    
-    memset(&sin, 0, sizeof sin);
-    sin.sin_family = AF_INET;
-    sin.sin_port = k_getportbyname ("krb_prop", "tcp", htons(KPROP_PORT));
-    sin.sin_addr.s_addr = INADDR_ANY;
-
-    strcpy(path, fslv);
-    if ((pc = strrchr(path, '/'))) {
-	pc += 1;
-    } else {
-	pc = path;
-    }
-
-    for (i = 0; i < 5; i++) {	/* try each slave five times max */
-	for (cs = sl; cs; cs = cs->next) {
-	    if (!cs->succeeded) {
-		if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-		    err (1, "socket");
-		memcpy(&sin.sin_addr, &cs->net_addr, 
-		      sizeof cs->net_addr);
-
-		if (connect(s, (struct sockaddr *) &sin, sizeof sin) < 0) {
-		    warn ("connect(%s)", cs->name);
-		    close(s);
-		    continue;	/*** NEXT SLAVE ***/
-		}
-		
-		/* for krb_mk_{priv, safe} */
-		memset(&my_sin, 0, sizeof my_sin);
-		n = sizeof my_sin;
-		if (getsockname (s, (struct sockaddr *) &my_sin, &n) != 0) {
-		    warn ("getsockname(%s)", cs->name);
-		    close (s);
-		    continue;	/*** NEXT SLAVE ***/
-		}
-		if (n != sizeof (my_sin)) {
-		    warnx ("can't get socketname %s length", cs->name);
-		    close (s);
-		    continue;	/*** NEXT SLAVE ***/
-		}
-		
-		/* Get ticket */
-		kerror = krb_mk_req (&ticket, KPROP_SERVICE_NAME, 
-				     cs->instance, cs->realm, (u_int32_t) 0);
-		/* if ticket has expired try to get a new one, but
-		 * first get a TGT ...
-		 */
-		if (kerror != MK_AP_OK) {
-		    if (k_gethostname (my_host_name, sizeof(my_host_name)) != 0) {
-			warnx ("gethostname(%s): %s",
-			       my_host_name,
-#ifdef HAVE_H_ERRNO
-			       hstrerror(h_errno)
-#else
-			       "unknown error"
-#endif			       
-			       );
-			close (s);
-			break;	/* next one can't work either! */
-		    }
-		    /* get canonical kerberos service instance name */
-		    p_my_host_name = krb_get_phost (my_host_name);
-		    /* copy it to make sure gethostbyname static doesn't
-		     * screw us. */
-		    strcpy (kprop_service_instance, p_my_host_name);
-		    kerror = krb_get_svc_in_tkt (KPROP_SERVICE_NAME, 
-#if 0
-						 kprop_service_instance,
-#else
-						 KRB_MASTER,
-#endif
-						 my_realm,
-						 KRB_TICKET_GRANTING_TICKET,
-						 my_realm,
-						 96,
-						 KPROP_SRVTAB);
-		    if (kerror != INTK_OK) {
-			warnx ("%s: %s.  While getting initial ticket\n",
-			       cs->name, krb_get_err_text(kerror));
-			close (s);
-			goto punt;
-		    }
-		    kerror = krb_mk_req (&ticket, KPROP_SERVICE_NAME, 
-					 cs->instance, cs->realm, (u_int32_t) 0);
-		}
-		if (kerror != MK_AP_OK) {
-		    warnx ("%s: krb_mk_req: %s",
-			   cs->name, krb_get_err_text(kerror));
-		    close (s);
-		    continue;	/*** NEXT SLAVE ***/
-		}		    
-
-		if (write(s, kprop_version, sizeof(kprop_version))
-		    != sizeof(kprop_version)) {
-		    warn ("%s", cs->name);
-		    close (s);
-		    continue;	/*** NEXT SLAVE ***/
-		}
-
-		net_transfer_mode = htons (transfer_mode);
-		if (write(s, &net_transfer_mode, sizeof(net_transfer_mode))
-		    != sizeof(net_transfer_mode)) {
-		    warn ("write(%s)", cs->name);
-		    close (s);
-		    continue;	/*** NEXT SLAVE ***/
-		}
-
-		kerror = krb_get_cred (KPROP_SERVICE_NAME, cs->instance,
-				       cs->realm, &cred);
-		if (kerror != KSUCCESS) {
-		    warnx ("%s: %s.  Getting session key.", 
-			   cs->name, krb_get_err_text(kerror));
-		    close (s);
-		    continue;	/*** NEXT SLAVE ***/
-		}
-#ifdef NOENCRYPTION
-		memset(session_sched, 0, sizeof(session_sched));
-#else
-		if (des_key_sched (&cred.session, session_sched)) {
-		    warnx ("%s: can't make key schedule.",
-			   cs->name);
-		    close (s);
-		    continue;	/*** NEXT SLAVE ***/
-		}
-#endif
-		/* SAFE (quad_cksum) and CLEAR are just not good enough */
-		cksum = 0;
-#ifdef not_working_yet
-		if (transfer_mode != KPROP_TRANSFER_PRIVATE) {
-		    cksum = get_data_checksum(fd, session_sched);
-		    lseek(fd, 0L, 0);
-		}
-		else
-#endif
-           	{
-		    struct stat st;
-		    fstat (fd, &st);
-		    cksum = st.st_size;
-	        }
-		kerror = krb_sendauth(KOPT_DO_MUTUAL,
-				      s,
-				      &ticket,
-				      KPROP_SERVICE_NAME,
-				      cs->instance,
-				      cs->realm,
-				      cksum,
-				      &msg_dat,
-				      &cred,
-				      session_sched,
-				      &my_sin,
-				      &sin,
-				      KPROP_PROT_VERSION);
-		if (kerror != KSUCCESS) {
-		    warnx ("%s: krb_sendauth: %s.",
-			   cs->name, krb_get_err_text(kerror));
-		    close (s);
-		    continue;	/*** NEXT SLAVE ***/
-		}
-
-		lseek(fd, 0L, SEEK_SET); /* Rewind file before rereading it. */
-		while ((n = read(fd, buf, sizeof buf))) {
-		    if (n < 0)
-			err (1, "read");
-		    switch (transfer_mode) {
-		    case KPROP_TRANSFER_PRIVATE:
-		    case KPROP_TRANSFER_SAFE:
-			if (transfer_mode == KPROP_TRANSFER_PRIVATE)
-			    length = krb_mk_priv (buf, obuf, n, 
-						  session_sched, &cred.session,
-						  &my_sin, &sin);
-			else
-			    length = krb_mk_safe (buf, obuf, n,
-						  &cred.session,
-						  &my_sin, &sin);
-			if (length == -1) {
-			    warnx ("%s: %s failed.",
-				   cs->name,
-				   (transfer_mode == KPROP_TRANSFER_PRIVATE) 
-				   ? "krb_rd_priv" : "krb_rd_safe");
-			    close (s);
-			    continue; /*** NEXT SLAVE ***/
-			}
-			nlength = htonl(length);
-			if (write(s, &nlength, sizeof nlength)
-			    != sizeof nlength) {
-			    warn ("write(%s)", cs->name);
-			    close (s);
-			    continue; /*** NEXT SLAVE ***/
-			}
-			if (write(s, obuf, length) != length) {
-			    warn ("write(%s)", cs->name);
-			    close(s);
-			    continue; /*** NEXT SLAVE ***/
-			}
-			break;
-		    case KPROP_TRANSFER_CLEAR:
-			if (write(s, buf, n) != n) {
-			    warn ("write(%s)", cs->name);
-			    close(s);
-			    continue; /*** NEXT SLAVE ***/
-			}
-			break;
-		    }
-		}
-		close(s);
-		cs->succeeded = 1;
-		fprintf(stderr, "%s: success.\n", cs->name);
-		strcat(strcpy(pc, cs->name), "-last-prop");
-		unlink(path);
-		close(creat(path, 0600));
-	    }
-	}
-    }
-punt:
-    
-    dest_tkt();
-    for (cs = sl; cs; cs = cs->next) {
-	if (!cs->succeeded)
-	    return (0);		/* didn't get this slave */
-    }
-    return (1);
-}
-
-static void
-usage()
-{
-    /* already got floc and fslv, what is this? */
-    fprintf(stderr,
-	    "\nUsage: kprop [-force] [-realm realm] [-private"
-#ifdef not_safe_yet
-	    "|-safe|-clear"
-#endif
-	    "] [data_file [slaves_file]]\n\n");
-    exit(1);
-}
-
-
-int
-main(int argc, char **argv)
-{
-    int     fd, i;
-    char   *floc, *floc_ok;
-    char   *fslv;
-    struct stat stbuf, stbuf_ok;
-    time_t   l_init, l_final;
-    char   *pc;
-    int    l_diff;
-    static struct slave_host *slave_host_list = NULL;
-    struct slave_host *sh;
-
-    set_progname (argv[0]);
-
-    transfer_mode = KPROP_TRANSFER_PRIVATE;
-
-    time(&l_init);
-    pc = ctime(&l_init);
-    pc[strlen(pc) - 1] = '\0';
-    printf("\nStart slave propagation: %s\n", pc);
- 
-    floc = NULL;
-    fslv = NULL;
-
-    if (krb_get_lrealm(my_realm,1) != KSUCCESS)
-      errx (1, "Getting my kerberos realm.  Check krb.conf");
-
-    for (i = 1; i < argc; i++) 
-      switch (argv[i][0]) {
-      case '-':
-	if (strcmp (argv[i], "-private") == 0) 
-	  transfer_mode = KPROP_TRANSFER_PRIVATE;
-#ifdef not_safe_yet
-	else if (strcmp (argv[i], "-safe") == 0) 
-	  transfer_mode = KPROP_TRANSFER_SAFE;
-	else if (strcmp (argv[i], "-clear") == 0) 
-	  transfer_mode = KPROP_TRANSFER_CLEAR;
-#endif
-	else if (strcmp (argv[i], "-realm") == 0) {
-	    i++;
-	    if (i < argc)
-		strcpy(my_realm, argv[i]);
-	    else
-		usage();
-	} else if (strcmp (argv[i], "-force") == 0)
-	    force_flag++;
-	else {
-	    warnx("unknown control argument %s.", argv[i]);
-	    usage ();
-	}
-	break;
-      default:
-	/* positional arguments are marginal at best ... */
-	if (floc == NULL)
-	  floc = argv[i];
-	else {
-	  if (fslv == NULL)
-	    fslv = argv[i];
-	  else 
-	      usage();
-	}
-      }
-    if(floc == NULL)
-	floc = DB_DIR "/slave_dump";
-    if(fslv == NULL)
-	fslv = DB_DIR "/slaves";
-	
-    asprintf (&floc_ok, "%s%s", floc, ok);
-    if (floc_ok == NULL)
-	errx (1, "out of memory in copying %s", floc);
-
-    if ((fd = open(floc, O_RDONLY)) < 0)
-	err (1, "open(%s)", floc);
-    if (k_flock(fd, K_LOCK_SH | K_LOCK_NB))
-	err (1, "flock(%s)", floc);
-    if (stat(floc, &stbuf))
-	err (1, "stat(%s)", floc);
-    if (stat(floc_ok, &stbuf_ok))
-	err (1, "stat(%s)", floc_ok);
-    if (stbuf.st_mtime > stbuf_ok.st_mtime)
-	errx (1, "'%s' more recent than '%s'.", floc, floc_ok);
-    if (!get_slaves(&slave_host_list, fslv, stbuf_ok.st_mtime))
-	errx (1, "can't read slave host file '%s'.", fslv);
-#ifdef KPROP_DBG
-    {
-	struct slave_host *sh;
-	int     i;
-	fprintf(stderr, "\n\n");
-	fflush(stderr);
-	for (sh = slave_host_list; sh; sh = sh->next) {
-	    fprintf(stderr, "slave %d: %s, %s", i++, sh->name,
-		    inet_ntoa(sh->net_addr));
-	    fflush(stderr);
-	}
-    }
-#endif				/* KPROP_DBG */
-
-    if (!prop_to_slaves(slave_host_list, fd, fslv))
-	errx (1, "propagation failed.");
-    if (k_flock(fd, K_LOCK_UN))
-	err (1, "flock(%s, LOCK_UN)", floc);
-    fprintf(stderr, "\n\n");
-    for (sh = slave_host_list; sh; sh = sh->next) {
-	fprintf(stderr, "%s:\t\t%s\n", sh->name,
-		(sh->not_time_yet? "Not time yet" : (sh->succeeded ? "Succeeded" : "FAILED")));
-    }
-
-    time(&l_final);
-    l_diff = l_final - l_init;
-    printf("propagation finished, %d:%02d:%02d elapsed\n",
-	   l_diff / 3600, (l_diff % 3600) / 60, l_diff % 60);
-
-    exit(0);
-}
-
-#ifdef doesnt_work_yet
-u_long get_data_checksum(fd, key_sched)
-     int fd;
-     des_key_schedule key_sched;
-{
-	u_int32_t cksum = 0;
-	int n;
-	char buf[BUFSIZ];
-	u_int32_t obuf[2];
-
-	while (n = read(fd, buf, sizeof buf)) {
-	    if (n < 0)
-		err (1, "read");
-	    cksum = cbc_cksum(buf, obuf, n, key_sched, key_sched);
-	}
-	return cksum;
-}
-#endif
diff --git a/crypto/kerberosIV/slave/kprop.h b/crypto/kerberosIV/slave/kprop.h
deleted file mode 100644
index d66f63f73474..000000000000
--- a/crypto/kerberosIV/slave/kprop.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* 
- * Copyright 1987 by the Massachusetts Institute of Technology.
- *
- * For copying and distribution information,
- * please see the file <mit-copyright.h>.
- *
- * $Id: kprop.h,v 1.5 1997/02/07 21:39:52 assar Exp $
- *
- */
-
-#define KPROP_SERVICE_NAME "rcmd"
-#define KPROP_SRVTAB "/etc/srvtab"
-#define KPROP_PROT_VERSION_LEN 8
-#define KPROP_PROT_VERSION "kprop01"
-#define KPROP_TRANSFER_PRIVATE 1
-#define KPROP_TRANSFER_SAFE 2
-#define KPROP_TRANSFER_CLEAR 3
-#define KPROP_BUFSIZ 32768
-#define KPROP_PORT 754
diff --git a/crypto/kerberosIV/slave/kpropd.c b/crypto/kerberosIV/slave/kpropd.c
deleted file mode 100644
index e2b5f0a2a293..000000000000
--- a/crypto/kerberosIV/slave/kpropd.c
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "slav_locl.h"
-
-#include "kprop.h"
-
-RCSID("$Id: kpropd.c,v 2.21 1997/05/02 17:52:13 assar Exp $");
-
-#ifndef SBINDIR
-#define SBINDIR "/usr/athena/sbin"
-#endif
-
-struct sockaddr_in master, slave;
-
-char *database = DBM_FILE;
-
-char *lockfile = DB_DIR "/slave_propagation";
-
-char *logfile = K_LOGFIL;
-
-char *kdb_util = SBINDIR "/kdb_util";
-
-char *kdb_util_command = "load";
-
-char *srvtab = "";
-
-char realm[REALM_SZ];
-
-static
-int
-copy_data(int from, int to, des_cblock *session, des_key_schedule schedule)
-{
-    unsigned char tmp[4];
-    char buf[KPROP_BUFSIZ + 26];
-    u_int32_t length;
-    int n;
-    
-    int kerr;
-    MSG_DAT m;
-
-    while(1){
-	n = krb_net_read(from, tmp, 4);
-	if(n == 0)
-	    break;
-	if(n < 0){
-	    klog(L_KRB_PERR, "krb_net_read: %s", strerror(errno));
-	    return -1;
-	}
-	if(n != 4){
-	    klog(L_KRB_PERR, "Premature end of data");
-	    return -1;
-	}
-	length = (tmp[0] << 24) | (tmp[1] << 16) | (tmp[2] << 8) | tmp[3];
-	if(length > sizeof(buf)){
-	    klog(L_KRB_PERR, "Giant packet received: %d", length);
-	    return -1;
-	}
-	if(krb_net_read(from, buf, length) != length){
-	    klog(L_KRB_PERR, "Premature end of data");
-	    return -1;
-	}
-	kerr = krb_rd_priv (buf, length, schedule, session, &master, &slave, &m);
-	if(kerr != KSUCCESS){
-	    klog(L_KRB_PERR, "Kerberos error: %s", krb_get_err_text(kerr));
-	    return -1;
-	}
-	write(to, m.app_data, m.app_length);
-    }
-    return 0;
-}
-
-
-static
-int
-kprop(int s)
-{
-    char buf[128];
-    int n;
-    KTEXT_ST ticket;
-    AUTH_DAT ad;
-    char sinst[INST_SZ];
-    char command[1024];
-    des_key_schedule schedule;
-    int mode;
-    int kerr;
-    int lock;
-    
-    n = sizeof(master);
-    if(getpeername(s, (struct sockaddr*)&master, &n) < 0){
-	klog(L_KRB_PERR, "getpeername: %s", strerror(errno));
-	return 1;
-    }
-    
-    n = sizeof(slave);
-    if(getsockname(s, (struct sockaddr*)&slave, &n) < 0){
-	klog(L_KRB_PERR, "getsockname: %s", strerror(errno));
-	return 1;
-    }
-
-    klog(L_KRB_PERR, "Connection from %s", inet_ntoa(master.sin_addr));
-
-    n = krb_net_read(s, buf, KPROP_PROT_VERSION_LEN + 2);
-    if(n < KPROP_PROT_VERSION_LEN + 2){
-	klog(L_KRB_PERR, "Premature end of data");
-	return 1;
-    }
-    if(memcmp(buf, KPROP_PROT_VERSION, KPROP_PROT_VERSION_LEN) != 0){
-	klog(L_KRB_PERR, "Bad protocol version string received");
-	return 1;
-    }
-    mode = (buf[n-2] << 8) | buf[n-1];
-    if(mode != KPROP_TRANSFER_PRIVATE){
-	klog(L_KRB_PERR, "Bad transfer mode received: %d", mode);
-	return 1;
-    }
-    k_getsockinst(s, sinst, sizeof(sinst));
-    kerr = krb_recvauth(KOPT_DO_MUTUAL, s, &ticket,
-			KPROP_SERVICE_NAME, sinst,
-			&master, &slave,
-			&ad, srvtab, schedule, 
-			buf);
-    if(kerr != KSUCCESS){
-	klog(L_KRB_PERR, "Kerberos error: %s", krb_get_err_text(kerr));
-	return 1;
-    }
-    des_set_key(&ad.session, schedule);
-    
-    lock = open(lockfile, O_WRONLY|O_CREAT, 0600);
-    if(lock < 0){
-	klog(L_KRB_PERR, "Failed to open file: %s", strerror(errno));
-	return 1;
-    }
-    if(k_flock(lock, K_LOCK_EX | K_LOCK_NB)){
-	close(lock);
-	klog(L_KRB_PERR, "Failed to lock file: %s", strerror(errno));
-	return 1;
-    }
-    
-    if(ftruncate(lock, 0) < 0){
-	close(lock);
-	klog(L_KRB_PERR, "Failed to lock file: %s", strerror(errno));
-	return 1;
-    }
-
-    if(copy_data(s, lock, &ad.session, schedule)){
-	close(lock);
-	return 1;
-    }
-    close(lock);
-    snprintf(command, sizeof(command),
-	     "%s %s %s %s", kdb_util, kdb_util_command, 
-	    lockfile, database);
-    if(system(command) == 0){
-	klog(L_KRB_PERR, "Propagation finished successfully");
-	return 0;
-    }
-    klog(L_KRB_PERR, "*** Propagation failed ***");
-    return 1;
-}
-
-static int
-doit(void)
-{
-    return kprop(0);
-}
-
-static int
-doit_interactive(void)
-{
-    struct sockaddr_in sa;
-    int salen;
-    int s, s2;
-    int ret;
-
-    s = socket(AF_INET, SOCK_STREAM, 0);
-    if(s < 0){
-      klog(L_KRB_PERR, "socket: %s", strerror(errno));
-      return 1;
-    }
-    memset(&sa, 0, sizeof(sa));
-    sa.sin_family = AF_INET;
-    sa.sin_port = k_getportbyname ("krb_prop", "tcp", htons(KPROP_PORT));
-    ret = bind(s, (struct sockaddr*)&sa, sizeof(sa));
-    if (ret < 0) {
-      klog(L_KRB_PERR, "bind: %s", strerror(errno));
-      return 1;
-    }
-    ret = listen(s, SOMAXCONN);
-    if (ret < 0) {
-      klog(L_KRB_PERR, "listen: %s", strerror(errno));
-      return 1;
-    }
-    for(;;) {
-      salen = sizeof(sa);
-      s2 = accept(s, (struct sockaddr*)&sa, &salen);
-      switch(fork()){
-      case -1:
-	klog(L_KRB_PERR, "fork: %s", strerror(errno));
-	return 1;
-      case 0:
-	close(s);
-	kprop(s2);
-	return 1;
-      default: {
-	  int status;
-	  close(s2);
-	  wait(&status);
-	}
-      }
-    }
-}
-
-static void
-usage (void)
-{
-     fprintf (stderr, 
-	      "Usage: kpropd [-i] [-d database] [-l log] [-m] [-[p|P] program]"
-	      " [-r realm] [-s srvtab]\n");
-     exit (1);
-}
-
-int
-main(int argc, char **argv)
-{
-    int opt;
-    int interactive = 0;
-
-    krb_get_lrealm(realm, 1);
-    
-    while((opt = getopt(argc, argv, ":d:l:mp:P:r:s:i")) >= 0){
-	switch(opt){
-	case 'd':
-	    database = optarg;
-	    break;
-	case 'l':
-	    logfile = optarg;
-	    break;
-	case 'm':
-	    kdb_util_command = "merge";
-	    break;
-	case 'p':
-	case 'P':
-	    kdb_util = optarg;
-	    break;
-	case 'r':
-	    strcpy(realm, optarg);
-	    break;
-	case 's':
-	    srvtab = optarg;
-	    break;
-	case 'i':
-	    interactive = 1;
-	    break;
-	default:
-	    klog(L_KRB_PERR, "Bad option: -%c", optopt);
-	    usage ();
-	    exit(1);
-	}
-    }
-    kset_logfile(logfile);
-    if (interactive)
-      return doit_interactive ();
-    else
-      return doit ();
-}
diff --git a/crypto/kerberosIV/slave/slav_locl.h b/crypto/kerberosIV/slave/slav_locl.h
deleted file mode 100644
index 760fb9dbc751..000000000000
--- a/crypto/kerberosIV/slave/slav_locl.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id: slav_locl.h,v 1.11 1997/05/20 18:40:47 bg Exp $ */
-
-#ifndef __slav_locl_h
-#define __slav_locl_h
-
-#include "config.h"
-#include "protos.h"
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#include <errno.h>
-#include <unistd.h>
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <time.h>
-#ifdef HAVE_SYS_FILE_H
-#include <sys/file.h>
-#endif
-#ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#include <err.h>
-
-#ifdef SOCKS
-#include <socks.h>
-#endif
-
-#include <roken.h>
-
-#include <krb.h>
-#include <krb_db.h>
-#include <klog.h>
-#include <prot.h>
-#include <kdc.h>
-
-#include "kprop.h"
-
-#endif /*  __slav_locl_h */
diff --git a/crypto/telnet/arpa/telnet.h b/crypto/telnet/arpa/telnet.h
deleted file mode 100644
index 01601f16b24e..000000000000
--- a/crypto/telnet/arpa/telnet.h
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)telnet.h	8.2 (Berkeley) 12/15/93
- */
-
-#ifndef _ARPA_TELNET_H_
-#define	_ARPA_TELNET_H_
-
-/*
- * Definitions for the TELNET protocol.
- */
-#define	IAC	255		/* interpret as command: */
-#define	DONT	254		/* you are not to use option */
-#define	DO	253		/* please, you use option */
-#define	WONT	252		/* I won't use option */
-#define	WILL	251		/* I will use option */
-#define	SB	250		/* interpret as subnegotiation */
-#define	GA	249		/* you may reverse the line */
-#define	EL	248		/* erase the current line */
-#define	EC	247		/* erase the current character */
-#define	AYT	246		/* are you there */
-#define	AO	245		/* abort output--but let prog finish */
-#define	IP	244		/* interrupt process--permanently */
-#define	BREAK	243		/* break */
-#define	DM	242		/* data mark--for connect. cleaning */
-#define	NOP	241		/* nop */
-#define	SE	240		/* end sub negotiation */
-#define EOR     239             /* end of record (transparent mode) */
-#define	ABORT	238		/* Abort process */
-#define	SUSP	237		/* Suspend process */
-#define	xEOF	236		/* End of file: EOF is already used... */
-
-#define SYNCH	242		/* for telfunc calls */
-
-#ifdef TELCMDS
-char *telcmds[] = {
-	"EOF", "SUSP", "ABORT", "EOR",
-	"SE", "NOP", "DMARK", "BRK", "IP", "AO", "AYT", "EC",
-	"EL", "GA", "SB", "WILL", "WONT", "DO", "DONT", "IAC",
-	0
-};
-#else
-extern char *telcmds[];
-#endif
-
-#define	TELCMD_FIRST	xEOF
-#define	TELCMD_LAST	IAC
-#define	TELCMD_OK(x)	((unsigned int)(x) <= TELCMD_LAST && \
-			 (unsigned int)(x) >= TELCMD_FIRST)
-#define	TELCMD(x)	telcmds[(x)-TELCMD_FIRST]
-
-/* telnet options */
-#define TELOPT_BINARY	0	/* 8-bit data path */
-#define TELOPT_ECHO	1	/* echo */
-#define	TELOPT_RCP	2	/* prepare to reconnect */
-#define	TELOPT_SGA	3	/* suppress go ahead */
-#define	TELOPT_NAMS	4	/* approximate message size */
-#define	TELOPT_STATUS	5	/* give status */
-#define	TELOPT_TM	6	/* timing mark */
-#define	TELOPT_RCTE	7	/* remote controlled transmission and echo */
-#define TELOPT_NAOL 	8	/* negotiate about output line width */
-#define TELOPT_NAOP 	9	/* negotiate about output page size */
-#define TELOPT_NAOCRD	10	/* negotiate about CR disposition */
-#define TELOPT_NAOHTS	11	/* negotiate about horizontal tabstops */
-#define TELOPT_NAOHTD	12	/* negotiate about horizontal tab disposition */
-#define TELOPT_NAOFFD	13	/* negotiate about formfeed disposition */
-#define TELOPT_NAOVTS	14	/* negotiate about vertical tab stops */
-#define TELOPT_NAOVTD	15	/* negotiate about vertical tab disposition */
-#define TELOPT_NAOLFD	16	/* negotiate about output LF disposition */
-#define TELOPT_XASCII	17	/* extended ascic character set */
-#define	TELOPT_LOGOUT	18	/* force logout */
-#define	TELOPT_BM	19	/* byte macro */
-#define	TELOPT_DET	20	/* data entry terminal */
-#define	TELOPT_SUPDUP	21	/* supdup protocol */
-#define	TELOPT_SUPDUPOUTPUT 22	/* supdup output */
-#define	TELOPT_SNDLOC	23	/* send location */
-#define	TELOPT_TTYPE	24	/* terminal type */
-#define	TELOPT_EOR	25	/* end or record */
-#define	TELOPT_TUID	26	/* TACACS user identification */
-#define	TELOPT_OUTMRK	27	/* output marking */
-#define	TELOPT_TTYLOC	28	/* terminal location number */
-#define	TELOPT_3270REGIME 29	/* 3270 regime */
-#define	TELOPT_X3PAD	30	/* X.3 PAD */
-#define	TELOPT_NAWS	31	/* window size */
-#define	TELOPT_TSPEED	32	/* terminal speed */
-#define	TELOPT_LFLOW	33	/* remote flow control */
-#define TELOPT_LINEMODE	34	/* Linemode option */
-#define TELOPT_XDISPLOC	35	/* X Display Location */
-#define TELOPT_OLD_ENVIRON 36	/* Old - Environment variables */
-#define	TELOPT_AUTHENTICATION 37/* Authenticate */
-#define	TELOPT_ENCRYPT	38	/* Encryption option */
-#define TELOPT_NEW_ENVIRON 39	/* New - Environment variables */
-#define	TELOPT_EXOPL	255	/* extended-options-list */
-
-
-#define	NTELOPTS	(1+TELOPT_NEW_ENVIRON)
-#ifdef TELOPTS
-char *telopts[NTELOPTS+1] = {
-	"BINARY", "ECHO", "RCP", "SUPPRESS GO AHEAD", "NAME",
-	"STATUS", "TIMING MARK", "RCTE", "NAOL", "NAOP",
-	"NAOCRD", "NAOHTS", "NAOHTD", "NAOFFD", "NAOVTS",
-	"NAOVTD", "NAOLFD", "EXTEND ASCII", "LOGOUT", "BYTE MACRO",
-	"DATA ENTRY TERMINAL", "SUPDUP", "SUPDUP OUTPUT",
-	"SEND LOCATION", "TERMINAL TYPE", "END OF RECORD",
-	"TACACS UID", "OUTPUT MARKING", "TTYLOC",
-	"3270 REGIME", "X.3 PAD", "NAWS", "TSPEED", "LFLOW",
-	"LINEMODE", "XDISPLOC", "OLD-ENVIRON", "AUTHENTICATION",
-	"ENCRYPT", "NEW-ENVIRON",
-	0
-};
-#define	TELOPT_FIRST	TELOPT_BINARY
-#define	TELOPT_LAST	TELOPT_NEW_ENVIRON
-#define	TELOPT_OK(x)	((unsigned int)(x) <= TELOPT_LAST)
-#define	TELOPT(x)	telopts[(x)-TELOPT_FIRST]
-#endif
-
-/* sub-option qualifiers */
-#define	TELQUAL_IS	0	/* option is... */
-#define	TELQUAL_SEND	1	/* send option */
-#define	TELQUAL_INFO	2	/* ENVIRON: informational version of IS */
-#define	TELQUAL_REPLY	2	/* AUTHENTICATION: client version of IS */
-#define	TELQUAL_NAME	3	/* AUTHENTICATION: client version of IS */
-
-#define	LFLOW_OFF		0	/* Disable remote flow control */
-#define	LFLOW_ON		1	/* Enable remote flow control */
-#define	LFLOW_RESTART_ANY	2	/* Restart output on any char */
-#define	LFLOW_RESTART_XON	3	/* Restart output only on XON */
-
-/*
- * LINEMODE suboptions
- */
-
-#define	LM_MODE		1
-#define	LM_FORWARDMASK	2
-#define	LM_SLC		3
-
-#define	MODE_EDIT	0x01
-#define	MODE_TRAPSIG	0x02
-#define	MODE_ACK	0x04
-#define MODE_SOFT_TAB	0x08
-#define MODE_LIT_ECHO	0x10
-
-#define	MODE_MASK	0x1f
-
-/* Not part of protocol, but needed to simplify things... */
-#define MODE_FLOW		0x0100
-#define MODE_ECHO		0x0200
-#define MODE_INBIN		0x0400
-#define MODE_OUTBIN		0x0800
-#define MODE_FORCE		0x1000
-
-#define	SLC_SYNCH	1
-#define	SLC_BRK		2
-#define	SLC_IP		3
-#define	SLC_AO		4
-#define	SLC_AYT		5
-#define	SLC_EOR		6
-#define	SLC_ABORT	7
-#define	SLC_EOF		8
-#define	SLC_SUSP	9
-#define	SLC_EC		10
-#define	SLC_EL		11
-#define	SLC_EW		12
-#define	SLC_RP		13
-#define	SLC_LNEXT	14
-#define	SLC_XON		15
-#define	SLC_XOFF	16
-#define	SLC_FORW1	17
-#define	SLC_FORW2	18
-#define SLC_MCL         19
-#define SLC_MCR         20
-#define SLC_MCWL        21
-#define SLC_MCWR        22
-#define SLC_MCBOL       23
-#define SLC_MCEOL       24
-#define SLC_INSRT       25
-#define SLC_OVER        26
-#define SLC_ECR         27
-#define SLC_EWR         28
-#define SLC_EBOL        29
-#define SLC_EEOL        30
-
-#define	NSLC		30
-
-/*
- * For backwards compatability, we define SLC_NAMES to be the
- * list of names if SLC_NAMES is not defined.
- */
-#define	SLC_NAMELIST	"0", "SYNCH", "BRK", "IP", "AO", "AYT", "EOR", \
-			"ABORT", "EOF", "SUSP", "EC", "EL", "EW", "RP", \
-			"LNEXT", "XON", "XOFF", "FORW1", "FORW2",	\
-			"MCL", "MCR", "MCWL", "MCWR", "MCBOL",		\
-			"MCEOL", "INSRT", "OVER", "ECR", "EWR",		\
-			"EBOL", "EEOL",					\
-			0
-
-#ifdef	SLC_NAMES
-char *slc_names[] = {
-	SLC_NAMELIST
-};
-#else
-extern char *slc_names[];
-#define	SLC_NAMES SLC_NAMELIST
-#endif
-
-#define	SLC_NAME_OK(x)	((unsigned int)(x) <= NSLC)
-#define SLC_NAME(x)	slc_names[x]
-
-#define	SLC_NOSUPPORT	0
-#define	SLC_CANTCHANGE	1
-#define	SLC_VARIABLE	2
-#define	SLC_DEFAULT	3
-#define	SLC_LEVELBITS	0x03
-
-#define	SLC_FUNC	0
-#define	SLC_FLAGS	1
-#define	SLC_VALUE	2
-
-#define	SLC_ACK		0x80
-#define	SLC_FLUSHIN	0x40
-#define	SLC_FLUSHOUT	0x20
-
-#define	OLD_ENV_VAR	1
-#define	OLD_ENV_VALUE	0
-#define	NEW_ENV_VAR	0
-#define	NEW_ENV_VALUE	1
-#define	ENV_ESC		2
-#define ENV_USERVAR	3
-
-/*
- * AUTHENTICATION suboptions
- */
-
-/*
- * Who is authenticating who ...
- */
-#define	AUTH_WHO_CLIENT		0	/* Client authenticating server */
-#define	AUTH_WHO_SERVER		1	/* Server authenticating client */
-#define	AUTH_WHO_MASK		1
-
-/*
- * amount of authentication done
- */
-#define	AUTH_HOW_ONE_WAY	0
-#define	AUTH_HOW_MUTUAL		2
-#define	AUTH_HOW_MASK		2
-
-#define	AUTHTYPE_NULL		0
-#define	AUTHTYPE_KERBEROS_V4	1
-#define	AUTHTYPE_KERBEROS_V5	2
-#define	AUTHTYPE_SPX		3
-#define	AUTHTYPE_MINK		4
-#define	AUTHTYPE_CNT		5
-
-#define	AUTHTYPE_TEST		99
-
-#ifdef	AUTH_NAMES
-char *authtype_names[] = {
-	"NULL", "KERBEROS_V4", "KERBEROS_V5", "SPX", "MINK",
-	0
-};
-#else
-extern char *authtype_names[];
-#endif
-
-#define	AUTHTYPE_NAME_OK(x)	((unsigned int)(x) < AUTHTYPE_CNT)
-#define	AUTHTYPE_NAME(x)	authtype_names[x]
-
-/*
- * ENCRYPTion suboptions
- */
-#define	ENCRYPT_IS		0	/* I pick encryption type ... */
-#define	ENCRYPT_SUPPORT		1	/* I support encryption types ... */
-#define	ENCRYPT_REPLY		2	/* Initial setup response */
-#define	ENCRYPT_START		3	/* Am starting to send encrypted */
-#define	ENCRYPT_END		4	/* Am ending encrypted */
-#define	ENCRYPT_REQSTART	5	/* Request you start encrypting */
-#define	ENCRYPT_REQEND		6	/* Request you end encrypting */
-#define	ENCRYPT_ENC_KEYID	7
-#define	ENCRYPT_DEC_KEYID	8
-#define	ENCRYPT_CNT		9
-
-#define	ENCTYPE_ANY		0
-#define	ENCTYPE_DES_CFB64	1
-#define	ENCTYPE_DES_OFB64	2
-#define	ENCTYPE_CNT		3
-
-#ifdef	ENCRYPT_NAMES
-char *encrypt_names[] = {
-	"IS", "SUPPORT", "REPLY", "START", "END",
-	"REQUEST-START", "REQUEST-END", "ENC-KEYID", "DEC-KEYID",
-	0
-};
-char *enctype_names[] = {
-	"ANY", "DES_CFB64",  "DES_OFB64",
-	0
-};
-#else
-extern char *encrypt_names[];
-extern char *enctype_names[];
-#endif
-
-
-#define	ENCRYPT_NAME_OK(x)	((unsigned int)(x) < ENCRYPT_CNT)
-#define	ENCRYPT_NAME(x)		encrypt_names[x]
-
-#define	ENCTYPE_NAME_OK(x)	((unsigned int)(x) < ENCTYPE_CNT)
-#define	ENCTYPE_NAME(x)		enctype_names[x]
-
-#endif /* !_TELNET_H_ */
diff --git a/crypto/telnet/libtelnet/auth-proto.h b/crypto/telnet/libtelnet/auth-proto.h
deleted file mode 100644
index a1e9aa410ff6..000000000000
--- a/crypto/telnet/libtelnet/auth-proto.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)auth-proto.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * Copyright (C) 1990 by the Massachusetts Institute of Technology
- *
- * Export of this software from the United States of America is assumed
- * to require a specific license from the United States Government.
- * It is the responsibility of any person or organization contemplating
- * export to obtain such a license before exporting.
- * 
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of M.I.T. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission.  M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express
- * or implied warranty.
- */
-
-#if	!defined(P)
-#ifdef	__STDC__
-#define	P(x)	x
-#else
-#define	P(x)	()
-#endif
-#endif
-
-#if	defined(AUTHENTICATION)
-Authenticator *findauthenticator P((int, int));
-
-void auth_init P((char *, int));
-int auth_cmd P((int, char **));
-void auth_request P((void));
-void auth_send P((unsigned char *, int));
-void auth_send_retry P((void));
-void auth_is P((unsigned char *, int));
-void auth_reply P((unsigned char *, int));
-void auth_finished P((Authenticator *, int));
-int auth_wait P((char *));
-void auth_disable_name P((char *));
-void auth_gen_printsub P((unsigned char *, int, unsigned char *, int));
-void auth_name P((unsigned char *, int));
-void auth_printsub P((unsigned char *, int, unsigned char *, int));
-int auth_sendname P((unsigned char *, int));
-void auth_encrypt_user P((char *));
-
-#ifdef	KRB4
-int kerberos4_init P((Authenticator *, int));
-int kerberos4_send P((Authenticator *));
-void kerberos4_is P((Authenticator *, unsigned char *, int));
-void kerberos4_reply P((Authenticator *, unsigned char *, int));
-int kerberos4_status P((Authenticator *, char *, int));
-void kerberos4_printsub P((unsigned char *, int, unsigned char *, int));
-#endif
-
-#ifdef	KRB5
-int kerberos5_init P((Authenticator *, int));
-int kerberos5_send P((Authenticator *));
-void kerberos5_is P((Authenticator *, unsigned char *, int));
-void kerberos5_reply P((Authenticator *, unsigned char *, int));
-int kerberos5_status P((Authenticator *, char *, int));
-void kerberos5_printsub P((unsigned char *, int, unsigned char *, int));
-#endif
-#endif
diff --git a/crypto/telnet/libtelnet/auth.c b/crypto/telnet/libtelnet/auth.c
deleted file mode 100644
index 4262b55a100a..000000000000
--- a/crypto/telnet/libtelnet/auth.c
+++ /dev/null
@@ -1,674 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static const char sccsid[] = "@(#)auth.c	8.3 (Berkeley) 5/30/95";
-#endif /* not lint */
-
-/*
- * Copyright (C) 1990 by the Massachusetts Institute of Technology
- *
- * Export of this software from the United States of America is assumed
- * to require a specific license from the United States Government.
- * It is the responsibility of any person or organization contemplating
- * export to obtain such a license before exporting.
- *
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of M.I.T. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission.  M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express
- * or implied warranty.
- */
-
-
-#if	defined(AUTHENTICATION)
-#include <stdio.h>
-#include <sys/types.h>
-#include <signal.h>
-#define	AUTH_NAMES
-#include <arpa/telnet.h>
-#ifdef	__STDC__
-#include <stdlib.h>
-#include <unistd.h>
-#endif
-#ifdef	NO_STRING_H
-#include <strings.h>
-#else
-#include <string.h>
-#endif
-
-#include "encrypt.h"
-#include "auth.h"
-#include "misc-proto.h"
-#include "auth-proto.h"
-
-#define	typemask(x)		(1<<((x)-1))
-
-#ifdef	KRB4_ENCPWD
-extern krb4encpwd_init();
-extern krb4encpwd_send();
-extern krb4encpwd_is();
-extern krb4encpwd_reply();
-extern krb4encpwd_status();
-extern krb4encpwd_printsub();
-#endif
-
-#ifdef	RSA_ENCPWD
-extern rsaencpwd_init();
-extern rsaencpwd_send();
-extern rsaencpwd_is();
-extern rsaencpwd_reply();
-extern rsaencpwd_status();
-extern rsaencpwd_printsub();
-#endif
-
-int auth_debug_mode = 0;
-static 	char	*Name = "Noname";
-static	int	Server = 0;
-static	Authenticator	*authenticated = 0;
-static	int	authenticating = 0;
-static	int	validuser = 0;
-static	unsigned char	_auth_send_data[256];
-static	unsigned char	*auth_send_data;
-static	int	auth_send_cnt = 0;
-
-int auth_onoff(char *type, int on);
-void auth_encrypt_user(char *name);
-
-/*
- * Authentication types supported.  Plese note that these are stored
- * in priority order, i.e. try the first one first.
- */
-Authenticator authenticators[] = {
-#ifdef	SPX
-	{ AUTHTYPE_SPX, AUTH_WHO_CLIENT|AUTH_HOW_MUTUAL,
-				spx_init,
-				spx_send,
-				spx_is,
-				spx_reply,
-				spx_status,
-				spx_printsub },
-	{ AUTHTYPE_SPX, AUTH_WHO_CLIENT|AUTH_HOW_ONE_WAY,
-				spx_init,
-				spx_send,
-				spx_is,
-				spx_reply,
-				spx_status,
-				spx_printsub },
-#endif
-#ifdef	KRB5
-# ifdef	ENCRYPTION
-	{ AUTHTYPE_KERBEROS_V5, AUTH_WHO_CLIENT|AUTH_HOW_MUTUAL,
-				kerberos5_init,
-				kerberos5_send,
-				kerberos5_is,
-				kerberos5_reply,
-				kerberos5_status,
-				kerberos5_printsub },
-# endif	/* ENCRYPTION */
-	{ AUTHTYPE_KERBEROS_V5, AUTH_WHO_CLIENT|AUTH_HOW_ONE_WAY,
-				kerberos5_init,
-				kerberos5_send,
-				kerberos5_is,
-				kerberos5_reply,
-				kerberos5_status,
-				kerberos5_printsub },
-#endif
-#ifdef	KRB4
-# ifdef ENCRYPTION
-	{ AUTHTYPE_KERBEROS_V4, AUTH_WHO_CLIENT|AUTH_HOW_MUTUAL,
-				kerberos4_init,
-				kerberos4_send,
-				kerberos4_is,
-				kerberos4_reply,
-				kerberos4_status,
-				kerberos4_printsub },
-# endif	/* ENCRYPTION */
-	{ AUTHTYPE_KERBEROS_V4, AUTH_WHO_CLIENT|AUTH_HOW_ONE_WAY,
-				kerberos4_init,
-				kerberos4_send,
-				kerberos4_is,
-				kerberos4_reply,
-				kerberos4_status,
-				kerberos4_printsub },
-#endif
-#ifdef	KRB4_ENCPWD
-	{ AUTHTYPE_KRB4_ENCPWD, AUTH_WHO_CLIENT|AUTH_HOW_MUTUAL,
-				krb4encpwd_init,
-				krb4encpwd_send,
-				krb4encpwd_is,
-				krb4encpwd_reply,
-				krb4encpwd_status,
-				krb4encpwd_printsub },
-#endif
-#ifdef	RSA_ENCPWD
-	{ AUTHTYPE_RSA_ENCPWD, AUTH_WHO_CLIENT|AUTH_HOW_ONE_WAY,
-				rsaencpwd_init,
-				rsaencpwd_send,
-				rsaencpwd_is,
-				rsaencpwd_reply,
-				rsaencpwd_status,
-				rsaencpwd_printsub },
-#endif
-	{ 0, },
-};
-
-static Authenticator NoAuth = { 0 };
-
-static int	i_support = 0;
-static int	i_wont_support = 0;
-
-	Authenticator *
-findauthenticator(type, way)
-	int type;
-	int way;
-{
-	Authenticator *ap = authenticators;
-
-	while (ap->type && (ap->type != type || ap->way != way))
-		++ap;
-	return(ap->type ? ap : 0);
-}
-
-	void
-auth_init(name, server)
-	char *name;
-	int server;
-{
-	Authenticator *ap = authenticators;
-
-	Server = server;
-	Name = name;
-
-	i_support = 0;
-	authenticated = 0;
-	authenticating = 0;
-	while (ap->type) {
-		if (!ap->init || (*ap->init)(ap, server)) {
-			i_support |= typemask(ap->type);
-			if (auth_debug_mode)
-				printf(">>>%s: I support auth type %d %d\r\n",
-					Name,
-					ap->type, ap->way);
-		}
-		else if (auth_debug_mode)
-			printf(">>>%s: Init failed: auth type %d %d\r\n",
-				Name, ap->type, ap->way);
-		++ap;
-	}
-}
-
-	void
-auth_disable_name(name)
-	char *name;
-{
-	int x;
-	for (x = 0; x < AUTHTYPE_CNT; ++x) {
-		if (!strcasecmp(name, AUTHTYPE_NAME(x))) {
-			i_wont_support |= typemask(x);
-			break;
-		}
-	}
-}
-
-	int
-getauthmask(type, maskp)
-	char *type;
-	int *maskp;
-{
-	register int x;
-
-	if (!strcasecmp(type, AUTHTYPE_NAME(0))) {
-		*maskp = -1;
-		return(1);
-	}
-
-	for (x = 1; x < AUTHTYPE_CNT; ++x) {
-		if (!strcasecmp(type, AUTHTYPE_NAME(x))) {
-			*maskp = typemask(x);
-			return(1);
-		}
-	}
-	return(0);
-}
-
-	int
-auth_enable(type)
-	char *type;
-{
-	return(auth_onoff(type, 1));
-}
-
-	int
-auth_disable(type)
-	char *type;
-{
-	return(auth_onoff(type, 0));
-}
-
-	int
-auth_onoff(type, on)
-	char *type;
-	int on;
-{
-	int i, mask = -1;
-	Authenticator *ap;
-
-	if (!strcasecmp(type, "?") || !strcasecmp(type, "help")) {
-		printf("auth %s 'type'\n", on ? "enable" : "disable");
-		printf("Where 'type' is one of:\n");
-		printf("\t%s\n", AUTHTYPE_NAME(0));
-		mask = 0;
-		for (ap = authenticators; ap->type; ap++) {
-			if ((mask & (i = typemask(ap->type))) != 0)
-				continue;
-			mask |= i;
-			printf("\t%s\n", AUTHTYPE_NAME(ap->type));
-		}
-		return(0);
-	}
-
-	if (!getauthmask(type, &mask)) {
-		printf("%s: invalid authentication type\n", type);
-		return(0);
-	}
-	if (on)
-		i_wont_support &= ~mask;
-	else
-		i_wont_support |= mask;
-	return(1);
-}
-
-	int
-auth_togdebug(on)
-	int on;
-{
-	if (on < 0)
-		auth_debug_mode ^= 1;
-	else
-		auth_debug_mode = on;
-	printf("auth debugging %s\n", auth_debug_mode ? "enabled" : "disabled");
-	return(1);
-}
-
-	int
-auth_status()
-{
-	Authenticator *ap;
-	int i, mask;
-
-	if (i_wont_support == -1)
-		printf("Authentication disabled\n");
-	else
-		printf("Authentication enabled\n");
-
-	mask = 0;
-	for (ap = authenticators; ap->type; ap++) {
-		if ((mask & (i = typemask(ap->type))) != 0)
-			continue;
-		mask |= i;
-		printf("%s: %s\n", AUTHTYPE_NAME(ap->type),
-			(i_wont_support & typemask(ap->type)) ?
-					"disabled" : "enabled");
-	}
-	return(1);
-}
-
-/*
- * This routine is called by the server to start authentication
- * negotiation.
- */
-	void
-auth_request()
-{
-	static unsigned char str_request[64] = { IAC, SB,
-						 TELOPT_AUTHENTICATION,
-						 TELQUAL_SEND, };
-	Authenticator *ap = authenticators;
-	unsigned char *e = str_request + 4;
-
-	if (!authenticating) {
-		authenticating = 1;
-		while (ap->type) {
-			if (i_support & ~i_wont_support & typemask(ap->type)) {
-				if (auth_debug_mode) {
-					printf(">>>%s: Sending type %d %d\r\n",
-						Name, ap->type, ap->way);
-				}
-				*e++ = ap->type;
-				*e++ = ap->way;
-			}
-			++ap;
-		}
-		*e++ = IAC;
-		*e++ = SE;
-		net_write(str_request, e - str_request);
-		printsub('>', &str_request[2], e - str_request - 2);
-	}
-}
-
-/*
- * This is called when an AUTH SEND is received.
- * It should never arrive on the server side (as only the server can
- * send an AUTH SEND).
- * You should probably respond to it if you can...
- *
- * If you want to respond to the types out of order (i.e. even
- * if he sends  LOGIN KERBEROS and you support both, you respond
- * with KERBEROS instead of LOGIN (which is against what the
- * protocol says)) you will have to hack this code...
- */
-	void
-auth_send(data, cnt)
-	unsigned char *data;
-	int cnt;
-{
-	Authenticator *ap;
-	static unsigned char str_none[] = { IAC, SB, TELOPT_AUTHENTICATION,
-					    TELQUAL_IS, AUTHTYPE_NULL, 0,
-					    IAC, SE };
-	if (Server) {
-		if (auth_debug_mode) {
-			printf(">>>%s: auth_send called!\r\n", Name);
-		}
-		return;
-	}
-
-	if (auth_debug_mode) {
-		printf(">>>%s: auth_send got:", Name);
-		printd(data, cnt); printf("\r\n");
-	}
-
-	/*
-	 * Save the data, if it is new, so that we can continue looking
-	 * at it if the authorization we try doesn't work
-	 */
-	if (data < _auth_send_data ||
-	    data > _auth_send_data + sizeof(_auth_send_data)) {
-		auth_send_cnt = cnt > sizeof(_auth_send_data)
-					? sizeof(_auth_send_data)
-					: cnt;
-		memmove((void *)_auth_send_data, (void *)data, auth_send_cnt);
-		auth_send_data = _auth_send_data;
-	} else {
-		/*
-		 * This is probably a no-op, but we just make sure
-		 */
-		auth_send_data = data;
-		auth_send_cnt = cnt;
-	}
-	while ((auth_send_cnt -= 2) >= 0) {
-		if (auth_debug_mode)
-			printf(">>>%s: He supports %d\r\n",
-				Name, *auth_send_data);
-		if ((i_support & ~i_wont_support) & typemask(*auth_send_data)) {
-			ap = findauthenticator(auth_send_data[0],
-					       auth_send_data[1]);
-			if (ap && ap->send) {
-				if (auth_debug_mode)
-					printf(">>>%s: Trying %d %d\r\n",
-						Name, auth_send_data[0],
-							auth_send_data[1]);
-				if ((*ap->send)(ap)) {
-					/*
-					 * Okay, we found one we like
-					 * and did it.
-					 * we can go home now.
-					 */
-					if (auth_debug_mode)
-						printf(">>>%s: Using type %d\r\n",
-							Name, *auth_send_data);
-					auth_send_data += 2;
-					return;
-				}
-			}
-			/* else
-			 *	just continue on and look for the
-			 *	next one if we didn't do anything.
-			 */
-		}
-		auth_send_data += 2;
-	}
-	net_write(str_none, sizeof(str_none));
-	printsub('>', &str_none[2], sizeof(str_none) - 2);
-	if (auth_debug_mode)
-		printf(">>>%s: Sent failure message\r\n", Name);
-	auth_finished(0, AUTH_REJECT);
-#ifdef KANNAN
-	/*
-	 *  We requested strong authentication, however no mechanisms worked.
-	 *  Therefore, exit on client end.
-	 */
-	printf("Unable to securely authenticate user ... exit\n");
-	exit(0);
-#endif /* KANNAN */
-}
-
-	void
-auth_send_retry()
-{
-	/*
-	 * if auth_send_cnt <= 0 then auth_send will end up rejecting
-	 * the authentication and informing the other side of this.
-	 */
-	auth_send(auth_send_data, auth_send_cnt);
-}
-
-	void
-auth_is(data, cnt)
-	unsigned char *data;
-	int cnt;
-{
-	Authenticator *ap;
-
-	if (cnt < 2)
-		return;
-
-	if (data[0] == AUTHTYPE_NULL) {
-		auth_finished(0, AUTH_REJECT);
-		return;
-	}
-
-	if ((ap = findauthenticator(data[0], data[1]))) {
-		if (ap->is)
-			(*ap->is)(ap, data+2, cnt-2);
-	} else if (auth_debug_mode)
-		printf(">>>%s: Invalid authentication in IS: %d\r\n",
-			Name, *data);
-}
-
-	void
-auth_reply(data, cnt)
-	unsigned char *data;
-	int cnt;
-{
-	Authenticator *ap;
-
-	if (cnt < 2)
-		return;
-
-	if ((ap = findauthenticator(data[0], data[1]))) {
-		if (ap->reply)
-			(*ap->reply)(ap, data+2, cnt-2);
-	} else if (auth_debug_mode)
-		printf(">>>%s: Invalid authentication in SEND: %d\r\n",
-			Name, *data);
-}
-
-	void
-auth_name(data, cnt)
-	unsigned char *data;
-	int cnt;
-{
-	unsigned char savename[256];
-
-	if (cnt < 1) {
-		if (auth_debug_mode)
-			printf(">>>%s: Empty name in NAME\r\n", Name);
-		return;
-	}
-	if (cnt > sizeof(savename) - 1) {
-		if (auth_debug_mode)
-			printf(">>>%s: Name in NAME (%d) exceeds %d length\r\n",
-					Name, cnt, sizeof(savename)-1);
-		return;
-	}
-	memmove((void *)savename, (void *)data, cnt);
-	savename[cnt] = '\0';	/* Null terminate */
-	if (auth_debug_mode)
-		printf(">>>%s: Got NAME [%s]\r\n", Name, savename);
-	auth_encrypt_user(savename);
-}
-
-	int
-auth_sendname(cp, len)
-	unsigned char *cp;
-	int len;
-{
-	static unsigned char str_request[256+6]
-			= { IAC, SB, TELOPT_AUTHENTICATION, TELQUAL_NAME, };
-	register unsigned char *e = str_request + 4;
-	register unsigned char *ee = &str_request[sizeof(str_request)-2];
-
-	while (--len >= 0) {
-		if ((*e++ = *cp++) == IAC)
-			*e++ = IAC;
-		if (e >= ee)
-			return(0);
-	}
-	*e++ = IAC;
-	*e++ = SE;
-	net_write(str_request, e - str_request);
-	printsub('>', &str_request[2], e - &str_request[2]);
-	return(1);
-}
-
-	void
-auth_finished(ap, result)
-	Authenticator *ap;
-	int result;
-{
-	if (!(authenticated = ap))
-		authenticated = &NoAuth;
-	validuser = result;
-}
-
-	/* ARGSUSED */
-	static void
-auth_intr(sig)
-	int sig;
-{
-	auth_finished(0, AUTH_REJECT);
-}
-
-	int
-auth_wait(name)
-	char *name;
-{
-	if (auth_debug_mode)
-		printf(">>>%s: in auth_wait.\r\n", Name);
-
-	if (Server && !authenticating)
-		return(0);
-
-	(void) signal(SIGALRM, auth_intr);
-	alarm(30);
-	while (!authenticated)
-		if (telnet_spin())
-			break;
-	alarm(0);
-	(void) signal(SIGALRM, SIG_DFL);
-
-	/*
-	 * Now check to see if the user is valid or not
-	 */
-	if (!authenticated || authenticated == &NoAuth)
-		return(AUTH_REJECT);
-
-	if (validuser == AUTH_VALID)
-		validuser = AUTH_USER;
-
-	if (authenticated->status)
-		validuser = (*authenticated->status)(authenticated,
-						     name, validuser);
-	return(validuser);
-}
-
-	void
-auth_debug(mode)
-	int mode;
-{
-	auth_debug_mode = mode;
-}
-
-	void
-auth_printsub(data, cnt, buf, buflen)
-	unsigned char *data, *buf;
-	int cnt, buflen;
-{
-	Authenticator *ap;
-
-	if ((ap = findauthenticator(data[1], data[2])) && ap->printsub)
-		(*ap->printsub)(data, cnt, buf, buflen);
-	else
-		auth_gen_printsub(data, cnt, buf, buflen);
-}
-
-	void
-auth_gen_printsub(data, cnt, buf, buflen)
-	unsigned char *data, *buf;
-	int cnt, buflen;
-{
-	register unsigned char *cp;
-	unsigned char tbuf[16];
-
-	cnt -= 3;
-	data += 3;
-	buf[buflen-1] = '\0';
-	buf[buflen-2] = '*';
-	buflen -= 2;
-	for (; cnt > 0; cnt--, data++) {
-		sprintf((char *)tbuf, " %d", *data);
-		for (cp = tbuf; *cp && buflen > 0; --buflen)
-			*buf++ = *cp++;
-		if (buflen <= 0)
-			return;
-	}
-	*buf = '\0';
-}
-#endif
diff --git a/crypto/telnet/libtelnet/auth.h b/crypto/telnet/libtelnet/auth.h
deleted file mode 100644
index 615e8a07b894..000000000000
--- a/crypto/telnet/libtelnet/auth.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)auth.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * Copyright (C) 1990 by the Massachusetts Institute of Technology
- *
- * Export of this software from the United States of America is assumed
- * to require a specific license from the United States Government.
- * It is the responsibility of any person or organization contemplating
- * export to obtain such a license before exporting.
- *
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of M.I.T. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission.  M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express
- * or implied warranty.
- */
-
-#ifndef	__AUTH__
-#define	__AUTH__
-
-#define	AUTH_REJECT	0	/* Rejected */
-#define	AUTH_UNKNOWN	1	/* We don't know who he is, but he's okay */
-#define	AUTH_OTHER	2	/* We know him, but not his name */
-#define	AUTH_USER	3	/* We know he name */
-#define	AUTH_VALID	4	/* We know him, and he needs no password */
-
-#if	!defined(P)
-#ifdef	__STDC__
-#define P(x)	x
-#else
-#define P(x)	()
-#endif
-#endif
-
-typedef struct XauthP {
-	int	type;
-	int	way;
-	int	(*init) P((struct XauthP *, int));
-	int	(*send) P((struct XauthP *));
-	void	(*is) P((struct XauthP *, unsigned char *, int));
-	void	(*reply) P((struct XauthP *, unsigned char *, int));
-	int	(*status) P((struct XauthP *, char *, int));
-	void	(*printsub) P((unsigned char *, int, unsigned char *, int));
-} Authenticator;
-
-#include "auth-proto.h"
-
-extern auth_debug_mode;
-#endif
diff --git a/crypto/telnet/libtelnet/enc-proto.h b/crypto/telnet/libtelnet/enc-proto.h
deleted file mode 100644
index 8e15ffdab8d1..000000000000
--- a/crypto/telnet/libtelnet/enc-proto.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)enc-proto.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * Copyright (C) 1990 by the Massachusetts Institute of Technology
- *
- * Export of this software from the United States of America is assumed
- * to require a specific license from the United States Government.
- * It is the responsibility of any person or organization contemplating
- * export to obtain such a license before exporting.
- *
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of M.I.T. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission.  M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express
- * or implied warranty.
- */
-#if	!defined(P)
-#ifdef	__STDC__
-#define	P(x)	x
-#else
-#define	P(x)	()
-#endif
-#endif
-
-#ifdef	ENCRYPTION
-void encrypt_init P((char *, int));
-Encryptions *findencryption P((int));
-void encrypt_send_supprt P((void));
-void encrypt_auto P((int));
-void decrypt_auto P((int));
-void encrypt_is P((unsigned char *, int));
-void encrypt_reply P((unsigned char *, int));
-void encrypt_start_input P((int));
-void encrypt_session_key P((Session_Key *, int));
-void encrypt_end_input P((void));
-void encrypt_start_output P((int));
-void encrypt_end_output P((void));
-void encrypt_send_request_start P((void));
-void encrypt_send_request_end P((void));
-void encrypt_send_end P((void));
-void encrypt_wait P((void));
-void encrypt_send_support P((void));
-void encrypt_send_keyid P((int, unsigned char *, int, int));
-void encrypt_start P((unsigned char *, int));
-void encrypt_end P((void));
-void encrypt_support P((unsigned char *, int));
-void encrypt_request_start P((unsigned char *, int));
-void encrypt_request_end P((void));
-void encrypt_enc_keyid P((unsigned char *, int));
-void encrypt_dec_keyid P((unsigned char *, int));
-void encrypt_printsub P((unsigned char *, int, unsigned char *, int));
-int net_write P((unsigned char *, int));
-
-#ifndef	TELENTD
-int encrypt_cmd P((int, char **));
-void encrypt_display P((void));
-#endif
-
-void krbdes_encrypt P((unsigned char *, int));
-int krbdes_decrypt P((int));
-int krbdes_is P((unsigned char *, int));
-int krbdes_reply P((unsigned char *, int));
-void krbdes_init P((int));
-int krbdes_start P((int, int));
-void krbdes_session P((Session_Key *, int));
-void krbdes_printsub P((unsigned char *, int, unsigned char *, int));
-
-void cfb64_encrypt P((unsigned char *, int));
-int cfb64_decrypt P((int));
-void cfb64_init P((int));
-int cfb64_start P((int, int));
-int cfb64_is P((unsigned char *, int));
-int cfb64_reply P((unsigned char *, int));
-void cfb64_session P((Session_Key *, int));
-int cfb64_keyid P((int, unsigned char *, int *));
-void cfb64_printsub P((unsigned char *, int, unsigned char *, int));
-
-void ofb64_encrypt P((unsigned char *, int));
-int ofb64_decrypt P((int));
-void ofb64_init P((int));
-int ofb64_start P((int, int));
-int ofb64_is P((unsigned char *, int));
-int ofb64_reply P((unsigned char *, int));
-void ofb64_session P((Session_Key *, int));
-int ofb64_keyid P((int, unsigned char *, int *));
-void ofb64_printsub P((unsigned char *, int, unsigned char *, int));
-
-#endif	/* ENCRYPTION */
diff --git a/crypto/telnet/libtelnet/enc_des.c b/crypto/telnet/libtelnet/enc_des.c
deleted file mode 100644
index 8e4b9a7f4b78..000000000000
--- a/crypto/telnet/libtelnet/enc_des.c
+++ /dev/null
@@ -1,720 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static const char sccsid[] = "@(#)enc_des.c	8.3 (Berkeley) 5/30/95";
-#endif /* not lint */
-
-#ifdef	ENCRYPTION
-# ifdef	AUTHENTICATION
-#  ifdef DES_ENCRYPTION
-#include <arpa/telnet.h>
-#include <stdio.h>
-#ifdef	__STDC__
-#include <stdlib.h>
-#endif
-
-#include <des.h>
-#include <string.h>
-#include "encrypt.h"
-#include "key-proto.h"
-#include "misc-proto.h"
-
-extern encrypt_debug_mode;
-
-#define	CFB	0
-#define	OFB	1
-
-#define	NO_SEND_IV	1
-#define	NO_RECV_IV	2
-#define	NO_KEYID	4
-#define	IN_PROGRESS	(NO_SEND_IV|NO_RECV_IV|NO_KEYID)
-#define	SUCCESS		0
-#define	FAILED		-1
-
-
-struct fb {
-	Block krbdes_key;
-	Schedule krbdes_sched;
-	Block temp_feed;
-	unsigned char fb_feed[64];
-	int need_start;
-	int state[2];
-	int keyid[2];
-	int once;
-	struct stinfo {
-		Block		str_output;
-		Block		str_feed;
-		Block		str_iv;
-		Block		str_ikey;
-		Schedule	str_sched;
-		int		str_index;
-		int		str_flagshift;
-	} streams[2];
-};
-
-static struct fb fb[2];
-
-struct keyidlist {
-	char	*keyid;
-	int	keyidlen;
-	char	*key;
-	int	keylen;
-	int	flags;
-} keyidlist [] = {
-	{ "\0", 1, 0, 0, 0 },		/* default key of zero */
-	{ 0, 0, 0, 0, 0 }
-};
-
-#define	KEYFLAG_MASK	03
-
-#define	KEYFLAG_NOINIT	00
-#define	KEYFLAG_INIT	01
-#define	KEYFLAG_OK	02
-#define	KEYFLAG_BAD	03
-
-#define	KEYFLAG_SHIFT	2
-
-#define	SHIFT_VAL(a,b)	(KEYFLAG_SHIFT*((a)+((b)*2)))
-
-#define	FB64_IV		1
-#define	FB64_IV_OK	2
-#define	FB64_IV_BAD	3
-
-
-void fb64_stream_iv P((Block, struct stinfo *));
-void fb64_init P((struct fb *));
-static int fb64_start P((struct fb *, int, int));
-int fb64_is P((unsigned char *, int, struct fb *));
-int fb64_reply P((unsigned char *, int, struct fb *));
-static void fb64_session P((Session_Key *, int, struct fb *));
-void fb64_stream_key P((Block, struct stinfo *));
-int fb64_keyid P((int, unsigned char *, int *, struct fb *));
-
-	void
-cfb64_init(server)
-	int server;
-{
-	fb64_init(&fb[CFB]);
-	fb[CFB].fb_feed[4] = ENCTYPE_DES_CFB64;
-	fb[CFB].streams[0].str_flagshift = SHIFT_VAL(0, CFB);
-	fb[CFB].streams[1].str_flagshift = SHIFT_VAL(1, CFB);
-}
-
-	void
-ofb64_init(server)
-	int server;
-{
-	fb64_init(&fb[OFB]);
-	fb[OFB].fb_feed[4] = ENCTYPE_DES_OFB64;
-	fb[CFB].streams[0].str_flagshift = SHIFT_VAL(0, OFB);
-	fb[CFB].streams[1].str_flagshift = SHIFT_VAL(1, OFB);
-}
-
-	void
-fb64_init(fbp)
-	register struct fb *fbp;
-{
-	memset((void *)fbp, 0, sizeof(*fbp));
-	fbp->state[0] = fbp->state[1] = FAILED;
-	fbp->fb_feed[0] = IAC;
-	fbp->fb_feed[1] = SB;
-	fbp->fb_feed[2] = TELOPT_ENCRYPT;
-	fbp->fb_feed[3] = ENCRYPT_IS;
-}
-
-/*
- * Returns:
- *	-1: some error.  Negotiation is done, encryption not ready.
- *	 0: Successful, initial negotiation all done.
- *	 1: successful, negotiation not done yet.
- *	 2: Not yet.  Other things (like getting the key from
- *	    Kerberos) have to happen before we can continue.
- */
-	int
-cfb64_start(dir, server)
-	int dir;
-	int server;
-{
-	return(fb64_start(&fb[CFB], dir, server));
-}
-	int
-ofb64_start(dir, server)
-	int dir;
-	int server;
-{
-	return(fb64_start(&fb[OFB], dir, server));
-}
-
-	static int
-fb64_start(fbp, dir, server)
-	struct fb *fbp;
-	int dir;
-	int server;
-{
-	int x;
-	unsigned char *p;
-	register int state;
-
-	switch (dir) {
-	case DIR_DECRYPT:
-		/*
-		 * This is simply a request to have the other side
-		 * start output (our input).  He will negotiate an
-		 * IV so we need not look for it.
-		 */
-		state = fbp->state[dir-1];
-		if (state == FAILED)
-			state = IN_PROGRESS;
-		break;
-
-	case DIR_ENCRYPT:
-		state = fbp->state[dir-1];
-		if (state == FAILED)
-			state = IN_PROGRESS;
-		else if ((state & NO_SEND_IV) == 0)
-			break;
-
-		if (!VALIDKEY(fbp->krbdes_key)) {
-			fbp->need_start = 1;
-			break;
-		}
-		state &= ~NO_SEND_IV;
-		state |= NO_RECV_IV;
-		if (encrypt_debug_mode)
-			printf("Creating new feed\r\n");
-		/*
-		 * Create a random feed and send it over.
-		 */
-		des_new_random_key((Block *)fbp->temp_feed);
-		des_ecb_encrypt((Block *)fbp->temp_feed, (Block *)fbp->temp_feed,
-				fbp->krbdes_sched, 1);
-		p = fbp->fb_feed + 3;
-		*p++ = ENCRYPT_IS;
-		p++;
-		*p++ = FB64_IV;
-		for (x = 0; x < sizeof(Block); ++x) {
-			if ((*p++ = fbp->temp_feed[x]) == IAC)
-				*p++ = IAC;
-		}
-		*p++ = IAC;
-		*p++ = SE;
-		printsub('>', &fbp->fb_feed[2], p - &fbp->fb_feed[2]);
-		net_write(fbp->fb_feed, p - fbp->fb_feed);
-		break;
-	default:
-		return(FAILED);
-	}
-	return(fbp->state[dir-1] = state);
-}
-
-/*
- * Returns:
- *	-1: some error.  Negotiation is done, encryption not ready.
- *	 0: Successful, initial negotiation all done.
- *	 1: successful, negotiation not done yet.
- */
-	int
-cfb64_is(data, cnt)
-	unsigned char *data;
-	int cnt;
-{
-	return(fb64_is(data, cnt, &fb[CFB]));
-}
-	int
-ofb64_is(data, cnt)
-	unsigned char *data;
-	int cnt;
-{
-	return(fb64_is(data, cnt, &fb[OFB]));
-}
-
-	int
-fb64_is(data, cnt, fbp)
-	unsigned char *data;
-	int cnt;
-	struct fb *fbp;
-{
-	unsigned char *p;
-	register int state = fbp->state[DIR_DECRYPT-1];
-
-	if (cnt-- < 1)
-		goto failure;
-
-	switch (*data++) {
-	case FB64_IV:
-		if (cnt != sizeof(Block)) {
-			if (encrypt_debug_mode)
-				printf("CFB64: initial vector failed on size\r\n");
-			state = FAILED;
-			goto failure;
-		}
-
-		if (encrypt_debug_mode)
-			printf("CFB64: initial vector received\r\n");
-
-		if (encrypt_debug_mode)
-			printf("Initializing Decrypt stream\r\n");
-
-		fb64_stream_iv((void *)data, &fbp->streams[DIR_DECRYPT-1]);
-
-		p = fbp->fb_feed + 3;
-		*p++ = ENCRYPT_REPLY;
-		p++;
-		*p++ = FB64_IV_OK;
-		*p++ = IAC;
-		*p++ = SE;
-		printsub('>', &fbp->fb_feed[2], p - &fbp->fb_feed[2]);
-		net_write(fbp->fb_feed, p - fbp->fb_feed);
-
-		state = fbp->state[DIR_DECRYPT-1] = IN_PROGRESS;
-		break;
-
-	default:
-		if (encrypt_debug_mode) {
-			printf("Unknown option type: %d\r\n", *(data-1));
-			printd(data, cnt);
-			printf("\r\n");
-		}
-		/* FALL THROUGH */
-	failure:
-		/*
-		 * We failed.  Send an FB64_IV_BAD option
-		 * to the other side so it will know that
-		 * things failed.
-		 */
-		p = fbp->fb_feed + 3;
-		*p++ = ENCRYPT_REPLY;
-		p++;
-		*p++ = FB64_IV_BAD;
-		*p++ = IAC;
-		*p++ = SE;
-		printsub('>', &fbp->fb_feed[2], p - &fbp->fb_feed[2]);
-		net_write(fbp->fb_feed, p - fbp->fb_feed);
-
-		break;
-	}
-	return(fbp->state[DIR_DECRYPT-1] = state);
-}
-
-/*
- * Returns:
- *	-1: some error.  Negotiation is done, encryption not ready.
- *	 0: Successful, initial negotiation all done.
- *	 1: successful, negotiation not done yet.
- */
-	int
-cfb64_reply(data, cnt)
-	unsigned char *data;
-	int cnt;
-{
-	return(fb64_reply(data, cnt, &fb[CFB]));
-}
-	int
-ofb64_reply(data, cnt)
-	unsigned char *data;
-	int cnt;
-{
-	return(fb64_reply(data, cnt, &fb[OFB]));
-}
-
-
-	int
-fb64_reply(data, cnt, fbp)
-	unsigned char *data;
-	int cnt;
-	struct fb *fbp;
-{
-	register int state = fbp->state[DIR_ENCRYPT-1];
-
-	if (cnt-- < 1)
-		goto failure;
-
-	switch (*data++) {
-	case FB64_IV_OK:
-		fb64_stream_iv(fbp->temp_feed, &fbp->streams[DIR_ENCRYPT-1]);
-		if (state == FAILED)
-			state = IN_PROGRESS;
-		state &= ~NO_RECV_IV;
-		encrypt_send_keyid(DIR_ENCRYPT, (unsigned char *)"\0", 1, 1);
-		break;
-
-	case FB64_IV_BAD:
-		memset(fbp->temp_feed, 0, sizeof(Block));
-		fb64_stream_iv(fbp->temp_feed, &fbp->streams[DIR_ENCRYPT-1]);
-		state = FAILED;
-		break;
-
-	default:
-		if (encrypt_debug_mode) {
-			printf("Unknown option type: %d\r\n", data[-1]);
-			printd(data, cnt);
-			printf("\r\n");
-		}
-		/* FALL THROUGH */
-	failure:
-		state = FAILED;
-		break;
-	}
-	return(fbp->state[DIR_ENCRYPT-1] = state);
-}
-
-	void
-cfb64_session(key, server)
-	Session_Key *key;
-	int server;
-{
-	fb64_session(key, server, &fb[CFB]);
-}
-
-	void
-ofb64_session(key, server)
-	Session_Key *key;
-	int server;
-{
-	fb64_session(key, server, &fb[OFB]);
-}
-
-	static void
-fb64_session(key, server, fbp)
-	Session_Key *key;
-	int server;
-	struct fb *fbp;
-{
-
-	if (!key || key->type != SK_DES) {
-		if (encrypt_debug_mode)
-			printf("Can't set krbdes's session key (%d != %d)\r\n",
-				key ? key->type : -1, SK_DES);
-		return;
-	}
-	memmove((void *)fbp->krbdes_key, (void *)key->data, sizeof(Block));
-
-	fb64_stream_key(fbp->krbdes_key, &fbp->streams[DIR_ENCRYPT-1]);
-	fb64_stream_key(fbp->krbdes_key, &fbp->streams[DIR_DECRYPT-1]);
-
-	if (fbp->once == 0) {
-		des_set_random_generator_seed((Block *)fbp->krbdes_key);
-		fbp->once = 1;
-	}
-	des_key_sched((Block *)fbp->krbdes_key, fbp->krbdes_sched);
-	/*
-	 * Now look to see if krbdes_start() was was waiting for
-	 * the key to show up.  If so, go ahead an call it now
-	 * that we have the key.
-	 */
-	if (fbp->need_start) {
-		fbp->need_start = 0;
-		fb64_start(fbp, DIR_ENCRYPT, server);
-	}
-}
-
-/*
- * We only accept a keyid of 0.  If we get a keyid of
- * 0, then mark the state as SUCCESS.
- */
-	int
-cfb64_keyid(dir, kp, lenp)
-	int dir, *lenp;
-	unsigned char *kp;
-{
-	return(fb64_keyid(dir, kp, lenp, &fb[CFB]));
-}
-
-	int
-ofb64_keyid(dir, kp, lenp)
-	int dir, *lenp;
-	unsigned char *kp;
-{
-	return(fb64_keyid(dir, kp, lenp, &fb[OFB]));
-}
-
-	int
-fb64_keyid(dir, kp, lenp, fbp)
-	int dir, *lenp;
-	unsigned char *kp;
-	struct fb *fbp;
-{
-	register int state = fbp->state[dir-1];
-
-	if (*lenp != 1 || (*kp != '\0')) {
-		*lenp = 0;
-		return(state);
-	}
-
-	if (state == FAILED)
-		state = IN_PROGRESS;
-
-	state &= ~NO_KEYID;
-
-	return(fbp->state[dir-1] = state);
-}
-
-	void
-fb64_printsub(data, cnt, buf, buflen, type)
-	unsigned char *data, *buf, *type;
-	int cnt, buflen;
-{
-	char lbuf[32];
-	register int i;
-	char *cp;
-
-	buf[buflen-1] = '\0';		/* make sure it's NULL terminated */
-	buflen -= 1;
-
-	switch(data[2]) {
-	case FB64_IV:
-		sprintf(lbuf, "%s_IV", type);
-		cp = lbuf;
-		goto common;
-
-	case FB64_IV_OK:
-		sprintf(lbuf, "%s_IV_OK", type);
-		cp = lbuf;
-		goto common;
-
-	case FB64_IV_BAD:
-		sprintf(lbuf, "%s_IV_BAD", type);
-		cp = lbuf;
-		goto common;
-
-	default:
-		sprintf(lbuf, " %d (unknown)", data[2]);
-		cp = lbuf;
-	common:
-		for (; (buflen > 0) && (*buf = *cp++); buf++)
-			buflen--;
-		for (i = 3; i < cnt; i++) {
-			sprintf(lbuf, " %d", data[i]);
-			for (cp = lbuf; (buflen > 0) && (*buf = *cp++); buf++)
-				buflen--;
-		}
-		break;
-	}
-}
-
-	void
-cfb64_printsub(data, cnt, buf, buflen)
-	unsigned char *data, *buf;
-	int cnt, buflen;
-{
-	fb64_printsub(data, cnt, buf, buflen, "CFB64");
-}
-
-	void
-ofb64_printsub(data, cnt, buf, buflen)
-	unsigned char *data, *buf;
-	int cnt, buflen;
-{
-	fb64_printsub(data, cnt, buf, buflen, "OFB64");
-}
-
-	void
-fb64_stream_iv(seed, stp)
-	Block seed;
-	register struct stinfo *stp;
-{
-
-	memmove((void *)stp->str_iv, (void *)seed, sizeof(Block));
-	memmove((void *)stp->str_output, (void *)seed, sizeof(Block));
-
-	des_key_sched((Block *)stp->str_ikey, stp->str_sched);
-
-	stp->str_index = sizeof(Block);
-}
-
-	void
-fb64_stream_key(key, stp)
-	Block key;
-	register struct stinfo *stp;
-{
-	memmove((void *)stp->str_ikey, (void *)key, sizeof(Block));
-	des_key_sched((Block *)key, stp->str_sched);
-
-	memmove((void *)stp->str_output, (void *)stp->str_iv, sizeof(Block));
-
-	stp->str_index = sizeof(Block);
-}
-
-/*
- * DES 64 bit Cipher Feedback
- *
- *     key --->+-----+
- *          +->| DES |--+
- *          |  +-----+  |
- *	    |           v
- *  INPUT --(--------->(+)+---> DATA
- *          |             |
- *	    +-------------+
- *
- *
- * Given:
- *	iV: Initial vector, 64 bits (8 bytes) long.
- *	Dn: the nth chunk of 64 bits (8 bytes) of data to encrypt (decrypt).
- *	On: the nth chunk of 64 bits (8 bytes) of encrypted (decrypted) output.
- *
- *	V0 = DES(iV, key)
- *	On = Dn ^ Vn
- *	V(n+1) = DES(On, key)
- */
-
-	void
-cfb64_encrypt(s, c)
-	register unsigned char *s;
-	int c;
-{
-	register struct stinfo *stp = &fb[CFB].streams[DIR_ENCRYPT-1];
-	register int index;
-
-	index = stp->str_index;
-	while (c-- > 0) {
-		if (index == sizeof(Block)) {
-			Block b;
-			des_ecb_encrypt((Block *)stp->str_output, (Block *)b, stp->str_sched, 1);
-			memmove((void *)stp->str_feed, (void *)b, sizeof(Block));
-			index = 0;
-		}
-
-		/* On encryption, we store (feed ^ data) which is cypher */
-		*s = stp->str_output[index] = (stp->str_feed[index] ^ *s);
-		s++;
-		index++;
-	}
-	stp->str_index = index;
-}
-
-	int
-cfb64_decrypt(data)
-	int data;
-{
-	register struct stinfo *stp = &fb[CFB].streams[DIR_DECRYPT-1];
-	int index;
-
-	if (data == -1) {
-		/*
-		 * Back up one byte.  It is assumed that we will
-		 * never back up more than one byte.  If we do, this
-		 * may or may not work.
-		 */
-		if (stp->str_index)
-			--stp->str_index;
-		return(0);
-	}
-
-	index = stp->str_index++;
-	if (index == sizeof(Block)) {
-		Block b;
-		des_ecb_encrypt((Block *)stp->str_output, (Block *)b, stp->str_sched, 1);
-		memmove((void *)stp->str_feed, (void *)b, sizeof(Block));
-		stp->str_index = 1;	/* Next time will be 1 */
-		index = 0;		/* But now use 0 */
-	}
-
-	/* On decryption we store (data) which is cypher. */
-	stp->str_output[index] = data;
-	return(data ^ stp->str_feed[index]);
-}
-
-/*
- * DES 64 bit Output Feedback
- *
- * key --->+-----+
- *	+->| DES |--+
- *	|  +-----+  |
- *	+-----------+
- *	            v
- *  INPUT -------->(+) ----> DATA
- *
- * Given:
- *	iV: Initial vector, 64 bits (8 bytes) long.
- *	Dn: the nth chunk of 64 bits (8 bytes) of data to encrypt (decrypt).
- *	On: the nth chunk of 64 bits (8 bytes) of encrypted (decrypted) output.
- *
- *	V0 = DES(iV, key)
- *	V(n+1) = DES(Vn, key)
- *	On = Dn ^ Vn
- */
-	void
-ofb64_encrypt(s, c)
-	register unsigned char *s;
-	int c;
-{
-	register struct stinfo *stp = &fb[OFB].streams[DIR_ENCRYPT-1];
-	register int index;
-
-	index = stp->str_index;
-	while (c-- > 0) {
-		if (index == sizeof(Block)) {
-			Block b;
-			des_ecb_encrypt((Block *)stp->str_feed, (Block *)b, stp->str_sched, 1);
-			memmove((void *)stp->str_feed, (void *)b, sizeof(Block));
-			index = 0;
-		}
-		*s++ ^= stp->str_feed[index];
-		index++;
-	}
-	stp->str_index = index;
-}
-
-	int
-ofb64_decrypt(data)
-	int data;
-{
-	register struct stinfo *stp = &fb[OFB].streams[DIR_DECRYPT-1];
-	int index;
-
-	if (data == -1) {
-		/*
-		 * Back up one byte.  It is assumed that we will
-		 * never back up more than one byte.  If we do, this
-		 * may or may not work.
-		 */
-		if (stp->str_index)
-			--stp->str_index;
-		return(0);
-	}
-
-	index = stp->str_index++;
-	if (index == sizeof(Block)) {
-		Block b;
-		des_ecb_encrypt((Block *)stp->str_feed, (Block *)b, stp->str_sched, 1);
-		memmove((void *)stp->str_feed, (void *)b, sizeof(Block));
-		stp->str_index = 1;	/* Next time will be 1 */
-		index = 0;		/* But now use 0 */
-	}
-
-	return(data ^ stp->str_feed[index]);
-}
-#  endif /* DES_ENCRYPTION */
-# endif	/* AUTHENTICATION */
-#endif	/* ENCRYPTION */
diff --git a/crypto/telnet/libtelnet/encrypt.c b/crypto/telnet/libtelnet/encrypt.c
deleted file mode 100644
index 41dd5cc71044..000000000000
--- a/crypto/telnet/libtelnet/encrypt.c
+++ /dev/null
@@ -1,1016 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static const char sccsid[] = "@(#)encrypt.c	8.2 (Berkeley) 5/30/95";
-#endif /* not lint */
-
-/*
- * Copyright (C) 1990 by the Massachusetts Institute of Technology
- *
- * Export of this software from the United States of America is assumed
- * to require a specific license from the United States Government.
- * It is the responsibility of any person or organization contemplating
- * export to obtain such a license before exporting.
- *
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of M.I.T. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission.  M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express
- * or implied warranty.
- */
-
-#ifdef	ENCRYPTION
-
-#define	ENCRYPT_NAMES
-#include <stdio.h>
-#include <arpa/telnet.h>
-
-#include "encrypt.h"
-#include "misc.h"
-
-#ifdef	__STDC__
-#include <stdlib.h>
-#endif
-#ifdef	NO_STRING_H
-#include <strings.h>
-#else
-#include <string.h>
-#endif
-
-/*
- * These functions pointers point to the current routines
- * for encrypting and decrypting data.
- */
-void	(*encrypt_output) P((unsigned char *, int));
-int	(*decrypt_input) P((int));
-
-int EncryptType(char *type, char *mode);
-int EncryptStart(char *mode);
-int EncryptStop(char *mode);
-int EncryptStartInput(void);
-int EncryptStartOutput(void);
-int EncryptStopInput(void);
-int EncryptStopOutput(void);
-
-int Ambiguous(char **s);
-int isprefix(char *s1, char *s2);
-char **genget(char *name, char **table, int stlen);
-
-int encrypt_debug_mode = 0;
-static int decrypt_mode = 0;
-static int encrypt_mode = 0;
-static int encrypt_verbose = 0;
-static int autoencrypt = 0;
-static int autodecrypt = 0;
-static int havesessionkey = 0;
-static int Server = 0;
-static char *Name = "Noname";
-
-#define	typemask(x)	((x) > 0 ? 1 << ((x)-1) : 0)
-
-static long i_support_encrypt = typemask(ENCTYPE_DES_CFB64)
-				| typemask(ENCTYPE_DES_OFB64);
-static long i_support_decrypt = typemask(ENCTYPE_DES_CFB64)
-				| typemask(ENCTYPE_DES_OFB64);
-static long i_wont_support_encrypt = 0;
-static long i_wont_support_decrypt = 0;
-#define	I_SUPPORT_ENCRYPT	(i_support_encrypt & ~i_wont_support_encrypt)
-#define	I_SUPPORT_DECRYPT	(i_support_decrypt & ~i_wont_support_decrypt)
-
-static long remote_supports_encrypt = 0;
-static long remote_supports_decrypt = 0;
-
-static Encryptions encryptions[] = {
-#ifdef	DES_ENCRYPTION
-    { "DES_CFB64",	ENCTYPE_DES_CFB64,
-			cfb64_encrypt,
-			cfb64_decrypt,
-			cfb64_init,
-			cfb64_start,
-			cfb64_is,
-			cfb64_reply,
-			cfb64_session,
-			cfb64_keyid,
-			cfb64_printsub },
-    { "DES_OFB64",	ENCTYPE_DES_OFB64,
-			ofb64_encrypt,
-			ofb64_decrypt,
-			ofb64_init,
-			ofb64_start,
-			ofb64_is,
-			ofb64_reply,
-			ofb64_session,
-			ofb64_keyid,
-			ofb64_printsub },
-#endif	/* DES_ENCRYPTION */
-    { 0, },
-};
-
-static unsigned char str_send[64] = { IAC, SB, TELOPT_ENCRYPT,
-					 ENCRYPT_SUPPORT };
-static unsigned char str_suplen = 0;
-static unsigned char str_start[72] = { IAC, SB, TELOPT_ENCRYPT };
-static unsigned char str_end[] = { IAC, SB, TELOPT_ENCRYPT, 0, IAC, SE };
-
-	Encryptions *
-findencryption(type)
-	int type;
-{
-	Encryptions *ep = encryptions;
-
-	if (!(I_SUPPORT_ENCRYPT & remote_supports_decrypt & typemask(type)))
-		return(0);
-	while (ep->type && ep->type != type)
-		++ep;
-	return(ep->type ? ep : 0);
-}
-
-	Encryptions *
-finddecryption(type)
-	int type;
-{
-	Encryptions *ep = encryptions;
-
-	if (!(I_SUPPORT_DECRYPT & remote_supports_encrypt & typemask(type)))
-		return(0);
-	while (ep->type && ep->type != type)
-		++ep;
-	return(ep->type ? ep : 0);
-}
-
-#define	MAXKEYLEN 64
-
-static struct key_info {
-	unsigned char keyid[MAXKEYLEN];
-	int keylen;
-	int dir;
-	int *modep;
-	Encryptions *(*getcrypt)();
-} ki[2] = {
-	{ { 0 }, 0, DIR_ENCRYPT, &encrypt_mode, findencryption },
-	{ { 0 }, 0, DIR_DECRYPT, &decrypt_mode, finddecryption },
-};
-
-static void encrypt_keyid(struct key_info *kp, unsigned char *keyid, int len);
-
-	void
-encrypt_init(name, server)
-	char *name;
-	int server;
-{
-	Encryptions *ep = encryptions;
-
-	Name = name;
-	Server = server;
-	i_support_encrypt = i_support_decrypt = 0;
-	remote_supports_encrypt = remote_supports_decrypt = 0;
-	encrypt_mode = 0;
-	decrypt_mode = 0;
-	encrypt_output = 0;
-	decrypt_input = 0;
-#ifdef notdef
-	encrypt_verbose = !server;
-#endif
-
-	str_suplen = 4;
-
-	while (ep->type) {
-		if (encrypt_debug_mode)
-			printf(">>>%s: I will support %s\r\n",
-				Name, ENCTYPE_NAME(ep->type));
-		i_support_encrypt |= typemask(ep->type);
-		i_support_decrypt |= typemask(ep->type);
-		if ((i_wont_support_decrypt & typemask(ep->type)) == 0)
-			if ((str_send[str_suplen++] = ep->type) == IAC)
-				str_send[str_suplen++] = IAC;
-		if (ep->init)
-			(*ep->init)(Server);
-		++ep;
-	}
-	str_send[str_suplen++] = IAC;
-	str_send[str_suplen++] = SE;
-}
-
-	void
-encrypt_list_types()
-{
-	Encryptions *ep = encryptions;
-
-	printf("Valid encryption types:\n");
-	while (ep->type) {
-		printf("\t%s (%d)\r\n", ENCTYPE_NAME(ep->type), ep->type);
-		++ep;
-	}
-}
-
-	int
-EncryptEnable(type, mode)
-	char *type, *mode;
-{
-	if (isprefix(type, "help") || isprefix(type, "?")) {
-		printf("Usage: encrypt enable <type> [input|output]\n");
-		encrypt_list_types();
-		return(0);
-	}
-	if (EncryptType(type, mode))
-		return(EncryptStart(mode));
-	return(0);
-}
-
-	int
-EncryptDisable(type, mode)
-	char *type, *mode;
-{
-	register Encryptions *ep;
-	int ret = 0;
-
-	if (isprefix(type, "help") || isprefix(type, "?")) {
-		printf("Usage: encrypt disable <type> [input|output]\n");
-		encrypt_list_types();
-	} else if ((ep = (Encryptions *)genget(type, (char **)encryptions,
-						sizeof(Encryptions))) == 0) {
-		printf("%s: invalid encryption type\n", type);
-	} else if (Ambiguous((char **)ep)) {
-		printf("Ambiguous type '%s'\n", type);
-	} else {
-		if ((mode == 0) || (isprefix(mode, "input") ? 1 : 0)) {
-			if (decrypt_mode == ep->type)
-				EncryptStopInput();
-			i_wont_support_decrypt |= typemask(ep->type);
-			ret = 1;
-		}
-		if ((mode == 0) || (isprefix(mode, "output"))) {
-			if (encrypt_mode == ep->type)
-				EncryptStopOutput();
-			i_wont_support_encrypt |= typemask(ep->type);
-			ret = 1;
-		}
-		if (ret == 0)
-			printf("%s: invalid encryption mode\n", mode);
-	}
-	return(ret);
-}
-
-	int
-EncryptType(type, mode)
-	char *type;
-	char *mode;
-{
-	register Encryptions *ep;
-	int ret = 0;
-
-	if (isprefix(type, "help") || isprefix(type, "?")) {
-		printf("Usage: encrypt type <type> [input|output]\n");
-		encrypt_list_types();
-	} else if ((ep = (Encryptions *)genget(type, (char **)encryptions,
-						sizeof(Encryptions))) == 0) {
-		printf("%s: invalid encryption type\n", type);
-	} else if (Ambiguous((char **)ep)) {
-		printf("Ambiguous type '%s'\n", type);
-	} else {
-		if ((mode == 0) || isprefix(mode, "input")) {
-			decrypt_mode = ep->type;
-			i_wont_support_decrypt &= ~typemask(ep->type);
-			ret = 1;
-		}
-		if ((mode == 0) || isprefix(mode, "output")) {
-			encrypt_mode = ep->type;
-			i_wont_support_encrypt &= ~typemask(ep->type);
-			ret = 1;
-		}
-		if (ret == 0)
-			printf("%s: invalid encryption mode\n", mode);
-	}
-	return(ret);
-}
-
-	int
-EncryptStart(mode)
-	char *mode;
-{
-	register int ret = 0;
-	if (mode) {
-		if (isprefix(mode, "input"))
-			return(EncryptStartInput());
-		if (isprefix(mode, "output"))
-			return(EncryptStartOutput());
-		if (isprefix(mode, "help") || isprefix(mode, "?")) {
-			printf("Usage: encrypt start [input|output]\n");
-			return(0);
-		}
-		printf("%s: invalid encryption mode 'encrypt start ?' for help\n", mode);
-		return(0);
-	}
-	ret += EncryptStartInput();
-	ret += EncryptStartOutput();
-	return(ret);
-}
-
-	int
-EncryptStartInput()
-{
-	if (decrypt_mode) {
-		encrypt_send_request_start();
-		return(1);
-	}
-	printf("No previous decryption mode, decryption not enabled\r\n");
-	return(0);
-}
-
-	int
-EncryptStartOutput()
-{
-	if (encrypt_mode) {
-		encrypt_start_output(encrypt_mode);
-		return(1);
-	}
-	printf("No previous encryption mode, encryption not enabled\r\n");
-	return(0);
-}
-
-	int
-EncryptStop(mode)
-	char *mode;
-{
-	int ret = 0;
-	if (mode) {
-		if (isprefix(mode, "input"))
-			return(EncryptStopInput());
-		if (isprefix(mode, "output"))
-			return(EncryptStopOutput());
-		if (isprefix(mode, "help") || isprefix(mode, "?")) {
-			printf("Usage: encrypt stop [input|output]\n");
-			return(0);
-		}
-		printf("%s: invalid encryption mode 'encrypt stop ?' for help\n", mode);
-		return(0);
-	}
-	ret += EncryptStopInput();
-	ret += EncryptStopOutput();
-	return(ret);
-}
-
-	int
-EncryptStopInput()
-{
-	encrypt_send_request_end();
-	return(1);
-}
-
-	int
-EncryptStopOutput()
-{
-	encrypt_send_end();
-	return(1);
-}
-
-	void
-encrypt_display()
-{
-	if (encrypt_output)
-		printf("Currently encrypting output with %s\r\n",
-			ENCTYPE_NAME(encrypt_mode));
-	if (decrypt_input)
-		printf("Currently decrypting input with %s\r\n",
-			ENCTYPE_NAME(decrypt_mode));
-}
-
-	int
-EncryptStatus()
-{
-	if (encrypt_output)
-		printf("Currently encrypting output with %s\r\n",
-			ENCTYPE_NAME(encrypt_mode));
-	else if (encrypt_mode) {
-		printf("Currently output is clear text.\r\n");
-		printf("Last encryption mode was %s\r\n",
-			ENCTYPE_NAME(encrypt_mode));
-	}
-	if (decrypt_input) {
-		printf("Currently decrypting input with %s\r\n",
-			ENCTYPE_NAME(decrypt_mode));
-	} else if (decrypt_mode) {
-		printf("Currently input is clear text.\r\n");
-		printf("Last decryption mode was %s\r\n",
-			ENCTYPE_NAME(decrypt_mode));
-	}
-	return 1;
-}
-
-	void
-encrypt_send_support()
-{
-	if (str_suplen) {
-		/*
-		 * If the user has requested that decryption start
-		 * immediatly, then send a "REQUEST START" before
-		 * we negotiate the type.
-		 */
-		if (!Server && autodecrypt)
-			encrypt_send_request_start();
-		net_write(str_send, str_suplen);
-		printsub('>', &str_send[2], str_suplen - 2);
-		str_suplen = 0;
-	}
-}
-
-	int
-EncryptDebug(on)
-	int on;
-{
-	if (on < 0)
-		encrypt_debug_mode ^= 1;
-	else
-		encrypt_debug_mode = on;
-	printf("Encryption debugging %s\r\n",
-		encrypt_debug_mode ? "enabled" : "disabled");
-	return(1);
-}
-
-	int
-EncryptVerbose(on)
-	int on;
-{
-	if (on < 0)
-		encrypt_verbose ^= 1;
-	else
-		encrypt_verbose = on;
-	printf("Encryption %s verbose\r\n",
-		encrypt_verbose ? "is" : "is not");
-	return(1);
-}
-
-	int
-EncryptAutoEnc(on)
-	int on;
-{
-	encrypt_auto(on);
-	printf("Automatic encryption of output is %s\r\n",
-		autoencrypt ? "enabled" : "disabled");
-	return(1);
-}
-
-	int
-EncryptAutoDec(on)
-	int on;
-{
-	decrypt_auto(on);
-	printf("Automatic decryption of input is %s\r\n",
-		autodecrypt ? "enabled" : "disabled");
-	return(1);
-}
-
-/*
- * Called when ENCRYPT SUPPORT is received.
- */
-	void
-encrypt_support(typelist, cnt)
-	unsigned char *typelist;
-	int cnt;
-{
-	register int type, use_type = 0;
-	Encryptions *ep;
-
-	/*
-	 * Forget anything the other side has previously told us.
-	 */
-	remote_supports_decrypt = 0;
-
-	while (cnt-- > 0) {
-		type = *typelist++;
-		if (encrypt_debug_mode)
-			printf(">>>%s: He is supporting %s (%d)\r\n",
-				Name,
-				ENCTYPE_NAME(type), type);
-		if ((type < ENCTYPE_CNT) &&
-		    (I_SUPPORT_ENCRYPT & typemask(type))) {
-			remote_supports_decrypt |= typemask(type);
-			if (use_type == 0)
-				use_type = type;
-		}
-	}
-	if (use_type) {
-		ep = findencryption(use_type);
-		if (!ep)
-			return;
-		type = ep->start ? (*ep->start)(DIR_ENCRYPT, Server) : 0;
-		if (encrypt_debug_mode)
-			printf(">>>%s: (*ep->start)() returned %d\r\n",
-					Name, type);
-		if (type < 0)
-			return;
-		encrypt_mode = use_type;
-		if (type == 0)
-			encrypt_start_output(use_type);
-	}
-}
-
-	void
-encrypt_is(data, cnt)
-	unsigned char *data;
-	int cnt;
-{
-	Encryptions *ep;
-	register int type, ret;
-
-	if (--cnt < 0)
-		return;
-	type = *data++;
-	if (type < ENCTYPE_CNT)
-		remote_supports_encrypt |= typemask(type);
-	if (!(ep = finddecryption(type))) {
-		if (encrypt_debug_mode)
-			printf(">>>%s: Can't find type %s (%d) for initial negotiation\r\n",
-				Name,
-				ENCTYPE_NAME_OK(type)
-					? ENCTYPE_NAME(type) : "(unknown)",
-				type);
-		return;
-	}
-	if (!ep->is) {
-		if (encrypt_debug_mode)
-			printf(">>>%s: No initial negotiation needed for type %s (%d)\r\n",
-				Name,
-				ENCTYPE_NAME_OK(type)
-					? ENCTYPE_NAME(type) : "(unknown)",
-				type);
-		ret = 0;
-	} else {
-		ret = (*ep->is)(data, cnt);
-		if (encrypt_debug_mode)
-			printf("(*ep->is)(%p, %d) returned %s(%d)\n", data, cnt,
-				(ret < 0) ? "FAIL " :
-				(ret == 0) ? "SUCCESS " : "MORE_TO_DO ", ret);
-	}
-	if (ret < 0) {
-		autodecrypt = 0;
-	} else {
-		decrypt_mode = type;
-		if (ret == 0 && autodecrypt)
-			encrypt_send_request_start();
-	}
-}
-
-	void
-encrypt_reply(data, cnt)
-	unsigned char *data;
-	int cnt;
-{
-	Encryptions *ep;
-	register int ret, type;
-
-	if (--cnt < 0)
-		return;
-	type = *data++;
-	if (!(ep = findencryption(type))) {
-		if (encrypt_debug_mode)
-			printf(">>>%s: Can't find type %s (%d) for initial negotiation\r\n",
-				Name,
-				ENCTYPE_NAME_OK(type)
-					? ENCTYPE_NAME(type) : "(unknown)",
-				type);
-		return;
-	}
-	if (!ep->reply) {
-		if (encrypt_debug_mode)
-			printf(">>>%s: No initial negotiation needed for type %s (%d)\r\n",
-				Name,
-				ENCTYPE_NAME_OK(type)
-					? ENCTYPE_NAME(type) : "(unknown)",
-				type);
-		ret = 0;
-	} else {
-		ret = (*ep->reply)(data, cnt);
-		if (encrypt_debug_mode)
-			printf("(*ep->reply)(%p, %d) returned %s(%d)\n",
-				data, cnt,
-				(ret < 0) ? "FAIL " :
-				(ret == 0) ? "SUCCESS " : "MORE_TO_DO ", ret);
-	}
-	if (encrypt_debug_mode)
-		printf(">>>%s: encrypt_reply returned %d\n", Name, ret);
-	if (ret < 0) {
-		autoencrypt = 0;
-	} else {
-		encrypt_mode = type;
-		if (ret == 0 && autoencrypt)
-			encrypt_start_output(type);
-	}
-}
-
-/*
- * Called when a ENCRYPT START command is received.
- */
-	void
-encrypt_start(data, cnt)
-	unsigned char *data;
-	int cnt;
-{
-	Encryptions *ep;
-
-	if (!decrypt_mode) {
-		/*
-		 * Something is wrong.  We should not get a START
-		 * command without having already picked our
-		 * decryption scheme.  Send a REQUEST-END to
-		 * attempt to clear the channel...
-		 */
-		printf("%s: Warning, Cannot decrypt input stream!!!\r\n", Name);
-		encrypt_send_request_end();
-		return;
-	}
-
-	if ((ep = finddecryption(decrypt_mode))) {
-		decrypt_input = ep->input;
-		if (encrypt_verbose)
-			printf("[ Input is now decrypted with type %s ]\r\n",
-				ENCTYPE_NAME(decrypt_mode));
-		if (encrypt_debug_mode)
-			printf(">>>%s: Start to decrypt input with type %s\r\n",
-				Name, ENCTYPE_NAME(decrypt_mode));
-	} else {
-		printf("%s: Warning, Cannot decrypt type %s (%d)!!!\r\n",
-				Name,
-				ENCTYPE_NAME_OK(decrypt_mode)
-					? ENCTYPE_NAME(decrypt_mode)
-					: "(unknown)",
-				decrypt_mode);
-		encrypt_send_request_end();
-	}
-}
-
-	void
-encrypt_session_key(key, server)
-	Session_Key *key;
-	int server;
-{
-	Encryptions *ep = encryptions;
-
-	havesessionkey = 1;
-
-	while (ep->type) {
-		if (ep->session)
-			(*ep->session)(key, server);
-#ifdef notdef
-		if (!encrypt_output && autoencrypt && !server)
-			encrypt_start_output(ep->type);
-		if (!decrypt_input && autodecrypt && !server)
-			encrypt_send_request_start();
-#endif
-		++ep;
-	}
-}
-
-/*
- * Called when ENCRYPT END is received.
- */
-	void
-encrypt_end()
-{
-	decrypt_input = 0;
-	if (encrypt_debug_mode)
-		printf(">>>%s: Input is back to clear text\r\n", Name);
-	if (encrypt_verbose)
-		printf("[ Input is now clear text ]\r\n");
-}
-
-/*
- * Called when ENCRYPT REQUEST-END is received.
- */
-	void
-encrypt_request_end()
-{
-	encrypt_send_end();
-}
-
-/*
- * Called when ENCRYPT REQUEST-START is received.  If we receive
- * this before a type is picked, then that indicates that the
- * other side wants us to start encrypting data as soon as we
- * can.
- */
-	void
-encrypt_request_start(data, cnt)
-	unsigned char *data;
-	int cnt;
-{
-	if (encrypt_mode == 0)  {
-		if (Server)
-			autoencrypt = 1;
-		return;
-	}
-	encrypt_start_output(encrypt_mode);
-}
-
-static unsigned char str_keyid[(MAXKEYLEN*2)+5] = { IAC, SB, TELOPT_ENCRYPT };
-
-	void
-encrypt_enc_keyid(keyid, len)
-	unsigned char *keyid;
-	int len;
-{
-	encrypt_keyid(&ki[1], keyid, len);
-}
-
-	void
-encrypt_dec_keyid(keyid, len)
-	unsigned char *keyid;
-	int len;
-{
-	encrypt_keyid(&ki[0], keyid, len);
-}
-
-	void
-encrypt_keyid(kp, keyid, len)
-	struct key_info *kp;
-	unsigned char *keyid;
-	int len;
-{
-	Encryptions *ep;
-	int dir = kp->dir;
-	register int ret = 0;
-
-	if (!(ep = (*kp->getcrypt)(*kp->modep))) {
-		if (len == 0)
-			return;
-		kp->keylen = 0;
-	} else if (len == 0) {
-		/*
-		 * Empty option, indicates a failure.
-		 */
-		if (kp->keylen == 0)
-			return;
-		kp->keylen = 0;
-		if (ep->keyid)
-			(void)(*ep->keyid)(dir, kp->keyid, &kp->keylen);
-
-	} else if ((len != kp->keylen) ||
-		   (memcmp(keyid, kp->keyid, len) != 0)) {
-		/*
-		 * Length or contents are different
-		 */
-		kp->keylen = len;
-		memmove(kp->keyid, keyid, len);
-		if (ep->keyid)
-			(void)(*ep->keyid)(dir, kp->keyid, &kp->keylen);
-	} else {
-		if (ep->keyid)
-			ret = (*ep->keyid)(dir, kp->keyid, &kp->keylen);
-		if ((ret == 0) && (dir == DIR_ENCRYPT) && autoencrypt)
-			encrypt_start_output(*kp->modep);
-		return;
-	}
-
-	encrypt_send_keyid(dir, kp->keyid, kp->keylen, 0);
-}
-
-	void
-encrypt_send_keyid(dir, keyid, keylen, saveit)
-	int dir;
-	unsigned char *keyid;
-	int keylen;
-	int saveit;
-{
-	unsigned char *strp;
-
-	str_keyid[3] = (dir == DIR_ENCRYPT)
-			? ENCRYPT_ENC_KEYID : ENCRYPT_DEC_KEYID;
-	if (saveit) {
-		struct key_info *kp = &ki[(dir == DIR_ENCRYPT) ? 0 : 1];
-		memmove(kp->keyid, keyid, keylen);
-		kp->keylen = keylen;
-	}
-
-	for (strp = &str_keyid[4]; keylen > 0; --keylen) {
-		if ((*strp++ = *keyid++) == IAC)
-			*strp++ = IAC;
-	}
-	*strp++ = IAC;
-	*strp++ = SE;
-	net_write(str_keyid, strp - str_keyid);
-	printsub('>', &str_keyid[2], strp - str_keyid - 2);
-}
-
-	void
-encrypt_auto(on)
-	int on;
-{
-	if (on < 0)
-		autoencrypt ^= 1;
-	else
-		autoencrypt = on ? 1 : 0;
-}
-
-	void
-decrypt_auto(on)
-	int on;
-{
-	if (on < 0)
-		autodecrypt ^= 1;
-	else
-		autodecrypt = on ? 1 : 0;
-}
-
-	void
-encrypt_start_output(type)
-	int type;
-{
-	Encryptions *ep;
-	register unsigned char *p;
-	register int i;
-
-	if (!(ep = findencryption(type))) {
-		if (encrypt_debug_mode) {
-			printf(">>>%s: Can't encrypt with type %s (%d)\r\n",
-				Name,
-				ENCTYPE_NAME_OK(type)
-					? ENCTYPE_NAME(type) : "(unknown)",
-				type);
-		}
-		return;
-	}
-	if (ep->start) {
-		i = (*ep->start)(DIR_ENCRYPT, Server);
-		if (encrypt_debug_mode) {
-			printf(">>>%s: Encrypt start: %s (%d) %s\r\n",
-				Name,
-				(i < 0) ? "failed" :
-					"initial negotiation in progress",
-				i, ENCTYPE_NAME(type));
-		}
-		if (i)
-			return;
-	}
-	p = str_start + 3;
-	*p++ = ENCRYPT_START;
-	for (i = 0; i < ki[0].keylen; ++i) {
-		if ((*p++ = ki[0].keyid[i]) == IAC)
-			*p++ = IAC;
-	}
-	*p++ = IAC;
-	*p++ = SE;
-	net_write(str_start, p - str_start);
-	net_encrypt();
-	printsub('>', &str_start[2], p - &str_start[2]);
-	/*
-	 * If we are already encrypting in some mode, then
-	 * encrypt the ring (which includes our request) in
-	 * the old mode, mark it all as "clear text" and then
-	 * switch to the new mode.
-	 */
-	encrypt_output = ep->output;
-	encrypt_mode = type;
-	if (encrypt_debug_mode)
-		printf(">>>%s: Started to encrypt output with type %s\r\n",
-			Name, ENCTYPE_NAME(type));
-	if (encrypt_verbose)
-		printf("[ Output is now encrypted with type %s ]\r\n",
-			ENCTYPE_NAME(type));
-}
-
-	void
-encrypt_send_end()
-{
-	if (!encrypt_output)
-		return;
-
-	str_end[3] = ENCRYPT_END;
-	net_write(str_end, sizeof(str_end));
-	net_encrypt();
-	printsub('>', &str_end[2], sizeof(str_end) - 2);
-	/*
-	 * Encrypt the output buffer now because it will not be done by
-	 * netflush...
-	 */
-	encrypt_output = 0;
-	if (encrypt_debug_mode)
-		printf(">>>%s: Output is back to clear text\r\n", Name);
-	if (encrypt_verbose)
-		printf("[ Output is now clear text ]\r\n");
-}
-
-	void
-encrypt_send_request_start()
-{
-	register unsigned char *p;
-	register int i;
-
-	p = &str_start[3];
-	*p++ = ENCRYPT_REQSTART;
-	for (i = 0; i < ki[1].keylen; ++i) {
-		if ((*p++ = ki[1].keyid[i]) == IAC)
-			*p++ = IAC;
-	}
-	*p++ = IAC;
-	*p++ = SE;
-	net_write(str_start, p - str_start);
-	printsub('>', &str_start[2], p - &str_start[2]);
-	if (encrypt_debug_mode)
-		printf(">>>%s: Request input to be encrypted\r\n", Name);
-}
-
-	void
-encrypt_send_request_end()
-{
-	str_end[3] = ENCRYPT_REQEND;
-	net_write(str_end, sizeof(str_end));
-	printsub('>', &str_end[2], sizeof(str_end) - 2);
-
-	if (encrypt_debug_mode)
-		printf(">>>%s: Request input to be clear text\r\n", Name);
-}
-
-	void
-encrypt_wait()
-{
-	if (encrypt_debug_mode)
-		printf(">>>%s: in encrypt_wait\r\n", Name);
-	if (!havesessionkey || !(I_SUPPORT_ENCRYPT & remote_supports_decrypt))
-		return;
-	while (autoencrypt && !encrypt_output)
-		if (telnet_spin())
-			return;
-}
-
-	void
-encrypt_debug(mode)
-	int mode;
-{
-	encrypt_debug_mode = mode;
-}
-
-	void
-encrypt_gen_printsub(data, cnt, buf, buflen)
-	unsigned char *data, *buf;
-	int cnt, buflen;
-{
-	char tbuf[16], *cp;
-
-	cnt -= 2;
-	data += 2;
-	buf[buflen-1] = '\0';
-	buf[buflen-2] = '*';
-	buflen -= 2;;
-	for (; cnt > 0; cnt--, data++) {
-		sprintf(tbuf, " %d", *data);
-		for (cp = tbuf; *cp && buflen > 0; --buflen)
-			*buf++ = *cp++;
-		if (buflen <= 0)
-			return;
-	}
-	*buf = '\0';
-}
-
-	void
-encrypt_printsub(data, cnt, buf, buflen)
-	unsigned char *data, *buf;
-	int cnt, buflen;
-{
-	Encryptions *ep;
-	register int type = data[1];
-
-	for (ep = encryptions; ep->type && ep->type != type; ep++)
-		;
-
-	if (ep->printsub)
-		(*ep->printsub)(data, cnt, buf, buflen);
-	else
-		encrypt_gen_printsub(data, cnt, buf, buflen);
-}
-#endif	/* ENCRYPTION */
diff --git a/crypto/telnet/libtelnet/encrypt.h b/crypto/telnet/libtelnet/encrypt.h
deleted file mode 100644
index 1c942dc6e7e8..000000000000
--- a/crypto/telnet/libtelnet/encrypt.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)encrypt.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * Copyright (C) 1990 by the Massachusetts Institute of Technology
- *
- * Export of this software from the United States of America is assumed
- * to require a specific license from the United States Government.
- * It is the responsibility of any person or organization contemplating
- * export to obtain such a license before exporting.
- *
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of M.I.T. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission.  M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express
- * or implied warranty.
- */
-
-#ifdef	ENCRYPTION
-# ifndef __ENCRYPTION__
-# define __ENCRYPTION__
-
-#define	DIR_DECRYPT		1
-#define	DIR_ENCRYPT		2
-
-typedef	unsigned char Block[8];
-typedef unsigned char *BlockT;
-typedef struct { Block __; } Schedule[16];
-
-#define	VALIDKEY(key)	( key[0] | key[1] | key[2] | key[3] | \
-			  key[4] | key[5] | key[6] | key[7])
-
-#define	SAMEKEY(k1, k2)	(!bcmp((void *)k1, (void *)k2, sizeof(Block)))
-
-typedef	struct {
-	short		type;
-	int		length;
-	unsigned char	*data;
-} Session_Key;
-
-# if !defined(P)
-#  ifdef __STDC__
-#   define P(x)	x
-#  else
-#   define P(x)	()
-#  endif
-# endif
-
-typedef struct {
-	char	*name;
-	int	type;
-	void	(*output) P((unsigned char *, int));
-	int	(*input) P((int));
-	void	(*init) P((int));
-	int	(*start) P((int, int));
-	int	(*is) P((unsigned char *, int));
-	int	(*reply) P((unsigned char *, int));
-	void	(*session) P((Session_Key *, int));
-	int	(*keyid) P((int, unsigned char *, int *));
-	void	(*printsub) P((unsigned char *, int, unsigned char *, int));
-} Encryptions;
-
-#define	SK_DES		1	/* Matched Kerberos v5 KEYTYPE_DES */
-
-#include "enc-proto.h"
-
-extern int encrypt_debug_mode;
-extern int (*decrypt_input) P((int));
-extern void (*encrypt_output) P((unsigned char *, int));
-# endif /* __ENCRYPTION__ */
-#endif /* ENCRYPTION */
diff --git a/crypto/telnet/libtelnet/genget.c b/crypto/telnet/libtelnet/genget.c
deleted file mode 100644
index 8668db47a700..000000000000
--- a/crypto/telnet/libtelnet/genget.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static const char sccsid[] = "@(#)genget.c	8.2 (Berkeley) 5/30/95";
-#endif /* not lint */
-
-
-#include <ctype.h>
-
-#define	LOWER(x) (isupper(x) ? tolower(x) : (x))
-/*
- * The prefix function returns 0 if *s1 is not a prefix
- * of *s2.  If *s1 exactly matches *s2, the negative of
- * the length is returned.  If *s1 is a prefix of *s2,
- * the length of *s1 is returned.
- */
-	int
-isprefix(s1, s2)
-	register char *s1, *s2;
-{
-	char *os1;
-	register char c1, c2;
-
-	if (*s1 == '\0')
-		return(-1);
-	os1 = s1;
-	c1 = *s1;
-	c2 = *s2;
-	while (LOWER(c1) == LOWER(c2)) {
-		if (c1 == '\0')
-			break;
-		c1 = *++s1;
-		c2 = *++s2;
-	}
-	return(*s1 ? 0 : (*s2 ? (s1 - os1) : (os1 - s1)));
-}
-
-static char *ambiguous;		/* special return value for command routines */
-
-	char **
-genget(name, table, stlen)
-	char	*name;		/* name to match */
-	char	**table;	/* name entry in table */
-	int	stlen;
-{
-	register char **c, **found;
-	register int n;
-
-	if (name == 0)
-	    return 0;
-
-	found = 0;
-	for (c = table; *c != 0; c = (char **)((char *)c + stlen)) {
-		if ((n = isprefix(name, *c)) == 0)
-			continue;
-		if (n < 0)		/* exact match */
-			return(c);
-		if (found)
-			return(&ambiguous);
-		found = c;
-	}
-	return(found);
-}
-
-/*
- * Function call version of Ambiguous()
- */
-	int
-Ambiguous(s)
-	char **s;
-{
-	return(s == &ambiguous);
-}
diff --git a/crypto/telnet/libtelnet/getent.c b/crypto/telnet/libtelnet/getent.c
deleted file mode 100644
index 5aa1049a3c8d..000000000000
--- a/crypto/telnet/libtelnet/getent.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static char sccsid[] = "@(#)getent.c	8.2 (Berkeley) 12/15/93";
-#endif /* not lint */
-
-static char *area;
-
-/*ARGSUSED*/
-getent(cp, name)
-char *cp, *name;
-{
-#ifdef	HAS_CGETENT
-	char *dba[2];
-
-	dba[0] = "/etc/gettytab";
-	dba[1] = 0;
-	return((cgetent(&area, dba, name) == 0) ? 1 : 0);
-#else
-	return(0);
-#endif
-}
-
-#ifndef	SOLARIS
-/*ARGSUSED*/
-char *
-Getstr(id, cpp)
-char *id, **cpp;
-{
-# ifdef	HAS_CGETENT
-	char *answer;
-	return((cgetstr(area, id, &answer) > 0) ? answer : 0);
-# else
-	return(0);
-# endif
-}
-#endif
diff --git a/crypto/telnet/libtelnet/kerberos.c b/crypto/telnet/libtelnet/kerberos.c
deleted file mode 100644
index 738a57f35ce6..000000000000
--- a/crypto/telnet/libtelnet/kerberos.c
+++ /dev/null
@@ -1,550 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static const char sccsid[] = "@(#)kerberos.c	8.3 (Berkeley) 5/30/95";
-#endif /* not lint */
-
-/*
- * Copyright (C) 1990 by the Massachusetts Institute of Technology
- *
- * Export of this software from the United States of America is assumed
- * to require a specific license from the United States Government.
- * It is the responsibility of any person or organization contemplating
- * export to obtain such a license before exporting.
- *
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of M.I.T. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission.  M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express
- * or implied warranty.
- */
-
-#ifdef	KRB4
-#include <sys/types.h>
-#include <arpa/telnet.h>
-#include <stdio.h>
-#include <des.h>	/* BSD wont include this in krb.h, so we do it here */
-#include <krb.h>
-#ifdef	__STDC__
-#include <stdlib.h>
-#endif
-#ifdef	NO_STRING_H
-#include <strings.h>
-#else
-#include <string.h>
-#endif
-
-#include "encrypt.h"
-#include "auth.h"
-#include "misc.h"
-
-int kerberos4_cksum P((unsigned char *, int));
-int kuserok P((AUTH_DAT *, char *));
-
-extern auth_debug_mode;
-
-static unsigned char str_data[1024] = { IAC, SB, TELOPT_AUTHENTICATION, 0,
-			  		AUTHTYPE_KERBEROS_V4, };
-
-#define	KRB_AUTH	0		/* Authentication data follows */
-#define	KRB_REJECT	1		/* Rejected (reason might follow) */
-#define	KRB_ACCEPT	2		/* Accepted */
-#define	KRB_CHALLENGE	3		/* Challenge for mutual auth. */
-#define	KRB_RESPONSE	4		/* Response for mutual auth. */
-
-#define KRB_SERVICE_NAME   "rcmd"
-
-static	KTEXT_ST auth;
-static	char name[ANAME_SZ];
-static	AUTH_DAT adat = { 0 };
-#ifdef	ENCRYPTION
-static Block	session_key	= { 0 };
-static des_key_schedule sched;
-static Block	challenge	= { 0 };
-#endif	/* ENCRYPTION */
-
-	static int
-Data(ap, type, d, c)
-	Authenticator *ap;
-	int type;
-	void *d;
-	int c;
-{
-	unsigned char *p = str_data + 4;
-	unsigned char *cd = (unsigned char *)d;
-
-	if (c == -1)
-		c = strlen((char *)cd);
-
-	if (auth_debug_mode) {
-		printf("%s:%d: [%d] (%d)",
-			str_data[3] == TELQUAL_IS ? ">>>IS" : ">>>REPLY",
-			str_data[3],
-			type, c);
-		printd(d, c);
-		printf("\r\n");
-	}
-	*p++ = ap->type;
-	*p++ = ap->way;
-	*p++ = type;
-	while (c-- > 0) {
-		if ((*p++ = *cd++) == IAC)
-			*p++ = IAC;
-	}
-	*p++ = IAC;
-	*p++ = SE;
-	if (str_data[3] == TELQUAL_IS)
-		printsub('>', &str_data[2], p - (&str_data[2]));
-	return(net_write(str_data, p - str_data));
-}
-
-	int
-kerberos4_init(ap, server)
-	Authenticator *ap;
-	int server;
-{
-	FILE *fp;
-
-	if (server) {
-		str_data[3] = TELQUAL_REPLY;
-		if ((fp = fopen(KEYFILE, "r")) == NULL)
-			return(0);
-		fclose(fp);
-	} else {
-		str_data[3] = TELQUAL_IS;
-	}
-	return(1);
-}
-
-char dst_realm_buf[REALM_SZ], *dest_realm = NULL;
-int dst_realm_sz = REALM_SZ;
-
-	int
-kerberos4_send(ap)
-	Authenticator *ap;
-{
-	KTEXT_ST auth;
-	char instance[INST_SZ];
-	char *realm;
-	char *krb_realmofhost();
-	char *krb_get_phost();
-	CREDENTIALS cred;
-	int r;
-
-	printf("[ Trying KERBEROS4 ... ]\n");
-	if (!UserNameRequested) {
-		if (auth_debug_mode) {
-			printf("Kerberos V4: no user name supplied\r\n");
-		}
-		return(0);
-	}
-
-	memset(instance, 0, sizeof(instance));
-
-	if ((realm = krb_get_phost(RemoteHostName)))
-		strncpy(instance, realm, sizeof(instance));
-
-	instance[sizeof(instance)-1] = '\0';
-
-	realm = dest_realm ? dest_realm : krb_realmofhost(RemoteHostName);
-
-	if (!realm) {
-		printf("Kerberos V4: no realm for %s\r\n", RemoteHostName);
-		return(0);
-	}
-	if ((r = krb_mk_req(&auth, KRB_SERVICE_NAME, instance, realm, 0L))) {
-		printf("mk_req failed: %s\r\n", krb_err_txt[r]);
-		return(0);
-	}
-	if ((r = krb_get_cred(KRB_SERVICE_NAME, instance, realm, &cred))) {
-		printf("get_cred failed: %s\r\n", krb_err_txt[r]);
-		return(0);
-	}
-	if (!auth_sendname(UserNameRequested, strlen(UserNameRequested))) {
-		if (auth_debug_mode)
-			printf("Not enough room for user name\r\n");
-		return(0);
-	}
-	if (auth_debug_mode)
-		printf("Sent %d bytes of authentication data\r\n", auth.length);
-	if (!Data(ap, KRB_AUTH, (void *)auth.dat, auth.length)) {
-		if (auth_debug_mode)
-			printf("Not enough room for authentication data\r\n");
-		return(0);
-	}
-#ifdef	ENCRYPTION
-	/*
-	 * If we are doing mutual authentication, get set up to send
-	 * the challenge, and verify it when the response comes back.
-	 */
-	if ((ap->way & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) {
-		register int i;
-
-		des_key_sched(&cred.session, sched);
-		des_init_random_number_generator(&cred.session);
-		des_new_random_key(&session_key);
-		des_ecb_encrypt(&session_key, &session_key, sched, 0);
-		des_ecb_encrypt(&session_key, &challenge, sched, 0);
-		/*
-		 * Increment the challenge by 1, and encrypt it for
-		 * later comparison.
-		 */
-		for (i = 7; i >= 0; --i) {
-			register int x;
-			x = (unsigned int)challenge[i] + 1;
-			challenge[i] = x;	/* ignore overflow */
-			if (x < 256)		/* if no overflow, all done */
-				break;
-		}
-		des_ecb_encrypt(&challenge, &challenge, sched, 1);
-	}
-#endif	/* ENCRYPTION */
-
-	if (auth_debug_mode) {
-		printf("CK: %d:", kerberos4_cksum(auth.dat, auth.length));
-		printd(auth.dat, auth.length);
-		printf("\r\n");
-		printf("Sent Kerberos V4 credentials to server\r\n");
-	}
-	return(1);
-}
-
-	void
-kerberos4_is(ap, data, cnt)
-	Authenticator *ap;
-	unsigned char *data;
-	int cnt;
-{
-#ifdef	ENCRYPTION
-	Session_Key skey;
-	Block datablock;
-#endif	/* ENCRYPTION */
-	char realm[REALM_SZ];
-	char instance[INST_SZ];
-	int r;
-
-	if (cnt-- < 1)
-		return;
-	switch (*data++) {
-	case KRB_AUTH:
-		if (krb_get_lrealm(realm, 1) != KSUCCESS) {
-			Data(ap, KRB_REJECT, (void *)"No local V4 Realm.", -1);
-			auth_finished(ap, AUTH_REJECT);
-			if (auth_debug_mode)
-				printf("No local realm\r\n");
-			return;
-		}
-		memmove((void *)auth.dat, (void *)data, auth.length = cnt);
-		if (auth_debug_mode) {
-			printf("Got %d bytes of authentication data\r\n", cnt);
-			printf("CK: %d:", kerberos4_cksum(auth.dat, auth.length));
-			printd(auth.dat, auth.length);
-			printf("\r\n");
-		}
-		instance[0] = '*'; instance[1] = 0;
-		if ((r = krb_rd_req(&auth, KRB_SERVICE_NAME,
-				   instance, 0, &adat, ""))) {
-			if (auth_debug_mode)
-				printf("Kerberos failed him as %s\r\n", name);
-			Data(ap, KRB_REJECT, (void *)krb_err_txt[r], -1);
-			auth_finished(ap, AUTH_REJECT);
-			return;
-		}
-#ifdef	ENCRYPTION
-		memmove((void *)session_key, (void *)adat.session, sizeof(Block));
-#endif	/* ENCRYPTION */
-		krb_kntoln(&adat, name);
-
-		if (UserNameRequested && !kuserok(&adat, UserNameRequested))
-			Data(ap, KRB_ACCEPT, (void *)0, 0);
-		else
-			Data(ap, KRB_REJECT,
-				(void *)"user is not authorized", -1);
-		auth_finished(ap, AUTH_USER);
-		break;
-
-	case KRB_CHALLENGE:
-#ifndef	ENCRYPTION
-		Data(ap, KRB_RESPONSE, (void *)0, 0);
-#else	/* ENCRYPTION */
-		if (!VALIDKEY(session_key)) {
-			/*
-			 * We don't have a valid session key, so just
-			 * send back a response with an empty session
-			 * key.
-			 */
-			Data(ap, KRB_RESPONSE, (void *)0, 0);
-			break;
-		}
-
-		/*
-		 * Initialize the random number generator since it's
-		 * used later on by the encryption routine.
-		 */
-		des_init_random_number_generator(&session_key);
-		des_key_sched(&session_key, sched);
-		memmove((void *)datablock, (void *)data, sizeof(Block));
-		/*
-		 * Take the received encrypted challenge, and encrypt
-		 * it again to get a unique session_key for the
-		 * ENCRYPT option.
-		 */
-		des_ecb_encrypt(&datablock, &session_key, sched, 1);
-		skey.type = SK_DES;
-		skey.length = 8;
-		skey.data = session_key;
-		encrypt_session_key(&skey, 1);
-		/*
-		 * Now decrypt the received encrypted challenge,
-		 * increment by one, re-encrypt it and send it back.
-		 */
-		des_ecb_encrypt(&datablock, &challenge, sched, 0);
-		for (r = 7; r >= 0; r--) {
-			register int t;
-			t = (unsigned int)challenge[r] + 1;
-			challenge[r] = t;	/* ignore overflow */
-			if (t < 256)		/* if no overflow, all done */
-				break;
-		}
-		des_ecb_encrypt(&challenge, &challenge, sched, 1);
-		Data(ap, KRB_RESPONSE, (void *)challenge, sizeof(challenge));
-#endif	/* ENCRYPTION */
-		break;
-
-	default:
-		if (auth_debug_mode)
-			printf("Unknown Kerberos option %d\r\n", data[-1]);
-		Data(ap, KRB_REJECT, 0, 0);
-		break;
-	}
-}
-
-	void
-kerberos4_reply(ap, data, cnt)
-	Authenticator *ap;
-	unsigned char *data;
-	int cnt;
-{
-#ifdef	ENCRYPTION
-	Session_Key skey;
-#endif	/* ENCRYPTION */
-
-	if (cnt-- < 1)
-		return;
-	switch (*data++) {
-	case KRB_REJECT:
-		if (cnt > 0) {
-			printf("[ Kerberos V4 refuses authentication because %.*s ]\r\n",
-				cnt, data);
-		} else
-			printf("[ Kerberos V4 refuses authentication ]\r\n");
-		auth_send_retry();
-		return;
-	case KRB_ACCEPT:
-		printf("[ Kerberos V4 accepts you ]\n");
-		if ((ap->way & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) {
-			/*
-			 * Send over the encrypted challenge.
-		 	 */
-#ifndef	ENCRYPTION
-			Data(ap, KRB_CHALLENGE, (void *)0, 0);
-#else	/* ENCRYPTION */
-			Data(ap, KRB_CHALLENGE, (void *)session_key,
-						sizeof(session_key));
-			des_ecb_encrypt(&session_key, &session_key, sched, 1);
-			skey.type = SK_DES;
-			skey.length = 8;
-			skey.data = session_key;
-			encrypt_session_key(&skey, 0);
-#endif	/* ENCRYPTION */
-			return;
-		}
-		auth_finished(ap, AUTH_USER);
-		return;
-	case KRB_RESPONSE:
-#ifdef	ENCRYPTION
-		/*
-		 * Verify that the response to the challenge is correct.
-		 */
-		if ((cnt != sizeof(Block)) ||
-		    (0 != memcmp((void *)data, (void *)challenge,
-						sizeof(challenge))))
-		{
-#endif	/* ENCRYPTION */
-			printf("[ Kerberos V4 challenge failed!!! ]\r\n");
-			auth_send_retry();
-			return;
-#ifdef	ENCRYPTION
-		}
-		printf("[ Kerberos V4 challenge successful ]\r\n");
-		auth_finished(ap, AUTH_USER);
-#endif	/* ENCRYPTION */
-		break;
-	default:
-		if (auth_debug_mode)
-			printf("Unknown Kerberos option %d\r\n", data[-1]);
-		return;
-	}
-}
-
-	int
-kerberos4_status(ap, name, level)
-	Authenticator *ap;
-	char *name;
-	int level;
-{
-	if (level < AUTH_USER)
-		return(level);
-
-	if (UserNameRequested && !kuserok(&adat, UserNameRequested)) {
-		strcpy(name, UserNameRequested);
-		return(AUTH_VALID);
-	} else
-		return(AUTH_USER);
-}
-
-#define	BUMP(buf, len)		while (*(buf)) {++(buf), --(len);}
-#define	ADDC(buf, len, c)	if ((len) > 0) {*(buf)++ = (c); --(len);}
-
-	void
-kerberos4_printsub(data, cnt, buf, buflen)
-	unsigned char *data, *buf;
-	int cnt, buflen;
-{
-	char lbuf[32];
-	register int i;
-
-	buf[buflen-1] = '\0';		/* make sure its NULL terminated */
-	buflen -= 1;
-
-	switch(data[3]) {
-	case KRB_REJECT:		/* Rejected (reason might follow) */
-		strncpy((char *)buf, " REJECT ", buflen);
-		goto common;
-
-	case KRB_ACCEPT:		/* Accepted (name might follow) */
-		strncpy((char *)buf, " ACCEPT ", buflen);
-	common:
-		BUMP(buf, buflen);
-		if (cnt <= 4)
-			break;
-		ADDC(buf, buflen, '"');
-		for (i = 4; i < cnt; i++)
-			ADDC(buf, buflen, data[i]);
-		ADDC(buf, buflen, '"');
-		ADDC(buf, buflen, '\0');
-		break;
-
-	case KRB_AUTH:			/* Authentication data follows */
-		strncpy((char *)buf, " AUTH", buflen);
-		goto common2;
-
-	case KRB_CHALLENGE:
-		strncpy((char *)buf, " CHALLENGE", buflen);
-		goto common2;
-
-	case KRB_RESPONSE:
-		strncpy((char *)buf, " RESPONSE", buflen);
-		goto common2;
-
-	default:
-		sprintf(lbuf, " %d (unknown)", data[3]);
-		strncpy((char *)buf, lbuf, buflen);
-	common2:
-		BUMP(buf, buflen);
-		for (i = 4; i < cnt; i++) {
-			sprintf(lbuf, " %d", data[i]);
-			strncpy((char *)buf, lbuf, buflen);
-			BUMP(buf, buflen);
-		}
-		break;
-	}
-}
-
-	int
-kerberos4_cksum(d, n)
-	unsigned char *d;
-	int n;
-{
-	int ck = 0;
-
-	/*
-	 * A comment is probably needed here for those not
-	 * well versed in the "C" language.  Yes, this is
-	 * supposed to be a "switch" with the body of the
-	 * "switch" being a "while" statement.  The whole
-	 * purpose of the switch is to allow us to jump into
-	 * the middle of the while() loop, and then not have
-	 * to do any more switch()s.
-	 *
-	 * Some compilers will spit out a warning message
-	 * about the loop not being entered at the top.
-	 */
-	switch (n&03)
-	while (n > 0) {
-	case 0:
-		ck ^= (int)*d++ << 24;
-		--n;
-	case 3:
-		ck ^= (int)*d++ << 16;
-		--n;
-	case 2:
-		ck ^= (int)*d++ << 8;
-		--n;
-	case 1:
-		ck ^= (int)*d++;
-		--n;
-	}
-	return(ck);
-}
-#endif
-
-#ifdef notdef
-
-prkey(msg, key)
-	char *msg;
-	unsigned char *key;
-{
-	register int i;
-	printf("%s:", msg);
-	for (i = 0; i < 8; i++)
-		printf(" %3d", key[i]);
-	printf("\r\n");
-}
-#endif
diff --git a/crypto/telnet/libtelnet/kerberos5.c b/crypto/telnet/libtelnet/kerberos5.c
deleted file mode 100644
index bcf1a9f0c348..000000000000
--- a/crypto/telnet/libtelnet/kerberos5.c
+++ /dev/null
@@ -1,764 +0,0 @@
-/*
- *	$Source: /mit/krb5/.cvsroot/src/appl/telnet/libtelnet/kerberos5.c,v $
- *	$Author: tytso $
- *	$Id: kerberos5.c,v 1.1 1997/09/04 06:11:15 markm Exp $
- */
-
-#if !defined(lint) && !defined(SABER)
-static
-#ifdef __STDC__
-const
-#endif
-char rcsid_kerberos5_c[] = "$Id: kerberos5.c,v 1.1 1997/09/04 06:11:15 markm Exp $";
-#endif /* lint */
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static char sccsid[] = "@(#)kerberos5.c	8.3 (Berkeley) 5/30/95";
-#endif /* not lint */
-
-/*
- * Copyright (C) 1990 by the Massachusetts Institute of Technology
- *
- * Export of this software from the United States of America may
- * require a specific license from the United States Government.
- * It is the responsibility of any person or organization contemplating
- * export to obtain such a license before exporting.
- *
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of M.I.T. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission.  M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express
- * or implied warranty.
- */
-
-
-#ifdef	KRB5
-#include <arpa/telnet.h>
-#include <stdio.h>
-#include <krb5/krb5.h>
-#include <krb5/asn1.h>
-#include <krb5/crc-32.h>
-#include <krb5/los-proto.h>
-#include <krb5/ext-proto.h>
-#include <com_err.h>
-#include <netdb.h>
-#include <ctype.h>
-
-/* kerberos 5 include files (ext-proto.h) will get an appropriate stdlib.h
-   and string.h/strings.h */
-
-#include "encrypt.h"
-#include "auth.h"
-#include "misc.h"
-
-extern auth_debug_mode;
-
-#ifdef	FORWARD
-int forward_flags = 0;  /* Flags get set in telnet/main.c on -f and -F */
-
-/* These values need to be the same as those defined in telnet/main.c. */
-/* Either define them in both places, or put in some common header file. */
-#define OPTS_FORWARD_CREDS	0x00000002
-#define OPTS_FORWARDABLE_CREDS	0x00000001
-
-void kerberos5_forward();
-
-#endif	/* FORWARD */
-
-static unsigned char str_data[1024] = { IAC, SB, TELOPT_AUTHENTICATION, 0,
-			  		AUTHTYPE_KERBEROS_V5, };
-/*static unsigned char str_name[1024] = { IAC, SB, TELOPT_AUTHENTICATION,
-					TELQUAL_NAME, };*/
-
-#define	KRB_AUTH		0	/* Authentication data follows */
-#define	KRB_REJECT		1	/* Rejected (reason might follow) */
-#define	KRB_ACCEPT		2	/* Accepted */
-#define	KRB_RESPONSE		3	/* Response for mutual auth. */
-
-#ifdef	FORWARD
-#define KRB_FORWARD     	4       /* Forwarded credentials follow */
-#define KRB_FORWARD_ACCEPT     	5       /* Forwarded credentials accepted */
-#define KRB_FORWARD_REJECT     	6       /* Forwarded credentials rejected */
-#endif	/* FORWARD */
-
-static	krb5_data auth;
-	/* telnetd gets session key from here */
-static	krb5_tkt_authent *authdat = NULL;
-/* telnet matches the AP_REQ and AP_REP with this */
-static	krb5_authenticator authenticator;
-
-/* some compilers can't hack void *, so we use the Kerberos krb5_pointer,
-   which is either void * or char *, depending on the compiler. */
-
-#define Voidptr krb5_pointer
-
-Block	session_key;
-
-	static int
-Data(ap, type, d, c)
-	Authenticator *ap;
-	int type;
-	Voidptr d;
-	int c;
-{
-	unsigned char *p = str_data + 4;
-	unsigned char *cd = (unsigned char *)d;
-
-	if (c == -1)
-		c = strlen((char *)cd);
-
-	if (auth_debug_mode) {
-		printf("%s:%d: [%d] (%d)",
-			str_data[3] == TELQUAL_IS ? ">>>IS" : ">>>REPLY",
-			str_data[3],
-			type, c);
-		printd(d, c);
-		printf("\r\n");
-	}
-	*p++ = ap->type;
-	*p++ = ap->way;
-	*p++ = type;
-	while (c-- > 0) {
-		if ((*p++ = *cd++) == IAC)
-			*p++ = IAC;
-	}
-	*p++ = IAC;
-	*p++ = SE;
-	if (str_data[3] == TELQUAL_IS)
-		printsub('>', &str_data[2], p - &str_data[2]);
-	return(net_write(str_data, p - str_data));
-}
-
-	int
-kerberos5_init(ap, server)
-	Authenticator *ap;
-	int server;
-{
-	if (server)
-		str_data[3] = TELQUAL_REPLY;
-	else
-		str_data[3] = TELQUAL_IS;
-	krb5_init_ets();
-	return(1);
-}
-
-	int
-kerberos5_send(ap)
-	Authenticator *ap;
-{
-	char **realms;
-	char *name;
-	char *p1, *p2;
-	krb5_checksum ksum;
-	krb5_octet sum[CRC32_CKSUM_LENGTH];
- 	krb5_principal server;
-	krb5_error_code r;
-	krb5_ccache ccache;
-	krb5_creds creds;		/* telnet gets session key from here */
-	extern krb5_flags krb5_kdc_default_options;
-	int ap_opts;
-
-#ifdef	ENCRYPTION
-	krb5_keyblock *newkey = 0;
-#endif	/* ENCRYPTION */
-
-	ksum.checksum_type = CKSUMTYPE_CRC32;
-	ksum.contents = sum;
-	ksum.length = sizeof(sum);
-	memset((Voidptr )sum, 0, sizeof(sum));
-
-	if (!UserNameRequested) {
-		if (auth_debug_mode) {
-			printf("Kerberos V5: no user name supplied\r\n");
-		}
-		return(0);
-	}
-
-	if (r = krb5_cc_default(&ccache)) {
-		if (auth_debug_mode) {
-			printf("Kerberos V5: could not get default ccache\r\n");
-		}
-		return(0);
-	}
-
-	if ((name = malloc(strlen(RemoteHostName)+1)) == NULL) {
-		if (auth_debug_mode)
-			printf("Out of memory for hostname in Kerberos V5\r\n");
-		return(0);
-	}
-
-	if (r = krb5_get_host_realm(RemoteHostName, &realms)) {
-		if (auth_debug_mode)
-			printf("Kerberos V5: no realm for %s\r\n", RemoteHostName);
-		free(name);
-		return(0);
-	}
-
-	p1 = RemoteHostName;
-	p2 = name;
-
-	while (*p2 = *p1++) {
-		if (isupper(*p2))
-			*p2 |= 040;
-		++p2;
-	}
-
-	if (r = krb5_build_principal_ext(&server,
-					 strlen(realms[0]), realms[0],
-					 4, "host",
-					 p2 - name, name,
-					 0)) {
-		if (auth_debug_mode) {
-			printf("Kerberos V5: failure setting up principal (%s)\r\n",
-			       error_message(r));
-		}
-		free(name);
-		krb5_free_host_realm(realms);
-		return(0);
-	}
-
-
-	memset((char *)&creds, 0, sizeof(creds));
-	creds.server = server;
-
-	if (r = krb5_cc_get_principal(ccache, &creds.client)) {
-		if (auth_debug_mode) {
-			printf("Kerberos V5: failure on principal (%s)\r\n",
-				error_message(r));
-		}
-		free(name);
-		krb5_free_principal(server);
-		krb5_free_host_realm(realms);
-		return(0);
-	}
-
-	if (r = krb5_get_credentials(krb5_kdc_default_options, ccache, &creds)) {
-		if (auth_debug_mode) {
-			printf("Kerberos V5: failure on credentials(%d)\r\n",r);
-		}
-		free(name);
-		krb5_free_host_realm(realms);
-		krb5_free_principal(server);
-		return(0);
-	}
-
-	if ((ap->way & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL)
-	    ap_opts = AP_OPTS_MUTUAL_REQUIRED;
-	else
-	    ap_opts = 0;
-
-	r = krb5_mk_req_extended(ap_opts, &ksum, krb5_kdc_default_options, 0,
-#ifdef	ENCRYPTION
-				 &newkey,
-#else	/* ENCRYPTION */
-				 0,
-#endif	/* ENCRYPTION */
-				 ccache, &creds, &authenticator, &auth);
-	/* don't let the key get freed if we clean up the authenticator */
-	authenticator.subkey = 0;
-
-	free(name);
-	krb5_free_host_realm(realms);
-	krb5_free_principal(server);
-#ifdef	ENCRYPTION
-	if (newkey) {
-	    /* keep the key in our private storage, but don't use it
-	       yet---see kerberos5_reply() below */
-	    if (newkey->keytype != KEYTYPE_DES) {
-		if (creds.keyblock.keytype == KEYTYPE_DES)
-		    /* use the session key in credentials instead */
-		    memmove((char *)session_key,
-			   (char *)creds.keyblock.contents, sizeof(Block));
-		else
-		    /* XXX ? */;
-	    } else {
-		memmove((char *)session_key, (char *)newkey->contents,
-		       sizeof(Block));
-	    }
-	    krb5_free_keyblock(newkey);
-	}
-#endif	/* ENCRYPTION */
-	if (r) {
-		if (auth_debug_mode) {
-			printf("Kerberos V5: mk_req failed (%s)\r\n",
-			       error_message(r));
-		}
-		return(0);
-	}
-
-	if (!auth_sendname(UserNameRequested, strlen(UserNameRequested))) {
-		if (auth_debug_mode)
-			printf("Not enough room for user name\r\n");
-		return(0);
-	}
-	if (!Data(ap, KRB_AUTH, auth.data, auth.length)) {
-		if (auth_debug_mode)
-			printf("Not enough room for authentication data\r\n");
-		return(0);
-	}
-	if (auth_debug_mode) {
-		printf("Sent Kerberos V5 credentials to server\r\n");
-	}
-	return(1);
-}
-
-	void
-kerberos5_is(ap, data, cnt)
-	Authenticator *ap;
-	unsigned char *data;
-	int cnt;
-{
-	int r;
-	struct hostent *hp;
-	char *p1, *p2;
-	static char *realm = NULL;
-	krb5_principal server;
-	krb5_ap_rep_enc_part reply;
-	krb5_data outbuf;
-#ifdef ENCRYPTION
-	Session_Key skey;
-#endif	/* ENCRYPTION */
-	char *name;
-	char *getenv();
-	krb5_data inbuf;
-
-	if (cnt-- < 1)
-		return;
-	switch (*data++) {
-	case KRB_AUTH:
-		auth.data = (char *)data;
-		auth.length = cnt;
-
-		if (!(hp = gethostbyname(LocalHostName))) {
-			if (auth_debug_mode)
-				printf("Cannot resolve local host name\r\n");
-			Data(ap, KRB_REJECT, "Unknown local hostname.", -1);
-			auth_finished(ap, AUTH_REJECT);
-			return;
-		}
-
-		if (!realm && (krb5_get_default_realm(&realm))) {
-			if (auth_debug_mode)
-				printf("Could not get default realm\r\n");
-			Data(ap, KRB_REJECT, "Could not get default realm.", -1);
-			auth_finished(ap, AUTH_REJECT);
-			return;
-		}
-
-		if ((name = malloc(strlen(hp->h_name)+1)) == NULL) {
-			if (auth_debug_mode)
-				printf("Out of memory for hostname in Kerberos V5\r\n");
-			Data(ap, KRB_REJECT, "Out of memory.", -1);
-			auth_finished(ap, AUTH_REJECT);
-			return;
-		}
-
-		p1 = hp->h_name;
-		p2 = name;
-
-		while (*p2 = *p1++) {
-			if (isupper(*p2))
-				*p2 |= 040;
-			++p2;
-		}
-
-		if (authdat)
-			krb5_free_tkt_authent(authdat);
-
-		r = krb5_build_principal_ext(&server,
-					     strlen(realm), realm,
-					     4, "host",
-					     p2 - name, name,
-					     0);
-		if (!r) {
-		    r = krb5_rd_req_simple(&auth, server, 0, &authdat);
-		    krb5_free_principal(server);
-		}
-		if (r) {
-			char errbuf[128];
-
-		    errout:
-			authdat = 0;
-			(void) strcpy(errbuf, "Read req failed: ");
-			(void) strcat(errbuf, error_message(r));
-			Data(ap, KRB_REJECT, errbuf, -1);
-			if (auth_debug_mode)
-				printf("%s\r\n", errbuf);
-			return;
-		}
-		free(name);
-		if ((ap->way & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) {
-		    /* do ap_rep stuff here */
-		    reply.ctime = authdat->authenticator->ctime;
-		    reply.cusec = authdat->authenticator->cusec;
-		    reply.subkey = 0;	/* use the one he gave us, so don't
-					   need to return one here */
-		    reply.seq_number = 0; /* we don't do seq #'s. */
-
-		    if (r = krb5_mk_rep(&reply,
-					authdat->authenticator->subkey ?
-					authdat->authenticator->subkey :
-					authdat->ticket->enc_part2->session,
-					&outbuf)) {
-			goto errout;
-		    }
-		    Data(ap, KRB_RESPONSE, outbuf.data, outbuf.length);
-		}
-		if (krb5_unparse_name(authdat->ticket->enc_part2 ->client,
-				      					&name))
-			name = 0;
-		Data(ap, KRB_ACCEPT, name, name ? -1 : 0);
-		if (auth_debug_mode) {
-			printf("Kerberos5 identifies him as ``%s''\r\n",
-							name ? name : "");
-		}
-		auth_finished(ap, AUTH_USER);
-
-		free(name);
-	    	if (authdat->authenticator->subkey &&
-		    authdat->authenticator->subkey->keytype == KEYTYPE_DES) {
-		    memmove((Voidptr )session_key,
-			   (Voidptr )authdat->authenticator->subkey->contents,
-			   sizeof(Block));
-		} else if (authdat->ticket->enc_part2->session->keytype ==
-			   KEYTYPE_DES) {
-		    memmove((Voidptr )session_key,
-			(Voidptr )authdat->ticket->enc_part2->session->contents,
-			sizeof(Block));
-		} else
-		    break;
-
-#ifdef ENCRYPTION
-		skey.type = SK_DES;
-		skey.length = 8;
-		skey.data = session_key;
-		encrypt_session_key(&skey, 1);
-#endif	/* ENCRYPTION */
-		break;
-#ifdef	FORWARD
-	case KRB_FORWARD:
-		inbuf.data = (char *)data;
-		inbuf.length = cnt;
-		if (r = rd_and_store_for_creds(&inbuf, authdat->ticket,
-					       UserNameRequested)) {
-		    char errbuf[128];
-
-		    (void) strcpy(errbuf, "Read forwarded creds failed: ");
-		    (void) strcat(errbuf, error_message(r));
-		    Data(ap, KRB_FORWARD_REJECT, errbuf, -1);
-		    if (auth_debug_mode)
-		      printf("Could not read forwarded credentials\r\n");
-		}
-		else
-		  Data(ap, KRB_FORWARD_ACCEPT, 0, 0);
-		  if (auth_debug_mode)
-		    printf("Forwarded credentials obtained\r\n");
-		break;
-#endif	/* FORWARD */
-	default:
-		if (auth_debug_mode)
-			printf("Unknown Kerberos option %d\r\n", data[-1]);
-		Data(ap, KRB_REJECT, 0, 0);
-		break;
-	}
-}
-
-	void
-kerberos5_reply(ap, data, cnt)
-	Authenticator *ap;
-	unsigned char *data;
-	int cnt;
-{
-	Session_Key skey;
-	static int mutual_complete = 0;
-
-	if (cnt-- < 1)
-		return;
-	switch (*data++) {
-	case KRB_REJECT:
-		if (cnt > 0) {
-			printf("[ Kerberos V5 refuses authentication because %.*s ]\r\n",
-				cnt, data);
-		} else
-			printf("[ Kerberos V5 refuses authentication ]\r\n");
-		auth_send_retry();
-		return;
-	case KRB_ACCEPT:
-		if ((ap->way & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL &&
-		    !mutual_complete) {
-		    printf("[ Kerberos V5 accepted you, but didn't provide mutual authentication! ]\n");
-		    auth_send_retry();
-		    return;
-		}
-		if (cnt)
-		    printf("[ Kerberos V5 accepts you as ``%.*s'' ]\n", cnt, data);
-		else
-		    printf("[ Kerberos V5 accepts you ]\n");
-		auth_finished(ap, AUTH_USER);
-#ifdef	FORWARD
-		if (forward_flags & OPTS_FORWARD_CREDS)
-		  kerberos5_forward(ap);
-#endif	/* FORWARD */
-		break;
-	case KRB_RESPONSE:
-		if ((ap->way & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) {
-		    /* the rest of the reply should contain a krb_ap_rep */
-		    krb5_ap_rep_enc_part *reply;
-		    krb5_data inbuf;
-		    krb5_error_code r;
-		    krb5_keyblock tmpkey;
-
-		    inbuf.length = cnt;
-		    inbuf.data = (char *)data;
-
-		    tmpkey.keytype = KEYTYPE_DES;
-		    tmpkey.contents = session_key;
-		    tmpkey.length = sizeof(Block);
-
-		    if (r = krb5_rd_rep(&inbuf, &tmpkey, &reply)) {
-			printf("[ Mutual authentication failed: %s ]\n",
-			       error_message(r));
-			auth_send_retry();
-			return;
-		    }
-		    if (reply->ctime != authenticator.ctime ||
-			reply->cusec != authenticator.cusec) {
-			printf("[ Mutual authentication failed (mismatched KRB_AP_REP) ]\n");
-			auth_send_retry();
-			return;
-		    }
-		    krb5_free_ap_rep_enc_part(reply);
-#ifdef	ENCRYPTION
-			skey.type = SK_DES;
-			skey.length = 8;
-			skey.data = session_key;
-			encrypt_session_key(&skey, 0);
-#endif	/* ENCRYPTION */
-		    mutual_complete = 1;
-		}
-		return;
-#ifdef	FORWARD
-	case KRB_FORWARD_ACCEPT:
-		printf("[ Kerberos V5 accepted forwarded credentials ]\n");
-		return;
-	case KRB_FORWARD_REJECT:
-		printf("[ Kerberos V5 refuses forwarded credentials because %.*s ]\r\n",
-				cnt, data);
-		return;
-#endif	/* FORWARD */
-	default:
-		if (auth_debug_mode)
-			printf("Unknown Kerberos option %d\r\n", data[-1]);
-		return;
-	}
-}
-
-	int
-kerberos5_status(ap, name, level)
-	Authenticator *ap;
-	char *name;
-	int level;
-{
-	if (level < AUTH_USER)
-		return(level);
-
-	if (UserNameRequested &&
-	    krb5_kuserok(authdat->ticket->enc_part2->client, UserNameRequested))
-	{
-		strcpy(name, UserNameRequested);
-		return(AUTH_VALID);
-	} else
-		return(AUTH_USER);
-}
-
-#define	BUMP(buf, len)		while (*(buf)) {++(buf), --(len);}
-#define	ADDC(buf, len, c)	if ((len) > 0) {*(buf)++ = (c); --(len);}
-
-	void
-kerberos5_printsub(data, cnt, buf, buflen)
-	unsigned char *data, *buf;
-	int cnt, buflen;
-{
-	char lbuf[32];
-	register int i;
-
-	buf[buflen-1] = '\0';		/* make sure its NULL terminated */
-	buflen -= 1;
-
-	switch(data[3]) {
-	case KRB_REJECT:		/* Rejected (reason might follow) */
-		strncpy((char *)buf, " REJECT ", buflen);
-		goto common;
-
-	case KRB_ACCEPT:		/* Accepted (name might follow) */
-		strncpy((char *)buf, " ACCEPT ", buflen);
-	common:
-		BUMP(buf, buflen);
-		if (cnt <= 4)
-			break;
-		ADDC(buf, buflen, '"');
-		for (i = 4; i < cnt; i++)
-			ADDC(buf, buflen, data[i]);
-		ADDC(buf, buflen, '"');
-		ADDC(buf, buflen, '\0');
-		break;
-
-
-	case KRB_AUTH:			/* Authentication data follows */
-		strncpy((char *)buf, " AUTH", buflen);
-		goto common2;
-
-	case KRB_RESPONSE:
-		strncpy((char *)buf, " RESPONSE", buflen);
-		goto common2;
-
-#ifdef	FORWARD
-	case KRB_FORWARD:		/* Forwarded credentials follow */
-		strncpy((char *)buf, " FORWARD", buflen);
-		goto common2;
-
-	case KRB_FORWARD_ACCEPT:	/* Forwarded credentials accepted */
-		strncpy((char *)buf, " FORWARD_ACCEPT", buflen);
-		goto common2;
-
-	case KRB_FORWARD_REJECT:	/* Forwarded credentials rejected */
-					       /* (reason might follow) */
-		strncpy((char *)buf, " FORWARD_REJECT", buflen);
-		goto common2;
-#endif	/* FORWARD */
-
-	default:
-		sprintf(lbuf, " %d (unknown)", data[3]);
-		strncpy((char *)buf, lbuf, buflen);
-	common2:
-		BUMP(buf, buflen);
-		for (i = 4; i < cnt; i++) {
-			sprintf(lbuf, " %d", data[i]);
-			strncpy((char *)buf, lbuf, buflen);
-			BUMP(buf, buflen);
-		}
-		break;
-	}
-}
-
-#ifdef	FORWARD
-	void
-kerberos5_forward(ap)
-     Authenticator *ap;
-{
-    struct hostent *hp;
-    krb5_creds *local_creds;
-    krb5_error_code r;
-    krb5_data forw_creds;
-    extern krb5_cksumtype krb5_kdc_req_sumtype;
-    krb5_ccache ccache;
-    int i;
-
-    if (!(local_creds = (krb5_creds *)
-	  calloc(1, sizeof(*local_creds)))) {
-	if (auth_debug_mode)
-	  printf("Kerberos V5: could not allocate memory for credentials\r\n");
-	return;
-    }
-
-    if (r = krb5_sname_to_principal(RemoteHostName, "host", 1,
-				    &local_creds->server)) {
-	if (auth_debug_mode)
-	  printf("Kerberos V5: could not build server name - %s\r\n",
-		 error_message(r));
-	krb5_free_creds(local_creds);
-	return;
-    }
-
-    if (r = krb5_cc_default(&ccache)) {
-	if (auth_debug_mode)
-	  printf("Kerberos V5: could not get default ccache - %s\r\n",
-		 error_message(r));
-	krb5_free_creds(local_creds);
-	return;
-    }
-
-    if (r = krb5_cc_get_principal(ccache, &local_creds->client)) {
-	if (auth_debug_mode)
-	  printf("Kerberos V5: could not get default principal - %s\r\n",
-		 error_message(r));
-	krb5_free_creds(local_creds);
-	return;
-    }
-
-    /* Get ticket from credentials cache */
-    if (r = krb5_get_credentials(KRB5_GC_CACHED, ccache, local_creds)) {
-	if (auth_debug_mode)
-	  printf("Kerberos V5: could not obtain credentials - %s\r\n",
-		 error_message(r));
-	krb5_free_creds(local_creds);
-	return;
-    }
-
-    if (r = get_for_creds(ETYPE_DES_CBC_CRC,
-			  krb5_kdc_req_sumtype,
-			  RemoteHostName,
-			  local_creds->client,
-			  &local_creds->keyblock,
-			  forward_flags & OPTS_FORWARDABLE_CREDS,
-			  &forw_creds)) {
-	if (auth_debug_mode)
-	  printf("Kerberos V5: error getting forwarded creds - %s\r\n",
-		 error_message(r));
-	krb5_free_creds(local_creds);
-	return;
-    }
-
-    /* Send forwarded credentials */
-    if (!Data(ap, KRB_FORWARD, forw_creds.data, forw_creds.length)) {
-	if (auth_debug_mode)
-	  printf("Not enough room for authentication data\r\n");
-    }
-    else {
-	if (auth_debug_mode)
-	  printf("Forwarded local Kerberos V5 credentials to server\r\n");
-    }
-
-    krb5_free_creds(local_creds);
-}
-#endif	/* FORWARD */
-
-#endif /* KRB5 */
diff --git a/crypto/telnet/libtelnet/key-proto.h b/crypto/telnet/libtelnet/key-proto.h
deleted file mode 100644
index 9668a775be50..000000000000
--- a/crypto/telnet/libtelnet/key-proto.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)key-proto.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * Copyright (C) 1990 by the Massachusetts Institute of Technology
- *
- * Export of this software from the United States of America is assumed
- * to require a specific license from the United States Government.
- * It is the responsibility of any person or organization contemplating
- * export to obtain such a license before exporting.
- *
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of M.I.T. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission.  M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express
- * or implied warranty.
- */
-
-#ifndef	__KEY_PROTO__
-#define	__KEY_PROTO__
-
-#if	!defined(P)
-#ifdef	__STDC__
-#define	P(x)	x
-#else
-#define	P(x)	()
-#endif
-#endif
-
-int key_file_exists P((void));
-void key_lookup P((unsigned char *, Block));
-void key_stream_init P((Block, Block, int));
-unsigned char key_stream P((int, int));
-#endif
diff --git a/crypto/telnet/libtelnet/krb4encpwd.c b/crypto/telnet/libtelnet/krb4encpwd.c
deleted file mode 100644
index cb9523c99205..000000000000
--- a/crypto/telnet/libtelnet/krb4encpwd.c
+++ /dev/null
@@ -1,445 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static char sccsid[] = "@(#)krb4encpwd.c	8.3 (Berkeley) 5/30/95";
-#endif /* not lint */
-
-
-#ifdef	KRB4_ENCPWD
-/*
- * COPYRIGHT (C) 1990 DIGITAL EQUIPMENT CORPORATION
- * ALL RIGHTS RESERVED
- *
- * "Digital Equipment Corporation authorizes the reproduction,
- * distribution and modification of this software subject to the following
- * restrictions:
- *
- * 1.  Any partial or whole copy of this software, or any modification
- * thereof, must include this copyright notice in its entirety.
- *
- * 2.  This software is supplied "as is" with no warranty of any kind,
- * expressed or implied, for any purpose, including any warranty of fitness
- * or merchantibility.  DIGITAL assumes no responsibility for the use or
- * reliability of this software, nor promises to provide any form of
- * support for it on any basis.
- *
- * 3.  Distribution of this software is authorized only if no profit or
- * remuneration of any kind is received in exchange for such distribution.
- *
- * 4.  This software produces public key authentication certificates
- * bearing an expiration date established by DIGITAL and RSA Data
- * Security, Inc.  It may cease to generate certificates after the expiration
- * date.  Any modification of this software that changes or defeats
- * the expiration date or its effect is unauthorized.
- *
- * 5.  Software that will renew or extend the expiration date of
- * authentication certificates produced by this software may be obtained
- * from RSA Data Security, Inc., 10 Twin Dolphin Drive, Redwood City, CA
- * 94065, (415)595-8782, or from DIGITAL"
- *
- */
-
-#include <sys/types.h>
-#include <arpa/telnet.h>
-#include <pwd.h>
-#include <stdio.h>
-
-#include <des.h>
-#include <krb.h>
-#ifdef	__STDC__
-#include <stdlib.h>
-#endif
-#ifdef	NO_STRING_H
-#include <strings.h>
-#else
-#include <string.h>
-#endif
-
-#include "encrypt.h"
-#include "auth.h"
-#include "misc.h"
-
-int krb_mk_encpwd_req P((KTEXT, char *, char *, char *, char *, char *, char *));
-int krb_rd_encpwd_req P((KTEXT, char *, char *, u_long, AUTH_DAT *, char *, char *, char *, char *));
-
-extern auth_debug_mode;
-
-static unsigned char str_data[1024] = { IAC, SB, TELOPT_AUTHENTICATION, 0,
-			  		AUTHTYPE_KRB4_ENCPWD, };
-static unsigned char str_name[1024] = { IAC, SB, TELOPT_AUTHENTICATION,
-					TELQUAL_NAME, };
-
-#define	KRB4_ENCPWD_AUTH	0	/* Authentication data follows */
-#define	KRB4_ENCPWD_REJECT	1	/* Rejected (reason might follow) */
-#define KRB4_ENCPWD_ACCEPT	2	/* Accepted */
-#define	KRB4_ENCPWD_CHALLENGE	3	/* Challenge for mutual auth. */
-#define	KRB4_ENCPWD_ACK		4	/* Acknowledge */
-
-#define KRB_SERVICE_NAME    "rcmd"
-
-static	KTEXT_ST auth;
-static	char name[ANAME_SZ];
-static	char user_passwd[ANAME_SZ];
-static	AUTH_DAT adat = { 0 };
-#ifdef	ENCRYPTION
-static Block	session_key	= { 0 };
-#endif	/* ENCRYPTION */
-static char  challenge[REALM_SZ];
-
-	static int
-Data(ap, type, d, c)
-	Authenticator *ap;
-	int type;
-	void *d;
-	int c;
-{
-	unsigned char *p = str_data + 4;
-	unsigned char *cd = (unsigned char *)d;
-
-	if (c == -1)
-		c = strlen((char *)cd);
-
-	if (0) {
-		printf("%s:%d: [%d] (%d)",
-			str_data[3] == TELQUAL_IS ? ">>>IS" : ">>>REPLY",
-			str_data[3],
-			type, c);
-		printd(d, c);
-		printf("\r\n");
-	}
-	*p++ = ap->type;
-	*p++ = ap->way;
-	*p++ = type;
-	while (c-- > 0) {
-		if ((*p++ = *cd++) == IAC)
-			*p++ = IAC;
-	}
-	*p++ = IAC;
-	*p++ = SE;
-	if (str_data[3] == TELQUAL_IS)
-		printsub('>', &str_data[2], p - (&str_data[2]));
-	return(net_write(str_data, p - str_data));
-}
-
-	int
-krb4encpwd_init(ap, server)
-	Authenticator *ap;
-	int server;
-{
-	char hostname[80], *cp, *realm;
-	C_Block skey;
-
-	if (server) {
-		str_data[3] = TELQUAL_REPLY;
-	} else {
-		str_data[3] = TELQUAL_IS;
-		gethostname(hostname, sizeof(hostname));
-		realm = krb_realmofhost(hostname);
-		cp = strchr(hostname, '.');
-		if (*cp != NULL) *cp = NULL;
-		if (read_service_key(KRB_SERVICE_NAME, hostname, realm, 0,
-					KEYFILE, (char *)skey)) {
-		  return(0);
-		}
-	}
-	return(1);
-}
-
-	int
-krb4encpwd_send(ap)
-	Authenticator *ap;
-{
-
-	printf("[ Trying KRB4ENCPWD ... ]\n");
-	if (!UserNameRequested) {
-		return(0);
-	}
-	if (!auth_sendname(UserNameRequested, strlen(UserNameRequested))) {
-		return(0);
-	}
-
-	if (!Data(ap, KRB4_ENCPWD_ACK, (void *)NULL, 0)) {
-		return(0);
-	}
-
-	return(1);
-}
-
-	void
-krb4encpwd_is(ap, data, cnt)
-	Authenticator *ap;
-	unsigned char *data;
-	int cnt;
-{
-	Session_Key skey;
-	Block datablock;
-	char  r_passwd[ANAME_SZ], r_user[ANAME_SZ];
-	char  lhostname[ANAME_SZ], *cp;
-	int r;
-	time_t now;
-
-	if (cnt-- < 1)
-		return;
-	switch (*data++) {
-	case KRB4_ENCPWD_AUTH:
-		memmove((void *)auth.dat, (void *)data, auth.length = cnt);
-
-		gethostname(lhostname, sizeof(lhostname));
-		if ((cp = strchr(lhostname, '.')) != 0)  *cp = '\0';
-
-		if (r = krb_rd_encpwd_req(&auth, KRB_SERVICE_NAME, lhostname, 0, &adat, NULL, challenge, r_user, r_passwd)) {
-			Data(ap, KRB4_ENCPWD_REJECT, (void *)"Auth failed", -1);
-			auth_finished(ap, AUTH_REJECT);
-			return;
-		}
-		auth_encrypt_userpwd(r_passwd);
-		if (passwdok(UserNameRequested, UserPassword) == 0) {
-		  /*
-		   *  illegal username and password
-		   */
-		  Data(ap, KRB4_ENCPWD_REJECT, (void *)"Illegal password", -1);
-		  auth_finished(ap, AUTH_REJECT);
-		  return;
-		}
-
-		memmove((void *)session_key, (void *)adat.session, sizeof(Block));
-		Data(ap, KRB4_ENCPWD_ACCEPT, (void *)0, 0);
-		auth_finished(ap, AUTH_USER);
-		break;
-
-	case KRB4_ENCPWD_CHALLENGE:
-		/*
-		 *  Take the received random challenge text and save
-		 *  for future authentication.
-		 */
-		memmove((void *)challenge, (void *)data, sizeof(Block));
-		break;
-
-
-	case KRB4_ENCPWD_ACK:
-		/*
-		 *  Receive ack, if mutual then send random challenge
-		 */
-
-		/*
-		 * If we are doing mutual authentication, get set up to send
-		 * the challenge, and verify it when the response comes back.
-		 */
-
-		if ((ap->way & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) {
-		  register int i;
-
-		  time(&now);
-		  sprintf(challenge, "%x", now);
-		  Data(ap, KRB4_ENCPWD_CHALLENGE, (void *)challenge, strlen(challenge));
-		}
-		break;
-
-	default:
-		Data(ap, KRB4_ENCPWD_REJECT, 0, 0);
-		break;
-	}
-}
-
-
-	void
-krb4encpwd_reply(ap, data, cnt)
-	Authenticator *ap;
-	unsigned char *data;
-	int cnt;
-{
-	Session_Key skey;
-	KTEXT_ST krb_token;
-	Block enckey;
-	CREDENTIALS cred;
-	int r;
-	char	randchal[REALM_SZ], instance[ANAME_SZ], *cp;
-	char	hostname[80], *realm;
-
-	if (cnt-- < 1)
-		return;
-	switch (*data++) {
-	case KRB4_ENCPWD_REJECT:
-		if (cnt > 0) {
-			printf("[ KRB4_ENCPWD refuses authentication because %.*s ]\r\n",
-				cnt, data);
-		} else
-			printf("[ KRB4_ENCPWD refuses authentication ]\r\n");
-		auth_send_retry();
-		return;
-	case KRB4_ENCPWD_ACCEPT:
-		printf("[ KRB4_ENCPWD accepts you ]\n");
-		auth_finished(ap, AUTH_USER);
-		return;
-	case KRB4_ENCPWD_CHALLENGE:
-		/*
-		 * Verify that the response to the challenge is correct.
-		 */
-
-		gethostname(hostname, sizeof(hostname));
-		realm = krb_realmofhost(hostname);
-		memmove((void *)challenge, (void *)data, cnt);
-		memset(user_passwd, 0, sizeof(user_passwd));
-		local_des_read_pw_string(user_passwd, sizeof(user_passwd)-1, "Password: ", 0);
-		UserPassword = user_passwd;
-		Challenge = challenge;
-		strcpy(instance, RemoteHostName);
-		if ((cp = strchr(instance, '.')) != 0)  *cp = '\0';
-
-		if (r = krb_mk_encpwd_req(&krb_token, KRB_SERVICE_NAME, instance, realm, Challenge, UserNameRequested, user_passwd)) {
-		  krb_token.length = 0;
-		}
-
-		if (!Data(ap, KRB4_ENCPWD_AUTH, (void *)krb_token.dat, krb_token.length)) {
-		  return;
-		}
-
-		break;
-
-	default:
-		return;
-	}
-}
-
-	int
-krb4encpwd_status(ap, name, level)
-	Authenticator *ap;
-	char *name;
-	int level;
-{
-
-	if (level < AUTH_USER)
-		return(level);
-
-	if (UserNameRequested && passwdok(UserNameRequested, UserPassword)) {
-		strcpy(name, UserNameRequested);
-		return(AUTH_VALID);
-	} else {
-		return(AUTH_USER);
-	}
-}
-
-#define	BUMP(buf, len)		while (*(buf)) {++(buf), --(len);}
-#define	ADDC(buf, len, c)	if ((len) > 0) {*(buf)++ = (c); --(len);}
-
-	void
-krb4encpwd_printsub(data, cnt, buf, buflen)
-	unsigned char *data, *buf;
-	int cnt, buflen;
-{
-	char lbuf[32];
-	register int i;
-
-	buf[buflen-1] = '\0';		/* make sure its NULL terminated */
-	buflen -= 1;
-
-	switch(data[3]) {
-	case KRB4_ENCPWD_REJECT:	/* Rejected (reason might follow) */
-		strncpy((char *)buf, " REJECT ", buflen);
-		goto common;
-
-	case KRB4_ENCPWD_ACCEPT:	/* Accepted (name might follow) */
-		strncpy((char *)buf, " ACCEPT ", buflen);
-	common:
-		BUMP(buf, buflen);
-		if (cnt <= 4)
-			break;
-		ADDC(buf, buflen, '"');
-		for (i = 4; i < cnt; i++)
-			ADDC(buf, buflen, data[i]);
-		ADDC(buf, buflen, '"');
-		ADDC(buf, buflen, '\0');
-		break;
-
-	case KRB4_ENCPWD_AUTH:		/* Authentication data follows */
-		strncpy((char *)buf, " AUTH", buflen);
-		goto common2;
-
-	case KRB4_ENCPWD_CHALLENGE:
-		strncpy((char *)buf, " CHALLENGE", buflen);
-		goto common2;
-
-	case KRB4_ENCPWD_ACK:
-		strncpy((char *)buf, " ACK", buflen);
-		goto common2;
-
-	default:
-		sprintf(lbuf, " %d (unknown)", data[3]);
-		strncpy((char *)buf, lbuf, buflen);
-	common2:
-		BUMP(buf, buflen);
-		for (i = 4; i < cnt; i++) {
-			sprintf(lbuf, " %d", data[i]);
-			strncpy((char *)buf, lbuf, buflen);
-			BUMP(buf, buflen);
-		}
-		break;
-	}
-}
-
-int passwdok(name, passwd)
-char *name, *passwd;
-{
-  char *crypt();
-  char *salt, *p;
-  struct passwd *pwd;
-  int   passwdok_status = 0;
-
-  if (pwd = getpwnam(name))
-    salt = pwd->pw_passwd;
-  else salt = "xx";
-
-  p = crypt(passwd, salt);
-
-  if (pwd && !strcmp(p, pwd->pw_passwd)) {
-    passwdok_status = 1;
-  } else passwdok_status = 0;
-  return(passwdok_status);
-}
-
-#endif
-
-#ifdef notdef
-
-prkey(msg, key)
-	char *msg;
-	unsigned char *key;
-{
-	register int i;
-	printf("%s:", msg);
-	for (i = 0; i < 8; i++)
-		printf(" %3d", key[i]);
-	printf("\r\n");
-}
-#endif
diff --git a/crypto/telnet/libtelnet/misc-proto.h b/crypto/telnet/libtelnet/misc-proto.h
deleted file mode 100644
index e5f334a9bdd0..000000000000
--- a/crypto/telnet/libtelnet/misc-proto.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)misc-proto.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * Copyright (C) 1990 by the Massachusetts Institute of Technology
- *
- * Export of this software from the United States of America is assumed
- * to require a specific license from the United States Government.
- * It is the responsibility of any person or organization contemplating
- * export to obtain such a license before exporting.
- *
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of M.I.T. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission.  M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express
- * or implied warranty.
- */
-
-#ifndef	__MISC_PROTO__
-#define	__MISC_PROTO__
-
-#if	!defined(P)
-#ifdef	__STDC__
-#define	P(x)	x
-#else
-#define	P(x)	()
-#endif
-#endif
-
-void auth_encrypt_init P((char *, char *, char *, int));
-void auth_encrypt_connect P((int));
-void printd P((unsigned char *, int));
-
-/*
- * These functions are imported from the application
- */
-int net_write P((unsigned char *, int));
-void net_encrypt P((void));
-int telnet_spin P((void));
-char *telnet_getenv P((char *));
-char *telnet_gets P((char *, char *, int, int));
-#endif
diff --git a/crypto/telnet/libtelnet/misc.c b/crypto/telnet/libtelnet/misc.c
deleted file mode 100644
index 4f8f8d53644b..000000000000
--- a/crypto/telnet/libtelnet/misc.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static const char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "misc.h"
-#include "auth.h"
-#include "encrypt.h"
-
-char *RemoteHostName;
-char *LocalHostName;
-char *UserNameRequested = 0;
-int ConnectedCount = 0;
-
-	void
-auth_encrypt_init(local, remote, name, server)
-	char *local;
-	char *remote;
-	char *name;
-	int server;
-{
-	RemoteHostName = remote;
-	LocalHostName = local;
-#if	defined(AUTHENTICATION)
-	auth_init(name, server);
-#endif
-#ifdef	ENCRYPTION
-	encrypt_init(name, server);
-#endif	/* ENCRYPTION */
-	if (UserNameRequested) {
-		free(UserNameRequested);
-		UserNameRequested = 0;
-	}
-}
-
-	void
-auth_encrypt_user(name)
-	char *name;
-{
-	extern char *strdup();
-
-	if (UserNameRequested)
-		free(UserNameRequested);
-	UserNameRequested = name ? strdup(name) : 0;
-}
-
-	void
-auth_encrypt_connect(cnt)
-	int cnt;
-{
-}
-
-	void
-printd(data, cnt)
-	unsigned char *data;
-	int cnt;
-{
-	if (cnt > 16)
-		cnt = 16;
-	while (cnt-- > 0) {
-		printf(" %02x", *data);
-		++data;
-	}
-}
diff --git a/crypto/telnet/libtelnet/misc.h b/crypto/telnet/libtelnet/misc.h
deleted file mode 100644
index 41ffa7f67aa7..000000000000
--- a/crypto/telnet/libtelnet/misc.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)misc.h	8.1 (Berkeley) 6/4/93
- */
-
-extern char *UserNameRequested;
-extern char *LocalHostName;
-extern char *RemoteHostName;
-extern int ConnectedCount;
-extern int ReservedPort;
-
-#include "misc-proto.h"
diff --git a/crypto/telnet/libtelnet/read_password.c b/crypto/telnet/libtelnet/read_password.c
deleted file mode 100644
index 4676ed3a01bb..000000000000
--- a/crypto/telnet/libtelnet/read_password.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static char sccsid[] = "@(#)read_password.c	8.3 (Berkeley) 5/30/95";
-#endif /* not lint */
-
-/*
- * $Source: /mit/kerberos/src/lib/des/RCS/read_password.c,v $
- * $Author: jon $
- *
- * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute
- * of Technology.
- *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
- *
- * This routine prints the supplied string to standard
- * output as a prompt, and reads a password string without
- * echoing.
- */
-
-#if	defined(RSA_ENCPWD) || defined(KRB4_ENCPWD)
-
-#include <stdio.h>
-#include <strings.h>
-#include <sys/ioctl.h>
-#include <signal.h>
-#include <setjmp.h>
-
-static jmp_buf env;
-
-/*** Routines ****************************************************** */
-/*
- * This version just returns the string, doesn't map to key.
- *
- * Returns 0 on success, non-zero on failure.
- */
-
-int
-local_des_read_pw_string(s,max,prompt,verify)
-    char *s;
-    int	max;
-    char *prompt;
-    int	verify;
-{
-    int ok = 0;
-    char *ptr;
-
-    jmp_buf old_env;
-    struct sgttyb tty_state;
-    char key_string[BUFSIZ];
-
-    if (max > BUFSIZ) {
-	return -1;
-    }
-
-    /* XXX assume jmp_buf is typedef'ed to an array */
-    memmove((char *)env, (char *)old_env, sizeof(env));
-    if (setjmp(env))
-	goto lose;
-
-    /* save terminal state*/
-    if (ioctl(0,TIOCGETP,(char *)&tty_state) == -1)
-	return -1;
-/*
-    push_signals();
-*/
-    /* Turn off echo */
-    tty_state.sg_flags &= ~ECHO;
-    if (ioctl(0,TIOCSETP,(char *)&tty_state) == -1)
-	return -1;
-    while (!ok) {
-	(void) printf(prompt);
-	(void) fflush(stdout);
-	while (!fgets(s, max, stdin));
-
-	if ((ptr = strchr(s, '\n')))
-	    *ptr = '\0';
-	if (verify) {
-	    printf("\nVerifying, please re-enter %s",prompt);
-	    (void) fflush(stdout);
-	    if (!fgets(key_string, sizeof(key_string), stdin)) {
-		clearerr(stdin);
-		continue;
-	    }
-	    if ((ptr = strchr(key_string, '\n')))
-	    *ptr = '\0';
-	    if (strcmp(s,key_string)) {
-		printf("\n\07\07Mismatch - try again\n");
-		(void) fflush(stdout);
-		continue;
-	    }
-	}
-	ok = 1;
-    }
-
-lose:
-    if (!ok)
-	memset(s, 0, max);
-    printf("\n");
-    /* turn echo back on */
-    tty_state.sg_flags |= ECHO;
-    if (ioctl(0,TIOCSETP,(char *)&tty_state))
-	ok = 0;
-/*
-    pop_signals();
-*/
-    memmove((char *)old_env, (char *)env, sizeof(env));
-    if (verify)
-	memset(key_string, 0, sizeof (key_string));
-    s[max-1] = 0;		/* force termination */
-    return !ok;			/* return nonzero if not okay */
-}
-#endif	/* defined(RSA_ENCPWD) || defined(KRB4_ENCPWD) */
diff --git a/crypto/telnet/libtelnet/rsaencpwd.c b/crypto/telnet/libtelnet/rsaencpwd.c
deleted file mode 100644
index 5906d999af68..000000000000
--- a/crypto/telnet/libtelnet/rsaencpwd.c
+++ /dev/null
@@ -1,492 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static char sccsid[] = "@(#)rsaencpwd.c	8.3 (Berkeley) 5/30/95";
-#endif /* not lint */
-
-
-#ifdef	RSA_ENCPWD
-/*
- * COPYRIGHT (C) 1990 DIGITAL EQUIPMENT CORPORATION
- * ALL RIGHTS RESERVED
- *
- * "Digital Equipment Corporation authorizes the reproduction,
- * distribution and modification of this software subject to the following
- * restrictions:
- *
- * 1.  Any partial or whole copy of this software, or any modification
- * thereof, must include this copyright notice in its entirety.
- *
- * 2.  This software is supplied "as is" with no warranty of any kind,
- * expressed or implied, for any purpose, including any warranty of fitness
- * or merchantibility.  DIGITAL assumes no responsibility for the use or
- * reliability of this software, nor promises to provide any form of
- * support for it on any basis.
- *
- * 3.  Distribution of this software is authorized only if no profit or
- * remuneration of any kind is received in exchange for such distribution.
- *
- * 4.  This software produces public key authentication certificates
- * bearing an expiration date established by DIGITAL and RSA Data
- * Security, Inc.  It may cease to generate certificates after the expiration
- * date.  Any modification of this software that changes or defeats
- * the expiration date or its effect is unauthorized.
- *
- * 5.  Software that will renew or extend the expiration date of
- * authentication certificates produced by this software may be obtained
- * from RSA Data Security, Inc., 10 Twin Dolphin Drive, Redwood City, CA
- * 94065, (415)595-8782, or from DIGITAL"
- *
- */
-
-#include <sys/types.h>
-#include <arpa/telnet.h>
-#include <pwd.h>
-#include <stdio.h>
-
-#ifdef	__STDC__
-#include <stdlib.h>
-#endif
-#ifdef	NO_STRING_H
-#include <strings.h>
-#else
-#include <string.h>
-#endif
-
-#include "encrypt.h"
-#include "auth.h"
-#include "misc.h"
-#include "cdc.h"
-
-extern auth_debug_mode;
-
-static unsigned char str_data[1024] = { IAC, SB, TELOPT_AUTHENTICATION, 0,
-			  		AUTHTYPE_RSA_ENCPWD, };
-static unsigned char str_name[1024] = { IAC, SB, TELOPT_AUTHENTICATION,
-					TELQUAL_NAME, };
-
-#define	RSA_ENCPWD_AUTH	0	/* Authentication data follows */
-#define	RSA_ENCPWD_REJECT	1	/* Rejected (reason might follow) */
-#define RSA_ENCPWD_ACCEPT	2	/* Accepted */
-#define	RSA_ENCPWD_CHALLENGEKEY	3	/* Challenge and public key */
-
-#define NAME_SZ   40
-#define CHAL_SZ   20
-#define PWD_SZ    40
-
-static	KTEXT_ST auth;
-static	char name[NAME_SZ];
-static	char user_passwd[PWD_SZ];
-static  char key_file[2*NAME_SZ];
-static  char lhostname[NAME_SZ];
-static char  challenge[CHAL_SZ];
-static int   challenge_len;
-
-	static int
-Data(ap, type, d, c)
-	Authenticator *ap;
-	int type;
-	void *d;
-	int c;
-{
-	unsigned char *p = str_data + 4;
-	unsigned char *cd = (unsigned char *)d;
-
-	if (c == -1)
-		c = strlen((char *)cd);
-
-	if (0) {
-		printf("%s:%d: [%d] (%d)",
-			str_data[3] == TELQUAL_IS ? ">>>IS" : ">>>REPLY",
-			str_data[3],
-			type, c);
-		printd(d, c);
-		printf("\r\n");
-	}
-	*p++ = ap->type;
-	*p++ = ap->way;
-	if (type != NULL) *p++ = type;
-	while (c-- > 0) {
-		if ((*p++ = *cd++) == IAC)
-			*p++ = IAC;
-	}
-	*p++ = IAC;
-	*p++ = SE;
-	if (str_data[3] == TELQUAL_IS)
-		printsub('>', &str_data[2], p - (&str_data[2]));
-	return(net_write(str_data, p - str_data));
-}
-
-	int
-rsaencpwd_init(ap, server)
-	Authenticator *ap;
-	int server;
-{
-	char  *cp;
-	FILE  *fp;
-
-	if (server) {
-		str_data[3] = TELQUAL_REPLY;
-		memset(key_file, 0, sizeof(key_file));
-		gethostname(lhostname, sizeof(lhostname));
-		if ((cp = strchr(lhostname, '.')) != 0)  *cp = '\0';
-		strcpy(key_file, "/etc/.");
-		strcat(key_file, lhostname);
-		strcat(key_file, "_privkey");
-		if ((fp=fopen(key_file, "r"))==NULL) return(0);
-		fclose(fp);
-	} else {
-		str_data[3] = TELQUAL_IS;
-	}
-	return(1);
-}
-
-	int
-rsaencpwd_send(ap)
-	Authenticator *ap;
-{
-
-	printf("[ Trying RSAENCPWD ... ]\n");
-	if (!UserNameRequested) {
-		return(0);
-	}
-	if (!auth_sendname(UserNameRequested, strlen(UserNameRequested))) {
-		return(0);
-	}
-	if (!Data(ap, NULL, (void *)NULL, 0)) {
-		return(0);
-	}
-
-
-	return(1);
-}
-
-	void
-rsaencpwd_is(ap, data, cnt)
-	Authenticator *ap;
-	unsigned char *data;
-	int cnt;
-{
-	Session_Key skey;
-	Block datablock;
-	char  r_passwd[PWD_SZ], r_user[NAME_SZ];
-	char  *cp, key[160];
-	char  chalkey[160], *ptr;
-	FILE  *fp;
-	int r, i, j, chalkey_len, len;
-	time_t now;
-
-	cnt--;
-	switch (*data++) {
-	case RSA_ENCPWD_AUTH:
-		memmove((void *)auth.dat, (void *)data, auth.length = cnt);
-
-		if ((fp=fopen(key_file, "r"))==NULL) {
-		  Data(ap, RSA_ENCPWD_REJECT, (void *)"Auth failed", -1);
-		  auth_finished(ap, AUTH_REJECT);
-		  return;
-		}
-		/*
-		 *  get privkey
-		 */
-		fscanf(fp, "%x;", &len);
-		for (i=0;i<len;i++) {
-		  j = getc(fp);  key[i]=j;
-		}
-		fclose(fp);
-
-		r = accept_rsa_encpwd(&auth, key, challenge,
-				      challenge_len, r_passwd);
-		if (r < 0) {
-		  Data(ap, RSA_ENCPWD_REJECT, (void *)"Auth failed", -1);
-		  auth_finished(ap, AUTH_REJECT);
-		  return;
-		}
-		auth_encrypt_userpwd(r_passwd);
-		if (rsaencpwd_passwdok(UserNameRequested, UserPassword) == 0) {
-		  /*
-		   *  illegal username and password
-		   */
-		  Data(ap, RSA_ENCPWD_REJECT, (void *)"Illegal password", -1);
-		  auth_finished(ap, AUTH_REJECT);
-		  return;
-		}
-
-		Data(ap, RSA_ENCPWD_ACCEPT, (void *)0, 0);
-		auth_finished(ap, AUTH_USER);
-		break;
-
-
-	case IAC:
-
-		/*
-		 * If we are doing mutual authentication, get set up to send
-		 * the challenge, and verify it when the response comes back.
-		 */
-		if ((ap->way & AUTH_HOW_MASK) == AUTH_HOW_ONE_WAY) {
-		  register int i;
-
-
-		  time(&now);
-		  if ((now % 2) == 0) {
-		    sprintf(challenge, "%x", now);
-		    challenge_len = strlen(challenge);
-		  } else {
-		    strcpy(challenge, "randchal");
-		    challenge_len = 8;
-		  }
-
-		  if ((fp=fopen(key_file, "r"))==NULL) {
-		    Data(ap, RSA_ENCPWD_REJECT, (void *)"Auth failed", -1);
-		    auth_finished(ap, AUTH_REJECT);
-		    return;
-		  }
-		  /*
-		   *  skip privkey
-		   */
-		  fscanf(fp, "%x;", &len);
-		  for (i=0;i<len;i++) {
-		    j = getc(fp);
-		  }
-		  /*
-		   * get pubkey
-		   */
-		  fscanf(fp, "%x;", &len);
-		  for (i=0;i<len;i++) {
-		    j = getc(fp);  key[i]=j;
-		  }
-		  fclose(fp);
-		  chalkey[0] = 0x30;
-		  ptr = (char *) &chalkey[1];
-		  chalkey_len = 1+NumEncodeLengthOctets(i)+i+1+NumEncodeLengthOctets(challenge_len)+challenge_len;
-		  EncodeLength(ptr, chalkey_len);
-		  ptr +=NumEncodeLengthOctets(chalkey_len);
-		  *ptr++ = 0x04;  /* OCTET STRING */
-		  *ptr++ = challenge_len;
-		  memmove(ptr, challenge, challenge_len);
-		  ptr += challenge_len;
-		  *ptr++ = 0x04;  /* OCTET STRING */
-		  EncodeLength(ptr, i);
-		  ptr += NumEncodeLengthOctets(i);
-		  memmove(ptr, key, i);
-		  chalkey_len = 1+NumEncodeLengthOctets(chalkey_len)+chalkey_len;
-		  Data(ap, RSA_ENCPWD_CHALLENGEKEY, (void *)chalkey, chalkey_len);
-		}
-		break;
-
-	default:
-		Data(ap, RSA_ENCPWD_REJECT, 0, 0);
-		break;
-	}
-}
-
-
-	void
-rsaencpwd_reply(ap, data, cnt)
-	Authenticator *ap;
-	unsigned char *data;
-	int cnt;
-{
-	Session_Key skey;
-	KTEXT_ST token;
-	Block enckey;
-	int r, pubkey_len;
-	char	randchal[CHAL_SZ], *cp;
-	char	chalkey[160], pubkey[128], *ptr;
-
-	if (cnt-- < 1)
-		return;
-	switch (*data++) {
-	case RSA_ENCPWD_REJECT:
-		if (cnt > 0) {
-			printf("[ RSA_ENCPWD refuses authentication because %.*s ]\r\n",
-				cnt, data);
-		} else
-			printf("[ RSA_ENCPWD refuses authentication ]\r\n");
-		auth_send_retry();
-		return;
-	case RSA_ENCPWD_ACCEPT:
-		printf("[ RSA_ENCPWD accepts you ]\n");
-		auth_finished(ap, AUTH_USER);
-		return;
-	case RSA_ENCPWD_CHALLENGEKEY:
-		/*
-		 * Verify that the response to the challenge is correct.
-		 */
-
-		memmove((void *)chalkey, (void *)data, cnt);
-		ptr = (char *) &chalkey[0];
-		ptr += DecodeHeaderLength(chalkey);
-		if (*ptr != 0x04) {
-		  return;
-		}
-		*ptr++;
-		challenge_len = DecodeValueLength(ptr);
-		ptr += NumEncodeLengthOctets(challenge_len);
-		memmove(challenge, ptr, challenge_len);
-		ptr += challenge_len;
-		if (*ptr != 0x04) {
-		  return;
-		}
-		*ptr++;
-		pubkey_len = DecodeValueLength(ptr);
-		ptr += NumEncodeLengthOctets(pubkey_len);
-		memmove(pubkey, ptr, pubkey_len);
-		memset(user_passwd, 0, sizeof(user_passwd));
-		local_des_read_pw_string(user_passwd, sizeof(user_passwd)-1, "Password: ", 0);
-		UserPassword = user_passwd;
-		Challenge = challenge;
-		r = init_rsa_encpwd(&token, user_passwd, challenge, challenge_len, pubkey);
-		if (r < 0) {
-		  token.length = 1;
-		}
-
-		if (!Data(ap, RSA_ENCPWD_AUTH, (void *)token.dat, token.length)) {
-		  return;
-		}
-
-		break;
-
-	default:
-		return;
-	}
-}
-
-	int
-rsaencpwd_status(ap, name, level)
-	Authenticator *ap;
-	char *name;
-	int level;
-{
-
-	if (level < AUTH_USER)
-		return(level);
-
-	if (UserNameRequested && rsaencpwd_passwdok(UserNameRequested, UserPassword)) {
-		strcpy(name, UserNameRequested);
-		return(AUTH_VALID);
-	} else {
-		return(AUTH_USER);
-	}
-}
-
-#define	BUMP(buf, len)		while (*(buf)) {++(buf), --(len);}
-#define	ADDC(buf, len, c)	if ((len) > 0) {*(buf)++ = (c); --(len);}
-
-	void
-rsaencpwd_printsub(data, cnt, buf, buflen)
-	unsigned char *data, *buf;
-	int cnt, buflen;
-{
-	char lbuf[32];
-	register int i;
-
-	buf[buflen-1] = '\0';		/* make sure its NULL terminated */
-	buflen -= 1;
-
-	switch(data[3]) {
-	case RSA_ENCPWD_REJECT:	/* Rejected (reason might follow) */
-		strncpy((char *)buf, " REJECT ", buflen);
-		goto common;
-
-	case RSA_ENCPWD_ACCEPT:	/* Accepted (name might follow) */
-		strncpy((char *)buf, " ACCEPT ", buflen);
-	common:
-		BUMP(buf, buflen);
-		if (cnt <= 4)
-			break;
-		ADDC(buf, buflen, '"');
-		for (i = 4; i < cnt; i++)
-			ADDC(buf, buflen, data[i]);
-		ADDC(buf, buflen, '"');
-		ADDC(buf, buflen, '\0');
-		break;
-
-	case RSA_ENCPWD_AUTH:		/* Authentication data follows */
-		strncpy((char *)buf, " AUTH", buflen);
-		goto common2;
-
-	case RSA_ENCPWD_CHALLENGEKEY:
-		strncpy((char *)buf, " CHALLENGEKEY", buflen);
-		goto common2;
-
-	default:
-		sprintf(lbuf, " %d (unknown)", data[3]);
-		strncpy((char *)buf, lbuf, buflen);
-	common2:
-		BUMP(buf, buflen);
-		for (i = 4; i < cnt; i++) {
-			sprintf(lbuf, " %d", data[i]);
-			strncpy((char *)buf, lbuf, buflen);
-			BUMP(buf, buflen);
-		}
-		break;
-	}
-}
-
-int rsaencpwd_passwdok(name, passwd)
-char *name, *passwd;
-{
-  char *crypt();
-  char *salt, *p;
-  struct passwd *pwd;
-  int   passwdok_status = 0;
-
-  if (pwd = getpwnam(name))
-    salt = pwd->pw_passwd;
-  else salt = "xx";
-
-  p = crypt(passwd, salt);
-
-  if (pwd && !strcmp(p, pwd->pw_passwd)) {
-    passwdok_status = 1;
-  } else passwdok_status = 0;
-  return(passwdok_status);
-}
-
-#endif
-
-#ifdef notdef
-
-prkey(msg, key)
-	char *msg;
-	unsigned char *key;
-{
-	register int i;
-	printf("%s:", msg);
-	for (i = 0; i < 8; i++)
-		printf(" %3d", key[i]);
-	printf("\r\n");
-}
-#endif
diff --git a/crypto/telnet/libtelnet/spx.c b/crypto/telnet/libtelnet/spx.c
deleted file mode 100644
index 90c37a47ebd6..000000000000
--- a/crypto/telnet/libtelnet/spx.c
+++ /dev/null
@@ -1,587 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static char sccsid[] = "@(#)spx.c	8.2 (Berkeley) 5/30/95";
-#endif /* not lint */
-
-#ifdef	SPX
-/*
- * COPYRIGHT (C) 1990 DIGITAL EQUIPMENT CORPORATION
- * ALL RIGHTS RESERVED
- *
- * "Digital Equipment Corporation authorizes the reproduction,
- * distribution and modification of this software subject to the following
- * restrictions:
- *
- * 1.  Any partial or whole copy of this software, or any modification
- * thereof, must include this copyright notice in its entirety.
- *
- * 2.  This software is supplied "as is" with no warranty of any kind,
- * expressed or implied, for any purpose, including any warranty of fitness
- * or merchantibility.  DIGITAL assumes no responsibility for the use or
- * reliability of this software, nor promises to provide any form of
- * support for it on any basis.
- *
- * 3.  Distribution of this software is authorized only if no profit or
- * remuneration of any kind is received in exchange for such distribution.
- *
- * 4.  This software produces public key authentication certificates
- * bearing an expiration date established by DIGITAL and RSA Data
- * Security, Inc.  It may cease to generate certificates after the expiration
- * date.  Any modification of this software that changes or defeats
- * the expiration date or its effect is unauthorized.
- *
- * 5.  Software that will renew or extend the expiration date of
- * authentication certificates produced by this software may be obtained
- * from RSA Data Security, Inc., 10 Twin Dolphin Drive, Redwood City, CA
- * 94065, (415)595-8782, or from DIGITAL"
- *
- */
-
-#include <sys/types.h>
-#include <arpa/telnet.h>
-#include <stdio.h>
-#include "gssapi_defs.h"
-#ifdef	__STDC__
-#include <stdlib.h>
-#endif
-#ifdef	NO_STRING_H
-#include <strings.h>
-#else
-#include <string.h>
-#endif
-
-#include <pwd.h>
-#include "encrypt.h"
-#include "auth.h"
-#include "misc.h"
-
-extern auth_debug_mode;
-
-static unsigned char str_data[1024] = { IAC, SB, TELOPT_AUTHENTICATION, 0,
-			  		AUTHTYPE_SPX, };
-static unsigned char str_name[1024] = { IAC, SB, TELOPT_AUTHENTICATION,
-					TELQUAL_NAME, };
-
-#define	SPX_AUTH	0		/* Authentication data follows */
-#define	SPX_REJECT	1		/* Rejected (reason might follow) */
-#define SPX_ACCEPT	2		/* Accepted */
-
-#ifdef	ENCRYPTION
-static Block	session_key	= { 0 };
-#endif	/* ENCRYPTION */
-static Block	challenge	= { 0 };
-
-
-/*******************************************************************/
-
-gss_OID_set		actual_mechs;
-gss_OID			actual_mech_type, output_name_type;
-int			major_status, status, msg_ctx = 0, new_status;
-int			req_flags = 0, ret_flags, lifetime_rec;
-gss_cred_id_t		gss_cred_handle;
-gss_ctx_id_t		actual_ctxhandle, context_handle;
-gss_buffer_desc		output_token, input_token, input_name_buffer;
-gss_buffer_desc		status_string;
-gss_name_t		desired_targname, src_name;
-gss_channel_bindings	input_chan_bindings;
-char			lhostname[GSS_C_MAX_PRINTABLE_NAME];
-char			targ_printable[GSS_C_MAX_PRINTABLE_NAME];
-int			to_addr=0, from_addr=0;
-char			*address;
-gss_buffer_desc		fullname_buffer;
-gss_OID			fullname_type;
-gss_cred_id_t		gss_delegated_cred_handle;
-
-/*******************************************************************/
-
-
-
-	static int
-Data(ap, type, d, c)
-	Authenticator *ap;
-	int type;
-	void *d;
-	int c;
-{
-	unsigned char *p = str_data + 4;
-	unsigned char *cd = (unsigned char *)d;
-
-	if (c == -1)
-		c = strlen((char *)cd);
-
-	if (0) {
-		printf("%s:%d: [%d] (%d)",
-			str_data[3] == TELQUAL_IS ? ">>>IS" : ">>>REPLY",
-			str_data[3],
-			type, c);
-		printd(d, c);
-		printf("\r\n");
-	}
-	*p++ = ap->type;
-	*p++ = ap->way;
-	*p++ = type;
-	while (c-- > 0) {
-		if ((*p++ = *cd++) == IAC)
-			*p++ = IAC;
-	}
-	*p++ = IAC;
-	*p++ = SE;
-	if (str_data[3] == TELQUAL_IS)
-		printsub('>', &str_data[2], p - (&str_data[2]));
-	return(net_write(str_data, p - str_data));
-}
-
-	int
-spx_init(ap, server)
-	Authenticator *ap;
-	int server;
-{
-	gss_cred_id_t	tmp_cred_handle;
-
-	if (server) {
-		str_data[3] = TELQUAL_REPLY;
-		gethostname(lhostname, sizeof(lhostname));
-		strcpy(targ_printable, "SERVICE:rcmd@");
-		strcat(targ_printable, lhostname);
-		input_name_buffer.length = strlen(targ_printable);
-		input_name_buffer.value = targ_printable;
-		major_status = gss_import_name(&status,
-					&input_name_buffer,
-					GSS_C_NULL_OID,
-					&desired_targname);
-		major_status = gss_acquire_cred(&status,
-					desired_targname,
-					0,
-					GSS_C_NULL_OID_SET,
-					GSS_C_ACCEPT,
-					&tmp_cred_handle,
-					&actual_mechs,
-					&lifetime_rec);
-		if (major_status != GSS_S_COMPLETE) return(0);
-	} else {
-		str_data[3] = TELQUAL_IS;
-	}
-	return(1);
-}
-
-	int
-spx_send(ap)
-	Authenticator *ap;
-{
-	Block enckey;
-	int r;
-
-	gss_OID	actual_mech_type, output_name_type;
-	int	msg_ctx = 0, new_status, status;
-	int	req_flags = 0, ret_flags, lifetime_rec, major_status;
-	gss_buffer_desc  output_token, input_token, input_name_buffer;
-	gss_buffer_desc  output_name_buffer, status_string;
-	gss_name_t    desired_targname;
-	gss_channel_bindings  input_chan_bindings;
-	char targ_printable[GSS_C_MAX_PRINTABLE_NAME];
-	int  from_addr=0, to_addr=0, myhostlen, j;
-	int  deleg_flag=1, mutual_flag=0, replay_flag=0, seq_flag=0;
-	char *address;
-
-	printf("[ Trying SPX ... ]\n");
-	strcpy(targ_printable, "SERVICE:rcmd@");
-	strcat(targ_printable, RemoteHostName);
-
-	input_name_buffer.length = strlen(targ_printable);
-	input_name_buffer.value = targ_printable;
-
-	if (!UserNameRequested) {
-		return(0);
-	}
-
-	major_status = gss_import_name(&status,
-					&input_name_buffer,
-					GSS_C_NULL_OID,
-					&desired_targname);
-
-
-	major_status = gss_display_name(&status,
-					desired_targname,
-					&output_name_buffer,
-					&output_name_type);
-
-	printf("target is '%s'\n", output_name_buffer.value); fflush(stdout);
-
-	major_status = gss_release_buffer(&status, &output_name_buffer);
-
-	input_chan_bindings = (gss_channel_bindings)
-	  malloc(sizeof(gss_channel_bindings_desc));
-
-	input_chan_bindings->initiator_addrtype = GSS_C_AF_INET;
-	input_chan_bindings->initiator_address.length = 4;
-	address = (char *) malloc(4);
-	input_chan_bindings->initiator_address.value = (char *) address;
-	address[0] = ((from_addr & 0xff000000) >> 24);
-	address[1] = ((from_addr & 0xff0000) >> 16);
-	address[2] = ((from_addr & 0xff00) >> 8);
-	address[3] = (from_addr & 0xff);
-	input_chan_bindings->acceptor_addrtype = GSS_C_AF_INET;
-	input_chan_bindings->acceptor_address.length = 4;
-	address = (char *) malloc(4);
-	input_chan_bindings->acceptor_address.value = (char *) address;
-	address[0] = ((to_addr & 0xff000000) >> 24);
-	address[1] = ((to_addr & 0xff0000) >> 16);
-	address[2] = ((to_addr & 0xff00) >> 8);
-	address[3] = (to_addr & 0xff);
-	input_chan_bindings->application_data.length = 0;
-
-	req_flags = 0;
-	if (deleg_flag)  req_flags = req_flags | 1;
-	if (mutual_flag) req_flags = req_flags | 2;
-	if (replay_flag) req_flags = req_flags | 4;
-	if (seq_flag)    req_flags = req_flags | 8;
-
-	major_status = gss_init_sec_context(&status,         /* minor status */
-					GSS_C_NO_CREDENTIAL, /* cred handle */
-					&actual_ctxhandle,   /* ctx handle */
-					desired_targname,    /* target name */
-					GSS_C_NULL_OID,      /* mech type */
-					req_flags,           /* req flags */
-					0,                   /* time req */
-					input_chan_bindings, /* chan binding */
-					GSS_C_NO_BUFFER,     /* input token */
-					&actual_mech_type,   /* actual mech */
-					&output_token,       /* output token */
-					&ret_flags,          /* ret flags */
-					&lifetime_rec);      /* time rec */
-
-	if ((major_status != GSS_S_COMPLETE) &&
-	    (major_status != GSS_S_CONTINUE_NEEDED)) {
-	  gss_display_status(&new_status,
-				status,
-				GSS_C_MECH_CODE,
-				GSS_C_NULL_OID,
-				&msg_ctx,
-				&status_string);
-	  printf("%s\n", status_string.value);
-	  return(0);
-	}
-
-	if (!auth_sendname(UserNameRequested, strlen(UserNameRequested))) {
-		return(0);
-	}
-
-	if (!Data(ap, SPX_AUTH, (void *)output_token.value, output_token.length)) {
-		return(0);
-	}
-
-	return(1);
-}
-
-	void
-spx_is(ap, data, cnt)
-	Authenticator *ap;
-	unsigned char *data;
-	int cnt;
-{
-	Session_Key skey;
-	Block datablock;
-	int r;
-
-	if (cnt-- < 1)
-		return;
-	switch (*data++) {
-	case SPX_AUTH:
-		input_token.length = cnt;
-		input_token.value = (char *) data;
-
-		gethostname(lhostname, sizeof(lhostname));
-
-		strcpy(targ_printable, "SERVICE:rcmd@");
-		strcat(targ_printable, lhostname);
-
-		input_name_buffer.length = strlen(targ_printable);
-		input_name_buffer.value = targ_printable;
-
-		major_status = gss_import_name(&status,
-					&input_name_buffer,
-					GSS_C_NULL_OID,
-					&desired_targname);
-
-		major_status = gss_acquire_cred(&status,
-					desired_targname,
-					0,
-					GSS_C_NULL_OID_SET,
-					GSS_C_ACCEPT,
-					&gss_cred_handle,
-					&actual_mechs,
-					&lifetime_rec);
-
-		major_status = gss_release_name(&status, desired_targname);
-
-		input_chan_bindings = (gss_channel_bindings)
-		  malloc(sizeof(gss_channel_bindings_desc));
-
-		input_chan_bindings->initiator_addrtype = GSS_C_AF_INET;
-		input_chan_bindings->initiator_address.length = 4;
-		address = (char *) malloc(4);
-		input_chan_bindings->initiator_address.value = (char *) address;
-		address[0] = ((from_addr & 0xff000000) >> 24);
-		address[1] = ((from_addr & 0xff0000) >> 16);
-		address[2] = ((from_addr & 0xff00) >> 8);
-		address[3] = (from_addr & 0xff);
-		input_chan_bindings->acceptor_addrtype = GSS_C_AF_INET;
-		input_chan_bindings->acceptor_address.length = 4;
-		address = (char *) malloc(4);
-		input_chan_bindings->acceptor_address.value = (char *) address;
-		address[0] = ((to_addr & 0xff000000) >> 24);
-		address[1] = ((to_addr & 0xff0000) >> 16);
-		address[2] = ((to_addr & 0xff00) >> 8);
-		address[3] = (to_addr & 0xff);
-		input_chan_bindings->application_data.length = 0;
-
-		major_status = gss_accept_sec_context(&status,
-						&context_handle,
-						gss_cred_handle,
-						&input_token,
-						input_chan_bindings,
-						&src_name,
-						&actual_mech_type,
-						&output_token,
-						&ret_flags,
-						&lifetime_rec,
-						&gss_delegated_cred_handle);
-
-
-		if (major_status != GSS_S_COMPLETE) {
-
-		  major_status = gss_display_name(&status,
-					src_name,
-					&fullname_buffer,
-					&fullname_type);
-			Data(ap, SPX_REJECT, (void *)"auth failed", -1);
-			auth_finished(ap, AUTH_REJECT);
-			return;
-		}
-
-		major_status = gss_display_name(&status,
-					src_name,
-					&fullname_buffer,
-					&fullname_type);
-
-
-		Data(ap, SPX_ACCEPT, (void *)output_token.value, output_token.length);
-		auth_finished(ap, AUTH_USER);
-		break;
-
-	default:
-		Data(ap, SPX_REJECT, 0, 0);
-		break;
-	}
-}
-
-
-	void
-spx_reply(ap, data, cnt)
-	Authenticator *ap;
-	unsigned char *data;
-	int cnt;
-{
-	Session_Key skey;
-
-	if (cnt-- < 1)
-		return;
-	switch (*data++) {
-	case SPX_REJECT:
-		if (cnt > 0) {
-			printf("[ SPX refuses authentication because %.*s ]\r\n",
-				cnt, data);
-		} else
-			printf("[ SPX refuses authentication ]\r\n");
-		auth_send_retry();
-		return;
-	case SPX_ACCEPT:
-		printf("[ SPX accepts you ]\n");
-		if ((ap->way & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) {
-			/*
-			 * Send over the encrypted challenge.
-		 	 */
-		  input_token.value = (char *) data;
-		  input_token.length = cnt;
-
-		  major_status = gss_init_sec_context(&status, /* minor stat */
-					GSS_C_NO_CREDENTIAL, /* cred handle */
-					&actual_ctxhandle,   /* ctx handle */
-					desired_targname,    /* target name */
-					GSS_C_NULL_OID,      /* mech type */
-					req_flags,           /* req flags */
-					0,                   /* time req */
-					input_chan_bindings, /* chan binding */
-					&input_token,        /* input token */
-					&actual_mech_type,   /* actual mech */
-					&output_token,       /* output token */
-					&ret_flags,          /* ret flags */
-					&lifetime_rec);      /* time rec */
-
-		  if (major_status != GSS_S_COMPLETE) {
-		    gss_display_status(&new_status,
-					status,
-					GSS_C_MECH_CODE,
-					GSS_C_NULL_OID,
-					&msg_ctx,
-					&status_string);
-		    printf("[ SPX mutual response fails ... '%s' ]\r\n",
-			 status_string.value);
-		    auth_send_retry();
-		    return;
-		  }
-		}
-		auth_finished(ap, AUTH_USER);
-		return;
-
-	default:
-		return;
-	}
-}
-
-	int
-spx_status(ap, name, level)
-	Authenticator *ap;
-	char *name;
-	int level;
-{
-
-	gss_buffer_desc  fullname_buffer, acl_file_buffer;
-	gss_OID          fullname_type;
-	char acl_file[160], fullname[160];
-	int major_status, status = 0;
-	struct passwd  *pwd;
-
-	/*
-	 * hard code fullname to
-	 *   "SPX:/C=US/O=Digital/OU=LKG/OU=Sphinx/OU=Users/CN=Kannan Alagappan"
-	 * and acl_file to "~kannan/.sphinx"
-	 */
-
-	pwd = getpwnam(UserNameRequested);
-	if (pwd == NULL) {
-	  return(AUTH_USER);   /*  not authenticated  */
-	}
-
-	strcpy(acl_file, pwd->pw_dir);
-	strcat(acl_file, "/.sphinx");
-	acl_file_buffer.value = acl_file;
-	acl_file_buffer.length = strlen(acl_file);
-
-	major_status = gss_display_name(&status,
-					src_name,
-					&fullname_buffer,
-					&fullname_type);
-
-	if (level < AUTH_USER)
-		return(level);
-
-	major_status = gss__check_acl(&status, &fullname_buffer,
-					&acl_file_buffer);
-
-	if (major_status == GSS_S_COMPLETE) {
-	  strcpy(name, UserNameRequested);
-	  return(AUTH_VALID);
-	} else {
-	   return(AUTH_USER);
-	}
-
-}
-
-#define	BUMP(buf, len)		while (*(buf)) {++(buf), --(len);}
-#define	ADDC(buf, len, c)	if ((len) > 0) {*(buf)++ = (c); --(len);}
-
-	void
-spx_printsub(data, cnt, buf, buflen)
-	unsigned char *data, *buf;
-	int cnt, buflen;
-{
-	char lbuf[32];
-	register int i;
-
-	buf[buflen-1] = '\0';		/* make sure its NULL terminated */
-	buflen -= 1;
-
-	switch(data[3]) {
-	case SPX_REJECT:		/* Rejected (reason might follow) */
-		strncpy((char *)buf, " REJECT ", buflen);
-		goto common;
-
-	case SPX_ACCEPT:		/* Accepted (name might follow) */
-		strncpy((char *)buf, " ACCEPT ", buflen);
-	common:
-		BUMP(buf, buflen);
-		if (cnt <= 4)
-			break;
-		ADDC(buf, buflen, '"');
-		for (i = 4; i < cnt; i++)
-			ADDC(buf, buflen, data[i]);
-		ADDC(buf, buflen, '"');
-		ADDC(buf, buflen, '\0');
-		break;
-
-	case SPX_AUTH:			/* Authentication data follows */
-		strncpy((char *)buf, " AUTH", buflen);
-		goto common2;
-
-	default:
-		sprintf(lbuf, " %d (unknown)", data[3]);
-		strncpy((char *)buf, lbuf, buflen);
-	common2:
-		BUMP(buf, buflen);
-		for (i = 4; i < cnt; i++) {
-			sprintf(lbuf, " %d", data[i]);
-			strncpy((char *)buf, lbuf, buflen);
-			BUMP(buf, buflen);
-		}
-		break;
-	}
-}
-
-#endif
-
-#ifdef notdef
-
-prkey(msg, key)
-	char *msg;
-	unsigned char *key;
-{
-	register int i;
-	printf("%s:", msg);
-	for (i = 0; i < 8; i++)
-		printf(" %3d", key[i]);
-	printf("\r\n");
-}
-#endif
diff --git a/crypto/telnet/telnet/authenc.c b/crypto/telnet/telnet/authenc.c
deleted file mode 100644
index f829b1a741a9..000000000000
--- a/crypto/telnet/telnet/authenc.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static const char sccsid[] = "@(#)authenc.c	8.1 (Berkeley) 6/6/93";
-#endif /* not lint */
-
-#if	defined(AUTHENTICATION) || defined(ENCRYPTION)
-#include <sys/types.h>
-#include <arpa/telnet.h>
-#include <libtelnet/encrypt.h>
-#include <libtelnet/misc.h>
-
-#include "general.h"
-#include "ring.h"
-#include "externs.h"
-#include "defines.h"
-#include "types.h"
-
-	int
-net_write(str, len)
-	unsigned char *str;
-	int len;
-{
-	if (NETROOM() > len) {
-		ring_supply_data(&netoring, str, len);
-		if (str[0] == IAC && str[1] == SE)
-			printsub('>', &str[2], len-2);
-		return(len);
-	}
-	return(0);
-}
-
-	void
-net_encrypt()
-{
-#ifdef	ENCRYPTION
-	if (encrypt_output)
-		ring_encrypt(&netoring, encrypt_output);
-	else
-		ring_clearto(&netoring);
-#endif	/* ENCRYPTION */
-}
-
-	int
-telnet_spin()
-{
-	return(-1);
-}
-
-	char *
-telnet_getenv(val)
-	char *val;
-{
-	return((char *)env_getvalue((unsigned char *)val));
-}
-
-	char *
-telnet_gets(prompt, result, length, echo)
-	char *prompt;
-	char *result;
-	int length;
-	int echo;
-{
-	extern char *getpass();
-	extern int globalmode;
-	int om = globalmode;
-	char *res;
-
-	TerminalNewMode(-1);
-	if (echo) {
-		printf("%s", prompt);
-		res = fgets(result, length, stdin);
-	} else if ((res = getpass(prompt))) {
-		strncpy(result, res, length);
-		res = result;
-	}
-	TerminalNewMode(om);
-	return(res);
-}
-#endif	/* defined(AUTHENTICATION) || defined(ENCRYPTION) */
diff --git a/crypto/telnet/telnet/commands.c b/crypto/telnet/telnet/commands.c
deleted file mode 100644
index 40e7315d063a..000000000000
--- a/crypto/telnet/telnet/commands.c
+++ /dev/null
@@ -1,3037 +0,0 @@
-/*
- * Copyright (c) 1988, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static const char sccsid[] = "@(#)commands.c	8.4 (Berkeley) 5/30/95";
-#endif /* not lint */
-
-#if	defined(unix)
-#include <sys/param.h>
-#if	defined(CRAY) || defined(sysV88)
-#include <sys/types.h>
-#endif
-#include <sys/file.h>
-#else
-#include <sys/types.h>
-#endif	/* defined(unix) */
-#include <sys/socket.h>
-#include <netinet/in.h>
-#ifdef	CRAY
-#include <fcntl.h>
-#endif	/* CRAY */
-
-#include <signal.h>
-#include <netdb.h>
-#include <ctype.h>
-#include <pwd.h>
-#include <varargs.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include <arpa/telnet.h>
-
-#include "general.h"
-
-#include "ring.h"
-
-#include "externs.h"
-#include "defines.h"
-#include "types.h"
-
-#if	defined(AUTHENTICATION)
-#include <libtelnet/auth.h>
-#endif
-#if	defined(ENCRYPTION)
-#include <libtelnet/encrypt.h>
-#endif
-
-#if !defined(CRAY) && !defined(sysV88)
-#include <netinet/in_systm.h>
-# if (defined(vax) || defined(tahoe) || defined(hp300)) && !defined(ultrix)
-# include <machine/endian.h>
-# endif /* vax */
-#endif /* !defined(CRAY) && !defined(sysV88) */
-#include <netinet/ip.h>
-
-
-#ifndef	MAXHOSTNAMELEN
-#define	MAXHOSTNAMELEN 64
-#endif	MAXHOSTNAMELEN
-
-#if	defined(IPPROTO_IP) && defined(IP_TOS)
-int tos = -1;
-#endif	/* defined(IPPROTO_IP) && defined(IP_TOS) */
-
-char	*hostname;
-static char _hostname[MAXHOSTNAMELEN];
-
-extern char *getenv();
-
-extern int isprefix();
-extern char **genget();
-extern int Ambiguous();
-
-static int help(int argc, char *argv[]);
-static int call();
-static void cmdrc(char *m1, char *m2);
-
-int quit(void);
-
-typedef struct {
-	char	*name;		/* command name */
-	char	*help;		/* help string (NULL for no help) */
-	int	(*handler)();	/* routine which executes command */
-	int	needconnect;	/* Do we need to be connected to execute? */
-} Command;
-
-static char line[256];
-static char saveline[256];
-static int margc;
-static char *margv[20];
-
-#if	defined(SKEY)
-#include <sys/wait.h>
-#define PATH_SKEY	"/usr/bin/key"
-    int
-skey_calc(argc, argv)
-	int argc;
-	char **argv;
-{
-	int status;
-
-	if(argc != 3) {
-		printf("%s sequence challenge\n", argv[0]);
-		return;
-	}
-
-	switch(fork()) {
-	case 0:
-		execv(PATH_SKEY, argv);
-		exit (1);
-	case -1:
-		perror("fork");
-		break;
-	default:
-		(void) wait(&status);
-		if (WIFEXITED(status))
-			return (WEXITSTATUS(status));
-		return (0);
-	}
-}
-#endif
-
-    static void
-makeargv()
-{
-    register char *cp, *cp2, c;
-    register char **argp = margv;
-
-    margc = 0;
-    cp = line;
-    if (*cp == '!') {		/* Special case shell escape */
-	strcpy(saveline, line);	/* save for shell command */
-	*argp++ = "!";		/* No room in string to get this */
-	margc++;
-	cp++;
-    }
-    while ((c = *cp)) {
-	register int inquote = 0;
-	while (isspace(c))
-	    c = *++cp;
-	if (c == '\0')
-	    break;
-	*argp++ = cp;
-	margc += 1;
-	for (cp2 = cp; c != '\0'; c = *++cp) {
-	    if (inquote) {
-		if (c == inquote) {
-		    inquote = 0;
-		    continue;
-		}
-	    } else {
-		if (c == '\\') {
-		    if ((c = *++cp) == '\0')
-			break;
-		} else if (c == '"') {
-		    inquote = '"';
-		    continue;
-		} else if (c == '\'') {
-		    inquote = '\'';
-		    continue;
-		} else if (isspace(c))
-		    break;
-	    }
-	    *cp2++ = c;
-	}
-	*cp2 = '\0';
-	if (c == '\0')
-	    break;
-	cp++;
-    }
-    *argp++ = 0;
-}
-
-/*
- * Make a character string into a number.
- *
- * Todo:  1.  Could take random integers (12, 0x12, 012, 0b1).
- */
-
-	static int
-special(s)
-	register char *s;
-{
-	register char c;
-	char b;
-
-	switch (*s) {
-	case '^':
-		b = *++s;
-		if (b == '?') {
-		    c = b | 0x40;		/* DEL */
-		} else {
-		    c = b & 0x1f;
-		}
-		break;
-	default:
-		c = *s;
-		break;
-	}
-	return c;
-}
-
-/*
- * Construct a control character sequence
- * for a special character.
- */
-	static char *
-control(c)
-	register cc_t c;
-{
-	static char buf[5];
-	/*
-	 * The only way I could get the Sun 3.5 compiler
-	 * to shut up about
-	 *	if ((unsigned int)c >= 0x80)
-	 * was to assign "c" to an unsigned int variable...
-	 * Arggg....
-	 */
-	register unsigned int uic = (unsigned int)c;
-
-	if (uic == 0x7f)
-		return ("^?");
-	if (c == (cc_t)_POSIX_VDISABLE) {
-		return "off";
-	}
-	if (uic >= 0x80) {
-		buf[0] = '\\';
-		buf[1] = ((c>>6)&07) + '0';
-		buf[2] = ((c>>3)&07) + '0';
-		buf[3] = (c&07) + '0';
-		buf[4] = 0;
-	} else if (uic >= 0x20) {
-		buf[0] = c;
-		buf[1] = 0;
-	} else {
-		buf[0] = '^';
-		buf[1] = '@'+c;
-		buf[2] = 0;
-	}
-	return (buf);
-}
-
-
-
-/*
- *	The following are data structures and routines for
- *	the "send" command.
- *
- */
-
-struct sendlist {
-    char	*name;		/* How user refers to it (case independent) */
-    char	*help;		/* Help information (0 ==> no help) */
-    int		needconnect;	/* Need to be connected */
-    int		narg;		/* Number of arguments */
-    int		(*handler)();	/* Routine to perform (for special ops) */
-    int		nbyte;		/* Number of bytes to send this command */
-    int		what;		/* Character to be sent (<0 ==> special) */
-};
-
-
-static int
-	send_esc P((void)),
-	send_help P((void)),
-	send_docmd P((char *)),
-	send_dontcmd P((char *)),
-	send_willcmd P((char *)),
-	send_wontcmd P((char *));
-
-static struct sendlist Sendlist[] = {
-    { "ao",	"Send Telnet Abort output",		1, 0, 0, 2, AO },
-    { "ayt",	"Send Telnet 'Are You There'",		1, 0, 0, 2, AYT },
-    { "brk",	"Send Telnet Break",			1, 0, 0, 2, BREAK },
-    { "break",	0,					1, 0, 0, 2, BREAK },
-    { "ec",	"Send Telnet Erase Character",		1, 0, 0, 2, EC },
-    { "el",	"Send Telnet Erase Line",		1, 0, 0, 2, EL },
-    { "escape",	"Send current escape character",	1, 0, send_esc, 1, 0 },
-    { "ga",	"Send Telnet 'Go Ahead' sequence",	1, 0, 0, 2, GA },
-    { "ip",	"Send Telnet Interrupt Process",	1, 0, 0, 2, IP },
-    { "intp",	0,					1, 0, 0, 2, IP },
-    { "interrupt", 0,					1, 0, 0, 2, IP },
-    { "intr",	0,					1, 0, 0, 2, IP },
-    { "nop",	"Send Telnet 'No operation'",		1, 0, 0, 2, NOP },
-    { "eor",	"Send Telnet 'End of Record'",		1, 0, 0, 2, EOR },
-    { "abort",	"Send Telnet 'Abort Process'",		1, 0, 0, 2, ABORT },
-    { "susp",	"Send Telnet 'Suspend Process'",	1, 0, 0, 2, SUSP },
-    { "eof",	"Send Telnet End of File Character",	1, 0, 0, 2, xEOF },
-    { "synch",	"Perform Telnet 'Synch operation'",	1, 0, dosynch, 2, 0 },
-    { "getstatus", "Send request for STATUS",		1, 0, get_status, 6, 0 },
-    { "?",	"Display send options",			0, 0, send_help, 0, 0 },
-    { "help",	0,					0, 0, send_help, 0, 0 },
-    { "do",	0,					0, 1, send_docmd, 3, 0 },
-    { "dont",	0,					0, 1, send_dontcmd, 3, 0 },
-    { "will",	0,					0, 1, send_willcmd, 3, 0 },
-    { "wont",	0,					0, 1, send_wontcmd, 3, 0 },
-    { 0 }
-};
-
-#define	GETSEND(name) ((struct sendlist *) genget(name, (char **) Sendlist, \
-				sizeof(struct sendlist)))
-
-    static int
-sendcmd(argc, argv)
-    int  argc;
-    char **argv;
-{
-    int count;		/* how many bytes we are going to need to send */
-    int i;
-    struct sendlist *s;	/* pointer to current command */
-    int success = 0;
-    int needconnect = 0;
-
-    if (argc < 2) {
-	printf("need at least one argument for 'send' command\n");
-	printf("'send ?' for help\n");
-	return 0;
-    }
-    /*
-     * First, validate all the send arguments.
-     * In addition, we see how much space we are going to need, and
-     * whether or not we will be doing a "SYNCH" operation (which
-     * flushes the network queue).
-     */
-    count = 0;
-    for (i = 1; i < argc; i++) {
-	s = GETSEND(argv[i]);
-	if (s == 0) {
-	    printf("Unknown send argument '%s'\n'send ?' for help.\n",
-			argv[i]);
-	    return 0;
-	} else if (Ambiguous(s)) {
-	    printf("Ambiguous send argument '%s'\n'send ?' for help.\n",
-			argv[i]);
-	    return 0;
-	}
-	if (i + s->narg >= argc) {
-	    fprintf(stderr,
-	    "Need %d argument%s to 'send %s' command.  'send %s ?' for help.\n",
-		s->narg, s->narg == 1 ? "" : "s", s->name, s->name);
-	    return 0;
-	}
-	count += s->nbyte;
-	if (s->handler == send_help) {
-	    send_help();
-	    return 0;
-	}
-
-	i += s->narg;
-	needconnect += s->needconnect;
-    }
-    if (!connected && needconnect) {
-	printf("?Need to be connected first.\n");
-	printf("'send ?' for help\n");
-	return 0;
-    }
-    /* Now, do we have enough room? */
-    if (NETROOM() < count) {
-	printf("There is not enough room in the buffer TO the network\n");
-	printf("to process your request.  Nothing will be done.\n");
-	printf("('send synch' will throw away most data in the network\n");
-	printf("buffer, if this might help.)\n");
-	return 0;
-    }
-    /* OK, they are all OK, now go through again and actually send */
-    count = 0;
-    for (i = 1; i < argc; i++) {
-	if ((s = GETSEND(argv[i])) == 0) {
-	    fprintf(stderr, "Telnet 'send' error - argument disappeared!\n");
-	    (void) quit();
-	    /*NOTREACHED*/
-	}
-	if (s->handler) {
-	    count++;
-	    success += (*s->handler)((s->narg > 0) ? argv[i+1] : 0,
-				  (s->narg > 1) ? argv[i+2] : 0);
-	    i += s->narg;
-	} else {
-	    NET2ADD(IAC, s->what);
-	    printoption("SENT", IAC, s->what);
-	}
-    }
-    return (count == success);
-}
-
-    static int
-send_esc()
-{
-    NETADD(escape);
-    return 1;
-}
-
-    static int
-send_docmd(name)
-    char *name;
-{
-    return(send_tncmd(send_do, "do", name));
-}
-
-    static int
-send_dontcmd(name)
-    char *name;
-{
-    return(send_tncmd(send_dont, "dont", name));
-}
-    static int
-send_willcmd(name)
-    char *name;
-{
-    return(send_tncmd(send_will, "will", name));
-}
-    static int
-send_wontcmd(name)
-    char *name;
-{
-    return(send_tncmd(send_wont, "wont", name));
-}
-
-    int
-send_tncmd(func, cmd, name)
-    void	(*func)();
-    char	*cmd, *name;
-{
-    char **cpp;
-    extern char *telopts[];
-    register int val = 0;
-
-    if (isprefix(name, "help") || isprefix(name, "?")) {
-	register int col, len;
-
-	printf("Usage: send %s <value|option>\n", cmd);
-	printf("\"value\" must be from 0 to 255\n");
-	printf("Valid options are:\n\t");
-
-	col = 8;
-	for (cpp = telopts; *cpp; cpp++) {
-	    len = strlen(*cpp) + 3;
-	    if (col + len > 65) {
-		printf("\n\t");
-		col = 8;
-	    }
-	    printf(" \"%s\"", *cpp);
-	    col += len;
-	}
-	printf("\n");
-	return 0;
-    }
-    cpp = (char **)genget(name, telopts, sizeof(char *));
-    if (Ambiguous(cpp)) {
-	fprintf(stderr,"'%s': ambiguous argument ('send %s ?' for help).\n",
-					name, cmd);
-	return 0;
-    }
-    if (cpp) {
-	val = cpp - telopts;
-    } else {
-	register char *cp = name;
-
-	while (*cp >= '0' && *cp <= '9') {
-	    val *= 10;
-	    val += *cp - '0';
-	    cp++;
-	}
-	if (*cp != 0) {
-	    fprintf(stderr, "'%s': unknown argument ('send %s ?' for help).\n",
-					name, cmd);
-	    return 0;
-	} else if (val < 0 || val > 255) {
-	    fprintf(stderr, "'%s': bad value ('send %s ?' for help).\n",
-					name, cmd);
-	    return 0;
-	}
-    }
-    if (!connected) {
-	printf("?Need to be connected first.\n");
-	return 0;
-    }
-    (*func)(val, 1);
-    return 1;
-}
-
-    static int
-send_help()
-{
-    struct sendlist *s;	/* pointer to current command */
-    for (s = Sendlist; s->name; s++) {
-	if (s->help)
-	    printf("%-15s %s\n", s->name, s->help);
-    }
-    return(0);
-}
-
-/*
- * The following are the routines and data structures referred
- * to by the arguments to the "toggle" command.
- */
-
-    static int
-lclchars()
-{
-    donelclchars = 1;
-    return 1;
-}
-
-    static int
-togdebug()
-{
-#ifndef	NOT43
-    if (net > 0 &&
-	(SetSockOpt(net, SOL_SOCKET, SO_DEBUG, debug)) < 0) {
-	    perror("setsockopt (SO_DEBUG)");
-    }
-#else	/* NOT43 */
-    if (debug) {
-	if (net > 0 && SetSockOpt(net, SOL_SOCKET, SO_DEBUG, 1) < 0)
-	    perror("setsockopt (SO_DEBUG)");
-    } else
-	printf("Cannot turn off socket debugging\n");
-#endif	/* NOT43 */
-    return 1;
-}
-
-
-    static int
-togcrlf()
-{
-    if (crlf) {
-	printf("Will send carriage returns as telnet <CR><LF>.\n");
-    } else {
-	printf("Will send carriage returns as telnet <CR><NUL>.\n");
-    }
-    return 1;
-}
-
-int binmode;
-
-    static int
-togbinary(val)
-    int val;
-{
-    donebinarytoggle = 1;
-
-    if (val >= 0) {
-	binmode = val;
-    } else {
-	if (my_want_state_is_will(TELOPT_BINARY) &&
-				my_want_state_is_do(TELOPT_BINARY)) {
-	    binmode = 1;
-	} else if (my_want_state_is_wont(TELOPT_BINARY) &&
-				my_want_state_is_dont(TELOPT_BINARY)) {
-	    binmode = 0;
-	}
-	val = binmode ? 0 : 1;
-    }
-
-    if (val == 1) {
-	if (my_want_state_is_will(TELOPT_BINARY) &&
-					my_want_state_is_do(TELOPT_BINARY)) {
-	    printf("Already operating in binary mode with remote host.\n");
-	} else {
-	    printf("Negotiating binary mode with remote host.\n");
-	    tel_enter_binary(3);
-	}
-    } else {
-	if (my_want_state_is_wont(TELOPT_BINARY) &&
-					my_want_state_is_dont(TELOPT_BINARY)) {
-	    printf("Already in network ascii mode with remote host.\n");
-	} else {
-	    printf("Negotiating network ascii mode with remote host.\n");
-	    tel_leave_binary(3);
-	}
-    }
-    return 1;
-}
-
-    static int
-togrbinary(val)
-    int val;
-{
-    donebinarytoggle = 1;
-
-    if (val == -1)
-	val = my_want_state_is_do(TELOPT_BINARY) ? 0 : 1;
-
-    if (val == 1) {
-	if (my_want_state_is_do(TELOPT_BINARY)) {
-	    printf("Already receiving in binary mode.\n");
-	} else {
-	    printf("Negotiating binary mode on input.\n");
-	    tel_enter_binary(1);
-	}
-    } else {
-	if (my_want_state_is_dont(TELOPT_BINARY)) {
-	    printf("Already receiving in network ascii mode.\n");
-	} else {
-	    printf("Negotiating network ascii mode on input.\n");
-	    tel_leave_binary(1);
-	}
-    }
-    return 1;
-}
-
-    static int
-togxbinary(val)
-    int val;
-{
-    donebinarytoggle = 1;
-
-    if (val == -1)
-	val = my_want_state_is_will(TELOPT_BINARY) ? 0 : 1;
-
-    if (val == 1) {
-	if (my_want_state_is_will(TELOPT_BINARY)) {
-	    printf("Already transmitting in binary mode.\n");
-	} else {
-	    printf("Negotiating binary mode on output.\n");
-	    tel_enter_binary(2);
-	}
-    } else {
-	if (my_want_state_is_wont(TELOPT_BINARY)) {
-	    printf("Already transmitting in network ascii mode.\n");
-	} else {
-	    printf("Negotiating network ascii mode on output.\n");
-	    tel_leave_binary(2);
-	}
-    }
-    return 1;
-}
-
-
-static int togglehelp P((void));
-#if	defined(AUTHENTICATION)
-extern int auth_togdebug P((int));
-#endif
-#ifdef	ENCRYPTION
-extern int EncryptAutoEnc P((int));
-extern int EncryptAutoDec P((int));
-extern int EncryptDebug P((int));
-extern int EncryptVerbose P((int));
-#endif	/* ENCRYPTION */
-
-struct togglelist {
-    char	*name;		/* name of toggle */
-    char	*help;		/* help message */
-    int		(*handler)();	/* routine to do actual setting */
-    int		*variable;
-    char	*actionexplanation;
-};
-
-static struct togglelist Togglelist[] = {
-    { "autoflush",
-	"flushing of output when sending interrupt characters",
-	    0,
-		&autoflush,
-		    "flush output when sending interrupt characters" },
-    { "autosynch",
-	"automatic sending of interrupt characters in urgent mode",
-	    0,
-		&autosynch,
-		    "send interrupt characters in urgent mode" },
-#if	defined(AUTHENTICATION)
-    { "autologin",
-	"automatic sending of login and/or authentication info",
-	    0,
-		&autologin,
-		    "send login name and/or authentication information" },
-    { "authdebug",
-	"Toggle authentication debugging",
-	    auth_togdebug,
-		0,
-		     "print authentication debugging information" },
-#endif
-#ifdef	ENCRYPTION
-    { "autoencrypt",
-	"automatic encryption of data stream",
-	    EncryptAutoEnc,
-		0,
-		    "automatically encrypt output" },
-    { "autodecrypt",
-	"automatic decryption of data stream",
-	    EncryptAutoDec,
-		0,
-		    "automatically decrypt input" },
-    { "verbose_encrypt",
-	"Toggle verbose encryption output",
-	    EncryptVerbose,
-		0,
-		    "print verbose encryption output" },
-    { "encdebug",
-	"Toggle encryption debugging",
-	    EncryptDebug,
-		0,
-		    "print encryption debugging information" },
-#endif	/* ENCRYPTION */
-    { "skiprc",
-	"don't read ~/.telnetrc file",
-	    0,
-		&skiprc,
-		    "skip reading of ~/.telnetrc file" },
-    { "binary",
-	"sending and receiving of binary data",
-	    togbinary,
-		0,
-		    0 },
-    { "inbinary",
-	"receiving of binary data",
-	    togrbinary,
-		0,
-		    0 },
-    { "outbinary",
-	"sending of binary data",
-	    togxbinary,
-		0,
-		    0 },
-    { "crlf",
-	"sending carriage returns as telnet <CR><LF>",
-	    togcrlf,
-		&crlf,
-		    0 },
-    { "crmod",
-	"mapping of received carriage returns",
-	    0,
-		&crmod,
-		    "map carriage return on output" },
-    { "localchars",
-	"local recognition of certain control characters",
-	    lclchars,
-		&localchars,
-		    "recognize certain control characters" },
-    { " ", "", 0 },		/* empty line */
-#if	defined(unix) && defined(TN3270)
-    { "apitrace",
-	"(debugging) toggle tracing of API transactions",
-	    0,
-		&apitrace,
-		    "trace API transactions" },
-    { "cursesdata",
-	"(debugging) toggle printing of hexadecimal curses data",
-	    0,
-		&cursesdata,
-		    "print hexadecimal representation of curses data" },
-#endif	/* defined(unix) && defined(TN3270) */
-    { "debug",
-	"debugging",
-	    togdebug,
-		&debug,
-		    "turn on socket level debugging" },
-    { "netdata",
-	"printing of hexadecimal network data (debugging)",
-	    0,
-		&netdata,
-		    "print hexadecimal representation of network traffic" },
-    { "prettydump",
-	"output of \"netdata\" to user readable format (debugging)",
-	    0,
-		&prettydump,
-		    "print user readable output for \"netdata\"" },
-    { "options",
-	"viewing of options processing (debugging)",
-	    0,
-		&showoptions,
-		    "show option processing" },
-#if	defined(unix)
-    { "termdata",
-	"(debugging) toggle printing of hexadecimal terminal data",
-	    0,
-		&termdata,
-		    "print hexadecimal representation of terminal traffic" },
-#endif	/* defined(unix) */
-    { "?",
-	0,
-	    togglehelp },
-    { "help",
-	0,
-	    togglehelp },
-    { 0 }
-};
-
-    static int
-togglehelp()
-{
-    struct togglelist *c;
-
-    for (c = Togglelist; c->name; c++) {
-	if (c->help) {
-	    if (*c->help)
-		printf("%-15s toggle %s\n", c->name, c->help);
-	    else
-		printf("\n");
-	}
-    }
-    printf("\n");
-    printf("%-15s %s\n", "?", "display help information");
-    return 0;
-}
-
-    static void
-settogglehelp(set)
-    int set;
-{
-    struct togglelist *c;
-
-    for (c = Togglelist; c->name; c++) {
-	if (c->help) {
-	    if (*c->help)
-		printf("%-15s %s %s\n", c->name, set ? "enable" : "disable",
-						c->help);
-	    else
-		printf("\n");
-	}
-    }
-}
-
-#define	GETTOGGLE(name) (struct togglelist *) \
-		genget(name, (char **) Togglelist, sizeof(struct togglelist))
-
-    static int
-toggle(argc, argv)
-    int  argc;
-    char *argv[];
-{
-    int retval = 1;
-    char *name;
-    struct togglelist *c;
-
-    if (argc < 2) {
-	fprintf(stderr,
-	    "Need an argument to 'toggle' command.  'toggle ?' for help.\n");
-	return 0;
-    }
-    argc--;
-    argv++;
-    while (argc--) {
-	name = *argv++;
-	c = GETTOGGLE(name);
-	if (Ambiguous(c)) {
-	    fprintf(stderr, "'%s': ambiguous argument ('toggle ?' for help).\n",
-					name);
-	    return 0;
-	} else if (c == 0) {
-	    fprintf(stderr, "'%s': unknown argument ('toggle ?' for help).\n",
-					name);
-	    return 0;
-	} else {
-	    if (c->variable) {
-		*c->variable = !*c->variable;		/* invert it */
-		if (c->actionexplanation) {
-		    printf("%s %s.\n", *c->variable? "Will" : "Won't",
-							c->actionexplanation);
-		}
-	    }
-	    if (c->handler) {
-		retval &= (*c->handler)(-1);
-	    }
-	}
-    }
-    return retval;
-}
-
-/*
- * The following perform the "set" command.
- */
-
-#ifdef	USE_TERMIO
-struct termio new_tc = { 0 };
-#endif
-
-struct setlist {
-    char *name;				/* name */
-    char *help;				/* help information */
-    void (*handler)();
-    cc_t *charp;			/* where it is located at */
-};
-
-static struct setlist Setlist[] = {
-#ifdef	KLUDGELINEMODE
-    { "echo", 	"character to toggle local echoing on/off", 0, &echoc },
-#endif
-    { "escape",	"character to escape back to telnet command mode", 0, &escape },
-    { "rlogin", "rlogin escape character", 0, &rlogin },
-    { "tracefile", "file to write trace information to", SetNetTrace, (cc_t *)NetTraceFile},
-    { " ", "" },
-    { " ", "The following need 'localchars' to be toggled true", 0, 0 },
-    { "flushoutput", "character to cause an Abort Output", 0, termFlushCharp },
-    { "interrupt", "character to cause an Interrupt Process", 0, termIntCharp },
-    { "quit",	"character to cause an Abort process", 0, termQuitCharp },
-    { "eof",	"character to cause an EOF ", 0, termEofCharp },
-    { " ", "" },
-    { " ", "The following are for local editing in linemode", 0, 0 },
-    { "erase",	"character to use to erase a character", 0, termEraseCharp },
-    { "kill",	"character to use to erase a line", 0, termKillCharp },
-    { "lnext",	"character to use for literal next", 0, termLiteralNextCharp },
-    { "susp",	"character to cause a Suspend Process", 0, termSuspCharp },
-    { "reprint", "character to use for line reprint", 0, termRprntCharp },
-    { "worderase", "character to use to erase a word", 0, termWerasCharp },
-    { "start",	"character to use for XON", 0, termStartCharp },
-    { "stop",	"character to use for XOFF", 0, termStopCharp },
-    { "forw1",	"alternate end of line character", 0, termForw1Charp },
-    { "forw2",	"alternate end of line character", 0, termForw2Charp },
-    { "ayt",	"alternate AYT character", 0, termAytCharp },
-    { 0 }
-};
-
-#if	defined(CRAY) && !defined(__STDC__)
-/* Work around compiler bug in pcc 4.1.5 */
-    void
-_setlist_init()
-{
-#ifndef	KLUDGELINEMODE
-#define	N 5
-#else
-#define	N 6
-#endif
-	Setlist[N+0].charp = &termFlushChar;
-	Setlist[N+1].charp = &termIntChar;
-	Setlist[N+2].charp = &termQuitChar;
-	Setlist[N+3].charp = &termEofChar;
-	Setlist[N+6].charp = &termEraseChar;
-	Setlist[N+7].charp = &termKillChar;
-	Setlist[N+8].charp = &termLiteralNextChar;
-	Setlist[N+9].charp = &termSuspChar;
-	Setlist[N+10].charp = &termRprntChar;
-	Setlist[N+11].charp = &termWerasChar;
-	Setlist[N+12].charp = &termStartChar;
-	Setlist[N+13].charp = &termStopChar;
-	Setlist[N+14].charp = &termForw1Char;
-	Setlist[N+15].charp = &termForw2Char;
-	Setlist[N+16].charp = &termAytChar;
-#undef	N
-}
-#endif	/* defined(CRAY) && !defined(__STDC__) */
-
-    static struct setlist *
-getset(name)
-    char *name;
-{
-    return (struct setlist *)
-		genget(name, (char **) Setlist, sizeof(struct setlist));
-}
-
-    void
-set_escape_char(s)
-    char *s;
-{
-	if (rlogin != _POSIX_VDISABLE) {
-		rlogin = (s && *s) ? special(s) : _POSIX_VDISABLE;
-		printf("Telnet rlogin escape character is '%s'.\n",
-					control(rlogin));
-	} else {
-		escape = (s && *s) ? special(s) : _POSIX_VDISABLE;
-		printf("Telnet escape character is '%s'.\n", control(escape));
-	}
-}
-
-    static int
-setcmd(argc, argv)
-    int  argc;
-    char *argv[];
-{
-    int value;
-    struct setlist *ct;
-    struct togglelist *c;
-
-    if (argc < 2 || argc > 3) {
-	printf("Format is 'set Name Value'\n'set ?' for help.\n");
-	return 0;
-    }
-    if ((argc == 2) && (isprefix(argv[1], "?") || isprefix(argv[1], "help"))) {
-	for (ct = Setlist; ct->name; ct++)
-	    printf("%-15s %s\n", ct->name, ct->help);
-	printf("\n");
-	settogglehelp(1);
-	printf("%-15s %s\n", "?", "display help information");
-	return 0;
-    }
-
-    ct = getset(argv[1]);
-    if (ct == 0) {
-	c = GETTOGGLE(argv[1]);
-	if (c == 0) {
-	    fprintf(stderr, "'%s': unknown argument ('set ?' for help).\n",
-			argv[1]);
-	    return 0;
-	} else if (Ambiguous(c)) {
-	    fprintf(stderr, "'%s': ambiguous argument ('set ?' for help).\n",
-			argv[1]);
-	    return 0;
-	}
-	if (c->variable) {
-	    if ((argc == 2) || (strcmp("on", argv[2]) == 0))
-		*c->variable = 1;
-	    else if (strcmp("off", argv[2]) == 0)
-		*c->variable = 0;
-	    else {
-		printf("Format is 'set togglename [on|off]'\n'set ?' for help.\n");
-		return 0;
-	    }
-	    if (c->actionexplanation) {
-		printf("%s %s.\n", *c->variable? "Will" : "Won't",
-							c->actionexplanation);
-	    }
-	}
-	if (c->handler)
-	    (*c->handler)(1);
-    } else if (argc != 3) {
-	printf("Format is 'set Name Value'\n'set ?' for help.\n");
-	return 0;
-    } else if (Ambiguous(ct)) {
-	fprintf(stderr, "'%s': ambiguous argument ('set ?' for help).\n",
-			argv[1]);
-	return 0;
-    } else if (ct->handler) {
-	(*ct->handler)(argv[2]);
-	printf("%s set to \"%s\".\n", ct->name, (char *)ct->charp);
-    } else {
-	if (strcmp("off", argv[2])) {
-	    value = special(argv[2]);
-	} else {
-	    value = _POSIX_VDISABLE;
-	}
-	*(ct->charp) = (cc_t)value;
-	printf("%s character is '%s'.\n", ct->name, control(*(ct->charp)));
-    }
-    slc_check();
-    return 1;
-}
-
-    static int
-unsetcmd(argc, argv)
-    int  argc;
-    char *argv[];
-{
-    struct setlist *ct;
-    struct togglelist *c;
-    register char *name;
-
-    if (argc < 2) {
-	fprintf(stderr,
-	    "Need an argument to 'unset' command.  'unset ?' for help.\n");
-	return 0;
-    }
-    if (isprefix(argv[1], "?") || isprefix(argv[1], "help")) {
-	for (ct = Setlist; ct->name; ct++)
-	    printf("%-15s %s\n", ct->name, ct->help);
-	printf("\n");
-	settogglehelp(0);
-	printf("%-15s %s\n", "?", "display help information");
-	return 0;
-    }
-
-    argc--;
-    argv++;
-    while (argc--) {
-	name = *argv++;
-	ct = getset(name);
-	if (ct == 0) {
-	    c = GETTOGGLE(name);
-	    if (c == 0) {
-		fprintf(stderr, "'%s': unknown argument ('unset ?' for help).\n",
-			name);
-		return 0;
-	    } else if (Ambiguous(c)) {
-		fprintf(stderr, "'%s': ambiguous argument ('unset ?' for help).\n",
-			name);
-		return 0;
-	    }
-	    if (c->variable) {
-		*c->variable = 0;
-		if (c->actionexplanation) {
-		    printf("%s %s.\n", *c->variable? "Will" : "Won't",
-							c->actionexplanation);
-		}
-	    }
-	    if (c->handler)
-		(*c->handler)(0);
-	} else if (Ambiguous(ct)) {
-	    fprintf(stderr, "'%s': ambiguous argument ('unset ?' for help).\n",
-			name);
-	    return 0;
-	} else if (ct->handler) {
-	    (*ct->handler)(0);
-	    printf("%s reset to \"%s\".\n", ct->name, (char *)ct->charp);
-	} else {
-	    *(ct->charp) = _POSIX_VDISABLE;
-	    printf("%s character is '%s'.\n", ct->name, control(*(ct->charp)));
-	}
-    }
-    return 1;
-}
-
-/*
- * The following are the data structures and routines for the
- * 'mode' command.
- */
-#ifdef	KLUDGELINEMODE
-extern int kludgelinemode;
-
-    static int
-dokludgemode()
-{
-    kludgelinemode = 1;
-    send_wont(TELOPT_LINEMODE, 1);
-    send_dont(TELOPT_SGA, 1);
-    send_dont(TELOPT_ECHO, 1);
-}
-#endif
-
-    static int
-dolinemode()
-{
-#ifdef	KLUDGELINEMODE
-    if (kludgelinemode)
-	send_dont(TELOPT_SGA, 1);
-#endif
-    send_will(TELOPT_LINEMODE, 1);
-    send_dont(TELOPT_ECHO, 1);
-    return 1;
-}
-
-    static int
-docharmode()
-{
-#ifdef	KLUDGELINEMODE
-    if (kludgelinemode)
-	send_do(TELOPT_SGA, 1);
-    else
-#endif
-    send_wont(TELOPT_LINEMODE, 1);
-    send_do(TELOPT_ECHO, 1);
-    return 1;
-}
-
-    static int
-dolmmode(bit, on)
-    int bit, on;
-{
-    unsigned char c;
-    extern int linemode;
-
-    if (my_want_state_is_wont(TELOPT_LINEMODE)) {
-	printf("?Need to have LINEMODE option enabled first.\n");
-	printf("'mode ?' for help.\n");
-	return 0;
-    }
-
-    if (on)
-	c = (linemode | bit);
-    else
-	c = (linemode & ~bit);
-    lm_mode(&c, 1, 1);
-    return 1;
-}
-
-    int
-setmod(bit)
-{
-    return dolmmode(bit, 1);
-}
-
-    int
-clearmode(bit)
-{
-    return dolmmode(bit, 0);
-}
-
-struct modelist {
-	char	*name;		/* command name */
-	char	*help;		/* help string */
-	int	(*handler)();	/* routine which executes command */
-	int	needconnect;	/* Do we need to be connected to execute? */
-	int	arg1;
-};
-
-extern int modehelp();
-
-static struct modelist ModeList[] = {
-    { "character", "Disable LINEMODE option",	docharmode, 1 },
-#ifdef	KLUDGELINEMODE
-    { "",	"(or disable obsolete line-by-line mode)", 0 },
-#endif
-    { "line",	"Enable LINEMODE option",	dolinemode, 1 },
-#ifdef	KLUDGELINEMODE
-    { "",	"(or enable obsolete line-by-line mode)", 0 },
-#endif
-    { "", "", 0 },
-    { "",	"These require the LINEMODE option to be enabled", 0 },
-    { "isig",	"Enable signal trapping",	setmod, 1, MODE_TRAPSIG },
-    { "+isig",	0,				setmod, 1, MODE_TRAPSIG },
-    { "-isig",	"Disable signal trapping",	clearmode, 1, MODE_TRAPSIG },
-    { "edit",	"Enable character editing",	setmod, 1, MODE_EDIT },
-    { "+edit",	0,				setmod, 1, MODE_EDIT },
-    { "-edit",	"Disable character editing",	clearmode, 1, MODE_EDIT },
-    { "softtabs", "Enable tab expansion",	setmod, 1, MODE_SOFT_TAB },
-    { "+softtabs", 0,				setmod, 1, MODE_SOFT_TAB },
-    { "-softtabs", "Disable character editing",	clearmode, 1, MODE_SOFT_TAB },
-    { "litecho", "Enable literal character echo", setmod, 1, MODE_LIT_ECHO },
-    { "+litecho", 0,				setmod, 1, MODE_LIT_ECHO },
-    { "-litecho", "Disable literal character echo", clearmode, 1, MODE_LIT_ECHO },
-    { "help",	0,				modehelp, 0 },
-#ifdef	KLUDGELINEMODE
-    { "kludgeline", 0,				dokludgemode, 1 },
-#endif
-    { "", "", 0 },
-    { "?",	"Print help information",	modehelp, 0 },
-    { 0 },
-};
-
-
-    int
-modehelp()
-{
-    struct modelist *mt;
-
-    printf("format is:  'mode Mode', where 'Mode' is one of:\n\n");
-    for (mt = ModeList; mt->name; mt++) {
-	if (mt->help) {
-	    if (*mt->help)
-		printf("%-15s %s\n", mt->name, mt->help);
-	    else
-		printf("\n");
-	}
-    }
-    return 0;
-}
-
-#define	GETMODECMD(name) (struct modelist *) \
-		genget(name, (char **) ModeList, sizeof(struct modelist))
-
-    static int
-modecmd(argc, argv)
-    int  argc;
-    char *argv[];
-{
-    struct modelist *mt;
-
-    if (argc != 2) {
-	printf("'mode' command requires an argument\n");
-	printf("'mode ?' for help.\n");
-    } else if ((mt = GETMODECMD(argv[1])) == 0) {
-	fprintf(stderr, "Unknown mode '%s' ('mode ?' for help).\n", argv[1]);
-    } else if (Ambiguous(mt)) {
-	fprintf(stderr, "Ambiguous mode '%s' ('mode ?' for help).\n", argv[1]);
-    } else if (mt->needconnect && !connected) {
-	printf("?Need to be connected first.\n");
-	printf("'mode ?' for help.\n");
-    } else if (mt->handler) {
-	return (*mt->handler)(mt->arg1);
-    }
-    return 0;
-}
-
-/*
- * The following data structures and routines implement the
- * "display" command.
- */
-
-    static int
-display(argc, argv)
-    int  argc;
-    char *argv[];
-{
-    struct togglelist *tl;
-    struct setlist *sl;
-
-#define	dotog(tl)	if (tl->variable && tl->actionexplanation) { \
-			    if (*tl->variable) { \
-				printf("will"); \
-			    } else { \
-				printf("won't"); \
-			    } \
-			    printf(" %s.\n", tl->actionexplanation); \
-			}
-
-#define	doset(sl)   if (sl->name && *sl->name != ' ') { \
-			if (sl->handler == 0) \
-			    printf("%-15s [%s]\n", sl->name, control(*sl->charp)); \
-			else \
-			    printf("%-15s \"%s\"\n", sl->name, (char *)sl->charp); \
-		    }
-
-    if (argc == 1) {
-	for (tl = Togglelist; tl->name; tl++) {
-	    dotog(tl);
-	}
-	printf("\n");
-	for (sl = Setlist; sl->name; sl++) {
-	    doset(sl);
-	}
-    } else {
-	int i;
-
-	for (i = 1; i < argc; i++) {
-	    sl = getset(argv[i]);
-	    tl = GETTOGGLE(argv[i]);
-	    if (Ambiguous(sl) || Ambiguous(tl)) {
-		printf("?Ambiguous argument '%s'.\n", argv[i]);
-		return 0;
-	    } else if (!sl && !tl) {
-		printf("?Unknown argument '%s'.\n", argv[i]);
-		return 0;
-	    } else {
-		if (tl) {
-		    dotog(tl);
-		}
-		if (sl) {
-		    doset(sl);
-		}
-	    }
-	}
-    }
-/*@*/optionstatus();
-#ifdef	ENCRYPTION
-    EncryptStatus();
-#endif	/* ENCRYPTION */
-    return 1;
-#undef	doset
-#undef	dotog
-}
-
-/*
- * The following are the data structures, and many of the routines,
- * relating to command processing.
- */
-
-/*
- * Set the escape character.
- */
-	static int
-setescape(argc, argv)
-	int argc;
-	char *argv[];
-{
-	register char *arg;
-	char buf[50];
-
-	printf(
-	    "Deprecated usage - please use 'set escape%s%s' in the future.\n",
-				(argc > 2)? " ":"", (argc > 2)? argv[1]: "");
-	if (argc > 2)
-		arg = argv[1];
-	else {
-		printf("new escape character: ");
-		(void) fgets(buf, sizeof(buf), stdin);
-		arg = buf;
-	}
-	if (arg[0] != '\0')
-		escape = arg[0];
-	if (!In3270) {
-		printf("Escape character is '%s'.\n", control(escape));
-	}
-	(void) fflush(stdout);
-	return 1;
-}
-
-    /*VARARGS*/
-    static int
-togcrmod()
-{
-    crmod = !crmod;
-    printf("Deprecated usage - please use 'toggle crmod' in the future.\n");
-    printf("%s map carriage return on output.\n", crmod ? "Will" : "Won't");
-    (void) fflush(stdout);
-    return 1;
-}
-
-    /*VARARGS*/
-    int
-suspend()
-{
-#ifdef	SIGTSTP
-    setcommandmode();
-    {
-	long oldrows, oldcols, newrows, newcols, err;
-
-	err = (TerminalWindowSize(&oldrows, &oldcols) == 0) ? 1 : 0;
-	(void) kill(0, SIGTSTP);
-	/*
-	 * If we didn't get the window size before the SUSPEND, but we
-	 * can get them now (?), then send the NAWS to make sure that
-	 * we are set up for the right window size.
-	 */
-	if (TerminalWindowSize(&newrows, &newcols) && connected &&
-	    (err || ((oldrows != newrows) || (oldcols != newcols)))) {
-		sendnaws();
-	}
-    }
-    /* reget parameters in case they were changed */
-    TerminalSaveState();
-    setconnmode(0);
-#else
-    printf("Suspend is not supported.  Try the '!' command instead\n");
-#endif
-    return 1;
-}
-
-#if	!defined(TN3270)
-    /*ARGSUSED*/
-    int
-shell(argc, argv)
-    int argc;
-    char *argv[];
-{
-    long oldrows, oldcols, newrows, newcols, err;
-
-    setcommandmode();
-
-    err = (TerminalWindowSize(&oldrows, &oldcols) == 0) ? 1 : 0;
-    switch(vfork()) {
-    case -1:
-	perror("Fork failed\n");
-	break;
-
-    case 0:
-	{
-	    /*
-	     * Fire up the shell in the child.
-	     */
-	    register char *shellp, *shellname;
-	    extern char *strrchr();
-
-	    shellp = getenv("SHELL");
-	    if (shellp == NULL)
-		shellp = "/bin/sh";
-	    if ((shellname = strrchr(shellp, '/')) == 0)
-		shellname = shellp;
-	    else
-		shellname++;
-	    if (argc > 1)
-		execl(shellp, shellname, "-c", &saveline[1], 0);
-	    else
-		execl(shellp, shellname, 0);
-	    perror("Execl");
-	    _exit(1);
-	}
-    default:
-	    (void)wait((int *)0);	/* Wait for the shell to complete */
-
-	    if (TerminalWindowSize(&newrows, &newcols) && connected &&
-		(err || ((oldrows != newrows) || (oldcols != newcols)))) {
-		    sendnaws();
-	    }
-	    break;
-    }
-    return 1;
-}
-#else	/* !defined(TN3270) */
-extern int shell();
-#endif	/* !defined(TN3270) */
-
-    /*VARARGS*/
-    static int
-bye(argc, argv)
-    int  argc;		/* Number of arguments */
-    char *argv[];	/* arguments */
-{
-    extern int resettermname;
-
-    if (connected) {
-	(void) shutdown(net, 2);
-	printf("Connection closed.\n");
-	(void) NetClose(net);
-	connected = 0;
-	resettermname = 1;
-#if	defined(AUTHENTICATION) || defined(ENCRYPTION)
-	auth_encrypt_connect(connected);
-#endif	/* defined(AUTHENTICATION) || defined(ENCRYPTION) */
-	/* reset options */
-	tninit();
-#if	defined(TN3270)
-	SetIn3270();		/* Get out of 3270 mode */
-#endif	/* defined(TN3270) */
-    }
-    if ((argc != 2) || (strcmp(argv[1], "fromquit") != 0)) {
-	longjmp(toplevel, 1);
-	/* NOTREACHED */
-    }
-    return 1;			/* Keep lint, etc., happy */
-}
-
-/*VARARGS*/
-	int
-quit()
-{
-	(void) call(bye, "bye", "fromquit", 0);
-	Exit(0);
-	/*NOTREACHED*/
-}
-
-/*VARARGS*/
-	int
-logout()
-{
-	send_do(TELOPT_LOGOUT, 1);
-	(void) netflush();
-	return 1;
-}
-
-
-/*
- * The SLC command.
- */
-
-struct slclist {
-	char	*name;
-	char	*help;
-	void	(*handler)();
-	int	arg;
-};
-
-static void slc_help();
-
-struct slclist SlcList[] = {
-    { "export",	"Use local special character definitions",
-						slc_mode_export,	0 },
-    { "import",	"Use remote special character definitions",
-						slc_mode_import,	1 },
-    { "check",	"Verify remote special character definitions",
-						slc_mode_import,	0 },
-    { "help",	0,				slc_help,		0 },
-    { "?",	"Print help information",	slc_help,		0 },
-    { 0 },
-};
-
-    static void
-slc_help()
-{
-    struct slclist *c;
-
-    for (c = SlcList; c->name; c++) {
-	if (c->help) {
-	    if (*c->help)
-		printf("%-15s %s\n", c->name, c->help);
-	    else
-		printf("\n");
-	}
-    }
-}
-
-    static struct slclist *
-getslc(name)
-    char *name;
-{
-    return (struct slclist *)
-		genget(name, (char **) SlcList, sizeof(struct slclist));
-}
-
-    static int
-slccmd(argc, argv)
-    int  argc;
-    char *argv[];
-{
-    struct slclist *c;
-
-    if (argc != 2) {
-	fprintf(stderr,
-	    "Need an argument to 'slc' command.  'slc ?' for help.\n");
-	return 0;
-    }
-    c = getslc(argv[1]);
-    if (c == 0) {
-	fprintf(stderr, "'%s': unknown argument ('slc ?' for help).\n",
-    				argv[1]);
-	return 0;
-    }
-    if (Ambiguous(c)) {
-	fprintf(stderr, "'%s': ambiguous argument ('slc ?' for help).\n",
-    				argv[1]);
-	return 0;
-    }
-    (*c->handler)(c->arg);
-    slcstate();
-    return 1;
-}
-
-/*
- * The ENVIRON command.
- */
-
-struct envlist {
-	char	*name;
-	char	*help;
-	void	(*handler)();
-	int	narg;
-};
-
-extern struct env_lst *
-	env_define P((unsigned char *, unsigned char *));
-extern void
-	env_undefine P((unsigned char *)),
-	env_export P((unsigned char *)),
-	env_unexport P((unsigned char *)),
-	env_send P((unsigned char *)),
-#if defined(OLD_ENVIRON) && defined(ENV_HACK)
-	env_varval P((unsigned char *)),
-#endif
-	env_list P((void));
-static void
-	env_help P((void));
-
-struct envlist EnvList[] = {
-    { "define",	"Define an environment variable",
-						(void (*)())env_define,	2 },
-    { "undefine", "Undefine an environment variable",
-						env_undefine,	1 },
-    { "export",	"Mark an environment variable for automatic export",
-						env_export,	1 },
-    { "unexport", "Don't mark an environment variable for automatic export",
-						env_unexport,	1 },
-    { "send",	"Send an environment variable", env_send,	1 },
-    { "list",	"List the current environment variables",
-						env_list,	0 },
-#if defined(OLD_ENVIRON) && defined(ENV_HACK)
-    { "varval", "Reverse VAR and VALUE (auto, right, wrong, status)",
-						env_varval,    1 },
-#endif
-    { "help",	0,				env_help,		0 },
-    { "?",	"Print help information",	env_help,		0 },
-    { 0 },
-};
-
-    static void
-env_help()
-{
-    struct envlist *c;
-
-    for (c = EnvList; c->name; c++) {
-	if (c->help) {
-	    if (*c->help)
-		printf("%-15s %s\n", c->name, c->help);
-	    else
-		printf("\n");
-	}
-    }
-}
-
-    static struct envlist *
-getenvcmd(name)
-    char *name;
-{
-    return (struct envlist *)
-		genget(name, (char **) EnvList, sizeof(struct envlist));
-}
-
-	int
-env_cmd(argc, argv)
-    int  argc;
-    char *argv[];
-{
-    struct envlist *c;
-
-    if (argc < 2) {
-	fprintf(stderr,
-	    "Need an argument to 'environ' command.  'environ ?' for help.\n");
-	return 0;
-    }
-    c = getenvcmd(argv[1]);
-    if (c == 0) {
-	fprintf(stderr, "'%s': unknown argument ('environ ?' for help).\n",
-    				argv[1]);
-	return 0;
-    }
-    if (Ambiguous(c)) {
-	fprintf(stderr, "'%s': ambiguous argument ('environ ?' for help).\n",
-    				argv[1]);
-	return 0;
-    }
-    if (c->narg + 2 != argc) {
-	fprintf(stderr,
-	    "Need %s%d argument%s to 'environ %s' command.  'environ ?' for help.\n",
-		c->narg < argc + 2 ? "only " : "",
-		c->narg, c->narg == 1 ? "" : "s", c->name);
-	return 0;
-    }
-    (*c->handler)(argv[2], argv[3]);
-    return 1;
-}
-
-struct env_lst {
-	struct env_lst *next;	/* pointer to next structure */
-	struct env_lst *prev;	/* pointer to previous structure */
-	unsigned char *var;	/* pointer to variable name */
-	unsigned char *value;	/* pointer to variable value */
-	int export;		/* 1 -> export with default list of variables */
-	int welldefined;	/* A well defined variable */
-};
-
-struct env_lst envlisthead;
-
-	struct env_lst *
-env_find(var)
-	unsigned char *var;
-{
-	register struct env_lst *ep;
-
-	for (ep = envlisthead.next; ep; ep = ep->next) {
-		if (strcmp((char *)ep->var, (char *)var) == 0)
-			return(ep);
-	}
-	return(NULL);
-}
-
-	void
-env_init()
-{
-	extern char **environ;
-	register char **epp, *cp;
-	register struct env_lst *ep;
-	extern char *strchr();
-
-	for (epp = environ; *epp; epp++) {
-		if ((cp = strchr(*epp, '='))) {
-			*cp = '\0';
-			ep = env_define((unsigned char *)*epp,
-					(unsigned char *)cp+1);
-			ep->export = 0;
-			*cp = '=';
-		}
-	}
-	/*
-	 * Special case for DISPLAY variable.  If it is ":0.0" or
-	 * "unix:0.0", we have to get rid of "unix" and insert our
-	 * hostname.
-	 */
-	if ((ep = env_find("DISPLAY"))
-	    && ((*ep->value == ':')
-		|| (strncmp((char *)ep->value, "unix:", 5) == 0))) {
-		char hbuf[256+1];
-		char *cp2 = strchr((char *)ep->value, ':');
-
-		gethostname(hbuf, 256);
-		hbuf[256] = '\0';
-		cp = (char *)malloc(strlen(hbuf) + strlen(cp2) + 1);
-		sprintf((char *)cp, "%s%s", hbuf, cp2);
-		free(ep->value);
-		ep->value = (unsigned char *)cp;
-	}
-	/*
-	 * If USER is not defined, but LOGNAME is, then add
-	 * USER with the value from LOGNAME.  By default, we
-	 * don't export the USER variable.
-	 */
-	if ((env_find("USER") == NULL) && (ep = env_find("LOGNAME"))) {
-		env_define((unsigned char *)"USER", ep->value);
-		env_unexport((unsigned char *)"USER");
-	}
-	env_export((unsigned char *)"DISPLAY");
-	env_export((unsigned char *)"PRINTER");
-}
-
-	struct env_lst *
-env_define(var, value)
-	unsigned char *var, *value;
-{
-	register struct env_lst *ep;
-
-	if ((ep = env_find(var))) {
-		if (ep->var)
-			free(ep->var);
-		if (ep->value)
-			free(ep->value);
-	} else {
-		ep = (struct env_lst *)malloc(sizeof(struct env_lst));
-		ep->next = envlisthead.next;
-		envlisthead.next = ep;
-		ep->prev = &envlisthead;
-		if (ep->next)
-			ep->next->prev = ep;
-	}
-	ep->welldefined = opt_welldefined(var);
-	ep->export = 1;
-	ep->var = (unsigned char *)strdup((char *)var);
-	ep->value = (unsigned char *)strdup((char *)value);
-	return(ep);
-}
-
-	void
-env_undefine(var)
-	unsigned char *var;
-{
-	register struct env_lst *ep;
-
-	if ((ep = env_find(var))) {
-		ep->prev->next = ep->next;
-		if (ep->next)
-			ep->next->prev = ep->prev;
-		if (ep->var)
-			free(ep->var);
-		if (ep->value)
-			free(ep->value);
-		free(ep);
-	}
-}
-
-	void
-env_export(var)
-	unsigned char *var;
-{
-	register struct env_lst *ep;
-
-	if ((ep = env_find(var)))
-		ep->export = 1;
-}
-
-	void
-env_unexport(var)
-	unsigned char *var;
-{
-	register struct env_lst *ep;
-
-	if ((ep = env_find(var)))
-		ep->export = 0;
-}
-
-	void
-env_send(var)
-	unsigned char *var;
-{
-	register struct env_lst *ep;
-
-	if (my_state_is_wont(TELOPT_NEW_ENVIRON)
-#ifdef	OLD_ENVIRON
-	    && my_state_is_wont(TELOPT_OLD_ENVIRON)
-#endif
-		) {
-		fprintf(stderr,
-		    "Cannot send '%s': Telnet ENVIRON option not enabled\n",
-									var);
-		return;
-	}
-	ep = env_find(var);
-	if (ep == 0) {
-		fprintf(stderr, "Cannot send '%s': variable not defined\n",
-									var);
-		return;
-	}
-	env_opt_start_info();
-	env_opt_add(ep->var);
-	env_opt_end(0);
-}
-
-	void
-env_list()
-{
-	register struct env_lst *ep;
-
-	for (ep = envlisthead.next; ep; ep = ep->next) {
-		printf("%c %-20s %s\n", ep->export ? '*' : ' ',
-					ep->var, ep->value);
-	}
-}
-
-	unsigned char *
-env_default(init, welldefined)
-	int init;
-{
-	static struct env_lst *nep = NULL;
-
-	if (init) {
-		nep = &envlisthead;
-		return(NULL);
-	}
-	if (nep) {
-		while ((nep = nep->next)) {
-			if (nep->export && (nep->welldefined == welldefined))
-				return(nep->var);
-		}
-	}
-	return(NULL);
-}
-
-	unsigned char *
-env_getvalue(var)
-	unsigned char *var;
-{
-	register struct env_lst *ep;
-
-	if ((ep = env_find(var)))
-		return(ep->value);
-	return(NULL);
-}
-
-#if defined(OLD_ENVIRON) && defined(ENV_HACK)
-	void
-env_varval(what)
-	unsigned char *what;
-{
-	extern int old_env_var, old_env_value, env_auto;
-	int len = strlen((char *)what);
-
-	if (len == 0)
-		goto unknown;
-
-	if (strncasecmp((char *)what, "status", len) == 0) {
-		if (env_auto)
-			printf("%s%s", "VAR and VALUE are/will be ",
-					"determined automatically\n");
-		if (old_env_var == OLD_ENV_VAR)
-			printf("VAR and VALUE set to correct definitions\n");
-		else
-			printf("VAR and VALUE definitions are reversed\n");
-	} else if (strncasecmp((char *)what, "auto", len) == 0) {
-		env_auto = 1;
-		old_env_var = OLD_ENV_VALUE;
-		old_env_value = OLD_ENV_VAR;
-	} else if (strncasecmp((char *)what, "right", len) == 0) {
-		env_auto = 0;
-		old_env_var = OLD_ENV_VAR;
-		old_env_value = OLD_ENV_VALUE;
-	} else if (strncasecmp((char *)what, "wrong", len) == 0) {
-		env_auto = 0;
-		old_env_var = OLD_ENV_VALUE;
-		old_env_value = OLD_ENV_VAR;
-	} else {
-unknown:
-		printf("Unknown \"varval\" command. (\"auto\", \"right\", \"wrong\", \"status\")\n");
-	}
-}
-#endif
-
-#if	defined(AUTHENTICATION)
-/*
- * The AUTHENTICATE command.
- */
-
-struct authlist {
-	char	*name;
-	char	*help;
-	int	(*handler)();
-	int	narg;
-};
-
-extern int
-	auth_enable P((char *)),
-	auth_disable P((char *)),
-	auth_status P((void));
-static int
-	auth_help P((void));
-
-struct authlist AuthList[] = {
-    { "status",	"Display current status of authentication information",
-						auth_status,	0 },
-    { "disable", "Disable an authentication type ('auth disable ?' for more)",
-						auth_disable,	1 },
-    { "enable", "Enable an authentication type ('auth enable ?' for more)",
-						auth_enable,	1 },
-    { "help",	0,				auth_help,		0 },
-    { "?",	"Print help information",	auth_help,		0 },
-    { 0 },
-};
-
-    static int
-auth_help()
-{
-    struct authlist *c;
-
-    for (c = AuthList; c->name; c++) {
-	if (c->help) {
-	    if (*c->help)
-		printf("%-15s %s\n", c->name, c->help);
-	    else
-		printf("\n");
-	}
-    }
-    return 0;
-}
-
-	int
-auth_cmd(argc, argv)
-    int  argc;
-    char *argv[];
-{
-    struct authlist *c;
-
-    if (argc < 2) {
-	fprintf(stderr,
-	    "Need an argument to 'auth' command.  'auth ?' for help.\n");
-	return 0;
-    }
-
-    c = (struct authlist *)
-		genget(argv[1], (char **) AuthList, sizeof(struct authlist));
-    if (c == 0) {
-	fprintf(stderr, "'%s': unknown argument ('auth ?' for help).\n",
-    				argv[1]);
-	return 0;
-    }
-    if (Ambiguous(c)) {
-	fprintf(stderr, "'%s': ambiguous argument ('auth ?' for help).\n",
-    				argv[1]);
-	return 0;
-    }
-    if (c->narg + 2 != argc) {
-	fprintf(stderr,
-	    "Need %s%d argument%s to 'auth %s' command.  'auth ?' for help.\n",
-		c->narg < argc + 2 ? "only " : "",
-		c->narg, c->narg == 1 ? "" : "s", c->name);
-	return 0;
-    }
-    return((*c->handler)(argv[2], argv[3]));
-}
-#endif
-
-#ifdef	ENCRYPTION
-/*
- * The ENCRYPT command.
- */
-
-struct encryptlist {
-	char	*name;
-	char	*help;
-	int	(*handler)();
-	int	needconnect;
-	int	minarg;
-	int	maxarg;
-};
-
-extern int
-	EncryptEnable P((char *, char *)),
-	EncryptDisable P((char *, char *)),
-	EncryptType P((char *, char *)),
-	EncryptStart P((char *)),
-	EncryptStartInput P((void)),
-	EncryptStartOutput P((void)),
-	EncryptStop P((char *)),
-	EncryptStopInput P((void)),
-	EncryptStopOutput P((void)),
-	EncryptStatus P((void));
-static int
-	EncryptHelp P((void));
-
-struct encryptlist EncryptList[] = {
-    { "enable", "Enable encryption. ('encrypt enable ?' for more)",
-						EncryptEnable, 1, 1, 2 },
-    { "disable", "Disable encryption. ('encrypt enable ?' for more)",
-						EncryptDisable, 0, 1, 2 },
-    { "type", "Set encryption type. ('encrypt type ?' for more)",
-						EncryptType, 0, 1, 1 },
-    { "start", "Start encryption. ('encrypt start ?' for more)",
-						EncryptStart, 1, 0, 1 },
-    { "stop", "Stop encryption. ('encrypt stop ?' for more)",
-						EncryptStop, 1, 0, 1 },
-    { "input", "Start encrypting the input stream",
-						EncryptStartInput, 1, 0, 0 },
-    { "-input", "Stop encrypting the input stream",
-						EncryptStopInput, 1, 0, 0 },
-    { "output", "Start encrypting the output stream",
-						EncryptStartOutput, 1, 0, 0 },
-    { "-output", "Stop encrypting the output stream",
-						EncryptStopOutput, 1, 0, 0 },
-
-    { "status",	"Display current status of authentication information",
-						EncryptStatus,	0, 0, 0 },
-    { "help",	0,				EncryptHelp,	0, 0, 0 },
-    { "?",	"Print help information",	EncryptHelp,	0, 0, 0 },
-    { 0 },
-};
-
-    static int
-EncryptHelp()
-{
-    struct encryptlist *c;
-
-    for (c = EncryptList; c->name; c++) {
-	if (c->help) {
-	    if (*c->help)
-		printf("%-15s %s\n", c->name, c->help);
-	    else
-		printf("\n");
-	}
-    }
-    return 0;
-}
-
-	int
-encrypt_cmd(argc, argv)
-    int  argc;
-    char *argv[];
-{
-    struct encryptlist *c;
-
-    if (argc < 2) {
-	fprintf(stderr,
-	    "Need an argument to 'encrypt' command.  'encrypt ?' for help.\n");
-	return 0;
-    }
-
-    c = (struct encryptlist *)
-		genget(argv[1], (char **) EncryptList, sizeof(struct encryptlist));
-    if (c == 0) {
-	fprintf(stderr, "'%s': unknown argument ('encrypt ?' for help).\n",
-    				argv[1]);
-	return 0;
-    }
-    if (Ambiguous(c)) {
-	fprintf(stderr, "'%s': ambiguous argument ('encrypt ?' for help).\n",
-    				argv[1]);
-	return 0;
-    }
-    argc -= 2;
-    if (argc < c->minarg || argc > c->maxarg) {
-	if (c->minarg == c->maxarg) {
-	    fprintf(stderr, "Need %s%d argument%s ",
-		c->minarg < argc ? "only " : "", c->minarg,
-		c->minarg == 1 ? "" : "s");
-	} else {
-	    fprintf(stderr, "Need %s%d-%d arguments ",
-		c->maxarg < argc ? "only " : "", c->minarg, c->maxarg);
-	}
-	fprintf(stderr, "to 'encrypt %s' command.  'encrypt ?' for help.\n",
-		c->name);
-	return 0;
-    }
-    if (c->needconnect && !connected) {
-	if (!(argc && (isprefix(argv[2], "help") || isprefix(argv[2], "?")))) {
-	    printf("?Need to be connected first.\n");
-	    return 0;
-	}
-    }
-    return ((*c->handler)(argc > 0 ? argv[2] : 0,
-			argc > 1 ? argv[3] : 0,
-			argc > 2 ? argv[4] : 0));
-}
-#endif	/* ENCRYPTION */
-
-#if	defined(unix) && defined(TN3270)
-    static void
-filestuff(fd)
-    int fd;
-{
-    int res;
-
-#ifdef	F_GETOWN
-    setconnmode(0);
-    res = fcntl(fd, F_GETOWN, 0);
-    setcommandmode();
-
-    if (res == -1) {
-	perror("fcntl");
-	return;
-    }
-    printf("\tOwner is %d.\n", res);
-#endif
-
-    setconnmode(0);
-    res = fcntl(fd, F_GETFL, 0);
-    setcommandmode();
-
-    if (res == -1) {
-	perror("fcntl");
-	return;
-    }
-#ifdef notdef
-    printf("\tFlags are 0x%x: %s\n", res, decodeflags(res));
-#endif
-}
-#endif /* defined(unix) && defined(TN3270) */
-
-/*
- * Print status about the connection.
- */
-    /*ARGSUSED*/
-    static int
-status(argc, argv)
-    int	 argc;
-    char *argv[];
-{
-    if (connected) {
-	printf("Connected to %s.\n", hostname);
-	if ((argc < 2) || strcmp(argv[1], "notmuch")) {
-	    int mode = getconnmode();
-
-	    if (my_want_state_is_will(TELOPT_LINEMODE)) {
-		printf("Operating with LINEMODE option\n");
-		printf("%s line editing\n", (mode&MODE_EDIT) ? "Local" : "No");
-		printf("%s catching of signals\n",
-					(mode&MODE_TRAPSIG) ? "Local" : "No");
-		slcstate();
-#ifdef	KLUDGELINEMODE
-	    } else if (kludgelinemode && my_want_state_is_dont(TELOPT_SGA)) {
-		printf("Operating in obsolete linemode\n");
-#endif
-	    } else {
-		printf("Operating in single character mode\n");
-		if (localchars)
-		    printf("Catching signals locally\n");
-	    }
-	    printf("%s character echo\n", (mode&MODE_ECHO) ? "Local" : "Remote");
-	    if (my_want_state_is_will(TELOPT_LFLOW))
-		printf("%s flow control\n", (mode&MODE_FLOW) ? "Local" : "No");
-#ifdef	ENCRYPTION
-	    encrypt_display();
-#endif	/* ENCRYPTION */
-	}
-    } else {
-	printf("No connection.\n");
-    }
-#   if !defined(TN3270)
-    printf("Escape character is '%s'.\n", control(escape));
-    (void) fflush(stdout);
-#   else /* !defined(TN3270) */
-    if ((!In3270) && ((argc < 2) || strcmp(argv[1], "notmuch"))) {
-	printf("Escape character is '%s'.\n", control(escape));
-    }
-#   if defined(unix)
-    if ((argc >= 2) && !strcmp(argv[1], "everything")) {
-	printf("SIGIO received %d time%s.\n",
-				sigiocount, (sigiocount == 1)? "":"s");
-	if (In3270) {
-	    printf("Process ID %d, process group %d.\n",
-					    getpid(), getpgrp(getpid()));
-	    printf("Terminal input:\n");
-	    filestuff(tin);
-	    printf("Terminal output:\n");
-	    filestuff(tout);
-	    printf("Network socket:\n");
-	    filestuff(net);
-	}
-    }
-    if (In3270 && transcom) {
-       printf("Transparent mode command is '%s'.\n", transcom);
-    }
-#   endif /* defined(unix) */
-    (void) fflush(stdout);
-    if (In3270) {
-	return 0;
-    }
-#   endif /* defined(TN3270) */
-    return 1;
-}
-
-#ifdef	SIGINFO
-/*
- * Function that gets called when SIGINFO is received.
- */
-	void
-ayt_status()
-{
-    (void) call(status, "status", "notmuch", 0);
-}
-#endif
-
-unsigned long inet_addr();
-
-    int
-tn(argc, argv)
-    int argc;
-    char *argv[];
-{
-    register struct hostent *host = 0;
-    struct sockaddr_in sin, src_sin;
-    struct servent *sp = 0;
-    unsigned long temp;
-    extern char *inet_ntoa();
-#if	defined(IP_OPTIONS) && defined(IPPROTO_IP)
-    char *srp = 0, *strrchr();
-    unsigned long sourceroute(), srlen;
-#endif
-    char *cmd, *hostp = 0, *portp = 0, *user = 0;
-    char *src_addr = NULL;
-
-    /* clear the socket address prior to use */
-    memset((char *)&sin, 0, sizeof(sin));
-
-    if (connected) {
-	printf("?Already connected to %s\n", hostname);
-	setuid(getuid());
-	return 0;
-    }
-    if (argc < 2) {
-	(void) strcpy(line, "open ");
-	printf("(to) ");
-	(void) fgets(&line[strlen(line)], sizeof(line) - strlen(line), stdin);
-	makeargv();
-	argc = margc;
-	argv = margv;
-    }
-    cmd = *argv;
-    --argc; ++argv;
-    while (argc) {
-	if (strcmp(*argv, "help") == 0 || isprefix(*argv, "?"))
-	    goto usage;
-	if (strcmp(*argv, "-l") == 0) {
-	    --argc; ++argv;
-	    if (argc == 0)
-		goto usage;
-	    user = *argv++;
-	    --argc;
-	    continue;
-	}
-	if (strcmp(*argv, "-a") == 0) {
-	    --argc; ++argv;
-	    autologin = 1;
-	    continue;
-	}
-	if (strcmp(*argv, "-s") == 0) {
-	    --argc; ++argv;
-	    if (argc == 0)
-		goto usage;
-	    src_addr = *argv++;
-	    --argc;
-	    continue;
-	}
-	if (hostp == 0) {
-	    hostp = *argv++;
-	    --argc;
-	    continue;
-	}
-	if (portp == 0) {
-	    portp = *argv++;
-	    --argc;
-	    continue;
-	}
-    usage:
-	printf("usage: %s [-l user] [-a] [-s src_addr] host-name [port]\n", cmd);
-	setuid(getuid());
-	return 0;
-    }
-    if (hostp == 0)
-	goto usage;
-
-    if (src_addr != NULL) {
-	bzero((char *)&src_sin, sizeof(src_sin));
-	src_sin.sin_family = AF_INET;
-	if (!inet_aton(src_addr, &src_sin.sin_addr)) {
-	    host = gethostbyname2(src_addr, AF_INET);
-	    if (host == NULL) {
-		herror(src_addr);
-		return 0;
-	    }
-	    if (host->h_length != sizeof(src_sin.sin_addr)) {
-		fprintf(stderr, "telnet: gethostbyname2: invalid address\n");
-		return 0;
-	    }
-	    memcpy((void *)&src_sin.sin_addr, (void *)host->h_addr_list[0],
-			sizeof(src_sin.sin_addr));
-	}
-    }
-
-#if	defined(IP_OPTIONS) && defined(IPPROTO_IP)
-    if (hostp[0] == '@' || hostp[0] == '!') {
-	if ((hostname = strrchr(hostp, ':')) == NULL)
-	    hostname = strrchr(hostp, '@');
-	hostname++;
-	srp = 0;
-	temp = sourceroute(hostp, &srp, &srlen);
-	if (temp == 0) {
-	    herror(srp);
-	    setuid(getuid());
-	    return 0;
-	} else if (temp == -1) {
-	    printf("Bad source route option: %s\n", hostp);
-	    setuid(getuid());
-	    return 0;
-	} else {
-	    sin.sin_addr.s_addr = temp;
-	    sin.sin_family = AF_INET;
-	}
-    } else {
-#endif
-	temp = inet_addr(hostp);
- 	if (temp != INADDR_NONE) {
-	    sin.sin_addr.s_addr = temp;
-	    sin.sin_family = AF_INET;
-	    if (doaddrlookup)
-		host = gethostbyaddr((char *)&temp, sizeof(temp), AF_INET);
- 	    if (host)
- 	        (void) strncpy(_hostname, host->h_name, sizeof(_hostname));
- 	    else
- 		(void) strncpy(_hostname, hostp, sizeof(_hostname));
- 	    _hostname[sizeof(_hostname)-1] = '\0';
-	    hostname = _hostname;
-	} else {
-	    host = gethostbyname(hostp);
-	    if (host) {
-		sin.sin_family = host->h_addrtype;
-#if	defined(h_addr)		/* In 4.3, this is a #define */
-		memmove((caddr_t)&sin.sin_addr,
-				host->h_addr_list[0], host->h_length);
-#else	/* defined(h_addr) */
-		memmove((caddr_t)&sin.sin_addr, host->h_addr, host->h_length);
-#endif	/* defined(h_addr) */
-		strncpy(_hostname, host->h_name, sizeof(_hostname));
-		_hostname[sizeof(_hostname)-1] = '\0';
-		hostname = _hostname;
-	    } else {
-		herror(hostp);
-		setuid(getuid());
-		return 0;
-	    }
-	}
-#if	defined(IP_OPTIONS) && defined(IPPROTO_IP)
-    }
-#endif
-    if (portp) {
-	if (*portp == '-') {
-	    portp++;
-	    telnetport = 1;
-	} else
-	    telnetport = 0;
-	sin.sin_port = atoi(portp);
-	if (sin.sin_port == 0) {
-	    sp = getservbyname(portp, "tcp");
-	    if (sp)
-		sin.sin_port = sp->s_port;
-	    else {
-		printf("%s: bad port number\n", portp);
-		setuid(getuid());
-		return 0;
-	    }
-	} else {
-#if	!defined(htons)
-	    u_short htons P((unsigned short));
-#endif	/* !defined(htons) */
-	    sin.sin_port = htons(sin.sin_port);
-	}
-    } else {
-	if (sp == 0) {
-	    sp = getservbyname("telnet", "tcp");
-	    if (sp == 0) {
-		fprintf(stderr, "telnet: tcp/telnet: unknown service\n");
-		setuid(getuid());
-		return 0;
-	    }
-	    sin.sin_port = sp->s_port;
-	}
-	telnetport = 1;
-    }
-    printf("Trying %s...\n", inet_ntoa(sin.sin_addr));
-    do {
-	net = socket(AF_INET, SOCK_STREAM, 0);
-	setuid(getuid());
-	if (net < 0) {
-	    perror("telnet: socket");
-	    return 0;
-	}
-#if	defined(IP_OPTIONS) && defined(IPPROTO_IP)
-	if (srp && setsockopt(net, IPPROTO_IP, IP_OPTIONS, (char *)srp, srlen) < 0)
-		perror("setsockopt (IP_OPTIONS)");
-#endif
-#if	defined(IPPROTO_IP) && defined(IP_TOS)
-	{
-# if	defined(HAS_GETTOS)
-	    struct tosent *tp;
-	    if (tos < 0 && (tp = gettosbyname("telnet", "tcp")))
-		tos = tp->t_tos;
-# endif
-	    if (tos < 0)
-		tos = 020;	/* Low Delay bit */
-	    if (tos
-		&& (setsockopt(net, IPPROTO_IP, IP_TOS,
-		    (char *)&tos, sizeof(int)) < 0)
-		&& (errno != ENOPROTOOPT))
-		    perror("telnet: setsockopt (IP_TOS) (ignored)");
-	}
-#endif	/* defined(IPPROTO_IP) && defined(IP_TOS) */
-
-	if (debug && SetSockOpt(net, SOL_SOCKET, SO_DEBUG, 1) < 0) {
-		perror("setsockopt (SO_DEBUG)");
-	}
-
-	if (src_addr != NULL) {
-	    if (bind(net, (struct sockaddr *)&src_sin, sizeof(src_sin)) == -1) {
-		perror("bind");
-		return 0;
-	    }
-	}
-
-	if (connect(net, (struct sockaddr *)&sin, sizeof (sin)) < 0) {
-#if	defined(h_addr)		/* In 4.3, this is a #define */
-	    if (host && host->h_addr_list[1]) {
-		int oerrno = errno;
-
-		fprintf(stderr, "telnet: connect to address %s: ",
-						inet_ntoa(sin.sin_addr));
-		errno = oerrno;
-		perror((char *)0);
-		host->h_addr_list++;
-		memmove((caddr_t)&sin.sin_addr,
-			host->h_addr_list[0], host->h_length);
-		(void) NetClose(net);
-		continue;
-	    }
-#endif	/* defined(h_addr) */
-	    perror("telnet: Unable to connect to remote host");
-	    return 0;
-	}
-	connected++;
-#if	defined(AUTHENTICATION) || defined(ENCRYPTION)
-	auth_encrypt_connect(connected);
-#endif	/* defined(AUTHENTICATION) || defined(ENCRYPTION) */
-    } while (connected == 0);
-    cmdrc(hostp, hostname);
-    if (autologin && user == NULL) {
-	struct passwd *pw;
-
-	user = getenv("USER");
-	if (user == NULL ||
-	    ((pw = getpwnam(user)) && pw->pw_uid != getuid())) {
-		if ((pw = getpwuid(getuid())))
-			user = pw->pw_name;
-		else
-			user = NULL;
-	}
-    }
-    if (user) {
-	env_define((unsigned char *)"USER", (unsigned char *)user);
-	env_export((unsigned char *)"USER");
-    }
-    (void) call(status, "status", "notmuch", 0);
-    if (setjmp(peerdied) == 0)
-	telnet(user);
-    (void) NetClose(net);
-    ExitString("Connection closed by foreign host.\n",1);
-    /*NOTREACHED*/
-}
-
-#define HELPINDENT (sizeof ("connect"))
-
-static char
-	openhelp[] =	"connect to a site",
-	closehelp[] =	"close current connection",
-	logouthelp[] =	"forcibly logout remote user and close the connection",
-	quithelp[] =	"exit telnet",
-	statushelp[] =	"print status information",
-	helphelp[] =	"print help information",
-	sendhelp[] =	"transmit special characters ('send ?' for more)",
-	sethelp[] = 	"set operating parameters ('set ?' for more)",
-	unsethelp[] = 	"unset operating parameters ('unset ?' for more)",
-	togglestring[] ="toggle operating parameters ('toggle ?' for more)",
-	slchelp[] =	"change state of special charaters ('slc ?' for more)",
-	displayhelp[] =	"display operating parameters",
-#if	defined(TN3270) && defined(unix)
-	transcomhelp[] = "specify Unix command for transparent mode pipe",
-#endif	/* defined(TN3270) && defined(unix) */
-#if	defined(AUTHENTICATION)
-	authhelp[] =	"turn on (off) authentication ('auth ?' for more)",
-#endif
-#ifdef	ENCRYPTION
-	encrypthelp[] =	"turn on (off) encryption ('encrypt ?' for more)",
-#endif	/* ENCRYPTION */
-#if	defined(unix)
-	zhelp[] =	"suspend telnet",
-#endif	/* defined(unix) */
-#if	defined(SKEY)
-	skeyhelp[] =    "compute response to s/key challenge",
-#endif
-	shellhelp[] =	"invoke a subshell",
-	envhelp[] =	"change environment variables ('environ ?' for more)",
-	modestring[] = "try to enter line or character mode ('mode ?' for more)";
-
-static Command cmdtab[] = {
-	{ "close",	closehelp,	bye,		1 },
-	{ "logout",	logouthelp,	logout,		1 },
-	{ "display",	displayhelp,	display,	0 },
-	{ "mode",	modestring,	modecmd,	0 },
-	{ "open",	openhelp,	tn,		0 },
-	{ "quit",	quithelp,	quit,		0 },
-	{ "send",	sendhelp,	sendcmd,	0 },
-	{ "set",	sethelp,	setcmd,		0 },
-	{ "unset",	unsethelp,	unsetcmd,	0 },
-	{ "status",	statushelp,	status,		0 },
-	{ "toggle",	togglestring,	toggle,		0 },
-	{ "slc",	slchelp,	slccmd,		0 },
-#if	defined(TN3270) && defined(unix)
-	{ "transcom",	transcomhelp,	settranscom,	0 },
-#endif	/* defined(TN3270) && defined(unix) */
-#if	defined(AUTHENTICATION)
-	{ "auth",	authhelp,	auth_cmd,	0 },
-#endif
-#ifdef	ENCRYPTION
-	{ "encrypt",	encrypthelp,	encrypt_cmd,	0 },
-#endif	/* ENCRYPTION */
-#if	defined(unix)
-	{ "z",		zhelp,		suspend,	0 },
-#endif	/* defined(unix) */
-#if	defined(TN3270)
-	{ "!",		shellhelp,	shell,		1 },
-#else
-	{ "!",		shellhelp,	shell,		0 },
-#endif
-	{ "environ",	envhelp,	env_cmd,	0 },
-	{ "?",		helphelp,	help,		0 },
-#if	defined(SKEY)
-	{ "skey",       skeyhelp,       skey_calc,      0 },
-#endif		
-	{ 0, 0, 0, 0 }
-};
-
-static char	crmodhelp[] =	"deprecated command -- use 'toggle crmod' instead";
-static char	escapehelp[] =	"deprecated command -- use 'set escape' instead";
-
-static Command cmdtab2[] = {
-	{ "help",	0,		help,		0 },
-	{ "escape",	escapehelp,	setescape,	0 },
-	{ "crmod",	crmodhelp,	togcrmod,	0 },
-	{ 0, 0, 0, 0 }
-};
-
-
-/*
- * Call routine with argc, argv set from args (terminated by 0).
- */
-
-    /*VARARGS1*/
-    static int
-call(va_alist)
-    va_dcl
-{
-    va_list ap;
-    typedef int (*intrtn_t)();
-    intrtn_t routine;
-    char *args[100];
-    int argno = 0;
-
-    va_start(ap);
-    routine = (va_arg(ap, intrtn_t));
-    while ((args[argno++] = va_arg(ap, char *)) != 0) {
-	;
-    }
-    va_end(ap);
-    return (*routine)(argno-1, args);
-}
-
-
-    static Command *
-getcmd(name)
-    char *name;
-{
-    Command *cm;
-
-    if ((cm = (Command *) genget(name, (char **) cmdtab, sizeof(Command))))
-	return cm;
-    return (Command *) genget(name, (char **) cmdtab2, sizeof(Command));
-}
-
-    void
-command(top, tbuf, cnt)
-    int top;
-    char *tbuf;
-    int cnt;
-{
-    register Command *c;
-
-    setcommandmode();
-    if (!top) {
-	putchar('\n');
-#if	defined(unix)
-    } else {
-	(void) signal(SIGINT, SIG_DFL);
-	(void) signal(SIGQUIT, SIG_DFL);
-#endif	/* defined(unix) */
-    }
-    for (;;) {
-	if (rlogin == _POSIX_VDISABLE)
-		printf("%s> ", prompt);
-	if (tbuf) {
-	    register char *cp;
-	    cp = line;
-	    while (cnt > 0 && (*cp++ = *tbuf++) != '\n')
-		cnt--;
-	    tbuf = 0;
-	    if (cp == line || *--cp != '\n' || cp == line)
-		goto getline;
-	    *cp = '\0';
-	    if (rlogin == _POSIX_VDISABLE)
-		printf("%s\n", line);
-	} else {
-	getline:
-	    if (rlogin != _POSIX_VDISABLE)
-		printf("%s> ", prompt);
-	    if (fgets(line, sizeof(line), stdin) == NULL) {
-		if (feof(stdin) || ferror(stdin)) {
-		    (void) quit();
-		    /*NOTREACHED*/
-		}
-		break;
-	    }
-	}
-	if (line[0] == 0)
-	    break;
-	makeargv();
-	if (margv[0] == 0) {
-	    break;
-	}
-	c = getcmd(margv[0]);
-	if (Ambiguous(c)) {
-	    printf("?Ambiguous command\n");
-	    continue;
-	}
-	if (c == 0) {
-	    printf("?Invalid command\n");
-	    continue;
-	}
-	if (c->needconnect && !connected) {
-	    printf("?Need to be connected first.\n");
-	    continue;
-	}
-	if ((*c->handler)(margc, margv)) {
-	    break;
-	}
-    }
-    if (!top) {
-	if (!connected) {
-	    longjmp(toplevel, 1);
-	    /*NOTREACHED*/
-	}
-#if	defined(TN3270)
-	if (shell_active == 0) {
-	    setconnmode(0);
-	}
-#else	/* defined(TN3270) */
-	setconnmode(0);
-#endif	/* defined(TN3270) */
-    }
-}
-
-/*
- * Help command.
- */
-	static int
-help(argc, argv)
-	int argc;
-	char *argv[];
-{
-	register Command *c;
-
-	if (argc == 1) {
-		printf("Commands may be abbreviated.  Commands are:\n\n");
-		for (c = cmdtab; c->name; c++)
-			if (c->help) {
-				printf("%-*s\t%s\n", HELPINDENT, c->name,
-								    c->help);
-			}
-	}
-	else while (--argc > 0) {
-		register char *arg;
-		arg = *++argv;
-		c = getcmd(arg);
-		if (Ambiguous(c))
-			printf("?Ambiguous help command %s\n", arg);
-		else if (c == (Command *)0)
-			printf("?Invalid help command %s\n", arg);
-		else
-			printf("%s\n", c->help);
-	}
-	return(0);
-}
-
-static char *rcname = 0;
-static char rcbuf[128];
-
-	void
-cmdrc(m1, m2)
-	char *m1, *m2;
-{
-    register Command *c;
-    FILE *rcfile;
-    int gotmachine = 0;
-    int l1 = strlen(m1);
-    int l2 = strlen(m2);
-    char m1save[64];
-
-    if (skiprc)
-	return;
-
-    strcpy(m1save, m1);
-    m1 = m1save;
-
-    if (rcname == 0) {
-	rcname = getenv("HOME");
-	if (rcname && (strlen(rcname) + 10) < sizeof(rcbuf))
-	    strcpy(rcbuf, rcname);
-	else
-	    rcbuf[0] = '\0';
-	strcat(rcbuf, "/.telnetrc");
-	rcname = rcbuf;
-    }
-
-    if ((rcfile = fopen(rcname, "r")) == 0) {
-	return;
-    }
-
-    for (;;) {
-	if (fgets(line, sizeof(line), rcfile) == NULL)
-	    break;
-	if (line[0] == 0)
-	    break;
-	if (line[0] == '#')
-	    continue;
-	if (gotmachine) {
-	    if (!isspace(line[0]))
-		gotmachine = 0;
-	}
-	if (gotmachine == 0) {
-	    if (isspace(line[0]))
-		continue;
-	    if (strncasecmp(line, m1, l1) == 0)
-		strncpy(line, &line[l1], sizeof(line) - l1);
-	    else if (strncasecmp(line, m2, l2) == 0)
-		strncpy(line, &line[l2], sizeof(line) - l2);
-	    else if (strncasecmp(line, "DEFAULT", 7) == 0)
-		strncpy(line, &line[7], sizeof(line) - 7);
-	    else
-		continue;
-	    if (line[0] != ' ' && line[0] != '\t' && line[0] != '\n')
-		continue;
-	    gotmachine = 1;
-	}
-	makeargv();
-	if (margv[0] == 0)
-	    continue;
-	c = getcmd(margv[0]);
-	if (Ambiguous(c)) {
-	    printf("?Ambiguous command: %s\n", margv[0]);
-	    continue;
-	}
-	if (c == 0) {
-	    printf("?Invalid command: %s\n", margv[0]);
-	    continue;
-	}
-	/*
-	 * This should never happen...
-	 */
-	if (c->needconnect && !connected) {
-	    printf("?Need to be connected first for %s.\n", margv[0]);
-	    continue;
-	}
-	(*c->handler)(margc, margv);
-    }
-    fclose(rcfile);
-}
-
-#if	defined(IP_OPTIONS) && defined(IPPROTO_IP)
-
-/*
- * Source route is handed in as
- *	[!]@hop1@hop2...[@|:]dst
- * If the leading ! is present, it is a
- * strict source route, otherwise it is
- * assmed to be a loose source route.
- *
- * We fill in the source route option as
- *	hop1,hop2,hop3...dest
- * and return a pointer to hop1, which will
- * be the address to connect() to.
- *
- * Arguments:
- *	arg:	pointer to route list to decipher
- *
- *	cpp: 	If *cpp is not equal to NULL, this is a
- *		pointer to a pointer to a character array
- *		that should be filled in with the option.
- *
- *	lenp:	pointer to an integer that contains the
- *		length of *cpp if *cpp != NULL.
- *
- * Return values:
- *
- *	Returns the address of the host to connect to.  If the
- *	return value is -1, there was a syntax error in the
- *	option, either unknown characters, or too many hosts.
- *	If the return value is 0, one of the hostnames in the
- *	path is unknown, and *cpp is set to point to the bad
- *	hostname.
- *
- *	*cpp:	If *cpp was equal to NULL, it will be filled
- *		in with a pointer to our static area that has
- *		the option filled in.  This will be 32bit aligned.
- *
- *	*lenp:	This will be filled in with how long the option
- *		pointed to by *cpp is.
- *
- */
-	unsigned long
-sourceroute(arg, cpp, lenp)
-	char	*arg;
-	char	**cpp;
-	int	*lenp;
-{
-	static char lsr[44];
-#ifdef	sysV88
-	static IOPTN ipopt;
-#endif
-	char *cp, *cp2, *lsrp, *lsrep;
-	register int tmp;
-	struct in_addr sin_addr;
-	register struct hostent *host = 0;
-	register char c;
-
-	/*
-	 * Verify the arguments, and make sure we have
-	 * at least 7 bytes for the option.
-	 */
-	if (cpp == NULL || lenp == NULL)
-		return((unsigned long)-1);
-	if (*cpp != NULL && *lenp < 7)
-		return((unsigned long)-1);
-	/*
-	 * Decide whether we have a buffer passed to us,
-	 * or if we need to use our own static buffer.
-	 */
-	if (*cpp) {
-		lsrp = *cpp;
-		lsrep = lsrp + *lenp;
-	} else {
-		*cpp = lsrp = lsr;
-		lsrep = lsrp + 44;
-	}
-
-	cp = arg;
-
-	/*
-	 * Next, decide whether we have a loose source
-	 * route or a strict source route, and fill in
-	 * the begining of the option.
-	 */
-#ifndef	sysV88
-	if (*cp == '!') {
-		cp++;
-		*lsrp++ = IPOPT_SSRR;
-	} else
-		*lsrp++ = IPOPT_LSRR;
-#else
-	if (*cp == '!') {
-		cp++;
-		ipopt.io_type = IPOPT_SSRR;
-	} else
-		ipopt.io_type = IPOPT_LSRR;
-#endif
-
-	if (*cp != '@')
-		return((unsigned long)-1);
-
-#ifndef	sysV88
-	lsrp++;		/* skip over length, we'll fill it in later */
-	*lsrp++ = 4;
-#endif
-
-	cp++;
-
-	sin_addr.s_addr = 0;
-
-	for (c = 0;;) {
-		if (c == ':')
-			cp2 = 0;
-		else for (cp2 = cp; (c = *cp2); cp2++) {
-			if (c == ',') {
-				*cp2++ = '\0';
-				if (*cp2 == '@')
-					cp2++;
-			} else if (c == '@') {
-				*cp2++ = '\0';
-			} else if (c == ':') {
-				*cp2++ = '\0';
-			} else
-				continue;
-			break;
-		}
-		if (!c)
-			cp2 = 0;
-
-		if ((tmp = inet_addr(cp)) != -1) {
-			sin_addr.s_addr = tmp;
-		} else if ((host = gethostbyname(cp))) {
-#if	defined(h_addr)
-			memmove((caddr_t)&sin_addr,
-				host->h_addr_list[0], host->h_length);
-#else
-			memmove((caddr_t)&sin_addr, host->h_addr, host->h_length);
-#endif
-		} else {
-			*cpp = cp;
-			return(0);
-		}
-		memmove(lsrp, (char *)&sin_addr, 4);
-		lsrp += 4;
-		if (cp2)
-			cp = cp2;
-		else
-			break;
-		/*
-		 * Check to make sure there is space for next address
-		 */
-		if (lsrp + 4 > lsrep)
-			return((unsigned long)-1);
-	}
-#ifndef	sysV88
-	if ((*(*cpp+IPOPT_OLEN) = lsrp - *cpp) <= 7) {
-		*cpp = 0;
-		*lenp = 0;
-		return((unsigned long)-1);
-	}
-	*lsrp++ = IPOPT_NOP; /* 32 bit word align it */
-	*lenp = lsrp - *cpp;
-#else
-	ipopt.io_len = lsrp - *cpp;
-	if (ipopt.io_len <= 5) {		/* Is 3 better ? */
-		*cpp = 0;
-		*lenp = 0;
-		return((unsigned long)-1);
-	}
-	*lenp = sizeof(ipopt);
-	*cpp = (char *) &ipopt;
-#endif
-	return(sin_addr.s_addr);
-}
-#endif
diff --git a/crypto/telnet/telnet/defines.h b/crypto/telnet/telnet/defines.h
deleted file mode 100644
index 0978173ea995..000000000000
--- a/crypto/telnet/telnet/defines.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)defines.h	8.1 (Berkeley) 6/6/93
- */
-
-#define	settimer(x)	clocks.x = clocks.system++
-
-#if	!defined(TN3270)
-
-#define	SetIn3270()
-
-#endif	/* !defined(TN3270) */
-
-#define	NETADD(c)	{ *netoring.supply = c; ring_supplied(&netoring, 1); }
-#define	NET2ADD(c1,c2)	{ NETADD(c1); NETADD(c2); }
-#define	NETBYTES()	(ring_full_count(&netoring))
-#define	NETROOM()	(ring_empty_count(&netoring))
-
-#define	TTYADD(c)	if (!(SYNCHing||flushout)) { \
-				*ttyoring.supply = c; \
-				ring_supplied(&ttyoring, 1); \
-			}
-#define	TTYBYTES()	(ring_full_count(&ttyoring))
-#define	TTYROOM()	(ring_empty_count(&ttyoring))
-
-/*	Various modes */
-#define	MODE_LOCAL_CHARS(m)	((m)&(MODE_EDIT|MODE_TRAPSIG))
-#define	MODE_LOCAL_ECHO(m)	((m)&MODE_ECHO)
-#define	MODE_COMMAND_LINE(m)	((m)==-1)
-
-#define	CONTROL(x)	((x)&0x1f)		/* CTRL(x) is not portable */
diff --git a/crypto/telnet/telnet/externs.h b/crypto/telnet/telnet/externs.h
deleted file mode 100644
index 0c6894f53d4e..000000000000
--- a/crypto/telnet/telnet/externs.h
+++ /dev/null
@@ -1,492 +0,0 @@
-/*
- * Copyright (c) 1988, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)externs.h	8.3 (Berkeley) 5/30/95
- */
-
-#ifndef	BSD
-# define BSD 43
-#endif
-
-/*
- * ucb stdio.h defines BSD as something wierd
- */
-#if defined(sun) && defined(__svr4__)
-#define BSD 43
-#endif
-
-#ifndef	USE_TERMIO
-# if BSD > 43 || defined(SYSV_TERMIO)
-#  define USE_TERMIO
-# endif
-#endif
-
-#include <stdio.h>
-#include <setjmp.h>
-#if defined(CRAY) && !defined(NO_BSD_SETJMP)
-#include <bsdsetjmp.h>
-#endif
-#ifndef	FILIO_H
-#include <sys/ioctl.h>
-#else
-#include <sys/filio.h>
-#endif
-#ifdef CRAY
-# include <errno.h>
-#endif /* CRAY */
-#ifdef	USE_TERMIO
-# ifndef	VINTR
-#  ifdef SYSV_TERMIO
-#   include <sys/termio.h>
-#  else
-#   include <sys/termios.h>
-#   define termio termios
-#  endif
-# endif
-#endif
-#if defined(NO_CC_T) || !defined(USE_TERMIO)
-# if !defined(USE_TERMIO)
-typedef char cc_t;
-# else
-typedef unsigned char cc_t;
-# endif
-#endif
-
-#ifndef	NO_STRING_H
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
-#ifndef	_POSIX_VDISABLE
-# ifdef sun
-#  include <sys/param.h>	/* pick up VDISABLE definition, mayby */
-# endif
-# ifdef VDISABLE
-#  define _POSIX_VDISABLE VDISABLE
-# else
-#  define _POSIX_VDISABLE ((cc_t)'\377')
-# endif
-#endif
-
-#define	SUBBUFSIZE	256
-
-#ifndef CRAY
-extern int errno;		/* outside this world */
-#endif /* !CRAY */
-
-#if	!defined(P)
-# ifdef	__STDC__
-#  define	P(x)	x
-# else
-#  define	P(x)	()
-# endif
-#endif
-
-extern int
-    autologin,		/* Autologin enabled */
-    skiprc,		/* Don't process the ~/.telnetrc file */
-    eight,		/* use eight bit mode (binary in and/or out */
-    flushout,		/* flush output */
-    connected,		/* Are we connected to the other side? */
-    globalmode,		/* Mode tty should be in */
-    In3270,		/* Are we in 3270 mode? */
-    telnetport,		/* Are we connected to the telnet port? */
-    localflow,		/* Flow control handled locally */
-    restartany,		/* If flow control, restart output on any character */
-    localchars,		/* we recognize interrupt/quit */
-    donelclchars,	/* the user has set "localchars" */
-    showoptions,
-    net,		/* Network file descriptor */
-    tin,		/* Terminal input file descriptor */
-    tout,		/* Terminal output file descriptor */
-    crlf,		/* Should '\r' be mapped to <CR><LF> (or <CR><NUL>)? */
-    autoflush,		/* flush output when interrupting? */
-    autosynch,		/* send interrupt characters with SYNCH? */
-    SYNCHing,		/* Is the stream in telnet SYNCH mode? */
-    donebinarytoggle,	/* the user has put us in binary */
-    dontlecho,		/* do we suppress local echoing right now? */
-    crmod,
-    netdata,		/* Print out network data flow */
-    prettydump,		/* Print "netdata" output in user readable format */
-#if	defined(unix)
-#if	defined(TN3270)
-    cursesdata,		/* Print out curses data flow */
-    apitrace,		/* Trace API transactions */
-#endif	/* defined(TN3270) */
-    termdata,		/* Print out terminal data flow */
-#endif	/* defined(unix) */
-    debug,		/* Debug level */
-    doaddrlookup,	/* do a reverse lookup? */
-    clienteof;		/* Client received EOF */
-
-extern cc_t escape;	/* Escape to command mode */
-extern cc_t rlogin;	/* Rlogin mode escape character */
-#ifdef	KLUDGELINEMODE
-extern cc_t echoc;	/* Toggle local echoing */
-#endif
-
-extern char
-    *prompt;		/* Prompt for command. */
-
-extern char
-    doopt[],
-    dont[],
-    will[],
-    wont[],
-    options[],		/* All the little options */
-    *hostname;		/* Who are we connected to? */
-#ifdef	ENCRYPTION
-extern void (*encrypt_output) P((unsigned char *, int));
-extern int (*decrypt_input) P((int));
-#endif	/* ENCRYPTION */
-
-/*
- * We keep track of each side of the option negotiation.
- */
-
-#define	MY_STATE_WILL		0x01
-#define	MY_WANT_STATE_WILL	0x02
-#define	MY_STATE_DO		0x04
-#define	MY_WANT_STATE_DO	0x08
-
-/*
- * Macros to check the current state of things
- */
-
-#define	my_state_is_do(opt)		(options[opt]&MY_STATE_DO)
-#define	my_state_is_will(opt)		(options[opt]&MY_STATE_WILL)
-#define my_want_state_is_do(opt)	(options[opt]&MY_WANT_STATE_DO)
-#define my_want_state_is_will(opt)	(options[opt]&MY_WANT_STATE_WILL)
-
-#define	my_state_is_dont(opt)		(!my_state_is_do(opt))
-#define	my_state_is_wont(opt)		(!my_state_is_will(opt))
-#define my_want_state_is_dont(opt)	(!my_want_state_is_do(opt))
-#define my_want_state_is_wont(opt)	(!my_want_state_is_will(opt))
-
-#define	set_my_state_do(opt)		{options[opt] |= MY_STATE_DO;}
-#define	set_my_state_will(opt)		{options[opt] |= MY_STATE_WILL;}
-#define	set_my_want_state_do(opt)	{options[opt] |= MY_WANT_STATE_DO;}
-#define	set_my_want_state_will(opt)	{options[opt] |= MY_WANT_STATE_WILL;}
-
-#define	set_my_state_dont(opt)		{options[opt] &= ~MY_STATE_DO;}
-#define	set_my_state_wont(opt)		{options[opt] &= ~MY_STATE_WILL;}
-#define	set_my_want_state_dont(opt)	{options[opt] &= ~MY_WANT_STATE_DO;}
-#define	set_my_want_state_wont(opt)	{options[opt] &= ~MY_WANT_STATE_WILL;}
-
-/*
- * Make everything symetrical
- */
-
-#define	HIS_STATE_WILL			MY_STATE_DO
-#define	HIS_WANT_STATE_WILL		MY_WANT_STATE_DO
-#define HIS_STATE_DO			MY_STATE_WILL
-#define HIS_WANT_STATE_DO		MY_WANT_STATE_WILL
-
-#define	his_state_is_do			my_state_is_will
-#define	his_state_is_will		my_state_is_do
-#define his_want_state_is_do		my_want_state_is_will
-#define his_want_state_is_will		my_want_state_is_do
-
-#define	his_state_is_dont		my_state_is_wont
-#define	his_state_is_wont		my_state_is_dont
-#define his_want_state_is_dont		my_want_state_is_wont
-#define his_want_state_is_wont		my_want_state_is_dont
-
-#define	set_his_state_do		set_my_state_will
-#define	set_his_state_will		set_my_state_do
-#define	set_his_want_state_do		set_my_want_state_will
-#define	set_his_want_state_will		set_my_want_state_do
-
-#define	set_his_state_dont		set_my_state_wont
-#define	set_his_state_wont		set_my_state_dont
-#define	set_his_want_state_dont		set_my_want_state_wont
-#define	set_his_want_state_wont		set_my_want_state_dont
-
-
-extern FILE
-    *NetTrace;		/* Where debugging output goes */
-extern unsigned char
-    NetTraceFile[];	/* Name of file where debugging output goes */
-extern void
-    SetNetTrace P((char *));	/* Function to change where debugging goes */
-
-extern jmp_buf
-    peerdied,
-    toplevel;		/* For error conditions. */
-
-extern void
-    command P((int, char *, int)),
-    Dump P((int, unsigned char *, int)),
-    ExitString P((char *, int)),
-    init_3270 P((void)),
-    printoption P((char *, int, int)),
-    printsub P((int, unsigned char *, int)),
-    sendnaws P((void)),
-    setconnmode P((int)),
-    setcommandmode P((void)),
-    setneturg P((void)),
-    sys_telnet_init P((void)),
-    telnet P((char *)),
-    tel_enter_binary P((int)),
-    TerminalFlushOutput P((void)),
-    TerminalNewMode P((int)),
-    TerminalRestoreState P((void)),
-    TerminalSaveState P((void)),
-    tninit P((void)),
-    upcase P((char *)),
-    willoption P((int)),
-    wontoption P((int));
-
-extern void
-    send_do P((int, int)),
-    send_dont P((int, int)),
-    send_will P((int, int)),
-    send_wont P((int, int));
-
-extern void
-    lm_will P((unsigned char *, int)),
-    lm_wont P((unsigned char *, int)),
-    lm_do P((unsigned char *, int)),
-    lm_dont P((unsigned char *, int)),
-    lm_mode P((unsigned char *, int, int));
-
-extern void
-    slc_init P((void)),
-    slcstate P((void)),
-    slc_mode_export P((void)),
-    slc_mode_import P((int)),
-    slc_import P((int)),
-    slc_export P((void)),
-    slc P((unsigned char *, int)),
-    slc_check P((void)),
-    slc_start_reply P((void)),
-    slc_add_reply P((int, int, int)),
-    slc_end_reply P((void));
-extern int
-    NetClose P((int)),
-    netflush P((void)),
-    SetSockOpt P((int, int, int, int)),
-    slc_update P((void)),
-    telrcv P((void)),
-    TerminalWrite P((char *, int)),
-    TerminalAutoFlush P((void)),
-    ttyflush P((int));
-
-extern void
-    env_opt P((unsigned char *, int)),
-    env_opt_start P((void)),
-    env_opt_start_info P((void)),
-    env_opt_add P((unsigned char *)),
-    env_opt_end P((int));
-
-extern unsigned char
-    *env_default P((int, int)),
-    *env_getvalue P((unsigned char *));
-
-extern int
-    get_status P((void)),
-    dosynch P((void));
-
-extern cc_t
-    *tcval P((int));
-
-#ifndef	USE_TERMIO
-
-extern struct	tchars ntc;
-extern struct	ltchars nltc;
-extern struct	sgttyb nttyb;
-
-# define termEofChar		ntc.t_eofc
-# define termEraseChar		nttyb.sg_erase
-# define termFlushChar		nltc.t_flushc
-# define termIntChar		ntc.t_intrc
-# define termKillChar		nttyb.sg_kill
-# define termLiteralNextChar	nltc.t_lnextc
-# define termQuitChar		ntc.t_quitc
-# define termSuspChar		nltc.t_suspc
-# define termRprntChar		nltc.t_rprntc
-# define termWerasChar		nltc.t_werasc
-# define termStartChar		ntc.t_startc
-# define termStopChar		ntc.t_stopc
-# define termForw1Char		ntc.t_brkc
-extern cc_t termForw2Char;
-extern cc_t termAytChar;
-
-# define termEofCharp		(cc_t *)&ntc.t_eofc
-# define termEraseCharp		(cc_t *)&nttyb.sg_erase
-# define termFlushCharp		(cc_t *)&nltc.t_flushc
-# define termIntCharp		(cc_t *)&ntc.t_intrc
-# define termKillCharp		(cc_t *)&nttyb.sg_kill
-# define termLiteralNextCharp	(cc_t *)&nltc.t_lnextc
-# define termQuitCharp		(cc_t *)&ntc.t_quitc
-# define termSuspCharp		(cc_t *)&nltc.t_suspc
-# define termRprntCharp		(cc_t *)&nltc.t_rprntc
-# define termWerasCharp		(cc_t *)&nltc.t_werasc
-# define termStartCharp		(cc_t *)&ntc.t_startc
-# define termStopCharp		(cc_t *)&ntc.t_stopc
-# define termForw1Charp		(cc_t *)&ntc.t_brkc
-# define termForw2Charp		(cc_t *)&termForw2Char
-# define termAytCharp		(cc_t *)&termAytChar
-
-# else
-
-extern struct	termio new_tc;
-
-# define termEofChar		new_tc.c_cc[VEOF]
-# define termEraseChar		new_tc.c_cc[VERASE]
-# define termIntChar		new_tc.c_cc[VINTR]
-# define termKillChar		new_tc.c_cc[VKILL]
-# define termQuitChar		new_tc.c_cc[VQUIT]
-
-# ifndef	VSUSP
-extern cc_t termSuspChar;
-# else
-#  define termSuspChar		new_tc.c_cc[VSUSP]
-# endif
-# if	defined(VFLUSHO) && !defined(VDISCARD)
-#  define VDISCARD VFLUSHO
-# endif
-# ifndef	VDISCARD
-extern cc_t termFlushChar;
-# else
-#  define termFlushChar		new_tc.c_cc[VDISCARD]
-# endif
-# ifndef VWERASE
-extern cc_t termWerasChar;
-# else
-#  define termWerasChar		new_tc.c_cc[VWERASE]
-# endif
-# ifndef	VREPRINT
-extern cc_t termRprntChar;
-# else
-#  define termRprntChar		new_tc.c_cc[VREPRINT]
-# endif
-# ifndef	VLNEXT
-extern cc_t termLiteralNextChar;
-# else
-#  define termLiteralNextChar	new_tc.c_cc[VLNEXT]
-# endif
-# ifndef	VSTART
-extern cc_t termStartChar;
-# else
-#  define termStartChar		new_tc.c_cc[VSTART]
-# endif
-# ifndef	VSTOP
-extern cc_t termStopChar;
-# else
-#  define termStopChar		new_tc.c_cc[VSTOP]
-# endif
-# ifndef	VEOL
-extern cc_t termForw1Char;
-# else
-#  define termForw1Char		new_tc.c_cc[VEOL]
-# endif
-# ifndef	VEOL2
-extern cc_t termForw2Char;
-# else
-#  define termForw2Char		new_tc.c_cc[VEOL]
-# endif
-# ifndef	VSTATUS
-extern cc_t termAytChar;
-#else
-#  define termAytChar		new_tc.c_cc[VSTATUS]
-#endif
-
-# if !defined(CRAY) || defined(__STDC__)
-#  define termEofCharp		&termEofChar
-#  define termEraseCharp	&termEraseChar
-#  define termIntCharp		&termIntChar
-#  define termKillCharp		&termKillChar
-#  define termQuitCharp		&termQuitChar
-#  define termSuspCharp		&termSuspChar
-#  define termFlushCharp	&termFlushChar
-#  define termWerasCharp	&termWerasChar
-#  define termRprntCharp	&termRprntChar
-#  define termLiteralNextCharp	&termLiteralNextChar
-#  define termStartCharp	&termStartChar
-#  define termStopCharp		&termStopChar
-#  define termForw1Charp	&termForw1Char
-#  define termForw2Charp	&termForw2Char
-#  define termAytCharp		&termAytChar
-# else
-	/* Work around a compiler bug */
-#  define termEofCharp		0
-#  define termEraseCharp	0
-#  define termIntCharp		0
-#  define termKillCharp		0
-#  define termQuitCharp		0
-#  define termSuspCharp		0
-#  define termFlushCharp	0
-#  define termWerasCharp	0
-#  define termRprntCharp	0
-#  define termLiteralNextCharp	0
-#  define termStartCharp	0
-#  define termStopCharp		0
-#  define termForw1Charp	0
-#  define termForw2Charp	0
-#  define termAytCharp		0
-# endif
-#endif
-
-
-/* Ring buffer structures which are shared */
-
-extern Ring
-    netoring,
-    netiring,
-    ttyoring,
-    ttyiring;
-
-/* Tn3270 section */
-#if	defined(TN3270)
-
-extern int
-    HaveInput,		/* Whether an asynchronous I/O indication came in */
-    noasynchtty,	/* Don't do signals on I/O (SIGURG, SIGIO) */
-    noasynchnet,	/* Don't do signals on I/O (SIGURG, SIGIO) */
-    sigiocount,		/* Count of SIGIO receptions */
-    shell_active;	/* Subshell is active */
-
-extern char
-    *Ibackp,		/* Oldest byte of 3270 data */
-    Ibuf[],		/* 3270 buffer */
-    *Ifrontp,		/* Where next 3270 byte goes */
-    tline[],
-    *transcom;		/* Transparent command */
-
-extern int
-    settranscom P((int, char**));
-
-extern void
-    inputAvailable P((int));
-#endif	/* defined(TN3270) */
diff --git a/crypto/telnet/telnet/fdset.h b/crypto/telnet/telnet/fdset.h
deleted file mode 100644
index 045bb7221419..000000000000
--- a/crypto/telnet/telnet/fdset.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)fdset.h	8.1 (Berkeley) 6/6/93
- */
-
-/*
- * The following is defined just in case someone should want to run
- * this telnet on a 4.2 system.
- *
- */
-
-#ifndef	FD_SETSIZE
-
-#define	FD_SET(n, p)	((p)->fds_bits[0] |= (1<<(n)))
-#define	FD_CLR(n, p)	((p)->fds_bits[0] &= ~(1<<(n)))
-#define	FD_ISSET(n, p)	((p)->fds_bits[0] & (1<<(n)))
-#define FD_ZERO(p)	((p)->fds_bits[0] = 0)
-
-#endif
diff --git a/crypto/telnet/telnet/general.h b/crypto/telnet/telnet/general.h
deleted file mode 100644
index 4efa9519469e..000000000000
--- a/crypto/telnet/telnet/general.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)general.h	8.1 (Berkeley) 6/6/93
- */
-
-/*
- * Some general definitions.
- */
-
-
-#define	numberof(x)	(sizeof x/sizeof x[0])
-#define	highestof(x)	(numberof(x)-1)
-
-#define	ClearElement(x)		memset((char *)&x, 0, sizeof x)
-#define	ClearArray(x)		memset((char *)x, 0, sizeof x)
diff --git a/crypto/telnet/telnet/main.c b/crypto/telnet/telnet/main.c
deleted file mode 100644
index 2dc05fd73eb0..000000000000
--- a/crypto/telnet/telnet/main.c
+++ /dev/null
@@ -1,350 +0,0 @@
-/*
- * Copyright (c) 1988, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1988, 1990, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static const char sccsid[] = "@(#)main.c	8.3 (Berkeley) 5/30/95";
-#endif /* not lint */
-
-#include <sys/types.h>
-#include <stdlib.h>
-
-#include "ring.h"
-#include "externs.h"
-#include "defines.h"
-
-#if	defined(AUTHENTICATION)
-#include <libtelnet/auth.h>
-#endif
-#if	defined(ENCRYPTION)
-#include <libtelnet/encrypt.h>
-#endif
-
-/* These values need to be the same as defined in libtelnet/kerberos5.c */
-/* Either define them in both places, or put in some common header file. */
-#define OPTS_FORWARD_CREDS	0x00000002
-#define OPTS_FORWARDABLE_CREDS	0x00000001
-
-#if 0
-#define FORWARD
-#endif
-
-void init_terminal(void);
-void init_network(void);
-void init_telnet(void);
-void init_sys(void);
-void init_3270(void);
-
-/*
- * Initialize variables.
- */
-    void
-tninit()
-{
-    init_terminal();
-
-    init_network();
-
-    init_telnet();
-
-    init_sys();
-
-#if defined(TN3270)
-    init_3270();
-#endif
-}
-
-	void
-usage()
-{
-	fprintf(stderr, "Usage: %s %s%s%s%s\n",
-	    prompt,
-#ifdef	AUTHENTICATION
-	    "[-8] [-E] [-K] [-L] [-N] [-S tos] [-X atype] [-a] [-c] [-d]",
-	    "\n\t[-e char] [-k realm] [-l user] [-f/-F] [-n tracefile] ",
-#else
-	    "[-8] [-E] [-L] [-N] [-S tos] [-a] [-c] [-d] [-e char] [-l user]",
-	    "\n\t[-n tracefile] ",
-#endif
-#if defined(TN3270) && defined(unix)
-# ifdef AUTHENTICATION
-	    "[-noasynch] [-noasynctty]\n\t"
-	    "[-noasyncnet] [-r] [-s src_addr] [-t transcom] ",
-# else
-	    "[-noasynch] [-noasynctty] [-noasyncnet] [-r]\n\t"
-	    "[-s src_addr] [-t transcom]",
-# endif
-#else
-	    "[-r] [-s src_addr] ",
-#endif
-#ifdef	ENCRYPTION
-	    "[-x] [host-name [port]]"
-#else	/* ENCRYPTION */
-	    "[host-name [port]]"
-#endif	/* ENCRYPTION */
-	);
-	exit(1);
-}
-
-/*
- * main.  Parse arguments, invoke the protocol or command parser.
- */
-
-	int
-main(argc, argv)
-	int argc;
-	char *argv[];
-{
-	extern char *optarg;
-	extern int optind;
-	int ch;
-	char *user, *strrchr();
-	char *src_addr = NULL;
-#ifdef	FORWARD
-	extern int forward_flags;
-#endif	/* FORWARD */
-
-	tninit();		/* Clear out things */
-#if	defined(CRAY) && !defined(__STDC__)
-	_setlist_init();	/* Work around compiler bug */
-#endif
-
-	TerminalSaveState();
-
-	if ((prompt = strrchr(argv[0], '/')))
-		++prompt;
-	else
-		prompt = argv[0];
-
-	user = NULL;
-
-	rlogin = (strncmp(prompt, "rlog", 4) == 0) ? '~' : _POSIX_VDISABLE;
-	autologin = -1;
-
-	while ((ch = getopt(argc, argv, "8EKLNS:X:acde:fFk:l:n:rs:t:x")) != EOF) {
-		switch(ch) {
-		case '8':
-			eight = 3;	/* binary output and input */
-			break;
-		case 'E':
-			rlogin = escape = _POSIX_VDISABLE;
-			break;
-		case 'K':
-#ifdef	AUTHENTICATION
-			autologin = 0;
-#endif
-			break;
-		case 'L':
-			eight |= 2;	/* binary output only */
-			break;
-		case 'N':
-			doaddrlookup = 0;
-			break;
-		case 'S':
-		    {
-#ifdef	HAS_GETTOS
-			extern int tos;
-
-			if ((tos = parsetos(optarg, "tcp")) < 0)
-				fprintf(stderr, "%s%s%s%s\n",
-					prompt, ": Bad TOS argument '",
-					optarg,
-					"; will try to use default TOS");
-#else
-			fprintf(stderr,
-			   "%s: Warning: -S ignored, no parsetos() support.\n",
-								prompt);
-#endif
-		    }
-			break;
-		case 'X':
-#ifdef	AUTHENTICATION
-			auth_disable_name(optarg);
-#endif
-			break;
-		case 'a':
-			autologin = 1;
-			break;
-		case 'c':
-			skiprc = 1;
-			break;
-		case 'd':
-			debug = 1;
-			break;
-		case 'e':
-			set_escape_char(optarg);
-			break;
-		case 'f':
-#if defined(AUTHENTICATION) && defined(KRB5) && defined(FORWARD)
-			if (forward_flags & OPTS_FORWARD_CREDS) {
-			    fprintf(stderr,
-				    "%s: Only one of -f and -F allowed.\n",
-				    prompt);
-			    usage();
-			}
-			forward_flags |= OPTS_FORWARD_CREDS;
-#else
-			fprintf(stderr,
-			 "%s: Warning: -f ignored, no Kerberos V5 support.\n",
-				prompt);
-#endif
-			break;
-		case 'F':
-#if defined(AUTHENTICATION) && defined(KRB5) && defined(FORWARD)
-			if (forward_flags & OPTS_FORWARD_CREDS) {
-			    fprintf(stderr,
-				    "%s: Only one of -f and -F allowed.\n",
-				    prompt);
-			    usage();
-			}
-			forward_flags |= OPTS_FORWARD_CREDS;
-			forward_flags |= OPTS_FORWARDABLE_CREDS;
-#else
-			fprintf(stderr,
-			 "%s: Warning: -F ignored, no Kerberos V5 support.\n",
-				prompt);
-#endif
-			break;
-		case 'k':
-#if defined(AUTHENTICATION) && defined(KRB4)
-		    {
-			extern char *dest_realm, dst_realm_buf[], dst_realm_sz;
-			dest_realm = dst_realm_buf;
-			(void)strncpy(dest_realm, optarg, dst_realm_sz);
-		    }
-#else
-			fprintf(stderr,
-			   "%s: Warning: -k ignored, no Kerberos V4 support.\n",
-								prompt);
-#endif
-			break;
-		case 'l':
-			autologin = 1;
-			user = optarg;
-			break;
-		case 'n':
-#if defined(TN3270) && defined(unix)
-			/* distinguish between "-n oasynch" and "-noasynch" */
-			if (argv[optind - 1][0] == '-' && argv[optind - 1][1]
-			    == 'n' && argv[optind - 1][2] == 'o') {
-				if (!strcmp(optarg, "oasynch")) {
-					noasynchtty = 1;
-					noasynchnet = 1;
-				} else if (!strcmp(optarg, "oasynchtty"))
-					noasynchtty = 1;
-				else if (!strcmp(optarg, "oasynchnet"))
-					noasynchnet = 1;
-			} else
-#endif	/* defined(TN3270) && defined(unix) */
-				SetNetTrace(optarg);
-			break;
-		case 'r':
-			rlogin = '~';
-			break;
-		case 's':
-			src_addr = optarg;
-			break;
-		case 't':
-#if defined(TN3270) && defined(unix)
-			transcom = tline;
-			(void)strcpy(transcom, optarg);
-#else
-			fprintf(stderr,
-			   "%s: Warning: -t ignored, no TN3270 support.\n",
-								prompt);
-#endif
-			break;
-		case 'x':
-#ifdef	ENCRYPTION
-			encrypt_auto(1);
-			decrypt_auto(1);
-#else	/* ENCRYPTION */
-			fprintf(stderr,
-			    "%s: Warning: -x ignored, no ENCRYPT support.\n",
-								prompt);
-#endif	/* ENCRYPTION */
-			break;
-		case '?':
-		default:
-			usage();
-			/* NOTREACHED */
-		}
-	}
-	if (autologin == -1)
-		autologin = (rlogin == _POSIX_VDISABLE) ? 0 : 1;
-
-	argc -= optind;
-	argv += optind;
-
-	if (argc) {
-		char *args[9], **argp = args;
-
-		if (argc > 2)
-			usage();
-		*argp++ = prompt;
-		if (user) {
-			*argp++ = "-l";
-			*argp++ = user;
-		}
-		if (src_addr) {
-			*argp++ = "-s";
-			*argp++ = src_addr;
-		}
-		*argp++ = argv[0];		/* host */
-		if (argc > 1)
-			*argp++ = argv[1];	/* port */
-		*argp = 0;
-
-		if (setjmp(toplevel) != 0)
-			Exit(0);
-		if (tn(argp - args, args) == 1)
-			return (0);
-		else
-			return (1);
-	}
-	(void)setjmp(toplevel);
-	for (;;) {
-#ifdef TN3270
-		if (shell_active)
-			shell_continue();
-		else
-#endif
-			command(1, 0, 0);
-	}
-	return 0;
-}
diff --git a/crypto/telnet/telnet/network.c b/crypto/telnet/telnet/network.c
deleted file mode 100644
index 9964bc205cef..000000000000
--- a/crypto/telnet/telnet/network.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static const char sccsid[] = "@(#)network.c	8.2 (Berkeley) 12/15/93";
-#endif /* not lint */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-
-#include <errno.h>
-
-#include <arpa/telnet.h>
-#include <unistd.h>
-
-#include "ring.h"
-
-#include "defines.h"
-#include "externs.h"
-#include "fdset.h"
-
-Ring		netoring, netiring;
-unsigned char	netobuf[2*BUFSIZ], netibuf[BUFSIZ];
-
-/*
- * Initialize internal network data structures.
- */
-
-    void
-init_network()
-{
-    if (ring_init(&netoring, netobuf, sizeof netobuf) != 1) {
-	exit(1);
-    }
-    if (ring_init(&netiring, netibuf, sizeof netibuf) != 1) {
-	exit(1);
-    }
-    NetTrace = stdout;
-}
-
-
-/*
- * Check to see if any out-of-band data exists on a socket (for
- * Telnet "synch" processing).
- */
-
-    int
-stilloob()
-{
-    static struct timeval timeout = { 0 };
-    fd_set	excepts;
-    int value;
-
-    do {
-	FD_ZERO(&excepts);
-	FD_SET(net, &excepts);
-	value = select(net+1, (fd_set *)0, (fd_set *)0, &excepts, &timeout);
-    } while ((value == -1) && (errno == EINTR));
-
-    if (value < 0) {
-	perror("select");
-	(void) quit();
-	/* NOTREACHED */
-    }
-    if (FD_ISSET(net, &excepts)) {
-	return 1;
-    } else {
-	return 0;
-    }
-}
-
-
-/*
- *  setneturg()
- *
- *	Sets "neturg" to the current location.
- */
-
-    void
-setneturg()
-{
-    ring_mark(&netoring);
-}
-
-
-/*
- *  netflush
- *		Send as much data as possible to the network,
- *	handling requests for urgent data.
- *
- *		The return value indicates whether we did any
- *	useful work.
- */
-
-
-    int
-netflush()
-{
-    register int n, n1;
-
-#ifdef	ENCRYPTION
-    if (encrypt_output)
-	ring_encrypt(&netoring, encrypt_output);
-#endif	/* ENCRYPTION */
-    if ((n1 = n = ring_full_consecutive(&netoring)) > 0) {
-	if (!ring_at_mark(&netoring)) {
-	    n = send(net, (char *)netoring.consume, n, 0); /* normal write */
-	} else {
-	    /*
-	     * In 4.2 (and 4.3) systems, there is some question about
-	     * what byte in a sendOOB operation is the "OOB" data.
-	     * To make ourselves compatible, we only send ONE byte
-	     * out of band, the one WE THINK should be OOB (though
-	     * we really have more the TCP philosophy of urgent data
-	     * rather than the Unix philosophy of OOB data).
-	     */
-	    n = send(net, (char *)netoring.consume, 1, MSG_OOB);/* URGENT data */
-	}
-    }
-    if (n < 0) {
-	if (errno != ENOBUFS && errno != EWOULDBLOCK) {
-	    setcommandmode();
-	    perror(hostname);
-	    (void)NetClose(net);
-	    ring_clear_mark(&netoring);
-	    longjmp(peerdied, -1);
-	    /*NOTREACHED*/
-	}
-	n = 0;
-    }
-    if (netdata && n) {
-	Dump('>', netoring.consume, n);
-    }
-    if (n) {
-	ring_consumed(&netoring, n);
-	/*
-	 * If we sent all, and more to send, then recurse to pick
-	 * up the other half.
-	 */
-	if ((n1 == n) && ring_full_consecutive(&netoring)) {
-	    (void) netflush();
-	}
-	return 1;
-    } else {
-	return 0;
-    }
-}
diff --git a/crypto/telnet/telnet/ring.c b/crypto/telnet/telnet/ring.c
deleted file mode 100644
index 13fe6c2b79cb..000000000000
--- a/crypto/telnet/telnet/ring.c
+++ /dev/null
@@ -1,364 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static const char sccsid[] = "@(#)ring.c	8.2 (Berkeley) 5/30/95";
-#endif /* not lint */
-
-/*
- * This defines a structure for a ring buffer.
- *
- * The circular buffer has two parts:
- *(((
- *	full:	[consume, supply)
- *	empty:	[supply, consume)
- *]]]
- *
- */
-
-#include	<stdio.h>
-#include	<errno.h>
-#include	<string.h>
-
-#ifdef	size_t
-#undef	size_t
-#endif
-
-#include	<sys/types.h>
-#ifndef	FILIO_H
-#include	<sys/ioctl.h>
-#endif
-#include	<sys/socket.h>
-
-#include	"ring.h"
-#include	"general.h"
-
-/* Internal macros */
-
-#if	!defined(MIN)
-#define	MIN(a,b)	(((a)<(b))? (a):(b))
-#endif	/* !defined(MIN) */
-
-#define	ring_subtract(d,a,b)	(((a)-(b) >= 0)? \
-					(a)-(b): (((a)-(b))+(d)->size))
-
-#define	ring_increment(d,a,c)	(((a)+(c) < (d)->top)? \
-					(a)+(c) : (((a)+(c))-(d)->size))
-
-#define	ring_decrement(d,a,c)	(((a)-(c) >= (d)->bottom)? \
-					(a)-(c) : (((a)-(c))-(d)->size))
-
-
-/*
- * The following is a clock, used to determine full, empty, etc.
- *
- * There is some trickiness here.  Since the ring buffers are initialized
- * to ZERO on allocation, we need to make sure, when interpreting the
- * clock, that when the times are EQUAL, then the buffer is FULL.
- */
-static u_long ring_clock = 0;
-
-
-#define	ring_empty(d) (((d)->consume == (d)->supply) && \
-				((d)->consumetime >= (d)->supplytime))
-#define	ring_full(d) (((d)->supply == (d)->consume) && \
-				((d)->supplytime > (d)->consumetime))
-
-
-
-
-
-/* Buffer state transition routines */
-
-	int
-    ring_init(ring, buffer, count)
-Ring *ring;
-    unsigned char *buffer;
-    int count;
-{
-    memset((char *)ring, 0, sizeof *ring);
-
-    ring->size = count;
-
-    ring->supply = ring->consume = ring->bottom = buffer;
-
-    ring->top = ring->bottom+ring->size;
-
-#ifdef	ENCRYPTION
-    ring->clearto = 0;
-#endif	/* ENCRYPTION */
-
-    return 1;
-}
-
-/* Mark routines */
-
-/*
- * Mark the most recently supplied byte.
- */
-
-    void
-ring_mark(ring)
-    Ring *ring;
-{
-    ring->mark = ring_decrement(ring, ring->supply, 1);
-}
-
-/*
- * Is the ring pointing to the mark?
- */
-
-    int
-ring_at_mark(ring)
-    Ring *ring;
-{
-    if (ring->mark == ring->consume) {
-	return 1;
-    } else {
-	return 0;
-    }
-}
-
-/*
- * Clear any mark set on the ring.
- */
-
-    void
-ring_clear_mark(ring)
-    Ring *ring;
-{
-    ring->mark = 0;
-}
-
-/*
- * Add characters from current segment to ring buffer.
- */
-    void
-ring_supplied(ring, count)
-    Ring *ring;
-    int count;
-{
-    ring->supply = ring_increment(ring, ring->supply, count);
-    ring->supplytime = ++ring_clock;
-}
-
-/*
- * We have just consumed "c" bytes.
- */
-    void
-ring_consumed(ring, count)
-    Ring *ring;
-    int count;
-{
-    if (count == 0)	/* don't update anything */
-	return;
-
-    if (ring->mark &&
-		(ring_subtract(ring, ring->mark, ring->consume) < count)) {
-	ring->mark = 0;
-    }
-#ifdef	ENCRYPTION
-    if (ring->consume < ring->clearto &&
-		ring->clearto <= ring->consume + count)
-	ring->clearto = 0;
-    else if (ring->consume + count > ring->top &&
-		ring->bottom <= ring->clearto &&
-		ring->bottom + ((ring->consume + count) - ring->top))
-	ring->clearto = 0;
-#endif	/* ENCRYPTION */
-    ring->consume = ring_increment(ring, ring->consume, count);
-    ring->consumetime = ++ring_clock;
-    /*
-     * Try to encourage "ring_empty_consecutive()" to be large.
-     */
-    if (ring_empty(ring)) {
-	ring->consume = ring->supply = ring->bottom;
-    }
-}
-
-
-
-/* Buffer state query routines */
-
-
-/* Number of bytes that may be supplied */
-    int
-ring_empty_count(ring)
-    Ring *ring;
-{
-    if (ring_empty(ring)) {	/* if empty */
-	    return ring->size;
-    } else {
-	return ring_subtract(ring, ring->consume, ring->supply);
-    }
-}
-
-/* number of CONSECUTIVE bytes that may be supplied */
-    int
-ring_empty_consecutive(ring)
-    Ring *ring;
-{
-    if ((ring->consume < ring->supply) || ring_empty(ring)) {
-			    /*
-			     * if consume is "below" supply, or empty, then
-			     * return distance to the top
-			     */
-	return ring_subtract(ring, ring->top, ring->supply);
-    } else {
-				    /*
-				     * else, return what we may.
-				     */
-	return ring_subtract(ring, ring->consume, ring->supply);
-    }
-}
-
-/* Return the number of bytes that are available for consuming
- * (but don't give more than enough to get to cross over set mark)
- */
-
-    int
-ring_full_count(ring)
-    Ring *ring;
-{
-    if ((ring->mark == 0) || (ring->mark == ring->consume)) {
-	if (ring_full(ring)) {
-	    return ring->size;	/* nothing consumed, but full */
-	} else {
-	    return ring_subtract(ring, ring->supply, ring->consume);
-	}
-    } else {
-	return ring_subtract(ring, ring->mark, ring->consume);
-    }
-}
-
-/*
- * Return the number of CONSECUTIVE bytes available for consuming.
- * However, don't return more than enough to cross over set mark.
- */
-    int
-ring_full_consecutive(ring)
-    Ring *ring;
-{
-    if ((ring->mark == 0) || (ring->mark == ring->consume)) {
-	if ((ring->supply < ring->consume) || ring_full(ring)) {
-	    return ring_subtract(ring, ring->top, ring->consume);
-	} else {
-	    return ring_subtract(ring, ring->supply, ring->consume);
-	}
-    } else {
-	if (ring->mark < ring->consume) {
-	    return ring_subtract(ring, ring->top, ring->consume);
-	} else {	/* Else, distance to mark */
-	    return ring_subtract(ring, ring->mark, ring->consume);
-	}
-    }
-}
-
-/*
- * Move data into the "supply" portion of of the ring buffer.
- */
-    void
-ring_supply_data(ring, buffer, count)
-    Ring *ring;
-    unsigned char *buffer;
-    int count;
-{
-    int i;
-
-    while (count) {
-	i = MIN(count, ring_empty_consecutive(ring));
-	memmove(ring->supply, buffer, i);
-	ring_supplied(ring, i);
-	count -= i;
-	buffer += i;
-    }
-}
-
-#ifdef notdef
-
-/*
- * Move data from the "consume" portion of the ring buffer
- */
-    void
-ring_consume_data(ring, buffer, count)
-    Ring *ring;
-    unsigned char *buffer;
-    int count;
-{
-    int i;
-
-    while (count) {
-	i = MIN(count, ring_full_consecutive(ring));
-	memmove(buffer, ring->consume, i);
-	ring_consumed(ring, i);
-	count -= i;
-	buffer += i;
-    }
-}
-#endif
-
-#ifdef	ENCRYPTION
-    void
-ring_encrypt(ring, encryptor)
-    Ring *ring;
-    void (*encryptor)();
-{
-    unsigned char *s, *c;
-
-    if (ring_empty(ring) || ring->clearto == ring->supply)
-	return;
-
-    if (!(c = ring->clearto))
-	c = ring->consume;
-
-    s = ring->supply;
-
-    if (s <= c) {
-	(*encryptor)(c, ring->top - c);
-	(*encryptor)(ring->bottom, s - ring->bottom);
-    } else
-	(*encryptor)(c, s - c);
-
-    ring->clearto = ring->supply;
-}
-
-    void
-ring_clearto(ring)
-    Ring *ring;
-{
-    if (!ring_empty(ring))
-	ring->clearto = ring->supply;
-    else
-	ring->clearto = 0;
-}
-#endif	/* ENCRYPTION */
diff --git a/crypto/telnet/telnet/ring.h b/crypto/telnet/telnet/ring.h
deleted file mode 100644
index 2a36781e5ae5..000000000000
--- a/crypto/telnet/telnet/ring.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ring.h	8.1 (Berkeley) 6/6/93
- */
-
-#if defined(P)
-# undef P
-#endif
-
-#if defined(__STDC__) || defined(LINT_ARGS)
-# define	P(x)	x
-#else
-# define	P(x)	()
-#endif
-
-/*
- * This defines a structure for a ring buffer.
- *
- * The circular buffer has two parts:
- *(((
- *	full:	[consume, supply)
- *	empty:	[supply, consume)
- *]]]
- *
- */
-typedef struct {
-    unsigned char	*consume,	/* where data comes out of */
-			*supply,	/* where data comes in to */
-			*bottom,	/* lowest address in buffer */
-			*top,		/* highest address+1 in buffer */
-			*mark;		/* marker (user defined) */
-#ifdef	ENCRYPTION
-    unsigned char	*clearto;	/* Data to this point is clear text */
-    unsigned char	*encryyptedto;	/* Data is encrypted to here */
-#endif	/* ENCRYPTION */
-    int		size;		/* size in bytes of buffer */
-    u_long	consumetime,	/* help us keep straight full, empty, etc. */
-		supplytime;
-} Ring;
-
-/* Here are some functions and macros to deal with the ring buffer */
-
-/* Initialization routine */
-extern int
-	ring_init P((Ring *ring, unsigned char *buffer, int count));
-
-/* Data movement routines */
-extern void
-	ring_supply_data P((Ring *ring, unsigned char *buffer, int count));
-#ifdef notdef
-extern void
-	ring_consume_data P((Ring *ring, unsigned char *buffer, int count));
-#endif
-
-/* Buffer state transition routines */
-extern void
-	ring_supplied P((Ring *ring, int count)),
-	ring_consumed P((Ring *ring, int count));
-
-/* Buffer state query routines */
-extern int
-	ring_empty_count P((Ring *ring)),
-	ring_empty_consecutive P((Ring *ring)),
-	ring_full_count P((Ring *ring)),
-	ring_full_consecutive P((Ring *ring));
-
-#ifdef	ENCRYPTION
-extern void
-	ring_encrypt P((Ring *ring, void (*func)())),
-	ring_clearto P((Ring *ring));
-#endif	/* ENCRYPTION */
-
-extern void
-    ring_clear_mark(),
-    ring_mark();
diff --git a/crypto/telnet/telnet/sys_bsd.c b/crypto/telnet/telnet/sys_bsd.c
deleted file mode 100644
index ed5f459e957c..000000000000
--- a/crypto/telnet/telnet/sys_bsd.c
+++ /dev/null
@@ -1,1221 +0,0 @@
-/*
- * Copyright (c) 1988, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static const char sccsid[] = "@(#)sys_bsd.c	8.4 (Berkeley) 5/30/95";
-#endif /* not lint */
-
-/*
- * The following routines try to encapsulate what is system dependent
- * (at least between 4.x and dos) which is used in telnet.c.
- */
-
-
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <signal.h>
-#include <errno.h>
-#include <arpa/telnet.h>
-#include <unistd.h>
-
-#include "ring.h"
-
-#include "fdset.h"
-
-#include "defines.h"
-#include "externs.h"
-#include "types.h"
-
-#if	defined(CRAY) || (defined(USE_TERMIO) && !defined(SYSV_TERMIO))
-#define	SIG_FUNC_RET	void
-#else
-#define	SIG_FUNC_RET	int
-#endif
-
-#ifdef	SIGINFO
-extern SIG_FUNC_RET ayt_status();
-#endif
-
-int
-	tout,			/* Output file descriptor */
-	tin,			/* Input file descriptor */
-	net;
-
-#ifndef	USE_TERMIO
-struct	tchars otc = { 0 }, ntc = { 0 };
-struct	ltchars oltc = { 0 }, nltc = { 0 };
-struct	sgttyb ottyb = { 0 }, nttyb = { 0 };
-int	olmode = 0;
-# define cfgetispeed(ptr)	(ptr)->sg_ispeed
-# define cfgetospeed(ptr)	(ptr)->sg_ospeed
-# define old_tc ottyb
-
-#else	/* USE_TERMIO */
-struct	termio old_tc = { 0 };
-extern struct termio new_tc;
-
-# ifndef	TCSANOW
-#  ifdef TCSETS
-#   define	TCSANOW		TCSETS
-#   define	TCSADRAIN	TCSETSW
-#   define	tcgetattr(f, t) ioctl(f, TCGETS, (char *)t)
-#  else
-#   ifdef TCSETA
-#    define	TCSANOW		TCSETA
-#    define	TCSADRAIN	TCSETAW
-#    define	tcgetattr(f, t) ioctl(f, TCGETA, (char *)t)
-#   else
-#    define	TCSANOW		TIOCSETA
-#    define	TCSADRAIN	TIOCSETAW
-#    define	tcgetattr(f, t) ioctl(f, TIOCGETA, (char *)t)
-#   endif
-#  endif
-#  define	tcsetattr(f, a, t) ioctl(f, a, (char *)t)
-#  define	cfgetospeed(ptr)	((ptr)->c_cflag&CBAUD)
-#  ifdef CIBAUD
-#   define	cfgetispeed(ptr)	(((ptr)->c_cflag&CIBAUD) >> IBSHIFT)
-#  else
-#   define	cfgetispeed(ptr)	cfgetospeed(ptr)
-#  endif
-# endif /* TCSANOW */
-# ifdef	sysV88
-# define TIOCFLUSH TC_PX_DRAIN
-# endif
-#endif	/* USE_TERMIO */
-
-static fd_set ibits, obits, xbits;
-
-
-    void
-init_sys()
-{
-    tout = fileno(stdout);
-    tin = fileno(stdin);
-    FD_ZERO(&ibits);
-    FD_ZERO(&obits);
-    FD_ZERO(&xbits);
-
-    errno = 0;
-}
-
-
-    int
-TerminalWrite(buf, n)
-    char *buf;
-    int  n;
-{
-    return write(tout, buf, n);
-}
-
-    int
-TerminalRead(buf, n)
-    char *buf;
-    int  n;
-{
-    return read(tin, buf, n);
-}
-
-/*
- *
- */
-
-    int
-TerminalAutoFlush()
-{
-#if	defined(LNOFLSH)
-    int flush;
-
-    ioctl(0, TIOCLGET, (char *)&flush);
-    return !(flush&LNOFLSH);	/* if LNOFLSH, no autoflush */
-#else	/* LNOFLSH */
-    return 1;
-#endif	/* LNOFLSH */
-}
-
-#ifdef	KLUDGELINEMODE
-extern int kludgelinemode;
-#endif
-/*
- * TerminalSpecialChars()
- *
- * Look at an input character to see if it is a special character
- * and decide what to do.
- *
- * Output:
- *
- *	0	Don't add this character.
- *	1	Do add this character
- */
-
-extern void xmitAO(), xmitEL(), xmitEC(), intp(), sendbrk();
-
-    int
-TerminalSpecialChars(c)
-    int	c;
-{
-    if (c == termIntChar) {
-	intp();
-	return 0;
-    } else if (c == termQuitChar) {
-#ifdef	KLUDGELINEMODE
-	if (kludgelinemode)
-	    sendbrk();
-	else
-#endif
-	    sendabort();
-	return 0;
-    } else if (c == termEofChar) {
-	if (my_want_state_is_will(TELOPT_LINEMODE)) {
-	    sendeof();
-	    return 0;
-	}
-	return 1;
-    } else if (c == termSuspChar) {
-	sendsusp();
-	return(0);
-    } else if (c == termFlushChar) {
-	xmitAO();		/* Transmit Abort Output */
-	return 0;
-    } else if (!MODE_LOCAL_CHARS(globalmode)) {
-	if (c == termKillChar) {
-	    xmitEL();
-	    return 0;
-	} else if (c == termEraseChar) {
-	    xmitEC();		/* Transmit Erase Character */
-	    return 0;
-	}
-    }
-    return 1;
-}
-
-
-/*
- * Flush output to the terminal
- */
-
-    void
-TerminalFlushOutput()
-{
-#ifdef	TIOCFLUSH
-    (void) ioctl(fileno(stdout), TIOCFLUSH, (char *) 0);
-#else
-    (void) ioctl(fileno(stdout), TCFLSH, (char *) 0);
-#endif
-}
-
-    void
-TerminalSaveState()
-{
-#ifndef	USE_TERMIO
-    ioctl(0, TIOCGETP, (char *)&ottyb);
-    ioctl(0, TIOCGETC, (char *)&otc);
-    ioctl(0, TIOCGLTC, (char *)&oltc);
-    ioctl(0, TIOCLGET, (char *)&olmode);
-
-    ntc = otc;
-    nltc = oltc;
-    nttyb = ottyb;
-
-#else	/* USE_TERMIO */
-    tcgetattr(0, &old_tc);
-
-    new_tc = old_tc;
-
-#ifndef	VDISCARD
-    termFlushChar = CONTROL('O');
-#endif
-#ifndef	VWERASE
-    termWerasChar = CONTROL('W');
-#endif
-#ifndef	VREPRINT
-    termRprntChar = CONTROL('R');
-#endif
-#ifndef	VLNEXT
-    termLiteralNextChar = CONTROL('V');
-#endif
-#ifndef	VSTART
-    termStartChar = CONTROL('Q');
-#endif
-#ifndef	VSTOP
-    termStopChar = CONTROL('S');
-#endif
-#ifndef	VSTATUS
-    termAytChar = CONTROL('T');
-#endif
-#endif	/* USE_TERMIO */
-}
-
-    cc_t *
-tcval(func)
-    register int func;
-{
-    switch(func) {
-    case SLC_IP:	return(&termIntChar);
-    case SLC_ABORT:	return(&termQuitChar);
-    case SLC_EOF:	return(&termEofChar);
-    case SLC_EC:	return(&termEraseChar);
-    case SLC_EL:	return(&termKillChar);
-    case SLC_XON:	return(&termStartChar);
-    case SLC_XOFF:	return(&termStopChar);
-    case SLC_FORW1:	return(&termForw1Char);
-#ifdef	USE_TERMIO
-    case SLC_FORW2:	return(&termForw2Char);
-# ifdef	VDISCARD
-    case SLC_AO:	return(&termFlushChar);
-# endif
-# ifdef	VSUSP
-    case SLC_SUSP:	return(&termSuspChar);
-# endif
-# ifdef	VWERASE
-    case SLC_EW:	return(&termWerasChar);
-# endif
-# ifdef	VREPRINT
-    case SLC_RP:	return(&termRprntChar);
-# endif
-# ifdef	VLNEXT
-    case SLC_LNEXT:	return(&termLiteralNextChar);
-# endif
-# ifdef	VSTATUS
-    case SLC_AYT:	return(&termAytChar);
-# endif
-#endif
-
-    case SLC_SYNCH:
-    case SLC_BRK:
-    case SLC_EOR:
-    default:
-	return((cc_t *)0);
-    }
-}
-
-    void
-TerminalDefaultChars()
-{
-#ifndef	USE_TERMIO
-    ntc = otc;
-    nltc = oltc;
-    nttyb.sg_kill = ottyb.sg_kill;
-    nttyb.sg_erase = ottyb.sg_erase;
-#else	/* USE_TERMIO */
-    memmove(new_tc.c_cc, old_tc.c_cc, sizeof(old_tc.c_cc));
-# ifndef	VDISCARD
-    termFlushChar = CONTROL('O');
-# endif
-# ifndef	VWERASE
-    termWerasChar = CONTROL('W');
-# endif
-# ifndef	VREPRINT
-    termRprntChar = CONTROL('R');
-# endif
-# ifndef	VLNEXT
-    termLiteralNextChar = CONTROL('V');
-# endif
-# ifndef	VSTART
-    termStartChar = CONTROL('Q');
-# endif
-# ifndef	VSTOP
-    termStopChar = CONTROL('S');
-# endif
-# ifndef	VSTATUS
-    termAytChar = CONTROL('T');
-# endif
-#endif	/* USE_TERMIO */
-}
-
-#ifdef notdef
-void
-TerminalRestoreState()
-{
-}
-#endif
-
-/*
- * TerminalNewMode - set up terminal to a specific mode.
- *	MODE_ECHO: do local terminal echo
- *	MODE_FLOW: do local flow control
- *	MODE_TRAPSIG: do local mapping to TELNET IAC sequences
- *	MODE_EDIT: do local line editing
- *
- *	Command mode:
- *		MODE_ECHO|MODE_EDIT|MODE_FLOW|MODE_TRAPSIG
- *		local echo
- *		local editing
- *		local xon/xoff
- *		local signal mapping
- *
- *	Linemode:
- *		local/no editing
- *	Both Linemode and Single Character mode:
- *		local/remote echo
- *		local/no xon/xoff
- *		local/no signal mapping
- */
-
-
-    void
-TerminalNewMode(f)
-    register int f;
-{
-    static int prevmode = 0;
-#ifndef	USE_TERMIO
-    struct tchars tc;
-    struct ltchars ltc;
-    struct sgttyb sb;
-    int lmode;
-#else	/* USE_TERMIO */
-    struct termio tmp_tc;
-#endif	/* USE_TERMIO */
-    int onoff;
-    int old;
-    cc_t esc;
-
-    globalmode = f&~MODE_FORCE;
-    if (prevmode == f)
-	return;
-
-    /*
-     * Write any outstanding data before switching modes
-     * ttyflush() returns 0 only when there is no more data
-     * left to write out, it returns -1 if it couldn't do
-     * anything at all, otherwise it returns 1 + the number
-     * of characters left to write.
-#ifndef	USE_TERMIO
-     * We would really like ask the kernel to wait for the output
-     * to drain, like we can do with the TCSADRAIN, but we don't have
-     * that option.  The only ioctl that waits for the output to
-     * drain, TIOCSETP, also flushes the input queue, which is NOT
-     * what we want (TIOCSETP is like TCSADFLUSH).
-#endif
-     */
-    old = ttyflush(SYNCHing|flushout);
-    if (old < 0 || old > 1) {
-#ifdef	USE_TERMIO
-	tcgetattr(tin, &tmp_tc);
-#endif	/* USE_TERMIO */
-	do {
-	    /*
-	     * Wait for data to drain, then flush again.
-	     */
-#ifdef	USE_TERMIO
-	    tcsetattr(tin, TCSADRAIN, &tmp_tc);
-#endif	/* USE_TERMIO */
-	    old = ttyflush(SYNCHing|flushout);
-	} while (old < 0 || old > 1);
-    }
-
-    old = prevmode;
-    prevmode = f&~MODE_FORCE;
-#ifndef	USE_TERMIO
-    sb = nttyb;
-    tc = ntc;
-    ltc = nltc;
-    lmode = olmode;
-#else
-    tmp_tc = new_tc;
-#endif
-
-    if (f&MODE_ECHO) {
-#ifndef	USE_TERMIO
-	sb.sg_flags |= ECHO;
-#else
-	tmp_tc.c_lflag |= ECHO;
-	tmp_tc.c_oflag |= ONLCR;
-	if (crlf)
-		tmp_tc.c_iflag |= ICRNL;
-#endif
-    } else {
-#ifndef	USE_TERMIO
-	sb.sg_flags &= ~ECHO;
-#else
-	tmp_tc.c_lflag &= ~ECHO;
-	tmp_tc.c_oflag &= ~ONLCR;
-# ifdef notdef
-	if (crlf)
-		tmp_tc.c_iflag &= ~ICRNL;
-# endif
-#endif
-    }
-
-    if ((f&MODE_FLOW) == 0) {
-#ifndef	USE_TERMIO
-	tc.t_startc = _POSIX_VDISABLE;
-	tc.t_stopc = _POSIX_VDISABLE;
-#else
-	tmp_tc.c_iflag &= ~(IXOFF|IXON);	/* Leave the IXANY bit alone */
-    } else {
-	if (restartany < 0) {
-		tmp_tc.c_iflag |= IXOFF|IXON;	/* Leave the IXANY bit alone */
-	} else if (restartany > 0) {
-		tmp_tc.c_iflag |= IXOFF|IXON|IXANY;
-	} else {
-		tmp_tc.c_iflag |= IXOFF|IXON;
-		tmp_tc.c_iflag &= ~IXANY;
-	}
-#endif
-    }
-
-    if ((f&MODE_TRAPSIG) == 0) {
-#ifndef	USE_TERMIO
-	tc.t_intrc = _POSIX_VDISABLE;
-	tc.t_quitc = _POSIX_VDISABLE;
-	tc.t_eofc = _POSIX_VDISABLE;
-	ltc.t_suspc = _POSIX_VDISABLE;
-	ltc.t_dsuspc = _POSIX_VDISABLE;
-#else
-	tmp_tc.c_lflag &= ~ISIG;
-#endif
-	localchars = 0;
-    } else {
-#ifdef	USE_TERMIO
-	tmp_tc.c_lflag |= ISIG;
-#endif
-	localchars = 1;
-    }
-
-    if (f&MODE_EDIT) {
-#ifndef	USE_TERMIO
-	sb.sg_flags &= ~CBREAK;
-	sb.sg_flags |= CRMOD;
-#else
-	tmp_tc.c_lflag |= ICANON;
-#endif
-    } else {
-#ifndef	USE_TERMIO
-	sb.sg_flags |= CBREAK;
-	if (f&MODE_ECHO)
-	    sb.sg_flags |= CRMOD;
-	else
-	    sb.sg_flags &= ~CRMOD;
-#else
-	tmp_tc.c_lflag &= ~ICANON;
-	tmp_tc.c_iflag &= ~ICRNL;
-	tmp_tc.c_cc[VMIN] = 1;
-	tmp_tc.c_cc[VTIME] = 0;
-#endif
-    }
-
-    if ((f&(MODE_EDIT|MODE_TRAPSIG)) == 0) {
-#ifndef	USE_TERMIO
-	ltc.t_lnextc = _POSIX_VDISABLE;
-#else
-# ifdef VLNEXT
-	tmp_tc.c_cc[VLNEXT] = (cc_t)(_POSIX_VDISABLE);
-# endif
-#endif
-    }
-
-    if (f&MODE_SOFT_TAB) {
-#ifndef USE_TERMIO
-	sb.sg_flags |= XTABS;
-#else
-# ifdef	OXTABS
-	tmp_tc.c_oflag |= OXTABS;
-# endif
-# ifdef	TABDLY
-	tmp_tc.c_oflag &= ~TABDLY;
-	tmp_tc.c_oflag |= TAB3;
-# endif
-#endif
-    } else {
-#ifndef USE_TERMIO
-	sb.sg_flags &= ~XTABS;
-#else
-# ifdef	OXTABS
-	tmp_tc.c_oflag &= ~OXTABS;
-# endif
-# ifdef	TABDLY
-	tmp_tc.c_oflag &= ~TABDLY;
-# endif
-#endif
-    }
-
-    if (f&MODE_LIT_ECHO) {
-#ifndef USE_TERMIO
-	lmode &= ~LCTLECH;
-#else
-# ifdef	ECHOCTL
-	tmp_tc.c_lflag &= ~ECHOCTL;
-# endif
-#endif
-    } else {
-#ifndef USE_TERMIO
-	lmode |= LCTLECH;
-#else
-# ifdef	ECHOCTL
-	tmp_tc.c_lflag |= ECHOCTL;
-# endif
-#endif
-    }
-
-    if (f == -1) {
-	onoff = 0;
-    } else {
-#ifndef	USE_TERMIO
-	if (f & MODE_OUTBIN)
-		lmode |= LLITOUT;
-	else
-		lmode &= ~LLITOUT;
-
-	if (f & MODE_INBIN)
-		lmode |= LPASS8;
-	else
-		lmode &= ~LPASS8;
-#else
-	if (f & MODE_INBIN)
-		tmp_tc.c_iflag &= ~ISTRIP;
-	else
-		tmp_tc.c_iflag |= ISTRIP;
-	if (f & MODE_OUTBIN) {
-		tmp_tc.c_cflag &= ~(CSIZE|PARENB);
-		tmp_tc.c_cflag |= CS8;
-		tmp_tc.c_oflag &= ~OPOST;
-	} else {
-		tmp_tc.c_cflag &= ~(CSIZE|PARENB);
-		tmp_tc.c_cflag |= old_tc.c_cflag & (CSIZE|PARENB);
-		tmp_tc.c_oflag |= OPOST;
-	}
-#endif
-	onoff = 1;
-    }
-
-    if (f != -1) {
-#ifdef	SIGTSTP
-	SIG_FUNC_RET susp();
-#endif	/* SIGTSTP */
-#ifdef	SIGINFO
-	SIG_FUNC_RET ayt();
-#endif
-
-#ifdef	SIGTSTP
-	(void) signal(SIGTSTP, susp);
-#endif	/* SIGTSTP */
-#ifdef	SIGINFO
-	(void) signal(SIGINFO, ayt);
-#endif
-#if	defined(USE_TERMIO) && defined(NOKERNINFO)
-	tmp_tc.c_lflag |= NOKERNINFO;
-#endif
-	/*
-	 * We don't want to process ^Y here.  It's just another
-	 * character that we'll pass on to the back end.  It has
-	 * to process it because it will be processed when the
-	 * user attempts to read it, not when we send it.
-	 */
-#ifndef	USE_TERMIO
-	ltc.t_dsuspc = _POSIX_VDISABLE;
-#else
-# ifdef	VDSUSP
-	tmp_tc.c_cc[VDSUSP] = (cc_t)(_POSIX_VDISABLE);
-# endif
-#endif
-#ifdef	USE_TERMIO
-	/*
-	 * If the VEOL character is already set, then use VEOL2,
-	 * otherwise use VEOL.
-	 */
-	esc = (rlogin != _POSIX_VDISABLE) ? rlogin : escape;
-	if ((tmp_tc.c_cc[VEOL] != esc)
-# ifdef	VEOL2
-	    && (tmp_tc.c_cc[VEOL2] != esc)
-# endif
-	    ) {
-		if (tmp_tc.c_cc[VEOL] == (cc_t)(_POSIX_VDISABLE))
-		    tmp_tc.c_cc[VEOL] = esc;
-# ifdef	VEOL2
-		else if (tmp_tc.c_cc[VEOL2] == (cc_t)(_POSIX_VDISABLE))
-		    tmp_tc.c_cc[VEOL2] = esc;
-# endif
-	}
-#else
-	if (tc.t_brkc == (cc_t)(_POSIX_VDISABLE))
-		tc.t_brkc = esc;
-#endif
-    } else {
-#ifdef	SIGINFO
-	SIG_FUNC_RET ayt_status();
-
-	(void) signal(SIGINFO, ayt_status);
-#endif
-#ifdef	SIGTSTP
-	(void) signal(SIGTSTP, SIG_DFL);
-# ifndef SOLARIS
-	(void) sigsetmask(sigblock(0) & ~(1<<(SIGTSTP-1)));
-# else	SOLARIS
-	(void) sigrelse(SIGTSTP);
-# endif	SOLARIS
-#endif	/* SIGTSTP */
-#ifndef USE_TERMIO
-	ltc = oltc;
-	tc = otc;
-	sb = ottyb;
-	lmode = olmode;
-#else
-	tmp_tc = old_tc;
-#endif
-    }
-#ifndef USE_TERMIO
-    ioctl(tin, TIOCLSET, (char *)&lmode);
-    ioctl(tin, TIOCSLTC, (char *)&ltc);
-    ioctl(tin, TIOCSETC, (char *)&tc);
-    ioctl(tin, TIOCSETN, (char *)&sb);
-#else
-    if (tcsetattr(tin, TCSADRAIN, &tmp_tc) < 0)
-	tcsetattr(tin, TCSANOW, &tmp_tc);
-#endif
-
-#if	(!defined(TN3270)) || ((!defined(NOT43)) || defined(PUTCHAR))
-# if	!defined(sysV88)
-    ioctl(tin, FIONBIO, (char *)&onoff);
-    ioctl(tout, FIONBIO, (char *)&onoff);
-# endif
-#endif	/* (!defined(TN3270)) || ((!defined(NOT43)) || defined(PUTCHAR)) */
-#if	defined(TN3270)
-    if (noasynchtty == 0) {
-	ioctl(tin, FIOASYNC, (char *)&onoff);
-    }
-#endif	/* defined(TN3270) */
-
-}
-
-/*
- * Try to guess whether speeds are "encoded" (4.2BSD) or just numeric (4.4BSD).
- */
-#if B4800 != 4800
-#define	DECODE_BAUD
-#endif
-
-#ifdef	DECODE_BAUD
-#ifndef	B7200
-#define B7200   B4800
-#endif
-
-#ifndef	B14400
-#define B14400  B9600
-#endif
-
-#ifndef	B19200
-# define B19200 B14400
-#endif
-
-#ifndef	B28800
-#define B28800  B19200
-#endif
-
-#ifndef	B38400
-# define B38400 B28800
-#endif
-
-#ifndef B57600
-#define B57600  B38400
-#endif
-
-#ifndef B76800
-#define B76800  B57600
-#endif
-
-#ifndef B115200
-#define B115200 B76800
-#endif
-
-#ifndef B230400
-#define B230400 B115200
-#endif
-
-
-/*
- * This code assumes that the values B0, B50, B75...
- * are in ascending order.  They do not have to be
- * contiguous.
- */
-struct termspeeds {
-	long speed;
-	long value;
-} termspeeds[] = {
-	{ 0,      B0 },      { 50,    B50 },    { 75,     B75 },
-	{ 110,    B110 },    { 134,   B134 },   { 150,    B150 },
-	{ 200,    B200 },    { 300,   B300 },   { 600,    B600 },
-	{ 1200,   B1200 },   { 1800,  B1800 },  { 2400,   B2400 },
-	{ 4800,   B4800 },   { 7200,  B7200 },  { 9600,   B9600 },
-	{ 14400,  B14400 },  { 19200, B19200 }, { 28800,  B28800 },
-	{ 38400,  B38400 },  { 57600, B57600 }, { 115200, B115200 },
-	{ 230400, B230400 }, { -1,    B230400 }
-};
-#endif	/* DECODE_BAUD */
-
-    void
-TerminalSpeeds(ispeed, ospeed)
-    long *ispeed;
-    long *ospeed;
-{
-#ifdef	DECODE_BAUD
-    register struct termspeeds *tp;
-#endif	/* DECODE_BAUD */
-    register long in, out;
-
-    out = cfgetospeed(&old_tc);
-    in = cfgetispeed(&old_tc);
-    if (in == 0)
-	in = out;
-
-#ifdef	DECODE_BAUD
-    tp = termspeeds;
-    while ((tp->speed != -1) && (tp->value < in))
-	tp++;
-    *ispeed = tp->speed;
-
-    tp = termspeeds;
-    while ((tp->speed != -1) && (tp->value < out))
-	tp++;
-    *ospeed = tp->speed;
-#else	/* DECODE_BAUD */
-	*ispeed = in;
-	*ospeed = out;
-#endif	/* DECODE_BAUD */
-}
-
-    int
-TerminalWindowSize(rows, cols)
-    long *rows, *cols;
-{
-#ifdef	TIOCGWINSZ
-    struct winsize ws;
-
-    if (ioctl(fileno(stdin), TIOCGWINSZ, (char *)&ws) >= 0) {
-	*rows = ws.ws_row;
-	*cols = ws.ws_col;
-	return 1;
-    }
-#endif	/* TIOCGWINSZ */
-    return 0;
-}
-
-    int
-NetClose(fd)
-    int	fd;
-{
-    return close(fd);
-}
-
-
-    void
-NetNonblockingIO(fd, onoff)
-    int fd;
-    int onoff;
-{
-    ioctl(fd, FIONBIO, (char *)&onoff);
-}
-
-#if	defined(TN3270)
-    void
-NetSigIO(fd, onoff)
-    int fd;
-    int onoff;
-{
-    ioctl(fd, FIOASYNC, (char *)&onoff);	/* hear about input */
-}
-
-    void
-NetSetPgrp(fd)
-    int fd;
-{
-    int myPid;
-
-    myPid = getpid();
-    fcntl(fd, F_SETOWN, myPid);
-}
-#endif	/*defined(TN3270)*/
-
-/*
- * Various signal handling routines.
- */
-
-    /* ARGSUSED */
-    SIG_FUNC_RET
-deadpeer(sig)
-    int sig;
-{
-	setcommandmode();
-	longjmp(peerdied, -1);
-}
-
-    /* ARGSUSED */
-    SIG_FUNC_RET
-intr(sig)
-    int sig;
-{
-    if (localchars) {
-	intp();
-	return;
-    }
-    setcommandmode();
-    longjmp(toplevel, -1);
-}
-
-    /* ARGSUSED */
-    SIG_FUNC_RET
-intr2(sig)
-    int sig;
-{
-    if (localchars) {
-#ifdef	KLUDGELINEMODE
-	if (kludgelinemode)
-	    sendbrk();
-	else
-#endif
-	    sendabort();
-	return;
-    }
-}
-
-#ifdef	SIGTSTP
-    /* ARGSUSED */
-    SIG_FUNC_RET
-susp(sig)
-    int sig;
-{
-    if ((rlogin != _POSIX_VDISABLE) && rlogin_susp())
-	return;
-    if (localchars)
-	sendsusp();
-}
-#endif
-
-#ifdef	SIGWINCH
-    /* ARGSUSED */
-    SIG_FUNC_RET
-sendwin(sig)
-    int sig;
-{
-    if (connected) {
-	sendnaws();
-    }
-}
-#endif
-
-#ifdef	SIGINFO
-    /* ARGSUSED */
-    SIG_FUNC_RET
-ayt(sig)
-    int sig;
-{
-    if (connected)
-	sendayt();
-    else
-	ayt_status();
-}
-#endif
-
-
-    void
-sys_telnet_init()
-{
-    (void) signal(SIGINT, intr);
-    (void) signal(SIGQUIT, intr2);
-    (void) signal(SIGPIPE, deadpeer);
-#ifdef	SIGWINCH
-    (void) signal(SIGWINCH, sendwin);
-#endif
-#ifdef	SIGTSTP
-    (void) signal(SIGTSTP, susp);
-#endif
-#ifdef	SIGINFO
-    (void) signal(SIGINFO, ayt);
-#endif
-
-    setconnmode(0);
-
-    NetNonblockingIO(net, 1);
-
-#if	defined(TN3270)
-    if (noasynchnet == 0) {			/* DBX can't handle! */
-	NetSigIO(net, 1);
-	NetSetPgrp(net);
-    }
-#endif	/* defined(TN3270) */
-
-#if	defined(SO_OOBINLINE)
-    if (SetSockOpt(net, SOL_SOCKET, SO_OOBINLINE, 1) == -1) {
-	perror("SetSockOpt");
-    }
-#endif	/* defined(SO_OOBINLINE) */
-}
-
-/*
- * Process rings -
- *
- *	This routine tries to fill up/empty our various rings.
- *
- *	The parameter specifies whether this is a poll operation,
- *	or a block-until-something-happens operation.
- *
- *	The return value is 1 if something happened, 0 if not.
- */
-
-    int
-process_rings(netin, netout, netex, ttyin, ttyout, poll)
-    int poll;		/* If 0, then block until something to do */
-{
-    register int c;
-		/* One wants to be a bit careful about setting returnValue
-		 * to one, since a one implies we did some useful work,
-		 * and therefore probably won't be called to block next
-		 * time (TN3270 mode only).
-		 */
-    int returnValue = 0;
-    static struct timeval TimeValue = { 0 };
-
-    if (netout) {
-	FD_SET(net, &obits);
-    }
-    if (ttyout) {
-	FD_SET(tout, &obits);
-    }
-#if	defined(TN3270)
-    if (ttyin) {
-	FD_SET(tin, &ibits);
-    }
-#else	/* defined(TN3270) */
-    if (ttyin) {
-	FD_SET(tin, &ibits);
-    }
-#endif	/* defined(TN3270) */
-#if	defined(TN3270)
-    if (netin) {
-	FD_SET(net, &ibits);
-    }
-#   else /* !defined(TN3270) */
-    if (netin) {
-	FD_SET(net, &ibits);
-    }
-#   endif /* !defined(TN3270) */
-    if (netex) {
-	FD_SET(net, &xbits);
-    }
-    if ((c = select(16, &ibits, &obits, &xbits,
-			(poll == 0)? (struct timeval *)0 : &TimeValue)) < 0) {
-	if (c == -1) {
-		    /*
-		     * we can get EINTR if we are in line mode,
-		     * and the user does an escape (TSTP), or
-		     * some other signal generator.
-		     */
-	    if (errno == EINTR) {
-		return 0;
-	    }
-#	    if defined(TN3270)
-		    /*
-		     * we can get EBADF if we were in transparent
-		     * mode, and the transcom process died.
-		    */
-	    if (errno == EBADF) {
-			/*
-			 * zero the bits (even though kernel does it)
-			 * to make sure we are selecting on the right
-			 * ones.
-			*/
-		FD_ZERO(&ibits);
-		FD_ZERO(&obits);
-		FD_ZERO(&xbits);
-		return 0;
-	    }
-#	    endif /* defined(TN3270) */
-		    /* I don't like this, does it ever happen? */
-	    printf("sleep(5) from telnet, after select: %s\r\n", strerror(errno));
-	    sleep(5);
-	}
-	return 0;
-    }
-
-    /*
-     * Any urgent data?
-     */
-    if (FD_ISSET(net, &xbits)) {
-	FD_CLR(net, &xbits);
-	SYNCHing = 1;
-	(void) ttyflush(1);	/* flush already enqueued data */
-    }
-
-    /*
-     * Something to read from the network...
-     */
-    if (FD_ISSET(net, &ibits)) {
-	int canread;
-
-	FD_CLR(net, &ibits);
-	canread = ring_empty_consecutive(&netiring);
-#if	!defined(SO_OOBINLINE)
-	    /*
-	     * In 4.2 (and some early 4.3) systems, the
-	     * OOB indication and data handling in the kernel
-	     * is such that if two separate TCP Urgent requests
-	     * come in, one byte of TCP data will be overlaid.
-	     * This is fatal for Telnet, but we try to live
-	     * with it.
-	     *
-	     * In addition, in 4.2 (and...), a special protocol
-	     * is needed to pick up the TCP Urgent data in
-	     * the correct sequence.
-	     *
-	     * What we do is:  if we think we are in urgent
-	     * mode, we look to see if we are "at the mark".
-	     * If we are, we do an OOB receive.  If we run
-	     * this twice, we will do the OOB receive twice,
-	     * but the second will fail, since the second
-	     * time we were "at the mark", but there wasn't
-	     * any data there (the kernel doesn't reset
-	     * "at the mark" until we do a normal read).
-	     * Once we've read the OOB data, we go ahead
-	     * and do normal reads.
-	     *
-	     * There is also another problem, which is that
-	     * since the OOB byte we read doesn't put us
-	     * out of OOB state, and since that byte is most
-	     * likely the TELNET DM (data mark), we would
-	     * stay in the TELNET SYNCH (SYNCHing) state.
-	     * So, clocks to the rescue.  If we've "just"
-	     * received a DM, then we test for the
-	     * presence of OOB data when the receive OOB
-	     * fails (and AFTER we did the normal mode read
-	     * to clear "at the mark").
-	     */
-	if (SYNCHing) {
-	    int atmark;
-	    static int bogus_oob = 0, first = 1;
-
-	    ioctl(net, SIOCATMARK, (char *)&atmark);
-	    if (atmark) {
-		c = recv(net, netiring.supply, canread, MSG_OOB);
-		if ((c == -1) && (errno == EINVAL)) {
-		    c = recv(net, netiring.supply, canread, 0);
-		    if (clocks.didnetreceive < clocks.gotDM) {
-			SYNCHing = stilloob(net);
-		    }
-		} else if (first && c > 0) {
-		    /*
-		     * Bogosity check.  Systems based on 4.2BSD
-		     * do not return an error if you do a second
-		     * recv(MSG_OOB).  So, we do one.  If it
-		     * succeeds and returns exactly the same
-		     * data, then assume that we are running
-		     * on a broken system and set the bogus_oob
-		     * flag.  (If the data was different, then
-		     * we probably got some valid new data, so
-		     * increment the count...)
-		     */
-		    int i;
-		    i = recv(net, netiring.supply + c, canread - c, MSG_OOB);
-		    if (i == c &&
-			 memcmp(netiring.supply, netiring.supply + c, i) == 0) {
-			bogus_oob = 1;
-			first = 0;
-		    } else if (i < 0) {
-			bogus_oob = 0;
-			first = 0;
-		    } else
-			c += i;
-		}
-		if (bogus_oob && c > 0) {
-		    int i;
-		    /*
-		     * Bogosity.  We have to do the read
-		     * to clear the atmark to get out of
-		     * an infinate loop.
-		     */
-		    i = read(net, netiring.supply + c, canread - c);
-		    if (i > 0)
-			c += i;
-		}
-	    } else {
-		c = recv(net, netiring.supply, canread, 0);
-	    }
-	} else {
-	    c = recv(net, netiring.supply, canread, 0);
-	}
-	settimer(didnetreceive);
-#else	/* !defined(SO_OOBINLINE) */
-	c = recv(net, (char *)netiring.supply, canread, 0);
-#endif	/* !defined(SO_OOBINLINE) */
-	if (c < 0 && errno == EWOULDBLOCK) {
-	    c = 0;
-	} else if (c <= 0) {
-	    return -1;
-	}
-	if (netdata) {
-	    Dump('<', netiring.supply, c);
-	}
-	if (c)
-	    ring_supplied(&netiring, c);
-	returnValue = 1;
-    }
-
-    /*
-     * Something to read from the tty...
-     */
-    if (FD_ISSET(tin, &ibits)) {
-	FD_CLR(tin, &ibits);
-	c = TerminalRead(ttyiring.supply, ring_empty_consecutive(&ttyiring));
-	if (c < 0 && errno == EIO)
-	    c = 0;
-	if (c < 0 && errno == EWOULDBLOCK) {
-	    c = 0;
-	} else {
-	    /* EOF detection for line mode!!!! */
-	    if ((c == 0) && MODE_LOCAL_CHARS(globalmode) && isatty(tin)) {
-			/* must be an EOF... */
-		*ttyiring.supply = termEofChar;
-		c = 1;
-	    }
-	    if (c <= 0) {
-		return -1;
-	    }
-	    if (termdata) {
-		Dump('<', ttyiring.supply, c);
-	    }
-	    ring_supplied(&ttyiring, c);
-	}
-	returnValue = 1;		/* did something useful */
-    }
-
-    if (FD_ISSET(net, &obits)) {
-	FD_CLR(net, &obits);
-	returnValue |= netflush();
-    }
-    if (FD_ISSET(tout, &obits)) {
-	FD_CLR(tout, &obits);
-	returnValue |= (ttyflush(SYNCHing|flushout) > 0);
-    }
-
-    return returnValue;
-}
diff --git a/crypto/telnet/telnet/telnet.1 b/crypto/telnet/telnet/telnet.1
deleted file mode 100644
index 06b2b8ea395e..000000000000
--- a/crypto/telnet/telnet/telnet.1
+++ /dev/null
@@ -1,1376 +0,0 @@
-.\" Copyright (c) 1983, 1990, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"	@(#)telnet.1	8.6 (Berkeley) 6/1/94
-.\"
-.Dd June 1, 1994
-.Dt TELNET 1
-.Os BSD 4.2
-.Sh NAME
-.Nm telnet
-.Nd user interface to the 
-.Tn TELNET
-protocol
-.Sh SYNOPSIS
-.Nm telnet
-.Op Fl 8EFKLNacdfrx
-.Op Fl S Ar tos
-.Op Fl X Ar authtype
-.Op Fl e Ar escapechar
-.Op Fl k Ar realm
-.Op Fl l Ar user
-.Op Fl n Ar tracefile
-.Op Fl s Ar src_addr
-.Oo
-.Ar host
-.Op port
-.Oc
-.Sh DESCRIPTION
-The
-.Nm telnet
-command
-is used to communicate with another host using the 
-.Tn TELNET
-protocol.
-If
-.Nm telnet
-is invoked without the
-.Ar host
-argument, it enters command mode,
-indicated by its prompt
-.Pq Nm telnet\&> .
-In this mode, it accepts and executes the commands listed below.
-If it is invoked with arguments, it performs an
-.Ic open
-command with those arguments.
-.Pp
-Options:
-.Bl -tag -width indent
-.It Fl 8
-Specifies an 8-bit data path.  This causes an attempt to
-negotiate the
-.Dv TELNET BINARY
-option on both input and output.
-.It Fl E
-Stops any character from being recognized as an escape character.
-.It Fl F
-If Kerberos V5 authentication is being used, the
-.Fl F
-option allows the local credentials to be forwarded
-to the remote system, including any credentials that
-have already been forwarded into the local environment.
-.It Fl K
-Specifies no automatic login to the remote system.
-.It Fl L
-Specifies an 8-bit data path on output.  This causes the
-BINARY option to be negotiated on output.
-.It Fl N
-Prevents IP address to name lookup when destination host is given
-as an IP address.
-.It Fl S Ar tos
-Sets the IP type-of-service (TOS) option for the telnet
-connection to the value
-.Ar tos,
-which can be a numeric TOS value
-or, on systems that support it, a symbolic
-TOS name found in the /etc/iptos file.
-.It Fl X Ar atype 
-Disables the
-.Ar atype
-type of authentication.
-.It Fl a
-Attempt automatic login.
-Currently, this sends the user name via the
-.Ev USER
-variable
-of the
-.Ev ENVIRON
-option if supported by the remote system.
-The name used is that of the current user as returned by
-.Xr getlogin 2
-if it agrees with the current user ID,
-otherwise it is the name associated with the user ID.
-.It Fl c
-Disables the reading of the user's
-.Pa \&.telnetrc
-file.  (See the
-.Ic toggle skiprc
-command on this man page.)
-.It Fl d
-Sets the initial value of the
-.Ic debug
-toggle to
-.Dv TRUE
-.It Fl e Ar escape char 
-Sets the initial
-.Nm
-.Nm telnet
-escape character to
-.Ar escape char.
-If
-.Ar escape char
-is omitted, then
-there will be no escape character.
-.It Fl f
-If Kerberos V5 authentication is being used, the
-.Fl f
-option allows the local credentials to be forwarded to the remote system.
-.ne 1i
-.It Fl k Ar realm
-If Kerberos authentication is being used, the
-.Fl k
-option requests that telnet obtain tickets for the remote host in
-realm realm instead of the remote host's realm, as determined
-by
-.Xr krb_realmofhost 3 .
-.It Fl l Ar user 
-When connecting to the remote system, if the remote system
-understands the
-.Ev ENVIRON
-option, then
-.Ar user
-will be sent to the remote system as the value for the variable USER.
-This option implies the
-.Fl a
-option.
-This option may also be used with the
-.Ic open
-command.
-.It Fl n Ar tracefile 
-Opens
-.Ar tracefile
-for recording trace information.
-See the
-.Ic set tracefile
-command below.
-.It Fl r
-Specifies a user interface similar to
-.Xr rlogin 1 .
-In this
-mode, the escape character is set to the tilde (~) character,
-unless modified by the -e option.
-.It Fl s Ar src_addr
-Set the source IP address for the
-.Nm
-connection to
-.Ar src_addr ,
-which can be an IP address or a host name.
-.It Fl x
-Turns on encryption of the data stream if possible.  This
-option is not available outside of the United States and
-Canada.
-.It Ar host
-Indicates the official name, an alias, or the Internet address
-of a remote host.
-.It Ar port
-Indicates a port number (address of an application).  If a number is
-not specified, the default
-.Nm telnet
-port is used.
-.El
-.Pp
-When in rlogin mode, a line of the form ~.  disconnects from the
-remote host; ~ is the telnet escape character.
-Similarly, the line ~^Z suspends the telnet session.
-The line ~^] escapes to the normal telnet escape prompt.
-.Pp
-Once a connection has been opened,
-.Nm telnet
-will attempt to enable the
-.Dv TELNET LINEMODE
-option.
-If this fails, then
-.Nm telnet
-will revert to one of two input modes:
-either \*(Lqcharacter at a time\*(Rq
-or \*(Lqold line by line\*(Rq
-depending on what the remote system supports.
-.Pp
-When 
-.Dv LINEMODE
-is enabled, character processing is done on the
-local system, under the control of the remote system.  When input
-editing or character echoing is to be disabled, the remote system
-will relay that information.  The remote system will also relay
-changes to any special characters that happen on the remote
-system, so that they can take effect on the local system.
-.Pp
-In \*(Lqcharacter at a time\*(Rq mode, most
-text typed is immediately sent to the remote host for processing.
-.Pp
-In \*(Lqold line by line\*(Rq mode, all text is echoed locally,
-and (normally) only completed lines are sent to the remote host.
-The \*(Lqlocal echo character\*(Rq (initially \*(Lq^E\*(Rq) may be used
-to turn off and on the local echo
-(this would mostly be used to enter passwords
-without the password being echoed).
-.Pp
-If the 
-.Dv LINEMODE
-option is enabled, or if the
-.Ic localchars
-toggle is
-.Dv TRUE
-(the default for \*(Lqold line by line\*(Lq; see below),
-the user's
-.Ic quit  ,
-.Ic intr ,
-and
-.Ic flush
-characters are trapped locally, and sent as
-.Tn TELNET
-protocol sequences to the remote side.
-If 
-.Dv LINEMODE
-has ever been enabled, then the user's
-.Ic susp
-and
-.Ic eof
-are also sent as
-.Tn TELNET
-protocol sequences,
-and
-.Ic quit
-is sent as a 
-.Dv TELNET ABORT
-instead of 
-.Dv BREAK
-There are options (see
-.Ic toggle
-.Ic autoflush
-and
-.Ic toggle
-.Ic autosynch
-below)
-which cause this action to flush subsequent output to the terminal
-(until the remote host acknowledges the
-.Tn TELNET
-sequence) and flush previous terminal input
-(in the case of
-.Ic quit
-and
-.Ic intr  ) .
-.Pp
-While connected to a remote host,
-.Nm telnet
-command mode may be entered by typing the
-.Nm telnet
-\*(Lqescape character\*(Rq (initially \*(Lq^]\*(Rq).
-When in command mode, the normal terminal editing conventions are available.
-.Pp
-The following
-.Nm telnet
-commands are available.
-Only enough of each command to uniquely identify it need be typed
-(this is also true for arguments to the
-.Ic mode  ,
-.Ic set ,
-.Ic toggle  ,
-.Ic unset ,
-.Ic slc  ,
-.Ic environ ,
-and
-.Ic display
-commands).
-.Pp
-.Bl -tag -width "mode type"
-.It Ic auth Ar argument ... 
-The auth command manipulates the information sent through the
-.Dv TELNET AUTHENTICATE
-option.  Valid arguments for the
-auth command are as follows:
-.Bl -tag -width "disable type"
-.It Ic disable Ar type
-Disables the specified type of authentication.  To
-obtain a list of available types, use the
-.Ic auth disable \&?
-command.
-.It Ic enable Ar type
-Enables the specified type of authentication.  To
-obtain a list of available types, use the
-.Ic auth enable \&?
-command.
-.It Ic status
-Lists the current status of the various types of
-authentication.
-.El
-.It Ic close
-Close a
-.Tn TELNET
-session and return to command mode.
-.It Ic display Ar argument ... 
-Displays all, or some, of the
-.Ic set
-and
-.Ic toggle
-values (see below).
-.It Ic encrypt Ar argument ...
-The encrypt command manipulates the information sent through the
-.Dv TELNET ENCRYPT
-option.
-.Pp
-Note:  Because of export controls, the
-.Dv TELNET ENCRYPT
-option is not supported outside of the United States and Canada.
-.Pp
-Valid arguments for the encrypt command are as follows:
-.Bl -tag -width Ar
-.It Ic disable Ar type Ic [input|output]
-Disables the specified type of encryption.  If you
-omit the input and output, both input and output
-are disabled.  To obtain a list of available
-types, use the
-.Ic encrypt disable \&?
-command.
-.It Ic enable Ar type Ic [input|output]
-Enables the specified type of encryption.  If you
-omit input and output, both input and output are
-enabled.  To obtain a list of available types, use the
-.Ic encrypt enable \&?
-command.
-.It Ic input
-This is the same as the
-.Ic encrypt start input
-command.
-.It Ic -input
-This is the same as the
-.Ic encrypt stop input
-command.
-.It Ic output
-This is the same as the
-.Ic encrypt start output
-command.
-.It Ic -output
-This is the same as the
-.Ic encrypt stop output
-command.
-.It Ic start Ic [input|output]
-Attempts to start encryption.  If you omit
-.Ic input
-and
-.Ic output,
-both input and output are enabled.  To
-obtain a list of available types, use the
-.Ic encrypt enable \&?
-command.
-.It Ic status
-Lists the current status of encryption.
-.It Ic stop Ic [input|output]
-Stops encryption.  If you omit input and output,
-encryption is on both input and output.
-.It Ic type Ar type
-Sets the default type of encryption to be used
-with later
-.Ic encrypt start
-or
-.Ic encrypt stop
-commands.
-.El
-.It Ic environ Ar arguments... 
-The
-.Ic environ
-command is used to manipulate the
-the variables that my be sent through the
-.Dv TELNET ENVIRON
-option.
-The initial set of variables is taken from the users
-environment, with only the
-.Ev DISPLAY
-and
-.Ev PRINTER
-variables being exported by default.
-The
-.Ev USER
-variable is also exported if the
-.Fl a
-or
-.Fl l
-options are used.
-.br
-Valid arguments for the
-.Ic environ
-command are:
-.Bl -tag -width Fl
-.It Ic define Ar variable value 
-Define the variable
-.Ar variable
-to have a value of
-.Ar value.
-Any variables defined by this command are automatically exported.
-The
-.Ar value
-may be enclosed in single or double quotes so
-that tabs and spaces may be included.
-.It Ic undefine Ar variable 
-Remove
-.Ar variable
-from the list of environment variables.
-.It Ic export Ar variable 
-Mark the variable
-.Ar variable
-to be exported to the remote side.
-.It Ic unexport Ar variable 
-Mark the variable
-.Ar variable
-to not be exported unless
-explicitly asked for by the remote side.
-.It Ic list
-List the current set of environment variables.
-Those marked with a
-.Cm *
-will be sent automatically,
-other variables will only be sent if explicitly requested.
-.It Ic \&?
-Prints out help information for the
-.Ic environ
-command.
-.El
-.It Ic logout
-Sends the
-.Dv TELNET LOGOUT
-option to the remote side.
-This command is similar to a
-.Ic close
-command; however, if the remote side does not support the
-.Dv LOGOUT
-option, nothing happens.
-If, however, the remote side does support the
-.Dv LOGOUT
-option, this command should cause the remote side to close the
-.Tn TELNET
-connection.
-If the remote side also supports the concept of
-suspending a user's session for later reattachment,
-the logout argument indicates that you
-should terminate the session immediately.
-.It Ic mode Ar type 
-.Ar Type
-is one of several options, depending on the state of the
-.Tn TELNET
-session.
-The remote host is asked for permission to go into the requested mode.
-If the remote host is capable of entering that mode, the requested
-mode will be entered.
-.Bl -tag -width Ar
-.It Ic character
-Disable the
-.Dv TELNET LINEMODE
-option, or, if the remote side does not understand the
-.Dv LINEMODE
-option, then enter \*(Lqcharacter at a time\*(Lq mode.
-.It Ic line
-Enable the
-.Dv TELNET LINEMODE
-option, or, if the remote side does not understand the
-.Dv LINEMODE
-option, then attempt to enter \*(Lqold-line-by-line\*(Lq mode.
-.It Ic isig Pq Ic \-isig 
-Attempt to enable (disable) the 
-.Dv TRAPSIG
-mode of the 
-.Dv LINEMODE
-option.
-This requires that the 
-.Dv LINEMODE
-option be enabled.
-.It Ic edit Pq Ic \-edit 
-Attempt to enable (disable) the 
-.Dv EDIT
-mode of the 
-.Dv LINEMODE
-option.
-This requires that the 
-.Dv LINEMODE
-option be enabled.
-.It Ic softtabs Pq Ic \-softtabs 
-Attempt to enable (disable) the 
-.Dv SOFT_TAB
-mode of the 
-.Dv LINEMODE
-option.
-This requires that the 
-.Dv LINEMODE
-option be enabled.
-.ne 1i
-.It Ic litecho Pq Ic \-litecho 
-Attempt to enable (disable) the 
-.Dv LIT_ECHO
-mode of the 
-.Dv LINEMODE
-option.
-This requires that the 
-.Dv LINEMODE
-option be enabled.
-.It Ic \&?
-Prints out help information for the
-.Ic mode
-command.
-.El
-.It Xo
-.Ic open Ar host
-.Oo Op Fl l
-.Ar user
-.Oc Ns Oo Fl
-.Ar port Oc
-.Xc
-Open a connection to the named host.
-If no port number
-is specified,
-.Nm telnet
-will attempt to contact a
-.Tn TELNET
-server at the default port.
-The host specification may be either a host name (see
-.Xr hosts  5  )
-or an Internet address specified in the \*(Lqdot notation\*(Rq (see
-.Xr inet 3 ) .
-The
-.Op Fl l
-option may be used to specify the user name
-to be passed to the remote system via the
-.Ev ENVIRON
-option.
-When connecting to a non-standard port,
-.Nm telnet
-omits any automatic initiation of
-.Tn TELNET
-options.  When the port number is preceded by a minus sign,
-the initial option negotiation is done.
-After establishing a connection, the file
-.Pa \&.telnetrc
-in the
-users home directory is opened.  Lines beginning with a # are
-comment lines.  Blank lines are ignored.  Lines that begin
-without white space are the start of a machine entry.  The
-first thing on the line is the name of the machine that is
-being connected to.  The rest of the line, and successive
-lines that begin with white space are assumed to be
-.Nm telnet
-commands and are processed as if they had been typed
-in manually to the
-.Nm telnet
-command prompt.
-.It Ic quit
-Close any open
-.Tn TELNET
-session and exit
-.Nm telnet  .
-An end of file (in command mode) will also close a session and exit.
-.It Ic send Ar arguments 
-Sends one or more special character sequences to the remote host.
-The following are the arguments which may be specified
-(more than one argument may be specified at a time):
-.Pp
-.Bl -tag -width escape
-.It Ic abort
-Sends the
-.Dv TELNET ABORT
-(Abort
-processes)
-sequence.
-.It Ic ao
-Sends the
-.Dv TELNET AO
-(Abort Output) sequence, which should cause the remote system to flush
-all output
-.Em from
-the remote system
-.Em to
-the user's terminal.
-.It Ic ayt
-Sends the
-.Dv TELNET AYT
-(Are You There)
-sequence, to which the remote system may or may not choose to respond.
-.It Ic brk
-Sends the
-.Dv TELNET BRK
-(Break) sequence, which may have significance to the remote
-system.
-.It Ic ec
-Sends the
-.Dv TELNET EC
-(Erase Character)
-sequence, which should cause the remote system to erase the last character
-entered.
-.It Ic el
-Sends the
-.Dv TELNET EL
-(Erase Line)
-sequence, which should cause the remote system to erase the line currently
-being entered.
-.It Ic eof
-Sends the
-.Dv TELNET EOF
-(End Of File)
-sequence.
-.It Ic eor
-Sends the
-.Dv TELNET EOR
-(End of Record)
-sequence.
-.It Ic escape
-Sends the current
-.Nm telnet
-escape character (initially \*(Lq^\*(Rq).
-.It Ic ga
-Sends the
-.Dv TELNET GA
-(Go Ahead)
-sequence, which likely has no significance to the remote system.
-.It Ic getstatus
-If the remote side supports the
-.Dv TELNET STATUS
-command,
-.Ic getstatus
-will send the subnegotiation to request that the server send
-its current option status.
-.ne 1i
-.It Ic ip
-Sends the
-.Dv TELNET IP
-(Interrupt Process) sequence, which should cause the remote
-system to abort the currently running process.
-.It Ic nop
-Sends the
-.Dv TELNET NOP
-(No OPeration)
-sequence.
-.It Ic susp
-Sends the
-.Dv TELNET SUSP
-(SUSPend process)
-sequence.
-.It Ic synch
-Sends the
-.Dv TELNET SYNCH
-sequence.
-This sequence causes the remote system to discard all previously typed
-(but not yet read) input.
-This sequence is sent as
-.Tn TCP
-urgent
-data (and may not work if the remote system is a
-.Bx 4.2
-system -- if
-it doesn't work, a lower case \*(Lqr\*(Rq may be echoed on the terminal).
-.It Ic do Ar cmd
-.It Ic dont Ar cmd
-.It Ic will Ar cmd
-.It Ic wont Ar cmd
-Sends the
-.Dv TELNET DO
-.Ar cmd
-sequence.
-.Ar Cmd
-can be either a decimal number between 0 and 255,
-or a symbolic name for a specific
-.Dv TELNET
-command.
-.Ar Cmd
-can also be either
-.Ic help
-or
-.Ic \&?
-to print out help information, including
-a list of known symbolic names.
-.It Ic \&?
-Prints out help information for the
-.Ic send
-command.
-.El
-.It Ic set Ar argument value 
-.It Ic unset Ar argument value 
-The
-.Ic set
-command will set any one of a number of
-.Nm telnet
-variables to a specific value or to
-.Dv TRUE .
-The special value
-.Ic off
-turns off the function associated with
-the variable, this is equivalent to using the
-.Ic unset
-command.
-The
-.Ic unset
-command will disable or set to
-.Dv FALSE
-any of the specified functions.
-The values of variables may be interrogated with the
-.Ic display
-command.
-The variables which may be set or unset, but not toggled, are
-listed here.  In addition, any of the variables for the
-.Ic toggle
-command may be explicitly set or unset using
-the
-.Ic set
-and
-.Ic unset
-commands.
-.Bl -tag -width escape
-.It Ic ayt
-If
-.Tn TELNET
-is in localchars mode, or
-.Dv LINEMODE
-is enabled, and the status character is typed, a
-.Dv TELNET AYT
-sequence (see
-.Ic send ayt
-preceding) is sent to the
-remote host.  The initial value for the "Are You There"
-character is the terminal's status character.
-.It Ic echo
-This is the value (initially \*(Lq^E\*(Rq) which, when in
-\*(Lqline by line\*(Rq mode, toggles between doing local echoing
-of entered characters (for normal processing), and suppressing
-echoing of entered characters (for entering, say, a password).
-.It Ic eof
-If
-.Nm telnet
-is operating in
-.Dv LINEMODE
-or \*(Lqold line by line\*(Rq mode, entering this character
-as the first character on a line will cause this character to be
-sent to the remote system.
-The initial value of the eof character is taken to be the terminal's
-.Ic eof
-character.
-.It Ic erase
-If
-.Nm telnet
-is in
-.Ic localchars
-mode (see
-.Ic toggle
-.Ic localchars
-below),
-.Sy and
-if
-.Nm telnet
-is operating in \*(Lqcharacter at a time\*(Rq mode, then when this
-character is typed, a
-.Dv TELNET EC
-sequence (see
-.Ic send
-.Ic ec
-above)
-is sent to the remote system.
-The initial value for the erase character is taken to be
-the terminal's
-.Ic erase
-character.
-.It Ic escape
-This is the
-.Nm telnet
-escape character (initially \*(Lq^[\*(Rq) which causes entry
-into
-.Nm telnet
-command mode (when connected to a remote system).
-.It Ic flushoutput
-If
-.Nm telnet
-is in
-.Ic localchars
-mode (see
-.Ic toggle
-.Ic localchars
-below)
-and the
-.Ic flushoutput
-character is typed, a
-.Dv TELNET AO
-sequence (see
-.Ic send
-.Ic ao
-above)
-is sent to the remote host.
-The initial value for the flush character is taken to be
-the terminal's
-.Ic flush
-character.
-.It Ic forw1
-.It Ic forw2
-If
-.Tn TELNET
-is operating in
-.Dv LINEMODE ,
-these are the
-characters that, when typed, cause partial lines to be
-forwarded to the remote system.  The initial value for
-the forwarding characters are taken from the terminal's
-eol and eol2 characters.
-.It Ic interrupt
-If
-.Nm telnet
-is in
-.Ic localchars
-mode (see
-.Ic toggle
-.Ic localchars
-below)
-and the
-.Ic interrupt
-character is typed, a
-.Dv TELNET IP
-sequence (see
-.Ic send
-.Ic ip
-above)
-is sent to the remote host.
-The initial value for the interrupt character is taken to be
-the terminal's
-.Ic intr
-character.
-.It Ic kill
-If
-.Nm telnet
-is in
-.Ic localchars
-mode (see
-.Ic toggle
-.Ic localchars
-below),
-.Ic and
-if
-.Nm telnet
-is operating in \*(Lqcharacter at a time\*(Rq mode, then when this
-character is typed, a
-.Dv TELNET EL
-sequence (see
-.Ic send
-.Ic el
-above)
-is sent to the remote system.
-The initial value for the kill character is taken to be
-the terminal's
-.Ic kill
-character.
-.It Ic lnext
-If
-.Nm telnet
-is operating in
-.Dv LINEMODE
-or \*(Lqold line by line\*(Lq mode, then this character is taken to
-be the terminal's
-.Ic lnext
-character.
-The initial value for the lnext character is taken to be
-the terminal's
-.Ic lnext
-character.
-.It Ic quit
-If
-.Nm telnet
-is in
-.Ic localchars
-mode (see
-.Ic toggle
-.Ic localchars
-below)
-and the
-.Ic quit
-character is typed, a
-.Dv TELNET BRK
-sequence (see
-.Ic send
-.Ic brk
-above)
-is sent to the remote host.
-The initial value for the quit character is taken to be
-the terminal's
-.Ic quit
-character.
-.It Ic reprint
-If
-.Nm telnet
-is operating in
-.Dv LINEMODE
-or \*(Lqold line by line\*(Lq mode, then this character is taken to
-be the terminal's
-.Ic reprint
-character.
-The initial value for the reprint character is taken to be
-the terminal's
-.Ic reprint
-character.
-.It Ic rlogin
-This is the rlogin escape character.
-If set, the normal
-.Tn TELNET
-escape character is ignored unless it is
-preceded by this character at the beginning of a line.
-This character, at the beginning of a line followed by
-a "."  closes the connection; when followed by a ^Z it
-suspends the telnet command.  The initial state is to
-disable the rlogin escape character.
-.It Ic start
-If the
-.Dv TELNET TOGGLE-FLOW-CONTROL
-option has been enabled,
-then this character is taken to
-be the terminal's
-.Ic start
-character.
-The initial value for the kill character is taken to be
-the terminal's
-.Ic start
-character.
-.It Ic stop
-If the
-.Dv TELNET TOGGLE-FLOW-CONTROL
-option has been enabled,
-then this character is taken to
-be the terminal's
-.Ic stop
-character.
-The initial value for the kill character is taken to be
-the terminal's
-.Ic stop
-character.
-.It Ic susp
-If
-.Nm telnet
-is in
-.Ic localchars
-mode, or
-.Dv LINEMODE
-is enabled, and the
-.Ic suspend
-character is typed, a
-.Dv TELNET SUSP
-sequence (see
-.Ic send
-.Ic susp
-above)
-is sent to the remote host.
-The initial value for the suspend character is taken to be
-the terminal's
-.Ic suspend
-character.
-.ne 1i
-.It Ic tracefile
-This is the file to which the output, caused by
-.Ic netdata
-or
-.Ic option
-tracing being
-.Dv TRUE ,
-will be written.  If it is set to
-.Dq Fl ,
-then tracing information will be written to standard output (the default).
-.It Ic worderase
-If
-.Nm telnet
-is operating in
-.Dv LINEMODE
-or \*(Lqold line by line\*(Lq mode, then this character is taken to
-be the terminal's
-.Ic worderase
-character.
-The initial value for the worderase character is taken to be
-the terminal's
-.Ic worderase
-character.
-.It Ic \&?
-Displays the legal
-.Ic set
-.Pq Ic unset
-commands.
-.El
-.It Ic slc Ar state 
-The
-.Ic slc
-command (Set Local Characters) is used to set
-or change the state of the the special
-characters when the 
-.Dv TELNET LINEMODE
-option has
-been enabled.  Special characters are characters that get
-mapped to 
-.Tn TELNET
-commands sequences (like
-.Ic ip
-or
-.Ic quit  )
-or line editing characters (like
-.Ic erase
-and
-.Ic kill  ) .
-By default, the local special characters are exported.
-.Bl -tag -width Fl
-.It Ic check
-Verify the current settings for the current special characters.
-The remote side is requested to send all the current special
-character settings, and if there are any discrepancies with
-the local side, the local side will switch to the remote value.
-.It Ic export
-Switch to the local defaults for the special characters.  The
-local default characters are those of the local terminal at
-the time when
-.Nm telnet
-was started.
-.It Ic import
-Switch to the remote defaults for the special characters.
-The remote default characters are those of the remote system
-at the time when the 
-.Tn TELNET
-connection was established.
-.It Ic \&?
-Prints out help information for the
-.Ic slc
-command.
-.El
-.It Ic status
-Show the current status of
-.Nm telnet  .
-This includes the peer one is connected to, as well
-as the current mode.
-.It Ic toggle Ar arguments ... 
-Toggle (between
-.Dv TRUE
-and
-.Dv FALSE )
-various flags that control how
-.Nm telnet
-responds to events.
-These flags may be set explicitly to
-.Dv TRUE
-or
-.Dv FALSE
-using the
-.Ic set
-and
-.Ic unset
-commands listed above.
-More than one argument may be specified.
-The state of these flags may be interrogated with the
-.Ic display
-command.
-Valid arguments are:
-.Bl -tag -width Ar
-.It Ic authdebug
-Turns on debugging information for the authentication code.
-.It Ic autoflush
-If
-.Ic autoflush
-and
-.Ic localchars
-are both
-.Dv TRUE ,
-then when the
-.Ic ao  ,
-or
-.Ic quit
-characters are recognized (and transformed into
-.Tn TELNET
-sequences; see
-.Ic set
-above for details),
-.Nm telnet
-refuses to display any data on the user's terminal
-until the remote system acknowledges (via a
-.Dv TELNET TIMING MARK
-option)
-that it has processed those
-.Tn TELNET
-sequences.
-The initial value for this toggle is
-.Dv TRUE
-if the terminal user had not
-done an "stty noflsh", otherwise
-.Dv FALSE
-(see
-.Xr stty  1  ) .
-.It Ic autodecrypt
-When the
-.Dv TELNET ENCRYPT
-option is negotiated, by
-default the actual encryption (decryption) of the data
-stream does not start automatically.  The autoencrypt
-(autodecrypt) command states that encryption of the
-output (input) stream should be enabled as soon as
-possible.
-.sp
-.Pp
-Note:  Because of export controls, the
-.Dv TELNET ENCRYPT
-option is not supported outside the United States and Canada.
-.It Ic autologin
-If the remote side supports the
-.Dv TELNET AUTHENTICATION
-option
-.Tn TELNET
-attempts to use it to perform automatic authentication.  If the
-.Dv AUTHENTICATION
-option is not supported, the user's login
-name are propagated through the
-.Dv TELNET ENVIRON
-option.
-This command is the same as specifying
-.Ar a
-option on the
-.Ic open
-command.
-.It Ic autosynch
-If
-.Ic autosynch
-and
-.Ic localchars
-are both
-.Dv TRUE ,
-then when either the
-.Ic intr
-or
-.Ic quit
-characters is typed (see
-.Ic set
-above for descriptions of the
-.Ic intr
-and
-.Ic quit
-characters), the resulting
-.Tn TELNET
-sequence sent is followed by the
-.Dv TELNET SYNCH
-sequence.
-This procedure
-.Ic should
-cause the remote system to begin throwing away all previously
-typed input until both of the
-.Tn TELNET
-sequences have been read and acted upon.
-The initial value of this toggle is
-.Dv FALSE .
-.It Ic binary
-Enable or disable the
-.Dv TELNET BINARY
-option on both input and output.
-.It Ic inbinary
-Enable or disable the
-.Dv TELNET BINARY
-option on input.
-.It Ic outbinary
-Enable or disable the
-.Dv TELNET BINARY
-option on output.
-.It Ic crlf
-If this is
-.Dv TRUE ,
-then carriage returns will be sent as
-.Li <CR><LF> .
-If this is
-.Dv FALSE ,
-then carriage returns will be send as
-.Li <CR><NUL> .
-The initial value for this toggle is
-.Dv FALSE .
-.It Ic crmod
-Toggle carriage return mode.
-When this mode is enabled, most carriage return characters received from
-the remote host will be mapped into a carriage return followed by
-a line feed.
-This mode does not affect those characters typed by the user, only
-those received from the remote host.
-This mode is not very useful unless the remote host
-only sends carriage return, but never line feed.
-The initial value for this toggle is
-.Dv FALSE .
-.It Ic debug
-Toggles socket level debugging (useful only to the
-.Ic super user  ) .
-The initial value for this toggle is
-.Dv FALSE .
-.It Ic encdebug
-Turns on debugging information for the encryption code.
-.It Ic localchars
-If this is
-.Dv TRUE ,
-then the
-.Ic flush  ,
-.Ic interrupt ,
-.Ic quit  ,
-.Ic erase ,
-and
-.Ic kill
-characters (see
-.Ic set
-above) are recognized locally, and transformed into (hopefully) appropriate
-.Tn TELNET
-control sequences
-(respectively
-.Ic ao  ,
-.Ic ip ,
-.Ic brk  ,
-.Ic ec ,
-and
-.Ic el  ;
-see
-.Ic send
-above).
-The initial value for this toggle is
-.Dv TRUE
-in \*(Lqold line by line\*(Rq mode,
-and
-.Dv FALSE
-in \*(Lqcharacter at a time\*(Rq mode.
-When the
-.Dv LINEMODE
-option is enabled, the value of
-.Ic localchars
-is ignored, and assumed to always be
-.Dv TRUE .
-If
-.Dv LINEMODE
-has ever been enabled, then
-.Ic quit
-is sent as
-.Ic abort  ,
-and
-.Ic eof and
-.B suspend
-are sent as
-.Ic eof and
-.Ic susp ,
-see
-.Ic send
-above).
-.It Ic netdata
-Toggles the display of all network data (in hexadecimal format).
-The initial value for this toggle is
-.Dv FALSE .
-.It Ic options
-Toggles the display of some internal
-.Nm telnet
-protocol processing (having to do with
-.Tn TELNET
-options).
-The initial value for this toggle is
-.Dv FALSE .
-.ne 1i
-.It Ic prettydump
-When the
-.Ic netdata
-toggle is enabled, if
-.Ic prettydump
-is enabled the output from the
-.Ic netdata
-command will be formatted in a more user readable format.
-Spaces are put between each character in the output, and the
-beginning of any
-.Tn TELNET
-escape sequence is preceded by a '*' to aid in locating them.
-.It Ic skiprc
-When the skiprc toggle is
-.Dv TRUE ,
-.Tn TELNET
-skips the reading of the
-.Pa \&.telnetrc
-file in the users home
-directory when connections are opened.  The initial
-value for this toggle is
-.Dv FALSE.
-.It Ic termdata
-Toggles the display of all terminal data (in hexadecimal format).
-The initial value for this toggle is
-.Dv FALSE .
-.It Ic verbose_encrypt
-When the
-.Ic verbose_encrypt
-toggle is
-.Dv TRUE ,
-.Tn TELNET
-prints out a message each time encryption is enabled or
-disabled.  The initial value for this toggle is
-.Dv FALSE.
-Note:  Because of export controls, data encryption
-is not supported outside of the United States and Canada.
-.It Ic \&?
-Displays the legal
-.Ic toggle
-commands.
-.El
-.It Ic z
-Suspend
-.Nm telnet  .
-This command only works when the user is using the
-.Xr csh  1  .
-.It Ic \&! Op Ar command 
-Execute a single command in a subshell on the local
-system.  If
-.Ic command
-is omitted, then an interactive
-subshell is invoked.
-.It Ic \&? Op Ar command 
-Get help.  With no arguments,
-.Nm telnet
-prints a help summary.
-If a command is specified,
-.Nm telnet
-will print the help information for just that command.
-.El
-.Sh ENVIRONMENT
-.Nm Telnet
-uses at least the
-.Ev HOME ,
-.Ev SHELL ,
-.Ev DISPLAY ,
-and
-.Ev TERM
-environment variables.
-Other environment variables may be propagated
-to the other side via the
-.Dv TELNET ENVIRON
-option.
-.Sh FILES
-.Bl -tag -width ~/.telnetrc -compact
-.It Pa ~/.telnetrc
-user customized telnet startup values
-.El
-.Sh HISTORY
-The
-.Nm Telnet
-command appeared in
-.Bx 4.2 .
-.Sh NOTES
-.Pp
-On some remote systems, echo has to be turned off manually when in
-\*(Lqold line by line\*(Rq mode.
-.Pp
-In \*(Lqold line by line\*(Rq mode or 
-.Dv LINEMODE
-the terminal's
-.Ic eof
-character is only recognized (and sent to the remote system)
-when it is the first character on a line.
diff --git a/crypto/telnet/telnet/telnet.c b/crypto/telnet/telnet/telnet.c
deleted file mode 100644
index e1716857af8b..000000000000
--- a/crypto/telnet/telnet/telnet.c
+++ /dev/null
@@ -1,2663 +0,0 @@
-/*
- * Copyright (c) 1988, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static const char sccsid[] = "@(#)telnet.c	8.4 (Berkeley) 5/30/95";
-#endif /* not lint */
-
-#include <sys/types.h>
-
-#if	defined(unix)
-#include <signal.h>
-/* By the way, we need to include curses.h before telnet.h since,
- * among other things, telnet.h #defines 'DO', which is a variable
- * declared in curses.h.
- */
-#endif	/* defined(unix) */
-
-#include <arpa/telnet.h>
-
-#include <ctype.h>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <termcap.h>
-
-#include "ring.h"
-
-#include "defines.h"
-#include "externs.h"
-#include "types.h"
-#include "general.h"
-
-#if	defined(AUTHENTICATION)
-#include <libtelnet/auth.h>
-#endif
-#if	defined(ENCRYPTION)
-#include <libtelnet/encrypt.h>
-#endif
-#include <libtelnet/misc.h>
-
-#define	strip(x) ((my_want_state_is_wont(TELOPT_BINARY)) ? ((x)&0x7f) : (x))
-
-static unsigned char	subbuffer[SUBBUFSIZE],
-			*subpointer, *subend;	 /* buffer for sub-options */
-#define	SB_CLEAR()	subpointer = subbuffer;
-#define	SB_TERM()	{ subend = subpointer; SB_CLEAR(); }
-#define	SB_ACCUM(c)	if (subpointer < (subbuffer+sizeof subbuffer)) { \
-				*subpointer++ = (c); \
-			}
-
-#define	SB_GET()	((*subpointer++)&0xff)
-#define	SB_PEEK()	((*subpointer)&0xff)
-#define	SB_EOF()	(subpointer >= subend)
-#define	SB_LEN()	(subend - subpointer)
-
-char	options[256];		/* The combined options */
-char	do_dont_resp[256];
-char	will_wont_resp[256];
-
-int
-	eight = 0,
-	autologin = 0,	/* Autologin anyone? */
-	skiprc = 0,
-	connected,
-	showoptions,
-	In3270,		/* Are we in 3270 mode? */
-	ISend,		/* trying to send network data in */
-	debug = 0,
-	crmod,
-	netdata,	/* Print out network data flow */
-	crlf,		/* Should '\r' be mapped to <CR><LF> (or <CR><NUL>)? */
-#if	defined(TN3270)
-	noasynchtty = 0,/* User specified "-noasynch" on command line */
-	noasynchnet = 0,/* User specified "-noasynch" on command line */
-	askedSGA = 0,	/* We have talked about suppress go ahead */
-#endif	/* defined(TN3270) */
-	telnetport,
-	SYNCHing,	/* we are in TELNET SYNCH mode */
-	flushout,	/* flush output */
-	autoflush = 0,	/* flush output when interrupting? */
-	autosynch,	/* send interrupt characters with SYNCH? */
-	localflow,	/* we handle flow control locally */
-	restartany,	/* if flow control enabled, restart on any character */
-	localchars,	/* we recognize interrupt/quit */
-	donelclchars,	/* the user has set "localchars" */
-	donebinarytoggle,	/* the user has put us in binary */
-	dontlecho,	/* do we suppress local echoing right now? */
-	globalmode,
-	doaddrlookup = 1, /* do a reverse address lookup? */
-	clienteof = 0;
-
-char *prompt = 0;
-
-cc_t escape;
-cc_t rlogin;
-#ifdef	KLUDGELINEMODE
-cc_t echoc;
-#endif
-
-/*
- * Telnet receiver states for fsm
- */
-#define	TS_DATA		0
-#define	TS_IAC		1
-#define	TS_WILL		2
-#define	TS_WONT		3
-#define	TS_DO		4
-#define	TS_DONT		5
-#define	TS_CR		6
-#define	TS_SB		7		/* sub-option collection */
-#define	TS_SE		8		/* looking for sub-option end */
-
-static int	telrcv_state;
-#ifdef	OLD_ENVIRON
-unsigned char telopt_environ = TELOPT_NEW_ENVIRON;
-#else
-# define telopt_environ TELOPT_NEW_ENVIRON
-#endif
-
-jmp_buf	toplevel = { 0 };
-jmp_buf	peerdied;
-
-int	flushline;
-int	linemode;
-
-#ifdef	KLUDGELINEMODE
-int	kludgelinemode = 1;
-#endif
-
-/*
- * The following are some clocks used to decide how to interpret
- * the relationship between various variables.
- */
-
-Clocks clocks;
-
-#ifdef	notdef
-Modelist modelist[] = {
-	{ "telnet command mode", COMMAND_LINE },
-	{ "character-at-a-time mode", 0 },
-	{ "character-at-a-time mode (local echo)", LOCAL_ECHO|LOCAL_CHARS },
-	{ "line-by-line mode (remote echo)", LINE | LOCAL_CHARS },
-	{ "line-by-line mode", LINE | LOCAL_ECHO | LOCAL_CHARS },
-	{ "line-by-line mode (local echoing suppressed)", LINE | LOCAL_CHARS },
-	{ "3270 mode", 0 },
-};
-#endif
-
-
-/*
- * Initialize telnet environment.
- */
-
-    void
-init_telnet()
-{
-    env_init();
-
-    SB_CLEAR();
-    ClearArray(options);
-
-    connected = In3270 = ISend = localflow = donebinarytoggle = 0;
-#if	defined(AUTHENTICATION) || defined(ENCRYPTION)
-    auth_encrypt_connect(connected);
-#endif	/* defined(AUTHENTICATION) || defined(ENCRYPTION)  */
-    restartany = -1;
-
-    SYNCHing = 0;
-
-    /* Don't change NetTrace */
-
-    escape = CONTROL(']');
-    rlogin = _POSIX_VDISABLE;
-#ifdef	KLUDGELINEMODE
-    echoc = CONTROL('E');
-#endif
-
-    flushline = 1;
-    telrcv_state = TS_DATA;
-}
-
-
-#ifdef	notdef
-#include <varargs.h>
-
-    /*VARARGS*/
-    static void
-printring(va_alist)
-    va_dcl
-{
-    va_list ap;
-    char buffer[100];		/* where things go */
-    char *ptr;
-    char *format;
-    char *string;
-    Ring *ring;
-    int i;
-
-    va_start(ap);
-
-    ring = va_arg(ap, Ring *);
-    format = va_arg(ap, char *);
-    ptr = buffer;
-
-    while ((i = *format++) != 0) {
-	if (i == '%') {
-	    i = *format++;
-	    switch (i) {
-	    case 'c':
-		*ptr++ = va_arg(ap, int);
-		break;
-	    case 's':
-		string = va_arg(ap, char *);
-		ring_supply_data(ring, buffer, ptr-buffer);
-		ring_supply_data(ring, string, strlen(string));
-		ptr = buffer;
-		break;
-	    case 0:
-		ExitString("printring: trailing %%.\n", 1);
-		/*NOTREACHED*/
-	    default:
-		ExitString("printring: unknown format character.\n", 1);
-		/*NOTREACHED*/
-	    }
-	} else {
-	    *ptr++ = i;
-	}
-    }
-    ring_supply_data(ring, buffer, ptr-buffer);
-}
-#endif
-
-/*
- * These routines are in charge of sending option negotiations
- * to the other side.
- *
- * The basic idea is that we send the negotiation if either side
- * is in disagreement as to what the current state should be.
- */
-
-    void
-send_do(c, init)
-    register int c, init;
-{
-    if (init) {
-	if (((do_dont_resp[c] == 0) && my_state_is_do(c)) ||
-				my_want_state_is_do(c))
-	    return;
-	set_my_want_state_do(c);
-	do_dont_resp[c]++;
-    }
-    NET2ADD(IAC, DO);
-    NETADD(c);
-    printoption("SENT", DO, c);
-}
-
-    void
-send_dont(c, init)
-    register int c, init;
-{
-    if (init) {
-	if (((do_dont_resp[c] == 0) && my_state_is_dont(c)) ||
-				my_want_state_is_dont(c))
-	    return;
-	set_my_want_state_dont(c);
-	do_dont_resp[c]++;
-    }
-    NET2ADD(IAC, DONT);
-    NETADD(c);
-    printoption("SENT", DONT, c);
-}
-
-    void
-send_will(c, init)
-    register int c, init;
-{
-    if (init) {
-	if (((will_wont_resp[c] == 0) && my_state_is_will(c)) ||
-				my_want_state_is_will(c))
-	    return;
-	set_my_want_state_will(c);
-	will_wont_resp[c]++;
-    }
-    NET2ADD(IAC, WILL);
-    NETADD(c);
-    printoption("SENT", WILL, c);
-}
-
-    void
-send_wont(c, init)
-    register int c, init;
-{
-    if (init) {
-	if (((will_wont_resp[c] == 0) && my_state_is_wont(c)) ||
-				my_want_state_is_wont(c))
-	    return;
-	set_my_want_state_wont(c);
-	will_wont_resp[c]++;
-    }
-    NET2ADD(IAC, WONT);
-    NETADD(c);
-    printoption("SENT", WONT, c);
-}
-
-
-	void
-willoption(option)
-	int option;
-{
-	int new_state_ok = 0;
-
-	if (do_dont_resp[option]) {
-	    --do_dont_resp[option];
-	    if (do_dont_resp[option] && my_state_is_do(option))
-		--do_dont_resp[option];
-	}
-
-	if ((do_dont_resp[option] == 0) && my_want_state_is_dont(option)) {
-
-	    switch (option) {
-
-	    case TELOPT_ECHO:
-#	    if defined(TN3270)
-		/*
-		 * The following is a pain in the rear-end.
-		 * Various IBM servers (some versions of Wiscnet,
-		 * possibly Fibronics/Spartacus, and who knows who
-		 * else) will NOT allow us to send "DO SGA" too early
-		 * in the setup proceedings.  On the other hand,
-		 * 4.2 servers (telnetd) won't set SGA correctly.
-		 * So, we are stuck.  Empirically (but, based on
-		 * a VERY small sample), the IBM servers don't send
-		 * out anything about ECHO, so we postpone our sending
-		 * "DO SGA" until we see "WILL ECHO" (which 4.2 servers
-		 * DO send).
-		  */
-		{
-		    if (askedSGA == 0) {
-			askedSGA = 1;
-			if (my_want_state_is_dont(TELOPT_SGA))
-			    send_do(TELOPT_SGA, 1);
-		    }
-		}
-		    /* Fall through */
-	    case TELOPT_EOR:
-#endif	    /* defined(TN3270) */
-	    case TELOPT_BINARY:
-	    case TELOPT_SGA:
-		settimer(modenegotiated);
-		/* FALL THROUGH */
-	    case TELOPT_STATUS:
-#if	defined(AUTHENTICATION)
-	    case TELOPT_AUTHENTICATION:
-#endif
-#ifdef	ENCRYPTION
-	    case TELOPT_ENCRYPT:
-#endif /* ENCRYPTION */
-		new_state_ok = 1;
-		break;
-
-	    case TELOPT_TM:
-		if (flushout)
-		    flushout = 0;
-		/*
-		 * Special case for TM.  If we get back a WILL,
-		 * pretend we got back a WONT.
-		 */
-		set_my_want_state_dont(option);
-		set_my_state_dont(option);
-		return;			/* Never reply to TM will's/wont's */
-
-	    case TELOPT_LINEMODE:
-	    default:
-		break;
-	    }
-
-	    if (new_state_ok) {
-		set_my_want_state_do(option);
-		send_do(option, 0);
-		setconnmode(0);		/* possibly set new tty mode */
-	    } else {
-		do_dont_resp[option]++;
-		send_dont(option, 0);
-	    }
-	}
-	set_my_state_do(option);
-#ifdef	ENCRYPTION
-	if (option == TELOPT_ENCRYPT)
-		encrypt_send_support();
-#endif	/* ENCRYPTION */
-}
-
-	void
-wontoption(option)
-	int option;
-{
-	if (do_dont_resp[option]) {
-	    --do_dont_resp[option];
-	    if (do_dont_resp[option] && my_state_is_dont(option))
-		--do_dont_resp[option];
-	}
-
-	if ((do_dont_resp[option] == 0) && my_want_state_is_do(option)) {
-
-	    switch (option) {
-
-#ifdef	KLUDGELINEMODE
-	    case TELOPT_SGA:
-		if (!kludgelinemode)
-		    break;
-		/* FALL THROUGH */
-#endif
-	    case TELOPT_ECHO:
-		settimer(modenegotiated);
-		break;
-
-	    case TELOPT_TM:
-		if (flushout)
-		    flushout = 0;
-		set_my_want_state_dont(option);
-		set_my_state_dont(option);
-		return;		/* Never reply to TM will's/wont's */
-
-	    default:
-		break;
-	    }
-	    set_my_want_state_dont(option);
-	    if (my_state_is_do(option))
-		send_dont(option, 0);
-	    setconnmode(0);			/* Set new tty mode */
-	} else if (option == TELOPT_TM) {
-	    /*
-	     * Special case for TM.
-	     */
-	    if (flushout)
-		flushout = 0;
-	    set_my_want_state_dont(option);
-	}
-	set_my_state_dont(option);
-}
-
-	static void
-dooption(option)
-	int option;
-{
-	int new_state_ok = 0;
-
-	if (will_wont_resp[option]) {
-	    --will_wont_resp[option];
-	    if (will_wont_resp[option] && my_state_is_will(option))
-		--will_wont_resp[option];
-	}
-
-	if (will_wont_resp[option] == 0) {
-	  if (my_want_state_is_wont(option)) {
-
-	    switch (option) {
-
-	    case TELOPT_TM:
-		/*
-		 * Special case for TM.  We send a WILL, but pretend
-		 * we sent WONT.
-		 */
-		send_will(option, 0);
-		set_my_want_state_wont(TELOPT_TM);
-		set_my_state_wont(TELOPT_TM);
-		return;
-
-#	if defined(TN3270)
-	    case TELOPT_EOR:		/* end of record */
-#	endif	/* defined(TN3270) */
-	    case TELOPT_BINARY:		/* binary mode */
-	    case TELOPT_NAWS:		/* window size */
-	    case TELOPT_TSPEED:		/* terminal speed */
-	    case TELOPT_LFLOW:		/* local flow control */
-	    case TELOPT_TTYPE:		/* terminal type option */
-	    case TELOPT_SGA:		/* no big deal */
-#ifdef	ENCRYPTION
-	    case TELOPT_ENCRYPT:	/* encryption variable option */
-#endif	/* ENCRYPTION */
-		new_state_ok = 1;
-		break;
-
-	    case TELOPT_NEW_ENVIRON:	/* New environment variable option */
-#ifdef	OLD_ENVIRON
-		if (my_state_is_will(TELOPT_OLD_ENVIRON))
-			send_wont(TELOPT_OLD_ENVIRON, 1); /* turn off the old */
-		goto env_common;
-	    case TELOPT_OLD_ENVIRON:	/* Old environment variable option */
-		if (my_state_is_will(TELOPT_NEW_ENVIRON))
-			break;		/* Don't enable if new one is in use! */
-	    env_common:
-		telopt_environ = option;
-#endif
-		new_state_ok = 1;
-		break;
-
-#if	defined(AUTHENTICATION)
-	    case TELOPT_AUTHENTICATION:
-		if (autologin)
-			new_state_ok = 1;
-		break;
-#endif
-
-	    case TELOPT_XDISPLOC:	/* X Display location */
-		if (env_getvalue((unsigned char *)"DISPLAY"))
-		    new_state_ok = 1;
-		break;
-
-	    case TELOPT_LINEMODE:
-#ifdef	KLUDGELINEMODE
-		kludgelinemode = 0;
-		send_do(TELOPT_SGA, 1);
-#endif
-		set_my_want_state_will(TELOPT_LINEMODE);
-		send_will(option, 0);
-		set_my_state_will(TELOPT_LINEMODE);
-		slc_init();
-		return;
-
-	    case TELOPT_ECHO:		/* We're never going to echo... */
-	    default:
-		break;
-	    }
-
-	    if (new_state_ok) {
-		set_my_want_state_will(option);
-		send_will(option, 0);
-		setconnmode(0);			/* Set new tty mode */
-	    } else {
-		will_wont_resp[option]++;
-		send_wont(option, 0);
-	    }
-	  } else {
-	    /*
-	     * Handle options that need more things done after the
-	     * other side has acknowledged the option.
-	     */
-	    switch (option) {
-	    case TELOPT_LINEMODE:
-#ifdef	KLUDGELINEMODE
-		kludgelinemode = 0;
-		send_do(TELOPT_SGA, 1);
-#endif
-		set_my_state_will(option);
-		slc_init();
-		send_do(TELOPT_SGA, 0);
-		return;
-	    }
-	  }
-	}
-	set_my_state_will(option);
-}
-
-	static void
-dontoption(option)
-	int option;
-{
-
-	if (will_wont_resp[option]) {
-	    --will_wont_resp[option];
-	    if (will_wont_resp[option] && my_state_is_wont(option))
-		--will_wont_resp[option];
-	}
-
-	if ((will_wont_resp[option] == 0) && my_want_state_is_will(option)) {
-	    switch (option) {
-	    case TELOPT_LINEMODE:
-		linemode = 0;	/* put us back to the default state */
-		break;
-#ifdef	OLD_ENVIRON
-	    case TELOPT_NEW_ENVIRON:
-		/*
-		 * The new environ option wasn't recognized, try
-		 * the old one.
-		 */
-		send_will(TELOPT_OLD_ENVIRON, 1);
-		telopt_environ = TELOPT_OLD_ENVIRON;
-		break;
-#endif
-	    }
-	    /* we always accept a DONT */
-	    set_my_want_state_wont(option);
-	    if (my_state_is_will(option))
-		send_wont(option, 0);
-	    setconnmode(0);			/* Set new tty mode */
-	}
-	set_my_state_wont(option);
-}
-
-/*
- * Given a buffer returned by tgetent(), this routine will turn
- * the pipe seperated list of names in the buffer into an array
- * of pointers to null terminated names.  We toss out any bad,
- * duplicate, or verbose names (names with spaces).
- */
-
-static char *name_unknown = "UNKNOWN";
-static char *unknown[] = { 0, 0 };
-
-	char **
-mklist(buf, name)
-	char *buf, *name;
-{
-	register int n;
-	register char c, *cp, **argvp, *cp2, **argv, **avt;
-
-	if (name) {
-		if ((int)strlen(name) > 40) {
-			name = 0;
-			unknown[0] = name_unknown;
-		} else {
-			unknown[0] = name;
-			upcase(name);
-		}
-	} else
-		unknown[0] = name_unknown;
-	/*
-	 * Count up the number of names.
-	 */
-	for (n = 1, cp = buf; *cp && *cp != ':'; cp++) {
-		if (*cp == '|')
-			n++;
-	}
-	/*
-	 * Allocate an array to put the name pointers into
-	 */
-	argv = (char **)malloc((n+3)*sizeof(char *));
-	if (argv == 0)
-		return(unknown);
-
-	/*
-	 * Fill up the array of pointers to names.
-	 */
-	*argv = 0;
-	argvp = argv+1;
-	n = 0;
-	for (cp = cp2 = buf; (c = *cp);  cp++) {
-		if (c == '|' || c == ':') {
-			*cp++ = '\0';
-			/*
-			 * Skip entries that have spaces or are over 40
-			 * characters long.  If this is our environment
-			 * name, then put it up front.  Otherwise, as
-			 * long as this is not a duplicate name (case
-			 * insensitive) add it to the list.
-			 */
-			if (n || (cp - cp2 > 41))
-				;
-			else if (name && (strncasecmp(name, cp2, cp-cp2) == 0))
-				*argv = cp2;
-			else if (is_unique(cp2, argv+1, argvp))
-				*argvp++ = cp2;
-			if (c == ':')
-				break;
-			/*
-			 * Skip multiple delimiters. Reset cp2 to
-			 * the beginning of the next name. Reset n,
-			 * the flag for names with spaces.
-			 */
-			while ((c = *cp) == '|')
-				cp++;
-			cp2 = cp;
-			n = 0;
-		}
-		/*
-		 * Skip entries with spaces or non-ascii values.
-		 * Convert lower case letters to upper case.
-		 */
-		if ((c == ' ') || !isascii(c))
-			n = 1;
-		else if (islower(c))
-			*cp = toupper(c);
-	}
-
-	/*
-	 * Check for an old V6 2 character name.  If the second
-	 * name points to the beginning of the buffer, and is
-	 * only 2 characters long, move it to the end of the array.
-	 */
-	if ((argv[1] == buf) && (strlen(argv[1]) == 2)) {
-		--argvp;
-		for (avt = &argv[1]; avt < argvp; avt++)
-			*avt = *(avt+1);
-		*argvp++ = buf;
-	}
-
-	/*
-	 * Duplicate last name, for TTYPE option, and null
-	 * terminate the array.  If we didn't find a match on
-	 * our terminal name, put that name at the beginning.
-	 */
-	cp = *(argvp-1);
-	*argvp++ = cp;
-	*argvp = 0;
-
-	if (*argv == 0) {
-		if (name)
-			*argv = name;
-		else {
-			--argvp;
-			for (avt = argv; avt < argvp; avt++)
-				*avt = *(avt+1);
-		}
-	}
-	if (*argv)
-		return(argv);
-	else
-		return(unknown);
-}
-
-	int
-is_unique(name, as, ae)
-	register char *name, **as, **ae;
-{
-	register char **ap;
-	register int n;
-
-	n = strlen(name) + 1;
-	for (ap = as; ap < ae; ap++)
-		if (strncasecmp(*ap, name, n) == 0)
-			return(0);
-	return (1);
-}
-
-#ifdef	TERMCAP
-char termbuf[1024];
-
-	/*ARGSUSED*/
-	int
-setupterm(tname, fd, errp)
-	char *tname;
-	int fd, *errp;
-{
-	if (tgetent(termbuf, tname) == 1) {
-		termbuf[1023] = '\0';
-		if (errp)
-			*errp = 1;
-		return(0);
-	}
-	if (errp)
-		*errp = 0;
-	return(-1);
-}
-#else
-#define	termbuf	ttytype
-extern char ttytype[];
-#endif
-
-int resettermname = 1;
-
-	char *
-gettermname()
-{
-	char *tname;
-	static char **tnamep = 0;
-	static char **next;
-	int err;
-
-	if (resettermname) {
-		resettermname = 0;
-		if (tnamep && tnamep != unknown)
-			free(tnamep);
-		if ((tname = (char *)env_getvalue((unsigned char *)"TERM")) &&
-				(setupterm(tname, 1, &err) == 0)) {
-			tnamep = mklist(termbuf, tname);
-		} else {
-			if (tname && ((int)strlen(tname) <= 40)) {
-				unknown[0] = tname;
-				upcase(tname);
-			} else
-				unknown[0] = name_unknown;
-			tnamep = unknown;
-		}
-		next = tnamep;
-	}
-	if (*next == 0)
-		next = tnamep;
-	return(*next++);
-}
-/*
- * suboption()
- *
- *	Look at the sub-option buffer, and try to be helpful to the other
- * side.
- *
- *	Currently we recognize:
- *
- *		Terminal type, send request.
- *		Terminal speed (send request).
- *		Local flow control (is request).
- *		Linemode
- */
-
-    static void
-suboption()
-{
-    unsigned char subchar;
-
-    printsub('<', subbuffer, SB_LEN()+2);
-    switch (subchar = SB_GET()) {
-    case TELOPT_TTYPE:
-	if (my_want_state_is_wont(TELOPT_TTYPE))
-	    return;
-	if (SB_EOF() || SB_GET() != TELQUAL_SEND) {
-	    return;
-	} else {
-	    char *name;
-	    unsigned char temp[50];
-	    int len;
-
-#if	defined(TN3270)
-	    if (tn3270_ttype()) {
-		return;
-	    }
-#endif	/* defined(TN3270) */
-	    name = gettermname();
-	    len = strlen(name) + 4 + 2;
-	    if (len < NETROOM()) {
-		sprintf((char *)temp, "%c%c%c%c%s%c%c", IAC, SB, TELOPT_TTYPE,
-				TELQUAL_IS, name, IAC, SE);
-		ring_supply_data(&netoring, temp, len);
-		printsub('>', &temp[2], len-2);
-	    } else {
-		ExitString("No room in buffer for terminal type.\n", 1);
-		/*NOTREACHED*/
-	    }
-	}
-	break;
-    case TELOPT_TSPEED:
-	if (my_want_state_is_wont(TELOPT_TSPEED))
-	    return;
-	if (SB_EOF())
-	    return;
-	if (SB_GET() == TELQUAL_SEND) {
-	    long ospeed, ispeed;
-	    unsigned char temp[50];
-	    int len;
-
-	    TerminalSpeeds(&ispeed, &ospeed);
-
-	    sprintf((char *)temp, "%c%c%c%c%ld,%ld%c%c", IAC, SB, TELOPT_TSPEED,
-		    TELQUAL_IS, ospeed, ispeed, IAC, SE);
-	    len = strlen((char *)temp+4) + 4;	/* temp[3] is 0 ... */
-
-	    if (len < NETROOM()) {
-		ring_supply_data(&netoring, temp, len);
-		printsub('>', temp+2, len - 2);
-	    }
-/*@*/	    else printf("lm_will: not enough room in buffer\n");
-	}
-	break;
-    case TELOPT_LFLOW:
-	if (my_want_state_is_wont(TELOPT_LFLOW))
-	    return;
-	if (SB_EOF())
-	    return;
-	switch(SB_GET()) {
-	case LFLOW_RESTART_ANY:
-	    restartany = 1;
-	    break;
-	case LFLOW_RESTART_XON:
-	    restartany = 0;
-	    break;
-	case LFLOW_ON:
-	    localflow = 1;
-	    break;
-	case LFLOW_OFF:
-	    localflow = 0;
-	    break;
-	default:
-	    return;
-	}
-	setcommandmode();
-	setconnmode(0);
-	break;
-
-    case TELOPT_LINEMODE:
-	if (my_want_state_is_wont(TELOPT_LINEMODE))
-	    return;
-	if (SB_EOF())
-	    return;
-	switch (SB_GET()) {
-	case WILL:
-	    lm_will(subpointer, SB_LEN());
-	    break;
-	case WONT:
-	    lm_wont(subpointer, SB_LEN());
-	    break;
-	case DO:
-	    lm_do(subpointer, SB_LEN());
-	    break;
-	case DONT:
-	    lm_dont(subpointer, SB_LEN());
-	    break;
-	case LM_SLC:
-	    slc(subpointer, SB_LEN());
-	    break;
-	case LM_MODE:
-	    lm_mode(subpointer, SB_LEN(), 0);
-	    break;
-	default:
-	    break;
-	}
-	break;
-
-#ifdef	OLD_ENVIRON
-    case TELOPT_OLD_ENVIRON:
-#endif
-    case TELOPT_NEW_ENVIRON:
-	if (SB_EOF())
-	    return;
-	switch(SB_PEEK()) {
-	case TELQUAL_IS:
-	case TELQUAL_INFO:
-	    if (my_want_state_is_dont(subchar))
-		return;
-	    break;
-	case TELQUAL_SEND:
-	    if (my_want_state_is_wont(subchar)) {
-		return;
-	    }
-	    break;
-	default:
-	    return;
-	}
-	env_opt(subpointer, SB_LEN());
-	break;
-
-    case TELOPT_XDISPLOC:
-	if (my_want_state_is_wont(TELOPT_XDISPLOC))
-	    return;
-	if (SB_EOF())
-	    return;
-	if (SB_GET() == TELQUAL_SEND) {
-	    unsigned char temp[50], *dp;
-	    int len;
-
-	    if ((dp = env_getvalue((unsigned char *)"DISPLAY")) == NULL) {
-		/*
-		 * Something happened, we no longer have a DISPLAY
-		 * variable.  So, turn off the option.
-		 */
-		send_wont(TELOPT_XDISPLOC, 1);
-		break;
-	    }
-	    sprintf((char *)temp, "%c%c%c%c%s%c%c", IAC, SB, TELOPT_XDISPLOC,
-		    TELQUAL_IS, dp, IAC, SE);
-	    len = strlen((char *)temp+4) + 4;	/* temp[3] is 0 ... */
-
-	    if (len < NETROOM()) {
-		ring_supply_data(&netoring, temp, len);
-		printsub('>', temp+2, len - 2);
-	    }
-/*@*/	    else printf("lm_will: not enough room in buffer\n");
-	}
-	break;
-
-#if	defined(AUTHENTICATION)
-	case TELOPT_AUTHENTICATION: {
-		if (!autologin)
-			break;
-		if (SB_EOF())
-			return;
-		switch(SB_GET()) {
-		case TELQUAL_IS:
-			if (my_want_state_is_dont(TELOPT_AUTHENTICATION))
-				return;
-			auth_is(subpointer, SB_LEN());
-			break;
-		case TELQUAL_SEND:
-			if (my_want_state_is_wont(TELOPT_AUTHENTICATION))
-				return;
-			auth_send(subpointer, SB_LEN());
-			break;
-		case TELQUAL_REPLY:
-			if (my_want_state_is_wont(TELOPT_AUTHENTICATION))
-				return;
-			auth_reply(subpointer, SB_LEN());
-			break;
-		case TELQUAL_NAME:
-			if (my_want_state_is_dont(TELOPT_AUTHENTICATION))
-				return;
-			auth_name(subpointer, SB_LEN());
-			break;
-		}
-	}
-	break;
-#endif
-#ifdef	ENCRYPTION
-	case TELOPT_ENCRYPT:
-		if (SB_EOF())
-			return;
-		switch(SB_GET()) {
-		case ENCRYPT_START:
-			if (my_want_state_is_dont(TELOPT_ENCRYPT))
-				return;
-			encrypt_start(subpointer, SB_LEN());
-			break;
-		case ENCRYPT_END:
-			if (my_want_state_is_dont(TELOPT_ENCRYPT))
-				return;
-			encrypt_end();
-			break;
-		case ENCRYPT_SUPPORT:
-			if (my_want_state_is_wont(TELOPT_ENCRYPT))
-				return;
-			encrypt_support(subpointer, SB_LEN());
-			break;
-		case ENCRYPT_REQSTART:
-			if (my_want_state_is_wont(TELOPT_ENCRYPT))
-				return;
-			encrypt_request_start(subpointer, SB_LEN());
-			break;
-		case ENCRYPT_REQEND:
-			if (my_want_state_is_wont(TELOPT_ENCRYPT))
-				return;
-			/*
-			 * We can always send an REQEND so that we cannot
-			 * get stuck encrypting.  We should only get this
-			 * if we have been able to get in the correct mode
-			 * anyhow.
-			 */
-			encrypt_request_end();
-			break;
-		case ENCRYPT_IS:
-			if (my_want_state_is_dont(TELOPT_ENCRYPT))
-				return;
-			encrypt_is(subpointer, SB_LEN());
-			break;
-		case ENCRYPT_REPLY:
-			if (my_want_state_is_wont(TELOPT_ENCRYPT))
-				return;
-			encrypt_reply(subpointer, SB_LEN());
-			break;
-		case ENCRYPT_ENC_KEYID:
-			if (my_want_state_is_dont(TELOPT_ENCRYPT))
-				return;
-			encrypt_enc_keyid(subpointer, SB_LEN());
-			break;
-		case ENCRYPT_DEC_KEYID:
-			if (my_want_state_is_wont(TELOPT_ENCRYPT))
-				return;
-			encrypt_dec_keyid(subpointer, SB_LEN());
-			break;
-		default:
-			break;
-		}
-		break;
-#endif	/* ENCRYPTION */
-    default:
-	break;
-    }
-}
-
-static unsigned char str_lm[] = { IAC, SB, TELOPT_LINEMODE, 0, 0, IAC, SE };
-
-    void
-lm_will(cmd, len)
-    unsigned char *cmd;
-    int len;
-{
-    if (len < 1) {
-/*@*/	printf("lm_will: no command!!!\n");	/* Should not happen... */
-	return;
-    }
-    switch(cmd[0]) {
-    case LM_FORWARDMASK:	/* We shouldn't ever get this... */
-    default:
-	str_lm[3] = DONT;
-	str_lm[4] = cmd[0];
-	if (NETROOM() > sizeof(str_lm)) {
-	    ring_supply_data(&netoring, str_lm, sizeof(str_lm));
-	    printsub('>', &str_lm[2], sizeof(str_lm)-2);
-	}
-/*@*/	else printf("lm_will: not enough room in buffer\n");
-	break;
-    }
-}
-
-    void
-lm_wont(cmd, len)
-    unsigned char *cmd;
-    int len;
-{
-    if (len < 1) {
-/*@*/	printf("lm_wont: no command!!!\n");	/* Should not happen... */
-	return;
-    }
-    switch(cmd[0]) {
-    case LM_FORWARDMASK:	/* We shouldn't ever get this... */
-    default:
-	/* We are always DONT, so don't respond */
-	return;
-    }
-}
-
-    void
-lm_do(cmd, len)
-    unsigned char *cmd;
-    int len;
-{
-    if (len < 1) {
-/*@*/	printf("lm_do: no command!!!\n");	/* Should not happen... */
-	return;
-    }
-    switch(cmd[0]) {
-    case LM_FORWARDMASK:
-    default:
-	str_lm[3] = WONT;
-	str_lm[4] = cmd[0];
-	if (NETROOM() > sizeof(str_lm)) {
-	    ring_supply_data(&netoring, str_lm, sizeof(str_lm));
-	    printsub('>', &str_lm[2], sizeof(str_lm)-2);
-	}
-/*@*/	else printf("lm_do: not enough room in buffer\n");
-	break;
-    }
-}
-
-    void
-lm_dont(cmd, len)
-    unsigned char *cmd;
-    int len;
-{
-    if (len < 1) {
-/*@*/	printf("lm_dont: no command!!!\n");	/* Should not happen... */
-	return;
-    }
-    switch(cmd[0]) {
-    case LM_FORWARDMASK:
-    default:
-	/* we are always WONT, so don't respond */
-	break;
-    }
-}
-
-static unsigned char str_lm_mode[] = {
-	IAC, SB, TELOPT_LINEMODE, LM_MODE, 0, IAC, SE
-};
-
-	void
-lm_mode(cmd, len, init)
-	unsigned char *cmd;
-	int len, init;
-{
-	if (len != 1)
-		return;
-	if ((linemode&MODE_MASK&~MODE_ACK) == *cmd)
-		return;
-	if (*cmd&MODE_ACK)
-		return;
-	linemode = *cmd&(MODE_MASK&~MODE_ACK);
-	str_lm_mode[4] = linemode;
-	if (!init)
-	    str_lm_mode[4] |= MODE_ACK;
-	if (NETROOM() > sizeof(str_lm_mode)) {
-	    ring_supply_data(&netoring, str_lm_mode, sizeof(str_lm_mode));
-	    printsub('>', &str_lm_mode[2], sizeof(str_lm_mode)-2);
-	}
-/*@*/	else printf("lm_mode: not enough room in buffer\n");
-	setconnmode(0);	/* set changed mode */
-}
-
-
-
-/*
- * slc()
- * Handle special character suboption of LINEMODE.
- */
-
-struct spc {
-	cc_t val;
-	cc_t *valp;
-	char flags;	/* Current flags & level */
-	char mylevel;	/* Maximum level & flags */
-} spc_data[NSLC+1];
-
-#define SLC_IMPORT	0
-#define	SLC_EXPORT	1
-#define SLC_RVALUE	2
-static int slc_mode = SLC_EXPORT;
-
-	void
-slc_init()
-{
-	register struct spc *spcp;
-
-	localchars = 1;
-	for (spcp = spc_data; spcp < &spc_data[NSLC+1]; spcp++) {
-		spcp->val = 0;
-		spcp->valp = 0;
-		spcp->flags = spcp->mylevel = SLC_NOSUPPORT;
-	}
-
-#define	initfunc(func, flags) { \
-					spcp = &spc_data[func]; \
-					if ((spcp->valp = tcval(func))) { \
-					    spcp->val = *spcp->valp; \
-					    spcp->mylevel = SLC_VARIABLE|flags; \
-					} else { \
-					    spcp->val = 0; \
-					    spcp->mylevel = SLC_DEFAULT; \
-					} \
-				    }
-
-	initfunc(SLC_SYNCH, 0);
-	/* No BRK */
-	initfunc(SLC_AO, 0);
-	initfunc(SLC_AYT, 0);
-	/* No EOR */
-	initfunc(SLC_ABORT, SLC_FLUSHIN|SLC_FLUSHOUT);
-	initfunc(SLC_EOF, 0);
-#ifndef	SYSV_TERMIO
-	initfunc(SLC_SUSP, SLC_FLUSHIN);
-#endif
-	initfunc(SLC_EC, 0);
-	initfunc(SLC_EL, 0);
-#ifndef	SYSV_TERMIO
-	initfunc(SLC_EW, 0);
-	initfunc(SLC_RP, 0);
-	initfunc(SLC_LNEXT, 0);
-#endif
-	initfunc(SLC_XON, 0);
-	initfunc(SLC_XOFF, 0);
-#ifdef	SYSV_TERMIO
-	spc_data[SLC_XON].mylevel = SLC_CANTCHANGE;
-	spc_data[SLC_XOFF].mylevel = SLC_CANTCHANGE;
-#endif
-	initfunc(SLC_FORW1, 0);
-#ifdef	USE_TERMIO
-	initfunc(SLC_FORW2, 0);
-	/* No FORW2 */
-#endif
-
-	initfunc(SLC_IP, SLC_FLUSHIN|SLC_FLUSHOUT);
-#undef	initfunc
-
-	if (slc_mode == SLC_EXPORT)
-		slc_export();
-	else
-		slc_import(1);
-
-}
-
-    void
-slcstate()
-{
-    printf("Special characters are %s values\n",
-		slc_mode == SLC_IMPORT ? "remote default" :
-		slc_mode == SLC_EXPORT ? "local" :
-					 "remote");
-}
-
-    void
-slc_mode_export()
-{
-    slc_mode = SLC_EXPORT;
-    if (my_state_is_will(TELOPT_LINEMODE))
-	slc_export();
-}
-
-    void
-slc_mode_import(def)
-    int def;
-{
-    slc_mode = def ? SLC_IMPORT : SLC_RVALUE;
-    if (my_state_is_will(TELOPT_LINEMODE))
-	slc_import(def);
-}
-
-unsigned char slc_import_val[] = {
-	IAC, SB, TELOPT_LINEMODE, LM_SLC, 0, SLC_VARIABLE, 0, IAC, SE
-};
-unsigned char slc_import_def[] = {
-	IAC, SB, TELOPT_LINEMODE, LM_SLC, 0, SLC_DEFAULT, 0, IAC, SE
-};
-
-    void
-slc_import(def)
-    int def;
-{
-    if (NETROOM() > sizeof(slc_import_val)) {
-	if (def) {
-	    ring_supply_data(&netoring, slc_import_def, sizeof(slc_import_def));
-	    printsub('>', &slc_import_def[2], sizeof(slc_import_def)-2);
-	} else {
-	    ring_supply_data(&netoring, slc_import_val, sizeof(slc_import_val));
-	    printsub('>', &slc_import_val[2], sizeof(slc_import_val)-2);
-	}
-    }
-/*@*/ else printf("slc_import: not enough room\n");
-}
-
-    void
-slc_export()
-{
-    register struct spc *spcp;
-
-    TerminalDefaultChars();
-
-    slc_start_reply();
-    for (spcp = &spc_data[1]; spcp < &spc_data[NSLC+1]; spcp++) {
-	if (spcp->mylevel != SLC_NOSUPPORT) {
-	    if (spcp->val == (cc_t)(_POSIX_VDISABLE))
-		spcp->flags = SLC_NOSUPPORT;
-	    else
-		spcp->flags = spcp->mylevel;
-	    if (spcp->valp)
-		spcp->val = *spcp->valp;
-	    slc_add_reply(spcp - spc_data, spcp->flags, spcp->val);
-	}
-    }
-    slc_end_reply();
-    (void)slc_update();
-    setconnmode(1);	/* Make sure the character values are set */
-}
-
-	void
-slc(cp, len)
-	register unsigned char *cp;
-	int len;
-{
-	register struct spc *spcp;
-	register int func,level;
-
-	slc_start_reply();
-
-	for (; len >= 3; len -=3, cp +=3) {
-
-		func = cp[SLC_FUNC];
-
-		if (func == 0) {
-			/*
-			 * Client side: always ignore 0 function.
-			 */
-			continue;
-		}
-		if (func > NSLC) {
-			if ((cp[SLC_FLAGS] & SLC_LEVELBITS) != SLC_NOSUPPORT)
-				slc_add_reply(func, SLC_NOSUPPORT, 0);
-			continue;
-		}
-
-		spcp = &spc_data[func];
-
-		level = cp[SLC_FLAGS]&(SLC_LEVELBITS|SLC_ACK);
-
-		if ((cp[SLC_VALUE] == (unsigned char)spcp->val) &&
-		    ((level&SLC_LEVELBITS) == (spcp->flags&SLC_LEVELBITS))) {
-			continue;
-		}
-
-		if (level == (SLC_DEFAULT|SLC_ACK)) {
-			/*
-			 * This is an error condition, the SLC_ACK
-			 * bit should never be set for the SLC_DEFAULT
-			 * level.  Our best guess to recover is to
-			 * ignore the SLC_ACK bit.
-			 */
-			cp[SLC_FLAGS] &= ~SLC_ACK;
-		}
-
-		if (level == ((spcp->flags&SLC_LEVELBITS)|SLC_ACK)) {
-			spcp->val = (cc_t)cp[SLC_VALUE];
-			spcp->flags = cp[SLC_FLAGS];	/* include SLC_ACK */
-			continue;
-		}
-
-		level &= ~SLC_ACK;
-
-		if (level <= (spcp->mylevel&SLC_LEVELBITS)) {
-			spcp->flags = cp[SLC_FLAGS]|SLC_ACK;
-			spcp->val = (cc_t)cp[SLC_VALUE];
-		}
-		if (level == SLC_DEFAULT) {
-			if ((spcp->mylevel&SLC_LEVELBITS) != SLC_DEFAULT)
-				spcp->flags = spcp->mylevel;
-			else
-				spcp->flags = SLC_NOSUPPORT;
-		}
-		slc_add_reply(func, spcp->flags, spcp->val);
-	}
-	slc_end_reply();
-	if (slc_update())
-		setconnmode(1);	/* set the  new character values */
-}
-
-    void
-slc_check()
-{
-    register struct spc *spcp;
-
-    slc_start_reply();
-    for (spcp = &spc_data[1]; spcp < &spc_data[NSLC+1]; spcp++) {
-	if (spcp->valp && spcp->val != *spcp->valp) {
-	    spcp->val = *spcp->valp;
-	    if (spcp->val == (cc_t)(_POSIX_VDISABLE))
-		spcp->flags = SLC_NOSUPPORT;
-	    else
-		spcp->flags = spcp->mylevel;
-	    slc_add_reply(spcp - spc_data, spcp->flags, spcp->val);
-	}
-    }
-    slc_end_reply();
-    setconnmode(1);
-}
-
-
-unsigned char slc_reply[128];
-unsigned char *slc_replyp;
-
-	void
-slc_start_reply()
-{
-	slc_replyp = slc_reply;
-	*slc_replyp++ = IAC;
-	*slc_replyp++ = SB;
-	*slc_replyp++ = TELOPT_LINEMODE;
-	*slc_replyp++ = LM_SLC;
-}
-
-	void
-slc_add_reply(func, flags, value)
-	unsigned char func;
-	unsigned char flags;
-	cc_t value;
-{
-	if ((*slc_replyp++ = func) == IAC)
-		*slc_replyp++ = IAC;
-	if ((*slc_replyp++ = flags) == IAC)
-		*slc_replyp++ = IAC;
-	if ((*slc_replyp++ = (unsigned char)value) == IAC)
-		*slc_replyp++ = IAC;
-}
-
-    void
-slc_end_reply()
-{
-    register int len;
-
-    *slc_replyp++ = IAC;
-    *slc_replyp++ = SE;
-    len = slc_replyp - slc_reply;
-    if (len <= 6)
-	return;
-    if (NETROOM() > len) {
-	ring_supply_data(&netoring, slc_reply, slc_replyp - slc_reply);
-	printsub('>', &slc_reply[2], slc_replyp - slc_reply - 2);
-    }
-/*@*/else printf("slc_end_reply: not enough room\n");
-}
-
-	int
-slc_update()
-{
-	register struct spc *spcp;
-	int need_update = 0;
-
-	for (spcp = &spc_data[1]; spcp < &spc_data[NSLC+1]; spcp++) {
-		if (!(spcp->flags&SLC_ACK))
-			continue;
-		spcp->flags &= ~SLC_ACK;
-		if (spcp->valp && (*spcp->valp != spcp->val)) {
-			*spcp->valp = spcp->val;
-			need_update = 1;
-		}
-	}
-	return(need_update);
-}
-
-#ifdef	OLD_ENVIRON
-# ifdef	ENV_HACK
-/*
- * Earlier version of telnet/telnetd from the BSD code had
- * the definitions of VALUE and VAR reversed.  To ensure
- * maximum interoperability, we assume that the server is
- * an older BSD server, until proven otherwise.  The newer
- * BSD servers should be able to handle either definition,
- * so it is better to use the wrong values if we don't
- * know what type of server it is.
- */
-int env_auto = 1;
-int old_env_var = OLD_ENV_VAR;
-int old_env_value = OLD_ENV_VALUE;
-# else
-#  define old_env_var OLD_ENV_VAR
-#  define old_env_value OLD_ENV_VALUE
-# endif
-#endif
-
-	void
-env_opt(buf, len)
-	register unsigned char *buf;
-	register int len;
-{
-	register unsigned char *ep = 0, *epc = 0;
-	register int i;
-
-	switch(buf[0]&0xff) {
-	case TELQUAL_SEND:
-		env_opt_start();
-		if (len == 1) {
-			env_opt_add(NULL);
-		} else for (i = 1; i < len; i++) {
-			switch (buf[i]&0xff) {
-#ifdef	OLD_ENVIRON
-			case OLD_ENV_VAR:
-# ifdef	ENV_HACK
-				if (telopt_environ == TELOPT_OLD_ENVIRON
-				    && env_auto) {
-					/* Server has the same definitions */
-					old_env_var = OLD_ENV_VAR;
-					old_env_value = OLD_ENV_VALUE;
-				}
-				/* FALL THROUGH */
-# endif
-			case OLD_ENV_VALUE:
-				/*
-				 * Although OLD_ENV_VALUE is not legal, we will
-				 * still recognize it, just in case it is an
-				 * old server that has VAR & VALUE mixed up...
-				 */
-				/* FALL THROUGH */
-#else
-			case NEW_ENV_VAR:
-#endif
-			case ENV_USERVAR:
-				if (ep) {
-					*epc = 0;
-					env_opt_add(ep);
-				}
-				ep = epc = &buf[i+1];
-				break;
-			case ENV_ESC:
-				i++;
-				/*FALL THROUGH*/
-			default:
-				if (epc)
-					*epc++ = buf[i];
-				break;
-			}
-		}
-		if (ep) {
-			*epc = 0;
-			env_opt_add(ep);
-		}
-		env_opt_end(1);
-		break;
-
-	case TELQUAL_IS:
-	case TELQUAL_INFO:
-		/* Ignore for now.  We shouldn't get it anyway. */
-		break;
-
-	default:
-		break;
-	}
-}
-
-#define	OPT_REPLY_SIZE	256
-unsigned char *opt_reply;
-unsigned char *opt_replyp;
-unsigned char *opt_replyend;
-
-	void
-env_opt_start()
-{
-	if (opt_reply)
-		opt_reply = (unsigned char *)realloc(opt_reply, OPT_REPLY_SIZE);
-	else
-		opt_reply = (unsigned char *)malloc(OPT_REPLY_SIZE);
-	if (opt_reply == NULL) {
-/*@*/		printf("env_opt_start: malloc()/realloc() failed!!!\n");
-		opt_reply = opt_replyp = opt_replyend = NULL;
-		return;
-	}
-	opt_replyp = opt_reply;
-	opt_replyend = opt_reply + OPT_REPLY_SIZE;
-	*opt_replyp++ = IAC;
-	*opt_replyp++ = SB;
-	*opt_replyp++ = telopt_environ;
-	*opt_replyp++ = TELQUAL_IS;
-}
-
-	void
-env_opt_start_info()
-{
-	env_opt_start();
-	if (opt_replyp)
-	    opt_replyp[-1] = TELQUAL_INFO;
-}
-
-	void
-env_opt_add(ep)
-	register unsigned char *ep;
-{
-	register unsigned char *vp, c;
-
-	if (opt_reply == NULL)		/*XXX*/
-		return;			/*XXX*/
-
-	if (ep == NULL || *ep == '\0') {
-		/* Send user defined variables first. */
-		env_default(1, 0);
-		while ((ep = env_default(0, 0)))
-			env_opt_add(ep);
-
-		/* Now add the list of well know variables.  */
-		env_default(1, 1);
-		while ((ep = env_default(0, 1)))
-			env_opt_add(ep);
-		return;
-	}
-	vp = env_getvalue(ep);
-	if (opt_replyp + (vp ? strlen((char *)vp) : 0) +
-				strlen((char *)ep) + 6 > opt_replyend)
-	{
-		register int len;
-		opt_replyend += OPT_REPLY_SIZE;
-		len = opt_replyend - opt_reply;
-		opt_reply = (unsigned char *)realloc(opt_reply, len);
-		if (opt_reply == NULL) {
-/*@*/			printf("env_opt_add: realloc() failed!!!\n");
-			opt_reply = opt_replyp = opt_replyend = NULL;
-			return;
-		}
-		opt_replyp = opt_reply + len - (opt_replyend - opt_replyp);
-		opt_replyend = opt_reply + len;
-	}
-	if (opt_welldefined(ep))
-#ifdef	OLD_ENVIRON
-		if (telopt_environ == TELOPT_OLD_ENVIRON)
-			*opt_replyp++ = old_env_var;
-		else
-#endif
-			*opt_replyp++ = NEW_ENV_VAR;
-	else
-		*opt_replyp++ = ENV_USERVAR;
-	for (;;) {
-		while ((c = *ep++)) {
-			switch(c&0xff) {
-			case IAC:
-				*opt_replyp++ = IAC;
-				break;
-			case NEW_ENV_VAR:
-			case NEW_ENV_VALUE:
-			case ENV_ESC:
-			case ENV_USERVAR:
-				*opt_replyp++ = ENV_ESC;
-				break;
-			}
-			*opt_replyp++ = c;
-		}
-		if ((ep = vp)) {
-#ifdef	OLD_ENVIRON
-			if (telopt_environ == TELOPT_OLD_ENVIRON)
-				*opt_replyp++ = old_env_value;
-			else
-#endif
-				*opt_replyp++ = NEW_ENV_VALUE;
-			vp = NULL;
-		} else
-			break;
-	}
-}
-
-	int
-opt_welldefined(ep)
-	char *ep;
-{
-	if ((strcmp(ep, "USER") == 0) ||
-	    (strcmp(ep, "DISPLAY") == 0) ||
-	    (strcmp(ep, "PRINTER") == 0) ||
-	    (strcmp(ep, "SYSTEMTYPE") == 0) ||
-	    (strcmp(ep, "JOB") == 0) ||
-	    (strcmp(ep, "ACCT") == 0))
-		return(1);
-	return(0);
-}
-	void
-env_opt_end(emptyok)
-	register int emptyok;
-{
-	register int len;
-
-	len = opt_replyp - opt_reply + 2;
-	if (emptyok || len > 6) {
-		*opt_replyp++ = IAC;
-		*opt_replyp++ = SE;
-		if (NETROOM() > len) {
-			ring_supply_data(&netoring, opt_reply, len);
-			printsub('>', &opt_reply[2], len - 2);
-		}
-/*@*/		else printf("slc_end_reply: not enough room\n");
-	}
-	if (opt_reply) {
-		free(opt_reply);
-		opt_reply = opt_replyp = opt_replyend = NULL;
-	}
-}
-
-
-
-    int
-telrcv()
-{
-    register int c;
-    register int scc;
-    register unsigned char *sbp;
-    int count;
-    int returnValue = 0;
-
-    scc = 0;
-    count = 0;
-    while (TTYROOM() > 2) {
-	if (scc == 0) {
-	    if (count) {
-		ring_consumed(&netiring, count);
-		returnValue = 1;
-		count = 0;
-	    }
-	    sbp = netiring.consume;
-	    scc = ring_full_consecutive(&netiring);
-	    if (scc == 0) {
-		/* No more data coming in */
-		break;
-	    }
-	}
-
-	c = *sbp++ & 0xff, scc--; count++;
-#ifdef	ENCRYPTION
-	if (decrypt_input)
-		c = (*decrypt_input)(c);
-#endif	/* ENCRYPTION */
-
-	switch (telrcv_state) {
-
-	case TS_CR:
-	    telrcv_state = TS_DATA;
-	    if (c == '\0') {
-		break;	/* Ignore \0 after CR */
-	    }
-	    else if ((c == '\n') && my_want_state_is_dont(TELOPT_ECHO) && !crmod) {
-		TTYADD(c);
-		break;
-	    }
-	    /* Else, fall through */
-
-	case TS_DATA:
-	    if (c == IAC) {
-		telrcv_state = TS_IAC;
-		break;
-	    }
-#	    if defined(TN3270)
-	    if (In3270) {
-		*Ifrontp++ = c;
-		while (scc > 0) {
-		    c = *sbp++ & 0377, scc--; count++;
-#ifdef	ENCRYPTION
-		    if (decrypt_input)
-			c = (*decrypt_input)(c);
-#endif	/* ENCRYPTION */
-		    if (c == IAC) {
-			telrcv_state = TS_IAC;
-			break;
-		    }
-		    *Ifrontp++ = c;
-		}
-	    } else
-#	    endif /* defined(TN3270) */
-		    /*
-		     * The 'crmod' hack (see following) is needed
-		     * since we can't * set CRMOD on output only.
-		     * Machines like MULTICS like to send \r without
-		     * \n; since we must turn off CRMOD to get proper
-		     * input, the mapping is done here (sigh).
-		     */
-	    if ((c == '\r') && my_want_state_is_dont(TELOPT_BINARY)) {
-		if (scc > 0) {
-		    c = *sbp&0xff;
-#ifdef	ENCRYPTION
-		    if (decrypt_input)
-			c = (*decrypt_input)(c);
-#endif	/* ENCRYPTION */
-		    if (c == 0) {
-			sbp++, scc--; count++;
-			/* a "true" CR */
-			TTYADD('\r');
-		    } else if (my_want_state_is_dont(TELOPT_ECHO) &&
-					(c == '\n')) {
-			sbp++, scc--; count++;
-			TTYADD('\n');
-		    } else {
-#ifdef	ENCRYPTION
-			if (decrypt_input)
-			    (*decrypt_input)(-1);
-#endif	/* ENCRYPTION */
-
-			TTYADD('\r');
-			if (crmod) {
-				TTYADD('\n');
-			}
-		    }
-		} else {
-		    telrcv_state = TS_CR;
-		    TTYADD('\r');
-		    if (crmod) {
-			    TTYADD('\n');
-		    }
-		}
-	    } else {
-		TTYADD(c);
-	    }
-	    continue;
-
-	case TS_IAC:
-process_iac:
-	    switch (c) {
-
-	    case WILL:
-		telrcv_state = TS_WILL;
-		continue;
-
-	    case WONT:
-		telrcv_state = TS_WONT;
-		continue;
-
-	    case DO:
-		telrcv_state = TS_DO;
-		continue;
-
-	    case DONT:
-		telrcv_state = TS_DONT;
-		continue;
-
-	    case DM:
-		    /*
-		     * We may have missed an urgent notification,
-		     * so make sure we flush whatever is in the
-		     * buffer currently.
-		     */
-		printoption("RCVD", IAC, DM);
-		SYNCHing = 1;
-		(void) ttyflush(1);
-		SYNCHing = stilloob();
-		settimer(gotDM);
-		break;
-
-	    case SB:
-		SB_CLEAR();
-		telrcv_state = TS_SB;
-		continue;
-
-#	    if defined(TN3270)
-	    case EOR:
-		if (In3270) {
-		    if (Ibackp == Ifrontp) {
-			Ibackp = Ifrontp = Ibuf;
-			ISend = 0;	/* should have been! */
-		    } else {
-			Ibackp += DataFromNetwork(Ibackp, Ifrontp-Ibackp, 1);
-			ISend = 1;
-		    }
-		}
-		printoption("RCVD", IAC, EOR);
-		break;
-#	    endif /* defined(TN3270) */
-
-	    case IAC:
-#	    if !defined(TN3270)
-		TTYADD(IAC);
-#	    else /* !defined(TN3270) */
-		if (In3270) {
-		    *Ifrontp++ = IAC;
-		} else {
-		    TTYADD(IAC);
-		}
-#	    endif /* !defined(TN3270) */
-		break;
-
-	    case NOP:
-	    case GA:
-	    default:
-		printoption("RCVD", IAC, c);
-		break;
-	    }
-	    telrcv_state = TS_DATA;
-	    continue;
-
-	case TS_WILL:
-	    printoption("RCVD", WILL, c);
-	    willoption(c);
-	    SetIn3270();
-	    telrcv_state = TS_DATA;
-	    continue;
-
-	case TS_WONT:
-	    printoption("RCVD", WONT, c);
-	    wontoption(c);
-	    SetIn3270();
-	    telrcv_state = TS_DATA;
-	    continue;
-
-	case TS_DO:
-	    printoption("RCVD", DO, c);
-	    dooption(c);
-	    SetIn3270();
-	    if (c == TELOPT_NAWS) {
-		sendnaws();
-	    } else if (c == TELOPT_LFLOW) {
-		localflow = 1;
-		setcommandmode();
-		setconnmode(0);
-	    }
-	    telrcv_state = TS_DATA;
-	    continue;
-
-	case TS_DONT:
-	    printoption("RCVD", DONT, c);
-	    dontoption(c);
-	    flushline = 1;
-	    setconnmode(0);	/* set new tty mode (maybe) */
-	    SetIn3270();
-	    telrcv_state = TS_DATA;
-	    continue;
-
-	case TS_SB:
-	    if (c == IAC) {
-		telrcv_state = TS_SE;
-	    } else {
-		SB_ACCUM(c);
-	    }
-	    continue;
-
-	case TS_SE:
-	    if (c != SE) {
-		if (c != IAC) {
-		    /*
-		     * This is an error.  We only expect to get
-		     * "IAC IAC" or "IAC SE".  Several things may
-		     * have happend.  An IAC was not doubled, the
-		     * IAC SE was left off, or another option got
-		     * inserted into the suboption are all possibilities.
-		     * If we assume that the IAC was not doubled,
-		     * and really the IAC SE was left off, we could
-		     * get into an infinate loop here.  So, instead,
-		     * we terminate the suboption, and process the
-		     * partial suboption if we can.
-		     */
-		    SB_ACCUM(IAC);
-		    SB_ACCUM(c);
-		    subpointer -= 2;
-		    SB_TERM();
-
-		    printoption("In SUBOPTION processing, RCVD", IAC, c);
-		    suboption();	/* handle sub-option */
-		    SetIn3270();
-		    telrcv_state = TS_IAC;
-		    goto process_iac;
-		}
-		SB_ACCUM(c);
-		telrcv_state = TS_SB;
-	    } else {
-		SB_ACCUM(IAC);
-		SB_ACCUM(SE);
-		subpointer -= 2;
-		SB_TERM();
-		suboption();	/* handle sub-option */
-		SetIn3270();
-		telrcv_state = TS_DATA;
-	    }
-	}
-    }
-    if (count)
-	ring_consumed(&netiring, count);
-    return returnValue||count;
-}
-
-static int bol = 1, local = 0;
-
-    int
-rlogin_susp()
-{
-    if (local) {
-	local = 0;
-	bol = 1;
-	command(0, "z\n", 2);
-	return(1);
-    }
-    return(0);
-}
-
-    static int
-telsnd()
-{
-    int tcc;
-    int count;
-    int returnValue = 0;
-    unsigned char *tbp;
-
-    tcc = 0;
-    count = 0;
-    while (NETROOM() > 2) {
-	register int sc;
-	register int c;
-
-	if (tcc == 0) {
-	    if (count) {
-		ring_consumed(&ttyiring, count);
-		returnValue = 1;
-		count = 0;
-	    }
-	    tbp = ttyiring.consume;
-	    tcc = ring_full_consecutive(&ttyiring);
-	    if (tcc == 0) {
-		break;
-	    }
-	}
-	c = *tbp++ & 0xff, sc = strip(c), tcc--; count++;
-	if (rlogin != _POSIX_VDISABLE) {
-		if (bol) {
-			bol = 0;
-			if (sc == rlogin) {
-				local = 1;
-				continue;
-			}
-		} else if (local) {
-			local = 0;
-			if (sc == '.' || c == termEofChar) {
-				bol = 1;
-				command(0, "close\n", 6);
-				continue;
-			}
-			if (sc == termSuspChar) {
-				bol = 1;
-				command(0, "z\n", 2);
-				continue;
-			}
-			if (sc == escape) {
-				command(0, (char *)tbp, tcc);
-				bol = 1;
-				count += tcc;
-				tcc = 0;
-				flushline = 1;
-				break;
-			}
-			if (sc != rlogin) {
-				++tcc;
-				--tbp;
-				--count;
-				c = sc = rlogin;
-			}
-		}
-		if ((sc == '\n') || (sc == '\r'))
-			bol = 1;
-	} else if (escape != _POSIX_VDISABLE && sc == escape) {
-	    /*
-	     * Double escape is a pass through of a single escape character.
-	     */
-	    if (tcc && strip(*tbp) == escape) {
-		tbp++;
-		tcc--;
-		count++;
-		bol = 0;
-	    } else {
-		command(0, (char *)tbp, tcc);
-		bol = 1;
-		count += tcc;
-		tcc = 0;
-		flushline = 1;
-		break;
-	    }
-	} else
-	    bol = 0;
-#ifdef	KLUDGELINEMODE
-	if (kludgelinemode && (globalmode&MODE_EDIT) && (sc == echoc)) {
-	    if (tcc > 0 && strip(*tbp) == echoc) {
-		tcc--; tbp++; count++;
-	    } else {
-		dontlecho = !dontlecho;
-		settimer(echotoggle);
-		setconnmode(0);
-		flushline = 1;
-		break;
-	    }
-	}
-#endif
-	if (MODE_LOCAL_CHARS(globalmode)) {
-	    if (TerminalSpecialChars(sc) == 0) {
-		bol = 1;
-		break;
-	    }
-	}
-	if (my_want_state_is_wont(TELOPT_BINARY)) {
-	    switch (c) {
-	    case '\n':
-		    /*
-		     * If we are in CRMOD mode (\r ==> \n)
-		     * on our local machine, then probably
-		     * a newline (unix) is CRLF (TELNET).
-		     */
-		if (MODE_LOCAL_CHARS(globalmode)) {
-		    NETADD('\r');
-		}
-		NETADD('\n');
-		bol = flushline = 1;
-		break;
-	    case '\r':
-		if (!crlf) {
-		    NET2ADD('\r', '\0');
-		} else {
-		    NET2ADD('\r', '\n');
-		}
-		bol = flushline = 1;
-		break;
-	    case IAC:
-		NET2ADD(IAC, IAC);
-		break;
-	    default:
-		NETADD(c);
-		break;
-	    }
-	} else if (c == IAC) {
-	    NET2ADD(IAC, IAC);
-	} else {
-	    NETADD(c);
-	}
-    }
-    if (count)
-	ring_consumed(&ttyiring, count);
-    return returnValue||count;		/* Non-zero if we did anything */
-}
-
-/*
- * Scheduler()
- *
- * Try to do something.
- *
- * If we do something useful, return 1; else return 0.
- *
- */
-
-
-    int
-Scheduler(block)
-    int	block;			/* should we block in the select ? */
-{
-		/* One wants to be a bit careful about setting returnValue
-		 * to one, since a one implies we did some useful work,
-		 * and therefore probably won't be called to block next
-		 * time (TN3270 mode only).
-		 */
-    int returnValue;
-    int netin, netout, netex, ttyin, ttyout;
-
-    /* Decide which rings should be processed */
-
-    netout = ring_full_count(&netoring) &&
-	    (flushline ||
-		(my_want_state_is_wont(TELOPT_LINEMODE)
-#ifdef	KLUDGELINEMODE
-			&& (!kludgelinemode || my_want_state_is_do(TELOPT_SGA))
-#endif
-		) ||
-			my_want_state_is_will(TELOPT_BINARY));
-    ttyout = ring_full_count(&ttyoring);
-
-#if	defined(TN3270)
-    ttyin = ring_empty_count(&ttyiring) && (clienteof == 0) && (shell_active == 0);
-#else	/* defined(TN3270) */
-    ttyin = ring_empty_count(&ttyiring) && (clienteof == 0);
-#endif	/* defined(TN3270) */
-
-#if	defined(TN3270)
-    netin = ring_empty_count(&netiring);
-#   else /* !defined(TN3270) */
-    netin = !ISend && ring_empty_count(&netiring);
-#   endif /* !defined(TN3270) */
-
-    netex = !SYNCHing;
-
-    /* If we have seen a signal recently, reset things */
-#   if defined(TN3270) && defined(unix)
-    if (HaveInput) {
-	HaveInput = 0;
-	(void) signal(SIGIO, inputAvailable);
-    }
-#endif	/* defined(TN3270) && defined(unix) */
-
-    /* Call to system code to process rings */
-
-    returnValue = process_rings(netin, netout, netex, ttyin, ttyout, !block);
-
-    /* Now, look at the input rings, looking for work to do. */
-
-    if (ring_full_count(&ttyiring)) {
-#   if defined(TN3270)
-	if (In3270) {
-	    int c;
-
-	    c = DataFromTerminal(ttyiring.consume,
-					ring_full_consecutive(&ttyiring));
-	    if (c) {
-		returnValue = 1;
-		ring_consumed(&ttyiring, c);
-	    }
-	} else {
-#   endif /* defined(TN3270) */
-	    returnValue |= telsnd();
-#   if defined(TN3270)
-	}
-#   endif /* defined(TN3270) */
-    }
-
-    if (ring_full_count(&netiring)) {
-#	if !defined(TN3270)
-	returnValue |= telrcv();
-#	else /* !defined(TN3270) */
-	returnValue = Push3270();
-#	endif /* !defined(TN3270) */
-    }
-    return returnValue;
-}
-
-/*
- * Select from tty and network...
- */
-    void
-telnet(user)
-    char *user;
-{
-    sys_telnet_init();
-
-#if	defined(AUTHENTICATION) || defined(ENCRYPTION)
-    {
-	static char local_host[256] = { 0 };
-
-	if (!local_host[0]) {
-		gethostname(local_host, sizeof(local_host));
-		local_host[sizeof(local_host)-1] = 0;
-	}
-	auth_encrypt_init(local_host, hostname, "TELNET", 0);
-	auth_encrypt_user(user);
-    }
-#endif	/* defined(AUTHENTICATION) || defined(ENCRYPTION)  */
-#   if !defined(TN3270)
-    if (telnetport) {
-#if	defined(AUTHENTICATION)
-	if (autologin)
-		send_will(TELOPT_AUTHENTICATION, 1);
-#endif
-#ifdef	ENCRYPTION
-	send_do(TELOPT_ENCRYPT, 1);
-	send_will(TELOPT_ENCRYPT, 1);
-#endif	/* ENCRYPTION */
-	send_do(TELOPT_SGA, 1);
-	send_will(TELOPT_TTYPE, 1);
-	send_will(TELOPT_NAWS, 1);
-	send_will(TELOPT_TSPEED, 1);
-	send_will(TELOPT_LFLOW, 1);
-	send_will(TELOPT_LINEMODE, 1);
-	send_will(TELOPT_NEW_ENVIRON, 1);
-	send_do(TELOPT_STATUS, 1);
-	if (env_getvalue((unsigned char *)"DISPLAY"))
-	    send_will(TELOPT_XDISPLOC, 1);
-	if (eight)
-	    tel_enter_binary(eight);
-    }
-#   endif /* !defined(TN3270) */
-
-#   if !defined(TN3270)
-    for (;;) {
-	int schedValue;
-
-	while ((schedValue = Scheduler(0)) != 0) {
-	    if (schedValue == -1) {
-		setcommandmode();
-		return;
-	    }
-	}
-
-	if (Scheduler(1) == -1) {
-	    setcommandmode();
-	    return;
-	}
-    }
-#   else /* !defined(TN3270) */
-    for (;;) {
-	int schedValue;
-
-	while (!In3270 && !shell_active) {
-	    if (Scheduler(1) == -1) {
-		setcommandmode();
-		return;
-	    }
-	}
-
-	while ((schedValue = Scheduler(0)) != 0) {
-	    if (schedValue == -1) {
-		setcommandmode();
-		return;
-	    }
-	}
-		/* If there is data waiting to go out to terminal, don't
-		 * schedule any more data for the terminal.
-		 */
-	if (ring_full_count(&ttyoring)) {
-	    schedValue = 1;
-	} else {
-	    if (shell_active) {
-		if (shell_continue() == 0) {
-		    ConnectScreen();
-		}
-	    } else if (In3270) {
-		schedValue = DoTerminalOutput();
-	    }
-	}
-	if (schedValue && (shell_active == 0)) {
-	    if (Scheduler(1) == -1) {
-		setcommandmode();
-		return;
-	    }
-	}
-    }
-#   endif /* !defined(TN3270) */
-}
-
-#if	0	/* XXX - this not being in is a bug */
-/*
- * nextitem()
- *
- *	Return the address of the next "item" in the TELNET data
- * stream.  This will be the address of the next character if
- * the current address is a user data character, or it will
- * be the address of the character following the TELNET command
- * if the current address is a TELNET IAC ("I Am a Command")
- * character.
- */
-
-    static char *
-nextitem(current)
-    char *current;
-{
-    if ((*current&0xff) != IAC) {
-	return current+1;
-    }
-    switch (*(current+1)&0xff) {
-    case DO:
-    case DONT:
-    case WILL:
-    case WONT:
-	return current+3;
-    case SB:		/* loop forever looking for the SE */
-	{
-	    register char *look = current+2;
-
-	    for (;;) {
-		if ((*look++&0xff) == IAC) {
-		    if ((*look++&0xff) == SE) {
-			return look;
-		    }
-		}
-	    }
-	}
-    default:
-	return current+2;
-    }
-}
-#endif	/* 0 */
-
-/*
- * netclear()
- *
- *	We are about to do a TELNET SYNCH operation.  Clear
- * the path to the network.
- *
- *	Things are a bit tricky since we may have sent the first
- * byte or so of a previous TELNET command into the network.
- * So, we have to scan the network buffer from the beginning
- * until we are up to where we want to be.
- *
- *	A side effect of what we do, just to keep things
- * simple, is to clear the urgent data pointer.  The principal
- * caller should be setting the urgent data pointer AFTER calling
- * us in any case.
- */
-
-    static void
-netclear()
-{
-#if	0	/* XXX */
-    register char *thisitem, *next;
-    char *good;
-#define	wewant(p)	((nfrontp > p) && ((*p&0xff) == IAC) && \
-				((*(p+1)&0xff) != EC) && ((*(p+1)&0xff) != EL))
-
-    thisitem = netobuf;
-
-    while ((next = nextitem(thisitem)) <= netobuf.send) {
-	thisitem = next;
-    }
-
-    /* Now, thisitem is first before/at boundary. */
-
-    good = netobuf;	/* where the good bytes go */
-
-    while (netoring.add > thisitem) {
-	if (wewant(thisitem)) {
-	    int length;
-
-	    next = thisitem;
-	    do {
-		next = nextitem(next);
-	    } while (wewant(next) && (nfrontp > next));
-	    length = next-thisitem;
-	    memmove(good, thisitem, length);
-	    good += length;
-	    thisitem = next;
-	} else {
-	    thisitem = nextitem(thisitem);
-	}
-    }
-
-#endif	/* 0 */
-}
-
-/*
- * These routines add various telnet commands to the data stream.
- */
-
-    static void
-doflush()
-{
-    NET2ADD(IAC, DO);
-    NETADD(TELOPT_TM);
-    flushline = 1;
-    flushout = 1;
-    (void) ttyflush(1);			/* Flush/drop output */
-    /* do printoption AFTER flush, otherwise the output gets tossed... */
-    printoption("SENT", DO, TELOPT_TM);
-}
-
-    void
-xmitAO()
-{
-    NET2ADD(IAC, AO);
-    printoption("SENT", IAC, AO);
-    if (autoflush) {
-	doflush();
-    }
-}
-
-
-    void
-xmitEL()
-{
-    NET2ADD(IAC, EL);
-    printoption("SENT", IAC, EL);
-}
-
-    void
-xmitEC()
-{
-    NET2ADD(IAC, EC);
-    printoption("SENT", IAC, EC);
-}
-
-
-    int
-dosynch()
-{
-    netclear();			/* clear the path to the network */
-    NETADD(IAC);
-    setneturg();
-    NETADD(DM);
-    printoption("SENT", IAC, DM);
-    return 1;
-}
-
-int want_status_response = 0;
-
-    int
-get_status()
-{
-    unsigned char tmp[16];
-    register unsigned char *cp;
-
-    if (my_want_state_is_dont(TELOPT_STATUS)) {
-	printf("Remote side does not support STATUS option\n");
-	return 0;
-    }
-    cp = tmp;
-
-    *cp++ = IAC;
-    *cp++ = SB;
-    *cp++ = TELOPT_STATUS;
-    *cp++ = TELQUAL_SEND;
-    *cp++ = IAC;
-    *cp++ = SE;
-    if (NETROOM() >= cp - tmp) {
-	ring_supply_data(&netoring, tmp, cp-tmp);
-	printsub('>', tmp+2, cp - tmp - 2);
-    }
-    ++want_status_response;
-    return 1;
-}
-
-    void
-intp()
-{
-    NET2ADD(IAC, IP);
-    printoption("SENT", IAC, IP);
-    flushline = 1;
-    if (autoflush) {
-	doflush();
-    }
-    if (autosynch) {
-	dosynch();
-    }
-}
-
-    void
-sendbrk()
-{
-    NET2ADD(IAC, BREAK);
-    printoption("SENT", IAC, BREAK);
-    flushline = 1;
-    if (autoflush) {
-	doflush();
-    }
-    if (autosynch) {
-	dosynch();
-    }
-}
-
-    void
-sendabort()
-{
-    NET2ADD(IAC, ABORT);
-    printoption("SENT", IAC, ABORT);
-    flushline = 1;
-    if (autoflush) {
-	doflush();
-    }
-    if (autosynch) {
-	dosynch();
-    }
-}
-
-    void
-sendsusp()
-{
-    NET2ADD(IAC, SUSP);
-    printoption("SENT", IAC, SUSP);
-    flushline = 1;
-    if (autoflush) {
-	doflush();
-    }
-    if (autosynch) {
-	dosynch();
-    }
-}
-
-    void
-sendeof()
-{
-    NET2ADD(IAC, xEOF);
-    printoption("SENT", IAC, xEOF);
-}
-
-    void
-sendayt()
-{
-    NET2ADD(IAC, AYT);
-    printoption("SENT", IAC, AYT);
-}
-
-/*
- * Send a window size update to the remote system.
- */
-
-    void
-sendnaws()
-{
-    long rows, cols;
-    unsigned char tmp[16];
-    register unsigned char *cp;
-
-    if (my_state_is_wont(TELOPT_NAWS))
-	return;
-
-#define	PUTSHORT(cp, x) { if ((*cp++ = ((x)>>8)&0xff) == IAC) *cp++ = IAC; \
-			    if ((*cp++ = ((x))&0xff) == IAC) *cp++ = IAC; }
-
-    if (TerminalWindowSize(&rows, &cols) == 0) {	/* Failed */
-	return;
-    }
-
-    cp = tmp;
-
-    *cp++ = IAC;
-    *cp++ = SB;
-    *cp++ = TELOPT_NAWS;
-    PUTSHORT(cp, cols);
-    PUTSHORT(cp, rows);
-    *cp++ = IAC;
-    *cp++ = SE;
-    if (NETROOM() >= cp - tmp) {
-	ring_supply_data(&netoring, tmp, cp-tmp);
-	printsub('>', tmp+2, cp - tmp - 2);
-    }
-}
-
-    void
-tel_enter_binary(rw)
-    int rw;
-{
-    if (rw&1)
-	send_do(TELOPT_BINARY, 1);
-    if (rw&2)
-	send_will(TELOPT_BINARY, 1);
-}
-
-    void
-tel_leave_binary(rw)
-    int rw;
-{
-    if (rw&1)
-	send_dont(TELOPT_BINARY, 1);
-    if (rw&2)
-	send_wont(TELOPT_BINARY, 1);
-}
diff --git a/crypto/telnet/telnet/terminal.c b/crypto/telnet/telnet/terminal.c
deleted file mode 100644
index a2383d9e6696..000000000000
--- a/crypto/telnet/telnet/terminal.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * Copyright (c) 1988, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static const char sccsid[] = "@(#)terminal.c	8.2 (Berkeley) 2/16/95";
-#endif /* not lint */
-
-#include <arpa/telnet.h>
-#include <sys/types.h>
-
-#include "ring.h"
-
-#include "externs.h"
-#include "types.h"
-
-#if	defined(ENCRYPTION)
-#include <libtelnet/encrypt.h>
-#endif
-
-Ring		ttyoring, ttyiring;
-unsigned char	ttyobuf[2*BUFSIZ], ttyibuf[BUFSIZ];
-
-int termdata;			/* Debugging flag */
-
-#ifdef	USE_TERMIO
-# ifndef VDISCARD
-cc_t termFlushChar;
-# endif
-# ifndef VLNEXT
-cc_t termLiteralNextChar;
-# endif
-# ifndef VSUSP
-cc_t termSuspChar;
-# endif
-# ifndef VWERASE
-cc_t termWerasChar;
-# endif
-# ifndef VREPRINT
-cc_t termRprntChar;
-# endif
-# ifndef VSTART
-cc_t termStartChar;
-# endif
-# ifndef VSTOP
-cc_t termStopChar;
-# endif
-# ifndef VEOL
-cc_t termForw1Char;
-# endif
-# ifndef VEOL2
-cc_t termForw2Char;
-# endif
-# ifndef VSTATUS
-cc_t termAytChar;
-# endif
-#else
-cc_t termForw2Char;
-cc_t termAytChar;
-#endif
-
-/*
- * initialize the terminal data structures.
- */
-
-    void
-init_terminal()
-{
-    if (ring_init(&ttyoring, ttyobuf, sizeof ttyobuf) != 1) {
-	exit(1);
-    }
-    if (ring_init(&ttyiring, ttyibuf, sizeof ttyibuf) != 1) {
-	exit(1);
-    }
-    autoflush = TerminalAutoFlush();
-}
-
-
-/*
- *		Send as much data as possible to the terminal.
- *
- *		Return value:
- *			-1: No useful work done, data waiting to go out.
- *			 0: No data was waiting, so nothing was done.
- *			 1: All waiting data was written out.
- *			 n: All data - n was written out.
- */
-
-
-    int
-ttyflush(drop)
-    int drop;
-{
-    register int n, n0, n1;
-
-    n0 = ring_full_count(&ttyoring);
-    if ((n1 = n = ring_full_consecutive(&ttyoring)) > 0) {
-	if (drop) {
-	    TerminalFlushOutput();
-	    /* we leave 'n' alone! */
-	} else {
-	    n = TerminalWrite(ttyoring.consume, n);
-	}
-    }
-    if (n > 0) {
-	if (termdata && n) {
-	    Dump('>', ttyoring.consume, n);
-	}
-	/*
-	 * If we wrote everything, and the full count is
-	 * larger than what we wrote, then write the
-	 * rest of the buffer.
-	 */
-	if (n1 == n && n0 > n) {
-		n1 = n0 - n;
-		if (!drop)
-			n1 = TerminalWrite(ttyoring.bottom, n1);
-		if (n1 > 0)
-			n += n1;
-	}
-	ring_consumed(&ttyoring, n);
-    }
-    if (n < 0)
-	return -1;
-    if (n == n0) {
-	if (n0)
-	    return -1;
-	return 0;
-    }
-    return n0 - n + 1;
-}
-
-
-/*
- * These routines decides on what the mode should be (based on the values
- * of various global variables).
- */
-
-
-    int
-getconnmode()
-{
-    extern int linemode;
-    int mode = 0;
-#ifdef	KLUDGELINEMODE
-    extern int kludgelinemode;
-#endif
-
-    if (In3270)
-	return(MODE_FLOW);
-
-    if (my_want_state_is_dont(TELOPT_ECHO))
-	mode |= MODE_ECHO;
-
-    if (localflow)
-	mode |= MODE_FLOW;
-
-    if (my_want_state_is_will(TELOPT_BINARY))
-	mode |= MODE_INBIN;
-
-    if (his_want_state_is_will(TELOPT_BINARY))
-	mode |= MODE_OUTBIN;
-
-#ifdef	KLUDGELINEMODE
-    if (kludgelinemode) {
-	if (my_want_state_is_dont(TELOPT_SGA)) {
-	    mode |= (MODE_TRAPSIG|MODE_EDIT);
-	    if (dontlecho && (clocks.echotoggle > clocks.modenegotiated)) {
-		mode &= ~MODE_ECHO;
-	    }
-	}
-	return(mode);
-    }
-#endif
-    if (my_want_state_is_will(TELOPT_LINEMODE))
-	mode |= linemode;
-    return(mode);
-}
-
-    void
-setconnmode(force)
-    int force;
-{
-#ifdef	ENCRYPTION
-    static int enc_passwd = 0;
-#endif	/* ENCRYPTION */
-    register int newmode;
-
-    newmode = getconnmode()|(force?MODE_FORCE:0);
-
-    TerminalNewMode(newmode);
-
-#ifdef  ENCRYPTION
-    if ((newmode & (MODE_ECHO|MODE_EDIT)) == MODE_EDIT) {
-	if (my_want_state_is_will(TELOPT_ENCRYPT)
-				&& (enc_passwd == 0) && !encrypt_output) {
-	    encrypt_request_start(0, 0);
-	    enc_passwd = 1;
-	}
-    } else {
-	if (enc_passwd) {
-	    encrypt_request_end();
-	    enc_passwd = 0;
-	}
-    }
-#endif	/* ENCRYPTION */
-
-}
-
-
-    void
-setcommandmode()
-{
-    TerminalNewMode(-1);
-}
diff --git a/crypto/telnet/telnet/tn3270.c b/crypto/telnet/telnet/tn3270.c
deleted file mode 100644
index 5a453d98cc5b..000000000000
--- a/crypto/telnet/telnet/tn3270.c
+++ /dev/null
@@ -1,411 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static const char sccsid[] = "@(#)tn3270.c	8.2 (Berkeley) 5/30/95";
-#endif /* not lint */
-
-#include <sys/types.h>
-#include <arpa/telnet.h>
-
-#include "general.h"
-
-#include "defines.h"
-#include "ring.h"
-#include "externs.h"
-#include "fdset.h"
-
-#if	defined(TN3270)
-
-#include "../ctlr/screen.h"
-#include "../general/globals.h"
-
-#include "../sys_curses/telextrn.h"
-#include "../ctlr/externs.h"
-
-#if	defined(unix)
-int
-	HaveInput,		/* There is input available to scan */
-	cursesdata,		/* Do we dump curses data? */
-	sigiocount;		/* Number of times we got a SIGIO */
-
-char	tline[200];
-char	*transcom = 0;	/* transparent mode command (default: none) */
-#endif	/* defined(unix) */
-
-char	Ibuf[8*BUFSIZ], *Ifrontp, *Ibackp;
-
-static char	sb_terminal[] = { IAC, SB,
-			TELOPT_TTYPE, TELQUAL_IS,
-			'I', 'B', 'M', '-', '3', '2', '7', '8', '-', '2',
-			IAC, SE };
-#define	SBTERMMODEL	13
-
-static int
-	Sent3270TerminalType;	/* Have we said we are a 3270? */
-
-#endif	/* defined(TN3270) */
-
-
-    void
-init_3270()
-{
-#if	defined(TN3270)
-#if	defined(unix)
-    HaveInput = 0;
-    sigiocount = 0;
-#endif	/* defined(unix) */
-    Sent3270TerminalType = 0;
-    Ifrontp = Ibackp = Ibuf;
-    init_ctlr();		/* Initialize some things */
-    init_keyboard();
-    init_screen();
-    init_system();
-#endif	/* defined(TN3270) */
-}
-
-
-#if	defined(TN3270)
-
-/*
- * DataToNetwork - queue up some data to go to network.  If "done" is set,
- * then when last byte is queued, we add on an IAC EOR sequence (so,
- * don't call us with "done" until you want that done...)
- *
- * We actually do send all the data to the network buffer, since our
- * only client needs for us to do that.
- */
-
-    int
-DataToNetwork(buffer, count, done)
-    register char *buffer;	/* where the data is */
-    register int  count;	/* how much to send */
-    int		  done;		/* is this the last of a logical block */
-{
-    register int loop, c;
-    int origCount;
-
-    origCount = count;
-
-    while (count) {
-	/* If not enough room for EORs, IACs, etc., wait */
-	if (NETROOM() < 6) {
-	    fd_set o;
-
-	    FD_ZERO(&o);
-	    netflush();
-	    while (NETROOM() < 6) {
-		FD_SET(net, &o);
-		(void) select(net+1, (fd_set *) 0, &o, (fd_set *) 0,
-						(struct timeval *) 0);
-		netflush();
-	    }
-	}
-	c = ring_empty_count(&netoring);
-	if (c > count) {
-	    c = count;
-	}
-	loop = c;
-	while (loop) {
-	    if (((unsigned char)*buffer) == IAC) {
-		break;
-	    }
-	    buffer++;
-	    loop--;
-	}
-	if ((c = c-loop)) {
-	    ring_supply_data(&netoring, buffer-c, c);
-	    count -= c;
-	}
-	if (loop) {
-	    NET2ADD(IAC, IAC);
-	    count--;
-	    buffer++;
-	}
-    }
-
-    if (done) {
-	NET2ADD(IAC, EOR);
-	netflush();		/* try to move along as quickly as ... */
-    }
-    return(origCount - count);
-}
-
-
-#if	defined(unix)
-    void
-inputAvailable(signo)
-	int signo;
-{
-    HaveInput = 1;
-    sigiocount++;
-}
-#endif	/* defined(unix) */
-
-    void
-outputPurge()
-{
-    (void) ttyflush(1);
-}
-
-
-/*
- * The following routines are places where the various tn3270
- * routines make calls into telnet.c.
- */
-
-/*
- * DataToTerminal - queue up some data to go to terminal.
- *
- * Note: there are people who call us and depend on our processing
- * *all* the data at one time (thus the select).
- */
-
-    int
-DataToTerminal(buffer, count)
-    register char	*buffer;		/* where the data is */
-    register int	count;			/* how much to send */
-{
-    register int c;
-    int origCount;
-
-    origCount = count;
-
-    while (count) {
-	if (TTYROOM() == 0) {
-#if	defined(unix)
-	    fd_set o;
-
-	    FD_ZERO(&o);
-#endif	/* defined(unix) */
-	    (void) ttyflush(0);
-	    while (TTYROOM() == 0) {
-#if	defined(unix)
-		FD_SET(tout, &o);
-		(void) select(tout+1, (fd_set *) 0, &o, (fd_set *) 0,
-						(struct timeval *) 0);
-#endif	/* defined(unix) */
-		(void) ttyflush(0);
-	    }
-	}
-	c = TTYROOM();
-	if (c > count) {
-	    c = count;
-	}
-	ring_supply_data(&ttyoring, buffer, c);
-	count -= c;
-	buffer += c;
-    }
-    return(origCount);
-}
-
-
-/*
- * Push3270 - Try to send data along the 3270 output (to screen) direction.
- */
-
-    int
-Push3270()
-{
-    int save = ring_full_count(&netiring);
-
-    if (save) {
-	if (Ifrontp+save > Ibuf+sizeof Ibuf) {
-	    if (Ibackp != Ibuf) {
-		memmove(Ibuf, Ibackp, Ifrontp-Ibackp);
-		Ifrontp -= (Ibackp-Ibuf);
-		Ibackp = Ibuf;
-	    }
-	}
-	if (Ifrontp+save < Ibuf+sizeof Ibuf) {
-	    (void)telrcv();
-	}
-    }
-    return save != ring_full_count(&netiring);
-}
-
-
-/*
- * Finish3270 - get the last dregs of 3270 data out to the terminal
- *		before quitting.
- */
-
-    void
-Finish3270()
-{
-    while (Push3270() || !DoTerminalOutput()) {
-#if	defined(unix)
-	HaveInput = 0;
-#endif	/* defined(unix) */
-	;
-    }
-}
-
-
-/* StringToTerminal - output a null terminated string to the terminal */
-
-    void
-StringToTerminal(s)
-    char *s;
-{
-    int count;
-
-    count = strlen(s);
-    if (count) {
-	(void) DataToTerminal(s, count);	/* we know it always goes... */
-    }
-}
-
-
-#if	((!defined(NOT43)) || defined(PUTCHAR))
-/* _putchar - output a single character to the terminal.  This name is so that
- *	curses(3x) can call us to send out data.
- */
-
-    void
-_putchar(c)
-    char c;
-{
-#if	defined(sun)		/* SunOS 4.0 bug */
-    c &= 0x7f;
-#endif	/* defined(sun) */
-    if (cursesdata) {
-	Dump('>', &c, 1);
-    }
-    if (!TTYROOM()) {
-	(void) DataToTerminal(&c, 1);
-    } else {
-	TTYADD(c);
-    }
-}
-#endif	/* ((!defined(NOT43)) || defined(PUTCHAR)) */
-
-    void
-SetIn3270()
-{
-    if (Sent3270TerminalType && my_want_state_is_will(TELOPT_BINARY)
-		&& my_want_state_is_do(TELOPT_BINARY) && !donebinarytoggle) {
-	if (!In3270) {
-	    In3270 = 1;
-	    Init3270();		/* Initialize 3270 functions */
-	    /* initialize terminal key mapping */
-	    InitTerminal();	/* Start terminal going */
-	    setconnmode(0);
-	}
-    } else {
-	if (In3270) {
-	    StopScreen(1);
-	    In3270 = 0;
-	    Stop3270();		/* Tell 3270 we aren't here anymore */
-	    setconnmode(0);
-	}
-    }
-}
-
-/*
- * tn3270_ttype()
- *
- *	Send a response to a terminal type negotiation.
- *
- *	Return '0' if no more responses to send; '1' if a response sent.
- */
-
-    int
-tn3270_ttype()
-{
-    /*
-     * Try to send a 3270 type terminal name.  Decide which one based
-     * on the format of our screen, and (in the future) color
-     * capaiblities.
-     */
-    InitTerminal();		/* Sets MaxNumberColumns, MaxNumberLines */
-    if ((MaxNumberLines >= 24) && (MaxNumberColumns >= 80)) {
-	Sent3270TerminalType = 1;
-	if ((MaxNumberLines >= 27) && (MaxNumberColumns >= 132)) {
-	    MaxNumberLines = 27;
-	    MaxNumberColumns = 132;
-	    sb_terminal[SBTERMMODEL] = '5';
-	} else if (MaxNumberLines >= 43) {
-	    MaxNumberLines = 43;
-	    MaxNumberColumns = 80;
-	    sb_terminal[SBTERMMODEL] = '4';
-	} else if (MaxNumberLines >= 32) {
-	    MaxNumberLines = 32;
-	    MaxNumberColumns = 80;
-	    sb_terminal[SBTERMMODEL] = '3';
-	} else {
-	    MaxNumberLines = 24;
-	    MaxNumberColumns = 80;
-	    sb_terminal[SBTERMMODEL] = '2';
-	}
-	NumberLines = 24;		/* before we start out... */
-	NumberColumns = 80;
-	ScreenSize = NumberLines*NumberColumns;
-	if ((MaxNumberLines*MaxNumberColumns) > MAXSCREENSIZE) {
-	    ExitString("Programming error:  MAXSCREENSIZE too small.\n",
-								1);
-	    /*NOTREACHED*/
-	}
-	printsub('>', sb_terminal+2, sizeof sb_terminal-2);
-	ring_supply_data(&netoring, sb_terminal, sizeof sb_terminal);
-	return 1;
-    } else {
-	return 0;
-    }
-}
-
-#if	defined(unix)
-	int
-settranscom(argc, argv)
-	int argc;
-	char *argv[];
-{
-	int i;
-
-	if (argc == 1 && transcom) {
-	   transcom = 0;
-	}
-	if (argc == 1) {
-	   return 1;
-	}
-	transcom = tline;
-	(void) strcpy(transcom, argv[1]);
-	for (i = 2; i < argc; ++i) {
-	    (void) strcat(transcom, " ");
-	    (void) strcat(transcom, argv[i]);
-	}
-	return 1;
-}
-#endif	/* defined(unix) */
-
-#endif	/* defined(TN3270) */
diff --git a/crypto/telnet/telnet/types.h b/crypto/telnet/telnet/types.h
deleted file mode 100644
index 191d311fd154..000000000000
--- a/crypto/telnet/telnet/types.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)types.h	8.1 (Berkeley) 6/6/93
- */
-
-typedef struct {
-    char *modedescriptions;
-    char modetype;
-} Modelist;
-
-extern Modelist modelist[];
-
-typedef struct {
-    int
-	system,			/* what the current time is */
-	echotoggle,		/* last time user entered echo character */
-	modenegotiated,		/* last time operating mode negotiated */
-	didnetreceive,		/* last time we read data from network */
-	gotDM;			/* when did we last see a data mark */
-} Clocks;
-
-extern Clocks clocks;
diff --git a/crypto/telnet/telnet/utilities.c b/crypto/telnet/telnet/utilities.c
deleted file mode 100644
index 0ee882ebd87c..000000000000
--- a/crypto/telnet/telnet/utilities.c
+++ /dev/null
@@ -1,946 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static const char sccsid[] = "@(#)utilities.c	8.3 (Berkeley) 5/30/95";
-#endif /* not lint */
-
-#define	TELOPTS
-#define	TELCMDS
-#define	SLC_NAMES
-#include <arpa/telnet.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <unistd.h>
-
-#include <ctype.h>
-
-#include "general.h"
-
-#include "fdset.h"
-
-#include "ring.h"
-
-#include "defines.h"
-
-#include "externs.h"
-
-#if	defined(AUTHENTICATION)
-#include <libtelnet/auth.h>
-#endif
-#if	defined(ENCRYPTION)
-#include <libtelnet/encrypt.h>
-#endif
-
-FILE	*NetTrace = 0;		/* Not in bss, since needs to stay */
-int	prettydump;
-
-/*
- * upcase()
- *
- *	Upcase (in place) the argument.
- */
-
-    void
-upcase(argument)
-    register char *argument;
-{
-    register int c;
-
-    while ((c = *argument) != 0) {
-	if (islower(c)) {
-	    *argument = toupper(c);
-	}
-	argument++;
-    }
-}
-
-/*
- * SetSockOpt()
- *
- * Compensate for differences in 4.2 and 4.3 systems.
- */
-
-    int
-SetSockOpt(fd, level, option, yesno)
-    int fd, level, option, yesno;
-{
-#ifndef	NOT43
-    return setsockopt(fd, level, option,
-				(char *)&yesno, sizeof yesno);
-#else	/* NOT43 */
-    if (yesno == 0) {		/* Can't do that in 4.2! */
-	fprintf(stderr, "Error: attempt to turn off an option 0x%x.\n",
-				option);
-	return -1;
-    }
-    return setsockopt(fd, level, option, 0, 0);
-#endif	/* NOT43 */
-}
-
-/*
- * The following are routines used to print out debugging information.
- */
-
-unsigned char NetTraceFile[256] = "(standard output)";
-
-    void
-SetNetTrace(file)
-    register char *file;
-{
-    if (NetTrace && NetTrace != stdout)
-	fclose(NetTrace);
-    if (file  && (strcmp(file, "-") != 0)) {
-	NetTrace = fopen(file, "w");
-	if (NetTrace) {
-	    strcpy((char *)NetTraceFile, file);
-	    return;
-	}
-	fprintf(stderr, "Cannot open %s.\n", file);
-    }
-    NetTrace = stdout;
-    strcpy((char *)NetTraceFile, "(standard output)");
-}
-
-    void
-Dump(direction, buffer, length)
-    char direction;
-    unsigned char *buffer;
-    int length;
-{
-#   define BYTES_PER_LINE	32
-#   define min(x,y)	((x<y)? x:y)
-    unsigned char *pThis;
-    int offset;
-
-    offset = 0;
-
-    while (length) {
-	/* print one line */
-	fprintf(NetTrace, "%c 0x%x\t", direction, offset);
-	pThis = buffer;
-	if (prettydump) {
-	    buffer = buffer + min(length, BYTES_PER_LINE/2);
-	    while (pThis < buffer) {
-		fprintf(NetTrace, "%c%.2x",
-		    (((*pThis)&0xff) == 0xff) ? '*' : ' ',
-		    (*pThis)&0xff);
-		pThis++;
-	    }
-	    length -= BYTES_PER_LINE/2;
-	    offset += BYTES_PER_LINE/2;
-	} else {
-	    buffer = buffer + min(length, BYTES_PER_LINE);
-	    while (pThis < buffer) {
-		fprintf(NetTrace, "%.2x", (*pThis)&0xff);
-		pThis++;
-	    }
-	    length -= BYTES_PER_LINE;
-	    offset += BYTES_PER_LINE;
-	}
-	if (NetTrace == stdout) {
-	    fprintf(NetTrace, "\r\n");
-	} else {
-	    fprintf(NetTrace, "\n");
-	}
-	if (length < 0) {
-	    fflush(NetTrace);
-	    return;
-	}
-	/* find next unique line */
-    }
-    fflush(NetTrace);
-}
-
-
-	void
-printoption(direction, cmd, option)
-	char *direction;
-	int cmd, option;
-{
-	if (!showoptions)
-		return;
-	if (cmd == IAC) {
-		if (TELCMD_OK(option))
-		    fprintf(NetTrace, "%s IAC %s", direction, TELCMD(option));
-		else
-		    fprintf(NetTrace, "%s IAC %d", direction, option);
-	} else {
-		register char *fmt;
-		fmt = (cmd == WILL) ? "WILL" : (cmd == WONT) ? "WONT" :
-			(cmd == DO) ? "DO" : (cmd == DONT) ? "DONT" : 0;
-		if (fmt) {
-		    fprintf(NetTrace, "%s %s ", direction, fmt);
-		    if (TELOPT_OK(option))
-			fprintf(NetTrace, "%s", TELOPT(option));
-		    else if (option == TELOPT_EXOPL)
-			fprintf(NetTrace, "EXOPL");
-		    else
-			fprintf(NetTrace, "%d", option);
-		} else
-		    fprintf(NetTrace, "%s %d %d", direction, cmd, option);
-	}
-	if (NetTrace == stdout) {
-	    fprintf(NetTrace, "\r\n");
-	    fflush(NetTrace);
-	} else {
-	    fprintf(NetTrace, "\n");
-	}
-	return;
-}
-
-    void
-optionstatus()
-{
-    register int i;
-    extern char will_wont_resp[], do_dont_resp[];
-
-    for (i = 0; i < 256; i++) {
-	if (do_dont_resp[i]) {
-	    if (TELOPT_OK(i))
-		printf("resp DO_DONT %s: %d\n", TELOPT(i), do_dont_resp[i]);
-	    else if (TELCMD_OK(i))
-		printf("resp DO_DONT %s: %d\n", TELCMD(i), do_dont_resp[i]);
-	    else
-		printf("resp DO_DONT %d: %d\n", i,
-				do_dont_resp[i]);
-	    if (my_want_state_is_do(i)) {
-		if (TELOPT_OK(i))
-		    printf("want DO   %s\n", TELOPT(i));
-		else if (TELCMD_OK(i))
-		    printf("want DO   %s\n", TELCMD(i));
-		else
-		    printf("want DO   %d\n", i);
-	    } else {
-		if (TELOPT_OK(i))
-		    printf("want DONT %s\n", TELOPT(i));
-		else if (TELCMD_OK(i))
-		    printf("want DONT %s\n", TELCMD(i));
-		else
-		    printf("want DONT %d\n", i);
-	    }
-	} else {
-	    if (my_state_is_do(i)) {
-		if (TELOPT_OK(i))
-		    printf("     DO   %s\n", TELOPT(i));
-		else if (TELCMD_OK(i))
-		    printf("     DO   %s\n", TELCMD(i));
-		else
-		    printf("     DO   %d\n", i);
-	    }
-	}
-	if (will_wont_resp[i]) {
-	    if (TELOPT_OK(i))
-		printf("resp WILL_WONT %s: %d\n", TELOPT(i), will_wont_resp[i]);
-	    else if (TELCMD_OK(i))
-		printf("resp WILL_WONT %s: %d\n", TELCMD(i), will_wont_resp[i]);
-	    else
-		printf("resp WILL_WONT %d: %d\n",
-				i, will_wont_resp[i]);
-	    if (my_want_state_is_will(i)) {
-		if (TELOPT_OK(i))
-		    printf("want WILL %s\n", TELOPT(i));
-		else if (TELCMD_OK(i))
-		    printf("want WILL %s\n", TELCMD(i));
-		else
-		    printf("want WILL %d\n", i);
-	    } else {
-		if (TELOPT_OK(i))
-		    printf("want WONT %s\n", TELOPT(i));
-		else if (TELCMD_OK(i))
-		    printf("want WONT %s\n", TELCMD(i));
-		else
-		    printf("want WONT %d\n", i);
-	    }
-	} else {
-	    if (my_state_is_will(i)) {
-		if (TELOPT_OK(i))
-		    printf("     WILL %s\n", TELOPT(i));
-		else if (TELCMD_OK(i))
-		    printf("     WILL %s\n", TELCMD(i));
-		else
-		    printf("     WILL %d\n", i);
-	    }
-	}
-    }
-
-}
-
-    void
-printsub(direction, pointer, length)
-    char direction;	/* '<' or '>' */
-    unsigned char *pointer;	/* where suboption data sits */
-    int		  length;	/* length of suboption data */
-{
-    register int i;
-    char buf[512];
-    extern int want_status_response;
-
-    if (showoptions || direction == 0 ||
-	(want_status_response && (pointer[0] == TELOPT_STATUS))) {
-	if (direction) {
-	    fprintf(NetTrace, "%s IAC SB ",
-				(direction == '<')? "RCVD":"SENT");
-	    if (length >= 3) {
-		register int j;
-
-		i = pointer[length-2];
-		j = pointer[length-1];
-
-		if (i != IAC || j != SE) {
-		    fprintf(NetTrace, "(terminated by ");
-		    if (TELOPT_OK(i))
-			fprintf(NetTrace, "%s ", TELOPT(i));
-		    else if (TELCMD_OK(i))
-			fprintf(NetTrace, "%s ", TELCMD(i));
-		    else
-			fprintf(NetTrace, "%d ", i);
-		    if (TELOPT_OK(j))
-			fprintf(NetTrace, "%s", TELOPT(j));
-		    else if (TELCMD_OK(j))
-			fprintf(NetTrace, "%s", TELCMD(j));
-		    else
-			fprintf(NetTrace, "%d", j);
-		    fprintf(NetTrace, ", not IAC SE!) ");
-		}
-	    }
-	    length -= 2;
-	}
-	if (length < 1) {
-	    fprintf(NetTrace, "(Empty suboption??\?)");
-	    if (NetTrace == stdout)
-		fflush(NetTrace);
-	    return;
-	}
-	switch (pointer[0]) {
-	case TELOPT_TTYPE:
-	    fprintf(NetTrace, "TERMINAL-TYPE ");
-	    switch (pointer[1]) {
-	    case TELQUAL_IS:
-		fprintf(NetTrace, "IS \"%.*s\"", length-2, (char *)pointer+2);
-		break;
-	    case TELQUAL_SEND:
-		fprintf(NetTrace, "SEND");
-		break;
-	    default:
-		fprintf(NetTrace,
-				"- unknown qualifier %d (0x%x).",
-				pointer[1], pointer[1]);
-	    }
-	    break;
-	case TELOPT_TSPEED:
-	    fprintf(NetTrace, "TERMINAL-SPEED");
-	    if (length < 2) {
-		fprintf(NetTrace, " (empty suboption??\?)");
-		break;
-	    }
-	    switch (pointer[1]) {
-	    case TELQUAL_IS:
-		fprintf(NetTrace, " IS ");
-		fprintf(NetTrace, "%.*s", length-2, (char *)pointer+2);
-		break;
-	    default:
-		if (pointer[1] == 1)
-		    fprintf(NetTrace, " SEND");
-		else
-		    fprintf(NetTrace, " %d (unknown)", pointer[1]);
-		for (i = 2; i < length; i++)
-		    fprintf(NetTrace, " ?%d?", pointer[i]);
-		break;
-	    }
-	    break;
-
-	case TELOPT_LFLOW:
-	    fprintf(NetTrace, "TOGGLE-FLOW-CONTROL");
-	    if (length < 2) {
-		fprintf(NetTrace, " (empty suboption??\?)");
-		break;
-	    }
-	    switch (pointer[1]) {
-	    case LFLOW_OFF:
-		fprintf(NetTrace, " OFF"); break;
-	    case LFLOW_ON:
-		fprintf(NetTrace, " ON"); break;
-	    case LFLOW_RESTART_ANY:
-		fprintf(NetTrace, " RESTART-ANY"); break;
-	    case LFLOW_RESTART_XON:
-		fprintf(NetTrace, " RESTART-XON"); break;
-	    default:
-		fprintf(NetTrace, " %d (unknown)", pointer[1]);
-	    }
-	    for (i = 2; i < length; i++)
-		fprintf(NetTrace, " ?%d?", pointer[i]);
-	    break;
-
-	case TELOPT_NAWS:
-	    fprintf(NetTrace, "NAWS");
-	    if (length < 2) {
-		fprintf(NetTrace, " (empty suboption??\?)");
-		break;
-	    }
-	    if (length == 2) {
-		fprintf(NetTrace, " ?%d?", pointer[1]);
-		break;
-	    }
-	    fprintf(NetTrace, " %d %d (%d)",
-		pointer[1], pointer[2],
-		(int)((((unsigned int)pointer[1])<<8)|((unsigned int)pointer[2])));
-	    if (length == 4) {
-		fprintf(NetTrace, " ?%d?", pointer[3]);
-		break;
-	    }
-	    fprintf(NetTrace, " %d %d (%d)",
-		pointer[3], pointer[4],
-		(int)((((unsigned int)pointer[3])<<8)|((unsigned int)pointer[4])));
-	    for (i = 5; i < length; i++)
-		fprintf(NetTrace, " ?%d?", pointer[i]);
-	    break;
-
-#if	defined(AUTHENTICATION)
-	case TELOPT_AUTHENTICATION:
-	    fprintf(NetTrace, "AUTHENTICATION");
-	    if (length < 2) {
-		fprintf(NetTrace, " (empty suboption??\?)");
-		break;
-	    }
-	    switch (pointer[1]) {
-	    case TELQUAL_REPLY:
-	    case TELQUAL_IS:
-		fprintf(NetTrace, " %s ", (pointer[1] == TELQUAL_IS) ?
-							"IS" : "REPLY");
-		if (AUTHTYPE_NAME_OK(pointer[2]))
-		    fprintf(NetTrace, "%s ", AUTHTYPE_NAME(pointer[2]));
-		else
-		    fprintf(NetTrace, "%d ", pointer[2]);
-		if (length < 3) {
-		    fprintf(NetTrace, "(partial suboption??\?)");
-		    break;
-		}
-		fprintf(NetTrace, "%s|%s",
-			((pointer[3] & AUTH_WHO_MASK) == AUTH_WHO_CLIENT) ?
-			"CLIENT" : "SERVER",
-			((pointer[3] & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) ?
-			"MUTUAL" : "ONE-WAY");
-
-		auth_printsub(&pointer[1], length - 1, buf, sizeof(buf));
-		fprintf(NetTrace, "%s", buf);
-		break;
-
-	    case TELQUAL_SEND:
-		i = 2;
-		fprintf(NetTrace, " SEND ");
-		while (i < length) {
-		    if (AUTHTYPE_NAME_OK(pointer[i]))
-			fprintf(NetTrace, "%s ", AUTHTYPE_NAME(pointer[i]));
-		    else
-			fprintf(NetTrace, "%d ", pointer[i]);
-		    if (++i >= length) {
-			fprintf(NetTrace, "(partial suboption??\?)");
-			break;
-		    }
-		    fprintf(NetTrace, "%s|%s ",
-			((pointer[i] & AUTH_WHO_MASK) == AUTH_WHO_CLIENT) ?
-							"CLIENT" : "SERVER",
-			((pointer[i] & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) ?
-							"MUTUAL" : "ONE-WAY");
-		    ++i;
-		}
-		break;
-
-	    case TELQUAL_NAME:
-		i = 2;
-		fprintf(NetTrace, " NAME \"");
-		while (i < length)
-		    putc(pointer[i++], NetTrace);
-		putc('"', NetTrace);
-		break;
-
-	    default:
-		    for (i = 2; i < length; i++)
-			fprintf(NetTrace, " ?%d?", pointer[i]);
-		    break;
-	    }
-	    break;
-#endif
-
-#ifdef	ENCRYPTION
-	case TELOPT_ENCRYPT:
-	    fprintf(NetTrace, "ENCRYPT");
-	    if (length < 2) {
-		fprintf(NetTrace, " (empty suboption??\?)");
-		break;
-	    }
-	    switch (pointer[1]) {
-	    case ENCRYPT_START:
-		fprintf(NetTrace, " START");
-		break;
-
-	    case ENCRYPT_END:
-		fprintf(NetTrace, " END");
-		break;
-
-	    case ENCRYPT_REQSTART:
-		fprintf(NetTrace, " REQUEST-START");
-		break;
-
-	    case ENCRYPT_REQEND:
-		fprintf(NetTrace, " REQUEST-END");
-		break;
-
-	    case ENCRYPT_IS:
-	    case ENCRYPT_REPLY:
-		fprintf(NetTrace, " %s ", (pointer[1] == ENCRYPT_IS) ?
-							"IS" : "REPLY");
-		if (length < 3) {
-		    fprintf(NetTrace, " (partial suboption??\?)");
-		    break;
-		}
-		if (ENCTYPE_NAME_OK(pointer[2]))
-		    fprintf(NetTrace, "%s ", ENCTYPE_NAME(pointer[2]));
-		else
-		    fprintf(NetTrace, " %d (unknown)", pointer[2]);
-
-		encrypt_printsub(&pointer[1], length - 1, buf, sizeof(buf));
-		fprintf(NetTrace, "%s", buf);
-		break;
-
-	    case ENCRYPT_SUPPORT:
-		i = 2;
-		fprintf(NetTrace, " SUPPORT ");
-		while (i < length) {
-		    if (ENCTYPE_NAME_OK(pointer[i]))
-			fprintf(NetTrace, "%s ", ENCTYPE_NAME(pointer[i]));
-		    else
-			fprintf(NetTrace, "%d ", pointer[i]);
-		    i++;
-		}
-		break;
-
-	    case ENCRYPT_ENC_KEYID:
-		fprintf(NetTrace, " ENC_KEYID ");
-		goto encommon;
-
-	    case ENCRYPT_DEC_KEYID:
-		fprintf(NetTrace, " DEC_KEYID ");
-		goto encommon;
-
-	    default:
-		fprintf(NetTrace, " %d (unknown)", pointer[1]);
-	    encommon:
-		for (i = 2; i < length; i++)
-		    fprintf(NetTrace, " %d", pointer[i]);
-		break;
-	    }
-	    break;
-#endif	/* ENCRYPTION */
-
-	case TELOPT_LINEMODE:
-	    fprintf(NetTrace, "LINEMODE ");
-	    if (length < 2) {
-		fprintf(NetTrace, " (empty suboption??\?)");
-		break;
-	    }
-	    switch (pointer[1]) {
-	    case WILL:
-		fprintf(NetTrace, "WILL ");
-		goto common;
-	    case WONT:
-		fprintf(NetTrace, "WONT ");
-		goto common;
-	    case DO:
-		fprintf(NetTrace, "DO ");
-		goto common;
-	    case DONT:
-		fprintf(NetTrace, "DONT ");
-	    common:
-		if (length < 3) {
-		    fprintf(NetTrace, "(no option??\?)");
-		    break;
-		}
-		switch (pointer[2]) {
-		case LM_FORWARDMASK:
-		    fprintf(NetTrace, "Forward Mask");
-		    for (i = 3; i < length; i++)
-			fprintf(NetTrace, " %x", pointer[i]);
-		    break;
-		default:
-		    fprintf(NetTrace, "%d (unknown)", pointer[2]);
-		    for (i = 3; i < length; i++)
-			fprintf(NetTrace, " %d", pointer[i]);
-		    break;
-		}
-		break;
-
-	    case LM_SLC:
-		fprintf(NetTrace, "SLC");
-		for (i = 2; i < length - 2; i += 3) {
-		    if (SLC_NAME_OK(pointer[i+SLC_FUNC]))
-			fprintf(NetTrace, " %s", SLC_NAME(pointer[i+SLC_FUNC]));
-		    else
-			fprintf(NetTrace, " %d", pointer[i+SLC_FUNC]);
-		    switch (pointer[i+SLC_FLAGS]&SLC_LEVELBITS) {
-		    case SLC_NOSUPPORT:
-			fprintf(NetTrace, " NOSUPPORT"); break;
-		    case SLC_CANTCHANGE:
-			fprintf(NetTrace, " CANTCHANGE"); break;
-		    case SLC_VARIABLE:
-			fprintf(NetTrace, " VARIABLE"); break;
-		    case SLC_DEFAULT:
-			fprintf(NetTrace, " DEFAULT"); break;
-		    }
-		    fprintf(NetTrace, "%s%s%s",
-			pointer[i+SLC_FLAGS]&SLC_ACK ? "|ACK" : "",
-			pointer[i+SLC_FLAGS]&SLC_FLUSHIN ? "|FLUSHIN" : "",
-			pointer[i+SLC_FLAGS]&SLC_FLUSHOUT ? "|FLUSHOUT" : "");
-		    if (pointer[i+SLC_FLAGS]& ~(SLC_ACK|SLC_FLUSHIN|
-						SLC_FLUSHOUT| SLC_LEVELBITS))
-			fprintf(NetTrace, "(0x%x)", pointer[i+SLC_FLAGS]);
-		    fprintf(NetTrace, " %d;", pointer[i+SLC_VALUE]);
-		    if ((pointer[i+SLC_VALUE] == IAC) &&
-			(pointer[i+SLC_VALUE+1] == IAC))
-				i++;
-		}
-		for (; i < length; i++)
-		    fprintf(NetTrace, " ?%d?", pointer[i]);
-		break;
-
-	    case LM_MODE:
-		fprintf(NetTrace, "MODE ");
-		if (length < 3) {
-		    fprintf(NetTrace, "(no mode??\?)");
-		    break;
-		}
-		{
-		    char tbuf[64];
-		    sprintf(tbuf, "%s%s%s%s%s",
-			pointer[2]&MODE_EDIT ? "|EDIT" : "",
-			pointer[2]&MODE_TRAPSIG ? "|TRAPSIG" : "",
-			pointer[2]&MODE_SOFT_TAB ? "|SOFT_TAB" : "",
-			pointer[2]&MODE_LIT_ECHO ? "|LIT_ECHO" : "",
-			pointer[2]&MODE_ACK ? "|ACK" : "");
-		    fprintf(NetTrace, "%s", tbuf[1] ? &tbuf[1] : "0");
-		}
-		if (pointer[2]&~(MODE_MASK))
-		    fprintf(NetTrace, " (0x%x)", pointer[2]);
-		for (i = 3; i < length; i++)
-		    fprintf(NetTrace, " ?0x%x?", pointer[i]);
-		break;
-	    default:
-		fprintf(NetTrace, "%d (unknown)", pointer[1]);
-		for (i = 2; i < length; i++)
-		    fprintf(NetTrace, " %d", pointer[i]);
-	    }
-	    break;
-
-	case TELOPT_STATUS: {
-	    register char *cp;
-	    register int j, k;
-
-	    fprintf(NetTrace, "STATUS");
-
-	    switch (pointer[1]) {
-	    default:
-		if (pointer[1] == TELQUAL_SEND)
-		    fprintf(NetTrace, " SEND");
-		else
-		    fprintf(NetTrace, " %d (unknown)", pointer[1]);
-		for (i = 2; i < length; i++)
-		    fprintf(NetTrace, " ?%d?", pointer[i]);
-		break;
-	    case TELQUAL_IS:
-		if (--want_status_response < 0)
-		    want_status_response = 0;
-		if (NetTrace == stdout)
-		    fprintf(NetTrace, " IS\r\n");
-		else
-		    fprintf(NetTrace, " IS\n");
-
-		for (i = 2; i < length; i++) {
-		    switch(pointer[i]) {
-		    case DO:	cp = "DO"; goto common2;
-		    case DONT:	cp = "DONT"; goto common2;
-		    case WILL:	cp = "WILL"; goto common2;
-		    case WONT:	cp = "WONT"; goto common2;
-		    common2:
-			i++;
-			if (TELOPT_OK((int)pointer[i]))
-			    fprintf(NetTrace, " %s %s", cp, TELOPT(pointer[i]));
-			else
-			    fprintf(NetTrace, " %s %d", cp, pointer[i]);
-
-			if (NetTrace == stdout)
-			    fprintf(NetTrace, "\r\n");
-			else
-			    fprintf(NetTrace, "\n");
-			break;
-
-		    case SB:
-			fprintf(NetTrace, " SB ");
-			i++;
-			j = k = i;
-			while (j < length) {
-			    if (pointer[j] == SE) {
-				if (j+1 == length)
-				    break;
-				if (pointer[j+1] == SE)
-				    j++;
-				else
-				    break;
-			    }
-			    pointer[k++] = pointer[j++];
-			}
-			printsub(0, &pointer[i], k - i);
-			if (i < length) {
-			    fprintf(NetTrace, " SE");
-			    i = j;
-			} else
-			    i = j - 1;
-
-			if (NetTrace == stdout)
-			    fprintf(NetTrace, "\r\n");
-			else
-			    fprintf(NetTrace, "\n");
-
-			break;
-
-		    default:
-			fprintf(NetTrace, " %d", pointer[i]);
-			break;
-		    }
-		}
-		break;
-	    }
-	    break;
-	  }
-
-	case TELOPT_XDISPLOC:
-	    fprintf(NetTrace, "X-DISPLAY-LOCATION ");
-	    switch (pointer[1]) {
-	    case TELQUAL_IS:
-		fprintf(NetTrace, "IS \"%.*s\"", length-2, (char *)pointer+2);
-		break;
-	    case TELQUAL_SEND:
-		fprintf(NetTrace, "SEND");
-		break;
-	    default:
-		fprintf(NetTrace, "- unknown qualifier %d (0x%x).",
-				pointer[1], pointer[1]);
-	    }
-	    break;
-
-	case TELOPT_NEW_ENVIRON:
-	    fprintf(NetTrace, "NEW-ENVIRON ");
-#ifdef	OLD_ENVIRON
-	    goto env_common1;
-	case TELOPT_OLD_ENVIRON:
-	    fprintf(NetTrace, "OLD-ENVIRON");
-	env_common1:
-#endif
-	    switch (pointer[1]) {
-	    case TELQUAL_IS:
-		fprintf(NetTrace, "IS ");
-		goto env_common;
-	    case TELQUAL_SEND:
-		fprintf(NetTrace, "SEND ");
-		goto env_common;
-	    case TELQUAL_INFO:
-		fprintf(NetTrace, "INFO ");
-	    env_common:
-		{
-		    register int noquote = 2;
-#if defined(ENV_HACK) && defined(OLD_ENVIRON)
-		    extern int old_env_var, old_env_value;
-#endif
-		    for (i = 2; i < length; i++ ) {
-			switch (pointer[i]) {
-			case NEW_ENV_VALUE:
-#ifdef OLD_ENVIRON
-		     /*	case NEW_ENV_OVAR: */
-			    if (pointer[0] == TELOPT_OLD_ENVIRON) {
-# ifdef	ENV_HACK
-				if (old_env_var == OLD_ENV_VALUE)
-				    fprintf(NetTrace, "\" (VALUE) " + noquote);
-				else
-# endif
-				    fprintf(NetTrace, "\" VAR " + noquote);
-			    } else
-#endif /* OLD_ENVIRON */
-				fprintf(NetTrace, "\" VALUE " + noquote);
-			    noquote = 2;
-			    break;
-
-			case NEW_ENV_VAR:
-#ifdef OLD_ENVIRON
-		     /* case OLD_ENV_VALUE: */
-			    if (pointer[0] == TELOPT_OLD_ENVIRON) {
-# ifdef	ENV_HACK
-				if (old_env_value == OLD_ENV_VAR)
-				    fprintf(NetTrace, "\" (VAR) " + noquote);
-				else
-# endif
-				    fprintf(NetTrace, "\" VALUE " + noquote);
-			    } else
-#endif /* OLD_ENVIRON */
-				fprintf(NetTrace, "\" VAR " + noquote);
-			    noquote = 2;
-			    break;
-
-			case ENV_ESC:
-			    fprintf(NetTrace, "\" ESC " + noquote);
-			    noquote = 2;
-			    break;
-
-			case ENV_USERVAR:
-			    fprintf(NetTrace, "\" USERVAR " + noquote);
-			    noquote = 2;
-			    break;
-
-			default:
-			    if (isprint(pointer[i]) && pointer[i] != '"') {
-				if (noquote) {
-				    putc('"', NetTrace);
-				    noquote = 0;
-				}
-				putc(pointer[i], NetTrace);
-			    } else {
-				fprintf(NetTrace, "\" %03o " + noquote,
-							pointer[i]);
-				noquote = 2;
-			    }
-			    break;
-			}
-		    }
-		    if (!noquote)
-			putc('"', NetTrace);
-		    break;
-		}
-	    }
-	    break;
-
-	default:
-	    if (TELOPT_OK(pointer[0]))
-		fprintf(NetTrace, "%s (unknown)", TELOPT(pointer[0]));
-	    else
-		fprintf(NetTrace, "%d (unknown)", pointer[0]);
-	    for (i = 1; i < length; i++)
-		fprintf(NetTrace, " %d", pointer[i]);
-	    break;
-	}
-	if (direction) {
-	    if (NetTrace == stdout)
-		fprintf(NetTrace, "\r\n");
-	    else
-		fprintf(NetTrace, "\n");
-	}
-	if (NetTrace == stdout)
-	    fflush(NetTrace);
-    }
-}
-
-/* EmptyTerminal - called to make sure that the terminal buffer is empty.
- *			Note that we consider the buffer to run all the
- *			way to the kernel (thus the select).
- */
-
-    void
-EmptyTerminal()
-{
-#if	defined(unix)
-    fd_set	o;
-
-    FD_ZERO(&o);
-#endif	/* defined(unix) */
-
-    if (TTYBYTES() == 0) {
-#if	defined(unix)
-	FD_SET(tout, &o);
-	(void) select(tout+1, (fd_set *) 0, &o, (fd_set *) 0,
-			(struct timeval *) 0);	/* wait for TTLOWAT */
-#endif	/* defined(unix) */
-    } else {
-	while (TTYBYTES()) {
-	    (void) ttyflush(0);
-#if	defined(unix)
-	    FD_SET(tout, &o);
-	    (void) select(tout+1, (fd_set *) 0, &o, (fd_set *) 0,
-				(struct timeval *) 0);	/* wait for TTLOWAT */
-#endif	/* defined(unix) */
-	}
-    }
-}
-
-    void
-SetForExit()
-{
-    setconnmode(0);
-#if	defined(TN3270)
-    if (In3270) {
-	Finish3270();
-    }
-#else	/* defined(TN3270) */
-    do {
-	(void)telrcv();			/* Process any incoming data */
-	EmptyTerminal();
-    } while (ring_full_count(&netiring));	/* While there is any */
-#endif	/* defined(TN3270) */
-    setcommandmode();
-    fflush(stdout);
-    fflush(stderr);
-#if	defined(TN3270)
-    if (In3270) {
-	StopScreen(1);
-    }
-#endif	/* defined(TN3270) */
-    setconnmode(0);
-    EmptyTerminal();			/* Flush the path to the tty */
-    setcommandmode();
-}
-
-    void
-Exit(returnCode)
-    int returnCode;
-{
-    SetForExit();
-    exit(returnCode);
-}
-
-    void
-ExitString(string, returnCode)
-    char *string;
-    int returnCode;
-{
-    SetForExit();
-    fwrite(string, 1, strlen(string), stderr);
-    exit(returnCode);
-}
diff --git a/crypto/telnet/telnetd/authenc.c b/crypto/telnet/telnetd/authenc.c
deleted file mode 100644
index 39a38d4df92b..000000000000
--- a/crypto/telnet/telnetd/authenc.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)authenc.c	8.2 (Berkeley) 5/30/95";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
-
-#if	defined(AUTHENTICATION) || defined(ENCRYPTION)
-#include "telnetd.h"
-#include <libtelnet/misc.h>
-
-	int
-net_write(str, len)
-	unsigned char *str;
-	int len;
-{
-	if (nfrontp + len < netobuf + BUFSIZ) {
-		memmove((void *)nfrontp, (void *)str, len);
-		nfrontp += len;
-		return(len);
-	}
-	return(0);
-}
-
-	void
-net_encrypt()
-{
-#ifdef	ENCRYPTION
-	char *s = (nclearto > nbackp) ? nclearto : nbackp;
-	if (s < nfrontp && encrypt_output) {
-		(*encrypt_output)((unsigned char *)s, nfrontp - s);
-	}
-	nclearto = nfrontp;
-#endif /* ENCRYPTION */
-}
-
-	int
-telnet_spin()
-{
-	ttloop();
-	return(0);
-}
-
-	char *
-telnet_getenv(val)
-	char *val;
-{
-	return(getenv(val));
-}
-
-	char *
-telnet_gets(prompt, result, length, echo)
-	char *prompt;
-	char *result;
-	int length;
-	int echo;
-{
-	return((char *)0);
-}
-#endif	/* defined(AUTHENTICATION) || defined(ENCRYPTION) */
diff --git a/crypto/telnet/telnetd/defs.h b/crypto/telnet/telnetd/defs.h
deleted file mode 100644
index a73d4a619978..000000000000
--- a/crypto/telnet/telnetd/defs.h
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)defs.h	8.1 (Berkeley) 6/4/93
- */
-
-/*
- * Telnet server defines
- */
-#include <sys/types.h>
-#include <sys/param.h>
-
-#ifndef	BSD
-# define	BSD 43
-#endif
-
-#if	defined(CRAY) && !defined(LINEMODE)
-# define SYSV_TERMIO
-# define LINEMODE
-# define KLUDGELINEMODE
-# define DIAGNOSTICS
-# if defined(UNICOS50) && !defined(UNICOS5)
-#  define UNICOS5
-# endif
-# if !defined(UNICOS5)
-#  define BFTPDAEMON
-#  define HAS_IP_TOS
-# endif
-#endif /* CRAY */
-#if defined(UNICOS5) && !defined(NO_SETSID)
-# define NO_SETSID
-#endif
-
-#if defined(PRINTOPTIONS) && defined(DIAGNOSTICS)
-#define TELOPTS
-#define TELCMDS
-#define	SLC_NAMES
-#endif
-
-#if	defined(SYSV_TERMIO) && !defined(USE_TERMIO)
-# define	USE_TERMIO
-#endif
-
-#include <sys/socket.h>
-#ifndef	CRAY
-#include <sys/wait.h>
-#endif	/* CRAY */
-#include <fcntl.h>
-#include <sys/file.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#ifndef	FILIO_H
-#include <sys/ioctl.h>
-#else
-#include <sys/filio.h>
-#endif
-
-#include <netinet/in.h>
-
-#include <arpa/telnet.h>
-
-#include <stdio.h>
-#ifdef	__STDC__
-#include <stdlib.h>
-#endif
-#include <signal.h>
-#include <errno.h>
-#include <netdb.h>
-#include <syslog.h>
-#ifndef	LOG_DAEMON
-#define	LOG_DAEMON	0
-#endif
-#ifndef	LOG_ODELAY
-#define	LOG_ODELAY	0
-#endif
-#include <ctype.h>
-#ifndef NO_STRING_H
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
-#ifndef	USE_TERMIO
-#include <sgtty.h>
-#else
-# ifdef	SYSV_TERMIO
-# include <termio.h>
-# else
-# include <termios.h>
-# endif
-#endif
-#if !defined(USE_TERMIO) || defined(NO_CC_T)
-typedef unsigned char cc_t;
-#endif
-
-#ifdef	__STDC__
-#include <unistd.h>
-#endif
-
-#ifndef _POSIX_VDISABLE
-# ifdef VDISABLE
-#  define _POSIX_VDISABLE VDISABLE
-# else
-#  define _POSIX_VDISABLE ((unsigned char)'\377')
-# endif
-#endif
-
-
-#ifdef	CRAY
-# ifdef	CRAY1
-# include <sys/pty.h>
-#  ifndef FD_ZERO
-# include <sys/select.h>
-#  endif /* FD_ZERO */
-# endif	/* CRAY1 */
-
-#include <memory.h>
-#endif	/* CRAY */
-
-#ifdef __hpux
-#include <sys/ptyio.h>
-#endif
-
-#if	!defined(TIOCSCTTY) && defined(TCSETCTTY)
-# define	TIOCSCTTY TCSETCTTY
-#endif
-
-#ifndef	FD_SET
-#ifndef	HAVE_fd_set
-typedef struct fd_set { int fds_bits[1]; } fd_set;
-#endif
-
-#define	FD_SET(n, p)	((p)->fds_bits[0] |= (1<<(n)))
-#define	FD_CLR(n, p)	((p)->fds_bits[0] &= ~(1<<(n)))
-#define	FD_ISSET(n, p)	((p)->fds_bits[0] & (1<<(n)))
-#define FD_ZERO(p)	((p)->fds_bits[0] = 0)
-#endif	/* FD_SET */
-
-/*
- * I/O data buffers defines
- */
-#define	NETSLOP	64
-#ifdef CRAY
-#undef BUFSIZ
-#define BUFSIZ  2048
-#endif
-
-#define	NIACCUM(c)	{   *netip++ = c; \
-			    ncc++; \
-			}
-
-/* clock manipulations */
-#define	settimer(x)	(clocks.x = ++clocks.system)
-#define	sequenceIs(x,y)	(clocks.x < clocks.y)
-
-/*
- * Linemode support states, in decreasing order of importance
- */
-#define REAL_LINEMODE	0x04
-#define KLUDGE_OK	0x03
-#define	NO_AUTOKLUDGE	0x02
-#define KLUDGE_LINEMODE	0x01
-#define NO_LINEMODE	0x00
-
-/*
- * Structures of information for each special character function.
- */
-typedef struct {
-	unsigned char	flag;		/* the flags for this function */
-	cc_t		val;		/* the value of the special character */
-} slcent, *Slcent;
-
-typedef struct {
-	slcent		defset;		/* the default settings */
-	slcent		current;	/* the current settings */
-	cc_t		*sptr;		/* a pointer to the char in */
-					/* system data structures */
-} slcfun, *Slcfun;
-
-#ifdef DIAGNOSTICS
-/*
- * Diagnostics capabilities
- */
-#define	TD_REPORT	0x01	/* Report operations to client */
-#define TD_EXERCISE	0x02	/* Exercise client's implementation */
-#define TD_NETDATA	0x04	/* Display received data stream */
-#define TD_PTYDATA	0x08	/* Display data passed to pty */
-#define	TD_OPTIONS	0x10	/* Report just telnet options */
-#endif /* DIAGNOSTICS */
-
-/*
- * We keep track of each side of the option negotiation.
- */
-
-#define	MY_STATE_WILL		0x01
-#define	MY_WANT_STATE_WILL	0x02
-#define	MY_STATE_DO		0x04
-#define	MY_WANT_STATE_DO	0x08
-
-/*
- * Macros to check the current state of things
- */
-
-#define	my_state_is_do(opt)		(options[opt]&MY_STATE_DO)
-#define	my_state_is_will(opt)		(options[opt]&MY_STATE_WILL)
-#define my_want_state_is_do(opt)	(options[opt]&MY_WANT_STATE_DO)
-#define my_want_state_is_will(opt)	(options[opt]&MY_WANT_STATE_WILL)
-
-#define	my_state_is_dont(opt)		(!my_state_is_do(opt))
-#define	my_state_is_wont(opt)		(!my_state_is_will(opt))
-#define my_want_state_is_dont(opt)	(!my_want_state_is_do(opt))
-#define my_want_state_is_wont(opt)	(!my_want_state_is_will(opt))
-
-#define	set_my_state_do(opt)		(options[opt] |= MY_STATE_DO)
-#define	set_my_state_will(opt)		(options[opt] |= MY_STATE_WILL)
-#define	set_my_want_state_do(opt)	(options[opt] |= MY_WANT_STATE_DO)
-#define	set_my_want_state_will(opt)	(options[opt] |= MY_WANT_STATE_WILL)
-
-#define	set_my_state_dont(opt)		(options[opt] &= ~MY_STATE_DO)
-#define	set_my_state_wont(opt)		(options[opt] &= ~MY_STATE_WILL)
-#define	set_my_want_state_dont(opt)	(options[opt] &= ~MY_WANT_STATE_DO)
-#define	set_my_want_state_wont(opt)	(options[opt] &= ~MY_WANT_STATE_WILL)
-
-/*
- * Tricky code here.  What we want to know is if the MY_STATE_WILL
- * and MY_WANT_STATE_WILL bits have the same value.  Since the two
- * bits are adjacent, a little arithmatic will show that by adding
- * in the lower bit, the upper bit will be set if the two bits were
- * different, and clear if they were the same.
- */
-#define my_will_wont_is_changing(opt) \
-			((options[opt]+MY_STATE_WILL) & MY_WANT_STATE_WILL)
-
-#define my_do_dont_is_changing(opt) \
-			((options[opt]+MY_STATE_DO) & MY_WANT_STATE_DO)
-
-/*
- * Make everything symetrical
- */
-
-#define	HIS_STATE_WILL			MY_STATE_DO
-#define	HIS_WANT_STATE_WILL		MY_WANT_STATE_DO
-#define HIS_STATE_DO			MY_STATE_WILL
-#define HIS_WANT_STATE_DO		MY_WANT_STATE_WILL
-
-#define	his_state_is_do			my_state_is_will
-#define	his_state_is_will		my_state_is_do
-#define his_want_state_is_do		my_want_state_is_will
-#define his_want_state_is_will		my_want_state_is_do
-
-#define	his_state_is_dont		my_state_is_wont
-#define	his_state_is_wont		my_state_is_dont
-#define his_want_state_is_dont		my_want_state_is_wont
-#define his_want_state_is_wont		my_want_state_is_dont
-
-#define	set_his_state_do		set_my_state_will
-#define	set_his_state_will		set_my_state_do
-#define	set_his_want_state_do		set_my_want_state_will
-#define	set_his_want_state_will		set_my_want_state_do
-
-#define	set_his_state_dont		set_my_state_wont
-#define	set_his_state_wont		set_my_state_dont
-#define	set_his_want_state_dont		set_my_want_state_wont
-#define	set_his_want_state_wont		set_my_want_state_dont
-
-#define his_will_wont_is_changing	my_do_dont_is_changing
-#define his_do_dont_is_changing		my_will_wont_is_changing
diff --git a/crypto/telnet/telnetd/ext.h b/crypto/telnet/telnetd/ext.h
deleted file mode 100644
index f60139e078ac..000000000000
--- a/crypto/telnet/telnetd/ext.h
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ext.h	8.2 (Berkeley) 12/15/93
- */
-
-/*
- * Telnet server variable declarations
- */
-extern char	options[256];
-extern char	do_dont_resp[256];
-extern char	will_wont_resp[256];
-extern int	linemode;	/* linemode on/off */
-#ifdef	LINEMODE
-extern int	uselinemode;	/* what linemode to use (on/off) */
-extern int	editmode;	/* edit modes in use */
-extern int	useeditmode;	/* edit modes to use */
-extern int	alwayslinemode;	/* command line option */
-extern int	lmodetype;	/* Client support for linemode */
-#endif	/* LINEMODE */
-extern int	flowmode;	/* current flow control state */
-extern int	restartany;	/* restart output on any character state */
-#ifdef DIAGNOSTICS
-extern int	diagnostic;	/* telnet diagnostic capabilities */
-#endif /* DIAGNOSTICS */
-#ifdef BFTPDAEMON
-extern int	bftpd;		/* behave as bftp daemon */
-#endif /* BFTPDAEMON */
-#if	defined(SecurID)
-extern int	require_SecurID;
-#endif
-#if	defined(AUTHENTICATION)
-extern int	auth_level;
-#endif
-
-extern slcfun	slctab[NSLC + 1];	/* slc mapping table */
-
-char	*terminaltype;
-
-/*
- * I/O data buffers, pointers, and counters.
- */
-extern char	ptyobuf[BUFSIZ+NETSLOP], *pfrontp, *pbackp;
-
-extern char	netibuf[BUFSIZ], *netip;
-
-extern char	netobuf[BUFSIZ+NETSLOP], *nfrontp, *nbackp;
-extern char	*neturg;		/* one past last bye of urgent data */
-
-extern int	pcc, ncc;
-
-#if defined(CRAY2) && defined(UNICOS5)
-extern int unpcc;  /* characters left unprocessed by CRAY-2 terminal routine */
-extern char *unptyip;  /* pointer to remaining characters in buffer */
-#endif
-
-extern int	pty, net;
-extern char	*line;
-extern int	SYNCHing;		/* we are in TELNET SYNCH mode */
-
-#ifndef	P
-# ifdef	__STDC__
-#  define P(x)	x
-# else
-#  define P(x)	()
-# endif
-#endif
-
-extern void
-	_termstat P((void)),
-	add_slc P((int, int, int)),
-	check_slc P((void)),
-	change_slc P((int, int, int)),
-	cleanup P((int)),
-	clientstat P((int, int, int)),
-	copy_termbuf P((char *, int)),
-	deferslc P((void)),
-	defer_terminit P((void)),
-	do_opt_slc P((unsigned char *, int)),
-	doeof P((void)),
-	dooption P((int)),
-	dontoption P((int)),
-	edithost P((char *, char *)),
-	fatal P((int, char *)),
-	fatalperror P((int, char *)),
-	get_slc_defaults P((void)),
-	init_env P((void)),
-	init_termbuf P((void)),
-	interrupt P((void)),
-	localstat P((void)),
-	flowstat P((void)),
-	netclear P((void)),
-	netflush P((void)),
-#ifdef DIAGNOSTICS
-	printoption P((char *, int)),
-	printdata P((char *, char *, int)),
-	printsub P((int, unsigned char *, int)),
-#endif
-	ptyflush P((void)),
-	putchr P((int)),
-	putf P((char *, char *)),
-	recv_ayt P((void)),
-	send_do P((int, int)),
-	send_dont P((int, int)),
-	send_slc P((void)),
-	send_status P((void)),
-	send_will P((int, int)),
-	send_wont P((int, int)),
-	sendbrk P((void)),
-	sendsusp P((void)),
-	set_termbuf P((void)),
-	start_login P((char *, int, char *)),
-	start_slc P((int)),
-#if	defined(AUTHENTICATION)
-	start_slave P((char *)),
-#else
-	start_slave P((char *, int, char *)),
-#endif
-	suboption P((void)),
-	telrcv P((void)),
-	ttloop P((void)),
-	tty_binaryin P((int)),
-	tty_binaryout P((int));
-
-extern int
-	end_slc P((unsigned char **)),
-	getnpty P((void)),
-#ifndef convex
-	getpty P((int *)),
-#endif
-	login_tty P((int)),
-	spcset P((int, cc_t *, cc_t **)),
-	stilloob P((int)),
-	terminit P((void)),
-	termstat P((void)),
-	tty_flowmode P((void)),
-	tty_restartany P((void)),
-	tty_isbinaryin P((void)),
-	tty_isbinaryout P((void)),
-	tty_iscrnl P((void)),
-	tty_isecho P((void)),
-	tty_isediting P((void)),
-	tty_islitecho P((void)),
-	tty_isnewmap P((void)),
-	tty_israw P((void)),
-	tty_issofttab P((void)),
-	tty_istrapsig P((void)),
-	tty_linemode P((void));
-
-extern void
-	tty_rspeed P((int)),
-	tty_setecho P((int)),
-	tty_setedit P((int)),
-	tty_setlinemode P((int)),
-	tty_setlitecho P((int)),
-	tty_setsig P((int)),
-	tty_setsofttab P((int)),
-	tty_tspeed P((int)),
-	willoption P((int)),
-	wontoption P((int)),
-	writenet P((unsigned char *, int));
-
-#ifdef	ENCRYPTION
-extern void	(*encrypt_output) P((unsigned char *, int));
-extern int	(*decrypt_input) P((int));
-extern char	*nclearto;
-#endif	/* ENCRYPTION */
-
-
-/*
- * The following are some clocks used to decide how to interpret
- * the relationship between various variables.
- */
-
-extern struct {
-    int
-	system,			/* what the current time is */
-	echotoggle,		/* last time user entered echo character */
-	modenegotiated,		/* last time operating mode negotiated */
-	didnetreceive,		/* last time we read data from network */
-	ttypesubopt,		/* ttype subopt is received */
-	tspeedsubopt,		/* tspeed subopt is received */
-	environsubopt,		/* environ subopt is received */
-	oenvironsubopt,		/* old environ subopt is received */
-	xdisplocsubopt,		/* xdisploc subopt is received */
-	baseline,		/* time started to do timed action */
-	gotDM;			/* when did we last see a data mark */
-} clocks;
-
-
-#if	defined(CRAY2) && defined(UNICOS5)
-extern int	needtermstat;
-#endif
-
-#ifndef	DEFAULT_IM
-# ifdef CRAY
-#  define DEFAULT_IM	"\r\n\r\nCray UNICOS (%h) (%t)\r\n\r\r\n\r"
-# else
-#  ifdef sun
-#   define DEFAULT_IM	"\r\n\r\nSunOS UNIX (%h) (%t)\r\n\r\r\n\r"
-#  else
-#   ifdef ultrix
-#    define DEFAULT_IM	"\r\n\r\nULTRIX (%h) (%t)\r\n\r\r\n\r"
-#   else
-#    ifdef __FreeBSD__
-#     define DEFAULT_IM  "\r\n\r\nFreeBSD (%h) (%t)\r\n\r\r\n\r"
-#    else
-#    define DEFAULT_IM	"\r\n\r\n4.4 BSD UNIX (%h) (%t)\r\n\r\r\n\r"
-#    endif
-#   endif
-#  endif
-# endif
-#endif
diff --git a/crypto/telnet/telnetd/global.c b/crypto/telnet/telnetd/global.c
deleted file mode 100644
index 0cf95dbd463e..000000000000
--- a/crypto/telnet/telnetd/global.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)global.c	8.1 (Berkeley) 6/4/93";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
-
-/*
- * Allocate global variables.  We do this
- * by including the header file that defines
- * them all as externs, but first we define
- * the keyword "extern" to be nothing, so that
- * we will actually allocate the space.
- */
-
-#include "defs.h"
-#define extern
-#include "ext.h"
diff --git a/crypto/telnet/telnetd/pathnames.h b/crypto/telnet/telnetd/pathnames.h
deleted file mode 100644
index c8b0806e7814..000000000000
--- a/crypto/telnet/telnetd/pathnames.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)pathnames.h	8.1 (Berkeley) 6/4/93
- */
-
-#if BSD > 43
-
-# include <paths.h>
-
-# ifndef _PATH_LOGIN
-#  define	_PATH_LOGIN	"/usr/bin/login"
-# endif
-
-#else
- 
-# define	_PATH_TTY	"/dev/tty"
-# ifndef _PATH_LOGIN
-#  define	_PATH_LOGIN	"/bin/login"
-# endif
-
-#endif
-
-#ifdef BFTPDAEMON
-#define		BFTPPATH	"/usr/ucb/bftp"
-#endif  /* BFTPDAEMON */
diff --git a/crypto/telnet/telnetd/slc.c b/crypto/telnet/telnetd/slc.c
deleted file mode 100644
index 65dc6891a940..000000000000
--- a/crypto/telnet/telnetd/slc.c
+++ /dev/null
@@ -1,495 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)slc.c	8.2 (Berkeley) 5/30/95";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
-
-#include "telnetd.h"
-
-#ifdef	LINEMODE
-/*
- * local variables
- */
-static unsigned char	*def_slcbuf = (unsigned char *)0;
-static int		def_slclen = 0;
-static int		slcchange;	/* change to slc is requested */
-static unsigned char	*slcptr;	/* pointer into slc buffer */
-static unsigned char	slcbuf[NSLC*6];	/* buffer for slc negotiation */
-
-/*
- * send_slc
- *
- * Write out the current special characters to the client.
- */
-	void
-send_slc()
-{
-	register int i;
-
-	/*
-	 * Send out list of triplets of special characters
-	 * to client.  We only send info on the characters
-	 * that are currently supported.
-	 */
-	for (i = 1; i <= NSLC; i++) {
-		if ((slctab[i].defset.flag & SLC_LEVELBITS) == SLC_NOSUPPORT)
-			continue;
-		add_slc((unsigned char)i, slctab[i].current.flag,
-							slctab[i].current.val);
-	}
-
-}  /* end of send_slc */
-
-/*
- * default_slc
- *
- * Set pty special characters to all the defaults.
- */
-	void
-default_slc()
-{
-	register int i;
-
-	for (i = 1; i <= NSLC; i++) {
-		slctab[i].current.val = slctab[i].defset.val;
-		if (slctab[i].current.val == (cc_t)(_POSIX_VDISABLE))
-			slctab[i].current.flag = SLC_NOSUPPORT;
-		else
-			slctab[i].current.flag = slctab[i].defset.flag;
-		if (slctab[i].sptr) {
-			*(slctab[i].sptr) = slctab[i].defset.val;
-		}
-	}
-	slcchange = 1;
-
-}  /* end of default_slc */
-#endif	/* LINEMODE */
-
-/*
- * get_slc_defaults
- *
- * Initialize the slc mapping table.
- */
-	void
-get_slc_defaults()
-{
-	register int i;
-
-	init_termbuf();
-
-	for (i = 1; i <= NSLC; i++) {
-		slctab[i].defset.flag =
-			spcset(i, &slctab[i].defset.val, &slctab[i].sptr);
-		slctab[i].current.flag = SLC_NOSUPPORT;
-		slctab[i].current.val = 0;
-	}
-
-}  /* end of get_slc_defaults */
-
-#ifdef	LINEMODE
-/*
- * add_slc
- *
- * Add an slc triplet to the slc buffer.
- */
-	void
-add_slc(func, flag, val)
-	register char func, flag;
-	register cc_t val;
-{
-
-	if ((*slcptr++ = (unsigned char)func) == 0xff)
-		*slcptr++ = 0xff;
-
-	if ((*slcptr++ = (unsigned char)flag) == 0xff)
-		*slcptr++ = 0xff;
-
-	if ((*slcptr++ = (unsigned char)val) == 0xff)
-		*slcptr++ = 0xff;
-
-}  /* end of add_slc */
-
-/*
- * start_slc
- *
- * Get ready to process incoming slc's and respond to them.
- *
- * The parameter getit is non-zero if it is necessary to grab a copy
- * of the terminal control structures.
- */
-	void
-start_slc(getit)
-	register int getit;
-{
-
-	slcchange = 0;
-	if (getit)
-		init_termbuf();
-	(void) sprintf((char *)slcbuf, "%c%c%c%c",
-					IAC, SB, TELOPT_LINEMODE, LM_SLC);
-	slcptr = slcbuf + 4;
-
-}  /* end of start_slc */
-
-/*
- * end_slc
- *
- * Finish up the slc negotiation.  If something to send, then send it.
- */
-	int
-end_slc(bufp)
-	register unsigned char **bufp;
-{
-	register int len;
-	void netflush();
-
-	/*
-	 * If a change has occured, store the new terminal control
-	 * structures back to the terminal driver.
-	 */
-	if (slcchange) {
-		set_termbuf();
-	}
-
-	/*
-	 * If the pty state has not yet been fully processed and there is a
-	 * deferred slc request from the client, then do not send any
-	 * sort of slc negotiation now.  We will respond to the client's
-	 * request very soon.
-	 */
-	if (def_slcbuf && (terminit() == 0)) {
-		return(0);
-	}
-
-	if (slcptr > (slcbuf + 4)) {
-		if (bufp) {
-			*bufp = &slcbuf[4];
-			return(slcptr - slcbuf - 4);
-		} else {
-			(void) sprintf((char *)slcptr, "%c%c", IAC, SE);
-			slcptr += 2;
-			len = slcptr - slcbuf;
-			writenet(slcbuf, len);
-			netflush();  /* force it out immediately */
-			DIAG(TD_OPTIONS, printsub('>', slcbuf+2, len-2););
-		}
-	}
-	return (0);
-
-}  /* end of end_slc */
-
-/*
- * process_slc
- *
- * Figure out what to do about the client's slc
- */
-	void
-process_slc(func, flag, val)
-	register unsigned char func, flag;
-	register cc_t val;
-{
-	register int hislevel, mylevel, ack;
-
-	/*
-	 * Ensure that we know something about this function
-	 */
-	if (func > NSLC) {
-		add_slc(func, SLC_NOSUPPORT, 0);
-		return;
-	}
-
-	/*
-	 * Process the special case requests of 0 SLC_DEFAULT 0
-	 * and 0 SLC_VARIABLE 0.  Be a little forgiving here, don't
-	 * worry about whether the value is actually 0 or not.
-	 */
-	if (func == 0) {
-		if ((flag = flag & SLC_LEVELBITS) == SLC_DEFAULT) {
-			default_slc();
-			send_slc();
-		} else if (flag == SLC_VARIABLE) {
-			send_slc();
-		}
-		return;
-	}
-
-	/*
-	 * Appears to be a function that we know something about.  So
-	 * get on with it and see what we know.
-	 */
-
-	hislevel = flag & SLC_LEVELBITS;
-	mylevel = slctab[func].current.flag & SLC_LEVELBITS;
-	ack = flag & SLC_ACK;
-	/*
-	 * ignore the command if:
-	 * the function value and level are the same as what we already have;
-	 * or the level is the same and the ack bit is set
-	 */
-	if (hislevel == mylevel && (val == slctab[func].current.val || ack)) {
-		return;
-	} else if (ack) {
-		/*
-		 * If we get here, we got an ack, but the levels don't match.
-		 * This shouldn't happen.  If it does, it is probably because
-		 * we have sent two requests to set a variable without getting
-		 * a response between them, and this is the first response.
-		 * So, ignore it, and wait for the next response.
-		 */
-		return;
-	} else {
-		change_slc(func, flag, val);
-	}
-
-}  /* end of process_slc */
-
-/*
- * change_slc
- *
- * Process a request to change one of our special characters.
- * Compare client's request with what we are capable of supporting.
- */
-	void
-change_slc(func, flag, val)
-	register char func, flag;
-	register cc_t val;
-{
-	register int hislevel, mylevel;
-
-	hislevel = flag & SLC_LEVELBITS;
-	mylevel = slctab[(int)func].defset.flag & SLC_LEVELBITS;
-	/*
-	 * If client is setting a function to NOSUPPORT
-	 * or DEFAULT, then we can easily and directly
-	 * accomodate the request.
-	 */
-	if (hislevel == SLC_NOSUPPORT) {
-		slctab[(int)func].current.flag = flag;
-		slctab[(int)func].current.val = (cc_t)_POSIX_VDISABLE;
-		flag |= SLC_ACK;
-		add_slc(func, flag, val);
-		return;
-	}
-	if (hislevel == SLC_DEFAULT) {
-		/*
-		 * Special case here.  If client tells us to use
-		 * the default on a function we don't support, then
-		 * return NOSUPPORT instead of what we may have as a
-		 * default level of DEFAULT.
-		 */
-		if (mylevel == SLC_DEFAULT) {
-			slctab[(int)func].current.flag = SLC_NOSUPPORT;
-		} else {
-			slctab[(int)func].current.flag = slctab[(int)func].defset.flag;
-		}
-		slctab[(int)func].current.val = slctab[(int)func].defset.val;
-		add_slc(func, slctab[(int)func].current.flag,
-						slctab[(int)func].current.val);
-		return;
-	}
-
-	/*
-	 * Client wants us to change to a new value or he
-	 * is telling us that he can't change to our value.
-	 * Some of the slc's we support and can change,
-	 * some we do support but can't change,
-	 * and others we don't support at all.
-	 * If we can change it then we have a pointer to
-	 * the place to put the new value, so change it,
-	 * otherwise, continue the negotiation.
-	 */
-	if (slctab[(int)func].sptr) {
-		/*
-		 * We can change this one.
-		 */
-		slctab[(int)func].current.val = val;
-		*(slctab[(int)func].sptr) = val;
-		slctab[(int)func].current.flag = flag;
-		flag |= SLC_ACK;
-		slcchange = 1;
-		add_slc(func, flag, val);
-	} else {
-		/*
-		* It is not possible for us to support this
-		* request as he asks.
-		*
-		* If our level is DEFAULT, then just ack whatever was
-		* sent.
-		*
-		* If he can't change and we can't change,
-		* then degenerate to NOSUPPORT.
-		*
-		* Otherwise we send our level back to him, (CANTCHANGE
-		* or NOSUPPORT) and if CANTCHANGE, send
-		* our value as well.
-		*/
-		if (mylevel == SLC_DEFAULT) {
-			slctab[(int)func].current.flag = flag;
-			slctab[(int)func].current.val = val;
-			flag |= SLC_ACK;
-		} else if (hislevel == SLC_CANTCHANGE &&
-				    mylevel == SLC_CANTCHANGE) {
-			flag &= ~SLC_LEVELBITS;
-			flag |= SLC_NOSUPPORT;
-			slctab[(int)func].current.flag = flag;
-		} else {
-			flag &= ~SLC_LEVELBITS;
-			flag |= mylevel;
-			slctab[(int)func].current.flag = flag;
-			if (mylevel == SLC_CANTCHANGE) {
-				slctab[(int)func].current.val =
-					slctab[(int)func].defset.val;
-				val = slctab[(int)func].current.val;
-			}
-		}
-		add_slc(func, flag, val);
-	}
-
-}  /* end of change_slc */
-
-#if	defined(USE_TERMIO) && (VEOF == VMIN)
-cc_t oldeofc = '\004';
-#endif
-
-/*
- * check_slc
- *
- * Check the special characters in use and notify the client if any have
- * changed.  Only those characters that are capable of being changed are
- * likely to have changed.  If a local change occurs, kick the support level
- * and flags up to the defaults.
- */
-	void
-check_slc()
-{
-	register int i;
-
-	for (i = 1; i <= NSLC; i++) {
-#if	defined(USE_TERMIO) && (VEOF == VMIN)
-		/*
-		 * In a perfect world this would be a neat little
-		 * function.  But in this world, we should not notify
-		 * client of changes to the VEOF char when
-		 * ICANON is off, because it is not representing
-		 * a special character.
-		 */
-		if (i == SLC_EOF) {
-			if (!tty_isediting())
-				continue;
-			else if (slctab[i].sptr)
-				oldeofc = *(slctab[i].sptr);
-		}
-#endif	/* defined(USE_TERMIO) && defined(SYSV_TERMIO) */
-		if (slctab[i].sptr &&
-				(*(slctab[i].sptr) != slctab[i].current.val)) {
-			slctab[i].current.val = *(slctab[i].sptr);
-			if (*(slctab[i].sptr) == (cc_t)_POSIX_VDISABLE)
-				slctab[i].current.flag = SLC_NOSUPPORT;
-			else
-				slctab[i].current.flag = slctab[i].defset.flag;
-			add_slc((unsigned char)i, slctab[i].current.flag,
-						slctab[i].current.val);
-		}
-	}
-}  /* check_slc */
-
-/*
- * do_opt_slc
- *
- * Process an slc option buffer.  Defer processing of incoming slc's
- * until after the terminal state has been processed.  Save the first slc
- * request that comes along, but discard all others.
- *
- * ptr points to the beginning of the buffer, len is the length.
- */
-	void
-do_opt_slc(ptr, len)
-	register unsigned char *ptr;
-	register int len;
-{
-	register unsigned char func, flag;
-	cc_t val;
-	register unsigned char *end = ptr + len;
-
-	if (terminit()) {  /* go ahead */
-		while (ptr < end) {
-			func = *ptr++;
-			if (ptr >= end) break;
-			flag = *ptr++;
-			if (ptr >= end) break;
-			val = (cc_t)*ptr++;
-
-			process_slc(func, flag, val);
-
-		}
-	} else {
-		/*
-		 * save this slc buffer if it is the first, otherwise dump
-		 * it.
-		 */
-		if (def_slcbuf == (unsigned char *)0) {
-			def_slclen = len;
-			def_slcbuf = (unsigned char *)malloc((unsigned)len);
-			if (def_slcbuf == (unsigned char *)0)
-				return;  /* too bad */
-			memmove(def_slcbuf, ptr, len);
-		}
-	}
-
-}  /* end of do_opt_slc */
-
-/*
- * deferslc
- *
- * Do slc stuff that was deferred.
- */
-	void
-deferslc()
-{
-	if (def_slcbuf) {
-		start_slc(1);
-		do_opt_slc(def_slcbuf, def_slclen);
-		(void) end_slc(0);
-		free(def_slcbuf);
-		def_slcbuf = (unsigned char *)0;
-		def_slclen = 0;
-	}
-
-}  /* end of deferslc */
-
-#endif	/* LINEMODE */
diff --git a/crypto/telnet/telnetd/state.c b/crypto/telnet/telnetd/state.c
deleted file mode 100644
index 4a066b7f2b22..000000000000
--- a/crypto/telnet/telnetd/state.c
+++ /dev/null
@@ -1,1619 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)state.c	8.5 (Berkeley) 5/30/95";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
-
-#include "telnetd.h"
-#if	defined(AUTHENTICATION)
-#include <libtelnet/auth.h>
-#endif
-#if	defined(ENCRYPTION)
-#include <libtelnet/encrypt.h>
-#endif
-
-unsigned char	doopt[] = { IAC, DO, '%', 'c', 0 };
-unsigned char	dont[] = { IAC, DONT, '%', 'c', 0 };
-unsigned char	will[] = { IAC, WILL, '%', 'c', 0 };
-unsigned char	wont[] = { IAC, WONT, '%', 'c', 0 };
-int	not42 = 1;
-
-/*
- * Buffer for sub-options, and macros
- * for suboptions buffer manipulations
- */
-unsigned char subbuffer[512], *subpointer= subbuffer, *subend= subbuffer;
-
-#define	SB_CLEAR()	subpointer = subbuffer
-#define	SB_TERM()	{ subend = subpointer; SB_CLEAR(); }
-#define	SB_ACCUM(c)	if (subpointer < (subbuffer+sizeof subbuffer)) { \
-				*subpointer++ = (c); \
-			}
-#define	SB_GET()	((*subpointer++)&0xff)
-#define	SB_EOF()	(subpointer >= subend)
-#define	SB_LEN()	(subend - subpointer)
-
-#ifdef	ENV_HACK
-unsigned char *subsave;
-#define SB_SAVE()	subsave = subpointer;
-#define	SB_RESTORE()	subpointer = subsave;
-#endif
-
-
-/*
- * State for recv fsm
- */
-#define	TS_DATA		0	/* base state */
-#define	TS_IAC		1	/* look for double IAC's */
-#define	TS_CR		2	/* CR-LF ->'s CR */
-#define	TS_SB		3	/* throw away begin's... */
-#define	TS_SE		4	/* ...end's (suboption negotiation) */
-#define	TS_WILL		5	/* will option negotiation */
-#define	TS_WONT		6	/* wont " */
-#define	TS_DO		7	/* do " */
-#define	TS_DONT		8	/* dont " */
-
-	void
-telrcv()
-{
-	register int c;
-	static int state = TS_DATA;
-#if	defined(CRAY2) && defined(UNICOS5)
-	char *opfrontp = pfrontp;
-#endif
-
-	while (ncc > 0) {
-		if ((&ptyobuf[BUFSIZ] - pfrontp) < 2)
-			break;
-		c = *netip++ & 0377, ncc--;
-#ifdef	ENCRYPTION
-		if (decrypt_input)
-			c = (*decrypt_input)(c);
-#endif	/* ENCRYPTION */
-		switch (state) {
-
-		case TS_CR:
-			state = TS_DATA;
-			/* Strip off \n or \0 after a \r */
-			if ((c == 0) || (c == '\n')) {
-				break;
-			}
-			/* FALL THROUGH */
-
-		case TS_DATA:
-			if (c == IAC) {
-				state = TS_IAC;
-				break;
-			}
-			/*
-			 * We now map \r\n ==> \r for pragmatic reasons.
-			 * Many client implementations send \r\n when
-			 * the user hits the CarriageReturn key.
-			 *
-			 * We USED to map \r\n ==> \n, since \r\n says
-			 * that we want to be in column 1 of the next
-			 * printable line, and \n is the standard
-			 * unix way of saying that (\r is only good
-			 * if CRMOD is set, which it normally is).
-			 */
-			if ((c == '\r') && his_state_is_wont(TELOPT_BINARY)) {
-				int nc = *netip;
-#ifdef	ENCRYPTION
-				if (decrypt_input)
-					nc = (*decrypt_input)(nc & 0xff);
-#endif	/* ENCRYPTION */
-#ifdef	LINEMODE
-				/*
-				 * If we are operating in linemode,
-				 * convert to local end-of-line.
-				 */
-				if (linemode && (ncc > 0) && (('\n' == nc) ||
-					 ((0 == nc) && tty_iscrnl())) ) {
-					netip++; ncc--;
-					c = '\n';
-				} else
-#endif
-				{
-#ifdef	ENCRYPTION
-					if (decrypt_input)
-						(void)(*decrypt_input)(-1);
-#endif	/* ENCRYPTION */
-					state = TS_CR;
-				}
-			}
-			*pfrontp++ = c;
-			break;
-
-		case TS_IAC:
-gotiac:			switch (c) {
-
-			/*
-			 * Send the process on the pty side an
-			 * interrupt.  Do this with a NULL or
-			 * interrupt char; depending on the tty mode.
-			 */
-			case IP:
-				DIAG(TD_OPTIONS,
-					printoption("td: recv IAC", c));
-				interrupt();
-				break;
-
-			case BREAK:
-				DIAG(TD_OPTIONS,
-					printoption("td: recv IAC", c));
-				sendbrk();
-				break;
-
-			/*
-			 * Are You There?
-			 */
-			case AYT:
-				DIAG(TD_OPTIONS,
-					printoption("td: recv IAC", c));
-				recv_ayt();
-				break;
-
-			/*
-			 * Abort Output
-			 */
-			case AO:
-			    {
-				DIAG(TD_OPTIONS,
-					printoption("td: recv IAC", c));
-				ptyflush();	/* half-hearted */
-				init_termbuf();
-
-				if (slctab[SLC_AO].sptr &&
-				    *slctab[SLC_AO].sptr != (cc_t)(_POSIX_VDISABLE)) {
-				    *pfrontp++ =
-					(unsigned char)*slctab[SLC_AO].sptr;
-				}
-
-				netclear();	/* clear buffer back */
-				*nfrontp++ = IAC;
-				*nfrontp++ = DM;
-				neturg = nfrontp-1; /* off by one XXX */
-				DIAG(TD_OPTIONS,
-					printoption("td: send IAC", DM));
-				break;
-			    }
-
-			/*
-			 * Erase Character and
-			 * Erase Line
-			 */
-			case EC:
-			case EL:
-			    {
-				cc_t ch;
-
-				DIAG(TD_OPTIONS,
-					printoption("td: recv IAC", c));
-				ptyflush();	/* half-hearted */
-				init_termbuf();
-				if (c == EC)
-					ch = *slctab[SLC_EC].sptr;
-				else
-					ch = *slctab[SLC_EL].sptr;
-				if (ch != (cc_t)(_POSIX_VDISABLE))
-					*pfrontp++ = (unsigned char)ch;
-				break;
-			    }
-
-			/*
-			 * Check for urgent data...
-			 */
-			case DM:
-				DIAG(TD_OPTIONS,
-					printoption("td: recv IAC", c));
-				SYNCHing = stilloob(net);
-				settimer(gotDM);
-				break;
-
-
-			/*
-			 * Begin option subnegotiation...
-			 */
-			case SB:
-				state = TS_SB;
-				SB_CLEAR();
-				continue;
-
-			case WILL:
-				state = TS_WILL;
-				continue;
-
-			case WONT:
-				state = TS_WONT;
-				continue;
-
-			case DO:
-				state = TS_DO;
-				continue;
-
-			case DONT:
-				state = TS_DONT;
-				continue;
-			case EOR:
-				if (his_state_is_will(TELOPT_EOR))
-					doeof();
-				break;
-
-			/*
-			 * Handle RFC 10xx Telnet linemode option additions
-			 * to command stream (EOF, SUSP, ABORT).
-			 */
-			case xEOF:
-				doeof();
-				break;
-
-			case SUSP:
-				sendsusp();
-				break;
-
-			case ABORT:
-				sendbrk();
-				break;
-
-			case IAC:
-				*pfrontp++ = c;
-				break;
-			}
-			state = TS_DATA;
-			break;
-
-		case TS_SB:
-			if (c == IAC) {
-				state = TS_SE;
-			} else {
-				SB_ACCUM(c);
-			}
-			break;
-
-		case TS_SE:
-			if (c != SE) {
-				if (c != IAC) {
-					/*
-					 * bad form of suboption negotiation.
-					 * handle it in such a way as to avoid
-					 * damage to local state.  Parse
-					 * suboption buffer found so far,
-					 * then treat remaining stream as
-					 * another command sequence.
-					 */
-
-					/* for DIAGNOSTICS */
-					SB_ACCUM(IAC);
-					SB_ACCUM(c);
-					subpointer -= 2;
-
-					SB_TERM();
-					suboption();
-					state = TS_IAC;
-					goto gotiac;
-				}
-				SB_ACCUM(c);
-				state = TS_SB;
-			} else {
-				/* for DIAGNOSTICS */
-				SB_ACCUM(IAC);
-				SB_ACCUM(SE);
-				subpointer -= 2;
-
-				SB_TERM();
-				suboption();	/* handle sub-option */
-				state = TS_DATA;
-			}
-			break;
-
-		case TS_WILL:
-			willoption(c);
-			state = TS_DATA;
-			continue;
-
-		case TS_WONT:
-			wontoption(c);
-			state = TS_DATA;
-			continue;
-
-		case TS_DO:
-			dooption(c);
-			state = TS_DATA;
-			continue;
-
-		case TS_DONT:
-			dontoption(c);
-			state = TS_DATA;
-			continue;
-
-		default:
-			syslog(LOG_ERR, "panic state=%d", state);
-			printf("telnetd: panic state=%d\n", state);
-			exit(1);
-		}
-	}
-#if	defined(CRAY2) && defined(UNICOS5)
-	if (!linemode) {
-		char	xptyobuf[BUFSIZ+NETSLOP];
-		char	xbuf2[BUFSIZ];
-		register char *cp;
-		int n = pfrontp - opfrontp, oc;
-		memmove(xptyobuf, opfrontp, n);
-		pfrontp = opfrontp;
-		pfrontp += term_input(xptyobuf, pfrontp, n, BUFSIZ+NETSLOP,
-					xbuf2, &oc, BUFSIZ);
-		for (cp = xbuf2; oc > 0; --oc)
-			if ((*nfrontp++ = *cp++) == IAC)
-				*nfrontp++ = IAC;
-	}
-#endif	/* defined(CRAY2) && defined(UNICOS5) */
-}  /* end of telrcv */
-
-/*
- * The will/wont/do/dont state machines are based on Dave Borman's
- * Telnet option processing state machine.
- *
- * These correspond to the following states:
- *	my_state = the last negotiated state
- *	want_state = what I want the state to go to
- *	want_resp = how many requests I have sent
- * All state defaults are negative, and resp defaults to 0.
- *
- * When initiating a request to change state to new_state:
- *
- * if ((want_resp == 0 && new_state == my_state) || want_state == new_state) {
- *	do nothing;
- * } else {
- *	want_state = new_state;
- *	send new_state;
- *	want_resp++;
- * }
- *
- * When receiving new_state:
- *
- * if (want_resp) {
- *	want_resp--;
- *	if (want_resp && (new_state == my_state))
- *		want_resp--;
- * }
- * if ((want_resp == 0) && (new_state != want_state)) {
- *	if (ok_to_switch_to new_state)
- *		want_state = new_state;
- *	else
- *		want_resp++;
- *	send want_state;
- * }
- * my_state = new_state;
- *
- * Note that new_state is implied in these functions by the function itself.
- * will and do imply positive new_state, wont and dont imply negative.
- *
- * Finally, there is one catch.  If we send a negative response to a
- * positive request, my_state will be the positive while want_state will
- * remain negative.  my_state will revert to negative when the negative
- * acknowlegment arrives from the peer.  Thus, my_state generally tells
- * us not only the last negotiated state, but also tells us what the peer
- * wants to be doing as well.  It is important to understand this difference
- * as we may wish to be processing data streams based on our desired state
- * (want_state) or based on what the peer thinks the state is (my_state).
- *
- * This all works fine because if the peer sends a positive request, the data
- * that we receive prior to negative acknowlegment will probably be affected
- * by the positive state, and we can process it as such (if we can; if we
- * can't then it really doesn't matter).  If it is that important, then the
- * peer probably should be buffering until this option state negotiation
- * is complete.
- *
- */
-	void
-send_do(option, init)
-	int option, init;
-{
-	if (init) {
-		if ((do_dont_resp[option] == 0 && his_state_is_will(option)) ||
-		    his_want_state_is_will(option))
-			return;
-		/*
-		 * Special case for TELOPT_TM:  We send a DO, but pretend
-		 * that we sent a DONT, so that we can send more DOs if
-		 * we want to.
-		 */
-		if (option == TELOPT_TM)
-			set_his_want_state_wont(option);
-		else
-			set_his_want_state_will(option);
-		do_dont_resp[option]++;
-	}
-	(void) sprintf(nfrontp, (char *)doopt, option);
-	nfrontp += sizeof (dont) - 2;
-
-	DIAG(TD_OPTIONS, printoption("td: send do", option));
-}
-
-#ifdef	AUTHENTICATION
-extern void auth_request();
-#endif
-#ifdef	LINEMODE
-extern void doclientstat();
-#endif
-#ifdef	ENCRYPTION
-extern void encrypt_send_support();
-#endif	/* ENCRYPTION */
-
-	void
-willoption(option)
-	int option;
-{
-	int changeok = 0;
-	void (*func)() = 0;
-
-	/*
-	 * process input from peer.
-	 */
-
-	DIAG(TD_OPTIONS, printoption("td: recv will", option));
-
-	if (do_dont_resp[option]) {
-		do_dont_resp[option]--;
-		if (do_dont_resp[option] && his_state_is_will(option))
-			do_dont_resp[option]--;
-	}
-	if (do_dont_resp[option] == 0) {
-	    if (his_want_state_is_wont(option)) {
-		switch (option) {
-
-		case TELOPT_BINARY:
-			init_termbuf();
-			tty_binaryin(1);
-			set_termbuf();
-			changeok++;
-			break;
-
-		case TELOPT_ECHO:
-			/*
-			 * See comments below for more info.
-			 */
-			not42 = 0;	/* looks like a 4.2 system */
-			break;
-
-		case TELOPT_TM:
-#if	defined(LINEMODE) && defined(KLUDGELINEMODE)
-			/*
-			 * This telnetd implementation does not really
-			 * support timing marks, it just uses them to
-			 * support the kludge linemode stuff.  If we
-			 * receive a will or wont TM in response to our
-			 * do TM request that may have been sent to
-			 * determine kludge linemode support, process
-			 * it, otherwise TM should get a negative
-			 * response back.
-			 */
-			/*
-			 * Handle the linemode kludge stuff.
-			 * If we are not currently supporting any
-			 * linemode at all, then we assume that this
-			 * is the client telling us to use kludge
-			 * linemode in response to our query.  Set the
-			 * linemode type that is to be supported, note
-			 * that the client wishes to use linemode, and
-			 * eat the will TM as though it never arrived.
-			 */
-			if (lmodetype < KLUDGE_LINEMODE) {
-				lmodetype = KLUDGE_LINEMODE;
-				clientstat(TELOPT_LINEMODE, WILL, 0);
-				send_wont(TELOPT_SGA, 1);
-			} else if (lmodetype == NO_AUTOKLUDGE) {
-				lmodetype = KLUDGE_OK;
-			}
-#endif	/* defined(LINEMODE) && defined(KLUDGELINEMODE) */
-			/*
-			 * We never respond to a WILL TM, and
-			 * we leave the state WONT.
-			 */
-			return;
-
-		case TELOPT_LFLOW:
-			/*
-			 * If we are going to support flow control
-			 * option, then don't worry peer that we can't
-			 * change the flow control characters.
-			 */
-			slctab[SLC_XON].defset.flag &= ~SLC_LEVELBITS;
-			slctab[SLC_XON].defset.flag |= SLC_DEFAULT;
-			slctab[SLC_XOFF].defset.flag &= ~SLC_LEVELBITS;
-			slctab[SLC_XOFF].defset.flag |= SLC_DEFAULT;
-		case TELOPT_TTYPE:
-		case TELOPT_SGA:
-		case TELOPT_NAWS:
-		case TELOPT_TSPEED:
-		case TELOPT_XDISPLOC:
-		case TELOPT_NEW_ENVIRON:
-		case TELOPT_OLD_ENVIRON:
-			changeok++;
-			break;
-
-#ifdef	LINEMODE
-		case TELOPT_LINEMODE:
-# ifdef	KLUDGELINEMODE
-			/*
-			 * Note client's desire to use linemode.
-			 */
-			lmodetype = REAL_LINEMODE;
-# endif	/* KLUDGELINEMODE */
-			func = doclientstat;
-			changeok++;
-			break;
-#endif	/* LINEMODE */
-
-#ifdef	AUTHENTICATION
-		case TELOPT_AUTHENTICATION:
-			func = auth_request;
-			changeok++;
-			break;
-#endif
-
-#ifdef	ENCRYPTION
-		case TELOPT_ENCRYPT:
-			func = encrypt_send_support;
-			changeok++;
-			break;
-#endif	/* ENCRYPTION */
-
-		default:
-			break;
-		}
-		if (changeok) {
-			set_his_want_state_will(option);
-			send_do(option, 0);
-		} else {
-			do_dont_resp[option]++;
-			send_dont(option, 0);
-		}
-	    } else {
-		/*
-		 * Option processing that should happen when
-		 * we receive conformation of a change in
-		 * state that we had requested.
-		 */
-		switch (option) {
-		case TELOPT_ECHO:
-			not42 = 0;	/* looks like a 4.2 system */
-			/*
-			 * Egads, he responded "WILL ECHO".  Turn
-			 * it off right now!
-			 */
-			send_dont(option, 1);
-			/*
-			 * "WILL ECHO".  Kludge upon kludge!
-			 * A 4.2 client is now echoing user input at
-			 * the tty.  This is probably undesireable and
-			 * it should be stopped.  The client will
-			 * respond WONT TM to the DO TM that we send to
-			 * check for kludge linemode.  When the WONT TM
-			 * arrives, linemode will be turned off and a
-			 * change propogated to the pty.  This change
-			 * will cause us to process the new pty state
-			 * in localstat(), which will notice that
-			 * linemode is off and send a WILL ECHO
-			 * so that we are properly in character mode and
-			 * all is well.
-			 */
-			break;
-#ifdef	LINEMODE
-		case TELOPT_LINEMODE:
-# ifdef	KLUDGELINEMODE
-			/*
-			 * Note client's desire to use linemode.
-			 */
-			lmodetype = REAL_LINEMODE;
-# endif	/* KLUDGELINEMODE */
-			func = doclientstat;
-			break;
-#endif	/* LINEMODE */
-
-#ifdef	AUTHENTICATION
-		case TELOPT_AUTHENTICATION:
-			func = auth_request;
-			break;
-#endif
-
-#ifdef	ENCRYPTION
-		case TELOPT_ENCRYPT:
-			func = encrypt_send_support;
-			break;
-#endif	/* ENCRYPTION */
-		case TELOPT_LFLOW:
-			func = flowstat;
-			break;
-		}
-	    }
-	}
-	set_his_state_will(option);
-	if (func)
-		(*func)();
-}  /* end of willoption */
-
-	void
-send_dont(option, init)
-	int option, init;
-{
-	if (init) {
-		if ((do_dont_resp[option] == 0 && his_state_is_wont(option)) ||
-		    his_want_state_is_wont(option))
-			return;
-		set_his_want_state_wont(option);
-		do_dont_resp[option]++;
-	}
-	(void) sprintf(nfrontp, (char *)dont, option);
-	nfrontp += sizeof (doopt) - 2;
-
-	DIAG(TD_OPTIONS, printoption("td: send dont", option));
-}
-
-	void
-wontoption(option)
-	int option;
-{
-	/*
-	 * Process client input.
-	 */
-
-	DIAG(TD_OPTIONS, printoption("td: recv wont", option));
-
-	if (do_dont_resp[option]) {
-		do_dont_resp[option]--;
-		if (do_dont_resp[option] && his_state_is_wont(option))
-			do_dont_resp[option]--;
-	}
-	if (do_dont_resp[option] == 0) {
-	    if (his_want_state_is_will(option)) {
-		/* it is always ok to change to negative state */
-		switch (option) {
-		case TELOPT_ECHO:
-			not42 = 1; /* doesn't seem to be a 4.2 system */
-			break;
-
-		case TELOPT_BINARY:
-			init_termbuf();
-			tty_binaryin(0);
-			set_termbuf();
-			break;
-
-#ifdef	LINEMODE
-		case TELOPT_LINEMODE:
-# ifdef	KLUDGELINEMODE
-			/*
-			 * If real linemode is supported, then client is
-			 * asking to turn linemode off.
-			 */
-			if (lmodetype != REAL_LINEMODE)
-				break;
-# endif	/* KLUDGELINEMODE */
-			clientstat(TELOPT_LINEMODE, WONT, 0);
-			break;
-#endif	/* LINEMODE */
-
-		case TELOPT_TM:
-			/*
-			 * If we get a WONT TM, and had sent a DO TM,
-			 * don't respond with a DONT TM, just leave it
-			 * as is.  Short circut the state machine to
-			 * achive this.
-			 */
-			set_his_want_state_wont(TELOPT_TM);
-			return;
-
-		case TELOPT_LFLOW:
-			/*
-			 * If we are not going to support flow control
-			 * option, then let peer know that we can't
-			 * change the flow control characters.
-			 */
-			slctab[SLC_XON].defset.flag &= ~SLC_LEVELBITS;
-			slctab[SLC_XON].defset.flag |= SLC_CANTCHANGE;
-			slctab[SLC_XOFF].defset.flag &= ~SLC_LEVELBITS;
-			slctab[SLC_XOFF].defset.flag |= SLC_CANTCHANGE;
-			break;
-
-#if	defined(AUTHENTICATION)
-		case TELOPT_AUTHENTICATION:
-			auth_finished(0, AUTH_REJECT);
-			break;
-#endif
-
-		/*
-		 * For options that we might spin waiting for
-		 * sub-negotiation, if the client turns off the
-		 * option rather than responding to the request,
-		 * we have to treat it here as if we got a response
-		 * to the sub-negotiation, (by updating the timers)
-		 * so that we'll break out of the loop.
-		 */
-		case TELOPT_TTYPE:
-			settimer(ttypesubopt);
-			break;
-
-		case TELOPT_TSPEED:
-			settimer(tspeedsubopt);
-			break;
-
-		case TELOPT_XDISPLOC:
-			settimer(xdisplocsubopt);
-			break;
-
-		case TELOPT_OLD_ENVIRON:
-			settimer(oenvironsubopt);
-			break;
-
-		case TELOPT_NEW_ENVIRON:
-			settimer(environsubopt);
-			break;
-
-		default:
-			break;
-		}
-		set_his_want_state_wont(option);
-		if (his_state_is_will(option))
-			send_dont(option, 0);
-	    } else {
-		switch (option) {
-		case TELOPT_TM:
-#if	defined(LINEMODE) && defined(KLUDGELINEMODE)
-			if (lmodetype < NO_AUTOKLUDGE) {
-				lmodetype = NO_LINEMODE;
-				clientstat(TELOPT_LINEMODE, WONT, 0);
-				send_will(TELOPT_SGA, 1);
-				send_will(TELOPT_ECHO, 1);
-			}
-#endif	/* defined(LINEMODE) && defined(KLUDGELINEMODE) */
-			break;
-
-#if	defined(AUTHENTICATION)
-		case TELOPT_AUTHENTICATION:
-			auth_finished(0, AUTH_REJECT);
-			break;
-#endif
-		default:
-			break;
-		}
-	    }
-	}
-	set_his_state_wont(option);
-
-}  /* end of wontoption */
-
-	void
-send_will(option, init)
-	int option, init;
-{
-	if (init) {
-		if ((will_wont_resp[option] == 0 && my_state_is_will(option))||
-		    my_want_state_is_will(option))
-			return;
-		set_my_want_state_will(option);
-		will_wont_resp[option]++;
-	}
-	(void) sprintf(nfrontp, (char *)will, option);
-	nfrontp += sizeof (doopt) - 2;
-
-	DIAG(TD_OPTIONS, printoption("td: send will", option));
-}
-
-#if	!defined(LINEMODE) || !defined(KLUDGELINEMODE)
-/*
- * When we get a DONT SGA, we will try once to turn it
- * back on.  If the other side responds DONT SGA, we
- * leave it at that.  This is so that when we talk to
- * clients that understand KLUDGELINEMODE but not LINEMODE,
- * we'll keep them in char-at-a-time mode.
- */
-int turn_on_sga = 0;
-#endif
-
-	void
-dooption(option)
-	int option;
-{
-	int changeok = 0;
-
-	/*
-	 * Process client input.
-	 */
-
-	DIAG(TD_OPTIONS, printoption("td: recv do", option));
-
-	if (will_wont_resp[option]) {
-		will_wont_resp[option]--;
-		if (will_wont_resp[option] && my_state_is_will(option))
-			will_wont_resp[option]--;
-	}
-	if ((will_wont_resp[option] == 0) && (my_want_state_is_wont(option))) {
-		switch (option) {
-		case TELOPT_ECHO:
-#ifdef	LINEMODE
-# ifdef	KLUDGELINEMODE
-			if (lmodetype == NO_LINEMODE)
-# else
-			if (his_state_is_wont(TELOPT_LINEMODE))
-# endif
-#endif
-			{
-				init_termbuf();
-				tty_setecho(1);
-				set_termbuf();
-			}
-			changeok++;
-			break;
-
-		case TELOPT_BINARY:
-			init_termbuf();
-			tty_binaryout(1);
-			set_termbuf();
-			changeok++;
-			break;
-
-		case TELOPT_SGA:
-#if	defined(LINEMODE) && defined(KLUDGELINEMODE)
-			/*
-			 * If kludge linemode is in use, then we must
-			 * process an incoming do SGA for linemode
-			 * purposes.
-			 */
-			if (lmodetype == KLUDGE_LINEMODE) {
-				/*
-				 * Receipt of "do SGA" in kludge
-				 * linemode is the peer asking us to
-				 * turn off linemode.  Make note of
-				 * the request.
-				 */
-				clientstat(TELOPT_LINEMODE, WONT, 0);
-				/*
-				 * If linemode did not get turned off
-				 * then don't tell peer that we did.
-				 * Breaking here forces a wont SGA to
-				 * be returned.
-				 */
-				if (linemode)
-					break;
-			}
-#else
-			turn_on_sga = 0;
-#endif	/* defined(LINEMODE) && defined(KLUDGELINEMODE) */
-			changeok++;
-			break;
-
-		case TELOPT_STATUS:
-			changeok++;
-			break;
-
-		case TELOPT_TM:
-			/*
-			 * Special case for TM.  We send a WILL, but
-			 * pretend we sent a WONT.
-			 */
-			send_will(option, 0);
-			set_my_want_state_wont(option);
-			set_my_state_wont(option);
-			return;
-
-		case TELOPT_LOGOUT:
-			/*
-			 * When we get a LOGOUT option, respond
-			 * with a WILL LOGOUT, make sure that
-			 * it gets written out to the network,
-			 * and then just go away...
-			 */
-			set_my_want_state_will(TELOPT_LOGOUT);
-			send_will(TELOPT_LOGOUT, 0);
-			set_my_state_will(TELOPT_LOGOUT);
-			(void)netflush();
-			cleanup(0);
-			/* NOT REACHED */
-			break;
-
-#ifdef	ENCRYPTION
-		case TELOPT_ENCRYPT:
-			changeok++;
-			break;
-#endif	/* ENCRYPTION */
-		case TELOPT_LINEMODE:
-		case TELOPT_TTYPE:
-		case TELOPT_NAWS:
-		case TELOPT_TSPEED:
-		case TELOPT_LFLOW:
-		case TELOPT_XDISPLOC:
-#ifdef	TELOPT_ENVIRON
-		case TELOPT_NEW_ENVIRON:
-#endif
-		case TELOPT_OLD_ENVIRON:
-		default:
-			break;
-		}
-		if (changeok) {
-			set_my_want_state_will(option);
-			send_will(option, 0);
-		} else {
-			will_wont_resp[option]++;
-			send_wont(option, 0);
-		}
-	}
-	set_my_state_will(option);
-
-}  /* end of dooption */
-
-	void
-send_wont(option, init)
-	int option, init;
-{
-	if (init) {
-		if ((will_wont_resp[option] == 0 && my_state_is_wont(option)) ||
-		    my_want_state_is_wont(option))
-			return;
-		set_my_want_state_wont(option);
-		will_wont_resp[option]++;
-	}
-	(void) sprintf(nfrontp, (char *)wont, option);
-	nfrontp += sizeof (wont) - 2;
-
-	DIAG(TD_OPTIONS, printoption("td: send wont", option));
-}
-
-	void
-dontoption(option)
-	int option;
-{
-	/*
-	 * Process client input.
-	 */
-
-
-	DIAG(TD_OPTIONS, printoption("td: recv dont", option));
-
-	if (will_wont_resp[option]) {
-		will_wont_resp[option]--;
-		if (will_wont_resp[option] && my_state_is_wont(option))
-			will_wont_resp[option]--;
-	}
-	if ((will_wont_resp[option] == 0) && (my_want_state_is_will(option))) {
-		switch (option) {
-		case TELOPT_BINARY:
-			init_termbuf();
-			tty_binaryout(0);
-			set_termbuf();
-			break;
-
-		case TELOPT_ECHO:	/* we should stop echoing */
-#ifdef	LINEMODE
-# ifdef	KLUDGELINEMODE
-			if ((lmodetype != REAL_LINEMODE) &&
-			    (lmodetype != KLUDGE_LINEMODE))
-# else
-			if (his_state_is_wont(TELOPT_LINEMODE))
-# endif
-#endif
-			{
-				init_termbuf();
-				tty_setecho(0);
-				set_termbuf();
-			}
-			break;
-
-		case TELOPT_SGA:
-#if	defined(LINEMODE) && defined(KLUDGELINEMODE)
-			/*
-			 * If kludge linemode is in use, then we
-			 * must process an incoming do SGA for
-			 * linemode purposes.
-			 */
-			if ((lmodetype == KLUDGE_LINEMODE) ||
-			    (lmodetype == KLUDGE_OK)) {
-				/*
-				 * The client is asking us to turn
-				 * linemode on.
-				 */
-				lmodetype = KLUDGE_LINEMODE;
-				clientstat(TELOPT_LINEMODE, WILL, 0);
-				/*
-				 * If we did not turn line mode on,
-				 * then what do we say?  Will SGA?
-				 * This violates design of telnet.
-				 * Gross.  Very Gross.
-				 */
-			}
-			break;
-#else
-			set_my_want_state_wont(option);
-			if (my_state_is_will(option))
-				send_wont(option, 0);
-			set_my_state_wont(option);
-			if (turn_on_sga ^= 1)
-				send_will(option, 1);
-			return;
-#endif	/* defined(LINEMODE) && defined(KLUDGELINEMODE) */
-
-		default:
-			break;
-		}
-
-		set_my_want_state_wont(option);
-		if (my_state_is_will(option))
-			send_wont(option, 0);
-	}
-	set_my_state_wont(option);
-
-}  /* end of dontoption */
-
-#ifdef	ENV_HACK
-int env_ovar = -1;
-int env_ovalue = -1;
-#else	/* ENV_HACK */
-# define env_ovar OLD_ENV_VAR
-# define env_ovalue OLD_ENV_VALUE
-#endif	/* ENV_HACK */
-
-/*
- * suboption()
- *
- *	Look at the sub-option buffer, and try to be helpful to the other
- * side.
- *
- *	Currently we recognize:
- *
- *	Terminal type is
- *	Linemode
- *	Window size
- *	Terminal speed
- */
-	void
-suboption()
-{
-    register int subchar;
-
-    DIAG(TD_OPTIONS, {netflush(); printsub('<', subpointer, SB_LEN()+2);});
-
-    subchar = SB_GET();
-    switch (subchar) {
-    case TELOPT_TSPEED: {
-	register int xspeed, rspeed;
-
-	if (his_state_is_wont(TELOPT_TSPEED))	/* Ignore if option disabled */
-		break;
-
-	settimer(tspeedsubopt);
-
-	if (SB_EOF() || SB_GET() != TELQUAL_IS)
-		return;
-
-	xspeed = atoi((char *)subpointer);
-
-	while (SB_GET() != ',' && !SB_EOF());
-	if (SB_EOF())
-		return;
-
-	rspeed = atoi((char *)subpointer);
-	clientstat(TELOPT_TSPEED, xspeed, rspeed);
-
-	break;
-
-    }  /* end of case TELOPT_TSPEED */
-
-    case TELOPT_TTYPE: {		/* Yaaaay! */
-	static char terminalname[41];
-
-	if (his_state_is_wont(TELOPT_TTYPE))	/* Ignore if option disabled */
-		break;
-	settimer(ttypesubopt);
-
-	if (SB_EOF() || SB_GET() != TELQUAL_IS) {
-	    return;		/* ??? XXX but, this is the most robust */
-	}
-
-	terminaltype = terminalname;
-
-	while ((terminaltype < (terminalname + sizeof terminalname-1)) &&
-								    !SB_EOF()) {
-	    register int c;
-
-	    c = SB_GET();
-	    if (isupper(c)) {
-		c = tolower(c);
-	    }
-	    *terminaltype++ = c;    /* accumulate name */
-	}
-	*terminaltype = 0;
-	terminaltype = terminalname;
-	break;
-    }  /* end of case TELOPT_TTYPE */
-
-    case TELOPT_NAWS: {
-	register int xwinsize, ywinsize;
-
-	if (his_state_is_wont(TELOPT_NAWS))	/* Ignore if option disabled */
-		break;
-
-	if (SB_EOF())
-		return;
-	xwinsize = SB_GET() << 8;
-	if (SB_EOF())
-		return;
-	xwinsize |= SB_GET();
-	if (SB_EOF())
-		return;
-	ywinsize = SB_GET() << 8;
-	if (SB_EOF())
-		return;
-	ywinsize |= SB_GET();
-	clientstat(TELOPT_NAWS, xwinsize, ywinsize);
-
-	break;
-
-    }  /* end of case TELOPT_NAWS */
-
-#ifdef	LINEMODE
-    case TELOPT_LINEMODE: {
-	register int request;
-
-	if (his_state_is_wont(TELOPT_LINEMODE))	/* Ignore if option disabled */
-		break;
-	/*
-	 * Process linemode suboptions.
-	 */
-	if (SB_EOF())
-	    break;		/* garbage was sent */
-	request = SB_GET();	/* get will/wont */
-
-	if (SB_EOF())
-	    break;		/* another garbage check */
-
-	if (request == LM_SLC) {  /* SLC is not preceeded by WILL or WONT */
-		/*
-		 * Process suboption buffer of slc's
-		 */
-		start_slc(1);
-		do_opt_slc(subpointer, subend - subpointer);
-		(void) end_slc(0);
-		break;
-	} else if (request == LM_MODE) {
-		if (SB_EOF())
-		    return;
-		useeditmode = SB_GET();  /* get mode flag */
-		clientstat(LM_MODE, 0, 0);
-		break;
-	}
-
-	if (SB_EOF())
-	    break;
-	switch (SB_GET()) {  /* what suboption? */
-	case LM_FORWARDMASK:
-		/*
-		 * According to spec, only server can send request for
-		 * forwardmask, and client can only return a positive response.
-		 * So don't worry about it.
-		 */
-
-	default:
-		break;
-	}
-	break;
-    }  /* end of case TELOPT_LINEMODE */
-#endif
-    case TELOPT_STATUS: {
-	int mode;
-
-	if (SB_EOF())
-	    break;
-	mode = SB_GET();
-	switch (mode) {
-	case TELQUAL_SEND:
-	    if (my_state_is_will(TELOPT_STATUS))
-		send_status();
-	    break;
-
-	case TELQUAL_IS:
-	    break;
-
-	default:
-	    break;
-	}
-	break;
-    }  /* end of case TELOPT_STATUS */
-
-    case TELOPT_XDISPLOC: {
-	if (SB_EOF() || SB_GET() != TELQUAL_IS)
-		return;
-	settimer(xdisplocsubopt);
-	subpointer[SB_LEN()] = '\0';
-	(void)setenv("DISPLAY", (char *)subpointer, 1);
-	break;
-    }  /* end of case TELOPT_XDISPLOC */
-
-#ifdef	TELOPT_NEW_ENVIRON
-    case TELOPT_NEW_ENVIRON:
-#endif
-    case TELOPT_OLD_ENVIRON: {
-	register int c;
-	register char *cp, *varp, *valp;
-
-	if (SB_EOF())
-		return;
-	c = SB_GET();
-	if (c == TELQUAL_IS) {
-		if (subchar == TELOPT_OLD_ENVIRON)
-			settimer(oenvironsubopt);
-		else
-			settimer(environsubopt);
-	} else if (c != TELQUAL_INFO) {
-		return;
-	}
-
-#ifdef	TELOPT_NEW_ENVIRON
-	if (subchar == TELOPT_NEW_ENVIRON) {
-	    while (!SB_EOF()) {
-		c = SB_GET();
-		if ((c == NEW_ENV_VAR) || (c == ENV_USERVAR))
-			break;
-	    }
-	} else
-#endif
-	{
-#ifdef	ENV_HACK
-	    /*
-	     * We only want to do this if we haven't already decided
-	     * whether or not the other side has its VALUE and VAR
-	     * reversed.
-	     */
-	    if (env_ovar < 0) {
-		register int last = -1;		/* invalid value */
-		int empty = 0;
-		int got_var = 0, got_value = 0, got_uservar = 0;
-
-		/*
-		 * The other side might have its VALUE and VAR values
-		 * reversed.  To be interoperable, we need to determine
-		 * which way it is.  If the first recognized character
-		 * is a VAR or VALUE, then that will tell us what
-		 * type of client it is.  If the fist recognized
-		 * character is a USERVAR, then we continue scanning
-		 * the suboption looking for two consecutive
-		 * VAR or VALUE fields.  We should not get two
-		 * consecutive VALUE fields, so finding two
-		 * consecutive VALUE or VAR fields will tell us
-		 * what the client is.
-		 */
-		SB_SAVE();
-		while (!SB_EOF()) {
-			c = SB_GET();
-			switch(c) {
-			case OLD_ENV_VAR:
-				if (last < 0 || last == OLD_ENV_VAR
-				    || (empty && (last == OLD_ENV_VALUE)))
-					goto env_ovar_ok;
-				got_var++;
-				last = OLD_ENV_VAR;
-				break;
-			case OLD_ENV_VALUE:
-				if (last < 0 || last == OLD_ENV_VALUE
-				    || (empty && (last == OLD_ENV_VAR)))
-					goto env_ovar_wrong;
-				got_value++;
-				last = OLD_ENV_VALUE;
-				break;
-			case ENV_USERVAR:
-				/* count strings of USERVAR as one */
-				if (last != ENV_USERVAR)
-					got_uservar++;
-				if (empty) {
-					if (last == OLD_ENV_VALUE)
-						goto env_ovar_ok;
-					if (last == OLD_ENV_VAR)
-						goto env_ovar_wrong;
-				}
-				last = ENV_USERVAR;
-				break;
-			case ENV_ESC:
-				if (!SB_EOF())
-					c = SB_GET();
-				/* FALL THROUGH */
-			default:
-				empty = 0;
-				continue;
-			}
-			empty = 1;
-		}
-		if (empty) {
-			if (last == OLD_ENV_VALUE)
-				goto env_ovar_ok;
-			if (last == OLD_ENV_VAR)
-				goto env_ovar_wrong;
-		}
-		/*
-		 * Ok, the first thing was a USERVAR, and there
-		 * are not two consecutive VAR or VALUE commands,
-		 * and none of the VAR or VALUE commands are empty.
-		 * If the client has sent us a well-formed option,
-		 * then the number of VALUEs received should always
-		 * be less than or equal to the number of VARs and
-		 * USERVARs received.
-		 *
-		 * If we got exactly as many VALUEs as VARs and
-		 * USERVARs, the client has the same definitions.
-		 *
-		 * If we got exactly as many VARs as VALUEs and
-		 * USERVARS, the client has reversed definitions.
-		 */
-		if (got_uservar + got_var == got_value) {
-	    env_ovar_ok:
-			env_ovar = OLD_ENV_VAR;
-			env_ovalue = OLD_ENV_VALUE;
-		} else if (got_uservar + got_value == got_var) {
-	    env_ovar_wrong:
-			env_ovar = OLD_ENV_VALUE;
-			env_ovalue = OLD_ENV_VAR;
-			DIAG(TD_OPTIONS, {sprintf(nfrontp,
-				"ENVIRON VALUE and VAR are reversed!\r\n");
-				nfrontp += strlen(nfrontp);});
-
-		}
-	    }
-	    SB_RESTORE();
-#endif
-
-	    while (!SB_EOF()) {
-		c = SB_GET();
-		if ((c == env_ovar) || (c == ENV_USERVAR))
-			break;
-	    }
-	}
-
-	if (SB_EOF())
-		return;
-
-	cp = varp = (char *)subpointer;
-	valp = 0;
-
-	while (!SB_EOF()) {
-		c = SB_GET();
-		if (subchar == TELOPT_OLD_ENVIRON) {
-			if (c == env_ovar)
-				c = NEW_ENV_VAR;
-			else if (c == env_ovalue)
-				c = NEW_ENV_VALUE;
-		}
-		switch (c) {
-
-		case NEW_ENV_VALUE:
-			*cp = '\0';
-			cp = valp = (char *)subpointer;
-			break;
-
-		case NEW_ENV_VAR:
-		case ENV_USERVAR:
-			*cp = '\0';
-			if (valp)
-				(void)setenv(varp, valp, 1);
-			else
-				unsetenv(varp);
-			cp = varp = (char *)subpointer;
-			valp = 0;
-			break;
-
-		case ENV_ESC:
-			if (SB_EOF())
-				break;
-			c = SB_GET();
-			/* FALL THROUGH */
-		default:
-			*cp++ = c;
-			break;
-		}
-	}
-	*cp = '\0';
-	if (valp)
-		(void)setenv(varp, valp, 1);
-	else
-		unsetenv(varp);
-	break;
-    }  /* end of case TELOPT_NEW_ENVIRON */
-#if	defined(AUTHENTICATION)
-    case TELOPT_AUTHENTICATION:
-	if (SB_EOF())
-		break;
-	switch(SB_GET()) {
-	case TELQUAL_SEND:
-	case TELQUAL_REPLY:
-		/*
-		 * These are sent by us and cannot be sent by
-		 * the client.
-		 */
-		break;
-	case TELQUAL_IS:
-		auth_is(subpointer, SB_LEN());
-		break;
-	case TELQUAL_NAME:
-		auth_name(subpointer, SB_LEN());
-		break;
-	}
-	break;
-#endif
-#ifdef	ENCRYPTION
-    case TELOPT_ENCRYPT:
-	if (SB_EOF())
-		break;
-	switch(SB_GET()) {
-	case ENCRYPT_SUPPORT:
-		encrypt_support(subpointer, SB_LEN());
-		break;
-	case ENCRYPT_IS:
-		encrypt_is(subpointer, SB_LEN());
-		break;
-	case ENCRYPT_REPLY:
-		encrypt_reply(subpointer, SB_LEN());
-		break;
-	case ENCRYPT_START:
-		encrypt_start(subpointer, SB_LEN());
-		break;
-	case ENCRYPT_END:
-		encrypt_end();
-		break;
-	case ENCRYPT_REQSTART:
-		encrypt_request_start(subpointer, SB_LEN());
-		break;
-	case ENCRYPT_REQEND:
-		/*
-		 * We can always send an REQEND so that we cannot
-		 * get stuck encrypting.  We should only get this
-		 * if we have been able to get in the correct mode
-		 * anyhow.
-		 */
-		encrypt_request_end();
-		break;
-	case ENCRYPT_ENC_KEYID:
-		encrypt_enc_keyid(subpointer, SB_LEN());
-		break;
-	case ENCRYPT_DEC_KEYID:
-		encrypt_dec_keyid(subpointer, SB_LEN());
-		break;
-	default:
-		break;
-	}
-	break;
-#endif	/* ENCRYPTION */
-
-    default:
-	break;
-    }  /* end of switch */
-
-}  /* end of suboption */
-
-	void
-doclientstat()
-{
-	clientstat(TELOPT_LINEMODE, WILL, 0);
-}
-
-#define	ADD(c)	 *ncp++ = c
-#define	ADD_DATA(c) { *ncp++ = c; if (c == SE || c == IAC) *ncp++ = c; }
-	void
-send_status()
-{
-	unsigned char statusbuf[256];
-	register unsigned char *ncp;
-	register unsigned char i;
-
-	ncp = statusbuf;
-
-	netflush();	/* get rid of anything waiting to go out */
-
-	ADD(IAC);
-	ADD(SB);
-	ADD(TELOPT_STATUS);
-	ADD(TELQUAL_IS);
-
-	/*
-	 * We check the want_state rather than the current state,
-	 * because if we received a DO/WILL for an option that we
-	 * don't support, and the other side didn't send a DONT/WONT
-	 * in response to our WONT/DONT, then the "state" will be
-	 * WILL/DO, and the "want_state" will be WONT/DONT.  We
-	 * need to go by the latter.
-	 */
-	for (i = 0; i < (unsigned char)NTELOPTS; i++) {
-		if (my_want_state_is_will(i)) {
-			ADD(WILL);
-			ADD_DATA(i);
-		}
-		if (his_want_state_is_will(i)) {
-			ADD(DO);
-			ADD_DATA(i);
-		}
-	}
-
-	if (his_want_state_is_will(TELOPT_LFLOW)) {
-		ADD(SB);
-		ADD(TELOPT_LFLOW);
-		if (flowmode) {
-			ADD(LFLOW_ON);
-		} else {
-			ADD(LFLOW_OFF);
-		}
-		ADD(SE);
-
-		if (restartany >= 0) {
-			ADD(SB);
-			ADD(TELOPT_LFLOW);
-			if (restartany) {
-				ADD(LFLOW_RESTART_ANY);
-			} else {
-				ADD(LFLOW_RESTART_XON);
-			}
-			ADD(SE);
-		}
-	}
-
-#ifdef	LINEMODE
-	if (his_want_state_is_will(TELOPT_LINEMODE)) {
-		unsigned char *cp, *cpe;
-		int len;
-
-		ADD(SB);
-		ADD(TELOPT_LINEMODE);
-		ADD(LM_MODE);
-		ADD_DATA(editmode);
-		ADD(SE);
-
-		ADD(SB);
-		ADD(TELOPT_LINEMODE);
-		ADD(LM_SLC);
-		start_slc(0);
-		send_slc();
-		len = end_slc(&cp);
-		for (cpe = cp + len; cp < cpe; cp++)
-			ADD_DATA(*cp);
-		ADD(SE);
-	}
-#endif	/* LINEMODE */
-
-	ADD(IAC);
-	ADD(SE);
-
-	writenet(statusbuf, ncp - statusbuf);
-	netflush();	/* Send it on its way */
-
-	DIAG(TD_OPTIONS,
-		{printsub('>', statusbuf, ncp - statusbuf); netflush();});
-}
diff --git a/crypto/telnet/telnetd/sys_term.c b/crypto/telnet/telnetd/sys_term.c
deleted file mode 100644
index 235e409be7aa..000000000000
--- a/crypto/telnet/telnetd/sys_term.c
+++ /dev/null
@@ -1,2333 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)sys_term.c	8.4+1 (Berkeley) 5/30/95";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
-
-#include "telnetd.h"
-#include "pathnames.h"
-
-#if	defined(AUTHENTICATION)
-#include <libtelnet/auth.h>
-#endif
-
-extern char *altlogin;
-int cleanopen(char *line);
-void scrub_env(void);
-
-#if defined(CRAY) || defined(__hpux)
-# define PARENT_DOES_UTMP
-#endif
-
-#ifdef	NEWINIT
-#include <initreq.h>
-#else	/* NEWINIT*/
-# ifdef	UTMPX
-# include <utmpx.h>
-struct	utmpx wtmp;
-# else
-# include <utmp.h>
-struct	utmp wtmp;
-# endif /* UTMPX */
-
-# ifndef PARENT_DOES_UTMP
-#ifdef _PATH_WTMP
-char    wtmpf[] = _PATH_WTMP;
-#else
-char	wtmpf[]	= "/usr/adm/wtmp";
-#endif
-#ifdef _PATH_UTMP
-char    utmpf[] = _PATH_UTMP;
-#else
-char	utmpf[] = "/etc/utmp";
-#endif
-# else /* PARENT_DOES_UTMP */
-char	wtmpf[]	= "/etc/wtmp";
-# endif /* PARENT_DOES_UTMP */
-
-#include <libutil.h>
-
-# ifdef CRAY
-#include <tmpdir.h>
-#include <sys/wait.h>
-#  if (UNICOS_LVL == '7.0') || (UNICOS_LVL == '7.1')
-#   define UNICOS7x
-#  endif
-
-#  ifdef UNICOS7x
-#include <sys/sysv.h>
-#include <sys/secstat.h>
-extern int secflag;
-extern struct sysv sysv;
-#  endif /* UNICOS7x */
-# endif	/* CRAY */
-#endif	/* NEWINIT */
-
-#ifdef	STREAMSPTY
-#include <sac.h>
-#include <sys/stropts.h>
-#endif
-
-#define SCPYN(a, b)	(void) strncpy(a, b, sizeof(a))
-#define SCMPN(a, b)	strncmp(a, b, sizeof(a))
-
-#ifdef	STREAMS
-#include <sys/stream.h>
-#endif
-#ifdef __hpux
-#include <sys/resource.h>
-#include <sys/proc.h>
-#endif
-#include <sys/tty.h>
-#ifdef	t_erase
-#undef	t_erase
-#undef	t_kill
-#undef	t_intrc
-#undef	t_quitc
-#undef	t_startc
-#undef	t_stopc
-#undef	t_eofc
-#undef	t_brkc
-#undef	t_suspc
-#undef	t_dsuspc
-#undef	t_rprntc
-#undef	t_flushc
-#undef	t_werasc
-#undef	t_lnextc
-#endif
-
-#if defined(UNICOS5) && defined(CRAY2) && !defined(EXTPROC)
-# define EXTPROC 0400
-#endif
-
-#ifndef	USE_TERMIO
-struct termbuf {
-	struct sgttyb sg;
-	struct tchars tc;
-	struct ltchars ltc;
-	int state;
-	int lflags;
-} termbuf, termbuf2;
-# define	cfsetospeed(tp, val)	(tp)->sg.sg_ospeed = (val)
-# define	cfsetispeed(tp, val)	(tp)->sg.sg_ispeed = (val)
-# define	cfgetospeed(tp)		(tp)->sg.sg_ospeed
-# define	cfgetispeed(tp)		(tp)->sg.sg_ispeed
-#else	/* USE_TERMIO */
-# ifdef	SYSV_TERMIO
-#	define termios termio
-# endif
-# ifndef	TCSANOW
-#  ifdef TCSETS
-#   define	TCSANOW		TCSETS
-#   define	TCSADRAIN	TCSETSW
-#   define	tcgetattr(f, t)	ioctl(f, TCGETS, (char *)t)
-#  else
-#   ifdef TCSETA
-#    define	TCSANOW		TCSETA
-#    define	TCSADRAIN	TCSETAW
-#    define	tcgetattr(f, t)	ioctl(f, TCGETA, (char *)t)
-#   else
-#    define	TCSANOW		TIOCSETA
-#    define	TCSADRAIN	TIOCSETAW
-#    define	tcgetattr(f, t)	ioctl(f, TIOCGETA, (char *)t)
-#   endif
-#  endif
-#  define	tcsetattr(f, a, t)	ioctl(f, a, t)
-#  define	cfsetospeed(tp, val)	(tp)->c_cflag &= ~CBAUD; \
-					(tp)->c_cflag |= (val)
-#  define	cfgetospeed(tp)		((tp)->c_cflag & CBAUD)
-#  ifdef CIBAUD
-#   define	cfsetispeed(tp, val)	(tp)->c_cflag &= ~CIBAUD; \
-					(tp)->c_cflag |= ((val)<<IBSHIFT)
-#   define	cfgetispeed(tp)		(((tp)->c_cflag & CIBAUD)>>IBSHIFT)
-#  else
-#   define	cfsetispeed(tp, val)	(tp)->c_cflag &= ~CBAUD; \
-					(tp)->c_cflag |= (val)
-#   define	cfgetispeed(tp)		((tp)->c_cflag & CBAUD)
-#  endif
-# endif /* TCSANOW */
-struct termios termbuf, termbuf2;	/* pty control structure */
-# ifdef  STREAMSPTY
-int ttyfd = -1;
-# endif
-#endif	/* USE_TERMIO */
-
-#include <sys/types.h>
-#include <libutil.h>
-
-int cleanopen __P((char *));
-void scrub_env __P((void));
-
-/*
- * init_termbuf()
- * copy_termbuf(cp)
- * set_termbuf()
- *
- * These three routines are used to get and set the "termbuf" structure
- * to and from the kernel.  init_termbuf() gets the current settings.
- * copy_termbuf() hands in a new "termbuf" to write to the kernel, and
- * set_termbuf() writes the structure into the kernel.
- */
-
-	void
-init_termbuf()
-{
-#ifndef	USE_TERMIO
-	(void) ioctl(pty, TIOCGETP, (char *)&termbuf.sg);
-	(void) ioctl(pty, TIOCGETC, (char *)&termbuf.tc);
-	(void) ioctl(pty, TIOCGLTC, (char *)&termbuf.ltc);
-# ifdef	TIOCGSTATE
-	(void) ioctl(pty, TIOCGSTATE, (char *)&termbuf.state);
-# endif
-#else
-# ifdef  STREAMSPTY
-	(void) tcgetattr(ttyfd, &termbuf);
-# else
-	(void) tcgetattr(pty, &termbuf);
-# endif
-#endif
-	termbuf2 = termbuf;
-}
-
-#if	defined(LINEMODE) && defined(TIOCPKT_IOCTL)
-	void
-copy_termbuf(cp, len)
-	char *cp;
-	int len;
-{
-	if (len > sizeof(termbuf))
-		len = sizeof(termbuf);
-	memmove((char *)&termbuf, cp, len);
-	termbuf2 = termbuf;
-}
-#endif	/* defined(LINEMODE) && defined(TIOCPKT_IOCTL) */
-
-	void
-set_termbuf()
-{
-	/*
-	 * Only make the necessary changes.
-	 */
-#ifndef	USE_TERMIO
-	if (memcmp((char *)&termbuf.sg, (char *)&termbuf2.sg,
-							sizeof(termbuf.sg)))
-		(void) ioctl(pty, TIOCSETN, (char *)&termbuf.sg);
-	if (memcmp((char *)&termbuf.tc, (char *)&termbuf2.tc,
-							sizeof(termbuf.tc)))
-		(void) ioctl(pty, TIOCSETC, (char *)&termbuf.tc);
-	if (memcmp((char *)&termbuf.ltc, (char *)&termbuf2.ltc,
-							sizeof(termbuf.ltc)))
-		(void) ioctl(pty, TIOCSLTC, (char *)&termbuf.ltc);
-	if (termbuf.lflags != termbuf2.lflags)
-		(void) ioctl(pty, TIOCLSET, (char *)&termbuf.lflags);
-#else	/* USE_TERMIO */
-	if (memcmp((char *)&termbuf, (char *)&termbuf2, sizeof(termbuf)))
-# ifdef  STREAMSPTY
-		(void) tcsetattr(ttyfd, TCSANOW, &termbuf);
-# else
-		(void) tcsetattr(pty, TCSANOW, &termbuf);
-# endif
-# if	defined(CRAY2) && defined(UNICOS5)
-	needtermstat = 1;
-# endif
-#endif	/* USE_TERMIO */
-}
-
-
-/*
- * spcset(func, valp, valpp)
- *
- * This function takes various special characters (func), and
- * sets *valp to the current value of that character, and
- * *valpp to point to where in the "termbuf" structure that
- * value is kept.
- *
- * It returns the SLC_ level of support for this function.
- */
-
-#ifndef	USE_TERMIO
-	int
-spcset(func, valp, valpp)
-	int func;
-	cc_t *valp;
-	cc_t **valpp;
-{
-	switch(func) {
-	case SLC_EOF:
-		*valp = termbuf.tc.t_eofc;
-		*valpp = (cc_t *)&termbuf.tc.t_eofc;
-		return(SLC_VARIABLE);
-	case SLC_EC:
-		*valp = termbuf.sg.sg_erase;
-		*valpp = (cc_t *)&termbuf.sg.sg_erase;
-		return(SLC_VARIABLE);
-	case SLC_EL:
-		*valp = termbuf.sg.sg_kill;
-		*valpp = (cc_t *)&termbuf.sg.sg_kill;
-		return(SLC_VARIABLE);
-	case SLC_IP:
-		*valp = termbuf.tc.t_intrc;
-		*valpp = (cc_t *)&termbuf.tc.t_intrc;
-		return(SLC_VARIABLE|SLC_FLUSHIN|SLC_FLUSHOUT);
-	case SLC_ABORT:
-		*valp = termbuf.tc.t_quitc;
-		*valpp = (cc_t *)&termbuf.tc.t_quitc;
-		return(SLC_VARIABLE|SLC_FLUSHIN|SLC_FLUSHOUT);
-	case SLC_XON:
-		*valp = termbuf.tc.t_startc;
-		*valpp = (cc_t *)&termbuf.tc.t_startc;
-		return(SLC_VARIABLE);
-	case SLC_XOFF:
-		*valp = termbuf.tc.t_stopc;
-		*valpp = (cc_t *)&termbuf.tc.t_stopc;
-		return(SLC_VARIABLE);
-	case SLC_AO:
-		*valp = termbuf.ltc.t_flushc;
-		*valpp = (cc_t *)&termbuf.ltc.t_flushc;
-		return(SLC_VARIABLE);
-	case SLC_SUSP:
-		*valp = termbuf.ltc.t_suspc;
-		*valpp = (cc_t *)&termbuf.ltc.t_suspc;
-		return(SLC_VARIABLE);
-	case SLC_EW:
-		*valp = termbuf.ltc.t_werasc;
-		*valpp = (cc_t *)&termbuf.ltc.t_werasc;
-		return(SLC_VARIABLE);
-	case SLC_RP:
-		*valp = termbuf.ltc.t_rprntc;
-		*valpp = (cc_t *)&termbuf.ltc.t_rprntc;
-		return(SLC_VARIABLE);
-	case SLC_LNEXT:
-		*valp = termbuf.ltc.t_lnextc;
-		*valpp = (cc_t *)&termbuf.ltc.t_lnextc;
-		return(SLC_VARIABLE);
-	case SLC_FORW1:
-		*valp = termbuf.tc.t_brkc;
-		*valpp = (cc_t *)&termbuf.ltc.t_lnextc;
-		return(SLC_VARIABLE);
-	case SLC_BRK:
-	case SLC_SYNCH:
-	case SLC_AYT:
-	case SLC_EOR:
-		*valp = (cc_t)0;
-		*valpp = (cc_t *)0;
-		return(SLC_DEFAULT);
-	default:
-		*valp = (cc_t)0;
-		*valpp = (cc_t *)0;
-		return(SLC_NOSUPPORT);
-	}
-}
-
-#else	/* USE_TERMIO */
-
-	int
-spcset(func, valp, valpp)
-	int func;
-	cc_t *valp;
-	cc_t **valpp;
-{
-
-#define	setval(a, b)	*valp = termbuf.c_cc[a]; \
-			*valpp = &termbuf.c_cc[a]; \
-			return(b);
-#define	defval(a) *valp = ((cc_t)a); *valpp = (cc_t *)0; return(SLC_DEFAULT);
-
-	switch(func) {
-	case SLC_EOF:
-		setval(VEOF, SLC_VARIABLE);
-	case SLC_EC:
-		setval(VERASE, SLC_VARIABLE);
-	case SLC_EL:
-		setval(VKILL, SLC_VARIABLE);
-	case SLC_IP:
-		setval(VINTR, SLC_VARIABLE|SLC_FLUSHIN|SLC_FLUSHOUT);
-	case SLC_ABORT:
-		setval(VQUIT, SLC_VARIABLE|SLC_FLUSHIN|SLC_FLUSHOUT);
-	case SLC_XON:
-#ifdef	VSTART
-		setval(VSTART, SLC_VARIABLE);
-#else
-		defval(0x13);
-#endif
-	case SLC_XOFF:
-#ifdef	VSTOP
-		setval(VSTOP, SLC_VARIABLE);
-#else
-		defval(0x11);
-#endif
-	case SLC_EW:
-#ifdef	VWERASE
-		setval(VWERASE, SLC_VARIABLE);
-#else
-		defval(0);
-#endif
-	case SLC_RP:
-#ifdef	VREPRINT
-		setval(VREPRINT, SLC_VARIABLE);
-#else
-		defval(0);
-#endif
-	case SLC_LNEXT:
-#ifdef	VLNEXT
-		setval(VLNEXT, SLC_VARIABLE);
-#else
-		defval(0);
-#endif
-	case SLC_AO:
-#if	!defined(VDISCARD) && defined(VFLUSHO)
-# define VDISCARD VFLUSHO
-#endif
-#ifdef	VDISCARD
-		setval(VDISCARD, SLC_VARIABLE|SLC_FLUSHOUT);
-#else
-		defval(0);
-#endif
-	case SLC_SUSP:
-#ifdef	VSUSP
-		setval(VSUSP, SLC_VARIABLE|SLC_FLUSHIN);
-#else
-		defval(0);
-#endif
-#ifdef	VEOL
-	case SLC_FORW1:
-		setval(VEOL, SLC_VARIABLE);
-#endif
-#ifdef	VEOL2
-	case SLC_FORW2:
-		setval(VEOL2, SLC_VARIABLE);
-#endif
-	case SLC_AYT:
-#ifdef	VSTATUS
-		setval(VSTATUS, SLC_VARIABLE);
-#else
-		defval(0);
-#endif
-
-	case SLC_BRK:
-	case SLC_SYNCH:
-	case SLC_EOR:
-		defval(0);
-
-	default:
-		*valp = 0;
-		*valpp = 0;
-		return(SLC_NOSUPPORT);
-	}
-}
-#endif	/* USE_TERMIO */
-
-#ifdef CRAY
-/*
- * getnpty()
- *
- * Return the number of pty's configured into the system.
- */
-	int
-getnpty()
-{
-#ifdef _SC_CRAY_NPTY
-	int numptys;
-
-	if ((numptys = sysconf(_SC_CRAY_NPTY)) != -1)
-		return numptys;
-	else
-#endif /* _SC_CRAY_NPTY */
-		return 128;
-}
-#endif /* CRAY */
-
-#ifndef	convex
-/*
- * getpty()
- *
- * Allocate a pty.  As a side effect, the external character
- * array "line" contains the name of the slave side.
- *
- * Returns the file descriptor of the opened pty.
- */
-#ifndef	__GNUC__
-char *line = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
-#else
-static char Xline[] = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
-char *line = Xline;
-#endif
-#ifdef	CRAY
-char *myline = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
-#endif	/* CRAY */
-
-	int
-getpty(ptynum)
-int *ptynum;
-{
-	register int p;
-#ifdef	STREAMSPTY
-	int t;
-	char *ptsname();
-
-	p = open("/dev/ptmx", 2);
-	if (p > 0) {
-		grantpt(p);
-		unlockpt(p);
-		strcpy(line, ptsname(p));
-		return(p);
-	}
-
-#else	/* ! STREAMSPTY */
-#ifndef CRAY
-	register char *cp, *p1, *p2;
-	register int i;
-#if defined(sun) && defined(TIOCGPGRP) && BSD < 199207
-	int dummy;
-#endif
-
-#ifndef	__hpux
-	(void) strcpy(line, "/dev/ptyXX");
-	p1 = &line[8];
-	p2 = &line[9];
-#else
-	(void) strcpy(line, "/dev/ptym/ptyXX");
-	p1 = &line[13];
-	p2 = &line[14];
-#endif
-
-	for (cp = "pqrsPQRS"; *cp; cp++) {
-		struct stat stb;
-
-		*p1 = *cp;
-		*p2 = '0';
-		/*
-		 * This stat() check is just to keep us from
-		 * looping through all 256 combinations if there
-		 * aren't that many ptys available.
-		 */
-		if (stat(line, &stb) < 0)
-			break;
-		for (i = 0; i < 32; i++) {
-			*p2 = "0123456789abcdefghijklmnopqrstuv"[i];
-			p = open(line, 2);
-			if (p > 0) {
-#ifndef	__hpux
-				line[5] = 't';
-#else
-				for (p1 = &line[8]; *p1; p1++)
-					*p1 = *(p1+1);
-				line[9] = 't';
-#endif
-				chown(line, 0, 0);
-				chmod(line, 0600);
-#if defined(sun) && defined(TIOCGPGRP) && BSD < 199207
-				if (ioctl(p, TIOCGPGRP, &dummy) == 0
-				    || errno != EIO) {
-					chmod(line, 0666);
-					close(p);
-					line[5] = 'p';
-				} else
-#endif /* defined(sun) && defined(TIOCGPGRP) && BSD < 199207 */
-					return(p);
-			}
-		}
-	}
-#else	/* CRAY */
-	extern lowpty, highpty;
-	struct stat sb;
-
-	for (*ptynum = lowpty; *ptynum <= highpty; (*ptynum)++) {
-		(void) sprintf(myline, "/dev/pty/%03d", *ptynum);
-		p = open(myline, 2);
-		if (p < 0)
-			continue;
-		(void) sprintf(line, "/dev/ttyp%03d", *ptynum);
-		/*
-		 * Here are some shenanigans to make sure that there
-		 * are no listeners lurking on the line.
-		 */
-		if(stat(line, &sb) < 0) {
-			(void) close(p);
-			continue;
-		}
-		if(sb.st_uid || sb.st_gid || sb.st_mode != 0600) {
-			chown(line, 0, 0);
-			chmod(line, 0600);
-			(void)close(p);
-			p = open(myline, 2);
-			if (p < 0)
-				continue;
-		}
-		/*
-		 * Now it should be safe...check for accessability.
-		 */
-		if (access(line, 6) == 0)
-			return(p);
-		else {
-			/* no tty side to pty so skip it */
-			(void) close(p);
-		}
-	}
-#endif	/* CRAY */
-#endif	/* STREAMSPTY */
-	return(-1);
-}
-#endif	/* convex */
-
-#ifdef	LINEMODE
-/*
- * tty_flowmode()	Find out if flow control is enabled or disabled.
- * tty_linemode()	Find out if linemode (external processing) is enabled.
- * tty_setlinemod(on)	Turn on/off linemode.
- * tty_isecho()		Find out if echoing is turned on.
- * tty_setecho(on)	Enable/disable character echoing.
- * tty_israw()		Find out if terminal is in RAW mode.
- * tty_binaryin(on)	Turn on/off BINARY on input.
- * tty_binaryout(on)	Turn on/off BINARY on output.
- * tty_isediting()	Find out if line editing is enabled.
- * tty_istrapsig()	Find out if signal trapping is enabled.
- * tty_setedit(on)	Turn on/off line editing.
- * tty_setsig(on)	Turn on/off signal trapping.
- * tty_issofttab()	Find out if tab expansion is enabled.
- * tty_setsofttab(on)	Turn on/off soft tab expansion.
- * tty_islitecho()	Find out if typed control chars are echoed literally
- * tty_setlitecho()	Turn on/off literal echo of control chars
- * tty_tspeed(val)	Set transmit speed to val.
- * tty_rspeed(val)	Set receive speed to val.
- */
-
-#ifdef convex
-static int linestate;
-#endif
-
-	int
-tty_linemode()
-{
-#ifndef convex
-#ifndef	USE_TERMIO
-	return(termbuf.state & TS_EXTPROC);
-#else
-	return(termbuf.c_lflag & EXTPROC);
-#endif
-#else
-	return(linestate);
-#endif
-}
-
-	void
-tty_setlinemode(on)
-	int on;
-{
-#ifdef	TIOCEXT
-# ifndef convex
-	set_termbuf();
-# else
-	linestate = on;
-# endif
-	(void) ioctl(pty, TIOCEXT, (char *)&on);
-# ifndef convex
-	init_termbuf();
-# endif
-#else	/* !TIOCEXT */
-# ifdef	EXTPROC
-	if (on)
-		termbuf.c_lflag |= EXTPROC;
-	else
-		termbuf.c_lflag &= ~EXTPROC;
-# endif
-#endif	/* TIOCEXT */
-}
-#endif	/* LINEMODE */
-
-	int
-tty_isecho()
-{
-#ifndef USE_TERMIO
-	return (termbuf.sg.sg_flags & ECHO);
-#else
-	return (termbuf.c_lflag & ECHO);
-#endif
-}
-
-	int
-tty_flowmode()
-{
-#ifndef USE_TERMIO
-	return(((termbuf.tc.t_startc) > 0 && (termbuf.tc.t_stopc) > 0) ? 1 : 0);
-#else
-	return((termbuf.c_iflag & IXON) ? 1 : 0);
-#endif
-}
-
-	int
-tty_restartany()
-{
-#ifndef USE_TERMIO
-# ifdef	DECCTQ
-	return((termbuf.lflags & DECCTQ) ? 0 : 1);
-# else
-	return(-1);
-# endif
-#else
-	return((termbuf.c_iflag & IXANY) ? 1 : 0);
-#endif
-}
-
-	void
-tty_setecho(on)
-	int on;
-{
-#ifndef	USE_TERMIO
-	if (on)
-		termbuf.sg.sg_flags |= ECHO|CRMOD;
-	else
-		termbuf.sg.sg_flags &= ~(ECHO|CRMOD);
-#else
-	if (on)
-		termbuf.c_lflag |= ECHO;
-	else
-		termbuf.c_lflag &= ~ECHO;
-#endif
-}
-
-	int
-tty_israw()
-{
-#ifndef USE_TERMIO
-	return(termbuf.sg.sg_flags & RAW);
-#else
-	return(!(termbuf.c_lflag & ICANON));
-#endif
-}
-
-#if	defined (AUTHENTICATION) && defined(NO_LOGIN_F) && defined(LOGIN_R)
-	int
-tty_setraw(on)
-{
-#  ifndef USE_TERMIO
-	if (on)
-		termbuf.sg.sg_flags |= RAW;
-	else
-		termbuf.sg.sg_flags &= ~RAW;
-#  else
-	if (on)
-		termbuf.c_lflag &= ~ICANON;
-	else
-		termbuf.c_lflag |= ICANON;
-#  endif
-}
-#endif
-
-	void
-tty_binaryin(on)
-	int on;
-{
-#ifndef	USE_TERMIO
-	if (on)
-		termbuf.lflags |= LPASS8;
-	else
-		termbuf.lflags &= ~LPASS8;
-#else
-	if (on) {
-		termbuf.c_iflag &= ~ISTRIP;
-	} else {
-		termbuf.c_iflag |= ISTRIP;
-	}
-#endif
-}
-
-	void
-tty_binaryout(on)
-	int on;
-{
-#ifndef	USE_TERMIO
-	if (on)
-		termbuf.lflags |= LLITOUT;
-	else
-		termbuf.lflags &= ~LLITOUT;
-#else
-	if (on) {
-		termbuf.c_cflag &= ~(CSIZE|PARENB);
-		termbuf.c_cflag |= CS8;
-		termbuf.c_oflag &= ~OPOST;
-	} else {
-		termbuf.c_cflag &= ~CSIZE;
-		termbuf.c_cflag |= CS7|PARENB;
-		termbuf.c_oflag |= OPOST;
-	}
-#endif
-}
-
-	int
-tty_isbinaryin()
-{
-#ifndef	USE_TERMIO
-	return(termbuf.lflags & LPASS8);
-#else
-	return(!(termbuf.c_iflag & ISTRIP));
-#endif
-}
-
-	int
-tty_isbinaryout()
-{
-#ifndef	USE_TERMIO
-	return(termbuf.lflags & LLITOUT);
-#else
-	return(!(termbuf.c_oflag&OPOST));
-#endif
-}
-
-#ifdef	LINEMODE
-	int
-tty_isediting()
-{
-#ifndef USE_TERMIO
-	return(!(termbuf.sg.sg_flags & (CBREAK|RAW)));
-#else
-	return(termbuf.c_lflag & ICANON);
-#endif
-}
-
-	int
-tty_istrapsig()
-{
-#ifndef USE_TERMIO
-	return(!(termbuf.sg.sg_flags&RAW));
-#else
-	return(termbuf.c_lflag & ISIG);
-#endif
-}
-
-	void
-tty_setedit(on)
-	int on;
-{
-#ifndef USE_TERMIO
-	if (on)
-		termbuf.sg.sg_flags &= ~CBREAK;
-	else
-		termbuf.sg.sg_flags |= CBREAK;
-#else
-	if (on)
-		termbuf.c_lflag |= ICANON;
-	else
-		termbuf.c_lflag &= ~ICANON;
-#endif
-}
-
-	void
-tty_setsig(on)
-	int on;
-{
-#ifndef	USE_TERMIO
-	if (on)
-		;
-#else
-	if (on)
-		termbuf.c_lflag |= ISIG;
-	else
-		termbuf.c_lflag &= ~ISIG;
-#endif
-}
-#endif	/* LINEMODE */
-
-	int
-tty_issofttab()
-{
-#ifndef	USE_TERMIO
-	return (termbuf.sg.sg_flags & XTABS);
-#else
-# ifdef	OXTABS
-	return (termbuf.c_oflag & OXTABS);
-# endif
-# ifdef	TABDLY
-	return ((termbuf.c_oflag & TABDLY) == TAB3);
-# endif
-#endif
-}
-
-	void
-tty_setsofttab(on)
-	int on;
-{
-#ifndef	USE_TERMIO
-	if (on)
-		termbuf.sg.sg_flags |= XTABS;
-	else
-		termbuf.sg.sg_flags &= ~XTABS;
-#else
-	if (on) {
-# ifdef	OXTABS
-		termbuf.c_oflag |= OXTABS;
-# endif
-# ifdef	TABDLY
-		termbuf.c_oflag &= ~TABDLY;
-		termbuf.c_oflag |= TAB3;
-# endif
-	} else {
-# ifdef	OXTABS
-		termbuf.c_oflag &= ~OXTABS;
-# endif
-# ifdef	TABDLY
-		termbuf.c_oflag &= ~TABDLY;
-		termbuf.c_oflag |= TAB0;
-# endif
-	}
-#endif
-}
-
-	int
-tty_islitecho()
-{
-#ifndef	USE_TERMIO
-	return (!(termbuf.lflags & LCTLECH));
-#else
-# ifdef	ECHOCTL
-	return (!(termbuf.c_lflag & ECHOCTL));
-# endif
-# ifdef	TCTLECH
-	return (!(termbuf.c_lflag & TCTLECH));
-# endif
-# if	!defined(ECHOCTL) && !defined(TCTLECH)
-	return (0);	/* assumes ctl chars are echoed '^x' */
-# endif
-#endif
-}
-
-	void
-tty_setlitecho(on)
-	int on;
-{
-#ifndef	USE_TERMIO
-	if (on)
-		termbuf.lflags &= ~LCTLECH;
-	else
-		termbuf.lflags |= LCTLECH;
-#else
-# ifdef	ECHOCTL
-	if (on)
-		termbuf.c_lflag &= ~ECHOCTL;
-	else
-		termbuf.c_lflag |= ECHOCTL;
-# endif
-# ifdef	TCTLECH
-	if (on)
-		termbuf.c_lflag &= ~TCTLECH;
-	else
-		termbuf.c_lflag |= TCTLECH;
-# endif
-#endif
-}
-
-	int
-tty_iscrnl()
-{
-#ifndef	USE_TERMIO
-	return (termbuf.sg.sg_flags & CRMOD);
-#else
-	return (termbuf.c_iflag & ICRNL);
-#endif
-}
-
-/*
- * Try to guess whether speeds are "encoded" (4.2BSD) or just numeric (4.4BSD).
- */
-#if B4800 != 4800
-#define	DECODE_BAUD
-#endif
-
-#ifdef	DECODE_BAUD
-
-/*
- * A table of available terminal speeds
- */
-struct termspeeds {
-	int	speed;
-	int	value;
-} termspeeds[] = {
-	{ 0,      B0 },      { 50,    B50 },    { 75,     B75 },
-	{ 110,    B110 },    { 134,   B134 },   { 150,    B150 },
-	{ 200,    B200 },    { 300,   B300 },   { 600,    B600 },
-	{ 1200,   B1200 },   { 1800,  B1800 },  { 2400,   B2400 },
-	{ 4800,   B4800 },
-#ifdef	B7200
-	{ 7200,  B7200 },
-#endif
-	{ 9600,   B9600 },
-#ifdef	B14400
-	{ 14400,  B14400 },
-#endif
-#ifdef	B19200
-	{ 19200,  B19200 },
-#endif
-#ifdef	B28800
-	{ 28800,  B28800 },
-#endif
-#ifdef	B38400
-	{ 38400,  B38400 },
-#endif
-#ifdef	B57600
-	{ 57600,  B57600 },
-#endif
-#ifdef	B115200
-	{ 115200, B115200 },
-#endif
-#ifdef	B230400
-	{ 230400, B230400 },
-#endif
-	{ -1,     0 }
-};
-#endif	/* DECODE_BAUD */
-
-	void
-tty_tspeed(val)
-	int val;
-{
-#ifdef	DECODE_BAUD
-	register struct termspeeds *tp;
-
-	for (tp = termspeeds; (tp->speed != -1) && (val > tp->speed); tp++)
-		;
-	if (tp->speed == -1)	/* back up to last valid value */
-		--tp;
-	cfsetospeed(&termbuf, tp->value);
-#else	/* DECODE_BAUD */
-	cfsetospeed(&termbuf, val);
-#endif	/* DECODE_BAUD */
-}
-
-	void
-tty_rspeed(val)
-	int val;
-{
-#ifdef	DECODE_BAUD
-	register struct termspeeds *tp;
-
-	for (tp = termspeeds; (tp->speed != -1) && (val > tp->speed); tp++)
-		;
-	if (tp->speed == -1)	/* back up to last valid value */
-		--tp;
-	cfsetispeed(&termbuf, tp->value);
-#else	/* DECODE_BAUD */
-	cfsetispeed(&termbuf, val);
-#endif	/* DECODE_BAUD */
-}
-
-#if	defined(CRAY2) && defined(UNICOS5)
-	int
-tty_isnewmap()
-{
-	return((termbuf.c_oflag & OPOST) && (termbuf.c_oflag & ONLCR) &&
-			!(termbuf.c_oflag & ONLRET));
-}
-#endif
-
-#ifdef PARENT_DOES_UTMP
-# ifndef NEWINIT
-extern	struct utmp wtmp;
-extern char wtmpf[];
-# else	/* NEWINIT */
-int	gotalarm;
-
-	/* ARGSUSED */
-	void
-nologinproc(sig)
-	int sig;
-{
-	gotalarm++;
-}
-# endif	/* NEWINIT */
-#endif /* PARENT_DOES_UTMP */
-
-#ifndef	NEWINIT
-# ifdef PARENT_DOES_UTMP
-extern void utmp_sig_init P((void));
-extern void utmp_sig_reset P((void));
-extern void utmp_sig_wait P((void));
-extern void utmp_sig_notify P((int));
-# endif /* PARENT_DOES_UTMP */
-#endif
-
-/*
- * getptyslave()
- *
- * Open the slave side of the pty, and do any initialization
- * that is necessary.
- */
-	void
-getptyslave()
-{
-	register int t = -1;
-	char erase;
-
-#if	!defined(CRAY) || !defined(NEWINIT)
-# ifdef	LINEMODE
-	int waslm;
-# endif
-# ifdef	TIOCGWINSZ
-	struct winsize ws;
-	extern int def_row, def_col;
-# endif
-	extern int def_tspeed, def_rspeed;
-	/*
-	 * Opening the slave side may cause initilization of the
-	 * kernel tty structure.  We need remember the state of
-	 * 	if linemode was turned on
-	 *	terminal window size
-	 *	terminal speed
-	 *	erase character
-	 * so that we can re-set them if we need to.
-	 */
-# ifdef	LINEMODE
-	waslm = tty_linemode();
-# endif
-	erase = termbuf.c_cc[VERASE];
-
-	/*
-	 * Make sure that we don't have a controlling tty, and
-	 * that we are the session (process group) leader.
-	 */
-# ifdef	TIOCNOTTY
-	t = open(_PATH_TTY, O_RDWR);
-	if (t >= 0) {
-		(void) ioctl(t, TIOCNOTTY, (char *)0);
-		(void) close(t);
-	}
-# endif
-
-
-# ifdef PARENT_DOES_UTMP
-	/*
-	 * Wait for our parent to get the utmp stuff to get done.
-	 */
-	utmp_sig_wait();
-# endif
-
-	t = cleanopen(line);
-	if (t < 0)
-		fatalperror(net, line);
-
-#ifdef  STREAMSPTY
-#ifdef	USE_TERMIO
-	ttyfd = t;
-#endif
-	if (ioctl(t, I_PUSH, "ptem") < 0)
-		fatal(net, "I_PUSH ptem");
-	if (ioctl(t, I_PUSH, "ldterm") < 0)
-		fatal(net, "I_PUSH ldterm");
-	if (ioctl(t, I_PUSH, "ttcompat") < 0)
-		fatal(net, "I_PUSH ttcompat");
-	if (ioctl(pty, I_PUSH, "pckt") < 0)
-		fatal(net, "I_PUSH pckt");
-#endif
-
-	/*
-	 * set up the tty modes as we like them to be.
-	 */
-	init_termbuf();
-# ifdef	TIOCGWINSZ
-	if (def_row || def_col) {
-		memset((char *)&ws, 0, sizeof(ws));
-		ws.ws_col = def_col;
-		ws.ws_row = def_row;
-		(void)ioctl(t, TIOCSWINSZ, (char *)&ws);
-	}
-# endif
-
-	/*
-	 * Settings for sgtty based systems
-	 */
-# ifndef	USE_TERMIO
-	termbuf.sg.sg_flags |= CRMOD|ANYP|ECHO|XTABS;
-# endif	/* USE_TERMIO */
-
-	/*
-	 * Settings for UNICOS (and HPUX)
-	 */
-# if defined(CRAY) || defined(__hpux)
-	termbuf.c_oflag = OPOST|ONLCR|TAB3;
-	termbuf.c_iflag = IGNPAR|ISTRIP|ICRNL|IXON;
-	termbuf.c_lflag = ISIG|ICANON|ECHO|ECHOE|ECHOK;
-	termbuf.c_cflag = EXTB|HUPCL|CS8;
-# endif
-
-	/*
-	 * Settings for all other termios/termio based
-	 * systems, other than 4.4BSD.  In 4.4BSD the
-	 * kernel does the initial terminal setup.
-	 */
-# if defined(USE_TERMIO) && !(defined(CRAY) || defined(__hpux)) && (BSD <= 43)
-#  ifndef	OXTABS
-#   define OXTABS	0
-#  endif
-	termbuf.c_lflag |= ECHO;
-	termbuf.c_oflag |= ONLCR|OXTABS;
-	termbuf.c_iflag |= ICRNL;
-	termbuf.c_iflag &= ~IXOFF;
-# endif /* defined(USE_TERMIO) && !defined(CRAY) && (BSD <= 43) */
-	tty_rspeed((def_rspeed > 0) ? def_rspeed : 9600);
-	tty_tspeed((def_tspeed > 0) ? def_tspeed : 9600);
-	if (erase)
-		termbuf.c_cc[VERASE] = erase;
-# ifdef	LINEMODE
-	if (waslm)
-		tty_setlinemode(1);
-# endif	/* LINEMODE */
-
-	/*
-	 * Set the tty modes, and make this our controlling tty.
-	 */
-	set_termbuf();
-	if (login_tty(t) == -1)
-		fatalperror(net, "login_tty");
-#endif	/* !defined(CRAY) || !defined(NEWINIT) */
-	if (net > 2)
-		(void) close(net);
-#if	defined(AUTHENTICATION) && defined(NO_LOGIN_F) && defined(LOGIN_R)
-	/*
-	 * Leave the pty open so that we can write out the rlogin
-	 * protocol for /bin/login, if the authentication works.
-	 */
-#else
-	if (pty > 2) {
-		(void) close(pty);
-		pty = -1;
-	}
-#endif
-}
-
-#if	!defined(CRAY) || !defined(NEWINIT)
-#ifndef	O_NOCTTY
-#define	O_NOCTTY	0
-#endif
-/*
- * Open the specified slave side of the pty,
- * making sure that we have a clean tty.
- */
-	int
-cleanopen(line)
-	char *line;
-{
-	register int t;
-#ifdef	UNICOS7x
-	struct secstat secbuf;
-#endif	/* UNICOS7x */
-
-#ifndef STREAMSPTY
-	/*
-	 * Make sure that other people can't open the
-	 * slave side of the connection.
-	 */
-	(void) chown(line, 0, 0);
-	(void) chmod(line, 0600);
-#endif
-
-# if !defined(CRAY) && (BSD > 43)
-	(void) revoke(line);
-# endif
-#ifdef	UNICOS7x
-	if (secflag) {
-		if (secstat(line, &secbuf) < 0)
-			return(-1);
-		if (setulvl(secbuf.st_slevel) < 0)
-			return(-1);
-		if (setucmp(secbuf.st_compart) < 0)
-			return(-1);
-	}
-#endif	/* UNICOS7x */
-
-	t = open(line, O_RDWR|O_NOCTTY);
-
-#ifdef	UNICOS7x
-	if (secflag) {
-		if (setulvl(sysv.sy_minlvl) < 0)
-			return(-1);
-		if (setucmp(0) < 0)
-			return(-1);
-	}
-#endif	/* UNICOS7x */
-
-	if (t < 0)
-		return(-1);
-
-	/*
-	 * Hangup anybody else using this ttyp, then reopen it for
-	 * ourselves.
-	 */
-# if !(defined(CRAY) || defined(__hpux)) && (BSD <= 43) && !defined(STREAMSPTY)
-	(void) signal(SIGHUP, SIG_IGN);
-	vhangup();
-	(void) signal(SIGHUP, SIG_DFL);
-	t = open(line, O_RDWR|O_NOCTTY);
-	if (t < 0)
-		return(-1);
-# endif
-# if	defined(CRAY) && defined(TCVHUP)
-	{
-		register int i;
-		(void) signal(SIGHUP, SIG_IGN);
-		(void) ioctl(t, TCVHUP, (char *)0);
-		(void) signal(SIGHUP, SIG_DFL);
-
-#ifdef	UNICOS7x
-		if (secflag) {
-			if (secstat(line, &secbuf) < 0)
-				return(-1);
-			if (setulvl(secbuf.st_slevel) < 0)
-				return(-1);
-			if (setucmp(secbuf.st_compart) < 0)
-				return(-1);
-		}
-#endif	/* UNICOS7x */
-
-		i = open(line, O_RDWR);
-
-#ifdef	UNICOS7x
-		if (secflag) {
-			if (setulvl(sysv.sy_minlvl) < 0)
-				return(-1);
-			if (setucmp(0) < 0)
-				return(-1);
-		}
-#endif	/* UNICOS7x */
-
-		if (i < 0)
-			return(-1);
-		(void) close(t);
-		t = i;
-	}
-# endif	/* defined(CRAY) && defined(TCVHUP) */
-	return(t);
-}
-#endif	/* !defined(CRAY) || !defined(NEWINIT) */
-
-#if BSD <= 43
-
-	int
-login_tty(t)
-	int t;
-{
-	if (setsid() < 0) {
-#ifdef ultrix
-		/*
-		 * The setsid() may have failed because we
-		 * already have a pgrp == pid.  Zero out
-		 * our pgrp and try again...
-		 */
-		if ((setpgrp(0, 0) < 0) || (setsid() < 0))
-#endif
-			fatalperror(net, "setsid()");
-	}
-# ifdef	TIOCSCTTY
-	if (ioctl(t, TIOCSCTTY, (char *)0) < 0)
-		fatalperror(net, "ioctl(sctty)");
-#  if defined(CRAY)
-	/*
-	 * Close the hard fd to /dev/ttypXXX, and re-open through
-	 * the indirect /dev/tty interface.
-	 */
-	close(t);
-	if ((t = open("/dev/tty", O_RDWR)) < 0)
-		fatalperror(net, "open(/dev/tty)");
-#  endif
-# else
-	/*
-	 * We get our controlling tty assigned as a side-effect
-	 * of opening up a tty device.  But on BSD based systems,
-	 * this only happens if our process group is zero.  The
-	 * setsid() call above may have set our pgrp, so clear
-	 * it out before opening the tty...
-	 */
-#  ifndef SOLARIS
-	(void) setpgrp(0, 0);
-#  else
-	(void) setpgrp();
-#  endif
-	close(open(line, O_RDWR));
-# endif
-	if (t != 0)
-		(void) dup2(t, 0);
-	if (t != 1)
-		(void) dup2(t, 1);
-	if (t != 2)
-		(void) dup2(t, 2);
-	if (t > 2)
-		close(t);
-	return(0);
-}
-#endif	/* BSD <= 43 */
-
-#ifdef	NEWINIT
-char *gen_id = "fe";
-#endif
-
-/*
- * startslave(host)
- *
- * Given a hostname, do whatever
- * is necessary to startup the login process on the slave side of the pty.
- */
-
-/* ARGSUSED */
-	void
-startslave(host, autologin, autoname)
-	char *host;
-	int autologin;
-	char *autoname;
-{
-	register int i;
-#ifdef	NEWINIT
-	extern char *ptyip;
-	struct init_request request;
-	void nologinproc();
-	register int n;
-#endif	/* NEWINIT */
-
-#if	defined(AUTHENTICATION)
-	if (!autoname || !autoname[0])
-		autologin = 0;
-
-	if (autologin < auth_level) {
-		fatal(net, "Authorization failed");
-		exit(1);
-	}
-#endif
-
-#ifndef	NEWINIT
-# ifdef	PARENT_DOES_UTMP
-	utmp_sig_init();
-# endif	/* PARENT_DOES_UTMP */
-
-	if ((i = fork()) < 0)
-		fatalperror(net, "fork");
-	if (i) {
-# ifdef PARENT_DOES_UTMP
-		/*
-		 * Cray parent will create utmp entry for child and send
-		 * signal to child to tell when done.  Child waits for signal
-		 * before doing anything important.
-		 */
-		register int pid = i;
-		void sigjob P((int));
-
-		setpgrp();
-		utmp_sig_reset();		/* reset handler to default */
-		/*
-		 * Create utmp entry for child
-		 */
-		(void) time(&wtmp.ut_time);
-		wtmp.ut_type = LOGIN_PROCESS;
-		wtmp.ut_pid = pid;
-		SCPYN(wtmp.ut_user, "LOGIN");
-		SCPYN(wtmp.ut_host, host);
-		SCPYN(wtmp.ut_line, line + sizeof("/dev/") - 1);
-#ifndef	__hpux
-		SCPYN(wtmp.ut_id, wtmp.ut_line+3);
-#else
-		SCPYN(wtmp.ut_id, wtmp.ut_line+7);
-#endif
-		pututline(&wtmp);
-		endutent();
-		if ((i = open(wtmpf, O_WRONLY|O_APPEND)) >= 0) {
-			(void) write(i, (char *)&wtmp, sizeof(struct utmp));
-			(void) close(i);
-		}
-#ifdef	CRAY
-		(void) signal(WJSIGNAL, sigjob);
-#endif
-		utmp_sig_notify(pid);
-# endif	/* PARENT_DOES_UTMP */
-	} else {
-		getptyslave(autologin);
-		start_login(host, autologin, autoname);
-		/*NOTREACHED*/
-	}
-#else	/* NEWINIT */
-
-	/*
-	 * Init will start up login process if we ask nicely.  We only wait
-	 * for it to start up and begin normal telnet operation.
-	 */
-	if ((i = open(INIT_FIFO, O_WRONLY)) < 0) {
-		char tbuf[128];
-		(void) snprintf(tbuf, sizeof(tbuf), "Can't open %s\n", INIT_FIFO);
-		fatalperror(net, tbuf);
-	}
-	memset((char *)&request, 0, sizeof(request));
-	request.magic = INIT_MAGIC;
-	SCPYN(request.gen_id, gen_id);
-	SCPYN(request.tty_id, &line[8]);
-	SCPYN(request.host, host);
-	SCPYN(request.term_type, terminaltype ? terminaltype : "network");
-#if	!defined(UNICOS5)
-	request.signal = SIGCLD;
-	request.pid = getpid();
-#endif
-#ifdef BFTPDAEMON
-	/*
-	 * Are we working as the bftp daemon?
-	 */
-	if (bftpd) {
-		SCPYN(request.exec_name, BFTPPATH);
-	}
-#endif /* BFTPDAEMON */
-	if (write(i, (char *)&request, sizeof(request)) < 0) {
-		char tbuf[128];
-		(void) snprintf(tbuf, sizeof(tbuf), "Can't write to %s\n", INIT_FIFO);
-		fatalperror(net, tbuf);
-	}
-	(void) close(i);
-	(void) signal(SIGALRM, nologinproc);
-	for (i = 0; ; i++) {
-		char tbuf[128];
-		alarm(15);
-		n = read(pty, ptyip, BUFSIZ);
-		if (i == 3 || n >= 0 || !gotalarm)
-			break;
-		gotalarm = 0;
-		snprintf(tbuf, sizeof(tbuf), "telnetd: waiting for /etc/init to start login process on %s\r\n", line);
-		(void) write(net, tbuf, strlen(tbuf));
-	}
-	if (n < 0 && gotalarm)
-		fatal(net, "/etc/init didn't start login process");
-	pcc += n;
-	alarm(0);
-	(void) signal(SIGALRM, SIG_DFL);
-
-	return;
-#endif	/* NEWINIT */
-}
-
-char	*envinit[3];
-extern char **environ;
-
-	void
-init_env()
-{
-	extern char *getenv();
-	char **envp;
-
-	envp = envinit;
-	if ((*envp = getenv("TZ")))
-		*envp++ -= 3;
-#if	defined(CRAY) || defined(__hpux)
-	else
-		*envp++ = "TZ=GMT0";
-#endif
-	*envp = 0;
-	environ = envinit;
-}
-
-#ifndef	NEWINIT
-
-/*
- * start_login(host)
- *
- * Assuming that we are now running as a child processes, this
- * function will turn us into the login process.
- */
-
-	void
-start_login(host, autologin, name)
-	char *host;
-	int autologin;
-	char *name;
-{
-	register char **argv;
-	char **addarg(), *user;
-	extern char *getenv();
-#ifdef	UTMPX
-	register int pid = getpid();
-	struct utmpx utmpx;
-#endif
-#ifdef SOLARIS
-	char *term;
-	char termbuf[64];
-#endif
-
-#ifdef	UTMPX
-	/*
-	 * Create utmp entry for child
-	 */
-
-	memset(&utmpx, 0, sizeof(utmpx));
-	SCPYN(utmpx.ut_user, ".telnet");
-	SCPYN(utmpx.ut_line, line + sizeof("/dev/") - 1);
-	utmpx.ut_pid = pid;
-	utmpx.ut_id[0] = 't';
-	utmpx.ut_id[1] = 'n';
-	utmpx.ut_id[2] = SC_WILDC;
-	utmpx.ut_id[3] = SC_WILDC;
-	utmpx.ut_type = LOGIN_PROCESS;
-	(void) time(&utmpx.ut_tv.tv_sec);
-	if (makeutx(&utmpx) == NULL)
-		fatal(net, "makeutx failed");
-#endif
-
-	scrub_env();
-
-	/*
-	 * -h : pass on name of host.
-	 *		WARNING:  -h is accepted by login if and only if
-	 *			getuid() == 0.
-	 * -p : don't clobber the environment (so terminal type stays set).
-	 *
-	 * -f : force this login, he has already been authenticated
-	 */
-	argv = addarg(0, "login");
-
-#if	!defined(NO_LOGIN_H)
-
-# if	defined (AUTHENTICATION) && defined(NO_LOGIN_F) && defined(LOGIN_R)
-	/*
-	 * Don't add the "-h host" option if we are going
-	 * to be adding the "-r host" option down below...
-	 */
-	if ((auth_level < 0) || (autologin != AUTH_VALID))
-# endif
-	{
-		argv = addarg(argv, "-h");
-		argv = addarg(argv, host);
-#ifdef	SOLARIS
-		/*
-		 * SVR4 version of -h takes TERM= as second arg, or -
-		 */
-		term = getenv("TERM");
-		if (term == NULL || term[0] == 0) {
-			term = "-";
-		} else {
-			strcpy(termbuf, "TERM=");
-			strncat(termbuf, term, sizeof(termbuf) - 6);
-			term = termbuf;
-		}
-		argv = addarg(argv, term);
-#endif
-	}
-#endif
-#if	!defined(NO_LOGIN_P)
-	argv = addarg(argv, "-p");
-#endif
-#ifdef	LINEMODE
-	/*
-	 * Set the environment variable "LINEMODE" to either
-	 * "real" or "kludge" if we are operating in either
-	 * real or kludge linemode.
-	 */
-	if (lmodetype == REAL_LINEMODE)
-		setenv("LINEMODE", "real", 1);
-# ifdef KLUDGELINEMODE
-	else if (lmodetype == KLUDGE_LINEMODE || lmodetype == KLUDGE_OK)
-		setenv("LINEMODE", "kludge", 1);
-# endif
-#endif
-#ifdef	BFTPDAEMON
-	/*
-	 * Are we working as the bftp daemon?  If so, then ask login
-	 * to start bftp instead of shell.
-	 */
-	if (bftpd) {
-		argv = addarg(argv, "-e");
-		argv = addarg(argv, BFTPPATH);
-	} else
-#endif
-#if	defined (SecurID)
-	/*
-	 * don't worry about the -f that might get sent.
-	 * A -s is supposed to override it anyhow.
-	 */
-	if (require_SecurID)
-		argv = addarg(argv, "-s");
-#endif
-#if	defined (AUTHENTICATION)
-	if (auth_level >= 0 && autologin == AUTH_VALID) {
-# if	!defined(NO_LOGIN_F)
-		argv = addarg(argv, "-f");
-		argv = addarg(argv, "--");
-		argv = addarg(argv, name);
-# else
-#  if defined(LOGIN_R)
-		/*
-		 * We don't have support for "login -f", but we
-		 * can fool /bin/login into thinking that we are
-		 * rlogind, and allow us to log in without a
-		 * password.  The rlogin protocol expects
-		 *	local-user\0remote-user\0term/speed\0
-		 */
-
-		if (pty > 2) {
-			register char *cp;
-			char speed[128];
-			int isecho, israw, xpty, len;
-			extern int def_rspeed;
-#  ifndef LOGIN_HOST
-			/*
-			 * Tell login that we are coming from "localhost".
-			 * If we passed in the real host name, then the
-			 * user would have to allow .rhost access from
-			 * every machine that they want authenticated
-			 * access to work from, which sort of defeats
-			 * the purpose of an authenticated login...
-			 * So, we tell login that the session is coming
-			 * from "localhost", and the user will only have
-			 * to have "localhost" in their .rhost file.
-			 */
-#			define LOGIN_HOST "localhost"
-#  endif
-			argv = addarg(argv, "-r");
-			argv = addarg(argv, LOGIN_HOST);
-
-			xpty = pty;
-# ifndef  STREAMSPTY
-			pty = 0;
-# else
-			ttyfd = 0;
-# endif
-			init_termbuf();
-			isecho = tty_isecho();
-			israw = tty_israw();
-			if (isecho || !israw) {
-				tty_setecho(0);		/* Turn off echo */
-				tty_setraw(1);		/* Turn on raw */
-				set_termbuf();
-			}
-			len = strlen(name)+1;
-			write(xpty, name, len);
-			write(xpty, name, len);
-			snprintf(speed, sizeof(speed),
-				"%s/%d", (cp = getenv("TERM")) ? cp : "",
-				(def_rspeed > 0) ? def_rspeed : 9600);
-			len = strlen(speed)+1;
-			write(xpty, speed, len);
-
-			if (isecho || !israw) {
-				init_termbuf();
-				tty_setecho(isecho);
-				tty_setraw(israw);
-				set_termbuf();
-				if (!israw) {
-					/*
-					 * Write a newline to ensure
-					 * that login will be able to
-					 * read the line...
-					 */
-					write(xpty, "\n", 1);
-				}
-			}
-			pty = xpty;
-		}
-#  else
-		argv = addarg(argv, "--");
-		argv = addarg(argv, name);
-#  endif
-# endif
-	} else
-#endif
-	if (getenv("USER")) {
- 		argv = addarg(argv, "--");
-		argv = addarg(argv, getenv("USER"));
-#if	defined(LOGIN_ARGS) && defined(NO_LOGIN_P)
-		{
-			register char **cpp;
-			for (cpp = environ; *cpp; cpp++)
-				argv = addarg(argv, *cpp);
-		}
-#endif
-		/*
-		 * Assume that login will set the USER variable
-		 * correctly.  For SysV systems, this means that
-		 * USER will no longer be set, just LOGNAME by
-		 * login.  (The problem is that if the auto-login
-		 * fails, and the user then specifies a different
-		 * account name, he can get logged in with both
-		 * LOGNAME and USER in his environment, but the
-		 * USER value will be wrong.
-		 */
-		unsetenv("USER");
-	}
-#ifdef	SOLARIS
-	else {
-		char **p;
-
-		argv = addarg(argv, "");	/* no login name */
-		for (p = environ; *p; p++) {
-			argv = addarg(argv, *p);
-		}
-	}
-#endif	/* SOLARIS */
-#if	defined(AUTHENTICATION) && defined(NO_LOGIN_F) && defined(LOGIN_R)
-	if (pty > 2)
-		close(pty);
-#endif
-	closelog();
-
-	if (altlogin == NULL) {
-		altlogin = _PATH_LOGIN;
-	}
-	execv(altlogin, argv);
-
-	syslog(LOG_ERR, "%s: %m", altlogin);
-	fatalperror(net, altlogin);
-	/*NOTREACHED*/
-}
-
-	char **
-addarg(argv, val)
-	register char **argv;
-	register char *val;
-{
-	register char **cpp;
-
-	if (argv == NULL) {
-		/*
-		 * 10 entries, a leading length, and a null
-		 */
-		argv = (char **)malloc(sizeof(*argv) * 12);
-		if (argv == NULL)
-			return(NULL);
-		*argv++ = (char *)10;
-		*argv = (char *)0;
-	}
-	for (cpp = argv; *cpp; cpp++)
-		;
-	if (cpp == &argv[(int)argv[-1]]) {
-		--argv;
-		*argv = (char *)((int)(*argv) + 10);
-		argv = (char **)realloc(argv, sizeof(*argv)*((int)(*argv) + 2));
-		if (argv == NULL)
-			return(NULL);
-		argv++;
-		cpp = &argv[(int)argv[-1] - 10];
-	}
-	*cpp++ = val;
-	*cpp = 0;
-	return(argv);
-}
-#endif	/* NEWINIT */
-
-/*
- * scrub_env()
- *
- * Remove a few things from the environment that
- * don't need to be there.
- */
-	void
-scrub_env()
-{
-	register char **cpp, **cpp2;
-
-	for (cpp2 = cpp = environ; *cpp; cpp++) {
-#ifdef __FreeBSD__
-		if (strncmp(*cpp, "LD_LIBRARY_PATH=", 16) &&
-		    strncmp(*cpp, "LD_PRELOAD=", 11) &&
-#else
-		if (strncmp(*cpp, "LD_", 3) &&
-		    strncmp(*cpp, "_RLD_", 5) &&
-		    strncmp(*cpp, "LIBPATH=", 8) &&
-#endif
-		    strncmp(*cpp, "IFS=", 4))
-			*cpp2++ = *cpp;
-	}
-	*cpp2 = 0;
-}
-
-/*
- * cleanup()
- *
- * This is the routine to call when we are all through, to
- * clean up anything that needs to be cleaned up.
- */
-	/* ARGSUSED */
-	void
-cleanup(sig)
-	int sig;
-{
-#ifndef	PARENT_DOES_UTMP
-# if (BSD > 43) || defined(convex)
-	char *p;
-
-	p = line + sizeof("/dev/") - 1;
-	if (logout(p))
-		logwtmp(p, "", "");
-	(void)chmod(line, 0666);
-	(void)chown(line, 0, 0);
-	*p = 'p';
-	(void)chmod(line, 0666);
-	(void)chown(line, 0, 0);
-	(void) shutdown(net, 2);
-	exit(1);
-# else
-	void rmut();
-
-	rmut();
-	vhangup();	/* XXX */
-	(void) shutdown(net, 2);
-	exit(1);
-# endif
-#else	/* PARENT_DOES_UTMP */
-# ifdef	NEWINIT
-	(void) shutdown(net, 2);
-	exit(1);
-# else	/* NEWINIT */
-#  ifdef CRAY
-	static int incleanup = 0;
-	register int t;
-	int child_status; /* status of child process as returned by waitpid */
-	int flags = WNOHANG|WUNTRACED;
-
-	/*
-	 * 1: Pick up the zombie, if we are being called
-	 *    as the signal handler.
-	 * 2: If we are a nested cleanup(), return.
-	 * 3: Try to clean up TMPDIR.
-	 * 4: Fill in utmp with shutdown of process.
-	 * 5: Close down the network and pty connections.
-	 * 6: Finish up the TMPDIR cleanup, if needed.
-	 */
-	if (sig == SIGCHLD) {
-		while (waitpid(-1, &child_status, flags) > 0)
-			;	/* VOID */
-		/* Check if the child process was stopped
-		 * rather than exited.  We want cleanup only if
-		 * the child has died.
-		 */
-		if (WIFSTOPPED(child_status)) {
-			return;
-		}
-	}
-	t = sigblock(sigmask(SIGCHLD));
-	if (incleanup) {
-		sigsetmask(t);
-		return;
-	}
-	incleanup = 1;
-	sigsetmask(t);
-#ifdef	UNICOS7x
-	if (secflag) {
-		/*
-		 *	We need to set ourselves back to a null
-		 *	label to clean up.
-		 */
-
-		setulvl(sysv.sy_minlvl);
-		setucmp((long)0);
-	}
-#endif	/* UNICOS7x */
-
-	t = cleantmp(&wtmp);
-	setutent();	/* just to make sure */
-#  endif /* CRAY */
-	rmut(line);
-	close(pty);
-	(void) shutdown(net, 2);
-#  ifdef CRAY
-	if (t == 0)
-		cleantmp(&wtmp);
-#  endif /* CRAY */
-	exit(1);
-# endif	/* NEWINT */
-#endif	/* PARENT_DOES_UTMP */
-}
-
-#if defined(PARENT_DOES_UTMP) && !defined(NEWINIT)
-/*
- * _utmp_sig_rcv
- * utmp_sig_init
- * utmp_sig_wait
- *	These three functions are used to coordinate the handling of
- *	the utmp file between the server and the soon-to-be-login shell.
- *	The server actually creates the utmp structure, the child calls
- *	utmp_sig_wait(), until the server calls utmp_sig_notify() and
- *	signals the future-login shell to proceed.
- */
-static int caught=0;		/* NZ when signal intercepted */
-static void (*func)();		/* address of previous handler */
-
-	void
-_utmp_sig_rcv(sig)
-	int sig;
-{
-	caught = 1;
-	(void) signal(SIGUSR1, func);
-}
-
-	void
-utmp_sig_init()
-{
-	/*
-	 * register signal handler for UTMP creation
-	 */
-	if ((int)(func = signal(SIGUSR1, _utmp_sig_rcv)) == -1)
-		fatalperror(net, "telnetd/signal");
-}
-
-	void
-utmp_sig_reset()
-{
-	(void) signal(SIGUSR1, func);	/* reset handler to default */
-}
-
-# ifdef __hpux
-# define sigoff() /* do nothing */
-# define sigon() /* do nothing */
-# endif
-
-	void
-utmp_sig_wait()
-{
-	/*
-	 * Wait for parent to write our utmp entry.
-	 */
-	sigoff();
-	while (caught == 0) {
-		pause();	/* wait until we get a signal (sigon) */
-		sigoff();	/* turn off signals while we check caught */
-	}
-	sigon();		/* turn on signals again */
-}
-
-	void
-utmp_sig_notify(pid)
-{
-	kill(pid, SIGUSR1);
-}
-
-# ifdef CRAY
-static int gotsigjob = 0;
-
-	/*ARGSUSED*/
-	void
-sigjob(sig)
-	int sig;
-{
-	register int jid;
-	register struct jobtemp *jp;
-
-	while ((jid = waitjob(NULL)) != -1) {
-		if (jid == 0) {
-			return;
-		}
-		gotsigjob++;
-		jobend(jid, NULL, NULL);
-	}
-}
-
-/*
- *	jid_getutid:
- *		called by jobend() before calling cleantmp()
- *		to find the correct $TMPDIR to cleanup.
- */
-
-	struct utmp *
-jid_getutid(jid)
-	int jid;
-{
-	struct utmp *cur = NULL;
-
-	setutent();	/* just to make sure */
-	while (cur = getutent()) {
-		if ( (cur->ut_type != NULL) && (jid == cur->ut_jid) ) {
-			return(cur);
-		}
-	}
-
-	return(0);
-}
-
-/*
- * Clean up the TMPDIR that login created.
- * The first time this is called we pick up the info
- * from the utmp.  If the job has already gone away,
- * then we'll clean up and be done.  If not, then
- * when this is called the second time it will wait
- * for the signal that the job is done.
- */
-	int
-cleantmp(wtp)
-	register struct utmp *wtp;
-{
-	struct utmp *utp;
-	static int first = 1;
-	register int mask, omask, ret;
-	extern struct utmp *getutid P((const struct utmp *_Id));
-
-
-	mask = sigmask(WJSIGNAL);
-
-	if (first == 0) {
-		omask = sigblock(mask);
-		while (gotsigjob == 0)
-			sigpause(omask);
-		return(1);
-	}
-	first = 0;
-	setutent();	/* just to make sure */
-
-	utp = getutid(wtp);
-	if (utp == 0) {
-		syslog(LOG_ERR, "can't get /etc/utmp entry to clean TMPDIR");
-		return(-1);
-	}
-	/*
-	 * Nothing to clean up if the user shell was never started.
-	 */
-	if (utp->ut_type != USER_PROCESS || utp->ut_jid == 0)
-		return(1);
-
-	/*
-	 * Block the WJSIGNAL while we are in jobend().
-	 */
-	omask = sigblock(mask);
-	ret = jobend(utp->ut_jid, utp->ut_tpath, utp->ut_user);
-	sigsetmask(omask);
-	return(ret);
-}
-
-	int
-jobend(jid, path, user)
-	register int jid;
-	register char *path;
-	register char *user;
-{
-	static int saved_jid = 0;
-	static int pty_saved_jid = 0;
-	static char saved_path[sizeof(wtmp.ut_tpath)+1];
-	static char saved_user[sizeof(wtmp.ut_user)+1];
-
-	/*
-	 * this little piece of code comes into play
-	 * only when ptyreconnect is used to reconnect
-	 * to an previous session.
-	 *
-	 * this is the only time when the
-	 * "saved_jid != jid" code is executed.
-	 */
-
-	if ( saved_jid && saved_jid != jid ) {
-		if (!path) {	/* called from signal handler */
-			pty_saved_jid = jid;
-		} else {
-			pty_saved_jid = saved_jid;
-		}
-	}
-
-	if (path) {
-		strncpy(saved_path, path, sizeof(wtmp.ut_tpath));
-		strncpy(saved_user, user, sizeof(wtmp.ut_user));
-		saved_path[sizeof(saved_path)] = '\0';
-		saved_user[sizeof(saved_user)] = '\0';
-	}
-	if (saved_jid == 0) {
-		saved_jid = jid;
-		return(0);
-	}
-
-	/* if the jid has changed, get the correct entry from the utmp file */
-
-	if ( saved_jid != jid ) {
-		struct utmp *utp = NULL;
-		struct utmp *jid_getutid();
-
-		utp = jid_getutid(pty_saved_jid);
-
-		if (utp == 0) {
-			syslog(LOG_ERR, "Can't get /etc/utmp entry to clean TMPDIR");
-			return(-1);
-		}
-
-		cleantmpdir(jid, utp->ut_tpath, utp->ut_user);
-		return(1);
-	}
-
-	cleantmpdir(jid, saved_path, saved_user);
-	return(1);
-}
-
-/*
- * Fork a child process to clean up the TMPDIR
- */
-cleantmpdir(jid, tpath, user)
-	register int jid;
-	register char *tpath;
-	register char *user;
-{
-	switch(fork()) {
-	case -1:
-		syslog(LOG_ERR, "TMPDIR cleanup(%s): fork() failed: %m",
-							tpath);
-		break;
-	case 0:
-		execl(CLEANTMPCMD, CLEANTMPCMD, user, tpath, 0);
-		syslog(LOG_ERR, "TMPDIR cleanup(%s): execl(%s) failed: %m",
-							tpath, CLEANTMPCMD);
-		exit(1);
-	default:
-		/*
-		 * Forget about child.  We will exit, and
-		 * /etc/init will pick it up.
-		 */
-		break;
-	}
-}
-# endif /* CRAY */
-#endif	/* defined(PARENT_DOES_UTMP) && !defined(NEWINIT) */
-
-/*
- * rmut()
- *
- * This is the function called by cleanup() to
- * remove the utmp entry for this person.
- */
-
-#ifdef	UTMPX
-	void
-rmut()
-{
-	register f;
-	int found = 0;
-	struct utmp *u, *utmp;
-	int nutmp;
-	struct stat statbf;
-
-	struct utmpx *utxp, utmpx;
-
-	/*
-	 * This updates the utmpx and utmp entries and make a wtmp/x entry
-	 */
-
-	SCPYN(utmpx.ut_line, line + sizeof("/dev/") - 1);
-	utxp = getutxline(&utmpx);
-	if (utxp) {
-		utxp->ut_type = DEAD_PROCESS;
-		utxp->ut_exit.e_termination = 0;
-		utxp->ut_exit.e_exit = 0;
-		(void) time(&utmpx.ut_tv.tv_sec);
-		utmpx.ut_tv.tv_usec = 0;
-		modutx(utxp);
-	}
-	endutxent();
-}  /* end of rmut */
-#endif
-
-#if	!defined(UTMPX) && !(defined(CRAY) || defined(__hpux)) && BSD <= 43
-	void
-rmut()
-{
-	register f;
-	int found = 0;
-	struct utmp *u, *utmp;
-	int nutmp;
-	struct stat statbf;
-
-	f = open(utmpf, O_RDWR);
-	if (f >= 0) {
-		(void) fstat(f, &statbf);
-		utmp = (struct utmp *)malloc((unsigned)statbf.st_size);
-		if (!utmp)
-			syslog(LOG_ERR, "utmp malloc failed");
-		if (statbf.st_size && utmp) {
-			nutmp = read(f, (char *)utmp, (int)statbf.st_size);
-			nutmp /= sizeof(struct utmp);
-
-			for (u = utmp ; u < &utmp[nutmp] ; u++) {
-				if (SCMPN(u->ut_line, line+5) ||
-				    u->ut_name[0]==0)
-					continue;
-				(void) lseek(f, ((long)u)-((long)utmp), L_SET);
-				SCPYN(u->ut_name, "");
-				SCPYN(u->ut_host, "");
-				(void) time(&u->ut_time);
-				(void) write(f, (char *)u, sizeof(wtmp));
-				found++;
-			}
-		}
-		(void) close(f);
-	}
-	if (found) {
-		f = open(wtmpf, O_WRONLY|O_APPEND);
-		if (f >= 0) {
-			SCPYN(wtmp.ut_line, line+5);
-			SCPYN(wtmp.ut_name, "");
-			SCPYN(wtmp.ut_host, "");
-			(void) time(&wtmp.ut_time);
-			(void) write(f, (char *)&wtmp, sizeof(wtmp));
-			(void) close(f);
-		}
-	}
-	(void) chmod(line, 0666);
-	(void) chown(line, 0, 0);
-	line[strlen("/dev/")] = 'p';
-	(void) chmod(line, 0666);
-	(void) chown(line, 0, 0);
-}  /* end of rmut */
-#endif	/* CRAY */
-
-#ifdef __hpux
-rmut (line)
-char *line;
-{
-	struct utmp utmp;
-	struct utmp *utptr;
-	int fd;			/* for /etc/wtmp */
-
-	utmp.ut_type = USER_PROCESS;
-	(void) strncpy(utmp.ut_id, line+12, sizeof(utmp.ut_id));
-	(void) setutent();
-	utptr = getutid(&utmp);
-	/* write it out only if it exists */
-	if (utptr) {
-		utptr->ut_type = DEAD_PROCESS;
-		utptr->ut_time = time((long *) 0);
-		(void) pututline(utptr);
-		/* set wtmp entry if wtmp file exists */
-		if ((fd = open(wtmpf, O_WRONLY | O_APPEND)) >= 0) {
-			(void) write(fd, utptr, sizeof(utmp));
-			(void) close(fd);
-		}
-	}
-	(void) endutent();
-
-	(void) chmod(line, 0666);
-	(void) chown(line, 0, 0);
-	line[14] = line[13];
-	line[13] = line[12];
-	line[8] = 'm';
-	line[9] = '/';
-	line[10] = 'p';
-	line[11] = 't';
-	line[12] = 'y';
-	(void) chmod(line, 0666);
-	(void) chown(line, 0, 0);
-}
-#endif
diff --git a/crypto/telnet/telnetd/telnetd.8 b/crypto/telnet/telnetd/telnetd.8
deleted file mode 100644
index e03f290daaa9..000000000000
--- a/crypto/telnet/telnetd/telnetd.8
+++ /dev/null
@@ -1,612 +0,0 @@
-.\" Copyright (c) 1983, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"	@(#)telnetd.8	8.4 (Berkeley) 6/1/94
-.\"
-.Dd June 1, 1994
-.Dt TELNETD 8
-.Os BSD 4.2
-.Sh NAME
-.Nm telnetd
-.Nd DARPA
-.Tn TELNET
-protocol server
-.Sh SYNOPSIS
-.Nm /usr/libexec/telnetd
-.Op Fl BUhlkns
-.Op Fl D Ar debugmode
-.Op Fl I Ns Ar initid
-.Op Fl S Ar tos
-.Op Fl X Ar authtype
-.Op Fl a Ar authmode
-.Op Fl edebug
-.Op Fl p Ar loginprog
-.Op Fl r Ns Ar lowpty-highpty
-.Op Fl u Ar len
-.Op Fl debug Op Ar port
-.Sh DESCRIPTION
-The
-.Nm
-command is a server which supports the
-.Tn DARPA
-standard
-.Tn TELNET
-virtual terminal protocol.
-.Nm Telnetd
-is normally invoked by the internet server (see
-.Xr inetd 8 )
-for requests to connect to the
-.Tn TELNET
-port as indicated by the
-.Pa /etc/services
-file (see
-.Xr services 5 ).
-The
-.Fl debug
-option may be used to start up
-.Nm
-manually, instead of through
-.Xr inetd 8 .
-If started up this way, 
-.Ar port
-may be specified to run
-.Nm
-on an alternate
-.Tn TCP
-port number.
-.Pp
-The
-.Nm
-command accepts the following options:
-.Bl -tag -width indent
-.It Fl a Ar authmode
-This option may be used for specifying what mode should
-be used for authentication.
-Note that this option is only useful if
-.Nm
-has been compiled with support for the
-.Dv AUTHENTICATION
-option.
-There are several valid values for
-.Ar authmode :
-.Bl -tag -width debug
-.It Cm debug
-Turn on authentication debugging code.
-.It Cm user
-Only allow connections when the remote user
-can provide valid authentication information
-to identify the remote user,
-and is allowed access to the specified account
-without providing a password.
-.It Cm valid
-Only allow connections when the remote user
-can provide valid authentication information
-to identify the remote user.
-The
-.Xr login 1
-command will provide any additional user verification
-needed if the remote user is not allowed automatic
-access to the specified account.
-.It Cm other
-Only allow connections that supply some authentication information.
-This option is currently not supported
-by any of the existing authentication mechanisms,
-and is thus the same as specifying
-.Fl a
-.Cm valid .
-.It Cm none
-This is the default state.
-Authentication information is not required.
-If no or insufficient authentication information
-is provided, then the
-.Xr login 1
-program will provide the necessary user
-verification.
-.It Cm off
-Disable the authentication code.
-All user verification will happen through the
-.Xr login 1
-program.
-.El
-.It Fl B
-Specify bftp server mode.  In this mode,
-.Nm
-causes login to start a
-.Xr bftp 1
-session rather than the user's
-normal shell.  In bftp daemon mode normal
-logins are not supported, and it must be used
-on a port other than the normal
-.Tn TELNET
-port.
-.It Fl D Ar debugmode
-This option may be used for debugging purposes.
-This allows
-.Nm
-to print out debugging information
-to the connection, allowing the user to see what
-.Nm
-is doing.
-There are several possible values for 
-.Ar debugmode :
-.Bl -tag -width exercise
-.It Cm options
-Print information about the negotiation of
-.Tn TELNET
-options.
-.It Cm report
-Print the 
-.Cm options
-information, plus some additional information
-about what processing is going on.
-.It Cm netdata
-Display the data stream received by
-.Nm Ns .
-.It Cm ptydata
-Display data written to the pty.
-.It Cm exercise
-Has not been implemented yet.
-.El
-.It Fl debug
-Enable debugging on each socket created by
-.Nm
-(see
-.Dv SO_DEBUG
-in
-.Xr socket 2 ) .
-.It Fl edebug
-If
-.Nm
-has been compiled with support for data encryption, then the
-.Fl edebug
-option may be used to enable encryption debugging code.
-.It Fl p Ar loginprog
-Specify an alternate
-.Xr login 1
-command to run to complete the login.  The alternate command must
-understand the same command arguments as the standard login.
-.It Fl h
-Disable the printing of host-specific information before
-login has been completed.
-.It Fl I Ar initid
-This option is only applicable to
-.Tn UNICOS
-systems prior to 7.0.
-It specifies the
-.Dv ID
-from
-.Pa /etc/inittab
-to use when init starts login sessions.  The default
-.Dv ID
-is
-.Dv fe.
-.It Fl k
-This option is only useful if
-.Nm
-has been compiled with both linemode and kludge linemode
-support.  If the
-.Fl k
-option is specified, then if the remote client does not
-support the
-.Dv LINEMODE
-option, then
-.Nm
-will operate in character at a time mode.
-It will still support kludge linemode, but will only
-go into kludge linemode if the remote client requests
-it.
-(This is done by the client sending
-.Dv DONT SUPPRESS-GO-AHEAD
-and
-.Dv DONT ECHO . )
-The
-.Fl k
-option is most useful when there are remote clients
-that do not support kludge linemode, but pass the heuristic
-(if they respond with
-.Dv WILL TIMING-MARK
-in response to a
-.Dv DO TIMING-MARK)
-for kludge linemode support.
-.It Fl l
-Specify line mode. Try to force clients to use line-
-at-a-time mode.
-If the
-.Dv LINEMODE
-option is not supported, it will go
-into kludge linemode.
-.It Fl n
-Disable
-.Dv TCP
-keep-alives.  Normally
-.Nm
-enables the
-.Tn TCP
-keep-alive mechanism to probe connections that
-have been idle for some period of time to determine
-if the client is still there, so that idle connections
-from machines that have crashed or can no longer
-be reached may be cleaned up.
-.It Fl r Ar lowpty-highpty
-This option is only enabled when
-.Nm
-is compiled for
-.Dv UNICOS.
-It specifies an inclusive range of pseudo-terminal devices to
-use.  If the system has sysconf variable
-.Dv _SC_CRAY_NPTY
-configured, the default pty search range is 0 to
-.Dv _SC_CRAY_NPTY;
-otherwise, the default range is 0 to 128.  Either
-.Ar lowpty
-or
-.Ar highpty
-may be omitted to allow changing
-either end of the search range.  If
-.Ar lowpty
-is omitted, the - character is still required so that
-.Nm
-can differentiate
-.Ar highpty
-from
-.Ar lowpty .
-.It Fl s
-This option is only enabled if
-.Nm
-is compiled with support for
-.Tn SecurID
-cards.
-It causes the
-.Fl s
-option to be passed on to
-.Xr login 1 ,
-and thus is only useful if
-.Xr login 1
-supports the
-.Fl s
-flag to indicate that only
-.Tn SecurID
-validated logins are allowed, and is
-usually useful for controlling remote logins
-from outside of a firewall.
-.It Fl S Ar tos
-.It Fl u Ar len
-This option is used to specify the size of the field
-in the
-.Dv utmp
-structure that holds the remote host name.
-If the resolved host name is longer than
-.Ar len ,
-the dotted decimal value will be used instead.
-This allows hosts with very long host names that
-overflow this field to still be uniquely identified.
-Specifying
-.Fl u0
-indicates that only dotted decimal addresses
-should be put into the
-.Pa utmp
-file.
-.ne 1i
-.It Fl U
-This option causes
-.Nm
-to refuse connections from addresses that
-cannot be mapped back into a symbolic name
-via the
-.Xr gethostbyaddr 3
-routine.
-.It Fl X Ar authtype
-This option is only valid if
-.Nm
-has been built with support for the authentication option.
-It disables the use of
-.Ar authtype
-authentication, and
-can be used to temporarily disable
-a specific authentication type without having to recompile
-.Nm Ns .
-.El
-.Pp
-.Nm Telnetd
-operates by allocating a pseudo-terminal device (see
-.Xr pty 4 )
-for a client, then creating a login process which has
-the slave side of the pseudo-terminal as 
-.Dv stdin ,
-.Dv stdout
-and
-.Dv stderr .
-.Nm Telnetd
-manipulates the master side of the pseudo-terminal,
-implementing the
-.Tn TELNET
-protocol and passing characters
-between the remote client and the login process.
-.Pp
-When a
-.Tn TELNET
-session is started up, 
-.Nm
-sends
-.Tn TELNET
-options to the client side indicating
-a willingness to do the
-following
-.Tn TELNET
-options, which are described in more detail below:
-.Bd -literal -offset indent
-DO AUTHENTICATION
-WILL ENCRYPT
-DO TERMINAL TYPE
-DO TSPEED
-DO XDISPLOC
-DO NEW-ENVIRON
-DO ENVIRON
-WILL SUPPRESS GO AHEAD
-DO ECHO
-DO LINEMODE
-DO NAWS
-WILL STATUS
-DO LFLOW
-DO TIMING-MARK
-.Ed
-.Pp
-The pseudo-terminal allocated to the client is configured
-to operate in \*(lqcooked\*(rq mode, and with
-.Dv XTABS and
-.Dv CRMOD
-enabled (see
-.Xr tty 4 ) .
-.Pp
-.Nm Telnetd
-has support for enabling locally the following
-.Tn TELNET
-options:
-.Bl -tag -width "DO AUTHENTICATION"
-.It "WILL ECHO"
-When the
-.Dv LINEMODE
-option is enabled, a
-.Dv WILL ECHO
-or
-.Dv WONT ECHO
-will be sent to the client to indicate the
-current state of terminal echoing.
-When terminal echo is not desired, a
-.Dv WILL ECHO
-is sent to indicate that
-.Nm
-will take care of echoing any data that needs to be
-echoed to the terminal, and then nothing is echoed.
-When terminal echo is desired, a
-.Dv WONT ECHO
-is sent to indicate that
-.Nm
-will not be doing any terminal echoing, so the
-client should do any terminal echoing that is needed.
-.It "WILL BINARY"
-Indicate that the client is willing to send a
-8 bits of data, rather than the normal 7 bits
-of the Network Virtual Terminal.
-.It "WILL SGA"
-Indicate that it will not be sending
-.Dv IAC GA,
-go ahead, commands.
-.It "WILL STATUS"
-Indicate a willingness to send the client, upon
-request, of the current status of all
-.Tn TELNET
-options.
-.It "WILL TIMING-MARK"
-Whenever a
-.Dv DO TIMING-MARK
-command is received, it is always responded
-to with a
-.Dv WILL TIMING-MARK
-.ne 1i
-.It "WILL LOGOUT"
-When a
-.Dv DO LOGOUT
-is received, a
-.Dv WILL LOGOUT
-is sent in response, and the
-.Tn TELNET
-session is shut down.
-.It "WILL ENCRYPT"
-Only sent if
-.Nm
-is compiled with support for data encryption, and
-indicates a willingness to decrypt
-the data stream.
-.El
-.Pp
-.Nm Telnetd
-has support for enabling remotely the following
-.Tn TELNET
-options:
-.Bl -tag -width "DO AUTHENTICATION"
-.It "DO BINARY"
-Sent to indicate that
-.Nm
-is willing to receive an 8 bit data stream.
-.It "DO LFLOW"
-Requests that the client handle flow control
-characters remotely.
-.It "DO ECHO"
-This is not really supported, but is sent to identify a 4.2BSD
-.Xr telnet 1
-client, which will improperly respond with
-.Dv WILL ECHO.
-If a
-.Dv WILL ECHO
-is received, a
-.Dv DONT ECHO
-will be sent in response.
-.It "DO TERMINAL-TYPE"
-Indicate a desire to be able to request the
-name of the type of terminal that is attached
-to the client side of the connection.
-.It "DO SGA"
-Indicate that it does not need to receive
-.Dv IAC GA,
-the go ahead command.
-.It "DO NAWS"
-Requests that the client inform the server when
-the window (display) size changes.
-.It "DO TERMINAL-SPEED"
-Indicate a desire to be able to request information
-about the speed of the serial line to which
-the client is attached.
-.It "DO XDISPLOC"
-Indicate a desire to be able to request the name
-of the X Window System display that is associated with
-the telnet client.
-.It "DO NEW-ENVIRON"
-Indicate a desire to be able to request environment
-variable information, as described in RFC 1572.
-.It "DO ENVIRON"
-Indicate a desire to be able to request environment
-variable information, as described in RFC 1408.
-.It "DO LINEMODE"
-Only sent if
-.Nm
-is compiled with support for linemode, and
-requests that the client do line by line processing.
-.It "DO TIMING-MARK"
-Only sent if
-.Nm
-is compiled with support for both linemode and
-kludge linemode, and the client responded with
-.Dv WONT LINEMODE.
-If the client responds with
-.Dv WILL TM,
-the it is assumed that the client supports
-kludge linemode.
-Note that the
-.Op Fl k
-option can be used to disable this.
-.It "DO AUTHENTICATION"
-Only sent if
-.Nm
-is compiled with support for authentication, and
-indicates a willingness to receive authentication
-information for automatic login.
-.It "DO ENCRYPT"
-Only sent if
-.Nm
-is compiled with support for data encryption, and
-indicates a willingness to decrypt
-the data stream.
-.Sh ENVIRONMENT
-.Sh FILES
-.Bl -tag -width /usr/ucb/bftp -compact
-.It Pa /etc/services
-.It Pa /etc/inittab
-(UNICOS systems only)
-.It Pa /etc/iptos
-(if supported)
-.It Pa /usr/ucb/bftp
-(if supported)
-.El
-.Sh "SEE ALSO"
-.Xr bftp 1 ,
-.Xr login 1 ,
-.Xr telnet 1
-(if supported)
-.Sh STANDARDS
-.Bl -tag -compact -width RFC-1572
-.It Cm RFC-854
-.Tn TELNET
-PROTOCOL SPECIFICATION
-.It Cm RFC-855
-TELNET OPTION SPECIFICATIONS
-.It Cm RFC-856
-TELNET BINARY TRANSMISSION
-.It Cm RFC-857
-TELNET ECHO OPTION
-.It Cm RFC-858
-TELNET SUPPRESS GO AHEAD OPTION
-.It Cm RFC-859
-TELNET STATUS OPTION
-.It Cm RFC-860
-TELNET TIMING MARK OPTION
-.It Cm RFC-861
-TELNET EXTENDED OPTIONS - LIST OPTION
-.It Cm RFC-885
-TELNET END OF RECORD OPTION
-.It Cm RFC-1073
-Telnet Window Size Option
-.It Cm RFC-1079
-Telnet Terminal Speed Option
-.It Cm RFC-1091
-Telnet Terminal-Type Option
-.It Cm RFC-1096
-Telnet X Display Location Option
-.It Cm RFC-1123
-Requirements for Internet Hosts -- Application and Support
-.It Cm RFC-1184
-Telnet Linemode Option
-.It Cm RFC-1372
-Telnet Remote Flow Control Option
-.It Cm RFC-1416
-Telnet Authentication Option
-.It Cm RFC-1411
-Telnet Authentication: Kerberos Version 4
-.It Cm RFC-1412
-Telnet Authentication: SPX
-.It Cm RFC-1571
-Telnet Environment Option Interoperability Issues
-.It Cm RFC-1572
-Telnet Environment Option
-.Sh BUGS
-Some
-.Tn TELNET
-commands are only partially implemented.
-.Pp
-Because of bugs in the original 4.2 BSD
-.Xr telnet 1 ,
-.Nm
-performs some dubious protocol exchanges to try to discover if the remote
-client is, in fact, a 4.2 BSD
-.Xr telnet 1 .
-.Pp
-Binary mode
-has no common interpretation except between similar operating systems
-(Unix in this case).
-.Pp
-The terminal type name received from the remote client is converted to
-lower case.
-.Pp
-.Nm Telnetd
-never sends
-.Tn TELNET
-.Dv IAC GA
-(go ahead) commands.
diff --git a/crypto/telnet/telnetd/telnetd.c b/crypto/telnet/telnetd/telnetd.c
deleted file mode 100644
index 57e6ed2a7a79..000000000000
--- a/crypto/telnet/telnetd/telnetd.c
+++ /dev/null
@@ -1,1614 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)telnetd.c	8.4 (Berkeley) 5/30/95";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
-
-#include "telnetd.h"
-#include "pathnames.h"
-
-#if	defined(_SC_CRAY_SECURE_SYS) && !defined(SCM_SECURITY)
-/*
- * UNICOS 6.0/6.1 do not have SCM_SECURITY defined, so we can
- * use it to tell us to turn off all the socket security code,
- * since that is only used in UNICOS 7.0 and later.
- */
-# undef _SC_CRAY_SECURE_SYS
-#endif
-
-#include <err.h>
-#include <arpa/inet.h>
-
-#include <libutil.h>
-#include <utmp.h>
-
-#if	defined(_SC_CRAY_SECURE_SYS)
-#include <sys/sysv.h>
-#include <sys/secdev.h>
-# ifdef SO_SEC_MULTI		/* 8.0 code */
-#include <sys/secparm.h>
-#include <sys/usrv.h>
-# endif /* SO_SEC_MULTI */
-int	secflag;
-char	tty_dev[16];
-struct	secdev dv;
-struct	sysv sysv;
-# ifdef SO_SEC_MULTI		/* 8.0 code */
-struct	socksec ss;
-# else /* SO_SEC_MULTI */	/* 7.0 code */
-struct	socket_security ss;
-# endif /* SO_SEC_MULTI */
-#endif	/* _SC_CRAY_SECURE_SYS */
-
-#if	defined(AUTHENTICATION)
-#include <libtelnet/auth.h>
-int	auth_level = 0;
-#endif
-#if	defined(ENCRYPTION)
-#include <libtelnet/encrypt.h>
-#endif
-#include <libtelnet/misc.h>
-#if	defined(SecurID)
-int	require_SecurID = 0;
-#endif
-
-char	remote_hostname[MAXHOSTNAMELEN];
-int	utmp_len = sizeof(remote_hostname) - 1;
-int	registerd_host_only = 0;
-
-#ifdef	STREAMSPTY
-# include <stropts.h>
-# include <termio.h>
-/* make sure we don't get the bsd version */
-# include "/usr/include/sys/tty.h"
-# include <sys/ptyvar.h>
-
-/*
- * Because of the way ptyibuf is used with streams messages, we need
- * ptyibuf+1 to be on a full-word boundary.  The following wierdness
- * is simply to make that happen.
- */
-long	ptyibufbuf[BUFSIZ/sizeof(long)+1];
-char	*ptyibuf = ((char *)&ptyibufbuf[1])-1;
-char	*ptyip = ((char *)&ptyibufbuf[1])-1;
-char	ptyibuf2[BUFSIZ];
-unsigned char ctlbuf[BUFSIZ];
-struct	strbuf strbufc, strbufd;
-
-#else	/* ! STREAMPTY */
-
-/*
- * I/O data buffers,
- * pointers, and counters.
- */
-char	ptyibuf[BUFSIZ], *ptyip = ptyibuf;
-char	ptyibuf2[BUFSIZ];
-
-# include <termcap.h>
-
-int readstream(int p, char *ibuf, int bufsize);
-void doit(struct sockaddr_in *who);
-int terminaltypeok(char *s);
-void startslave(char *host, int autologin, char *autoname);
-
-#endif /* ! STREAMPTY */
-
-int	hostinfo = 1;			/* do we print login banner? */
-
-#ifdef	CRAY
-extern int      newmap; /* nonzero if \n maps to ^M^J */
-int	lowpty = 0, highpty;	/* low, high pty numbers */
-#endif /* CRAY */
-
-int debug = 0;
-int keepalive = 1;
-char *altlogin;
-
-void doit __P((struct sockaddr_in *));
-int terminaltypeok __P((char *));
-void startslave __P((char *, int, char *));
-extern void usage P((void));
-
-/*
- * The string to pass to getopt().  We do it this way so
- * that only the actual options that we support will be
- * passed off to getopt().
- */
-char valid_opts[] = {
-	'd', ':', 'h', 'k', 'n', 'p', ':', 'S', ':', 'u', ':', 'U',
-#ifdef	AUTHENTICATION
-	'a', ':', 'X', ':',
-#endif
-#ifdef BFTPDAEMON
-	'B',
-#endif
-#ifdef DIAGNOSTICS
-	'D', ':',
-#endif
-#ifdef	ENCRYPTION
-	'e', ':',
-#endif
-#if	defined(CRAY) && defined(NEWINIT)
-	'I', ':',
-#endif
-#ifdef	LINEMODE
-	'l',
-#endif
-#ifdef CRAY
-	'r', ':',
-#endif
-#ifdef	SecurID
-	's',
-#endif
-	'\0'
-};
-
-	int
-main(argc, argv)
-	char *argv[];
-{
-	struct sockaddr_in from;
-	int on = 1, fromlen;
-	register int ch;
-#if	defined(IPPROTO_IP) && defined(IP_TOS)
-	int tos = -1;
-#endif
-
-	pfrontp = pbackp = ptyobuf;
-	netip = netibuf;
-	nfrontp = nbackp = netobuf;
-#ifdef	ENCRYPTION
-	nclearto = 0;
-#endif	/* ENCRYPTION */
-
-	/*
-	 * This initialization causes linemode to default to a configuration
-	 * that works on all telnet clients, including the FreeBSD client.
-	 * This is not quite the same as the telnet client issuing a "mode
-	 * character" command, but has most of the same benefits, and is
-	 * preferable since some clients (like usofts) don't have the
-	 * mode character command anyway and linemode breaks things.
-	 * The most notable symptom of fix is that csh "set filec" operations
-	 * like <ESC> (filename completion) and ^D (choices) keys now work
-	 * in telnet sessions and can be used more than once on the same line.
-	 * CR/LF handling is also corrected in some termio modes.  This 
-	 * change resolves problem reports bin/771 and bin/1037.
-	 */
-
-	linemode=1;	/*Default to mode that works on bulk of clients*/
-
-#ifdef CRAY
-	/*
-	 * Get number of pty's before trying to process options,
-	 * which may include changing pty range.
-	 */
-	highpty = getnpty();
-#endif /* CRAY */
-
-	while ((ch = getopt(argc, argv, valid_opts)) != -1) {
-		switch(ch) {
-
-#ifdef	AUTHENTICATION
-		case 'a':
-			/*
-			 * Check for required authentication level
-			 */
-			if (strcmp(optarg, "debug") == 0) {
-				extern int auth_debug_mode;
-				auth_debug_mode = 1;
-			} else if (strcasecmp(optarg, "none") == 0) {
-				auth_level = 0;
-			} else if (strcasecmp(optarg, "other") == 0) {
-				auth_level = AUTH_OTHER;
-			} else if (strcasecmp(optarg, "user") == 0) {
-				auth_level = AUTH_USER;
-			} else if (strcasecmp(optarg, "valid") == 0) {
-				auth_level = AUTH_VALID;
-			} else if (strcasecmp(optarg, "off") == 0) {
-				/*
-				 * This hack turns off authentication
-				 */
-				auth_level = -1;
-			} else {
-				warnx("unknown authorization level for -a");
-			}
-			break;
-#endif	/* AUTHENTICATION */
-
-#ifdef BFTPDAEMON
-		case 'B':
-			bftpd++;
-			break;
-#endif /* BFTPDAEMON */
-
-		case 'd':
-			if (strcmp(optarg, "ebug") == 0) {
-				debug++;
-				break;
-			}
-			usage();
-			/* NOTREACHED */
-			break;
-
-#ifdef DIAGNOSTICS
-		case 'D':
-			/*
-			 * Check for desired diagnostics capabilities.
-			 */
-			if (!strcmp(optarg, "report")) {
-				diagnostic |= TD_REPORT|TD_OPTIONS;
-			} else if (!strcmp(optarg, "exercise")) {
-				diagnostic |= TD_EXERCISE;
-			} else if (!strcmp(optarg, "netdata")) {
-				diagnostic |= TD_NETDATA;
-			} else if (!strcmp(optarg, "ptydata")) {
-				diagnostic |= TD_PTYDATA;
-			} else if (!strcmp(optarg, "options")) {
-				diagnostic |= TD_OPTIONS;
-			} else {
-				usage();
-				/* NOT REACHED */
-			}
-			break;
-#endif /* DIAGNOSTICS */
-
-#ifdef	ENCRYPTION
-		case 'e':
-			if (strcmp(optarg, "debug") == 0) {
-				extern int encrypt_debug_mode;
-				encrypt_debug_mode = 1;
-				break;
-			}
-			usage();
-			/* NOTREACHED */
-			break;
-#endif	/* ENCRYPTION */
-
-		case 'h':
-			hostinfo = 0;
-			break;
-
-#if	defined(CRAY) && defined(NEWINIT)
-		case 'I':
-		    {
-			extern char *gen_id;
-			gen_id = optarg;
-			break;
-		    }
-#endif	/* defined(CRAY) && defined(NEWINIT) */
-
-#ifdef	LINEMODE
-		case 'l':
-			alwayslinemode = 1;
-			break;
-#endif	/* LINEMODE */
-
-		case 'k':
-#if	defined(LINEMODE) && defined(KLUDGELINEMODE)
-			lmodetype = NO_AUTOKLUDGE;
-#else
-			/* ignore -k option if built without kludge linemode */
-#endif	/* defined(LINEMODE) && defined(KLUDGELINEMODE) */
-			break;
-
-		case 'n':
-			keepalive = 0;
-			break;
-
-		case 'p':
-			altlogin = optarg;
-			break;
-
-#ifdef CRAY
-		case 'r':
-		    {
-			char *strchr();
-			char *c;
-
-			/*
-			 * Allow the specification of alterations
-			 * to the pty search range.  It is legal to
-			 * specify only one, and not change the
-			 * other from its default.
-			 */
-			c = strchr(optarg, '-');
-			if (c) {
-				*c++ = '\0';
-				highpty = atoi(c);
-			}
-			if (*optarg != '\0')
-				lowpty = atoi(optarg);
-			if ((lowpty > highpty) || (lowpty < 0) ||
-							(highpty > 32767)) {
-				usage();
-				/* NOT REACHED */
-			}
-			break;
-		    }
-#endif	/* CRAY */
-
-#ifdef	SecurID
-		case 's':
-			/* SecurID required */
-			require_SecurID = 1;
-			break;
-#endif	/* SecurID */
-		case 'S':
-#ifdef	HAS_GETTOS
-			if ((tos = parsetos(optarg, "tcp")) < 0)
-				warnx("%s%s%s",
-					"bad TOS argument '", optarg,
-					"'; will try to use default TOS");
-#else
-			warnx("TOS option unavailable; -S flag not supported");
-#endif
-			break;
-
-		case 'u':
-			utmp_len = atoi(optarg);
-			if (utmp_len < 0)
-				utmp_len = -utmp_len;
-			if (utmp_len >= sizeof(remote_hostname))
-				utmp_len = sizeof(remote_hostname) - 1;
-			break;
-
-		case 'U':
-			registerd_host_only = 1;
-			break;
-
-#ifdef	AUTHENTICATION
-		case 'X':
-			/*
-			 * Check for invalid authentication types
-			 */
-			auth_disable_name(optarg);
-			break;
-#endif	/* AUTHENTICATION */
-
-		default:
-			warnx("%c: unknown option", ch);
-			/* FALLTHROUGH */
-		case '?':
-			usage();
-			/* NOTREACHED */
-		}
-	}
-
-	argc -= optind;
-	argv += optind;
-
-	if (debug) {
-	    int s, ns, foo;
-	    struct servent *sp;
-	    static struct sockaddr_in sin = { AF_INET };
-
-	    if (argc > 1) {
-		usage();
-		/* NOT REACHED */
-	    } else if (argc == 1) {
-		    if ((sp = getservbyname(*argv, "tcp"))) {
-			sin.sin_port = sp->s_port;
-		    } else {
-			sin.sin_port = atoi(*argv);
-			if ((int)sin.sin_port <= 0) {
-			    warnx("%s: bad port #", *argv);
-			    usage();
-			    /* NOT REACHED */
-			}
-			sin.sin_port = htons((u_short)sin.sin_port);
-		   }
-	    } else {
-		sp = getservbyname("telnet", "tcp");
-		if (sp == 0)
-		    errx(1, "tcp/telnet: unknown service");
-		sin.sin_port = sp->s_port;
-	    }
-
-	    s = socket(AF_INET, SOCK_STREAM, 0);
-	    if (s < 0)
-		    err(1, "socket");
-	    (void) setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
-				(char *)&on, sizeof(on));
-	    if (bind(s, (struct sockaddr *)&sin, sizeof sin) < 0)
-		err(1, "bind");
-	    if (listen(s, 1) < 0)
-		err(1, "listen");
-	    foo = sizeof sin;
-	    ns = accept(s, (struct sockaddr *)&sin, &foo);
-	    if (ns < 0)
-		err(1, "accept");
-	    (void) dup2(ns, 0);
-	    (void) close(ns);
-	    (void) close(s);
-#ifdef convex
-	} else if (argc == 1) {
-		; /* VOID*/		/* Just ignore the host/port name */
-#endif
-	} else if (argc > 0) {
-		usage();
-		/* NOT REACHED */
-	}
-
-#if	defined(_SC_CRAY_SECURE_SYS)
-	secflag = sysconf(_SC_CRAY_SECURE_SYS);
-
-	/*
-	 *	Get socket's security label
-	 */
-	if (secflag)  {
-		int szss = sizeof(ss);
-#ifdef SO_SEC_MULTI			/* 8.0 code */
-		int sock_multi;
-		int szi = sizeof(int);
-#endif /* SO_SEC_MULTI */
-
-		memset((char *)&dv, 0, sizeof(dv));
-
-		if (getsysv(&sysv, sizeof(struct sysv)) != 0)
-			err(1, "getsysv");
-
-		/*
-		 *	Get socket security label and set device values
-		 *	   {security label to be set on ttyp device}
-		 */
-#ifdef SO_SEC_MULTI			/* 8.0 code */
-		if ((getsockopt(0, SOL_SOCKET, SO_SECURITY,
-			       (char *)&ss, &szss) < 0) ||
-		    (getsockopt(0, SOL_SOCKET, SO_SEC_MULTI,
-				(char *)&sock_multi, &szi) < 0)) {
-			err(1, "getsockopt");
-		} else {
-			dv.dv_actlvl = ss.ss_actlabel.lt_level;
-			dv.dv_actcmp = ss.ss_actlabel.lt_compart;
-			if (!sock_multi) {
-				dv.dv_minlvl = dv.dv_maxlvl = dv.dv_actlvl;
-				dv.dv_valcmp = dv.dv_actcmp;
-			} else {
-				dv.dv_minlvl = ss.ss_minlabel.lt_level;
-				dv.dv_maxlvl = ss.ss_maxlabel.lt_level;
-				dv.dv_valcmp = ss.ss_maxlabel.lt_compart;
-			}
-			dv.dv_devflg = 0;
-		}
-#else /* SO_SEC_MULTI */		/* 7.0 code */
-		if (getsockopt(0, SOL_SOCKET, SO_SECURITY,
-				(char *)&ss, &szss) >= 0) {
-			dv.dv_actlvl = ss.ss_slevel;
-			dv.dv_actcmp = ss.ss_compart;
-			dv.dv_minlvl = ss.ss_minlvl;
-			dv.dv_maxlvl = ss.ss_maxlvl;
-			dv.dv_valcmp = ss.ss_maxcmp;
-		}
-#endif /* SO_SEC_MULTI */
-	}
-#endif	/* _SC_CRAY_SECURE_SYS */
-
-	openlog("telnetd", LOG_PID | LOG_ODELAY, LOG_DAEMON);
-	fromlen = sizeof (from);
-	if (getpeername(0, (struct sockaddr *)&from, &fromlen) < 0) {
-		warn("getpeername");
-		_exit(1);
-	}
-	if (keepalive &&
-	    setsockopt(0, SOL_SOCKET, SO_KEEPALIVE,
-			(char *)&on, sizeof (on)) < 0) {
-		syslog(LOG_WARNING, "setsockopt (SO_KEEPALIVE): %m");
-	}
-
-#if	defined(IPPROTO_IP) && defined(IP_TOS)
-	{
-# if	defined(HAS_GETTOS)
-		struct tosent *tp;
-		if (tos < 0 && (tp = gettosbyname("telnet", "tcp")))
-			tos = tp->t_tos;
-# endif
-		if (tos < 0)
-			tos = 020;	/* Low Delay bit */
-		if (tos
-		   && (setsockopt(0, IPPROTO_IP, IP_TOS,
-				  (char *)&tos, sizeof(tos)) < 0)
-		   && (errno != ENOPROTOOPT) )
-			syslog(LOG_WARNING, "setsockopt (IP_TOS): %m");
-	}
-#endif	/* defined(IPPROTO_IP) && defined(IP_TOS) */
-	net = 0;
-	doit(&from);
-	/* NOTREACHED */
-	return(0);
-}  /* end of main */
-
-	void
-usage()
-{
-	fprintf(stderr, "usage: telnetd");
-#ifdef	AUTHENTICATION
-	fprintf(stderr, " [-a (debug|other|user|valid|off|none)]\n\t");
-#endif
-#ifdef BFTPDAEMON
-	fprintf(stderr, " [-B]");
-#endif
-	fprintf(stderr, " [-debug]");
-#ifdef DIAGNOSTICS
-	fprintf(stderr, " [-D (options|report|exercise|netdata|ptydata)]\n\t");
-#endif
-#ifdef	AUTHENTICATION
-	fprintf(stderr, " [-edebug]");
-#endif
-	fprintf(stderr, " [-h]");
-#if	defined(CRAY) && defined(NEWINIT)
-	fprintf(stderr, " [-Iinitid]");
-#endif
-#if	defined(LINEMODE) && defined(KLUDGELINEMODE)
-	fprintf(stderr, " [-k]");
-#endif
-#ifdef LINEMODE
-	fprintf(stderr, " [-l]");
-#endif
-	fprintf(stderr, " [-n]");
-#ifdef	CRAY
-	fprintf(stderr, " [-r[lowpty]-[highpty]]");
-#endif
-	fprintf(stderr, "\n\t");
-#ifdef	SecurID
-	fprintf(stderr, " [-s]");
-#endif
-#ifdef	HAS_GETTOS
-	fprintf(stderr, " [-S tos]");
-#endif
-#ifdef	AUTHENTICATION
-	fprintf(stderr, " [-X auth-type]");
-#endif
-	fprintf(stderr, " [-u utmp_hostname_length] [-U]");
-	fprintf(stderr, " [port]\n");
-	exit(1);
-}
-
-/*
- * getterminaltype
- *
- *	Ask the other end to send along its terminal type and speed.
- * Output is the variable terminaltype filled in.
- */
-static unsigned char ttytype_sbbuf[] = {
-	IAC, SB, TELOPT_TTYPE, TELQUAL_SEND, IAC, SE
-};
-
-    int
-getterminaltype(name)
-    char *name;
-{
-    int retval = -1;
-    void _gettermname();
-
-    settimer(baseline);
-#if	defined(AUTHENTICATION)
-    /*
-     * Handle the Authentication option before we do anything else.
-     */
-    send_do(TELOPT_AUTHENTICATION, 1);
-    while (his_will_wont_is_changing(TELOPT_AUTHENTICATION))
-	ttloop();
-    if (his_state_is_will(TELOPT_AUTHENTICATION)) {
-	retval = auth_wait(name);
-    }
-#endif
-
-#ifdef	ENCRYPTION
-    send_will(TELOPT_ENCRYPT, 1);
-#endif	/* ENCRYPTION */
-    send_do(TELOPT_TTYPE, 1);
-    send_do(TELOPT_TSPEED, 1);
-    send_do(TELOPT_XDISPLOC, 1);
-    send_do(TELOPT_NEW_ENVIRON, 1);
-    send_do(TELOPT_OLD_ENVIRON, 1);
-    while (
-#ifdef	ENCRYPTION
-	   his_do_dont_is_changing(TELOPT_ENCRYPT) ||
-#endif	/* ENCRYPTION */
-	   his_will_wont_is_changing(TELOPT_TTYPE) ||
-	   his_will_wont_is_changing(TELOPT_TSPEED) ||
-	   his_will_wont_is_changing(TELOPT_XDISPLOC) ||
-	   his_will_wont_is_changing(TELOPT_NEW_ENVIRON) ||
-	   his_will_wont_is_changing(TELOPT_OLD_ENVIRON)) {
-	ttloop();
-    }
-#ifdef	ENCRYPTION
-    /*
-     * Wait for the negotiation of what type of encryption we can
-     * send with.  If autoencrypt is not set, this will just return.
-     */
-    if (his_state_is_will(TELOPT_ENCRYPT)) {
-	encrypt_wait();
-    }
-#endif	/* ENCRYPTION */
-    if (his_state_is_will(TELOPT_TSPEED)) {
-	static unsigned char sb[] =
-			{ IAC, SB, TELOPT_TSPEED, TELQUAL_SEND, IAC, SE };
-
-	memmove(nfrontp, sb, sizeof sb);
-	nfrontp += sizeof sb;
-	DIAG(TD_OPTIONS, printsub('>', sb + 2, sizeof sb - 2););
-    }
-    if (his_state_is_will(TELOPT_XDISPLOC)) {
-	static unsigned char sb[] =
-			{ IAC, SB, TELOPT_XDISPLOC, TELQUAL_SEND, IAC, SE };
-
-	memmove(nfrontp, sb, sizeof sb);
-	nfrontp += sizeof sb;
-	DIAG(TD_OPTIONS, printsub('>', sb + 2, sizeof sb - 2););
-    }
-    if (his_state_is_will(TELOPT_NEW_ENVIRON)) {
-	static unsigned char sb[] =
-			{ IAC, SB, TELOPT_NEW_ENVIRON, TELQUAL_SEND, IAC, SE };
-
-	memmove(nfrontp, sb, sizeof sb);
-	nfrontp += sizeof sb;
-	DIAG(TD_OPTIONS, printsub('>', sb + 2, sizeof sb - 2););
-    }
-    else if (his_state_is_will(TELOPT_OLD_ENVIRON)) {
-	static unsigned char sb[] =
-			{ IAC, SB, TELOPT_OLD_ENVIRON, TELQUAL_SEND, IAC, SE };
-
-	memmove(nfrontp, sb, sizeof sb);
-	nfrontp += sizeof sb;
-	DIAG(TD_OPTIONS, printsub('>', sb + 2, sizeof sb - 2););
-    }
-    if (his_state_is_will(TELOPT_TTYPE)) {
-
-	memmove(nfrontp, ttytype_sbbuf, sizeof ttytype_sbbuf);
-	nfrontp += sizeof ttytype_sbbuf;
-	DIAG(TD_OPTIONS, printsub('>', ttytype_sbbuf + 2,
-					sizeof ttytype_sbbuf - 2););
-    }
-    if (his_state_is_will(TELOPT_TSPEED)) {
-	while (sequenceIs(tspeedsubopt, baseline))
-	    ttloop();
-    }
-    if (his_state_is_will(TELOPT_XDISPLOC)) {
-	while (sequenceIs(xdisplocsubopt, baseline))
-	    ttloop();
-    }
-    if (his_state_is_will(TELOPT_NEW_ENVIRON)) {
-	while (sequenceIs(environsubopt, baseline))
-	    ttloop();
-    }
-    if (his_state_is_will(TELOPT_OLD_ENVIRON)) {
-	while (sequenceIs(oenvironsubopt, baseline))
-	    ttloop();
-    }
-    if (his_state_is_will(TELOPT_TTYPE)) {
-	char first[256], last[256];
-
-	while (sequenceIs(ttypesubopt, baseline))
-	    ttloop();
-
-	/*
-	 * If the other side has already disabled the option, then
-	 * we have to just go with what we (might) have already gotten.
-	 */
-	if (his_state_is_will(TELOPT_TTYPE) && !terminaltypeok(terminaltype)) {
-	    (void) strncpy(first, terminaltype, sizeof(first)-1);
-	    first[sizeof(first)-1] = '\0';
-	    for(;;) {
-		/*
-		 * Save the unknown name, and request the next name.
-		 */
-		(void) strncpy(last, terminaltype, sizeof(last)-1);
-		last[sizeof(last)-1] = '\0';
-		_gettermname();
-		if (terminaltypeok(terminaltype))
-		    break;
-		if ((strncmp(last, terminaltype, sizeof(last)) == 0) ||
-		    his_state_is_wont(TELOPT_TTYPE)) {
-		    /*
-		     * We've hit the end.  If this is the same as
-		     * the first name, just go with it.
-		     */
-		    if (strncmp(first, terminaltype, sizeof(first)) == 0)
-			break;
-		    /*
-		     * Get the terminal name one more time, so that
-		     * RFC1091 compliant telnets will cycle back to
-		     * the start of the list.
-		     */
-		     _gettermname();
-		    if (strncmp(first, terminaltype, sizeof(first)) != 0) {
-			(void) strncpy(terminaltype, first, sizeof(terminaltype)-1);
-			terminaltype[sizeof(terminaltype)-1] = '\0';
-		    }
-		    break;
-		}
-	    }
-	}
-    }
-    return(retval);
-}  /* end of getterminaltype */
-
-    void
-_gettermname()
-{
-    /*
-     * If the client turned off the option,
-     * we can't send another request, so we
-     * just return.
-     */
-    if (his_state_is_wont(TELOPT_TTYPE))
-	return;
-    settimer(baseline);
-    memmove(nfrontp, ttytype_sbbuf, sizeof ttytype_sbbuf);
-    nfrontp += sizeof ttytype_sbbuf;
-    DIAG(TD_OPTIONS, printsub('>', ttytype_sbbuf + 2,
-					sizeof ttytype_sbbuf - 2););
-    while (sequenceIs(ttypesubopt, baseline))
-	ttloop();
-}
-
-    int
-terminaltypeok(s)
-    char *s;
-{
-    char buf[1024];
-
-    if (terminaltype == NULL)
-	return(1);
-
-    /*
-     * tgetent() will return 1 if the type is known, and
-     * 0 if it is not known.  If it returns -1, it couldn't
-     * open the database.  But if we can't open the database,
-     * it won't help to say we failed, because we won't be
-     * able to verify anything else.  So, we treat -1 like 1.
-     */
-    if (tgetent(buf, s) == 0)
-	return(0);
-    return(1);
-}
-
-#ifndef	MAXHOSTNAMELEN
-#define	MAXHOSTNAMELEN 64
-#endif	/* MAXHOSTNAMELEN */
-
-char *hostname;
-char host_name[MAXHOSTNAMELEN];
-
-extern void telnet P((int, int, char *));
-
-int level;
-char user_name[256];
-/*
- * Get a pty, scan input lines.
- */
-	void
-doit(who)
-	struct sockaddr_in *who;
-{
-	int ptynum;
-
-	/*
-	 * Find an available pty to use.
-	 */
-#ifndef	convex
-	pty = getpty(&ptynum);
-	if (pty < 0)
-		fatal(net, "All network ports in use");
-#else
-	for (;;) {
-		char *lp;
-		extern char *line, *getpty();
-
-		if ((lp = getpty()) == NULL)
-			fatal(net, "Out of ptys");
-
-		if ((pty = open(lp, 2)) >= 0) {
-			strcpy(line,lp);
-			line[5] = 't';
-			break;
-		}
-	}
-#endif
-
-#if	defined(_SC_CRAY_SECURE_SYS)
-	/*
-	 *	set ttyp line security label
-	 */
-	if (secflag) {
-		char slave_dev[16];
-
-		sprintf(tty_dev, "/dev/pty/%03d", ptynum);
-		if (setdevs(tty_dev, &dv) < 0)
-		 	fatal(net, "cannot set pty security");
-		sprintf(slave_dev, "/dev/ttyp%03d", ptynum);
-		if (setdevs(slave_dev, &dv) < 0)
-		 	fatal(net, "cannot set tty security");
-	}
-#endif	/* _SC_CRAY_SECURE_SYS */
-
-	/* get name of connected client */
-	if (realhostname(remote_hostname, sizeof(remote_hostname) - 1,
-	    &who->sin_addr) == HOSTNAME_INVALIDADDR && registerd_host_only)
-		fatal(net, "Couldn't resolve your address into a host name.\r\n\
-	 Please contact your net administrator");
-	remote_hostname[sizeof(remote_hostname) - 1] = '\0';
-
-	trimdomain(remote_hostname, UT_HOSTSIZE);
-	if (!isdigit(remote_hostname[0]) && strlen(remote_hostname) > utmp_len)
-		strncpy(remote_hostname, inet_ntoa(who->sin_addr),
-			sizeof(remote_hostname) - 1);
-
-	(void) gethostname(host_name, sizeof(host_name) - 1);
-	host_name[sizeof(host_name) - 1] = '\0';
-	hostname = host_name;
-
-#if	defined(AUTHENTICATION) || defined(ENCRYPTION)
-	auth_encrypt_init(hostname, remote_hostname, "TELNETD", 1);
-#endif
-
-	init_env();
-	/*
-	 * get terminal type.
-	 */
-	*user_name = 0;
-	level = getterminaltype(user_name);
-	setenv("TERM", terminaltype ? terminaltype : "network", 1);
-
-#if	defined(_SC_CRAY_SECURE_SYS)
-	if (secflag) {
-		if (setulvl(dv.dv_actlvl) < 0)
-			fatal(net,"cannot setulvl()");
-		if (setucmp(dv.dv_actcmp) < 0)
-			fatal(net, "cannot setucmp()");
-	}
-#endif	/* _SC_CRAY_SECURE_SYS */
-
-	telnet(net, pty, remote_hostname);	/* begin server process */
-
-	/*NOTREACHED*/
-}  /* end of doit */
-
-#if	defined(CRAY2) && defined(UNICOS5) && defined(UNICOS50)
-	int
-Xterm_output(ibufp, obuf, icountp, ocount)
-	char **ibufp, *obuf;
-	int *icountp, ocount;
-{
-	int ret;
-	ret = term_output(*ibufp, obuf, *icountp, ocount);
-	*ibufp += *icountp;
-	*icountp = 0;
-	return(ret);
-}
-#define	term_output	Xterm_output
-#endif	/* defined(CRAY2) && defined(UNICOS5) && defined(UNICOS50) */
-
-/*
- * Main loop.  Select from pty and network, and
- * hand data to telnet receiver finite state machine.
- */
-	void
-telnet(f, p, host)
-	int f, p;
-	char *host;
-{
-	int on = 1;
-#define	TABBUFSIZ	512
-	char	defent[TABBUFSIZ];
-	char	defstrs[TABBUFSIZ];
-#undef	TABBUFSIZ
-	char *HE;
-	char *HN;
-	char *IM;
-	void netflush();
-	int nfd;
-
-	/*
-	 * Initialize the slc mapping table.
-	 */
-	get_slc_defaults();
-
-	/*
-	 * Do some tests where it is desireable to wait for a response.
-	 * Rather than doing them slowly, one at a time, do them all
-	 * at once.
-	 */
-	if (my_state_is_wont(TELOPT_SGA))
-		send_will(TELOPT_SGA, 1);
-	/*
-	 * Is the client side a 4.2 (NOT 4.3) system?  We need to know this
-	 * because 4.2 clients are unable to deal with TCP urgent data.
-	 *
-	 * To find out, we send out a "DO ECHO".  If the remote system
-	 * answers "WILL ECHO" it is probably a 4.2 client, and we note
-	 * that fact ("WILL ECHO" ==> that the client will echo what
-	 * WE, the server, sends it; it does NOT mean that the client will
-	 * echo the terminal input).
-	 */
-	send_do(TELOPT_ECHO, 1);
-
-#ifdef	LINEMODE
-	if (his_state_is_wont(TELOPT_LINEMODE)) {
-		/* Query the peer for linemode support by trying to negotiate
-		 * the linemode option.
-		 */
-		linemode = 0;
-		editmode = 0;
-		send_do(TELOPT_LINEMODE, 1);  /* send do linemode */
-	}
-#endif	/* LINEMODE */
-
-	/*
-	 * Send along a couple of other options that we wish to negotiate.
-	 */
-	send_do(TELOPT_NAWS, 1);
-	send_will(TELOPT_STATUS, 1);
-	flowmode = 1;		/* default flow control state */
-	restartany = -1;	/* uninitialized... */
-	send_do(TELOPT_LFLOW, 1);
-
-	/*
-	 * Spin, waiting for a response from the DO ECHO.  However,
-	 * some REALLY DUMB telnets out there might not respond
-	 * to the DO ECHO.  So, we spin looking for NAWS, (most dumb
-	 * telnets so far seem to respond with WONT for a DO that
-	 * they don't understand...) because by the time we get the
-	 * response, it will already have processed the DO ECHO.
-	 * Kludge upon kludge.
-	 */
-	while (his_will_wont_is_changing(TELOPT_NAWS))
-		ttloop();
-
-	/*
-	 * But...
-	 * The client might have sent a WILL NAWS as part of its
-	 * startup code; if so, we'll be here before we get the
-	 * response to the DO ECHO.  We'll make the assumption
-	 * that any implementation that understands about NAWS
-	 * is a modern enough implementation that it will respond
-	 * to our DO ECHO request; hence we'll do another spin
-	 * waiting for the ECHO option to settle down, which is
-	 * what we wanted to do in the first place...
-	 */
-	if (his_want_state_is_will(TELOPT_ECHO) &&
-	    his_state_is_will(TELOPT_NAWS)) {
-		while (his_will_wont_is_changing(TELOPT_ECHO))
-			ttloop();
-	}
-	/*
-	 * On the off chance that the telnet client is broken and does not
-	 * respond to the DO ECHO we sent, (after all, we did send the
-	 * DO NAWS negotiation after the DO ECHO, and we won't get here
-	 * until a response to the DO NAWS comes back) simulate the
-	 * receipt of a will echo.  This will also send a WONT ECHO
-	 * to the client, since we assume that the client failed to
-	 * respond because it believes that it is already in DO ECHO
-	 * mode, which we do not want.
-	 */
-	if (his_want_state_is_will(TELOPT_ECHO)) {
-		DIAG(TD_OPTIONS,
-			{sprintf(nfrontp, "td: simulating recv\r\n");
-			 nfrontp += strlen(nfrontp);});
-		willoption(TELOPT_ECHO);
-	}
-
-	/*
-	 * Finally, to clean things up, we turn on our echo.  This
-	 * will break stupid 4.2 telnets out of local terminal echo.
-	 */
-
-	if (my_state_is_wont(TELOPT_ECHO))
-		send_will(TELOPT_ECHO, 1);
-
-#ifndef	STREAMSPTY
-	/*
-	 * Turn on packet mode
-	 */
-	(void) ioctl(p, TIOCPKT, (char *)&on);
-#endif
-
-#if	defined(LINEMODE) && defined(KLUDGELINEMODE)
-	/*
-	 * Continuing line mode support.  If client does not support
-	 * real linemode, attempt to negotiate kludge linemode by sending
-	 * the do timing mark sequence.
-	 */
-	if (lmodetype < REAL_LINEMODE)
-		send_do(TELOPT_TM, 1);
-#endif	/* defined(LINEMODE) && defined(KLUDGELINEMODE) */
-
-	/*
-	 * Call telrcv() once to pick up anything received during
-	 * terminal type negotiation, 4.2/4.3 determination, and
-	 * linemode negotiation.
-	 */
-	telrcv();
-
-	(void) ioctl(f, FIONBIO, (char *)&on);
-	(void) ioctl(p, FIONBIO, (char *)&on);
-#if	defined(CRAY2) && defined(UNICOS5)
-	init_termdriver(f, p, interrupt, sendbrk);
-#endif
-
-#if	defined(SO_OOBINLINE)
-	(void) setsockopt(net, SOL_SOCKET, SO_OOBINLINE,
-				(char *)&on, sizeof on);
-#endif	/* defined(SO_OOBINLINE) */
-
-#ifdef	SIGTSTP
-	(void) signal(SIGTSTP, SIG_IGN);
-#endif
-#ifdef	SIGTTOU
-	/*
-	 * Ignoring SIGTTOU keeps the kernel from blocking us
-	 * in ttioct() in /sys/tty.c.
-	 */
-	(void) signal(SIGTTOU, SIG_IGN);
-#endif
-
-	(void) signal(SIGCHLD, cleanup);
-
-#if	defined(CRAY2) && defined(UNICOS5)
-	/*
-	 * Cray-2 will send a signal when pty modes are changed by slave
-	 * side.  Set up signal handler now.
-	 */
-	if ((int)signal(SIGUSR1, termstat) < 0)
-		warn("signal");
-	else if (ioctl(p, TCSIGME, (char *)SIGUSR1) < 0)
-		warn("ioctl:TCSIGME");
-	/*
-	 * Make processing loop check terminal characteristics early on.
-	 */
-	termstat();
-#endif
-
-#ifdef  TIOCNOTTY
-	{
-		register int t;
-		t = open(_PATH_TTY, O_RDWR);
-		if (t >= 0) {
-			(void) ioctl(t, TIOCNOTTY, (char *)0);
-			(void) close(t);
-		}
-	}
-#endif
-
-#if	defined(CRAY) && defined(NEWINIT) && defined(TIOCSCTTY)
-	(void) setsid();
-	ioctl(p, TIOCSCTTY, 0);
-#endif
-
-	/*
-	 * Show banner that getty never gave.
-	 *
-	 * We put the banner in the pty input buffer.  This way, it
-	 * gets carriage return null processing, etc., just like all
-	 * other pty --> client data.
-	 */
-
-#if	!defined(CRAY) || !defined(NEWINIT)
-	if (getenv("USER"))
-		hostinfo = 0;
-#endif
-
-	if (getent(defent, "default") == 1) {
-		char *Getstr();
-		char *cp=defstrs;
-
-		HE = Getstr("he", &cp);
-		HN = Getstr("hn", &cp);
-		IM = Getstr("im", &cp);
-		if (HN && *HN)
-			(void) strcpy(host_name, HN);
-		if (IM == 0)
-			IM = "";
-	} else {
-		IM = DEFAULT_IM;
-		HE = 0;
-	}
-	edithost(HE, host_name);
-	if (hostinfo && *IM)
-		putf(IM, ptyibuf2);
-
-	if (pcc)
-		(void) strncat(ptyibuf2, ptyip, pcc+1);
-	ptyip = ptyibuf2;
-	pcc = strlen(ptyip);
-#ifdef	LINEMODE
-	/*
-	 * Last check to make sure all our states are correct.
-	 */
-	init_termbuf();
-	localstat();
-#endif	/* LINEMODE */
-
-	DIAG(TD_REPORT,
-		{sprintf(nfrontp, "td: Entering processing loop\r\n");
-		 nfrontp += strlen(nfrontp);});
-
-	/*
-	 * Startup the login process on the slave side of the terminal
-	 * now.  We delay this until here to insure option negotiation
-	 * is complete.
-	 */
-	startslave(host, level, user_name);
-
-	nfd = ((f > p) ? f : p) + 1;
-	for (;;) {
-		fd_set ibits, obits, xbits;
-		register int c;
-
-		if (ncc < 0 && pcc < 0)
-			break;
-
-#if	defined(CRAY2) && defined(UNICOS5)
-		if (needtermstat)
-			_termstat();
-#endif	/* defined(CRAY2) && defined(UNICOS5) */
-		FD_ZERO(&ibits);
-		FD_ZERO(&obits);
-		FD_ZERO(&xbits);
-		/*
-		 * Never look for input if there's still
-		 * stuff in the corresponding output buffer
-		 */
-		if (nfrontp - nbackp || pcc > 0) {
-			FD_SET(f, &obits);
-		} else {
-			FD_SET(p, &ibits);
-		}
-		if (pfrontp - pbackp || ncc > 0) {
-			FD_SET(p, &obits);
-		} else {
-			FD_SET(f, &ibits);
-		}
-		if (!SYNCHing) {
-			FD_SET(f, &xbits);
-		}
-		if ((c = select(nfd, &ibits, &obits, &xbits,
-						(struct timeval *)0)) < 1) {
-			if (c == -1) {
-				if (errno == EINTR) {
-					continue;
-				}
-			}
-			sleep(5);
-			continue;
-		}
-
-		/*
-		 * Any urgent data?
-		 */
-		if (FD_ISSET(net, &xbits)) {
-		    SYNCHing = 1;
-		}
-
-		/*
-		 * Something to read from the network...
-		 */
-		if (FD_ISSET(net, &ibits)) {
-#if	!defined(SO_OOBINLINE)
-			/*
-			 * In 4.2 (and 4.3 beta) systems, the
-			 * OOB indication and data handling in the kernel
-			 * is such that if two separate TCP Urgent requests
-			 * come in, one byte of TCP data will be overlaid.
-			 * This is fatal for Telnet, but we try to live
-			 * with it.
-			 *
-			 * In addition, in 4.2 (and...), a special protocol
-			 * is needed to pick up the TCP Urgent data in
-			 * the correct sequence.
-			 *
-			 * What we do is:  if we think we are in urgent
-			 * mode, we look to see if we are "at the mark".
-			 * If we are, we do an OOB receive.  If we run
-			 * this twice, we will do the OOB receive twice,
-			 * but the second will fail, since the second
-			 * time we were "at the mark", but there wasn't
-			 * any data there (the kernel doesn't reset
-			 * "at the mark" until we do a normal read).
-			 * Once we've read the OOB data, we go ahead
-			 * and do normal reads.
-			 *
-			 * There is also another problem, which is that
-			 * since the OOB byte we read doesn't put us
-			 * out of OOB state, and since that byte is most
-			 * likely the TELNET DM (data mark), we would
-			 * stay in the TELNET SYNCH (SYNCHing) state.
-			 * So, clocks to the rescue.  If we've "just"
-			 * received a DM, then we test for the
-			 * presence of OOB data when the receive OOB
-			 * fails (and AFTER we did the normal mode read
-			 * to clear "at the mark").
-			 */
-		    if (SYNCHing) {
-			int atmark;
-
-			(void) ioctl(net, SIOCATMARK, (char *)&atmark);
-			if (atmark) {
-			    ncc = recv(net, netibuf, sizeof (netibuf), MSG_OOB);
-			    if ((ncc == -1) && (errno == EINVAL)) {
-				ncc = read(net, netibuf, sizeof (netibuf));
-				if (sequenceIs(didnetreceive, gotDM)) {
-				    SYNCHing = stilloob(net);
-				}
-			    }
-			} else {
-			    ncc = read(net, netibuf, sizeof (netibuf));
-			}
-		    } else {
-			ncc = read(net, netibuf, sizeof (netibuf));
-		    }
-		    settimer(didnetreceive);
-#else	/* !defined(SO_OOBINLINE)) */
-		    ncc = read(net, netibuf, sizeof (netibuf));
-#endif	/* !defined(SO_OOBINLINE)) */
-		    if (ncc < 0 && errno == EWOULDBLOCK)
-			ncc = 0;
-		    else {
-			if (ncc <= 0) {
-			    break;
-			}
-			netip = netibuf;
-		    }
-		    DIAG((TD_REPORT | TD_NETDATA),
-			    {sprintf(nfrontp, "td: netread %d chars\r\n", ncc);
-			     nfrontp += strlen(nfrontp);});
-		    DIAG(TD_NETDATA, printdata("nd", netip, ncc));
-		}
-
-		/*
-		 * Something to read from the pty...
-		 */
-		if (FD_ISSET(p, &ibits)) {
-#ifndef	STREAMSPTY
-			pcc = read(p, ptyibuf, BUFSIZ);
-#else
-			pcc = readstream(p, ptyibuf, BUFSIZ);
-#endif
-			/*
-			 * On some systems, if we try to read something
-			 * off the master side before the slave side is
-			 * opened, we get EIO.
-			 */
-			if (pcc < 0 && (errno == EWOULDBLOCK ||
-#ifdef	EAGAIN
-					errno == EAGAIN ||
-#endif
-					errno == EIO)) {
-				pcc = 0;
-			} else {
-				if (pcc <= 0)
-					break;
-#if	!defined(CRAY2) || !defined(UNICOS5)
-#ifdef	LINEMODE
-				/*
-				 * If ioctl from pty, pass it through net
-				 */
-				if (ptyibuf[0] & TIOCPKT_IOCTL) {
-					copy_termbuf(ptyibuf+1, pcc-1);
-					localstat();
-					pcc = 1;
-				}
-#endif	/* LINEMODE */
-				if (ptyibuf[0] & TIOCPKT_FLUSHWRITE) {
-					netclear();	/* clear buffer back */
-#ifndef	NO_URGENT
-					/*
-					 * There are client telnets on some
-					 * operating systems get screwed up
-					 * royally if we send them urgent
-					 * mode data.
-					 */
-					*nfrontp++ = IAC;
-					*nfrontp++ = DM;
-					neturg = nfrontp-1; /* off by one XXX */
-					DIAG(TD_OPTIONS,
-					    printoption("td: send IAC", DM));
-
-#endif
-				}
-				if (his_state_is_will(TELOPT_LFLOW) &&
-				    (ptyibuf[0] &
-				     (TIOCPKT_NOSTOP|TIOCPKT_DOSTOP))) {
-					int newflow =
-					    ptyibuf[0] & TIOCPKT_DOSTOP ? 1 : 0;
-					if (newflow != flowmode) {
-						flowmode = newflow;
-						(void) sprintf(nfrontp,
-							"%c%c%c%c%c%c",
-							IAC, SB, TELOPT_LFLOW,
-							flowmode ? LFLOW_ON
-								 : LFLOW_OFF,
-							IAC, SE);
-						nfrontp += 6;
-						DIAG(TD_OPTIONS, printsub('>',
-						    (unsigned char *)nfrontp-4,
-						    4););
-					}
-				}
-				pcc--;
-				ptyip = ptyibuf+1;
-#else	/* defined(CRAY2) && defined(UNICOS5) */
-				if (!uselinemode) {
-					unpcc = pcc;
-					unptyip = ptyibuf;
-					pcc = term_output(&unptyip, ptyibuf2,
-								&unpcc, BUFSIZ);
-					ptyip = ptyibuf2;
-				} else
-					ptyip = ptyibuf;
-#endif	/* defined(CRAY2) && defined(UNICOS5) */
-			}
-		}
-
-		while (pcc > 0) {
-			if ((&netobuf[BUFSIZ] - nfrontp) < 2)
-				break;
-			c = *ptyip++ & 0377, pcc--;
-			if (c == IAC)
-				*nfrontp++ = c;
-#if	defined(CRAY2) && defined(UNICOS5)
-			else if (c == '\n' &&
-				     my_state_is_wont(TELOPT_BINARY) && newmap)
-				*nfrontp++ = '\r';
-#endif	/* defined(CRAY2) && defined(UNICOS5) */
-			*nfrontp++ = c;
-			if ((c == '\r') && (my_state_is_wont(TELOPT_BINARY))) {
-				if (pcc > 0 && ((*ptyip & 0377) == '\n')) {
-					*nfrontp++ = *ptyip++ & 0377;
-					pcc--;
-				} else
-					*nfrontp++ = '\0';
-			}
-		}
-#if	defined(CRAY2) && defined(UNICOS5)
-		/*
-		 * If chars were left over from the terminal driver,
-		 * note their existence.
-		 */
-		if (!uselinemode && unpcc) {
-			pcc = unpcc;
-			unpcc = 0;
-			ptyip = unptyip;
-		}
-#endif	/* defined(CRAY2) && defined(UNICOS5) */
-
-		if (FD_ISSET(f, &obits) && (nfrontp - nbackp) > 0)
-			netflush();
-		if (ncc > 0)
-			telrcv();
-		if (FD_ISSET(p, &obits) && (pfrontp - pbackp) > 0)
-			ptyflush();
-	}
-	cleanup(0);
-}  /* end of telnet */
-
-#ifndef	TCSIG
-# ifdef	TIOCSIG
-#  define TCSIG TIOCSIG
-# endif
-#endif
-
-#ifdef	STREAMSPTY
-
-int flowison = -1;  /* current state of flow: -1 is unknown */
-
-int readstream(p, ibuf, bufsize)
-	int p;
-	char *ibuf;
-	int bufsize;
-{
-	int flags = 0;
-	int ret = 0;
-	struct termios *tsp;
-	struct termio *tp;
-	struct iocblk *ip;
-	char vstop, vstart;
-	int ixon;
-	int newflow;
-
-	strbufc.maxlen = BUFSIZ;
-	strbufc.buf = (char *)ctlbuf;
-	strbufd.maxlen = bufsize-1;
-	strbufd.len = 0;
-	strbufd.buf = ibuf+1;
-	ibuf[0] = 0;
-
-	ret = getmsg(p, &strbufc, &strbufd, &flags);
-	if (ret < 0)  /* error of some sort -- probably EAGAIN */
-		return(-1);
-
-	if (strbufc.len <= 0 || ctlbuf[0] == M_DATA) {
-		/* data message */
-		if (strbufd.len > 0) {			/* real data */
-			return(strbufd.len + 1);	/* count header char */
-		} else {
-			/* nothing there */
-			errno = EAGAIN;
-			return(-1);
-		}
-	}
-
-	/*
-	 * It's a control message.  Return 1, to look at the flag we set
-	 */
-
-	switch (ctlbuf[0]) {
-	case M_FLUSH:
-		if (ibuf[1] & FLUSHW)
-			ibuf[0] = TIOCPKT_FLUSHWRITE;
-		return(1);
-
-	case M_IOCTL:
-		ip = (struct iocblk *) (ibuf+1);
-
-		switch (ip->ioc_cmd) {
-		case TCSETS:
-		case TCSETSW:
-		case TCSETSF:
-			tsp = (struct termios *)
-					(ibuf+1 + sizeof(struct iocblk));
-			vstop = tsp->c_cc[VSTOP];
-			vstart = tsp->c_cc[VSTART];
-			ixon = tsp->c_iflag & IXON;
-			break;
-		case TCSETA:
-		case TCSETAW:
-		case TCSETAF:
-			tp = (struct termio *) (ibuf+1 + sizeof(struct iocblk));
-			vstop = tp->c_cc[VSTOP];
-			vstart = tp->c_cc[VSTART];
-			ixon = tp->c_iflag & IXON;
-			break;
-		default:
-			errno = EAGAIN;
-			return(-1);
-		}
-
-		newflow =  (ixon && (vstart == 021) && (vstop == 023)) ? 1 : 0;
-		if (newflow != flowison) {  /* it's a change */
-			flowison = newflow;
-			ibuf[0] = newflow ? TIOCPKT_DOSTOP : TIOCPKT_NOSTOP;
-			return(1);
-		}
-	}
-
-	/* nothing worth doing anything about */
-	errno = EAGAIN;
-	return(-1);
-}
-#endif /* STREAMSPTY */
-
-/*
- * Send interrupt to process on other side of pty.
- * If it is in raw mode, just write NULL;
- * otherwise, write intr char.
- */
-	void
-interrupt()
-{
-	ptyflush();	/* half-hearted */
-
-#if defined(STREAMSPTY) && defined(TIOCSIGNAL)
-	/* Streams PTY style ioctl to post a signal */
-	{
-		int sig = SIGINT;
-		(void) ioctl(pty, TIOCSIGNAL, &sig);
-		(void) ioctl(pty, I_FLUSH, FLUSHR);
-	}
-#else
-#ifdef	TCSIG
-	(void) ioctl(pty, TCSIG, (char *)SIGINT);
-#else	/* TCSIG */
-	init_termbuf();
-	*pfrontp++ = slctab[SLC_IP].sptr ?
-			(unsigned char)*slctab[SLC_IP].sptr : '\177';
-#endif	/* TCSIG */
-#endif
-}
-
-/*
- * Send quit to process on other side of pty.
- * If it is in raw mode, just write NULL;
- * otherwise, write quit char.
- */
-	void
-sendbrk()
-{
-	ptyflush();	/* half-hearted */
-#ifdef	TCSIG
-	(void) ioctl(pty, TCSIG, (char *)SIGQUIT);
-#else	/* TCSIG */
-	init_termbuf();
-	*pfrontp++ = slctab[SLC_ABORT].sptr ?
-			(unsigned char)*slctab[SLC_ABORT].sptr : '\034';
-#endif	/* TCSIG */
-}
-
-	void
-sendsusp()
-{
-#ifdef	SIGTSTP
-	ptyflush();	/* half-hearted */
-# ifdef	TCSIG
-	(void) ioctl(pty, TCSIG, (char *)SIGTSTP);
-# else	/* TCSIG */
-	*pfrontp++ = slctab[SLC_SUSP].sptr ?
-			(unsigned char)*slctab[SLC_SUSP].sptr : '\032';
-# endif	/* TCSIG */
-#endif	/* SIGTSTP */
-}
-
-/*
- * When we get an AYT, if ^T is enabled, use that.  Otherwise,
- * just send back "[Yes]".
- */
-	void
-recv_ayt()
-{
-#if	defined(SIGINFO) && defined(TCSIG)
-	if (slctab[SLC_AYT].sptr && *slctab[SLC_AYT].sptr != _POSIX_VDISABLE) {
-		(void) ioctl(pty, TCSIG, (char *)SIGINFO);
-		return;
-	}
-#endif
-	(void) strcpy(nfrontp, "\r\n[Yes]\r\n");
-	nfrontp += 9;
-}
-
-	void
-doeof()
-{
-	init_termbuf();
-
-#if	defined(LINEMODE) && defined(USE_TERMIO) && (VEOF == VMIN)
-	if (!tty_isediting()) {
-		extern char oldeofc;
-		*pfrontp++ = oldeofc;
-		return;
-	}
-#endif
-	*pfrontp++ = slctab[SLC_EOF].sptr ?
-			(unsigned char)*slctab[SLC_EOF].sptr : '\004';
-}
diff --git a/crypto/telnet/telnetd/telnetd.h b/crypto/telnet/telnetd/telnetd.h
deleted file mode 100644
index 234b9739e758..000000000000
--- a/crypto/telnet/telnetd/telnetd.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)telnetd.h	8.1 (Berkeley) 6/4/93
- */
-
-
-#include "defs.h"
-#include "ext.h"
-
-#ifdef	DIAGNOSTICS
-#define	DIAG(a,b)	if (diagnostic & (a)) b
-#else
-#define	DIAG(a,b)
-#endif
-
-/* other external variables */
-extern	char **environ;
-extern	int errno;
-
diff --git a/crypto/telnet/telnetd/termstat.c b/crypto/telnet/telnetd/termstat.c
deleted file mode 100644
index 46b20ffb2cc0..000000000000
--- a/crypto/telnet/telnetd/termstat.c
+++ /dev/null
@@ -1,677 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)termstat.c	8.2 (Berkeley) 5/30/95";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
-
-#include "telnetd.h"
-
-#if	defined(ENCRYPTION)
-#include <libtelnet/encrypt.h>
-#endif
-
-/*
- * local variables
- */
-int def_tspeed = -1, def_rspeed = -1;
-#ifdef	TIOCSWINSZ
-int def_row = 0, def_col = 0;
-#endif
-#ifdef	LINEMODE
-static int _terminit = 0;
-#endif	/* LINEMODE */
-
-#if	defined(CRAY2) && defined(UNICOS5)
-int	newmap = 1;	/* nonzero if \n maps to ^M^J */
-#endif
-
-#ifdef	LINEMODE
-/*
- * localstat
- *
- * This function handles all management of linemode.
- *
- * Linemode allows the client to do the local editing of data
- * and send only complete lines to the server.  Linemode state is
- * based on the state of the pty driver.  If the pty is set for
- * external processing, then we can use linemode.  Further, if we
- * can use real linemode, then we can look at the edit control bits
- * in the pty to determine what editing the client should do.
- *
- * Linemode support uses the following state flags to keep track of
- * current and desired linemode state.
- *	alwayslinemode : true if -l was specified on the telnetd
- * 	command line.  It means to have linemode on as much as
- *	possible.
- *
- * 	lmodetype: signifies whether the client can
- *	handle real linemode, or if use of kludgeomatic linemode
- *	is preferred.  It will be set to one of the following:
- *		REAL_LINEMODE : use linemode option
- *		NO_KLUDGE : don't initiate kludge linemode.
- *		KLUDGE_LINEMODE : use kludge linemode
- *		NO_LINEMODE : client is ignorant of linemode
- *
- *	linemode, uselinemode : linemode is true if linemode
- *	is currently on, uselinemode is the state that we wish
- *	to be in.  If another function wishes to turn linemode
- *	on or off, it sets or clears uselinemode.
- *
- *	editmode, useeditmode : like linemode/uselinemode, but
- *	these contain the edit mode states (edit and trapsig).
- *
- * The state variables correspond to some of the state information
- * in the pty.
- *	linemode:
- *		In real linemode, this corresponds to whether the pty
- *		expects external processing of incoming data.
- *		In kludge linemode, this more closely corresponds to the
- *		whether normal processing is on or not.  (ICANON in
- *		system V, or COOKED mode in BSD.)
- *		If the -l option was specified (alwayslinemode), then
- *		an attempt is made to force external processing on at
- *		all times.
- *
- * The following heuristics are applied to determine linemode
- * handling within the server.
- *	1) Early on in starting up the server, an attempt is made
- *	   to negotiate the linemode option.  If this succeeds
- *	   then lmodetype is set to REAL_LINEMODE and all linemode
- *	   processing occurs in the context of the linemode option.
- *	2) If the attempt to negotiate the linemode option failed,
- *	   and the "-k" (don't initiate kludge linemode) isn't set,
- *	   then we try to use kludge linemode.  We test for this
- *	   capability by sending "do Timing Mark".  If a positive
- *	   response comes back, then we assume that the client
- *	   understands kludge linemode (ech!) and the
- *	   lmodetype flag is set to KLUDGE_LINEMODE.
- *	3) Otherwise, linemode is not supported at all and
- *	   lmodetype remains set to NO_LINEMODE (which happens
- *	   to be 0 for convenience).
- *	4) At any time a command arrives that implies a higher
- *	   state of linemode support in the client, we move to that
- *	   linemode support.
- *
- * A short explanation of kludge linemode is in order here.
- *	1) The heuristic to determine support for kludge linemode
- *	   is to send a do timing mark.  We assume that a client
- *	   that supports timing marks also supports kludge linemode.
- *	   A risky proposition at best.
- *	2) Further negotiation of linemode is done by changing the
- *	   the server's state regarding SGA.  If server will SGA,
- *	   then linemode is off, if server won't SGA, then linemode
- *	   is on.
- */
-	void
-localstat()
-{
-	void netflush();
-	int need_will_echo = 0;
-
-#if	defined(CRAY2) && defined(UNICOS5)
-	/*
-	 * Keep track of that ol' CR/NL mapping while we're in the
-	 * neighborhood.
-	 */
-	newmap = tty_isnewmap();
-#endif	/* defined(CRAY2) && defined(UNICOS5) */
-
-	/*
-	 * Check for changes to flow control if client supports it.
-	 */
-	flowstat();
-
-	/*
-	 * Check linemode on/off state
-	 */
-	uselinemode = tty_linemode();
-
-	/*
-	 * If alwayslinemode is on, and pty is changing to turn it off, then
-	 * force linemode back on.
-	 */
-	if (alwayslinemode && linemode && !uselinemode) {
-		uselinemode = 1;
-		tty_setlinemode(uselinemode);
-	}
-
-	if (uselinemode) {
-		/*
-	 * Check for state of BINARY options.
-		 *
-		 * We only need to do the binary dance if we are actually going
-		 * to use linemode.  As this confuses some telnet clients
-		 * that don't support linemode, and doesn't gain us
-		 * anything, we don't do it unless we're doing linemode.
-		 * -Crh (henrich@msu.edu)
-	 */
-
-	if (tty_isbinaryin()) {
-		if (his_want_state_is_wont(TELOPT_BINARY))
-			send_do(TELOPT_BINARY, 1);
-	} else {
-		if (his_want_state_is_will(TELOPT_BINARY))
-			send_dont(TELOPT_BINARY, 1);
-	}
-
-	if (tty_isbinaryout()) {
-		if (my_want_state_is_wont(TELOPT_BINARY))
-			send_will(TELOPT_BINARY, 1);
-	} else {
-		if (my_want_state_is_will(TELOPT_BINARY))
-			send_wont(TELOPT_BINARY, 1);
-	}
-	}
-
-#ifdef	ENCRYPTION
-	/*
-	 * If the terminal is not echoing, but editing is enabled,
-	 * something like password input is going to happen, so
-	 * if we the other side is not currently sending encrypted
-	 * data, ask the other side to start encrypting.
-	 */
-	if (his_state_is_will(TELOPT_ENCRYPT)) {
-		static int enc_passwd = 0;
-		if (uselinemode && !tty_isecho() && tty_isediting()
-		    && (enc_passwd == 0) && !decrypt_input) {
-			encrypt_send_request_start();
-			enc_passwd = 1;
-		} else if (enc_passwd) {
-			encrypt_send_request_end();
-			enc_passwd = 0;
-		}
-	}
-#endif	/* ENCRYPTION */
-
-	/*
-	 * Do echo mode handling as soon as we know what the
-	 * linemode is going to be.
-	 * If the pty has echo turned off, then tell the client that
-	 * the server will echo.  If echo is on, then the server
-	 * will echo if in character mode, but in linemode the
-	 * client should do local echoing.  The state machine will
-	 * not send anything if it is unnecessary, so don't worry
-	 * about that here.
-	 *
-	 * If we need to send the WILL ECHO (because echo is off),
-	 * then delay that until after we have changed the MODE.
-	 * This way, when the user is turning off both editing
-	 * and echo, the client will get editing turned off first.
-	 * This keeps the client from going into encryption mode
-	 * and then right back out if it is doing auto-encryption
-	 * when passwords are being typed.
-	 */
-	if (uselinemode) {
-		if (tty_isecho())
-			send_wont(TELOPT_ECHO, 1);
-		else
-			need_will_echo = 1;
-#ifdef	KLUDGELINEMODE
-		if (lmodetype == KLUDGE_OK)
-			lmodetype = KLUDGE_LINEMODE;
-#endif
-	}
-
-	/*
-	 * If linemode is being turned off, send appropriate
-	 * command and then we're all done.
-	 */
-	 if (!uselinemode && linemode) {
-# ifdef	KLUDGELINEMODE
-		if (lmodetype == REAL_LINEMODE) {
-# endif	/* KLUDGELINEMODE */
-			send_dont(TELOPT_LINEMODE, 1);
-# ifdef	KLUDGELINEMODE
-		} else if (lmodetype == KLUDGE_LINEMODE)
-			send_will(TELOPT_SGA, 1);
-# endif	/* KLUDGELINEMODE */
-		send_will(TELOPT_ECHO, 1);
-		linemode = uselinemode;
-		goto done;
-	}
-
-# ifdef	KLUDGELINEMODE
-	/*
-	 * If using real linemode check edit modes for possible later use.
-	 * If we are in kludge linemode, do the SGA negotiation.
-	 */
-	if (lmodetype == REAL_LINEMODE) {
-# endif	/* KLUDGELINEMODE */
-		useeditmode = 0;
-		if (tty_isediting())
-			useeditmode |= MODE_EDIT;
-		if (tty_istrapsig())
-			useeditmode |= MODE_TRAPSIG;
-		if (tty_issofttab())
-			useeditmode |= MODE_SOFT_TAB;
-		if (tty_islitecho())
-			useeditmode |= MODE_LIT_ECHO;
-# ifdef	KLUDGELINEMODE
-	} else if (lmodetype == KLUDGE_LINEMODE) {
-		if (tty_isediting() && uselinemode)
-			send_wont(TELOPT_SGA, 1);
-		else
-			send_will(TELOPT_SGA, 1);
-	}
-# endif	/* KLUDGELINEMODE */
-
-	/*
-	 * Negotiate linemode on if pty state has changed to turn it on.
-	 * Send appropriate command and send along edit mode, then all done.
-	 */
-	if (uselinemode && !linemode) {
-# ifdef	KLUDGELINEMODE
-		if (lmodetype == KLUDGE_LINEMODE) {
-			send_wont(TELOPT_SGA, 1);
-		} else if (lmodetype == REAL_LINEMODE) {
-# endif	/* KLUDGELINEMODE */
-			send_do(TELOPT_LINEMODE, 1);
-			/* send along edit modes */
-			(void) sprintf(nfrontp, "%c%c%c%c%c%c%c", IAC, SB,
-				TELOPT_LINEMODE, LM_MODE, useeditmode,
-				IAC, SE);
-			nfrontp += 7;
-			editmode = useeditmode;
-# ifdef	KLUDGELINEMODE
-		}
-# endif	/* KLUDGELINEMODE */
-		linemode = uselinemode;
-		goto done;
-	}
-
-# ifdef	KLUDGELINEMODE
-	/*
-	 * None of what follows is of any value if not using
-	 * real linemode.
-	 */
-	if (lmodetype < REAL_LINEMODE)
-		goto done;
-# endif	/* KLUDGELINEMODE */
-
-	if (linemode && his_state_is_will(TELOPT_LINEMODE)) {
-		/*
-		 * If edit mode changed, send edit mode.
-		 */
-		 if (useeditmode != editmode) {
-			/*
-			 * Send along appropriate edit mode mask.
-			 */
-			(void) sprintf(nfrontp, "%c%c%c%c%c%c%c", IAC, SB,
-				TELOPT_LINEMODE, LM_MODE, useeditmode,
-				IAC, SE);
-			nfrontp += 7;
-			editmode = useeditmode;
-		}
-
-
-		/*
-		 * Check for changes to special characters in use.
-		 */
-		start_slc(0);
-		check_slc();
-		(void) end_slc(0);
-	}
-
-done:
-	if (need_will_echo)
-		send_will(TELOPT_ECHO, 1);
-	/*
-	 * Some things should be deferred until after the pty state has
-	 * been set by the local process.  Do those things that have been
-	 * deferred now.  This only happens once.
-	 */
-	if (_terminit == 0) {
-		_terminit = 1;
-		defer_terminit();
-	}
-
-	netflush();
-	set_termbuf();
-	return;
-
-}  /* end of localstat */
-#endif	/* LINEMODE */
-
-/*
- * flowstat
- *
- * Check for changes to flow control
- */
-	void
-flowstat()
-{
-	if (his_state_is_will(TELOPT_LFLOW)) {
-		if (tty_flowmode() != flowmode) {
-			flowmode = tty_flowmode();
-			(void) sprintf(nfrontp, "%c%c%c%c%c%c",
-					IAC, SB, TELOPT_LFLOW,
-					flowmode ? LFLOW_ON : LFLOW_OFF,
-					IAC, SE);
-			nfrontp += 6;
-		}
-		if (tty_restartany() != restartany) {
-			restartany = tty_restartany();
-			(void) sprintf(nfrontp, "%c%c%c%c%c%c",
-					IAC, SB, TELOPT_LFLOW,
-					restartany ? LFLOW_RESTART_ANY
-						   : LFLOW_RESTART_XON,
-					IAC, SE);
-			nfrontp += 6;
-		}
-	}
-}
-
-/*
- * clientstat
- *
- * Process linemode related requests from the client.
- * Client can request a change to only one of linemode, editmode or slc's
- * at a time, and if using kludge linemode, then only linemode may be
- * affected.
- */
-	void
-clientstat(code, parm1, parm2)
-	register int code, parm1, parm2;
-{
-	void netflush();
-
-	/*
-	 * Get a copy of terminal characteristics.
-	 */
-	init_termbuf();
-
-	/*
-	 * Process request from client. code tells what it is.
-	 */
-	switch (code) {
-#ifdef	LINEMODE
-	case TELOPT_LINEMODE:
-		/*
-		 * Don't do anything unless client is asking us to change
-		 * modes.
-		 */
-		uselinemode = (parm1 == WILL);
-		if (uselinemode != linemode) {
-# ifdef	KLUDGELINEMODE
-			/*
-			 * If using kludge linemode, make sure that
-			 * we can do what the client asks.
-			 * We can not turn off linemode if alwayslinemode
-			 * and the ICANON bit is set.
-			 */
-			if (lmodetype == KLUDGE_LINEMODE) {
-				if (alwayslinemode && tty_isediting()) {
-					uselinemode = 1;
-				}
-			}
-
-			/*
-			 * Quit now if we can't do it.
-			 */
-			if (uselinemode == linemode)
-				return;
-
-			/*
-			 * If using real linemode and linemode is being
-			 * turned on, send along the edit mode mask.
-			 */
-			if (lmodetype == REAL_LINEMODE && uselinemode)
-# else	/* KLUDGELINEMODE */
-			if (uselinemode)
-# endif	/* KLUDGELINEMODE */
-			{
-				useeditmode = 0;
-				if (tty_isediting())
-					useeditmode |= MODE_EDIT;
-				if (tty_istrapsig)
-					useeditmode |= MODE_TRAPSIG;
-				if (tty_issofttab())
-					useeditmode |= MODE_SOFT_TAB;
-				if (tty_islitecho())
-					useeditmode |= MODE_LIT_ECHO;
-				(void) sprintf(nfrontp, "%c%c%c%c%c%c%c", IAC,
-					SB, TELOPT_LINEMODE, LM_MODE,
-							useeditmode, IAC, SE);
-				nfrontp += 7;
-				editmode = useeditmode;
-			}
-
-
-			tty_setlinemode(uselinemode);
-
-			linemode = uselinemode;
-
-			if (!linemode)
-				send_will(TELOPT_ECHO, 1);
-		}
-		break;
-
-	case LM_MODE:
-	    {
-		register int ack, changed;
-
-		/*
-		 * Client has sent along a mode mask.  If it agrees with
-		 * what we are currently doing, ignore it; if not, it could
-		 * be viewed as a request to change.  Note that the server
-		 * will change to the modes in an ack if it is different from
-		 * what we currently have, but we will not ack the ack.
-		 */
-		 useeditmode &= MODE_MASK;
-		 ack = (useeditmode & MODE_ACK);
-		 useeditmode &= ~MODE_ACK;
-
-		 if ((changed = (useeditmode ^ editmode))) {
-			/*
-			 * This check is for a timing problem.  If the
-			 * state of the tty has changed (due to the user
-			 * application) we need to process that info
-			 * before we write in the state contained in the
-			 * ack!!!  This gets out the new MODE request,
-			 * and when the ack to that command comes back
-			 * we'll set it and be in the right mode.
-			 */
-			if (ack)
-				localstat();
-			if (changed & MODE_EDIT)
-				tty_setedit(useeditmode & MODE_EDIT);
-
-			if (changed & MODE_TRAPSIG)
-				tty_setsig(useeditmode & MODE_TRAPSIG);
-
-			if (changed & MODE_SOFT_TAB)
-				tty_setsofttab(useeditmode & MODE_SOFT_TAB);
-
-			if (changed & MODE_LIT_ECHO)
-				tty_setlitecho(useeditmode & MODE_LIT_ECHO);
-
-			set_termbuf();
-
- 			if (!ack) {
- 				(void) sprintf(nfrontp, "%c%c%c%c%c%c%c", IAC,
-					SB, TELOPT_LINEMODE, LM_MODE,
- 					useeditmode|MODE_ACK,
- 					IAC, SE);
- 				nfrontp += 7;
- 			}
-
-			editmode = useeditmode;
-		}
-
-		break;
-
-	    }  /* end of case LM_MODE */
-#endif	/* LINEMODE */
-
-	case TELOPT_NAWS:
-#ifdef	TIOCSWINSZ
-	    {
-		struct winsize ws;
-
-		def_col = parm1;
-		def_row = parm2;
-#ifdef	LINEMODE
-		/*
-		 * Defer changing window size until after terminal is
-		 * initialized.
-		 */
-		if (terminit() == 0)
-			return;
-#endif	/* LINEMODE */
-
-		/*
-		 * Change window size as requested by client.
-		 */
-
-		ws.ws_col = parm1;
-		ws.ws_row = parm2;
-		(void) ioctl(pty, TIOCSWINSZ, (char *)&ws);
-	    }
-#endif	/* TIOCSWINSZ */
-
-		break;
-
-	case TELOPT_TSPEED:
-	    {
-		def_tspeed = parm1;
-		def_rspeed = parm2;
-#ifdef	LINEMODE
-		/*
-		 * Defer changing the terminal speed.
-		 */
-		if (terminit() == 0)
-			return;
-#endif	/* LINEMODE */
-		/*
-		 * Change terminal speed as requested by client.
-		 * We set the receive speed first, so that if we can't
-		 * store seperate receive and transmit speeds, the transmit
-		 * speed will take precedence.
-		 */
-		tty_rspeed(parm2);
-		tty_tspeed(parm1);
-		set_termbuf();
-
-		break;
-
-	    }  /* end of case TELOPT_TSPEED */
-
-	default:
-		/* What? */
-		break;
-	}  /* end of switch */
-
-#if	defined(CRAY2) && defined(UNICOS5)
-	/*
-	 * Just in case of the likely event that we changed the pty state.
-	 */
-	rcv_ioctl();
-#endif	/* defined(CRAY2) && defined(UNICOS5) */
-
-	netflush();
-
-}  /* end of clientstat */
-
-#if	defined(CRAY2) && defined(UNICOS5)
-	void
-termstat()
-{
-	needtermstat = 1;
-}
-
-	void
-_termstat()
-{
-	needtermstat = 0;
-	init_termbuf();
-	localstat();
-	rcv_ioctl();
-}
-#endif	/* defined(CRAY2) && defined(UNICOS5) */
-
-#ifdef	LINEMODE
-/*
- * defer_terminit
- *
- * Some things should not be done until after the login process has started
- * and all the pty modes are set to what they are supposed to be.  This
- * function is called when the pty state has been processed for the first time.
- * It calls other functions that do things that were deferred in each module.
- */
-	void
-defer_terminit()
-{
-
-	/*
-	 * local stuff that got deferred.
-	 */
-	if (def_tspeed != -1) {
-		clientstat(TELOPT_TSPEED, def_tspeed, def_rspeed);
-		def_tspeed = def_rspeed = 0;
-	}
-
-#ifdef	TIOCSWINSZ
-	if (def_col || def_row) {
-		struct winsize ws;
-
-		memset((char *)&ws, 0, sizeof(ws));
-		ws.ws_col = def_col;
-		ws.ws_row = def_row;
-		(void) ioctl(pty, TIOCSWINSZ, (char *)&ws);
-	}
-#endif
-
-	/*
-	 * The only other module that currently defers anything.
-	 */
-	deferslc();
-
-}  /* end of defer_terminit */
-
-/*
- * terminit
- *
- * Returns true if the pty state has been processed yet.
- */
-	int
-terminit()
-{
-	return(_terminit);
-
-}  /* end of terminit */
-#endif	/* LINEMODE */
diff --git a/crypto/telnet/telnetd/utility.c b/crypto/telnet/telnetd/utility.c
deleted file mode 100644
index dc695fa690cc..000000000000
--- a/crypto/telnet/telnetd/utility.c
+++ /dev/null
@@ -1,1246 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)utility.c	8.4 (Berkeley) 5/30/95";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
-
-#ifdef __FreeBSD__
-#include <locale.h>
-#include <sys/utsname.h>
-#endif
-#define PRINTOPTIONS
-#include "telnetd.h"
-
-#if	defined(AUTHENTICATION)
-#include <libtelnet/auth.h>
-#endif
-#if	defined(ENCRYPTION)
-#include <libtelnet/encrypt.h>
-#endif
-
-/*
- * utility functions performing io related tasks
- */
-
-/*
- * ttloop
- *
- *	A small subroutine to flush the network output buffer, get some data
- * from the network, and pass it through the telnet state machine.  We
- * also flush the pty input buffer (by dropping its data) if it becomes
- * too full.
- */
-
-    void
-ttloop()
-{
-    void netflush();
-
-    DIAG(TD_REPORT, {sprintf(nfrontp, "td: ttloop\r\n");
-		     nfrontp += strlen(nfrontp);});
-    if (nfrontp-nbackp) {
-	netflush();
-    }
-    ncc = read(net, netibuf, sizeof netibuf);
-    if (ncc < 0) {
-	syslog(LOG_INFO, "ttloop:  read: %m");
-	exit(1);
-    } else if (ncc == 0) {
-	syslog(LOG_INFO, "ttloop:  peer died: %m");
-	exit(1);
-    }
-    DIAG(TD_REPORT, {sprintf(nfrontp, "td: ttloop read %d chars\r\n", ncc);
-		     nfrontp += strlen(nfrontp);});
-    netip = netibuf;
-    telrcv();			/* state machine */
-    if (ncc > 0) {
-	pfrontp = pbackp = ptyobuf;
-	telrcv();
-    }
-}  /* end of ttloop */
-
-/*
- * Check a descriptor to see if out of band data exists on it.
- */
-    int
-stilloob(s)
-    int	s;		/* socket number */
-{
-    static struct timeval timeout = { 0 };
-    fd_set	excepts;
-    int value;
-
-    do {
-	FD_ZERO(&excepts);
-	FD_SET(s, &excepts);
-	memset((char *)&timeout, 0, sizeof timeout);
-	value = select(s+1, (fd_set *)0, (fd_set *)0, &excepts, &timeout);
-    } while ((value == -1) && (errno == EINTR));
-
-    if (value < 0) {
-	fatalperror(pty, "select");
-    }
-    if (FD_ISSET(s, &excepts)) {
-	return 1;
-    } else {
-	return 0;
-    }
-}
-
-	void
-ptyflush()
-{
-	int n;
-
-	if ((n = pfrontp - pbackp) > 0) {
-		DIAG((TD_REPORT | TD_PTYDATA),
-			{ sprintf(nfrontp, "td: ptyflush %d chars\r\n", n);
-			  nfrontp += strlen(nfrontp); });
-		DIAG(TD_PTYDATA, printdata("pd", pbackp, n));
-		n = write(pty, pbackp, n);
-	}
-	if (n < 0) {
-		if (errno == EWOULDBLOCK || errno == EINTR)
-			return;
-		cleanup(0);
-	}
-	pbackp += n;
-	if (pbackp == pfrontp)
-		pbackp = pfrontp = ptyobuf;
-}
-
-/*
- * nextitem()
- *
- *	Return the address of the next "item" in the TELNET data
- * stream.  This will be the address of the next character if
- * the current address is a user data character, or it will
- * be the address of the character following the TELNET command
- * if the current address is a TELNET IAC ("I Am a Command")
- * character.
- */
-    char *
-nextitem(current)
-    char	*current;
-{
-    if ((*current&0xff) != IAC) {
-	return current+1;
-    }
-    switch (*(current+1)&0xff) {
-    case DO:
-    case DONT:
-    case WILL:
-    case WONT:
-	return current+3;
-    case SB:		/* loop forever looking for the SE */
-	{
-	    register char *look = current+2;
-
-	    for (;;) {
-		if ((*look++&0xff) == IAC) {
-		    if ((*look++&0xff) == SE) {
-			return look;
-		    }
-		}
-	    }
-	}
-    default:
-	return current+2;
-    }
-}  /* end of nextitem */
-
-
-/*
- * netclear()
- *
- *	We are about to do a TELNET SYNCH operation.  Clear
- * the path to the network.
- *
- *	Things are a bit tricky since we may have sent the first
- * byte or so of a previous TELNET command into the network.
- * So, we have to scan the network buffer from the beginning
- * until we are up to where we want to be.
- *
- *	A side effect of what we do, just to keep things
- * simple, is to clear the urgent data pointer.  The principal
- * caller should be setting the urgent data pointer AFTER calling
- * us in any case.
- */
-    void
-netclear()
-{
-    register char *thisitem, *next;
-    char *good;
-#define	wewant(p)	((nfrontp > p) && ((*p&0xff) == IAC) && \
-				((*(p+1)&0xff) != EC) && ((*(p+1)&0xff) != EL))
-
-#ifdef	ENCRYPTION
-    thisitem = nclearto > netobuf ? nclearto : netobuf;
-#else	/* ENCRYPTION */
-    thisitem = netobuf;
-#endif	/* ENCRYPTION */
-
-    while ((next = nextitem(thisitem)) <= nbackp) {
-	thisitem = next;
-    }
-
-    /* Now, thisitem is first before/at boundary. */
-
-#ifdef	ENCRYPTION
-    good = nclearto > netobuf ? nclearto : netobuf;
-#else	/* ENCRYPTION */
-    good = netobuf;	/* where the good bytes go */
-#endif	/* ENCRYPTION */
-
-    while (nfrontp > thisitem) {
-	if (wewant(thisitem)) {
-	    int length;
-
-	    next = thisitem;
-	    do {
-		next = nextitem(next);
-	    } while (wewant(next) && (nfrontp > next));
-	    length = next-thisitem;
-	    memmove(good, thisitem, length);
-	    good += length;
-	    thisitem = next;
-	} else {
-	    thisitem = nextitem(thisitem);
-	}
-    }
-
-    nbackp = netobuf;
-    nfrontp = good;		/* next byte to be sent */
-    neturg = 0;
-}  /* end of netclear */
-
-/*
- *  netflush
- *		Send as much data as possible to the network,
- *	handling requests for urgent data.
- */
-    void
-netflush()
-{
-    int n;
-    extern int not42;
-
-    if ((n = nfrontp - nbackp) > 0) {
-	DIAG(TD_REPORT,
-	    { sprintf(nfrontp, "td: netflush %d chars\r\n", n);
-	      n += strlen(nfrontp);  /* get count first */
-	      nfrontp += strlen(nfrontp);  /* then move pointer */
-	    });
-#ifdef	ENCRYPTION
-	if (encrypt_output) {
-		char *s = nclearto ? nclearto : nbackp;
-		if (nfrontp - s > 0) {
-			(*encrypt_output)((unsigned char *)s, nfrontp-s);
-			nclearto = nfrontp;
-		}
-	}
-#endif	/* ENCRYPTION */
-	/*
-	 * if no urgent data, or if the other side appears to be an
-	 * old 4.2 client (and thus unable to survive TCP urgent data),
-	 * write the entire buffer in non-OOB mode.
-	 */
-	if ((neturg == 0) || (not42 == 0)) {
-	    n = write(net, nbackp, n);	/* normal write */
-	} else {
-	    n = neturg - nbackp;
-	    /*
-	     * In 4.2 (and 4.3) systems, there is some question about
-	     * what byte in a sendOOB operation is the "OOB" data.
-	     * To make ourselves compatible, we only send ONE byte
-	     * out of band, the one WE THINK should be OOB (though
-	     * we really have more the TCP philosophy of urgent data
-	     * rather than the Unix philosophy of OOB data).
-	     */
-	    if (n > 1) {
-		n = send(net, nbackp, n-1, 0);	/* send URGENT all by itself */
-	    } else {
-		n = send(net, nbackp, n, MSG_OOB);	/* URGENT data */
-	    }
-	}
-    }
-    if (n < 0) {
-	if (errno == EWOULDBLOCK || errno == EINTR)
-		return;
-	cleanup(0);
-    }
-    nbackp += n;
-#ifdef	ENCRYPTION
-    if (nbackp > nclearto)
-	nclearto = 0;
-#endif	/* ENCRYPTION */
-    if (nbackp >= neturg) {
-	neturg = 0;
-    }
-    if (nbackp == nfrontp) {
-	nbackp = nfrontp = netobuf;
-#ifdef	ENCRYPTION
-	nclearto = 0;
-#endif	/* ENCRYPTION */
-    }
-    return;
-}  /* end of netflush */
-
-
-/*
- * writenet
- *
- * Just a handy little function to write a bit of raw data to the net.
- * It will force a transmit of the buffer if necessary
- *
- * arguments
- *    ptr - A pointer to a character string to write
- *    len - How many bytes to write
- */
-	void
-writenet(ptr, len)
-	register unsigned char *ptr;
-	register int len;
-{
-	/* flush buffer if no room for new data) */
-	if ((&netobuf[BUFSIZ] - nfrontp) < len) {
-		/* if this fails, don't worry, buffer is a little big */
-		netflush();
-	}
-
-	memmove(nfrontp, ptr, len);
-	nfrontp += len;
-
-}  /* end of writenet */
-
-
-/*
- * miscellaneous functions doing a variety of little jobs follow ...
- */
-
-
-	void
-fatal(f, msg)
-	int f;
-	char *msg;
-{
-	char buf[BUFSIZ];
-
-	(void) sprintf(buf, "telnetd: %s.\r\n", msg);
-#ifdef	ENCRYPTION
-	if (encrypt_output) {
-		/*
-		 * Better turn off encryption first....
-		 * Hope it flushes...
-		 */
-		encrypt_send_end();
-		netflush();
-	}
-#endif	/* ENCRYPTION */
-	(void) write(f, buf, (int)strlen(buf));
-	sleep(1);	/*XXX*/
-	exit(1);
-}
-
-	void
-fatalperror(f, msg)
-	int f;
-	char *msg;
-{
-	char buf[BUFSIZ], *strerror();
-
-	(void) sprintf(buf, "%s: %s", msg, strerror(errno));
-	fatal(f, buf);
-}
-
-char editedhost[32];
-
-	void
-edithost(pat, host)
-	register char *pat;
-	register char *host;
-{
-	register char *res = editedhost;
-
-	if (!pat)
-		pat = "";
-	while (*pat) {
-		switch (*pat) {
-
-		case '#':
-			if (*host)
-				host++;
-			break;
-
-		case '@':
-			if (*host)
-				*res++ = *host++;
-			break;
-
-		default:
-			*res++ = *pat;
-			break;
-		}
-		if (res == &editedhost[sizeof editedhost - 1]) {
-			*res = '\0';
-			return;
-		}
-		pat++;
-	}
-	if (*host)
-		(void) strncpy(res, host,
-				sizeof editedhost - (res - editedhost) -1);
-	else
-		*res = '\0';
-	editedhost[sizeof editedhost - 1] = '\0';
-}
-
-static char *putlocation;
-
-	void
-putstr(s)
-	register char *s;
-{
-
-	while (*s)
-		putchr(*s++);
-}
-
-	void
-putchr(cc)
-	int cc;
-{
-	*putlocation++ = cc;
-}
-
-#ifdef __FreeBSD__
-static char fmtstr[] = { "%+" };
-#else
-/*
- * This is split on two lines so that SCCS will not see the M
- * between two % signs and expand it...
- */
-static char fmtstr[] = { "%l:%M\
-%P on %A, %d %B %Y" };
-#endif
-
-	void
-putf(cp, where)
-	register char *cp;
-	char *where;
-{
-	char *slash;
-	time_t t;
-	char db[100];
-#ifdef	STREAMSPTY
-	extern char *strchr();
-#else
-	extern char *strrchr();
-#endif
-#ifdef __FreeBSD__
-	static struct utsname kerninfo;
-
-	if (!*kerninfo.sysname)
-		uname(&kerninfo);
-#endif
-
-	putlocation = where;
-
-	while (*cp) {
-		if (*cp =='\n') {
-			putstr("\r\n");
-			cp++;
-			continue;
-		} else if (*cp != '%') {
-			putchr(*cp++);
-			continue;
-		}
-		switch (*++cp) {
-
-		case 't':
-#ifdef	STREAMSPTY
-			/* names are like /dev/pts/2 -- we want pts/2 */
-			slash = strchr(line+1, '/');
-#else
-			slash = strrchr(line, '/');
-#endif
-			if (slash == (char *) 0)
-				putstr(line);
-			else
-				putstr(&slash[1]);
-			break;
-
-		case 'h':
-			putstr(editedhost);
-			break;
-
-		case 'd':
-#ifdef __FreeBSD__
-			setlocale(LC_TIME, "");
-#endif
-			(void)time(&t);
-			(void)strftime(db, sizeof(db), fmtstr, localtime(&t));
-			putstr(db);
-			break;
-
-#ifdef __FreeBSD__
-		case 's':
-			putstr(kerninfo.sysname);
-			break;
-
-		case 'm':
-			putstr(kerninfo.machine);
-			break;
-
-		case 'r':
-			putstr(kerninfo.release);
-			break;
-
-		case 'v':
-			putstr(kerninfo.version);
-			break;
-#endif
-
-		case '%':
-			putchr('%');
-			break;
-		}
-		cp++;
-	}
-}
-
-#ifdef DIAGNOSTICS
-/*
- * Print telnet options and commands in plain text, if possible.
- */
-	void
-printoption(fmt, option)
-	register char *fmt;
-	register int option;
-{
-	if (TELOPT_OK(option))
-		sprintf(nfrontp, "%s %s\r\n", fmt, TELOPT(option));
-	else if (TELCMD_OK(option))
-		sprintf(nfrontp, "%s %s\r\n", fmt, TELCMD(option));
-	else
-		sprintf(nfrontp, "%s %d\r\n", fmt, option);
-	nfrontp += strlen(nfrontp);
-	return;
-}
-
-    void
-printsub(direction, pointer, length)
-    char		direction;	/* '<' or '>' */
-    unsigned char	*pointer;	/* where suboption data sits */
-    int			length;		/* length of suboption data */
-{
-    register int i = 0;
-
-	if (!(diagnostic & TD_OPTIONS))
-		return;
-
-	if (direction) {
-	    sprintf(nfrontp, "td: %s suboption ",
-					direction == '<' ? "recv" : "send");
-	    nfrontp += strlen(nfrontp);
-	    if (length >= 3) {
-		register int j;
-
-		i = pointer[length-2];
-		j = pointer[length-1];
-
-		if (i != IAC || j != SE) {
-		    sprintf(nfrontp, "(terminated by ");
-		    nfrontp += strlen(nfrontp);
-		    if (TELOPT_OK(i))
-			sprintf(nfrontp, "%s ", TELOPT(i));
-		    else if (TELCMD_OK(i))
-			sprintf(nfrontp, "%s ", TELCMD(i));
-		    else
-			sprintf(nfrontp, "%d ", i);
-		    nfrontp += strlen(nfrontp);
-		    if (TELOPT_OK(j))
-			sprintf(nfrontp, "%s", TELOPT(j));
-		    else if (TELCMD_OK(j))
-			sprintf(nfrontp, "%s", TELCMD(j));
-		    else
-			sprintf(nfrontp, "%d", j);
-		    nfrontp += strlen(nfrontp);
-		    sprintf(nfrontp, ", not IAC SE!) ");
-		    nfrontp += strlen(nfrontp);
-		}
-	    }
-	    length -= 2;
-	}
-	if (length < 1) {
-	    sprintf(nfrontp, "(Empty suboption??\?)");
-	    nfrontp += strlen(nfrontp);
-	    return;
-	}
-	switch (pointer[0]) {
-	case TELOPT_TTYPE:
-	    sprintf(nfrontp, "TERMINAL-TYPE ");
-	    nfrontp += strlen(nfrontp);
-	    switch (pointer[1]) {
-	    case TELQUAL_IS:
-		sprintf(nfrontp, "IS \"%.*s\"", length-2, (char *)pointer+2);
-		break;
-	    case TELQUAL_SEND:
-		sprintf(nfrontp, "SEND");
-		break;
-	    default:
-		sprintf(nfrontp,
-				"- unknown qualifier %d (0x%x).",
-				pointer[1], pointer[1]);
-	    }
-	    nfrontp += strlen(nfrontp);
-	    break;
-	case TELOPT_TSPEED:
-	    sprintf(nfrontp, "TERMINAL-SPEED");
-	    nfrontp += strlen(nfrontp);
-	    if (length < 2) {
-		sprintf(nfrontp, " (empty suboption??\?)");
-		nfrontp += strlen(nfrontp);
-		break;
-	    }
-	    switch (pointer[1]) {
-	    case TELQUAL_IS:
-		sprintf(nfrontp, " IS %.*s", length-2, (char *)pointer+2);
-		nfrontp += strlen(nfrontp);
-		break;
-	    default:
-		if (pointer[1] == 1)
-		    sprintf(nfrontp, " SEND");
-		else
-		    sprintf(nfrontp, " %d (unknown)", pointer[1]);
-		nfrontp += strlen(nfrontp);
-		for (i = 2; i < length; i++) {
-		    sprintf(nfrontp, " ?%d?", pointer[i]);
-		    nfrontp += strlen(nfrontp);
-		}
-		break;
-	    }
-	    break;
-
-	case TELOPT_LFLOW:
-	    sprintf(nfrontp, "TOGGLE-FLOW-CONTROL");
-	    nfrontp += strlen(nfrontp);
-	    if (length < 2) {
-		sprintf(nfrontp, " (empty suboption??\?)");
-		nfrontp += strlen(nfrontp);
-		break;
-	    }
-	    switch (pointer[1]) {
-	    case LFLOW_OFF:
-		sprintf(nfrontp, " OFF"); break;
-	    case LFLOW_ON:
-		sprintf(nfrontp, " ON"); break;
-	    case LFLOW_RESTART_ANY:
-		sprintf(nfrontp, " RESTART-ANY"); break;
-	    case LFLOW_RESTART_XON:
-		sprintf(nfrontp, " RESTART-XON"); break;
-	    default:
-		sprintf(nfrontp, " %d (unknown)", pointer[1]);
-	    }
-	    nfrontp += strlen(nfrontp);
-	    for (i = 2; i < length; i++) {
-		sprintf(nfrontp, " ?%d?", pointer[i]);
-		nfrontp += strlen(nfrontp);
-	    }
-	    break;
-
-	case TELOPT_NAWS:
-	    sprintf(nfrontp, "NAWS");
-	    nfrontp += strlen(nfrontp);
-	    if (length < 2) {
-		sprintf(nfrontp, " (empty suboption??\?)");
-		nfrontp += strlen(nfrontp);
-		break;
-	    }
-	    if (length == 2) {
-		sprintf(nfrontp, " ?%d?", pointer[1]);
-		nfrontp += strlen(nfrontp);
-		break;
-	    }
-	    sprintf(nfrontp, " %d %d (%d)",
-		pointer[1], pointer[2],
-		(int)((((unsigned int)pointer[1])<<8)|((unsigned int)pointer[2])));
-	    nfrontp += strlen(nfrontp);
-	    if (length == 4) {
-		sprintf(nfrontp, " ?%d?", pointer[3]);
-		nfrontp += strlen(nfrontp);
-		break;
-	    }
-	    sprintf(nfrontp, " %d %d (%d)",
-		pointer[3], pointer[4],
-		(int)((((unsigned int)pointer[3])<<8)|((unsigned int)pointer[4])));
-	    nfrontp += strlen(nfrontp);
-	    for (i = 5; i < length; i++) {
-		sprintf(nfrontp, " ?%d?", pointer[i]);
-		nfrontp += strlen(nfrontp);
-	    }
-	    break;
-
-	case TELOPT_LINEMODE:
-	    sprintf(nfrontp, "LINEMODE ");
-	    nfrontp += strlen(nfrontp);
-	    if (length < 2) {
-		sprintf(nfrontp, " (empty suboption??\?)");
-		nfrontp += strlen(nfrontp);
-		break;
-	    }
-	    switch (pointer[1]) {
-	    case WILL:
-		sprintf(nfrontp, "WILL ");
-		goto common;
-	    case WONT:
-		sprintf(nfrontp, "WONT ");
-		goto common;
-	    case DO:
-		sprintf(nfrontp, "DO ");
-		goto common;
-	    case DONT:
-		sprintf(nfrontp, "DONT ");
-	    common:
-		nfrontp += strlen(nfrontp);
-		if (length < 3) {
-		    sprintf(nfrontp, "(no option??\?)");
-		    nfrontp += strlen(nfrontp);
-		    break;
-		}
-		switch (pointer[2]) {
-		case LM_FORWARDMASK:
-		    sprintf(nfrontp, "Forward Mask");
-		    nfrontp += strlen(nfrontp);
-		    for (i = 3; i < length; i++) {
-			sprintf(nfrontp, " %x", pointer[i]);
-			nfrontp += strlen(nfrontp);
-		    }
-		    break;
-		default:
-		    sprintf(nfrontp, "%d (unknown)", pointer[2]);
-		    nfrontp += strlen(nfrontp);
-		    for (i = 3; i < length; i++) {
-			sprintf(nfrontp, " %d", pointer[i]);
-			nfrontp += strlen(nfrontp);
-		    }
-		    break;
-		}
-		break;
-
-	    case LM_SLC:
-		sprintf(nfrontp, "SLC");
-		nfrontp += strlen(nfrontp);
-		for (i = 2; i < length - 2; i += 3) {
-		    if (SLC_NAME_OK(pointer[i+SLC_FUNC]))
-			sprintf(nfrontp, " %s", SLC_NAME(pointer[i+SLC_FUNC]));
-		    else
-			sprintf(nfrontp, " %d", pointer[i+SLC_FUNC]);
-		    nfrontp += strlen(nfrontp);
-		    switch (pointer[i+SLC_FLAGS]&SLC_LEVELBITS) {
-		    case SLC_NOSUPPORT:
-			sprintf(nfrontp, " NOSUPPORT"); break;
-		    case SLC_CANTCHANGE:
-			sprintf(nfrontp, " CANTCHANGE"); break;
-		    case SLC_VARIABLE:
-			sprintf(nfrontp, " VARIABLE"); break;
-		    case SLC_DEFAULT:
-			sprintf(nfrontp, " DEFAULT"); break;
-		    }
-		    nfrontp += strlen(nfrontp);
-		    sprintf(nfrontp, "%s%s%s",
-			pointer[i+SLC_FLAGS]&SLC_ACK ? "|ACK" : "",
-			pointer[i+SLC_FLAGS]&SLC_FLUSHIN ? "|FLUSHIN" : "",
-			pointer[i+SLC_FLAGS]&SLC_FLUSHOUT ? "|FLUSHOUT" : "");
-		    nfrontp += strlen(nfrontp);
-		    if (pointer[i+SLC_FLAGS]& ~(SLC_ACK|SLC_FLUSHIN|
-						SLC_FLUSHOUT| SLC_LEVELBITS)) {
-			sprintf(nfrontp, "(0x%x)", pointer[i+SLC_FLAGS]);
-			nfrontp += strlen(nfrontp);
-		    }
-		    sprintf(nfrontp, " %d;", pointer[i+SLC_VALUE]);
-		    nfrontp += strlen(nfrontp);
-		    if ((pointer[i+SLC_VALUE] == IAC) &&
-			(pointer[i+SLC_VALUE+1] == IAC))
-				i++;
-		}
-		for (; i < length; i++) {
-		    sprintf(nfrontp, " ?%d?", pointer[i]);
-		    nfrontp += strlen(nfrontp);
-		}
-		break;
-
-	    case LM_MODE:
-		sprintf(nfrontp, "MODE ");
-		nfrontp += strlen(nfrontp);
-		if (length < 3) {
-		    sprintf(nfrontp, "(no mode??\?)");
-		    nfrontp += strlen(nfrontp);
-		    break;
-		}
-		{
-		    char tbuf[32];
-		    sprintf(tbuf, "%s%s%s%s%s",
-			pointer[2]&MODE_EDIT ? "|EDIT" : "",
-			pointer[2]&MODE_TRAPSIG ? "|TRAPSIG" : "",
-			pointer[2]&MODE_SOFT_TAB ? "|SOFT_TAB" : "",
-			pointer[2]&MODE_LIT_ECHO ? "|LIT_ECHO" : "",
-			pointer[2]&MODE_ACK ? "|ACK" : "");
-		    sprintf(nfrontp, "%s", tbuf[1] ? &tbuf[1] : "0");
-		    nfrontp += strlen(nfrontp);
-		}
-		if (pointer[2]&~(MODE_EDIT|MODE_TRAPSIG|MODE_ACK)) {
-		    sprintf(nfrontp, " (0x%x)", pointer[2]);
-		    nfrontp += strlen(nfrontp);
-		}
-		for (i = 3; i < length; i++) {
-		    sprintf(nfrontp, " ?0x%x?", pointer[i]);
-		    nfrontp += strlen(nfrontp);
-		}
-		break;
-	    default:
-		sprintf(nfrontp, "%d (unknown)", pointer[1]);
-		nfrontp += strlen(nfrontp);
-		for (i = 2; i < length; i++) {
-		    sprintf(nfrontp, " %d", pointer[i]);
-		    nfrontp += strlen(nfrontp);
-		}
-	    }
-	    break;
-
-	case TELOPT_STATUS: {
-	    register char *cp;
-	    register int j, k;
-
-	    sprintf(nfrontp, "STATUS");
-	    nfrontp += strlen(nfrontp);
-
-	    switch (pointer[1]) {
-	    default:
-		if (pointer[1] == TELQUAL_SEND)
-		    sprintf(nfrontp, " SEND");
-		else
-		    sprintf(nfrontp, " %d (unknown)", pointer[1]);
-		nfrontp += strlen(nfrontp);
-		for (i = 2; i < length; i++) {
-		    sprintf(nfrontp, " ?%d?", pointer[i]);
-		    nfrontp += strlen(nfrontp);
-		}
-		break;
-	    case TELQUAL_IS:
-		sprintf(nfrontp, " IS\r\n");
-		nfrontp += strlen(nfrontp);
-
-		for (i = 2; i < length; i++) {
-		    switch(pointer[i]) {
-		    case DO:	cp = "DO"; goto common2;
-		    case DONT:	cp = "DONT"; goto common2;
-		    case WILL:	cp = "WILL"; goto common2;
-		    case WONT:	cp = "WONT"; goto common2;
-		    common2:
-			i++;
-			if (TELOPT_OK(pointer[i]))
-			    sprintf(nfrontp, " %s %s", cp, TELOPT(pointer[i]));
-			else
-			    sprintf(nfrontp, " %s %d", cp, pointer[i]);
-			nfrontp += strlen(nfrontp);
-
-			sprintf(nfrontp, "\r\n");
-			nfrontp += strlen(nfrontp);
-			break;
-
-		    case SB:
-			sprintf(nfrontp, " SB ");
-			nfrontp += strlen(nfrontp);
-			i++;
-			j = k = i;
-			while (j < length) {
-			    if (pointer[j] == SE) {
-				if (j+1 == length)
-				    break;
-				if (pointer[j+1] == SE)
-				    j++;
-				else
-				    break;
-			    }
-			    pointer[k++] = pointer[j++];
-			}
-			printsub(0, &pointer[i], k - i);
-			if (i < length) {
-			    sprintf(nfrontp, " SE");
-			    nfrontp += strlen(nfrontp);
-			    i = j;
-			} else
-			    i = j - 1;
-
-			sprintf(nfrontp, "\r\n");
-			nfrontp += strlen(nfrontp);
-
-			break;
-
-		    default:
-			sprintf(nfrontp, " %d", pointer[i]);
-			nfrontp += strlen(nfrontp);
-			break;
-		    }
-		}
-		break;
-	    }
-	    break;
-	  }
-
-	case TELOPT_XDISPLOC:
-	    sprintf(nfrontp, "X-DISPLAY-LOCATION ");
-	    nfrontp += strlen(nfrontp);
-	    switch (pointer[1]) {
-	    case TELQUAL_IS:
-		sprintf(nfrontp, "IS \"%.*s\"", length-2, (char *)pointer+2);
-		break;
-	    case TELQUAL_SEND:
-		sprintf(nfrontp, "SEND");
-		break;
-	    default:
-		sprintf(nfrontp, "- unknown qualifier %d (0x%x).",
-				pointer[1], pointer[1]);
-	    }
-	    nfrontp += strlen(nfrontp);
-	    break;
-
-	case TELOPT_NEW_ENVIRON:
-	    sprintf(nfrontp, "NEW-ENVIRON ");
-	    goto env_common1;
-	case TELOPT_OLD_ENVIRON:
-	    sprintf(nfrontp, "OLD-ENVIRON");
-	env_common1:
-	    nfrontp += strlen(nfrontp);
-	    switch (pointer[1]) {
-	    case TELQUAL_IS:
-		sprintf(nfrontp, "IS ");
-		goto env_common;
-	    case TELQUAL_SEND:
-		sprintf(nfrontp, "SEND ");
-		goto env_common;
-	    case TELQUAL_INFO:
-		sprintf(nfrontp, "INFO ");
-	    env_common:
-		nfrontp += strlen(nfrontp);
-		{
-		    register int noquote = 2;
-		    for (i = 2; i < length; i++ ) {
-			switch (pointer[i]) {
-			case NEW_ENV_VAR:
-			    sprintf(nfrontp, "\" VAR " + noquote);
-			    nfrontp += strlen(nfrontp);
-			    noquote = 2;
-			    break;
-
-			case NEW_ENV_VALUE:
-			    sprintf(nfrontp, "\" VALUE " + noquote);
-			    nfrontp += strlen(nfrontp);
-			    noquote = 2;
-			    break;
-
-			case ENV_ESC:
-			    sprintf(nfrontp, "\" ESC " + noquote);
-			    nfrontp += strlen(nfrontp);
-			    noquote = 2;
-			    break;
-
-			case ENV_USERVAR:
-			    sprintf(nfrontp, "\" USERVAR " + noquote);
-			    nfrontp += strlen(nfrontp);
-			    noquote = 2;
-			    break;
-
-			default:
-			    if (isprint(pointer[i]) && pointer[i] != '"') {
-				if (noquote) {
-				    *nfrontp++ = '"';
-				    noquote = 0;
-				}
-				*nfrontp++ = pointer[i];
-			    } else {
-				sprintf(nfrontp, "\" %03o " + noquote,
-							pointer[i]);
-				nfrontp += strlen(nfrontp);
-				noquote = 2;
-			    }
-			    break;
-			}
-		    }
-		    if (!noquote)
-			*nfrontp++ = '"';
-		    break;
-		}
-	    }
-	    break;
-
-#if	defined(AUTHENTICATION)
-	case TELOPT_AUTHENTICATION:
-	    sprintf(nfrontp, "AUTHENTICATION");
-	    nfrontp += strlen(nfrontp);
-
-	    if (length < 2) {
-		sprintf(nfrontp, " (empty suboption??\?)");
-		nfrontp += strlen(nfrontp);
-		break;
-	    }
-	    switch (pointer[1]) {
-	    case TELQUAL_REPLY:
-	    case TELQUAL_IS:
-		sprintf(nfrontp, " %s ", (pointer[1] == TELQUAL_IS) ?
-							"IS" : "REPLY");
-		nfrontp += strlen(nfrontp);
-		if (AUTHTYPE_NAME_OK(pointer[2]))
-		    sprintf(nfrontp, "%s ", AUTHTYPE_NAME(pointer[2]));
-		else
-		    sprintf(nfrontp, "%d ", pointer[2]);
-		nfrontp += strlen(nfrontp);
-		if (length < 3) {
-		    sprintf(nfrontp, "(partial suboption??\?)");
-		    nfrontp += strlen(nfrontp);
-		    break;
-		}
-		sprintf(nfrontp, "%s|%s",
-			((pointer[3] & AUTH_WHO_MASK) == AUTH_WHO_CLIENT) ?
-			"CLIENT" : "SERVER",
-			((pointer[3] & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) ?
-			"MUTUAL" : "ONE-WAY");
-		nfrontp += strlen(nfrontp);
-
-    		{
-		    char buf[512];
-		    auth_printsub(&pointer[1], length - 1, buf, sizeof(buf));
-		    sprintf(nfrontp, "%s", buf);
-		}
-		nfrontp += strlen(nfrontp);
-		break;
-
-	    case TELQUAL_SEND:
-		i = 2;
-		sprintf(nfrontp, " SEND ");
-		nfrontp += strlen(nfrontp);
-		while (i < length) {
-		    if (AUTHTYPE_NAME_OK(pointer[i]))
-			sprintf(nfrontp, "%s ", AUTHTYPE_NAME(pointer[i]));
-		    else
-			sprintf(nfrontp, "%d ", pointer[i]);
-		    nfrontp += strlen(nfrontp);
-		    if (++i >= length) {
-			sprintf(nfrontp, "(partial suboption??\?)");
-			nfrontp += strlen(nfrontp);
-			break;
-		    }
-		    sprintf(nfrontp, "%s|%s ",
-			((pointer[i] & AUTH_WHO_MASK) == AUTH_WHO_CLIENT) ?
-							"CLIENT" : "SERVER",
-			((pointer[i] & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) ?
-							"MUTUAL" : "ONE-WAY");
-		    nfrontp += strlen(nfrontp);
-		    ++i;
-		}
-		break;
-
-	    case TELQUAL_NAME:
-		i = 2;
-		sprintf(nfrontp, " NAME \"");
-		nfrontp += strlen(nfrontp);
-		while (i < length)
-		    *nfrontp += pointer[i++];
-		*nfrontp += '"';
-		break;
-
-	    default:
-		    for (i = 2; i < length; i++) {
-			sprintf(nfrontp, " ?%d?", pointer[i]);
-			nfrontp += strlen(nfrontp);
-		    }
-		    break;
-	    }
-	    break;
-#endif
-
-#ifdef	ENCRYPTION
-	case TELOPT_ENCRYPT:
-	    sprintf(nfrontp, "ENCRYPT");
-	    nfrontp += strlen(nfrontp);
-	    if (length < 2) {
-		sprintf(nfrontp, " (empty suboption??\?)");
-		nfrontp += strlen(nfrontp);
-		break;
-	    }
-	    switch (pointer[1]) {
-	    case ENCRYPT_START:
-		sprintf(nfrontp, " START");
-		nfrontp += strlen(nfrontp);
-		break;
-
-	    case ENCRYPT_END:
-		sprintf(nfrontp, " END");
-		nfrontp += strlen(nfrontp);
-		break;
-
-	    case ENCRYPT_REQSTART:
-		sprintf(nfrontp, " REQUEST-START");
-		nfrontp += strlen(nfrontp);
-		break;
-
-	    case ENCRYPT_REQEND:
-		sprintf(nfrontp, " REQUEST-END");
-		nfrontp += strlen(nfrontp);
-		break;
-
-	    case ENCRYPT_IS:
-	    case ENCRYPT_REPLY:
-		sprintf(nfrontp, " %s ", (pointer[1] == ENCRYPT_IS) ?
-							"IS" : "REPLY");
-		nfrontp += strlen(nfrontp);
-		if (length < 3) {
-		    sprintf(nfrontp, " (partial suboption??\?)");
-		    nfrontp += strlen(nfrontp);
-		    break;
-		}
-		if (ENCTYPE_NAME_OK(pointer[2]))
-		    sprintf(nfrontp, "%s ", ENCTYPE_NAME(pointer[2]));
-		else
-		    sprintf(nfrontp, " %d (unknown)", pointer[2]);
-		nfrontp += strlen(nfrontp);
-
-		{
-		    char buf[512];
-		    encrypt_printsub(&pointer[1], length - 1, buf, sizeof(buf));
-		    sprintf(nfrontp, "%s", buf);
-		}
-		nfrontp += strlen(nfrontp);
-		break;
-
-	    case ENCRYPT_SUPPORT:
-		i = 2;
-		sprintf(nfrontp, " SUPPORT ");
-		nfrontp += strlen(nfrontp);
-		while (i < length) {
-		    if (ENCTYPE_NAME_OK(pointer[i]))
-			sprintf(nfrontp, "%s ", ENCTYPE_NAME(pointer[i]));
-		    else
-			sprintf(nfrontp, "%d ", pointer[i]);
-		    nfrontp += strlen(nfrontp);
-		    i++;
-		}
-		break;
-
-	    case ENCRYPT_ENC_KEYID:
-		sprintf(nfrontp, " ENC_KEYID");
-		nfrontp += strlen(nfrontp);
-		goto encommon;
-
-	    case ENCRYPT_DEC_KEYID:
-		sprintf(nfrontp, " DEC_KEYID");
-		nfrontp += strlen(nfrontp);
-		goto encommon;
-
-	    default:
-		sprintf(nfrontp, " %d (unknown)", pointer[1]);
-		nfrontp += strlen(nfrontp);
-	    encommon:
-		for (i = 2; i < length; i++) {
-		    sprintf(nfrontp, " %d", pointer[i]);
-		    nfrontp += strlen(nfrontp);
-		}
-		break;
-	    }
-	    break;
-#endif	/* ENCRYPTION */
-
-	default:
-	    if (TELOPT_OK(pointer[0]))
-		sprintf(nfrontp, "%s (unknown)", TELOPT(pointer[0]));
-	    else
-		sprintf(nfrontp, "%d (unknown)", pointer[i]);
-	    nfrontp += strlen(nfrontp);
-	    for (i = 1; i < length; i++) {
-		sprintf(nfrontp, " %d", pointer[i]);
-		nfrontp += strlen(nfrontp);
-	    }
-	    break;
-	}
-	sprintf(nfrontp, "\r\n");
-	nfrontp += strlen(nfrontp);
-}
-
-/*
- * Dump a data buffer in hex and ascii to the output data stream.
- */
-	void
-printdata(tag, ptr, cnt)
-	register char *tag;
-	register char *ptr;
-	register int cnt;
-{
-	register int i;
-	char xbuf[30];
-
-	while (cnt) {
-		/* flush net output buffer if no room for new data) */
-		if ((&netobuf[BUFSIZ] - nfrontp) < 80) {
-			netflush();
-		}
-
-		/* add a line of output */
-		sprintf(nfrontp, "%s: ", tag);
-		nfrontp += strlen(nfrontp);
-		for (i = 0; i < 20 && cnt; i++) {
-			sprintf(nfrontp, "%02x", *ptr);
-			nfrontp += strlen(nfrontp);
-			if (isprint(*ptr)) {
-				xbuf[i] = *ptr;
-			} else {
-				xbuf[i] = '.';
-			}
-			if (i % 2) {
-				*nfrontp = ' ';
-				nfrontp++;
-			}
-			cnt--;
-			ptr++;
-		}
-		xbuf[i] = '\0';
-		sprintf(nfrontp, " %s\r\n", xbuf );
-		nfrontp += strlen(nfrontp);
-	}
-}
-#endif /* DIAGNOSTICS */
diff --git a/etc/MAKEDEV.local b/etc/MAKEDEV.local
index 06cc074dc401..48129a58e66b 100644
--- a/etc/MAKEDEV.local
+++ b/etc/MAKEDEV.local
@@ -31,7 +31,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/MAKEDEV.local,v 1.2.2.1 1999/08/29 14:18:36 peter Exp $
 #	@(#)MAKEDEV.local	5.1 (Berkeley) 3/22/91
 #
 
diff --git a/etc/Makefile b/etc/Makefile
index d7e90d46d605..4a84e1a2b6ea 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-# $FreeBSD$
+# $FreeBSD: src/etc/Makefile,v 1.187.2.12 1999/08/29 14:18:36 peter Exp $
 
 SUBDIR=	sendmail
 
diff --git a/etc/aliases b/etc/aliases
index 3ecde877d1dc..33f756801c62 100644
--- a/etc/aliases
+++ b/etc/aliases
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/aliases,v 1.8.2.2 1999/08/29 14:18:37 peter Exp $
 #	@(#)aliases	5.3 (Berkeley) 5/24/90
 #
 #  Aliases in this file will NOT be expanded in the header from
diff --git a/etc/apmd.conf b/etc/apmd.conf
index 9733eb476a92..7675eec0fe81 100644
--- a/etc/apmd.conf
+++ b/etc/apmd.conf
@@ -1,6 +1,6 @@
 # apmd Configration File
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/apmd.conf,v 1.1.2.2 1999/08/29 14:18:38 peter Exp $
 #
 
 apm_event SUSPENDREQ {
diff --git a/etc/auth.conf b/etc/auth.conf
index afdf552cb9a3..d4dcfa71b1d7 100644
--- a/etc/auth.conf
+++ b/etc/auth.conf
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/auth.conf,v 1.1.2.1 1999/08/29 14:18:39 peter Exp $
 #
 # This file contains information on what types of authentication to use.
 # It is just the beginnings of a greater scheme.
diff --git a/etc/crontab b/etc/crontab
index affe315a9d34..f90ab445d96a 100644
--- a/etc/crontab
+++ b/etc/crontab
@@ -1,6 +1,6 @@
 # /etc/crontab - root's crontab for FreeBSD
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/crontab,v 1.18.2.2 1999/08/29 14:18:39 peter Exp $
 #
 SHELL=/bin/sh
 PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin
diff --git a/etc/csh.cshrc b/etc/csh.cshrc
index f4f775ae6ada..5eb6b81c1ec3 100644
--- a/etc/csh.cshrc
+++ b/etc/csh.cshrc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/csh.cshrc,v 1.2.2.1 1999/08/29 14:18:40 peter Exp $
 #
 # System-wide .cshrc file for csh(1).
diff --git a/etc/csh.login b/etc/csh.login
index dd603492c7eb..156e26d8dfdc 100644
--- a/etc/csh.login
+++ b/etc/csh.login
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/csh.login,v 1.18.2.1 1999/08/29 14:18:40 peter Exp $
 #
 # System-wide .login file for csh(1).
 # Uncomment this to give you the default 4.2 behavior, where disk 
diff --git a/etc/csh.logout b/etc/csh.logout
index 6b0584f49984..5b52b94d8868 100644
--- a/etc/csh.logout
+++ b/etc/csh.logout
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/csh.logout,v 1.2.2.1 1999/08/29 14:18:41 peter Exp $
 #
 # System-wide .logout file for csh(1).
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 134ed1a334cf..81e8aa3f34e4 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -9,7 +9,7 @@
 #
 # All arguments must be in double or single quotes.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.1.2.18 1999/11/28 16:02:30 brian Exp $
 
 ##############################################################
 ### Important initial Boot-time options  #####################
diff --git a/etc/dhclient.conf b/etc/dhclient.conf
index 36d4e09824d7..6a24564edec1 100644
--- a/etc/dhclient.conf
+++ b/etc/dhclient.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/dhclient.conf,v 1.1.2.2 1999/08/29 14:18:41 peter Exp $
 #
 #	This file is required by the ISC DHCP client.
 #	See ``man 5 dhclient.conf'' for details.
diff --git a/etc/dm.conf b/etc/dm.conf
index 63fad93ba2ec..924d058d4a48 100644
--- a/etc/dm.conf
+++ b/etc/dm.conf
@@ -1,6 +1,6 @@
 #
 # Game Control File
-# $FreeBSD$
+# $FreeBSD: src/etc/dm.conf,v 1.2.2.1 1999/08/29 14:18:41 peter Exp $
 #	@(#)dm.conf	5.5 (Berkeley) 4/12/89
 #
 
diff --git a/etc/etc.alpha/MAKEDEV b/etc/etc.alpha/MAKEDEV
index 58439102aa2a..125ffddd10ef 100644
--- a/etc/etc.alpha/MAKEDEV
+++ b/etc/etc.alpha/MAKEDEV
@@ -108,7 +108,7 @@
 #	pci	PCI configuration-space access from user mode
 #	ipl	ipfilter control devices (ipl, ipnat, ipstate, ipauth)
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/etc.alpha/MAKEDEV,v 1.3.2.8 1999/10/12 15:58:07 gibbs Exp $
 #	from etc.i386 MAKEDEV,v 1.171 1998/09/15 10:21:35 gibbs Exp
 #
 
diff --git a/etc/etc.alpha/disktab b/etc/etc.alpha/disktab
index 63a26e2a6890..6d05519d876f 100644
--- a/etc/etc.alpha/disktab
+++ b/etc/etc.alpha/disktab
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/etc.alpha/disktab,v 1.3.2.1 1999/08/29 14:19:08 peter Exp $
 #
 # Disk geometry and partition layout tables. 
 # Key:
diff --git a/etc/etc.alpha/rc.alpha b/etc/etc.alpha/rc.alpha
index c4adc2d0bd86..e689a1ef4f2c 100644
--- a/etc/etc.alpha/rc.alpha
+++ b/etc/etc.alpha/rc.alpha
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/etc.alpha/rc.alpha,v 1.2.2.2 1999/08/29 14:19:09 peter Exp $
 #	Do alpha specific processing
 #
 
diff --git a/etc/etc.alpha/ttys b/etc/etc.alpha/ttys
index 86f9a398de8f..edcd53497739 100644
--- a/etc/etc.alpha/ttys
+++ b/etc/etc.alpha/ttys
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/etc.alpha/ttys,v 1.3.2.3 1999/08/29 14:19:09 peter Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index 65105d924280..7d994f5a6584 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -129,7 +129,7 @@
 #	ipl	ipfilter control devices (ipl, ipnat, ipstate, ipauth)
 #	kbd	keyboard devices
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/etc.i386/MAKEDEV,v 1.183.2.16 1999/11/15 22:14:50 joe Exp $
 #
 
 PATH=/sbin:/bin/:/usr/bin:/usr/sbin:$PATH
diff --git a/etc/etc.i386/disktab b/etc/etc.i386/disktab
index b75351a81c1b..9f39f372699e 100644
--- a/etc/etc.i386/disktab
+++ b/etc/etc.i386/disktab
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/etc.i386/disktab,v 1.18.2.1 1999/08/29 14:19:12 peter Exp $
 #
 # Disk geometry and partition layout tables. 
 # Key:
diff --git a/etc/etc.i386/rc.i386 b/etc/etc.i386/rc.i386
index fbd424374acb..4e6ef859cd1b 100644
--- a/etc/etc.i386/rc.i386
+++ b/etc/etc.i386/rc.i386
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/etc.i386/rc.i386,v 1.37.2.5 1999/09/15 17:43:08 obrien Exp $
 #	Do i386 specific processing
 #
 
diff --git a/etc/etc.i386/ttys b/etc/etc.i386/ttys
index c38b0f0dc4b7..8f5d516814b4 100644
--- a/etc/etc.i386/ttys
+++ b/etc/etc.i386/ttys
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/etc.i386/ttys,v 1.2.2.4 1999/08/29 14:19:13 peter Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
diff --git a/etc/ftpusers b/etc/ftpusers
index 713d0bcb1709..400c1df2c94d 100644
--- a/etc/ftpusers
+++ b/etc/ftpusers
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/ftpusers,v 1.4.2.2 1999/08/29 14:18:42 peter Exp $
 #
 # list of users disallowed any ftp access.
 # read by ftpd(8).
diff --git a/etc/gettytab b/etc/gettytab
index ea6180988504..bd9c9f12bfbf 100644
--- a/etc/gettytab
+++ b/etc/gettytab
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/gettytab,v 1.16.2.1 1999/08/29 14:18:43 peter Exp $
 #	from: @(#)gettytab	5.14 (Berkeley) 3/27/91
 #
 # Most of the table entries here are just copies of the old getty table,
diff --git a/etc/group b/etc/group
index 2418c29c0085..48b0215fa25a 100644
--- a/etc/group
+++ b/etc/group
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/group,v 1.18.2.1 1999/08/29 14:18:43 peter Exp $
 #
 wheel:*:0:root
 daemon:*:1:daemon
diff --git a/etc/host.conf b/etc/host.conf
index f6d28754b5f2..d1490dfd15b1 100644
--- a/etc/host.conf
+++ b/etc/host.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/host.conf,v 1.5.2.1 1999/08/29 14:18:44 peter Exp $
 # First try the /etc/hosts file
 hosts
 # Now try the nameserver next.
diff --git a/etc/hosts b/etc/hosts
index 51e98ea93604..d384d38902f4 100644
--- a/etc/hosts
+++ b/etc/hosts
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/hosts,v 1.9.2.1 1999/08/29 14:18:44 peter Exp $
 #
 # Host Database
 # This file should contain the addresses and aliases
diff --git a/etc/hosts.allow b/etc/hosts.allow
index 06ec81841d4f..7a1f35c50800 100644
--- a/etc/hosts.allow
+++ b/etc/hosts.allow
@@ -1,6 +1,6 @@
 #
 # hosts.allow access control file for "tcp wrapped" apps.
-# $FreeBSD$
+# $FreeBSD: src/etc/hosts.allow,v 1.2.2.5 1999/08/29 14:18:45 peter Exp $
 #
 # NOTE: The hosts.deny file is not longer used.  Instead, put both 'allow'
 #       and 'deny' rules in the hosts.allow file.
diff --git a/etc/hosts.equiv b/etc/hosts.equiv
index d8a71c1ebc7f..583f034cabd2 100644
--- a/etc/hosts.equiv
+++ b/etc/hosts.equiv
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/hosts.equiv,v 1.3.2.1 1999/08/29 14:18:45 peter Exp $
 #
 #localhost
 #my_very_good_friend.domain
diff --git a/etc/hosts.lpd b/etc/hosts.lpd
index b53202ab18e5..87bb98540680 100644
--- a/etc/hosts.lpd
+++ b/etc/hosts.lpd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/hosts.lpd,v 1.3.2.1 1999/08/29 14:18:46 peter Exp $
 #
 # See lpd(8)
 #machine.domain
diff --git a/etc/inetd.conf b/etc/inetd.conf
index 1fd42462dcd3..0536735b0e81 100644
--- a/etc/inetd.conf
+++ b/etc/inetd.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/inetd.conf,v 1.33.2.4 1999/11/18 09:45:15 des Exp $
 #
 # Internet server configuration database
 #
diff --git a/etc/isdn/Makefile b/etc/isdn/Makefile
index 7e4cd556bbad..f75557cfc8a1 100644
--- a/etc/isdn/Makefile
+++ b/etc/isdn/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/Makefile,v 1.2.2.2 1999/11/16 17:39:04 joe Exp $
 
 I4BETCPROG=	answer		\
 		isdntel.sh	\
diff --git a/etc/isdn/answer b/etc/isdn/answer
index d39a98331206..d390fa026ea7 100755
--- a/etc/isdn/answer
+++ b/etc/isdn/answer
@@ -4,7 +4,7 @@
 #	answer script for i4b isdnd
 #	---------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/answer,v 1.1.2.2 1999/11/16 17:39:04 joe Exp $
 #
 #	last edit-date: [Thu May 20 11:44:38 1999]
 #
diff --git a/etc/isdn/isdnd.rates.D b/etc/isdn/isdnd.rates.D
index 430f9dafc2a9..a6aad8db8388 100644
--- a/etc/isdn/isdnd.rates.D
+++ b/etc/isdn/isdnd.rates.D
@@ -3,7 +3,7 @@
 #	i4b - Deutsche Telekom charging rates config file
 #	-------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/isdnd.rates.D,v 1.1.2.2 1999/11/16 17:39:05 joe Exp $
 #
 #	last edit-date: [Sun Jan 17 18:38:29 1999]
 #
diff --git a/etc/isdn/isdnd.rates.F b/etc/isdn/isdnd.rates.F
index 14d772df6630..db7005db5f4c 100644
--- a/etc/isdn/isdnd.rates.F
+++ b/etc/isdn/isdnd.rates.F
@@ -3,7 +3,7 @@
 #	i4b - Tarifs France Telecom
 #	---------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/isdnd.rates.F,v 1.1.2.1 1999/08/29 14:19:16 peter Exp $
 #
 #	last edit-date: [Thu Mar 19 20:05:18 1998]
 #
diff --git a/etc/isdn/isdnd.rates.UK.BT b/etc/isdn/isdnd.rates.UK.BT
index c4d34ec3a6d6..274ee910a9a3 100644
--- a/etc/isdn/isdnd.rates.UK.BT
+++ b/etc/isdn/isdnd.rates.UK.BT
@@ -3,7 +3,7 @@
 #	i4b - BT charges
 #	-------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/isdnd.rates.UK.BT,v 1.2.2.1 1999/11/16 17:39:05 joe Exp $
 #
 #	Barry A. Scott barry@scottb.demon.co.uk
 #
diff --git a/etc/isdn/isdnd.rc.sample b/etc/isdn/isdnd.rc.sample
index 6681ed3bc2e7..3a1734a42149 100644
--- a/etc/isdn/isdnd.rc.sample
+++ b/etc/isdn/isdnd.rc.sample
@@ -3,7 +3,7 @@
 #	example of a configuration file for the isdn daemon
 #	---------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/isdnd.rc.sample,v 1.1.2.1 1999/08/29 14:19:16 peter Exp $
 #
 #	last edit-date: [Tue Jan 19 16:30:12 1999]
 #
diff --git a/etc/isdn/isdntel.alias.sample b/etc/isdn/isdntel.alias.sample
index c06bc1942a08..20678b2ce37d 100644
--- a/etc/isdn/isdntel.alias.sample
+++ b/etc/isdn/isdntel.alias.sample
@@ -3,7 +3,7 @@
 #	alias file for the isdntel(1) application
 #	-----------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/isdntel.alias.sample,v 1.1.2.1 1999/08/29 14:19:17 peter Exp $
 #
 #	last edit-date: [Fri Dec 18 18:06:03 1998]
 #
diff --git a/etc/isdn/isdntel.sh b/etc/isdn/isdntel.sh
index 14f528a80927..6eec3c95aaec 100755
--- a/etc/isdn/isdntel.sh
+++ b/etc/isdn/isdntel.sh
@@ -4,7 +4,7 @@
 #	isdn telephone answering
 #	-------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/isdntel.sh,v 1.1.2.2 1999/11/16 17:39:06 joe Exp $
 #
 #	last edit-date: [Thu May 20 11:45:04 1999]
 #
diff --git a/etc/isdn/record b/etc/isdn/record
index 61591fbfe6e6..7cd8048e33b9 100755
--- a/etc/isdn/record
+++ b/etc/isdn/record
@@ -4,7 +4,7 @@
 #	answer and record message script for i4b isdnd
 #	----------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/record,v 1.1.2.2 1999/11/16 17:39:06 joe Exp $
 #
 #	last edit-date: [Thu May 20 11:45:10 1999]
 #
diff --git a/etc/isdn/tell b/etc/isdn/tell
index 047c834b51f6..1ca41eb813ec 100755
--- a/etc/isdn/tell
+++ b/etc/isdn/tell
@@ -4,7 +4,7 @@
 #	tell called and calling numbers answer script for i4b isdnd
 #	-----------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/tell,v 1.1.2.2 1999/11/16 17:39:07 joe Exp $
 #
 #	last edit-date: [Thu May 20 11:45:15 1999]
 #
diff --git a/etc/isdn/tell-record b/etc/isdn/tell-record
index b081a0f87d5f..93816d406761 100755
--- a/etc/isdn/tell-record
+++ b/etc/isdn/tell-record
@@ -4,7 +4,7 @@
 #	tell called and calling numbers answer script for i4b isdnd
 #	-----------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/tell-record,v 1.1.2.2 1999/11/16 17:39:07 joe Exp $
 #
 #	last edit-date: [Thu May 20 11:45:21 1999]
 #
diff --git a/etc/kerberosIV/README b/etc/kerberosIV/README
index cdec6b120d36..e15287551cb3 100644
--- a/etc/kerberosIV/README
+++ b/etc/kerberosIV/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/kerberosIV/README,v 1.2.2.1 1999/08/29 14:19:21 peter Exp $
 #	@(#)README	5.1 (Berkeley) 6/30/90
 
 Notes about the contents of the /etc/kerberosIV directory:
diff --git a/etc/login.access b/etc/login.access
index 8d20467d02e0..b62587201e13 100644
--- a/etc/login.access
+++ b/etc/login.access
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/login.access,v 1.2.2.1 1999/08/29 14:18:47 peter Exp $
 #
 # Login access control table.
 # 
diff --git a/etc/login.conf b/etc/login.conf
index ac60b1ad7651..d1589cd30363 100644
--- a/etc/login.conf
+++ b/etc/login.conf
@@ -9,7 +9,7 @@
 # This file controls resource limits, accounting limits and
 # default user environment settings.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/login.conf,v 1.26.2.5 1999/09/10 15:10:57 sheldonh Exp $
 #
 
 # Default settings effectively disable resource limits, see the
diff --git a/etc/mail/Makefile b/etc/mail/Makefile
index 9c053f97d3c9..137aae1f03db 100644
--- a/etc/mail/Makefile
+++ b/etc/mail/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mail/Makefile,v 1.5.2.3 1999/08/29 14:19:23 peter Exp $
 
 install:
 	/usr/sbin/makemap hash /etc/mail/access < /etc/mail/access
diff --git a/etc/mail/README b/etc/mail/README
index 60f473e1765f..589fe1cb5554 100644
--- a/etc/mail/README
+++ b/etc/mail/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mail/README,v 1.5.2.3 1999/08/29 14:19:23 peter Exp $
 
 		Filtering out SPAM from your site
         Sendmail now includes excellent tools block spam.  These
diff --git a/etc/make.conf b/etc/make.conf
index ab035c17b473..7d676e035867 100644
--- a/etc/make.conf
+++ b/etc/make.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/make.conf,v 1.73.2.8 1999/09/19 21:57:44 billf Exp $
 #
 # This file, if present, will be read by make (see /usr/share/mk/sys.mk).
 # It allows you to override macro definitions to make without changing
diff --git a/etc/modems b/etc/modems
index 422c5ffd32e0..5946f518ea3c 100644
--- a/etc/modems
+++ b/etc/modems
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/modems,v 1.3.2.1 1999/08/29 14:18:48 peter Exp $
 #	@(#)modems	3/24/95
 #
 # modems -- modem configuration data base file
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index 2c3483f9885d..cb2d54f5dafc 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.24.2.2 1999/11/22 07:08:03 julian Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
diff --git a/etc/mtree/BSD.local.dist b/etc/mtree/BSD.local.dist
index 6ace0aedbcc1..4bacbdb95a2b 100644
--- a/etc/mtree/BSD.local.dist
+++ b/etc/mtree/BSD.local.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.44.2.3 1999/08/29 14:19:25 peter Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
diff --git a/etc/mtree/BSD.release.dist b/etc/mtree/BSD.release.dist
index 124a5d138f6e..a7d3e2bbb374 100644
--- a/etc/mtree/BSD.release.dist
+++ b/etc/mtree/BSD.release.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/BSD.release.dist,v 1.4.2.1 1999/08/29 14:19:25 peter Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index bb6a128406ee..43cb23c05439 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.37.2.3 1999/08/29 14:19:25 peter Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index b43f2223a80d..320d72347569 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.146.2.10 1999/09/12 00:09:29 jkh Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist
index 48c82eb5a305..4001a8eaf44d 100644
--- a/etc/mtree/BSD.var.dist
+++ b/etc/mtree/BSD.var.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/BSD.var.dist,v 1.38.2.3 1999/08/29 14:19:26 peter Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
diff --git a/etc/mtree/BSD.x11.dist b/etc/mtree/BSD.x11.dist
index c14566f9e648..881e3ea8fc68 100644
--- a/etc/mtree/BSD.x11.dist
+++ b/etc/mtree/BSD.x11.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/BSD.x11.dist,v 1.4.2.1 1999/08/29 14:19:27 peter Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
diff --git a/etc/namedb/PROTO.localhost.rev b/etc/namedb/PROTO.localhost.rev
index 5b293106348b..1b141630bddd 100644
--- a/etc/namedb/PROTO.localhost.rev
+++ b/etc/namedb/PROTO.localhost.rev
@@ -1,5 +1,5 @@
 ;	From: @(#)localhost.rev	5.1 (Berkeley) 6/30/90
-; $FreeBSD$
+; $FreeBSD: src/etc/namedb/PROTO.localhost.rev,v 1.4.2.1 1999/08/29 14:19:29 peter Exp $
 ;
 ; This file is automatically edited by the `make-localhost' script in
 ; the /etc/namedb directory.
diff --git a/etc/namedb/make-localhost b/etc/namedb/make-localhost
index cc6a1083f4d0..fe4869059834 100755
--- a/etc/namedb/make-localhost
+++ b/etc/namedb/make-localhost
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/namedb/make-localhost,v 1.3.2.1 1999/08/29 14:19:30 peter Exp $
 #
 # make-localhost - edit the appropriate local information into
 # /etc/namedb/localhost.rev
diff --git a/etc/namedb/named.conf b/etc/namedb/named.conf
index 9ba5f51b2c73..884fdfce7a11 100644
--- a/etc/namedb/named.conf
+++ b/etc/namedb/named.conf
@@ -1,4 +1,4 @@
-// $FreeBSD$
+// $FreeBSD: src/etc/namedb/named.conf,v 1.5.2.1 1999/08/29 14:19:30 peter Exp $
 //
 // Refer to the named(8) man page for details.  If you are ever going
 // to setup a primary server, make sure you've understood the hairy
diff --git a/etc/netstart b/etc/netstart
index 21e67edc9546..87654210fc73 100755
--- a/etc/netstart
+++ b/etc/netstart
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/netstart,v 1.52.2.2 1999/08/29 14:18:49 peter Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # This file is NOT called by any of the other scripts - it has been
diff --git a/etc/networks b/etc/networks
index a6b15d4519b7..beab97d7cf23 100644
--- a/etc/networks
+++ b/etc/networks
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/networks,v 1.2.2.1 1999/08/29 14:18:49 peter Exp $
 #	@(#)networks	5.1 (Berkeley) 6/30/90
 #
 # Your Local Networks Database
diff --git a/etc/newsyslog.conf b/etc/newsyslog.conf
index 6a0343c6a8bd..289717094ba3 100644
--- a/etc/newsyslog.conf
+++ b/etc/newsyslog.conf
@@ -1,5 +1,5 @@
 # configuration file for newsyslog
-# $FreeBSD$
+# $FreeBSD: src/etc/newsyslog.conf,v 1.16.2.3 1999/08/29 14:18:51 peter Exp $
 #
 # logfilename          [owner.group]    mode count size when [ZB] [/pid_file] [sig_num]
 /var/cron/log				600  3	   100  *     Z
diff --git a/etc/pam.conf b/etc/pam.conf
index 3f66affcbcb5..0db3ec40213d 100644
--- a/etc/pam.conf
+++ b/etc/pam.conf
@@ -7,7 +7,7 @@
 # work quite right.  If you delete the final entry, be sure to change
 # "sufficient" to "required" in the entry before it.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.conf,v 1.1 1998/11/20 23:20:01 jdp Exp $
 
 # If the user can authenticate with S/Key, that's sufficient.
 login	auth	sufficient	pam_skey.so
diff --git a/etc/pccard.conf.sample b/etc/pccard.conf.sample
index 52fa45e9b934..49cfb56401b6 100644
--- a/etc/pccard.conf.sample
+++ b/etc/pccard.conf.sample
@@ -8,7 +8,7 @@
 # IRQ == 0 means "allocate free IRQ from IRQ pool"
 # IRQ == 16 means "do not use IRQ (e.g. PIO mode)"
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pccard.conf.sample,v 1.24.2.15 1999/11/16 17:48:38 roger Exp $
 
 # Generally available IO ports
 io	0x240-0x360
diff --git a/etc/pccard_ether b/etc/pccard_ether
index 939fac1d89b7..7a8e523868ef 100755
--- a/etc/pccard_ether
+++ b/etc/pccard_ether
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pccard_ether,v 1.9.2.3 1999/08/29 14:18:52 peter Exp $
 #
 # pccard_ether interfacename [ifconfig option]
 #
diff --git a/etc/periodic/Makefile b/etc/periodic/Makefile
index 4c1fda48ae91..4886de1ee62c 100644
--- a/etc/periodic/Makefile
+++ b/etc/periodic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/Makefile,v 1.1.1.1.2.1 1999/08/29 14:19:32 peter Exp $
 
 SUBDIR=	daily weekly monthly
 
diff --git a/etc/periodic/Makefile.inc b/etc/periodic/Makefile.inc
index aba831316adf..4dabf0435680 100644
--- a/etc/periodic/Makefile.inc
+++ b/etc/periodic/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/Makefile.inc,v 1.3.2.1 1999/08/29 14:19:33 peter Exp $
 
 BINDIR=	/etc/periodic/${.CURDIR:T}
 NOOBJ=
diff --git a/etc/periodic/daily/100.clean-disks b/etc/periodic/daily/100.clean-disks
index e6b744aa89ec..c1de12a5f279 100755
--- a/etc/periodic/daily/100.clean-disks
+++ b/etc/periodic/daily/100.clean-disks
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/100.clean-disks,v 1.1.1.1.2.2 1999/08/29 14:19:34 peter Exp $
 #
 
 exit 0		# do not run by default
diff --git a/etc/periodic/daily/110.clean-tmps b/etc/periodic/daily/110.clean-tmps
index 78d817eeba72..515a8b504516 100755
--- a/etc/periodic/daily/110.clean-tmps
+++ b/etc/periodic/daily/110.clean-tmps
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/110.clean-tmps,v 1.3.2.3 1999/08/29 14:19:35 peter Exp $
 #
 # Use at your own risk, but for a long-living system, this might come
 # more useful than the boot-time cleaning of /tmp.  If /var/tmp and
diff --git a/etc/periodic/daily/120.clean-preserve b/etc/periodic/daily/120.clean-preserve
index 37278c10556e..662bda50bb3c 100755
--- a/etc/periodic/daily/120.clean-preserve
+++ b/etc/periodic/daily/120.clean-preserve
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/120.clean-preserve,v 1.2.2.2 1999/08/29 14:19:35 peter Exp $
 #
 
 if [ -d /var/preserve ]; then
diff --git a/etc/periodic/daily/130.clean-msgs b/etc/periodic/daily/130.clean-msgs
index 066581bf7748..47d130804129 100755
--- a/etc/periodic/daily/130.clean-msgs
+++ b/etc/periodic/daily/130.clean-msgs
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/130.clean-msgs,v 1.2.2.1 1999/08/29 14:19:36 peter Exp $
 #
 # remove system	messages older than 21 days
 #
diff --git a/etc/periodic/daily/140.clean-rwho b/etc/periodic/daily/140.clean-rwho
index 71ac4ae3fe79..45df80ecd3c6 100755
--- a/etc/periodic/daily/140.clean-rwho
+++ b/etc/periodic/daily/140.clean-rwho
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/140.clean-rwho,v 1.2.2.2 1999/08/29 14:19:37 peter Exp $
 #
 
 if [ -d /var/rwho ] ; then
diff --git a/etc/periodic/daily/200.backup-passwd b/etc/periodic/daily/200.backup-passwd
index 43b12a88582e..43e256b0dbed 100755
--- a/etc/periodic/daily/200.backup-passwd
+++ b/etc/periodic/daily/200.backup-passwd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/200.backup-passwd,v 1.2.2.1 1999/08/29 14:19:37 peter Exp $
 #
 bak=/var/backups
 
diff --git a/etc/periodic/daily/210.backup-aliases b/etc/periodic/daily/210.backup-aliases
index 043c4f51098d..bbe62d34e178 100755
--- a/etc/periodic/daily/210.backup-aliases
+++ b/etc/periodic/daily/210.backup-aliases
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/210.backup-aliases,v 1.1.1.1.2.1 1999/08/29 14:19:37 peter Exp $
 #
 bak=/var/backups
 
diff --git a/etc/periodic/daily/220.backup-distfile b/etc/periodic/daily/220.backup-distfile
index 16a0541570a2..894b1154497c 100755
--- a/etc/periodic/daily/220.backup-distfile
+++ b/etc/periodic/daily/220.backup-distfile
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/220.backup-distfile,v 1.2.2.1 1999/08/29 14:19:39 peter Exp $
 #
 bak=/var/backups
 
diff --git a/etc/periodic/daily/300.calendar b/etc/periodic/daily/300.calendar
index de0aeec71348..d5cdefe37c34 100755
--- a/etc/periodic/daily/300.calendar
+++ b/etc/periodic/daily/300.calendar
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/300.calendar,v 1.2.2.1 1999/08/29 14:19:39 peter Exp $
 #
 # `calendar -a' needs to die. Why? Because it's a bad idea, particular
 # with networked home directories, but also in general.  If you want the
diff --git a/etc/periodic/daily/310.accounting b/etc/periodic/daily/310.accounting
index f713920fe2a3..6fa6dcf3b2b2 100755
--- a/etc/periodic/daily/310.accounting
+++ b/etc/periodic/daily/310.accounting
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/310.accounting,v 1.2.2.1 1999/08/29 14:19:39 peter Exp $
 #
 
 if [ -f /var/account/acct ] ; then
diff --git a/etc/periodic/daily/320.rdist b/etc/periodic/daily/320.rdist
index 267315271706..b61a4217edd6 100755
--- a/etc/periodic/daily/320.rdist
+++ b/etc/periodic/daily/320.rdist
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/320.rdist,v 1.2.2.1 1999/08/29 14:19:40 peter Exp $
 #
 
 if [ -f /etc/Distfile ]; then
diff --git a/etc/periodic/daily/330.news b/etc/periodic/daily/330.news
index b7be359d29b0..a9b309be5aae 100755
--- a/etc/periodic/daily/330.news
+++ b/etc/periodic/daily/330.news
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/330.news,v 1.1.1.1.2.1 1999/08/29 14:19:40 peter Exp $
 #
 # Expire news articles
 # (This is present only for backwards compatibility, usually the news
diff --git a/etc/periodic/daily/340.uucp b/etc/periodic/daily/340.uucp
index 3ee830440f51..48f9b67cc60b 100755
--- a/etc/periodic/daily/340.uucp
+++ b/etc/periodic/daily/340.uucp
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/340.uucp,v 1.3.2.1 1999/08/29 14:19:41 peter Exp $
 #
 # Local cleanup of UUCP files.  This is for backwards compatibility,
 # /etc/uuclean.daily doesn't exist by default.
diff --git a/etc/periodic/daily/400.status-disks b/etc/periodic/daily/400.status-disks
index 86113183108e..b104145b6ca3 100755
--- a/etc/periodic/daily/400.status-disks
+++ b/etc/periodic/daily/400.status-disks
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/400.status-disks,v 1.1.1.1.2.1 1999/08/29 14:19:41 peter Exp $
 #
 
 echo ""
diff --git a/etc/periodic/daily/410.status-uucp b/etc/periodic/daily/410.status-uucp
index af8a8f6d3127..55229356d481 100755
--- a/etc/periodic/daily/410.status-uucp
+++ b/etc/periodic/daily/410.status-uucp
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/410.status-uucp,v 1.2.2.1 1999/08/29 14:19:41 peter Exp $
 #
 
 if [ -d /var/spool/uucp -a -x /usr/bin/uustat ]; then
diff --git a/etc/periodic/daily/420.status-network b/etc/periodic/daily/420.status-network
index 0d47661f4c17..5082c7a3316d 100755
--- a/etc/periodic/daily/420.status-network
+++ b/etc/periodic/daily/420.status-network
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/420.status-network,v 1.2.2.1 1999/08/29 14:19:42 peter Exp $
 #
 
 if [ -x /usr/bin/netstat ] ; then
diff --git a/etc/periodic/daily/430.status-rwho b/etc/periodic/daily/430.status-rwho
index 151898d4646b..0d25b86612e8 100755
--- a/etc/periodic/daily/430.status-rwho
+++ b/etc/periodic/daily/430.status-rwho
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/430.status-rwho,v 1.2.2.1 1999/08/29 14:19:42 peter Exp $
 #
 
 if [ -d /var/rwho -a -x /usr/bin/rwho -a $(ls -l /var/rwho | wc -l) -ne 0 ]
diff --git a/etc/periodic/daily/440.status-mailq b/etc/periodic/daily/440.status-mailq
index a9336fcf4c12..4ce267b33481 100755
--- a/etc/periodic/daily/440.status-mailq
+++ b/etc/periodic/daily/440.status-mailq
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/440.status-mailq,v 1.3.2.1 1999/08/29 14:19:42 peter Exp $
 #
 if [ -x /usr/bin/mailq -a -d /var/spool/mqueue ] ; then
     echo ""
diff --git a/etc/periodic/daily/450.status-security b/etc/periodic/daily/450.status-security
index 92f328d4893b..fd842d8a54d7 100755
--- a/etc/periodic/daily/450.status-security
+++ b/etc/periodic/daily/450.status-security
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/450.status-security,v 1.2.2.1 1999/08/29 14:19:43 peter Exp $
 #
 
 if [ -f /etc/security -a -x /usr/sbin/sendmail ] ; then
diff --git a/etc/periodic/daily/460.status-mail-rejects b/etc/periodic/daily/460.status-mail-rejects
index 4a29b47bf638..e33e763a7ebd 100755
--- a/etc/periodic/daily/460.status-mail-rejects
+++ b/etc/periodic/daily/460.status-mail-rejects
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/460.status-mail-rejects,v 1.7.2.1 1999/08/29 14:19:44 peter Exp $
 #
 
 if [ -d /etc/mail -a -f /var/log/maillog ]; then
diff --git a/etc/periodic/daily/999.local b/etc/periodic/daily/999.local
index 2f715abb595e..f9dde2b9a741 100755
--- a/etc/periodic/daily/999.local
+++ b/etc/periodic/daily/999.local
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/999.local,v 1.1.1.1.2.1 1999/08/29 14:19:44 peter Exp $
 #
 # Run the old /etc/daily.local script.  This is really for backwards
 # compatibility more than anything else.
diff --git a/etc/periodic/daily/Makefile b/etc/periodic/daily/Makefile
index 1944e5efcbdf..1553c55aa589 100644
--- a/etc/periodic/daily/Makefile
+++ b/etc/periodic/daily/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/Makefile,v 1.2.2.1 1999/08/29 14:19:45 peter Exp $
 
 BIN=    100.clean-disks \
 	110.clean-tmps \
diff --git a/etc/periodic/monthly/200.accounting b/etc/periodic/monthly/200.accounting
index 38c40e19cb9e..7a3d5f5335f4 100755
--- a/etc/periodic/monthly/200.accounting
+++ b/etc/periodic/monthly/200.accounting
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/monthly/200.accounting,v 1.2.2.1 1999/08/29 14:19:47 peter Exp $
 #
 
 W=/var/log/wtmp
diff --git a/etc/periodic/monthly/999.local b/etc/periodic/monthly/999.local
index 75fbebdb169a..d721c2645c4b 100755
--- a/etc/periodic/monthly/999.local
+++ b/etc/periodic/monthly/999.local
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/monthly/999.local,v 1.1.1.1.2.1 1999/08/29 14:19:48 peter Exp $
 #
 if [ -f /etc/monthly.local ]; then
     echo ""
diff --git a/etc/periodic/monthly/Makefile b/etc/periodic/monthly/Makefile
index 6fea21cf5eda..62d99d9ae6d6 100644
--- a/etc/periodic/monthly/Makefile
+++ b/etc/periodic/monthly/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/monthly/Makefile,v 1.1.1.1.2.1 1999/08/29 14:19:48 peter Exp $
 
 BIN=	200.accounting \
 	999.local
diff --git a/etc/periodic/weekly/120.clean-kvmdb b/etc/periodic/weekly/120.clean-kvmdb
index 42079c28089d..8c63cb0d68be 100755
--- a/etc/periodic/weekly/120.clean-kvmdb
+++ b/etc/periodic/weekly/120.clean-kvmdb
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/weekly/120.clean-kvmdb,v 1.2.2.2 1999/08/29 14:19:49 peter Exp $
 #
 
 if [ -d /var/db ] ; then
diff --git a/etc/periodic/weekly/300.uucp b/etc/periodic/weekly/300.uucp
index eb915044d32b..e1335995f02c 100755
--- a/etc/periodic/weekly/300.uucp
+++ b/etc/periodic/weekly/300.uucp
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/weekly/300.uucp,v 1.2.2.1 1999/08/29 14:19:50 peter Exp $
 #
 # This is really here for backwards compatibility, clean.weekly is not
 # created by default anymore.
diff --git a/etc/periodic/weekly/310.locate b/etc/periodic/weekly/310.locate
index b616a4ab4573..a57baeed72bf 100755
--- a/etc/periodic/weekly/310.locate
+++ b/etc/periodic/weekly/310.locate
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/weekly/310.locate,v 1.2.2.2 1999/08/29 14:19:51 peter Exp $
 #
 locdb=/var/db/locate.database
 
diff --git a/etc/periodic/weekly/320.whatis b/etc/periodic/weekly/320.whatis
index bf159a8b472e..fa3538141726 100755
--- a/etc/periodic/weekly/320.whatis
+++ b/etc/periodic/weekly/320.whatis
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/weekly/320.whatis,v 1.2.2.1 1999/08/29 14:19:51 peter Exp $
 #
 
 if [ -x /usr/libexec/makewhatis.local -a -x /usr/bin/manpath ] ; then
diff --git a/etc/periodic/weekly/330.catman b/etc/periodic/weekly/330.catman
index 5a4f490d96c5..ae40f4d55cb8 100755
--- a/etc/periodic/weekly/330.catman
+++ b/etc/periodic/weekly/330.catman
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/weekly/330.catman,v 1.2.2.1 1999/08/29 14:19:52 peter Exp $
 #
 
 exit 0		# do not run by default
diff --git a/etc/periodic/weekly/340.noid b/etc/periodic/weekly/340.noid
index 8a94924b6703..6c3220334c36 100644
--- a/etc/periodic/weekly/340.noid
+++ b/etc/periodic/weekly/340.noid
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/weekly/340.noid,v 1.1.2.1 1999/08/29 14:19:53 peter Exp $
 
 exit 0		# do not run by default
 
diff --git a/etc/periodic/weekly/999.local b/etc/periodic/weekly/999.local
index bc9fac288c04..e379bf3b23f8 100755
--- a/etc/periodic/weekly/999.local
+++ b/etc/periodic/weekly/999.local
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/weekly/999.local,v 1.2.2.1 1999/08/29 14:19:53 peter Exp $
 #
 
 if [ -f /etc/weekly.local ]; then
diff --git a/etc/periodic/weekly/Makefile b/etc/periodic/weekly/Makefile
index 33e4086f1657..d8d5e8cdec02 100644
--- a/etc/periodic/weekly/Makefile
+++ b/etc/periodic/weekly/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/weekly/Makefile,v 1.3.2.1 1999/08/29 14:19:54 peter Exp $
 
 BIN=	120.clean-kvmdb \
 	300.uucp \
diff --git a/etc/phones b/etc/phones
index 536ac2019597..d2c756750feb 100644
--- a/etc/phones
+++ b/etc/phones
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/phones,v 1.7.2.1 1999/08/29 14:18:52 peter Exp $
 #	From: @(#)phones	5.2 (Berkeley) 6/30/90
 #
 # phones -- remote host phone number data base
diff --git a/etc/ppp/ppp.conf b/etc/ppp/ppp.conf
index 410db1a55bc7..371d3687d376 100644
--- a/etc/ppp/ppp.conf
+++ b/etc/ppp/ppp.conf
@@ -3,7 +3,7 @@
 # Originally written by Toshiharu OHNO
 # Simplified 5/14/1999 by wself@cdrom.com
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/ppp/ppp.conf,v 1.1.2.2 1999/08/29 14:19:56 peter Exp $
 #################################################################
 
 default:
diff --git a/etc/ppp/ppp.deny b/etc/ppp/ppp.deny
index 6d06f4fac32e..6b2344d8bcc5 100644
--- a/etc/ppp/ppp.deny
+++ b/etc/ppp/ppp.deny
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/ppp/ppp.deny,v 1.2.2.1 1999/08/29 14:19:56 peter Exp $
 #
 # list of users disallowed any pppd access via 'system
 # password login'.
diff --git a/etc/ppp/ppp.shells.sample b/etc/ppp/ppp.shells.sample
index 7d26d62a5054..24c9e96d6c95 100644
--- a/etc/ppp/ppp.shells.sample
+++ b/etc/ppp/ppp.shells.sample
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/ppp/ppp.shells.sample,v 1.2.2.1 1999/08/29 14:19:57 peter Exp $
 #
 # List of acceptable shells for pppd(8).
 # Pppd will not accept a system password login
diff --git a/etc/printcap b/etc/printcap
index 81c3a5e541b0..cd73b593641d 100644
--- a/etc/printcap
+++ b/etc/printcap
@@ -1,5 +1,5 @@
 #	@(#)printcap	5.3 (Berkeley) 6/30/90
-# $FreeBSD$
+# $FreeBSD: src/etc/printcap,v 1.9.2.1 1999/08/29 14:18:53 peter Exp $
 
 #
 # This enables a simple local "raw" printer, hooked up to the first
diff --git a/etc/profile b/etc/profile
index 76958757b099..20a118727b1a 100644
--- a/etc/profile
+++ b/etc/profile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/profile,v 1.11.2.1 1999/08/29 14:18:53 peter Exp $
 #
 # System-wide .profile file for sh(1).
 # Uncomment this to give you the default 4.2 behavior, where disk 
diff --git a/etc/protocols b/etc/protocols
index f486ce3d7fe6..d916062b7038 100644
--- a/etc/protocols
+++ b/etc/protocols
@@ -1,7 +1,7 @@
 #
 # Internet protocols
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/protocols,v 1.10.2.3 1999/08/29 14:18:53 peter Exp $
 #	from: @(#)protocols	5.1 (Berkeley) 4/17/89
 #
 # See also http://www.isi.edu/in-notes/iana/assignments/protocol-numbers
diff --git a/etc/rc b/etc/rc
index 0974e14dad90..af96db1f9e3c 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/etc/rc,v 1.169.2.18 1999/11/24 03:52:00 jkoshy Exp $
 #	From: @(#)rc	5.27 (Berkeley) 6/5/91
 
 # System startup script run by init on autoboot
diff --git a/etc/rc.atm b/etc/rc.atm
index 9704536f9f53..22ce00a92b11 100644
--- a/etc/rc.atm
+++ b/etc/rc.atm
@@ -3,7 +3,7 @@
 
 # ATM networking startup script
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.atm,v 1.2.2.1 1999/08/29 14:18:54 peter Exp $
 
 #
 # Initial interface configuration.
diff --git a/etc/rc.devfs b/etc/rc.devfs
index 339cbdbf48cb..10633960c305 100644
--- a/etc/rc.devfs
+++ b/etc/rc.devfs
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.devfs,v 1.3.2.2 1999/08/29 14:18:55 peter Exp $
 #
 # If there is a global system configuration file, suck it in.
 if [ -f /etc/defaults/rc.conf ]; then
diff --git a/etc/rc.firewall b/etc/rc.firewall
index 0623536134cb..9f4caaa13c7f 100644
--- a/etc/rc.firewall
+++ b/etc/rc.firewall
@@ -1,6 +1,6 @@
 ############
 # Setup system for firewall service.
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.firewall,v 1.19.2.3 1999/09/30 04:56:27 mpp Exp $
 
 # Suck in the configuration variables.
 if [ -f /etc/defaults/rc.conf ]; then
diff --git a/etc/rc.isdn b/etc/rc.isdn
index 130210201082..47efe9eecd94 100644
--- a/etc/rc.isdn
+++ b/etc/rc.isdn
@@ -6,7 +6,7 @@
 #
 #	last edit-date: [Mon Mar  8 12:15:56 1999]
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.isdn,v 1.1.2.2 1999/11/16 17:54:31 joe Exp $
 #
 #---------------------------------------------------------------------------
 
diff --git a/etc/rc.network b/etc/rc.network
index addc2c169989..3c17379306cf 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.network,v 1.39.2.14 1999/11/28 16:09:07 brian Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
diff --git a/etc/rc.pccard b/etc/rc.pccard
index 3da09ae07501..094a1af071df 100644
--- a/etc/rc.pccard
+++ b/etc/rc.pccard
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #	PC-card startup script
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.pccard,v 1.6.2.7 1999/08/29 14:18:57 peter Exp $
 
 if [ "X$pccard_enable" = X"YES" ] ; then
 	builtin=`kldstat -v -i 1 | grep pcic | awk '{print $2}'`
diff --git a/etc/rc.resume b/etc/rc.resume
index 74db8ed579a6..5ea8dd708db4 100755
--- a/etc/rc.resume
+++ b/etc/rc.resume
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.resume,v 1.1.2.2 1999/08/29 14:18:57 peter Exp $
 #
 # sample run command file for APM Resume Event
 
diff --git a/etc/rc.serial b/etc/rc.serial
index 40fbd8a334cc..e40aedcaefbc 100644
--- a/etc/rc.serial
+++ b/etc/rc.serial
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.serial,v 1.11.2.1 1999/08/29 14:18:58 peter Exp $
 
 # Change some defaults for serial devices.
 # Standard defaults are:
diff --git a/etc/rc.shutdown b/etc/rc.shutdown
index e241721936bc..61ef398856dd 100644
--- a/etc/rc.shutdown
+++ b/etc/rc.shutdown
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.shutdown,v 1.1.2.1 1999/08/29 14:18:59 peter Exp $
 
 # site-specific closing actions for daemons run by init on shutdown
 # or before going single-user from multi-user.
diff --git a/etc/rc.suspend b/etc/rc.suspend
index 9b6f815915af..14d85f403c46 100755
--- a/etc/rc.suspend
+++ b/etc/rc.suspend
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.suspend,v 1.1.2.2 1999/08/29 14:18:59 peter Exp $
 #
 # sample run command file for APM Suspend Event
 
diff --git a/etc/remote b/etc/remote
index 37a25f5d5814..ee6873c57fd1 100644
--- a/etc/remote
+++ b/etc/remote
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/remote,v 1.9.2.1 1999/08/29 14:19:00 peter Exp $
 #
 #	@(#)remote	5.2 (Berkeley) 6/30/90
 #
diff --git a/etc/root/dot.cshrc b/etc/root/dot.cshrc
index 7b66bd1b559c..c5d9b031b3fa 100644
--- a/etc/root/dot.cshrc
+++ b/etc/root/dot.cshrc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/root/dot.cshrc,v 1.22.2.2 1999/08/29 14:19:58 peter Exp $
 #
 #csh .cshrc file
 
diff --git a/etc/root/dot.klogin b/etc/root/dot.klogin
index 55e653a13323..2a9445bfb10b 100644
--- a/etc/root/dot.klogin
+++ b/etc/root/dot.klogin
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/root/dot.klogin,v 1.5.2.1 1999/08/29 14:19:58 peter Exp $
 #
 # user1.root@your.realm.wherever
 # user2.root@your.realm.wherever
diff --git a/etc/root/dot.login b/etc/root/dot.login
index 9d9d3a50fdaf..ce390d1ecb4e 100644
--- a/etc/root/dot.login
+++ b/etc/root/dot.login
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/root/dot.login,v 1.17.2.2 1999/08/29 14:19:59 peter Exp $
 #
 # csh .login file
 #
diff --git a/etc/root/dot.profile b/etc/root/dot.profile
index bcf606d1047e..36e68939cd83 100644
--- a/etc/root/dot.profile
+++ b/etc/root/dot.profile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/root/dot.profile,v 1.17.2.3 1999/08/29 14:20:00 peter Exp $
 #
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
 export PATH
diff --git a/etc/rpc b/etc/rpc
index a662bf947066..437f0d97acfd 100644
--- a/etc/rpc
+++ b/etc/rpc
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rpc,v 1.6.2.1 1999/08/29 14:19:00 peter Exp $
 # rpc 88/08/01 4.0 RPCSRC; from 1.12   88/02/07 SMI
 #
 portmapper	100000	portmap sunrpc
diff --git a/etc/security b/etc/security
index 15c13902c58b..4e954999ec57 100644
--- a/etc/security
+++ b/etc/security
@@ -1,7 +1,7 @@
 #!/bin/sh -
 #
 #	@(#)security	5.3 (Berkeley) 5/28/91
-# $FreeBSD$
+# $FreeBSD: src/etc/security,v 1.29.2.2 1999/08/29 14:19:01 peter Exp $
 #
 PATH=/sbin:/bin:/usr/bin
 LC_ALL=C; export LC_ALL
diff --git a/etc/sendmail/Makefile b/etc/sendmail/Makefile
index ea1952989ece..1ab87706ec8c 100644
--- a/etc/sendmail/Makefile
+++ b/etc/sendmail/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.19 (Berkeley) 1/14/97
-# $FreeBSD$
+# $FreeBSD: src/etc/sendmail/Makefile,v 1.1.2.1 1999/08/29 14:20:01 peter Exp $
 
 M4=	m4
 CFDIR=	${.CURDIR}/../../contrib/sendmail/cf
diff --git a/etc/sendmail/freefall.mc b/etc/sendmail/freefall.mc
index 2f4480e3a0a9..ef3befdf8dac 100644
--- a/etc/sendmail/freefall.mc
+++ b/etc/sendmail/freefall.mc
@@ -40,7 +40,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$FreeBSD$')
+VERSIONID(`$FreeBSD: src/etc/sendmail/freefall.mc,v 1.12.2.3 1999/08/29 14:20:02 peter Exp $')
 
 OSTYPE(bsd4.4)
 FEATURE(nullclient, hub.$m)
diff --git a/etc/services b/etc/services
index 6e2763de5f4f..0b2f3bea0160 100644
--- a/etc/services
+++ b/etc/services
@@ -16,7 +16,7 @@
 # Kerberos services are for Kerberos v4, and are unofficial.  Sites running
 # v5 should uncomment v5 entries and comment v4 entries.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/services,v 1.55.2.6 1999/08/29 14:19:01 peter Exp $
 #	From: @(#)services	5.8 (Berkeley) 5/9/91
 #
 # WELL KNOWN PORT NUMBERS
diff --git a/etc/shells b/etc/shells
index 964bcbf67264..49ba510c6192 100644
--- a/etc/shells
+++ b/etc/shells
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/shells,v 1.2.2.1 1999/08/29 14:19:02 peter Exp $
 #
 # List of acceptable shells for chpass(1).
 # Ftpd will not allow users to connect who are not using
diff --git a/etc/syslog.conf b/etc/syslog.conf
index 0a585c14b2aa..ddc21df8e320 100644
--- a/etc/syslog.conf
+++ b/etc/syslog.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/syslog.conf,v 1.9.2.1 1999/08/29 14:19:02 peter Exp $
 #
 #	Spaces are NOT valid field separators in this file.
 #	Consult the syslog.conf(5) manpage.
diff --git a/games/Makefile b/games/Makefile
index 02b1a550de56..ee553834911e 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/31/94
-# $FreeBSD$
+# $FreeBSD: src/games/Makefile,v 1.15.2.1 1999/08/29 14:22:50 peter Exp $
 
 # XXX missing: chess ching monop [copyright]
 SUBDIR= adventure \
diff --git a/games/atc/atc.6 b/games/atc/atc.6
index de165d2fa02f..2845c86e13d9 100644
--- a/games/atc/atc.6
+++ b/games/atc/atc.6
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)atc.6	8.1 (Berkeley) 5/31/93
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/games/atc/atc.6,v 1.3.2.1 1999/09/20 09:49:04 phantom Exp $
 .\"
 .       \" XP - exdented paragraph
 .de XP
diff --git a/games/battlestar/com6.c b/games/battlestar/com6.c
index 8780a1122550..78140b2074d9 100644
--- a/games/battlestar/com6.c
+++ b/games/battlestar/com6.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/games/battlestar/com6.c,v 1.6.2.1 1999/11/25 15:59:08 joerg Exp $
  */
 
 #ifndef lint
diff --git a/games/bs/Makefile b/games/bs/Makefile
index c0905c94cd0f..c7c239e6e0c1 100644
--- a/games/bs/Makefile
+++ b/games/bs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/games/bs/Makefile,v 1.4.2.1 1999/08/29 14:22:52 peter Exp $
 
 PROG=   bs
 MAN6=   bs.6
diff --git a/games/factor/factor.6 b/games/factor/factor.6
index 576e9528b1c2..85efd811bbb4 100644
--- a/games/factor/factor.6
+++ b/games/factor/factor.6
@@ -34,7 +34,7 @@
 .\"
 .\"	@(#)factor.6	8.1 (Berkeley) 5/31/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/games/factor/factor.6,v 1.4.2.1 1999/08/29 14:22:53 peter Exp $
 .\"
 .\" By: Landon Curt Noll   chongo@toad.com,   ...!{sun,tolsoft}!hoptoad!chongo
 .\"
diff --git a/games/fortune/datfiles/fortunes b/games/fortune/datfiles/fortunes
index 5419a8df11f6..dde9f87fe858 100644
--- a/games/fortune/datfiles/fortunes
+++ b/games/fortune/datfiles/fortunes
@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD$
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.12.2.3 1999/11/27 07:34:25 wes Exp $
 %
 !07/11 PDP a ni deppart m'I  !pleH
 %
diff --git a/games/fortune/datfiles/fortunes-o.real b/games/fortune/datfiles/fortunes-o.real
index 041e7e68d36e..0c3959756d9f 100644
--- a/games/fortune/datfiles/fortunes-o.real
+++ b/games/fortune/datfiles/fortunes-o.real
@@ -1,4 +1,4 @@
-%% $FreeBSD$
+%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.3.2.1 1999/11/27 07:34:27 wes Exp $
 71:
 	69 with two fingers up your ass.
 		-- George Carlin
diff --git a/games/fortune/datfiles/fortunes2 b/games/fortune/datfiles/fortunes2
index 39c9759d3d2d..7ff9bb40f5e9 100644
--- a/games/fortune/datfiles/fortunes2
+++ b/games/fortune/datfiles/fortunes2
@@ -1,4 +1,4 @@
-%% $FreeBSD$
+%% $FreeBSD: src/games/fortune/datfiles/fortunes2,v 1.9.2.4 1999/11/27 07:34:27 wes Exp $
 =======================================================================
 ||								     ||
 || The FORTUNE-COOKIE program is soon to be a Major Motion Picture!  ||
diff --git a/games/fortune/datfiles/fortunes2-o b/games/fortune/datfiles/fortunes2-o
index 29fdec7c5308..716d497dbcf0 100644
--- a/games/fortune/datfiles/fortunes2-o
+++ b/games/fortune/datfiles/fortunes2-o
@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD$
+$FreeBSD: src/games/fortune/datfiles/fortunes2-o,v 1.2.2.3 1999/11/27 07:34:34 wes Exp $
 %
 						PLAYGIRL, Inc.
 						Philadelphia, Pa.  19369
diff --git a/games/fortune/fortune/fortune.6 b/games/fortune/fortune/fortune.6
index 502c0fd3ce19..faf9d48a9aeb 100644
--- a/games/fortune/fortune/fortune.6
+++ b/games/fortune/fortune/fortune.6
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fortune.6	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/games/fortune/fortune/fortune.6,v 1.5.2.4 1999/12/07 02:50:31 chris Exp $
 .\"
 .Dd April 19, 1994
 .Dt FORTUNE 6
diff --git a/games/grdc/Makefile b/games/grdc/Makefile
index dd22a236219c..7b3de4de662d 100644
--- a/games/grdc/Makefile
+++ b/games/grdc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/games/grdc/Makefile,v 1.3.2.1 1999/08/29 14:22:55 peter Exp $
 
 PROG=   grdc
 MAN6=   grdc.6
diff --git a/games/hack/hack.version.c b/games/hack/hack.version.c
index 0fe78854972b..084795618e00 100644
--- a/games/hack/hack.version.c
+++ b/games/hack/hack.version.c
@@ -1,6 +1,6 @@
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* hack.version.c - version 1.0.3 */
-/* $FreeBSD$ */
+/* $FreeBSD: src/games/hack/hack.version.c,v 1.2.2.1 1999/08/29 14:22:56 peter Exp $ */
 
 #include	"date.h"
 
diff --git a/games/mille/mille.6 b/games/mille/mille.6
index 5d05e7ae4a04..b19b373263dc 100644
--- a/games/mille/mille.6
+++ b/games/mille/mille.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mille.6	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/games/mille/mille.6,v 1.3.2.1 1999/08/29 14:22:58 peter Exp $
 .\"
 .TH MILLE 6 "December 30, 1993"
 .UC 4
diff --git a/games/mille/mille.c b/games/mille/mille.c
index b2c5c156958d..e3194daca76f 100644
--- a/games/mille/mille.c
+++ b/games/mille/mille.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mille.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/games/mille/mille.c,v 1.5.2.1 1999/08/29 14:22:58 peter Exp $";
 #endif /* not lint */
 
 # include	"mille.h"
diff --git a/games/phantasia/phantasia.6 b/games/phantasia/phantasia.6
index ab0733c994e4..8bed3dbd724c 100644
--- a/games/phantasia/phantasia.6
+++ b/games/phantasia/phantasia.6
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/games/phantasia/phantasia.6,v 1.5.2.1 1999/08/29 14:22:59 peter Exp $
 .\"
 .de sh
 .br
diff --git a/games/piano/piano.c b/games/piano/piano.c
index 555ceadc4b7c..e943bf3c9f7b 100644
--- a/games/piano/piano.c
+++ b/games/piano/piano.c
@@ -1,7 +1,7 @@
 /*
  * piano.c - a piano emulator
  */
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/games/piano/piano.c,v 1.5.2.1 1999/08/29 14:23:00 peter Exp $";
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/games/sail/sail.6 b/games/sail/sail.6
index 0455e06b08f3..8599cc4fcb11 100644
--- a/games/sail/sail.6
+++ b/games/sail/sail.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sail.6	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/games/sail/sail.6,v 1.4.2.1 1999/08/29 14:23:02 peter Exp $
 .\"
 .TH SAIL 6 "December 30, 1993"
 .UC 4
diff --git a/gnu/Makefile b/gnu/Makefile
index 30c64596aa1b..da6d45e631bb 100644
--- a/gnu/Makefile
+++ b/gnu/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	5.33.1.1 (Berkeley) 5/6/91
-# $FreeBSD$
+# $FreeBSD: src/gnu/Makefile,v 1.32.2.1 1999/08/29 14:28:25 peter Exp $
 
 SUBDIR= include lib libexec usr.bin usr.sbin
 
diff --git a/gnu/include/Makefile b/gnu/include/Makefile
index 604971fb4ecf..ac3dc4955158 100644
--- a/gnu/include/Makefile
+++ b/gnu/include/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/include/Makefile,v 1.7.2.1 1999/08/29 14:28:30 peter Exp $
 
 NOOBJ=	noobj
 
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile
index 0b169a718c2b..ba8db8fe1f84 100644
--- a/gnu/lib/Makefile
+++ b/gnu/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/Makefile,v 1.19.2.1 1999/08/29 14:28:32 peter Exp $
 
 SUBDIR= libdialog libg++ libgmp libmp libobjc libregex libreadline libstdc++
 
diff --git a/gnu/lib/Makefile.inc b/gnu/lib/Makefile.inc
index c1739ad7d790..53aa77bb5d98 100644
--- a/gnu/lib/Makefile.inc
+++ b/gnu/lib/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/Makefile.inc,v 1.6.2.1 1999/08/29 14:28:32 peter Exp $
 
 SHLIB_MAJOR?= 2
 SHLIB_MINOR?= 0
diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile
index 284409a88a61..9cfc25902551 100644
--- a/gnu/lib/libdialog/Makefile
+++ b/gnu/lib/libdialog/Makefile
@@ -1,5 +1,5 @@
 # Makefile for libdialog
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libdialog/Makefile,v 1.24.2.1 1999/08/29 14:28:34 peter Exp $
 
 LIB=    dialog
 MAN3=	dialog.3
diff --git a/gnu/lib/libdialog/TESTS/Makefile b/gnu/lib/libdialog/TESTS/Makefile
index 8abf06f93d57..ba8854f922ad 100644
--- a/gnu/lib/libdialog/TESTS/Makefile
+++ b/gnu/lib/libdialog/TESTS/Makefile
@@ -1,6 +1,6 @@
 # Really quick and evil Makefile for building all the tests.  I wish that bmake was friendlier to
 # the concept of multiple progs/libs in the same directory.
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libdialog/TESTS/Makefile,v 1.8.2.1 1999/08/29 14:28:36 peter Exp $
 
 PROGS=	msg yesno prgbox gauge dselect fselect text menu1 menu2 menu3 \
 	input1 input2 check1 check2 check3 radio1 radio2 radio3 \
diff --git a/gnu/lib/libdialog/TESTS/check1.c b/gnu/lib/libdialog/TESTS/check1.c
index a8eabc10db76..59cd83da4a5c 100644
--- a/gnu/lib/libdialog/TESTS/check1.c
+++ b/gnu/lib/libdialog/TESTS/check1.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/lib/libdialog/TESTS/check1.c,v 1.5.2.1 1999/08/29 14:28:37 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/check2.c b/gnu/lib/libdialog/TESTS/check2.c
index 3cdb6ae5ef41..fd27f3b8a710 100644
--- a/gnu/lib/libdialog/TESTS/check2.c
+++ b/gnu/lib/libdialog/TESTS/check2.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/lib/libdialog/TESTS/check2.c,v 1.4.2.1 1999/08/29 14:28:37 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/check3.c b/gnu/lib/libdialog/TESTS/check3.c
index c5e7f925b476..d756fe0d10f9 100644
--- a/gnu/lib/libdialog/TESTS/check3.c
+++ b/gnu/lib/libdialog/TESTS/check3.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/lib/libdialog/TESTS/check3.c,v 1.4.2.1 1999/08/29 14:28:38 peter Exp $
  *
  */
 
diff --git a/gnu/lib/libdialog/TESTS/dselect.c b/gnu/lib/libdialog/TESTS/dselect.c
index 66a786660a83..4236b79da161 100644
--- a/gnu/lib/libdialog/TESTS/dselect.c
+++ b/gnu/lib/libdialog/TESTS/dselect.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/lib/libdialog/TESTS/dselect.c,v 1.3.2.1 1999/08/29 14:28:38 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/fselect.c b/gnu/lib/libdialog/TESTS/fselect.c
index 2fb7aa844544..29cf0a1e6785 100644
--- a/gnu/lib/libdialog/TESTS/fselect.c
+++ b/gnu/lib/libdialog/TESTS/fselect.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/lib/libdialog/TESTS/fselect.c,v 1.3.2.1 1999/08/29 14:28:39 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/gauge.c b/gnu/lib/libdialog/TESTS/gauge.c
index 803d09458262..c6d025f0cbf5 100644
--- a/gnu/lib/libdialog/TESTS/gauge.c
+++ b/gnu/lib/libdialog/TESTS/gauge.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/lib/libdialog/TESTS/gauge.c,v 1.4.2.1 1999/08/29 14:28:39 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/input1.c b/gnu/lib/libdialog/TESTS/input1.c
index bdb78b0e2ae7..e34444b76bd9 100644
--- a/gnu/lib/libdialog/TESTS/input1.c
+++ b/gnu/lib/libdialog/TESTS/input1.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/lib/libdialog/TESTS/input1.c,v 1.3.2.1 1999/08/29 14:28:40 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/input2.c b/gnu/lib/libdialog/TESTS/input2.c
index 85368244e323..a2415de993e3 100644
--- a/gnu/lib/libdialog/TESTS/input2.c
+++ b/gnu/lib/libdialog/TESTS/input2.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/lib/libdialog/TESTS/input2.c,v 1.3.2.1 1999/08/29 14:28:41 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/menu1.c b/gnu/lib/libdialog/TESTS/menu1.c
index fbdebcbffea4..8ef5b6be8cb4 100644
--- a/gnu/lib/libdialog/TESTS/menu1.c
+++ b/gnu/lib/libdialog/TESTS/menu1.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/lib/libdialog/TESTS/menu1.c,v 1.6.2.1 1999/08/29 14:28:41 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/menu2.c b/gnu/lib/libdialog/TESTS/menu2.c
index a081d3263324..01d8a1a4ee5e 100644
--- a/gnu/lib/libdialog/TESTS/menu2.c
+++ b/gnu/lib/libdialog/TESTS/menu2.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/lib/libdialog/TESTS/menu2.c,v 1.6.2.1 1999/08/29 14:28:42 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/menu3.c b/gnu/lib/libdialog/TESTS/menu3.c
index 5f42b151c8fb..98c414f1ae39 100644
--- a/gnu/lib/libdialog/TESTS/menu3.c
+++ b/gnu/lib/libdialog/TESTS/menu3.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/lib/libdialog/TESTS/menu3.c,v 1.7.2.1 1999/08/29 14:28:43 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/msg.c b/gnu/lib/libdialog/TESTS/msg.c
index 7594b599efe7..44a01cce39f5 100644
--- a/gnu/lib/libdialog/TESTS/msg.c
+++ b/gnu/lib/libdialog/TESTS/msg.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/lib/libdialog/TESTS/msg.c,v 1.3.2.1 1999/08/29 14:28:43 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/prgbox.c b/gnu/lib/libdialog/TESTS/prgbox.c
index f09190cf7a95..6e15ebe1679c 100644
--- a/gnu/lib/libdialog/TESTS/prgbox.c
+++ b/gnu/lib/libdialog/TESTS/prgbox.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/lib/libdialog/TESTS/prgbox.c,v 1.3.2.1 1999/08/29 14:28:44 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/radio1.c b/gnu/lib/libdialog/TESTS/radio1.c
index 2cdb0c5e4bd1..3eb6a320370f 100644
--- a/gnu/lib/libdialog/TESTS/radio1.c
+++ b/gnu/lib/libdialog/TESTS/radio1.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/lib/libdialog/TESTS/radio1.c,v 1.5.2.1 1999/08/29 14:28:44 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/radio2.c b/gnu/lib/libdialog/TESTS/radio2.c
index 1dee3c034acc..95e681bc9fce 100644
--- a/gnu/lib/libdialog/TESTS/radio2.c
+++ b/gnu/lib/libdialog/TESTS/radio2.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/lib/libdialog/TESTS/radio2.c,v 1.5.2.1 1999/08/29 14:28:45 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/radio3.c b/gnu/lib/libdialog/TESTS/radio3.c
index 80fa38075763..4290772f8974 100644
--- a/gnu/lib/libdialog/TESTS/radio3.c
+++ b/gnu/lib/libdialog/TESTS/radio3.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/lib/libdialog/TESTS/radio3.c,v 1.5.2.1 1999/08/29 14:28:45 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/text.c b/gnu/lib/libdialog/TESTS/text.c
index d13a121bb891..7cad9d423804 100644
--- a/gnu/lib/libdialog/TESTS/text.c
+++ b/gnu/lib/libdialog/TESTS/text.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/lib/libdialog/TESTS/text.c,v 1.3.2.1 1999/08/29 14:28:45 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/yesno.c b/gnu/lib/libdialog/TESTS/yesno.c
index d2e34d328c90..af90b0c63fc9 100644
--- a/gnu/lib/libdialog/TESTS/yesno.c
+++ b/gnu/lib/libdialog/TESTS/yesno.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/lib/libdialog/TESTS/yesno.c,v 1.3.2.1 1999/08/29 14:28:46 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/checklist.c b/gnu/lib/libdialog/checklist.c
index 9fa2ff69197d..14317b9fb865 100644
--- a/gnu/lib/libdialog/checklist.c
+++ b/gnu/lib/libdialog/checklist.c
@@ -25,7 +25,7 @@
 #include "dialog.priv.h"
 
 #ifndef lint
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/gnu/lib/libdialog/checklist.c,v 1.33.2.2 1999/12/17 02:44:40 jkh Exp $";
 #endif
 
 static void print_item(WINDOW *win, unsigned char *tag, unsigned char *item, int status, int choice, int selected, dialogMenuItem *me, int list_width, int item_x, int check_x);
diff --git a/gnu/lib/libdialog/dialog.3 b/gnu/lib/libdialog/dialog.3
index c268c4edf60f..e2c8738a2aa0 100644
--- a/gnu/lib/libdialog/dialog.3
+++ b/gnu/lib/libdialog/dialog.3
@@ -11,7 +11,7 @@
 .\" nor does the author assume any responsibility for damages incurred with
 .\" its use.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/lib/libdialog/dialog.3,v 1.8.2.2 1999/08/29 14:28:34 peter Exp $
 .\"
 .Dd October 2, 1998
 .Dt DIALOG 3
diff --git a/gnu/lib/libdialog/menubox.c b/gnu/lib/libdialog/menubox.c
index e326e9b6cb77..500cbab5a32e 100644
--- a/gnu/lib/libdialog/menubox.c
+++ b/gnu/lib/libdialog/menubox.c
@@ -26,7 +26,7 @@
 #include <ncurses.h>
 
 #ifndef lint
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/gnu/lib/libdialog/menubox.c,v 1.32.2.2 1999/12/17 02:44:40 jkh Exp $";
 #endif
 
 static void print_item(WINDOW *win, unsigned char *tag, unsigned char *item, int choice, int selected, dialogMenuItem *me, int menu_width, int tag_x, int item_x);
diff --git a/gnu/lib/libdialog/radiolist.c b/gnu/lib/libdialog/radiolist.c
index 3ad3f6fcf3e4..3a01953c8e6a 100644
--- a/gnu/lib/libdialog/radiolist.c
+++ b/gnu/lib/libdialog/radiolist.c
@@ -26,7 +26,7 @@
 #include "dialog.priv.h"
 
 #ifndef lint
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/gnu/lib/libdialog/radiolist.c,v 1.34.2.2 1999/12/17 02:44:40 jkh Exp $";
 #endif
 
 static void print_item(WINDOW *win, char *tag, char *item, int status, int choice, int selected, dialogMenuItem *me);
diff --git a/gnu/lib/libg++/Makefile b/gnu/lib/libg++/Makefile
index 6d9fc509b9d0..6a596de0c3d3 100644
--- a/gnu/lib/libg++/Makefile
+++ b/gnu/lib/libg++/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libg++/Makefile,v 1.21.2.1 1999/08/29 14:28:47 peter Exp $
 #
 
 GPPDIR=	${.CURDIR}/../../../contrib/libg++
diff --git a/gnu/lib/libg++/doc/Makefile b/gnu/lib/libg++/doc/Makefile
index 1d275ea0c26a..296f5faa519b 100644
--- a/gnu/lib/libg++/doc/Makefile
+++ b/gnu/lib/libg++/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libg++/doc/Makefile,v 1.4.2.1 1999/08/29 14:28:49 peter Exp $
 
 INFO = g++FAQ libg++ iostream
 INFOSECTION= "Gcc Documentation"
diff --git a/gnu/lib/libgmp/Makefile b/gnu/lib/libgmp/Makefile
index 12b9b8cdaf40..5180902bbfc5 100644
--- a/gnu/lib/libgmp/Makefile
+++ b/gnu/lib/libgmp/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libgmp/Makefile,v 1.21.2.1 1999/08/29 14:28:49 peter Exp $
 #
 
 LIB=	gmp
diff --git a/gnu/lib/libgmp/Makefile.inc b/gnu/lib/libgmp/Makefile.inc
index f433aca6d22a..b7b96043fd99 100644
--- a/gnu/lib/libgmp/Makefile.inc
+++ b/gnu/lib/libgmp/Makefile.inc
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libgmp/Makefile.inc,v 1.3.2.1 1999/08/29 14:28:50 peter Exp $
 #
 
 SHLIB_MAJOR=	3
diff --git a/gnu/lib/libgmp/doc/Makefile b/gnu/lib/libgmp/doc/Makefile
index afe15d1068ce..6e41cfc9caf1 100644
--- a/gnu/lib/libgmp/doc/Makefile
+++ b/gnu/lib/libgmp/doc/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libgmp/doc/Makefile,v 1.7.2.1 1999/08/29 14:28:51 peter Exp $
 #
 INFO = gmp
 INFOSECTION= "Programming & development tools."
diff --git a/gnu/lib/libmp/Makefile b/gnu/lib/libmp/Makefile
index 8a37ed83490c..969d2d562986 100644
--- a/gnu/lib/libmp/Makefile
+++ b/gnu/lib/libmp/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libmp/Makefile,v 1.17.2.1 1999/08/29 14:28:53 peter Exp $
 #
 
 LIB=	mp
diff --git a/gnu/lib/libobjc/Makefile b/gnu/lib/libobjc/Makefile
index 0dbb918a7bc5..81cd493a1d9c 100644
--- a/gnu/lib/libobjc/Makefile
+++ b/gnu/lib/libobjc/Makefile
@@ -1,5 +1,5 @@
 # Makefile for libobjc
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libobjc/Makefile,v 1.4.2.1 1999/08/29 14:28:54 peter Exp $
 
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 
diff --git a/gnu/lib/libreadline/Makefile b/gnu/lib/libreadline/Makefile
index 31650321000b..3e631141ce6c 100644
--- a/gnu/lib/libreadline/Makefile
+++ b/gnu/lib/libreadline/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libreadline/Makefile,v 1.30.2.3 1999/08/29 14:28:55 peter Exp $
 
 SUBDIR = history readline
 
diff --git a/gnu/lib/libreadline/Makefile.inc b/gnu/lib/libreadline/Makefile.inc
index 0dd7746254d0..a960da9ea242 100644
--- a/gnu/lib/libreadline/Makefile.inc
+++ b/gnu/lib/libreadline/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libreadline/Makefile.inc,v 1.1.2.3 1999/08/29 14:28:56 peter Exp $
 
 SHLIB_MAJOR= 3
 SHLIB_MINOR= 0
diff --git a/gnu/lib/libreadline/history/Makefile b/gnu/lib/libreadline/history/Makefile
index 7d225128c3d6..f76421577797 100644
--- a/gnu/lib/libreadline/history/Makefile
+++ b/gnu/lib/libreadline/history/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libreadline/history/Makefile,v 1.2.2.2 1999/08/29 14:28:57 peter Exp $
 
 SUBDIR= doc
 
diff --git a/gnu/lib/libreadline/history/doc/Makefile b/gnu/lib/libreadline/history/doc/Makefile
index 4fdf229fc98d..8d3e40da0a1b 100644
--- a/gnu/lib/libreadline/history/doc/Makefile
+++ b/gnu/lib/libreadline/history/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libreadline/history/doc/Makefile,v 1.1.2.2 1999/08/29 14:28:59 peter Exp $
 
 SRCDIR= ${.CURDIR}/../../../../../contrib/libreadline/doc
 
diff --git a/gnu/lib/libreadline/readline/Makefile b/gnu/lib/libreadline/readline/Makefile
index e539fb802f7a..7b48211af47f 100644
--- a/gnu/lib/libreadline/readline/Makefile
+++ b/gnu/lib/libreadline/readline/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libreadline/readline/Makefile,v 1.2.2.2 1999/08/29 14:29:00 peter Exp $
 
 SUBDIR= doc
 
diff --git a/gnu/lib/libreadline/readline/doc/Makefile b/gnu/lib/libreadline/readline/doc/Makefile
index a65e339f554a..b1c2f9ff2661 100644
--- a/gnu/lib/libreadline/readline/doc/Makefile
+++ b/gnu/lib/libreadline/readline/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libreadline/readline/doc/Makefile,v 1.1.2.2 1999/08/29 14:29:01 peter Exp $
 
 SRCDIR= ${.CURDIR}/../../../../../contrib/libreadline/doc
 
diff --git a/gnu/lib/libregex/Makefile b/gnu/lib/libregex/Makefile
index 20b08df0a9d4..56ede1dd69c6 100644
--- a/gnu/lib/libregex/Makefile
+++ b/gnu/lib/libregex/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libregex/Makefile,v 1.19.2.1 1999/08/29 14:29:03 peter Exp $
 
 
 LIB=	gnuregex
diff --git a/gnu/lib/libregex/test/Makefile b/gnu/lib/libregex/test/Makefile
index 218d2a1da2a1..27bac76bebe5 100644
--- a/gnu/lib/libregex/test/Makefile
+++ b/gnu/lib/libregex/test/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libregex/test/Makefile,v 1.5.2.1 1999/08/29 14:29:04 peter Exp $
 
 # Generated automatically from Makefile.in by configure.
 # Makefile for regex testing.
diff --git a/gnu/lib/libregex/test/Makefile.in b/gnu/lib/libregex/test/Makefile.in
index 80ec09cfed36..922e0fa090c9 100644
--- a/gnu/lib/libregex/test/Makefile.in
+++ b/gnu/lib/libregex/test/Makefile.in
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libregex/test/Makefile.in,v 1.5.2.1 1999/08/29 14:29:05 peter Exp $
 
 # Makefile for regex testing.
 #
diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile
index 688f6356d40b..a72742d6f10a 100644
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.12.2.1 1999/08/29 14:29:06 peter Exp $
 #
 
 GPPDIR=	${.CURDIR}/../../../contrib/libg++
diff --git a/gnu/libexec/Makefile b/gnu/libexec/Makefile
index 5d8ed2e40fef..d482058f354f 100644
--- a/gnu/libexec/Makefile
+++ b/gnu/libexec/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/libexec/Makefile,v 1.5.2.1 1999/08/29 14:29:07 peter Exp $
 
 SUBDIR=	uucp
 
diff --git a/gnu/libexec/Makefile.inc b/gnu/libexec/Makefile.inc
index 829da300445d..2ddc326e6417 100644
--- a/gnu/libexec/Makefile.inc
+++ b/gnu/libexec/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/libexec/Makefile.inc,v 1.3.2.1 1999/08/29 14:29:08 peter Exp $
 
 BINDIR?=	/usr/libexec
diff --git a/gnu/libexec/uucp/Makefile b/gnu/libexec/uucp/Makefile
index 23d6e1af746f..0711e6adaa84 100644
--- a/gnu/libexec/uucp/Makefile
+++ b/gnu/libexec/uucp/Makefile
@@ -1,5 +1,5 @@
 # This is the Makefile for Taylor UUCP
-# $FreeBSD$
+# $FreeBSD: src/gnu/libexec/uucp/Makefile,v 1.6.2.1 1999/08/29 14:29:09 peter Exp $
 
 # subdir 'sample' called by /usr/src/etc/Makefile
 SUBDIR=		libunix libuucp libuuconf \
diff --git a/gnu/libexec/uucp/common_sources/chat.c b/gnu/libexec/uucp/common_sources/chat.c
index 589cc7da9121..23c99112b5f1 100644
--- a/gnu/libexec/uucp/common_sources/chat.c
+++ b/gnu/libexec/uucp/common_sources/chat.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char chat_rcsid[] = "$FreeBSD$";
+const char chat_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/common_sources/chat.c,v 1.6.2.1 1999/08/29 14:29:11 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/common_sources/conn.c b/gnu/libexec/uucp/common_sources/conn.c
index 0ba0202d4fe9..a10726a0c2ef 100644
--- a/gnu/libexec/uucp/common_sources/conn.c
+++ b/gnu/libexec/uucp/common_sources/conn.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char conn_rcsid[] = "$FreeBSD$";
+const char conn_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/common_sources/conn.c,v 1.6.2.1 1999/08/29 14:29:12 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/common_sources/copy.c b/gnu/libexec/uucp/common_sources/copy.c
index a40276a508a2..5f2dd2bb11f0 100644
--- a/gnu/libexec/uucp/common_sources/copy.c
+++ b/gnu/libexec/uucp/common_sources/copy.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char copy_rcsid[] = "$FreeBSD$";
+const char copy_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/common_sources/copy.c,v 1.5.2.1 1999/08/29 14:29:12 peter Exp $";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/common_sources/log.c b/gnu/libexec/uucp/common_sources/log.c
index 6661b3c9b5fc..e4f8d1893f49 100644
--- a/gnu/libexec/uucp/common_sources/log.c
+++ b/gnu/libexec/uucp/common_sources/log.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char log_rcsid[] = "$FreeBSD$";
+const char log_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/common_sources/log.c,v 1.6.2.1 1999/08/29 14:29:13 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/common_sources/prot.c b/gnu/libexec/uucp/common_sources/prot.c
index 6661c1fa7b1f..e754b5071d3f 100644
--- a/gnu/libexec/uucp/common_sources/prot.c
+++ b/gnu/libexec/uucp/common_sources/prot.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char prot_rcsid[] = "$FreeBSD$";
+const char prot_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/common_sources/prot.c,v 1.5.2.1 1999/08/29 14:29:13 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/common_sources/util.c b/gnu/libexec/uucp/common_sources/util.c
index 3e85af9614ba..cb354be456c4 100644
--- a/gnu/libexec/uucp/common_sources/util.c
+++ b/gnu/libexec/uucp/common_sources/util.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char util_rcsid[] = "$FreeBSD$";
+const char util_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/common_sources/util.c,v 1.5.2.1 1999/08/29 14:29:14 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/contrib/Makefile.uurt b/gnu/libexec/uucp/contrib/Makefile.uurt
index 855897737941..41b1256edfba 100644
--- a/gnu/libexec/uucp/contrib/Makefile.uurt
+++ b/gnu/libexec/uucp/contrib/Makefile.uurt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/libexec/uucp/contrib/Makefile.uurt,v 1.5.2.1 1999/08/29 14:29:16 peter Exp $
 # Makefile for uurate 1.10
 #
 
diff --git a/gnu/libexec/uucp/contrib/uupoll.shar b/gnu/libexec/uucp/contrib/uupoll.shar
index fa4f72f25bec..599ba37c9b97 100644
--- a/gnu/libexec/uucp/contrib/uupoll.shar
+++ b/gnu/libexec/uucp/contrib/uupoll.shar
@@ -493,7 +493,7 @@ X                  not scan the uucico log.
 X
 X
 #if !defined(lint)
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/contrib/uupoll.shar,v 1.5.2.1 1999/08/29 14:29:16 peter Exp $";
 #endif /* not lint */
 X
 X/* Log: uupoll.shar,v
@@ -1628,7 +1628,7 @@ sed 's/^X//' << 'SHAR_EOF' > 'uupoll/conf.h' &&
 #ifndef CONF
 X  #define CONF
 X
-X/* $FreeBSD$ */
+X/* $FreeBSD: src/gnu/libexec/uucp/contrib/uupoll.shar,v 1.5.2.1 1999/08/29 14:29:16 peter Exp $ */
 X/* Log: uupoll.shar,v
 X * Revision 1.9  1994/04/14  17:24:58  kdburg
 X * added comment to the AT_OPTION
@@ -1986,7 +1986,7 @@ X                - No alias expansion is done on the given names.
 */
 X
 #if !defined(lint)
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/contrib/uupoll.shar,v 1.5.2.1 1999/08/29 14:29:16 peter Exp $";
 #endif /* not lint */
 X
 X/* Log: uupoll.shar,v
diff --git a/gnu/libexec/uucp/contrib/uurate.c b/gnu/libexec/uucp/contrib/uurate.c
index 83be73476cbc..bcceb62d8a67 100644
--- a/gnu/libexec/uucp/contrib/uurate.c
+++ b/gnu/libexec/uucp/contrib/uurate.c
@@ -139,7 +139,7 @@
  * */
 
 char version[] = "@(#) Taylor UUCP Log File Summary Filter, Version 1.2.2";
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/contrib/uurate.c,v 1.7.2.1 1999/08/29 14:29:17 peter Exp $";
 #include <ctype.h>            /* Character Classification      */
 #include <math.h>
 #include "uucp.h"
diff --git a/gnu/libexec/uucp/contrib/uurate.man b/gnu/libexec/uucp/contrib/uurate.man
index f6c0399dba12..c9afbd7cd59c 100644
--- a/gnu/libexec/uucp/contrib/uurate.man
+++ b/gnu/libexec/uucp/contrib/uurate.man
@@ -1,4 +1,4 @@
-''' $FreeBSD$
+''' $FreeBSD: src/gnu/libexec/uucp/contrib/uurate.man,v 1.5.2.1 1999/08/29 14:29:17 peter Exp $
 .TH uurate 1
 .SH NAME
 uurate \- Report Taylor UUCP statistics
diff --git a/gnu/libexec/uucp/contrib/uusnap.c b/gnu/libexec/uucp/contrib/uusnap.c
index 992aa04cf65e..2577ce875647 100644
--- a/gnu/libexec/uucp/contrib/uusnap.c
+++ b/gnu/libexec/uucp/contrib/uusnap.c
@@ -25,7 +25,7 @@
 
 #include "uucp.h"
 #if USE_RCS_ID
-char uusnap_rcsid[] = "$FreeBSD$";
+char uusnap_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/contrib/uusnap.c,v 1.6.2.1 1999/08/29 14:29:18 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/cu/Makefile b/gnu/libexec/uucp/cu/Makefile
index 612546df99ef..85064eff31c7 100644
--- a/gnu/libexec/uucp/cu/Makefile
+++ b/gnu/libexec/uucp/cu/Makefile
@@ -1,5 +1,5 @@
 # Makefile for cu
-# $FreeBSD$
+# $FreeBSD: src/gnu/libexec/uucp/cu/Makefile,v 1.7.2.1 1999/08/29 14:29:20 peter Exp $
 
 BINDIR=		$(bindir)
 BINOWN=		$(owner)
diff --git a/gnu/libexec/uucp/cu/cu.1 b/gnu/libexec/uucp/cu/cu.1
index 81ee4df47b56..c95aa8007bd0 100644
--- a/gnu/libexec/uucp/cu/cu.1
+++ b/gnu/libexec/uucp/cu/cu.1
@@ -1,4 +1,4 @@
-''' $FreeBSD$
+''' $FreeBSD: src/gnu/libexec/uucp/cu/cu.1,v 1.6.2.1 1999/08/29 14:29:20 peter Exp $
 .TH cu 1 "Taylor UUCP 1.06"
 .SH NAME
 cu \- Call up another system
diff --git a/gnu/libexec/uucp/cu/cu.c b/gnu/libexec/uucp/cu/cu.c
index 3b41df3a28ac..01f951315af9 100644
--- a/gnu/libexec/uucp/cu/cu.c
+++ b/gnu/libexec/uucp/cu/cu.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char cu_rcsid[] = "$FreeBSD$";
+const char cu_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/cu/cu.c,v 1.7.2.1 1999/08/29 14:29:21 peter Exp $";
 #endif
 
 #include "cu.h"
diff --git a/gnu/libexec/uucp/libunix/Makefile b/gnu/libexec/uucp/libunix/Makefile
index 750521e33f29..774d7160faff 100644
--- a/gnu/libexec/uucp/libunix/Makefile
+++ b/gnu/libexec/uucp/libunix/Makefile
@@ -1,5 +1,5 @@
 # This subdirectory contains Unix specific support functions.
-# $FreeBSD$
+# $FreeBSD: src/gnu/libexec/uucp/libunix/Makefile,v 1.6.2.1 1999/08/29 14:29:22 peter Exp $
 
 LIB=		unix
 SRCS = access.c addbas.c app3.c app4.c basnam.c bytfre.c corrup.c \
diff --git a/gnu/libexec/uucp/libunix/cusub.c b/gnu/libexec/uucp/libunix/cusub.c
index c92eeba10a05..16750eae7860 100644
--- a/gnu/libexec/uucp/libunix/cusub.c
+++ b/gnu/libexec/uucp/libunix/cusub.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char cusub_rcsid[] = "$FreeBSD$";
+const char cusub_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libunix/cusub.c,v 1.6.2.1 1999/08/29 14:29:22 peter Exp $";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/libunix/lock.c b/gnu/libexec/uucp/libunix/lock.c
index 9740e862c1a8..e868eb349a5f 100644
--- a/gnu/libexec/uucp/libunix/lock.c
+++ b/gnu/libexec/uucp/libunix/lock.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char lock_rcsid[] = "$FreeBSD$";
+const char lock_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libunix/lock.c,v 1.6.2.1 1999/08/29 14:29:23 peter Exp $";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/libunix/picksb.c b/gnu/libexec/uucp/libunix/picksb.c
index 2aacc15da568..7187458d4733 100644
--- a/gnu/libexec/uucp/libunix/picksb.c
+++ b/gnu/libexec/uucp/libunix/picksb.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char picksb_rcsid[] = "$FreeBSD$";
+const char picksb_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libunix/picksb.c,v 1.6.2.1 1999/08/29 14:29:24 peter Exp $";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/libunix/pipe.c b/gnu/libexec/uucp/libunix/pipe.c
index ad1ff01c9aa0..78e8ed6c7575 100644
--- a/gnu/libexec/uucp/libunix/pipe.c
+++ b/gnu/libexec/uucp/libunix/pipe.c
@@ -27,7 +27,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char pipe_rcsid[] = "$FreeBSD$";
+const char pipe_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libunix/pipe.c,v 1.4.2.1 1999/08/29 14:29:24 peter Exp $";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/libunix/serial.c b/gnu/libexec/uucp/libunix/serial.c
index f5d88161cf61..a356f72682a4 100644
--- a/gnu/libexec/uucp/libunix/serial.c
+++ b/gnu/libexec/uucp/libunix/serial.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char serial_rcsid[] = "$FreeBSD$";
+const char serial_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libunix/serial.c,v 1.10.2.1 1999/08/29 14:29:25 peter Exp $";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/libunix/spool.c b/gnu/libexec/uucp/libunix/spool.c
index b14b5605a093..99bea7549ce1 100644
--- a/gnu/libexec/uucp/libunix/spool.c
+++ b/gnu/libexec/uucp/libunix/spool.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char spool_rcsid[] = "$FreeBSD$";
+const char spool_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libunix/spool.c,v 1.6.2.1 1999/08/29 14:29:26 peter Exp $";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/libunix/statsb.c b/gnu/libexec/uucp/libunix/statsb.c
index 4989cadc55ad..bbbcc0a48e02 100644
--- a/gnu/libexec/uucp/libunix/statsb.c
+++ b/gnu/libexec/uucp/libunix/statsb.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char statsb_rcsid[] = "$FreeBSD$";
+const char statsb_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libunix/statsb.c,v 1.5.2.1 1999/08/29 14:29:27 peter Exp $";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/libunix/tcp.c b/gnu/libexec/uucp/libunix/tcp.c
index 0791900d56a2..ca19c05adca6 100644
--- a/gnu/libexec/uucp/libunix/tcp.c
+++ b/gnu/libexec/uucp/libunix/tcp.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char tcp_rcsid[] = "$FreeBSD$";
+const char tcp_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libunix/tcp.c,v 1.3.2.1 1999/08/29 14:29:27 peter Exp $";
 #endif
 
 #if HAVE_TCP
diff --git a/gnu/libexec/uucp/libunix/tli.c b/gnu/libexec/uucp/libunix/tli.c
index 714942e5b029..65f522746b80 100644
--- a/gnu/libexec/uucp/libunix/tli.c
+++ b/gnu/libexec/uucp/libunix/tli.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char tli_rcsid[] = "$FreeBSD$";
+const char tli_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libunix/tli.c,v 1.3.2.1 1999/08/29 14:29:28 peter Exp $";
 #endif
 
 #if HAVE_TLI
diff --git a/gnu/libexec/uucp/libunix/work.c b/gnu/libexec/uucp/libunix/work.c
index 7e0c12eb48fc..d3e2e98eb1ca 100644
--- a/gnu/libexec/uucp/libunix/work.c
+++ b/gnu/libexec/uucp/libunix/work.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char work_rcsid[] = "$FreeBSD$";
+const char work_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libunix/work.c,v 1.6.2.1 1999/08/29 14:29:28 peter Exp $";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/libunix/xqtfil.c b/gnu/libexec/uucp/libunix/xqtfil.c
index 3019a3295db9..158ed7bb1acc 100644
--- a/gnu/libexec/uucp/libunix/xqtfil.c
+++ b/gnu/libexec/uucp/libunix/xqtfil.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char xqtfil_rcsid[] = "$FreeBSD$";
+const char xqtfil_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libunix/xqtfil.c,v 1.6.2.1 1999/08/29 14:29:28 peter Exp $";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/libunix/xqtsub.c b/gnu/libexec/uucp/libunix/xqtsub.c
index 7435497eb631..c02e8ffdbbfb 100644
--- a/gnu/libexec/uucp/libunix/xqtsub.c
+++ b/gnu/libexec/uucp/libunix/xqtsub.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char xqtsub_rcsid[] = "$FreeBSD$";
+const char xqtsub_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libunix/xqtsub.c,v 1.6.2.1 1999/08/29 14:29:29 peter Exp $";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/libuuconf/Makefile b/gnu/libexec/uucp/libuuconf/Makefile
index 6fc7942a55f1..890b46fe55ec 100644
--- a/gnu/libexec/uucp/libuuconf/Makefile
+++ b/gnu/libexec/uucp/libuuconf/Makefile
@@ -1,5 +1,5 @@
 # This is the Makefile for the Taylor UUCP uuconf library
-# $FreeBSD$
+# $FreeBSD: src/gnu/libexec/uucp/libuuconf/Makefile,v 1.5.2.1 1999/08/29 14:29:31 peter Exp $
 
 LIB=		uuconf
 SRCS = addblk.c addstr.c allblk.c alloc.c base.c bool.c callin.c \
diff --git a/gnu/libexec/uucp/libuuconf/addblk.c b/gnu/libexec/uucp/libuuconf/addblk.c
index 3f502df302d9..595e0f2ca2c1 100644
--- a/gnu/libexec/uucp/libuuconf/addblk.c
+++ b/gnu/libexec/uucp/libuuconf/addblk.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_addblk_rcsid[] = "$FreeBSD$";
+const char _uuconf_addblk_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/addblk.c,v 1.5.2.1 1999/08/29 14:29:32 peter Exp $";
 #endif
 
 #include "alloc.h"
diff --git a/gnu/libexec/uucp/libuuconf/addstr.c b/gnu/libexec/uucp/libuuconf/addstr.c
index f95d528fddc9..76521d4889dd 100644
--- a/gnu/libexec/uucp/libuuconf/addstr.c
+++ b/gnu/libexec/uucp/libuuconf/addstr.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_addstr_rcsid[] = "$FreeBSD$";
+const char _uuconf_addstr_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/addstr.c,v 1.5.2.1 1999/08/29 14:29:32 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/allblk.c b/gnu/libexec/uucp/libuuconf/allblk.c
index 045740e2f8aa..02b78d52be0a 100644
--- a/gnu/libexec/uucp/libuuconf/allblk.c
+++ b/gnu/libexec/uucp/libuuconf/allblk.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_allblk_rcsid[] = "$FreeBSD$";
+const char _uuconf_allblk_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/allblk.c,v 1.5.2.1 1999/08/29 14:29:32 peter Exp $";
 #endif
 
 #include "alloc.h"
diff --git a/gnu/libexec/uucp/libuuconf/alloc.c b/gnu/libexec/uucp/libuuconf/alloc.c
index e64875a526fe..d639446dae2c 100644
--- a/gnu/libexec/uucp/libuuconf/alloc.c
+++ b/gnu/libexec/uucp/libuuconf/alloc.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_alloc_rcsid[] = "$FreeBSD$";
+const char _uuconf_alloc_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/alloc.c,v 1.5.2.1 1999/08/29 14:29:33 peter Exp $";
 #endif
 
 #include "alloc.h"
diff --git a/gnu/libexec/uucp/libuuconf/base.c b/gnu/libexec/uucp/libuuconf/base.c
index c6441230eb74..614a7f09632d 100644
--- a/gnu/libexec/uucp/libuuconf/base.c
+++ b/gnu/libexec/uucp/libuuconf/base.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_base_rcsid[] = "$FreeBSD$";
+const char _uuconf_base_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/base.c,v 1.5.2.1 1999/08/29 14:29:34 peter Exp $";
 #endif
 
 /* This turns a cmdtab_offset table into a uuconf_cmdtab table.  Each
diff --git a/gnu/libexec/uucp/libuuconf/bool.c b/gnu/libexec/uucp/libuuconf/bool.c
index f32c9bb5dcf2..527593c4c3d7 100644
--- a/gnu/libexec/uucp/libuuconf/bool.c
+++ b/gnu/libexec/uucp/libuuconf/bool.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_bool_rcsid[] = "$FreeBSD$";
+const char _uuconf_bool_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/bool.c,v 1.6.2.1 1999/08/29 14:29:34 peter Exp $";
 #endif
 
 /* Parse a boolean string into a variable.  This is called by
diff --git a/gnu/libexec/uucp/libuuconf/callin.c b/gnu/libexec/uucp/libuuconf/callin.c
index e8b80adb807d..36faf27585e9 100644
--- a/gnu/libexec/uucp/libuuconf/callin.c
+++ b/gnu/libexec/uucp/libuuconf/callin.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_callin_rcsid[] = "$FreeBSD$";
+const char _uuconf_callin_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/callin.c,v 1.6.2.1 1999/08/29 14:29:35 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/calout.c b/gnu/libexec/uucp/libuuconf/calout.c
index 26ce361fdb43..70dad4905e3e 100644
--- a/gnu/libexec/uucp/libuuconf/calout.c
+++ b/gnu/libexec/uucp/libuuconf/calout.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_calout_rcsid[] = "$FreeBSD$";
+const char _uuconf_calout_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/calout.c,v 1.6.2.1 1999/08/29 14:29:36 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/chatc.c b/gnu/libexec/uucp/libuuconf/chatc.c
index bf3aed63a082..5aad934f9d9f 100644
--- a/gnu/libexec/uucp/libuuconf/chatc.c
+++ b/gnu/libexec/uucp/libuuconf/chatc.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_chatc_rcsid[] = "$FreeBSD$";
+const char _uuconf_chatc_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/chatc.c,v 1.5.2.1 1999/08/29 14:29:36 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/libuuconf/cmdarg.c b/gnu/libexec/uucp/libuuconf/cmdarg.c
index 701405c668fc..6de7eb6571ad 100644
--- a/gnu/libexec/uucp/libuuconf/cmdarg.c
+++ b/gnu/libexec/uucp/libuuconf/cmdarg.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_cmdarg_rcsid[] = "$FreeBSD$";
+const char _uuconf_cmdarg_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/cmdarg.c,v 1.6.2.1 1999/08/29 14:29:36 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/libuuconf/cmdfil.c b/gnu/libexec/uucp/libuuconf/cmdfil.c
index dd5183ff5a05..ce8caa255fa9 100644
--- a/gnu/libexec/uucp/libuuconf/cmdfil.c
+++ b/gnu/libexec/uucp/libuuconf/cmdfil.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_cmdfil_rcsid[] = "$FreeBSD$";
+const char _uuconf_cmdfil_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/cmdfil.c,v 1.5.2.1 1999/08/29 14:29:37 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/cmdlin.c b/gnu/libexec/uucp/libuuconf/cmdlin.c
index 59ec08aa815d..c749e0282514 100644
--- a/gnu/libexec/uucp/libuuconf/cmdlin.c
+++ b/gnu/libexec/uucp/libuuconf/cmdlin.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_cmdlin_rcsid[] = "$FreeBSD$";
+const char _uuconf_cmdlin_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/cmdlin.c,v 1.6.2.1 1999/08/29 14:29:37 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/debfil.c b/gnu/libexec/uucp/libuuconf/debfil.c
index 6d4c0cb8d05a..bb406e015a85 100644
--- a/gnu/libexec/uucp/libuuconf/debfil.c
+++ b/gnu/libexec/uucp/libuuconf/debfil.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_debfil_rcsid[] = "$FreeBSD$";
+const char _uuconf_debfil_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/debfil.c,v 1.5.2.1 1999/08/29 14:29:38 peter Exp $";
 #endif
 
 /* Get the name of the UUCP debugging file.  */
diff --git a/gnu/libexec/uucp/libuuconf/deblev.c b/gnu/libexec/uucp/libuuconf/deblev.c
index 7653aeedb88c..695d67344fb8 100644
--- a/gnu/libexec/uucp/libuuconf/deblev.c
+++ b/gnu/libexec/uucp/libuuconf/deblev.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_deblev_rcsid[] = "$FreeBSD$";
+const char _uuconf_deblev_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/deblev.c,v 1.5.2.1 1999/08/29 14:29:38 peter Exp $";
 #endif
 
 /* Get the UUCP debugging level.  */
diff --git a/gnu/libexec/uucp/libuuconf/diacod.c b/gnu/libexec/uucp/libuuconf/diacod.c
index df0e9a7beec0..2455fdd502a6 100644
--- a/gnu/libexec/uucp/libuuconf/diacod.c
+++ b/gnu/libexec/uucp/libuuconf/diacod.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_diacod_rcsid[] = "$FreeBSD$";
+const char _uuconf_diacod_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/diacod.c,v 1.5.2.1 1999/08/29 14:29:39 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/dial.c b/gnu/libexec/uucp/libuuconf/dial.c
index 7b84416b77d0..92c2b72628b1 100644
--- a/gnu/libexec/uucp/libuuconf/dial.c
+++ b/gnu/libexec/uucp/libuuconf/dial.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_dial_rcsid[] = "$FreeBSD$";
+const char _uuconf_dial_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/dial.c,v 1.5.2.1 1999/08/29 14:29:39 peter Exp $";
 #endif
 
 /* Find a dialer by name.  */
diff --git a/gnu/libexec/uucp/libuuconf/diasub.c b/gnu/libexec/uucp/libuuconf/diasub.c
index 80358cc26af8..1546ad473366 100644
--- a/gnu/libexec/uucp/libuuconf/diasub.c
+++ b/gnu/libexec/uucp/libuuconf/diasub.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_diasub_rcsid[] = "$FreeBSD$";
+const char _uuconf_diasub_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/diasub.c,v 1.5.2.1 1999/08/29 14:29:40 peter Exp $";
 #endif
 
 /* Clear the information in a dialer.  */
diff --git a/gnu/libexec/uucp/libuuconf/dnams.c b/gnu/libexec/uucp/libuuconf/dnams.c
index 2d295e6aaaf2..c984e6578243 100644
--- a/gnu/libexec/uucp/libuuconf/dnams.c
+++ b/gnu/libexec/uucp/libuuconf/dnams.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_dnams_rcsid[] = "$FreeBSD$";
+const char _uuconf_dnams_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/dnams.c,v 1.5.2.1 1999/08/29 14:29:40 peter Exp $";
 #endif
 
 /* Get all known dialer names.  */
diff --git a/gnu/libexec/uucp/libuuconf/errno.c b/gnu/libexec/uucp/libuuconf/errno.c
index 129c4a4b88b7..b8d53a183137 100644
--- a/gnu/libexec/uucp/libuuconf/errno.c
+++ b/gnu/libexec/uucp/libuuconf/errno.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_errno_rcsid[] = "$FreeBSD$";
+const char _uuconf_errno_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/errno.c,v 1.5.2.1 1999/08/29 14:29:41 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/errstr.c b/gnu/libexec/uucp/libuuconf/errstr.c
index d5370c963ec8..042e1ebac33e 100644
--- a/gnu/libexec/uucp/libuuconf/errstr.c
+++ b/gnu/libexec/uucp/libuuconf/errstr.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_errstr_rcsid[] = "$FreeBSD$";
+const char _uuconf_errstr_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/errstr.c,v 1.6.2.1 1999/08/29 14:29:41 peter Exp $";
 #endif
 
 static char *zeprint_num P((char *zbuf, size_t cbuf, int ival));
diff --git a/gnu/libexec/uucp/libuuconf/filnam.c b/gnu/libexec/uucp/libuuconf/filnam.c
index 55c23b75ec18..8d8fba9aea62 100644
--- a/gnu/libexec/uucp/libuuconf/filnam.c
+++ b/gnu/libexec/uucp/libuuconf/filnam.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_filnam_rcsid[] = "$FreeBSD$";
+const char _uuconf_filnam_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/filnam.c,v 1.5.2.1 1999/08/29 14:29:42 peter Exp $";
 #endif
 
 /* Return the saved file name.  */
diff --git a/gnu/libexec/uucp/libuuconf/freblk.c b/gnu/libexec/uucp/libuuconf/freblk.c
index df01897e29a3..390226e5228a 100644
--- a/gnu/libexec/uucp/libuuconf/freblk.c
+++ b/gnu/libexec/uucp/libuuconf/freblk.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_freblk_rcsid[] = "$FreeBSD$";
+const char _uuconf_freblk_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/freblk.c,v 1.5.2.1 1999/08/29 14:29:42 peter Exp $";
 #endif
 
 #include "alloc.h"
diff --git a/gnu/libexec/uucp/libuuconf/fredia.c b/gnu/libexec/uucp/libuuconf/fredia.c
index c1f8f46786b0..61733eb71827 100644
--- a/gnu/libexec/uucp/libuuconf/fredia.c
+++ b/gnu/libexec/uucp/libuuconf/fredia.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_fredia_rcsid[] = "$FreeBSD$";
+const char _uuconf_fredia_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/fredia.c,v 1.5.2.1 1999/08/29 14:29:43 peter Exp $";
 #endif
 
 /* Free the memory allocated for a dialer.  */
diff --git a/gnu/libexec/uucp/libuuconf/free.c b/gnu/libexec/uucp/libuuconf/free.c
index c31f337925e8..fff0d1c082f1 100644
--- a/gnu/libexec/uucp/libuuconf/free.c
+++ b/gnu/libexec/uucp/libuuconf/free.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_free_rcsid[] = "$FreeBSD$";
+const char _uuconf_free_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/free.c,v 1.5.2.1 1999/08/29 14:29:44 peter Exp $";
 #endif
 
 #include "alloc.h"
diff --git a/gnu/libexec/uucp/libuuconf/freprt.c b/gnu/libexec/uucp/libuuconf/freprt.c
index 265275804b31..4a6868488085 100644
--- a/gnu/libexec/uucp/libuuconf/freprt.c
+++ b/gnu/libexec/uucp/libuuconf/freprt.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_freprt_rcsid[] = "$FreeBSD$";
+const char _uuconf_freprt_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/freprt.c,v 1.5.2.1 1999/08/29 14:29:44 peter Exp $";
 #endif
 
 /* Free the memory allocated for a port.  */
diff --git a/gnu/libexec/uucp/libuuconf/fresys.c b/gnu/libexec/uucp/libuuconf/fresys.c
index a8a71cba2a7c..e3c24a317e17 100644
--- a/gnu/libexec/uucp/libuuconf/fresys.c
+++ b/gnu/libexec/uucp/libuuconf/fresys.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_fresys_rcsid[] = "$FreeBSD$";
+const char _uuconf_fresys_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/fresys.c,v 1.5.2.1 1999/08/29 14:29:44 peter Exp $";
 #endif
 
 /* Free the memory allocated for a system.  */
diff --git a/gnu/libexec/uucp/libuuconf/grdcmp.c b/gnu/libexec/uucp/libuuconf/grdcmp.c
index 65b5e6311cf8..28ddf0c10891 100644
--- a/gnu/libexec/uucp/libuuconf/grdcmp.c
+++ b/gnu/libexec/uucp/libuuconf/grdcmp.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_grdcmp_rcsid[] = "$FreeBSD$";
+const char _uuconf_grdcmp_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/grdcmp.c,v 1.5.2.1 1999/08/29 14:29:45 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/libuuconf/hdial.c b/gnu/libexec/uucp/libuuconf/hdial.c
index 6c524f8ec58c..881c689a40c9 100644
--- a/gnu/libexec/uucp/libuuconf/hdial.c
+++ b/gnu/libexec/uucp/libuuconf/hdial.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_hdial_rcsid[] = "$FreeBSD$";
+const char _uuconf_hdial_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/hdial.c,v 1.6.2.1 1999/08/29 14:29:45 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/hdnams.c b/gnu/libexec/uucp/libuuconf/hdnams.c
index f02019b7ef9f..e5a8b28afd44 100644
--- a/gnu/libexec/uucp/libuuconf/hdnams.c
+++ b/gnu/libexec/uucp/libuuconf/hdnams.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_hdnams_rcsid[] = "$FreeBSD$";
+const char _uuconf_hdnams_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/hdnams.c,v 1.6.2.1 1999/08/29 14:29:46 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/hinit.c b/gnu/libexec/uucp/libuuconf/hinit.c
index 5a0e32a4b291..3f869de5fc9b 100644
--- a/gnu/libexec/uucp/libuuconf/hinit.c
+++ b/gnu/libexec/uucp/libuuconf/hinit.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_hinit_rcsid[] = "$FreeBSD$";
+const char _uuconf_hinit_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/hinit.c,v 1.6.2.1 1999/08/29 14:29:47 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/hlocnm.c b/gnu/libexec/uucp/libuuconf/hlocnm.c
index 0ede436c5f61..ec1a2055847e 100644
--- a/gnu/libexec/uucp/libuuconf/hlocnm.c
+++ b/gnu/libexec/uucp/libuuconf/hlocnm.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_hlocnm_rcsid[] = "$FreeBSD$";
+const char _uuconf_hlocnm_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/hlocnm.c,v 1.5.2.1 1999/08/29 14:29:47 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/hport.c b/gnu/libexec/uucp/libuuconf/hport.c
index 23d59abe8f46..dce6837d0fc6 100644
--- a/gnu/libexec/uucp/libuuconf/hport.c
+++ b/gnu/libexec/uucp/libuuconf/hport.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_hport_rcsid[] = "$FreeBSD$";
+const char _uuconf_hport_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/hport.c,v 1.5.2.1 1999/08/29 14:29:47 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/hrmunk.c b/gnu/libexec/uucp/libuuconf/hrmunk.c
index fba3af97f1f1..40b964ad1b90 100644
--- a/gnu/libexec/uucp/libuuconf/hrmunk.c
+++ b/gnu/libexec/uucp/libuuconf/hrmunk.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_hrmunk_rcsid[] = "$FreeBSD$";
+const char _uuconf_hrmunk_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/hrmunk.c,v 1.5.2.1 1999/08/29 14:29:48 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/hsinfo.c b/gnu/libexec/uucp/libuuconf/hsinfo.c
index 94343cc11015..ca0321009092 100644
--- a/gnu/libexec/uucp/libuuconf/hsinfo.c
+++ b/gnu/libexec/uucp/libuuconf/hsinfo.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_hsinfo_rcsid[] = "$FreeBSD$";
+const char _uuconf_hsinfo_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/hsinfo.c,v 1.6.2.1 1999/08/29 14:29:48 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/hsnams.c b/gnu/libexec/uucp/libuuconf/hsnams.c
index 18cec1bc0c21..a69f756cfc47 100644
--- a/gnu/libexec/uucp/libuuconf/hsnams.c
+++ b/gnu/libexec/uucp/libuuconf/hsnams.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_hsnams_rcsid[] = "$FreeBSD$";
+const char _uuconf_hsnams_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/hsnams.c,v 1.6.2.1 1999/08/29 14:29:48 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/hsys.c b/gnu/libexec/uucp/libuuconf/hsys.c
index 72254cc8a534..73c982b9e5e1 100644
--- a/gnu/libexec/uucp/libuuconf/hsys.c
+++ b/gnu/libexec/uucp/libuuconf/hsys.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_hsys_rcsid[] = "$FreeBSD$";
+const char _uuconf_hsys_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/hsys.c,v 1.5.2.1 1999/08/29 14:29:49 peter Exp $";
 #endif
 
 /* Get system information from the HDB configuration files.  This is a
diff --git a/gnu/libexec/uucp/libuuconf/hunk.c b/gnu/libexec/uucp/libuuconf/hunk.c
index c829817d76de..d97000dfc4a1 100644
--- a/gnu/libexec/uucp/libuuconf/hunk.c
+++ b/gnu/libexec/uucp/libuuconf/hunk.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_hunk_rcsid[] = "$FreeBSD$";
+const char _uuconf_hunk_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/hunk.c,v 1.5.2.1 1999/08/29 14:29:49 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/iniglb.c b/gnu/libexec/uucp/libuuconf/iniglb.c
index d0b8dd081924..a12cb224b300 100644
--- a/gnu/libexec/uucp/libuuconf/iniglb.c
+++ b/gnu/libexec/uucp/libuuconf/iniglb.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_iniglb_rcsid[] = "$FreeBSD$";
+const char _uuconf_iniglb_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/iniglb.c,v 1.5.2.1 1999/08/29 14:29:50 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/init.c b/gnu/libexec/uucp/libuuconf/init.c
index e06c0019434e..4dfdd3af507f 100644
--- a/gnu/libexec/uucp/libuuconf/init.c
+++ b/gnu/libexec/uucp/libuuconf/init.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_init_rcsid[] = "$FreeBSD$";
+const char _uuconf_init_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/init.c,v 1.5.2.1 1999/08/29 14:29:51 peter Exp $";
 #endif
 
 /* Initialize the UUCP configuration file reading routines.  This is
diff --git a/gnu/libexec/uucp/libuuconf/int.c b/gnu/libexec/uucp/libuuconf/int.c
index f559ec97a1e0..2d00530e28b8 100644
--- a/gnu/libexec/uucp/libuuconf/int.c
+++ b/gnu/libexec/uucp/libuuconf/int.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_int_rcsid[] = "$FreeBSD$";
+const char _uuconf_int_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/int.c,v 1.5.2.1 1999/08/29 14:29:51 peter Exp $";
 #endif
 
 /* Parse a string into a variable.  This is called by uuconf_cmd_args,
diff --git a/gnu/libexec/uucp/libuuconf/lckdir.c b/gnu/libexec/uucp/libuuconf/lckdir.c
index cb00f12fdc80..7c77d5311841 100644
--- a/gnu/libexec/uucp/libuuconf/lckdir.c
+++ b/gnu/libexec/uucp/libuuconf/lckdir.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_lckdir_rcsid[] = "$FreeBSD$";
+const char _uuconf_lckdir_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/lckdir.c,v 1.5.2.1 1999/08/29 14:29:52 peter Exp $";
 #endif
 
 /* Get the name of the UUCP lock directory.  */
diff --git a/gnu/libexec/uucp/libuuconf/lineno.c b/gnu/libexec/uucp/libuuconf/lineno.c
index df5ff4b18cba..3504a887d56a 100644
--- a/gnu/libexec/uucp/libuuconf/lineno.c
+++ b/gnu/libexec/uucp/libuuconf/lineno.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_lineno_rcsid[] = "$FreeBSD$";
+const char _uuconf_lineno_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/lineno.c,v 1.5.2.1 1999/08/29 14:29:52 peter Exp $";
 #endif
 
 /* Return the saved line number.  */
diff --git a/gnu/libexec/uucp/libuuconf/llocnm.c b/gnu/libexec/uucp/libuuconf/llocnm.c
index ce7a6a049e59..5075c05c79ca 100644
--- a/gnu/libexec/uucp/libuuconf/llocnm.c
+++ b/gnu/libexec/uucp/libuuconf/llocnm.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_llocnm_rcsid[] = "$FreeBSD$";
+const char _uuconf_llocnm_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/llocnm.c,v 1.5.2.1 1999/08/29 14:29:52 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/local.c b/gnu/libexec/uucp/libuuconf/local.c
index 8687f459b017..651b7b56c847 100644
--- a/gnu/libexec/uucp/libuuconf/local.c
+++ b/gnu/libexec/uucp/libuuconf/local.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_local_rcsid[] = "$FreeBSD$";
+const char _uuconf_local_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/local.c,v 1.5.2.1 1999/08/29 14:29:53 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/locnm.c b/gnu/libexec/uucp/libuuconf/locnm.c
index 3b01474ffd0b..7ea2dc44dadc 100644
--- a/gnu/libexec/uucp/libuuconf/locnm.c
+++ b/gnu/libexec/uucp/libuuconf/locnm.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_locnm_rcsid[] = "$FreeBSD$";
+const char _uuconf_locnm_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/locnm.c,v 1.5.2.1 1999/08/29 14:29:54 peter Exp $";
 #endif
 
 /* Get the local node name.  */
diff --git a/gnu/libexec/uucp/libuuconf/logfil.c b/gnu/libexec/uucp/libuuconf/logfil.c
index 24439e2a27ce..686fc369e0a5 100644
--- a/gnu/libexec/uucp/libuuconf/logfil.c
+++ b/gnu/libexec/uucp/libuuconf/logfil.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_logfil_rcsid[] = "$FreeBSD$";
+const char _uuconf_logfil_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/logfil.c,v 1.5.2.1 1999/08/29 14:29:54 peter Exp $";
 #endif
 
 /* Get the name of the UUCP log file.  */
diff --git a/gnu/libexec/uucp/libuuconf/maxuxq.c b/gnu/libexec/uucp/libuuconf/maxuxq.c
index 909de08d5411..290e9781d34a 100644
--- a/gnu/libexec/uucp/libuuconf/maxuxq.c
+++ b/gnu/libexec/uucp/libuuconf/maxuxq.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_maxuxq_rcsid[] = "$FreeBSD$";
+const char _uuconf_maxuxq_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/maxuxq.c,v 1.5.2.1 1999/08/29 14:29:55 peter Exp $";
 #endif
 
 /* Get the maximum number of simultaneous uuxqt executions.  When
diff --git a/gnu/libexec/uucp/libuuconf/mrgblk.c b/gnu/libexec/uucp/libuuconf/mrgblk.c
index e0dea6afe85a..d978d8e92c5e 100644
--- a/gnu/libexec/uucp/libuuconf/mrgblk.c
+++ b/gnu/libexec/uucp/libuuconf/mrgblk.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_mrgblk_rcsid[] = "$FreeBSD$";
+const char _uuconf_mrgblk_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/mrgblk.c,v 1.5.2.1 1999/08/29 14:29:55 peter Exp $";
 #endif
 
 #include "alloc.h"
diff --git a/gnu/libexec/uucp/libuuconf/paramc.c b/gnu/libexec/uucp/libuuconf/paramc.c
index a5074d3b381b..0e2ec82c7ac8 100644
--- a/gnu/libexec/uucp/libuuconf/paramc.c
+++ b/gnu/libexec/uucp/libuuconf/paramc.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_paramc_rcsid[] = "$FreeBSD$";
+const char _uuconf_paramc_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/paramc.c,v 1.5.2.1 1999/08/29 14:29:55 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/port.c b/gnu/libexec/uucp/libuuconf/port.c
index bb3a16fccd67..9d2439ee09ca 100644
--- a/gnu/libexec/uucp/libuuconf/port.c
+++ b/gnu/libexec/uucp/libuuconf/port.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_port_rcsid[] = "$FreeBSD$";
+const char _uuconf_port_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/port.c,v 1.5.2.1 1999/08/29 14:29:56 peter Exp $";
 #endif
 
 /* Find a port by name, baud rate, and special purpose function.  */
diff --git a/gnu/libexec/uucp/libuuconf/prtsub.c b/gnu/libexec/uucp/libuuconf/prtsub.c
index 667bc1c9d71c..d61fef12d0a5 100644
--- a/gnu/libexec/uucp/libuuconf/prtsub.c
+++ b/gnu/libexec/uucp/libuuconf/prtsub.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_prtsub_rcsid[] = "$FreeBSD$";
+const char _uuconf_prtsub_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/prtsub.c,v 1.5.2.1 1999/08/29 14:29:56 peter Exp $";
 #endif
 
 /* Clear the information in a port.  This can only clear the type
diff --git a/gnu/libexec/uucp/libuuconf/pubdir.c b/gnu/libexec/uucp/libuuconf/pubdir.c
index 5192c6246df2..a5a8428a91f2 100644
--- a/gnu/libexec/uucp/libuuconf/pubdir.c
+++ b/gnu/libexec/uucp/libuuconf/pubdir.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_pubdir_rcsid[] = "$FreeBSD$";
+const char _uuconf_pubdir_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/pubdir.c,v 1.5.2.1 1999/08/29 14:29:56 peter Exp $";
 #endif
 
 /* Get the name of the UUCP public directory.  */
diff --git a/gnu/libexec/uucp/libuuconf/rdlocs.c b/gnu/libexec/uucp/libuuconf/rdlocs.c
index 3baabc251df2..547e01c5bf46 100644
--- a/gnu/libexec/uucp/libuuconf/rdlocs.c
+++ b/gnu/libexec/uucp/libuuconf/rdlocs.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_rdlocs_rcsid[] = "$FreeBSD$";
+const char _uuconf_rdlocs_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/rdlocs.c,v 1.6.2.1 1999/08/29 14:29:57 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/rdperm.c b/gnu/libexec/uucp/libuuconf/rdperm.c
index a7d29a41b63b..e6bf23324d31 100644
--- a/gnu/libexec/uucp/libuuconf/rdperm.c
+++ b/gnu/libexec/uucp/libuuconf/rdperm.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_rdperm_rcsid[] = "$FreeBSD$";
+const char _uuconf_rdperm_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/rdperm.c,v 1.5.2.1 1999/08/29 14:29:58 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/reliab.c b/gnu/libexec/uucp/libuuconf/reliab.c
index 8a232cd1253f..078599c281b3 100644
--- a/gnu/libexec/uucp/libuuconf/reliab.c
+++ b/gnu/libexec/uucp/libuuconf/reliab.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_reliab_rcsid[] = "$FreeBSD$";
+const char _uuconf_reliab_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/reliab.c,v 1.5.2.1 1999/08/29 14:29:59 peter Exp $";
 #endif
 
 /* Handle the "seven-bit" command for a port or a dialer.  The pvar
diff --git a/gnu/libexec/uucp/libuuconf/remunk.c b/gnu/libexec/uucp/libuuconf/remunk.c
index 8dc83d713a7f..b58d367a0e4c 100644
--- a/gnu/libexec/uucp/libuuconf/remunk.c
+++ b/gnu/libexec/uucp/libuuconf/remunk.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_remunk_rcsid[] = "$FreeBSD$";
+const char _uuconf_remunk_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/remunk.c,v 1.5.2.1 1999/08/29 14:29:59 peter Exp $";
 #endif
 
 /* Get the name of the remote.unknown shell script.  */
diff --git a/gnu/libexec/uucp/libuuconf/runuxq.c b/gnu/libexec/uucp/libuuconf/runuxq.c
index 0c5296cbf613..3adbf6c598f7 100644
--- a/gnu/libexec/uucp/libuuconf/runuxq.c
+++ b/gnu/libexec/uucp/libuuconf/runuxq.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_runuxq_rcsid[] = "$FreeBSD$";
+const char _uuconf_runuxq_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/runuxq.c,v 1.4.2.1 1999/08/29 14:30:00 peter Exp $";
 #endif
 
 /* Return how often to spawn a uuxqt process.  This is either a
diff --git a/gnu/libexec/uucp/libuuconf/sinfo.c b/gnu/libexec/uucp/libuuconf/sinfo.c
index fe7b7b972731..f1e1b3b14f57 100644
--- a/gnu/libexec/uucp/libuuconf/sinfo.c
+++ b/gnu/libexec/uucp/libuuconf/sinfo.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_sinfo_rcsid[] = "$FreeBSD$";
+const char _uuconf_sinfo_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/sinfo.c,v 1.5.2.1 1999/08/29 14:30:00 peter Exp $";
 #endif
 
 /* Get information about a particular system.  We combine the
diff --git a/gnu/libexec/uucp/libuuconf/snams.c b/gnu/libexec/uucp/libuuconf/snams.c
index f648e61a6d0f..99e96fe48920 100644
--- a/gnu/libexec/uucp/libuuconf/snams.c
+++ b/gnu/libexec/uucp/libuuconf/snams.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_snams_rcsid[] = "$FreeBSD$";
+const char _uuconf_snams_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/snams.c,v 1.5.2.1 1999/08/29 14:30:01 peter Exp $";
 #endif
 
 /* Get all known system names.  */
diff --git a/gnu/libexec/uucp/libuuconf/split.c b/gnu/libexec/uucp/libuuconf/split.c
index 8b90a660d682..c8bce13aaaa0 100644
--- a/gnu/libexec/uucp/libuuconf/split.c
+++ b/gnu/libexec/uucp/libuuconf/split.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_split_rcsid[] = "$FreeBSD$";
+const char _uuconf_split_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/split.c,v 1.5.2.1 1999/08/29 14:30:01 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/libuuconf/spool.c b/gnu/libexec/uucp/libuuconf/spool.c
index 0fe073334c90..325738605509 100644
--- a/gnu/libexec/uucp/libuuconf/spool.c
+++ b/gnu/libexec/uucp/libuuconf/spool.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_spool_rcsid[] = "$FreeBSD$";
+const char _uuconf_spool_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/spool.c,v 1.5.2.1 1999/08/29 14:30:02 peter Exp $";
 #endif
 
 /* Get the name of the UUCP spool directory.  */
diff --git a/gnu/libexec/uucp/libuuconf/stafil.c b/gnu/libexec/uucp/libuuconf/stafil.c
index 205e05c7bb89..cd39a53088ad 100644
--- a/gnu/libexec/uucp/libuuconf/stafil.c
+++ b/gnu/libexec/uucp/libuuconf/stafil.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_stafil_rcsid[] = "$FreeBSD$";
+const char _uuconf_stafil_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/stafil.c,v 1.5.2.1 1999/08/29 14:30:03 peter Exp $";
 #endif
 
 /* Get the name of the UUCP statistics file.  */
diff --git a/gnu/libexec/uucp/libuuconf/strip.c b/gnu/libexec/uucp/libuuconf/strip.c
index 03f962bf1da4..a4bf1c443805 100644
--- a/gnu/libexec/uucp/libuuconf/strip.c
+++ b/gnu/libexec/uucp/libuuconf/strip.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_strip_rcsid[] = "$FreeBSD$";
+const char _uuconf_strip_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/strip.c,v 1.3.2.1 1999/08/29 14:30:03 peter Exp $";
 #endif
 
 /* Get information about what types of global information should be
diff --git a/gnu/libexec/uucp/libuuconf/syssub.c b/gnu/libexec/uucp/libuuconf/syssub.c
index 81b0dd84e651..5f48a870cc17 100644
--- a/gnu/libexec/uucp/libuuconf/syssub.c
+++ b/gnu/libexec/uucp/libuuconf/syssub.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_syssub_rcsid[] = "$FreeBSD$";
+const char _uuconf_syssub_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/syssub.c,v 1.6.2.1 1999/08/29 14:30:03 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/tcalou.c b/gnu/libexec/uucp/libuuconf/tcalou.c
index 8ff0493bde54..7dfa663b5b37 100644
--- a/gnu/libexec/uucp/libuuconf/tcalou.c
+++ b/gnu/libexec/uucp/libuuconf/tcalou.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tcalou_rcsid[] = "$FreeBSD$";
+const char _uuconf_tcalou_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/tcalou.c,v 1.5.2.1 1999/08/29 14:30:03 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/tdial.c b/gnu/libexec/uucp/libuuconf/tdial.c
index 1bf57d240fb3..7afad444b825 100644
--- a/gnu/libexec/uucp/libuuconf/tdial.c
+++ b/gnu/libexec/uucp/libuuconf/tdial.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tdial_rcsid[] = "$FreeBSD$";
+const char _uuconf_tdial_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/tdial.c,v 1.5.2.1 1999/08/29 14:30:04 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/tdialc.c b/gnu/libexec/uucp/libuuconf/tdialc.c
index c13a7a5d2c43..22ab52b8745e 100644
--- a/gnu/libexec/uucp/libuuconf/tdialc.c
+++ b/gnu/libexec/uucp/libuuconf/tdialc.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tdialc_rcsid[] = "$FreeBSD$";
+const char _uuconf_tdialc_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/tdialc.c,v 1.6.2.1 1999/08/29 14:30:04 peter Exp $";
 #endif
 
 static int idchat P((pointer pglobal, int argc, char **argv, pointer pvar,
diff --git a/gnu/libexec/uucp/libuuconf/tdnams.c b/gnu/libexec/uucp/libuuconf/tdnams.c
index 38e30070bb83..cfdb4876a24e 100644
--- a/gnu/libexec/uucp/libuuconf/tdnams.c
+++ b/gnu/libexec/uucp/libuuconf/tdnams.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tdnams_rcsid[] = "$FreeBSD$";
+const char _uuconf_tdnams_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/tdnams.c,v 1.6.2.1 1999/08/29 14:30:04 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/tgcmp.c b/gnu/libexec/uucp/libuuconf/tgcmp.c
index 16f2a2c229c6..a20c43070477 100644
--- a/gnu/libexec/uucp/libuuconf/tgcmp.c
+++ b/gnu/libexec/uucp/libuuconf/tgcmp.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tgcmp_rcsid[] = "$FreeBSD$";
+const char _uuconf_tgcmp_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/tgcmp.c,v 1.5.2.1 1999/08/29 14:30:05 peter Exp $";
 #endif
 
 /* A comparison function to pass to _uuconf_itime_parse.  This
diff --git a/gnu/libexec/uucp/libuuconf/thread.c b/gnu/libexec/uucp/libuuconf/thread.c
index 23af8ebe8bcc..6abeaaa7aa80 100644
--- a/gnu/libexec/uucp/libuuconf/thread.c
+++ b/gnu/libexec/uucp/libuuconf/thread.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_thread_rcsid[] = "$FreeBSD$";
+const char _uuconf_thread_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/thread.c,v 1.5.2.1 1999/08/29 14:30:05 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/time.c b/gnu/libexec/uucp/libuuconf/time.c
index db00d6a993e3..0ecd1c6c923f 100644
--- a/gnu/libexec/uucp/libuuconf/time.c
+++ b/gnu/libexec/uucp/libuuconf/time.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_time_rcsid[] = "$FreeBSD$";
+const char _uuconf_time_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/time.c,v 1.5.2.1 1999/08/29 14:30:05 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/libuuconf/tinit.c b/gnu/libexec/uucp/libuuconf/tinit.c
index 6ab9869d285e..ff34c60a9bd2 100644
--- a/gnu/libexec/uucp/libuuconf/tinit.c
+++ b/gnu/libexec/uucp/libuuconf/tinit.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tinit_rcsid[] = "$FreeBSD$";
+const char _uuconf_tinit_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/tinit.c,v 1.5.2.1 1999/08/29 14:30:06 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/tlocnm.c b/gnu/libexec/uucp/libuuconf/tlocnm.c
index 96280acdbc44..c4a7ed92bb57 100644
--- a/gnu/libexec/uucp/libuuconf/tlocnm.c
+++ b/gnu/libexec/uucp/libuuconf/tlocnm.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tlocnm_rcsid[] = "$FreeBSD$";
+const char _uuconf_tlocnm_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/tlocnm.c,v 1.5.2.1 1999/08/29 14:30:06 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/tport.c b/gnu/libexec/uucp/libuuconf/tport.c
index 3e052f375382..68c4b86bff0f 100644
--- a/gnu/libexec/uucp/libuuconf/tport.c
+++ b/gnu/libexec/uucp/libuuconf/tport.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tport_rcsid[] = "$FreeBSD$";
+const char _uuconf_tport_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/tport.c,v 1.5.2.1 1999/08/29 14:30:07 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/tportc.c b/gnu/libexec/uucp/libuuconf/tportc.c
index b07d49a15f95..92dd29dcfb08 100644
--- a/gnu/libexec/uucp/libuuconf/tportc.c
+++ b/gnu/libexec/uucp/libuuconf/tportc.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tportc_rcsid[] = "$FreeBSD$";
+const char _uuconf_tportc_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/tportc.c,v 1.6.2.1 1999/08/29 14:30:07 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/tsinfo.c b/gnu/libexec/uucp/libuuconf/tsinfo.c
index 6766153f5203..0f09b1352e48 100644
--- a/gnu/libexec/uucp/libuuconf/tsinfo.c
+++ b/gnu/libexec/uucp/libuuconf/tsinfo.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tsinfo_rcsid[] = "$FreeBSD$";
+const char _uuconf_tsinfo_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/tsinfo.c,v 1.5.2.1 1999/08/29 14:30:08 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/tsnams.c b/gnu/libexec/uucp/libuuconf/tsnams.c
index a60b3c7e120c..fd7b9bc923ba 100644
--- a/gnu/libexec/uucp/libuuconf/tsnams.c
+++ b/gnu/libexec/uucp/libuuconf/tsnams.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tsnams_rcsid[] = "$FreeBSD$";
+const char _uuconf_tsnams_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/tsnams.c,v 1.5.2.1 1999/08/29 14:30:08 peter Exp $";
 #endif
 
 /* Get all the system names from the Taylor UUCP configuration files.
diff --git a/gnu/libexec/uucp/libuuconf/tsys.c b/gnu/libexec/uucp/libuuconf/tsys.c
index bdb90a2f5c72..58ddae422884 100644
--- a/gnu/libexec/uucp/libuuconf/tsys.c
+++ b/gnu/libexec/uucp/libuuconf/tsys.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tsys_rcsid[] = "$FreeBSD$";
+const char _uuconf_tsys_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/tsys.c,v 1.5.2.1 1999/08/29 14:30:09 peter Exp $";
 #endif
 
 /* Get system information from the Taylor UUCP configuration files.
diff --git a/gnu/libexec/uucp/libuuconf/tval.c b/gnu/libexec/uucp/libuuconf/tval.c
index c0a25351a318..78cb47fc556d 100644
--- a/gnu/libexec/uucp/libuuconf/tval.c
+++ b/gnu/libexec/uucp/libuuconf/tval.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tval_rcsid[] = "$FreeBSD$";
+const char _uuconf_tval_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/tval.c,v 1.5.2.1 1999/08/29 14:30:09 peter Exp $";
 #endif
 
 /* Validate a login name for a system using Taylor UUCP configuration
diff --git a/gnu/libexec/uucp/libuuconf/ugtlin.c b/gnu/libexec/uucp/libuuconf/ugtlin.c
index a328229759ad..af9a63618146 100644
--- a/gnu/libexec/uucp/libuuconf/ugtlin.c
+++ b/gnu/libexec/uucp/libuuconf/ugtlin.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_ugtlin_rcsid[] = "$FreeBSD$";
+const char _uuconf_ugtlin_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/ugtlin.c,v 1.5.2.1 1999/08/29 14:30:10 peter Exp $";
 #endif
 
 /* Read a line from a file with backslash continuations.  This updates
diff --git a/gnu/libexec/uucp/libuuconf/unk.c b/gnu/libexec/uucp/libuuconf/unk.c
index 6345ffed9cb3..da70f8e59709 100644
--- a/gnu/libexec/uucp/libuuconf/unk.c
+++ b/gnu/libexec/uucp/libuuconf/unk.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_unk_rcsid[] = "$FreeBSD$";
+const char _uuconf_unk_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/unk.c,v 1.5.2.1 1999/08/29 14:30:10 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/val.c b/gnu/libexec/uucp/libuuconf/val.c
index 1ef0182a27ec..ec413788bd2e 100644
--- a/gnu/libexec/uucp/libuuconf/val.c
+++ b/gnu/libexec/uucp/libuuconf/val.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_val_rcsid[] = "$FreeBSD$";
+const char _uuconf_val_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/val.c,v 1.5.2.1 1999/08/29 14:30:11 peter Exp $";
 #endif
 
 /* Validate a login name for a system.  */
diff --git a/gnu/libexec/uucp/libuuconf/vinit.c b/gnu/libexec/uucp/libuuconf/vinit.c
index e1552c30cefe..d08627adc4df 100644
--- a/gnu/libexec/uucp/libuuconf/vinit.c
+++ b/gnu/libexec/uucp/libuuconf/vinit.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_vinit_rcsid[] = "$FreeBSD$";
+const char _uuconf_vinit_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/vinit.c,v 1.5.2.1 1999/08/29 14:30:11 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/vport.c b/gnu/libexec/uucp/libuuconf/vport.c
index 1e39d2d647b7..edb7449e3688 100644
--- a/gnu/libexec/uucp/libuuconf/vport.c
+++ b/gnu/libexec/uucp/libuuconf/vport.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_vport_rcsid[] = "$FreeBSD$";
+const char _uuconf_vport_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/vport.c,v 1.6.2.1 1999/08/29 14:30:12 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/vsinfo.c b/gnu/libexec/uucp/libuuconf/vsinfo.c
index 4ca8005b7e07..1dd71e556585 100644
--- a/gnu/libexec/uucp/libuuconf/vsinfo.c
+++ b/gnu/libexec/uucp/libuuconf/vsinfo.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_vsinfo_rcsid[] = "$FreeBSD$";
+const char _uuconf_vsinfo_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/vsinfo.c,v 1.6.2.1 1999/08/29 14:30:12 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/vsnams.c b/gnu/libexec/uucp/libuuconf/vsnams.c
index 432c9bf9a998..dd71c784fcab 100644
--- a/gnu/libexec/uucp/libuuconf/vsnams.c
+++ b/gnu/libexec/uucp/libuuconf/vsnams.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_vsnams_rcsid[] = "$FreeBSD$";
+const char _uuconf_vsnams_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/vsnams.c,v 1.5.2.1 1999/08/29 14:30:12 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/vsys.c b/gnu/libexec/uucp/libuuconf/vsys.c
index c4431a04983a..e0cd1578e378 100644
--- a/gnu/libexec/uucp/libuuconf/vsys.c
+++ b/gnu/libexec/uucp/libuuconf/vsys.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_vsys_rcsid[] = "$FreeBSD$";
+const char _uuconf_vsys_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuuconf/vsys.c,v 1.5.2.1 1999/08/29 14:30:13 peter Exp $";
 #endif
 
 /* Get system information from the V2 configuration files.  This is a
diff --git a/gnu/libexec/uucp/libuucp/Makefile b/gnu/libexec/uucp/libuucp/Makefile
index 3c4c5e94ef8f..56315a1060eb 100644
--- a/gnu/libexec/uucp/libuucp/Makefile
+++ b/gnu/libexec/uucp/libuucp/Makefile
@@ -1,5 +1,5 @@
 # This is the Makefile for the libuucp subdirectory of Taylor UUCP
-# $FreeBSD$
+# $FreeBSD: src/gnu/libexec/uucp/libuucp/Makefile,v 1.5.2.1 1999/08/29 14:30:20 peter Exp $
 
 LIB=		uucp
 SRCS = buffer.c crc.c debug.c escape.c getopt.c getop1.c parse.c spool.c \
diff --git a/gnu/libexec/uucp/libuucp/parse.c b/gnu/libexec/uucp/libuucp/parse.c
index d955e416f0cd..26b7a59c9d56 100644
--- a/gnu/libexec/uucp/libuucp/parse.c
+++ b/gnu/libexec/uucp/libuucp/parse.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char parse_rcsid[] = "$FreeBSD$";
+const char parse_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/libuucp/parse.c,v 1.6.2.1 1999/08/29 14:30:21 peter Exp $";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/sample/Makefile b/gnu/libexec/uucp/sample/Makefile
index 82811b3156c5..c1d8749af1de 100644
--- a/gnu/libexec/uucp/sample/Makefile
+++ b/gnu/libexec/uucp/sample/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/libexec/uucp/sample/Makefile,v 1.5.2.1 1999/08/29 14:30:22 peter Exp $
 
 FILES=	call.sample config.sample dial.sample dialcode.sample passwd.sample \
 	port.sample sys1.sample sys2.sample
diff --git a/gnu/libexec/uucp/sample/dial.sample b/gnu/libexec/uucp/sample/dial.sample
index 4480ec5c6064..bd60446158b2 100644
--- a/gnu/libexec/uucp/sample/dial.sample
+++ b/gnu/libexec/uucp/sample/dial.sample
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/libexec/uucp/sample/dial.sample,v 1.3.2.1 1999/08/29 14:30:22 peter Exp $
 
 # This is an example of dial, the dialer configuration file for Taylor
 # UUCP.  To use it, you must compile the package with
diff --git a/gnu/libexec/uucp/tstuu.c b/gnu/libexec/uucp/tstuu.c
index b220677cae51..21165779bf66 100644
--- a/gnu/libexec/uucp/tstuu.c
+++ b/gnu/libexec/uucp/tstuu.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char tstuu_rcsid[] = "$FreeBSD$";
+const char tstuu_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/tstuu.c,v 1.6.2.1 1999/08/29 14:29:10 peter Exp $";
 #endif
 
 #include "sysdep.h"
diff --git a/gnu/libexec/uucp/uuchk/Makefile b/gnu/libexec/uucp/uuchk/Makefile
index 8af9626c7162..86ac6a45fb7e 100644
--- a/gnu/libexec/uucp/uuchk/Makefile
+++ b/gnu/libexec/uucp/uuchk/Makefile
@@ -1,5 +1,5 @@
 # Makefile for uuchk
-# $FreeBSD$
+# $FreeBSD: src/gnu/libexec/uucp/uuchk/Makefile,v 1.7.2.1 1999/08/29 14:30:23 peter Exp $
 
 BINDIR=		$(sbindir)
 
diff --git a/gnu/libexec/uucp/uuchk/uuchk.8 b/gnu/libexec/uucp/uuchk/uuchk.8
index 88f7a67de171..a6f42168ec9d 100644
--- a/gnu/libexec/uucp/uuchk/uuchk.8
+++ b/gnu/libexec/uucp/uuchk/uuchk.8
@@ -1,4 +1,4 @@
-''' $FreeBSD$
+''' $FreeBSD: src/gnu/libexec/uucp/uuchk/uuchk.8,v 1.2.2.1 1999/08/29 14:30:24 peter Exp $
 .TH uuchk 1 "Taylor UUCP 1.06"
 .SH NAME
 uuchk \- displays information from the UUCP configuration
diff --git a/gnu/libexec/uucp/uuchk/uuchk.c b/gnu/libexec/uucp/uuchk/uuchk.c
index 38c241a6ee6d..d1a6e262c56f 100644
--- a/gnu/libexec/uucp/uuchk/uuchk.c
+++ b/gnu/libexec/uucp/uuchk/uuchk.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char uuchk_rcsid[] = "$FreeBSD$";
+const char uuchk_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/uuchk/uuchk.c,v 1.6.2.1 1999/08/29 14:30:24 peter Exp $";
 #endif
 
 #include "getopt.h"
diff --git a/gnu/libexec/uucp/uucico/Makefile b/gnu/libexec/uucp/uucico/Makefile
index 1aa147a826c3..3b66ce4279fd 100644
--- a/gnu/libexec/uucp/uucico/Makefile
+++ b/gnu/libexec/uucp/uucico/Makefile
@@ -1,5 +1,5 @@
 # Makefile for uucico
-# $FreeBSD$
+# $FreeBSD: src/gnu/libexec/uucp/uucico/Makefile,v 1.11.2.1 1999/08/29 14:30:26 peter Exp $
 
 BINDIR=         $(libxdir)
 BINOWN=		$(owner)
diff --git a/gnu/libexec/uucp/uucico/prote.c b/gnu/libexec/uucp/uucico/prote.c
index 6f7032480f7d..b99ea0f413e0 100644
--- a/gnu/libexec/uucp/uucico/prote.c
+++ b/gnu/libexec/uucp/uucico/prote.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char prote_rcsid[] = "$FreeBSD$";
+const char prote_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/uucico/prote.c,v 1.6.2.1 1999/08/29 14:30:26 peter Exp $";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/uucico/protf.c b/gnu/libexec/uucp/uucico/protf.c
index 4436a1209c25..32e75c0ddb25 100644
--- a/gnu/libexec/uucp/uucico/protf.c
+++ b/gnu/libexec/uucp/uucico/protf.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char protf_rcsid[] = "$FreeBSD$";
+const char protf_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/uucico/protf.c,v 1.6.2.1 1999/08/29 14:30:27 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/uucico/protg.c b/gnu/libexec/uucp/uucico/protg.c
index ea589170b5fa..e6c7507c15c6 100644
--- a/gnu/libexec/uucp/uucico/protg.c
+++ b/gnu/libexec/uucp/uucico/protg.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char protg_rcsid[] = "$FreeBSD$";
+const char protg_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/uucico/protg.c,v 1.6.2.1 1999/08/29 14:30:28 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/uucico/proti.c b/gnu/libexec/uucp/uucico/proti.c
index 4b4c5e3ecd28..aa888b600e90 100644
--- a/gnu/libexec/uucp/uucico/proti.c
+++ b/gnu/libexec/uucp/uucico/proti.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char proti_rcsid[] = "$FreeBSD$";
+const char proti_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/uucico/proti.c,v 1.6.2.1 1999/08/29 14:30:28 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/uucico/protj.c b/gnu/libexec/uucp/uucico/protj.c
index bb46f72fe0b6..45caa01e9f28 100644
--- a/gnu/libexec/uucp/uucico/protj.c
+++ b/gnu/libexec/uucp/uucico/protj.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char protj_rcsid[] = "$FreeBSD$";
+const char protj_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/uucico/protj.c,v 1.5.2.1 1999/08/29 14:30:29 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/uucico/prott.c b/gnu/libexec/uucp/uucico/prott.c
index fe3b274493a1..0189af44a72c 100644
--- a/gnu/libexec/uucp/uucico/prott.c
+++ b/gnu/libexec/uucp/uucico/prott.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char prott_rcsid[] = "$FreeBSD$";
+const char prott_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/uucico/prott.c,v 1.6.2.1 1999/08/29 14:30:29 peter Exp $";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/uucico/proty.c b/gnu/libexec/uucp/uucico/proty.c
index 50e1f1152db3..310efd6da78d 100644
--- a/gnu/libexec/uucp/uucico/proty.c
+++ b/gnu/libexec/uucp/uucico/proty.c
@@ -23,7 +23,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char proty_id[] = "$FreeBSD$";
+const char proty_id[] = "$FreeBSD: src/gnu/libexec/uucp/uucico/proty.c,v 1.3.2.1 1999/08/29 14:30:30 peter Exp $";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/uucico/protz.c b/gnu/libexec/uucp/uucico/protz.c
index 305e2507f7cf..bba6124f3aa1 100644
--- a/gnu/libexec/uucp/uucico/protz.c
+++ b/gnu/libexec/uucp/uucico/protz.c
@@ -181,7 +181,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char protz_rcsid[] = "$FreeBSD$";
+const char protz_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/uucico/protz.c,v 1.6.2.1 1999/08/29 14:30:30 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/uucico/rec.c b/gnu/libexec/uucp/uucico/rec.c
index 020ff21eefd1..39f566256379 100644
--- a/gnu/libexec/uucp/uucico/rec.c
+++ b/gnu/libexec/uucp/uucico/rec.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char rec_rcsid[] = "$FreeBSD$";
+const char rec_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/uucico/rec.c,v 1.7.2.1 1999/08/29 14:30:31 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/uucico/send.c b/gnu/libexec/uucp/uucico/send.c
index bbe34e582d7d..79a0a8a50316 100644
--- a/gnu/libexec/uucp/uucico/send.c
+++ b/gnu/libexec/uucp/uucico/send.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char send_rcsid[] = "$FreeBSD$";
+const char send_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/uucico/send.c,v 1.7.2.1 1999/08/29 14:30:31 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/uucico/time.c b/gnu/libexec/uucp/uucico/time.c
index bdcb25f6e9e0..a2ab3b1815ea 100644
--- a/gnu/libexec/uucp/uucico/time.c
+++ b/gnu/libexec/uucp/uucico/time.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char time_rcsid[] = "$FreeBSD$";
+const char time_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/uucico/time.c,v 1.5.2.1 1999/08/29 14:30:31 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/uucico/trans.c b/gnu/libexec/uucp/uucico/trans.c
index e7165714351d..20599ab4512e 100644
--- a/gnu/libexec/uucp/uucico/trans.c
+++ b/gnu/libexec/uucp/uucico/trans.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char trans_rcsid[] = "$FreeBSD$";
+const char trans_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/uucico/trans.c,v 1.7.2.1 1999/08/29 14:30:32 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/uucico/uucico.8 b/gnu/libexec/uucp/uucico/uucico.8
index b7918999f88f..7e3bcbf72b7b 100644
--- a/gnu/libexec/uucp/uucico/uucico.8
+++ b/gnu/libexec/uucp/uucico/uucico.8
@@ -1,4 +1,4 @@
-''' $FreeBSD$
+''' $FreeBSD: src/gnu/libexec/uucp/uucico/uucico.8,v 1.7.2.1 1999/08/29 14:30:32 peter Exp $
 .TH uucico 8 "Taylor UUCP 1.06"
 .SH NAME
 uucico \- UUCP file transfer daemon
diff --git a/gnu/libexec/uucp/uucico/uucico.c b/gnu/libexec/uucp/uucico/uucico.c
index 63b7116c72f8..baf0267d7cb2 100644
--- a/gnu/libexec/uucp/uucico/uucico.c
+++ b/gnu/libexec/uucp/uucico/uucico.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char uucico_rcsid[] = "$FreeBSD$";
+const char uucico_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/uucico/uucico.c,v 1.8.2.1 1999/08/29 14:30:33 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/uucico/xcmd.c b/gnu/libexec/uucp/uucico/xcmd.c
index f29bb5e478d3..6b30f842a025 100644
--- a/gnu/libexec/uucp/uucico/xcmd.c
+++ b/gnu/libexec/uucp/uucico/xcmd.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char xcmd_rcsid[] = "$FreeBSD$";
+const char xcmd_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/uucico/xcmd.c,v 1.5.2.1 1999/08/29 14:30:33 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/uuconv/Makefile b/gnu/libexec/uucp/uuconv/Makefile
index 02df55cc685f..cbcb345b7951 100644
--- a/gnu/libexec/uucp/uuconv/Makefile
+++ b/gnu/libexec/uucp/uuconv/Makefile
@@ -1,5 +1,5 @@
 # Makefile for uuconv
-# $FreeBSD$
+# $FreeBSD: src/gnu/libexec/uucp/uuconv/Makefile,v 1.8.2.1 1999/08/29 14:30:35 peter Exp $
 
 BINDIR=		$(sbindir)
 
diff --git a/gnu/libexec/uucp/uuconv/uuconv.1 b/gnu/libexec/uucp/uuconv/uuconv.1
index 71fedc1398e9..1a25a75e956c 100644
--- a/gnu/libexec/uucp/uuconv/uuconv.1
+++ b/gnu/libexec/uucp/uuconv/uuconv.1
@@ -1,4 +1,4 @@
-''' $FreeBSD$
+''' $FreeBSD: src/gnu/libexec/uucp/uuconv/uuconv.1,v 1.1.4.1 1999/08/29 14:30:36 peter Exp $
 .TH uuconv 1 "Taylor UUCP 1.06"
 .SH NAME
 uuconv \- convert UUCP configuration files
diff --git a/gnu/libexec/uucp/uuconv/uuconv.c b/gnu/libexec/uucp/uuconv/uuconv.c
index fadea9e20028..6a1783e1f772 100644
--- a/gnu/libexec/uucp/uuconv/uuconv.c
+++ b/gnu/libexec/uucp/uuconv/uuconv.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char uuconv_rcsid[] = "$FreeBSD$";
+const char uuconv_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/uuconv/uuconv.c,v 1.6.2.1 1999/08/29 14:30:37 peter Exp $";
 #endif
 
 #include "getopt.h"
diff --git a/gnu/libexec/uucp/uucp/Makefile b/gnu/libexec/uucp/uucp/Makefile
index 0219fff63a43..e2f4b67076ec 100644
--- a/gnu/libexec/uucp/uucp/Makefile
+++ b/gnu/libexec/uucp/uucp/Makefile
@@ -1,5 +1,5 @@
 # Makefile for uucp
-# $FreeBSD$
+# $FreeBSD: src/gnu/libexec/uucp/uucp/Makefile,v 1.5.2.1 1999/08/29 14:30:38 peter Exp $
 
 BINDIR=		$(bindir)
 BINOWN=		$(owner)
diff --git a/gnu/libexec/uucp/uucp/uucp.1 b/gnu/libexec/uucp/uucp/uucp.1
index d8e693a5aed1..d933f5b8a187 100644
--- a/gnu/libexec/uucp/uucp/uucp.1
+++ b/gnu/libexec/uucp/uucp/uucp.1
@@ -1,4 +1,4 @@
-''' $FreeBSD$
+''' $FreeBSD: src/gnu/libexec/uucp/uucp/uucp.1,v 1.6.2.1 1999/08/29 14:30:38 peter Exp $
 .TH uucp 1 "Taylor UUCP 1.06"
 .SH NAME
 uucp \- Unix to Unix copy
diff --git a/gnu/libexec/uucp/uucp/uucp.c b/gnu/libexec/uucp/uucp/uucp.c
index 080ad0f8b61d..e54b6a2323ae 100644
--- a/gnu/libexec/uucp/uucp/uucp.c
+++ b/gnu/libexec/uucp/uucp/uucp.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char uucp_rcsid[] = "$FreeBSD$";
+const char uucp_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/uucp/uucp.c,v 1.6.2.1 1999/08/29 14:30:39 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/uulog/Makefile b/gnu/libexec/uucp/uulog/Makefile
index 9724cd515970..7263f19e71c9 100644
--- a/gnu/libexec/uucp/uulog/Makefile
+++ b/gnu/libexec/uucp/uulog/Makefile
@@ -1,5 +1,5 @@
 # Makefile for uulog
-# $FreeBSD$
+# $FreeBSD: src/gnu/libexec/uucp/uulog/Makefile,v 1.4.2.1 1999/08/29 14:30:40 peter Exp $
 
 BINDIR=		$(bindir)
 
diff --git a/gnu/libexec/uucp/uulog/uulog.1 b/gnu/libexec/uucp/uulog/uulog.1
index 315cb908aec6..a4b1add8dc05 100644
--- a/gnu/libexec/uucp/uulog/uulog.1
+++ b/gnu/libexec/uucp/uulog/uulog.1
@@ -1,4 +1,4 @@
-''' $FreeBSD$
+''' $FreeBSD: src/gnu/libexec/uucp/uulog/uulog.1,v 1.2.2.1 1999/08/29 14:30:41 peter Exp $
 .TH uulog 1 "Taylor UUCP 1.06"
 .SH NAME
 uulog \- display UUCP log entries 
diff --git a/gnu/libexec/uucp/uulog/uulog.c b/gnu/libexec/uucp/uulog/uulog.c
index 440289eedbda..b7ef6f768da7 100644
--- a/gnu/libexec/uucp/uulog/uulog.c
+++ b/gnu/libexec/uucp/uulog/uulog.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char uulog_rcsid[] = "$FreeBSD$";
+const char uulog_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/uulog/uulog.c,v 1.6.2.1 1999/08/29 14:30:41 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/uuname/Makefile b/gnu/libexec/uucp/uuname/Makefile
index f5e6dd92cc85..02a69079d50c 100644
--- a/gnu/libexec/uucp/uuname/Makefile
+++ b/gnu/libexec/uucp/uuname/Makefile
@@ -1,5 +1,5 @@
 # Makefile for uuname
-# $FreeBSD$
+# $FreeBSD: src/gnu/libexec/uucp/uuname/Makefile,v 1.4.2.1 1999/08/29 14:30:42 peter Exp $
 
 BINDIR=		$(bindir)
 BINOWN=		$(owner)
diff --git a/gnu/libexec/uucp/uuname/uuname.1 b/gnu/libexec/uucp/uuname/uuname.1
index 443aa9dc1e13..6cc411d596bb 100644
--- a/gnu/libexec/uucp/uuname/uuname.1
+++ b/gnu/libexec/uucp/uuname/uuname.1
@@ -1,4 +1,4 @@
-''' $FreeBSD$
+''' $FreeBSD: src/gnu/libexec/uucp/uuname/uuname.1,v 1.1.4.1 1999/08/29 14:30:43 peter Exp $
 .TH uuname 1 "Taylor UUCP 1.06"
 .SH NAME
 uuname \- list known remote UUCP sites
diff --git a/gnu/libexec/uucp/uuname/uuname.c b/gnu/libexec/uucp/uuname/uuname.c
index 8500c33b5ad2..c7fdc2c55e77 100644
--- a/gnu/libexec/uucp/uuname/uuname.c
+++ b/gnu/libexec/uucp/uuname/uuname.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char uuname_rcsid[] = "$FreeBSD$";
+const char uuname_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/uuname/uuname.c,v 1.5.2.1 1999/08/29 14:30:44 peter Exp $";
 #endif
 
 #include "getopt.h"
diff --git a/gnu/libexec/uucp/uupick/Makefile b/gnu/libexec/uucp/uupick/Makefile
index 60216b806176..d087f9b75418 100644
--- a/gnu/libexec/uucp/uupick/Makefile
+++ b/gnu/libexec/uucp/uupick/Makefile
@@ -1,5 +1,5 @@
 # Makefile for uupick
-# $FreeBSD$
+# $FreeBSD: src/gnu/libexec/uucp/uupick/Makefile,v 1.4.2.1 1999/08/29 14:30:45 peter Exp $
 
 BINDIR=		$(bindir)
 
diff --git a/gnu/libexec/uucp/uupick/uupick.1 b/gnu/libexec/uucp/uupick/uupick.1
index ebddfda38cab..9312c5383e73 100644
--- a/gnu/libexec/uucp/uupick/uupick.1
+++ b/gnu/libexec/uucp/uupick/uupick.1
@@ -1,4 +1,4 @@
-''' $FreeBSD$
+''' $FreeBSD: src/gnu/libexec/uucp/uupick/uupick.1,v 1.1.4.1 1999/08/29 14:30:45 peter Exp $
 .TH uupick 1 "Taylor UUCP 1.06"
 .SH NAME
 uupick \- retrieve files transferred by uuto
diff --git a/gnu/libexec/uucp/uupick/uupick.c b/gnu/libexec/uucp/uupick/uupick.c
index b6d208ae8594..ca683e70ccb6 100644
--- a/gnu/libexec/uucp/uupick/uupick.c
+++ b/gnu/libexec/uucp/uupick/uupick.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char uupick_rcsid[] = "$FreeBSD$";
+const char uupick_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/uupick/uupick.c,v 1.5.2.1 1999/08/29 14:30:46 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/uusched/Makefile b/gnu/libexec/uucp/uusched/Makefile
index 0a203a8619fc..cbed676c6b98 100644
--- a/gnu/libexec/uucp/uusched/Makefile
+++ b/gnu/libexec/uucp/uusched/Makefile
@@ -1,5 +1,5 @@
 # Makefile for uusched
-# $FreeBSD$
+# $FreeBSD: src/gnu/libexec/uucp/uusched/Makefile,v 1.11.2.1 1999/08/29 14:30:47 peter Exp $
 
 BINDIR=		$(bindir)
 CLEANFILES+=	$(ONESHPROG)
diff --git a/gnu/libexec/uucp/uusched/uusched.8 b/gnu/libexec/uucp/uusched/uusched.8
index 9621c48dcfcc..2a9743e04bf2 100644
--- a/gnu/libexec/uucp/uusched/uusched.8
+++ b/gnu/libexec/uucp/uusched/uusched.8
@@ -1,4 +1,4 @@
-''' $FreeBSD$
+''' $FreeBSD: src/gnu/libexec/uucp/uusched/uusched.8,v 1.1.4.1 1999/08/29 14:30:48 peter Exp $
 .TH uusched 8 "Taylor UUCP 1.06"
 .SH NAME
 uusched \- UUCP file transfer daemon
diff --git a/gnu/libexec/uucp/uustat/Makefile b/gnu/libexec/uucp/uustat/Makefile
index be839ca11116..fb9991724113 100644
--- a/gnu/libexec/uucp/uustat/Makefile
+++ b/gnu/libexec/uucp/uustat/Makefile
@@ -1,5 +1,5 @@
 # Makefile for uustat
-# $FreeBSD$
+# $FreeBSD: src/gnu/libexec/uucp/uustat/Makefile,v 1.4.2.1 1999/08/29 14:30:49 peter Exp $
 
 BINDIR=		$(bindir)
 BINOWN=		$(owner)
diff --git a/gnu/libexec/uucp/uustat/uustat.1 b/gnu/libexec/uucp/uustat/uustat.1
index 8c30d044a599..052caceb01e9 100644
--- a/gnu/libexec/uucp/uustat/uustat.1
+++ b/gnu/libexec/uucp/uustat/uustat.1
@@ -1,4 +1,4 @@
-''' $FreeBSD$
+''' $FreeBSD: src/gnu/libexec/uucp/uustat/uustat.1,v 1.8.2.1 1999/08/29 14:30:49 peter Exp $
 .TH uustat 1 "Taylor UUCP 1.06"
 .SH NAME
 uustat \- UUCP status inquiry and control
diff --git a/gnu/libexec/uucp/uustat/uustat.c b/gnu/libexec/uucp/uustat/uustat.c
index 9ca16bbab68d..86307bf66a49 100644
--- a/gnu/libexec/uucp/uustat/uustat.c
+++ b/gnu/libexec/uucp/uustat/uustat.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char uustat_rcsid[] = "$FreeBSD$";
+const char uustat_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/uustat/uustat.c,v 1.6.2.1 1999/08/29 14:30:51 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/uuto/Makefile b/gnu/libexec/uucp/uuto/Makefile
index da379eef7342..1692e3d45243 100644
--- a/gnu/libexec/uucp/uuto/Makefile
+++ b/gnu/libexec/uucp/uuto/Makefile
@@ -1,5 +1,5 @@
 # Makefile for uuto
-# $FreeBSD$
+# $FreeBSD: src/gnu/libexec/uucp/uuto/Makefile,v 1.9.2.1 1999/08/29 14:30:52 peter Exp $
 
 BINDIR=		$(bindir)
 CLEANFILES+=	$(ONESHPROG)
diff --git a/gnu/libexec/uucp/uuto/uuto.1 b/gnu/libexec/uucp/uuto/uuto.1
index 13efd9292947..259e32c132d6 100644
--- a/gnu/libexec/uucp/uuto/uuto.1
+++ b/gnu/libexec/uucp/uuto/uuto.1
@@ -1,4 +1,4 @@
-''' $FreeBSD$
+''' $FreeBSD: src/gnu/libexec/uucp/uuto/uuto.1,v 1.1.4.1 1999/08/29 14:30:52 peter Exp $
 ''' based on the uucp texinfo documentation
 .TH uuto 1 "Taylor UUCP 1.06"
 .SH NAME
diff --git a/gnu/libexec/uucp/uux/Makefile b/gnu/libexec/uucp/uux/Makefile
index 60593523392c..babb5280fb1e 100644
--- a/gnu/libexec/uucp/uux/Makefile
+++ b/gnu/libexec/uucp/uux/Makefile
@@ -1,5 +1,5 @@
 # Makefile for uux
-# $FreeBSD$
+# $FreeBSD: src/gnu/libexec/uucp/uux/Makefile,v 1.5.2.1 1999/08/29 14:30:54 peter Exp $
 
 BINDIR=		$(bindir)
 BINOWN=		$(owner)
diff --git a/gnu/libexec/uucp/uux/uux.1 b/gnu/libexec/uucp/uux/uux.1
index 079ff5dc428a..ffd5de6db915 100644
--- a/gnu/libexec/uucp/uux/uux.1
+++ b/gnu/libexec/uucp/uux/uux.1
@@ -1,4 +1,4 @@
-''' $FreeBSD$
+''' $FreeBSD: src/gnu/libexec/uucp/uux/uux.1,v 1.6.2.1 1999/08/29 14:30:54 peter Exp $
 .TH uux 1 "Taylor UUCP 1.06"
 .SH NAME
 uux \- Remote command execution over UUCP
diff --git a/gnu/libexec/uucp/uux/uux.c b/gnu/libexec/uucp/uux/uux.c
index 069e9d624d5f..caf3f3b5a66a 100644
--- a/gnu/libexec/uucp/uux/uux.c
+++ b/gnu/libexec/uucp/uux/uux.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char uux_rcsid[] = "$FreeBSD$";
+const char uux_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/uux/uux.c,v 1.10.2.1 1999/08/29 14:30:55 peter Exp $";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/uuxqt/Makefile b/gnu/libexec/uucp/uuxqt/Makefile
index 8c6dffa7bf13..84edf7d5eb31 100644
--- a/gnu/libexec/uucp/uuxqt/Makefile
+++ b/gnu/libexec/uucp/uuxqt/Makefile
@@ -1,5 +1,5 @@
 # Makefile for uuxqt
-# $FreeBSD$
+# $FreeBSD: src/gnu/libexec/uucp/uuxqt/Makefile,v 1.8.2.2 1999/08/29 14:30:56 peter Exp $
 
 BINDIR=         $(libxdir)
 BINOWN=		$(owner)
diff --git a/gnu/libexec/uucp/uuxqt/uuxqt.8 b/gnu/libexec/uucp/uuxqt/uuxqt.8
index 40fe661a40e7..85ac9209f27a 100644
--- a/gnu/libexec/uucp/uuxqt/uuxqt.8
+++ b/gnu/libexec/uucp/uuxqt/uuxqt.8
@@ -1,4 +1,4 @@
-''' $FreeBSD$
+''' $FreeBSD: src/gnu/libexec/uucp/uuxqt/uuxqt.8,v 1.6.2.1 1999/08/29 14:30:57 peter Exp $
 .TH uuxqt 8 "Taylor UUCP 1.06"
 .SH NAME
 uuxqt \- UUCP execution daemon
diff --git a/gnu/libexec/uucp/uuxqt/uuxqt.c b/gnu/libexec/uucp/uuxqt/uuxqt.c
index 31bcee2acfee..c122a80052f5 100644
--- a/gnu/libexec/uucp/uuxqt/uuxqt.c
+++ b/gnu/libexec/uucp/uuxqt/uuxqt.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char uuxqt_rcsid[] = "$FreeBSD$";
+const char uuxqt_rcsid[] = "$FreeBSD: src/gnu/libexec/uucp/uuxqt/uuxqt.c,v 1.7.2.1 1999/08/29 14:30:57 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index d1e7641a7976..c969f5d87e53 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.44.2.3 1999/09/15 03:43:33 peter Exp $
 
 SUBDIR= awk bc binutils bison cc cpio dc dialog diff diff3 genclass gperf \
 	grep groff gzip man patch ptx rcs sdiff send-pr sort tar texinfo
diff --git a/gnu/usr.bin/Makefile.inc b/gnu/usr.bin/Makefile.inc
index 5d2cffdd3625..3a0b4c61c01c 100644
--- a/gnu/usr.bin/Makefile.inc
+++ b/gnu/usr.bin/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/Makefile.inc,v 1.3.2.1 1999/08/29 14:31:00 peter Exp $
 
 BINDIR?=	/usr/bin
diff --git a/gnu/usr.bin/as/Makefile b/gnu/usr.bin/as/Makefile
index 30df8314a41b..9d34c88fd23f 100644
--- a/gnu/usr.bin/as/Makefile
+++ b/gnu/usr.bin/as/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	6.1 (Berkeley) 3/3/91
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/as/Makefile,v 1.17.2.1 1999/08/29 14:31:01 peter Exp $
 
 .include "config/Makefile.$(MACHINE_ARCH)"
 
diff --git a/gnu/usr.bin/as/Makefile.in b/gnu/usr.bin/as/Makefile.in
index 6b3d9937def5..d946d2f14ea4 100644
--- a/gnu/usr.bin/as/Makefile.in
+++ b/gnu/usr.bin/as/Makefile.in
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/as/Makefile.in,v 1.5.2.1 1999/08/29 14:31:01 peter Exp $
 
 # Makefile for GNU Assembler
 #   Copyright (C) 1987-1992 Free Software Foundation, Inc.
diff --git a/gnu/usr.bin/as/app.c b/gnu/usr.bin/as/app.c
index 130fb1e14db1..5b1f2b8090a8 100644
--- a/gnu/usr.bin/as/app.c
+++ b/gnu/usr.bin/as/app.c
@@ -24,7 +24,7 @@
    pair.  This needs better error-handling.  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/app.c,v 1.6.2.1 1999/08/29 14:31:02 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/gnu/usr.bin/as/as.1 b/gnu/usr.bin/as/as.1
index c7e792f82624..8833254574d0 100644
--- a/gnu/usr.bin/as/as.1
+++ b/gnu/usr.bin/as/as.1
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1991, 1992 Free Software Foundation
 .\" See section COPYING for conditions for redistribution
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/as/as.1,v 1.8.2.1 1999/08/29 14:31:02 peter Exp $
 .TH as 1 "21 January 1992" "cygnus support" "GNU Development Tools"
 
 .SH NAME
diff --git a/gnu/usr.bin/as/as.1aout b/gnu/usr.bin/as/as.1aout
index c7e792f82624..dc427473c89a 100644
--- a/gnu/usr.bin/as/as.1aout
+++ b/gnu/usr.bin/as/as.1aout
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1991, 1992 Free Software Foundation
 .\" See section COPYING for conditions for redistribution
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/as/as.1aout,v 1.8.2.1 1999/08/29 14:31:03 peter Exp $
 .TH as 1 "21 January 1992" "cygnus support" "GNU Development Tools"
 
 .SH NAME
diff --git a/gnu/usr.bin/as/as.c b/gnu/usr.bin/as/as.c
index 5233f33371eb..4ab5e2ac0f17 100644
--- a/gnu/usr.bin/as/as.c
+++ b/gnu/usr.bin/as/as.c
@@ -32,7 +32,7 @@
  *
  */
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/as.c,v 1.6.2.1 1999/08/29 14:31:03 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/gnu/usr.bin/as/as.h b/gnu/usr.bin/as/as.h
index 6b81ac92ff91..3f4f5abb19c5 100644
--- a/gnu/usr.bin/as/as.h
+++ b/gnu/usr.bin/as/as.h
@@ -18,7 +18,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/as/as.h,v 1.7.2.1 1999/08/29 14:31:04 peter Exp $
  */
 
 #define GAS 1
diff --git a/gnu/usr.bin/as/atof-generic.c b/gnu/usr.bin/as/atof-generic.c
index f01fdb2961eb..bde58a7e932e 100644
--- a/gnu/usr.bin/as/atof-generic.c
+++ b/gnu/usr.bin/as/atof-generic.c
@@ -18,7 +18,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/atof-generic.c,v 1.5.2.1 1999/08/29 14:31:04 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/usr.bin/as/bignum-copy.c b/gnu/usr.bin/as/bignum-copy.c
index bb5763f35768..ee9ff2bfbc01 100644
--- a/gnu/usr.bin/as/bignum-copy.c
+++ b/gnu/usr.bin/as/bignum-copy.c
@@ -18,7 +18,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/bignum-copy.c,v 1.5.2.1 1999/08/29 14:31:04 peter Exp $";
 #endif
 
 #include "as.h"
diff --git a/gnu/usr.bin/as/bignum.h b/gnu/usr.bin/as/bignum.h
index 34435e2878f0..b1566f49aec9 100644
--- a/gnu/usr.bin/as/bignum.h
+++ b/gnu/usr.bin/as/bignum.h
@@ -18,7 +18,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/as/bignum.h,v 1.5.2.1 1999/08/29 14:31:05 peter Exp $
  */
 
 /***********************************************************************\
diff --git a/gnu/usr.bin/as/bit_fix.h b/gnu/usr.bin/as/bit_fix.h
index 5820c29c3752..212fe709e938 100644
--- a/gnu/usr.bin/as/bit_fix.h
+++ b/gnu/usr.bin/as/bit_fix.h
@@ -18,7 +18,7 @@
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/as/bit_fix.h,v 1.4.2.1 1999/08/29 14:31:05 peter Exp $
  */
 
 
diff --git a/gnu/usr.bin/as/cond.c b/gnu/usr.bin/as/cond.c
index 9fda86ff55b6..5087cc1696d6 100644
--- a/gnu/usr.bin/as/cond.c
+++ b/gnu/usr.bin/as/cond.c
@@ -18,7 +18,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/cond.c,v 1.5.2.1 1999/08/29 14:31:06 peter Exp $";
 #endif
 
 #include "as.h"
diff --git a/gnu/usr.bin/as/config/Makefile.hp300 b/gnu/usr.bin/as/config/Makefile.hp300
index 981e5ca6c99b..129c78fdf16a 100644
--- a/gnu/usr.bin/as/config/Makefile.hp300
+++ b/gnu/usr.bin/as/config/Makefile.hp300
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile.hp300	6.1 (Berkeley) 3/3/91
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/as/config/Makefile.hp300,v 1.3.2.1 1999/08/29 14:31:30 peter Exp $
 
 CFLAGS+=	-Dm68851
 SRCS+=		tc-m68k.c atof-ieee.c
diff --git a/gnu/usr.bin/as/config/Makefile.i386 b/gnu/usr.bin/as/config/Makefile.i386
index 79d30b3a4b37..701d659f7464 100644
--- a/gnu/usr.bin/as/config/Makefile.i386
+++ b/gnu/usr.bin/as/config/Makefile.i386
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile.i386	6.1 (Berkeley) 3/3/91
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/as/config/Makefile.i386,v 1.5.2.1 1999/08/29 14:31:30 peter Exp $
 
 CFLAGS+=	-DNON_BROKEN_WORDS -DPIC
 SRCS+=		tc-i386.c atof-ieee.c
diff --git a/gnu/usr.bin/as/config/Makefile.pc532 b/gnu/usr.bin/as/config/Makefile.pc532
index 34d6fd30fab4..eed194ff099a 100644
--- a/gnu/usr.bin/as/config/Makefile.pc532
+++ b/gnu/usr.bin/as/config/Makefile.pc532
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/as/config/Makefile.pc532,v 1.3.2.1 1999/08/29 14:31:31 peter Exp $
 
 SRCS+=		tc-ns32k.c atof-ns32k.c
 
diff --git a/gnu/usr.bin/as/config/Makefile.sparc b/gnu/usr.bin/as/config/Makefile.sparc
index 2952077c7ef9..310708af1f02 100644
--- a/gnu/usr.bin/as/config/Makefile.sparc
+++ b/gnu/usr.bin/as/config/Makefile.sparc
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile.i386	6.1 (Berkeley) 3/3/91
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/as/config/Makefile.sparc,v 1.4.2.1 1999/08/29 14:31:31 peter Exp $
 
 CFLAGS+=	-DNON_BROKEN_WORDS -DPIC
 SRCS+=		tc-sparc.c atof-ieee.c
diff --git a/gnu/usr.bin/as/config/Makefile.vax b/gnu/usr.bin/as/config/Makefile.vax
index 3bdd671dcb25..d0072f39ec28 100644
--- a/gnu/usr.bin/as/config/Makefile.vax
+++ b/gnu/usr.bin/as/config/Makefile.vax
@@ -1,4 +1,4 @@
 #	from: @(#)Makefile.vax	6.1 (Berkeley) 3/3/91
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/as/config/Makefile.vax,v 1.3.2.1 1999/08/29 14:31:32 peter Exp $
 
 SRCS+=		tc-vax.c atof-vax.c
diff --git a/gnu/usr.bin/as/config/atof-ieee.c b/gnu/usr.bin/as/config/atof-ieee.c
index 5b5ff8571e08..cc47147b8f3b 100644
--- a/gnu/usr.bin/as/config/atof-ieee.c
+++ b/gnu/usr.bin/as/config/atof-ieee.c
@@ -18,7 +18,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/config/atof-ieee.c,v 1.8.2.1 1999/08/29 14:31:32 peter Exp $";
 #endif
 
 #include "as.h"
diff --git a/gnu/usr.bin/as/config/ho-i386.h b/gnu/usr.bin/as/config/ho-i386.h
index 949e78adc23f..9a82212d9918 100644
--- a/gnu/usr.bin/as/config/ho-i386.h
+++ b/gnu/usr.bin/as/config/ho-i386.h
@@ -17,7 +17,7 @@
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/as/config/ho-i386.h,v 1.4.2.1 1999/08/29 14:31:33 peter Exp $
  */
 
 
diff --git a/gnu/usr.bin/as/config/obj-aout.h b/gnu/usr.bin/as/config/obj-aout.h
index 7f63e3b7545b..13fe8ccb471a 100644
--- a/gnu/usr.bin/as/config/obj-aout.h
+++ b/gnu/usr.bin/as/config/obj-aout.h
@@ -17,7 +17,7 @@
    License along with GAS; see the file COPYING.  If not, write
    to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
- $FreeBSD$
+ $FreeBSD: src/gnu/usr.bin/as/config/obj-aout.h,v 1.8.2.1 1999/08/29 14:31:34 peter Exp $
  */
 
 
diff --git a/gnu/usr.bin/as/config/tc-i386.c b/gnu/usr.bin/as/config/tc-i386.c
index 133c07a6f582..4851797517eb 100644
--- a/gnu/usr.bin/as/config/tc-i386.c
+++ b/gnu/usr.bin/as/config/tc-i386.c
@@ -25,7 +25,7 @@
   */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/config/tc-i386.c,v 1.9.2.1 1999/08/29 14:31:34 peter Exp $";
 #endif
 
 #include "as.h"
diff --git a/gnu/usr.bin/as/config/tc-i386.h b/gnu/usr.bin/as/config/tc-i386.h
index a227895c0d97..b457db3ccee0 100644
--- a/gnu/usr.bin/as/config/tc-i386.h
+++ b/gnu/usr.bin/as/config/tc-i386.h
@@ -18,7 +18,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/as/config/tc-i386.h,v 1.5.2.1 1999/08/29 14:31:35 peter Exp $
  */
 
 #ifndef TC_I386
diff --git a/gnu/usr.bin/as/config/tc-sparc.c b/gnu/usr.bin/as/config/tc-sparc.c
index 7a14efdb4cc1..c3157d9ff826 100644
--- a/gnu/usr.bin/as/config/tc-sparc.c
+++ b/gnu/usr.bin/as/config/tc-sparc.c
@@ -18,7 +18,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/config/tc-sparc.c,v 1.7.2.1 1999/08/29 14:31:35 peter Exp $";
 #endif
 
 #define cypress 1234
diff --git a/gnu/usr.bin/as/config/tc-sparc.h b/gnu/usr.bin/as/config/tc-sparc.h
index 5dcb72b124e9..1b1d38c43414 100644
--- a/gnu/usr.bin/as/config/tc-sparc.h
+++ b/gnu/usr.bin/as/config/tc-sparc.h
@@ -18,7 +18,7 @@
    to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/as/config/tc-sparc.h,v 1.5.2.1 1999/08/29 14:31:36 peter Exp $
  */
 
 #define TC_SPARC 1
diff --git a/gnu/usr.bin/as/config/te-generic.h b/gnu/usr.bin/as/config/te-generic.h
index e7ec7084b159..d93b9635b313 100644
--- a/gnu/usr.bin/as/config/te-generic.h
+++ b/gnu/usr.bin/as/config/te-generic.h
@@ -6,7 +6,7 @@
  * compile, and copying as an aid for testing and porting.  xoxorich.
  */
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/as/config/te-generic.h,v 1.3.2.1 1999/08/29 14:31:36 peter Exp $
  */
 
 
diff --git a/gnu/usr.bin/as/debug.c b/gnu/usr.bin/as/debug.c
index e91947fa8de0..ee67079799a0 100644
--- a/gnu/usr.bin/as/debug.c
+++ b/gnu/usr.bin/as/debug.c
@@ -21,7 +21,7 @@
 /* Routines for debug use only.  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/debug.c,v 1.4.2.1 1999/08/29 14:31:07 peter Exp $";
 #endif
 
 #include "as.h"
diff --git a/gnu/usr.bin/as/expr.c b/gnu/usr.bin/as/expr.c
index c46961c94316..63b3702ae436 100644
--- a/gnu/usr.bin/as/expr.c
+++ b/gnu/usr.bin/as/expr.c
@@ -25,7 +25,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/expr.c,v 1.7.2.1 1999/08/29 14:31:07 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/usr.bin/as/expr.h b/gnu/usr.bin/as/expr.h
index ea06842444a6..cf12cc0c9c3d 100644
--- a/gnu/usr.bin/as/expr.h
+++ b/gnu/usr.bin/as/expr.h
@@ -17,7 +17,7 @@
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/as/expr.h,v 1.5.2.1 1999/08/29 14:31:08 peter Exp $
  */
 
 
diff --git a/gnu/usr.bin/as/flo-const.c b/gnu/usr.bin/as/flo-const.c
index 51a4afc2450d..17a62759347d 100644
--- a/gnu/usr.bin/as/flo-const.c
+++ b/gnu/usr.bin/as/flo-const.c
@@ -18,7 +18,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/flo-const.c,v 1.4.2.1 1999/08/29 14:31:08 peter Exp $";
 #endif
 
 #include "flonum.h"
diff --git a/gnu/usr.bin/as/flo-copy.c b/gnu/usr.bin/as/flo-copy.c
index 15a6ed4d8e79..0debd2d1548a 100644
--- a/gnu/usr.bin/as/flo-copy.c
+++ b/gnu/usr.bin/as/flo-copy.c
@@ -18,7 +18,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/flo-copy.c,v 1.4.2.1 1999/08/29 14:31:09 peter Exp $";
 #endif
 
 #include "as.h"
diff --git a/gnu/usr.bin/as/flonum-mult.c b/gnu/usr.bin/as/flonum-mult.c
index cb28f642d04e..58ca8998a2ba 100644
--- a/gnu/usr.bin/as/flonum-mult.c
+++ b/gnu/usr.bin/as/flonum-mult.c
@@ -19,7 +19,7 @@
    notice and this notice must be preserved on all copies.  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/flonum-mult.c,v 1.5.2.1 1999/08/29 14:31:09 peter Exp $";
 #endif
 
 #include "flonum.h"
diff --git a/gnu/usr.bin/as/flonum.h b/gnu/usr.bin/as/flonum.h
index c0ed4165c5fe..2b3cbc8f7bbb 100644
--- a/gnu/usr.bin/as/flonum.h
+++ b/gnu/usr.bin/as/flonum.h
@@ -18,7 +18,7 @@
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/as/flonum.h,v 1.5.2.1 1999/08/29 14:31:10 peter Exp $
  */
 
 
diff --git a/gnu/usr.bin/as/frags.c b/gnu/usr.bin/as/frags.c
index dcdb4c5b94e9..bc67ef18216b 100644
--- a/gnu/usr.bin/as/frags.c
+++ b/gnu/usr.bin/as/frags.c
@@ -19,7 +19,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/frags.c,v 1.5.2.1 1999/08/29 14:31:10 peter Exp $";
 #endif
 
 #include "as.h"
diff --git a/gnu/usr.bin/as/frags.h b/gnu/usr.bin/as/frags.h
index 287d10777623..9850ae9707a9 100644
--- a/gnu/usr.bin/as/frags.h
+++ b/gnu/usr.bin/as/frags.h
@@ -18,7 +18,7 @@
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/as/frags.h,v 1.5.2.1 1999/08/29 14:31:11 peter Exp $
  */
 
 
diff --git a/gnu/usr.bin/as/hash.c b/gnu/usr.bin/as/hash.c
index dae2746e4e08..e112b30a6ede 100644
--- a/gnu/usr.bin/as/hash.c
+++ b/gnu/usr.bin/as/hash.c
@@ -123,7 +123,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/hash.c,v 1.6.2.1 1999/08/29 14:31:11 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/gnu/usr.bin/as/hash.h b/gnu/usr.bin/as/hash.h
index b6e8038fe3fc..90a46cd2d912 100644
--- a/gnu/usr.bin/as/hash.h
+++ b/gnu/usr.bin/as/hash.h
@@ -17,7 +17,7 @@
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/as/hash.h,v 1.5.2.1 1999/08/29 14:31:12 peter Exp $
  */
 
 
diff --git a/gnu/usr.bin/as/hex-value.c b/gnu/usr.bin/as/hex-value.c
index 9b52e88b2b10..717b48c78d29 100644
--- a/gnu/usr.bin/as/hex-value.c
+++ b/gnu/usr.bin/as/hex-value.c
@@ -23,7 +23,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/hex-value.c,v 1.5.2.1 1999/08/29 14:31:12 peter Exp $";
 #endif
 
 #define __ (42)			/* blatently illegal digit value */
diff --git a/gnu/usr.bin/as/input-file.c b/gnu/usr.bin/as/input-file.c
index b9bb4be3f165..2e4d5edfba9b 100644
--- a/gnu/usr.bin/as/input-file.c
+++ b/gnu/usr.bin/as/input-file.c
@@ -25,7 +25,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/input-file.c,v 1.5.2.1 1999/08/29 14:31:13 peter Exp $";
 #endif
 
 #ifdef USG
diff --git a/gnu/usr.bin/as/input-file.h b/gnu/usr.bin/as/input-file.h
index 73c33df5377a..732779662ee6 100644
--- a/gnu/usr.bin/as/input-file.h
+++ b/gnu/usr.bin/as/input-file.h
@@ -20,7 +20,7 @@
 /*"input_file.c":Operating-system dependant functions to read source files.*/
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/as/input-file.h,v 1.5.2.1 1999/08/29 14:31:13 peter Exp $
  */
 
 
diff --git a/gnu/usr.bin/as/input-scrub.c b/gnu/usr.bin/as/input-scrub.c
index d93d7ce01afc..7a761b6ddb68 100644
--- a/gnu/usr.bin/as/input-scrub.c
+++ b/gnu/usr.bin/as/input-scrub.c
@@ -18,7 +18,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/input-scrub.c,v 1.6.2.1 1999/08/29 14:31:14 peter Exp $";
 #endif
 
 #include <errno.h>		/* Need this to make errno declaration right */
diff --git a/gnu/usr.bin/as/listing.c b/gnu/usr.bin/as/listing.c
index 87da713cd7b3..e56da73f8ca8 100644
--- a/gnu/usr.bin/as/listing.c
+++ b/gnu/usr.bin/as/listing.c
@@ -92,7 +92,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/listing.c,v 1.5.2.1 1999/08/29 14:31:14 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/usr.bin/as/listing.h b/gnu/usr.bin/as/listing.h
index 4dece8fdb06a..ea8b85dc502a 100644
--- a/gnu/usr.bin/as/listing.h
+++ b/gnu/usr.bin/as/listing.h
@@ -18,7 +18,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/as/listing.h,v 1.4.2.1 1999/08/29 14:31:15 peter Exp $
  */
 
 #ifndef __listing_h__
diff --git a/gnu/usr.bin/as/makefile.dos b/gnu/usr.bin/as/makefile.dos
index 2d2a9890a3b1..470bbcddb310 100644
--- a/gnu/usr.bin/as/makefile.dos
+++ b/gnu/usr.bin/as/makefile.dos
@@ -17,7 +17,7 @@
 #along with GNU GAS; see the file COPYING.  If not, write to
 #the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/as/makefile.dos,v 1.3.2.1 1999/08/29 14:31:15 peter Exp $
 
 # The targets for external use include:
 # all, doc, proto, install, uninstall, includes, TAGS,
diff --git a/gnu/usr.bin/as/messages.c b/gnu/usr.bin/as/messages.c
index 1d65116db6dc..bf915e2cfa8e 100644
--- a/gnu/usr.bin/as/messages.c
+++ b/gnu/usr.bin/as/messages.c
@@ -18,7 +18,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/messages.c,v 1.7.2.1 1999/08/29 14:31:16 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/gnu/usr.bin/as/obj.h b/gnu/usr.bin/as/obj.h
index 987e70688944..2ae869c3907e 100644
--- a/gnu/usr.bin/as/obj.h
+++ b/gnu/usr.bin/as/obj.h
@@ -19,7 +19,7 @@
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/as/obj.h,v 1.4.2.1 1999/08/29 14:31:16 peter Exp $
  */
 
 
diff --git a/gnu/usr.bin/as/obstack.c b/gnu/usr.bin/as/obstack.c
index 4a39b56b7568..be4b8038041a 100644
--- a/gnu/usr.bin/as/obstack.c
+++ b/gnu/usr.bin/as/obstack.c
@@ -16,7 +16,7 @@ along with this program; if not, write to the Free Software
 Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/obstack.c,v 1.4.2.1 1999/08/29 14:31:17 peter Exp $";
 #endif
 
 #include "obstack.h"
diff --git a/gnu/usr.bin/as/obstack.h b/gnu/usr.bin/as/obstack.h
index c1b44844bae8..cce63f07fd2c 100644
--- a/gnu/usr.bin/as/obstack.h
+++ b/gnu/usr.bin/as/obstack.h
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/as/obstack.h,v 1.5.2.1 1999/08/29 14:31:17 peter Exp $
  */
 
 
diff --git a/gnu/usr.bin/as/opcode/i386.h b/gnu/usr.bin/as/opcode/i386.h
index fd482ffe9670..a24eb875b735 100644
--- a/gnu/usr.bin/as/opcode/i386.h
+++ b/gnu/usr.bin/as/opcode/i386.h
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with GAS; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/as/opcode/i386.h,v 1.9.2.1 1999/08/29 14:31:39 peter Exp $ */
 
 static const template i386_optab[] = {
 
diff --git a/gnu/usr.bin/as/opcode/i960.h b/gnu/usr.bin/as/opcode/i960.h
index 20b10a8ecf69..910b84a73ce3 100644
--- a/gnu/usr.bin/as/opcode/i960.h
+++ b/gnu/usr.bin/as/opcode/i960.h
@@ -18,7 +18,7 @@
  * appropriate.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/as/opcode/i960.h,v 1.4.2.1 1999/08/29 14:31:40 peter Exp $ */
 
 #define CTRL	0
 #define COBR	1
diff --git a/gnu/usr.bin/as/opcode/sparc.h b/gnu/usr.bin/as/opcode/sparc.h
index cd032c256186..0c1064143948 100644
--- a/gnu/usr.bin/as/opcode/sparc.h
+++ b/gnu/usr.bin/as/opcode/sparc.h
@@ -20,7 +20,7 @@ along with GAS or GDB; see the file COPYING.	If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.	*/
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/as/opcode/sparc.h,v 1.5.2.1 1999/08/29 14:31:40 peter Exp $
  */
 
  /* FIXME-someday: perhaps the ,a's and such should be embedded in the
diff --git a/gnu/usr.bin/as/output-file.c b/gnu/usr.bin/as/output-file.c
index 0d913fd4ffa3..194f9298562f 100644
--- a/gnu/usr.bin/as/output-file.c
+++ b/gnu/usr.bin/as/output-file.c
@@ -27,7 +27,7 @@
 /* note that we do need config info.  xoxorich. */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/output-file.c,v 1.5.2.1 1999/08/29 14:31:18 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/gnu/usr.bin/as/output-file.h b/gnu/usr.bin/as/output-file.h
index 7ef1677a9601..49cfafef66a8 100644
--- a/gnu/usr.bin/as/output-file.h
+++ b/gnu/usr.bin/as/output-file.h
@@ -18,7 +18,7 @@
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/as/output-file.h,v 1.4.2.1 1999/08/29 14:31:18 peter Exp $
  */
 
 
diff --git a/gnu/usr.bin/as/read.c b/gnu/usr.bin/as/read.c
index f25f3634c9b4..d283c0d4946f 100644
--- a/gnu/usr.bin/as/read.c
+++ b/gnu/usr.bin/as/read.c
@@ -19,7 +19,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/read.c,v 1.12.2.1 1999/08/29 14:31:19 peter Exp $";
 #endif
 
 #define MASK_CHAR (0xFF)	/* If your chars aren't 8 bits, you will
diff --git a/gnu/usr.bin/as/read.h b/gnu/usr.bin/as/read.h
index e396922b10b6..66836875eb12 100644
--- a/gnu/usr.bin/as/read.h
+++ b/gnu/usr.bin/as/read.h
@@ -18,7 +18,7 @@
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/as/read.h,v 1.8.2.1 1999/08/29 14:31:19 peter Exp $
  */
 
 
diff --git a/gnu/usr.bin/as/struc-symbol.h b/gnu/usr.bin/as/struc-symbol.h
index 412bdfbfcd4f..6f9a3620d9b4 100644
--- a/gnu/usr.bin/as/struc-symbol.h
+++ b/gnu/usr.bin/as/struc-symbol.h
@@ -17,7 +17,7 @@
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/as/struc-symbol.h,v 1.8.2.1 1999/08/29 14:31:20 peter Exp $
  */
 
 
diff --git a/gnu/usr.bin/as/subsegs.c b/gnu/usr.bin/as/subsegs.c
index 21ef534eb9e0..1839ab27b6df 100644
--- a/gnu/usr.bin/as/subsegs.c
+++ b/gnu/usr.bin/as/subsegs.c
@@ -22,7 +22,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/subsegs.c,v 1.7.2.1 1999/08/29 14:31:20 peter Exp $";
 #endif
 
 #include "as.h"
diff --git a/gnu/usr.bin/as/subsegs.h b/gnu/usr.bin/as/subsegs.h
index 0b2880485c91..e14bbbd627d2 100644
--- a/gnu/usr.bin/as/subsegs.h
+++ b/gnu/usr.bin/as/subsegs.h
@@ -18,7 +18,7 @@
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/as/subsegs.h,v 1.5.2.1 1999/08/29 14:31:21 peter Exp $
  */
 
 
diff --git a/gnu/usr.bin/as/symbols.c b/gnu/usr.bin/as/symbols.c
index 2473af4e398a..f695af0e9462 100644
--- a/gnu/usr.bin/as/symbols.c
+++ b/gnu/usr.bin/as/symbols.c
@@ -19,7 +19,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/symbols.c,v 1.6.2.1 1999/08/29 14:31:21 peter Exp $";
 #endif
 
 #include "as.h"
diff --git a/gnu/usr.bin/as/symbols.h b/gnu/usr.bin/as/symbols.h
index 47916440e93c..b5814f92ba39 100644
--- a/gnu/usr.bin/as/symbols.h
+++ b/gnu/usr.bin/as/symbols.h
@@ -18,7 +18,7 @@
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/as/symbols.h,v 1.5.2.1 1999/08/29 14:31:22 peter Exp $
  */
 
 
diff --git a/gnu/usr.bin/as/tc.h b/gnu/usr.bin/as/tc.h
index e5b3938bd7d1..8ebb7f1baa4c 100644
--- a/gnu/usr.bin/as/tc.h
+++ b/gnu/usr.bin/as/tc.h
@@ -18,7 +18,7 @@
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/as/tc.h,v 1.5.2.1 1999/08/29 14:31:23 peter Exp $
  */
 
 
diff --git a/gnu/usr.bin/as/testscripts/doboth b/gnu/usr.bin/as/testscripts/doboth
index 6762b81af116..3eccb94df210 100755
--- a/gnu/usr.bin/as/testscripts/doboth
+++ b/gnu/usr.bin/as/testscripts/doboth
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/as/testscripts/doboth,v 1.3.2.1 1999/08/29 14:31:42 peter Exp $
 
 x=$1 ; shift
 y=$1 ; shift
diff --git a/gnu/usr.bin/as/testscripts/doobjcmp b/gnu/usr.bin/as/testscripts/doobjcmp
index 6297ea4116ca..d257198b0957 100755
--- a/gnu/usr.bin/as/testscripts/doobjcmp
+++ b/gnu/usr.bin/as/testscripts/doobjcmp
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/as/testscripts/doobjcmp,v 1.3.2.1 1999/08/29 14:31:42 peter Exp $
 # compare two object files, in depth.
 
 x=$1
diff --git a/gnu/usr.bin/as/testscripts/dostriptest b/gnu/usr.bin/as/testscripts/dostriptest
index 9cf54754c32d..1a1a017770c9 100755
--- a/gnu/usr.bin/as/testscripts/dostriptest
+++ b/gnu/usr.bin/as/testscripts/dostriptest
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/as/testscripts/dostriptest,v 1.3.2.1 1999/08/29 14:31:43 peter Exp $
 
 x=striptest.xx.$$
 y=striptest.yy.$$
diff --git a/gnu/usr.bin/as/testscripts/dotest b/gnu/usr.bin/as/testscripts/dotest
index 677e864c819e..d82ed6735614 100755
--- a/gnu/usr.bin/as/testscripts/dotest
+++ b/gnu/usr.bin/as/testscripts/dotest
@@ -1,6 +1,6 @@
 #!/bin/sh
 # ad hoc debug tool
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/as/testscripts/dotest,v 1.3.2.1 1999/08/29 14:31:43 peter Exp $
 
 x=$1
 y=$2
diff --git a/gnu/usr.bin/as/testscripts/dounsortreloc b/gnu/usr.bin/as/testscripts/dounsortreloc
index 667ee5dff9ef..0ed2116c2efe 100755
--- a/gnu/usr.bin/as/testscripts/dounsortreloc
+++ b/gnu/usr.bin/as/testscripts/dounsortreloc
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/as/testscripts/dounsortreloc,v 1.3.2.1 1999/08/29 14:31:44 peter Exp $
 # objdump the reloc table, but strip off the headings and reloc
 # numbers and sort the result.  Intended for use in comparing reloc
 # tables that may not be in the same order.
diff --git a/gnu/usr.bin/as/testscripts/dounsortsymbols b/gnu/usr.bin/as/testscripts/dounsortsymbols
index b9b352362685..54fbbf5a4221 100755
--- a/gnu/usr.bin/as/testscripts/dounsortsymbols
+++ b/gnu/usr.bin/as/testscripts/dounsortsymbols
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/as/testscripts/dounsortsymbols,v 1.3.2.1 1999/08/29 14:31:45 peter Exp $
 # objdump the symbol table, but strip off the headings and symbol
 # numbers and sort the result.  Intended for use in comparing symbol
 # tables that may not be in the same order.
diff --git a/gnu/usr.bin/as/version.c b/gnu/usr.bin/as/version.c
index 36867911d5bd..dc25b00b8637 100644
--- a/gnu/usr.bin/as/version.c
+++ b/gnu/usr.bin/as/version.c
@@ -16,7 +16,7 @@ const
    */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/version.c,v 1.6.2.1 1999/08/29 14:31:23 peter Exp $";
 #endif
 
 char version_string[] = "GNU assembler version 1.92.3, FreeBSD $Revision: 1.6 $\n";
diff --git a/gnu/usr.bin/as/write.c b/gnu/usr.bin/as/write.c
index 835383e933ef..42a250a02d01 100644
--- a/gnu/usr.bin/as/write.c
+++ b/gnu/usr.bin/as/write.c
@@ -21,7 +21,7 @@
 /* This thing should be set up to do byteordering correctly.  But... */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/write.c,v 1.10.2.1 1999/08/29 14:31:24 peter Exp $";
 #endif
 
 #include "as.h"
diff --git a/gnu/usr.bin/as/xmalloc.c b/gnu/usr.bin/as/xmalloc.c
index 6c97b06511ae..e8d3a38237e1 100644
--- a/gnu/usr.bin/as/xmalloc.c
+++ b/gnu/usr.bin/as/xmalloc.c
@@ -42,7 +42,7 @@
   */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/xmalloc.c,v 1.5.2.1 1999/08/29 14:31:25 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/gnu/usr.bin/as/xrealloc.c b/gnu/usr.bin/as/xrealloc.c
index 72189d5d9479..b7dd1e89b9e6 100644
--- a/gnu/usr.bin/as/xrealloc.c
+++ b/gnu/usr.bin/as/xrealloc.c
@@ -43,7 +43,7 @@
   */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/as/xrealloc.c,v 1.5.2.1 1999/08/29 14:31:25 peter Exp $";
 #endif
 
 
diff --git a/gnu/usr.bin/awk/Makefile b/gnu/usr.bin/awk/Makefile
index 6ba1bdb8a662..79ac466ac1fc 100644
--- a/gnu/usr.bin/awk/Makefile
+++ b/gnu/usr.bin/awk/Makefile
@@ -1,6 +1,6 @@
 # Makefile copyright James Raynard (jraynard@freebsd.org) 1997
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/awk/Makefile,v 1.11.2.2 1999/08/29 14:31:46 peter Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
diff --git a/gnu/usr.bin/awk/doc/Makefile b/gnu/usr.bin/awk/doc/Makefile
index 28ee56eb7d69..9fb4092b4aa3 100644
--- a/gnu/usr.bin/awk/doc/Makefile
+++ b/gnu/usr.bin/awk/doc/Makefile
@@ -1,6 +1,6 @@
 # Makefile copyright James Raynard (jraynard@freebsd.org) 1997
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/awk/doc/Makefile,v 1.4.2.1 1999/08/29 14:31:47 peter Exp $
 
 .PATH:	${.CURDIR}/../../../../contrib/awk/doc
 
diff --git a/gnu/usr.bin/bc/Makefile b/gnu/usr.bin/bc/Makefile
index d1aab78870da..3fb1f92fcf1c 100644
--- a/gnu/usr.bin/bc/Makefile
+++ b/gnu/usr.bin/bc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/bc/Makefile,v 1.14.2.2 1999/08/29 14:31:48 peter Exp $
 
 .PATH:	${.CURDIR}/../../../contrib/bc/bc \
 	${.CURDIR}/../../../contrib/bc/lib \
diff --git a/gnu/usr.bin/binutils/Makefile b/gnu/usr.bin/binutils/Makefile
index 60ace3d85539..e68efd6a52b7 100644
--- a/gnu/usr.bin/binutils/Makefile
+++ b/gnu/usr.bin/binutils/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/Makefile,v 1.4.2.2 1999/08/29 14:31:50 peter Exp $
 #
 
 SUBDIR=		libiberty libbfd libopcodes libbinutils \
diff --git a/gnu/usr.bin/binutils/Makefile.inc b/gnu/usr.bin/binutils/Makefile.inc
index f314c0dff49e..77bf9130590b 100644
--- a/gnu/usr.bin/binutils/Makefile.inc
+++ b/gnu/usr.bin/binutils/Makefile.inc
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/Makefile.inc,v 1.3.2.1 1999/08/29 14:31:50 peter Exp $
 #
 
 BINDIR?=	/usr/libexec/elf
diff --git a/gnu/usr.bin/binutils/Makefile.inc0 b/gnu/usr.bin/binutils/Makefile.inc0
index b57878dd16c6..2a0abfea8a00 100644
--- a/gnu/usr.bin/binutils/Makefile.inc0
+++ b/gnu/usr.bin/binutils/Makefile.inc0
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/Makefile.inc0,v 1.5.2.1 1999/08/29 14:31:51 peter Exp $
 #
 
 #
diff --git a/gnu/usr.bin/binutils/addr2line/Makefile b/gnu/usr.bin/binutils/addr2line/Makefile
index 51bc7b9c2997..3dbb2bd2f3ee 100644
--- a/gnu/usr.bin/binutils/addr2line/Makefile
+++ b/gnu/usr.bin/binutils/addr2line/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/addr2line/Makefile,v 1.2.2.1 1999/08/29 14:31:52 peter Exp $
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/ar/Makefile b/gnu/usr.bin/binutils/ar/Makefile
index 6039e4b16d7d..7bf611631ea7 100644
--- a/gnu/usr.bin/binutils/ar/Makefile
+++ b/gnu/usr.bin/binutils/ar/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.3.2.1 1999/08/29 14:31:53 peter Exp $
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/as/Makefile b/gnu/usr.bin/binutils/as/Makefile
index 615fab36db46..c92559797551 100644
--- a/gnu/usr.bin/binutils/as/Makefile
+++ b/gnu/usr.bin/binutils/as/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/as/Makefile,v 1.4.2.1 1999/08/29 14:31:55 peter Exp $
 #
 
 GASES=		${MACHINE_ARCH} ${CROSS_TOOLS} ${CROSS_TARGETS}
diff --git a/gnu/usr.bin/binutils/as/Makefile.inc b/gnu/usr.bin/binutils/as/Makefile.inc
index 835b5e3c0942..f6c48699ca28 100644
--- a/gnu/usr.bin/binutils/as/Makefile.inc
+++ b/gnu/usr.bin/binutils/as/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/as/Makefile.inc,v 1.2.2.1 1999/08/29 14:31:55 peter Exp $
 
 # BINDIR
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/gnu/usr.bin/binutils/as/Makefile.inc0 b/gnu/usr.bin/binutils/as/Makefile.inc0
index 25317854e071..b55c3b99ff32 100644
--- a/gnu/usr.bin/binutils/as/Makefile.inc0
+++ b/gnu/usr.bin/binutils/as/Makefile.inc0
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/as/Makefile.inc0,v 1.4.2.1 1999/08/29 14:31:56 peter Exp $
 #
 
 .include "${.CURDIR}/../../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/as/as_alpha/Makefile b/gnu/usr.bin/binutils/as/as_alpha/Makefile
index 5d694f23c37b..ab73fa3620b0 100644
--- a/gnu/usr.bin/binutils/as/as_alpha/Makefile
+++ b/gnu/usr.bin/binutils/as/as_alpha/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/as/as_alpha/Makefile,v 1.3.2.1 1999/08/29 14:31:57 peter Exp $
 #
 
 .include "${.CURDIR}/../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/as/as_i386/Makefile b/gnu/usr.bin/binutils/as/as_i386/Makefile
index 69d9639473f3..6b2918b86e4c 100644
--- a/gnu/usr.bin/binutils/as/as_i386/Makefile
+++ b/gnu/usr.bin/binutils/as/as_i386/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/as/as_i386/Makefile,v 1.3.2.1 1999/08/29 14:31:58 peter Exp $
 #
 
 .include "${.CURDIR}/../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/doc/Makefile b/gnu/usr.bin/binutils/doc/Makefile
index 0669e3665270..a0a833ffefe4 100644
--- a/gnu/usr.bin/binutils/doc/Makefile
+++ b/gnu/usr.bin/binutils/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/doc/Makefile,v 1.1.2.2 1999/08/29 14:31:59 peter Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/gdb/Makefile b/gnu/usr.bin/binutils/gdb/Makefile
index 5b1d6bca478d..0c77bafbb674 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile
+++ b/gnu/usr.bin/binutils/gdb/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.41.2.2 1999/08/29 14:32:00 peter Exp $
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/gdb/Makefile.alpha b/gnu/usr.bin/binutils/gdb/Makefile.alpha
index 1ae7136c70d4..a5f98b12ce96 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile.alpha
+++ b/gnu/usr.bin/binutils/gdb/Makefile.alpha
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.alpha,v 1.1.2.2 1999/08/29 14:32:01 peter Exp $
 #
 
 XSRCS+= freebsd-nat.c alpha-tdep.c
diff --git a/gnu/usr.bin/binutils/gdb/Makefile.i386 b/gnu/usr.bin/binutils/gdb/Makefile.i386
index 607463bded0c..86b398cd66d1 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile.i386
+++ b/gnu/usr.bin/binutils/gdb/Makefile.i386
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.i386,v 1.1.2.2 1999/08/29 14:32:02 peter Exp $
 #
 
 XSRCS+= freebsd-nat.c i386-tdep.c i387-tdep.c kvm-fbsd.c
diff --git a/gnu/usr.bin/binutils/gdb/gdb.1 b/gnu/usr.bin/binutils/gdb/gdb.1
index b6cd3cc47d76..a2ed828baa7c 100644
--- a/gnu/usr.bin/binutils/gdb/gdb.1
+++ b/gnu/usr.bin/binutils/gdb/gdb.1
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1991 Free Software Foundation
 .\" See section COPYING for conditions for redistribution
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/binutils/gdb/gdb.1,v 1.6.4.2 1999/08/29 14:32:02 peter Exp $
 .TH gdb 1 "4nov1991" "GNU Tools" "GNU Tools"
 .SH NAME
 gdb \- The GNU Debugger
diff --git a/gnu/usr.bin/binutils/gdbreplay/Makefile b/gnu/usr.bin/binutils/gdbreplay/Makefile
index 7a7d3562950f..6d679501c189 100644
--- a/gnu/usr.bin/binutils/gdbreplay/Makefile
+++ b/gnu/usr.bin/binutils/gdbreplay/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/gdbreplay/Makefile,v 1.4.2.3 1999/08/29 14:32:03 peter Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/gdbserver/Makefile b/gnu/usr.bin/binutils/gdbserver/Makefile
index 757f0f6ce0d9..7ea2edd13dab 100644
--- a/gnu/usr.bin/binutils/gdbserver/Makefile
+++ b/gnu/usr.bin/binutils/gdbserver/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/gdbserver/Makefile,v 1.4.2.3 1999/08/29 14:32:04 peter Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile
index 9af66f78b311..f4e0d73bd857 100644
--- a/gnu/usr.bin/binutils/ld/Makefile
+++ b/gnu/usr.bin/binutils/ld/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile,v 1.6.2.1 1999/08/29 14:32:06 peter Exp $
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/ld/Makefile.alpha b/gnu/usr.bin/binutils/ld/Makefile.alpha
index 6665fde445b2..b7bc92cd8b7c 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.alpha
+++ b/gnu/usr.bin/binutils/ld/Makefile.alpha
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.alpha,v 1.3.2.1 1999/08/29 14:32:07 peter Exp $
 #
 
 .if	${MACHINE_ARCH} == "alpha"
diff --git a/gnu/usr.bin/binutils/ld/Makefile.i386 b/gnu/usr.bin/binutils/ld/Makefile.i386
index 174f2110a926..09aae83a4d64 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.i386
+++ b/gnu/usr.bin/binutils/ld/Makefile.i386
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.i386,v 1.4.2.1 1999/08/29 14:32:07 peter Exp $
 #
 
 .if	${MACHINE_ARCH} == "i386"
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile b/gnu/usr.bin/binutils/libbfd/Makefile
index 2a7f5cf90395..9a35cdea9c19 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile
+++ b/gnu/usr.bin/binutils/libbfd/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile,v 1.6.2.1 1999/08/29 14:32:08 peter Exp $
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.alpha b/gnu/usr.bin/binutils/libbfd/Makefile.alpha
index 33024a562274..abf520462be7 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.alpha
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.alpha
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.alpha,v 1.3.2.1 1999/08/29 14:32:09 peter Exp $
 #
 
 SRCS+=		coff-alpha.c cpu-alpha.c ecoff.c ecofflink.c elf64-alpha.c \
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.i386 b/gnu/usr.bin/binutils/libbfd/Makefile.i386
index ac30822f3d09..511609a11451 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.i386
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.i386
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.i386,v 1.5.2.1 1999/08/29 14:32:09 peter Exp $
 #
 SRCS+=		cpu-i386.c elf32-i386.c elf32-target.h elf32.c elflink.c
 VECS+=		bfd_elf32_i386_vec
diff --git a/gnu/usr.bin/binutils/libbinutils/Makefile b/gnu/usr.bin/binutils/libbinutils/Makefile
index f8efb645ed9b..36a9a44aac80 100644
--- a/gnu/usr.bin/binutils/libbinutils/Makefile
+++ b/gnu/usr.bin/binutils/libbinutils/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libbinutils/Makefile,v 1.5.2.1 1999/08/29 14:32:11 peter Exp $
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/libbinutils/Makefile.alpha b/gnu/usr.bin/binutils/libbinutils/Makefile.alpha
index d214e9cfd524..dd20829a2b63 100644
--- a/gnu/usr.bin/binutils/libbinutils/Makefile.alpha
+++ b/gnu/usr.bin/binutils/libbinutils/Makefile.alpha
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libbinutils/Makefile.alpha,v 1.1.2.1 1999/08/29 14:32:12 peter Exp $
 #
 
 TARGET=		alpha-unknown-freebsdelf
diff --git a/gnu/usr.bin/binutils/libbinutils/Makefile.i386 b/gnu/usr.bin/binutils/libbinutils/Makefile.i386
index f52be9a2b5d6..c0eed00f94fc 100644
--- a/gnu/usr.bin/binutils/libbinutils/Makefile.i386
+++ b/gnu/usr.bin/binutils/libbinutils/Makefile.i386
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libbinutils/Makefile.i386,v 1.1.2.1 1999/08/29 14:32:12 peter Exp $
 #
 
 TARGET=		i386-unknown-freebsdelf
diff --git a/gnu/usr.bin/binutils/libiberty/Makefile b/gnu/usr.bin/binutils/libiberty/Makefile
index 7d428382eec9..11ccdab40b7e 100644
--- a/gnu/usr.bin/binutils/libiberty/Makefile
+++ b/gnu/usr.bin/binutils/libiberty/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libiberty/Makefile,v 1.2.2.1 1999/08/29 14:32:13 peter Exp $
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile b/gnu/usr.bin/binutils/libopcodes/Makefile
index d6a8b55dc602..e4a70268dc51 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libopcodes/Makefile,v 1.3.2.1 1999/08/29 14:32:14 peter Exp $
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.alpha b/gnu/usr.bin/binutils/libopcodes/Makefile.alpha
index b2f7a7912c0b..f04c0e7e5dff 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.alpha
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.alpha
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libopcodes/Makefile.alpha,v 1.2.2.1 1999/08/29 14:32:15 peter Exp $
 #
 
 SRCS+=		alpha-dis.c alpha-opc.c
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.i386 b/gnu/usr.bin/binutils/libopcodes/Makefile.i386
index 96c0bc74af5b..2a725c98b987 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.i386
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.i386
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libopcodes/Makefile.i386,v 1.1.2.1 1999/08/29 14:32:15 peter Exp $
 #
 
 SRCS+=		i386-dis.c
diff --git a/gnu/usr.bin/binutils/nm/Makefile b/gnu/usr.bin/binutils/nm/Makefile
index 2d2e263f8af5..09349e6db6b6 100644
--- a/gnu/usr.bin/binutils/nm/Makefile
+++ b/gnu/usr.bin/binutils/nm/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/nm/Makefile,v 1.3.2.1 1999/08/29 14:32:16 peter Exp $
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/objcopy/Makefile b/gnu/usr.bin/binutils/objcopy/Makefile
index ca05034a44f3..83c7cd862913 100644
--- a/gnu/usr.bin/binutils/objcopy/Makefile
+++ b/gnu/usr.bin/binutils/objcopy/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/objcopy/Makefile,v 1.3.2.1 1999/08/29 14:32:18 peter Exp $
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/objdump/Makefile b/gnu/usr.bin/binutils/objdump/Makefile
index 9635b35bb146..4b68eee76ffe 100644
--- a/gnu/usr.bin/binutils/objdump/Makefile
+++ b/gnu/usr.bin/binutils/objdump/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/objdump/Makefile,v 1.3.2.1 1999/08/29 14:32:19 peter Exp $
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/ranlib/Makefile b/gnu/usr.bin/binutils/ranlib/Makefile
index f3f085092550..af7088274987 100644
--- a/gnu/usr.bin/binutils/ranlib/Makefile
+++ b/gnu/usr.bin/binutils/ranlib/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.3.2.1 1999/08/29 14:32:20 peter Exp $
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/size/Makefile b/gnu/usr.bin/binutils/size/Makefile
index 9109a766836b..90c327e00c20 100644
--- a/gnu/usr.bin/binutils/size/Makefile
+++ b/gnu/usr.bin/binutils/size/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/size/Makefile,v 1.3.2.1 1999/08/29 14:32:21 peter Exp $
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/strings/Makefile b/gnu/usr.bin/binutils/strings/Makefile
index e163cdb900af..9d7f06fa68b8 100644
--- a/gnu/usr.bin/binutils/strings/Makefile
+++ b/gnu/usr.bin/binutils/strings/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/strings/Makefile,v 1.3.2.1 1999/08/29 14:32:22 peter Exp $
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/strip/Makefile b/gnu/usr.bin/binutils/strip/Makefile
index 421a3d446cb6..739e584d36bb 100644
--- a/gnu/usr.bin/binutils/strip/Makefile
+++ b/gnu/usr.bin/binutils/strip/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/strip/Makefile,v 1.5.2.1 1999/08/29 14:32:23 peter Exp $
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/bison/Makefile b/gnu/usr.bin/bison/Makefile
index 4fa25c767c60..3be205c5e1c2 100644
--- a/gnu/usr.bin/bison/Makefile
+++ b/gnu/usr.bin/bison/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/bison/Makefile,v 1.3.2.3 1999/08/29 14:32:25 peter Exp $
 
 .PATH:	${.CURDIR}/../../../contrib/bison
 
diff --git a/gnu/usr.bin/bison/data/Makefile b/gnu/usr.bin/bison/data/Makefile
index 843aebf78a88..1931bf019b47 100644
--- a/gnu/usr.bin/bison/data/Makefile
+++ b/gnu/usr.bin/bison/data/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/bison/data/Makefile,v 1.6.2.2 1999/08/29 14:32:26 peter Exp $
 
 BISONDIR=${.CURDIR}/../../../../contrib/bison
 
diff --git a/gnu/usr.bin/bison/doc/Makefile b/gnu/usr.bin/bison/doc/Makefile
index 97bbb93c9e26..99d0fad6cdc7 100644
--- a/gnu/usr.bin/bison/doc/Makefile
+++ b/gnu/usr.bin/bison/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/bison/doc/Makefile,v 1.5.2.1 1999/08/29 14:32:28 peter Exp $
 
 INFO = bison
 INFOSECTION= "Programming & development tools."
diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile
index b9071793c2a5..4d5c86c77fe9 100644
--- a/gnu/usr.bin/cc/Makefile
+++ b/gnu/usr.bin/cc/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/Makefile,v 1.9.2.1 1999/08/29 14:32:28 peter Exp $
 #
 
 # The order of some of these are rather important.  Some depend on previous
diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc
index 490816ab61b8..8b5c25afef84 100644
--- a/gnu/usr.bin/cc/Makefile.inc
+++ b/gnu/usr.bin/cc/Makefile.inc
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/Makefile.inc,v 1.25.2.1 1999/08/29 14:32:28 peter Exp $
 #
 
 # Sometimes this is .include'd several times...
diff --git a/gnu/usr.bin/cc/c++/Makefile b/gnu/usr.bin/cc/c++/Makefile
index dbaa165aa0f5..1c60cf291902 100644
--- a/gnu/usr.bin/cc/c++/Makefile
+++ b/gnu/usr.bin/cc/c++/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/c++/Makefile,v 1.9.2.1 1999/08/29 14:32:30 peter Exp $
 #
 
 PROG =	c++
diff --git a/gnu/usr.bin/cc/c++filt/Makefile b/gnu/usr.bin/cc/c++filt/Makefile
index dcc2e9b22fc5..ffcaca8b4412 100644
--- a/gnu/usr.bin/cc/c++filt/Makefile
+++ b/gnu/usr.bin/cc/c++filt/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/c++filt/Makefile,v 1.4.2.2 1999/08/29 14:32:30 peter Exp $
 #
 
 PROG =	c++filt
diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile
index 088b03a31601..67ae8298a896 100644
--- a/gnu/usr.bin/cc/cc/Makefile
+++ b/gnu/usr.bin/cc/cc/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/cc/Makefile,v 1.13.2.1 1999/08/29 14:32:31 peter Exp $
 #
 
 PROG =	cc
diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile
index ac039b95c4c9..ceccb1ddf498 100644
--- a/gnu/usr.bin/cc/cc1/Makefile
+++ b/gnu/usr.bin/cc/cc1/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/cc1/Makefile,v 1.12.2.1 1999/08/29 14:32:32 peter Exp $
 #
  
 PROG =	cc1
diff --git a/gnu/usr.bin/cc/cc1obj/Makefile b/gnu/usr.bin/cc/cc1obj/Makefile
index d5f45eaba48d..025fe87de13a 100644
--- a/gnu/usr.bin/cc/cc1obj/Makefile
+++ b/gnu/usr.bin/cc/cc1obj/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/cc1obj/Makefile,v 1.5.2.1 1999/08/29 14:32:34 peter Exp $
 #
 
 PROG =	cc1obj
diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
index eefd9bb792f1..aee2f5378d06 100644
--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/cc1plus/Makefile,v 1.13.2.1 1999/08/29 14:32:36 peter Exp $
 #
 
 #First, so that we get cp/tree.c and cp/expr.c instead of the C version
diff --git a/gnu/usr.bin/cc/cc_int/Makefile b/gnu/usr.bin/cc/cc_int/Makefile
index 44d876337fc5..b2979bee0e92 100644
--- a/gnu/usr.bin/cc/cc_int/Makefile
+++ b/gnu/usr.bin/cc/cc_int/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/cc_int/Makefile,v 1.15.2.1 1999/08/29 14:32:38 peter Exp $
 #
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index 7d02affdfcba..405d3e0c7210 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.14.2.1 1999/08/29 14:32:40 peter Exp $
 #
 
 #
diff --git a/gnu/usr.bin/cc/cpp/Makefile b/gnu/usr.bin/cc/cpp/Makefile
index 33d34bd1790c..e79fc92dcc4d 100644
--- a/gnu/usr.bin/cc/cpp/Makefile
+++ b/gnu/usr.bin/cc/cpp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/cpp/Makefile,v 1.11.2.1 1999/08/29 14:32:41 peter Exp $
 
 PROG=	cpp
 SRCS=	cccp.c cexp.y obstack.c version.c
diff --git a/gnu/usr.bin/cc/doc/Makefile b/gnu/usr.bin/cc/doc/Makefile
index 94efa8d84322..1f3400579f20 100644
--- a/gnu/usr.bin/cc/doc/Makefile
+++ b/gnu/usr.bin/cc/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/doc/Makefile,v 1.7.2.1 1999/08/29 14:32:43 peter Exp $
 
 INFO = gcc cpp reno gxxint
 
diff --git a/gnu/usr.bin/cc/f77/Makefile b/gnu/usr.bin/cc/f77/Makefile
index e8ac8dc54dc9..4182b94b4cf5 100644
--- a/gnu/usr.bin/cc/f77/Makefile
+++ b/gnu/usr.bin/cc/f77/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/f77/Makefile,v 1.4.2.1 1999/08/29 14:32:45 peter Exp $
 #
 
 PROG =	f77
diff --git a/gnu/usr.bin/cc/f77/f77.1 b/gnu/usr.bin/cc/f77/f77.1
index be953d32de9d..d567c33216db 100644
--- a/gnu/usr.bin/cc/f77/f77.1
+++ b/gnu/usr.bin/cc/f77/f77.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/cc/f77/f77.1,v 1.4.2.1 1999/08/29 14:32:46 peter Exp $
 .\"
 .Dd July 22, 1995
 .Dt F77 1
diff --git a/gnu/usr.bin/cc/libgcc/Makefile b/gnu/usr.bin/cc/libgcc/Makefile
index 48fde2adae3e..b6c5e8b8cd26 100644
--- a/gnu/usr.bin/cc/libgcc/Makefile
+++ b/gnu/usr.bin/cc/libgcc/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/libgcc/Makefile,v 1.19.2.1 1999/08/29 14:32:47 peter Exp $
 #
 
 LIB=	gcc
diff --git a/gnu/usr.bin/cpio/Makefile b/gnu/usr.bin/cpio/Makefile
index 64d5c5e30f5c..c80d2564b669 100644
--- a/gnu/usr.bin/cpio/Makefile
+++ b/gnu/usr.bin/cpio/Makefile
@@ -1,7 +1,7 @@
 # Note that this files is under a "BSD" copyright (c) by David O'Brien 1997, 
 # even though it may live in src/gnu/...
 
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cpio/Makefile,v 1.6.2.1 1999/08/29 14:32:48 peter Exp $
 
 .PATH:	${.CURDIR}/../../../contrib/cpio
 
diff --git a/gnu/usr.bin/cpio/doc/Makefile b/gnu/usr.bin/cpio/doc/Makefile
index 5ccf5da50a85..34eca6debe54 100644
--- a/gnu/usr.bin/cpio/doc/Makefile
+++ b/gnu/usr.bin/cpio/doc/Makefile
@@ -1,7 +1,7 @@
 # Note that this files is under a "BSD" copyright (c) by David O'Brien 1997, 
 # even though it may live in src/gnu/...
 
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cpio/doc/Makefile,v 1.2.4.1 1999/08/29 14:32:48 peter Exp $
 
 .PATH:	${.CURDIR}/../../../../contrib/cpio
 
diff --git a/gnu/usr.bin/cvs/Makefile b/gnu/usr.bin/cvs/Makefile
index 65e72f9cfb7b..7cdcad8e214b 100644
--- a/gnu/usr.bin/cvs/Makefile
+++ b/gnu/usr.bin/cvs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cvs/Makefile,v 1.11.2.2 1999/12/13 20:57:23 peter Exp $
 
 MAINAINER=	peter@FreeBSD.org
 
diff --git a/gnu/usr.bin/cvs/contrib/Makefile b/gnu/usr.bin/cvs/contrib/Makefile
index 20e160eaf87a..ce8585b79fc3 100644
--- a/gnu/usr.bin/cvs/contrib/Makefile
+++ b/gnu/usr.bin/cvs/contrib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cvs/contrib/Makefile,v 1.11.2.2 1999/12/13 20:57:25 peter Exp $
 
 MAINAINER=	peter@FreeBSD.org
 
diff --git a/gnu/usr.bin/cvs/contrib/easy-import.pl b/gnu/usr.bin/cvs/contrib/easy-import.pl
index d2669578fdb9..48e8435d9edc 100644
--- a/gnu/usr.bin/cvs/contrib/easy-import.pl
+++ b/gnu/usr.bin/cvs/contrib/easy-import.pl
@@ -8,7 +8,7 @@
 #
 # Written by Jörg Wunsch, 95/03/07, and placed in the public domain.
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cvs/contrib/easy-import.pl,v 1.14.2.2 1999/12/13 20:57:25 peter Exp $
 
 require "complete.pl";
 require "getopts.pl";
@@ -22,7 +22,7 @@ sub scan_opts
 
     $dont_do_it = "-n" if $opt_n;
     if($opt_v) {
-	print STDERR '$FreeBSD$' . "\n"; # 'emacs kludge
+	print STDERR '$FreeBSD: src/gnu/usr.bin/cvs/contrib/easy-import.pl,v 1.14.2.2 1999/12/13 20:57:25 peter Exp $' . "\n"; # 'emacs kludge
 	exit 0;
     }
     die "usage: $0 [-v] [-n] [moduledir]\n" .
diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile
index 1b8e34e897a4..dc0a2c9dbb78 100644
--- a/gnu/usr.bin/cvs/cvs/Makefile
+++ b/gnu/usr.bin/cvs/cvs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cvs/cvs/Makefile,v 1.24.2.4 1999/12/14 11:46:18 peter Exp $
 
 MAINAINER=	peter@FreeBSD.org
 
diff --git a/gnu/usr.bin/cvs/cvs/options.h b/gnu/usr.bin/cvs/cvs/options.h
index 41e1f940cea8..901f0d5a10bb 100644
--- a/gnu/usr.bin/cvs/cvs/options.h
+++ b/gnu/usr.bin/cvs/cvs/options.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/cvs/cvs/options.h,v 1.7.2.1 1999/12/13 20:57:26 peter Exp $ */
 /*
  * Copyright (c) 1992, Brian Berliner and Jeff Polk
  * Copyright (c) 1989-1992, Brian Berliner
diff --git a/gnu/usr.bin/cvs/cvsbug/Makefile b/gnu/usr.bin/cvs/cvsbug/Makefile
index 413df98fc36e..20815019e79f 100644
--- a/gnu/usr.bin/cvs/cvsbug/Makefile
+++ b/gnu/usr.bin/cvs/cvsbug/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cvs/cvsbug/Makefile,v 1.8.2.2 1999/12/13 20:57:27 peter Exp $
 
 MAINAINER=	peter@FreeBSD.org
 
diff --git a/gnu/usr.bin/cvs/doc/Makefile b/gnu/usr.bin/cvs/doc/Makefile
index a60d5bbae97c..a3e616a0563e 100644
--- a/gnu/usr.bin/cvs/doc/Makefile
+++ b/gnu/usr.bin/cvs/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cvs/doc/Makefile,v 1.9.2.2 1999/12/13 20:57:28 peter Exp $
 
 MAINAINER=	peter@FreeBSD.org
 
diff --git a/gnu/usr.bin/cvs/lib/Makefile b/gnu/usr.bin/cvs/lib/Makefile
index 37b691d082b4..ec4dd7b6975b 100644
--- a/gnu/usr.bin/cvs/lib/Makefile
+++ b/gnu/usr.bin/cvs/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cvs/lib/Makefile,v 1.15.2.2 1999/12/13 20:57:29 peter Exp $
 
 MAINAINER=	peter@FreeBSD.org
 
diff --git a/gnu/usr.bin/cvs/lib/config.h b/gnu/usr.bin/cvs/lib/config.h
index 4de42413f50e..e22fec4dad98 100644
--- a/gnu/usr.bin/cvs/lib/config.h
+++ b/gnu/usr.bin/cvs/lib/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/cvs/lib/config.h,v 1.5.2.1 1999/12/13 20:57:30 peter Exp $ */
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
 
diff --git a/gnu/usr.bin/cvs/libdiff/Makefile b/gnu/usr.bin/cvs/libdiff/Makefile
index bad35c8efb4c..d82ac93b3030 100644
--- a/gnu/usr.bin/cvs/libdiff/Makefile
+++ b/gnu/usr.bin/cvs/libdiff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cvs/libdiff/Makefile,v 1.1.4.2 1999/12/13 20:57:30 peter Exp $
 
 MAINAINER=	peter@FreeBSD.org
 
diff --git a/gnu/usr.bin/cvs/tools/Makefile b/gnu/usr.bin/cvs/tools/Makefile
index 59fa9032eb17..f938350941cc 100644
--- a/gnu/usr.bin/cvs/tools/Makefile
+++ b/gnu/usr.bin/cvs/tools/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cvs/tools/Makefile,v 1.4.2.2 1999/12/13 20:57:31 peter Exp $
 
 MAINAINER=	peter@FreeBSD.org
 
diff --git a/gnu/usr.bin/dc/Makefile b/gnu/usr.bin/dc/Makefile
index 8ecd2e27d92c..eb1206e9b459 100644
--- a/gnu/usr.bin/dc/Makefile
+++ b/gnu/usr.bin/dc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/dc/Makefile,v 1.10.2.1 1999/08/29 14:32:55 peter Exp $
 
 BCDIR=	${.CURDIR}/../../../contrib/bc
 
diff --git a/gnu/usr.bin/dc/doc/Makefile b/gnu/usr.bin/dc/doc/Makefile
index 2b3d553efb8a..131d6deda11d 100644
--- a/gnu/usr.bin/dc/doc/Makefile
+++ b/gnu/usr.bin/dc/doc/Makefile
@@ -1,6 +1,6 @@
 # Makefile copyright Andreas Klemm <andreas@FreeBSD.ORG> 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/dc/doc/Makefile,v 1.3.2.1 1999/08/29 14:32:57 peter Exp $
 
 .PATH:	${.CURDIR}/../../../../contrib/bc/doc
 
diff --git a/gnu/usr.bin/dialog/Makefile b/gnu/usr.bin/dialog/Makefile
index efbb7931022a..ffa9fc9f50b5 100644
--- a/gnu/usr.bin/dialog/Makefile
+++ b/gnu/usr.bin/dialog/Makefile
@@ -1,5 +1,5 @@
 # Makefile for dialog
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/dialog/Makefile,v 1.6.2.1 1999/08/29 14:32:58 peter Exp $
 
 PROG=   dialog
 MAN1=   dialog.1
diff --git a/gnu/usr.bin/diff/Makefile b/gnu/usr.bin/diff/Makefile
index 58818cb7be5c..98f24119f0ef 100644
--- a/gnu/usr.bin/diff/Makefile
+++ b/gnu/usr.bin/diff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/diff/Makefile,v 1.9.2.2 1999/12/08 15:48:30 obrien Exp $
 
 .PATH:  ${.CURDIR}/../../../contrib/diff
 
diff --git a/gnu/usr.bin/diff/doc/Makefile b/gnu/usr.bin/diff/doc/Makefile
index 973dbcc87675..2e0ed8e6132a 100644
--- a/gnu/usr.bin/diff/doc/Makefile
+++ b/gnu/usr.bin/diff/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/diff/doc/Makefile,v 1.5.2.1 1999/08/29 14:33:01 peter Exp $
 
 INFO = diff
 
diff --git a/gnu/usr.bin/diff3/Makefile b/gnu/usr.bin/diff3/Makefile
index 1acd3142c026..9baf085bbdae 100644
--- a/gnu/usr.bin/diff3/Makefile
+++ b/gnu/usr.bin/diff3/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/diff3/Makefile,v 1.5.2.1 1999/08/29 14:33:02 peter Exp $
 
 .PATH:  ${.CURDIR}/../../../contrib/diff
 
diff --git a/gnu/usr.bin/genclass/Makefile b/gnu/usr.bin/genclass/Makefile
index db071141d484..9e5547f4677a 100644
--- a/gnu/usr.bin/genclass/Makefile
+++ b/gnu/usr.bin/genclass/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/genclass/Makefile,v 1.5.2.1 1999/08/29 14:33:03 peter Exp $
 #
 
 GPPDIR=	${.CURDIR}/../../../contrib/libg++
diff --git a/gnu/usr.bin/gperf/Makefile b/gnu/usr.bin/gperf/Makefile
index d0e17301cbb3..f92535eb2b27 100644
--- a/gnu/usr.bin/gperf/Makefile
+++ b/gnu/usr.bin/gperf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gperf/Makefile,v 1.3.2.1 1999/08/29 14:33:05 peter Exp $
 
 .PATH:	${.CURDIR}/../../../contrib/gperf
 .PATH:	${.CURDIR}/../../../contrib/gperf/src
diff --git a/gnu/usr.bin/gperf/doc/Makefile b/gnu/usr.bin/gperf/doc/Makefile
index eac57053eb0d..2c54522a4758 100644
--- a/gnu/usr.bin/gperf/doc/Makefile
+++ b/gnu/usr.bin/gperf/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gperf/doc/Makefile,v 1.5.2.1 1999/08/29 14:33:06 peter Exp $
 
 INFO = gperf
 INFOSECTION= "Programming & development tools."
diff --git a/gnu/usr.bin/grep/Makefile b/gnu/usr.bin/grep/Makefile
index 3efc561fbbb7..af2261d92b27 100644
--- a/gnu/usr.bin/grep/Makefile
+++ b/gnu/usr.bin/grep/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/grep/Makefile,v 1.14.2.2 1999/08/29 14:33:07 peter Exp $
 
 GREP_LIBZ= YES
 GREP_FTS=  YES
diff --git a/gnu/usr.bin/grep/kwset.c b/gnu/usr.bin/grep/kwset.c
index 68871cb36a66..c4f27bfe0850 100644
--- a/gnu/usr.bin/grep/kwset.c
+++ b/gnu/usr.bin/grep/kwset.c
@@ -27,7 +27,7 @@
    String Matching:  An Aid to Bibliographic Search," CACM June 1975,
    Vol. 18, No. 6, which describes the failure function used below. */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/grep/kwset.c,v 1.2.8.1 1999/10/16 10:25:13 ache Exp $ */
 
 
 #ifdef STDC_HEADERS
diff --git a/gnu/usr.bin/groff/Makefile b/gnu/usr.bin/groff/Makefile
index f25543ca387a..edf748ddfbeb 100644
--- a/gnu/usr.bin/groff/Makefile
+++ b/gnu/usr.bin/groff/Makefile
@@ -1,6 +1,6 @@
 # Makefile for groff
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/Makefile,v 2.3.2.1 1999/08/29 14:33:08 peter Exp $
 
 SUBDIR=		libgroff libdriver libbib \
 		addftinfo eqn \
diff --git a/gnu/usr.bin/groff/Makefile.cfg b/gnu/usr.bin/groff/Makefile.cfg
index ab7cdcb6221f..34945a8e1f6e 100644
--- a/gnu/usr.bin/groff/Makefile.cfg
+++ b/gnu/usr.bin/groff/Makefile.cfg
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/Makefile.cfg,v 2.6.2.1 1999/08/29 14:33:09 peter Exp $
 
 BINDIR?=	/usr/bin
 SHELL=		/bin/sh
diff --git a/gnu/usr.bin/groff/Makefile.dev b/gnu/usr.bin/groff/Makefile.dev
index 3f9d50617ba1..4ce622da5a95 100644
--- a/gnu/usr.bin/groff/Makefile.dev
+++ b/gnu/usr.bin/groff/Makefile.dev
@@ -2,7 +2,7 @@
 # Client Makefiles define DEV and DEVFILES and provide rules for
 # individual font files
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/Makefile.dev,v 2.5.2.1 1999/08/29 14:33:10 peter Exp $
 
 .include "../Makefile.cfg"
 
diff --git a/gnu/usr.bin/groff/devX100-12/Makefile b/gnu/usr.bin/groff/devX100-12/Makefile
index 1a50e261d2e5..6a16ac0ce4dd 100644
--- a/gnu/usr.bin/groff/devX100-12/Makefile
+++ b/gnu/usr.bin/groff/devX100-12/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/devX100-12/Makefile,v 1.7.2.1 1999/08/29 14:33:12 peter Exp $
 #
 # Generic groff font makefile
 
diff --git a/gnu/usr.bin/groff/devX100/Makefile b/gnu/usr.bin/groff/devX100/Makefile
index 1a50e261d2e5..ce946ef27e20 100644
--- a/gnu/usr.bin/groff/devX100/Makefile
+++ b/gnu/usr.bin/groff/devX100/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/devX100/Makefile,v 1.7.2.1 1999/08/29 14:33:11 peter Exp $
 #
 # Generic groff font makefile
 
diff --git a/gnu/usr.bin/groff/devX75-12/Makefile b/gnu/usr.bin/groff/devX75-12/Makefile
index 1a50e261d2e5..589c8ff428fb 100644
--- a/gnu/usr.bin/groff/devX75-12/Makefile
+++ b/gnu/usr.bin/groff/devX75-12/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/devX75-12/Makefile,v 1.7.2.1 1999/08/29 14:33:15 peter Exp $
 #
 # Generic groff font makefile
 
diff --git a/gnu/usr.bin/groff/devX75/Makefile b/gnu/usr.bin/groff/devX75/Makefile
index 1a50e261d2e5..b54d2663f1b6 100644
--- a/gnu/usr.bin/groff/devX75/Makefile
+++ b/gnu/usr.bin/groff/devX75/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/devX75/Makefile,v 1.7.2.1 1999/08/29 14:33:13 peter Exp $
 #
 # Generic groff font makefile
 
diff --git a/gnu/usr.bin/groff/eqn/Makefile b/gnu/usr.bin/groff/eqn/Makefile
index aba129e875a9..f36ee37adfc4 100644
--- a/gnu/usr.bin/groff/eqn/Makefile
+++ b/gnu/usr.bin/groff/eqn/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/eqn/Makefile,v 1.11.2.1 1999/08/29 14:33:16 peter Exp $
 
 PROG=		eqn
 SRCS=		eqn.cc eqn.tab.h main.cc lex.cc \
diff --git a/gnu/usr.bin/groff/libgroff/Makefile b/gnu/usr.bin/groff/libgroff/Makefile
index 8a5dcb47a48c..0fd2b8eb410c 100644
--- a/gnu/usr.bin/groff/libgroff/Makefile
+++ b/gnu/usr.bin/groff/libgroff/Makefile
@@ -1,6 +1,6 @@
 # Makefile for libgroff
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/libgroff/Makefile,v 1.6.2.1 1999/08/29 14:33:17 peter Exp $
 #
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/groff/pic/Makefile b/gnu/usr.bin/groff/pic/Makefile
index de800547ed8e..3a3ba414c0a0 100644
--- a/gnu/usr.bin/groff/pic/Makefile
+++ b/gnu/usr.bin/groff/pic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/pic/Makefile,v 1.6.2.1 1999/08/29 14:33:18 peter Exp $
 
 PROG=		pic
 SRCS=		lex.cc main.cc object.cc pic.cc pic.tab.h \
diff --git a/gnu/usr.bin/groff/refer/Makefile b/gnu/usr.bin/groff/refer/Makefile
index 4573443a7adf..ba2b66ed8c6e 100644
--- a/gnu/usr.bin/groff/refer/Makefile
+++ b/gnu/usr.bin/groff/refer/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/refer/Makefile,v 1.6.2.1 1999/08/29 14:33:19 peter Exp $
 
 PROG=		refer
 SRCS=		command.cc label.cc ref.cc refer.cc token.cc
diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile
index bb500891d21c..061d1f463e0b 100644
--- a/gnu/usr.bin/groff/tmac/Makefile
+++ b/gnu/usr.bin/groff/tmac/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/tmac/Makefile,v 1.15.2.2 1999/08/29 14:33:20 peter Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/groff/troff/Makefile b/gnu/usr.bin/groff/troff/Makefile
index 17cafa2658fe..c790f93f0758 100644
--- a/gnu/usr.bin/groff/troff/Makefile
+++ b/gnu/usr.bin/groff/troff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/troff/Makefile,v 1.9.2.1 1999/08/29 14:33:21 peter Exp $
 
 PROG=		troff
 SRCS=		env.cc node.cc input.cc div.cc symbol.cc dictionary.cc reg.cc \
diff --git a/gnu/usr.bin/gzip/Makefile b/gnu/usr.bin/gzip/Makefile
index 4019dabf19ed..389ff8dc6e48 100644
--- a/gnu/usr.bin/gzip/Makefile
+++ b/gnu/usr.bin/gzip/Makefile
@@ -1,5 +1,5 @@
 #       @(#)Makefile    5.3 (Berkeley) 5/12/90
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gzip/Makefile,v 1.20.2.1 1999/08/29 14:33:23 peter Exp $
 
 PROG=	gzip
 SRCS=	gzip.c zip.c deflate.c trees.c bits.c unzip.c inflate.c util.c \
diff --git a/gnu/usr.bin/gzip/bits.c b/gnu/usr.bin/gzip/bits.c
index efce3910632e..16bfe5170621 100644
--- a/gnu/usr.bin/gzip/bits.c
+++ b/gnu/usr.bin/gzip/bits.c
@@ -60,7 +60,7 @@
 #endif
 
 #ifdef RCSID
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/bits.c,v 1.6.2.1 1999/08/29 14:33:23 peter Exp $";
 #endif
 
 /* ===========================================================================
diff --git a/gnu/usr.bin/gzip/crypt.c b/gnu/usr.bin/gzip/crypt.c
index cdbd812368cc..eced6c1c7676 100644
--- a/gnu/usr.bin/gzip/crypt.c
+++ b/gnu/usr.bin/gzip/crypt.c
@@ -2,5 +2,5 @@
  * Hardly worth copyrighting :-)
  */
 #ifdef RCSID
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/crypt.c,v 1.5.2.1 1999/08/29 14:33:24 peter Exp $";
 #endif
diff --git a/gnu/usr.bin/gzip/deflate.c b/gnu/usr.bin/gzip/deflate.c
index cbc48843ce1d..71accbbba934 100644
--- a/gnu/usr.bin/gzip/deflate.c
+++ b/gnu/usr.bin/gzip/deflate.c
@@ -68,7 +68,7 @@
 #include "lzw.h" /* just for consistency checking */
 
 #ifdef RCSID
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/deflate.c,v 1.6.2.1 1999/08/29 14:33:25 peter Exp $";
 #endif
 
 /* ===========================================================================
diff --git a/gnu/usr.bin/gzip/gzexe b/gnu/usr.bin/gzip/gzexe
index 19a1d7ee31bd..fc95e0e0cf2e 100644
--- a/gnu/usr.bin/gzip/gzexe
+++ b/gnu/usr.bin/gzip/gzexe
@@ -12,7 +12,7 @@
 # The : is required for some old versions of csh.
 # On Ultrix, /bin/sh is too buggy, change the first line to: #!/bin/sh5
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gzip/gzexe,v 1.5.2.2 1999/08/29 14:33:25 peter Exp $
 
 x=`basename $0`
 if test $# = 0; then
diff --git a/gnu/usr.bin/gzip/gzip.1 b/gnu/usr.bin/gzip/gzip.1
index 795e47fe059d..ec45c8633038 100644
--- a/gnu/usr.bin/gzip/gzip.1
+++ b/gnu/usr.bin/gzip/gzip.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/gzip/gzip.1,v 1.6.2.1 1999/09/20 09:49:49 phantom Exp $
 .\"
 .PU
 .TH GZIP 1
diff --git a/gnu/usr.bin/gzip/gzip.c b/gnu/usr.bin/gzip/gzip.c
index b59b4d1a7a4c..6343c58d27b4 100644
--- a/gnu/usr.bin/gzip/gzip.c
+++ b/gnu/usr.bin/gzip/gzip.c
@@ -45,7 +45,7 @@ static char  *license_msg[] = {
  */
 
 #ifdef RCSID
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/gzip.c,v 1.8.2.2 1999/08/29 14:33:26 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/usr.bin/gzip/inflate.c b/gnu/usr.bin/gzip/inflate.c
index c9b250b3bd61..8e228c6b9079 100644
--- a/gnu/usr.bin/gzip/inflate.c
+++ b/gnu/usr.bin/gzip/inflate.c
@@ -97,7 +97,7 @@
  */
 
 #ifdef RCSID
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/inflate.c,v 1.7.2.1 1999/08/29 14:33:26 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/gnu/usr.bin/gzip/lzw.c b/gnu/usr.bin/gzip/lzw.c
index 934a8d994d41..08e9800cc3bf 100644
--- a/gnu/usr.bin/gzip/lzw.c
+++ b/gnu/usr.bin/gzip/lzw.c
@@ -3,7 +3,7 @@
  */
 
 #ifdef RCSID
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/lzw.c,v 1.5.2.1 1999/08/29 14:33:27 peter Exp $";
 #endif
 
 #include "tailor.h"
diff --git a/gnu/usr.bin/gzip/match.S b/gnu/usr.bin/gzip/match.S
index 6ae803493c64..90dd0235b8b3 100644
--- a/gnu/usr.bin/gzip/match.S
+++ b/gnu/usr.bin/gzip/match.S
@@ -9,7 +9,7 @@
  * Kristoffer Eriksson <ske@pkmab.se>
  */
  
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gzip/match.S,v 1.6.2.1 1999/08/29 14:33:27 peter Exp $ */
 
 /* Preprocess with -DNO_UNDERLINE if your C compiler does not prefix
  * external symbols with an underline character '_'.
diff --git a/gnu/usr.bin/gzip/revision.h b/gnu/usr.bin/gzip/revision.h
index 43b0885e4154..504fd15ccfd4 100644
--- a/gnu/usr.bin/gzip/revision.h
+++ b/gnu/usr.bin/gzip/revision.h
@@ -13,4 +13,4 @@
 #  undef LZW
 #endif
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gzip/revision.h,v 1.5.2.1 1999/08/29 14:33:28 peter Exp $ */
diff --git a/gnu/usr.bin/gzip/tailor.h b/gnu/usr.bin/gzip/tailor.h
index abdde17d18fd..239257349d62 100644
--- a/gnu/usr.bin/gzip/tailor.h
+++ b/gnu/usr.bin/gzip/tailor.h
@@ -8,7 +8,7 @@
  * The target dependent functions should be defined in tailor.c.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gzip/tailor.h,v 1.6.2.1 1999/08/29 14:33:29 peter Exp $ */
 
 #if defined(__MSDOS__) && !defined(MSDOS)
 #  define MSDOS
diff --git a/gnu/usr.bin/gzip/trees.c b/gnu/usr.bin/gzip/trees.c
index fe2405e47f52..58e72bd10fac 100644
--- a/gnu/usr.bin/gzip/trees.c
+++ b/gnu/usr.bin/gzip/trees.c
@@ -59,7 +59,7 @@
 #include "gzip.h"
 
 #ifdef RCSID
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/trees.c,v 1.8.2.1 1999/08/29 14:33:29 peter Exp $";
 #endif
 
 /* ===========================================================================
diff --git a/gnu/usr.bin/gzip/unlzh.c b/gnu/usr.bin/gzip/unlzh.c
index 971ecc0389a4..446995e16f2d 100644
--- a/gnu/usr.bin/gzip/unlzh.c
+++ b/gnu/usr.bin/gzip/unlzh.c
@@ -4,7 +4,7 @@
  */
 
 #ifdef RCSID
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/unlzh.c,v 1.4.2.1 1999/08/29 14:33:30 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/gnu/usr.bin/gzip/unlzw.c b/gnu/usr.bin/gzip/unlzw.c
index 7e89ca487822..e36eb7e98ee0 100644
--- a/gnu/usr.bin/gzip/unlzw.c
+++ b/gnu/usr.bin/gzip/unlzw.c
@@ -8,7 +8,7 @@
  */
 
 #ifdef RCSID
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/unlzw.c,v 1.6.2.1 1999/08/29 14:33:31 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/gnu/usr.bin/gzip/unpack.c b/gnu/usr.bin/gzip/unpack.c
index a0ef28699e4c..59133a9cbae9 100644
--- a/gnu/usr.bin/gzip/unpack.c
+++ b/gnu/usr.bin/gzip/unpack.c
@@ -5,7 +5,7 @@
  */
 
 #ifdef RCSID
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/unpack.c,v 1.5.2.1 1999/08/29 14:33:31 peter Exp $";
 #endif
 
 #include "tailor.h"
diff --git a/gnu/usr.bin/gzip/unzip.c b/gnu/usr.bin/gzip/unzip.c
index e36555a97536..21e58414f8ae 100644
--- a/gnu/usr.bin/gzip/unzip.c
+++ b/gnu/usr.bin/gzip/unzip.c
@@ -14,7 +14,7 @@
  */
 
 #ifdef RCSID
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/unzip.c,v 1.5.2.1 1999/08/29 14:33:31 peter Exp $";
 #endif
 
 #include "tailor.h"
diff --git a/gnu/usr.bin/gzip/util.c b/gnu/usr.bin/gzip/util.c
index 684cc5dd4a54..2da968edef9d 100644
--- a/gnu/usr.bin/gzip/util.c
+++ b/gnu/usr.bin/gzip/util.c
@@ -5,7 +5,7 @@
  */
 
 #ifdef RCSID
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/util.c,v 1.7.2.1 1999/08/29 14:33:32 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/usr.bin/gzip/zdiff b/gnu/usr.bin/gzip/zdiff
index ebc9eca485a3..9eae4d7299b1 100644
--- a/gnu/usr.bin/gzip/zdiff
+++ b/gnu/usr.bin/gzip/zdiff
@@ -9,7 +9,7 @@
 # necessary) and fed to cmp or diff.  The exit status from cmp
 # or diff is preserved.
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gzip/zdiff,v 1.3.12.2 1999/08/29 14:33:32 peter Exp $
 
 prog=`echo $0 | sed 's|.*/||'`
 case "$prog" in
diff --git a/gnu/usr.bin/gzip/zforce b/gnu/usr.bin/gzip/zforce
index 146db92c86d1..b30b3a2c5e6e 100644
--- a/gnu/usr.bin/gzip/zforce
+++ b/gnu/usr.bin/gzip/zforce
@@ -5,7 +5,7 @@
 # This can be useful for files with names truncated after a file transfer.
 # foo is renamed to foo.gz
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gzip/zforce,v 1.2.12.3 1999/08/29 14:33:33 peter Exp $
 
 x=`basename $0`
 if test $# = 0; then
diff --git a/gnu/usr.bin/gzip/zgrep b/gnu/usr.bin/gzip/zgrep
index fe5efb9917fd..2038edc560a4 100644
--- a/gnu/usr.bin/gzip/zgrep
+++ b/gnu/usr.bin/gzip/zgrep
@@ -3,7 +3,7 @@
 # zgrep -- a wrapper around a grep program that decompresses files as needed
 # Adapted from a version sent by Charles Levert <charles@comm.polymtl.ca>
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gzip/zgrep,v 1.1.12.2 1999/08/29 14:33:34 peter Exp $
 
 prog=`echo $0 | sed 's|.*/||'`
 case "$prog" in
diff --git a/gnu/usr.bin/gzip/zgrep.getopt b/gnu/usr.bin/gzip/zgrep.getopt
index e6811b7e969e..8cafa3230cbd 100644
--- a/gnu/usr.bin/gzip/zgrep.getopt
+++ b/gnu/usr.bin/gzip/zgrep.getopt
@@ -26,7 +26,7 @@
 #
 # zgrep - search possibly compressed files for a regular expression
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gzip/zgrep.getopt,v 1.6.2.1 1999/08/29 14:33:34 peter Exp $
 
 
 PATH=/bin:/usr/bin:$PATH; export PATH
diff --git a/gnu/usr.bin/gzip/zgrep.libz b/gnu/usr.bin/gzip/zgrep.libz
index 3001efae61e0..daa1f816a34e 100644
--- a/gnu/usr.bin/gzip/zgrep.libz
+++ b/gnu/usr.bin/gzip/zgrep.libz
@@ -5,7 +5,7 @@
 # zgrep - Search possibly compressed files for a regular expression. This
 #         version of zgrep(1) depend on a grep(1) linked with libz.
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gzip/zgrep.libz,v 1.1.2.1 1999/08/29 14:33:35 peter Exp $
 
 PATH=/bin:/usr/bin; export PATH
 
diff --git a/gnu/usr.bin/gzip/zip.c b/gnu/usr.bin/gzip/zip.c
index c5b985e71dc0..b77b663670b1 100644
--- a/gnu/usr.bin/gzip/zip.c
+++ b/gnu/usr.bin/gzip/zip.c
@@ -5,7 +5,7 @@
  */
 
 #ifdef RCSID
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/zip.c,v 1.5.2.1 1999/08/29 14:33:35 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/usr.bin/gzip/zmore b/gnu/usr.bin/gzip/zmore
index f5c2d5fe6014..b98932f7f45a 100644
--- a/gnu/usr.bin/gzip/zmore
+++ b/gnu/usr.bin/gzip/zmore
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gzip/zmore,v 1.3.12.2 1999/08/29 14:33:36 peter Exp $
 
 if test "`echo -n a`" = "-n a"; then
   # looks like a SysV system:
diff --git a/gnu/usr.bin/gzip/zmore.1 b/gnu/usr.bin/gzip/zmore.1
index b8157e519f5e..1c61a4c88152 100644
--- a/gnu/usr.bin/gzip/zmore.1
+++ b/gnu/usr.bin/gzip/zmore.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/gzip/zmore.1,v 1.2.12.2 1999/08/29 14:33:36 peter Exp $
 .\"
 .TH ZMORE 1
 .SH NAME
diff --git a/gnu/usr.bin/gzip/znew b/gnu/usr.bin/gzip/znew
index 8e0e26bc76bd..ffa9ef7537ef 100644
--- a/gnu/usr.bin/gzip/znew
+++ b/gnu/usr.bin/gzip/znew
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gzip/znew,v 1.3.12.2 1999/08/29 14:33:36 peter Exp $
 
 check=0
 pipe=0
diff --git a/gnu/usr.bin/ld/Makefile b/gnu/usr.bin/ld/Makefile
index 8d153600b922..95bf65009f3c 100644
--- a/gnu/usr.bin/ld/Makefile
+++ b/gnu/usr.bin/ld/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/ld/Makefile,v 1.27.2.1 1999/08/29 14:33:39 peter Exp $
 #
 
 RTLD=	${.CURDIR}/../../../libexec/rtld-aout
diff --git a/gnu/usr.bin/ld/PORTING b/gnu/usr.bin/ld/PORTING
index 4a91ff81ce03..58ccb2f906cc 100644
--- a/gnu/usr.bin/ld/PORTING
+++ b/gnu/usr.bin/ld/PORTING
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/gnu/usr.bin/ld/PORTING,v 1.4.2.1 1999/08/29 14:33:40 peter Exp $
 
 This document describes some of the machine dependent parts in ld(1) and rtld(?)
 Most of the machine dependencies are a result of different ways in which
diff --git a/gnu/usr.bin/ld/ld.1 b/gnu/usr.bin/ld/ld.1
index 74d4b2cc3e62..871f9f1416dc 100644
--- a/gnu/usr.bin/ld/ld.1
+++ b/gnu/usr.bin/ld/ld.1
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/ld/ld.1,v 1.20.2.1 1999/08/29 14:33:40 peter Exp $
 .\"
 .Dd October 14, 1993
 .Dt LD 1
diff --git a/gnu/usr.bin/ld/ld.1aout b/gnu/usr.bin/ld/ld.1aout
index 74d4b2cc3e62..e812c8f9d6b4 100644
--- a/gnu/usr.bin/ld/ld.1aout
+++ b/gnu/usr.bin/ld/ld.1aout
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/ld/ld.1aout,v 1.20.2.1 1999/08/29 14:33:41 peter Exp $
 .\"
 .Dd October 14, 1993
 .Dt LD 1
diff --git a/gnu/usr.bin/ld/ld.c b/gnu/usr.bin/ld/ld.c
index 316df2835f36..ca1aa8b555eb 100644
--- a/gnu/usr.bin/ld/ld.c
+++ b/gnu/usr.bin/ld/ld.c
@@ -32,7 +32,7 @@ static char sccsid[] = "@(#)ld.c	6.10 (Berkeley) 5/22/91";
    Set, indirect, and warning symbol features added by Randy Smith. */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/ld/ld.c,v 1.46.2.1 1999/08/29 14:33:41 peter Exp $
  */
 
 /* Define how to initialize system-dependent header fields.  */
diff --git a/gnu/usr.bin/ld/ld.h b/gnu/usr.bin/ld/ld.h
index 4aaa775ec713..15aaded2889f 100644
--- a/gnu/usr.bin/ld/ld.h
+++ b/gnu/usr.bin/ld/ld.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/ld/ld.h,v 1.20.2.1 1999/08/29 14:33:43 peter Exp $
  */
 /*-
  * This code is derived from software copyrighted by the Free Software
diff --git a/gnu/usr.bin/ld/lib.c b/gnu/usr.bin/ld/lib.c
index 7881584cc077..b7734faa7fb4 100644
--- a/gnu/usr.bin/ld/lib.c
+++ b/gnu/usr.bin/ld/lib.c
@@ -30,7 +30,7 @@
    Set, indirect, and warning symbol features added by Randy Smith. */
 
 /*
- * $FreeBSD$	- library routines
+ * $FreeBSD: src/gnu/usr.bin/ld/lib.c,v 1.22.2.1 1999/08/29 14:33:43 peter Exp $	- library routines
  */
 
 #include <sys/param.h>
diff --git a/gnu/usr.bin/ld/rrs.c b/gnu/usr.bin/ld/rrs.c
index fbd356c3a325..a345c99bd0aa 100644
--- a/gnu/usr.bin/ld/rrs.c
+++ b/gnu/usr.bin/ld/rrs.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/ld/rrs.c,v 1.23.2.1 1999/08/29 14:33:43 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/gnu/usr.bin/ld/sparc/md-static-funcs.c b/gnu/usr.bin/ld/sparc/md-static-funcs.c
index 04558ee569d0..6fdd848b2c0a 100644
--- a/gnu/usr.bin/ld/sparc/md-static-funcs.c
+++ b/gnu/usr.bin/ld/sparc/md-static-funcs.c
@@ -1,6 +1,6 @@
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/ld/sparc/md-static-funcs.c,v 1.4.2.1 1999/08/29 14:33:47 peter Exp $
  *
  * Simple SPARC relocations for the benefit of self-relocation of ld.so
  * avoiding the use of global variables (ie. reloc_bitshift[] et. al.).
diff --git a/gnu/usr.bin/ld/sparc/md.c b/gnu/usr.bin/ld/sparc/md.c
index 20d241036f6b..7e8c2b334bb7 100644
--- a/gnu/usr.bin/ld/sparc/md.c
+++ b/gnu/usr.bin/ld/sparc/md.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/ld/sparc/md.c,v 1.11.2.1 1999/08/29 14:33:48 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/gnu/usr.bin/ld/sparc/md.h b/gnu/usr.bin/ld/sparc/md.h
index 7c8a5683b3bb..5070b5d43386 100644
--- a/gnu/usr.bin/ld/sparc/md.h
+++ b/gnu/usr.bin/ld/sparc/md.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/ld/sparc/md.h,v 1.10.2.1 1999/08/29 14:33:48 peter Exp $
  */
 
 /*
diff --git a/gnu/usr.bin/ld/sparc/mdprologue.S b/gnu/usr.bin/ld/sparc/mdprologue.S
index 68140ae4a725..c272b61fa170 100644
--- a/gnu/usr.bin/ld/sparc/mdprologue.S
+++ b/gnu/usr.bin/ld/sparc/mdprologue.S
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/ld/sparc/mdprologue.S,v 1.6.2.1 1999/08/29 14:33:49 peter Exp $
  */
 
 /*
diff --git a/gnu/usr.bin/ld/symbol.c b/gnu/usr.bin/ld/symbol.c
index 350b23bd0620..b354602465b3 100644
--- a/gnu/usr.bin/ld/symbol.c
+++ b/gnu/usr.bin/ld/symbol.c
@@ -31,7 +31,7 @@
 
 /*
  * symbol table routines
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/ld/symbol.c,v 1.9.2.1 1999/08/29 14:33:44 peter Exp $
  */
 
 /* Create the symbol table entries for `etext', `edata' and `end'.  */
diff --git a/gnu/usr.bin/ld/symseg.h b/gnu/usr.bin/ld/symseg.h
index fbe530f6f07f..acf07da64440 100644
--- a/gnu/usr.bin/ld/symseg.h
+++ b/gnu/usr.bin/ld/symseg.h
@@ -4,7 +4,7 @@
  * Foundation.
  *
  *	from: @(#)symseg.h	5.4 (Berkeley) 4/30/91
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/ld/symseg.h,v 1.6.2.1 1999/08/29 14:33:45 peter Exp $
  */
 
 /* GDB symbol table format definitions.
diff --git a/gnu/usr.bin/ld/warnings.c b/gnu/usr.bin/ld/warnings.c
index baa69caeb379..bf0305fc2fec 100644
--- a/gnu/usr.bin/ld/warnings.c
+++ b/gnu/usr.bin/ld/warnings.c
@@ -30,7 +30,7 @@
    Set, indirect, and warning symbol features added by Randy Smith. */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/ld/warnings.c,v 1.16.2.1 1999/08/29 14:33:45 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/gnu/usr.bin/ld/xbits.c b/gnu/usr.bin/ld/xbits.c
index f5a2740c8c5f..5539b988f4d8 100644
--- a/gnu/usr.bin/ld/xbits.c
+++ b/gnu/usr.bin/ld/xbits.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/ld/xbits.c,v 1.6.2.1 1999/08/29 14:33:45 peter Exp $
  */
 
 /*
diff --git a/gnu/usr.bin/man/Makefile.shprog b/gnu/usr.bin/man/Makefile.shprog
index 819ed33ebb8e..d95467a87958 100644
--- a/gnu/usr.bin/man/Makefile.shprog
+++ b/gnu/usr.bin/man/Makefile.shprog
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/man/Makefile.shprog,v 1.3.2.1 1999/08/29 14:33:50 peter Exp $
 
 # This may become bsd.shprog.mk.  The general version would have to handle:
 # - arbitrary sed substitutions.
diff --git a/gnu/usr.bin/man/apropos/Makefile b/gnu/usr.bin/man/apropos/Makefile
index 235c938e20ae..48a5fecef3e5 100644
--- a/gnu/usr.bin/man/apropos/Makefile
+++ b/gnu/usr.bin/man/apropos/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/man/apropos/Makefile,v 1.13.2.1 1999/08/29 14:33:51 peter Exp $
 
 SHPROG=	apropos
 
diff --git a/gnu/usr.bin/man/apropos/apropos.sh b/gnu/usr.bin/man/apropos/apropos.sh
index 4f68263ce4ec..f8bfb7477440 100644
--- a/gnu/usr.bin/man/apropos/apropos.sh
+++ b/gnu/usr.bin/man/apropos/apropos.sh
@@ -15,7 +15,7 @@
 # The University of Texas at Austin
 # Austin, Texas  78712
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/man/apropos/apropos.sh,v 1.9.2.1 1999/08/29 14:33:52 peter Exp $
 
 
 PATH=/bin:/usr/bin:$PATH
diff --git a/gnu/usr.bin/man/catman/catman.1 b/gnu/usr.bin/man/catman/catman.1
index 13fefaf59868..72bd8a927048 100644
--- a/gnu/usr.bin/man/catman/catman.1
+++ b/gnu/usr.bin/man/catman/catman.1
@@ -24,7 +24,7 @@
 .\"
 .\" /usr/bin/catman - preformat man pages
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/man/catman/catman.1,v 1.15.2.1 1999/08/29 14:33:53 peter Exp $
 .Dd Mar 12, 1995
 .Dt CATMAN 1
 .Os
diff --git a/gnu/usr.bin/man/catman/catman.perl b/gnu/usr.bin/man/catman/catman.perl
index 5add5d44b985..19aaaed59001 100644
--- a/gnu/usr.bin/man/catman/catman.perl
+++ b/gnu/usr.bin/man/catman/catman.perl
@@ -26,7 +26,7 @@
 #
 # /usr/bin/catman - preformat man pages
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/man/catman/catman.perl,v 1.12.2.1 1999/08/29 14:33:54 peter Exp $
 
 
 sub usage {
diff --git a/gnu/usr.bin/man/makewhatis/makewhatis.1 b/gnu/usr.bin/man/makewhatis/makewhatis.1
index ec9ae5788b60..771d3041eb3c 100644
--- a/gnu/usr.bin/man/makewhatis/makewhatis.1
+++ b/gnu/usr.bin/man/makewhatis/makewhatis.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/man/makewhatis/makewhatis.1,v 1.12.2.1 1999/08/29 14:33:55 peter Exp $
 .Dd January 12, 1995
 .Dt MAKEWHATIS 1
 .Os FreeBSD 2.1
diff --git a/gnu/usr.bin/man/makewhatis/makewhatis.local.8 b/gnu/usr.bin/man/makewhatis/makewhatis.local.8
index 051c4ace2e68..74781616d06a 100644
--- a/gnu/usr.bin/man/makewhatis/makewhatis.local.8
+++ b/gnu/usr.bin/man/makewhatis/makewhatis.local.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/man/makewhatis/makewhatis.local.8,v 1.6.2.1 1999/08/29 14:33:56 peter Exp $
 .Dd April 26, 1996
 .Dt MAKEWHATIS.LOCAL 8
 .Os FreeBSD 2.2
diff --git a/gnu/usr.bin/man/makewhatis/makewhatis.local.sh b/gnu/usr.bin/man/makewhatis/makewhatis.local.sh
index 26cae568868f..9e9408831284 100644
--- a/gnu/usr.bin/man/makewhatis/makewhatis.local.sh
+++ b/gnu/usr.bin/man/makewhatis/makewhatis.local.sh
@@ -33,7 +33,7 @@
 #
 # PS: this wrapper works also for catman(1)
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/man/makewhatis/makewhatis.local.sh,v 1.5.2.1 1999/08/29 14:33:56 peter Exp $
 
 PATH=/bin:/usr/bin:$PATH; export PATH
 opt= dirs= localdirs=
diff --git a/gnu/usr.bin/man/makewhatis/makewhatis.perl b/gnu/usr.bin/man/makewhatis/makewhatis.perl
index 7094c92b6cde..96abf057e51a 100644
--- a/gnu/usr.bin/man/makewhatis/makewhatis.perl
+++ b/gnu/usr.bin/man/makewhatis/makewhatis.perl
@@ -26,7 +26,7 @@
 #
 # makewhatis -- update the whatis database in the man directories.
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/man/makewhatis/makewhatis.perl,v 1.18.2.2 1999/09/06 05:41:49 phantom Exp $
 
 
 sub usage {
diff --git a/gnu/usr.bin/man/man/man.c b/gnu/usr.bin/man/man/man.c
index 776499bc4952..d41f4ce81228 100644
--- a/gnu/usr.bin/man/man/man.c
+++ b/gnu/usr.bin/man/man/man.c
@@ -13,7 +13,7 @@
  * The University of Texas at Austin
  * Austin, Texas  78712
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/man/man/man.c,v 1.28.2.1 1999/12/04 06:22:15 jhb Exp $
  */
 
 #define MAN_MAIN
diff --git a/gnu/usr.bin/man/manpath/manpath.config b/gnu/usr.bin/man/manpath/manpath.config
index b340fea14187..16b7facd6192 100644
--- a/gnu/usr.bin/man/manpath/manpath.config
+++ b/gnu/usr.bin/man/manpath/manpath.config
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/man/manpath/manpath.config,v 1.8.2.6 1999/08/29 14:33:58 peter Exp $
 #
 # This file is read by manpath(1) to configure the mandatory manpath,
 # optional manpath and to map each path element to a manpath element.
diff --git a/gnu/usr.bin/man/manpath/manpath.man b/gnu/usr.bin/man/manpath/manpath.man
index 5b54a099e627..5749a7be97d4 100644
--- a/gnu/usr.bin/man/manpath/manpath.man
+++ b/gnu/usr.bin/man/manpath/manpath.man
@@ -12,7 +12,7 @@
 .\" The University of Texas at Austin
 .\" Austin, Texas  78712
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/man/manpath/manpath.man,v 1.3.2.2 1999/08/29 14:33:59 peter Exp $
 .Dd Aug 16, 1999
 .Dt MANPATH 1
 .Os
diff --git a/gnu/usr.bin/patch/EXTERN.h b/gnu/usr.bin/patch/EXTERN.h
index 54cc620ed4d1..2f61cb3a70bb 100644
--- a/gnu/usr.bin/patch/EXTERN.h
+++ b/gnu/usr.bin/patch/EXTERN.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/EXTERN.h,v 1.4.2.1 1999/08/29 14:34:00 peter Exp $
  *
  * $Log: EXTERN.h,v $
  * Revision 1.4  1998/01/21 14:37:12  ache
diff --git a/gnu/usr.bin/patch/INTERN.h b/gnu/usr.bin/patch/INTERN.h
index 0f121fbc683c..9b0796db362a 100644
--- a/gnu/usr.bin/patch/INTERN.h
+++ b/gnu/usr.bin/patch/INTERN.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/INTERN.h,v 1.4.2.1 1999/08/29 14:34:01 peter Exp $
  *
  * $Log: INTERN.h,v $
  * Revision 1.4  1998/01/21 14:37:12  ache
diff --git a/gnu/usr.bin/patch/common.h b/gnu/usr.bin/patch/common.h
index b8d2d7153aae..7d927f88300e 100644
--- a/gnu/usr.bin/patch/common.h
+++ b/gnu/usr.bin/patch/common.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/common.h,v 1.5.2.1 1999/08/29 14:34:01 peter Exp $
  *
  * $Log: common.h,v $
  * Revision 1.5  1998/01/21 14:37:16  ache
diff --git a/gnu/usr.bin/patch/inp.c b/gnu/usr.bin/patch/inp.c
index c44465a333a1..d55502d03588 100644
--- a/gnu/usr.bin/patch/inp.c
+++ b/gnu/usr.bin/patch/inp.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/inp.c,v 1.8.2.1 1999/08/29 14:34:02 peter Exp $
  *
  * $Log: inp.c,v $
  * Revision 1.8  1998/01/21 14:37:20  ache
diff --git a/gnu/usr.bin/patch/inp.h b/gnu/usr.bin/patch/inp.h
index 730fc14bc763..86c77f9c0128 100644
--- a/gnu/usr.bin/patch/inp.h
+++ b/gnu/usr.bin/patch/inp.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/inp.h,v 1.4.2.1 1999/08/29 14:34:03 peter Exp $
  *
  * $Log: inp.h,v $
  * Revision 1.4  1998/01/21 14:37:20  ache
diff --git a/gnu/usr.bin/patch/patch.1 b/gnu/usr.bin/patch/patch.1
index 56dd60a2047a..3d826ebdbd59 100644
--- a/gnu/usr.bin/patch/patch.1
+++ b/gnu/usr.bin/patch/patch.1
@@ -1,6 +1,6 @@
 .\" -*- nroff -*-
 .rn '' }`
-'\" $FreeBSD$
+'\" $FreeBSD: src/gnu/usr.bin/patch/patch.1,v 1.9.2.1 1999/08/29 14:34:03 peter Exp $
 '\" 
 '\" $Log: patch.1,v $
 '\" Revision 1.9  1998/01/22 07:44:03  ache
diff --git a/gnu/usr.bin/patch/patch.c b/gnu/usr.bin/patch/patch.c
index 5431652ca179..32c8fcb937dc 100644
--- a/gnu/usr.bin/patch/patch.c
+++ b/gnu/usr.bin/patch/patch.c
@@ -1,5 +1,5 @@
 char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/gnu/usr.bin/patch/patch.c,v 1.14.2.1 1999/08/29 14:34:04 peter Exp $";
 
 /* patch - a program to apply diffs to original files
  *
diff --git a/gnu/usr.bin/patch/pch.c b/gnu/usr.bin/patch/pch.c
index 43de437b26b1..f5f43b3b48c3 100644
--- a/gnu/usr.bin/patch/pch.c
+++ b/gnu/usr.bin/patch/pch.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/pch.c,v 1.14.2.1 1999/08/29 14:34:04 peter Exp $
  *
  * $Log: pch.c,v $
  * Revision 1.14  1998/01/21 15:10:14  ache
diff --git a/gnu/usr.bin/patch/pch.h b/gnu/usr.bin/patch/pch.h
index 8e512fa348ec..8d92c0000308 100644
--- a/gnu/usr.bin/patch/pch.h
+++ b/gnu/usr.bin/patch/pch.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/pch.h,v 1.4.2.1 1999/08/29 14:34:05 peter Exp $
  *
  * $Log: pch.h,v $
  * Revision 1.4  1998/01/21 14:37:24  ache
diff --git a/gnu/usr.bin/patch/util.h b/gnu/usr.bin/patch/util.h
index f2a016e44dd4..b9c46eb59db2 100644
--- a/gnu/usr.bin/patch/util.h
+++ b/gnu/usr.bin/patch/util.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/util.h,v 1.5.2.1 1999/08/29 14:34:05 peter Exp $
  *
  * $Log: util.h,v $
  * Revision 1.5  1998/01/21 14:37:25  ache
diff --git a/gnu/usr.bin/patch/version.c b/gnu/usr.bin/patch/version.c
index ba6650911b82..f4a881c8249b 100644
--- a/gnu/usr.bin/patch/version.c
+++ b/gnu/usr.bin/patch/version.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/version.c,v 1.4.2.1 1999/08/29 14:34:05 peter Exp $
  *
  * $Log: version.c,v $
  * Revision 1.4  1998/01/21 14:37:26  ache
diff --git a/gnu/usr.bin/patch/version.h b/gnu/usr.bin/patch/version.h
index 5efe54c844b8..1fce5cf04025 100644
--- a/gnu/usr.bin/patch/version.h
+++ b/gnu/usr.bin/patch/version.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/version.h,v 1.4.2.1 1999/08/29 14:34:06 peter Exp $
  *
  * $Log: version.h,v $
  * Revision 1.4  1998/01/21 14:37:27  ache
diff --git a/gnu/usr.bin/perl/Makefile b/gnu/usr.bin/perl/Makefile
index 967b0ce22e73..cd8d0cd41837 100644
--- a/gnu/usr.bin/perl/Makefile
+++ b/gnu/usr.bin/perl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/Makefile,v 1.7.2.2 1999/08/29 14:34:08 peter Exp $
 
 .if !defined(NOSUIDPERL)
 _suidperl=	suidperl
diff --git a/gnu/usr.bin/perl/Makefile.inc b/gnu/usr.bin/perl/Makefile.inc
index 7c36011eb838..9a5e790bc537 100644
--- a/gnu/usr.bin/perl/Makefile.inc
+++ b/gnu/usr.bin/perl/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/Makefile.inc,v 1.7.2.1 1999/08/29 14:34:09 peter Exp $
 
 PERL5SRC?= ${.CURDIR}/../../../../contrib/perl5
 
diff --git a/gnu/usr.bin/perl/libperl/Makefile b/gnu/usr.bin/perl/libperl/Makefile
index 7f264b89ea2a..edc3a9acce87 100644
--- a/gnu/usr.bin/perl/libperl/Makefile
+++ b/gnu/usr.bin/perl/libperl/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/libperl/Makefile,v 1.5.2.1 1999/08/29 14:34:10 peter Exp $
 #
 
 LIB=	perl
diff --git a/gnu/usr.bin/perl/libperl/config.SH-aout.i386 b/gnu/usr.bin/perl/libperl/config.SH-aout.i386
index 9f2f3d7fe165..68649f8ca7a0 100644
--- a/gnu/usr.bin/perl/libperl/config.SH-aout.i386
+++ b/gnu/usr.bin/perl/libperl/config.SH-aout.i386
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/libperl/config.SH-aout.i386,v 1.10.2.3 1999/08/29 14:34:10 peter Exp $
 #
 
 # Package name      : perl5
@@ -12,7 +12,7 @@
 Author=''
 Date='$Date: 1999/05/05 19:42:38 $'
 Header=''
-Id='$FreeBSD$'
+Id='$FreeBSD: src/gnu/usr.bin/perl/libperl/config.SH-aout.i386,v 1.10.2.3 1999/08/29 14:34:10 peter Exp $'
 Locker=''
 Mcc='Mcc'
 RCSfile='$RCSfile: config.SH-aout.i386,v $'
diff --git a/gnu/usr.bin/perl/libperl/config.SH-elf.alpha b/gnu/usr.bin/perl/libperl/config.SH-elf.alpha
index 13c5e3d4520f..3a3dfeb3e223 100644
--- a/gnu/usr.bin/perl/libperl/config.SH-elf.alpha
+++ b/gnu/usr.bin/perl/libperl/config.SH-elf.alpha
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/libperl/config.SH-elf.alpha,v 1.11.2.3 1999/08/29 14:34:11 peter Exp $
 #
 
 # Package name      : perl5
@@ -12,7 +12,7 @@
 Author=''
 Date='$Date: 1999/05/05 19:42:39 $'
 Header=''
-Id='$FreeBSD$'
+Id='$FreeBSD: src/gnu/usr.bin/perl/libperl/config.SH-elf.alpha,v 1.11.2.3 1999/08/29 14:34:11 peter Exp $'
 Locker=''
 Mcc='Mcc'
 RCSfile='$RCSfile: config.SH-elf.alpha,v $'
diff --git a/gnu/usr.bin/perl/libperl/config.SH-elf.i386 b/gnu/usr.bin/perl/libperl/config.SH-elf.i386
index 62a44ffa23e4..23b1732955ff 100644
--- a/gnu/usr.bin/perl/libperl/config.SH-elf.i386
+++ b/gnu/usr.bin/perl/libperl/config.SH-elf.i386
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/libperl/config.SH-elf.i386,v 1.10.2.3 1999/08/29 14:34:12 peter Exp $
 #
 
 # Package name      : perl5
@@ -12,7 +12,7 @@
 Author=''
 Date='$Date: 1999/05/05 19:42:40 $'
 Header=''
-Id='$FreeBSD$'
+Id='$FreeBSD: src/gnu/usr.bin/perl/libperl/config.SH-elf.i386,v 1.10.2.3 1999/08/29 14:34:12 peter Exp $'
 Locker=''
 Mcc='Mcc'
 RCSfile='$RCSfile: config.SH-elf.i386,v $'
diff --git a/gnu/usr.bin/perl/miniperl/Makefile b/gnu/usr.bin/perl/miniperl/Makefile
index e072d5ee2196..9d237d7becf0 100644
--- a/gnu/usr.bin/perl/miniperl/Makefile
+++ b/gnu/usr.bin/perl/miniperl/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/miniperl/Makefile,v 1.7.2.1 1999/08/29 14:34:13 peter Exp $
 #
 
 PROG=	miniperl
diff --git a/gnu/usr.bin/perl/perl/Makefile b/gnu/usr.bin/perl/perl/Makefile
index 96655dad3738..f7ef0d3a0691 100644
--- a/gnu/usr.bin/perl/perl/Makefile
+++ b/gnu/usr.bin/perl/perl/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/perl/Makefile,v 1.16.2.2 1999/08/29 14:34:14 peter Exp $
 #
 
 PROG=	perl
diff --git a/gnu/usr.bin/perl/pod/Makefile b/gnu/usr.bin/perl/pod/Makefile
index ffa559eeb9f7..3123028f2552 100644
--- a/gnu/usr.bin/perl/pod/Makefile
+++ b/gnu/usr.bin/perl/pod/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/pod/Makefile,v 1.1.2.1 1999/08/29 14:34:16 peter Exp $
 #
 
 SUBDIR= pod2man pod2html pod2latex pod2text pod
diff --git a/gnu/usr.bin/perl/pod/Makefile.inc b/gnu/usr.bin/perl/pod/Makefile.inc
index 1e3cbfe7fc72..5fc803340044 100644
--- a/gnu/usr.bin/perl/pod/Makefile.inc
+++ b/gnu/usr.bin/perl/pod/Makefile.inc
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/pod/Makefile.inc,v 1.1.2.1 1999/08/29 14:34:17 peter Exp $
 #
 
 PERL5SRC?=	${.CURDIR}/../../../../../contrib/perl5
diff --git a/gnu/usr.bin/perl/pod/pod/Makefile b/gnu/usr.bin/perl/pod/pod/Makefile
index dd614985fc0e..3225182d314a 100644
--- a/gnu/usr.bin/perl/pod/pod/Makefile
+++ b/gnu/usr.bin/perl/pod/pod/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/pod/pod/Makefile,v 1.2.2.3 1999/11/17 13:09:01 sheldonh Exp $
 #
 
 PODS=	perl.pod perl5004delta.pod perlapio.pod perlbook.pod perlbot.pod \
diff --git a/gnu/usr.bin/perl/pod/pod2html/Makefile b/gnu/usr.bin/perl/pod/pod2html/Makefile
index 77e1b1adc089..c7d893e95174 100644
--- a/gnu/usr.bin/perl/pod/pod2html/Makefile
+++ b/gnu/usr.bin/perl/pod/pod2html/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/pod/pod2html/Makefile,v 1.1.2.1 1999/08/29 14:34:19 peter Exp $
 #
 
 PROG=	pod2html
diff --git a/gnu/usr.bin/perl/pod/pod2latex/Makefile b/gnu/usr.bin/perl/pod/pod2latex/Makefile
index 3b67d0047692..437623461456 100644
--- a/gnu/usr.bin/perl/pod/pod2latex/Makefile
+++ b/gnu/usr.bin/perl/pod/pod2latex/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/pod/pod2latex/Makefile,v 1.1.2.1 1999/08/29 14:34:20 peter Exp $
 #
 
 PROG=	pod2latex
diff --git a/gnu/usr.bin/perl/pod/pod2man/Makefile b/gnu/usr.bin/perl/pod/pod2man/Makefile
index 99f1ec40da68..1d39ad1fe547 100644
--- a/gnu/usr.bin/perl/pod/pod2man/Makefile
+++ b/gnu/usr.bin/perl/pod/pod2man/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/pod/pod2man/Makefile,v 1.1.2.1 1999/08/29 14:34:21 peter Exp $
 #
 
 PROG=	pod2man
diff --git a/gnu/usr.bin/perl/pod/pod2text/Makefile b/gnu/usr.bin/perl/pod/pod2text/Makefile
index 13a425c067d4..46ccea794017 100644
--- a/gnu/usr.bin/perl/pod/pod2text/Makefile
+++ b/gnu/usr.bin/perl/pod/pod2text/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/pod/pod2text/Makefile,v 1.1.2.1 1999/08/29 14:34:22 peter Exp $
 #
 
 PROG=	pod2text
diff --git a/gnu/usr.bin/perl/suidperl/Makefile b/gnu/usr.bin/perl/suidperl/Makefile
index 8a0cea826c54..1692d60dc2ef 100644
--- a/gnu/usr.bin/perl/suidperl/Makefile
+++ b/gnu/usr.bin/perl/suidperl/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/suidperl/Makefile,v 1.6.2.2 1999/08/29 14:34:23 peter Exp $
 #
 
 PROG=	suidperl
diff --git a/gnu/usr.bin/perl/utils/Makefile b/gnu/usr.bin/perl/utils/Makefile
index 58a2ce7d30d9..c34798f5e36c 100644
--- a/gnu/usr.bin/perl/utils/Makefile
+++ b/gnu/usr.bin/perl/utils/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/utils/Makefile,v 1.1.2.1 1999/08/29 14:34:24 peter Exp $
 #
 
 SUBDIR= c2ph h2ph h2xs perlbug perlcc perldoc pl2pm splain
diff --git a/gnu/usr.bin/perl/utils/Makefile.inc b/gnu/usr.bin/perl/utils/Makefile.inc
index 6f8850df7895..8a3204c2c1fc 100644
--- a/gnu/usr.bin/perl/utils/Makefile.inc
+++ b/gnu/usr.bin/perl/utils/Makefile.inc
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/utils/Makefile.inc,v 1.2.2.1 1999/08/29 14:34:25 peter Exp $
 #
 
 PERL5SRC=	${.CURDIR}/../../../../../contrib/perl5
diff --git a/gnu/usr.bin/perl/utils/c2ph/Makefile b/gnu/usr.bin/perl/utils/c2ph/Makefile
index 0225a28f249a..86b0891e8e8b 100644
--- a/gnu/usr.bin/perl/utils/c2ph/Makefile
+++ b/gnu/usr.bin/perl/utils/c2ph/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/utils/c2ph/Makefile,v 1.1.2.1 1999/08/29 14:34:26 peter Exp $
 #
 
 PROG=	c2ph
diff --git a/gnu/usr.bin/perl/utils/h2ph/Makefile b/gnu/usr.bin/perl/utils/h2ph/Makefile
index ab7075d08103..25a4543b4207 100644
--- a/gnu/usr.bin/perl/utils/h2ph/Makefile
+++ b/gnu/usr.bin/perl/utils/h2ph/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/utils/h2ph/Makefile,v 1.2.2.3 1999/08/29 14:34:27 peter Exp $
 #
 
 PROG=	h2ph
diff --git a/gnu/usr.bin/perl/utils/h2xs/Makefile b/gnu/usr.bin/perl/utils/h2xs/Makefile
index fa635dbe8646..0f4c9ae14ca1 100644
--- a/gnu/usr.bin/perl/utils/h2xs/Makefile
+++ b/gnu/usr.bin/perl/utils/h2xs/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/utils/h2xs/Makefile,v 1.1.2.1 1999/08/29 14:34:29 peter Exp $
 #
 
 PROG=	h2xs
diff --git a/gnu/usr.bin/perl/utils/perlbug/Makefile b/gnu/usr.bin/perl/utils/perlbug/Makefile
index 2d4399a3006b..86bd966963dc 100644
--- a/gnu/usr.bin/perl/utils/perlbug/Makefile
+++ b/gnu/usr.bin/perl/utils/perlbug/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/utils/perlbug/Makefile,v 1.2.2.1 1999/08/29 14:34:30 peter Exp $
 #
 
 PROG=	perlbug
diff --git a/gnu/usr.bin/perl/utils/perlcc/Makefile b/gnu/usr.bin/perl/utils/perlcc/Makefile
index 02ce3a3ef077..218a8ef5c0d7 100644
--- a/gnu/usr.bin/perl/utils/perlcc/Makefile
+++ b/gnu/usr.bin/perl/utils/perlcc/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/utils/perlcc/Makefile,v 1.1.2.1 1999/08/29 14:34:31 peter Exp $
 #
 
 PROG=	perlcc
diff --git a/gnu/usr.bin/perl/utils/perldoc/Makefile b/gnu/usr.bin/perl/utils/perldoc/Makefile
index 5d55722414f4..61d1493072eb 100644
--- a/gnu/usr.bin/perl/utils/perldoc/Makefile
+++ b/gnu/usr.bin/perl/utils/perldoc/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/utils/perldoc/Makefile,v 1.1.2.1 1999/08/29 14:34:33 peter Exp $
 #
 
 PROG=	perldoc
diff --git a/gnu/usr.bin/perl/utils/pl2pm/Makefile b/gnu/usr.bin/perl/utils/pl2pm/Makefile
index fea06a33d29e..3e85942be59d 100644
--- a/gnu/usr.bin/perl/utils/pl2pm/Makefile
+++ b/gnu/usr.bin/perl/utils/pl2pm/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/utils/pl2pm/Makefile,v 1.1.2.1 1999/08/29 14:34:34 peter Exp $
 #
 
 PROG=	pl2pm
diff --git a/gnu/usr.bin/perl/utils/splain/Makefile b/gnu/usr.bin/perl/utils/splain/Makefile
index c971ceb41047..91d145d3f0fe 100644
--- a/gnu/usr.bin/perl/utils/splain/Makefile
+++ b/gnu/usr.bin/perl/utils/splain/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/utils/splain/Makefile,v 1.1.2.1 1999/08/29 14:34:35 peter Exp $
 #
 
 PROG=	splain
diff --git a/gnu/usr.bin/perl/x2p/Makefile b/gnu/usr.bin/perl/x2p/Makefile
index 2ded8338af01..dc56b7ce0a0b 100644
--- a/gnu/usr.bin/perl/x2p/Makefile
+++ b/gnu/usr.bin/perl/x2p/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/x2p/Makefile,v 1.17.2.1 1999/08/29 14:34:36 peter Exp $
 #
 
 SUBDIR= a2pl s2pl find2pl
diff --git a/gnu/usr.bin/perl/x2p/Makefile.inc b/gnu/usr.bin/perl/x2p/Makefile.inc
index fe3b7102b080..346d45926ca1 100644
--- a/gnu/usr.bin/perl/x2p/Makefile.inc
+++ b/gnu/usr.bin/perl/x2p/Makefile.inc
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/x2p/Makefile.inc,v 1.2.2.1 1999/08/29 14:34:37 peter Exp $
 #
 
 PERL5SRC=	${.CURDIR}/../../../../../contrib/perl5
diff --git a/gnu/usr.bin/perl/x2p/a2pl/Makefile b/gnu/usr.bin/perl/x2p/a2pl/Makefile
index 005496f47558..72187fd36e51 100644
--- a/gnu/usr.bin/perl/x2p/a2pl/Makefile
+++ b/gnu/usr.bin/perl/x2p/a2pl/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/x2p/a2pl/Makefile,v 1.6.2.1 1999/08/29 14:34:38 peter Exp $
 #
 
 PROG=	a2p
diff --git a/gnu/usr.bin/perl/x2p/find2pl/Makefile b/gnu/usr.bin/perl/x2p/find2pl/Makefile
index 600aecedffdd..7f378daf0a11 100644
--- a/gnu/usr.bin/perl/x2p/find2pl/Makefile
+++ b/gnu/usr.bin/perl/x2p/find2pl/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/x2p/find2pl/Makefile,v 1.2.2.1 1999/08/29 14:34:39 peter Exp $
 #
 
 PROG=	find2perl
diff --git a/gnu/usr.bin/perl/x2p/s2pl/Makefile b/gnu/usr.bin/perl/x2p/s2pl/Makefile
index 9b1ad97f7034..a0202cc5e002 100644
--- a/gnu/usr.bin/perl/x2p/s2pl/Makefile
+++ b/gnu/usr.bin/perl/x2p/s2pl/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/perl/x2p/s2pl/Makefile,v 1.2.2.1 1999/08/29 14:34:40 peter Exp $
 #
 
 PROG=	s2p
diff --git a/gnu/usr.bin/rcs/CREDITS b/gnu/usr.bin/rcs/CREDITS
index 589e8b685091..404074118e21 100644
--- a/gnu/usr.bin/rcs/CREDITS
+++ b/gnu/usr.bin/rcs/CREDITS
@@ -21,4 +21,4 @@ Brendan Kehoe of Cygnus Support suggested rlog's -N option.
 Paul D. Smith of Data General suggested improvements in option
 and error processing.  Adam Hammer of Purdue QAed.
 
-$FreeBSD$
+$FreeBSD: src/gnu/usr.bin/rcs/CREDITS,v 1.4.2.1 1999/08/29 14:34:41 peter Exp $
diff --git a/gnu/usr.bin/rcs/NEWS b/gnu/usr.bin/rcs/NEWS
index 99208064bd32..a9b584ec5b0a 100644
--- a/gnu/usr.bin/rcs/NEWS
+++ b/gnu/usr.bin/rcs/NEWS
@@ -1,6 +1,6 @@
 Recent changes to RCS (and possible future changes)
 
- $FreeBSD$
+ $FreeBSD: src/gnu/usr.bin/rcs/NEWS,v 1.4.2.1 1999/08/29 14:34:42 peter Exp $
 
 	Copyright 1991, 1992, 1993, 1994, 1995 Paul Eggert
 	Distributed under license by the Free Software Foundation, Inc.
diff --git a/gnu/usr.bin/rcs/REFS b/gnu/usr.bin/rcs/REFS
index 89fc823525ee..0f0ae004730e 100644
--- a/gnu/usr.bin/rcs/REFS
+++ b/gnu/usr.bin/rcs/REFS
@@ -2,7 +2,7 @@ Here are references to RCS and related free software and documentation.
 Some of this information changes often; see the Frequently Asked Questions
 for more up-to-date references.
 
- $FreeBSD$
+ $FreeBSD: src/gnu/usr.bin/rcs/REFS,v 1.4.2.1 1999/08/29 14:34:42 peter Exp $
 
 
 Frequently Asked Questions (FAQs)
diff --git a/gnu/usr.bin/rcs/ci/ci.1 b/gnu/usr.bin/rcs/ci/ci.1
index 1378af222cb8..7aadf012961d 100644
--- a/gnu/usr.bin/rcs/ci/ci.1
+++ b/gnu/usr.bin/rcs/ci/ci.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/ci/ci.1,v 1.5.2.1 1999/08/29 14:34:44 peter Exp $
 .ds i \&\s-1ISO\s0
 .ds r \&\s-1RCS\s0
 .ds u \&\s-1UTC\s0
diff --git a/gnu/usr.bin/rcs/ci/ci.c b/gnu/usr.bin/rcs/ci/ci.c
index 749a4cf6dbe9..ef123d8f79b9 100644
--- a/gnu/usr.bin/rcs/ci/ci.c
+++ b/gnu/usr.bin/rcs/ci/ci.c
@@ -274,7 +274,7 @@ static struct hshentry newdelta;	/* new delta to be inserted	*/
 static struct stat workstat;
 static struct Symrev *assoclst, **nextassoc;
 
-mainProg(ciId, "ci", "$FreeBSD$")
+mainProg(ciId, "ci", "$FreeBSD: src/gnu/usr.bin/rcs/ci/ci.c,v 1.6.2.1 1999/08/29 14:34:45 peter Exp $")
 {
 	static char const cmdusage[] =
 		"\nci usage: ci -{fIklMqru}[rev] -d[date] -mmsg -{nN}name -sstate -ttext -T -Vn -wwho -xsuff -zzone file ...";
diff --git a/gnu/usr.bin/rcs/co/co.1 b/gnu/usr.bin/rcs/co/co.1
index 2aea3ad1b40d..344703a12dbc 100644
--- a/gnu/usr.bin/rcs/co/co.1
+++ b/gnu/usr.bin/rcs/co/co.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/co/co.1,v 1.5.2.1 1999/08/29 14:34:46 peter Exp $
 .ds i \&\s-1ISO\s0
 .ds r \&\s-1RCS\s0
 .ds u \&\s-1UTC\s0
diff --git a/gnu/usr.bin/rcs/co/co.c b/gnu/usr.bin/rcs/co/co.c
index 51cb2b277927..2d0fcd2d35cd 100644
--- a/gnu/usr.bin/rcs/co/co.c
+++ b/gnu/usr.bin/rcs/co/co.c
@@ -191,7 +191,7 @@ static struct hshentries *gendeltas;	/* deltas to be generated	*/
 static struct hshentry *targetdelta;	/* final delta to be generated	*/
 static struct stat workstat;
 
-mainProg(coId, "co", "$FreeBSD$")
+mainProg(coId, "co", "$FreeBSD: src/gnu/usr.bin/rcs/co/co.c,v 1.9.2.1 1999/08/29 14:34:47 peter Exp $")
 {
 	static char const cmdusage[] =
 		"\nco usage: co -{fIlMpqru}[rev] -ddate -jjoins -ksubst -sstate -T -w[who] -Vn -xsuff -zzone file ...";
diff --git a/gnu/usr.bin/rcs/doc/rcs.ms b/gnu/usr.bin/rcs/doc/rcs.ms
index f6b0db300330..3078b2b8b633 100644
--- a/gnu/usr.bin/rcs/doc/rcs.ms
+++ b/gnu/usr.bin/rcs/doc/rcs.ms
@@ -18,7 +18,7 @@
 .de Id
 .ND \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/doc/rcs.ms,v 1.4.2.1 1999/08/29 14:34:48 peter Exp $
 .RP
 .TL
 RCS\*-A System for Version Control
diff --git a/gnu/usr.bin/rcs/ident/ident.1 b/gnu/usr.bin/rcs/ident/ident.1
index 253a2ce72724..2d792f39af21 100644
--- a/gnu/usr.bin/rcs/ident/ident.1
+++ b/gnu/usr.bin/rcs/ident/ident.1
@@ -3,7 +3,7 @@
 .ds Dt \\$4
 .ds iD \\$3 \\$4 \\$5 \\$6 \\$7
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/ident/ident.1,v 1.4.2.1 1999/08/29 14:34:49 peter Exp $
 .ds r \&\s-1RCS\s0
 .ds u \&\s-1UTC\s0
 .if n .ds - \%--
diff --git a/gnu/usr.bin/rcs/ident/ident.c b/gnu/usr.bin/rcs/ident/ident.c
index 1239bd8b22b3..24ab5e24e07c 100644
--- a/gnu/usr.bin/rcs/ident/ident.c
+++ b/gnu/usr.bin/rcs/ident/ident.c
@@ -102,7 +102,7 @@ static int match P((FILE*));
 static int scanfile P((FILE*,char const*,int));
 static void reportError P((char const*));
 
-mainProg(identId, "ident", "$FreeBSD$")
+mainProg(identId, "ident", "$FreeBSD: src/gnu/usr.bin/rcs/ident/ident.c,v 1.6.2.1 1999/08/29 14:34:50 peter Exp $")
 /*  Ident searches the named files for all occurrences
  *  of the pattern $@: text $ where @ is a keyword.
  */
diff --git a/gnu/usr.bin/rcs/lib/conf.h b/gnu/usr.bin/rcs/lib/conf.h
index b60e3ce3aa51..1121099a2dd2 100644
--- a/gnu/usr.bin/rcs/lib/conf.h
+++ b/gnu/usr.bin/rcs/lib/conf.h
@@ -1,6 +1,6 @@
 /* RCS compile-time configuration */
 
-	/* $FreeBSD$ */
+	/* $FreeBSD: src/gnu/usr.bin/rcs/lib/conf.h,v 1.7.2.1 1999/08/29 14:34:52 peter Exp $ */
 
 /*
  * This file is generated automatically.
diff --git a/gnu/usr.bin/rcs/lib/maketime.c b/gnu/usr.bin/rcs/lib/maketime.c
index 0f83bf5690d6..15133ae74636 100644
--- a/gnu/usr.bin/rcs/lib/maketime.c
+++ b/gnu/usr.bin/rcs/lib/maketime.c
@@ -43,7 +43,7 @@ Report problems and direct all questions to:
 #include "maketime.h"
 
 char const maketId[]
-  = "$FreeBSD$";
+  = "$FreeBSD: src/gnu/usr.bin/rcs/lib/maketime.c,v 1.6.2.1 1999/08/29 14:34:52 peter Exp $";
 
 static int isleap P((int));
 static int month_days P((struct tm const*));
diff --git a/gnu/usr.bin/rcs/lib/merger.c b/gnu/usr.bin/rcs/lib/merger.c
index 8f1d610d5f56..c65561a252ce 100644
--- a/gnu/usr.bin/rcs/lib/merger.c
+++ b/gnu/usr.bin/rcs/lib/merger.c
@@ -28,7 +28,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(mergerId, "$FreeBSD$")
+libId(mergerId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/merger.c,v 1.4.2.1 1999/08/29 14:34:53 peter Exp $")
 
 	static char const *normalize_arg P((char const*,char**));
 	static char const *
diff --git a/gnu/usr.bin/rcs/lib/partime.c b/gnu/usr.bin/rcs/lib/partime.c
index 05b010854950..7b08c0d8edaf 100644
--- a/gnu/usr.bin/rcs/lib/partime.c
+++ b/gnu/usr.bin/rcs/lib/partime.c
@@ -46,7 +46,7 @@ Report problems and direct all questions to:
 #include "partime.h"
 
 char const partimeId[]
-  = "$FreeBSD$";
+  = "$FreeBSD: src/gnu/usr.bin/rcs/lib/partime.c,v 1.5.2.1 1999/08/29 14:34:53 peter Exp $";
 
 
 /* Lookup tables for names of months, weekdays, time zones.  */
diff --git a/gnu/usr.bin/rcs/lib/rcsbase.h b/gnu/usr.bin/rcs/lib/rcsbase.h
index 9f2f68cc8b6b..c42b91d073c7 100644
--- a/gnu/usr.bin/rcs/lib/rcsbase.h
+++ b/gnu/usr.bin/rcs/lib/rcsbase.h
@@ -1,6 +1,6 @@
 /* RCS common definitions and data structures */
 
-#define RCSBASE "$FreeBSD$"
+#define RCSBASE "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcsbase.h,v 1.9.2.1 1999/08/29 14:34:54 peter Exp $"
 
 /* Copyright 1982, 1988, 1989 Walter Tichy
    Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert
diff --git a/gnu/usr.bin/rcs/lib/rcsedit.c b/gnu/usr.bin/rcs/lib/rcsedit.c
index 855790a12926..da81b9c8e47d 100644
--- a/gnu/usr.bin/rcs/lib/rcsedit.c
+++ b/gnu/usr.bin/rcs/lib/rcsedit.c
@@ -201,7 +201,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(editId, "$FreeBSD$")
+libId(editId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcsedit.c,v 1.9.2.1 1999/08/29 14:34:55 peter Exp $")
 
 static void editEndsPrematurely P((void)) exiting;
 static void editLineNumberOverflow P((void)) exiting;
diff --git a/gnu/usr.bin/rcs/lib/rcsfcmp.c b/gnu/usr.bin/rcs/lib/rcsfcmp.c
index ef0529001b87..08f2b735ba78 100644
--- a/gnu/usr.bin/rcs/lib/rcsfcmp.c
+++ b/gnu/usr.bin/rcs/lib/rcsfcmp.c
@@ -118,7 +118,7 @@ Report problems and direct all questions to:
 
 #include  "rcsbase.h"
 
-libId(fcmpId, "$FreeBSD$")
+libId(fcmpId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcsfcmp.c,v 1.6.2.1 1999/08/29 14:34:55 peter Exp $")
 
 	static int discardkeyval P((int,RILE*));
 	static int
diff --git a/gnu/usr.bin/rcs/lib/rcsfnms.c b/gnu/usr.bin/rcs/lib/rcsfnms.c
index 7d833bb1f80b..5d0d05854a7f 100644
--- a/gnu/usr.bin/rcs/lib/rcsfnms.c
+++ b/gnu/usr.bin/rcs/lib/rcsfnms.c
@@ -177,7 +177,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(fnmsId, "$FreeBSD$")
+libId(fnmsId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcsfnms.c,v 1.9.2.1 1999/08/29 14:34:56 peter Exp $")
 
 static char const *bindex P((char const*,int));
 static int fin2open P((char const*, size_t, char const*, size_t, char const*, size_t, RILE*(*)P((struct buf*,struct stat*,int)), int));
diff --git a/gnu/usr.bin/rcs/lib/rcsgen.c b/gnu/usr.bin/rcs/lib/rcsgen.c
index 35d8702a34f8..a91a4175e874 100644
--- a/gnu/usr.bin/rcs/lib/rcsgen.c
+++ b/gnu/usr.bin/rcs/lib/rcsgen.c
@@ -140,7 +140,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(genId, "$FreeBSD$")
+libId(genId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcsgen.c,v 1.6.2.1 1999/08/29 14:34:57 peter Exp $")
 
 int interactiveflag;  /* Should we act as if stdin is a tty?  */
 struct buf curlogbuf;  /* buffer for current log message */
diff --git a/gnu/usr.bin/rcs/lib/rcskeep.c b/gnu/usr.bin/rcs/lib/rcskeep.c
index 4a90f851e615..ab58508862d2 100644
--- a/gnu/usr.bin/rcs/lib/rcskeep.c
+++ b/gnu/usr.bin/rcs/lib/rcskeep.c
@@ -98,7 +98,7 @@ Report problems and direct all questions to:
 
 #include  "rcsbase.h"
 
-libId(keepId, "$FreeBSD$")
+libId(keepId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcskeep.c,v 1.7.2.1 1999/08/29 14:34:57 peter Exp $")
 
 static int badly_terminated P((void));
 static int checknum P((char const*));
diff --git a/gnu/usr.bin/rcs/lib/rcskeys.c b/gnu/usr.bin/rcs/lib/rcskeys.c
index db6f9c90a934..add2206223a5 100644
--- a/gnu/usr.bin/rcs/lib/rcskeys.c
+++ b/gnu/usr.bin/rcs/lib/rcskeys.c
@@ -63,7 +63,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(keysId, "$FreeBSD$")
+libId(keysId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcskeys.c,v 1.11.2.1 1999/08/29 14:34:58 peter Exp $")
 
 
 char const *Keyword[] = {
diff --git a/gnu/usr.bin/rcs/lib/rcslex.c b/gnu/usr.bin/rcs/lib/rcslex.c
index 7a11f79b46c8..5ff8a20570b1 100644
--- a/gnu/usr.bin/rcs/lib/rcslex.c
+++ b/gnu/usr.bin/rcs/lib/rcslex.c
@@ -168,7 +168,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(lexId, "$FreeBSD$")
+libId(lexId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcslex.c,v 1.7.2.1 1999/08/29 14:34:58 peter Exp $")
 
 static char *checkidentifier P((char*,int,int));
 static void errsay P((char const*));
diff --git a/gnu/usr.bin/rcs/lib/rcsmap.c b/gnu/usr.bin/rcs/lib/rcsmap.c
index 89fb08daf364..57ac08949386 100644
--- a/gnu/usr.bin/rcs/lib/rcsmap.c
+++ b/gnu/usr.bin/rcs/lib/rcsmap.c
@@ -29,7 +29,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(mapId, "$FreeBSD$")
+libId(mapId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcsmap.c,v 1.4.2.1 1999/08/29 14:34:59 peter Exp $")
 
 /* map of character types */
 /* ISO 8859/1 (Latin-1) */
diff --git a/gnu/usr.bin/rcs/lib/rcsrev.c b/gnu/usr.bin/rcs/lib/rcsrev.c
index 12c6c43006ac..324122483b5f 100644
--- a/gnu/usr.bin/rcs/lib/rcsrev.c
+++ b/gnu/usr.bin/rcs/lib/rcsrev.c
@@ -105,7 +105,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(revId, "$FreeBSD$")
+libId(revId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcsrev.c,v 1.7.2.1 1999/08/29 14:34:59 peter Exp $")
 
 static char const *branchtip P((char const*));
 static char const *lookupsym P((char const*));
diff --git a/gnu/usr.bin/rcs/lib/rcssyn.c b/gnu/usr.bin/rcs/lib/rcssyn.c
index 07f155bfb8ea..28902ad7d600 100644
--- a/gnu/usr.bin/rcs/lib/rcssyn.c
+++ b/gnu/usr.bin/rcs/lib/rcssyn.c
@@ -153,7 +153,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(synId, "$FreeBSD$")
+libId(synId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcssyn.c,v 1.6.2.1 1999/08/29 14:35:00 peter Exp $")
 
 static char const *getkeyval P((char const*,enum tokens,int));
 static int getdelta P((void));
diff --git a/gnu/usr.bin/rcs/lib/rcstime.c b/gnu/usr.bin/rcs/lib/rcstime.c
index cfd466096ff7..feda29926b95 100644
--- a/gnu/usr.bin/rcs/lib/rcstime.c
+++ b/gnu/usr.bin/rcs/lib/rcstime.c
@@ -30,7 +30,7 @@ Report problems and direct all questions to:
 #include "partime.h"
 #include "maketime.h"
 
-libId(rcstimeId, "$FreeBSD$")
+libId(rcstimeId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcstime.c,v 1.4.2.1 1999/08/29 14:35:00 peter Exp $")
 
 static long zone_offset; /* seconds east of UTC, or TM_LOCAL_ZONE */
 static int use_zone_offset; /* if zero, use UTC without zone indication */
diff --git a/gnu/usr.bin/rcs/lib/rcsutil.c b/gnu/usr.bin/rcs/lib/rcsutil.c
index e10afff6c20d..f1c3c4eb757d 100644
--- a/gnu/usr.bin/rcs/lib/rcsutil.c
+++ b/gnu/usr.bin/rcs/lib/rcsutil.c
@@ -186,7 +186,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(utilId, "$FreeBSD$")
+libId(utilId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcsutil.c,v 1.7.2.1 1999/08/29 14:35:01 peter Exp $")
 
 #if !has_memcmp
 	int
diff --git a/gnu/usr.bin/rcs/merge/merge.1 b/gnu/usr.bin/rcs/merge/merge.1
index a4fd35b7986a..73a9eac5a52d 100644
--- a/gnu/usr.bin/rcs/merge/merge.1
+++ b/gnu/usr.bin/rcs/merge/merge.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/merge/merge.1,v 1.5.2.1 1999/08/29 14:35:03 peter Exp $
 .ds r \&\s-1RCS\s0
 .TH MERGE 1 \*(Dt GNU
 .SH NAME
diff --git a/gnu/usr.bin/rcs/merge/merge.c b/gnu/usr.bin/rcs/merge/merge.c
index aa127bf1c8ec..b08443bf7795 100644
--- a/gnu/usr.bin/rcs/merge/merge.c
+++ b/gnu/usr.bin/rcs/merge/merge.c
@@ -41,7 +41,7 @@ badoption(a)
 }
 
 
-mainProg(mergeId, "merge", "$FreeBSD$")
+mainProg(mergeId, "merge", "$FreeBSD: src/gnu/usr.bin/rcs/merge/merge.c,v 1.4.2.1 1999/08/29 14:35:03 peter Exp $")
 {
 	register char const *a;
 	char const *arg[3], *label[3], *edarg = 0;
diff --git a/gnu/usr.bin/rcs/rcs/rcs.1 b/gnu/usr.bin/rcs/rcs/rcs.1
index 37fb59fea068..2c8285679166 100644
--- a/gnu/usr.bin/rcs/rcs/rcs.1
+++ b/gnu/usr.bin/rcs/rcs/rcs.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/rcs/rcs.1,v 1.4.2.1 1999/08/29 14:35:04 peter Exp $
 .ds r \&\s-1RCS\s0
 .if n .ds - \%--
 .if t .ds - \(em
diff --git a/gnu/usr.bin/rcs/rcs/rcs.c b/gnu/usr.bin/rcs/rcs/rcs.c
index dfb622a6f808..e995c12ce4dc 100644
--- a/gnu/usr.bin/rcs/rcs/rcs.c
+++ b/gnu/usr.bin/rcs/rcs/rcs.c
@@ -275,7 +275,7 @@ static struct delrevpair delrev;
 static struct hshentry *cuthead, *cuttail, *delstrt;
 static struct hshentries *gendeltas;
 
-mainProg(rcsId, "rcs", "$FreeBSD$")
+mainProg(rcsId, "rcs", "$FreeBSD: src/gnu/usr.bin/rcs/rcs/rcs.c,v 1.6.2.1 1999/08/29 14:35:04 peter Exp $")
 {
 	static char const cmdusage[] =
 		"\nrcs usage: rcs -{ae}logins -Afile -{blu}[rev] -cstring -{iILqTU} -ksubst -mrev:msg -{nN}name[:[rev]] -orange -sstate[:rev] -t[text] -Vn -xsuff -zzone file ...";
diff --git a/gnu/usr.bin/rcs/rcs/rcsfile.5 b/gnu/usr.bin/rcs/rcs/rcsfile.5
index f3a6dac6fb5f..80dd20086217 100644
--- a/gnu/usr.bin/rcs/rcs/rcsfile.5
+++ b/gnu/usr.bin/rcs/rcs/rcsfile.5
@@ -5,7 +5,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/rcs/rcsfile.5,v 1.4.2.1 1999/08/29 14:35:05 peter Exp $
 .ds r \s-1RCS\s0
 .if n .ds - \%--
 .if t .ds - \(em
diff --git a/gnu/usr.bin/rcs/rcs/rcsintro.1 b/gnu/usr.bin/rcs/rcs/rcsintro.1
index edcd9ee9389d..6cb5875fa53f 100644
--- a/gnu/usr.bin/rcs/rcs/rcsintro.1
+++ b/gnu/usr.bin/rcs/rcs/rcsintro.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/rcs/rcsintro.1,v 1.4.2.1 1999/08/29 14:35:06 peter Exp $
 .ds r \&\s-1RCS\s0
 .if n .ds - \%--
 .if t .ds - \(em
diff --git a/gnu/usr.bin/rcs/rcsclean/rcsclean.1 b/gnu/usr.bin/rcs/rcsclean/rcsclean.1
index 3111915455a6..1ce922b1eeb9 100644
--- a/gnu/usr.bin/rcs/rcsclean/rcsclean.1
+++ b/gnu/usr.bin/rcs/rcsclean/rcsclean.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/rcsclean/rcsclean.1,v 1.4.2.1 1999/08/29 14:35:07 peter Exp $
 .ds r \&\s-1RCS\s0
 .if n .ds - \%--
 .if t .ds - \(em
diff --git a/gnu/usr.bin/rcs/rcsclean/rcsclean.c b/gnu/usr.bin/rcs/rcsclean/rcsclean.c
index 32c8e7dfbc63..9959ee4fc773 100644
--- a/gnu/usr.bin/rcs/rcsclean/rcsclean.c
+++ b/gnu/usr.bin/rcs/rcsclean/rcsclean.c
@@ -38,7 +38,7 @@ static void cleanup P((void));
 static RILE *workptr;
 static int exitstatus;
 
-mainProg(rcscleanId, "rcsclean", "$FreeBSD$")
+mainProg(rcscleanId, "rcsclean", "$FreeBSD: src/gnu/usr.bin/rcs/rcsclean/rcsclean.c,v 1.4.2.1 1999/08/29 14:35:08 peter Exp $")
 {
 	static char const usage[] =
 		"\nrcsclean: usage: rcsclean -ksubst -{nqru}[rev] -T -Vn -xsuff -zzone file ...";
diff --git a/gnu/usr.bin/rcs/rcsdiff/rcsdiff.1 b/gnu/usr.bin/rcs/rcsdiff/rcsdiff.1
index 74117c270e6c..9470beabbf8b 100644
--- a/gnu/usr.bin/rcs/rcsdiff/rcsdiff.1
+++ b/gnu/usr.bin/rcs/rcsdiff/rcsdiff.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/rcsdiff/rcsdiff.1,v 1.4.2.1 1999/08/29 14:35:09 peter Exp $
 .ds r \&\s-1RCS\s0
 .if n .ds - \%--
 .if t .ds - \(em
diff --git a/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c b/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c
index 7d3c0a37f66a..f1786204980c 100644
--- a/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c
+++ b/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c
@@ -151,7 +151,7 @@ static int exitstatus;
 static RILE *workptr;
 static struct stat workstat;
 
-mainProg(rcsdiffId, "rcsdiff", "$FreeBSD$")
+mainProg(rcsdiffId, "rcsdiff", "$FreeBSD: src/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c,v 1.7.2.1 1999/08/29 14:35:10 peter Exp $")
 {
     static char const cmdusage[] =
 	    "\nrcsdiff usage: rcsdiff -ksubst -q -rrev1 [-rrev2] -Vn -xsuff -zzone [diff options] file ...";
diff --git a/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1 b/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1
index 3f513c4d65ad..07847204290e 100644
--- a/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1
+++ b/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1,v 1.4.2.1 1999/08/29 14:35:12 peter Exp $
 .ds r \s-1RCS\s0
 .TH RCSFREEZE 1 \*(Dt GNU
 .SH NAME
diff --git a/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh b/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh
index 9cb34bbdb83a..e33fcf5088c4 100644
--- a/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh
+++ b/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh
@@ -2,7 +2,7 @@
 
 # rcsfreeze - assign a symbolic revision number to a configuration of RCS files
 
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh,v 1.7.2.1 1999/08/29 14:35:12 peter Exp $
 
 #       The idea is to run rcsfreeze each time a new version is checked
 #       in. A unique symbolic revision number (C_[number], where number
diff --git a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1 b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1
index aff6f666dabb..3b23f65115b8 100644
--- a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1
+++ b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1,v 1.4.2.1 1999/08/29 14:35:14 peter Exp $
 .ds r \&\s-1RCS\s0
 .if n .ds - \%--
 .if t .ds - \(em
diff --git a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
index e09dc2469867..9fc0b7dee92c 100644
--- a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
+++ b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
@@ -117,7 +117,7 @@ Report problems and direct all questions to:
 
 static char const co[] = CO;
 
-mainProg(rcsmergeId, "rcsmerge", "$FreeBSD$")
+mainProg(rcsmergeId, "rcsmerge", "$FreeBSD: src/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c,v 1.6.2.1 1999/08/29 14:35:14 peter Exp $")
 {
 	static char const cmdusage[] =
 		"\nrcsmerge usage: rcsmerge -rrev1 [-rrev2] -ksubst -{pq}[rev] -Vn -xsuff -zzone file";
diff --git a/gnu/usr.bin/rcs/rcstest b/gnu/usr.bin/rcs/rcstest
index 75165f1bbd59..fd8bf29c36e6 100755
--- a/gnu/usr.bin/rcs/rcstest
+++ b/gnu/usr.bin/rcs/rcstest
@@ -15,7 +15,7 @@
 
 # The current directory and ./RCS must be readable, writable, and searchable.
 
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/rcs/rcstest,v 1.4.2.1 1999/08/29 14:34:43 peter Exp $
 
 
 #    Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert
diff --git a/gnu/usr.bin/rcs/rlog/rlog.1 b/gnu/usr.bin/rcs/rlog/rlog.1
index 26bf08a2bcb0..96f7700597b4 100644
--- a/gnu/usr.bin/rcs/rlog/rlog.1
+++ b/gnu/usr.bin/rcs/rlog/rlog.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/rlog/rlog.1,v 1.7.2.1 1999/08/29 14:35:15 peter Exp $
 .ds i \&\s-1ISO\s0
 .ds r \&\s-1RCS\s0
 .ds u \&\s-1UTC\s0
diff --git a/gnu/usr.bin/rcs/rlog/rlog.c b/gnu/usr.bin/rcs/rlog/rlog.c
index f8872febb971..03e1c674f534 100644
--- a/gnu/usr.bin/rcs/rlog/rlog.c
+++ b/gnu/usr.bin/rcs/rlog/rlog.c
@@ -218,7 +218,7 @@ static struct rcslockers *lockerlist;
 static struct stateattri *statelist;
 
 
-mainProg(rlogId, "rlog", "$FreeBSD$")
+mainProg(rlogId, "rlog", "$FreeBSD: src/gnu/usr.bin/rcs/rlog/rlog.c,v 1.12.2.1 1999/08/29 14:35:16 peter Exp $")
 {
 	static char const cmdusage[] =
 		"\nrlog usage: rlog -{bhLNRt} -v[string] -ddates -l[lockers] -r[revs] -sstates -Vn -w[logins] -xsuff -zzone file ...";
diff --git a/gnu/usr.bin/sdiff/Makefile b/gnu/usr.bin/sdiff/Makefile
index 2312bb21b3b3..b7ef30eb56fb 100644
--- a/gnu/usr.bin/sdiff/Makefile
+++ b/gnu/usr.bin/sdiff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/sdiff/Makefile,v 1.4.2.1 1999/08/29 14:35:17 peter Exp $
 
 .PATH:  ${.CURDIR}/../../../contrib/diff
 
diff --git a/gnu/usr.bin/send-pr/send-pr.sh b/gnu/usr.bin/send-pr/send-pr.sh
index a76e3f544bb4..151000c0ee3a 100644
--- a/gnu/usr.bin/send-pr/send-pr.sh
+++ b/gnu/usr.bin/send-pr/send-pr.sh
@@ -20,7 +20,7 @@
 # along with GNU GNATS; see the file COPYING.  If not, write to
 # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.sh,v 1.9.2.3 1999/08/29 14:35:18 peter Exp $
 
 # The version of this send-pr.
 VERSION=3.2
diff --git a/gnu/usr.bin/tar/getdate.y b/gnu/usr.bin/tar/getdate.y
index c9d5421b6d62..5259e0f2139a 100644
--- a/gnu/usr.bin/tar/getdate.y
+++ b/gnu/usr.bin/tar/getdate.y
@@ -98,7 +98,7 @@ extern struct tm	*localtime();
 
 #if	!defined(lint) && !defined(SABER)
 static char RCS[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/gnu/usr.bin/tar/getdate.y,v 1.5.2.1 1999/08/29 14:35:20 peter Exp $";
 #endif	/* !defined(lint) && !defined(SABER) */
 
 
diff --git a/gnu/usr.bin/tar/tar.1 b/gnu/usr.bin/tar/tar.1
index 87904cf413a0..2883f0cd9984 100644
--- a/gnu/usr.bin/tar/tar.1
+++ b/gnu/usr.bin/tar/tar.1
@@ -4,7 +4,7 @@
 .\"	Written by John F. Woods <jfw@jfwhome.funhouse.com>
 .\"	Updated by Robert Eckardt <roberte@mep.ruhr-uni-bochum.de>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/tar/tar.1,v 1.18.2.3 1999/08/29 14:35:20 peter Exp $
 .\"
 .Dd 25 August 1997
 .Os FreeBSD
diff --git a/gnu/usr.bin/texinfo/Makefile b/gnu/usr.bin/texinfo/Makefile
index dac6f56c655b..ec7b44a99c07 100644
--- a/gnu/usr.bin/texinfo/Makefile
+++ b/gnu/usr.bin/texinfo/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/texinfo/Makefile,v 1.7.2.2 1999/10/26 08:40:00 tg Exp $
 #
 
 SUBDIR= libtxi libintl makeinfo info install-info texindex doc
diff --git a/gnu/usr.bin/texinfo/Makefile.inc b/gnu/usr.bin/texinfo/Makefile.inc
index d071bf0b4714..0a74512b5525 100644
--- a/gnu/usr.bin/texinfo/Makefile.inc
+++ b/gnu/usr.bin/texinfo/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/texinfo/Makefile.inc,v 1.9.2.1 1999/08/29 14:35:22 peter Exp $
 
 TXIDIR=		${.CURDIR}/../../../../contrib/texinfo
 
diff --git a/gnu/usr.bin/texinfo/doc/Makefile b/gnu/usr.bin/texinfo/doc/Makefile
index 2dfb17ff701a..f7982844bed4 100644
--- a/gnu/usr.bin/texinfo/doc/Makefile
+++ b/gnu/usr.bin/texinfo/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/texinfo/doc/Makefile,v 1.10.2.1 1999/08/29 14:35:24 peter Exp $
 
 INFO=	info info-stnd texinfo
 
diff --git a/gnu/usr.bin/texinfo/info/Makefile b/gnu/usr.bin/texinfo/info/Makefile
index f8c0de7c3f6b..0e8ca289d431 100644
--- a/gnu/usr.bin/texinfo/info/Makefile
+++ b/gnu/usr.bin/texinfo/info/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/texinfo/info/Makefile,v 1.7.2.1 1999/08/29 14:35:25 peter Exp $
 
 PROG=	info
 NOMAN=  yes
diff --git a/gnu/usr.bin/texinfo/install-info/Makefile b/gnu/usr.bin/texinfo/install-info/Makefile
index d1f62c600070..b6d25d3df596 100644
--- a/gnu/usr.bin/texinfo/install-info/Makefile
+++ b/gnu/usr.bin/texinfo/install-info/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/texinfo/install-info/Makefile,v 1.8.2.1 1999/08/29 14:35:25 peter Exp $
 
 PROG=	install-info
 
diff --git a/gnu/usr.bin/texinfo/install-info/install-info.1 b/gnu/usr.bin/texinfo/install-info/install-info.1
index 2199b66f04ac..118fa8a8705d 100644
--- a/gnu/usr.bin/texinfo/install-info/install-info.1
+++ b/gnu/usr.bin/texinfo/install-info/install-info.1
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/texinfo/install-info/install-info.1,v 1.2.2.2 1999/09/23 13:43:31 phantom Exp $
 .\"
 .\" .TH install-info 1
 .Dd August 29, 1997
diff --git a/gnu/usr.bin/texinfo/libintl/Makefile b/gnu/usr.bin/texinfo/libintl/Makefile
index a0347389c898..e35cdb5428bb 100644
--- a/gnu/usr.bin/texinfo/libintl/Makefile
+++ b/gnu/usr.bin/texinfo/libintl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/texinfo/libintl/Makefile,v 1.1.2.1 1999/08/29 14:35:27 peter Exp $
 
 LIB=	intl
 INTERNALLIB= true
diff --git a/gnu/usr.bin/texinfo/libtxi/Makefile b/gnu/usr.bin/texinfo/libtxi/Makefile
index 217b5849186d..53b1f8be8fee 100644
--- a/gnu/usr.bin/texinfo/libtxi/Makefile
+++ b/gnu/usr.bin/texinfo/libtxi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/texinfo/libtxi/Makefile,v 1.5.2.1 1999/08/29 14:35:29 peter Exp $
 
 LIB=	txi
 INTERNALLIB= true
diff --git a/gnu/usr.bin/texinfo/makeinfo/Makefile b/gnu/usr.bin/texinfo/makeinfo/Makefile
index d8f420fc94c8..026273fc02a7 100644
--- a/gnu/usr.bin/texinfo/makeinfo/Makefile
+++ b/gnu/usr.bin/texinfo/makeinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/texinfo/makeinfo/Makefile,v 1.9.2.1 1999/08/29 14:35:30 peter Exp $
 
 PROG=	makeinfo
 NOMAN=	yes
diff --git a/gnu/usr.bin/texinfo/texindex/Makefile b/gnu/usr.bin/texinfo/texindex/Makefile
index 4f583e6749d1..5ad562236704 100644
--- a/gnu/usr.bin/texinfo/texindex/Makefile
+++ b/gnu/usr.bin/texinfo/texindex/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/texinfo/texindex/Makefile,v 1.5.2.1 1999/10/26 08:40:01 tg Exp $
 
 PROG=	texindex
 NOMAN=	noman
diff --git a/gnu/usr.sbin/Makefile b/gnu/usr.sbin/Makefile
index cd90af77fde7..bfd5b2835127 100644
--- a/gnu/usr.sbin/Makefile
+++ b/gnu/usr.sbin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.sbin/Makefile,v 1.6.2.1 1999/08/29 14:35:31 peter Exp $
 
 
 SUBDIR=
diff --git a/gnu/usr.sbin/Makefile.inc b/gnu/usr.sbin/Makefile.inc
index 8c6b79e955f7..18f040871f72 100644
--- a/gnu/usr.sbin/Makefile.inc
+++ b/gnu/usr.sbin/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.sbin/Makefile.inc,v 1.3.2.1 1999/08/29 14:35:31 peter Exp $
 
 BINDIR?=	/usr/sbin
diff --git a/include/Makefile b/include/Makefile
index 6cab69326d9e..c1e403640821 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
-# $FreeBSD$
+# $FreeBSD: src/include/Makefile,v 1.92.2.3 1999/11/22 07:08:04 julian Exp $
 #
 # Doing a make install builds /usr/include
 #
diff --git a/include/arpa/inet.h b/include/arpa/inet.h
index e28b73985b94..fe8ff8e1e616 100644
--- a/include/arpa/inet.h
+++ b/include/arpa/inet.h
@@ -52,7 +52,7 @@
 /*
  *	@(#)inet.h	8.1 (Berkeley) 6/2/93
  *	From: Id: inet.h,v 8.5 1997/01/29 08:48:09 vixie Exp $
- * $FreeBSD$
+ * $FreeBSD: src/include/arpa/inet.h,v 1.10.2.1 1999/08/29 14:39:00 peter Exp $
  */
 
 #ifndef _ARPA_INET_H_
diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h
index 621d9cf6b582..97d29215563e 100644
--- a/include/arpa/nameser.h
+++ b/include/arpa/nameser.h
@@ -50,7 +50,7 @@
 
 /*
  *	From: Id: nameser.h,v 8.16 1998/02/06 00:35:58 halley Exp
- * $FreeBSD$
+ * $FreeBSD: src/include/arpa/nameser.h,v 1.12.2.1 1999/08/29 14:39:00 peter Exp $
  */
 
 #ifndef _ARPA_NAMESER_H_
diff --git a/include/arpa/nameser_compat.h b/include/arpa/nameser_compat.h
index 850fb8a0890d..33c96acfd799 100644
--- a/include/arpa/nameser_compat.h
+++ b/include/arpa/nameser_compat.h
@@ -33,7 +33,7 @@
 /*
  *      from nameser.h	8.1 (Berkeley) 6/2/93
  *	From: Id: nameser_compat.h,v 8.9 1998/03/20 23:25:10 halley Exp
- * $FreeBSD$
+ * $FreeBSD: src/include/arpa/nameser_compat.h,v 1.1.2.1 1999/08/29 14:39:01 peter Exp $
  */
 
 #ifndef _ARPA_NAMESER_COMPAT_
diff --git a/include/dlfcn.h b/include/dlfcn.h
index 9990e6efbdf2..a21fb34a846d 100644
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/dlfcn.h,v 1.2.2.2 1999/12/17 01:39:41 jkh Exp $
  */
 
 #ifndef _DLFCN_H_
diff --git a/include/elf.h b/include/elf.h
index 963308378330..189299305685 100644
--- a/include/elf.h
+++ b/include/elf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/elf.h,v 1.2.2.1 1999/08/29 14:38:49 peter Exp $
  */
 
 #ifndef	_ELF_H_
diff --git a/include/err.h b/include/err.h
index ed8f6174fdd9..9c0b9c17b3c1 100644
--- a/include/err.h
+++ b/include/err.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)err.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/err.h,v 1.7.2.1 1999/08/29 14:38:50 peter Exp $
  */
 
 #ifndef _ERR_H_
diff --git a/include/fnmatch.h b/include/fnmatch.h
index 49102b34b80d..c19f8e68e5e4 100644
--- a/include/fnmatch.h
+++ b/include/fnmatch.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/fnmatch.h,v 1.8.2.1 1999/11/22 21:46:12 ache Exp $
  *	@(#)fnmatch.h	8.1 (Berkeley) 6/2/93
  */
 
diff --git a/include/histedit.h b/include/histedit.h
index a5648faec091..b168fb0f4cc0 100644
--- a/include/histedit.h
+++ b/include/histedit.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/include/histedit.h,v 1.3.2.1 1999/08/29 14:38:51 peter Exp $ */
 /*	$NetBSD: histedit.h,v 1.5 1997/04/11 17:52:45 christos Exp $	*/
 
 /*-
diff --git a/include/iso646.h b/include/iso646.h
index e397fe61a0c0..7de0ac0df557 100644
--- a/include/iso646.h
+++ b/include/iso646.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/iso646.h,v 1.2.2.1 1999/08/29 14:38:51 peter Exp $
  */
 
 #ifndef _ISO646_H_
diff --git a/include/kvm.h b/include/kvm.h
index ef379db2d0d6..f90465c6841e 100644
--- a/include/kvm.h
+++ b/include/kvm.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kvm.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/kvm.h,v 1.6.2.1 1999/08/29 14:38:51 peter Exp $
  */
 
 #ifndef _KVM_H_
diff --git a/include/limits.h b/include/limits.h
index 743643217805..9ef7a1e2d7c5 100644
--- a/include/limits.h
+++ b/include/limits.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/include/limits.h,v 1.9.2.1 1999/08/29 14:38:52 peter Exp $
  */
 
 #ifndef _LIMITS_H_
diff --git a/include/link.h b/include/link.h
index 3acb86a3b3d6..f2bafefc2b14 100644
--- a/include/link.h
+++ b/include/link.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/link.h,v 1.19.2.1 1999/08/29 14:38:53 peter Exp $
  */
 
 /*
diff --git a/include/netdb.h b/include/netdb.h
index 987523ebd6fe..95b5c31b8623 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -55,7 +55,7 @@
 /*
  *      @(#)netdb.h	8.1 (Berkeley) 6/2/93
  *      From: Id: netdb.h,v 8.9 1996/11/19 08:39:29 vixie Exp $
- * $FreeBSD$
+ * $FreeBSD: src/include/netdb.h,v 1.11.2.1 1999/08/29 14:38:53 peter Exp $
  */
 
 #ifndef _NETDB_H_
diff --git a/include/nl_types.h b/include/nl_types.h
index 7691b14e6933..3b12e4422a10 100644
--- a/include/nl_types.h
+++ b/include/nl_types.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/include/nl_types.h,v 1.5.2.2 1999/08/29 14:38:53 peter Exp $ */
 
 /***********************************************************
 Copyright 1990, by Alfalfa Software Incorporated, Cambridge, Massachusetts.
diff --git a/include/nlist.h b/include/nlist.h
index 560563abf1a1..f054bb49fd4b 100644
--- a/include/nlist.h
+++ b/include/nlist.h
@@ -37,7 +37,7 @@
  *
  *	@(#)nlist.h	8.2 (Berkeley) 1/21/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/nlist.h,v 1.6.2.1 1999/08/29 14:38:54 peter Exp $
  */
 
 #ifndef _NLIST_H_
diff --git a/include/objformat.h b/include/objformat.h
index ec3443a5b1b9..0773bf63b824 100644
--- a/include/objformat.h
+++ b/include/objformat.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/objformat.h,v 1.1.2.1 1999/08/29 14:38:55 peter Exp $
  */
 
 #ifndef _OBJFORMAT_H_
diff --git a/include/resolv.h b/include/resolv.h
index e44e43abc069..25489dd3fc94 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -51,7 +51,7 @@
 /*
  *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
  *	From Id: resolv.h,v 8.12 1998/04/28 19:36:46 halley Exp $
- * $FreeBSD$
+ * $FreeBSD: src/include/resolv.h,v 1.17.2.1 1999/08/29 14:38:55 peter Exp $
  */
 
 #ifndef _RESOLV_H_
diff --git a/include/rpc/auth.h b/include/rpc/auth.h
index 4d6c38dbac17..611d434ea87a 100644
--- a/include/rpc/auth.h
+++ b/include/rpc/auth.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)auth.h 1.17 88/02/08 SMI
  *	from: @(#)auth.h	2.3 88/08/07 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/auth.h,v 1.14.2.1 1999/08/29 14:39:02 peter Exp $
  */
 
 /*
diff --git a/include/rpc/auth_unix.h b/include/rpc/auth_unix.h
index 57e075b54816..e6e8015c9eaf 100644
--- a/include/rpc/auth_unix.h
+++ b/include/rpc/auth_unix.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)auth_unix.h 1.8 88/02/08 SMI
  *	from: @(#)auth_unix.h	2.2 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/auth_unix.h,v 1.9.2.1 1999/08/29 14:39:03 peter Exp $
  */
 
 /*
diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h
index cf2116d611fa..94268c76cb8b 100644
--- a/include/rpc/clnt.h
+++ b/include/rpc/clnt.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)clnt.h 1.31 88/02/08 SMI
  *	from: @(#)clnt.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/clnt.h,v 1.10.2.1 1999/08/29 14:39:04 peter Exp $
  */
 
 /*
diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h
index d4080cc2857a..0f2a7c2ca61b 100644
--- a/include/rpc/pmap_clnt.h
+++ b/include/rpc/pmap_clnt.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)pmap_clnt.h 1.11 88/02/08 SMI
  *	from: @(#)pmap_clnt.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/pmap_clnt.h,v 1.10.2.1 1999/08/29 14:39:05 peter Exp $
  */
 
 /*
diff --git a/include/rpc/pmap_prot.h b/include/rpc/pmap_prot.h
index 123ee159dfae..46e223a0db3c 100644
--- a/include/rpc/pmap_prot.h
+++ b/include/rpc/pmap_prot.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)pmap_prot.h 1.14 88/02/08 SMI
  *	from: @(#)pmap_prot.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/pmap_prot.h,v 1.9.2.1 1999/08/29 14:39:05 peter Exp $
  */
 
 /*
diff --git a/include/rpc/pmap_rmt.h b/include/rpc/pmap_rmt.h
index 845e815e0add..2fe1bddbe83e 100644
--- a/include/rpc/pmap_rmt.h
+++ b/include/rpc/pmap_rmt.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)pmap_rmt.h 1.2 88/02/08 SMI
  *	from: @(#)pmap_rmt.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/pmap_rmt.h,v 1.9.2.1 1999/08/29 14:39:06 peter Exp $
  */
 
 /*
diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h
index 5a2948da7f4d..286fd7b7c964 100644
--- a/include/rpc/rpc.h
+++ b/include/rpc/rpc.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)rpc.h 1.9 88/02/08 SMI
  *	from: @(#)rpc.h	2.4 89/07/11 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/rpc.h,v 1.9.2.1 1999/08/29 14:39:07 peter Exp $
  */
 
 /*
diff --git a/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h
index 98f0f79aa881..1a0600e63be3 100644
--- a/include/rpc/rpc_msg.h
+++ b/include/rpc/rpc_msg.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)rpc_msg.h 1.7 86/07/16 SMI
  *	from: @(#)rpc_msg.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/rpc_msg.h,v 1.11.2.1 1999/08/29 14:39:07 peter Exp $
  */
 
 /*
diff --git a/include/rpc/svc.h b/include/rpc/svc.h
index b5446519d8a1..1439fb5797c3 100644
--- a/include/rpc/svc.h
+++ b/include/rpc/svc.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)svc.h 1.20 88/02/08 SMI
  *	from: @(#)svc.h	2.2 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/svc.h,v 1.14.2.1 1999/08/29 14:39:07 peter Exp $
  */
 
 /*
diff --git a/include/rpc/svc_auth.h b/include/rpc/svc_auth.h
index 536d6a6481c6..d42292fc4fe3 100644
--- a/include/rpc/svc_auth.h
+++ b/include/rpc/svc_auth.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)svc_auth.h 1.6 86/07/16 SMI
  *	from: @(#)svc_auth.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/svc_auth.h,v 1.11.2.1 1999/08/29 14:39:08 peter Exp $
  */
 
 /*
diff --git a/include/rpc/types.h b/include/rpc/types.h
index e2ceec5b3df7..fc17ff804600 100644
--- a/include/rpc/types.h
+++ b/include/rpc/types.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)types.h 1.18 87/07/24 SMI
  *	from: @(#)types.h	2.3 88/08/15 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/types.h,v 1.8.2.1 1999/08/29 14:39:08 peter Exp $
  */
 
 /*
diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
index a82a374cace3..f66a0a9ffd0c 100644
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)xdr.h 1.19 87/04/22 SMI
  *	from: @(#)xdr.h	2.2 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/xdr.h,v 1.12.2.1 1999/08/29 14:39:08 peter Exp $
  */
 
 /*
diff --git a/include/rpcsvc/Makefile b/include/rpcsvc/Makefile
index 48e78a6f4733..80a029d9542a 100644
--- a/include/rpcsvc/Makefile
+++ b/include/rpcsvc/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	2.3 88/08/11 4.0 RPCSRC
-# $FreeBSD$
+# $FreeBSD: src/include/rpcsvc/Makefile,v 1.23.2.1 1999/08/29 14:39:10 peter Exp $
 
 .SUFFIXES: .x
 
diff --git a/include/rpcsvc/crypt.x b/include/rpcsvc/crypt.x
index dbc83ed36e30..6b9fa36546e8 100644
--- a/include/rpcsvc/crypt.x
+++ b/include/rpcsvc/crypt.x
@@ -29,12 +29,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/rpcsvc/crypt.x,v 1.2.2.1 1999/08/29 14:39:10 peter Exp $
  */
 
 #ifndef RPC_HDR
 %#ifndef lint
-%static const char rcsid[] = "$FreeBSD$";
+%static const char rcsid[] = "$FreeBSD: src/include/rpcsvc/crypt.x,v 1.2.2.1 1999/08/29 14:39:10 peter Exp $";
 %#endif
 #endif
 
diff --git a/include/rpcsvc/klm_prot.x b/include/rpcsvc/klm_prot.x
index 8bc16aa3a64a..7404be187ce5 100644
--- a/include/rpcsvc/klm_prot.x
+++ b/include/rpcsvc/klm_prot.x
@@ -40,7 +40,7 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)klm_prot.x 1.7 87/07/08 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)klm_prot.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "$FreeBSD$";
+%static const char rcsid[] = "$FreeBSD: src/include/rpcsvc/klm_prot.x,v 1.5.2.1 1999/08/29 14:39:12 peter Exp $";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/mount.x b/include/rpcsvc/mount.x
index 48dc4b4960a4..c02a597e74f2 100644
--- a/include/rpcsvc/mount.x
+++ b/include/rpcsvc/mount.x
@@ -35,7 +35,7 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)mount.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)mount.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "$FreeBSD$";
+%static const char rcsid[] = "$FreeBSD: src/include/rpcsvc/mount.x,v 1.5.2.1 1999/08/29 14:39:13 peter Exp $";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/nfs_prot.x b/include/rpcsvc/nfs_prot.x
index da191b6abd55..36dbd76ca6ec 100644
--- a/include/rpcsvc/nfs_prot.x
+++ b/include/rpcsvc/nfs_prot.x
@@ -31,7 +31,7 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)nfs_prot.x 1.2 87/10/12 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)nfs_prot.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "$FreeBSD$";
+%static const char rcsid[] = "$FreeBSD: src/include/rpcsvc/nfs_prot.x,v 1.6.2.1 1999/08/29 14:39:13 peter Exp $";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/nis.x b/include/rpcsvc/nis.x
index deeb4dc2e65b..84cee81158ee 100644
--- a/include/rpcsvc/nis.x
+++ b/include/rpcsvc/nis.x
@@ -30,7 +30,7 @@
 
 #ifndef RPC_HDR
 %#ifndef lint
-%static const char rcsid[] = "$FreeBSD$";
+%static const char rcsid[] = "$FreeBSD: src/include/rpcsvc/nis.x,v 1.2.2.1 1999/08/29 14:39:14 peter Exp $";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/nis_cache.x b/include/rpcsvc/nis_cache.x
index 3d7fa72020a3..45a95199afb5 100644
--- a/include/rpcsvc/nis_cache.x
+++ b/include/rpcsvc/nis_cache.x
@@ -39,7 +39,7 @@
 
 #ifndef RPC_HDR
 %#ifndef lint
-%static const char rcsid[] = "$FreeBSD$";
+%static const char rcsid[] = "$FreeBSD: src/include/rpcsvc/nis_cache.x,v 1.2.2.1 1999/08/29 14:39:14 peter Exp $";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/nis_callback.x b/include/rpcsvc/nis_callback.x
index fa36788d04ba..61a65e8ebf4d 100644
--- a/include/rpcsvc/nis_callback.x
+++ b/include/rpcsvc/nis_callback.x
@@ -39,7 +39,7 @@
 
 #ifndef RPC_HDR
 %#ifndef lint
-%static const char rcsid[] = "$FreeBSD$";
+%static const char rcsid[] = "$FreeBSD: src/include/rpcsvc/nis_callback.x,v 1.2.2.1 1999/08/29 14:39:15 peter Exp $";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/nis_db.h b/include/rpcsvc/nis_db.h
index 784ac07fdb32..7851ac443e6d 100644
--- a/include/rpcsvc/nis_db.h
+++ b/include/rpcsvc/nis_db.h
@@ -26,7 +26,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/rpcsvc/nis_db.h,v 1.4.2.1 1999/08/29 14:39:15 peter Exp $
  */
 
 /*
diff --git a/include/rpcsvc/nlm_prot.x b/include/rpcsvc/nlm_prot.x
index e7618a6e2264..8da74bb0c357 100644
--- a/include/rpcsvc/nlm_prot.x
+++ b/include/rpcsvc/nlm_prot.x
@@ -14,7 +14,7 @@
 #else
 %#ifndef lint
 %static const char rcsid[] =
-%	"$FreeBSD$";
+%	"$FreeBSD: src/include/rpcsvc/nlm_prot.x,v 1.7.2.1 1999/08/29 14:39:15 peter Exp $";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/rex.x b/include/rpcsvc/rex.x
index 11a19fda157c..683fa93cab02 100644
--- a/include/rpcsvc/rex.x
+++ b/include/rpcsvc/rex.x
@@ -35,7 +35,7 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)rex.x 1.3 87/09/18 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)rex.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "$FreeBSD$";
+%static const char rcsid[] = "$FreeBSD: src/include/rpcsvc/rex.x,v 1.5.2.1 1999/08/29 14:39:16 peter Exp $";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/rnusers.x b/include/rpcsvc/rnusers.x
index b1f26c5f8816..d30203ddb61b 100644
--- a/include/rpcsvc/rnusers.x
+++ b/include/rpcsvc/rnusers.x
@@ -35,7 +35,7 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)rnusers.x 1.2 87/09/20 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)rnusers.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "$FreeBSD$";
+%static const char rcsid[] = "$FreeBSD: src/include/rpcsvc/rnusers.x,v 1.5.2.1 1999/08/29 14:39:16 peter Exp $";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/rquota.x b/include/rpcsvc/rquota.x
index 31466dd811b5..46757856e675 100644
--- a/include/rpcsvc/rquota.x
+++ b/include/rpcsvc/rquota.x
@@ -7,7 +7,7 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)rquota.x 1.2 87/09/20 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)rquota.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "$FreeBSD$";
+%static const char rcsid[] = "$FreeBSD: src/include/rpcsvc/rquota.x,v 1.5.2.1 1999/08/29 14:39:17 peter Exp $";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/rstat.x b/include/rpcsvc/rstat.x
index 00455e81feef..fc07a6ee9328 100644
--- a/include/rpcsvc/rstat.x
+++ b/include/rpcsvc/rstat.x
@@ -47,7 +47,7 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)rstat.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)rstat.x	2.2 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "$FreeBSD$";
+%static const char rcsid[] = "$FreeBSD: src/include/rpcsvc/rstat.x,v 1.5.2.1 1999/08/29 14:39:17 peter Exp $";
 %#endif /* not lint */
 
 #endif /* def RPC_HDR */
diff --git a/include/rpcsvc/sm_inter.x b/include/rpcsvc/sm_inter.x
index 5fe64ff2e7f3..9e51b2a90f7c 100644
--- a/include/rpcsvc/sm_inter.x
+++ b/include/rpcsvc/sm_inter.x
@@ -39,7 +39,7 @@
 #ifndef RPC_HDR
 %#ifndef lint
 %static const char rcsid[] =
-%	"$FreeBSD$";
+%	"$FreeBSD: src/include/rpcsvc/sm_inter.x,v 1.7.2.1 1999/08/29 14:39:18 peter Exp $";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/spray.x b/include/rpcsvc/spray.x
index 1ec2c63808f0..f1a96a1eb898 100644
--- a/include/rpcsvc/spray.x
+++ b/include/rpcsvc/spray.x
@@ -36,7 +36,7 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)spray.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)spray.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "$FreeBSD$";
+%static const char rcsid[] = "$FreeBSD: src/include/rpcsvc/spray.x,v 1.5.2.1 1999/08/29 14:39:18 peter Exp $";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/yp.x b/include/rpcsvc/yp.x
index 86cd84aedfc3..26c8b8a5797c 100644
--- a/include/rpcsvc/yp.x
+++ b/include/rpcsvc/yp.x
@@ -36,7 +36,7 @@
 #ifndef RPC_HDR
 %#ifndef lint
 %static const char rcsid[] =
-%	"$FreeBSD$";
+%	"$FreeBSD: src/include/rpcsvc/yp.x,v 1.11.2.1 1999/08/29 14:39:19 peter Exp $";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/yp_prot.h b/include/rpcsvc/yp_prot.h
index 4b1aa61ed3ce..1ded778b5936 100644
--- a/include/rpcsvc/yp_prot.h
+++ b/include/rpcsvc/yp_prot.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/rpcsvc/yp_prot.h,v 1.9.2.1 1999/08/29 14:39:20 peter Exp $
  */
 
 #ifndef _RPCSVC_YP_PROT_H_
diff --git a/include/rpcsvc/ypclnt.h b/include/rpcsvc/ypclnt.h
index 6dae7bb476c0..e383e6935f0d 100644
--- a/include/rpcsvc/ypclnt.h
+++ b/include/rpcsvc/ypclnt.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/rpcsvc/ypclnt.h,v 1.10.2.1 1999/08/29 14:39:20 peter Exp $
  */
 
 #ifndef _RPCSVC_YPCLNT_H_
diff --git a/include/rpcsvc/yppasswd.x b/include/rpcsvc/yppasswd.x
index 46243229d009..5ae707ddd41a 100644
--- a/include/rpcsvc/yppasswd.x
+++ b/include/rpcsvc/yppasswd.x
@@ -36,7 +36,7 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)yppasswd.x 1.1 87/04/13 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)yppasswd.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "$FreeBSD$";
+%static const char rcsid[] = "$FreeBSD: src/include/rpcsvc/yppasswd.x,v 1.5.2.1 1999/08/29 14:39:21 peter Exp $";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/ypupdate_prot.x b/include/rpcsvc/ypupdate_prot.x
index 5b0938bcd050..d5cb5ded875b 100644
--- a/include/rpcsvc/ypupdate_prot.x
+++ b/include/rpcsvc/ypupdate_prot.x
@@ -35,7 +35,7 @@
 %/* from @(#)ypupdate_prot.x	1.3 91/03/11 TIRPC 1.0 */
 #ifndef RPC_HDR
 %#ifndef lint
-%static const char rcsid[] = "$FreeBSD$";
+%static const char rcsid[] = "$FreeBSD: src/include/rpcsvc/ypupdate_prot.x,v 1.2.2.1 1999/08/29 14:39:21 peter Exp $";
 %#endif
 #endif
 %
diff --git a/include/rpcsvc/ypxfrd.x b/include/rpcsvc/ypxfrd.x
index 96b61341a8c9..268168c0a588 100644
--- a/include/rpcsvc/ypxfrd.x
+++ b/include/rpcsvc/ypxfrd.x
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/rpcsvc/ypxfrd.x,v 1.6.2.1 1999/08/29 14:39:22 peter Exp $
  */
 
 /*
@@ -68,7 +68,7 @@
 
 #ifndef RPC_HDR
 %#ifndef lint
-%static const char rcsid[] = "$FreeBSD$";
+%static const char rcsid[] = "$FreeBSD: src/include/rpcsvc/ypxfrd.x,v 1.6.2.1 1999/08/29 14:39:22 peter Exp $";
 %#endif /* not lint */
 #endif
 
diff --git a/include/stdio.h b/include/stdio.h
index 571705a46e68..42cd95f660c3 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdio.h	8.5 (Berkeley) 4/29/95
- * $FreeBSD$
+ * $FreeBSD: src/include/stdio.h,v 1.21.2.2 1999/08/29 14:38:56 peter Exp $
  */
 
 #ifndef	_STDIO_H_
diff --git a/include/strhash.h b/include/strhash.h
index e0922f00a1c9..c5aed734b10a 100644
--- a/include/strhash.h
+++ b/include/strhash.h
@@ -1,7 +1,7 @@
 #ifndef _STRHASH_H_INCLUDE
 #define _STRHASH_H_INCLUDE
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/include/strhash.h,v 1.2.8.1 1999/08/29 14:38:56 peter Exp $ */
 
 /*
  *
diff --git a/include/timers.h b/include/timers.h
index 73180f9c75e1..ea7adbfc1efa 100644
--- a/include/timers.h
+++ b/include/timers.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/timers.h,v 1.3.2.1 1999/08/29 14:38:57 peter Exp $
  *
  * Description : Basic timers header.
  *
diff --git a/include/utmp.h b/include/utmp.h
index 557efc021599..d1234deba3d3 100644
--- a/include/utmp.h
+++ b/include/utmp.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)utmp.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/include/utmp.h,v 1.8.2.1 1999/08/29 14:38:58 peter Exp $
  */
 
 #ifndef	_UTMP_H_
diff --git a/include/vis.h b/include/vis.h
index f3722d6b39cf..7619442931b3 100644
--- a/include/vis.h
+++ b/include/vis.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vis.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/vis.h,v 1.5.2.1 1999/08/29 14:38:58 peter Exp $
  */
 
 #ifndef _VIS_H_
diff --git a/kerberosIV/Makefile b/kerberosIV/Makefile
deleted file mode 100644
index 5d94416cd748..000000000000
--- a/kerberosIV/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-# $FreeBSD$
-
-SUBDIR=	include lib libexec usr.bin usr.sbin
-
-SDIR= ${.CURDIR}/..
-
-CODAI=	${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes cleandir && \
-	${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes obj && \
-	${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes depend all install
-
-CODAIN=	${MAKE} ${MFLAGS} cleandir && \
-	${MAKE} ${MFLAGS} obj && \
-	${MAKE} ${MFLAGS} depend all install
-
-CODAD=	${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes cleandir && \
-	${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes obj && \
-	${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes depend all distribute
-
-# These are the programs which depend on kerberos
-kprog:
-	cd ${SDIR}/bin/rcp; ${CODAI}
-	cd ${SDIR}/gnu/usr.bin/cvs; ${CODAI}
-	cd ${SDIR}/libexec/rlogind; ${CODAI}
-	cd ${SDIR}/libexec/rshd; ${CODAI}
-	cd ${SDIR}/usr.bin/login; ${CODAI}
-	cd ${SDIR}/usr.bin/passwd; ${CODAI}
-	cd ${SDIR}/usr.bin/rlogin; ${CODAI}
-	cd ${SDIR}/usr.bin/rsh; ${CODAI}
-	cd ${SDIR}/usr.bin/su; ${CODAI}
-	cd ${SDIR}/sbin/dump; ${CODAI}
-	cd ${SDIR}/sbin/restore; ${CODAI}
-
-# These are the programs which depend on kerberos
-# This target us used to rebuild these programs WITHOUT kerberos
-dekerberise:
-	cd ${SDIR}/bin/rcp; ${CODAIN}
-	cd ${SDIR}/gnu/usr.bin/cvs; ${CODAIN}
-	cd ${SDIR}/libexec/rlogind; ${CODAIN}
-	cd ${SDIR}/libexec/rshd; ${CODAIN}
-	cd ${SDIR}/usr.bin/login; ${CODAIN}
-	cd ${SDIR}/usr.bin/passwd; ${CODAIN}
-	cd ${SDIR}/usr.bin/rlogin; ${CODAIN}
-	cd ${SDIR}/usr.bin/rsh; ${CODAIN}
-	cd ${SDIR}/usr.bin/su; ${CODAIN}
-	cd ${SDIR}/sbin/dump; ${CODAIN}
-	cd ${SDIR}/sbin/restore; ${CODAIN}
-
-bootstrap: cleandir obj depend all install kprog
-
-help-distribute:	distribute
-	cd ${SDIR}/bin/rcp; ${CODAD}
-	cd ${SDIR}/gnu/usr.bin/cvs; ${CODAD}
-	cd ${SDIR}/libexec/rlogind; ${CODAD}
-	cd ${SDIR}/libexec/rshd; ${CODAD}
-	cd ${SDIR}/usr.bin/login; ${CODAD}
-	cd ${SDIR}/usr.bin/passwd; ${CODAD}
-	cd ${SDIR}/usr.bin/rlogin; ${CODAD}
-	cd ${SDIR}/usr.bin/rsh; ${CODAD}
-	cd ${SDIR}/usr.bin/su; ${CODAD}
-	cd ${SDIR}/sbin/dump; ${CODAD}
-	cd ${SDIR}/sbin/restore; ${CODAD}
-
-.include <bsd.subdir.mk>
diff --git a/kerberosIV/Makefile.inc b/kerberosIV/Makefile.inc
deleted file mode 100644
index b9a5a17c58ec..000000000000
--- a/kerberosIV/Makefile.inc
+++ /dev/null
@@ -1,102 +0,0 @@
-# $FreeBSD$
-
-.if !defined(DISTRIBUTION)
-
-DISTRIBUTION=	krb
-
-.if !defined(INCLUDEOBJDIR)
-
-KRB4DIR=	${.CURDIR}/../../../crypto/kerberosIV
-TELNETDIR=	${.CURDIR}/../../../crypto/telnet
-
-.if exists(${.OBJDIR}/../../include)
-INCLUDEOBJDIR=	${.OBJDIR}/../../include
-.else
-INCLUDEOBJDIR=	${.CURDIR}/../../include
-.endif
-
-.if exists(${.OBJDIR}/../../lib/libacl)
-ACLOBJDIR=	${.OBJDIR}/../../lib/libacl
-.else
-ACLOBJDIR=	${.CURDIR}/../../lib/libacl
-.endif
-
-.if exists(${.OBJDIR}/../../lib/libkadm)
-KADMOBJDIR=	${.OBJDIR}/../../lib/libkadm
-.else
-KADMOBJDIR=	${.CURDIR}/../../lib/libkadm
-.endif
-
-.if exists(${.OBJDIR}/../../lib/libkafs)
-KAFSOBJDIR=	${.OBJDIR}/../../lib/libkafs
-.else
-KAFSOBJDIR=	${.CURDIR}/../../lib/libkafs
-.endif
-
-.if exists(${.OBJDIR}/../../lib/libkdb)
-KDBOBJDIR=	${.OBJDIR}/../../lib/libkdb
-.else
-KDBOBJDIR=	${.CURDIR}/../../lib/libkdb
-.endif
-
-.if exists(${.OBJDIR}/../../lib/libkrb)
-KRBOBJDIR=	${.OBJDIR}/../../lib/libkrb
-.else
-KRBOBJDIR=	${.CURDIR}/../../lib/libkrb
-.endif
-
-.if exists(${.OBJDIR}/../../lib/libroken)
-ROKENOBJDIR=	${.OBJDIR}/../../lib/libroken
-.else
-ROKENOBJDIR=	${.CURDIR}/../../lib/libroken
-.endif
-
-.if exists(${.OBJDIR}/../../lib/libsl)
-SLOBJDIR=	${.OBJDIR}/../../lib/libsl
-.else
-SLOBJDIR=	${.CURDIR}/../../lib/libsl
-.endif
-
-.if exists(${.OBJDIR}/../../lib/libtelnet)
-TELNETOBJDIR=	${.OBJDIR}/../../lib/libtelnet
-.else
-TELNETOBJDIR=	${.CURDIR}/../../lib/libtelnet
-.endif
-
-CFLAGS+= -I${.CURDIR}/../../include -Wall -DHAVE_CONFIG_H \
-	-I${INCLUDEOBJDIR} -DBINDIR=\"/usr/bin\" -DSBINDIR=\"/usr/sbin\"
-
-#${INCLUDEOBJDIR}/protos.h: ${KRB4DIR}/include/protos.H
-#	cd ${INCLUDEOBJDIR} ; ln -sf ${.ALLSRC} ${.TARGET} 
-
-COMPILE_ET=     compile_et
-
-.ORDER: ${KADMOBJDIR}/kadm_err.c ${KADMOBJDIR}/kadm_err.h
-${KADMOBJDIR}/kadm_err.c ${KADMOBJDIR}/kadm_err.h: ${KRB4DIR}/lib/kadm/kadm_err.et          
-	test -e ${KADMOBJDIR}/kadm_err.et || ln -s ${.ALLSRC} ${KADMOBJDIR}
-	cd ${KADMOBJDIR}; ${COMPILE_ET} kadm_err.et
-
-CLEANFILES+=${KADMOBJDIR}/kadm_err.h ${KADMOBJDIR}/kadm_err.c ${KADMOBJDIR}/kadm_err.et
-
-.ORDER: ${KRBOBJDIR}/krb_err.c ${KRBOBJDIR}/krb_err.h
-${KRBOBJDIR}/krb_err.c ${KRBOBJDIR}/krb_err.h: ${KRB4DIR}/lib/krb/krb_err.et
-	test -e ${KRBOBJDIR}/krb_err.et || ln -s ${.ALLSRC} ${KRBOBJDIR}
-	cd ${KRBOBJDIR}; ${COMPILE_ET} krb_err.et
-
-CLEANFILES+=${KRBOBJDIR}/krb_err.h ${KRBOBJDIR}/krb_err.c ${KRBOBJDIR}/krb_err.et
-
-.if defined(INCLUDES)
-beforeinstall: ${INCLUDES}
-.for INC in ${INCLUDES}
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${INC} ${DESTDIR}/usr/include
-.endfor
-.endif
-
-.else
-
-KRB4DIR=	${.CURDIR}/../../crypto/kerberosIV
-
-.endif
-
-.endif
diff --git a/kerberosIV/README b/kerberosIV/README
deleted file mode 100644
index 9f97cf60f95a..000000000000
--- a/kerberosIV/README
+++ /dev/null
@@ -1,13 +0,0 @@
-This subtree is world-exportable, as it does not contain any
-cryptographic code.
-
-At the time of writing, it did not even contain source code, only
-Makefiles and headers.
-
-Please maintain this "exportable" status quo.
-
-Thanks!
-
-MarkM
-markm@freebsd.org
-20th Sept 1997
diff --git a/kerberosIV/include/Makefile b/kerberosIV/include/Makefile
deleted file mode 100644
index a74430495174..000000000000
--- a/kerberosIV/include/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-.if exists(${.OBJDIR}/../../include)
-INCLUDEOBJDIR=	${.OBJDIR}/../include
-.else
-INCLUDEOBJDIR=	${.CURDIR}/../include
-.endif
-
-depend lint tags:
-
-.include <bsd.prog.mk>
-
-#${INCLUDEOBJDIR}/protos.h: ${KRB4DIR}/include/protos.H
-#	cd ${INCLUDEOBJDIR} ; ln -sf ${.ALLSRC} ${.TARGET} 
-
-#all:	${INCLUDEOBJDIR}/protos.h
-
-#CLEANFILES= ${INCLUDEOBJDIR}/protos.h
diff --git a/kerberosIV/include/config.h b/kerberosIV/include/config.h
deleted file mode 100644
index 86f36145ef46..000000000000
--- a/kerberosIV/include/config.h
+++ /dev/null
@@ -1,985 +0,0 @@
-/* include/config.h.  Generated automatically by configure.  */
-/* include/config.h.in.  Generated automatically from configure.in by autoheader.  */
-
-/* Define if using alloca.c.  */
-/* #undef C_ALLOCA */
-
-/* Define to empty if the keyword does not work.  */
-/* #undef const */
-
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
-   This function is required for alloca.c support on those systems.  */
-/* #undef CRAY_STACKSEG_END */
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef gid_t */
-
-/* Define if you have alloca, as a function or macro.  */
-#define HAVE_ALLOCA 1
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-/* #undef HAVE_ALLOCA_H */
-
-/* Define if you have a working `mmap' system call.  */
-#define HAVE_MMAP 1
-
-/* Define if your struct stat has st_blksize.  */
-#define HAVE_ST_BLKSIZE 1
-
-/* Define to `long' if <sys/types.h> doesn't define.  */
-/* #undef off_t */
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef pid_t */
-
-/* Define if you need to in order for stat and other things to work.  */
-/* #undef _POSIX_SOURCE */
-
-/* Define as the return type of signal handlers (int or void).  */
-#define RETSIGTYPE void
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-/* #undef size_t */
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-/* #undef STACK_DIRECTION */
-
-/* Define if you have the ANSI C header files.  */
-#define STDC_HEADERS 1
-
-/* Define if `sys_siglist' is declared by <signal.h>.  */
-#define SYS_SIGLIST_DECLARED 1
-
-/* Define if you can safely include both <sys/time.h> and <time.h>.  */
-#define TIME_WITH_SYS_TIME 1
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef uid_t */
-
-/* Define if your processor stores words with the most significant
-   byte first (like Motorola and SPARC, unlike Intel and VAX).  */
-/* #undef WORDS_BIGENDIAN */
-
-/* Define if the X Window System is missing or not being used.  */
-/* #undef X_DISPLAY_MISSING */
-
-/*  Define this if RETSIGTYPE == void  */
-#define VOID_RETSIGTYPE 1
-
-/*  Define this if struct utmp have ut_user  */
-/* #undef HAVE_UT_USER */
-
-/*  Define this if struct utmp have ut_host  */
-#define HAVE_UT_HOST 1
-
-/*  Define this if struct utmp have ut_addr  */
-/* #undef HAVE_UT_ADDR */
-
-/*  Define this if struct utmp have ut_type  */
-/* #undef HAVE_UT_TYPE */
-
-/*  Define this if struct utmp have ut_pid  */
-/* #undef HAVE_UT_PID */
-
-/*  Define this if struct utmp have ut_id  */
-/* #undef HAVE_UT_ID */
-
-/*  Define this if struct utmpx have ut_syslen  */
-/* #undef HAVE_UT_SYSLEN */
-
-/*  Define this if struct winsize is declared in sys/termios.h */
-#define HAVE_STRUCT_WINSIZE 1
-
-/*  Define this if struct winsize have ws_xpixel */
-#define HAVE_WS_XPIXEL 1
-
-/*  Define this if struct winsize have ws_ypixel */
-#define HAVE_WS_YPIXEL 1
-
-/*  Define this to be the directory where the dictionary for cracklib */
-/*  resides */
-/* #undef DICTPATH */
-
-/* Define this if you want to use SOCKS v5 */
-/* #undef SOCKS */
-
-/* Define this to the path of the mail spool directory */
-/* #undef KRB4_MAILDIR */
-
-/* Define this if `struct sockaddr' includes sa_len */
-#define SOCKADDR_HAS_SA_LEN 1
-
-/* Define this if `struct siaentity' includes ouid */
-/* #undef SIAENTITY_HAS_OUID */
-
-/* Define if getlogin has POSIX flavour, as opposed to BSD */
-/* #undef POSIX_GETLOGIN */
-
-/* Define if getpwnam_r has POSIX flavour */
-/* #undef POSIX_GETPWNAM_R */
-
-/* define if getcwd() is broken (such as in SunOS) */
-/* #undef BROKEN_GETCWD */
-
-/* define if the system is missing a prototype for crypt() */
-/* #undef NEED_CRYPT_PROTO */
-
-/* define if the system is missing a prototype for strtok_r() */
-/* #undef NEED_STRTOK_R_PROTO */
-
-/* define if /bin/ls takes -A */
-#define HAVE_LS_A 1
-
-/* define if you have h_errno */
-#define HAVE_H_ERRNO 1
-
-/* define if you have h_errlist but not hstrerror */
-#define HAVE_H_ERRLIST 1
-
-/* define if you have h_nerr but not hstrerror */
-#define HAVE_H_NERR 1
-
-/* define if your system doesn't declare h_errlist */
-/* #undef HAVE_H_ERRLIST_DECLARATION */
-
-/* define if your system doesn't declare h_nerr */
-/* #undef HAVE_H_NERR_DECLARATION */
-
-/* define this if you need a declaration for h_errno */
-#define HAVE_H_ERRNO_DECLARATION 1
-
-/* define if you need a declaration for optarg */
-/* #undef HAVE_OPTARG_DECLARATION */
-
-/* define if you need a declaration for optind */
-/* #undef HAVE_OPTIND_DECLARATION */
-
-/* define if you need a declaration for opterr */
-/* #undef HAVE_OPTERR_DECLARATION */
-
-/* define if you need a declaration for optopt */
-/* #undef HAVE_OPTOPT_DECLARATION */
-
-/* define if you need a declaration for __progname */
-/* #undef HAVE___PROGNAME_DECLARATION */
-
-/* Define if you have the XauReadAuth function.  */
-#define HAVE_XAUREADAUTH 1
-
-/* Define if you have the XauWriteAuth function.  */
-#define HAVE_XAUWRITEAUTH 1
-
-/* Define if you have the _getpty function.  */
-/* #undef HAVE__GETPTY */
-
-/* Define if you have the _scrsize function.  */
-/* #undef HAVE__SCRSIZE */
-
-/* Define if you have the _setsid function.  */
-/* #undef HAVE__SETSID */
-
-/* Define if you have the _stricmp function.  */
-/* #undef HAVE__STRICMP */
-
-/* Define if you have the asnprintf function.  */
-/* #undef HAVE_ASNPRINTF */
-
-/* Define if you have the asprintf function.  */
-#define HAVE_ASPRINTF 1
-
-/* Define if you have the chown function.  */
-#define HAVE_CHOWN 1
-
-/* Define if you have the daemon function.  */
-#define HAVE_DAEMON 1
-
-/* Define if you have the dbm_firstkey function.  */
-#define HAVE_DBM_FIRSTKEY 1
-
-/* Define if you have the dbopen function.  */
-#define HAVE_DBOPEN 1
-
-/* Define if you have the dn_expand function.  */
-#define HAVE_DN_EXPAND 1
-
-/* Define if you have the el_init function.  */
-#define HAVE_EL_INIT 1
-
-/* Define if you have the err function.  */
-#define HAVE_ERR 1
-
-/* Define if you have the errx function.  */
-#define HAVE_ERRX 1
-
-/* Define if you have the fchmod function.  */
-#define HAVE_FCHMOD 1
-
-/* Define if you have the fchown function.  */
-#define HAVE_FCHOWN 1
-
-/* Define if you have the fcntl function.  */
-#define HAVE_FCNTL 1
-
-/* Define if you have the flock function.  */
-#define HAVE_FLOCK 1
-
-/* Define if you have the forkpty function.  */
-#define HAVE_FORKPTY 1
-
-/* Define if you have the frevoke function.  */
-/* #undef HAVE_FREVOKE */
-
-/* Define if you have the getattr function.  */
-/* #undef HAVE_GETATTR */
-
-/* Define if you have the getcwd function.  */
-#define HAVE_GETCWD 1
-
-/* Define if you have the getdtablesize function.  */
-#define HAVE_GETDTABLESIZE 1
-
-/* Define if you have the gethostbyname function.  */
-#define HAVE_GETHOSTBYNAME 1
-
-/* Define if you have the gethostname function.  */
-#define HAVE_GETHOSTNAME 1
-
-/* Define if you have the getlogin function.  */
-#define HAVE_GETLOGIN 1
-
-/* Define if you have the getopt function.  */
-#define HAVE_GETOPT 1
-
-/* Define if you have the getpagesize function.  */
-#define HAVE_GETPAGESIZE 1
-
-/* Define if you have the getpriority function.  */
-#define HAVE_GETPRIORITY 1
-
-/* Define if you have the getpwnam_r function.  */
-/* #undef HAVE_GETPWNAM_R */
-
-/* Define if you have the getservbyname function.  */
-#define HAVE_GETSERVBYNAME 1
-
-/* Define if you have the getsockopt function.  */
-#define HAVE_GETSOCKOPT 1
-
-/* Define if you have the getspnam function.  */
-/* #undef HAVE_GETSPNAM */
-
-/* Define if you have the getspuid function.  */
-/* #undef HAVE_GETSPUID */
-
-/* Define if you have the gettimeofday function.  */
-#define HAVE_GETTIMEOFDAY 1
-
-/* Define if you have the getudbnam function.  */
-/* #undef HAVE_GETUDBNAM */
-
-/* Define if you have the getuid function.  */
-#define HAVE_GETUID 1
-
-/* Define if you have the getusershell function.  */
-#define HAVE_GETUSERSHELL 1
-
-/* Define if you have the grantpt function.  */
-/* #undef HAVE_GRANTPT */
-
-/* Define if you have the hstrerror function.  */
-#define HAVE_HSTRERROR 1
-
-/* Define if you have the inet_aton function.  */
-#define HAVE_INET_ATON 1
-
-/* Define if you have the initgroups function.  */
-#define HAVE_INITGROUPS 1
-
-/* Define if you have the innetgr function.  */
-#define HAVE_INNETGR 1
-
-/* Define if you have the iruserok function.  */
-#define HAVE_IRUSEROK 1
-
-/* Define if you have the logout function.  */
-#define HAVE_LOGOUT 1
-
-/* Define if you have the logwtmp function.  */
-#define HAVE_LOGWTMP 1
-
-/* Define if you have the lstat function.  */
-#define HAVE_LSTAT 1
-
-/* Define if you have the memmove function.  */
-#define HAVE_MEMMOVE 1
-
-/* Define if you have the mkstemp function.  */
-#define HAVE_MKSTEMP 1
-
-/* Define if you have the mktime function.  */
-#define HAVE_MKTIME 1
-
-/* Define if you have the odm_initialize function.  */
-/* #undef HAVE_ODM_INITIALIZE */
-
-/* Define if you have the ptsname function.  */
-/* #undef HAVE_PTSNAME */
-
-/* Define if you have the putenv function.  */
-#define HAVE_PUTENV 1
-
-/* Define if you have the rand function.  */
-#define HAVE_RAND 1
-
-/* Define if you have the random function.  */
-#define HAVE_RANDOM 1
-
-/* Define if you have the rcmd function.  */
-#define HAVE_RCMD 1
-
-/* Define if you have the readline function.  */
-#define HAVE_READLINE 1
-
-/* Define if you have the res_search function.  */
-#define HAVE_RES_SEARCH 1
-
-/* Define if you have the revoke function.  */
-#define HAVE_REVOKE 1
-
-/* Define if you have the setegid function.  */
-#define HAVE_SETEGID 1
-
-/* Define if you have the setenv function.  */
-#define HAVE_SETENV 1
-
-/* Define if you have the seteuid function.  */
-#define HAVE_SETEUID 1
-
-/* Define if you have the setitimer function.  */
-#define HAVE_SETITIMER 1
-
-/* Define if you have the setlim function.  */
-/* #undef HAVE_SETLIM */
-
-/* Define if you have the setlogin function.  */
-#define HAVE_SETLOGIN 1
-
-/* Define if you have the setpcred function.  */
-/* #undef HAVE_SETPCRED */
-
-/* Define if you have the setpgid function.  */
-#define HAVE_SETPGID 1
-
-/* Define if you have the setpriority function.  */
-#define HAVE_SETPRIORITY 1
-
-/* Define if you have the setproctitle function.  */
-#define HAVE_SETPROCTITLE 1
-
-/* Define if you have the setregid function.  */
-#define HAVE_SETREGID 1
-
-/* Define if you have the setresgid function.  */
-/* #undef HAVE_SETRESGID */
-
-/* Define if you have the setresuid function.  */
-/* #undef HAVE_SETRESUID */
-
-/* Define if you have the setreuid function.  */
-#define HAVE_SETREUID 1
-
-/* Define if you have the setsid function.  */
-#define HAVE_SETSID 1
-
-/* Define if you have the setsockopt function.  */
-#define HAVE_SETSOCKOPT 1
-
-/* Define if you have the setutent function.  */
-/* #undef HAVE_SETUTENT */
-
-/* Define if you have the snprintf function.  */
-#define HAVE_SNPRINTF 1
-
-/* Define if you have the socket function.  */
-#define HAVE_SOCKET 1
-
-/* Define if you have the strcasecmp function.  */
-#define HAVE_STRCASECMP 1
-
-/* Define if you have the strdup function.  */
-#define HAVE_STRDUP 1
-
-/* Define if you have the strerror function.  */
-#define HAVE_STRERROR 1
-
-/* Define if you have the strftime function.  */
-#define HAVE_STRFTIME 1
-
-/* Define if you have the strlwr function.  */
-/* #undef HAVE_STRLWR */
-
-/* Define if you have the strnlen function.  */
-/* #undef HAVE_STRNLEN */
-
-/* Define if you have the strtok_r function.  */
-#define HAVE_STRTOK_R 1
-
-/* Define if you have the strupr function.  */
-/* #undef HAVE_STRUPR */
-
-/* Define if you have the swab function.  */
-#define HAVE_SWAB 1
-
-/* Define if you have the syslog function.  */
-#define HAVE_SYSLOG 1
-
-/* Define if you have the tgetent function.  */
-#define HAVE_TGETENT 1
-
-/* Define if you have the ttyname function.  */
-#define HAVE_TTYNAME 1
-
-/* Define if you have the ttyslot function.  */
-#define HAVE_TTYSLOT 1
-
-/* Define if you have the ulimit function.  */
-/* #undef HAVE_ULIMIT */
-
-/* Define if you have the uname function.  */
-#define HAVE_UNAME 1
-
-/* Define if you have the unlockpt function.  */
-/* #undef HAVE_UNLOCKPT */
-
-/* Define if you have the unsetenv function.  */
-#define HAVE_UNSETENV 1
-
-/* Define if you have the vasnprintf function.  */
-/* #undef HAVE_VASNPRINTF */
-
-/* Define if you have the vasprintf function.  */
-#define HAVE_VASPRINTF 1
-
-/* Define if you have the verr function.  */
-#define HAVE_VERR 1
-
-/* Define if you have the verrx function.  */
-#define HAVE_VERRX 1
-
-/* Define if you have the vhangup function.  */
-/* #undef HAVE_VHANGUP */
-
-/* Define if you have the vsnprintf function.  */
-#define HAVE_VSNPRINTF 1
-
-/* Define if you have the vwarn function.  */
-#define HAVE_VWARN 1
-
-/* Define if you have the vwarnx function.  */
-#define HAVE_VWARNX 1
-
-/* Define if you have the warn function.  */
-#define HAVE_WARN 1
-
-/* Define if you have the warnx function.  */
-#define HAVE_WARNX 1
-
-/* Define if you have the yp_get_default_domain function.  */
-#define HAVE_YP_GET_DEFAULT_DOMAIN 1
-
-/* Define if you have the <arpa/ftp.h> header file.  */
-#define HAVE_ARPA_FTP_H 1
-
-/* Define if you have the <arpa/inet.h> header file.  */
-#define HAVE_ARPA_INET_H 1
-
-/* Define if you have the <arpa/nameser.h> header file.  */
-#define HAVE_ARPA_NAMESER_H 1
-
-/* Define if you have the <arpa/telnet.h> header file.  */
-#define HAVE_ARPA_TELNET_H 1
-
-/* Define if you have the <bind/bitypes.h> header file.  */
-/* #undef HAVE_BIND_BITYPES_H */
-
-/* Define if you have the <bsd/bsd.h> header file.  */
-/* #undef HAVE_BSD_BSD_H */
-
-/* Define if you have the <bsdsetjmp.h> header file.  */
-/* #undef HAVE_BSDSETJMP_H */
-
-/* Define if you have the <crypt.h> header file.  */
-/* #undef HAVE_CRYPT_H */
-
-/* Define if you have the <dbm.h> header file.  */
-/* #undef HAVE_DBM_H */
-
-/* Define if you have the <dirent.h> header file.  */
-#define HAVE_DIRENT_H 1
-
-/* Define if you have the <err.h> header file.  */
-#define HAVE_ERR_H 1
-
-/* Define if you have the <fcntl.h> header file.  */
-#define HAVE_FCNTL_H 1
-
-/* Define if you have the <grp.h> header file.  */
-#define HAVE_GRP_H 1
-
-/* Define if you have the <io.h> header file.  */
-/* #undef HAVE_IO_H */
-
-/* Define if you have the <lastlog.h> header file.  */
-/* #undef HAVE_LASTLOG_H */
-
-/* Define if you have the <login.h> header file.  */
-/* #undef HAVE_LOGIN_H */
-
-/* Define if you have the <maillock.h> header file.  */
-/* #undef HAVE_MAILLOCK_H */
-
-/* Define if you have the <ndbm.h> header file.  */
-#define HAVE_NDBM_H 1
-
-/* Define if you have the <net/if.h> header file.  */
-#define HAVE_NET_IF_H 1
-
-/* Define if you have the <net/if_tun.h> header file.  */
-#define HAVE_NET_IF_TUN_H 1
-
-/* Define if you have the <net/if_var.h> header file.  */
-#define HAVE_NET_IF_VAR_H 1
-
-/* Define if you have the <netdb.h> header file.  */
-#define HAVE_NETDB_H 1
-
-/* Define if you have the <netinet/in.h> header file.  */
-#define HAVE_NETINET_IN_H 1
-
-/* Define if you have the <netinet/in6_machtypes.h> header file.  */
-/* #undef HAVE_NETINET_IN6_MACHTYPES_H */
-
-/* Define if you have the <netinet/in_systm.h> header file.  */
-#define HAVE_NETINET_IN_SYSTM_H 1
-
-/* Define if you have the <netinet/ip.h> header file.  */
-#define HAVE_NETINET_IP_H 1
-
-/* Define if you have the <netinet/tcp.h> header file.  */
-#define HAVE_NETINET_TCP_H 1
-
-/* Define if you have the <paths.h> header file.  */
-#define HAVE_PATHS_H 1
-
-/* Define if you have the <pty.h> header file.  */
-/* #undef HAVE_PTY_H */
-
-/* Define if you have the <pwd.h> header file.  */
-#define HAVE_PWD_H 1
-
-/* Define if you have the <resolv.h> header file.  */
-#define HAVE_RESOLV_H 1
-
-/* Define if you have the <rpcsvc/dbm.h> header file.  */
-/* #undef HAVE_RPCSVC_DBM_H */
-
-/* Define if you have the <sac.h> header file.  */
-/* #undef HAVE_SAC_H */
-
-/* Define if you have the <security/pam_modules.h> header file.  */
-/* #undef HAVE_SECURITY_PAM_MODULES_H */
-
-/* Define if you have the <shadow.h> header file.  */
-/* #undef HAVE_SHADOW_H */
-
-/* Define if you have the <siad.h> header file.  */
-/* #undef HAVE_SIAD_H */
-
-/* Define if you have the <signal.h> header file.  */
-#define HAVE_SIGNAL_H 1
-
-/* Define if you have the <stropts.h> header file.  */
-/* #undef HAVE_STROPTS_H */
-
-/* Define if you have the <sys/bitypes.h> header file.  */
-/* #undef HAVE_SYS_BITYPES_H */
-
-/* Define if you have the <sys/category.h> header file.  */
-/* #undef HAVE_SYS_CATEGORY_H */
-
-/* Define if you have the <sys/cdefs.h> header file.  */
-#define HAVE_SYS_CDEFS_H 1
-
-/* Define if you have the <sys/file.h> header file.  */
-#define HAVE_SYS_FILE_H 1
-
-/* Define if you have the <sys/filio.h> header file.  */
-#define HAVE_SYS_FILIO_H 1
-
-/* Define if you have the <sys/ioccom.h> header file.  */
-#define HAVE_SYS_IOCCOM_H 1
-
-/* Define if you have the <sys/ioctl.h> header file.  */
-#define HAVE_SYS_IOCTL_H 1
-
-/* Define if you have the <sys/locking.h> header file.  */
-/* #undef HAVE_SYS_LOCKING_H */
-
-/* Define if you have the <sys/mman.h> header file.  */
-#define HAVE_SYS_MMAN_H 1
-
-/* Define if you have the <sys/param.h> header file.  */
-#define HAVE_SYS_PARAM_H 1
-
-/* Define if you have the <sys/proc.h> header file.  */
-#define HAVE_SYS_PROC_H 1
-
-/* Define if you have the <sys/ptyio.h> header file.  */
-/* #undef HAVE_SYS_PTYIO_H */
-
-/* Define if you have the <sys/ptyvar.h> header file.  */
-/* #undef HAVE_SYS_PTYVAR_H */
-
-/* Define if you have the <sys/resource.h> header file.  */
-#define HAVE_SYS_RESOURCE_H 1
-
-/* Define if you have the <sys/select.h> header file.  */
-#define HAVE_SYS_SELECT_H 1
-
-/* Define if you have the <sys/socket.h> header file.  */
-#define HAVE_SYS_SOCKET_H 1
-
-/* Define if you have the <sys/sockio.h> header file.  */
-#define HAVE_SYS_SOCKIO_H 1
-
-/* Define if you have the <sys/stat.h> header file.  */
-#define HAVE_SYS_STAT_H 1
-
-/* Define if you have the <sys/str_tty.h> header file.  */
-/* #undef HAVE_SYS_STR_TTY_H */
-
-/* Define if you have the <sys/stream.h> header file.  */
-/* #undef HAVE_SYS_STREAM_H */
-
-/* Define if you have the <sys/stropts.h> header file.  */
-/* #undef HAVE_SYS_STROPTS_H */
-
-/* Define if you have the <sys/strtty.h> header file.  */
-/* #undef HAVE_SYS_STRTTY_H */
-
-/* Define if you have the <sys/syscall.h> header file.  */
-#define HAVE_SYS_SYSCALL_H 1
-
-/* Define if you have the <sys/sysctl.h> header file.  */
-#define HAVE_SYS_SYSCTL_H 1
-
-/* Define if you have the <sys/termio.h> header file.  */
-/* #undef HAVE_SYS_TERMIO_H */
-
-/* Define if you have the <sys/time.h> header file.  */
-#define HAVE_SYS_TIME_H 1
-
-/* Define if you have the <sys/timeb.h> header file.  */
-#define HAVE_SYS_TIMEB_H 1
-
-/* Define if you have the <sys/times.h> header file.  */
-#define HAVE_SYS_TIMES_H 1
-
-/* Define if you have the <sys/tty.h> header file.  */
-#define HAVE_SYS_TTY_H 1
-
-/* Define if you have the <sys/types.h> header file.  */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define if you have the <sys/uio.h> header file.  */
-#define HAVE_SYS_UIO_H 1
-
-/* Define if you have the <sys/un.h> header file.  */
-#define HAVE_SYS_UN_H 1
-
-/* Define if you have the <sys/utsname.h> header file.  */
-#define HAVE_SYS_UTSNAME_H 1
-
-/* Define if you have the <sys/wait.h> header file.  */
-#define HAVE_SYS_WAIT_H 1
-
-/* Define if you have the <syslog.h> header file.  */
-#define HAVE_SYSLOG_H 1
-
-/* Define if you have the <termio.h> header file.  */
-/* #undef HAVE_TERMIO_H */
-
-/* Define if you have the <termios.h> header file.  */
-#define HAVE_TERMIOS_H 1
-
-/* Define if you have the <tmpdir.h> header file.  */
-/* #undef HAVE_TMPDIR_H */
-
-/* Define if you have the <ttyent.h> header file.  */
-#define HAVE_TTYENT_H 1
-
-/* Define if you have the <udb.h> header file.  */
-/* #undef HAVE_UDB_H */
-
-/* Define if you have the <ulimit.h> header file.  */
-/* #undef HAVE_ULIMIT_H */
-
-/* Define if you have the <unistd.h> header file.  */
-#define HAVE_UNISTD_H 1
-
-/* Define if you have the <userpw.h> header file.  */
-/* #undef HAVE_USERPW_H */
-
-/* Define if you have the <usersec.h> header file.  */
-/* #undef HAVE_USERSEC_H */
-
-/* Define if you have the <util.h> header file.  */
-/* #undef HAVE_UTIL_H */
-
-/* Define if you have the <utime.h> header file.  */
-#define HAVE_UTIME_H 1
-
-/* Define if you have the <utmp.h> header file.  */
-#define HAVE_UTMP_H 1
-
-/* Define if you have the <utmpx.h> header file.  */
-/* #undef HAVE_UTMPX_H */
-
-/* Define if you have the <wait.h> header file.  */
-/* #undef HAVE_WAIT_H */
-
-/* Define if you have the <winsock.h> header file.  */
-/* #undef HAVE_WINSOCK_H */
-
-/* Define if you have the X11 library (-lX11).  */
-/* #undef HAVE_LIBX11 */
-
-/* Define if you have the Xau library (-lXau).  */
-#define HAVE_LIBXAU 1
-
-/* Define if you have the c_r library (-lc_r).  */
-/* #undef HAVE_LIBC_R */
-
-/* Define if you have the cfg library (-lcfg).  */
-/* #undef HAVE_LIBCFG */
-
-/* Define if you have the edit library (-ledit).  */
-#define HAVE_LIBEDIT 1
-
-/* Define if you have the gdbm library (-lgdbm).  */
-/* #undef HAVE_LIBGDBM */
-
-/* Define if you have the ndbm library (-lndbm).  */
-/* #undef HAVE_LIBNDBM */
-
-/* Define if you have the nsl library (-lnsl).  */
-/* #undef HAVE_LIBNSL */
-
-/* Define if you have the odm library (-lodm).  */
-/* #undef HAVE_LIBODM */
-
-/* Define if you have the readline library (-lreadline).  */
-#define HAVE_LIBREADLINE 1
-
-/* Define if you have the resolv library (-lresolv).  */
-/* #undef HAVE_LIBRESOLV */
-
-/* Define if you have the s library (-ls).  */
-/* #undef HAVE_LIBS */
-
-/* Define if you have the socket library (-lsocket).  */
-/* #undef HAVE_LIBSOCKET */
-
-/* Define if you have the syslog library (-lsyslog).  */
-/* #undef HAVE_LIBSYSLOG */
-
-/* Define if you have the termcap library (-ltermcap).  */
-#define HAVE_LIBTERMCAP 1
-
-/* Define if you have the util library (-lutil).  */
-#define HAVE_LIBUTIL 1
-
-#define HAVE_INT8_T 1
-#define HAVE_INT16_T 1
-#define HAVE_INT32_T 1
-#define HAVE_INT64_T 1
-#define HAVE_U_INT8_T 1
-#define HAVE_U_INT16_T 1
-#define HAVE_U_INT32_T 1
-#define HAVE_U_INT64_T 1
-
-#define RCSID(msg) \
-static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
-
-/*
- * Set ORGANIZATION to be the desired organization string printed
- * by the 'kinit' program.  It may have spaces.
- */
-#define ORGANIZATION "eBones International"
-
-#if 0
-#define BINDIR "/usr/athena/bin" 
-#define LIBDIR "/usr/athena/lib"
-#define LIBEXECDIR "/usr/athena/libexec"
-#define SBINDIR "/usr/athena/sbin"
-#endif
-
-#if 0
-#define KRB_CNF_FILES	{ "/etc/krb.conf",   "/etc/kerberosIV/krb.conf", 0}
-#define KRB_RLM_FILES	{ "/etc/krb.realms", "/etc/kerberosIV/krb.realms", 0}
-#define KRB_EQUIV	"/etc/krb.equiv"
-
-#define KEYFILE		"/etc/srvtab"
-
-#define KRBDIR		"/var/kerberos"
-#define DBM_FILE	KRBDIR "/principal"
-#define DEFAULT_ACL_DIR	KRBDIR
-
-#define KRBLOG		"/var/log/kerberos.log"	/* master server  */
-#define KRBSLAVELOG	"/var/log/kerberos_slave.log" /* slave server  */
-#define KADM_SYSLOG	"/var/log/admin_server.syslog"
-#define K_LOGFIL	"/var/log/kpropd.log"
-#endif
-
-/* Maximum values on all known systems */
-#define MaxHostNameLen (64+4)
-#define MaxPathLen (1024+4)
-
-/*
- * Define NDBM if you are using the 4.3 ndbm library (which is part of
- * libc).  If not defined, 4.2 dbm will be assumed.
- */
-#if defined(HAVE_DBM_FIRSTKEY)
-#define NDBM
-#endif
-
-/* ftp stuff -------------------------------------------------- */
-
-#define KERBEROS
-
-/* telnet stuff ----------------------------------------------- */
-
-/* define this if you have kerberos 4 */
-#define KRB4 1
-
-/* define this if you want encryption */
-#define ENCRYPTION 1
-
-/* define this if you want authentication */
-#define AUTHENTICATION 1
-
-#if defined(ENCRYPTION) && !defined(AUTHENTICATION)
-#define AUTHENTICATION 1
-#endif
-
-/* Set this if you want des encryption */
-#define DES_ENCRYPTION 1
-
-/* Set this to the default system lead string for telnetd 
- * can contain %-escapes: %s=sysname, %m=machine, %r=os-release
- * %v=os-version, %t=tty, %h=hostname, %d=date and time
- */
-/* #undef USE_IM */
-
-/* define this if you want diagnostics in telnetd */
-#define DIAGNOSTICS 1
-
-/* define this if you want support for broken ENV_{VALUE,VAR} systems  */
-/* #undef ENV_HACK */
-
-/*  */
-#define OLD_ENVIRON 1
-
-/* Used with login -p */
-/* #undef LOGIN_ARGS */
-
-/* Define if there are working stream ptys */
-/* #undef STREAMSPTY */
-
-/* set this to a sensible login */
-#ifndef LOGIN_PATH
-#define LOGIN_PATH BINDIR "/login"
-#endif
-
-
-/* ------------------------------------------------------------ */
-
-/*
- * Define this if your ndbm-library really is berkeley db and creates
- * files that ends in .db.
- */
-#define HAVE_NEW_DB 1
-
-/* Define this if you have a working getmsg */
-/* #undef HAVE_GETMSG */
-
-/* Define to enable new master key code */
-/* #undef RANDOM_MKEY */
-
-/* Location of the master key file, default value lives in <kdc.h> */
-/* #undef MKEYFILE */
-
-/* Define if you don't want support for afs, might be a good idea on
-   AIX if you don't have afs */
-#define NO_AFS 1
-
-/* Define if you have a readline compatible library */
-#define HAVE_READLINE 1
-
-#ifdef VOID_RETSIGTYPE
-#define SIGRETURN(x) return
-#else
-#define SIGRETURN(x) return (RETSIGTYPE)(x)
-#endif
-
-/* Define this if your compiler supports '#pragma weak' */
-#define HAVE_PRAGMA_WEAK 1
-
-/* Temporary fixes for krb_{rd,mk}_safe */
-#define DES_QUAD_GUESS 0
-#define DES_QUAD_NEW 1
-#define DES_QUAD_OLD 2
-
-/* Set this to one of the constants above to specify default checksum
-   type to emit */
-#define DES_QUAD_DEFAULT DES_QUAD_GUESS
-
-/*
- * AIX braindamage!
- */
-#if _AIX
-#define _ALL_SOURCE
-#define _POSIX_SOURCE
-/* this is left for hysteric reasons :-) */
-#define unix /* well, ok... */
-#endif
-
-/*
- * SunOS braindamage! (Sun include files are generally braindead)
- */
-#if (defined(sun) || defined(__sun))
-#if defined(__svr4__) || defined(__SVR4)
-#define SunOS 5
-#else
-#define SunOS 4
-#endif
-#endif
-
-#if defined(__sgi) || defined(sgi)
-#if defined(__SYSTYPE_SVR4) || defined(_SYSTYPE_SVR4)
-#define IRIX 5
-#else
-#define IRIX 4
-#endif
-#endif
-
-/* IRIX 4 braindamage */
-#if IRIX == 4 && !defined(__STDC__)
-#define __STDC__ 0
-#endif
diff --git a/kerberosIV/include/version.h b/kerberosIV/include/version.h
deleted file mode 100644
index ae8ca52958f3..000000000000
--- a/kerberosIV/include/version.h
+++ /dev/null
@@ -1,2 +0,0 @@
-char *krb4_long_version = "@(#)$Version: krb4-0.9.6 by root on greenpeace.grondar.za (i386-unknown-freebsd3.0) Sun Jun 22 18:14:59 SAT 1997 $";
-char *krb4_version = "krb4-0.9.6";
diff --git a/kerberosIV/lib/Makefile b/kerberosIV/lib/Makefile
deleted file mode 100644
index f2b0a532f263..000000000000
--- a/kerberosIV/lib/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-SUBDIR=	libroken libsl libacl libkadm libkafs libkdb libkrb libtelnet
-
-.include <bsd.subdir.mk>
diff --git a/kerberosIV/lib/Makefile.inc b/kerberosIV/lib/Makefile.inc
deleted file mode 100644
index acd5059dc437..000000000000
--- a/kerberosIV/lib/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-SHLIB_MAJOR?=	3
-SHLIB_MINOR?=	0
-
-.include "../Makefile.inc"
diff --git a/kerberosIV/lib/libacl/Makefile b/kerberosIV/lib/libacl/Makefile
deleted file mode 100644
index 74a987e574e2..000000000000
--- a/kerberosIV/lib/libacl/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $FreeBSD$
-
-LIB=		acl
-CFLAGS+=	-I${KRB4DIR}/include \
-		-I${INCLUDEOBJDIR} \
-		-I${KRB4DIR}/lib/roken \
-		-I${KRB4DIR}/lib/krb \
-		-I${KRB4DIR}/lib/acl
-SRCS=		acl_files.c
-MAN3=		${KRB4DIR}/man/acl_check.3
-MLINKS=		acl_check.3 acl_canonicalize_principal.3 \
-		acl_check.3 acl_exact_match.3 \
-		acl_check.3 acl_add.3 \
-		acl_check.3 acl_delete.3 \
-		acl_check.3 acl_initialize.3
-
-INCLUDES=	${KRB4DIR}/lib/acl/acl.h
-
-.include <bsd.lib.mk>
-
-.PATH:		${KRB4DIR}/lib/acl
diff --git a/kerberosIV/lib/libkadm/Makefile b/kerberosIV/lib/libkadm/Makefile
deleted file mode 100644
index ba33c27c3647..000000000000
--- a/kerberosIV/lib/libkadm/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $FreeBSD$
-
-LIB=		kadm
-CFLAGS+=	-I${KRB4DIR}/include \
-		-I${INCLUDEOBJDIR} \
-		-I${KRB4DIR}/lib/roken \
-		-I${KRB4DIR}/lib/krb \
-		-I${KRB4DIR}/lib/kdb \
-		-I${KRB4DIR}/lib/kadm \
-		-I${KRBOBJDIR} \
-		-I${KADMOBJDIR}
-SRCS=		kadm_cli_wrap.c kadm_stream.c kadm_supp.c \
-		${KADMOBJDIR}/kadm_err.c ${KADMOBJDIR}/kadm_err.h \
-		${KRBOBJDIR}/krb_err.h
-
-INCLUDES=	${KRB4DIR}/lib/kadm/kadm.h ${KADMOBJDIR}/kadm_err.h
-
-.include <bsd.lib.mk>
-
-.PATH:		${KRB4DIR}/lib/kadm
diff --git a/kerberosIV/lib/libkafs/Makefile b/kerberosIV/lib/libkafs/Makefile
deleted file mode 100644
index a49606a42db9..000000000000
--- a/kerberosIV/lib/libkafs/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $FreeBSD$
-
-LIB=		kafs
-CFLAGS+=	-I${KRB4DIR}/include \
-		-I${INCLUDEOBJDIR} \
-		-I${KRB4DIR}/lib/roken \
-		-I${KRB4DIR}/lib/krb \
-		-I${KRB4DIR}/lib/kafs
-SRCS=		afssys.c afskrb.c
-MAN3=		${KRB4DIR}/man/kafs.3
-MLINKS=		kafs.3 k_hasafs.3 kafs.3 k_afsklog.3 kafs.3 k_afsklog_uid.3 \
-		kafs.3 k_pioctl.3 kafs.3 k_unlog.3 kafs.3 k_setpag.3 \
-		kafs.3 k_afs_cell_of_file.3
-
-
-INCLUDES=	${KRB4DIR}/lib/kafs/kafs.h
-
-.include <bsd.lib.mk>
-
-.PATH:		${KRB4DIR}/lib/kafs
diff --git a/kerberosIV/lib/libkdb/Makefile b/kerberosIV/lib/libkdb/Makefile
deleted file mode 100644
index 5a673333acff..000000000000
--- a/kerberosIV/lib/libkdb/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-LIB=		kdb
-CFLAGS+=	-I${KRB4DIR}/include \
-		-I${INCLUDEOBJDIR} \
-		-I${KRB4DIR}/lib/roken \
-		-I${KRB4DIR}/lib/krb \
-		-I${KRB4DIR}/lib/kdb \
-		-I${KADMOBJDIR}
-SRCS=		krb_cache.c krb_kdb_utils.c copykey.c krb_lib.c krb_dbm.c \
-		print_princ.c base64.c
-
-INCLUDES=	${KRB4DIR}/lib/kdb/kdc.h ${KRB4DIR}/lib/kdb/krb_db.h
-
-.include <bsd.lib.mk>
-
-.PATH:		${KRB4DIR}/lib/kdb
diff --git a/kerberosIV/lib/libkrb/Makefile b/kerberosIV/lib/libkrb/Makefile
deleted file mode 100644
index 3544daf3cb83..000000000000
--- a/kerberosIV/lib/libkrb/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-# $FreeBSD$
-
-LIB=		krb
-CFLAGS+=	-I${KRB4DIR}/include \
-		-I${INCLUDEOBJDIR} \
-		-I${KRB4DIR}/lib/roken \
-		-I${KRB4DIR}/lib/krb \
-		-I${KRBOBJDIR}
-DPADD+=		${LIBCRYPT}
-LDADD+=		-lcrypt
-SRCS=		cr_err_reply.c create_auth_reply.c create_ciph.c \
-         	create_death_packet.c create_ticket.c dest_tkt.c get_in_tkt.c \
-          	get_svc_in_tkt.c getrealm.c k_localtime.c krb_err_txt.c \
-          	krb_get_in_tkt.c kuserok.c parse_name.c kntoln.c mk_auth.c \
-	  	krb_check_auth.c mk_err.c mk_safe.c rd_err.c rd_safe.c \
-          	recvauth.c mk_priv.c rd_req.c decomp_ticket.c lifetime.c \
-          	month_sname.c stime.c read_service_key.c getst.c sendauth.c \
-          	netread.c netwrite.c rd_priv.c krb_equiv.c str2key.c \
-		get_ad_tkt.c mk_req.c get_cred.c get_tf_realm.c \
-		get_tf_fullname.c one.c save_credentials.c send_to_kdc.c \
-		get_host.c get_krbrlm.c k_gethostname.c tf_util.c \
-		debug_decl.c k_flock.c tkt_string.c getaddrs.c \
-		k_getsockinst.c k_getport.c lsb_addr_comp.c name2name.c \
-		get_default_principal.c realm_parse.c verify_user.c \
-	  	rw.c kdc_reply.c encrypt_ktext.c swab.c gettimeofday.c \
-	  	check_time.c krb_err.c et_list.c resolve.c unparse_name.c \
-	  	logging.c k_concat.c \
-		snprintf.c strdup.c strcasecmp.c \
-		${KRBOBJDIR}/krb_err.h
-MAN3=		${KRB4DIR}/man/kerberos.3 \
-		${KRB4DIR}/man/krb_realmofhost.3 \
-		${KRB4DIR}/man/krb_sendauth.3 \
-		${KRB4DIR}/man/krb_set_tkt_string.3 \
-		${KRB4DIR}/man/kuserok.3 \
-		${KRB4DIR}/man/tf_util.3
-MLINKS=		kerberos.3 krb_mk_req.3 \
-		kerberos.3 krb_rd_req.3 \
-		kerberos.3 krb_kntoln.3 \
-		kerberos.3 krb_set_key.3 \
-		kerberos.3 krb_get_cred.3 \
-		kerberos.3 krb_mk_priv.3 \
-		kerberos.3 krb_rd_priv.3 \
-		kerberos.3 krb_mk_safe.3 \
-		kerberos.3 krb_rd_safe.3 \
-		kerberos.3 krb_mk_err.3 \
-		kerberos.3 krb_rd_err.3 \
-		kerberos.3 krb_ck_repl.3 \
-		krb_realmofhost.3 krb_get_phost.3 \
-		krb_realmofhost.3 krb_get_krbhst.3 \
-		krb_realmofhost.3 krb_get_admhst.3 \
-		krb_realmofhost.3 krb_get_lrealm.3 \
-		krb_sendauth.3 krb_recvauth.3 \
-		krb_sendauth.3 krb_net_write.3 \
-		krb_sendauth.3 krb_net_read.3 \
-		tf_util.3 tf_init.3 \
-		tf_util.3 tf_get_pname.3 \
-		tf_util.3 tf_get_pinst.3 \
-		tf_util.3 tf_get_cred.3 \
-		tf_util.3 tf_close.3
-
-INCLUDES=	${KRB4DIR}/lib/krb/krb.h ${KRB4DIR}/lib/krb/klog.h \
-		${KRB4DIR}/lib/krb/prot.h ${KRBOBJDIR}/krb_err.h
-
-.include <bsd.lib.mk>
-
-.PATH:		${KRB4DIR}/lib/krb
-.PATH:		${KRB4DIR}/lib/roken
diff --git a/kerberosIV/lib/libroken/Makefile b/kerberosIV/lib/libroken/Makefile
deleted file mode 100644
index 4e00a2071d3c..000000000000
--- a/kerberosIV/lib/libroken/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-LIB=		roken
-CFLAGS+=	-I${KRB4DIR}/include \
-		-I${INCLUDEOBJDIR} \
-		-I${KRB4DIR}/lib/roken
-SRCS=		k_getpwuid.c k_getpwnam.c signal.c tm2time.c \
-		verify.c inaddr2str.c mini_inetd.c get_window_size.c \
-		warnerr.c snprintf.c  strlwr.c strnlen.c strupr.c
-NOPIC=		yes
-
-install:
-
-.include <bsd.lib.mk>
-
-.PATH:		${KRB4DIR}/lib/roken
diff --git a/kerberosIV/lib/libsl/Makefile b/kerberosIV/lib/libsl/Makefile
deleted file mode 100644
index 18d82bf9da12..000000000000
--- a/kerberosIV/lib/libsl/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-LIB=		sl
-CFLAGS+=	-I${KRB4DIR}/include \
-		-I${INCLUDEOBJDIR} \
-		-I${KRB4DIR}/lib/roken \
-		-I${KRB4DIR}/lib/sl
-SRCS=		sl.c
-NOPIC=		yes
-
-install:
-
-.include <bsd.lib.mk>
-
-.PATH:		${KRB4DIR}/lib/sl
diff --git a/kerberosIV/lib/libtelnet/Makefile b/kerberosIV/lib/libtelnet/Makefile
deleted file mode 100644
index c237735600e8..000000000000
--- a/kerberosIV/lib/libtelnet/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $FreeBSD$
-
-LIB=		telnet
-
-SRCS=		genget.c getent.c misc.c encrypt.c auth.c kerberos.c enc_des.c
-
-CFLAGS+=	-DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \
-		-DKRB4 -I${TELNETDIR} \
-		-I${KRB4DIR}/lib/krb
-
-NOPIC=		yes
-
-INCLUDES=	${TELNETDIR}/arpa/telnet.h 
-
-#
-# Before complaining about this, please *double-check* that you have
-# updated the ldconfig path in /etc/rc to include /usr/lib/compat that
-# was added in src/etc/rc rev 1.98.
-# This is so that `ld' will not continue to generate binaries linked
-# shared against libtelnet, so that in a future release we can move this
-# off to a compat dist (like compat22).
-#
-beforeinstall:
-	rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
-
-.include <bsd.lib.mk>
-
-.PATH:	${TELNETDIR}/libtelnet
diff --git a/kerberosIV/libexec/Makefile b/kerberosIV/libexec/Makefile
deleted file mode 100644
index d8079b3e379f..000000000000
--- a/kerberosIV/libexec/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-SUBDIR=	kauthd kipd kpropd telnetd
-
-.include <bsd.subdir.mk>
diff --git a/kerberosIV/libexec/Makefile.inc b/kerberosIV/libexec/Makefile.inc
deleted file mode 100644
index 535597e7d2a5..000000000000
--- a/kerberosIV/libexec/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-BINDIR=	/usr/libexec
-
-.include "../Makefile.inc"
diff --git a/kerberosIV/libexec/kauthd/Makefile b/kerberosIV/libexec/kauthd/Makefile
deleted file mode 100644
index 559ad7815025..000000000000
--- a/kerberosIV/libexec/kauthd/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-PROG=		kauthd
-MAN8=		${KRB4DIR}/man/kauthd.8
-SRCS=		kauthd.c encdata.c marshall.c
-CFLAGS+=	-I${KRB4DIR}/include \
-		-I${KRB4DIR}/lib/roken \
-		-I${KRB4DIR}/lib/kafs \
-		-I${KRB4DIR}/lib/krb \
-		-I${KRB4DIR}/appl/kauth
-LDADD=		-L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt
-DPADD=		${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT}
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB4DIR}/appl/kauth
diff --git a/kerberosIV/libexec/kipd/Makefile b/kerberosIV/libexec/kipd/Makefile
deleted file mode 100644
index 8ac9cbd74dcd..000000000000
--- a/kerberosIV/libexec/kipd/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-PROG=		kipd
-NOMAN=		yes
-SRCS=		kipd.c common.c
-CFLAGS+=	-I${KRB4DIR}/include \
-		-I${KRB4DIR}/lib/roken \
-		-I${KRB4DIR}/lib/krb \
-		-I${KRB4DIR}/appl/kip
-LDADD=		-L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt
-DPADD=		${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT}
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB4DIR}/appl/kip
diff --git a/kerberosIV/libexec/kpropd/Makefile b/kerberosIV/libexec/kpropd/Makefile
deleted file mode 100644
index 7a21ba3259d5..000000000000
--- a/kerberosIV/libexec/kpropd/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-PROG=		kpropd
-MAN8=		${KRB4DIR}/man/kpropd.8
-SRCS=		kpropd.c
-CFLAGS+=	-I${KRB4DIR}/include \
-		-I${KRB4DIR}/lib/roken \
-		-I${KRB4DIR}/lib/kdb \
-		-I${KRB4DIR}/lib/krb \
-		-I${KRB4DIR}/slave \
-		-I${INCLOBJDIR} \
-		-I${.CURDIR}/../include
-LDADD=		-L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt
-DPADD=		${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT}
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB4DIR}/slave
diff --git a/kerberosIV/libexec/telnetd/Makefile b/kerberosIV/libexec/telnetd/Makefile
deleted file mode 100644
index 8c3917a090db..000000000000
--- a/kerberosIV/libexec/telnetd/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $FreeBSD$
-
-# Do not define -DKLUDGELINEMODE, as it does not interact well with many
-# telnet implementations.
-
-PROG=		telnetd
-MAN8=		telnetd.8
-
-CFLAGS+=	-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \
-		-DENV_HACK -DAUTHENTICATION -DENCRYPTION \
-		-I${TELNETDIR}
-
-SRCS=		global.c slc.c state.c sys_term.c telnetd.c \
-		termstat.c utility.c authenc.c
-
-DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} \
-		${LIBCRYPT}
-LDADD=		-lutil -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \
-		-L${KRBOBJDIR} -lkrb -lcrypt
-
-.include <bsd.prog.mk>
-
-.PATH:	${TELNETDIR}/telnetd
diff --git a/kerberosIV/share/info/Makefile b/kerberosIV/share/info/Makefile
deleted file mode 100644
index 0360a58be245..000000000000
--- a/kerberosIV/share/info/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-#       @(#)Makefile    8.1 (Berkeley) 6/5/93
-
-NOOBJ=  noobj
-
-all clean cleandir depend lint tags:
-
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 dir-tmpl \
-		${DESTDIR}${BINDIR}/info/dir-tmpl
-	if [ ! -f ${DESTDIR}${BINDIR}/info/dir ]; then \
-		${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 dir-tmpl \
-			${DESTDIR}${BINDIR}/info/dir ; \
-	fi
-
-.include <bsd.prog.mk>
diff --git a/kerberosIV/usr.bin/Makefile b/kerberosIV/usr.bin/Makefile
deleted file mode 100644
index 258c347eba2a..000000000000
--- a/kerberosIV/usr.bin/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-SUBDIR=	kadmin kauth kdestroy kinit klist ksrvtgt telnet
-
-.include <bsd.subdir.mk>
diff --git a/kerberosIV/usr.bin/Makefile.inc b/kerberosIV/usr.bin/Makefile.inc
deleted file mode 100644
index abd146b6720e..000000000000
--- a/kerberosIV/usr.bin/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-BINDIR=	/usr/bin
-
-.include "../Makefile.inc"
diff --git a/kerberosIV/usr.bin/kadmin/Makefile b/kerberosIV/usr.bin/kadmin/Makefile
deleted file mode 100644
index e7af692ec2f9..000000000000
--- a/kerberosIV/usr.bin/kadmin/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $FreeBSD$
-
-PROG=		kadmin
-MAN8=		${KRB4DIR}/man/kadmin.8
-SRCS=		kadmin.c new_pwd.c \
-		${KADMOBJDIR}/kadm_err.h ${KRBOBJDIR}/krb_err.h
-CFLAGS+=	-I${KRB4DIR}/include \
-		-I${KRB4DIR}/lib/roken \
-		-I${KRB4DIR}/lib/sl \
-		-I${KRB4DIR}/lib/acl \
-		-I${KRB4DIR}/lib/kadm \
-		-I${KRB4DIR}/lib/kdb \
-		-I${KRB4DIR}/lib/krb \
-		-I${KRB4DIR}/kadmin \
-		-I${KADMOBJDIR} \
-		-I${KRBOBJDIR} \
-		-I${.CURDIR}/../include
-LDADD=		-L${ROKENOBJDIR} -lroken -L${SLOBJDIR} -lsl \
-		-L${ACLOBJDIR} -lacl -L${KADMOBJDIR} -lkadm \
-		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb \
-		-ldes -lcrypt -lcom_err -lreadline -ltermcap
-DPADD=		${LIBROKEN} ${LIBSL} ${LIBACL} ${LIBKADM} ${LIBKDB} ${LIBKRB} \
-		${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBREADLINE} \
-		${LIBTERMCAP}
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB4DIR}/kadmin
diff --git a/kerberosIV/usr.bin/kauth/Makefile b/kerberosIV/usr.bin/kauth/Makefile
deleted file mode 100644
index bfa9bc23cb68..000000000000
--- a/kerberosIV/usr.bin/kauth/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-PROG=		kauth
-MAN1=		${KRB4DIR}/man/kauth.1
-SRCS=		kauth.c rkinit.c encdata.c marshall.c
-CFLAGS+=	-I${KRB4DIR}/include \
-		-I${KRB4DIR}/lib/roken \
-		-I${KRB4DIR}/lib/kafs \
-		-I${KRB4DIR}/lib/krb \
-		-I${KRB4DIR}/appl/kauth
-LDADD=		-L${ROKENOBJDIR} -lroken -L${KAFSOBJDIR} -lkafs \
-		-L${KRBOBJDIR} -lkrb -ldes -lcrypt
-DPADD=		${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} ${LIBCRYPT}
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB4DIR}/appl/kauth
diff --git a/kerberosIV/usr.bin/kdestroy/Makefile b/kerberosIV/usr.bin/kdestroy/Makefile
deleted file mode 100644
index 3a4824adef87..000000000000
--- a/kerberosIV/usr.bin/kdestroy/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-PROG=		kdestroy
-MAN1=		${KRB4DIR}/man/kdestroy.1
-SRCS=		kdestroy.c
-CFLAGS+=	-I${KRB4DIR}/include \
-		-I${KRB4DIR}/lib/roken \
-		-I${KRB4DIR}/lib/kafs \
-		-I${KRB4DIR}/lib/kadm \
-		-I${KRB4DIR}/lib/kdb \
-		-I${KRB4DIR}/lib/krb \
-		-I${KRB4DIR}/kuser
-LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -ldes -lcrypt
-DPADD=		${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} ${LIBCRYPT}
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB4DIR}/kuser
diff --git a/kerberosIV/usr.bin/kinit/Makefile b/kerberosIV/usr.bin/kinit/Makefile
deleted file mode 100644
index 2554c8d0ed89..000000000000
--- a/kerberosIV/usr.bin/kinit/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-PROG=		kinit
-MAN1=		${KRB4DIR}/man/kinit.1
-SRCS=		kinit.c
-CFLAGS+=	-I${KRB4DIR}/include \
-		-I${KRB4DIR}/lib/roken \
-		-I${KRB4DIR}/lib/kadm \
-		-I${KRB4DIR}/lib/kdb \
-		-I${KRB4DIR}/lib/krb \
-		-I${KRB4DIR}/kuser
-LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KRBOBJDIR} -lkrb -ldes -lcrypt
-DPADD=		${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT}
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB4DIR}/kuser
diff --git a/kerberosIV/usr.bin/klist/Makefile b/kerberosIV/usr.bin/klist/Makefile
deleted file mode 100644
index 03ae469b849a..000000000000
--- a/kerberosIV/usr.bin/klist/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-PROG=		klist
-MAN1=		${KRB4DIR}/man/klist.1
-SRCS=		klist.c
-CFLAGS+=	-I${KRB4DIR}/include \
-		-I${KRB4DIR}/lib/roken \
-		-I${KRB4DIR}/lib/kafs \
-		-I${KRB4DIR}/lib/kadm \
-		-I${KRB4DIR}/lib/kdb \
-		-I${KRB4DIR}/lib/krb \
-		-I${KRB4DIR}/kuser
-LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -ldes -lcrypt
-DPADD=		${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} ${LIBCRYPT}
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB4DIR}/kuser
diff --git a/kerberosIV/usr.bin/ksrvtgt/Makefile b/kerberosIV/usr.bin/ksrvtgt/Makefile
deleted file mode 100644
index 4bcb1c9ec252..000000000000
--- a/kerberosIV/usr.bin/ksrvtgt/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-MAN1=		${KRB4DIR}/man/ksrvtgt.1
-
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${KRB4DIR}/appl/kauth/ksrvtgt.in ${DESTDIR}${BINDIR}/ksrvtgt
-
-depend all:
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB4DIR}/appl/kauth
diff --git a/kerberosIV/usr.bin/telnet/Makefile b/kerberosIV/usr.bin/telnet/Makefile
deleted file mode 100644
index 809fa8a22e75..000000000000
--- a/kerberosIV/usr.bin/telnet/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-PROG=		telnet
-
-CFLAGS+=	-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \
-		-DENCRYPTION -DAUTHENTICATION -DKRB4 \
-		-I${TELNETDIR}
-
-SRCS=		authenc.c commands.c main.c network.c ring.c sys_bsd.c \
-		telnet.c terminal.c tn3270.c utilities.c
-
-DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} ${LIBCRYPT}
-LDADD=		-ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \
-		-L${KRBOBJDIR} -lkrb -lcrypt
-
-.include <bsd.prog.mk>
-
-.PATH:	${TELNETDIR}/telnet
diff --git a/kerberosIV/usr.sbin/Makefile b/kerberosIV/usr.sbin/Makefile
deleted file mode 100644
index 398bcd8e4951..000000000000
--- a/kerberosIV/usr.sbin/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-SUBDIR=	ext_srvtab kadmind kdb_destroy kdb_edit kdb_init kdb_util \
-	kerberos kip kprop ksrvutil kstash
-
-.include <bsd.subdir.mk>
diff --git a/kerberosIV/usr.sbin/Makefile.inc b/kerberosIV/usr.sbin/Makefile.inc
deleted file mode 100644
index dab729d159e4..000000000000
--- a/kerberosIV/usr.sbin/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-BINDIR=	/usr/sbin
-
-.include "../Makefile.inc"
diff --git a/kerberosIV/usr.sbin/ext_srvtab/Makefile b/kerberosIV/usr.sbin/ext_srvtab/Makefile
deleted file mode 100644
index 0685d550d0ec..000000000000
--- a/kerberosIV/usr.sbin/ext_srvtab/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-PROG=		ext_srvtab
-MAN8=		${KRB4DIR}/man/ext_srvtab.8
-SRCS=		ext_srvtab.c
-CFLAGS+=	-I${KRB4DIR}/include \
-		-I${KRB4DIR}/lib/roken \
-		-I${KRB4DIR}/admin \
-		-I${KRB4DIR}/lib/kadm \
-		-I${KRB4DIR}/lib/kdb \
-		-I${KRB4DIR}/lib/krb \
-		-I${.CURDIR}/../include
-LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt
-DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT}
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB4DIR}/admin
diff --git a/kerberosIV/usr.sbin/kadmind/Makefile b/kerberosIV/usr.sbin/kadmind/Makefile
deleted file mode 100644
index 52698d425532..000000000000
--- a/kerberosIV/usr.sbin/kadmind/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $FreeBSD$
-
-PROG=		kadmind
-MAN8=		${KRB4DIR}/man/kadmind.8
-SRCS=		kadm_server.c kadm_funcs.c admin_server.c kadm_ser_wrap.c \
-		pw_check.c ${KADMOBJDIR}/kadm_err.h ${KRBOBJDIR}/krb_err.h
-CFLAGS+=	-I${KRB4DIR}/include \
-		-I${KRB4DIR}/lib/roken \
-		-I${KRB4DIR}/lib/sl \
-		-I${KRB4DIR}/lib/acl \
-		-I${KRB4DIR}/lib/kadm \
-		-I${KRB4DIR}/lib/kdb \
-		-I${KRB4DIR}/lib/krb \
-		-I${KRB4DIR}/kadmin \
-		-I${KADMOBJDIR} \
-		-I${KRBOBJDIR} \
-		-I${.CURDIR}/../include
-LDADD=		-L${ROKENOBJDIR} -lroken -L${SLOBJDIR} -lsl \
-		-L${ACLOBJDIR} -lacl -L${KADMOBJDIR} -lkadm \
-		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb \
-		-ldes -lcom_err -lcrypt
-DPADD=		${LIBROKEN} ${LIBSL} ${LIBACL} ${LIBKADM} ${LIBKDB} ${LIBKRB} \
-		${LIBDES} ${LIBCOM_ERR} ${LIBCRYPT}
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB4DIR}/kadmin
diff --git a/kerberosIV/usr.sbin/kdb_destroy/Makefile b/kerberosIV/usr.sbin/kdb_destroy/Makefile
deleted file mode 100644
index a9ec515a456f..000000000000
--- a/kerberosIV/usr.sbin/kdb_destroy/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-PROG=		kdb_destroy
-MAN8=		${KRB4DIR}/man/kdb_destroy.8
-SRCS=		kdb_destroy.c
-CFLAGS+=	-I${KRB4DIR}/include \
-		-I${KRB4DIR}/lib/roken \
-		-I${KRB4DIR}/lib/kadm \
-		-I${KRB4DIR}/lib/kdb \
-		-I${KRB4DIR}/lib/krb \
-		-I${KRB4DIR}/admin \
-		-I${.CURDIR}/../include
-LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt
-DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${CRYPT}
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB4DIR}/admin
diff --git a/kerberosIV/usr.sbin/kdb_edit/Makefile b/kerberosIV/usr.sbin/kdb_edit/Makefile
deleted file mode 100644
index 3db4b709dcdd..000000000000
--- a/kerberosIV/usr.sbin/kdb_edit/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-PROG=		kdb_edit
-MAN8=		${KRB4DIR}/man/kdb_edit.8
-SRCS=		kdb_edit.c
-CFLAGS+=	-I${KRB4DIR}/include \
-		-I${KRB4DIR}/lib/roken \
-		-I${KRB4DIR}/lib/kadm \
-		-I${KRB4DIR}/lib/kdb \
-		-I${KRB4DIR}/lib/krb \
-		-I${KRB4DIR}/admin \
-		-I${.CURDIR}/../include
-LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt
-DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT}
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB4DIR}/admin
diff --git a/kerberosIV/usr.sbin/kdb_init/Makefile b/kerberosIV/usr.sbin/kdb_init/Makefile
deleted file mode 100644
index e15dae478334..000000000000
--- a/kerberosIV/usr.sbin/kdb_init/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-PROG=		kdb_init
-MAN8=		${KRB4DIR}/man/kdb_init.8
-SRCS=		kdb_init.c
-CFLAGS+=	-I${KRB4DIR}/include \
-		-I${KRB4DIR}/lib/roken \
-		-I${KRB4DIR}/lib/kadm \
-		-I${KRB4DIR}/lib/kdb \
-		-I${KRB4DIR}/lib/krb \
-		-I${KRB4DIR}/admin \
-		-I${.CURDIR}/../include
-LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt
-DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT}
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB4DIR}/admin
diff --git a/kerberosIV/usr.sbin/kdb_util/Makefile b/kerberosIV/usr.sbin/kdb_util/Makefile
deleted file mode 100644
index 32162508ff97..000000000000
--- a/kerberosIV/usr.sbin/kdb_util/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-PROG=		kdb_util
-MAN8=		${KRB4DIR}/man/kdb_util.8
-SRCS=		kdb_util.c
-CFLAGS+=	-I${KRB4DIR}/include \
-		-I${KRB4DIR}/lib/roken \
-		-I${KRB4DIR}/lib/kadm \
-		-I${KRB4DIR}/lib/kdb \
-		-I${KRB4DIR}/lib/krb \
-		-I${KRB4DIR}/admin \
-		-I${.CURDIR}/../include
-LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt
-DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT}
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB4DIR}/admin
diff --git a/kerberosIV/usr.sbin/kerberos/Makefile b/kerberosIV/usr.sbin/kerberos/Makefile
deleted file mode 100644
index 1f3300b4a7ac..000000000000
--- a/kerberosIV/usr.sbin/kerberos/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $FreeBSD$
-
-PROG=		kerberos
-MAN1=		${KRB4DIR}/man/kerberos.1
-MAN5=		${KRB4DIR}/man/krb.conf.5 ${KRB4DIR}/man/krb.realms.5 \
-		${KRB4DIR}/man/krb.equiv.5
-MAN8=		${KRB4DIR}/man/kerberos.8
-SRCS=		kerberos.c
-CFLAGS+=	-I${KRB4DIR}/include \
-		-I${KRB4DIR}/lib/roken \
-		-I${KRB4DIR}/lib/kadm \
-		-I${KRB4DIR}/lib/kdb \
-		-I${KRB4DIR}/lib/krb \
-		-I${KADMOBJDIR} \
-		-I${KRBOBJDIR} \
-		-I${.CURDIR}/../include
-LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt
-DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT}
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB4DIR}/server
diff --git a/kerberosIV/usr.sbin/kip/Makefile b/kerberosIV/usr.sbin/kip/Makefile
deleted file mode 100644
index 5fbe1d21be65..000000000000
--- a/kerberosIV/usr.sbin/kip/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-PROG=		kip
-NOMAN=		true
-SRCS=		kip.c common.c
-CFLAGS+=	-I${KRB4DIR}/include \
-		-I${KRB4DIR}/lib/roken \
-		-I${KRB4DIR}/lib/krb \
-		-I${KRB4DIR}/kadmin \
-		-I${KRBOBJDIR} \
-		-I${.CURDIR}/../include
-LDADD=		-L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt
-DPADD=		${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT}
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB4DIR}/appl/kip
diff --git a/kerberosIV/usr.sbin/kprop/Makefile b/kerberosIV/usr.sbin/kprop/Makefile
deleted file mode 100644
index eb81251e72ae..000000000000
--- a/kerberosIV/usr.sbin/kprop/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-PROG=		kprop
-MAN8=		${KRB4DIR}/man/kprop.8
-SRCS=		kprop.c
-CFLAGS+=	-I${KRB4DIR}/include \
-		-I${KRB4DIR}/lib/roken \
-		-I${KRB4DIR}/lib/kdb \
-		-I${KRB4DIR}/lib/krb \
-		-I${KRB4DIR}/slave \
-		-I${INCLOBJDIR} \
-		-I${.CURDIR}/../include
-LDADD=		-L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt
-DPADD=		${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT}
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB4DIR}/slave
diff --git a/kerberosIV/usr.sbin/ksrvutil/Makefile b/kerberosIV/usr.sbin/ksrvutil/Makefile
deleted file mode 100644
index 8799cfc28da1..000000000000
--- a/kerberosIV/usr.sbin/ksrvutil/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $FreeBSD$
-
-PROG=		ksrvutil
-MAN8=		${KRB4DIR}/man/ksrvutil.8
-SRCS=		ksrvutil.c ksrvutil_get.c \
-		${KADMOBJDIR}/kadm_err.h ${KRBOBJDIR}/krb_err.h
-CFLAGS+=	-I${KRB4DIR}/include \
-		-I${KRB4DIR}/lib/roken \
-		-I${KRB4DIR}/lib/sl \
-		-I${KRB4DIR}/lib/acl \
-		-I${KRB4DIR}/lib/kadm \
-		-I${KRB4DIR}/lib/kdb \
-		-I${KRB4DIR}/lib/krb \
-		-I${KRB4DIR}/admin \
-		-I${KADMOBJDIR} \
-		-I${KRBOBJDIR} \
-		-I${.CURDIR}/../include
-LDADD=		-L${ROKENOBJDIR} -lroken -L${KADMOBJDIR} -lkadm \
-		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcom_err \
-		-lcrypt
-DPADD=		${LIBROKEN} ${LIBKADM} ${LIBKDB} ${LIBKRB} \
-		${LIBDES} ${LIBCOM_ERR} ${LIBCRYPT}
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB4DIR}/kadmin
diff --git a/kerberosIV/usr.sbin/kstash/Makefile b/kerberosIV/usr.sbin/kstash/Makefile
deleted file mode 100644
index c46dc20fbbce..000000000000
--- a/kerberosIV/usr.sbin/kstash/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-PROG=		kstash
-MAN8=		${KRB4DIR}/man/kstash.8
-SRCS=		kstash.c
-CFLAGS+=	-I${KRB4DIR}/include \
-		-I${KRB4DIR}/lib/roken \
-		-I${KRB4DIR}/lib/krb \
-		-I${KRB4DIR}/admin \
-		-I${KRB4DIR}/lib/kadm \
-		-I${KRB4DIR}/lib/kdb \
-		-I${.CURDIR}/../include
-LDADD=		-L${ROKENOBJDIR} -lroken \
-		-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt
-DPADD=		${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT}
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB4DIR}/admin
diff --git a/lib/Makefile b/lib/Makefile
index afc3a43a0449..19ba775495d2 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/Makefile,v 1.87.2.4 1999/12/13 15:08:10 peter Exp $
 
 # To satisfy shared library or ELF linkage when only the libraries being
 # built are visible:
diff --git a/lib/compat/Makefile b/lib/compat/Makefile
index 41b9442a3f24..7c0f69201101 100644
--- a/lib/compat/Makefile
+++ b/lib/compat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/compat/Makefile,v 1.3.4.2 1999/08/29 14:55:02 peter Exp $
 
 SUBDIR=
 
diff --git a/lib/compat/Makefile.inc b/lib/compat/Makefile.inc
index 23e27116dac4..63a3eccfa693 100644
--- a/lib/compat/Makefile.inc
+++ b/lib/compat/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/compat/Makefile.inc,v 1.5.2.1 1999/08/29 14:55:02 peter Exp $
 
 LIBCOMPATDIR?=	${LIBDIR}/compat/aout
diff --git a/lib/compat/compat1x/Makefile b/lib/compat/compat1x/Makefile
index d83e938f5a01..786dd1c33d9b 100644
--- a/lib/compat/compat1x/Makefile
+++ b/lib/compat/compat1x/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/compat/compat1x/Makefile,v 1.7.4.1 1999/08/29 14:55:03 peter Exp $
 
 DISTRIBUTION=	compat1x
 
diff --git a/lib/compat/compat20/Makefile b/lib/compat/compat20/Makefile
index f416b3381b2b..63550b403c81 100644
--- a/lib/compat/compat20/Makefile
+++ b/lib/compat/compat20/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/compat/compat20/Makefile,v 1.7.4.3 1999/08/29 14:55:05 peter Exp $
 
 DISTRIBUTION=	compat20
 
diff --git a/lib/compat/compat21/Makefile b/lib/compat/compat21/Makefile
index 652bbb7252f4..a16e8094e8d9 100644
--- a/lib/compat/compat21/Makefile
+++ b/lib/compat/compat21/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/compat/compat21/Makefile,v 1.9.2.3 1999/08/29 14:55:06 peter Exp $
 
 DISTRIBUTION=	compat21
 
diff --git a/lib/compat/compat22/Makefile b/lib/compat/compat22/Makefile
index 94457f359a91..790388ee17b9 100644
--- a/lib/compat/compat22/Makefile
+++ b/lib/compat/compat22/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/compat/compat22/Makefile,v 1.1.2.3 1999/08/29 14:55:08 peter Exp $
 
 DISTRIBUTION=	compat22
 
diff --git a/lib/compat/compat22/libxpg4.so.2.0.gz.uu b/lib/compat/compat22/libxpg4.so.2.0.gz.uu
index ddbaf226f5c6..e39c23574039 100644
--- a/lib/compat/compat22/libxpg4.so.2.0.gz.uu
+++ b/lib/compat/compat22/libxpg4.so.2.0.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/compat/compat22/libxpg4.so.2.0.gz.uu,v 1.1.2.2 1999/09/14 08:44:04 obrien Exp $
 
 begin 640 libxpg4.so.2.0.gz
 M'XL(""_'U#<"`VQI8GAP9S0N<V\N,BXP`.U:>W!35WH_$K(0()``V=A@L``1
diff --git a/lib/csu/alpha/Makefile b/lib/csu/alpha/Makefile
index 033a3f0cdb3e..5cf3ba050b4f 100644
--- a/lib/csu/alpha/Makefile
+++ b/lib/csu/alpha/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/csu/alpha/Makefile,v 1.7.2.2 1999/08/29 14:55:10 peter Exp $
 #
 
 SRCS=		crt1.c crtbegin.c crtend.c
diff --git a/lib/csu/alpha/crt1.c b/lib/csu/alpha/crt1.c
index 229a64826ec3..8b58528e1f62 100644
--- a/lib/csu/alpha/crt1.c
+++ b/lib/csu/alpha/crt1.c
@@ -30,7 +30,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/csu/alpha/crt1.c,v 1.4.2.2 1999/08/29 14:55:10 peter Exp $
  */
 
 #ifndef __GNUC__
diff --git a/lib/csu/alpha/crtbegin.c b/lib/csu/alpha/crtbegin.c
index c5fe12076d3e..8a779b927f32 100644
--- a/lib/csu/alpha/crtbegin.c
+++ b/lib/csu/alpha/crtbegin.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/csu/alpha/crtbegin.c,v 1.3.2.1 1999/08/29 14:55:11 peter Exp $
  */
 
 typedef void (*fptr)(void);
diff --git a/lib/csu/alpha/crtend.c b/lib/csu/alpha/crtend.c
index d6228a32433c..c41bdd6de73c 100644
--- a/lib/csu/alpha/crtend.c
+++ b/lib/csu/alpha/crtend.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/csu/alpha/crtend.c,v 1.3.2.1 1999/08/29 14:55:11 peter Exp $
  */
 
 typedef void (*fptr)(void);
diff --git a/lib/csu/i386-elf/Makefile b/lib/csu/i386-elf/Makefile
index 50686fe05bd9..e77785ab766c 100644
--- a/lib/csu/i386-elf/Makefile
+++ b/lib/csu/i386-elf/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/csu/i386-elf/Makefile,v 1.3.2.3 1999/08/29 14:55:14 peter Exp $
 #
 
 SRCS=		crt1.c crtbegin.c crtend.c crti.S crtn.S
diff --git a/lib/csu/i386-elf/crt1.c b/lib/csu/i386-elf/crt1.c
index 0ee070227107..2549571234cb 100644
--- a/lib/csu/i386-elf/crt1.c
+++ b/lib/csu/i386-elf/crt1.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/csu/i386-elf/crt1.c,v 1.3.2.1 1999/08/29 14:55:14 peter Exp $
  */
 
 #ifndef __GNUC__
diff --git a/lib/csu/i386-elf/crtbegin.c b/lib/csu/i386-elf/crtbegin.c
index 7c1f11e4a010..510c9ce88195 100644
--- a/lib/csu/i386-elf/crtbegin.c
+++ b/lib/csu/i386-elf/crtbegin.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/csu/i386-elf/crtbegin.c,v 1.1.1.1.2.3 1999/08/29 14:55:15 peter Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/lib/csu/i386-elf/crtend.c b/lib/csu/i386-elf/crtend.c
index 4b33f0c7bb4f..b0c4119c9870 100644
--- a/lib/csu/i386-elf/crtend.c
+++ b/lib/csu/i386-elf/crtend.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/csu/i386-elf/crtend.c,v 1.1.1.1.2.2 1999/08/29 14:55:15 peter Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/lib/csu/i386-elf/crti.S b/lib/csu/i386-elf/crti.S
index 0038497e04ba..9b3b193f3a43 100644
--- a/lib/csu/i386-elf/crti.S
+++ b/lib/csu/i386-elf/crti.S
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/csu/i386-elf/crti.S,v 1.1.1.1.2.1 1999/08/29 14:55:15 peter Exp $
  */
 
 	.section .init,"ax",@progbits
diff --git a/lib/csu/i386-elf/crtn.S b/lib/csu/i386-elf/crtn.S
index 0944ee36761d..83684fdef740 100644
--- a/lib/csu/i386-elf/crtn.S
+++ b/lib/csu/i386-elf/crtn.S
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/csu/i386-elf/crtn.S,v 1.1.1.1.2.1 1999/08/29 14:55:15 peter Exp $
  */
 
 	.section .init,"ax",@progbits
diff --git a/lib/csu/i386/Makefile b/lib/csu/i386/Makefile
index 02f14f29d8ad..d989e58f9f4b 100644
--- a/lib/csu/i386/Makefile
+++ b/lib/csu/i386/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.6 (Berkeley) 5/22/91
-# $FreeBSD$
+# $FreeBSD: src/lib/csu/i386/Makefile,v 1.39.2.1 1999/08/29 14:55:13 peter Exp $
 
 CFLAGS+=        -DLIBC_SCCS -fno-omit-frame-pointer
 OBJS=		crt0.o c++rt0.o gcrt0.o scrt0.o sgcrt0.o
diff --git a/lib/csu/i386/c++rt0.c b/lib/csu/i386/c++rt0.c
index 39752d5b1c48..f2e73768b35e 100644
--- a/lib/csu/i386/c++rt0.c
+++ b/lib/csu/i386/c++rt0.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/csu/i386/c++rt0.c,v 1.8.2.1 1999/08/29 14:55:13 peter Exp $
  */
 
 /*
diff --git a/lib/csu/i386/crt0.c b/lib/csu/i386/crt0.c
index e1a5551d5efc..9abb81d37e09 100644
--- a/lib/csu/i386/crt0.c
+++ b/lib/csu/i386/crt0.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/csu/i386/crt0.c,v 1.35.2.1 1999/08/29 14:55:13 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/lib/libalias/Makefile b/lib/libalias/Makefile
index e5406486a8e3..70585bc03f98 100644
--- a/lib/libalias/Makefile
+++ b/lib/libalias/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libalias/Makefile,v 1.9.2.3 1999/08/29 14:55:16 peter Exp $
 
 LIB=		alias
 SHLIB_MAJOR=	3
diff --git a/lib/libalias/alias.c b/lib/libalias/alias.c
index 982365681b3c..0ebb81d85da5 100644
--- a/lib/libalias/alias.c
+++ b/lib/libalias/alias.c
@@ -78,7 +78,7 @@
 
     See HISTORY file for additional revisions.
 
-    $FreeBSD$
+    $FreeBSD: src/lib/libalias/alias.c,v 1.9.2.4 1999/09/12 16:07:24 ru Exp $
 */
 
 #include <stdio.h>
diff --git a/lib/libalias/alias.h b/lib/libalias/alias.h
index 9666b0fb12be..4e7f15237ebe 100644
--- a/lib/libalias/alias.h
+++ b/lib/libalias/alias.h
@@ -7,7 +7,7 @@
     This software is placed into the public domain with no restrictions
     on its distribution.
 
- $FreeBSD$
+ $FreeBSD: src/lib/libalias/alias.h,v 1.8.2.3 1999/08/29 14:55:17 peter Exp $
 */
 
 
diff --git a/lib/libalias/alias_cuseeme.c b/lib/libalias/alias_cuseeme.c
index b1b95f49e0d4..7d89e2810511 100644
--- a/lib/libalias/alias_cuseeme.c
+++ b/lib/libalias/alias_cuseeme.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libalias/alias_cuseeme.c,v 1.1.2.1 1999/08/29 14:55:17 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libalias/alias_db.c b/lib/libalias/alias_db.c
index 203b96b11978..667ba48646f1 100644
--- a/lib/libalias/alias_db.c
+++ b/lib/libalias/alias_db.c
@@ -105,7 +105,7 @@
 
     See HISTORY file for additional revisions.
 
-    $FreeBSD$
+    $FreeBSD: src/lib/libalias/alias_db.c,v 1.10.2.4 1999/10/13 12:29:02 ru Exp $
 */
 
 
diff --git a/lib/libalias/alias_nbt.c b/lib/libalias/alias_nbt.c
index b5afedf1ab56..9ba9594ef06a 100644
--- a/lib/libalias/alias_nbt.c
+++ b/lib/libalias/alias_nbt.c
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libalias/alias_nbt.c,v 1.2.2.2 1999/08/29 14:55:17 peter Exp $
  *
  *  TODO:
  *       oClean up. 
diff --git a/lib/libalias/libalias.3 b/lib/libalias/libalias.3
index 018367088073..b166927fcb21 100644
--- a/lib/libalias/libalias.3
+++ b/lib/libalias/libalias.3
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libalias/libalias.3,v 1.8.2.9 1999/11/09 00:25:06 phantom Exp $
 .\"
 .Dd July, 1997
 .Dt LIBALIAS 3 
diff --git a/lib/libatm/Makefile b/lib/libatm/Makefile
index 218bf9f59af2..b0372be2ecd8 100644
--- a/lib/libatm/Makefile
+++ b/lib/libatm/Makefile
@@ -23,7 +23,7 @@
 # Copies of this Software may be made, however, the above copyright
 # notice must be reproduced on all copies.
 #
-#	@(#) $FreeBSD$
+#	@(#) $FreeBSD: src/lib/libatm/Makefile,v 1.2.2.1 1999/08/29 14:55:18 peter Exp $
 #
 #
 
diff --git a/lib/libatm/atm_addr.c b/lib/libatm/atm_addr.c
index 476ffd1d7335..f49208334a67 100644
--- a/lib/libatm/atm_addr.c
+++ b/lib/libatm/atm_addr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/lib/libatm/atm_addr.c,v 1.1.2.2 1999/08/29 14:55:19 peter Exp $
  *
  */
 
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/lib/libatm/atm_addr.c,v 1.1.2.2 1999/08/29 14:55:19 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/lib/libatm/cache_key.c b/lib/libatm/cache_key.c
index e5a15f99a8af..c5afae8a5cf9 100644
--- a/lib/libatm/cache_key.c
+++ b/lib/libatm/cache_key.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/lib/libatm/cache_key.c,v 1.1.2.1 1999/08/29 14:55:19 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/lib/libatm/cache_key.c,v 1.1.2.1 1999/08/29 14:55:19 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/lib/libatm/ioctl_subr.c b/lib/libatm/ioctl_subr.c
index bbef3f9b6804..632a168eaf94 100644
--- a/lib/libatm/ioctl_subr.c
+++ b/lib/libatm/ioctl_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/lib/libatm/ioctl_subr.c,v 1.1.2.1 1999/08/29 14:55:19 peter Exp $
  *
  */
 
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/lib/libatm/ioctl_subr.c,v 1.1.2.1 1999/08/29 14:55:19 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/lib/libatm/ip_addr.c b/lib/libatm/ip_addr.c
index a2f9fa504948..0d888b76573a 100644
--- a/lib/libatm/ip_addr.c
+++ b/lib/libatm/ip_addr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/lib/libatm/ip_addr.c,v 1.1.2.1 1999/08/29 14:55:20 peter Exp $
  *
  */
 
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/lib/libatm/ip_addr.c,v 1.1.2.1 1999/08/29 14:55:20 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/lib/libatm/ip_checksum.c b/lib/libatm/ip_checksum.c
index 08fb456e9c99..9048233114af 100644
--- a/lib/libatm/ip_checksum.c
+++ b/lib/libatm/ip_checksum.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/lib/libatm/ip_checksum.c,v 1.1.2.1 1999/08/29 14:55:20 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/lib/libatm/ip_checksum.c,v 1.1.2.1 1999/08/29 14:55:20 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/lib/libatm/libatm.h b/lib/libatm/libatm.h
index 77259225c932..c732f4533f08 100644
--- a/lib/libatm/libatm.h
+++ b/lib/libatm/libatm.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/lib/libatm/libatm.h,v 1.1.2.1 1999/08/29 14:55:20 peter Exp $
  *
  */
 
diff --git a/lib/libatm/timer.c b/lib/libatm/timer.c
index 3277eb70a3ad..6c40738ffdcc 100644
--- a/lib/libatm/timer.c
+++ b/lib/libatm/timer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/lib/libatm/timer.c,v 1.1.2.1 1999/08/29 14:55:20 peter Exp $
  *
  */
 
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/lib/libatm/timer.c,v 1.1.2.1 1999/08/29 14:55:20 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/lib/libbind/Makefile b/lib/libbind/Makefile
index ba6da8a78605..58648a7c6a24 100644
--- a/lib/libbind/Makefile
+++ b/lib/libbind/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libbind/Makefile,v 1.3.2.1 1999/12/13 15:08:12 peter Exp $
 
 BIND_DIR=${.CURDIR}/../../contrib/bind
 
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 023da6b8bad5..3e291bc59879 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 2/3/94
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/Makefile,v 1.22.2.1 1999/08/29 14:45:35 peter Exp $
 #
 # All library objects contain rcsid strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
diff --git a/lib/libc/Makefile.inc b/lib/libc/Makefile.inc
index 318ca70b8100..f95b6988d08b 100644
--- a/lib/libc/Makefile.inc
+++ b/lib/libc/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/Makefile.inc,v 1.4.2.1 1999/08/29 14:45:35 peter Exp $
 #
 # This file contains make rules that are shared by libc and libc_r.
 #
diff --git a/lib/libc/alpha/Makefile.inc b/lib/libc/alpha/Makefile.inc
index 5a4d48e4a5d0..08e54c7ebed5 100644
--- a/lib/libc/alpha/Makefile.inc
+++ b/lib/libc/alpha/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/alpha/Makefile.inc,v 1.4.2.1 1999/08/29 14:45:37 peter Exp $
 #
 # Machine dependent definitions for the alpha architecture.
 #
diff --git a/lib/libc/alpha/SYS.h b/lib/libc/alpha/SYS.h
index 6e0d52251b38..5114cf623f73 100644
--- a/lib/libc/alpha/SYS.h
+++ b/lib/libc/alpha/SYS.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/alpha/SYS.h,v 1.5.2.1 1999/08/29 14:45:37 peter Exp $ */
 /*	From: NetBSD: SYS.h,v 1.5 1997/05/02 18:15:15 kleink Exp */
 
 /*
diff --git a/lib/libc/alpha/gen/Makefile.inc b/lib/libc/alpha/gen/Makefile.inc
index 4e7fb358cfb0..12fd4b3560d6 100644
--- a/lib/libc/alpha/gen/Makefile.inc
+++ b/lib/libc/alpha/gen/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/alpha/gen/Makefile.inc,v 1.5.2.1 1999/08/29 14:45:38 peter Exp $
 
 SRCS+=	_setjmp.S fabs.S frexp.c infinity.c isinf.c ldexp.c modf.c setjmp.S
 SRCS+=	flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \
diff --git a/lib/libc/alpha/gen/flt_rounds.c b/lib/libc/alpha/gen/flt_rounds.c
index b6246c975169..31ae2c63d0f9 100644
--- a/lib/libc/alpha/gen/flt_rounds.c
+++ b/lib/libc/alpha/gen/flt_rounds.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/alpha/gen/flt_rounds.c,v 1.1.1.1.2.1 1999/08/29 14:45:39 peter Exp $ */
 /*	From: NetBSD: flt_rounds.c,v 1.2 1997/07/18 00:30:30 thorpej Exp */
 
 /*
diff --git a/lib/libc/alpha/net/Makefile.inc b/lib/libc/alpha/net/Makefile.inc
index b7178133b972..1e7211a98e6f 100644
--- a/lib/libc/alpha/net/Makefile.inc
+++ b/lib/libc/alpha/net/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/alpha/net/Makefile.inc,v 1.1.1.1.2.1 1999/08/29 14:45:40 peter Exp $
 
 SRCS+=  htonl.S htons.S ntohl.S ntohs.S
diff --git a/lib/libc/alpha/stdlib/Makefile.inc b/lib/libc/alpha/stdlib/Makefile.inc
index dda8c76018d8..029c76679894 100644
--- a/lib/libc/alpha/stdlib/Makefile.inc
+++ b/lib/libc/alpha/stdlib/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/alpha/stdlib/Makefile.inc,v 1.2.2.1 1999/08/29 14:45:41 peter Exp $
 
 MDSRCS+=	abs.c div.c labs.c ldiv.c
diff --git a/lib/libc/alpha/string/Makefile.inc b/lib/libc/alpha/string/Makefile.inc
index 7bbcc8de10e9..f0729284547d 100644
--- a/lib/libc/alpha/string/Makefile.inc
+++ b/lib/libc/alpha/string/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/alpha/string/Makefile.inc,v 1.1.1.1.2.1 1999/08/29 14:45:43 peter Exp $
 
 MDSRCS+=	bcopy.S bzero.S ffs.S memcpy.S memmove.S
diff --git a/lib/libc/alpha/sys/Makefile.inc b/lib/libc/alpha/sys/Makefile.inc
index 51de27af9ffa..2fdc6d01dc91 100644
--- a/lib/libc/alpha/sys/Makefile.inc
+++ b/lib/libc/alpha/sys/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/alpha/sys/Makefile.inc,v 1.3.2.2 1999/08/29 14:45:44 peter Exp $
 
 MDASM+=	Ovfork.S brk.S cerror.S exect.S fork.S pipe.S ptrace.S \
 	sbrk.S setlogin.S sigpending.S sigprocmask.S sigreturn.S \
diff --git a/lib/libc/alpha/sys/cerror.S b/lib/libc/alpha/sys/cerror.S
index e5b18f727e65..388d68cf452c 100644
--- a/lib/libc/alpha/sys/cerror.S
+++ b/lib/libc/alpha/sys/cerror.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/lib/libc/alpha/sys/cerror.S,v 1.4.2.1 1999/08/29 14:45:44 peter Exp $	*/
 /*	From: NetBSD: cerror.S,v 1.4 1996/11/08 00:52:46 cgd Exp 	*/
 
 /*
diff --git a/lib/libc/compat-43/Makefile.inc b/lib/libc/compat-43/Makefile.inc
index e90188244d1f..9fe4770dd8f5 100644
--- a/lib/libc/compat-43/Makefile.inc
+++ b/lib/libc/compat-43/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/2/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/compat-43/Makefile.inc,v 1.8.2.1 1999/08/29 14:45:45 peter Exp $
 
 # compat-43 sources
 .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/compat-43 ${.CURDIR}/../libc/compat-43
diff --git a/lib/libc/db/Makefile.inc b/lib/libc/db/Makefile.inc
index 8bd4dd6d6305..f3d0af06aac9 100644
--- a/lib/libc/db/Makefile.inc
+++ b/lib/libc/db/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.2 (Berkeley) 2/21/94
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/db/Makefile.inc,v 1.2.2.1 1999/08/29 14:45:47 peter Exp $
 #
 CFLAGS+=-D__DBINTERFACE_PRIVATE
 
diff --git a/lib/libc/db/btree/Makefile.inc b/lib/libc/db/btree/Makefile.inc
index 33c630f5f499..3c90dcef70f8 100644
--- a/lib/libc/db/btree/Makefile.inc
+++ b/lib/libc/db/btree/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.2 (Berkeley) 7/14/94
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/db/btree/Makefile.inc,v 1.2.2.1 1999/08/29 14:45:48 peter Exp $
 
 .PATH: ${.CURDIR}/../libc/db/btree
 
diff --git a/lib/libc/db/db/Makefile.inc b/lib/libc/db/db/Makefile.inc
index 03cb1a835273..c9dff306c6d5 100644
--- a/lib/libc/db/db/Makefile.inc
+++ b/lib/libc/db/db/Makefile.inc
@@ -1,5 +1,5 @@
 #       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/db/db/Makefile.inc,v 1.2.2.1 1999/08/29 14:45:49 peter Exp $
 
 .PATH: ${.CURDIR}/../libc/db/db
 
diff --git a/lib/libc/db/docs/hash.usenix.ps b/lib/libc/db/docs/hash.usenix.ps
index 3a0cf444b1ac..b2e6fe3f7ad2 100644
--- a/lib/libc/db/docs/hash.usenix.ps
+++ b/lib/libc/db/docs/hash.usenix.ps
@@ -7,7 +7,7 @@
 % lib/psdit.pro -- prolog for psdit (ditroff) files
 % Copyright (c) 1984, 1985 Adobe Systems Incorporated. All Rights Reserved.
 % last edit: shore Sat Nov 23 20:28:03 1985
-% RCSID: $FreeBSD$
+% RCSID: $FreeBSD: src/lib/libc/db/docs/hash.usenix.ps,v 1.1.1.1.4.1 1999/08/29 14:45:50 peter Exp $
 
 % Changed by Edward Wang (edward@ucbarpa.berkeley.edu) to handle graphics,
 % 17 Feb, 87.
diff --git a/lib/libc/db/docs/libtp.usenix.ps b/lib/libc/db/docs/libtp.usenix.ps
index b7e441a5755e..093904ba0fff 100644
--- a/lib/libc/db/docs/libtp.usenix.ps
+++ b/lib/libc/db/docs/libtp.usenix.ps
@@ -7,7 +7,7 @@
 % lib/psdit.pro -- prolog for psdit (ditroff) files
 % Copyright (c) 1984, 1985 Adobe Systems Incorporated. All Rights Reserved.
 % last edit: shore Sat Nov 23 20:28:03 1985
-% RCSID: $FreeBSD$
+% RCSID: $FreeBSD: src/lib/libc/db/docs/libtp.usenix.ps,v 1.1.1.1.4.1 1999/08/29 14:45:51 peter Exp $
 
 % Changed by Edward Wang (edward@ucbarpa.berkeley.edu) to handle graphics,
 % 17 Feb, 87.
diff --git a/lib/libc/db/hash/Makefile.inc b/lib/libc/db/hash/Makefile.inc
index 38b523d2c696..ab8d1b86f3db 100644
--- a/lib/libc/db/hash/Makefile.inc
+++ b/lib/libc/db/hash/Makefile.inc
@@ -1,5 +1,5 @@
 #       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/db/hash/Makefile.inc,v 1.2.2.1 1999/08/29 14:45:54 peter Exp $
 
 .PATH: ${.CURDIR}/../libc/db/hash
 
diff --git a/lib/libc/db/man/Makefile.inc b/lib/libc/db/man/Makefile.inc
index 149841335f26..73931877c118 100644
--- a/lib/libc/db/man/Makefile.inc
+++ b/lib/libc/db/man/Makefile.inc
@@ -1,5 +1,5 @@
 #       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/db/man/Makefile.inc,v 1.7.2.1 1999/08/29 14:45:55 peter Exp $
 
 .PATH: ${.CURDIR}/../libc/db/man
 
diff --git a/lib/libc/db/man/mpool.3 b/lib/libc/db/man/mpool.3
index 5174df60dc8b..312fe464243d 100644
--- a/lib/libc/db/man/mpool.3
+++ b/lib/libc/db/man/mpool.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mpool.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/db/man/mpool.3,v 1.4.2.1 1999/08/29 14:45:56 peter Exp $
 .\"
 .TH MPOOL 3 "June 4, 1993"
 .UC 7
diff --git a/lib/libc/db/mpool/Makefile.inc b/lib/libc/db/mpool/Makefile.inc
index 461e62ae379e..3fa39bcd2f35 100644
--- a/lib/libc/db/mpool/Makefile.inc
+++ b/lib/libc/db/mpool/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/db/mpool/Makefile.inc,v 1.2.2.1 1999/08/29 14:45:57 peter Exp $
 
 .PATH: ${.CURDIR}/../libc/db/mpool
 
diff --git a/lib/libc/db/mpool/mpool.libtp b/lib/libc/db/mpool/mpool.libtp
index bcd827dce29d..b8cbc19b60c3 100644
--- a/lib/libc/db/mpool/mpool.libtp
+++ b/lib/libc/db/mpool/mpool.libtp
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-VERSION $FreeBSD$
+VERSION $FreeBSD: src/lib/libc/db/mpool/mpool.libtp,v 1.3.2.1 1999/08/29 14:45:57 peter Exp $
 PACKAGE: 	User Level Shared Memory Manager
 
 DESCRIPTION: 	
diff --git a/lib/libc/db/recno/Makefile.inc b/lib/libc/db/recno/Makefile.inc
index 295332e90c2d..64cb31412105 100644
--- a/lib/libc/db/recno/Makefile.inc
+++ b/lib/libc/db/recno/Makefile.inc
@@ -1,5 +1,5 @@
 #       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/db/recno/Makefile.inc,v 1.2.2.1 1999/08/29 14:46:01 peter Exp $
 
 .PATH: ${.CURDIR}/../libc/db/recno
 
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
index 033be7d7d669..7b970b7dd897 100644
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.6 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.50.2.2 1999/09/22 22:15:11 phantom Exp $
 
 # machine-independent gen sources
 .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/gen ${.CURDIR}/../libc/gen
diff --git a/lib/libc/gen/_spinlock_stub.c b/lib/libc/gen/_spinlock_stub.c
index e3a800d0e1c0..5b7d9d3fa177 100644
--- a/lib/libc/gen/_spinlock_stub.c
+++ b/lib/libc/gen/_spinlock_stub.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gen/_spinlock_stub.c,v 1.3.4.1 1999/08/29 14:46:03 peter Exp $
  *
  */
 
diff --git a/lib/libc/gen/arc4random.3 b/lib/libc/gen/arc4random.3
index 334bb7b132ad..9272b7e71c7f 100644
--- a/lib/libc/gen/arc4random.3
+++ b/lib/libc/gen/arc4random.3
@@ -28,7 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" Manual page, using -mandoc macros
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/arc4random.3,v 1.2.4.2 1999/10/30 15:27:54 phantom Exp $
 .\"
 .Dd April 15, 1997
 .Dt ARC4RANDOM 3
diff --git a/lib/libc/gen/arc4random.c b/lib/libc/gen/arc4random.c
index f331687e7470..1787e80315ef 100644
--- a/lib/libc/gen/arc4random.c
+++ b/lib/libc/gen/arc4random.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/gen/arc4random.c,v 1.1.4.1 1999/08/29 14:46:03 peter Exp $ */
 
 /*
  * Arc4 random number generator for OpenBSD.
diff --git a/lib/libc/gen/crypt.c b/lib/libc/gen/crypt.c
index 8012b06a8e1b..a920890e6f7b 100644
--- a/lib/libc/gen/crypt.c
+++ b/lib/libc/gen/crypt.c
@@ -36,7 +36,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /* from static char sccsid[] = "@(#)crypt.c	5.11 (Berkeley) 6/25/91"; */
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/gen/crypt.c,v 1.4.4.1 1999/08/29 14:46:04 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <unistd.h>
diff --git a/lib/libc/gen/disklabel.c b/lib/libc/gen/disklabel.c
index 82a3b3c270e1..d65907995e61 100644
--- a/lib/libc/gen/disklabel.c
+++ b/lib/libc/gen/disklabel.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)disklabel.c	8.2 (Berkeley) 5/3/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/gen/disklabel.c,v 1.7.2.1 1999/08/29 14:46:04 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/dladdr.3 b/lib/libc/gen/dladdr.3
index 9938a7a7107c..715702b719bf 100644
--- a/lib/libc/gen/dladdr.3
+++ b/lib/libc/gen/dladdr.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/dladdr.3,v 1.2.2.1 1999/08/29 14:46:04 peter Exp $
 .\"
 .Dd February 5, 1998
 .Os FreeBSD
diff --git a/lib/libc/gen/dlfcn.c b/lib/libc/gen/dlfcn.c
index ff77b79d83f3..1ac231912e7a 100644
--- a/lib/libc/gen/dlfcn.c
+++ b/lib/libc/gen/dlfcn.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gen/dlfcn.c,v 1.2.2.1 1999/08/29 14:46:05 peter Exp $
  */
 
 /*
diff --git a/lib/libc/gen/dlopen.3 b/lib/libc/gen/dlopen.3
index 6485e750817f..6fd9e546ed53 100644
--- a/lib/libc/gen/dlopen.3
+++ b/lib/libc/gen/dlopen.3
@@ -30,7 +30,7 @@
 .\" Copyright (c) 1991 Sun Microsystems, Inc.
 .\"
 .\" @(#) dlopen.3 1.6 90/01/31 SMI
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/dlopen.3,v 1.2.2.1 1999/11/02 18:20:36 joerg Exp $
 .\"
 .Dd September 24, 1989
 .Os FreeBSD
diff --git a/lib/libc/gen/err.3 b/lib/libc/gen/err.3
index 76e470b7dc8c..4231ebbc3b4a 100644
--- a/lib/libc/gen/err.3
+++ b/lib/libc/gen/err.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)err.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/err.3,v 1.9.2.1 1999/08/29 14:46:05 peter Exp $
 .\"
 .Dd April 13, 1995
 .Dt ERR 3
diff --git a/lib/libc/gen/err.c b/lib/libc/gen/err.c
index 6d1766c6ca30..1ac8cc65db30 100644
--- a/lib/libc/gen/err.c
+++ b/lib/libc/gen/err.c
@@ -34,7 +34,7 @@
 
 #if defined(LIBC_RCS) && !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/gen/err.c,v 1.5.2.1 1999/08/29 14:46:06 peter Exp $";
 #endif /* LIBC_RCS and not lint */
 
 #include <err.h>
diff --git a/lib/libc/gen/exec.3 b/lib/libc/gen/exec.3
index 8da1247adcfd..631e009b7e23 100644
--- a/lib/libc/gen/exec.3
+++ b/lib/libc/gen/exec.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)exec.3	8.3 (Berkeley) 1/24/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/exec.3,v 1.6.2.1 1999/08/29 14:46:06 peter Exp $
 .\"
 .Dd January 24, 1994
 .Dt EXEC 3
diff --git a/lib/libc/gen/exec.c b/lib/libc/gen/exec.c
index a2c9746f16ac..e6b32247a413 100644
--- a/lib/libc/gen/exec.c
+++ b/lib/libc/gen/exec.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)exec.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/gen/exec.c,v 1.10.2.1 1999/08/29 14:46:07 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/fnmatch.3 b/lib/libc/gen/fnmatch.3
index 8b556b59fcfe..17252408e524 100644
--- a/lib/libc/gen/fnmatch.3
+++ b/lib/libc/gen/fnmatch.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fnmatch.3	8.3 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/fnmatch.3,v 1.6.2.1 1999/10/30 15:27:54 phantom Exp $
 .\"
 .Dd April 28, 1995
 .Dt FNMATCH 3
diff --git a/lib/libc/gen/ftok.3 b/lib/libc/gen/ftok.3
index 611bf3048f9a..e119967c3827 100644
--- a/lib/libc/gen/ftok.3
+++ b/lib/libc/gen/ftok.3
@@ -23,7 +23,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/ftok.3,v 1.10.4.2 1999/08/29 14:46:07 peter Exp $
 .Dd June 24, 1994
 .Os
 .Dt FTOK 3
diff --git a/lib/libc/gen/ftok.c b/lib/libc/gen/ftok.c
index 24cfe7d601e0..f03e9613db17 100644
--- a/lib/libc/gen/ftok.c
+++ b/lib/libc/gen/ftok.c
@@ -26,7 +26,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/gen/ftok.c,v 1.4.4.1 1999/08/29 14:46:07 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/gen/fts.3 b/lib/libc/gen/fts.3
index 5ffaf9e91df0..327d0753362e 100644
--- a/lib/libc/gen/fts.3
+++ b/lib/libc/gen/fts.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fts.3	8.5 (Berkeley) 4/16/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/fts.3,v 1.4.2.2 1999/10/30 15:27:55 phantom Exp $
 .\"
 .Dd April 16, 1994
 .Dt FTS 3
diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c
index 14137a3bd1e5..bbde3a6acc7c 100644
--- a/lib/libc/gen/fts.c
+++ b/lib/libc/gen/fts.c
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
 #else
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/gen/fts.c,v 1.8.2.2 1999/12/18 04:47:28 green Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libc/gen/getbootfile.3 b/lib/libc/gen/getbootfile.3
index 1ad2b8eb81a6..ce4c990170ad 100644
--- a/lib/libc/gen/getbootfile.3
+++ b/lib/libc/gen/getbootfile.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)gethostname.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getbootfile.3,v 1.5.2.1 1999/08/29 14:46:08 peter Exp $
 .\"
 .Dd September 23, 1994
 .Dt GETBOOTFILE 3
diff --git a/lib/libc/gen/getbootfile.c b/lib/libc/gen/getbootfile.c
index c2d155867ecb..fa44ce4533da 100644
--- a/lib/libc/gen/getbootfile.c
+++ b/lib/libc/gen/getbootfile.c
@@ -34,7 +34,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char sccsid[] = "From: @(#)gethostname.c	8.1 (Berkeley) 6/4/93";*/
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/gen/getbootfile.c,v 1.4.2.1 1999/08/29 14:46:09 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/getcap.3 b/lib/libc/gen/getcap.3
index 0e6a3da48587..39a1fa57cb49 100644
--- a/lib/libc/gen/getcap.3
+++ b/lib/libc/gen/getcap.3
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)getcap.3	8.4 (Berkeley) 5/13/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getcap.3,v 1.8.2.3 1999/08/29 14:46:10 peter Exp $
 .\"
 .Dd May 13, 1994
 .Dt GETCAP 3 
diff --git a/lib/libc/gen/getcwd.3 b/lib/libc/gen/getcwd.3
index 357fdf3fb31a..1fc2ae8c7148 100644
--- a/lib/libc/gen/getcwd.3
+++ b/lib/libc/gen/getcwd.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getcwd.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getcwd.3,v 1.6.2.1 1999/08/29 14:46:10 peter Exp $
 .\"
 .Dd November 24, 1997
 .Dt GETCWD 3
diff --git a/lib/libc/gen/getdomainname.3 b/lib/libc/gen/getdomainname.3
index 60a8099a2328..3de09e260b7e 100644
--- a/lib/libc/gen/getdomainname.3
+++ b/lib/libc/gen/getdomainname.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)gethostname.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getdomainname.3,v 1.8.2.1 1999/08/29 14:46:11 peter Exp $
 .\"
 .Dd May 6, 1994
 .Dt GETDOMAINNAME 3
diff --git a/lib/libc/gen/getdomainname.c b/lib/libc/gen/getdomainname.c
index aafb01074559..85b44beb0811 100644
--- a/lib/libc/gen/getdomainname.c
+++ b/lib/libc/gen/getdomainname.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "From: @(#)gethostname.c	8.1 (Berkeley) 6/4/93";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/gen/getdomainname.c,v 1.5.2.1 1999/08/29 14:46:11 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/getgrent.3 b/lib/libc/gen/getgrent.3
index bb3cfb56298b..367f3fbf6c1b 100644
--- a/lib/libc/gen/getgrent.3
+++ b/lib/libc/gen/getgrent.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)getgrent.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getgrent.3,v 1.10.2.1 1999/08/29 14:46:12 peter Exp $
 .\"
 .Dd September 29, 1994
 .Dt GETGRENT 3
diff --git a/lib/libc/gen/getobjformat.3 b/lib/libc/gen/getobjformat.3
index 3862d82a2b99..8abf9fbc5d4c 100644
--- a/lib/libc/gen/getobjformat.3
+++ b/lib/libc/gen/getobjformat.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getobjformat.3,v 1.2.2.1 1999/08/29 14:46:12 peter Exp $
 .\"
 .Dd September 7, 1998
 .Dt GETOBJFORMAT 3
diff --git a/lib/libc/gen/getobjformat.c b/lib/libc/gen/getobjformat.c
index fa155a0c6751..2e02032ac0cb 100644
--- a/lib/libc/gen/getobjformat.c
+++ b/lib/libc/gen/getobjformat.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gen/getobjformat.c,v 1.1.2.1 1999/08/29 14:46:13 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/getosreldate.c b/lib/libc/gen/getosreldate.c
index b6e91f49c349..13f95db40120 100644
--- a/lib/libc/gen/getosreldate.c
+++ b/lib/libc/gen/getosreldate.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)gethostid.c	8.1 (Berkeley) 6/2/93";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/gen/getosreldate.c,v 1.3.2.1 1999/08/29 14:46:13 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c
index 9f9534488539..2f384411cdd0 100644
--- a/lib/libc/gen/getpwent.c
+++ b/lib/libc/gen/getpwent.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gen/getpwent.c,v 1.48.2.4 1999/10/16 11:52:36 ache Exp $
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/gen/getvfsbyname.3 b/lib/libc/gen/getvfsbyname.3
index c33fbea7da85..b4e5a23f06ff 100644
--- a/lib/libc/gen/getvfsbyname.3
+++ b/lib/libc/gen/getvfsbyname.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm_getvfsbyname.3	8.3 (Berkeley) 5/4/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getvfsbyname.3,v 1.4.2.3 1999/08/29 14:46:14 peter Exp $
 .\"
 .Dd May 4, 1995
 .Dt GETVFSBYNAME 3
diff --git a/lib/libc/gen/getvfsbyname.c b/lib/libc/gen/getvfsbyname.c
index a8f691320e72..39e26ca49f29 100644
--- a/lib/libc/gen/getvfsbyname.c
+++ b/lib/libc/gen/getvfsbyname.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)kvm_getvfsbyname.c	8.1 (Berkeley) 4/3/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/gen/getvfsbyname.c,v 1.4.2.1 1999/08/29 14:46:15 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/getvfsent.3 b/lib/libc/gen/getvfsent.3
index e5f51c82d98f..c46038271704 100644
--- a/lib/libc/gen/getvfsent.3
+++ b/lib/libc/gen/getvfsent.3
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getvfsent.3,v 1.14.2.1 1999/08/29 14:46:15 peter Exp $
 .\"	Written by Garrett A. Wollman, September 1994.
 .\"	This manual page is in the public domain.
 .\"
diff --git a/lib/libc/gen/lockf.3 b/lib/libc/gen/lockf.3
index 1cfc40a6a52e..92a08467ef85 100644
--- a/lib/libc/gen/lockf.3
+++ b/lib/libc/gen/lockf.3
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/lockf.3,v 1.1.1.1.2.1 1999/11/09 00:30:54 phantom Exp $
 .\"
 .Dd December 19, 1997
 .Dt LOCKF 3
diff --git a/lib/libc/gen/lockf.c b/lib/libc/gen/lockf.c
index 3363d588a96d..57e93ddc8712 100644
--- a/lib/libc/gen/lockf.c
+++ b/lib/libc/gen/lockf.c
@@ -38,7 +38,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char rcsid[]=
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/gen/lockf.c,v 1.2.2.1 1999/08/29 14:46:15 peter Exp $";
 #endif
 
 #include <errno.h>
diff --git a/lib/libc/gen/msgctl.3 b/lib/libc/gen/msgctl.3
index 326e8a521bc1..73756a94b03e 100644
--- a/lib/libc/gen/msgctl.3
+++ b/lib/libc/gen/msgctl.3
@@ -29,7 +29,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/msgctl.3,v 1.5.2.2 1999/08/29 14:46:15 peter Exp $
 .\"/
 .Dd November 24, 1997
 .Dt MSGCTL 3
diff --git a/lib/libc/gen/msgrcv.3 b/lib/libc/gen/msgrcv.3
index e4aa45d19fea..9fcc9362f343 100644
--- a/lib/libc/gen/msgrcv.3
+++ b/lib/libc/gen/msgrcv.3
@@ -28,7 +28,7 @@
 .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/msgrcv.3,v 1.5.2.2 1999/08/29 14:46:16 peter Exp $
 .\"
 .\"/
 .Dd November 24, 1997
diff --git a/lib/libc/gen/msgsnd.3 b/lib/libc/gen/msgsnd.3
index 8946c1c52163..8b0b5e1bc2dd 100644
--- a/lib/libc/gen/msgsnd.3
+++ b/lib/libc/gen/msgsnd.3
@@ -28,7 +28,7 @@
 .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/msgsnd.3,v 1.4.2.2 1999/08/29 14:46:16 peter Exp $
 .\"
 .\"/
 .Dd November 24, 1997
diff --git a/lib/libc/gen/nlist.c b/lib/libc/gen/nlist.c
index 55f4f3978bb0..ee62b5e84012 100644
--- a/lib/libc/gen/nlist.c
+++ b/lib/libc/gen/nlist.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libc/gen/nlist.c,v 1.10 1998/10/28 06:37:49 jdp Exp $
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/gen/ntp_gettime.c b/lib/libc/gen/ntp_gettime.c
index 3bb71c136797..eb374cb62367 100644
--- a/lib/libc/gen/ntp_gettime.c
+++ b/lib/libc/gen/ntp_gettime.c
@@ -33,7 +33,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/gen/ntp_gettime.c,v 1.4.2.2 1999/08/29 14:46:17 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/pause.3 b/lib/libc/gen/pause.3
index e48bc8ead26e..56cd987aae9d 100644
--- a/lib/libc/gen/pause.3
+++ b/lib/libc/gen/pause.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pause.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/pause.3,v 1.2.2.1 1999/08/29 14:46:17 peter Exp $
 .\"
 .Dd June 4, 1993
 .Dt PAUSE 3
diff --git a/lib/libc/gen/setdomainname.c b/lib/libc/gen/setdomainname.c
index 8d461662f366..69a1f850c3a5 100644
--- a/lib/libc/gen/setdomainname.c
+++ b/lib/libc/gen/setdomainname.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "From: @(#)sethostname.c	8.1 (Berkeley) 6/4/93";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/gen/setdomainname.c,v 1.5.2.1 1999/08/29 14:46:18 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/setmode.c b/lib/libc/gen/setmode.c
index 0bbf22df7d05..addc74bc85e3 100644
--- a/lib/libc/gen/setmode.c
+++ b/lib/libc/gen/setmode.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)setmode.c	8.2 (Berkeley) 3/25/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/gen/setmode.c,v 1.3.4.1 1999/09/28 07:27:12 ru Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/gen/shmat.c b/lib/libc/gen/shmat.c
index 45b91430c944..1f9d92630ccb 100644
--- a/lib/libc/gen/shmat.c
+++ b/lib/libc/gen/shmat.c
@@ -1,5 +1,5 @@
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/gen/shmat.c,v 1.3.2.1 1999/08/29 14:46:19 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/gen/shmctl.c b/lib/libc/gen/shmctl.c
index eae9fbb6a23f..d07c41833083 100644
--- a/lib/libc/gen/shmctl.c
+++ b/lib/libc/gen/shmctl.c
@@ -1,5 +1,5 @@
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/gen/shmctl.c,v 1.3.2.1 1999/08/29 14:46:19 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/gen/shmdt.c b/lib/libc/gen/shmdt.c
index f39ad183f2ab..ec12f1893d27 100644
--- a/lib/libc/gen/shmdt.c
+++ b/lib/libc/gen/shmdt.c
@@ -1,5 +1,5 @@
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/gen/shmdt.c,v 1.3.2.1 1999/08/29 14:46:20 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/gen/shmget.c b/lib/libc/gen/shmget.c
index 8976d1c0d6d4..d5105abca810 100644
--- a/lib/libc/gen/shmget.c
+++ b/lib/libc/gen/shmget.c
@@ -1,5 +1,5 @@
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/gen/shmget.c,v 1.3.2.1 1999/08/29 14:46:20 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/gen/sleep.3 b/lib/libc/gen/sleep.3
index e59aad5113b9..b67d61b473e1 100644
--- a/lib/libc/gen/sleep.3
+++ b/lib/libc/gen/sleep.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sleep.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/sleep.3,v 1.11.2.1 1999/08/29 14:46:21 peter Exp $
 .\"
 .Dd Feb 13, 1998
 .Dt SLEEP 3
diff --git a/lib/libc/gen/sleep.c b/lib/libc/gen/sleep.c
index f87ffba1f951..9c11d473dce3 100644
--- a/lib/libc/gen/sleep.c
+++ b/lib/libc/gen/sleep.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)sleep.c	8.1 (Berkeley) 6/4/93";
 #endif
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/gen/sleep.c,v 1.25.2.1 1999/08/29 14:46:21 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <errno.h>
diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index 33cd2a0918bd..216afde08d28 100644
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sysctl.3	8.4 (Berkeley) 5/9/95
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libc/gen/sysctl.3,v 1.24.2.2 1999/09/20 09:49:50 phantom Exp $
 .\"
 .Dd May 9, 1995
 .Dt SYSCTL 3
diff --git a/lib/libc/gen/sysctlbyname.c b/lib/libc/gen/sysctlbyname.c
index 3d19ca2cdc9b..cd95960cb486 100644
--- a/lib/libc/gen/sysctlbyname.c
+++ b/lib/libc/gen/sysctlbyname.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gen/sysctlbyname.c,v 1.3.2.1 1999/08/29 14:46:22 peter Exp $
  *
  */
 #include <sys/types.h>
diff --git a/lib/libc/gen/syslog.c b/lib/libc/gen/syslog.c
index 3a9eca466809..b9b09ec9b349 100644
--- a/lib/libc/gen/syslog.c
+++ b/lib/libc/gen/syslog.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)syslog.c	8.5 (Berkeley) 4/29/95";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/gen/syslog.c,v 1.18.2.1 1999/08/29 14:46:22 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/gen/ualarm.3 b/lib/libc/gen/ualarm.3
index bbf9457fdfd9..ee33fb00cb9a 100644
--- a/lib/libc/gen/ualarm.3
+++ b/lib/libc/gen/ualarm.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)ualarm.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/ualarm.3,v 1.8.2.1 1999/08/29 14:46:23 peter Exp $
 .\"
 .Dd April 19, 1994
 .Dt UALARM 3
diff --git a/lib/libc/gen/uname.c b/lib/libc/gen/uname.c
index 944c2dc3b2ff..6ef36bf52fdb 100644
--- a/lib/libc/gen/uname.c
+++ b/lib/libc/gen/uname.c
@@ -34,7 +34,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char sccsid[] = "From: @(#)uname.c	8.1 (Berkeley) 1/4/94";*/
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/gen/uname.c,v 1.6.2.1 1999/08/29 14:46:23 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/usleep.3 b/lib/libc/gen/usleep.3
index 77d625965a3a..3df582889711 100644
--- a/lib/libc/gen/usleep.3
+++ b/lib/libc/gen/usleep.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)usleep.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/usleep.3,v 1.9.2.1 1999/08/29 14:46:24 peter Exp $
 .\"
 .Dd Feb 13, 1998
 .Dt USLEEP 3
diff --git a/lib/libc/gen/usleep.c b/lib/libc/gen/usleep.c
index 4b6c67d9af62..e2e82526ec2d 100644
--- a/lib/libc/gen/usleep.c
+++ b/lib/libc/gen/usleep.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)usleep.c	8.1 (Berkeley) 6/4/93";
 #endif
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/gen/usleep.c,v 1.22.2.1 1999/08/29 14:46:24 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <time.h>
diff --git a/lib/libc/gen/vis.3 b/lib/libc/gen/vis.3
index e8860b091145..c9ea71a575ba 100644
--- a/lib/libc/gen/vis.3
+++ b/lib/libc/gen/vis.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)vis.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/vis.3,v 1.7.2.1 1999/08/29 14:46:25 peter Exp $
 .\"
 .Dd July 25, 1996
 .Dt VIS 3
diff --git a/lib/libc/gmon/Makefile.inc b/lib/libc/gmon/Makefile.inc
index 1b8a90629204..8125b2b9a794 100644
--- a/lib/libc/gmon/Makefile.inc
+++ b/lib/libc/gmon/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/gmon/Makefile.inc,v 1.6.2.1 1999/08/29 14:46:30 peter Exp $
 
 # gmon sources
 .PATH: ${.CURDIR}/../libc/gmon
diff --git a/lib/libc/gmon/mcount.c b/lib/libc/gmon/mcount.c
index 43f539084e66..2799aad04900 100644
--- a/lib/libc/gmon/mcount.c
+++ b/lib/libc/gmon/mcount.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)mcount.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/gmon/mcount.c,v 1.14.2.1 1999/08/29 14:46:30 peter Exp $";
 #endif
 
 #ifndef __alpha__
diff --git a/lib/libc/i386/DEFS.h b/lib/libc/i386/DEFS.h
index edf08ea12379..1325e3746030 100644
--- a/lib/libc/i386/DEFS.h
+++ b/lib/libc/i386/DEFS.h
@@ -35,7 +35,7 @@
  *
  *	from: @(#)DEFS.h	5.1 (Berkeley) 4/23/90
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/DEFS.h,v 1.7.2.1 1999/08/29 14:46:31 peter Exp $
  */
 
 #include <machine/asm.h>
diff --git a/lib/libc/i386/SYS.h b/lib/libc/i386/SYS.h
index a5daa1c12987..9d6ea2274c9f 100644
--- a/lib/libc/i386/SYS.h
+++ b/lib/libc/i386/SYS.h
@@ -35,7 +35,7 @@
  *
  *	from: @(#)SYS.h	5.5 (Berkeley) 5/7/91
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/SYS.h,v 1.12.2.1 1999/08/29 14:46:32 peter Exp $
  */
 
 #include <sys/syscall.h>
diff --git a/lib/libc/i386/gen/Makefile.inc b/lib/libc/i386/gen/Makefile.inc
index f2506fdc6ae4..5e9988fcb01d 100644
--- a/lib/libc/i386/gen/Makefile.inc
+++ b/lib/libc/i386/gen/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/i386/gen/Makefile.inc,v 1.9.2.1 1999/08/29 14:46:33 peter Exp $
 
 SRCS+=	_setjmp.S alloca.S fabs.S frexp.c infinity.c isinf.c ldexp.c modf.S \
 	setjmp.S sigsetjmp.S
diff --git a/lib/libc/i386/gen/_setjmp.S b/lib/libc/i386/gen/_setjmp.S
index 39ad5accf47e..e42f98269093 100644
--- a/lib/libc/i386/gen/_setjmp.S
+++ b/lib/libc/i386/gen/_setjmp.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/gen/_setjmp.S,v 1.7.2.1 1999/08/29 14:46:33 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/gen/_setjmp.S,v 1.7.2.1 1999/08/29 14:46:33 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 /*
diff --git a/lib/libc/i386/gen/alloca.S b/lib/libc/i386/gen/alloca.S
index 4aa0e321b9e7..f612098b950e 100644
--- a/lib/libc/i386/gen/alloca.S
+++ b/lib/libc/i386/gen/alloca.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/gen/alloca.S,v 1.4.2.1 1999/08/29 14:46:34 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/gen/alloca.S,v 1.4.2.1 1999/08/29 14:46:34 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 /* like alloc, but automatic automatic free in return */
diff --git a/lib/libc/i386/gen/fabs.S b/lib/libc/i386/gen/fabs.S
index 578cf7cd5a9c..9b8ea090e0c5 100644
--- a/lib/libc/i386/gen/fabs.S
+++ b/lib/libc/i386/gen/fabs.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/gen/fabs.S,v 1.4.2.1 1999/08/29 14:46:35 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/gen/fabs.S,v 1.4.2.1 1999/08/29 14:46:35 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/gen/frexp.c b/lib/libc/i386/gen/frexp.c
index 4834f1788095..3b73f18253b9 100644
--- a/lib/libc/i386/gen/frexp.c
+++ b/lib/libc/i386/gen/frexp.c
@@ -30,11 +30,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/gen/frexp.c,v 1.4.2.1 1999/08/29 14:46:36 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/lib/libc/i386/gen/frexp.c,v 1.4.2.1 1999/08/29 14:46:36 peter Exp $";
 #endif /* LIBC_RCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/i386/gen/infinity.c b/lib/libc/i386/gen/infinity.c
index ac92d46e7ea9..10ddf1ad55f8 100644
--- a/lib/libc/i386/gen/infinity.c
+++ b/lib/libc/i386/gen/infinity.c
@@ -1,6 +1,6 @@
 /*
  * infinity.c
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/gen/infinity.c,v 1.4.2.1 1999/08/29 14:46:36 peter Exp $
  */
 
 #include <math.h>
diff --git a/lib/libc/i386/gen/isinf.c b/lib/libc/i386/gen/isinf.c
index b2b63a8f7274..eda2457af91b 100644
--- a/lib/libc/i386/gen/isinf.c
+++ b/lib/libc/i386/gen/isinf.c
@@ -30,11 +30,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/gen/isinf.c,v 1.5.2.1 1999/08/29 14:46:36 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/lib/libc/i386/gen/isinf.c,v 1.5.2.1 1999/08/29 14:46:36 peter Exp $";
 #endif /* LIBC_RCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/i386/gen/ldexp.c b/lib/libc/i386/gen/ldexp.c
index e7e58f05b2e0..450e6574aeab 100644
--- a/lib/libc/i386/gen/ldexp.c
+++ b/lib/libc/i386/gen/ldexp.c
@@ -33,11 +33,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/gen/ldexp.c,v 1.5.2.1 1999/08/29 14:46:37 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/lib/libc/i386/gen/ldexp.c,v 1.5.2.1 1999/08/29 14:46:37 peter Exp $";
 #endif /* LIBC_RCS and not lint */
 
 /*
diff --git a/lib/libc/i386/gen/modf.S b/lib/libc/i386/gen/modf.S
index 751ec1ca4f10..d76d1e0ae1ba 100644
--- a/lib/libc/i386/gen/modf.S
+++ b/lib/libc/i386/gen/modf.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/gen/modf.S,v 1.5.2.1 1999/08/29 14:46:37 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/gen/modf.S,v 1.5.2.1 1999/08/29 14:46:37 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 /*
diff --git a/lib/libc/i386/gen/setjmp.S b/lib/libc/i386/gen/setjmp.S
index 0dfdde917b6d..128e39e45b7a 100644
--- a/lib/libc/i386/gen/setjmp.S
+++ b/lib/libc/i386/gen/setjmp.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/gen/setjmp.S,v 1.8.2.1 1999/08/29 14:46:38 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/gen/setjmp.S,v 1.8.2.1 1999/08/29 14:46:38 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 /*
diff --git a/lib/libc/i386/gen/sigsetjmp.S b/lib/libc/i386/gen/sigsetjmp.S
index c3f98ff0f192..908d501786fa 100644
--- a/lib/libc/i386/gen/sigsetjmp.S
+++ b/lib/libc/i386/gen/sigsetjmp.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/gen/sigsetjmp.S,v 1.11.2.1 1999/08/29 14:46:38 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/gen/sigsetjmp.S,v 1.11.2.1 1999/08/29 14:46:38 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/net/Makefile.inc b/lib/libc/i386/net/Makefile.inc
index 96e559bf8027..3e770c779baf 100644
--- a/lib/libc/i386/net/Makefile.inc
+++ b/lib/libc/i386/net/Makefile.inc
@@ -1,4 +1,4 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/i386/net/Makefile.inc,v 1.5.2.1 1999/08/29 14:46:40 peter Exp $
 
 SRCS+=	htonl.S htons.S ntohl.S ntohs.S
diff --git a/lib/libc/i386/net/htonl.S b/lib/libc/i386/net/htonl.S
index 48f1ca8adcf9..d0d9a7f9ffa2 100644
--- a/lib/libc/i386/net/htonl.S
+++ b/lib/libc/i386/net/htonl.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/net/htonl.S,v 1.4.2.1 1999/08/29 14:46:41 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/net/htonl.S,v 1.4.2.1 1999/08/29 14:46:41 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 /* netorder = htonl(hostorder) */
diff --git a/lib/libc/i386/net/htons.S b/lib/libc/i386/net/htons.S
index 68f2b5a0131e..bae06771f267 100644
--- a/lib/libc/i386/net/htons.S
+++ b/lib/libc/i386/net/htons.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/net/htons.S,v 1.4.2.1 1999/08/29 14:46:41 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/net/htons.S,v 1.4.2.1 1999/08/29 14:46:41 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 /* netorder = htons(hostorder) */
diff --git a/lib/libc/i386/net/ntohl.S b/lib/libc/i386/net/ntohl.S
index 7be9deebe26c..c947a295e5fa 100644
--- a/lib/libc/i386/net/ntohl.S
+++ b/lib/libc/i386/net/ntohl.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/net/ntohl.S,v 1.4.2.1 1999/08/29 14:46:42 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/net/ntohl.S,v 1.4.2.1 1999/08/29 14:46:42 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 /* hostorder = ntohl(netorder) */
diff --git a/lib/libc/i386/net/ntohs.S b/lib/libc/i386/net/ntohs.S
index 0f1d2280ce70..9313189c2fa6 100644
--- a/lib/libc/i386/net/ntohs.S
+++ b/lib/libc/i386/net/ntohs.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/net/ntohs.S,v 1.4.2.1 1999/08/29 14:46:42 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/net/ntohs.S,v 1.4.2.1 1999/08/29 14:46:42 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 /* hostorder = ntohs(netorder) */
diff --git a/lib/libc/i386/stdlib/Makefile.inc b/lib/libc/i386/stdlib/Makefile.inc
index 0a6a6a89237c..168d61b41aa5 100644
--- a/lib/libc/i386/stdlib/Makefile.inc
+++ b/lib/libc/i386/stdlib/Makefile.inc
@@ -1,4 +1,4 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/i386/stdlib/Makefile.inc,v 1.6.2.1 1999/08/29 14:46:43 peter Exp $
 
 MDSRCS+=abs.S div.S labs.S ldiv.S
diff --git a/lib/libc/i386/stdlib/abs.S b/lib/libc/i386/stdlib/abs.S
index e4812d8547ad..4fb3bb000cff 100644
--- a/lib/libc/i386/stdlib/abs.S
+++ b/lib/libc/i386/stdlib/abs.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/stdlib/abs.S,v 1.5.2.1 1999/08/29 14:46:44 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/stdlib/abs.S,v 1.5.2.1 1999/08/29 14:46:44 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/stdlib/div.S b/lib/libc/i386/stdlib/div.S
index a9ff515e90f7..ed385339714d 100644
--- a/lib/libc/i386/stdlib/div.S
+++ b/lib/libc/i386/stdlib/div.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/stdlib/div.S,v 1.3.2.1 1999/08/29 14:46:44 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$FreeBSD$"
+        .asciz "$FreeBSD: src/lib/libc/i386/stdlib/div.S,v 1.3.2.1 1999/08/29 14:46:44 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/stdlib/labs.S b/lib/libc/i386/stdlib/labs.S
index 6fa814939d41..a15762873595 100644
--- a/lib/libc/i386/stdlib/labs.S
+++ b/lib/libc/i386/stdlib/labs.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/stdlib/labs.S,v 1.5.2.1 1999/08/29 14:46:45 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/stdlib/labs.S,v 1.5.2.1 1999/08/29 14:46:45 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/stdlib/ldiv.S b/lib/libc/i386/stdlib/ldiv.S
index c9546c379a8f..9fc565418bea 100644
--- a/lib/libc/i386/stdlib/ldiv.S
+++ b/lib/libc/i386/stdlib/ldiv.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/stdlib/ldiv.S,v 1.3.2.1 1999/08/29 14:46:45 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$FreeBSD$"
+        .asciz "$FreeBSD: src/lib/libc/i386/stdlib/ldiv.S,v 1.3.2.1 1999/08/29 14:46:45 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/Makefile.inc b/lib/libc/i386/string/Makefile.inc
index 1b2de19a83df..e273a2687f1a 100644
--- a/lib/libc/i386/string/Makefile.inc
+++ b/lib/libc/i386/string/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/i386/string/Makefile.inc,v 1.8.2.1 1999/08/29 14:46:47 peter Exp $
 
 MDSRCS+=bcmp.S bcopy.S bzero.S ffs.S index.S memchr.S memcmp.S memcpy.S \
 	memmove.S memset.S rindex.S strcat.S strchr.S strcmp.S strcpy.S \
diff --git a/lib/libc/i386/string/bcmp.S b/lib/libc/i386/string/bcmp.S
index 3c0bd02eb9b8..ec6434bdf35c 100644
--- a/lib/libc/i386/string/bcmp.S
+++ b/lib/libc/i386/string/bcmp.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/string/bcmp.S,v 1.4.2.1 1999/08/29 14:46:47 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$FreeBSD$"
+        .asciz "$FreeBSD: src/lib/libc/i386/string/bcmp.S,v 1.4.2.1 1999/08/29 14:46:47 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/bzero.S b/lib/libc/i386/string/bzero.S
index 7f95f712ee98..3031e2f69fc5 100644
--- a/lib/libc/i386/string/bzero.S
+++ b/lib/libc/i386/string/bzero.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/string/bzero.S,v 1.4.2.1 1999/08/29 14:46:48 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$FreeBSD$"
+        .asciz "$FreeBSD: src/lib/libc/i386/string/bzero.S,v 1.4.2.1 1999/08/29 14:46:48 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/ffs.S b/lib/libc/i386/string/ffs.S
index ae4be791ce03..6c4df9d867fc 100644
--- a/lib/libc/i386/string/ffs.S
+++ b/lib/libc/i386/string/ffs.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/string/ffs.S,v 1.4.2.1 1999/08/29 14:46:48 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$FreeBSD$"
+        .asciz "$FreeBSD: src/lib/libc/i386/string/ffs.S,v 1.4.2.1 1999/08/29 14:46:48 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/index.S b/lib/libc/i386/string/index.S
index d63a646e953a..4c46ba8a49d0 100644
--- a/lib/libc/i386/string/index.S
+++ b/lib/libc/i386/string/index.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/string/index.S,v 1.4.2.1 1999/08/29 14:46:48 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$FreeBSD$"
+        .asciz "$FreeBSD: src/lib/libc/i386/string/index.S,v 1.4.2.1 1999/08/29 14:46:48 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/memchr.S b/lib/libc/i386/string/memchr.S
index 9604f595a933..1e9914cf53e9 100644
--- a/lib/libc/i386/string/memchr.S
+++ b/lib/libc/i386/string/memchr.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/string/memchr.S,v 1.7.2.1 1999/08/29 14:46:49 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$FreeBSD$"
+        .asciz "$FreeBSD: src/lib/libc/i386/string/memchr.S,v 1.7.2.1 1999/08/29 14:46:49 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/memcmp.S b/lib/libc/i386/string/memcmp.S
index e4fd4a734868..342979afe5d9 100644
--- a/lib/libc/i386/string/memcmp.S
+++ b/lib/libc/i386/string/memcmp.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/string/memcmp.S,v 1.4.2.1 1999/08/29 14:46:49 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$FreeBSD$"
+        .asciz "$FreeBSD: src/lib/libc/i386/string/memcmp.S,v 1.4.2.1 1999/08/29 14:46:49 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/memset.S b/lib/libc/i386/string/memset.S
index bb9e268d16dc..1086150bf255 100644
--- a/lib/libc/i386/string/memset.S
+++ b/lib/libc/i386/string/memset.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/string/memset.S,v 1.4.2.1 1999/08/29 14:46:51 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$FreeBSD$"
+        .asciz "$FreeBSD: src/lib/libc/i386/string/memset.S,v 1.4.2.1 1999/08/29 14:46:51 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/rindex.S b/lib/libc/i386/string/rindex.S
index dd15865383a6..179094c78baf 100644
--- a/lib/libc/i386/string/rindex.S
+++ b/lib/libc/i386/string/rindex.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/string/rindex.S,v 1.4.2.1 1999/08/29 14:46:51 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$FreeBSD$"
+        .asciz "$FreeBSD: src/lib/libc/i386/string/rindex.S,v 1.4.2.1 1999/08/29 14:46:51 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/strcat.S b/lib/libc/i386/string/strcat.S
index ceda0102c79f..7081cb1c1493 100644
--- a/lib/libc/i386/string/strcat.S
+++ b/lib/libc/i386/string/strcat.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/string/strcat.S,v 1.4.2.1 1999/08/29 14:46:51 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$FreeBSD$"
+        .asciz "$FreeBSD: src/lib/libc/i386/string/strcat.S,v 1.4.2.1 1999/08/29 14:46:51 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/strchr.S b/lib/libc/i386/string/strchr.S
index 16fa724ca20a..b5d31586da6e 100644
--- a/lib/libc/i386/string/strchr.S
+++ b/lib/libc/i386/string/strchr.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/string/strchr.S,v 1.4.2.1 1999/08/29 14:46:52 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$FreeBSD$"
+        .asciz "$FreeBSD: src/lib/libc/i386/string/strchr.S,v 1.4.2.1 1999/08/29 14:46:52 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/strcmp.S b/lib/libc/i386/string/strcmp.S
index 28a3f2f5e5cd..03238240ee6a 100644
--- a/lib/libc/i386/string/strcmp.S
+++ b/lib/libc/i386/string/strcmp.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/string/strcmp.S,v 1.4.2.1 1999/08/29 14:46:52 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$FreeBSD$"
+        .asciz "$FreeBSD: src/lib/libc/i386/string/strcmp.S,v 1.4.2.1 1999/08/29 14:46:52 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/strcpy.S b/lib/libc/i386/string/strcpy.S
index 5a304149513c..497f442dc002 100644
--- a/lib/libc/i386/string/strcpy.S
+++ b/lib/libc/i386/string/strcpy.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/string/strcpy.S,v 1.4.2.1 1999/08/29 14:46:52 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$FreeBSD$"
+        .asciz "$FreeBSD: src/lib/libc/i386/string/strcpy.S,v 1.4.2.1 1999/08/29 14:46:52 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/strlen.S b/lib/libc/i386/string/strlen.S
index eedc96962f98..3992f105cd0c 100644
--- a/lib/libc/i386/string/strlen.S
+++ b/lib/libc/i386/string/strlen.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/string/strlen.S,v 1.4.2.1 1999/08/29 14:46:53 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$FreeBSD$"
+        .asciz "$FreeBSD: src/lib/libc/i386/string/strlen.S,v 1.4.2.1 1999/08/29 14:46:53 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/strncmp.S b/lib/libc/i386/string/strncmp.S
index 0efc6aca6ed5..0e96324fe145 100644
--- a/lib/libc/i386/string/strncmp.S
+++ b/lib/libc/i386/string/strncmp.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/string/strncmp.S,v 1.5.2.1 1999/08/29 14:46:54 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$FreeBSD$"
+        .asciz "$FreeBSD: src/lib/libc/i386/string/strncmp.S,v 1.5.2.1 1999/08/29 14:46:54 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/strrchr.S b/lib/libc/i386/string/strrchr.S
index d62039f31d04..30ff4966a3af 100644
--- a/lib/libc/i386/string/strrchr.S
+++ b/lib/libc/i386/string/strrchr.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/string/strrchr.S,v 1.4.2.1 1999/08/29 14:46:54 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$FreeBSD$"
+        .asciz "$FreeBSD: src/lib/libc/i386/string/strrchr.S,v 1.4.2.1 1999/08/29 14:46:54 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/swab.S b/lib/libc/i386/string/swab.S
index 80578afcf5cc..88567be50f04 100644
--- a/lib/libc/i386/string/swab.S
+++ b/lib/libc/i386/string/swab.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/string/swab.S,v 1.4.2.1 1999/08/29 14:46:55 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/string/swab.S,v 1.4.2.1 1999/08/29 14:46:55 peter Exp $"
 #endif
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/sys/Makefile.inc b/lib/libc/i386/sys/Makefile.inc
index 30081e82ffc6..7c0bee802810 100644
--- a/lib/libc/i386/sys/Makefile.inc
+++ b/lib/libc/i386/sys/Makefile.inc
@@ -1,5 +1,5 @@
 #	from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.12.2.2 1999/08/29 14:46:57 peter Exp $
 
 SRCS+=	i386_get_ioperm.c i386_get_ldt.c i386_set_ioperm.c i386_set_ldt.c \
 	i386_vm86.c
diff --git a/lib/libc/i386/sys/Ovfork.S b/lib/libc/i386/sys/Ovfork.S
index 30d7fd1932b7..e6c8a206f2b7 100644
--- a/lib/libc/i386/sys/Ovfork.S
+++ b/lib/libc/i386/sys/Ovfork.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/sys/Ovfork.S,v 1.10.2.1 1999/08/29 14:46:57 peter Exp $
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/sys/Ovfork.S,v 1.10.2.1 1999/08/29 14:46:57 peter Exp $"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/sys/brk.S b/lib/libc/i386/sys/brk.S
index 57266750efd3..f9b734ae2baf 100644
--- a/lib/libc/i386/sys/brk.S
+++ b/lib/libc/i386/sys/brk.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/sys/brk.S,v 1.6.2.1 1999/08/29 14:46:58 peter Exp $
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/sys/brk.S,v 1.6.2.1 1999/08/29 14:46:58 peter Exp $"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/i386/sys/cerror.S b/lib/libc/i386/sys/cerror.S
index 31c3622bd200..c7c80f037508 100644
--- a/lib/libc/i386/sys/cerror.S
+++ b/lib/libc/i386/sys/cerror.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/sys/cerror.S,v 1.9.2.1 1999/08/29 14:46:59 peter Exp $
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/sys/cerror.S,v 1.9.2.1 1999/08/29 14:46:59 peter Exp $"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/i386/sys/exect.S b/lib/libc/i386/sys/exect.S
index 9f90060fe156..36a39fd289c1 100644
--- a/lib/libc/i386/sys/exect.S
+++ b/lib/libc/i386/sys/exect.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/sys/exect.S,v 1.5.2.1 1999/08/29 14:46:59 peter Exp $
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/sys/exect.S,v 1.5.2.1 1999/08/29 14:46:59 peter Exp $"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/i386/sys/fork.S b/lib/libc/i386/sys/fork.S
index 6c3cde8a2772..22a2915c35e1 100644
--- a/lib/libc/i386/sys/fork.S
+++ b/lib/libc/i386/sys/fork.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/sys/fork.S,v 1.7.2.1 1999/08/29 14:46:59 peter Exp $
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/sys/fork.S,v 1.7.2.1 1999/08/29 14:46:59 peter Exp $"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/i386/sys/i386_get_ioperm.2 b/lib/libc/i386/sys/i386_get_ioperm.2
index 2d326b88fc7d..feb77e4e0782 100644
--- a/lib/libc/i386/sys/i386_get_ioperm.2
+++ b/lib/libc/i386/sys/i386_get_ioperm.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/i386/sys/i386_get_ioperm.2,v 1.2.2.1 1999/08/29 14:47:00 peter Exp $
 .\"
 .Dd July 27, 1998
 .Os
diff --git a/lib/libc/i386/sys/i386_get_ioperm.c b/lib/libc/i386/sys/i386_get_ioperm.c
index f49ae2eb8d57..b2417971a06c 100644
--- a/lib/libc/i386/sys/i386_get_ioperm.c
+++ b/lib/libc/i386/sys/i386_get_ioperm.c
@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/sys/i386_get_ioperm.c,v 1.2.2.1 1999/08/29 14:47:00 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/lib/libc/i386/sys/i386_get_ioperm.c,v 1.2.2.1 1999/08/29 14:47:00 peter Exp $";
 #endif /* LIBC_RCS and not lint */
 
 #include <machine/sysarch.h>
diff --git a/lib/libc/i386/sys/i386_get_ldt.2 b/lib/libc/i386/sys/i386_get_ldt.2
index b6173e648664..d5f1c59c53d4 100644
--- a/lib/libc/i386/sys/i386_get_ldt.2
+++ b/lib/libc/i386/sys/i386_get_ldt.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)fork.2	6.5 (Berkeley) 3/10/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/i386/sys/i386_get_ldt.2,v 1.4.2.1 1999/08/29 14:47:00 peter Exp $
 .\"
 .Dd September 20, 1993
 .Dt I386_GET_LDT 2
diff --git a/lib/libc/i386/sys/i386_get_ldt.c b/lib/libc/i386/sys/i386_get_ldt.c
index 11bbd8d30090..996dff7d85b0 100644
--- a/lib/libc/i386/sys/i386_get_ldt.c
+++ b/lib/libc/i386/sys/i386_get_ldt.c
@@ -25,11 +25,11 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/sys/i386_get_ldt.c,v 1.5.2.1 1999/08/29 14:47:01 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/lib/libc/i386/sys/i386_get_ldt.c,v 1.5.2.1 1999/08/29 14:47:01 peter Exp $";
 #endif /* LIBC_RCS and not lint */
 
 #include <sys/cdefs.h>
diff --git a/lib/libc/i386/sys/i386_set_ioperm.c b/lib/libc/i386/sys/i386_set_ioperm.c
index c7812edd82d5..a66c9479b1aa 100644
--- a/lib/libc/i386/sys/i386_set_ioperm.c
+++ b/lib/libc/i386/sys/i386_set_ioperm.c
@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/sys/i386_set_ioperm.c,v 1.2.2.1 1999/08/29 14:47:02 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/lib/libc/i386/sys/i386_set_ioperm.c,v 1.2.2.1 1999/08/29 14:47:02 peter Exp $";
 #endif /* LIBC_RCS and not lint */
 
 #include <machine/sysarch.h>
diff --git a/lib/libc/i386/sys/i386_set_ldt.c b/lib/libc/i386/sys/i386_set_ldt.c
index bcde553e503f..d1caa581d2b0 100644
--- a/lib/libc/i386/sys/i386_set_ldt.c
+++ b/lib/libc/i386/sys/i386_set_ldt.c
@@ -25,11 +25,11 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/sys/i386_set_ldt.c,v 1.5.2.1 1999/08/29 14:47:02 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/lib/libc/i386/sys/i386_set_ldt.c,v 1.5.2.1 1999/08/29 14:47:02 peter Exp $";
 #endif /* LIBC_RCS and not lint */
 
 #include <sys/cdefs.h>
diff --git a/lib/libc/i386/sys/i386_vm86.2 b/lib/libc/i386/sys/i386_vm86.2
index 4dc0d52adbe3..61f0b8000658 100644
--- a/lib/libc/i386/sys/i386_vm86.2
+++ b/lib/libc/i386/sys/i386_vm86.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/i386/sys/i386_vm86.2,v 1.2.2.1 1999/08/29 14:47:03 peter Exp $
 .\"
 .Dd July 27, 1998
 .Os
diff --git a/lib/libc/i386/sys/i386_vm86.c b/lib/libc/i386/sys/i386_vm86.c
index 31f923b3b2db..f81096388272 100644
--- a/lib/libc/i386/sys/i386_vm86.c
+++ b/lib/libc/i386/sys/i386_vm86.c
@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/sys/i386_vm86.c,v 1.1.2.1 1999/08/29 14:47:04 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/lib/libc/i386/sys/i386_vm86.c,v 1.1.2.1 1999/08/29 14:47:04 peter Exp $";
 #endif /* LIBC_RCS and not lint */
 
 #include <machine/sysarch.h>
diff --git a/lib/libc/i386/sys/pipe.S b/lib/libc/i386/sys/pipe.S
index 1684611f766f..0d9f67a071cf 100644
--- a/lib/libc/i386/sys/pipe.S
+++ b/lib/libc/i386/sys/pipe.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/sys/pipe.S,v 1.7.2.1 1999/08/29 14:47:04 peter Exp $
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/sys/pipe.S,v 1.7.2.1 1999/08/29 14:47:04 peter Exp $"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/i386/sys/ptrace.S b/lib/libc/i386/sys/ptrace.S
index 7f5e149d33e7..dfc6c454f4a1 100644
--- a/lib/libc/i386/sys/ptrace.S
+++ b/lib/libc/i386/sys/ptrace.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/sys/ptrace.S,v 1.5.2.1 1999/08/29 14:47:04 peter Exp $
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/sys/ptrace.S,v 1.5.2.1 1999/08/29 14:47:04 peter Exp $"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/i386/sys/reboot.S b/lib/libc/i386/sys/reboot.S
index 4e39068fdff4..cd1cd36467ee 100644
--- a/lib/libc/i386/sys/reboot.S
+++ b/lib/libc/i386/sys/reboot.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/sys/reboot.S,v 1.4.2.1 1999/08/29 14:47:05 peter Exp $
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/sys/reboot.S,v 1.4.2.1 1999/08/29 14:47:05 peter Exp $"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/i386/sys/rfork.S b/lib/libc/i386/sys/rfork.S
index b3e20e4eeb63..d6df3d97d22f 100644
--- a/lib/libc/i386/sys/rfork.S
+++ b/lib/libc/i386/sys/rfork.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/sys/rfork.S,v 1.5.2.1 1999/08/29 14:47:05 peter Exp $
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/sys/rfork.S,v 1.5.2.1 1999/08/29 14:47:05 peter Exp $"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/i386/sys/sbrk.S b/lib/libc/i386/sys/sbrk.S
index f7aae351b00b..6161e9162378 100644
--- a/lib/libc/i386/sys/sbrk.S
+++ b/lib/libc/i386/sys/sbrk.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/sys/sbrk.S,v 1.6.2.1 1999/08/29 14:47:06 peter Exp $
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/sys/sbrk.S,v 1.6.2.1 1999/08/29 14:47:06 peter Exp $"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/i386/sys/setlogin.S b/lib/libc/i386/sys/setlogin.S
index a4d74b0d10cf..cd628b0693a6 100644
--- a/lib/libc/i386/sys/setlogin.S
+++ b/lib/libc/i386/sys/setlogin.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/sys/setlogin.S,v 1.5.2.1 1999/08/29 14:47:07 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/sys/setlogin.S,v 1.5.2.1 1999/08/29 14:47:07 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/i386/sys/sigpending.S b/lib/libc/i386/sys/sigpending.S
index f734fd45644a..2fa942359211 100644
--- a/lib/libc/i386/sys/sigpending.S
+++ b/lib/libc/i386/sys/sigpending.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/sys/sigpending.S,v 1.7.2.1 1999/08/29 14:47:07 peter Exp $
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/sys/sigpending.S,v 1.7.2.1 1999/08/29 14:47:07 peter Exp $"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/i386/sys/sigprocmask.S b/lib/libc/i386/sys/sigprocmask.S
index 422ae3b411d3..71b9eea79299 100644
--- a/lib/libc/i386/sys/sigprocmask.S
+++ b/lib/libc/i386/sys/sigprocmask.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/sys/sigprocmask.S,v 1.6.2.1 1999/08/29 14:47:08 peter Exp $
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/sys/sigprocmask.S,v 1.6.2.1 1999/08/29 14:47:08 peter Exp $"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/i386/sys/sigreturn.S b/lib/libc/i386/sys/sigreturn.S
index 7405c340030e..bfe29b00bbd4 100644
--- a/lib/libc/i386/sys/sigreturn.S
+++ b/lib/libc/i386/sys/sigreturn.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/sys/sigreturn.S,v 1.7.2.1 1999/08/29 14:47:08 peter Exp $
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/sys/sigreturn.S,v 1.7.2.1 1999/08/29 14:47:08 peter Exp $"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/i386/sys/sigsuspend.S b/lib/libc/i386/sys/sigsuspend.S
index c60b9766f189..925bb0e9f43b 100644
--- a/lib/libc/i386/sys/sigsuspend.S
+++ b/lib/libc/i386/sys/sigsuspend.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/sys/sigsuspend.S,v 1.7.2.1 1999/08/29 14:47:08 peter Exp $
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/sys/sigsuspend.S,v 1.7.2.1 1999/08/29 14:47:08 peter Exp $"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/i386/sys/syscall.S b/lib/libc/i386/sys/syscall.S
index b5516f0f8fe6..49feaee7899d 100644
--- a/lib/libc/i386/sys/syscall.S
+++ b/lib/libc/i386/sys/syscall.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/sys/syscall.S,v 1.5.2.1 1999/08/29 14:47:08 peter Exp $
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc/i386/sys/syscall.S,v 1.5.2.1 1999/08/29 14:47:08 peter Exp $"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/include/libc_private.h b/lib/libc/include/libc_private.h
index 1e20bc7fcb74..2ae5676faa86 100644
--- a/lib/libc/include/libc_private.h
+++ b/lib/libc/include/libc_private.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.2.4.1 1999/08/29 14:47:10 peter Exp $
  *
  * Private definitions for libc, libc_r and libpthread.
  *
diff --git a/lib/libc/include/spinlock.h b/lib/libc/include/spinlock.h
index d81615d01bf1..e8e4d86379b4 100644
--- a/lib/libc/include/spinlock.h
+++ b/lib/libc/include/spinlock.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/include/spinlock.h,v 1.3.4.1 1999/08/29 14:47:11 peter Exp $
  *
  * Lock definitions used in both libc and libpthread.
  *
diff --git a/lib/libc/locale/Makefile.inc b/lib/libc/locale/Makefile.inc
index 531e2c5509c5..5ca397390aaa 100644
--- a/lib/libc/locale/Makefile.inc
+++ b/lib/libc/locale/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.13.2.2 1999/08/29 14:47:12 peter Exp $
 
 # locale sources
 .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/locale ${.CURDIR}/../libc/locale
diff --git a/lib/libc/locale/collate.c b/lib/libc/locale/collate.c
index f71870c9a34f..0b136e244572 100644
--- a/lib/libc/locale/collate.c
+++ b/lib/libc/locale/collate.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/locale/collate.c,v 1.16.2.1 1999/08/29 14:47:12 peter Exp $
  */
 
 #include <rune.h>
diff --git a/lib/libc/locale/collate.h b/lib/libc/locale/collate.h
index 23a87b7e0a75..8a7f9a0fcb96 100644
--- a/lib/libc/locale/collate.h
+++ b/lib/libc/locale/collate.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/locale/collate.h,v 1.7.2.1 1999/08/29 14:47:13 peter Exp $
  */
 
 #ifndef COLLATE_H_INCLUDED
diff --git a/lib/libc/locale/collcmp.c b/lib/libc/locale/collcmp.c
index ae783d06faee..f87245afce1f 100644
--- a/lib/libc/locale/collcmp.c
+++ b/lib/libc/locale/collcmp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/locale/collcmp.c,v 1.11.2.1 1999/08/29 14:47:13 peter Exp $
  */
 
 #define ASCII_COMPATIBLE_COLLATE        /* see usr.bin/colldef/data */
diff --git a/lib/libc/locale/ctype.3 b/lib/libc/locale/ctype.3
index aba1d3492340..a3244ad819b8 100644
--- a/lib/libc/locale/ctype.3
+++ b/lib/libc/locale/ctype.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ctype.3	8.1 (Berkeley) 6/4/93
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libc/locale/ctype.3,v 1.2.2.1 1999/12/14 10:40:46 phantom Exp $
 .\"
 .Dd June 4, 1993
 .Dt CTYPE 3
diff --git a/lib/libc/locale/rune.3 b/lib/libc/locale/rune.3
index 6f1c6e55676b..d2fa5dd49ce1 100644
--- a/lib/libc/locale/rune.3
+++ b/lib/libc/locale/rune.3
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rune.3	8.2 (Berkeley) 12/11/93
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libc/locale/rune.3,v 1.7.2.1 1999/09/23 13:47:46 phantom Exp $
 .\"
 .Dd December 11, 1993
 .Dt RUNE 3
diff --git a/lib/libc/locale/setlocale.c b/lib/libc/locale/setlocale.c
index 179be54325fc..d608a47765bb 100644
--- a/lib/libc/locale/setlocale.c
+++ b/lib/libc/locale/setlocale.c
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/locale/setlocale.c,v 1.23.2.2 1999/11/09 11:11:10 ache Exp $
  */
 
 #ifdef LIBC_RCS
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/locale/setlocale.c,v 1.23.2.2 1999/11/09 11:11:10 ache Exp $";
 #endif
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/locale/table.c b/lib/libc/locale/table.c
index 556a8defbda0..929f645ba401 100644
--- a/lib/libc/locale/table.c
+++ b/lib/libc/locale/table.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/locale/table.c,v 1.11.2.1 1999/08/29 14:47:14 peter Exp $
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc
index 8b4db7cd4a88..79a5e239e39e 100644
--- a/lib/libc/net/Makefile.inc
+++ b/lib/libc/net/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.2 (Berkeley) 9/5/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.28.2.1 1999/08/29 14:47:15 peter Exp $
 
 # machine-independent net sources
 .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/net ${.CURDIR}/../libc/net
diff --git a/lib/libc/net/base64.c b/lib/libc/net/base64.c
index 1a4909f8bb9c..5818f3a01309 100644
--- a/lib/libc/net/base64.c
+++ b/lib/libc/net/base64.c
@@ -41,7 +41,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/base64.c,v 1.2.2.1 1999/08/29 14:47:16 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/net/ether_addr.c b/lib/libc/net/ether_addr.c
index 89aa7b5d6924..c3a0709c3c3c 100644
--- a/lib/libc/net/ether_addr.c
+++ b/lib/libc/net/ether_addr.c
@@ -35,7 +35,7 @@
  * Center for Telecommunications Research
  * Columbia University, New York City
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/net/ether_addr.c,v 1.9.2.1 1999/08/29 14:47:17 peter Exp $
  */
 
 
diff --git a/lib/libc/net/ethers.3 b/lib/libc/net/ethers.3
index e8e5ced5f83c..d08a8278366a 100644
--- a/lib/libc/net/ethers.3
+++ b/lib/libc/net/ethers.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/ethers.3,v 1.7.2.1 1999/08/29 14:47:17 peter Exp $
 .\"
 .Dd April 12, 1995
 .Dt ETHERS 3
diff --git a/lib/libc/net/gethostbydns.c b/lib/libc/net/gethostbydns.c
index 32271db6bbd0..5c28102b668d 100644
--- a/lib/libc/net/gethostbydns.c
+++ b/lib/libc/net/gethostbydns.c
@@ -56,7 +56,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
 static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $";
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.23.2.1 1999/08/29 14:47:17 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/net/gethostbyht.c b/lib/libc/net/gethostbyht.c
index cd5f0f45735b..2f43cfc80506 100644
--- a/lib/libc/net/gethostbyht.c
+++ b/lib/libc/net/gethostbyht.c
@@ -53,7 +53,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/gethostbyht.c,v 1.10.2.2 1999/08/29 14:47:18 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/net/gethostbyname.3 b/lib/libc/net/gethostbyname.3
index 1b48c4a4153f..2327da47be25 100644
--- a/lib/libc/net/gethostbyname.3
+++ b/lib/libc/net/gethostbyname.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)gethostbyname.3	8.4 (Berkeley) 5/25/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/gethostbyname.3,v 1.10.2.2 1999/09/19 17:59:41 phantom Exp $
 .\"
 .Dd May 25, 1995
 .Dt GETHOSTBYNAME 3
diff --git a/lib/libc/net/gethostbynis.c b/lib/libc/net/gethostbynis.c
index 10ff7b912204..24652d80dd32 100644
--- a/lib/libc/net/gethostbynis.c
+++ b/lib/libc/net/gethostbynis.c
@@ -24,8 +24,8 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)$FreeBSD$";
-static char rcsid[] = "$FreeBSD$";
+static char sccsid[] = "@(#)$FreeBSD: src/lib/libc/net/gethostbynis.c,v 1.8.2.1 1999/08/29 14:47:19 peter Exp $";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/gethostbynis.c,v 1.8.2.1 1999/08/29 14:47:19 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/net/gethostnamadr.c b/lib/libc/net/gethostnamadr.c
index 8e02d2c103dd..4cf033b1c55c 100644
--- a/lib/libc/net/gethostnamadr.c
+++ b/lib/libc/net/gethostnamadr.c
@@ -24,8 +24,8 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)$FreeBSD$";
-static char rcsid[] = "$FreeBSD$";
+static char sccsid[] = "@(#)$FreeBSD: src/lib/libc/net/gethostnamadr.c,v 1.13.2.1 1999/08/29 14:47:20 peter Exp $";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/gethostnamadr.c,v 1.13.2.1 1999/08/29 14:47:20 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/net/getnetbydns.c b/lib/libc/net/getnetbydns.c
index 65d9d2de96d8..bd0e1aeffda7 100644
--- a/lib/libc/net/getnetbydns.c
+++ b/lib/libc/net/getnetbydns.c
@@ -60,7 +60,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/getnetbydns.c,v 1.12.2.1 1999/08/29 14:47:20 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/net/getnetbyht.c b/lib/libc/net/getnetbyht.c
index ab164b16746d..949a9691cb6f 100644
--- a/lib/libc/net/getnetbyht.c
+++ b/lib/libc/net/getnetbyht.c
@@ -44,7 +44,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)getnetent.c	8.1 (Berkeley) 6/4/93";
 static char orig_rcsid[] = "From: Id: getnetent.c,v 8.4 1997/06/01 20:34:37 vixie Exp";
-static chat rcsid[] = "$FreeBSD$";
+static chat rcsid[] = "$FreeBSD: src/lib/libc/net/getnetbyht.c,v 1.6.2.1 1999/08/29 14:47:20 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/net/getnetbynis.c b/lib/libc/net/getnetbynis.c
index 0ab7073cada5..a3a274fe9b78 100644
--- a/lib/libc/net/getnetbynis.c
+++ b/lib/libc/net/getnetbynis.c
@@ -24,8 +24,8 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)$FreeBSD$";
-static char rcsid[] = "$FreeBSD$";
+static char sccsid[] = "@(#)$FreeBSD: src/lib/libc/net/getnetbynis.c,v 1.10.2.1 1999/08/29 14:47:21 peter Exp $";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/getnetbynis.c,v 1.10.2.1 1999/08/29 14:47:21 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/net/getnetnamadr.c b/lib/libc/net/getnetnamadr.c
index 3ac10c2cbaa5..61786957faa2 100644
--- a/lib/libc/net/getnetnamadr.c
+++ b/lib/libc/net/getnetnamadr.c
@@ -24,7 +24,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/getnetnamadr.c,v 1.10.2.1 1999/08/29 14:47:21 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/net/getservent.3 b/lib/libc/net/getservent.3
index ffe75884bc73..2791e3be22fe 100644
--- a/lib/libc/net/getservent.3
+++ b/lib/libc/net/getservent.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)getservent.3	8.3 (Berkeley) 1/12/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/getservent.3,v 1.5.2.1 1999/08/29 14:47:22 peter Exp $
 .\"
 .Dd July 9, 1995
 .Dt GETSERVENT 3
diff --git a/lib/libc/net/herror.c b/lib/libc/net/herror.c
index 0ab744843251..7ee2940c2fbf 100644
--- a/lib/libc/net/herror.c
+++ b/lib/libc/net/herror.c
@@ -50,7 +50,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)herror.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/herror.c,v 1.7.2.1 1999/08/29 14:47:23 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/net/inet.3 b/lib/libc/net/inet.3
index 629ab0f18894..d9156c1b5826 100644
--- a/lib/libc/net/inet.3
+++ b/lib/libc/net/inet.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)inet.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/inet.3,v 1.6.2.1 1999/08/29 14:47:23 peter Exp $
 .\"
 .Dd June 17, 1996
 .Dt INET 3
diff --git a/lib/libc/net/inet_addr.c b/lib/libc/net/inet_addr.c
index 3fac1cafa31d..9ce9bae74503 100644
--- a/lib/libc/net/inet_addr.c
+++ b/lib/libc/net/inet_addr.c
@@ -55,7 +55,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)inet_addr.c	8.1 (Berkeley) 6/17/93";
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/inet_addr.c,v 1.6.2.1 1999/08/29 14:47:24 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/net/inet_net_ntop.c b/lib/libc/net/inet_net_ntop.c
index 4b30cb69e859..18a7a9a87ebf 100644
--- a/lib/libc/net/inet_net_ntop.c
+++ b/lib/libc/net/inet_net_ntop.c
@@ -17,7 +17,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char orig_rcsid[] = "From Id: inet_net_ntop.c,v 8.2 1996/08/08 06:54:44 vixie Exp";
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/lib/libc/net/inet_net_ntop.c,v 1.4.2.1 1999/08/29 14:47:24 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/lib/libc/net/inet_net_pton.c b/lib/libc/net/inet_net_pton.c
index 04a45d43a641..e3483c8cdc2e 100644
--- a/lib/libc/net/inet_net_pton.c
+++ b/lib/libc/net/inet_net_pton.c
@@ -17,7 +17,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char orig_rcsid[] = "From Id: inet_net_pton.c,v 1.8 1996/11/21 10:28:12 vixie Exp $";
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/lib/libc/net/inet_net_pton.c,v 1.5.2.1 1999/08/29 14:47:24 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/lib/libc/net/inet_neta.c b/lib/libc/net/inet_neta.c
index 2b8a84c42171..be2adf3504e0 100644
--- a/lib/libc/net/inet_neta.c
+++ b/lib/libc/net/inet_neta.c
@@ -17,7 +17,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char orig_rcsid[] = "From Id: inet_neta.c,v 8.2 1996/08/08 06:54:44 vixie Exp";
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/lib/libc/net/inet_neta.c,v 1.5.2.1 1999/08/29 14:47:25 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/lib/libc/net/inet_ntop.c b/lib/libc/net/inet_ntop.c
index 0b9449b0d81f..d3600a61e2f9 100644
--- a/lib/libc/net/inet_ntop.c
+++ b/lib/libc/net/inet_ntop.c
@@ -15,7 +15,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/inet_ntop.c,v 1.5.2.1 1999/08/29 14:47:25 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/net/inet_pton.c b/lib/libc/net/inet_pton.c
index 488ac7fe400f..59717b86d967 100644
--- a/lib/libc/net/inet_pton.c
+++ b/lib/libc/net/inet_pton.c
@@ -15,7 +15,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/inet_pton.c,v 1.5.2.1 1999/08/29 14:47:26 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/net/linkaddr.3 b/lib/libc/net/linkaddr.3
index 543e04019b15..222c8ca78c1e 100644
--- a/lib/libc/net/linkaddr.3
+++ b/lib/libc/net/linkaddr.3
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)linkaddr.3	8.1 (Berkeley) 7/28/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/linkaddr.3,v 1.7.2.1 1999/08/29 14:47:26 peter Exp $
 .\"
 .Dd June 17, 1996
 .Dt LINK_ADDR 3
diff --git a/lib/libc/net/map_v4v6.c b/lib/libc/net/map_v4v6.c
index ca5e55388f6e..71ac6f5eafe1 100644
--- a/lib/libc/net/map_v4v6.c
+++ b/lib/libc/net/map_v4v6.c
@@ -55,7 +55,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/map_v4v6.c,v 1.4.2.1 1999/08/29 14:47:27 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/net/ns.3 b/lib/libc/net/ns.3
index 6e697f9d4254..6b0a59ded3b8 100644
--- a/lib/libc/net/ns.3
+++ b/lib/libc/net/ns.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ns.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/ns.3,v 1.4.2.1 1999/08/29 14:47:27 peter Exp $
 .\"
 .Dd June 4, 1993
 .Dt NS 3
diff --git a/lib/libc/net/ns_name.c b/lib/libc/net/ns_name.c
index cbaf7bd1b19f..46a288ab5a74 100644
--- a/lib/libc/net/ns_name.c
+++ b/lib/libc/net/ns_name.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/ns_name.c,v 1.1.2.1 1999/08/29 14:47:28 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/lib/libc/net/ns_netint.c b/lib/libc/net/ns_netint.c
index 5e25b497011c..4dad965c4656 100644
--- a/lib/libc/net/ns_netint.c
+++ b/lib/libc/net/ns_netint.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/ns_netint.c,v 1.1.2.1 1999/08/29 14:47:28 peter Exp $";
 #endif
 
 /* Import. */
diff --git a/lib/libc/net/ns_parse.c b/lib/libc/net/ns_parse.c
index bd35476b795c..53f2941ba26f 100644
--- a/lib/libc/net/ns_parse.c
+++ b/lib/libc/net/ns_parse.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/ns_parse.c,v 1.1.2.1 1999/08/29 14:47:28 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/lib/libc/net/ns_print.c b/lib/libc/net/ns_print.c
index 6be8c804792f..374a4f7b824c 100644
--- a/lib/libc/net/ns_print.c
+++ b/lib/libc/net/ns_print.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/ns_print.c,v 1.1.2.1 1999/08/29 14:47:29 peter Exp $";
 #endif
 
 /* Import. */
diff --git a/lib/libc/net/ns_ttl.c b/lib/libc/net/ns_ttl.c
index 3327d8691f3c..8c3d4bf54a43 100644
--- a/lib/libc/net/ns_ttl.c
+++ b/lib/libc/net/ns_ttl.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/ns_ttl.c,v 1.1.2.1 1999/08/29 14:47:29 peter Exp $";
 #endif
 
 /* Import. */
diff --git a/lib/libc/net/nsap_addr.c b/lib/libc/net/nsap_addr.c
index 1f16fd26e999..bcea48ab40f0 100644
--- a/lib/libc/net/nsap_addr.c
+++ b/lib/libc/net/nsap_addr.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/nsap_addr.c,v 1.6.2.1 1999/08/29 14:47:30 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/net/rcmd.3 b/lib/libc/net/rcmd.3
index 0154e828e5d5..f71059834d96 100644
--- a/lib/libc/net/rcmd.3
+++ b/lib/libc/net/rcmd.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)rcmd.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/rcmd.3,v 1.7.2.1 1999/08/29 14:47:30 peter Exp $
 .\"
 .Dd February 15, 1996
 .Dt RCMD 3
diff --git a/lib/libc/net/res_comp.c b/lib/libc/net/res_comp.c
index 0d237ac87f76..62336704fc9b 100644
--- a/lib/libc/net/res_comp.c
+++ b/lib/libc/net/res_comp.c
@@ -71,7 +71,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)res_comp.c	8.1 (Berkeley) 6/4/93";
 static char orig_rcsid[] = "From: Id: res_comp.c,v 8.11 1997/05/21 19:31:04 halley Exp $";
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/res_comp.c,v 1.15.2.1 1999/08/29 14:47:30 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/net/res_data.c b/lib/libc/net/res_data.c
index 501ca32f3e48..6991b0cf0c22 100644
--- a/lib/libc/net/res_data.c
+++ b/lib/libc/net/res_data.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/res_data.c,v 1.6.2.1 1999/08/29 14:47:31 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/net/res_debug.c b/lib/libc/net/res_debug.c
index 900d6a23fa7c..39f5e07501b5 100644
--- a/lib/libc/net/res_debug.c
+++ b/lib/libc/net/res_debug.c
@@ -95,7 +95,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)res_debug.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/res_debug.c,v 1.16.2.1 1999/08/29 14:47:31 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/net/res_init.c b/lib/libc/net/res_init.c
index 8f6e649703cf..704bcebcfa26 100644
--- a/lib/libc/net/res_init.c
+++ b/lib/libc/net/res_init.c
@@ -71,7 +71,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)res_init.c	8.1 (Berkeley) 6/7/93";
 static char orig_rcsid[] = "From: Id: res_init.c,v 8.7 1996/11/18 09:10:04 vixie Exp $";
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/res_init.c,v 1.17.2.1 1999/08/29 14:47:32 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/net/res_mkquery.c b/lib/libc/net/res_mkquery.c
index 5ac662bd1432..d8e2ac16e94f 100644
--- a/lib/libc/net/res_mkquery.c
+++ b/lib/libc/net/res_mkquery.c
@@ -71,7 +71,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)res_mkquery.c	8.1 (Berkeley) 6/4/93";
 static char orig_rcsid[] = "From: Id: res_mkquery.c,v 8.9 1997/04/24 22:22:36 vixie Exp $";
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/res_mkquery.c,v 1.14.2.1 1999/08/29 14:47:33 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/net/res_mkupdate.c b/lib/libc/net/res_mkupdate.c
index eb31bac4dd78..f6291e750df5 100644
--- a/lib/libc/net/res_mkupdate.c
+++ b/lib/libc/net/res_mkupdate.c
@@ -21,7 +21,7 @@
  */
 
 #if !defined(lint) && !defined(SABER)
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/res_mkupdate.c,v 1.1.2.1 1999/08/29 14:47:33 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/net/res_query.c b/lib/libc/net/res_query.c
index c2f784ca4d91..05b8ada92190 100644
--- a/lib/libc/net/res_query.c
+++ b/lib/libc/net/res_query.c
@@ -71,7 +71,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)res_query.c	8.1 (Berkeley) 6/4/93";
 static char orig_rcsid = "From: Id: res_query.c,v 8.14 1997/06/09 17:47:05 halley Exp $";
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/res_query.c,v 1.17.2.1 1999/08/29 14:47:34 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/net/res_send.c b/lib/libc/net/res_send.c
index fc394ca54185..0ab76df5fcec 100644
--- a/lib/libc/net/res_send.c
+++ b/lib/libc/net/res_send.c
@@ -71,7 +71,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)res_send.c	8.1 (Berkeley) 6/4/93";
 static char orig_rcsid[] = "From: Id: res_send.c,v 8.20 1998/04/06 23:27:51 halley Exp $";
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/res_send.c,v 1.25.2.1 1999/08/29 14:47:34 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff --git a/lib/libc/net/res_update.c b/lib/libc/net/res_update.c
index a877d4aa1a82..c88fe2111903 100644
--- a/lib/libc/net/res_update.c
+++ b/lib/libc/net/res_update.c
@@ -1,5 +1,5 @@
 #if !defined(lint) && !defined(SABER)
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/res_update.c,v 1.1.2.1 1999/08/29 14:47:34 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/lib/libc/nls/Makefile.inc b/lib/libc/nls/Makefile.inc
index 56a664da510a..bc06fb595dfe 100644
--- a/lib/libc/nls/Makefile.inc
+++ b/lib/libc/nls/Makefile.inc
@@ -1,5 +1,5 @@
 #	from $NetBSD: Makefile.inc,v 1.7 1995/02/27 13:06:20 cgd Exp $
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.4.2.1 1999/08/29 14:47:42 peter Exp $
 
 .PATH: ${.CURDIR}/../libc/nls
 
diff --git a/lib/libc/nls/catclose.3 b/lib/libc/nls/catclose.3
index fcdecc5664c4..b327d76b5464 100644
--- a/lib/libc/nls/catclose.3
+++ b/lib/libc/nls/catclose.3
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/nls/catclose.3,v 1.5.2.2 1999/09/22 22:47:00 phantom Exp $
 .\"
 .\" Copyright (c) 1994 Winning Strategies, Inc.
 .\" All rights reserved.
diff --git a/lib/libc/nls/catclose.c b/lib/libc/nls/catclose.c
index a7326669059d..1578bf8ea03d 100644
--- a/lib/libc/nls/catclose.c
+++ b/lib/libc/nls/catclose.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/nls/catclose.c,v 1.3.2.1 1999/08/29 14:47:43 peter Exp $ */
 
 /*
  * Written by J.T. Conklin, 10/05/94
diff --git a/lib/libc/nls/catgets.3 b/lib/libc/nls/catgets.3
index 9359e5fc69c9..42ae5eead9f6 100644
--- a/lib/libc/nls/catgets.3
+++ b/lib/libc/nls/catgets.3
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/nls/catgets.3,v 1.5.2.2 1999/09/22 22:47:00 phantom Exp $
 .\"
 .\" Copyright (c) 1994 Winning Strategies, Inc.
 .\" All rights reserved.
diff --git a/lib/libc/nls/catgets.c b/lib/libc/nls/catgets.c
index 037b6ff684da..d73498c0f802 100644
--- a/lib/libc/nls/catgets.c
+++ b/lib/libc/nls/catgets.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/nls/catgets.c,v 1.4.2.1 1999/08/29 14:47:43 peter Exp $ */
 
 /*
  * Written by J.T. Conklin, 10/05/94
diff --git a/lib/libc/nls/catopen.3 b/lib/libc/nls/catopen.3
index 31306168cff5..533eea66f102 100644
--- a/lib/libc/nls/catopen.3
+++ b/lib/libc/nls/catopen.3
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/nls/catopen.3,v 1.6.2.2 1999/09/22 22:47:00 phantom Exp $
 .\"
 .\" Copyright (c) 1994 Winning Strategies, Inc.
 .\" All rights reserved.
diff --git a/lib/libc/nls/catopen.c b/lib/libc/nls/catopen.c
index c5ab394c8081..754f133e3fd1 100644
--- a/lib/libc/nls/catopen.c
+++ b/lib/libc/nls/catopen.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/nls/catopen.c,v 1.3.2.1 1999/08/29 14:47:44 peter Exp $ */
 
 /*
  * Written by J.T. Conklin, 10/05/94
diff --git a/lib/libc/nls/msgcat.c b/lib/libc/nls/msgcat.c
index 0e11ee259ef6..15b12e2aa44f 100644
--- a/lib/libc/nls/msgcat.c
+++ b/lib/libc/nls/msgcat.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/nls/msgcat.c,v 1.18.2.1 1999/08/29 14:47:44 peter Exp $ */
 
 /***********************************************************
 Copyright 1990, by Alfalfa Software Incorporated, Cambridge, Massachusetts.
diff --git a/lib/libc/nls/msgcat.h b/lib/libc/nls/msgcat.h
index 0a4c1643c940..d79a75346ad3 100644
--- a/lib/libc/nls/msgcat.h
+++ b/lib/libc/nls/msgcat.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/nls/msgcat.h,v 1.5.2.1 1999/08/29 14:47:44 peter Exp $ */
 
 /* -*-c++-*- */
 
diff --git a/lib/libc/quad/Makefile.inc b/lib/libc/quad/Makefile.inc
index 9934328b6ecb..42a511d392f7 100644
--- a/lib/libc/quad/Makefile.inc
+++ b/lib/libc/quad/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/quad/Makefile.inc,v 1.7.2.1 1999/08/29 14:47:46 peter Exp $
 
 # Quad support, if needed
 .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/quad ${.CURDIR}/../libc/quad
diff --git a/lib/libc/quad/quad.h b/lib/libc/quad/quad.h
index 65f0f127e48e..debce8cc4252 100644
--- a/lib/libc/quad/quad.h
+++ b/lib/libc/quad/quad.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)quad.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/quad/quad.h,v 1.4.2.1 1999/08/29 14:47:47 peter Exp $
  */
 
 /*
diff --git a/lib/libc/regex/Makefile.inc b/lib/libc/regex/Makefile.inc
index 107de2e9c4ef..d4e53435530b 100644
--- a/lib/libc/regex/Makefile.inc
+++ b/lib/libc/regex/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/regex/Makefile.inc,v 1.4.2.1 1999/08/29 14:47:48 peter Exp $
 
 # regex sources
 .PATH: ${.CURDIR}/../libc/regex
diff --git a/lib/libc/rpc/Makefile.inc b/lib/libc/rpc/Makefile.inc
index bfaeaa7c0364..84b0699ef633 100644
--- a/lib/libc/rpc/Makefile.inc
+++ b/lib/libc/rpc/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile	5.11 (Berkeley) 9/6/90
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/rpc/Makefile.inc,v 1.13.2.1 1999/08/29 14:47:49 peter Exp $
 
 .PATH: ${.CURDIR}/../libc/rpc ${.CURDIR}/.
 
diff --git a/lib/libc/rpc/auth_des.c b/lib/libc/rpc/auth_des.c
index 51cfb1f62bb3..cbfb6c844379 100644
--- a/lib/libc/rpc/auth_des.c
+++ b/lib/libc/rpc/auth_des.c
@@ -48,7 +48,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /* from: static char sccsid[] = 	"@(#)auth_des.c	2.2 88/07/29 4.0 RPCSRC; from 1.9 88/02/08 SMI"; */
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/lib/libc/rpc/auth_des.c,v 1.2.2.1 1999/08/29 14:47:50 peter Exp $";
 #endif
 
 extern bool_t __rpc_get_time_offset __P(( struct timeval *, nis_server *,
diff --git a/lib/libc/rpc/auth_none.c b/lib/libc/rpc/auth_none.c
index 9649df3ab51b..51f9f0cf6309 100644
--- a/lib/libc/rpc/auth_none.c
+++ b/lib/libc/rpc/auth_none.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)auth_none.c 1.19 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)auth_none.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/auth_none.c,v 1.8.2.1 1999/08/29 14:47:50 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/auth_unix.c b/lib/libc/rpc/auth_unix.c
index f2a09183f061..f99c2cc90b41 100644
--- a/lib/libc/rpc/auth_unix.c
+++ b/lib/libc/rpc/auth_unix.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)auth_unix.c 1.19 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)auth_unix.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/auth_unix.c,v 1.10.2.1 1999/08/29 14:47:51 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/authunix_prot.c b/lib/libc/rpc/authunix_prot.c
index 54f23fc9fefd..93501e87563e 100644
--- a/lib/libc/rpc/authunix_prot.c
+++ b/lib/libc/rpc/authunix_prot.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)authunix_prot.c 1.15 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)authunix_prot.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/authunix_prot.c,v 1.5.2.1 1999/08/29 14:47:51 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/bindresvport.c b/lib/libc/rpc/bindresvport.c
index 1a62efaca877..78747a35bafa 100644
--- a/lib/libc/rpc/bindresvport.c
+++ b/lib/libc/rpc/bindresvport.c
@@ -31,7 +31,7 @@
 /*static char *sccsid = "from: @(#)bindresvport.c 1.8 88/02/08 SMI";*/
 /*static char *sccsid = "from: @(#)bindresvport.c	2.2 88/07/29 4.0 RPCSRC";*/
 /*from: OpenBSD: bindresvport.c,v 1.7 1996/07/30 16:25:47 downsj Exp */
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/bindresvport.c,v 1.9.2.1 1999/08/29 14:47:51 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/clnt_generic.c b/lib/libc/rpc/clnt_generic.c
index 5e3cb7bb922b..8914cdea6b30 100644
--- a/lib/libc/rpc/clnt_generic.c
+++ b/lib/libc/rpc/clnt_generic.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)clnt_generic.c 1.4 87/08/11 (C) 1987 SMI";*/
 /*static char *sccsid = "from: @(#)clnt_generic.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/clnt_generic.c,v 1.8.2.1 1999/08/29 14:47:52 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/clnt_perror.c b/lib/libc/rpc/clnt_perror.c
index 53c2c88d8176..ac31a111bc5c 100644
--- a/lib/libc/rpc/clnt_perror.c
+++ b/lib/libc/rpc/clnt_perror.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)clnt_perror.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/clnt_perror.c,v 1.10.2.1 1999/08/29 14:47:52 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/clnt_raw.c b/lib/libc/rpc/clnt_raw.c
index 6f228fe99d69..a23dce38432b 100644
--- a/lib/libc/rpc/clnt_raw.c
+++ b/lib/libc/rpc/clnt_raw.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)clnt_raw.c 1.22 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)clnt_raw.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/clnt_raw.c,v 1.9.2.1 1999/08/29 14:47:52 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/clnt_simple.c b/lib/libc/rpc/clnt_simple.c
index dd935d36ece9..a909faa7e494 100644
--- a/lib/libc/rpc/clnt_simple.c
+++ b/lib/libc/rpc/clnt_simple.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)clnt_simple.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/clnt_simple.c,v 1.9.2.1 1999/08/29 14:47:52 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/clnt_tcp.c b/lib/libc/rpc/clnt_tcp.c
index ebbaddc7c44c..d88579de2612 100644
--- a/lib/libc/rpc/clnt_tcp.c
+++ b/lib/libc/rpc/clnt_tcp.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)clnt_tcp.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/clnt_tcp.c,v 1.11.2.1 1999/08/29 14:47:52 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/clnt_udp.c b/lib/libc/rpc/clnt_udp.c
index 5756fc56100b..f6c3e4bcfc38 100644
--- a/lib/libc/rpc/clnt_udp.c
+++ b/lib/libc/rpc/clnt_udp.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)clnt_udp.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/clnt_udp.c,v 1.12.2.1 1999/08/29 14:47:53 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/clnt_unix.c b/lib/libc/rpc/clnt_unix.c
index d7a490bc61df..2d87d9c88d93 100644
--- a/lib/libc/rpc/clnt_unix.c
+++ b/lib/libc/rpc/clnt_unix.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)clnt_unix.c 1.37 87/10/05 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)clnt_unix.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/clnt_unix.c,v 1.2.2.1 1999/08/29 14:47:53 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/crypt_client.c b/lib/libc/rpc/crypt_client.c
index ab01971657e7..6a4cf1d7084a 100644
--- a/lib/libc/rpc/crypt_client.c
+++ b/lib/libc/rpc/crypt_client.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/rpc/crypt_client.c,v 1.3.2.1 1999/08/29 14:47:54 peter Exp $
  */
 
 #include <sys/types.h>
@@ -39,7 +39,7 @@
 #include <rpcsvc/crypt.h>
 
 #ifndef lint
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/lib/libc/rpc/crypt_client.c,v 1.3.2.1 1999/08/29 14:47:54 peter Exp $";
 #endif
 
 #ifndef KEYSERVSOCK
diff --git a/lib/libc/rpc/des_crypt.c b/lib/libc/rpc/des_crypt.c
index fa71d5c355ee..c3e5400c4ee2 100644
--- a/lib/libc/rpc/des_crypt.c
+++ b/lib/libc/rpc/des_crypt.c
@@ -37,7 +37,7 @@
 
 #ifndef lint
 /* from: static char sccsid[] = "@(#)des_crypt.c	2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI"; */
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/lib/libc/rpc/des_crypt.c,v 1.2.2.1 1999/08/29 14:47:54 peter Exp $";
 #endif
 
 static int common_crypt	__P(( char *, char *, register unsigned, unsigned, struct desparams * ));
diff --git a/lib/libc/rpc/get_myaddress.c b/lib/libc/rpc/get_myaddress.c
index a18a032ecec4..17f75d278517 100644
--- a/lib/libc/rpc/get_myaddress.c
+++ b/lib/libc/rpc/get_myaddress.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)get_myaddress.c 1.4 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)get_myaddress.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/get_myaddress.c,v 1.14.2.1 1999/08/29 14:47:54 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/getrpcent.c b/lib/libc/rpc/getrpcent.c
index 4290235e686d..0cfcd7afc37a 100644
--- a/lib/libc/rpc/getrpcent.c
+++ b/lib/libc/rpc/getrpcent.c
@@ -30,7 +30,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)getrpcent.c 1.14 91/03/11 Copyr 1984 Sun Micro";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/getrpcent.c,v 1.9.2.1 1999/08/29 14:47:55 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/getrpcport.c b/lib/libc/rpc/getrpcport.c
index 24c6257fd886..2bc7632c378f 100644
--- a/lib/libc/rpc/getrpcport.c
+++ b/lib/libc/rpc/getrpcport.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)getrpcport.c 1.3 87/08/11 SMI";*/
 /*static char *sccsid = "from: @(#)getrpcport.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/getrpcport.c,v 1.9.2.1 1999/08/29 14:47:55 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/pmap_clnt.c b/lib/libc/rpc/pmap_clnt.c
index 67d1d89a7675..5f09e7b3e06a 100644
--- a/lib/libc/rpc/pmap_clnt.c
+++ b/lib/libc/rpc/pmap_clnt.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)pmap_clnt.c 1.37 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)pmap_clnt.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/pmap_clnt.c,v 1.8.2.1 1999/08/29 14:47:56 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/pmap_getmaps.c b/lib/libc/rpc/pmap_getmaps.c
index 098ba17bffac..0e258efc9a4b 100644
--- a/lib/libc/rpc/pmap_getmaps.c
+++ b/lib/libc/rpc/pmap_getmaps.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)pmap_getmaps.c 1.10 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)pmap_getmaps.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/pmap_getmaps.c,v 1.8.2.1 1999/08/29 14:47:56 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/pmap_getport.c b/lib/libc/rpc/pmap_getport.c
index 29a26ca4b71e..ee29b796fa53 100644
--- a/lib/libc/rpc/pmap_getport.c
+++ b/lib/libc/rpc/pmap_getport.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)pmap_getport.c 1.9 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)pmap_getport.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/pmap_getport.c,v 1.7.2.1 1999/08/29 14:47:56 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/pmap_prot.c b/lib/libc/rpc/pmap_prot.c
index f42484299477..c199ba291ab1 100644
--- a/lib/libc/rpc/pmap_prot.c
+++ b/lib/libc/rpc/pmap_prot.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)pmap_prot.c 1.17 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)pmap_prot.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/pmap_prot.c,v 1.5.2.1 1999/08/29 14:47:56 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/pmap_prot2.c b/lib/libc/rpc/pmap_prot2.c
index 9c5230ddaeba..8f2d4514c5c9 100644
--- a/lib/libc/rpc/pmap_prot2.c
+++ b/lib/libc/rpc/pmap_prot2.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)pmap_prot2.c 1.3 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)pmap_prot2.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/pmap_prot2.c,v 1.6.2.1 1999/08/29 14:47:56 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/pmap_rmt.c b/lib/libc/rpc/pmap_rmt.c
index 355f34b83e76..11cf08cc93fd 100644
--- a/lib/libc/rpc/pmap_rmt.c
+++ b/lib/libc/rpc/pmap_rmt.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)pmap_rmt.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/pmap_rmt.c,v 1.12.2.1 1999/08/29 14:47:56 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/rpc_callmsg.c b/lib/libc/rpc/rpc_callmsg.c
index dca3a1880d93..69a0c0746153 100644
--- a/lib/libc/rpc/rpc_callmsg.c
+++ b/lib/libc/rpc/rpc_callmsg.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)rpc_callmsg.c 1.4 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)rpc_callmsg.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/rpc_callmsg.c,v 1.8.2.1 1999/08/29 14:47:57 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/rpc_commondata.c b/lib/libc/rpc/rpc_commondata.c
index 043c08285056..e233cb5c2e03 100644
--- a/lib/libc/rpc/rpc_commondata.c
+++ b/lib/libc/rpc/rpc_commondata.c
@@ -29,7 +29,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)rpc_commondata.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/rpc_commondata.c,v 1.6.2.1 1999/08/29 14:47:57 peter Exp $";
 #endif
 
 #include <rpc/rpc.h>
diff --git a/lib/libc/rpc/rpc_dtablesize.c b/lib/libc/rpc/rpc_dtablesize.c
index 1ce5617655d6..3a68ddfe81b1 100644
--- a/lib/libc/rpc/rpc_dtablesize.c
+++ b/lib/libc/rpc/rpc_dtablesize.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)rpc_dtablesize.c 1.2 87/08/11 Copyr 1987 Sun Micro";*/
 /*static char *sccsid = "from: @(#)rpc_dtablesize.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/rpc_dtablesize.c,v 1.9.2.1 1999/08/29 14:47:57 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/lib/libc/rpc/rpc_prot.c b/lib/libc/rpc/rpc_prot.c
index 940a29d13704..7b121a234570 100644
--- a/lib/libc/rpc/rpc_prot.c
+++ b/lib/libc/rpc/rpc_prot.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)rpc_prot.c	2.3 88/08/07 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/rpc_prot.c,v 1.7.2.1 1999/08/29 14:47:57 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/rpc_secure.3 b/lib/libc/rpc/rpc_secure.3
index 571a04f39cdc..a7aba650df1e 100644
--- a/lib/libc/rpc/rpc_secure.3
+++ b/lib/libc/rpc/rpc_secure.3
@@ -1,5 +1,5 @@
 .\" @(#)rpc_secure.3n	2.1 88/08/08 4.0 RPCSRC; from 1.19 88/06/24 SMI
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rpc_secure.3,v 1.3.2.1 1999/08/29 14:47:57 peter Exp $
 .Dd February 16, 1988
 .Dt RPC 3
 .Sh NAME
diff --git a/lib/libc/rpc/rtime.c b/lib/libc/rpc/rtime.c
index 4e65c037563d..3a635626c89f 100644
--- a/lib/libc/rpc/rtime.c
+++ b/lib/libc/rpc/rtime.c
@@ -54,7 +54,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /* from: static char sccsid[] = 	"@(#)rtime.c	2.2 88/08/10 4.0 RPCSRC; from 1.8 88/02/08 SMI"; */
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/lib/libc/rpc/rtime.c,v 1.2.2.1 1999/08/29 14:47:57 peter Exp $";
 #endif
 
 extern int _rpc_dtablesize __P(( void ));
diff --git a/lib/libc/rpc/svc.c b/lib/libc/rpc/svc.c
index 1f9803bb6640..f39a920cc16d 100644
--- a/lib/libc/rpc/svc.c
+++ b/lib/libc/rpc/svc.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)svc.c 1.44 88/02/08 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)svc.c	2.4 88/08/11 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/svc.c,v 1.13.2.1 1999/08/29 14:47:57 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/svc_auth_des.c b/lib/libc/rpc/svc_auth_des.c
index 6a937f503913..05a319b5e8af 100644
--- a/lib/libc/rpc/svc_auth_des.c
+++ b/lib/libc/rpc/svc_auth_des.c
@@ -62,7 +62,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /* from: static char sccsid[] = 	"@(#)svcauth_des.c	2.3 89/07/11 4.0 RPCSRC; from 1.15 88/02/08 SMI"; */
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/lib/libc/rpc/svc_auth_des.c,v 1.2.2.1 1999/08/29 14:47:58 peter Exp $";
 #endif
 
 #define debug(msg)	 printf("svcauth_des: %s\n", msg) 
diff --git a/lib/libc/rpc/svc_auth_unix.c b/lib/libc/rpc/svc_auth_unix.c
index 4e800e5e2aa3..d5e0d1dd9c8c 100644
--- a/lib/libc/rpc/svc_auth_unix.c
+++ b/lib/libc/rpc/svc_auth_unix.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)svc_auth_unix.c 1.28 88/02/08 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)svc_auth_unix.c	2.3 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/svc_auth_unix.c,v 1.7.2.1 1999/08/29 14:47:58 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/svc_raw.c b/lib/libc/rpc/svc_raw.c
index 472615253428..9d38c02c671e 100644
--- a/lib/libc/rpc/svc_raw.c
+++ b/lib/libc/rpc/svc_raw.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)svc_raw.c 1.15 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)svc_raw.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/svc_raw.c,v 1.6.2.1 1999/08/29 14:47:58 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/svc_run.c b/lib/libc/rpc/svc_run.c
index f39886a4e3d7..c70203617cbc 100644
--- a/lib/libc/rpc/svc_run.c
+++ b/lib/libc/rpc/svc_run.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)svc_run.c 1.1 87/10/13 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)svc_run.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/svc_run.c,v 1.9.2.1 1999/08/29 14:47:59 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/svc_simple.c b/lib/libc/rpc/svc_simple.c
index 1bfaf1c8cd45..26947b0c844d 100644
--- a/lib/libc/rpc/svc_simple.c
+++ b/lib/libc/rpc/svc_simple.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)svc_simple.c 1.18 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)svc_simple.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/svc_simple.c,v 1.8.2.1 1999/08/29 14:47:59 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/svc_tcp.c b/lib/libc/rpc/svc_tcp.c
index 90e37a00dfab..e34a6e8c7b3a 100644
--- a/lib/libc/rpc/svc_tcp.c
+++ b/lib/libc/rpc/svc_tcp.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)svc_tcp.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/svc_tcp.c,v 1.13.2.3 1999/11/19 22:10:35 jdp Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/svc_udp.c b/lib/libc/rpc/svc_udp.c
index 4b76f2d1aadf..fae1cbac4252 100644
--- a/lib/libc/rpc/svc_udp.c
+++ b/lib/libc/rpc/svc_udp.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)svc_udp.c 1.24 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)svc_udp.c	2.2 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/svc_udp.c,v 1.10.2.1 1999/08/29 14:48:00 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/rpc/svc_unix.c b/lib/libc/rpc/svc_unix.c
index 365f1a5bbd77..cb409d839bea 100644
--- a/lib/libc/rpc/svc_unix.c
+++ b/lib/libc/rpc/svc_unix.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)svc_unix.c 1.21 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)svc_unix.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/rpc/svc_unix.c,v 1.4.2.1 1999/08/29 14:48:00 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/stdio/Makefile.inc b/lib/libc/stdio/Makefile.inc
index 514ab31c15bc..a785557065ac 100644
--- a/lib/libc/stdio/Makefile.inc
+++ b/lib/libc/stdio/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.3 (Berkeley) 4/17/94
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.15.2.3 1999/11/18 09:08:39 obrien Exp $
 
 # stdio sources
 .PATH: ${.CURDIR}/../libc/stdio
diff --git a/lib/libc/stdio/_flock_stub.c b/lib/libc/stdio/_flock_stub.c
index ada714c05db4..a9e11aaf760f 100644
--- a/lib/libc/stdio/_flock_stub.c
+++ b/lib/libc/stdio/_flock_stub.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdio/_flock_stub.c,v 1.2.4.1 1999/08/29 14:48:03 peter Exp $
  *
  */
 
diff --git a/lib/libc/stdio/asprintf.c b/lib/libc/stdio/asprintf.c
index e125bfc4bedf..e085c353335c 100644
--- a/lib/libc/stdio/asprintf.c
+++ b/lib/libc/stdio/asprintf.c
@@ -28,7 +28,7 @@
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/stdio/asprintf.c,v 1.5.2.1 1999/08/29 14:48:03 peter Exp $";
 #endif /* LIBC_RCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/clrerr.c b/lib/libc/stdio/clrerr.c
index 4e6b72027287..2ef985186102 100644
--- a/lib/libc/stdio/clrerr.c
+++ b/lib/libc/stdio/clrerr.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)clrerr.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/clrerr.c,v 1.6.2.1 1999/08/29 14:48:03 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/fclose.c b/lib/libc/stdio/fclose.c
index 302a7bac3dc2..4ecd7b1b8166 100644
--- a/lib/libc/stdio/fclose.c
+++ b/lib/libc/stdio/fclose.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fclose.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/fclose.c,v 1.6.2.1 1999/08/29 14:48:04 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <errno.h>
diff --git a/lib/libc/stdio/feof.c b/lib/libc/stdio/feof.c
index 3581100a3806..d75a0e078bb6 100644
--- a/lib/libc/stdio/feof.c
+++ b/lib/libc/stdio/feof.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)feof.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/feof.c,v 1.5.2.1 1999/08/29 14:48:04 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/ferror.c b/lib/libc/stdio/ferror.c
index 2311926b1bd2..43035334db1d 100644
--- a/lib/libc/stdio/ferror.c
+++ b/lib/libc/stdio/ferror.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)ferror.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/ferror.c,v 1.5.2.1 1999/08/29 14:48:04 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/fflush.c b/lib/libc/stdio/fflush.c
index cd7fbe8a49ee..b69881375077 100644
--- a/lib/libc/stdio/fflush.c
+++ b/lib/libc/stdio/fflush.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fflush.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/fflush.c,v 1.6.2.1 1999/08/29 14:48:05 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <errno.h>
diff --git a/lib/libc/stdio/fgetc.c b/lib/libc/stdio/fgetc.c
index 4e527053c52e..20b95d99d850 100644
--- a/lib/libc/stdio/fgetc.c
+++ b/lib/libc/stdio/fgetc.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fgetc.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/fgetc.c,v 1.6.2.1 1999/08/29 14:48:05 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/fgetln.c b/lib/libc/stdio/fgetln.c
index 3987b0d6f357..4e834e97bd78 100644
--- a/lib/libc/stdio/fgetln.c
+++ b/lib/libc/stdio/fgetln.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fgetln.c	8.2 (Berkeley) 1/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/fgetln.c,v 1.5.2.1 1999/08/29 14:48:05 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/fgetpos.c b/lib/libc/stdio/fgetpos.c
index 6d6cfa19ff25..9de8de7bf199 100644
--- a/lib/libc/stdio/fgetpos.c
+++ b/lib/libc/stdio/fgetpos.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fgetpos.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/fgetpos.c,v 1.6.2.2 1999/08/29 14:48:06 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/fgets.c b/lib/libc/stdio/fgets.c
index 33b7144e6ff2..396a1b7e8b3a 100644
--- a/lib/libc/stdio/fgets.c
+++ b/lib/libc/stdio/fgets.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fgets.c	8.2 (Berkeley) 12/22/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/fgets.c,v 1.8.2.1 1999/08/29 14:48:06 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/fileno.c b/lib/libc/stdio/fileno.c
index 0c3a8dc0c612..80b96e9486bc 100644
--- a/lib/libc/stdio/fileno.c
+++ b/lib/libc/stdio/fileno.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fileno.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/fileno.c,v 1.5.2.1 1999/08/29 14:48:07 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/findfp.c b/lib/libc/stdio/findfp.c
index f0b37cf12942..1c77d7da8db7 100644
--- a/lib/libc/stdio/findfp.c
+++ b/lib/libc/stdio/findfp.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)findfp.c	8.2 (Berkeley) 1/4/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/findfp.c,v 1.5.2.1 1999/08/29 14:48:07 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/stdio/flags.c b/lib/libc/stdio/flags.c
index afcc4d80f8ec..1026c61b2c14 100644
--- a/lib/libc/stdio/flags.c
+++ b/lib/libc/stdio/flags.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)flags.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/flags.c,v 1.5.2.1 1999/08/29 14:48:07 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/stdio/fprintf.c b/lib/libc/stdio/fprintf.c
index 27094b38779c..ddc2f4fb0453 100644
--- a/lib/libc/stdio/fprintf.c
+++ b/lib/libc/stdio/fprintf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fprintf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/fprintf.c,v 1.5.2.1 1999/08/29 14:48:08 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/fpurge.c b/lib/libc/stdio/fpurge.c
index acf0b8b451e1..84d9d206706b 100644
--- a/lib/libc/stdio/fpurge.c
+++ b/lib/libc/stdio/fpurge.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fpurge.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/fpurge.c,v 1.6.2.1 1999/08/29 14:48:08 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <errno.h>
diff --git a/lib/libc/stdio/fputc.c b/lib/libc/stdio/fputc.c
index 60079f13c0ed..b6a707f27a26 100644
--- a/lib/libc/stdio/fputc.c
+++ b/lib/libc/stdio/fputc.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fputc.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/fputc.c,v 1.6.2.1 1999/08/29 14:48:08 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/fputs.c b/lib/libc/stdio/fputs.c
index 63a5321f0f2f..98e1572c292e 100644
--- a/lib/libc/stdio/fputs.c
+++ b/lib/libc/stdio/fputs.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fputs.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/fputs.c,v 1.6.2.1 1999/08/29 14:48:09 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/fread.c b/lib/libc/stdio/fread.c
index 886a9fc5517c..13d3d0b343c6 100644
--- a/lib/libc/stdio/fread.c
+++ b/lib/libc/stdio/fread.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fread.c	8.2 (Berkeley) 12/11/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/fread.c,v 1.6.2.1 1999/08/29 14:48:09 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/fscanf.c b/lib/libc/stdio/fscanf.c
index 8b7b9411a934..29b65fe2a725 100644
--- a/lib/libc/stdio/fscanf.c
+++ b/lib/libc/stdio/fscanf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fscanf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/fscanf.c,v 1.6.2.1 1999/08/29 14:48:11 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/fseek.3 b/lib/libc/stdio/fseek.3
index fd6ff9ff3d8e..19fea1ac6c15 100644
--- a/lib/libc/stdio/fseek.3
+++ b/lib/libc/stdio/fseek.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fseek.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/fseek.3,v 1.2.2.2 1999/08/29 14:48:11 peter Exp $
 .\"
 .Dd Mar 5, 1999
 .Dt FSEEK 3
diff --git a/lib/libc/stdio/fseek.c b/lib/libc/stdio/fseek.c
index 8c2732e1b924..7663e58cd349 100644
--- a/lib/libc/stdio/fseek.c
+++ b/lib/libc/stdio/fseek.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fseek.c	8.3 (Berkeley) 1/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/fseek.c,v 1.7.2.2 1999/08/29 14:48:12 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/stdio/fsetpos.c b/lib/libc/stdio/fsetpos.c
index 60ab719d4351..ac535e5cbfb6 100644
--- a/lib/libc/stdio/fsetpos.c
+++ b/lib/libc/stdio/fsetpos.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fsetpos.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/fsetpos.c,v 1.5.2.2 1999/08/29 14:48:12 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/stdio/ftell.c b/lib/libc/stdio/ftell.c
index 9057f89b7aef..b7c48f904188 100644
--- a/lib/libc/stdio/ftell.c
+++ b/lib/libc/stdio/ftell.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)ftell.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/ftell.c,v 1.9.2.2 1999/08/29 14:48:12 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/stdio/fvwrite.c b/lib/libc/stdio/fvwrite.c
index 75d719132e9c..7eb20c08b493 100644
--- a/lib/libc/stdio/fvwrite.c
+++ b/lib/libc/stdio/fvwrite.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fvwrite.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/fvwrite.c,v 1.9.2.1 1999/08/29 14:48:13 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/fwalk.c b/lib/libc/stdio/fwalk.c
index b1a25d1f8707..a65e8a04b070 100644
--- a/lib/libc/stdio/fwalk.c
+++ b/lib/libc/stdio/fwalk.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fwalk.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/fwalk.c,v 1.5.2.1 1999/08/29 14:48:13 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <errno.h>
diff --git a/lib/libc/stdio/fwrite.c b/lib/libc/stdio/fwrite.c
index 681b9d313b42..8f42017daf54 100644
--- a/lib/libc/stdio/fwrite.c
+++ b/lib/libc/stdio/fwrite.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fwrite.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/fwrite.c,v 1.6.2.1 1999/08/29 14:48:13 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/getc.c b/lib/libc/stdio/getc.c
index eff320aa432d..e55ee800901e 100644
--- a/lib/libc/stdio/getc.c
+++ b/lib/libc/stdio/getc.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)getc.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/getc.c,v 1.6.2.1 1999/08/29 14:48:14 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/getchar.c b/lib/libc/stdio/getchar.c
index ec8810d64b07..053f06221240 100644
--- a/lib/libc/stdio/getchar.c
+++ b/lib/libc/stdio/getchar.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)getchar.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/getchar.c,v 1.6.2.1 1999/08/29 14:48:14 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff --git a/lib/libc/stdio/gets.c b/lib/libc/stdio/gets.c
index da90fe29c24d..e6862ca95965 100644
--- a/lib/libc/stdio/gets.c
+++ b/lib/libc/stdio/gets.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)gets.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/gets.c,v 1.6.2.1 1999/08/29 14:48:15 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <unistd.h>
diff --git a/lib/libc/stdio/getw.c b/lib/libc/stdio/getw.c
index 5ebb46b4f96f..0dcf4cd9a769 100644
--- a/lib/libc/stdio/getw.c
+++ b/lib/libc/stdio/getw.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)getw.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/getw.c,v 1.5.2.1 1999/08/29 14:48:15 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/mktemp.3 b/lib/libc/stdio/mktemp.3
index d78d67cb4df8..ec46dcd2063d 100644
--- a/lib/libc/stdio/mktemp.3
+++ b/lib/libc/stdio/mktemp.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mktemp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/mktemp.3,v 1.4.2.3 1999/11/20 00:19:15 obrien Exp $
 .\"
 .Dd February 11, 1998
 .Dt MKTEMP 3
diff --git a/lib/libc/stdio/mktemp.c b/lib/libc/stdio/mktemp.c
index af547c618ff8..19b8377b2dc4 100644
--- a/lib/libc/stdio/mktemp.c
+++ b/lib/libc/stdio/mktemp.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)mktemp.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/mktemp.c,v 1.12.2.2 1999/11/18 09:07:40 obrien Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/stdio/printf.c b/lib/libc/stdio/printf.c
index 053ec8eb370e..8d1b6431de87 100644
--- a/lib/libc/stdio/printf.c
+++ b/lib/libc/stdio/printf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)printf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/printf.c,v 1.5.2.1 1999/08/29 14:48:16 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/putc.c b/lib/libc/stdio/putc.c
index fe1591c0dec4..16d4f1582161 100644
--- a/lib/libc/stdio/putc.c
+++ b/lib/libc/stdio/putc.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)putc.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/putc.c,v 1.6.2.1 1999/08/29 14:48:16 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/putchar.c b/lib/libc/stdio/putchar.c
index cebd872c38cb..d0cb8855e9c7 100644
--- a/lib/libc/stdio/putchar.c
+++ b/lib/libc/stdio/putchar.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)putchar.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/putchar.c,v 1.6.2.1 1999/08/29 14:48:16 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/puts.c b/lib/libc/stdio/puts.c
index 59f153d68b32..432ba70571ae 100644
--- a/lib/libc/stdio/puts.c
+++ b/lib/libc/stdio/puts.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)puts.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/puts.c,v 1.6.2.1 1999/08/29 14:48:17 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/putw.c b/lib/libc/stdio/putw.c
index 8eac4cfd8188..0aa0fd52d7a1 100644
--- a/lib/libc/stdio/putw.c
+++ b/lib/libc/stdio/putw.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)putw.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/putw.c,v 1.6.2.1 1999/08/29 14:48:17 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/refill.c b/lib/libc/stdio/refill.c
index 37870975f2e4..16542c9fcb09 100644
--- a/lib/libc/stdio/refill.c
+++ b/lib/libc/stdio/refill.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)refill.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/refill.c,v 1.6.2.1 1999/08/29 14:48:17 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <errno.h>
diff --git a/lib/libc/stdio/remove.c b/lib/libc/stdio/remove.c
index cca7cb627163..c93690246d3c 100644
--- a/lib/libc/stdio/remove.c
+++ b/lib/libc/stdio/remove.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)remove.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/remove.c,v 1.5.2.1 1999/08/29 14:48:18 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <unistd.h>
diff --git a/lib/libc/stdio/rewind.c b/lib/libc/stdio/rewind.c
index 98c5846306bb..49d8f4054436 100644
--- a/lib/libc/stdio/rewind.c
+++ b/lib/libc/stdio/rewind.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)rewind.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/rewind.c,v 1.6.2.1 1999/08/29 14:48:19 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <errno.h>
diff --git a/lib/libc/stdio/scanf.c b/lib/libc/stdio/scanf.c
index b183c1784ced..dbde3541f16d 100644
--- a/lib/libc/stdio/scanf.c
+++ b/lib/libc/stdio/scanf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)scanf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/scanf.c,v 1.6.2.1 1999/08/29 14:48:19 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/setbuffer.c b/lib/libc/stdio/setbuffer.c
index 7db2d4d79a4e..aee976dfcb07 100644
--- a/lib/libc/stdio/setbuffer.c
+++ b/lib/libc/stdio/setbuffer.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)setbuffer.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/setbuffer.c,v 1.4.2.1 1999/08/29 14:48:20 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/setvbuf.c b/lib/libc/stdio/setvbuf.c
index 4693b9f8a68b..967ad93304f5 100644
--- a/lib/libc/stdio/setvbuf.c
+++ b/lib/libc/stdio/setvbuf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)setvbuf.c	8.2 (Berkeley) 11/16/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/setvbuf.c,v 1.6.2.1 1999/08/29 14:48:20 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/snprintf.c b/lib/libc/stdio/snprintf.c
index bedf98d353e6..b2a8d3d4e696 100644
--- a/lib/libc/stdio/snprintf.c
+++ b/lib/libc/stdio/snprintf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)snprintf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/snprintf.c,v 1.11.2.1 1999/08/29 14:48:20 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <limits.h>
diff --git a/lib/libc/stdio/sprintf.c b/lib/libc/stdio/sprintf.c
index 10e73f07d452..cabb2bf50243 100644
--- a/lib/libc/stdio/sprintf.c
+++ b/lib/libc/stdio/sprintf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)sprintf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/sprintf.c,v 1.5.2.1 1999/08/29 14:48:21 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/sscanf.c b/lib/libc/stdio/sscanf.c
index 2ed797efdf90..12c1c41efd17 100644
--- a/lib/libc/stdio/sscanf.c
+++ b/lib/libc/stdio/sscanf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)sscanf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/sscanf.c,v 1.5.2.1 1999/08/29 14:48:21 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/stdio.c b/lib/libc/stdio/stdio.c
index e12dc28ab9dc..fdfb169022d8 100644
--- a/lib/libc/stdio/stdio.c
+++ b/lib/libc/stdio/stdio.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)stdio.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/stdio.c,v 1.6.2.1 1999/08/29 14:48:22 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <fcntl.h>
diff --git a/lib/libc/stdio/tempnam.c b/lib/libc/stdio/tempnam.c
index c8abdaa1c861..e7aff5780346 100644
--- a/lib/libc/stdio/tempnam.c
+++ b/lib/libc/stdio/tempnam.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)tempnam.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/tempnam.c,v 1.5.2.1 1999/08/29 14:48:23 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/stdio/ungetc.c b/lib/libc/stdio/ungetc.c
index 3f4b32cb4313..b8f31da32d1c 100644
--- a/lib/libc/stdio/ungetc.c
+++ b/lib/libc/stdio/ungetc.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)ungetc.c	8.2 (Berkeley) 11/3/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/ungetc.c,v 1.6.2.1 1999/08/29 14:48:23 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/vasprintf.c b/lib/libc/stdio/vasprintf.c
index 37fb0fd93b6c..51c9e1256542 100644
--- a/lib/libc/stdio/vasprintf.c
+++ b/lib/libc/stdio/vasprintf.c
@@ -28,7 +28,7 @@
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libc/stdio/vasprintf.c,v 1.10.2.1 1999/08/29 14:48:24 peter Exp $";
 #endif /* LIBC_RCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c
index 44fd34b045c3..d3219dcb2ef3 100644
--- a/lib/libc/stdio/vfprintf.c
+++ b/lib/libc/stdio/vfprintf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)vfprintf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.20.2.2 1999/08/29 14:48:24 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c
index 6a832162fa20..8fc3e4486756 100644
--- a/lib/libc/stdio/vfscanf.c
+++ b/lib/libc/stdio/vfscanf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)vfscanf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/vfscanf.c,v 1.13.2.1 1999/08/29 14:48:25 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/vprintf.c b/lib/libc/stdio/vprintf.c
index a3a2f633d10d..f898c0dd5682 100644
--- a/lib/libc/stdio/vprintf.c
+++ b/lib/libc/stdio/vprintf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)vprintf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/vprintf.c,v 1.5.2.1 1999/08/29 14:48:25 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/vscanf.c b/lib/libc/stdio/vscanf.c
index 53fb362c1692..b2a738b8f6e7 100644
--- a/lib/libc/stdio/vscanf.c
+++ b/lib/libc/stdio/vscanf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)vscanf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/vscanf.c,v 1.6.2.1 1999/08/29 14:48:26 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/vsnprintf.c b/lib/libc/stdio/vsnprintf.c
index b8e4c8c271cd..9baa19b20cac 100644
--- a/lib/libc/stdio/vsnprintf.c
+++ b/lib/libc/stdio/vsnprintf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)vsnprintf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/vsnprintf.c,v 1.11.2.1 1999/08/29 14:48:27 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <limits.h>
diff --git a/lib/libc/stdio/vsprintf.c b/lib/libc/stdio/vsprintf.c
index d357af0c297c..cfc3b615272a 100644
--- a/lib/libc/stdio/vsprintf.c
+++ b/lib/libc/stdio/vsprintf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)vsprintf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/vsprintf.c,v 1.5.2.1 1999/08/29 14:48:27 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/vsscanf.c b/lib/libc/stdio/vsscanf.c
index 5a5f8c802e2a..5086b674e494 100644
--- a/lib/libc/stdio/vsscanf.c
+++ b/lib/libc/stdio/vsscanf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)vsscanf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/vsscanf.c,v 1.6.2.1 1999/08/29 14:48:28 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/wbuf.c b/lib/libc/stdio/wbuf.c
index 847699ad7cf4..6e3d4f6c99a0 100644
--- a/lib/libc/stdio/wbuf.c
+++ b/lib/libc/stdio/wbuf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)wbuf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/wbuf.c,v 1.5.2.1 1999/08/29 14:48:28 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/wsetup.c b/lib/libc/stdio/wsetup.c
index 074a880e66d5..99eeaeb0c680 100644
--- a/lib/libc/stdio/wsetup.c
+++ b/lib/libc/stdio/wsetup.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)wsetup.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdio/wsetup.c,v 1.5.2.1 1999/08/29 14:48:29 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc
index d1b4b2abc892..e1bc852a96d1 100644
--- a/lib/libc/stdlib/Makefile.inc
+++ b/lib/libc/stdlib/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.3 (Berkeley) 2/4/95
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/stdlib/Makefile.inc,v 1.17.2.1 1999/08/29 14:48:33 peter Exp $
 
 # machine-independent stdlib sources
 .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/stdlib ${.CURDIR}/../libc/stdlib
diff --git a/lib/libc/stdlib/abs.3 b/lib/libc/stdlib/abs.3
index 85a89ff83e90..9f50df07155a 100644
--- a/lib/libc/stdlib/abs.3
+++ b/lib/libc/stdlib/abs.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)abs.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/abs.3,v 1.5.2.2 1999/12/07 23:14:36 chris Exp $
 .\"
 .Dd June 4, 1993
 .Dt ABS 3
diff --git a/lib/libc/stdlib/exit.3 b/lib/libc/stdlib/exit.3
index 15531f9143ee..a313de14ce2b 100644
--- a/lib/libc/stdlib/exit.3
+++ b/lib/libc/stdlib/exit.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)exit.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/exit.3,v 1.3.2.2 1999/08/29 14:48:35 peter Exp $
 .\"
 .Dd June 4, 1993
 .Dt EXIT 3
diff --git a/lib/libc/stdlib/getopt.c b/lib/libc/stdlib/getopt.c
index 1b297a7982cf..796556ed7516 100644
--- a/lib/libc/stdlib/getopt.c
+++ b/lib/libc/stdlib/getopt.c
@@ -35,7 +35,7 @@
 #if 0
 static char sccsid[] = "@(#)getopt.c	8.3 (Berkeley) 4/27/95";
 #endif
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/lib/libc/stdlib/getopt.c,v 1.1.1.2.2.1 1999/12/17 01:54:28 jkh Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdlib/malloc.3 b/lib/libc/stdlib/malloc.3
index de93382fe478..e0e87bd2c8cf 100644
--- a/lib/libc/stdlib/malloc.3
+++ b/lib/libc/stdlib/malloc.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)malloc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.17.2.5 1999/09/25 22:43:35 chris Exp $
 .\"
 .Dd August 27, 1996
 .Dt MALLOC 3
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index 02d936462b93..d3af20010100 100644
--- a/lib/libc/stdlib/malloc.c
+++ b/lib/libc/stdlib/malloc.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.43.2.4 1999/08/29 14:48:36 peter Exp $
  *
  */
 
diff --git a/lib/libc/stdlib/memory.3 b/lib/libc/stdlib/memory.3
index 4480338f14e8..ed351b91eeca 100644
--- a/lib/libc/stdlib/memory.3
+++ b/lib/libc/stdlib/memory.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)memory.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/memory.3,v 1.4.2.1 1999/08/29 14:48:37 peter Exp $
 .\"
 .Dd June 4, 1993
 .Dt MEMORY 3
diff --git a/lib/libc/stdlib/netbsd_strtod.c b/lib/libc/stdlib/netbsd_strtod.c
index a402b688f0cf..9e3372b0e197 100644
--- a/lib/libc/stdlib/netbsd_strtod.c
+++ b/lib/libc/stdlib/netbsd_strtod.c
@@ -1,5 +1,5 @@
 /*	From: NetBSD: strtod.c,v 1.26 1998/02/03 18:44:21 perry Exp */
-/* $FreeBSD$	*/
+/* $FreeBSD: src/lib/libc/stdlib/netbsd_strtod.c,v 1.1.2.1 1999/08/29 14:48:37 peter Exp $	*/
 
 /****************************************************************
  *
diff --git a/lib/libc/stdlib/qsort.c b/lib/libc/stdlib/qsort.c
index 8adb7141f852..b30dcf09567d 100644
--- a/lib/libc/stdlib/qsort.c
+++ b/lib/libc/stdlib/qsort.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)qsort.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdlib/qsort.c,v 1.7.2.1 1999/08/29 14:48:38 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdlib.h>
diff --git a/lib/libc/stdlib/random.c b/lib/libc/stdlib/random.c
index 8be99b4bc2a2..55b7ea37d5a0 100644
--- a/lib/libc/stdlib/random.c
+++ b/lib/libc/stdlib/random.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdlib/random.c,v 1.10.2.1 1999/08/29 14:48:38 peter Exp $
  *
  */
 
diff --git a/lib/libc/stdlib/reallocf.c b/lib/libc/stdlib/reallocf.c
index e9327e603117..bba79291242d 100644
--- a/lib/libc/stdlib/reallocf.c
+++ b/lib/libc/stdlib/reallocf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdlib/reallocf.c,v 1.2.2.1 1999/08/29 14:48:39 peter Exp $
  */
 #include <stdlib.h>
 
diff --git a/lib/libc/stdlib/strhash.c b/lib/libc/stdlib/strhash.c
index 8b3ccc1786a3..1a184ab9d2f5 100644
--- a/lib/libc/stdlib/strhash.c
+++ b/lib/libc/stdlib/strhash.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/stdlib/strhash.c,v 1.6.4.1 1999/08/29 14:48:39 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/stdtime/Makefile.inc b/lib/libc/stdtime/Makefile.inc
index 39daaa661ed8..7861c0dcb759 100644
--- a/lib/libc/stdtime/Makefile.inc
+++ b/lib/libc/stdtime/Makefile.inc
@@ -1,5 +1,5 @@
 #	Makefile.inc,v 1.2 1994/09/13 21:26:01 wollman Exp
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/stdtime/Makefile.inc,v 1.8.2.1 1999/08/29 14:48:41 peter Exp $
 
 .PATH:	${.CURDIR}/../libc/stdtime
 
diff --git a/lib/libc/stdtime/ctime.3 b/lib/libc/stdtime/ctime.3
index ae5c6a1b7738..b601215f1d93 100644
--- a/lib/libc/stdtime/ctime.3
+++ b/lib/libc/stdtime/ctime.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)ctime.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdtime/ctime.3,v 1.8.2.2 1999/09/18 15:56:20 phantom Exp $
 .\"
 .Dd January 2, 1999
 .Dt CTIME 3
diff --git a/lib/libc/stdtime/strftime.3 b/lib/libc/stdtime/strftime.3
index 5df13f02b615..f86804485477 100644
--- a/lib/libc/stdtime/strftime.3
+++ b/lib/libc/stdtime/strftime.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strftime.3	8.1 (Berkeley) 6/4/93
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libc/stdtime/strftime.3,v 1.13.2.2 1999/12/10 11:00:46 sheldonh Exp $
 .\"
 .Dd October 4, 1997
 .Dt STRFTIME 3
diff --git a/lib/libc/stdtime/strftime.c b/lib/libc/stdtime/strftime.c
index 9aa891f6e168..9459dd44664f 100644
--- a/lib/libc/stdtime/strftime.c
+++ b/lib/libc/stdtime/strftime.c
@@ -17,7 +17,7 @@
 
 #ifdef LIBC_RCS
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdtime/strftime.c,v 1.20.2.2 1999/12/10 11:00:47 sheldonh Exp $";
 #endif
 
 #ifndef lint
diff --git a/lib/libc/stdtime/strptime.3 b/lib/libc/stdtime/strptime.3
index c93dc8994fee..2775fa19edfc 100644
--- a/lib/libc/stdtime/strptime.3
+++ b/lib/libc/stdtime/strptime.3
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdtime/strptime.3,v 1.2.2.6 1999/12/10 11:00:48 sheldonh Exp $
 .\" "
 .Dd May 8, 1997
 .Dt STRPTIME 3
diff --git a/lib/libc/stdtime/strptime.c b/lib/libc/stdtime/strptime.c
index ef1e09d76a9f..aa12b71a2905 100644
--- a/lib/libc/stdtime/strptime.c
+++ b/lib/libc/stdtime/strptime.c
@@ -53,7 +53,7 @@
 
 #ifdef LIBC_RCS
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/stdtime/strptime.c,v 1.4.2.6 1999/12/10 11:00:48 sheldonh Exp $";
 #endif
 
 #ifndef lint
diff --git a/lib/libc/stdtime/time2posix.3 b/lib/libc/stdtime/time2posix.3
index 7abd2610c95e..d6c83814b5af 100644
--- a/lib/libc/stdtime/time2posix.3
+++ b/lib/libc/stdtime/time2posix.3
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdtime/time2posix.3,v 1.5.2.4 1999/08/29 14:48:44 peter Exp $
 .\"
 .Dd May 1, 1996
 .Dt TIME2POSIX 3
diff --git a/lib/libc/stdtime/timelocal.c b/lib/libc/stdtime/timelocal.c
index a7d91e5a45da..8025d480f76d 100644
--- a/lib/libc/stdtime/timelocal.c
+++ b/lib/libc/stdtime/timelocal.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdtime/timelocal.c,v 1.2.2.2 1999/12/10 11:00:49 sheldonh Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc/stdtime/timelocal.h b/lib/libc/stdtime/timelocal.h
index 19b9d21730d9..697ce47985c7 100644
--- a/lib/libc/stdtime/timelocal.h
+++ b/lib/libc/stdtime/timelocal.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdtime/timelocal.h,v 1.1.4.2 1999/12/10 11:00:49 sheldonh Exp $
  */
 
 /*
diff --git a/lib/libc/string/Makefile.inc b/lib/libc/string/Makefile.inc
index 0ef5069f1651..b3615ddbc337 100644
--- a/lib/libc/string/Makefile.inc
+++ b/lib/libc/string/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.15.2.2 1999/09/03 06:18:11 imp Exp $
 
 .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/string ${.CURDIR}/../libc/string
 
diff --git a/lib/libc/string/bcmp.3 b/lib/libc/string/bcmp.3
index 808cf0db0d0b..7506b9a5ab91 100644
--- a/lib/libc/string/bcmp.3
+++ b/lib/libc/string/bcmp.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)bcmp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/bcmp.3,v 1.1.1.1.10.1 1999/12/14 11:39:07 billf Exp $
 .\"
 .Dd June 4, 1993
 .Dt BCMP 3
diff --git a/lib/libc/string/memcmp.3 b/lib/libc/string/memcmp.3
index 3939425df127..1339d7194afc 100644
--- a/lib/libc/string/memcmp.3
+++ b/lib/libc/string/memcmp.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)memcmp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/memcmp.3,v 1.4.2.1 1999/08/29 14:48:47 peter Exp $
 .\"
 .Dd June 4, 1993
 .Dt MEMCMP 3
diff --git a/lib/libc/string/strcoll.c b/lib/libc/string/strcoll.c
index b4631a1f00ad..00c8fd6718b0 100644
--- a/lib/libc/string/strcoll.c
+++ b/lib/libc/string/strcoll.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/string/strcoll.c,v 1.9.2.1 1999/08/29 14:48:47 peter Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libc/string/strdup.3 b/lib/libc/string/strdup.3
index 53c1d39bf3b2..ef736849544c 100644
--- a/lib/libc/string/strdup.3
+++ b/lib/libc/string/strdup.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strdup.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strdup.3,v 1.6.2.1 1999/08/29 14:48:48 peter Exp $
 .\"
 .Dd June 9, 1993
 .Dt STRDUP 3
diff --git a/lib/libc/string/string.3 b/lib/libc/string/string.3
index 947a745377a7..4d5e0a87055b 100644
--- a/lib/libc/string/string.3
+++ b/lib/libc/string/string.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)string.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/string.3,v 1.5.2.1 1999/08/29 14:48:49 peter Exp $
 .\"
 .Dd December 11, 1993
 .Dt STRING 3
diff --git a/lib/libc/string/strlcpy.3 b/lib/libc/string/strlcpy.3
index e1dddee77393..7538854405d3 100644
--- a/lib/libc/string/strlcpy.3
+++ b/lib/libc/string/strlcpy.3
@@ -25,7 +25,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strlcpy.3,v 1.3.2.2 1999/10/29 16:51:38 obrien Exp $
 .\"
 .Dd June 22, 1998
 .Dt STRLCPY 3
diff --git a/lib/libc/string/strxfrm.c b/lib/libc/string/strxfrm.c
index ac172f8bc208..7368998393e1 100644
--- a/lib/libc/string/strxfrm.c
+++ b/lib/libc/string/strxfrm.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/string/strxfrm.c,v 1.9.2.2 1999/08/29 14:48:49 peter Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index 897d929de599..2f09b5e7fea4 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.3 (Berkeley) 10/24/94
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.57.2.7 1999/09/10 20:36:08 billf Exp $
 
 # sys sources
 .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/sys ${.CURDIR}/../libc/sys
diff --git a/lib/libc/sys/_exit.2 b/lib/libc/sys/_exit.2
index a7d282d6f504..2b22e02a5e54 100644
--- a/lib/libc/sys/_exit.2
+++ b/lib/libc/sys/_exit.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)_exit.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/_exit.2,v 1.8.2.2 1999/09/18 16:18:58 phantom Exp $
 .\"
 .Dd June 4, 1993
 .Dt EXIT 2
diff --git a/lib/libc/sys/accept.2 b/lib/libc/sys/accept.2
index 211904ec2e6f..52459161d76b 100644
--- a/lib/libc/sys/accept.2
+++ b/lib/libc/sys/accept.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)accept.2	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/accept.2,v 1.6.2.2 1999/08/29 14:48:53 peter Exp $
 .\"
 .Dd December 11, 1993
 .Dt ACCEPT 2
diff --git a/lib/libc/sys/access.2 b/lib/libc/sys/access.2
index 9b1c03612cbf..a8e70e0f0342 100644
--- a/lib/libc/sys/access.2
+++ b/lib/libc/sys/access.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)access.2	8.2 (Berkeley) 4/1/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/access.2,v 1.6.2.1 1999/08/29 14:48:53 peter Exp $
 .\"
 .Dd April 1, 1994
 .Dt ACCESS 2
diff --git a/lib/libc/sys/aio_cancel.2 b/lib/libc/sys/aio_cancel.2
index 275c3eb7b486..d03a783ec6e9 100644
--- a/lib/libc/sys/aio_cancel.2
+++ b/lib/libc/sys/aio_cancel.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/aio_cancel.2,v 1.4.2.2 1999/08/29 14:48:54 peter Exp $
 .\"
 .Dd June 2, 1999
 .Dt AIO_CANCEL 2
diff --git a/lib/libc/sys/aio_error.2 b/lib/libc/sys/aio_error.2
index ae959ab14c76..c2b9f00a13f9 100644
--- a/lib/libc/sys/aio_error.2
+++ b/lib/libc/sys/aio_error.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/aio_error.2,v 1.4.2.2 1999/08/29 14:48:54 peter Exp $
 .\"
 .Dd June 2, 1999
 .Dt AIO_ERROR 2
diff --git a/lib/libc/sys/aio_read.2 b/lib/libc/sys/aio_read.2
index f28e0474fe8d..69fc2f28e7a4 100644
--- a/lib/libc/sys/aio_read.2
+++ b/lib/libc/sys/aio_read.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/aio_read.2,v 1.1.2.4 1999/08/29 14:48:55 peter Exp $
 .\"
 .Dd November 17, 1998
 .Dt AIO_READ 2
diff --git a/lib/libc/sys/aio_return.2 b/lib/libc/sys/aio_return.2
index 7f70fc30a962..8e6354308f02 100644
--- a/lib/libc/sys/aio_return.2
+++ b/lib/libc/sys/aio_return.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/aio_return.2,v 1.4.2.2 1999/08/29 14:48:55 peter Exp $
 .\"
 .Dd June 2, 1999
 .Dt AIO_RETURN 2
diff --git a/lib/libc/sys/aio_suspend.2 b/lib/libc/sys/aio_suspend.2
index ca416b7e8117..81e5fb729d88 100644
--- a/lib/libc/sys/aio_suspend.2
+++ b/lib/libc/sys/aio_suspend.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/aio_suspend.2,v 1.4.2.2 1999/08/29 14:48:56 peter Exp $
 .\"
 .Dd June 2, 1999
 .Dt AIO_SUSPEND 2
diff --git a/lib/libc/sys/aio_write.2 b/lib/libc/sys/aio_write.2
index 8e554237dfd7..7e4ee783c78b 100644
--- a/lib/libc/sys/aio_write.2
+++ b/lib/libc/sys/aio_write.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/aio_write.2,v 1.3.2.2 1999/08/29 14:48:57 peter Exp $
 .\"
 .Dd June 2, 1999
 .Dt AIO_WRITE 2
diff --git a/lib/libc/sys/chdir.2 b/lib/libc/sys/chdir.2
index 51622f8686ad..eb87ac8f995b 100644
--- a/lib/libc/sys/chdir.2
+++ b/lib/libc/sys/chdir.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chdir.2	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/chdir.2,v 1.6.2.1 1999/08/29 14:48:57 peter Exp $
 .\"
 .Dd December 11, 1993
 .Dt CHDIR 2
diff --git a/lib/libc/sys/chflags.2 b/lib/libc/sys/chflags.2
index 305a73e3fa79..42f08d991316 100644
--- a/lib/libc/sys/chflags.2
+++ b/lib/libc/sys/chflags.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chflags.2	8.3 (Berkeley) 5/2/95
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libc/sys/chflags.2,v 1.7.2.2 1999/09/18 16:18:58 phantom Exp $
 .\"
 .Dd May 2, 1995
 .Dt CHFLAGS 2
diff --git a/lib/libc/sys/chmod.2 b/lib/libc/sys/chmod.2
index 87e171f0c22a..d40afde09a89 100644
--- a/lib/libc/sys/chmod.2
+++ b/lib/libc/sys/chmod.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chmod.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/chmod.2,v 1.12.2.3 1999/08/29 14:48:58 peter Exp $
 .\"
 .Dd June 4, 1993
 .Dt CHMOD 2
diff --git a/lib/libc/sys/chown.2 b/lib/libc/sys/chown.2
index 6411045be604..d1e51eb7bbe2 100644
--- a/lib/libc/sys/chown.2
+++ b/lib/libc/sys/chown.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chown.2	8.4 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/chown.2,v 1.11.2.1 1999/08/29 14:48:59 peter Exp $
 .\"
 .Dd April 19, 1994
 .Dt CHOWN 2
diff --git a/lib/libc/sys/clock_gettime.2 b/lib/libc/sys/clock_gettime.2
index 4e0dd5511cad..a9dc9c505399 100644
--- a/lib/libc/sys/clock_gettime.2
+++ b/lib/libc/sys/clock_gettime.2
@@ -1,5 +1,5 @@
 .\"	$OpenBSD: clock_gettime.2,v 1.4 1997/05/08 20:21:16 kstailey Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/clock_gettime.2,v 1.2.2.1 1999/08/29 14:48:59 peter Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
diff --git a/lib/libc/sys/close.2 b/lib/libc/sys/close.2
index 60a7ce695f91..9a065ed8bb00 100644
--- a/lib/libc/sys/close.2
+++ b/lib/libc/sys/close.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)close.2	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/close.2,v 1.8.2.2 1999/08/29 14:48:59 peter Exp $
 .\"
 .Dd April 19, 1994
 .Dt CLOSE 2
diff --git a/lib/libc/sys/dup.2 b/lib/libc/sys/dup.2
index 6f86325badcf..98c30a5efd63 100644
--- a/lib/libc/sys/dup.2
+++ b/lib/libc/sys/dup.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dup.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/dup.2,v 1.8.2.1 1999/08/29 14:49:00 peter Exp $
 .\"
 .Dd June 4, 1993
 .Dt DUP 2
diff --git a/lib/libc/sys/execve.2 b/lib/libc/sys/execve.2
index 2adc7c9d9ec0..7e248e944c77 100644
--- a/lib/libc/sys/execve.2
+++ b/lib/libc/sys/execve.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)execve.2	8.5 (Berkeley) 6/1/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/execve.2,v 1.11.2.4 1999/08/29 14:49:00 peter Exp $
 .\"
 .Dd June 1, 1994
 .Dt EXECVE 2
diff --git a/lib/libc/sys/fork.2 b/lib/libc/sys/fork.2
index d01e60035e60..2e3c7d1a4686 100644
--- a/lib/libc/sys/fork.2
+++ b/lib/libc/sys/fork.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fork.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/fork.2,v 1.7.2.2 1999/09/18 16:18:59 phantom Exp $
 .\"
 .Dd June 4, 1993
 .Dt FORK 2
diff --git a/lib/libc/sys/getdtablesize.2 b/lib/libc/sys/getdtablesize.2
index d9bca9d3ba16..3e6d59c3b581 100644
--- a/lib/libc/sys/getdtablesize.2
+++ b/lib/libc/sys/getdtablesize.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getdtablesize.2	8.1 (Berkeley) 6/4/93
-,\"	$FreeBSD$
+,\"	$FreeBSD: src/lib/libc/sys/getdtablesize.2,v 1.1.1.1.10.1 1999/09/18 16:18:59 phantom Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETDTABLESIZE 2
diff --git a/lib/libc/sys/getgroups.2 b/lib/libc/sys/getgroups.2
index ad23faef131e..002aea8e04dd 100644
--- a/lib/libc/sys/getgroups.2
+++ b/lib/libc/sys/getgroups.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getgroups.2	8.2 (Berkeley) 4/16/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getgroups.2,v 1.4.2.1 1999/08/29 14:49:01 peter Exp $
 .\"
 .Dd April 16, 1994
 .Dt GETGROUPS 2
diff --git a/lib/libc/sys/getlogin.2 b/lib/libc/sys/getlogin.2
index 53a1a926bb69..d2565fccd2f5 100644
--- a/lib/libc/sys/getlogin.2
+++ b/lib/libc/sys/getlogin.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)getlogin.2	8.1 (Berkeley) 6/9/93
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libc/sys/getlogin.2,v 1.10.2.1 1999/09/18 16:18:59 phantom Exp $
 .\"
 .Dd June 9, 1993
 .Dt GETLOGIN 2
diff --git a/lib/libc/sys/getpid.2 b/lib/libc/sys/getpid.2
index 5a282b1583cf..a57ae8056442 100644
--- a/lib/libc/sys/getpid.2
+++ b/lib/libc/sys/getpid.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getpid.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getpid.2,v 1.7.2.1 1999/08/29 14:49:01 peter Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETPID 2
diff --git a/lib/libc/sys/getrlimit.2 b/lib/libc/sys/getrlimit.2
index d04e48911a02..2b71320cc789 100644
--- a/lib/libc/sys/getrlimit.2
+++ b/lib/libc/sys/getrlimit.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getrlimit.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getrlimit.2,v 1.8.2.1 1999/08/29 14:49:02 peter Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETRLIMIT 2
diff --git a/lib/libc/sys/getrusage.2 b/lib/libc/sys/getrusage.2
index dcbda2d45c2d..55aa5123b522 100644
--- a/lib/libc/sys/getrusage.2
+++ b/lib/libc/sys/getrusage.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getrusage.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getrusage.2,v 1.9.2.1 1999/08/29 14:49:02 peter Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETRUSAGE 2
diff --git a/lib/libc/sys/getsid.2 b/lib/libc/sys/getsid.2
index 4a7f13e01d2e..85cc90417305 100644
--- a/lib/libc/sys/getsid.2
+++ b/lib/libc/sys/getsid.2
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getsid.2,v 1.2.2.1 1999/08/29 14:49:02 peter Exp $
 .\"
 .Dd August 19, 1997
 .Dt GETSID 2
diff --git a/lib/libc/sys/getsockopt.2 b/lib/libc/sys/getsockopt.2
index 6cc8e49a2e4f..1ffd87ca615f 100644
--- a/lib/libc/sys/getsockopt.2
+++ b/lib/libc/sys/getsockopt.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getsockopt.2	8.4 (Berkeley) 5/2/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getsockopt.2,v 1.9.2.2 1999/08/29 14:49:03 peter Exp $
 .\"
 .Dd May 2, 1995
 .Dt GETSOCKOPT 2
diff --git a/lib/libc/sys/gettimeofday.2 b/lib/libc/sys/gettimeofday.2
index cb385a49bb92..c4a45a8d96d8 100644
--- a/lib/libc/sys/gettimeofday.2
+++ b/lib/libc/sys/gettimeofday.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)gettimeofday.2	8.2 (Berkeley) 5/26/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/gettimeofday.2,v 1.7.2.2 1999/09/18 16:18:59 phantom Exp $
 .\"
 .Dd May 26, 1995
 .Dt GETTIMEOFDAY 2
diff --git a/lib/libc/sys/getuid.2 b/lib/libc/sys/getuid.2
index ae6c94659daa..138f61492e77 100644
--- a/lib/libc/sys/getuid.2
+++ b/lib/libc/sys/getuid.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getuid.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getuid.2,v 1.6.2.1 1999/08/29 14:49:04 peter Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETUID 2
diff --git a/lib/libc/sys/ioctl.2 b/lib/libc/sys/ioctl.2
index 703e1ee5a345..3cc0c71c12a1 100644
--- a/lib/libc/sys/ioctl.2
+++ b/lib/libc/sys/ioctl.2
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)ioctl.2	8.2 (Berkeley) 12/11/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/ioctl.2,v 1.6.2.1 1999/08/29 14:49:05 peter Exp $
 .\"
 .Dd December 11, 1993
 .Dt IOCTL 2
diff --git a/lib/libc/sys/issetugid.2 b/lib/libc/sys/issetugid.2
index 91adf6cd72cb..cdfe097de1d7 100644
--- a/lib/libc/sys/issetugid.2
+++ b/lib/libc/sys/issetugid.2
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/issetugid.2,v 1.5.2.2 1999/09/18 16:18:59 phantom Exp $
 .\"
 .Dd August, 25 1996
 .Dt ISSETUGID 2
diff --git a/lib/libc/sys/kill.2 b/lib/libc/sys/kill.2
index c8667d890218..4f729988a65a 100644
--- a/lib/libc/sys/kill.2
+++ b/lib/libc/sys/kill.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kill.2	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/kill.2,v 1.7.2.3 1999/08/29 14:49:06 peter Exp $
 .\"
 .Dd April 19, 1994
 .Dt KILL 2
diff --git a/lib/libc/sys/kldfind.2 b/lib/libc/sys/kldfind.2
index 96be1222a080..3d4b32743ace 100644
--- a/lib/libc/sys/kldfind.2
+++ b/lib/libc/sys/kldfind.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$	
+.\" $FreeBSD: src/lib/libc/sys/kldfind.2,v 1.3.2.4 1999/11/14 18:21:22 chris Exp $	
 .\"
 .Dd March 3, 1999
 .Dt KLDFIND 2
diff --git a/lib/libc/sys/kldfirstmod.2 b/lib/libc/sys/kldfirstmod.2
index 29e43d69e4dd..9ad66975af01 100644
--- a/lib/libc/sys/kldfirstmod.2
+++ b/lib/libc/sys/kldfirstmod.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$	
+.\" $FreeBSD: src/lib/libc/sys/kldfirstmod.2,v 1.3.2.3 1999/09/18 16:18:59 phantom Exp $	
 .\"
 .Dd March 3, 1999
 .Dt KLDFIRSTMOD 2
diff --git a/lib/libc/sys/kldload.2 b/lib/libc/sys/kldload.2
index 7a2f9a1dd15f..a89449fd76b4 100644
--- a/lib/libc/sys/kldload.2
+++ b/lib/libc/sys/kldload.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/kldload.2,v 1.3.2.3 1999/09/18 16:18:59 phantom Exp $
 .\"
 
 .Dd March 3, 1999
diff --git a/lib/libc/sys/kldnext.2 b/lib/libc/sys/kldnext.2
index 9e7356433fd8..31782d6b457c 100644
--- a/lib/libc/sys/kldnext.2
+++ b/lib/libc/sys/kldnext.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$	
+.\" $FreeBSD: src/lib/libc/sys/kldnext.2,v 1.3.2.3 1999/09/18 16:18:59 phantom Exp $	
 .\"
 .Dd March 3, 1999
 .Dt KLDNEXT 2
diff --git a/lib/libc/sys/kldstat.2 b/lib/libc/sys/kldstat.2
index bc9adb3db67c..6e456df7870b 100644
--- a/lib/libc/sys/kldstat.2
+++ b/lib/libc/sys/kldstat.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$	
+.\" $FreeBSD: src/lib/libc/sys/kldstat.2,v 1.3.2.3 1999/09/18 16:19:00 phantom Exp $	
 .\"
 .Dd March 3, 1999
 .Dt KLDSTAT 2
diff --git a/lib/libc/sys/kldunload.2 b/lib/libc/sys/kldunload.2
index fd803e7c2ace..eeaf3e4ea5c5 100644
--- a/lib/libc/sys/kldunload.2
+++ b/lib/libc/sys/kldunload.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/kldunload.2,v 1.3.2.4 1999/09/18 16:19:00 phantom Exp $
 .\"
 
 .Dd March 3, 1999
diff --git a/lib/libc/sys/ktrace.2 b/lib/libc/sys/ktrace.2
index 9b25bdb1cbc4..c3094505e34d 100644
--- a/lib/libc/sys/ktrace.2
+++ b/lib/libc/sys/ktrace.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ktrace.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/ktrace.2,v 1.6.2.3 1999/09/18 16:19:00 phantom Exp $
 .\"
 .Dd June 4, 1993
 .Dt KTRACE 2
diff --git a/lib/libc/sys/link.2 b/lib/libc/sys/link.2
index 657f5da6b075..d2b3d7df8c6d 100644
--- a/lib/libc/sys/link.2
+++ b/lib/libc/sys/link.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)link.2	8.3 (Berkeley) 1/12/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/link.2,v 1.9.2.1 1999/08/29 14:49:09 peter Exp $
 .\"
 .Dd January 12, 1994
 .Dt LINK 2
diff --git a/lib/libc/sys/listen.2 b/lib/libc/sys/listen.2
index 4f87434316dd..55a27d05ca9e 100644
--- a/lib/libc/sys/listen.2
+++ b/lib/libc/sys/listen.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)listen.2	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/listen.2,v 1.10.2.2 1999/08/29 14:49:10 peter Exp $
 .\"
 .Dd November 3, 1995
 .Dt LISTEN 2
diff --git a/lib/libc/sys/lseek.2 b/lib/libc/sys/lseek.2
index aaccac7f7c4e..e5e054a1f80d 100644
--- a/lib/libc/sys/lseek.2
+++ b/lib/libc/sys/lseek.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lseek.2	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/lseek.2,v 1.8.2.1 1999/08/29 14:49:10 peter Exp $
 .\"
 .Dd April 19, 1994
 .Dt LSEEK 2
diff --git a/lib/libc/sys/madvise.2 b/lib/libc/sys/madvise.2
index 415af6802848..b544bee53823 100644
--- a/lib/libc/sys/madvise.2
+++ b/lib/libc/sys/madvise.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)madvise.2	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/madvise.2,v 1.14.2.1 1999/08/29 14:49:11 peter Exp $
 .\"
 .Dd Jul 19, 1996
 .Dt MADVISE 2
diff --git a/lib/libc/sys/mincore.2 b/lib/libc/sys/mincore.2
index 533c1530ca3c..c46ac32152d1 100644
--- a/lib/libc/sys/mincore.2
+++ b/lib/libc/sys/mincore.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mincore.2	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mincore.2,v 1.12.2.1 1999/08/29 14:49:11 peter Exp $
 .\"
 .Dd June 9, 1993
 .Dt MINCORE 2
diff --git a/lib/libc/sys/minherit.2 b/lib/libc/sys/minherit.2
index 734588922d1f..63859e8f53b7 100644
--- a/lib/libc/sys/minherit.2
+++ b/lib/libc/sys/minherit.2
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/minherit.2,v 1.5.2.1 1999/08/29 14:49:12 peter Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
diff --git a/lib/libc/sys/mkdir.2 b/lib/libc/sys/mkdir.2
index c2d88350b9cd..e3db9e4866be 100644
--- a/lib/libc/sys/mkdir.2
+++ b/lib/libc/sys/mkdir.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mkdir.2	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mkdir.2,v 1.7.2.2 1999/08/29 14:49:12 peter Exp $
 .\"
 .Dd December 11, 1993
 .Dt MKDIR 2
diff --git a/lib/libc/sys/mkfifo.2 b/lib/libc/sys/mkfifo.2
index 36ab7347a25f..c01eb3c7c820 100644
--- a/lib/libc/sys/mkfifo.2
+++ b/lib/libc/sys/mkfifo.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mkfifo.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mkfifo.2,v 1.7.2.2 1999/08/29 14:49:13 peter Exp $
 .\"
 .Dd June 4, 1993
 .Dt MKFIFO 2
diff --git a/lib/libc/sys/mknod.2 b/lib/libc/sys/mknod.2
index 90287b271e29..56ab94cfa87c 100644
--- a/lib/libc/sys/mknod.2
+++ b/lib/libc/sys/mknod.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mknod.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mknod.2,v 1.5.2.3 1999/08/29 14:49:14 peter Exp $
 .\"
 .Dd June 4, 1993
 .Dt MKNOD 2
diff --git a/lib/libc/sys/mlock.2 b/lib/libc/sys/mlock.2
index b5706b041423..62373faa6f77 100644
--- a/lib/libc/sys/mlock.2
+++ b/lib/libc/sys/mlock.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mlock.2	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mlock.2,v 1.4.2.2 1999/08/29 14:49:15 peter Exp $
 .\"
 .Dd June 2, 1993
 .Dt MLOCK 2
diff --git a/lib/libc/sys/nanosleep.2 b/lib/libc/sys/nanosleep.2
index fe39fd74fdef..8489524ba735 100644
--- a/lib/libc/sys/nanosleep.2
+++ b/lib/libc/sys/nanosleep.2
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/nanosleep.2,v 1.6.2.2 1999/09/18 16:19:00 phantom Exp $
 .\"	$OpenBSD: nanosleep.2,v 1.1 1997/04/20 20:56:20 tholo Exp $
 .\"	$NetBSD: nanosleep.2,v 1.1 1997/04/17 18:12:02 jtc Exp $
 .\"
diff --git a/lib/libc/sys/nfssvc.2 b/lib/libc/sys/nfssvc.2
index 5d0eb3bfa9be..80692dd679e5 100644
--- a/lib/libc/sys/nfssvc.2
+++ b/lib/libc/sys/nfssvc.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)nfssvc.2	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/nfssvc.2,v 1.6.2.1 1999/08/29 14:49:16 peter Exp $
 .\"
 .Dd June 9, 1993
 .Dt NFSSVC 2
diff --git a/lib/libc/sys/pipe.2 b/lib/libc/sys/pipe.2
index 1151505a255b..69cd15e1aa54 100644
--- a/lib/libc/sys/pipe.2
+++ b/lib/libc/sys/pipe.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pipe.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/pipe.2,v 1.7.2.4 1999/08/29 14:49:16 peter Exp $
 .\"
 .Dd June 4, 1993
 .Dt PIPE 2
diff --git a/lib/libc/sys/poll.2 b/lib/libc/sys/poll.2
index 25c2191a6565..cd80d587e600 100644
--- a/lib/libc/sys/poll.2
+++ b/lib/libc/sys/poll.2
@@ -1,5 +1,5 @@
 .\"	$NetBSD: poll.2,v 1.3 1996/09/07 21:53:08 mycroft Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/poll.2,v 1.2.2.1 1999/08/29 14:49:17 peter Exp $
 .\"
 .\" Copyright (c) 1996 Charles M. Hannum.  All rights reserved.
 .\"
diff --git a/lib/libc/sys/profil.2 b/lib/libc/sys/profil.2
index 1d9cd40c33ef..b714d3c79297 100644
--- a/lib/libc/sys/profil.2
+++ b/lib/libc/sys/profil.2
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)profil.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/profil.2,v 1.7.2.1 1999/08/29 14:49:17 peter Exp $
 .\"
 .Dd June 4, 1993
 .Dt PROFIL 2
diff --git a/lib/libc/sys/ptrace.2 b/lib/libc/sys/ptrace.2
index 37eca05a3de7..727ab4979640 100644
--- a/lib/libc/sys/ptrace.2
+++ b/lib/libc/sys/ptrace.2
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/ptrace.2,v 1.10.2.1 1999/08/29 14:49:17 peter Exp $
 .\"	$NetBSD: ptrace.2,v 1.2 1995/02/27 12:35:37 cgd Exp $
 .\"
 .\" This file is in the public domain.
diff --git a/lib/libc/sys/quotactl.2 b/lib/libc/sys/quotactl.2
index 675863c57302..ea41fdafa08f 100644
--- a/lib/libc/sys/quotactl.2
+++ b/lib/libc/sys/quotactl.2
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)quotactl.2	8.2 (Berkeley) 3/10/95
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libc/sys/quotactl.2,v 1.8.2.1 1999/09/18 16:19:00 phantom Exp $
 .\"
 .Dd March 10, 1995
 .Dt QUOTACTL 2
diff --git a/lib/libc/sys/readlink.2 b/lib/libc/sys/readlink.2
index b395dc10c036..71ecd8e24649 100644
--- a/lib/libc/sys/readlink.2
+++ b/lib/libc/sys/readlink.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)readlink.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/readlink.2,v 1.6.2.1 1999/08/29 14:49:18 peter Exp $
 .\"
 .Dd June 4, 1993
 .Dt READLINK 2
diff --git a/lib/libc/sys/reboot.2 b/lib/libc/sys/reboot.2
index f7a28bcc3906..8c26d692ae8b 100644
--- a/lib/libc/sys/reboot.2
+++ b/lib/libc/sys/reboot.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)reboot.2	8.1 (Berkeley) 6/4/93
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libc/sys/reboot.2,v 1.5.4.1 1999/09/18 16:19:00 phantom Exp $
 .\"
 .Dd June 4, 1993
 .Dt REBOOT 2
diff --git a/lib/libc/sys/recv.2 b/lib/libc/sys/recv.2
index a18db890b3b8..1a9dc0910c21 100644
--- a/lib/libc/sys/recv.2
+++ b/lib/libc/sys/recv.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)recv.2	8.3 (Berkeley) 2/21/94
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libc/sys/recv.2,v 1.4.2.1 1999/09/18 16:19:00 phantom Exp $
 .\"
 .Dd February 21, 1994
 .Dt RECV 2
diff --git a/lib/libc/sys/rename.2 b/lib/libc/sys/rename.2
index cce01d6e6a2d..f2cf0463f9e3 100644
--- a/lib/libc/sys/rename.2
+++ b/lib/libc/sys/rename.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rename.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/rename.2,v 1.7.2.1 1999/08/29 14:49:18 peter Exp $
 .\"
 .Dd June 4, 1993
 .Dt RENAME 2
diff --git a/lib/libc/sys/rtprio.2 b/lib/libc/sys/rtprio.2
index 579ed1bf45c0..43f96854849a 100644
--- a/lib/libc/sys/rtprio.2
+++ b/lib/libc/sys/rtprio.2
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/rtprio.2,v 1.10.2.2 1999/09/18 16:19:00 phantom Exp $
 .\"
 .Dd July 23, 1994
 .Dt RTPRIO 2
diff --git a/lib/libc/sys/sched_get_priority_max.2 b/lib/libc/sys/sched_get_priority_max.2
index 185f561de9cf..655708d0b665 100644
--- a/lib/libc/sys/sched_get_priority_max.2
+++ b/lib/libc/sys/sched_get_priority_max.2
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sched_get_priority_max.2,v 1.2.2.1 1999/08/29 14:49:19 peter Exp $
 .\" Copyright (c) 1998 HD Associates, Inc.
 .\" All rights reserved.
 .\"
diff --git a/lib/libc/sys/sched_setparam.2 b/lib/libc/sys/sched_setparam.2
index b627e6991ea3..33540a554858 100644
--- a/lib/libc/sys/sched_setparam.2
+++ b/lib/libc/sys/sched_setparam.2
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sched_setparam.2,v 1.3.2.1 1999/08/29 14:49:20 peter Exp $
 .\" Copyright (c) 1998 HD Associates, Inc.
 .\" All rights reserved.
 .\"
diff --git a/lib/libc/sys/sched_setscheduler.2 b/lib/libc/sys/sched_setscheduler.2
index 94d9f57686e8..a248ccc81327 100644
--- a/lib/libc/sys/sched_setscheduler.2
+++ b/lib/libc/sys/sched_setscheduler.2
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sched_setscheduler.2,v 1.2.2.1 1999/08/29 14:49:21 peter Exp $
 .\" Copyright (c) 1998 HD Associates, Inc.
 .\" All rights reserved.
 .\"
diff --git a/lib/libc/sys/sched_yield.2 b/lib/libc/sys/sched_yield.2
index 28ac9cc421e9..5ba3c42fe2a8 100644
--- a/lib/libc/sys/sched_yield.2
+++ b/lib/libc/sys/sched_yield.2
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sched_yield.2,v 1.1.2.1 1999/08/29 14:49:21 peter Exp $
 .\" Copyright (c) 1998 HD Associates, Inc.
 .\" All rights reserved.
 .\"
diff --git a/lib/libc/sys/semctl.2 b/lib/libc/sys/semctl.2
index 1983f86c07d8..932a07bc62ab 100644
--- a/lib/libc/sys/semctl.2
+++ b/lib/libc/sys/semctl.2
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/semctl.2,v 1.8.2.1 1999/08/29 14:49:21 peter Exp $
 .\"
 .Dd September 12, 1995
 .Dt SEMCTL 2
diff --git a/lib/libc/sys/semget.2 b/lib/libc/sys/semget.2
index edb0c873c8c3..a4315f696b6a 100644
--- a/lib/libc/sys/semget.2
+++ b/lib/libc/sys/semget.2
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/semget.2,v 1.6.2.1 1999/08/29 14:49:22 peter Exp $
 .\"
 .Dd September 12, 1995
 .Dt SEMGET 2
diff --git a/lib/libc/sys/semop.2 b/lib/libc/sys/semop.2
index abae921091f9..95d7d9a420ea 100644
--- a/lib/libc/sys/semop.2
+++ b/lib/libc/sys/semop.2
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/semop.2,v 1.6.2.1 1999/08/29 14:49:22 peter Exp $
 .\"
 .Dd September 22, 1995
 .Dt SEMOP 2
diff --git a/lib/libc/sys/send.2 b/lib/libc/sys/send.2
index 8f74a9f1b41a..81a95f0b53c2 100644
--- a/lib/libc/sys/send.2
+++ b/lib/libc/sys/send.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)send.2	8.2 (Berkeley) 2/21/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/send.2,v 1.8.2.1 1999/08/29 14:49:23 peter Exp $
 .\"
 .Dd February 15, 1995
 .Dt SEND 2
diff --git a/lib/libc/sys/sendfile.2 b/lib/libc/sys/sendfile.2
index 87b9bacdb9b7..64a01a0ea6db 100644
--- a/lib/libc/sys/sendfile.2
+++ b/lib/libc/sys/sendfile.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sendfile.2,v 1.2.2.3 1999/08/29 14:49:24 peter Exp $
 .\"
 .Dd November 5, 1998
 .Dt SENDFILE 2
diff --git a/lib/libc/sys/setuid.2 b/lib/libc/sys/setuid.2
index 0fc68908a135..7b69297e2b66 100644
--- a/lib/libc/sys/setuid.2
+++ b/lib/libc/sys/setuid.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setuid.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/setuid.2,v 1.12.2.1 1999/08/29 14:49:24 peter Exp $
 .\"
 .Dd June 4, 1993
 .Dt SETUID 2
diff --git a/lib/libc/sys/shmat.2 b/lib/libc/sys/shmat.2
index 331a4c942186..8d80404db39f 100644
--- a/lib/libc/sys/shmat.2
+++ b/lib/libc/sys/shmat.2
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/shmat.2,v 1.6.2.2 1999/08/29 14:49:25 peter Exp $
 .\"
 .Dd August 2, 1995
 .Dt SHMAT 2
diff --git a/lib/libc/sys/shmctl.2 b/lib/libc/sys/shmctl.2
index e24d226ceaec..e1f262fba949 100644
--- a/lib/libc/sys/shmctl.2
+++ b/lib/libc/sys/shmctl.2
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/shmctl.2,v 1.7.2.2 1999/08/29 14:49:25 peter Exp $
 .\"
 .Dd July 17, 1995
 .Dt SHMCTL 2
diff --git a/lib/libc/sys/shmget.2 b/lib/libc/sys/shmget.2
index db5917f6414c..1f3a61002206 100644
--- a/lib/libc/sys/shmget.2
+++ b/lib/libc/sys/shmget.2
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/shmget.2,v 1.6.2.2 1999/08/29 14:49:25 peter Exp $
 .\"
 .Dd July 3, 1995
 .Dt SHMGET 2
diff --git a/lib/libc/sys/sigaction.2 b/lib/libc/sys/sigaction.2
index 975af2f031cb..bb014691e2b0 100644
--- a/lib/libc/sys/sigaction.2
+++ b/lib/libc/sys/sigaction.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)sigaction.2	8.2 (Berkeley) 4/3/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sigaction.2,v 1.19.2.1 1999/08/29 14:49:26 peter Exp $
 .\"
 .Dd April 3, 1994
 .Dt SIGACTION 2
diff --git a/lib/libc/sys/sigaltstack.2 b/lib/libc/sys/sigaltstack.2
index d16612c0222a..01f790588845 100644
--- a/lib/libc/sys/sigaltstack.2
+++ b/lib/libc/sys/sigaltstack.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sigaltstack.2	8.2 (Berkeley) 5/1/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sigaltstack.2,v 1.9.2.2 1999/08/29 14:49:26 peter Exp $
 .\"
 .Dd May 1, 1995
 .Dt SIGALTSTACK 2
diff --git a/lib/libc/sys/sigreturn.2 b/lib/libc/sys/sigreturn.2
index 5f9597246adf..af0fe7f92ddd 100644
--- a/lib/libc/sys/sigreturn.2
+++ b/lib/libc/sys/sigreturn.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sigreturn.2	8.1 (Berkeley) 6/4/93
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libc/sys/sigreturn.2,v 1.3.2.1 1999/09/18 16:19:01 phantom Exp $
 .\"
 .Dd June 4, 1993
 .Dt SIGRETURN 2
diff --git a/lib/libc/sys/socket.2 b/lib/libc/sys/socket.2
index df988fff5ab7..1438a86b4b1e 100644
--- a/lib/libc/sys/socket.2
+++ b/lib/libc/sys/socket.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)socket.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/socket.2,v 1.9.2.1 1999/08/29 14:49:27 peter Exp $
 .\"
 .Dd November 24, 1997
 .Dt SOCKET 2
diff --git a/lib/libc/sys/stat.2 b/lib/libc/sys/stat.2
index 238be1d521b2..a945028795d9 100644
--- a/lib/libc/sys/stat.2
+++ b/lib/libc/sys/stat.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)stat.2	8.4 (Berkeley) 5/1/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/stat.2,v 1.14.2.1 1999/08/29 14:49:27 peter Exp $
 .\"
 .Dd May 1, 1995
 .Dt STAT 2
diff --git a/lib/libc/sys/sysarch.2 b/lib/libc/sys/sysarch.2
index c3840e9f12ea..abf66f72558b 100644
--- a/lib/libc/sys/sysarch.2
+++ b/lib/libc/sys/sysarch.2
@@ -1,5 +1,5 @@
 .\"	$NetBSD: sysarch.2,v 1.6 1998/02/25 21:24:57 perry Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sysarch.2,v 1.1.2.1 1999/08/29 14:49:28 peter Exp $
 .\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
diff --git a/lib/libc/sys/umask.2 b/lib/libc/sys/umask.2
index aaeaaa560dc4..3863aaa33cda 100644
--- a/lib/libc/sys/umask.2
+++ b/lib/libc/sys/umask.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)umask.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/umask.2,v 1.5.2.1 1999/08/29 14:49:29 peter Exp $
 .\"
 .Dd June 4, 1993
 .Dt UMASK 2
diff --git a/lib/libc/sys/unlink.2 b/lib/libc/sys/unlink.2
index 874a001a2c2d..4c7d134c8da2 100644
--- a/lib/libc/sys/unlink.2
+++ b/lib/libc/sys/unlink.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)unlink.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/unlink.2,v 1.7.2.1 1999/08/29 14:49:29 peter Exp $
 .\"
 .Dd June 4, 1993
 .Dt UNLINK 2
diff --git a/lib/libc/sys/utimes.2 b/lib/libc/sys/utimes.2
index ea04d853eae7..e8480b00955a 100644
--- a/lib/libc/sys/utimes.2
+++ b/lib/libc/sys/utimes.2
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)utimes.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/utimes.2,v 1.4.2.3 1999/08/29 14:49:30 peter Exp $
 .\"
 .Dd June 4, 1993
 .Dt UTIMES 2
diff --git a/lib/libc/sys/vfork.2 b/lib/libc/sys/vfork.2
index 7363c55abec6..c73c2e0379e3 100644
--- a/lib/libc/sys/vfork.2
+++ b/lib/libc/sys/vfork.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vfork.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/vfork.2,v 1.11.2.1 1999/08/29 14:49:31 peter Exp $
 .\"
 .Dd June 4, 1993
 .Dt VFORK 2
diff --git a/lib/libc/xdr/Makefile.inc b/lib/libc/xdr/Makefile.inc
index 1837ef889a38..f5ee37d092f9 100644
--- a/lib/libc/xdr/Makefile.inc
+++ b/lib/libc/xdr/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile	5.11 (Berkeley) 9/6/90
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/xdr/Makefile.inc,v 1.9.2.1 1999/08/29 14:49:36 peter Exp $
 
 .PATH: ${.CURDIR}/../libc/xdr ${.CURDIR}/.
 SRCS+=	xdr.c xdr_array.c xdr_float.c xdr_mem.c \
diff --git a/lib/libc/xdr/xdr.3 b/lib/libc/xdr/xdr.3
index 979b54e03a6e..b215b68c12b6 100644
--- a/lib/libc/xdr/xdr.3
+++ b/lib/libc/xdr/xdr.3
@@ -1,5 +1,5 @@
 .\" @(#)xdr.3n	2.2 88/08/03 4.0 RPCSRC; from 1.16 88/03/14 SMI
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/xdr/xdr.3,v 1.6.2.1 1999/08/29 14:49:37 peter Exp $
 .\"
 .TH XDR 3 "16 February 1988"
 .SH NAME
diff --git a/lib/libc/xdr/xdr.c b/lib/libc/xdr/xdr.c
index 956e2ffe983a..c81130a14a07 100644
--- a/lib/libc/xdr/xdr.c
+++ b/lib/libc/xdr/xdr.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)xdr.c 1.35 87/08/12";*/
 /*static char *sccsid = "from: @(#)xdr.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/xdr/xdr.c,v 1.8.2.1 1999/08/29 14:49:37 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/xdr/xdr_array.c b/lib/libc/xdr/xdr_array.c
index b7d36fea5ca3..8cb2b7f060b4 100644
--- a/lib/libc/xdr/xdr_array.c
+++ b/lib/libc/xdr/xdr_array.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)xdr_array.c 1.10 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)xdr_array.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/xdr/xdr_array.c,v 1.7.2.1 1999/08/29 14:49:38 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/xdr/xdr_float.c b/lib/libc/xdr/xdr_float.c
index 0ffbeb3358bc..59fca4f0ae0a 100644
--- a/lib/libc/xdr/xdr_float.c
+++ b/lib/libc/xdr/xdr_float.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)xdr_float.c 1.12 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)xdr_float.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/xdr/xdr_float.c,v 1.6.2.1 1999/08/29 14:49:38 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/xdr/xdr_mem.c b/lib/libc/xdr/xdr_mem.c
index 3193e64939dd..48e50d9ee9d4 100644
--- a/lib/libc/xdr/xdr_mem.c
+++ b/lib/libc/xdr/xdr_mem.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)xdr_mem.c 1.19 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)xdr_mem.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/xdr/xdr_mem.c,v 1.7.2.1 1999/08/29 14:49:39 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/xdr/xdr_rec.c b/lib/libc/xdr/xdr_rec.c
index b96b6342165c..8dcdc97368be 100644
--- a/lib/libc/xdr/xdr_rec.c
+++ b/lib/libc/xdr/xdr_rec.c
@@ -29,7 +29,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)xdr_rec.c 1.21 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)xdr_rec.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/xdr/xdr_rec.c,v 1.10.2.1 1999/08/29 14:49:39 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/xdr/xdr_reference.c b/lib/libc/xdr/xdr_reference.c
index b0cdbce93008..23cc3c673aa6 100644
--- a/lib/libc/xdr/xdr_reference.c
+++ b/lib/libc/xdr/xdr_reference.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)xdr_reference.c 1.11 87/08/11 SMI";*/
 /*static char *sccsid = "from: @(#)xdr_reference.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/xdr/xdr_reference.c,v 1.7.2.1 1999/08/29 14:49:39 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/xdr/xdr_stdio.c b/lib/libc/xdr/xdr_stdio.c
index 708573ccdf58..9f821fbd0abd 100644
--- a/lib/libc/xdr/xdr_stdio.c
+++ b/lib/libc/xdr/xdr_stdio.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)xdr_stdio.c 1.16 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)xdr_stdio.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/xdr/xdr_stdio.c,v 1.6.2.1 1999/08/29 14:49:40 peter Exp $";
 #endif
 
 /*
diff --git a/lib/libc/yp/Makefile.inc b/lib/libc/yp/Makefile.inc
index 2112aeb9b716..a3ae483d0006 100644
--- a/lib/libc/yp/Makefile.inc
+++ b/lib/libc/yp/Makefile.inc
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile.inc	5.3 (Berkeley) 2/20/91
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/yp/Makefile.inc,v 1.7.2.1 1999/08/29 14:49:42 peter Exp $
 
 # yp sources
 .PATH: ${.CURDIR}/../libc/yp
diff --git a/lib/libc/yp/xdryp.c b/lib/libc/yp/xdryp.c
index 180528866839..3d59687ec83d 100644
--- a/lib/libc/yp/xdryp.c
+++ b/lib/libc/yp/xdryp.c
@@ -28,7 +28,7 @@
  */
 
 #ifndef LINT
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/yp/xdryp.c,v 1.8.2.1 1999/08/29 14:49:42 peter Exp $";
 #endif
 
 #include <rpc/rpc.h>
diff --git a/lib/libc/yp/yplib.c b/lib/libc/yp/yplib.c
index 0622be1f8bbc..abd888b6bb4f 100644
--- a/lib/libc/yp/yplib.c
+++ b/lib/libc/yp/yplib.c
@@ -29,7 +29,7 @@
  */
 
 #ifndef LINT
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/lib/libc/yp/yplib.c,v 1.30.2.1 1999/08/29 14:49:43 peter Exp $";
 #endif
 
 #include <sys/param.h>
diff --git a/lib/libc_r/Makefile b/lib/libc_r/Makefile
index 3b130b2335ae..69bdf9395837 100644
--- a/lib/libc_r/Makefile
+++ b/lib/libc_r/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc_r/Makefile,v 1.14.2.2 1999/08/29 14:55:21 peter Exp $
 #
 # All library objects contain rcsid strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
diff --git a/lib/libc_r/arch/alpha/_atomic_lock.S b/lib/libc_r/arch/alpha/_atomic_lock.S
index 1cfb52faa824..3fe81f7b0662 100644
--- a/lib/libc_r/arch/alpha/_atomic_lock.S
+++ b/lib/libc_r/arch/alpha/_atomic_lock.S
@@ -19,7 +19,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF  
  * SUCH DAMAGE.    
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/arch/alpha/_atomic_lock.S,v 1.2.2.1 1999/08/29 14:55:21 peter Exp $
  *
  */
 
diff --git a/lib/libc_r/arch/i386/_atomic_lock.S b/lib/libc_r/arch/i386/_atomic_lock.S
index afaec7125ca1..ee89280b41de 100644
--- a/lib/libc_r/arch/i386/_atomic_lock.S
+++ b/lib/libc_r/arch/i386/_atomic_lock.S
@@ -19,13 +19,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF  
  * SUCH DAMAGE.    
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/arch/i386/_atomic_lock.S,v 1.2.2.1 1999/08/29 14:55:23 peter Exp $
  *
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc_r/arch/i386/_atomic_lock.S,v 1.2.2.1 1999/08/29 14:55:23 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc_r/man/Makefile.inc b/lib/libc_r/man/Makefile.inc
index 68129f6139bc..eb6a2caabd4f 100644
--- a/lib/libc_r/man/Makefile.inc
+++ b/lib/libc_r/man/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc_r/man/Makefile.inc,v 1.5.2.1 1999/08/29 14:55:24 peter Exp $
 
 # POSIX thread man files
 
diff --git a/lib/libc_r/man/pthread_cleanup_pop.3 b/lib/libc_r/man/pthread_cleanup_pop.3
index faae8ba450fc..2a1e6c4bcee5 100644
--- a/lib/libc_r/man/pthread_cleanup_pop.3
+++ b/lib/libc_r/man/pthread_cleanup_pop.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_cleanup_pop.3,v 1.2.2.2 1999/08/29 14:55:24 peter Exp $
 .\"
 .Dd July 30, 1998
 .Dt PTHREAD_CLEANUP_POP 3
diff --git a/lib/libc_r/man/pthread_cleanup_push.3 b/lib/libc_r/man/pthread_cleanup_push.3
index 4f260affbc32..cb706ef94d44 100644
--- a/lib/libc_r/man/pthread_cleanup_push.3
+++ b/lib/libc_r/man/pthread_cleanup_push.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_cleanup_push.3,v 1.3.2.2 1999/08/29 14:55:25 peter Exp $
 .\"
 .Dd July 30, 1998
 .Dt PTHREAD_CLEANUP_PUSH 3
diff --git a/lib/libc_r/man/pthread_cond_broadcast.3 b/lib/libc_r/man/pthread_cond_broadcast.3
index 6112695c9893..dd810e59f8be 100644
--- a/lib/libc_r/man/pthread_cond_broadcast.3
+++ b/lib/libc_r/man/pthread_cond_broadcast.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_cond_broadcast.3,v 1.3.2.2 1999/08/29 14:55:25 peter Exp $
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_BROADCAST 3
diff --git a/lib/libc_r/man/pthread_cond_destroy.3 b/lib/libc_r/man/pthread_cond_destroy.3
index 75ae99686f41..fc2eef8a8f1e 100644
--- a/lib/libc_r/man/pthread_cond_destroy.3
+++ b/lib/libc_r/man/pthread_cond_destroy.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_cond_destroy.3,v 1.3.2.2 1999/08/29 14:55:25 peter Exp $
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_DESTROY 3
diff --git a/lib/libc_r/man/pthread_cond_init.3 b/lib/libc_r/man/pthread_cond_init.3
index 2783672ce3d9..a9145c731225 100644
--- a/lib/libc_r/man/pthread_cond_init.3
+++ b/lib/libc_r/man/pthread_cond_init.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_cond_init.3,v 1.4.2.2 1999/08/29 14:55:26 peter Exp $
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_INIT 3
diff --git a/lib/libc_r/man/pthread_cond_signal.3 b/lib/libc_r/man/pthread_cond_signal.3
index e3a22f88cf6c..3b52432ef2c2 100644
--- a/lib/libc_r/man/pthread_cond_signal.3
+++ b/lib/libc_r/man/pthread_cond_signal.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_cond_signal.3,v 1.3.2.2 1999/08/29 14:55:26 peter Exp $
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_SIGNAL 3
diff --git a/lib/libc_r/man/pthread_cond_timedwait.3 b/lib/libc_r/man/pthread_cond_timedwait.3
index 0de2278a2fcd..181d01841a65 100644
--- a/lib/libc_r/man/pthread_cond_timedwait.3
+++ b/lib/libc_r/man/pthread_cond_timedwait.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_cond_timedwait.3,v 1.3.2.2 1999/08/29 14:55:27 peter Exp $
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_TIMEDWAIT 3
diff --git a/lib/libc_r/man/pthread_cond_wait.3 b/lib/libc_r/man/pthread_cond_wait.3
index 022bbf2822d0..310c5faecafd 100644
--- a/lib/libc_r/man/pthread_cond_wait.3
+++ b/lib/libc_r/man/pthread_cond_wait.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_cond_wait.3,v 1.3.2.2 1999/08/29 14:55:27 peter Exp $
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_WAIT 3
diff --git a/lib/libc_r/man/pthread_create.3 b/lib/libc_r/man/pthread_create.3
index cdc28a56c854..93045f4ae6bb 100644
--- a/lib/libc_r/man/pthread_create.3
+++ b/lib/libc_r/man/pthread_create.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_create.3,v 1.6.2.2 1999/08/29 14:55:27 peter Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_CREATE 3
diff --git a/lib/libc_r/man/pthread_detach.3 b/lib/libc_r/man/pthread_detach.3
index a3fffc6056ea..2b5db3bbfd1e 100644
--- a/lib/libc_r/man/pthread_detach.3
+++ b/lib/libc_r/man/pthread_detach.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_detach.3,v 1.3.2.2 1999/08/29 14:55:28 peter Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_DETACH 3
diff --git a/lib/libc_r/man/pthread_equal.3 b/lib/libc_r/man/pthread_equal.3
index 5d443b3cb2c6..d939aa16c7cd 100644
--- a/lib/libc_r/man/pthread_equal.3
+++ b/lib/libc_r/man/pthread_equal.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_equal.3,v 1.2.2.2 1999/08/29 14:55:28 peter Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_EQUAL 3
diff --git a/lib/libc_r/man/pthread_exit.3 b/lib/libc_r/man/pthread_exit.3
index ff452ca94215..ea89149e40a8 100644
--- a/lib/libc_r/man/pthread_exit.3
+++ b/lib/libc_r/man/pthread_exit.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_exit.3,v 1.4.2.3 1999/08/29 14:55:29 peter Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_EXIT 3
diff --git a/lib/libc_r/man/pthread_getspecific.3 b/lib/libc_r/man/pthread_getspecific.3
index a56254108f6e..49de6387ed74 100644
--- a/lib/libc_r/man/pthread_getspecific.3
+++ b/lib/libc_r/man/pthread_getspecific.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_getspecific.3,v 1.5.2.1 1999/08/29 14:55:29 peter Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_GETSPECIFIC 3
diff --git a/lib/libc_r/man/pthread_join.3 b/lib/libc_r/man/pthread_join.3
index e32ad40613b7..6731d547abaa 100644
--- a/lib/libc_r/man/pthread_join.3
+++ b/lib/libc_r/man/pthread_join.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_join.3,v 1.4.2.2 1999/08/29 14:55:30 peter Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_JOIN 3
diff --git a/lib/libc_r/man/pthread_key_create.3 b/lib/libc_r/man/pthread_key_create.3
index 76fc1879326c..857a3aaa5b12 100644
--- a/lib/libc_r/man/pthread_key_create.3
+++ b/lib/libc_r/man/pthread_key_create.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_key_create.3,v 1.3.2.2 1999/08/29 14:55:30 peter Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_KEY_CREATE 3
diff --git a/lib/libc_r/man/pthread_key_delete.3 b/lib/libc_r/man/pthread_key_delete.3
index 39fb19ea9af8..6f251dbef302 100644
--- a/lib/libc_r/man/pthread_key_delete.3
+++ b/lib/libc_r/man/pthread_key_delete.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_key_delete.3,v 1.3.2.2 1999/08/29 14:55:31 peter Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_KEY_DELETE 3
diff --git a/lib/libc_r/man/pthread_mutex_destroy.3 b/lib/libc_r/man/pthread_mutex_destroy.3
index 517d6ebadf5d..f5f4d2c4557c 100644
--- a/lib/libc_r/man/pthread_mutex_destroy.3
+++ b/lib/libc_r/man/pthread_mutex_destroy.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_mutex_destroy.3,v 1.3.2.2 1999/08/29 14:55:31 peter Exp $
 .\"
 .Dd July 29, 1998
 .Dt PTHREAD_MUTEX_DESTROY 3
diff --git a/lib/libc_r/man/pthread_mutex_init.3 b/lib/libc_r/man/pthread_mutex_init.3
index 926b034b6011..0caa06d5a472 100644
--- a/lib/libc_r/man/pthread_mutex_init.3
+++ b/lib/libc_r/man/pthread_mutex_init.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_mutex_init.3,v 1.4.2.2 1999/08/29 14:55:31 peter Exp $
 .\"
 .Dd July 29, 1998
 .Dt PTHREAD_MUTEX_INIT 3
diff --git a/lib/libc_r/man/pthread_mutex_lock.3 b/lib/libc_r/man/pthread_mutex_lock.3
index 36473733ce11..31b8ceea4bd3 100644
--- a/lib/libc_r/man/pthread_mutex_lock.3
+++ b/lib/libc_r/man/pthread_mutex_lock.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_mutex_lock.3,v 1.3.2.2 1999/08/29 14:55:32 peter Exp $
 .\"
 .Dd July 30, 1998
 .Dt PTHREAD_MUTEX_LOCK 3
diff --git a/lib/libc_r/man/pthread_mutex_trylock.3 b/lib/libc_r/man/pthread_mutex_trylock.3
index 30faaa81bd4d..c6b12e291af2 100644
--- a/lib/libc_r/man/pthread_mutex_trylock.3
+++ b/lib/libc_r/man/pthread_mutex_trylock.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_mutex_trylock.3,v 1.3.2.2 1999/08/29 14:55:32 peter Exp $
 .\"
 .Dd July 30, 1998
 .Dt PTHREAD_MUTEX_TRYLOCK 3
diff --git a/lib/libc_r/man/pthread_mutex_unlock.3 b/lib/libc_r/man/pthread_mutex_unlock.3
index 27a4c337fe37..5c51bce0abef 100644
--- a/lib/libc_r/man/pthread_mutex_unlock.3
+++ b/lib/libc_r/man/pthread_mutex_unlock.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_mutex_unlock.3,v 1.3.2.2 1999/08/29 14:55:33 peter Exp $
 .\"
 .Dd July 30, 1998
 .Dt PTHREAD_MUTEX_UNLOCK 3
diff --git a/lib/libc_r/man/pthread_once.3 b/lib/libc_r/man/pthread_once.3
index 2dcea493cb9c..fe4a3745beac 100644
--- a/lib/libc_r/man/pthread_once.3
+++ b/lib/libc_r/man/pthread_once.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_once.3,v 1.3.2.2 1999/08/29 14:55:34 peter Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_ONCE 3
diff --git a/lib/libc_r/man/pthread_rwlock_destroy.3 b/lib/libc_r/man/pthread_rwlock_destroy.3
index 14691c44bbf8..b863e236b3f6 100644
--- a/lib/libc_r/man/pthread_rwlock_destroy.3
+++ b/lib/libc_r/man/pthread_rwlock_destroy.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_rwlock_destroy.3,v 1.1.4.2 1999/08/29 14:55:34 peter Exp $
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCK_DESTROY 3
diff --git a/lib/libc_r/man/pthread_rwlock_init.3 b/lib/libc_r/man/pthread_rwlock_init.3
index 306af61bbeb4..3a5bc66e1075 100644
--- a/lib/libc_r/man/pthread_rwlock_init.3
+++ b/lib/libc_r/man/pthread_rwlock_init.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_rwlock_init.3,v 1.1.4.1 1999/08/29 14:55:34 peter Exp $
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCK_INIT 3
diff --git a/lib/libc_r/man/pthread_rwlock_rdlock.3 b/lib/libc_r/man/pthread_rwlock_rdlock.3
index bea219de0100..ca12ea2c7d2e 100644
--- a/lib/libc_r/man/pthread_rwlock_rdlock.3
+++ b/lib/libc_r/man/pthread_rwlock_rdlock.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_rwlock_rdlock.3,v 1.1.4.1 1999/08/29 14:55:35 peter Exp $
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCK_RDLOCK 3
diff --git a/lib/libc_r/man/pthread_rwlock_unlock.3 b/lib/libc_r/man/pthread_rwlock_unlock.3
index 7ad52b257120..57616da28fa1 100644
--- a/lib/libc_r/man/pthread_rwlock_unlock.3
+++ b/lib/libc_r/man/pthread_rwlock_unlock.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_rwlock_unlock.3,v 1.1.4.1 1999/08/29 14:55:35 peter Exp $
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCK_UNLOCK 3
diff --git a/lib/libc_r/man/pthread_rwlock_wrlock.3 b/lib/libc_r/man/pthread_rwlock_wrlock.3
index b6a2312a79d6..d008b7a30c75 100644
--- a/lib/libc_r/man/pthread_rwlock_wrlock.3
+++ b/lib/libc_r/man/pthread_rwlock_wrlock.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_rwlock_wrlock.3,v 1.1.4.1 1999/08/29 14:55:36 peter Exp $
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCK_WRLOCK 3
diff --git a/lib/libc_r/man/pthread_rwlockattr_destroy.3 b/lib/libc_r/man/pthread_rwlockattr_destroy.3
index 2d67041ba161..2a5d0cfb6b33 100644
--- a/lib/libc_r/man/pthread_rwlockattr_destroy.3
+++ b/lib/libc_r/man/pthread_rwlockattr_destroy.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_rwlockattr_destroy.3,v 1.1.4.2 1999/08/29 14:55:36 peter Exp $
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCKATTR_DESTROY 3
diff --git a/lib/libc_r/man/pthread_rwlockattr_getpshared.3 b/lib/libc_r/man/pthread_rwlockattr_getpshared.3
index d2028dc58c6d..0ba27dc96145 100644
--- a/lib/libc_r/man/pthread_rwlockattr_getpshared.3
+++ b/lib/libc_r/man/pthread_rwlockattr_getpshared.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_rwlockattr_getpshared.3,v 1.1.4.2 1999/08/29 14:55:36 peter Exp $
 .\"
 .Dd March 22, 1999
 .Dt PTHREAD_RWLOCKATTR_GETPSHARED 3
diff --git a/lib/libc_r/man/pthread_rwlockattr_init.3 b/lib/libc_r/man/pthread_rwlockattr_init.3
index ac191260c66d..980bbe43701e 100644
--- a/lib/libc_r/man/pthread_rwlockattr_init.3
+++ b/lib/libc_r/man/pthread_rwlockattr_init.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_rwlockattr_init.3,v 1.1.4.2 1999/08/29 14:55:36 peter Exp $
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCKATTR_INIT 3
diff --git a/lib/libc_r/man/pthread_rwlockattr_setpshared.3 b/lib/libc_r/man/pthread_rwlockattr_setpshared.3
index b98e081aa3a7..398c183c860e 100644
--- a/lib/libc_r/man/pthread_rwlockattr_setpshared.3
+++ b/lib/libc_r/man/pthread_rwlockattr_setpshared.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_rwlockattr_setpshared.3,v 1.1.4.1 1999/08/29 14:55:37 peter Exp $
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCKATTR_SETPSHARED 3
diff --git a/lib/libc_r/man/pthread_self.3 b/lib/libc_r/man/pthread_self.3
index be524b9345b9..f2b5a4240a14 100644
--- a/lib/libc_r/man/pthread_self.3
+++ b/lib/libc_r/man/pthread_self.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_self.3,v 1.2.2.2 1999/08/29 14:55:37 peter Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_SELF 3
diff --git a/lib/libc_r/man/pthread_setspecific.3 b/lib/libc_r/man/pthread_setspecific.3
index 89a416f57c61..00206b0286c2 100644
--- a/lib/libc_r/man/pthread_setspecific.3
+++ b/lib/libc_r/man/pthread_setspecific.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc_r/man/pthread_setspecific.3,v 1.3.2.2 1999/08/29 14:55:37 peter Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_SETSPECIFIC 3
diff --git a/lib/libc_r/sys/Makefile.inc b/lib/libc_r/sys/Makefile.inc
index e608afa69909..bed62ac8a5e1 100644
--- a/lib/libc_r/sys/Makefile.inc
+++ b/lib/libc_r/sys/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc_r/sys/Makefile.inc,v 1.9.2.1 1999/08/29 14:55:41 peter Exp $
 
 .PATH:	 ${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH}
 
diff --git a/lib/libc_r/test/Makefile b/lib/libc_r/test/Makefile
index 90ee5ad59ea4..096b0f1649a0 100644
--- a/lib/libc_r/test/Makefile
+++ b/lib/libc_r/test/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc_r/test/Makefile,v 1.2.4.2 1999/08/29 14:55:43 peter Exp $
 #
 # Tests for libc_r functionality.
 #
diff --git a/lib/libc_r/test/mutex/Makefile b/lib/libc_r/test/mutex/Makefile
index 19f4ce34622d..d1ab5d377c64 100644
--- a/lib/libc_r/test/mutex/Makefile
+++ b/lib/libc_r/test/mutex/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc_r/test/mutex/Makefile,v 1.1.2.1 1999/08/29 14:55:44 peter Exp $
 
 PROG=		mutex
 SRCS=		mutex.c
diff --git a/lib/libc_r/test/sigsuspend/Makefile b/lib/libc_r/test/sigsuspend/Makefile
index 7fb52c8f43b2..4bd5bf0971ab 100644
--- a/lib/libc_r/test/sigsuspend/Makefile
+++ b/lib/libc_r/test/sigsuspend/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc_r/test/sigsuspend/Makefile,v 1.1.4.1 1999/08/29 14:55:45 peter Exp $
 
 PROG=		sigsuspend
 SRCS=		sigsuspend.c
diff --git a/lib/libc_r/test/sigwait/Makefile b/lib/libc_r/test/sigwait/Makefile
index 31520c1af0fb..ea1e7f7d1468 100644
--- a/lib/libc_r/test/sigwait/Makefile
+++ b/lib/libc_r/test/sigwait/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc_r/test/sigwait/Makefile,v 1.1.4.1 1999/08/29 14:55:46 peter Exp $
 
 PROG=		sigwait
 SRCS=		sigwait.c
diff --git a/lib/libc_r/uthread/Makefile.inc b/lib/libc_r/uthread/Makefile.inc
index d42c04b1c871..27cf0870a129 100644
--- a/lib/libc_r/uthread/Makefile.inc
+++ b/lib/libc_r/uthread/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc_r/uthread/Makefile.inc,v 1.16.2.3 1999/08/29 14:55:47 peter Exp $
 
 # uthread sources
 .PATH: ${.CURDIR}/uthread
diff --git a/lib/libc_r/uthread/pthread_private.h b/lib/libc_r/uthread/pthread_private.h
index a4dfd54131fb..92829eb7561d 100644
--- a/lib/libc_r/uthread/pthread_private.h
+++ b/lib/libc_r/uthread/pthread_private.h
@@ -31,7 +31,7 @@
  *
  * Private thread definitions for the uthread kernel.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.16.2.4 1999/08/29 14:55:48 peter Exp $
  */
 
 #ifndef _PTHREAD_PRIVATE_H
diff --git a/lib/libc_r/uthread/uthread_close.c b/lib/libc_r/uthread/uthread_close.c
index c2f0fa6de7c9..ae180fa76793 100644
--- a/lib/libc_r/uthread/uthread_close.c
+++ b/lib/libc_r/uthread/uthread_close.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_close.c,v 1.4.2.2 1999/08/29 14:55:48 peter Exp $
  */
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libc_r/uthread/uthread_cond.c b/lib/libc_r/uthread/uthread_cond.c
index 2eb05f982cc9..5eb36bc8ea5a 100644
--- a/lib/libc_r/uthread/uthread_cond.c
+++ b/lib/libc_r/uthread/uthread_cond.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_cond.c,v 1.12.2.5 1999/08/30 00:20:00 deischen Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_create.c b/lib/libc_r/uthread/uthread_create.c
index 18251d261977..bc82a47bcd8a 100644
--- a/lib/libc_r/uthread/uthread_create.c
+++ b/lib/libc_r/uthread/uthread_create.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_create.c,v 1.11.2.3 1999/08/29 14:55:50 peter Exp $
  */
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libc_r/uthread/uthread_detach.c b/lib/libc_r/uthread/uthread_detach.c
index a8c4c38924a8..c62825c40748 100644
--- a/lib/libc_r/uthread/uthread_detach.c
+++ b/lib/libc_r/uthread/uthread_detach.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_detach.c,v 1.6.2.3 1999/08/29 14:55:50 peter Exp $
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_execve.c b/lib/libc_r/uthread/uthread_execve.c
index 024dab447359..7ac3a69ba7ef 100644
--- a/lib/libc_r/uthread/uthread_execve.c
+++ b/lib/libc_r/uthread/uthread_execve.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_execve.c,v 1.4.2.3 1999/08/29 14:55:51 peter Exp $
  */
 #include <errno.h>
 #include <fcntl.h>
diff --git a/lib/libc_r/uthread/uthread_exit.c b/lib/libc_r/uthread/uthread_exit.c
index 9b0bb50c659b..b6f7a1ff1b77 100644
--- a/lib/libc_r/uthread/uthread_exit.c
+++ b/lib/libc_r/uthread/uthread_exit.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_exit.c,v 1.6.2.5 1999/08/31 20:16:01 dt Exp $
  */
 #include <errno.h>
 #include <unistd.h>
diff --git a/lib/libc_r/uthread/uthread_fd.c b/lib/libc_r/uthread/uthread_fd.c
index e54a32ee6bdb..3603317a16ef 100644
--- a/lib/libc_r/uthread/uthread_fd.c
+++ b/lib/libc_r/uthread/uthread_fd.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_fd.c,v 1.9.2.4 1999/08/29 14:55:52 peter Exp $
  */
 #include <errno.h>
 #include <fcntl.h>
diff --git a/lib/libc_r/uthread/uthread_file.c b/lib/libc_r/uthread/uthread_file.c
index 9e0c79d28c77..2babb00dee01 100644
--- a/lib/libc_r/uthread/uthread_file.c
+++ b/lib/libc_r/uthread/uthread_file.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_file.c,v 1.6.2.2 1999/08/29 14:55:52 peter Exp $
  *
  * POSIX stdio FILE locking functions. These assume that the locking
  * is only required at FILE structure level, not at file descriptor
diff --git a/lib/libc_r/uthread/uthread_find_thread.c b/lib/libc_r/uthread/uthread_find_thread.c
index eb5b3d0b1e53..c4dc752a570c 100644
--- a/lib/libc_r/uthread/uthread_find_thread.c
+++ b/lib/libc_r/uthread/uthread_find_thread.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_find_thread.c,v 1.2.4.2 1999/08/29 14:55:53 peter Exp $
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_fork.c b/lib/libc_r/uthread/uthread_fork.c
index 9f46b1a2bd5a..62657b9a9f3b 100644
--- a/lib/libc_r/uthread/uthread_fork.c
+++ b/lib/libc_r/uthread/uthread_fork.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_fork.c,v 1.8.2.3 1999/08/29 14:55:53 peter Exp $
  */
 #include <errno.h>
 #include <string.h>
diff --git a/lib/libc_r/uthread/uthread_gc.c b/lib/libc_r/uthread/uthread_gc.c
index 0ef4e9f1c564..c5e51f0a7194 100644
--- a/lib/libc_r/uthread/uthread_gc.c
+++ b/lib/libc_r/uthread/uthread_gc.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_gc.c,v 1.2.4.3 1999/08/29 14:55:54 peter Exp $
  *
  * Garbage collector thread. Frees memory allocated for dead threads.
  *
diff --git a/lib/libc_r/uthread/uthread_info.c b/lib/libc_r/uthread/uthread_info.c
index 026849d2d100..8b9c7b6a6a25 100644
--- a/lib/libc_r/uthread/uthread_info.c
+++ b/lib/libc_r/uthread/uthread_info.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_info.c,v 1.9.2.3 1999/08/29 14:55:55 peter Exp $
  */
 #include <stdio.h>
 #include <fcntl.h>
diff --git a/lib/libc_r/uthread/uthread_init.c b/lib/libc_r/uthread/uthread_init.c
index 7fc602d051ce..1b3d5b7cd45a 100644
--- a/lib/libc_r/uthread/uthread_init.c
+++ b/lib/libc_r/uthread/uthread_init.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.9.2.5 1999/08/29 14:55:55 peter Exp $
  */
 
 /* Allocate space for global thread variables here: */
diff --git a/lib/libc_r/uthread/uthread_join.c b/lib/libc_r/uthread/uthread_join.c
index 84d2620c3d5e..bf900cd4d2b7 100644
--- a/lib/libc_r/uthread/uthread_join.c
+++ b/lib/libc_r/uthread/uthread_join.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_join.c,v 1.6.2.2 1999/08/29 14:55:56 peter Exp $
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_kern.c b/lib/libc_r/uthread/uthread_kern.c
index 3331a5df0bc7..8c1db7f40a6c 100644
--- a/lib/libc_r/uthread/uthread_kern.c
+++ b/lib/libc_r/uthread/uthread_kern.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_kern.c,v 1.15.2.6 1999/08/29 14:55:56 peter Exp $
  *
  */
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_kill.c b/lib/libc_r/uthread/uthread_kill.c
index 59684ff2cd9b..e4c8db5a245f 100644
--- a/lib/libc_r/uthread/uthread_kill.c
+++ b/lib/libc_r/uthread/uthread_kill.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_kill.c,v 1.5.2.3 1999/08/29 14:55:57 peter Exp $
  */
 #include <errno.h>
 #include <signal.h>
diff --git a/lib/libc_r/uthread/uthread_mutex.c b/lib/libc_r/uthread/uthread_mutex.c
index a402d4bc2159..07b7e2571ca6 100644
--- a/lib/libc_r/uthread/uthread_mutex.c
+++ b/lib/libc_r/uthread/uthread_mutex.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_mutex.c,v 1.12.2.3 1999/08/29 14:55:57 peter Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_open.c b/lib/libc_r/uthread/uthread_open.c
index 45fe149b19fa..9243ddae5f8e 100644
--- a/lib/libc_r/uthread/uthread_open.c
+++ b/lib/libc_r/uthread/uthread_open.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_open.c,v 1.4.2.1 1999/08/29 14:55:58 peter Exp $
  *
  */
 #include <stdarg.h>
diff --git a/lib/libc_r/uthread/uthread_poll.c b/lib/libc_r/uthread/uthread_poll.c
index 01916ad1b4e1..4a1380281618 100644
--- a/lib/libc_r/uthread/uthread_poll.c
+++ b/lib/libc_r/uthread/uthread_poll.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_poll.c,v 1.1.2.3 1999/08/30 00:20:01 deischen Exp $
  */
 #include <unistd.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_priority_queue.c b/lib/libc_r/uthread/uthread_priority_queue.c
index 5bd8a8cc2826..7b1229da4bd3 100644
--- a/lib/libc_r/uthread/uthread_priority_queue.c
+++ b/lib/libc_r/uthread/uthread_priority_queue.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_priority_queue.c,v 1.1.2.3 1999/08/29 14:55:59 peter Exp $
  */
 #include <stdlib.h>
 #include <sys/queue.h>
diff --git a/lib/libc_r/uthread/uthread_read.c b/lib/libc_r/uthread/uthread_read.c
index cfa0c6ae9f22..e77b401e4e44 100644
--- a/lib/libc_r/uthread/uthread_read.c
+++ b/lib/libc_r/uthread/uthread_read.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_read.c,v 1.6.2.1 1999/08/29 14:56:00 peter Exp $
  *
  */
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_readv.c b/lib/libc_r/uthread/uthread_readv.c
index 767c0ee64705..d9b10a6a08ec 100644
--- a/lib/libc_r/uthread/uthread_readv.c
+++ b/lib/libc_r/uthread/uthread_readv.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_readv.c,v 1.6.2.1 1999/08/29 14:56:00 peter Exp $
  *
  */
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_resume_np.c b/lib/libc_r/uthread/uthread_resume_np.c
index 77a53623b04f..eeb279534a61 100644
--- a/lib/libc_r/uthread/uthread_resume_np.c
+++ b/lib/libc_r/uthread/uthread_resume_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_resume_np.c,v 1.3.2.3 1999/08/29 14:56:01 peter Exp $
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_rwlock.c b/lib/libc_r/uthread/uthread_rwlock.c
index 648e8a394eeb..806cea49eb3d 100644
--- a/lib/libc_r/uthread/uthread_rwlock.c
+++ b/lib/libc_r/uthread/uthread_rwlock.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_rwlock.c,v 1.3.4.1 1999/08/29 14:56:01 peter Exp $
  */
 
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_rwlockattr.c b/lib/libc_r/uthread/uthread_rwlockattr.c
index 3330ba19ff3e..4beccf0032b6 100644
--- a/lib/libc_r/uthread/uthread_rwlockattr.c
+++ b/lib/libc_r/uthread/uthread_rwlockattr.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_rwlockattr.c,v 1.2.4.1 1999/08/29 14:56:02 peter Exp $
  */
 
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_select.c b/lib/libc_r/uthread/uthread_select.c
index 9bfae89be374..e1a5224db091 100644
--- a/lib/libc_r/uthread/uthread_select.c
+++ b/lib/libc_r/uthread/uthread_select.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_select.c,v 1.5.2.6 1999/08/30 00:20:02 deischen Exp $
  */
 #include <unistd.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_setschedparam.c b/lib/libc_r/uthread/uthread_setschedparam.c
index bb66fe50ba67..c10c50d9ae9d 100644
--- a/lib/libc_r/uthread/uthread_setschedparam.c
+++ b/lib/libc_r/uthread/uthread_setschedparam.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_setschedparam.c,v 1.1.2.3 1999/08/29 14:56:03 peter Exp $
  */
 #include <errno.h>
 #include <sys/param.h>
diff --git a/lib/libc_r/uthread/uthread_sig.c b/lib/libc_r/uthread/uthread_sig.c
index 23974e4f1a7f..931f9ee29180 100644
--- a/lib/libc_r/uthread/uthread_sig.c
+++ b/lib/libc_r/uthread/uthread_sig.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_sig.c,v 1.15.2.3 1999/08/29 14:56:03 peter Exp $
  */
 #include <signal.h>
 #include <fcntl.h>
diff --git a/lib/libc_r/uthread/uthread_sigaction.c b/lib/libc_r/uthread/uthread_sigaction.c
index dd1863c794e3..b935761f1d70 100644
--- a/lib/libc_r/uthread/uthread_sigaction.c
+++ b/lib/libc_r/uthread/uthread_sigaction.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_sigaction.c,v 1.4.2.3 1999/08/29 14:56:04 peter Exp $
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_sigwait.c b/lib/libc_r/uthread/uthread_sigwait.c
index d8906b14e0b1..a2965117fdd2 100644
--- a/lib/libc_r/uthread/uthread_sigwait.c
+++ b/lib/libc_r/uthread/uthread_sigwait.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_sigwait.c,v 1.4.2.3 1999/08/29 14:56:05 peter Exp $
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_socketpair.c b/lib/libc_r/uthread/uthread_socketpair.c
index 95571674d948..2c1e71eee11c 100644
--- a/lib/libc_r/uthread/uthread_socketpair.c
+++ b/lib/libc_r/uthread/uthread_socketpair.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_socketpair.c,v 1.4.2.1 1999/08/29 14:56:05 peter Exp $
  *
  */
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_spinlock.c b/lib/libc_r/uthread/uthread_spinlock.c
index 8285cf6d8cdd..325cbd00fb09 100644
--- a/lib/libc_r/uthread/uthread_spinlock.c
+++ b/lib/libc_r/uthread/uthread_spinlock.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_spinlock.c,v 1.4.4.3 1999/08/29 14:56:06 peter Exp $
  *
  */
 
diff --git a/lib/libc_r/uthread/uthread_suspend_np.c b/lib/libc_r/uthread/uthread_suspend_np.c
index dfa9a5d51e31..9375590b1752 100644
--- a/lib/libc_r/uthread/uthread_suspend_np.c
+++ b/lib/libc_r/uthread/uthread_suspend_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_suspend_np.c,v 1.3.2.3 1999/08/29 14:56:06 peter Exp $
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_write.c b/lib/libc_r/uthread/uthread_write.c
index 6b82950d2d3b..214c42eed111 100644
--- a/lib/libc_r/uthread/uthread_write.c
+++ b/lib/libc_r/uthread/uthread_write.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_write.c,v 1.10.2.1 1999/08/29 14:56:07 peter Exp $
  *
  */
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_writev.c b/lib/libc_r/uthread/uthread_writev.c
index 614bbc75c99a..f213435a2ad1 100644
--- a/lib/libc_r/uthread/uthread_writev.c
+++ b/lib/libc_r/uthread/uthread_writev.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_writev.c,v 1.10.2.1 1999/08/29 14:56:07 peter Exp $
  *
  */
 #include <sys/types.h>
diff --git a/lib/libcalendar/Makefile b/lib/libcalendar/Makefile
index 4ecd11ac2622..458edc92310a 100644
--- a/lib/libcalendar/Makefile
+++ b/lib/libcalendar/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libcalendar/Makefile,v 1.2.4.1 1999/08/29 14:56:12 peter Exp $
 
 LIB=	calendar
 
diff --git a/lib/libcalendar/calendar.3 b/lib/libcalendar/calendar.3
index ba889bfd6766..1ec9e9a1dca7 100644
--- a/lib/libcalendar/calendar.3
+++ b/lib/libcalendar/calendar.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcalendar/calendar.3,v 1.4.2.1 1999/08/29 14:56:12 peter Exp $
 .\"
 .Dd November 29, 1997
 .Dt CALENDAR 3
diff --git a/lib/libcalendar/calendar.c b/lib/libcalendar/calendar.c
index 3f5ca0700c93..f50099a592a2 100644
--- a/lib/libcalendar/calendar.c
+++ b/lib/libcalendar/calendar.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libcalendar/calendar.c,v 1.2.4.1 1999/08/29 14:56:13 peter Exp $
  */
 
 #include "calendar.h"
diff --git a/lib/libcalendar/calendar.h b/lib/libcalendar/calendar.h
index 2c42d6c2214e..485d74778480 100644
--- a/lib/libcalendar/calendar.h
+++ b/lib/libcalendar/calendar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libcalendar/calendar.h,v 1.3.4.1 1999/08/29 14:56:13 peter Exp $
  */
 struct date {
 	int y;	/* year */
diff --git a/lib/libcalendar/easter.c b/lib/libcalendar/easter.c
index 333665b9390c..42c36d7eb453 100644
--- a/lib/libcalendar/easter.c
+++ b/lib/libcalendar/easter.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libcalendar/easter.c,v 1.3.4.1 1999/08/29 14:56:13 peter Exp $
  */
 
 #include "calendar.h"
diff --git a/lib/libcam/cam.3 b/lib/libcam/cam.3
index af76d64ee0b2..16221ddfa12f 100644
--- a/lib/libcam/cam.3
+++ b/lib/libcam/cam.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcam/cam.3,v 1.1.2.3 1999/08/29 14:56:14 peter Exp $
 .\"
 .Dd October 10, 1998
 .Os FreeBSD 3.0
diff --git a/lib/libcam/cam_cdbparse.3 b/lib/libcam/cam_cdbparse.3
index c603aa3dfd5f..225608fa6d44 100644
--- a/lib/libcam/cam_cdbparse.3
+++ b/lib/libcam/cam_cdbparse.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcam/cam_cdbparse.3,v 1.1.2.1 1999/08/29 14:56:16 peter Exp $
 .\"
 .\" This man page borrows heavily from the old scsi(3) man page, which had
 .\" the following copyright:
diff --git a/lib/libcam/camlib.c b/lib/libcam/camlib.c
index 648b0303a96c..223692774a43 100644
--- a/lib/libcam/camlib.c
+++ b/lib/libcam/camlib.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libcam/camlib.c,v 1.4.2.3 1999/09/12 21:33:28 ken Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libcam/camlib.h b/lib/libcam/camlib.h
index 420129431b0c..45adfb60ce71 100644
--- a/lib/libcam/camlib.h
+++ b/lib/libcam/camlib.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libcam/camlib.h,v 1.1.2.1 1999/08/29 14:56:16 peter Exp $
  */
 /*
  * Buffer encoding/decoding routines taken from the original FreeBSD SCSI
diff --git a/lib/libcam/scsi_cmdparse.c b/lib/libcam/scsi_cmdparse.c
index ad1cbb0e93e9..f67750f28cf9 100644
--- a/lib/libcam/scsi_cmdparse.c
+++ b/lib/libcam/scsi_cmdparse.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * From: scsi.c,v 1.8 1997/02/22 15:07:54 peter Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libcam/scsi_cmdparse.c,v 1.2.2.1 1999/08/29 14:56:17 peter Exp $
  */
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/lib/libcom_err/Makefile b/lib/libcom_err/Makefile
index 85df262de725..59b1bdf93bbb 100644
--- a/lib/libcom_err/Makefile
+++ b/lib/libcom_err/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libcom_err/Makefile,v 1.8.2.1 1999/08/29 14:56:19 peter Exp $
 
 LIB=	com_err
 SRCS=	com_err.c error_message.c et_name.c init_et.c
diff --git a/lib/libcom_err/com_err.3 b/lib/libcom_err/com_err.3
index e6eeea13b852..7327a3daf20f 100644
--- a/lib/libcom_err/com_err.3
+++ b/lib/libcom_err/com_err.3
@@ -1,7 +1,7 @@
 .\" Copyright (c) 1988 Massachusetts Institute of Technology,
 .\" Student Information Processing Board.  All rights reserved.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcom_err/com_err.3,v 1.1.1.1.8.1 1999/08/29 14:56:19 peter Exp $
 .\"
 .TH COM_ERR 3 "22 Nov 1988" SIPB
 .SH NAME
diff --git a/lib/libcom_err/com_err.c b/lib/libcom_err/com_err.c
index 04000e369511..46a93e13a394 100644
--- a/lib/libcom_err/com_err.c
+++ b/lib/libcom_err/com_err.c
@@ -15,7 +15,7 @@
 
 #if ! lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libcom_err/com_err.c,v 1.4.2.1 1999/08/29 14:56:20 peter Exp $";
 #endif	/* ! lint */
 
 static void
diff --git a/lib/libcom_err/doc/Makefile b/lib/libcom_err/doc/Makefile
index 4c3c0bb0c744..22ed3514b1d8 100644
--- a/lib/libcom_err/doc/Makefile
+++ b/lib/libcom_err/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libcom_err/doc/Makefile,v 1.7.2.1 1999/08/29 14:56:22 peter Exp $
 
 INFO=	com_err
 INFOSECTION= "Programming & development tools."
diff --git a/lib/libcom_err/doc/com_err.texinfo b/lib/libcom_err/doc/com_err.texinfo
index 21b5b3652d13..3482949d5b80 100644
--- a/lib/libcom_err/doc/com_err.texinfo
+++ b/lib/libcom_err/doc/com_err.texinfo
@@ -1,6 +1,6 @@
 \input texinfo @c -*-texinfo-*-
 
-@c $FreeBSD$
+@c $FreeBSD: src/lib/libcom_err/doc/com_err.texinfo,v 1.2.2.1 1999/08/29 14:56:23 peter Exp $
 @c $Source: /home/ncvs/src/lib/libcom_err/doc/com_err.texinfo,v $
 
 @c Note that although this source file is in texinfo format (more
diff --git a/lib/libcom_err/error_message.c b/lib/libcom_err/error_message.c
index 1efe21c5b329..f59cea4536d7 100644
--- a/lib/libcom_err/error_message.c
+++ b/lib/libcom_err/error_message.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libcom_err/error_message.c,v 1.2.4.1 1999/08/29 14:56:20 peter Exp $
  * $Source: /home/ncvs/src/lib/libcom_err/error_message.c,v $
  * $Locker:  $
  *
@@ -16,7 +16,7 @@
 #include "internal.h"
 
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libcom_err/error_message.c,v 1.2.4.1 1999/08/29 14:56:20 peter Exp $";
 static const char copyright[] =
     "Copyright 1986, 1987, 1988 by the Student Information Processing Board\nand the department of Information Systems\nof the Massachusetts Institute of Technology";
 
diff --git a/lib/libcom_err/et_name.c b/lib/libcom_err/et_name.c
index cd711f027f5d..6a8e41cf2516 100644
--- a/lib/libcom_err/et_name.c
+++ b/lib/libcom_err/et_name.c
@@ -12,7 +12,7 @@
 static const char copyright[] =
     "Copyright 1987,1988 by Student Information Processing Board, Massachusetts Institute of Technology";
 static const char rcsid_et_name_c[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libcom_err/et_name.c,v 1.1.1.1.8.1 1999/08/29 14:56:21 peter Exp $";
 #endif
 
 static const char char_set[] =
diff --git a/lib/libcom_err/init_et.c b/lib/libcom_err/init_et.c
index 0d8ba1013f17..ab273be6d317 100644
--- a/lib/libcom_err/init_et.c
+++ b/lib/libcom_err/init_et.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libcom_err/init_et.c,v 1.2.2.1 1999/08/29 14:56:21 peter Exp $
  * $Source: /home/ncvs/src/lib/libcom_err/init_et.c,v $
  * $Locker:  $
  *
@@ -20,7 +20,7 @@
 
 #ifndef	lint
 static const char rcsid_init_et_c[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libcom_err/init_et.c,v 1.2.2.1 1999/08/29 14:56:21 peter Exp $";
 #endif
 
 struct foobar {
diff --git a/lib/libcompat/4.1/ascftime.c b/lib/libcompat/4.1/ascftime.c
index 088143c6e204..ef22133ff713 100644
--- a/lib/libcompat/4.1/ascftime.c
+++ b/lib/libcompat/4.1/ascftime.c
@@ -31,7 +31,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libcompat/4.1/ascftime.c,v 1.3.2.1 1999/08/29 14:56:24 peter Exp $
  */
 
 #include <time.h>
diff --git a/lib/libcompat/4.1/cftime.3 b/lib/libcompat/4.1/cftime.3
index 6b207973b302..0779ddfe0fe2 100644
--- a/lib/libcompat/4.1/cftime.3
+++ b/lib/libcompat/4.1/cftime.3
@@ -32,7 +32,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcompat/4.1/cftime.3,v 1.4.2.1 1999/08/29 14:56:25 peter Exp $
 .\"
 .Dd June 15, 1993
 .Os
diff --git a/lib/libcompat/4.1/cftime.c b/lib/libcompat/4.1/cftime.c
index 777055f6847f..3cdd292dfecf 100644
--- a/lib/libcompat/4.1/cftime.c
+++ b/lib/libcompat/4.1/cftime.c
@@ -31,7 +31,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libcompat/4.1/cftime.c,v 1.3.2.1 1999/08/29 14:56:25 peter Exp $
  */
 
 #include <time.h>
diff --git a/lib/libcompat/4.1/ftime.c b/lib/libcompat/4.1/ftime.c
index cc4a7f9ca071..8945187f598e 100644
--- a/lib/libcompat/4.1/ftime.c
+++ b/lib/libcompat/4.1/ftime.c
@@ -29,7 +29,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libcompat/4.1/ftime.c,v 1.4.2.1 1999/08/29 14:56:26 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/lib/libcompat/4.1/getpw.c b/lib/libcompat/4.1/getpw.c
index 96b4c1228645..1e72cfc83509 100644
--- a/lib/libcompat/4.1/getpw.c
+++ b/lib/libcompat/4.1/getpw.c
@@ -29,7 +29,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libcompat/4.1/getpw.c,v 1.4.2.1 1999/08/29 14:56:27 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libcompat/4.1/gtty.c b/lib/libcompat/4.1/gtty.c
index 524f1a64753d..dd82cdf29037 100644
--- a/lib/libcompat/4.1/gtty.c
+++ b/lib/libcompat/4.1/gtty.c
@@ -29,7 +29,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libcompat/4.1/gtty.c,v 1.4.2.1 1999/08/29 14:56:27 peter Exp $";
 #endif /* not lint */
 
 #include <sgtty.h>
diff --git a/lib/libcompat/4.1/stty.c b/lib/libcompat/4.1/stty.c
index cf0137f7ac19..b4e2bea31da9 100644
--- a/lib/libcompat/4.1/stty.c
+++ b/lib/libcompat/4.1/stty.c
@@ -29,7 +29,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libcompat/4.1/stty.c,v 1.4.2.1 1999/08/29 14:56:28 peter Exp $";
 #endif /* not lint */
 
 #include <sgtty.h>
diff --git a/lib/libcompat/4.3/cfree.3 b/lib/libcompat/4.3/cfree.3
index 7e3bdce0b041..f2f52d96731c 100644
--- a/lib/libcompat/4.3/cfree.3
+++ b/lib/libcompat/4.3/cfree.3
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcompat/4.3/cfree.3,v 1.3.2.1 1999/08/29 14:56:29 peter Exp $
 .\" " <- this is for hilit19 :)
 .Dd November 23, 1995
 .Dt CFREE 3
diff --git a/lib/libcompat/4.4/cuserid.3 b/lib/libcompat/4.4/cuserid.3
index 667656615863..4f4b1789b164 100644
--- a/lib/libcompat/4.4/cuserid.3
+++ b/lib/libcompat/4.4/cuserid.3
@@ -29,7 +29,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcompat/4.4/cuserid.3,v 1.5.2.1 1999/08/29 14:56:30 peter Exp $
 .\"
 .Dd April 10, 1995
 .Os
diff --git a/lib/libcompat/regexp/regexp.3 b/lib/libcompat/regexp/regexp.3
index 0d5c5a7d0b88..e16340c770f3 100644
--- a/lib/libcompat/regexp/regexp.3
+++ b/lib/libcompat/regexp/regexp.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)regexp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcompat/regexp/regexp.3,v 1.3.2.3 1999/08/29 14:56:31 peter Exp $
 .\"
 .Dd June 4, 1993
 .Dt REGEXP 3
diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile
index 3a85acb57749..1d0d15a865f2 100644
--- a/lib/libcrypt/Makefile
+++ b/lib/libcrypt/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libcrypt/Makefile,v 1.14.2.1 1999/08/29 14:56:33 peter Exp $
 #
 
 LCRYPTBASE= 	libcrypt
diff --git a/lib/libcrypt/crypt.c b/lib/libcrypt/crypt.c
index cf54cd5fc443..1993223982bc 100644
--- a/lib/libcrypt/crypt.c
+++ b/lib/libcrypt/crypt.c
@@ -6,12 +6,12 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libcrypt/crypt.c,v 1.7.2.1 1999/08/29 14:56:33 peter Exp $
  *
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libcrypt/crypt.c,v 1.7.2.1 1999/08/29 14:56:33 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <unistd.h>
diff --git a/lib/libcurses/Makefile b/lib/libcurses/Makefile
index 3839de65e35e..3fff71c27107 100644
--- a/lib/libcurses/Makefile
+++ b/lib/libcurses/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 1/2/94
-# $FreeBSD$
+# $FreeBSD: src/lib/libcurses/Makefile,v 1.10.2.1 1999/08/29 14:56:34 peter Exp $
 
 CFLAGS+=#-DTFILE=\"/dev/ttyp0\"
 CFLAGS+=-D_CURSES_PRIVATE -I${.CURDIR}
diff --git a/lib/libcurses/curses.h b/lib/libcurses/curses.h
index 2e78fd9a1a7c..5929c4d9f462 100644
--- a/lib/libcurses/curses.h
+++ b/lib/libcurses/curses.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)curses.h	8.3 (Berkeley) 7/27/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libcurses/curses.h,v 1.15.2.1 1999/08/29 14:56:35 peter Exp $
  */
 
 #ifndef _CURSES_H_
diff --git a/lib/libdevstat/devstat.3 b/lib/libdevstat/devstat.3
index 2dc727aea66a..9a4e574781be 100644
--- a/lib/libdevstat/devstat.3
+++ b/lib/libdevstat/devstat.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libdevstat/devstat.3,v 1.3.2.3 1999/09/23 06:39:55 ken Exp $
 .\"
 .Dd May 21, 1998
 .Dt DEVSTAT 3
diff --git a/lib/libdevstat/devstat.c b/lib/libdevstat/devstat.c
index eb4b41600849..b6ded2af9f25 100644
--- a/lib/libdevstat/devstat.c
+++ b/lib/libdevstat/devstat.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libdevstat/devstat.c,v 1.4.2.1 1999/08/29 14:56:37 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libdevstat/devstat.h b/lib/libdevstat/devstat.h
index fd0941c2076c..a4790ebba81a 100644
--- a/lib/libdevstat/devstat.h
+++ b/lib/libdevstat/devstat.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libdevstat/devstat.h,v 1.2.2.1 1999/08/29 14:56:38 peter Exp $
  */
 
 #ifndef _DEVSTAT_H
diff --git a/lib/libdisk/Makefile b/lib/libdisk/Makefile
index 355018a0db26..fce2a37ca1ec 100644
--- a/lib/libdisk/Makefile
+++ b/lib/libdisk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libdisk/Makefile,v 1.25.2.1 1999/08/29 14:56:39 peter Exp $
 
 LIB=	disk
 SRCS=	blocks.c disklabel.c dkcksum.c chunk.c disk.c change.c \
diff --git a/lib/libdisk/blocks.c b/lib/libdisk/blocks.c
index 10f5b31c74a1..efd21dc7e632 100644
--- a/lib/libdisk/blocks.c
+++ b/lib/libdisk/blocks.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libdisk/blocks.c,v 1.6.2.1 1999/08/29 14:56:39 peter Exp $
  *
  */
 
diff --git a/lib/libdisk/change.c b/lib/libdisk/change.c
index 6a506f806e15..048d77240113 100644
--- a/lib/libdisk/change.c
+++ b/lib/libdisk/change.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libdisk/change.c,v 1.13.2.1 1999/08/29 14:56:40 peter Exp $
  *
  */
 
diff --git a/lib/libdisk/chunk.c b/lib/libdisk/chunk.c
index 85463fa4610d..c4627f7866f3 100644
--- a/lib/libdisk/chunk.c
+++ b/lib/libdisk/chunk.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libdisk/chunk.c,v 1.19.2.1 1999/08/29 14:56:41 peter Exp $
  *
  */
 
diff --git a/lib/libdisk/create_chunk.c b/lib/libdisk/create_chunk.c
index 0c3c95a4d375..90fa1134ddc3 100644
--- a/lib/libdisk/create_chunk.c
+++ b/lib/libdisk/create_chunk.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libdisk/create_chunk.c,v 1.34.2.4 1999/08/29 14:56:41 peter Exp $
  *
  */
 
diff --git a/lib/libdisk/disk.c b/lib/libdisk/disk.c
index e2b46f51791a..742d8d7cc481 100644
--- a/lib/libdisk/disk.c
+++ b/lib/libdisk/disk.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libdisk/disk.c,v 1.39.2.5 1999/08/29 14:56:42 peter Exp $
  *
  */
 
diff --git a/lib/libdisk/disklabel.c b/lib/libdisk/disklabel.c
index 2ee6503225a8..113e748cee7c 100644
--- a/lib/libdisk/disklabel.c
+++ b/lib/libdisk/disklabel.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libdisk/disklabel.c,v 1.4.2.1 1999/08/29 14:56:43 peter Exp $
  *
  */
 
diff --git a/lib/libdisk/libdisk.3 b/lib/libdisk/libdisk.3
index abf3cac08ed2..91f237b212bf 100644
--- a/lib/libdisk/libdisk.3
+++ b/lib/libdisk/libdisk.3
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libdisk/libdisk.3,v 1.8.2.2 1999/10/28 15:44:55 phantom Exp $
 .\" "
 .Dd March 15, 1996
 .Dt LIBDISK 3
diff --git a/lib/libdisk/libdisk.h b/lib/libdisk/libdisk.h
index f7310bf41dd3..f6061b426048 100644
--- a/lib/libdisk/libdisk.h
+++ b/lib/libdisk/libdisk.h
@@ -6,7 +6,7 @@
 * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 * ----------------------------------------------------------------------------
 *
-* $FreeBSD$
+* $FreeBSD: src/lib/libdisk/libdisk.h,v 1.30.2.1 1999/08/29 14:56:44 peter Exp $
 *
 */
 
diff --git a/lib/libdisk/rules.c b/lib/libdisk/rules.c
index 9e1ca6ee51dc..489a10d5c04b 100644
--- a/lib/libdisk/rules.c
+++ b/lib/libdisk/rules.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libdisk/rules.c,v 1.13.2.1 1999/08/29 14:56:44 peter Exp $
  *
  */
 
diff --git a/lib/libdisk/tst01.c b/lib/libdisk/tst01.c
index e8c34d9ab6cf..e9607ff4facb 100644
--- a/lib/libdisk/tst01.c
+++ b/lib/libdisk/tst01.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libdisk/tst01.c,v 1.21.2.2 1999/08/29 14:56:44 peter Exp $
  *
  */
 
diff --git a/lib/libdisk/write_disk.c b/lib/libdisk/write_disk.c
index 60ddbdafc079..69e5cba410b9 100644
--- a/lib/libdisk/write_disk.c
+++ b/lib/libdisk/write_disk.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libdisk/write_disk.c,v 1.25.2.3 1999/08/29 14:56:45 peter Exp $
  *
  */
 
diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile
index 12b0b3a72fdf..03d4748566d7 100644
--- a/lib/libfetch/Makefile
+++ b/lib/libfetch/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libfetch/Makefile,v 1.11.2.1 1999/08/29 14:56:47 peter Exp $
 
 LIB=		fetch
 CFLAGS+=	-I. -Wall -pedantic
diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c
index 8b3b891f39f6..e01e38490a46 100644
--- a/lib/libfetch/common.c
+++ b/lib/libfetch/common.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libfetch/common.c,v 1.5.2.1 1999/08/29 14:56:47 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/lib/libfetch/common.h b/lib/libfetch/common.h
index aa2059c21d67..d52799b4fa3c 100644
--- a/lib/libfetch/common.h
+++ b/lib/libfetch/common.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libfetch/common.h,v 1.5.2.1 1999/08/29 14:56:48 peter Exp $
  */
 
 #ifndef _COMMON_H_INCLUDED
diff --git a/lib/libfetch/fetch.3 b/lib/libfetch/fetch.3
index 218c43d7fda8..bfac4693c0a5 100644
--- a/lib/libfetch/fetch.3
+++ b/lib/libfetch/fetch.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libfetch/fetch.3,v 1.7.2.1 1999/08/29 14:56:49 peter Exp $
 .\"
 .Dd July 1, 1998
 .Dt FETCH 3
diff --git a/lib/libfetch/fetch.c b/lib/libfetch/fetch.c
index bf4476f7f50d..e8a782932e46 100644
--- a/lib/libfetch/fetch.c
+++ b/lib/libfetch/fetch.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libfetch/fetch.c,v 1.8.2.1 1999/08/29 14:56:49 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/lib/libfetch/fetch.h b/lib/libfetch/fetch.h
index df3450949b04..ee34f46dedf8 100644
--- a/lib/libfetch/fetch.h
+++ b/lib/libfetch/fetch.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libfetch/fetch.h,v 1.8.2.1 1999/08/29 14:56:50 peter Exp $
  */
 
 #ifndef _FETCH_H_INCLUDED
diff --git a/lib/libfetch/fetch_err.et b/lib/libfetch/fetch_err.et
index 2593ebaf2212..62caa0f5616f 100644
--- a/lib/libfetch/fetch_err.et
+++ b/lib/libfetch/fetch_err.et
@@ -25,7 +25,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libfetch/fetch_err.et,v 1.2.2.1 1999/08/29 14:56:51 peter Exp $
 #
 et ftch
     ec FETCH_ABORT,	"Operation aborted"
diff --git a/lib/libfetch/file.c b/lib/libfetch/file.c
index 5b594c49e0a1..2c5efaaa95cb 100644
--- a/lib/libfetch/file.c
+++ b/lib/libfetch/file.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libfetch/file.c,v 1.4.2.1 1999/08/29 14:56:51 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/lib/libfetch/ftp.c b/lib/libfetch/ftp.c
index a3279e153d44..a3319a6a0ce8 100644
--- a/lib/libfetch/ftp.c
+++ b/lib/libfetch/ftp.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libfetch/ftp.c,v 1.12.2.1 1999/08/29 14:56:52 peter Exp $
  */
 
 /*
diff --git a/lib/libfetch/ftp.errors b/lib/libfetch/ftp.errors
index b9034c5f7baf..90cef54ead12 100644
--- a/lib/libfetch/ftp.errors
+++ b/lib/libfetch/ftp.errors
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libfetch/ftp.errors,v 1.2.2.1 1999/08/29 14:56:52 peter Exp $
 #
 # This list is taken from RFC 959.
 # It probably needs a going over.
diff --git a/lib/libfetch/http.c b/lib/libfetch/http.c
index 716d6c2a139f..830ac66864e7 100644
--- a/lib/libfetch/http.c
+++ b/lib/libfetch/http.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libfetch/http.c,v 1.11.2.1 1999/08/29 14:56:53 peter Exp $
  */
 
 /*
diff --git a/lib/libfetch/http.errors b/lib/libfetch/http.errors
index 37e106cd635c..388acce570ee 100644
--- a/lib/libfetch/http.errors
+++ b/lib/libfetch/http.errors
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libfetch/http.errors,v 1.2.2.1 1999/08/29 14:56:53 peter Exp $
 #
 # This list is taken from RFC 2068.
 #
diff --git a/lib/libftpio/ftp.errors b/lib/libftpio/ftp.errors
index 7ae444515e78..822616e855b5 100644
--- a/lib/libftpio/ftp.errors
+++ b/lib/libftpio/ftp.errors
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libftpio/ftp.errors,v 1.3.2.1 1999/08/29 14:56:56 peter Exp $
 #
 # This list is taken from RFC 959.
 # It probably needs a going over.
diff --git a/lib/libftpio/ftpio.3 b/lib/libftpio/ftpio.3
index 60948cec775f..302e837e61d8 100644
--- a/lib/libftpio/ftpio.3
+++ b/lib/libftpio/ftpio.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libftpio/ftpio.3,v 1.17.2.3 1999/09/20 09:49:51 phantom Exp $
 .\"
 .Dd June 17, 1996
 .Dt FTPIO 3
diff --git a/lib/libftpio/ftpio.c b/lib/libftpio/ftpio.c
index 45f7012a98b2..b4250f535ce1 100644
--- a/lib/libftpio/ftpio.c
+++ b/lib/libftpio/ftpio.c
@@ -14,7 +14,7 @@
  * Turned inside out. Now returns xfers as new file ids, not as a special
  * `state' of FTP_t
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libftpio/ftpio.c,v 1.30.2.3 1999/08/29 14:56:57 peter Exp $
  *
  */
 
diff --git a/lib/libftpio/ftpio.h b/lib/libftpio/ftpio.h
index 26d4f90cd422..9301b352cf5a 100644
--- a/lib/libftpio/ftpio.h
+++ b/lib/libftpio/ftpio.h
@@ -22,7 +22,7 @@
  * Turned inside out. Now returns xfers as new file ids, not as a special
  * `state' of FTP_t
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libftpio/ftpio.h,v 1.14.2.1 1999/08/29 14:56:57 peter Exp $
  */
 
 /* Internal housekeeping data structure for FTP sessions */
diff --git a/lib/libgnumalloc/Makefile b/lib/libgnumalloc/Makefile
index cddf5bad684a..4b641d68b664 100644
--- a/lib/libgnumalloc/Makefile
+++ b/lib/libgnumalloc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libgnumalloc/Makefile,v 1.13.2.1 1999/08/29 14:56:59 peter Exp $
 
 LIB=		gnumalloc
 INTERNALLIB=	yes		# Do not build or install ${LIB}*.a
diff --git a/lib/libio/Makefile b/lib/libio/Makefile
index 71e1c9e09cc6..d4dfa9b00146 100644
--- a/lib/libio/Makefile
+++ b/lib/libio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libio/Makefile,v 1.1.2.1 1999/08/29 14:57:00 peter Exp $
 
 LIB=		io
 SHLIB_MAJOR=	1
diff --git a/lib/libio/alpha_sethae.c b/lib/libio/alpha_sethae.c
index 337cafa79121..ab6a917639c2 100644
--- a/lib/libio/alpha_sethae.c
+++ b/lib/libio/alpha_sethae.c
@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libio/alpha_sethae.c,v 1.1.2.1 1999/08/29 14:57:00 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/lib/libio/alpha_sethae.c,v 1.1.2.1 1999/08/29 14:57:00 peter Exp $";
 #endif /* LIBC_RCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libio/bwx.c b/lib/libio/bwx.c
index 9ed51ffd795c..964f70c0bff5 100644
--- a/lib/libio/bwx.c
+++ b/lib/libio/bwx.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libio/bwx.c,v 1.1.2.1 1999/08/29 14:57:01 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/lib/libio/io.c b/lib/libio/io.c
index 7abfa36f6ff2..071d811ad7f2 100644
--- a/lib/libio/io.c
+++ b/lib/libio/io.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libio/io.c,v 1.1.2.1 1999/08/29 14:57:01 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libio/io.h b/lib/libio/io.h
index 1f4c62034ef3..c56444ee5100 100644
--- a/lib/libio/io.h
+++ b/lib/libio/io.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libio/io.h,v 1.1.2.1 1999/08/29 14:57:02 peter Exp $
  */
 
 struct io_ops {
diff --git a/lib/libio/swiz.c b/lib/libio/swiz.c
index e4c2772c7f45..15be9b9d29ef 100644
--- a/lib/libio/swiz.c
+++ b/lib/libio/swiz.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libio/swiz.c,v 1.1.2.1 1999/08/29 14:57:03 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/lib/libkvm/kvm_alpha.c b/lib/libkvm/kvm_alpha.c
index 4ed5f7acac05..741a8de88317 100644
--- a/lib/libkvm/kvm_alpha.c
+++ b/lib/libkvm/kvm_alpha.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libkvm/kvm_alpha.c,v 1.1.2.1 1999/08/29 14:57:04 peter Exp $ */
 /*	$NetBSD: kvm_alpha.c,v 1.7.2.1 1997/11/02 20:34:26 mellon Exp $	*/
 
 /*
diff --git a/lib/libkvm/kvm_getprocs.3 b/lib/libkvm/kvm_getprocs.3
index bd6bb74e9bb9..780b6412d014 100644
--- a/lib/libkvm/kvm_getprocs.3
+++ b/lib/libkvm/kvm_getprocs.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm_getprocs.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libkvm/kvm_getprocs.3,v 1.5.2.1 1999/08/29 14:57:05 peter Exp $
 .\"
 .Dd June 4, 1993
 .Dt KVM_GETPROCS 3
diff --git a/lib/libm/Makefile b/lib/libm/Makefile
index d00d6d7f96a0..11379e5ddc3d 100644
--- a/lib/libm/Makefile
+++ b/lib/libm/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libm/Makefile,v 1.6.2.1 1999/08/29 14:57:06 peter Exp $
 #
 # ieee		- for most IEEE machines, we hope.
 # mc68881	- the, ahem, mc68881.
diff --git a/lib/libm/common_source/atan2.3 b/lib/libm/common_source/atan2.3
index 027ab8bcac67..d6586b5f1876 100644
--- a/lib/libm/common_source/atan2.3
+++ b/lib/libm/common_source/atan2.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)atan2.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libm/common_source/atan2.3,v 1.4.2.1 1999/08/29 14:57:07 peter Exp $
 .\"
 .Dd June 4, 1993
 .Dt ATAN2 3
diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile
index cc68a2f0bc3f..d31a957e42ba 100644
--- a/lib/libmd/Makefile
+++ b/lib/libmd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libmd/Makefile,v 1.28.2.1 1999/08/29 14:57:08 peter Exp $
 
 LIB=	md
 SRCS=	md2c.c md4c.c md5c.c md2hl.c md4hl.c md5hl.c
diff --git a/lib/libmd/md2.copyright b/lib/libmd/md2.copyright
index acef7bab5be6..1fa9b68053db 100644
--- a/lib/libmd/md2.copyright
+++ b/lib/libmd/md2.copyright
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libmd/md2.copyright,v 1.4.2.1 1999/08/29 14:57:09 peter Exp $
 Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
 rights reserved.
 .Pp
diff --git a/lib/libmd/md2.h b/lib/libmd/md2.h
index 8215038cc577..6f067de8a1c0 100644
--- a/lib/libmd/md2.h
+++ b/lib/libmd/md2.h
@@ -1,5 +1,5 @@
 /* MD2.H - header file for MD2C.C
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmd/md2.h,v 1.7.2.1 1999/08/29 14:57:09 peter Exp $
  */
 
 /* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
diff --git a/lib/libmd/md2c.c b/lib/libmd/md2c.c
index 97edfbe5a437..d7bbce45934d 100644
--- a/lib/libmd/md2c.c
+++ b/lib/libmd/md2c.c
@@ -1,5 +1,5 @@
 /* MD2C.C - RSA Data Security, Inc., MD2 message-digest algorithm
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmd/md2c.c,v 1.6.2.1 1999/08/29 14:57:10 peter Exp $
  */
 
 /* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
diff --git a/lib/libmd/md4.copyright b/lib/libmd/md4.copyright
index e4502073a1ce..247c2d589ecc 100644
--- a/lib/libmd/md4.copyright
+++ b/lib/libmd/md4.copyright
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libmd/md4.copyright,v 1.4.2.1 1999/08/29 14:57:10 peter Exp $
 Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
 rights reserved.
 .Pp
diff --git a/lib/libmd/md4.h b/lib/libmd/md4.h
index 5a648c87f63a..46546399f6e1 100644
--- a/lib/libmd/md4.h
+++ b/lib/libmd/md4.h
@@ -1,5 +1,5 @@
 /* MD4.H - header file for MD4C.C
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmd/md4.h,v 1.8.2.1 1999/08/29 14:57:11 peter Exp $
  */
 
 /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
diff --git a/lib/libmd/md4c.c b/lib/libmd/md4c.c
index a51c73965921..31070dfa1a34 100644
--- a/lib/libmd/md4c.c
+++ b/lib/libmd/md4c.c
@@ -1,5 +1,5 @@
 /* MD4C.C - RSA Data Security, Inc., MD4 message-digest algorithm
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmd/md4c.c,v 1.6.2.1 1999/08/29 14:57:11 peter Exp $
  */
 
 /* Copyright (C) 1990-2, RSA Data Security, Inc. All rights reserved.
diff --git a/lib/libmd/md5.copyright b/lib/libmd/md5.copyright
index b718bf8b5ebe..676c04144e2f 100644
--- a/lib/libmd/md5.copyright
+++ b/lib/libmd/md5.copyright
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libmd/md5.copyright,v 1.4.2.1 1999/08/29 14:57:12 peter Exp $
 Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
 rights reserved.
 .Pp
diff --git a/lib/libmd/md5c.c b/lib/libmd/md5c.c
index 8e25a6a5e8ea..b0451b9146db 100644
--- a/lib/libmd/md5c.c
+++ b/lib/libmd/md5c.c
@@ -22,7 +22,7 @@
  * These notices must be retained in any copies of any part of this
  * documentation and/or software.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmd/md5c.c,v 1.9.2.1 1999/08/29 14:57:12 peter Exp $
  *
  * This code is the same as the code published by RSA Inc.  It has been
  * edited for clarity and style only.
diff --git a/lib/libmd/mdX.3 b/lib/libmd/mdX.3
index 0f1091817d25..f0d87b2502cf 100644
--- a/lib/libmd/mdX.3
+++ b/lib/libmd/mdX.3
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libmd/mdX.3,v 1.13.2.1 1999/08/29 14:57:13 peter Exp $
 .\"
 .Dd October 9, 1996
 .Dt MDX 3
diff --git a/lib/libmd/mdXhl.c b/lib/libmd/mdXhl.c
index b441140df6e9..7262cec7ff29 100644
--- a/lib/libmd/mdXhl.c
+++ b/lib/libmd/mdXhl.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmd/mdXhl.c,v 1.11.2.1 1999/08/29 14:57:14 peter Exp $
  *
  */
 
diff --git a/lib/libmd/mddriver.c b/lib/libmd/mddriver.c
index 0d76ccba18af..3b07027a21d2 100644
--- a/lib/libmd/mddriver.c
+++ b/lib/libmd/mddriver.c
@@ -1,5 +1,5 @@
 /* MDDRIVER.C - test driver for MD2, MD4 and MD5
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmd/mddriver.c,v 1.4.2.1 1999/08/29 14:57:15 peter Exp $
  */
 
 /* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
diff --git a/lib/libmytinfo/Makefile b/lib/libmytinfo/Makefile
index 89eff2bbe3e1..930fac012c93 100644
--- a/lib/libmytinfo/Makefile
+++ b/lib/libmytinfo/Makefile
@@ -1,7 +1,7 @@
 # Makefile for libmytinfo
 # Use 'make update_term_h' manually after changing internal
 # mytinfo structures
-# $FreeBSD$
+# $FreeBSD: src/lib/libmytinfo/Makefile,v 1.16.2.1 1999/08/29 14:57:16 peter Exp $
 
 LIB=    mytinfo
 SRCS=   addstr.c binorder.c buildpath.c caplist.c capsort.c compar.c\
diff --git a/lib/libmytinfo/TESTS/Makefile b/lib/libmytinfo/TESTS/Makefile
index d9b79372988a..ec47f23f4488 100644
--- a/lib/libmytinfo/TESTS/Makefile
+++ b/lib/libmytinfo/TESTS/Makefile
@@ -1,5 +1,5 @@
 # Makefile for libmytinfo tests
-# $FreeBSD$
+# $FreeBSD: src/lib/libmytinfo/TESTS/Makefile,v 1.3.2.1 1999/08/29 14:57:17 peter Exp $
 
 LIB=    mytinfo
 
diff --git a/lib/libmytinfo/tparm.c b/lib/libmytinfo/tparm.c
index b15dc5789dab..93a210e1d1d4 100644
--- a/lib/libmytinfo/tparm.c
+++ b/lib/libmytinfo/tparm.c
@@ -5,7 +5,7 @@
  * Public Domain
  * 92/02/01 07:30:36
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmytinfo/tparm.c,v 1.3.8.1 1999/10/21 09:40:02 tg Exp $
  */
 
 #include "defs.h"
diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile
index 30886f5866fa..1371662e4036 100644
--- a/lib/libncurses/Makefile
+++ b/lib/libncurses/Makefile
@@ -1,5 +1,5 @@
 # Makefile for ncurses
-# $FreeBSD$
+# $FreeBSD: src/lib/libncurses/Makefile,v 1.25.2.1 1999/08/29 14:57:18 peter Exp $
 
 LIB=    ncurses
 SHLIB_MAJOR= 3
diff --git a/lib/libncurses/TESTS/newdemo.c b/lib/libncurses/TESTS/newdemo.c
index 6c98c762327a..128e3183ad18 100644
--- a/lib/libncurses/TESTS/newdemo.c
+++ b/lib/libncurses/TESTS/newdemo.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/lib/libncurses/TESTS/newdemo.c,v 1.2.8.1 1999/08/29 14:57:21 peter Exp $
  *
  *  newdemo.c	-	A demo program using PDCurses. The program illustrate
  *  	 		the use of colours for text output.
diff --git a/lib/libncurses/curs_addch.3 b/lib/libncurses/curs_addch.3
index f0e72a141c5b..1ecd0cc1a4a3 100644
--- a/lib/libncurses/curs_addch.3
+++ b/lib/libncurses/curs_addch.3
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libncurses/curs_addch.3,v 1.6.2.1 1999/08/29 14:57:19 peter Exp $
 .\"
 .TH curs_addch 3 ""
 .SH NAME
diff --git a/lib/libncurses/curs_insstr.3 b/lib/libncurses/curs_insstr.3
index 37faf3c28098..61b23078301b 100644
--- a/lib/libncurses/curs_insstr.3
+++ b/lib/libncurses/curs_insstr.3
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libncurses/curs_insstr.3,v 1.6.2.1 1999/08/29 14:57:20 peter Exp $
 .\"
 .TH curs_insstr 3 ""
 .SH NAME
diff --git a/lib/libnetgraph/Makefile b/lib/libnetgraph/Makefile
index 342b2e57ce32..efadd175dadb 100644
--- a/lib/libnetgraph/Makefile
+++ b/lib/libnetgraph/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libnetgraph/Makefile,v 1.1.2.2 1999/12/01 19:41:39 julian Exp $
 # $Whistle: Makefile,v 1.4 1999/01/17 03:41:02 julian Exp $
 
 LIB=		netgraph
diff --git a/lib/libnetgraph/debug.c b/lib/libnetgraph/debug.c
index b5bb56acbb10..777aeeca1a42 100644
--- a/lib/libnetgraph/debug.c
+++ b/lib/libnetgraph/debug.c
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libnetgraph/debug.c,v 1.1.2.4 1999/12/06 22:06:48 archie Exp $
  * $Whistle: debug.c,v 1.24 1999/01/24 01:15:33 archie Exp $
  */
 
diff --git a/lib/libnetgraph/internal.h b/lib/libnetgraph/internal.h
index d521cfa5039d..11557598dcd7 100644
--- a/lib/libnetgraph/internal.h
+++ b/lib/libnetgraph/internal.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libnetgraph/internal.h,v 1.1.2.2 1999/12/01 19:41:39 julian Exp $
  * $Whistle: internal.h,v 1.5 1999/01/20 00:57:22 archie Exp $
  */
 
diff --git a/lib/libnetgraph/msg.c b/lib/libnetgraph/msg.c
index ece1787f2b7e..6153fce3308b 100644
--- a/lib/libnetgraph/msg.c
+++ b/lib/libnetgraph/msg.c
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libnetgraph/msg.c,v 1.1.2.2 1999/12/01 19:41:39 julian Exp $
  * $Whistle: msg.c,v 1.9 1999/01/20 00:57:23 archie Exp $
  */
 
diff --git a/lib/libnetgraph/netgraph.3 b/lib/libnetgraph/netgraph.3
index 6926f96ad2c3..2e5dba6955ed 100644
--- a/lib/libnetgraph/netgraph.3
+++ b/lib/libnetgraph/netgraph.3
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@whistle.com>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libnetgraph/netgraph.3,v 1.1.2.2 1999/12/01 19:41:39 julian Exp $
 .\" $Whistle: netgraph.3,v 1.7 1999/01/25 07:14:06 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/lib/libnetgraph/netgraph.h b/lib/libnetgraph/netgraph.h
index c5a87cb4bc93..3cfd1951b395 100644
--- a/lib/libnetgraph/netgraph.h
+++ b/lib/libnetgraph/netgraph.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libnetgraph/netgraph.h,v 1.1.2.2 1999/12/01 19:41:39 julian Exp $
  * $Whistle: netgraph.h,v 1.7 1999/01/20 00:57:23 archie Exp $
  */
 
diff --git a/lib/libnetgraph/sock.c b/lib/libnetgraph/sock.c
index b8bb9e65a364..a6d89e516076 100644
--- a/lib/libnetgraph/sock.c
+++ b/lib/libnetgraph/sock.c
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libnetgraph/sock.c,v 1.1.2.1 1999/11/18 01:13:56 julian Exp $
  * $Whistle: sock.c,v 1.12 1999/01/20 00:57:23 archie Exp $
  */
 
diff --git a/lib/libopie/Makefile b/lib/libopie/Makefile
index 22b01eb8b72a..ec61f31970fe 100644
--- a/lib/libopie/Makefile
+++ b/lib/libopie/Makefile
@@ -1,6 +1,6 @@
 # Makefile for libopie
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libopie/Makefile,v 1.8.2.1 1999/08/29 14:57:22 peter Exp $
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 DIST_DIR=	${OPIE_DIST}/${.CURDIR:T}
diff --git a/lib/libpam/Makefile b/lib/libpam/Makefile
index 8e99888bd7bf..08380c79c99b 100644
--- a/lib/libpam/Makefile
+++ b/lib/libpam/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+#	$FreeBSD: src/lib/libpam/Makefile,v 1.2 1999/01/20 21:55:21 jdp Exp $
 
 # The modules must be built first, because they are built into the
 # static version of libpam.
diff --git a/lib/libpam/Makefile.inc b/lib/libpam/Makefile.inc
index 2558a61faa10..8eaad3b978db 100644
--- a/lib/libpam/Makefile.inc
+++ b/lib/libpam/Makefile.inc
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+#	$FreeBSD: src/lib/libpam/Makefile.inc,v 1.1.1.1 1998/11/18 01:44:37 jdp Exp $
 
 SHLIB_MAJOR=	1
 SHLIB_MINOR=	0
diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile
index ddcc688c815e..65bd099d7732 100644
--- a/lib/libpam/libpam/Makefile
+++ b/lib/libpam/libpam/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+#	$FreeBSD: src/lib/libpam/libpam/Makefile,v 1.4.2.2 1999/05/08 21:31:43 jdp Exp $
 
 PAMDIR=		${.CURDIR}/../../../contrib/libpam
 MODOBJDIR=	../modules
diff --git a/lib/libpam/libpam/pam_get_pass.c b/lib/libpam/libpam/pam_get_pass.c
index 78ef75abdb8f..642de4910c7f 100644
--- a/lib/libpam/libpam/pam_get_pass.c
+++ b/lib/libpam/libpam/pam_get_pass.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libpam/libpam/pam_get_pass.c,v 1.1.1.1 1998/11/18 01:44:37 jdp Exp $
  */
 
 #include <security/pam_modules.h>
diff --git a/lib/libpam/libpam/pam_mod_misc.h b/lib/libpam/libpam/pam_mod_misc.h
index 06f474d293a2..69ac1077d33d 100644
--- a/lib/libpam/libpam/pam_mod_misc.h
+++ b/lib/libpam/libpam/pam_mod_misc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libpam/libpam/pam_mod_misc.h,v 1.1.1.1 1998/11/18 01:44:37 jdp Exp $
  */
 
 #ifndef PAM_MOD_MISC_H
diff --git a/lib/libpam/libpam/pam_prompt.c b/lib/libpam/libpam/pam_prompt.c
index 220616ee2aaa..255837cbeea5 100644
--- a/lib/libpam/libpam/pam_prompt.c
+++ b/lib/libpam/libpam/pam_prompt.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libpam/libpam/pam_prompt.c,v 1.1.1.1 1998/11/18 01:44:37 jdp Exp $
  */
 
 #include <security/pam_modules.h>
diff --git a/lib/libpam/libpam/pam_std_option.c b/lib/libpam/libpam/pam_std_option.c
index 0c00908b37f2..0c0809ac8300 100644
--- a/lib/libpam/libpam/pam_std_option.c
+++ b/lib/libpam/libpam/pam_std_option.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libpam/libpam/pam_std_option.c,v 1.1.1.1 1998/11/18 01:44:37 jdp Exp $
  */
 
 #include <security/pam_modules.h>
diff --git a/lib/libpam/modules/Makefile b/lib/libpam/modules/Makefile
index 74136ba4604e..8683e632629e 100644
--- a/lib/libpam/modules/Makefile
+++ b/lib/libpam/modules/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+#	$FreeBSD: src/lib/libpam/modules/Makefile,v 1.1.1.1.2.1 1999/05/08 21:31:48 jdp Exp $
 
 SUBDIR+=	pam_cleartext_pass_ok
 SUBDIR+=	pam_deny
diff --git a/lib/libpam/modules/pam_cleartext_pass_ok/Makefile b/lib/libpam/modules/pam_cleartext_pass_ok/Makefile
index 2336ea3e4615..fd3aaabbeae0 100644
--- a/lib/libpam/modules/pam_cleartext_pass_ok/Makefile
+++ b/lib/libpam/modules/pam_cleartext_pass_ok/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+#	$FreeBSD: src/lib/libpam/modules/pam_cleartext_pass_ok/Makefile,v 1.2 1999/01/20 21:55:24 jdp Exp $
 
 PAMDIR=		${.CURDIR}/../../../../contrib/libpam
 
diff --git a/lib/libpam/modules/pam_cleartext_pass_ok/pam_cleartext_pass_ok.c b/lib/libpam/modules/pam_cleartext_pass_ok/pam_cleartext_pass_ok.c
index 437225c30450..f545a6a3107c 100644
--- a/lib/libpam/modules/pam_cleartext_pass_ok/pam_cleartext_pass_ok.c
+++ b/lib/libpam/modules/pam_cleartext_pass_ok/pam_cleartext_pass_ok.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libpam/modules/pam_cleartext_pass_ok/pam_cleartext_pass_ok.c,v 1.2 1999/01/20 21:55:24 jdp Exp $
  */
 
 #include <stdio.h>
diff --git a/lib/libpam/modules/pam_deny/Makefile b/lib/libpam/modules/pam_deny/Makefile
index 17b1447ece66..f26248303226 100644
--- a/lib/libpam/modules/pam_deny/Makefile
+++ b/lib/libpam/modules/pam_deny/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+#	$FreeBSD: src/lib/libpam/modules/pam_deny/Makefile,v 1.1.2.1 1999/05/08 21:31:53 jdp Exp $
 
 PAMDIR=		${.CURDIR}/../../../../contrib/libpam
 
diff --git a/lib/libpam/modules/pam_kerberosIV/Makefile b/lib/libpam/modules/pam_kerberosIV/Makefile
index 8ab1e6e349b4..e4540442a2b5 100644
--- a/lib/libpam/modules/pam_kerberosIV/Makefile
+++ b/lib/libpam/modules/pam_kerberosIV/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+#	$FreeBSD: src/lib/libpam/modules/pam_kerberosIV/Makefile,v 1.2 1999/01/20 21:55:25 jdp Exp $
 
 PAMDIR=		${.CURDIR}/../../../../contrib/libpam
 
diff --git a/lib/libpam/modules/pam_kerberosIV/pam_kerberosIV.c b/lib/libpam/modules/pam_kerberosIV/pam_kerberosIV.c
index 403f8d612687..e168fe129427 100644
--- a/lib/libpam/modules/pam_kerberosIV/pam_kerberosIV.c
+++ b/lib/libpam/modules/pam_kerberosIV/pam_kerberosIV.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libpam/modules/pam_kerberosIV/pam_kerberosIV.c,v 1.3.2.1 1999/01/21 22:04:26 jdp Exp $
  */
 
 #include <sys/param.h>
diff --git a/lib/libpam/modules/pam_permit/Makefile b/lib/libpam/modules/pam_permit/Makefile
index 8863ff524467..0793c50bf7d1 100644
--- a/lib/libpam/modules/pam_permit/Makefile
+++ b/lib/libpam/modules/pam_permit/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+#	$FreeBSD: src/lib/libpam/modules/pam_permit/Makefile,v 1.1.2.1 1999/05/08 21:31:57 jdp Exp $
 
 PAMDIR=		${.CURDIR}/../../../../contrib/libpam
 
diff --git a/lib/libpam/modules/pam_radius/Makefile b/lib/libpam/modules/pam_radius/Makefile
index 48bd39a6d194..aeb5d4b7cdf8 100644
--- a/lib/libpam/modules/pam_radius/Makefile
+++ b/lib/libpam/modules/pam_radius/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+#	$FreeBSD: src/lib/libpam/modules/pam_radius/Makefile,v 1.2.2.2 1999/08/20 18:30:34 abial Exp $
 
 PAMDIR=		${.CURDIR}/../../../../contrib/libpam
 
diff --git a/lib/libpam/modules/pam_radius/pam_radius.8 b/lib/libpam/modules/pam_radius/pam_radius.8
index ffaa0748b277..38e64caae335 100644
--- a/lib/libpam/modules/pam_radius/pam_radius.8
+++ b/lib/libpam/modules/pam_radius/pam_radius.8
@@ -36,7 +36,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.8,v 1.1.2.2 1999/08/29 14:57:23 peter Exp $
 .\"
 .Dd August 2, 1999
 .Dt pam_radius 8
diff --git a/lib/libpam/modules/pam_radius/pam_radius.c b/lib/libpam/modules/pam_radius/pam_radius.c
index c04d8f288315..1bb140ed7549 100644
--- a/lib/libpam/modules/pam_radius/pam_radius.c
+++ b/lib/libpam/modules/pam_radius/pam_radius.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.c,v 1.2 1999/01/20 21:55:26 jdp Exp $
  */
 
 #include <sys/param.h>
diff --git a/lib/libpam/modules/pam_skey/Makefile b/lib/libpam/modules/pam_skey/Makefile
index bf6af9edd2b4..87bea88fffb2 100644
--- a/lib/libpam/modules/pam_skey/Makefile
+++ b/lib/libpam/modules/pam_skey/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+#	$FreeBSD: src/lib/libpam/modules/pam_skey/Makefile,v 1.2 1999/01/20 21:55:27 jdp Exp $
 
 PAMDIR=		${.CURDIR}/../../../../contrib/libpam
 
diff --git a/lib/libpam/modules/pam_skey/pam_skey.c b/lib/libpam/modules/pam_skey/pam_skey.c
index 439591e24015..2fc28d1c2cf8 100644
--- a/lib/libpam/modules/pam_skey/pam_skey.c
+++ b/lib/libpam/modules/pam_skey/pam_skey.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libpam/modules/pam_skey/pam_skey.c,v 1.2 1999/01/20 21:55:27 jdp Exp $
  */
 
 #include <syslog.h>	/* XXX */
diff --git a/lib/libpam/modules/pam_tacplus/Makefile b/lib/libpam/modules/pam_tacplus/Makefile
index 6430ca8a66fe..b92947ec9084 100644
--- a/lib/libpam/modules/pam_tacplus/Makefile
+++ b/lib/libpam/modules/pam_tacplus/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+#	$FreeBSD: src/lib/libpam/modules/pam_tacplus/Makefile,v 1.2 1999/01/20 21:55:28 jdp Exp $
 
 PAMDIR=		${.CURDIR}/../../../../contrib/libpam
 
diff --git a/lib/libpam/modules/pam_tacplus/pam_tacplus.c b/lib/libpam/modules/pam_tacplus/pam_tacplus.c
index 0820071529b4..913d75647f8a 100644
--- a/lib/libpam/modules/pam_tacplus/pam_tacplus.c
+++ b/lib/libpam/modules/pam_tacplus/pam_tacplus.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libpam/modules/pam_tacplus/pam_tacplus.c,v 1.2 1999/01/20 21:55:28 jdp Exp $
  */
 
 #include <sys/param.h>
diff --git a/lib/libpam/modules/pam_unix/Makefile b/lib/libpam/modules/pam_unix/Makefile
index d049e2b6ca71..e6486e274739 100644
--- a/lib/libpam/modules/pam_unix/Makefile
+++ b/lib/libpam/modules/pam_unix/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+#	$FreeBSD: src/lib/libpam/modules/pam_unix/Makefile,v 1.2.2.1 1999/05/08 21:32:00 jdp Exp $
 
 PAMDIR=		${.CURDIR}/../../../../contrib/libpam
 
diff --git a/lib/libpam/modules/pam_unix/pam_unix.c b/lib/libpam/modules/pam_unix/pam_unix.c
index 329b7844f8eb..e33b59095ec0 100644
--- a/lib/libpam/modules/pam_unix/pam_unix.c
+++ b/lib/libpam/modules/pam_unix/pam_unix.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libpam/modules/pam_unix/pam_unix.c,v 1.2.2.2 1999/05/08 21:32:02 jdp Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile
index 1218280ff672..bd587dabb625 100644
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@@ -1,5 +1,5 @@
 # Makefile for libpcap
-# $FreeBSD$
+# $FreeBSD: src/lib/libpcap/Makefile,v 1.22.2.1 1999/08/29 14:57:24 peter Exp $
 
 LIB=    pcap
 SRCS=	grammar.y tokdefs.h pcap-bpf.c \
diff --git a/lib/libradius/Makefile b/lib/libradius/Makefile
index ec8bdf72fe06..90845b101208 100644
--- a/lib/libradius/Makefile
+++ b/lib/libradius/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+#	$FreeBSD: src/lib/libradius/Makefile,v 1.1.1.1.2.1 1999/02/05 16:29:10 brian Exp $
 
 LIB=		radius
 SRCS=		radlib.c
diff --git a/lib/libradius/libradius.3 b/lib/libradius/libradius.3
index dc1587a07303..88eb91eec24f 100644
--- a/lib/libradius/libradius.3
+++ b/lib/libradius/libradius.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libradius/libradius.3,v 1.1.1.1.2.3 1999/11/19 04:31:27 jdp Exp $
 .\"
 .Dd July 29, 1998
 .Dt LIBRADIUS 3
diff --git a/lib/libradius/radius.conf.5 b/lib/libradius/radius.conf.5
index a0ef8270e33a..5550a6c883b7 100644
--- a/lib/libradius/radius.conf.5
+++ b/lib/libradius/radius.conf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libradius/radius.conf.5,v 1.1.1.1.2.1 1999/11/19 04:31:27 jdp Exp $
 .\"
 .Dd July 29, 1998
 .Dt RADIUS.CONF 5
diff --git a/lib/libradius/radlib.c b/lib/libradius/radlib.c
index 1860fedd9ee3..47a98b32c293 100644
--- a/lib/libradius/radlib.c
+++ b/lib/libradius/radlib.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libradius/radlib.c,v 1.1.1.1.2.2 1999/11/19 04:31:28 jdp Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libradius/radlib.h b/lib/libradius/radlib.h
index ccf300662f52..7a15bcabef09 100644
--- a/lib/libradius/radlib.h
+++ b/lib/libradius/radlib.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libradius/radlib.h,v 1.1.1.1.2.2 1999/11/19 04:31:28 jdp Exp $
  */
 
 #ifndef _RADLIB_H_
diff --git a/lib/libradius/radlib_private.h b/lib/libradius/radlib_private.h
index af169704bdbf..1a41f6d977ed 100644
--- a/lib/libradius/radlib_private.h
+++ b/lib/libradius/radlib_private.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libradius/radlib_private.h,v 1.1.1.1.2.2 1999/11/19 04:31:29 jdp Exp $
  */
 
 #ifndef RADLIB_PRIVATE_H
diff --git a/lib/librpcsvc/Makefile b/lib/librpcsvc/Makefile
index 077a33eadc69..386ba4b6f31e 100644
--- a/lib/librpcsvc/Makefile
+++ b/lib/librpcsvc/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile    5.10 (Berkeley) 6/24/90
-# $FreeBSD$
+# $FreeBSD: src/lib/librpcsvc/Makefile,v 1.12.2.1 1999/08/29 14:57:25 peter Exp $
 
 .PATH: ${DESTDIR}/usr/include/rpcsvc
 
diff --git a/lib/librpcsvc/xcrypt.c b/lib/librpcsvc/xcrypt.c
index f2b54a54e57c..5771a16212ae 100644
--- a/lib/librpcsvc/xcrypt.c
+++ b/lib/librpcsvc/xcrypt.c
@@ -40,7 +40,7 @@
 
 #ifndef lint
 /*from: static char sccsid[] = "@(#)xcrypt.c	2.2 88/08/10 4.0 RPCSRC"; */
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/lib/librpcsvc/xcrypt.c,v 1.1.1.1.2.1 1999/08/29 14:57:26 peter Exp $";
 #endif
 
 static char hex[];	/* forward */
diff --git a/lib/librpcsvc/yp_passwd.c b/lib/librpcsvc/yp_passwd.c
index f3d42b7154d8..8be43f88829a 100644
--- a/lib/librpcsvc/yp_passwd.c
+++ b/lib/librpcsvc/yp_passwd.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/librpcsvc/yp_passwd.c,v 1.1.1.1.2.1 1999/08/29 14:57:26 peter Exp $
  */
 
 #include <stdlib.h>
@@ -40,7 +40,7 @@
 #include <netinet/in.h>
 
 #ifndef LINT
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/lib/librpcsvc/yp_passwd.c,v 1.1.1.1.2.1 1999/08/29 14:57:26 peter Exp $";
 #endif
 
 /*
diff --git a/lib/librpcsvc/yp_update.c b/lib/librpcsvc/yp_update.c
index ba49c0ce7b0d..6b4e3ef41820 100644
--- a/lib/librpcsvc/yp_update.c
+++ b/lib/librpcsvc/yp_update.c
@@ -35,7 +35,7 @@
  * Center for Telecommunications Research
  * Columbia University, New York City
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/librpcsvc/yp_update.c,v 1.1.1.1.2.1 1999/08/29 14:57:27 peter Exp $
  */
 
 #include <stdlib.h>
@@ -46,7 +46,7 @@
 #include <rpc/key_prot.h>
 
 #ifndef lint
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/lib/librpcsvc/yp_update.c,v 1.1.1.1.2.1 1999/08/29 14:57:27 peter Exp $";
 #endif
 
 #ifndef WINDOW
diff --git a/lib/libskey/pathnames.h b/lib/libskey/pathnames.h
index ca91fccd9e6d..1d97b78114aa 100644
--- a/lib/libskey/pathnames.h
+++ b/lib/libskey/pathnames.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ (FreeBSD) */
+/* $FreeBSD: src/lib/libskey/pathnames.h,v 1.4.2.1 1999/08/29 14:57:28 peter Exp $ (FreeBSD) */
 
 #include <paths.h>
 
diff --git a/lib/libskey/skey.3 b/lib/libskey/skey.3
index f2834d216da2..7d9a429faa8f 100644
--- a/lib/libskey/skey.3
+++ b/lib/libskey/skey.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libskey/skey.3,v 1.8.2.1 1999/08/29 14:57:29 peter Exp $
 .\"
 .Dd December 22, 1996
 .Dt SKEY 3
diff --git a/lib/libss/Makefile b/lib/libss/Makefile
index 9638585124e1..131d156f7dc6 100644
--- a/lib/libss/Makefile
+++ b/lib/libss/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libss/Makefile,v 1.20.2.1 1999/08/29 14:57:30 peter Exp $
 
 LIB=	ss
 SRCS=	data.c error.c execute_cmd.c help.c invocation.c list_rqs.c \
diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile
index d2285e96187a..a286dcb82b98 100644
--- a/lib/libstand/Makefile
+++ b/lib/libstand/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libstand/Makefile,v 1.11.2.2 1999/08/29 14:57:31 peter Exp $
 #
 # Originally from	$NetBSD: Makefile,v 1.21 1997/10/26 22:08:38 lukem Exp $
 #
diff --git a/lib/libstand/assert.c b/lib/libstand/assert.c
index 48115284221c..db3ced9857f3 100644
--- a/lib/libstand/assert.c
+++ b/lib/libstand/assert.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/assert.c,v 1.1.2.1 1999/08/29 14:57:32 peter Exp $
  */
 
 #include <stand.h>
diff --git a/lib/libstand/environment.c b/lib/libstand/environment.c
index f2ca120a177d..a8dc300cb210 100644
--- a/lib/libstand/environment.c
+++ b/lib/libstand/environment.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/environment.c,v 1.2.2.1 1999/08/29 14:57:33 peter Exp $
  *
  */
 
diff --git a/lib/libstand/i386/_setjmp.S b/lib/libstand/i386/_setjmp.S
index fc75db7209b8..d6a24f327912 100644
--- a/lib/libstand/i386/_setjmp.S
+++ b/lib/libstand/i386/_setjmp.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/i386/_setjmp.S,v 1.2.2.2 1999/08/29 14:57:42 peter Exp $
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libstand/i386/_setjmp.S,v 1.2.2.2 1999/08/29 14:57:42 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 /*
diff --git a/lib/libstand/libstand.3 b/lib/libstand/libstand.3
index 99fbb54ca9f2..c1dcef7f456f 100644
--- a/lib/libstand/libstand.3
+++ b/lib/libstand/libstand.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libstand/libstand.3,v 1.3.2.1 1999/08/29 14:57:33 peter Exp $
 .\"
 .Dd June 22, 1998
 .Dt LIBSTAND 3
diff --git a/lib/libstand/pager.c b/lib/libstand/pager.c
index 387fdc31cb9f..fa944847a0c7 100644
--- a/lib/libstand/pager.c
+++ b/lib/libstand/pager.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/pager.c,v 1.2.2.2 1999/08/29 14:57:33 peter Exp $
  */
 /*
  * Simple paged-output and paged-viewing functions
diff --git a/lib/libstand/printf.c b/lib/libstand/printf.c
index 3e16b6f7b2da..8630a9c72f0f 100644
--- a/lib/libstand/printf.c
+++ b/lib/libstand/printf.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_prf.c	8.3 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/printf.c,v 1.2.2.1 1999/08/29 14:57:34 peter Exp $
  */
 
 /*
diff --git a/lib/libstand/qdivrem.c b/lib/libstand/qdivrem.c
index a8231f0c1545..6d3ded946829 100644
--- a/lib/libstand/qdivrem.c
+++ b/lib/libstand/qdivrem.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/qdivrem.c,v 1.1.2.1 1999/08/29 14:57:34 peter Exp $
  * 	From: Id: qdivrem.c,v 1.7 1997/11/07 09:20:40 phk Exp
  */
 
diff --git a/lib/libstand/quad.h b/lib/libstand/quad.h
index 14f57542f761..ed466b4d2df4 100644
--- a/lib/libstand/quad.h
+++ b/lib/libstand/quad.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)quad.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/quad.h,v 1.1.2.1 1999/08/29 14:57:35 peter Exp $
  */
 
 /*
diff --git a/lib/libstand/random.c b/lib/libstand/random.c
index 35ddea1add68..fe20455304e5 100644
--- a/lib/libstand/random.c
+++ b/lib/libstand/random.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)random.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/random.c,v 1.1.1.1.2.1 1999/08/29 14:57:36 peter Exp $
  */
 
 #include <sys/libkern.h>
diff --git a/lib/libstand/sbrk.c b/lib/libstand/sbrk.c
index fce03cf2a29f..a719d3a1a51d 100644
--- a/lib/libstand/sbrk.c
+++ b/lib/libstand/sbrk.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/sbrk.c,v 1.1.2.1 1999/08/29 14:57:36 peter Exp $
  */
 
 /*
diff --git a/lib/libstand/stand.h b/lib/libstand/stand.h
index 80e667e4893c..2c668722b3cd 100644
--- a/lib/libstand/stand.h
+++ b/lib/libstand/stand.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/stand.h,v 1.13.2.1 1999/08/29 14:57:37 peter Exp $
  * From	$NetBSD: stand.h,v 1.22 1997/06/26 19:17:40 drochner Exp $	
  */
 
diff --git a/lib/libstand/twiddle.c b/lib/libstand/twiddle.c
index 7a9a6692bd93..8a9c6e1cc28b 100644
--- a/lib/libstand/twiddle.c
+++ b/lib/libstand/twiddle.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_prf.c	8.3 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/twiddle.c,v 1.1.1.1.2.1 1999/08/29 14:57:37 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libstand/zalloc.c b/lib/libstand/zalloc.c
index 16a4163a88fb..504ee3273070 100644
--- a/lib/libstand/zalloc.c
+++ b/lib/libstand/zalloc.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/zalloc.c,v 1.4.2.1 1999/08/29 14:57:38 peter Exp $
  */
 
 /*
diff --git a/lib/libstand/zalloc_defs.h b/lib/libstand/zalloc_defs.h
index 00696d62443b..3853c25825ac 100644
--- a/lib/libstand/zalloc_defs.h
+++ b/lib/libstand/zalloc_defs.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/zalloc_defs.h,v 1.5.2.1 1999/08/29 14:57:38 peter Exp $
  */
 
 /*
diff --git a/lib/libstand/zalloc_malloc.c b/lib/libstand/zalloc_malloc.c
index 83e5290a95cd..691936b6c158 100644
--- a/lib/libstand/zalloc_malloc.c
+++ b/lib/libstand/zalloc_malloc.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/zalloc_malloc.c,v 1.4.2.1 1999/08/29 14:57:38 peter Exp $
  */
 
 /*
diff --git a/lib/libstand/zalloc_mem.h b/lib/libstand/zalloc_mem.h
index c872da17da73..94f580167780 100644
--- a/lib/libstand/zalloc_mem.h
+++ b/lib/libstand/zalloc_mem.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/zalloc_mem.h,v 1.2.2.1 1999/08/29 14:57:39 peter Exp $
  */
 
 /*
diff --git a/lib/libstand/zalloc_protos.h b/lib/libstand/zalloc_protos.h
index c90bd5a3cd35..beb9ef27b8d9 100644
--- a/lib/libstand/zalloc_protos.h
+++ b/lib/libstand/zalloc_protos.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/zalloc_protos.h,v 1.2.2.1 1999/08/29 14:57:40 peter Exp $
  */
 
 Library void *znalloc(struct MemPool *mpool, iaddr_t bytes);
diff --git a/lib/libstand/zipfs.c b/lib/libstand/zipfs.c
index b0e30073cd7e..5256f833a142 100644
--- a/lib/libstand/zipfs.c
+++ b/lib/libstand/zipfs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/zipfs.c,v 1.3.2.1 1999/08/29 14:57:40 peter Exp $
  *
  */
 
diff --git a/lib/libtacplus/Makefile b/lib/libtacplus/Makefile
index 798a8e08f306..7eac16116329 100644
--- a/lib/libtacplus/Makefile
+++ b/lib/libtacplus/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+#	$FreeBSD: src/lib/libtacplus/Makefile,v 1.1.1.1 1998/11/13 00:54:26 jdp Exp $
 
 LIB=		tacplus
 SRCS=		taclib.c
diff --git a/lib/libtacplus/libtacplus.3 b/lib/libtacplus/libtacplus.3
index bfbfa352a7d3..e8420b332295 100644
--- a/lib/libtacplus/libtacplus.3
+++ b/lib/libtacplus/libtacplus.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libtacplus/libtacplus.3,v 1.1.1.1 1998/11/13 00:54:26 jdp Exp $
 .\"
 .Dd September 2, 1998
 .Dt LIBTACPLUS 3
diff --git a/lib/libtacplus/taclib.c b/lib/libtacplus/taclib.c
index bd2e663b32c8..400dcde634f0 100644
--- a/lib/libtacplus/taclib.c
+++ b/lib/libtacplus/taclib.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libtacplus/taclib.c,v 1.1.1.1 1998/11/13 00:54:26 jdp Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libtacplus/taclib.h b/lib/libtacplus/taclib.h
index 0da1b0889ab3..95f6ae5649a3 100644
--- a/lib/libtacplus/taclib.h
+++ b/lib/libtacplus/taclib.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libtacplus/taclib.h,v 1.1.1.1 1998/11/13 00:54:26 jdp Exp $
  */
 
 #ifndef _TACLIB_H_
diff --git a/lib/libtacplus/taclib_private.h b/lib/libtacplus/taclib_private.h
index 830fc921fbf3..c0cf846fd9bc 100644
--- a/lib/libtacplus/taclib_private.h
+++ b/lib/libtacplus/taclib_private.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libtacplus/taclib_private.h,v 1.1.1.1 1998/11/13 00:54:26 jdp Exp $
  */
 
 #ifndef TACLIB_PRIVATE_H
diff --git a/lib/libtacplus/tacplus.conf.5 b/lib/libtacplus/tacplus.conf.5
index a61da844848b..6a297693f223 100644
--- a/lib/libtacplus/tacplus.conf.5
+++ b/lib/libtacplus/tacplus.conf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libtacplus/tacplus.conf.5,v 1.1.1.1 1998/11/13 00:54:26 jdp Exp $
 .\"
 .Dd July 29, 1998
 .Dt TACPLUS.CONF 5
diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile
index 9e791748797a..eb2939d419b8 100644
--- a/lib/libtelnet/Makefile
+++ b/lib/libtelnet/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 12/15/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libtelnet/Makefile,v 1.9.2.1 1999/08/29 14:57:43 peter Exp $
 
 LIB=	telnet
 SRCS=	genget.c getent.c misc.c
diff --git a/lib/libtermcap/termcap.h b/lib/libtermcap/termcap.h
index 350390d58cc4..e34903a79fce 100644
--- a/lib/libtermcap/termcap.h
+++ b/lib/libtermcap/termcap.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libtermcap/termcap.h,v 1.13.2.1 1999/08/29 14:57:45 peter Exp $ */
 
 #ifndef _TERMCAP_H_
 #define _TERMCAP_H_
diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
index 48db2a184fa5..b1fd26308252 100644
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$FreeBSD$
+#	$FreeBSD: src/lib/libutil/Makefile,v 1.21.2.5 1999/11/22 10:43:33 jkoshy Exp $
 
 LIB=	util
 SHLIB_MAJOR= 2
diff --git a/lib/libutil/_secure_path.3 b/lib/libutil/_secure_path.3
index e962669ceb68..f41f410f3e78 100644
--- a/lib/libutil/_secure_path.3
+++ b/lib/libutil/_secure_path.3
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/_secure_path.3,v 1.3.2.3 1999/09/21 19:41:08 phantom Exp $
 .\"
 .Dd May 2, 1997
 .Os FreeBSD
diff --git a/lib/libutil/_secure_path.c b/lib/libutil/_secure_path.c
index c27003c46661..e178e15ed92a 100644
--- a/lib/libutil/_secure_path.c
+++ b/lib/libutil/_secure_path.c
@@ -18,7 +18,7 @@
  * 5. Modifications may be freely made to this file providing the above
  *    conditions are met.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libutil/_secure_path.c,v 1.4.2.1 1999/08/29 14:57:47 peter Exp $
  */
 
 
diff --git a/lib/libutil/auth.3 b/lib/libutil/auth.3
index 67a63b7b610b..830caf3021c9 100644
--- a/lib/libutil/auth.3
+++ b/lib/libutil/auth.3
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/auth.3,v 1.1.2.3 1999/09/21 19:41:08 phantom Exp $
 .\" "
 .Dd October 7, 1998
 .Os
diff --git a/lib/libutil/auth.conf.5 b/lib/libutil/auth.conf.5
index fe64632a7701..49eb16ab8c36 100644
--- a/lib/libutil/auth.conf.5
+++ b/lib/libutil/auth.conf.5
@@ -11,7 +11,7 @@
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/auth.conf.5,v 1.1.2.2 1999/09/21 19:41:08 phantom Exp $
 .\"
 .Dd October 7, 1998
 .Dt AUTH.CONF 5
diff --git a/lib/libutil/libutil.h b/lib/libutil/libutil.h
index f41c66590cd2..801a4ceee359 100644
--- a/lib/libutil/libutil.h
+++ b/lib/libutil/libutil.h
@@ -18,7 +18,7 @@
  * 5. Modifications may be freely made to this file providing the above
  *    conditions are met.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libutil/libutil.h,v 1.21.2.2 1999/08/29 14:57:48 peter Exp $
  */
 
 #ifndef _LIBUTIL_H_
diff --git a/lib/libutil/login.3 b/lib/libutil/login.3
index c8f592c0bd20..5217884f4995 100644
--- a/lib/libutil/login.3
+++ b/lib/libutil/login.3
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/login.3,v 1.4.2.1 1999/08/29 14:57:49 peter Exp $
 .\" "
 .Dd December 29, 1996
 .Os
diff --git a/lib/libutil/login.c b/lib/libutil/login.c
index 322c9a69d94e..dd7ffec3bc23 100644
--- a/lib/libutil/login.c
+++ b/lib/libutil/login.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)login.c	8.1 (Berkeley) 6/4/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libutil/login.c,v 1.5.2.1 1999/08/29 14:57:49 peter Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libutil/login.conf.5 b/lib/libutil/login.conf.5
index 0b86490dfec9..e473cf84fb31 100644
--- a/lib/libutil/login.conf.5
+++ b/lib/libutil/login.conf.5
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/login.conf.5,v 1.15.2.4 1999/09/21 19:41:08 phantom Exp $
 .\"
 .Dd November 22, 1996
 .Dt LOGIN.CONF 5
diff --git a/lib/libutil/login_auth.3 b/lib/libutil/login_auth.3
index e521275a2db2..a0e6ec767da9 100644
--- a/lib/libutil/login_auth.3
+++ b/lib/libutil/login_auth.3
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/login_auth.3,v 1.5.2.3 1999/09/21 19:41:08 phantom Exp $
 .\"
 .Dd December 29, 1996
 .Os FreeBSD
diff --git a/lib/libutil/login_auth.c b/lib/libutil/login_auth.c
index 1fb21caee1f2..5ae83d40a64d 100644
--- a/lib/libutil/login_auth.c
+++ b/lib/libutil/login_auth.c
@@ -25,7 +25,7 @@
  *
  * Low-level routines relating to the user capabilities database
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libutil/login_auth.c,v 1.9.2.2 1999/09/10 15:10:57 sheldonh Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libutil/login_cap.3 b/lib/libutil/login_cap.3
index c9d54497f4fd..e79bdb0adeec 100644
--- a/lib/libutil/login_cap.3
+++ b/lib/libutil/login_cap.3
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/login_cap.3,v 1.9.2.2 1999/08/29 14:57:51 peter Exp $
 .\"
 .Dd December 27, 1996
 .Os FreeBSD
diff --git a/lib/libutil/login_cap.c b/lib/libutil/login_cap.c
index af27766e5064..81018de27165 100644
--- a/lib/libutil/login_cap.c
+++ b/lib/libutil/login_cap.c
@@ -25,7 +25,7 @@
  *
  * Low-level routines relating to the user capabilities database
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libutil/login_cap.c,v 1.14.2.2 1999/08/29 14:57:51 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/lib/libutil/login_cap.h b/lib/libutil/login_cap.h
index f4b382519770..b9f8026f78f8 100644
--- a/lib/libutil/login_cap.h
+++ b/lib/libutil/login_cap.h
@@ -22,7 +22,7 @@
  * Low-level routines relating to the user capabilities database
  *
  *	Was login_cap.h,v 1.9 1997/05/07 20:00:01 eivind Exp
- * $FreeBSD$
+ * $FreeBSD: src/lib/libutil/login_cap.h,v 1.2.4.1 1999/08/29 14:57:52 peter Exp $
  */
 
 #ifndef _LOGIN_CAP_H_
diff --git a/lib/libutil/login_class.3 b/lib/libutil/login_class.3
index 4bb018577624..f05654f3de58 100644
--- a/lib/libutil/login_class.3
+++ b/lib/libutil/login_class.3
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/login_class.3,v 1.6.2.1 1999/08/29 14:57:53 peter Exp $
 .\"
 .Dd December 28, 1996
 .Os FreeBSD
diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c
index 589ea4fdf400..785305070175 100644
--- a/lib/libutil/login_class.c
+++ b/lib/libutil/login_class.c
@@ -21,7 +21,7 @@
  *
  * High-level routines relating to use of the user capabilities database
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libutil/login_class.c,v 1.10.2.2 1999/08/29 14:57:53 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/lib/libutil/login_ok.3 b/lib/libutil/login_ok.3
index a19362d4dd24..332d12510525 100644
--- a/lib/libutil/login_ok.3
+++ b/lib/libutil/login_ok.3
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/login_ok.3,v 1.4.4.2 1999/09/21 19:41:08 phantom Exp $
 .\"
 .Dd January 2, 1997
 .Os FreeBSD
diff --git a/lib/libutil/login_ok.c b/lib/libutil/login_ok.c
index 365528ba8acb..a56aef840611 100644
--- a/lib/libutil/login_ok.c
+++ b/lib/libutil/login_ok.c
@@ -20,7 +20,7 @@
  *
  * Support allow/deny lists in login class capabilities
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libutil/login_ok.c,v 1.6.2.1 1999/08/29 14:57:54 peter Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libutil/login_times.3 b/lib/libutil/login_times.3
index f80bd83e291b..418899ff7ea3 100644
--- a/lib/libutil/login_times.3
+++ b/lib/libutil/login_times.3
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/login_times.3,v 1.4.4.3 1999/09/21 19:41:08 phantom Exp $
 .\"
 .Dd January 2, 1997
 .Os FreeBSD
diff --git a/lib/libutil/login_times.c b/lib/libutil/login_times.c
index af58974db250..2ed75cf095b0 100644
--- a/lib/libutil/login_times.c
+++ b/lib/libutil/login_times.c
@@ -20,7 +20,7 @@
  *
  * Login period parsing and comparison functions.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libutil/login_times.c,v 1.6.2.1 1999/08/29 14:57:55 peter Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libutil/login_tty.3 b/lib/libutil/login_tty.3
index 2cde93f43e43..4dbc8776dbf9 100644
--- a/lib/libutil/login_tty.3
+++ b/lib/libutil/login_tty.3
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/login_tty.3,v 1.4.2.1 1999/08/29 14:57:55 peter Exp $
 .\" "
 .Dd December 29, 1996
 .Os
diff --git a/lib/libutil/login_tty.c b/lib/libutil/login_tty.c
index eb32fc723073..f092bc5bb5ec 100644
--- a/lib/libutil/login_tty.c
+++ b/lib/libutil/login_tty.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)login_tty.c	8.1 (Berkeley) 6/4/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libutil/login_tty.c,v 1.5.2.1 1999/08/29 14:57:56 peter Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libutil/logout.3 b/lib/libutil/logout.3
index 580550ffdb23..e49b27d12b45 100644
--- a/lib/libutil/logout.3
+++ b/lib/libutil/logout.3
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/logout.3,v 1.5.2.1 1999/08/29 14:57:57 peter Exp $
 .\" "
 .Dd December 29, 1996
 .Os
diff --git a/lib/libutil/logout.c b/lib/libutil/logout.c
index 5b9a821b60d2..1c703be2be28 100644
--- a/lib/libutil/logout.c
+++ b/lib/libutil/logout.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)logout.c	8.1 (Berkeley) 6/4/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libutil/logout.c,v 1.5.2.1 1999/08/29 14:57:57 peter Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libutil/logwtmp.3 b/lib/libutil/logwtmp.3
index b7d3d0a0d7be..1477638dad0a 100644
--- a/lib/libutil/logwtmp.3
+++ b/lib/libutil/logwtmp.3
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/logwtmp.3,v 1.6.2.1 1999/08/29 14:57:57 peter Exp $
 .\" "
 .Dd December 29, 1996
 .Os
diff --git a/lib/libutil/logwtmp.c b/lib/libutil/logwtmp.c
index fd05b55e80d2..2d29a3cd4bbd 100644
--- a/lib/libutil/logwtmp.c
+++ b/lib/libutil/logwtmp.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)logwtmp.c	8.1 (Berkeley) 6/4/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libutil/logwtmp.c,v 1.8.2.2 1999/08/29 14:57:58 peter Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libutil/property.3 b/lib/libutil/property.3
index 0a0457ddea62..fb4c2069f3de 100644
--- a/lib/libutil/property.3
+++ b/lib/libutil/property.3
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/property.3,v 1.4.2.4 1999/09/20 09:49:52 phantom Exp $
 .\" "
 .Dd October 7, 1998
 .Os
diff --git a/lib/libutil/pty.3 b/lib/libutil/pty.3
index e209fde13f27..f862e8a9041f 100644
--- a/lib/libutil/pty.3
+++ b/lib/libutil/pty.3
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/pty.3,v 1.6.2.2 1999/08/29 14:57:59 peter Exp $
 .\" "
 .Dd December 29, 1996
 .Os
diff --git a/lib/libutil/pty.c b/lib/libutil/pty.c
index d46f38637e80..82fc07132757 100644
--- a/lib/libutil/pty.c
+++ b/lib/libutil/pty.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)pty.c	8.3 (Berkeley) 5/16/94";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libutil/pty.c,v 1.8.2.1 1999/08/29 14:58:00 peter Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libutil/realhostname.3 b/lib/libutil/realhostname.3
index 1f2e6a9b8f6b..8e2cf95e570a 100644
--- a/lib/libutil/realhostname.3
+++ b/lib/libutil/realhostname.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/realhostname.3,v 1.1.2.3 1999/09/20 09:49:52 phantom Exp $
 .\"
 .Dd April 6, 1999
 .Os
diff --git a/lib/libutil/realhostname.c b/lib/libutil/realhostname.c
index fa7f4b1a9805..c9860ea92133 100644
--- a/lib/libutil/realhostname.c
+++ b/lib/libutil/realhostname.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libutil/realhostname.c,v 1.2.2.2 1999/08/29 14:58:01 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/lib/libutil/setproctitle.3 b/lib/libutil/setproctitle.3
index 10eae654736a..1b4bfe9e8b71 100644
--- a/lib/libutil/setproctitle.3
+++ b/lib/libutil/setproctitle.3
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/setproctitle.3,v 1.10.2.3 1999/11/23 00:18:54 brian Exp $
 .\"
 .\" The following requests are required for all man pages.
 .Dd December 16, 1995
diff --git a/lib/libutil/setproctitle.c b/lib/libutil/setproctitle.c
index 47f9f21c9442..16f0e116787b 100644
--- a/lib/libutil/setproctitle.c
+++ b/lib/libutil/setproctitle.c
@@ -14,7 +14,7 @@
  * 3. Absolutely no warranty of function or purpose is made by the author
  *    Peter Wemm.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libutil/setproctitle.c,v 1.8.2.2 1999/11/23 00:18:54 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libutil/trimdomain.3 b/lib/libutil/trimdomain.3
index e4d70b8a711a..6bbf57e8421a 100644
--- a/lib/libutil/trimdomain.3
+++ b/lib/libutil/trimdomain.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/trimdomain.3,v 1.2.2.2 1999/08/29 14:58:03 peter Exp $
 .\"
 .Dd April 7, 1999
 .Os
diff --git a/lib/libutil/uucplock.3 b/lib/libutil/uucplock.3
index 99534a6fe7c9..4b54fc64f067 100644
--- a/lib/libutil/uucplock.3
+++ b/lib/libutil/uucplock.3
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/uucplock.3,v 1.11.2.2 1999/08/29 14:58:03 peter Exp $
 .\" "
 .Dd March 30, 1997
 .Os
diff --git a/lib/libutil/uucplock.c b/lib/libutil/uucplock.c
index 012016a3e7c1..21b281964612 100644
--- a/lib/libutil/uucplock.c
+++ b/lib/libutil/uucplock.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libutil/uucplock.c,v 1.10.2.2 1999/08/29 14:58:03 peter Exp $
  *
  */
 
diff --git a/lib/libvgl/Makefile b/lib/libvgl/Makefile
index fe71c3510171..7db6a5c6d2f1 100644
--- a/lib/libvgl/Makefile
+++ b/lib/libvgl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libvgl/Makefile,v 1.2.2.1 1999/10/28 16:46:23 phantom Exp $
 LIB=	vgl
 SHLIB_MAJOR= 1
 SHLIB_MINOR= 0
diff --git a/lib/libvgl/bitmap.c b/lib/libvgl/bitmap.c
index e66150ca2348..befa1ae751e8 100644
--- a/lib/libvgl/bitmap.c
+++ b/lib/libvgl/bitmap.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libvgl/bitmap.c,v 1.1.4.2 1999/08/29 14:58:07 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libvgl/keyboard.c b/lib/libvgl/keyboard.c
index 690da320e50d..377336262ac0 100644
--- a/lib/libvgl/keyboard.c
+++ b/lib/libvgl/keyboard.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libvgl/keyboard.c,v 1.1.4.2 1999/08/29 14:58:07 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/lib/libvgl/main.c b/lib/libvgl/main.c
index fc13f46b0c43..3a1438e3bf1e 100644
--- a/lib/libvgl/main.c
+++ b/lib/libvgl/main.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libvgl/main.c,v 1.2.2.3 1999/08/31 09:19:09 yokota Exp $
  */
 
 #include <stdio.h>
diff --git a/lib/libvgl/mouse.c b/lib/libvgl/mouse.c
index a5ded2f2a424..a73c1fdb63b7 100644
--- a/lib/libvgl/mouse.c
+++ b/lib/libvgl/mouse.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libvgl/mouse.c,v 1.1.4.1 1999/08/29 14:58:08 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/lib/libvgl/simple.c b/lib/libvgl/simple.c
index 2ca923ca7ff7..f0cc4f1d2988 100644
--- a/lib/libvgl/simple.c
+++ b/lib/libvgl/simple.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libvgl/simple.c,v 1.1.4.2 1999/08/29 14:58:09 peter Exp $
  */
 
 #include <signal.h>
diff --git a/lib/libvgl/text.c b/lib/libvgl/text.c
index a2c6417301e5..7659777a45c6 100644
--- a/lib/libvgl/text.c
+++ b/lib/libvgl/text.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libvgl/text.c,v 1.1.4.2 1999/08/29 14:58:10 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/lib/libvgl/vgl.3 b/lib/libvgl/vgl.3
index af69ca42945a..228688bc7389 100644
--- a/lib/libvgl/vgl.3
+++ b/lib/libvgl/vgl.3
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libvgl/vgl.3,v 1.4.2.3 1999/12/13 10:45:16 abial Exp $
 .Dd October 28, 1999
 .Dt VGL 3
 .Os FreeBSD 3.0
diff --git a/lib/libvgl/vgl.h b/lib/libvgl/vgl.h
index 8704ac97ecdf..c541b39ebe26 100644
--- a/lib/libvgl/vgl.h
+++ b/lib/libvgl/vgl.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libvgl/vgl.h,v 1.2.2.1 1999/08/29 14:58:10 peter Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libwrap/Makefile b/lib/libwrap/Makefile
index 83800677642f..12db54025b5c 100644
--- a/lib/libwrap/Makefile
+++ b/lib/libwrap/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libwrap/Makefile,v 1.2.2.2 1999/08/29 14:58:12 peter Exp $
 #
 
 MAINTAINER=markm@FreeBSD.org
diff --git a/lib/liby/Makefile b/lib/liby/Makefile
index 8c816a9c2d5e..b038850483e2 100644
--- a/lib/liby/Makefile
+++ b/lib/liby/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/liby/Makefile,v 1.6.2.1 1999/08/29 14:58:14 peter Exp $
 
 LIB=		y
 SHLIB_MAJOR=	2
diff --git a/lib/libz/ChangeLog b/lib/libz/ChangeLog
index 0f36d178cd65..090a562900cd 100644
--- a/lib/libz/ChangeLog
+++ b/lib/libz/ChangeLog
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libz/ChangeLog,v 1.1.1.3.2.2 1999/10/10 07:45:59 peter Exp $
 
 		ChangeLog file for zlib
 
diff --git a/lib/libz/Makefile b/lib/libz/Makefile
index 250e005d857c..ef7baeb38f17 100644
--- a/lib/libz/Makefile
+++ b/lib/libz/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libz/Makefile,v 1.9.2.1 1999/08/29 14:58:15 peter Exp $
 #
 
 MAINTAINER=peter@FreeBSD.org
diff --git a/lib/libz/adler32.c b/lib/libz/adler32.c
index 8d42f875a8f9..1e8953a28714 100644
--- a/lib/libz/adler32.c
+++ b/lib/libz/adler32.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $FreeBSD$ */
+/* @(#) $FreeBSD: src/lib/libz/adler32.c,v 1.4.2.1 1999/08/29 14:58:16 peter Exp $ */
 
 #include "zlib.h"
 
diff --git a/lib/libz/compress.c b/lib/libz/compress.c
index 4ff6bc1e7f09..905491ec86ee 100644
--- a/lib/libz/compress.c
+++ b/lib/libz/compress.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $FreeBSD$ */
+/* @(#) $FreeBSD: src/lib/libz/compress.c,v 1.4.2.1 1999/08/29 14:58:16 peter Exp $ */
 
 #include "zlib.h"
 
diff --git a/lib/libz/crc32.c b/lib/libz/crc32.c
index 3f8ce1df5ff8..cc85025b39a6 100644
--- a/lib/libz/crc32.c
+++ b/lib/libz/crc32.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $FreeBSD$ */
+/* @(#) $FreeBSD: src/lib/libz/crc32.c,v 1.4.2.1 1999/08/29 14:58:17 peter Exp $ */
 
 #include "zlib.h"
 
diff --git a/lib/libz/deflate.c b/lib/libz/deflate.c
index 10bb235fa16b..c1ff1843b0d5 100644
--- a/lib/libz/deflate.c
+++ b/lib/libz/deflate.c
@@ -47,7 +47,7 @@
  *
  */
 
-/* @(#) $FreeBSD$ */
+/* @(#) $FreeBSD: src/lib/libz/deflate.c,v 1.4.2.1 1999/08/29 14:58:18 peter Exp $ */
 
 #include "deflate.h"
 
diff --git a/lib/libz/deflate.h b/lib/libz/deflate.h
index 998528880454..0f14b29f7889 100644
--- a/lib/libz/deflate.h
+++ b/lib/libz/deflate.h
@@ -8,7 +8,7 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* @(#) $FreeBSD$ */
+/* @(#) $FreeBSD: src/lib/libz/deflate.h,v 1.4.2.1 1999/08/29 14:58:19 peter Exp $ */
 
 #ifndef _DEFLATE_H
 #define _DEFLATE_H
diff --git a/lib/libz/example.c b/lib/libz/example.c
index 045751f3c19e..3a1ec98081ac 100644
--- a/lib/libz/example.c
+++ b/lib/libz/example.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $FreeBSD$ */
+/* @(#) $FreeBSD: src/lib/libz/example.c,v 1.4.2.1 1999/08/29 14:58:19 peter Exp $ */
 
 #include <stdio.h>
 #include "zlib.h"
diff --git a/lib/libz/gzio.c b/lib/libz/gzio.c
index 8c5d521b4ab2..6775f96499f7 100644
--- a/lib/libz/gzio.c
+++ b/lib/libz/gzio.c
@@ -5,7 +5,7 @@
  * Compile this file with -DNO_DEFLATE to avoid the compression code.
  */
 
-/* @(#) $FreeBSD$ */
+/* @(#) $FreeBSD: src/lib/libz/gzio.c,v 1.4.2.1 1999/08/29 14:58:19 peter Exp $ */
 
 #include <stdio.h>
 
diff --git a/lib/libz/minigzip.c b/lib/libz/minigzip.c
index ba4b2dc9e8df..21646e30aa62 100644
--- a/lib/libz/minigzip.c
+++ b/lib/libz/minigzip.c
@@ -13,7 +13,7 @@
  * or in pipe mode.
  */
 
-/* @(#) $FreeBSD$ */
+/* @(#) $FreeBSD: src/lib/libz/minigzip.c,v 1.5.2.1 1999/08/29 14:58:20 peter Exp $ */
 
 #include <stdio.h>
 #include "zlib.h"
diff --git a/lib/libz/trees.c b/lib/libz/trees.c
index bd7044012cfa..7128879d9fbd 100644
--- a/lib/libz/trees.c
+++ b/lib/libz/trees.c
@@ -29,7 +29,7 @@
  *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
  */
 
-/* @(#) $FreeBSD$ */
+/* @(#) $FreeBSD: src/lib/libz/trees.c,v 1.4.2.1 1999/08/29 14:58:20 peter Exp $ */
 
 /* #define GEN_TREES_H */
 
diff --git a/lib/libz/uncompr.c b/lib/libz/uncompr.c
index 25472c0f94c7..32f9cb4ac48d 100644
--- a/lib/libz/uncompr.c
+++ b/lib/libz/uncompr.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $FreeBSD$ */
+/* @(#) $FreeBSD: src/lib/libz/uncompr.c,v 1.4.2.1 1999/08/29 14:58:20 peter Exp $ */
 
 #include "zlib.h"
 
diff --git a/lib/libz/zconf.h b/lib/libz/zconf.h
index a294f58d0560..df4c06e27506 100644
--- a/lib/libz/zconf.h
+++ b/lib/libz/zconf.h
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $FreeBSD$ */
+/* @(#) $FreeBSD: src/lib/libz/zconf.h,v 1.4.2.2 1999/10/10 07:46:00 peter Exp $ */
 
 #ifndef _ZCONF_H
 #define _ZCONF_H
diff --git a/lib/libz/zutil.c b/lib/libz/zutil.c
index 8419dbcdab34..e9d7a1cfebe0 100644
--- a/lib/libz/zutil.c
+++ b/lib/libz/zutil.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $FreeBSD$ */
+/* @(#) $FreeBSD: src/lib/libz/zutil.c,v 1.4.2.1 1999/08/29 14:58:21 peter Exp $ */
 
 #include "zutil.h"
 
diff --git a/lib/libz/zutil.h b/lib/libz/zutil.h
index 378703d03a54..78a383e81eca 100644
--- a/lib/libz/zutil.h
+++ b/lib/libz/zutil.h
@@ -8,7 +8,7 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* @(#) $FreeBSD$ */
+/* @(#) $FreeBSD: src/lib/libz/zutil.h,v 1.4.2.1 1999/08/29 14:58:22 peter Exp $ */
 
 #ifndef _Z_UTIL_H
 #define _Z_UTIL_H
diff --git a/lib/msun/Makefile b/lib/msun/Makefile
index 4281b142a957..07c3d995390e 100644
--- a/lib/msun/Makefile
+++ b/lib/msun/Makefile
@@ -1,5 +1,5 @@
 #  @(#)Makefile 5.1beta 93/09/24
-# $FreeBSD$
+# $FreeBSD: src/lib/msun/Makefile,v 1.22.2.1 1999/08/29 14:58:24 peter Exp $
 #
 #  ====================================================
 #  Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
diff --git a/lib/msun/alpha/s_copysign.S b/lib/msun/alpha/s_copysign.S
index 2a724e228c48..909bb9973dc7 100644
--- a/lib/msun/alpha/s_copysign.S
+++ b/lib/msun/alpha/s_copysign.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/msun/alpha/s_copysign.S,v 1.1.2.1 1999/08/29 14:58:24 peter Exp $ */
 /*	From: NetBSD: s_copysign.S,v 1.3 1997/07/30 23:58:38 jtc Exp	*/
 
 /*-
diff --git a/lib/msun/alpha/s_copysignf.S b/lib/msun/alpha/s_copysignf.S
index d8a42a464c4c..fcffbe2dc7ad 100644
--- a/lib/msun/alpha/s_copysignf.S
+++ b/lib/msun/alpha/s_copysignf.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/msun/alpha/s_copysignf.S,v 1.1.2.1 1999/08/29 14:58:25 peter Exp $ */
 /*	From: NetBSD: s_copysignf.S,v 1.3 1997/07/30 23:58:41 jtc Exp */
 
 /*-
diff --git a/lib/msun/i387/e_acos.S b/lib/msun/i387/e_acos.S
index bd1499c66d5f..e89829af71a2 100644
--- a/lib/msun/i387/e_acos.S
+++ b/lib/msun/i387/e_acos.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/e_acos.S,v 1.6.2.1 1999/08/29 14:58:27 peter Exp $")
 
 /*
  * acos(x) = atan2(sqrt(1  - x^2, x).
diff --git a/lib/msun/i387/e_asin.S b/lib/msun/i387/e_asin.S
index 1876cfd7d343..29dad5b612b1 100644
--- a/lib/msun/i387/e_asin.S
+++ b/lib/msun/i387/e_asin.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/e_asin.S,v 1.6.2.1 1999/08/29 14:58:27 peter Exp $")
 
 /*
  * asin(x) = atan2(x, sqrt(1  - x^2).
diff --git a/lib/msun/i387/e_atan2.S b/lib/msun/i387/e_atan2.S
index 456de5636f60..32417ea4bce2 100644
--- a/lib/msun/i387/e_atan2.S
+++ b/lib/msun/i387/e_atan2.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/e_atan2.S,v 1.5.2.1 1999/08/29 14:58:28 peter Exp $")
 
 ENTRY(__ieee754_atan2)
 	fldl	 4(%esp)
diff --git a/lib/msun/i387/e_exp.S b/lib/msun/i387/e_exp.S
index 6e0dd396defd..da978402dd69 100644
--- a/lib/msun/i387/e_exp.S
+++ b/lib/msun/i387/e_exp.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/e_exp.S,v 1.7.2.1 1999/08/29 14:58:28 peter Exp $")
 
 /* e^x = 2^(x * log2(e)) */
 ENTRY(__ieee754_exp)
diff --git a/lib/msun/i387/e_fmod.S b/lib/msun/i387/e_fmod.S
index 0ce2450d4302..450422969526 100644
--- a/lib/msun/i387/e_fmod.S
+++ b/lib/msun/i387/e_fmod.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/e_fmod.S,v 1.5.2.1 1999/08/29 14:58:29 peter Exp $")
 
 ENTRY(__ieee754_fmod)
 	fldl	12(%esp)
diff --git a/lib/msun/i387/e_log.S b/lib/msun/i387/e_log.S
index 79a58c1739e3..169e4a4c62d4 100644
--- a/lib/msun/i387/e_log.S
+++ b/lib/msun/i387/e_log.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/e_log.S,v 1.5.2.1 1999/08/29 14:58:29 peter Exp $")
 
 ENTRY(__ieee754_log)
 	fldln2
diff --git a/lib/msun/i387/e_log10.S b/lib/msun/i387/e_log10.S
index c7f9bc437ac8..2656217e90a2 100644
--- a/lib/msun/i387/e_log10.S
+++ b/lib/msun/i387/e_log10.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/e_log10.S,v 1.5.2.1 1999/08/29 14:58:30 peter Exp $")
 
 ENTRY(__ieee754_log10)
 	fldlg2
diff --git a/lib/msun/i387/e_remainder.S b/lib/msun/i387/e_remainder.S
index cf0808bc7490..e75654d99f4b 100644
--- a/lib/msun/i387/e_remainder.S
+++ b/lib/msun/i387/e_remainder.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/e_remainder.S,v 1.5.2.1 1999/08/29 14:58:30 peter Exp $")
 
 ENTRY(__ieee754_remainder)
 	fldl	12(%esp)
diff --git a/lib/msun/i387/e_scalb.S b/lib/msun/i387/e_scalb.S
index fc8bb779525a..94944c04394a 100644
--- a/lib/msun/i387/e_scalb.S
+++ b/lib/msun/i387/e_scalb.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/e_scalb.S,v 1.6.2.1 1999/08/29 14:58:31 peter Exp $")
 
 ENTRY(__ieee754_scalb)
 	fldl	12(%esp)
diff --git a/lib/msun/i387/e_sqrt.S b/lib/msun/i387/e_sqrt.S
index f0403f0dfd7f..85829c4f8111 100644
--- a/lib/msun/i387/e_sqrt.S
+++ b/lib/msun/i387/e_sqrt.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/e_sqrt.S,v 1.5.2.1 1999/08/29 14:58:32 peter Exp $")
 
 ENTRY(__ieee754_sqrt)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_atan.S b/lib/msun/i387/s_atan.S
index 1150cce97802..83603ef751e2 100644
--- a/lib/msun/i387/s_atan.S
+++ b/lib/msun/i387/s_atan.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_atan.S,v 1.5.2.1 1999/08/29 14:58:32 peter Exp $")
 
 ENTRY(atan)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_ceil.S b/lib/msun/i387/s_ceil.S
index e805d8524bb9..b742a28b90a2 100644
--- a/lib/msun/i387/s_ceil.S
+++ b/lib/msun/i387/s_ceil.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_ceil.S,v 1.6.2.1 1999/08/29 14:58:32 peter Exp $")
 
 ENTRY(ceil)
 	pushl	%ebp
diff --git a/lib/msun/i387/s_copysign.S b/lib/msun/i387/s_copysign.S
index ec28b452bfa7..d14502c334ee 100644
--- a/lib/msun/i387/s_copysign.S
+++ b/lib/msun/i387/s_copysign.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_copysign.S,v 1.5.2.1 1999/08/29 14:58:33 peter Exp $")
 
 ENTRY(copysign)
 	movl	16(%esp),%edx
diff --git a/lib/msun/i387/s_cos.S b/lib/msun/i387/s_cos.S
index a73ba0621229..d7c1e4e207c2 100644
--- a/lib/msun/i387/s_cos.S
+++ b/lib/msun/i387/s_cos.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_cos.S,v 1.5.2.1 1999/08/29 14:58:33 peter Exp $")
 
 ENTRY(cos)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_finite.S b/lib/msun/i387/s_finite.S
index b27b7d1149df..8d7fbf0bffaa 100644
--- a/lib/msun/i387/s_finite.S
+++ b/lib/msun/i387/s_finite.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_finite.S,v 1.6.2.1 1999/08/29 14:58:34 peter Exp $")
 
 ENTRY(finite)
 	movl	8(%esp),%eax
diff --git a/lib/msun/i387/s_floor.S b/lib/msun/i387/s_floor.S
index 66c1d9f9d0f5..9ec375b91d30 100644
--- a/lib/msun/i387/s_floor.S
+++ b/lib/msun/i387/s_floor.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_floor.S,v 1.6.2.1 1999/08/29 14:58:35 peter Exp $")
 
 ENTRY(floor)
 	pushl	%ebp
diff --git a/lib/msun/i387/s_ilogb.S b/lib/msun/i387/s_ilogb.S
index c0c0eaf1746e..7587b6ff7c6e 100644
--- a/lib/msun/i387/s_ilogb.S
+++ b/lib/msun/i387/s_ilogb.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_ilogb.S,v 1.6.2.1 1999/08/29 14:58:35 peter Exp $")
 
 ENTRY(ilogb)
 	pushl	%ebp
diff --git a/lib/msun/i387/s_log1p.S b/lib/msun/i387/s_log1p.S
index 24b28219d345..0fa735884564 100644
--- a/lib/msun/i387/s_log1p.S
+++ b/lib/msun/i387/s_log1p.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_log1p.S,v 1.6.2.1 1999/08/29 14:58:36 peter Exp $")
 
 /*
  * The fyl2xp1 instruction has such a limited range:
diff --git a/lib/msun/i387/s_logb.S b/lib/msun/i387/s_logb.S
index ef9d56ef4f6e..b631dfeef6a4 100644
--- a/lib/msun/i387/s_logb.S
+++ b/lib/msun/i387/s_logb.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_logb.S,v 1.5.2.1 1999/08/29 14:58:36 peter Exp $")
 
 ENTRY(logb)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_rint.S b/lib/msun/i387/s_rint.S
index 79da080d7110..7a091b5dce12 100644
--- a/lib/msun/i387/s_rint.S
+++ b/lib/msun/i387/s_rint.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_rint.S,v 1.5.2.1 1999/08/29 14:58:36 peter Exp $")
 
 ENTRY(rint)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_scalbn.S b/lib/msun/i387/s_scalbn.S
index c00e1fb137e0..2c68b9b448b6 100644
--- a/lib/msun/i387/s_scalbn.S
+++ b/lib/msun/i387/s_scalbn.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_scalbn.S,v 1.6.2.1 1999/08/29 14:58:36 peter Exp $")
 
 ENTRY(scalbn)
 	fildl	12(%esp)
diff --git a/lib/msun/i387/s_significand.S b/lib/msun/i387/s_significand.S
index 7210f9bd7512..ed47ad664c8b 100644
--- a/lib/msun/i387/s_significand.S
+++ b/lib/msun/i387/s_significand.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_significand.S,v 1.5.2.1 1999/08/29 14:58:37 peter Exp $")
 
 ENTRY(significand)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_sin.S b/lib/msun/i387/s_sin.S
index d152352abf2f..8721d50b9b38 100644
--- a/lib/msun/i387/s_sin.S
+++ b/lib/msun/i387/s_sin.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_sin.S,v 1.5.2.1 1999/08/29 14:58:37 peter Exp $")
 
 ENTRY(sin)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_tan.S b/lib/msun/i387/s_tan.S
index d0cbc0aabd97..fd5bd53ab3d1 100644
--- a/lib/msun/i387/s_tan.S
+++ b/lib/msun/i387/s_tan.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_tan.S,v 1.5.2.1 1999/08/29 14:58:38 peter Exp $")
 
 ENTRY(tan)
 	fldl	4(%esp)
diff --git a/lib/msun/man/acos.3 b/lib/msun/man/acos.3
index 71418b84be5f..7a9a02ed643d 100644
--- a/lib/msun/man/acos.3
+++ b/lib/msun/man/acos.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)acos.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/acos.3,v 1.5.2.1 1999/08/29 14:58:40 peter Exp $
 .\"
 .Dd May 2, 1991
 .Dt ACOS 3
diff --git a/lib/msun/man/acosh.3 b/lib/msun/man/acosh.3
index b7d9f7b047c3..b591d3cba6b7 100644
--- a/lib/msun/man/acosh.3
+++ b/lib/msun/man/acosh.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)acosh.3	5.2 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/acosh.3,v 1.5.2.1 1999/08/29 14:58:40 peter Exp $
 .\"
 .Dd May 6, 1991
 .Dt ACOSH 3
diff --git a/lib/msun/man/asin.3 b/lib/msun/man/asin.3
index 1e4b2c1cd646..dbc972247e73 100644
--- a/lib/msun/man/asin.3
+++ b/lib/msun/man/asin.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)asin.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/asin.3,v 1.5.2.1 1999/08/29 14:58:41 peter Exp $
 .\"
 .Dd May 2, 1991
 .Dt ASIN 3
diff --git a/lib/msun/man/asinh.3 b/lib/msun/man/asinh.3
index eb3f2f3616f4..e4b94bae5934 100644
--- a/lib/msun/man/asinh.3
+++ b/lib/msun/man/asinh.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)asinh.3	6.4 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/asinh.3,v 1.5.2.1 1999/08/29 14:58:42 peter Exp $
 .\"
 .Dd May 6, 1991
 .Dt ASINH 3
diff --git a/lib/msun/man/atan.3 b/lib/msun/man/atan.3
index e26d0127ae65..9716618f9d36 100644
--- a/lib/msun/man/atan.3
+++ b/lib/msun/man/atan.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)atan.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/atan.3,v 1.5.2.1 1999/08/29 14:58:42 peter Exp $
 .\"
 .Dd May 2, 1991
 .Dt ATAN 3
diff --git a/lib/msun/man/atan2.3 b/lib/msun/man/atan2.3
index 36f1c0c1f7ad..49ac1540af52 100644
--- a/lib/msun/man/atan2.3
+++ b/lib/msun/man/atan2.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)atan2.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/atan2.3,v 1.5.2.1 1999/08/29 14:58:43 peter Exp $
 .\"
 .Dd May 2, 1991
 .Dt ATAN2 3
diff --git a/lib/msun/man/atanh.3 b/lib/msun/man/atanh.3
index 6e770b41944e..4adf3a95a0b2 100644
--- a/lib/msun/man/atanh.3
+++ b/lib/msun/man/atanh.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)atanh.3	5.2 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/atanh.3,v 1.5.2.1 1999/08/29 14:58:43 peter Exp $
 .\"
 .Dd May 6, 1991
 .Dt ATANH 3
diff --git a/lib/msun/man/ceil.3 b/lib/msun/man/ceil.3
index 93f4595779e7..40515fd39528 100644
--- a/lib/msun/man/ceil.3
+++ b/lib/msun/man/ceil.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ceil.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/ceil.3,v 1.7.2.1 1999/08/29 14:58:44 peter Exp $
 .\"
 .Dd March 10, 1994
 .Dt CEIL 3
diff --git a/lib/msun/man/cos.3 b/lib/msun/man/cos.3
index c6b108433827..6f8d2811c5ff 100644
--- a/lib/msun/man/cos.3
+++ b/lib/msun/man/cos.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)cos.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/cos.3,v 1.6.2.1 1999/08/29 14:58:44 peter Exp $
 .\"
 .Dd May 2, 1991
 .Dt COS 3
diff --git a/lib/msun/man/cosh.3 b/lib/msun/man/cosh.3
index 799ba9794299..92b45d99246a 100644
--- a/lib/msun/man/cosh.3
+++ b/lib/msun/man/cosh.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)cosh.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/cosh.3,v 1.6.2.1 1999/08/29 14:58:44 peter Exp $
 .\"
 .Dd May 2, 1991
 .Dt COSH 3
diff --git a/lib/msun/man/erf.3 b/lib/msun/man/erf.3
index 95240b691e2e..dd43570028de 100644
--- a/lib/msun/man/erf.3
+++ b/lib/msun/man/erf.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)erf.3	6.4 (Berkeley) 4/20/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/erf.3,v 1.4.2.1 1999/08/29 14:58:45 peter Exp $
 .\"
 .Dd April 20, 1991
 .Dt ERF 3
diff --git a/lib/msun/man/exp.3 b/lib/msun/man/exp.3
index dc60be6b95a8..f2e22a2e7f3a 100644
--- a/lib/msun/man/exp.3
+++ b/lib/msun/man/exp.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)exp.3	6.12 (Berkeley) 7/31/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/exp.3,v 1.6.2.2 1999/11/09 00:19:48 phantom Exp $
 .\"
 .Dd July 31, 1991
 .Dt EXP 3
diff --git a/lib/msun/man/fabs.3 b/lib/msun/man/fabs.3
index 551b41d8ce08..3fe3a7a544aa 100644
--- a/lib/msun/man/fabs.3
+++ b/lib/msun/man/fabs.3
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)fabs.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/fabs.3,v 1.5.2.1 1999/08/29 14:58:46 peter Exp $
 .\"
 .Dd May 2, 1991
 .Dt FABS 3
diff --git a/lib/msun/man/floor.3 b/lib/msun/man/floor.3
index 4371fd53c4ec..c9e0a354a9a8 100644
--- a/lib/msun/man/floor.3
+++ b/lib/msun/man/floor.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)floor.3	6.5 (Berkeley) 4/19/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/floor.3,v 1.6.2.1 1999/08/29 14:58:47 peter Exp $
 .\"
 .Dd March 10, 1994
 .Dt FLOOR 3
diff --git a/lib/msun/man/fmod.3 b/lib/msun/man/fmod.3
index 849b1d77b44f..3936f3da2ca6 100644
--- a/lib/msun/man/fmod.3
+++ b/lib/msun/man/fmod.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)fmod.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/fmod.3,v 1.4.2.1 1999/08/29 14:58:47 peter Exp $
 .\"
 .Dd May 2, 1991
 .Dt FMOD 3
diff --git a/lib/msun/man/hypot.3 b/lib/msun/man/hypot.3
index c65064ab9193..bf5d96c005d3 100644
--- a/lib/msun/man/hypot.3
+++ b/lib/msun/man/hypot.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)hypot.3	6.7 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/hypot.3,v 1.4.2.1 1999/08/29 14:58:48 peter Exp $
 .\"
 .Dd May 6, 1991
 .Dt HYPOT 3
diff --git a/lib/msun/man/ieee.3 b/lib/msun/man/ieee.3
index 1056fef76524..32e4bcc53dde 100644
--- a/lib/msun/man/ieee.3
+++ b/lib/msun/man/ieee.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ieee.3	6.4 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/ieee.3,v 1.4.2.1 1999/08/29 14:58:48 peter Exp $
 .\"
 .Dd Feb 25, 1994
 .Dt IEEE 3
diff --git a/lib/msun/man/ieee_test.3 b/lib/msun/man/ieee_test.3
index 7ff205939259..f603e9a07263 100644
--- a/lib/msun/man/ieee_test.3
+++ b/lib/msun/man/ieee_test.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ieee.3	6.4 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/ieee_test.3,v 1.4.2.1 1999/08/29 14:58:48 peter Exp $
 .\"
 .Dd March 10, 1994
 .Dt IEEE_TEST 3
diff --git a/lib/msun/man/j0.3 b/lib/msun/man/j0.3
index 8dbbb5bcca73..b0dcb3c1a09d 100644
--- a/lib/msun/man/j0.3
+++ b/lib/msun/man/j0.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)j0.3	6.7 (Berkeley) 4/19/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/j0.3,v 1.6.2.1 1999/08/29 14:58:49 peter Exp $
 .\"
 .Dd April 19, 1991
 .Dt J0 3
diff --git a/lib/msun/man/lgamma.3 b/lib/msun/man/lgamma.3
index b7eeca04ae27..621c3c9f7f18 100644
--- a/lib/msun/man/lgamma.3
+++ b/lib/msun/man/lgamma.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)lgamma.3	6.6 (Berkeley) 12/3/92
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/lgamma.3,v 1.6.2.1 1999/08/29 14:58:50 peter Exp $
 .\"
 .Dd December 3, 1992
 .Dt LGAMMA 3
diff --git a/lib/msun/man/math.3 b/lib/msun/man/math.3
index e2231de2407c..8130b751f96d 100644
--- a/lib/msun/man/math.3
+++ b/lib/msun/man/math.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)math.3	6.10 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/math.3,v 1.7.2.1 1999/08/29 14:58:51 peter Exp $
 .\"
 .TH MATH 3M "May 6, 1991"
 .UC 4
diff --git a/lib/msun/man/rint.3 b/lib/msun/man/rint.3
index c8e320d9d979..52169b39db27 100644
--- a/lib/msun/man/rint.3
+++ b/lib/msun/man/rint.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)rint.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/rint.3,v 1.5.2.1 1999/08/29 14:58:51 peter Exp $
 .\"
 .Dd March 10, 1994
 .Dt RINT 3
diff --git a/lib/msun/man/sin.3 b/lib/msun/man/sin.3
index 82e873bd8286..981db4fd1f90 100644
--- a/lib/msun/man/sin.3
+++ b/lib/msun/man/sin.3
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)sin.3	6.7 (Berkeley) 4/19/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/sin.3,v 1.5.2.1 1999/08/29 14:58:51 peter Exp $
 .\"
 .Dd April 19, 1991
 .Dt SIN 3
diff --git a/lib/msun/man/sinh.3 b/lib/msun/man/sinh.3
index d445a1f1ef6c..e6e74a7c656c 100644
--- a/lib/msun/man/sinh.3
+++ b/lib/msun/man/sinh.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sinh.3	6.6 (Berkeley) 4/19/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/sinh.3,v 1.5.2.1 1999/08/29 14:58:52 peter Exp $
 .Dd April 19, 1991
 .Dt SINH 3
 .Os
diff --git a/lib/msun/man/sqrt.3 b/lib/msun/man/sqrt.3
index 41c16b3b0ef7..8649bdef4254 100644
--- a/lib/msun/man/sqrt.3
+++ b/lib/msun/man/sqrt.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)sqrt.3	6.4 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/sqrt.3,v 1.5.2.1 1999/08/29 14:58:52 peter Exp $
 .\"
 .Dd May 6, 1991
 .Dt SQRT 3
diff --git a/lib/msun/man/tan.3 b/lib/msun/man/tan.3
index 642e243c5756..501281386047 100644
--- a/lib/msun/man/tan.3
+++ b/lib/msun/man/tan.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)tan.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/tan.3,v 1.5.2.1 1999/08/29 14:58:52 peter Exp $
 .\"
 .Dd May 2, 1991
 .Dt TAN 3
diff --git a/lib/msun/man/tanh.3 b/lib/msun/man/tanh.3
index 0145bb783646..1a8467c9971a 100644
--- a/lib/msun/man/tanh.3
+++ b/lib/msun/man/tanh.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)tanh.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/tanh.3,v 1.5.2.1 1999/08/29 14:58:53 peter Exp $
 .\"
 .Dd May 2, 1991
 .Dt TANH 3
diff --git a/lib/msun/src/e_acos.c b/lib/msun/src/e_acos.c
index 7bdb79c9dcd7..1413d034f1ef 100644
--- a/lib/msun/src/e_acos.c
+++ b/lib/msun/src/e_acos.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_acos.c,v 1.6.2.1 1999/08/29 14:58:55 peter Exp $";
 #endif
 
 /* __ieee754_acos(x)
diff --git a/lib/msun/src/e_acosf.c b/lib/msun/src/e_acosf.c
index b249710f36e3..d72c300d200b 100644
--- a/lib/msun/src/e_acosf.c
+++ b/lib/msun/src/e_acosf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_acosf.c,v 1.5.2.1 1999/08/29 14:58:55 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_acosh.c b/lib/msun/src/e_acosh.c
index 434e879fdaab..e4d7ec321604 100644
--- a/lib/msun/src/e_acosh.c
+++ b/lib/msun/src/e_acosh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_acosh.c,v 1.5.2.1 1999/08/29 14:58:55 peter Exp $";
 #endif
 
 /* __ieee754_acosh(x)
diff --git a/lib/msun/src/e_acoshf.c b/lib/msun/src/e_acoshf.c
index ad0e3a380b20..c6783ee12f08 100644
--- a/lib/msun/src/e_acoshf.c
+++ b/lib/msun/src/e_acoshf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_acoshf.c,v 1.5.2.1 1999/08/29 14:58:56 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_asin.c b/lib/msun/src/e_asin.c
index de7af9e71c19..d888d71950b3 100644
--- a/lib/msun/src/e_asin.c
+++ b/lib/msun/src/e_asin.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_asin.c,v 1.7.2.1 1999/08/29 14:58:57 peter Exp $";
 #endif
 
 /* __ieee754_asin(x)
diff --git a/lib/msun/src/e_asinf.c b/lib/msun/src/e_asinf.c
index 2f1e2e2c4f3e..004a3fbefb6d 100644
--- a/lib/msun/src/e_asinf.c
+++ b/lib/msun/src/e_asinf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_asinf.c,v 1.6.2.1 1999/08/29 14:58:57 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_atan2.c b/lib/msun/src/e_atan2.c
index b07d543bfcb2..788ebd0ca352 100644
--- a/lib/msun/src/e_atan2.c
+++ b/lib/msun/src/e_atan2.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_atan2.c,v 1.6.2.1 1999/08/29 14:58:58 peter Exp $";
 #endif
 
 /* __ieee754_atan2(y,x)
diff --git a/lib/msun/src/e_atan2f.c b/lib/msun/src/e_atan2f.c
index 6e6c181bde04..0386f17f0cf2 100644
--- a/lib/msun/src/e_atan2f.c
+++ b/lib/msun/src/e_atan2f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_atan2f.c,v 1.4.2.1 1999/08/29 14:58:59 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_atanh.c b/lib/msun/src/e_atanh.c
index 97a79f0f9e4b..2b31e48bd564 100644
--- a/lib/msun/src/e_atanh.c
+++ b/lib/msun/src/e_atanh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_atanh.c,v 1.4.2.1 1999/08/29 14:58:59 peter Exp $";
 #endif
 
 /* __ieee754_atanh(x)
diff --git a/lib/msun/src/e_atanhf.c b/lib/msun/src/e_atanhf.c
index dc55b3b6706e..8dea9a8e7abf 100644
--- a/lib/msun/src/e_atanhf.c
+++ b/lib/msun/src/e_atanhf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_atanhf.c,v 1.4.2.1 1999/08/29 14:59:00 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_cosh.c b/lib/msun/src/e_cosh.c
index 47723c53d7fc..d2b7f73962e7 100644
--- a/lib/msun/src/e_cosh.c
+++ b/lib/msun/src/e_cosh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_cosh.c,v 1.5.2.1 1999/08/29 14:59:00 peter Exp $";
 #endif
 
 /* __ieee754_cosh(x)
diff --git a/lib/msun/src/e_coshf.c b/lib/msun/src/e_coshf.c
index 9ea041626656..ad87f11182e8 100644
--- a/lib/msun/src/e_coshf.c
+++ b/lib/msun/src/e_coshf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_coshf.c,v 1.4.2.1 1999/08/29 14:59:00 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_exp.c b/lib/msun/src/e_exp.c
index 2fc04c61dbb0..84bab567ba24 100644
--- a/lib/msun/src/e_exp.c
+++ b/lib/msun/src/e_exp.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_exp.c,v 1.6.2.1 1999/08/29 14:59:01 peter Exp $";
 #endif
 
 /* __ieee754_exp(x)
diff --git a/lib/msun/src/e_expf.c b/lib/msun/src/e_expf.c
index 8f37f6f11470..5c9279f1482b 100644
--- a/lib/msun/src/e_expf.c
+++ b/lib/msun/src/e_expf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_expf.c,v 1.5.2.1 1999/08/29 14:59:01 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_fmod.c b/lib/msun/src/e_fmod.c
index f16863072963..86f0ece7a886 100644
--- a/lib/msun/src/e_fmod.c
+++ b/lib/msun/src/e_fmod.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_fmod.c,v 1.5.2.1 1999/08/29 14:59:02 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/e_fmodf.c b/lib/msun/src/e_fmodf.c
index 01d85d07d058..69dc1395c351 100644
--- a/lib/msun/src/e_fmodf.c
+++ b/lib/msun/src/e_fmodf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_fmodf.c,v 1.4.2.1 1999/08/29 14:59:02 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/e_gamma.c b/lib/msun/src/e_gamma.c
index bad4569e5175..9e8233b0406d 100644
--- a/lib/msun/src/e_gamma.c
+++ b/lib/msun/src/e_gamma.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_gamma.c,v 1.4.2.1 1999/08/29 14:59:03 peter Exp $";
 #endif
 
 /* __ieee754_gamma(x)
diff --git a/lib/msun/src/e_gamma_r.c b/lib/msun/src/e_gamma_r.c
index 7d5197f88cf3..5f68a7aa3149 100644
--- a/lib/msun/src/e_gamma_r.c
+++ b/lib/msun/src/e_gamma_r.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_gamma_r.c,v 1.4.2.1 1999/08/29 14:59:03 peter Exp $";
 #endif
 
 /* __ieee754_gamma_r(x, signgamp)
diff --git a/lib/msun/src/e_gammaf.c b/lib/msun/src/e_gammaf.c
index f05ebefdcd99..145770442bbf 100644
--- a/lib/msun/src/e_gammaf.c
+++ b/lib/msun/src/e_gammaf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_gammaf.c,v 1.4.2.1 1999/08/29 14:59:04 peter Exp $";
 #endif
 
 /* __ieee754_gammaf(x)
diff --git a/lib/msun/src/e_gammaf_r.c b/lib/msun/src/e_gammaf_r.c
index 6847aa79ddd7..a8fec78f66ec 100644
--- a/lib/msun/src/e_gammaf_r.c
+++ b/lib/msun/src/e_gammaf_r.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_gammaf_r.c,v 1.4.2.1 1999/08/29 14:59:04 peter Exp $";
 #endif
 
 /* __ieee754_gammaf_r(x, signgamp)
diff --git a/lib/msun/src/e_hypot.c b/lib/msun/src/e_hypot.c
index 40af9c789f58..de3eb36419a0 100644
--- a/lib/msun/src/e_hypot.c
+++ b/lib/msun/src/e_hypot.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_hypot.c,v 1.5.2.1 1999/08/29 14:59:05 peter Exp $";
 #endif
 
 /* __ieee754_hypot(x,y)
diff --git a/lib/msun/src/e_hypotf.c b/lib/msun/src/e_hypotf.c
index 52b2288876b5..f60f64d4dfd7 100644
--- a/lib/msun/src/e_hypotf.c
+++ b/lib/msun/src/e_hypotf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_hypotf.c,v 1.6.2.1 1999/08/29 14:59:05 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_j0.c b/lib/msun/src/e_j0.c
index 1747d784d6bb..ccd76a55baf3 100644
--- a/lib/msun/src/e_j0.c
+++ b/lib/msun/src/e_j0.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_j0.c,v 1.4.2.1 1999/08/29 14:59:05 peter Exp $";
 #endif
 
 /* __ieee754_j0(x), __ieee754_y0(x)
diff --git a/lib/msun/src/e_j0f.c b/lib/msun/src/e_j0f.c
index ad27122ac163..a97d415e7de1 100644
--- a/lib/msun/src/e_j0f.c
+++ b/lib/msun/src/e_j0f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_j0f.c,v 1.4.2.1 1999/08/29 14:59:06 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_j1.c b/lib/msun/src/e_j1.c
index 6d60a785bf56..03daa5aec79f 100644
--- a/lib/msun/src/e_j1.c
+++ b/lib/msun/src/e_j1.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_j1.c,v 1.4.2.1 1999/08/29 14:59:07 peter Exp $";
 #endif
 
 /* __ieee754_j1(x), __ieee754_y1(x)
diff --git a/lib/msun/src/e_j1f.c b/lib/msun/src/e_j1f.c
index 2d4b93aec31d..6005246d9d85 100644
--- a/lib/msun/src/e_j1f.c
+++ b/lib/msun/src/e_j1f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_j1f.c,v 1.4.2.1 1999/08/29 14:59:07 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_jn.c b/lib/msun/src/e_jn.c
index cfe26e81f583..6ae318a37f16 100644
--- a/lib/msun/src/e_jn.c
+++ b/lib/msun/src/e_jn.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_jn.c,v 1.5.2.1 1999/08/29 14:59:08 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/e_jnf.c b/lib/msun/src/e_jnf.c
index 03ed9308c88e..0306370336dd 100644
--- a/lib/msun/src/e_jnf.c
+++ b/lib/msun/src/e_jnf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_jnf.c,v 1.5.2.1 1999/08/29 14:59:08 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_lgamma.c b/lib/msun/src/e_lgamma.c
index ca25a43c0078..60975be40617 100644
--- a/lib/msun/src/e_lgamma.c
+++ b/lib/msun/src/e_lgamma.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_lgamma.c,v 1.4.2.1 1999/08/29 14:59:08 peter Exp $";
 #endif
 
 /* __ieee754_lgamma(x)
diff --git a/lib/msun/src/e_lgamma_r.c b/lib/msun/src/e_lgamma_r.c
index a66465589081..83158c5e59bd 100644
--- a/lib/msun/src/e_lgamma_r.c
+++ b/lib/msun/src/e_lgamma_r.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_lgamma_r.c,v 1.4.2.1 1999/08/29 14:59:09 peter Exp $";
 #endif
 
 /* __ieee754_lgamma_r(x, signgamp)
diff --git a/lib/msun/src/e_lgammaf.c b/lib/msun/src/e_lgammaf.c
index dde3f95ba2f1..5081d68bb942 100644
--- a/lib/msun/src/e_lgammaf.c
+++ b/lib/msun/src/e_lgammaf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_lgammaf.c,v 1.4.2.1 1999/08/29 14:59:09 peter Exp $";
 #endif
 
 /* __ieee754_lgammaf(x)
diff --git a/lib/msun/src/e_lgammaf_r.c b/lib/msun/src/e_lgammaf_r.c
index 0e578880568f..953af7036018 100644
--- a/lib/msun/src/e_lgammaf_r.c
+++ b/lib/msun/src/e_lgammaf_r.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_lgammaf_r.c,v 1.4.2.1 1999/08/29 14:59:09 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_log.c b/lib/msun/src/e_log.c
index 6ebeb910d020..ca4525027e6e 100644
--- a/lib/msun/src/e_log.c
+++ b/lib/msun/src/e_log.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_log.c,v 1.5.2.1 1999/08/29 14:59:10 peter Exp $";
 #endif
 
 /* __ieee754_log(x)
diff --git a/lib/msun/src/e_log10.c b/lib/msun/src/e_log10.c
index 5c02df8c33fb..23be986199d7 100644
--- a/lib/msun/src/e_log10.c
+++ b/lib/msun/src/e_log10.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_log10.c,v 1.6.2.1 1999/08/29 14:59:10 peter Exp $";
 #endif
 
 /* __ieee754_log10(x)
diff --git a/lib/msun/src/e_log10f.c b/lib/msun/src/e_log10f.c
index 8b11d3817cf6..872815ef8241 100644
--- a/lib/msun/src/e_log10f.c
+++ b/lib/msun/src/e_log10f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_log10f.c,v 1.5.2.1 1999/08/29 14:59:11 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_logf.c b/lib/msun/src/e_logf.c
index 4a286a6a97e5..7cce44932001 100644
--- a/lib/msun/src/e_logf.c
+++ b/lib/msun/src/e_logf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_logf.c,v 1.4.2.1 1999/08/29 14:59:11 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_pow.c b/lib/msun/src/e_pow.c
index 18ba4fa1ec35..b2ce3d1cd938 100644
--- a/lib/msun/src/e_pow.c
+++ b/lib/msun/src/e_pow.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_pow.c,v 1.5.2.1 1999/08/29 14:59:12 peter Exp $";
 #endif
 
 /* __ieee754_pow(x,y) return x**y
diff --git a/lib/msun/src/e_powf.c b/lib/msun/src/e_powf.c
index 34f5d4718e57..919f13f8ecfa 100644
--- a/lib/msun/src/e_powf.c
+++ b/lib/msun/src/e_powf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_powf.c,v 1.5.2.1 1999/08/29 14:59:13 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_rem_pio2.c b/lib/msun/src/e_rem_pio2.c
index 0d182de316ed..62aea0f0652d 100644
--- a/lib/msun/src/e_rem_pio2.c
+++ b/lib/msun/src/e_rem_pio2.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.5.2.1 1999/08/29 14:59:13 peter Exp $";
 #endif
 
 /* __ieee754_rem_pio2(x,y)
diff --git a/lib/msun/src/e_rem_pio2f.c b/lib/msun/src/e_rem_pio2f.c
index cf9cecc36c86..110b1e07e912 100644
--- a/lib/msun/src/e_rem_pio2f.c
+++ b/lib/msun/src/e_rem_pio2f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.5.2.1 1999/08/29 14:59:14 peter Exp $";
 #endif
 
 /* __ieee754_rem_pio2f(x,y)
diff --git a/lib/msun/src/e_remainder.c b/lib/msun/src/e_remainder.c
index c41d392adc58..d90441b579a4 100644
--- a/lib/msun/src/e_remainder.c
+++ b/lib/msun/src/e_remainder.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_remainder.c,v 1.5.2.1 1999/08/29 14:59:14 peter Exp $";
 #endif
 
 /* __ieee754_remainder(x,p)
diff --git a/lib/msun/src/e_remainderf.c b/lib/msun/src/e_remainderf.c
index d5f670e8a022..240f3890fb2d 100644
--- a/lib/msun/src/e_remainderf.c
+++ b/lib/msun/src/e_remainderf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_remainderf.c,v 1.4.2.1 1999/08/29 14:59:14 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_scalb.c b/lib/msun/src/e_scalb.c
index 14f167ee0d54..496caa2448e9 100644
--- a/lib/msun/src/e_scalb.c
+++ b/lib/msun/src/e_scalb.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_scalb.c,v 1.5.2.1 1999/08/29 14:59:15 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/e_scalbf.c b/lib/msun/src/e_scalbf.c
index c6785703fe05..c0835423a183 100644
--- a/lib/msun/src/e_scalbf.c
+++ b/lib/msun/src/e_scalbf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_scalbf.c,v 1.4.2.1 1999/08/29 14:59:15 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_sinh.c b/lib/msun/src/e_sinh.c
index 2ac789118699..33ed7d15ffd7 100644
--- a/lib/msun/src/e_sinh.c
+++ b/lib/msun/src/e_sinh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_sinh.c,v 1.5.2.1 1999/08/29 14:59:16 peter Exp $";
 #endif
 
 /* __ieee754_sinh(x)
diff --git a/lib/msun/src/e_sinhf.c b/lib/msun/src/e_sinhf.c
index fc417dee769b..892df0e82208 100644
--- a/lib/msun/src/e_sinhf.c
+++ b/lib/msun/src/e_sinhf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_sinhf.c,v 1.4.2.1 1999/08/29 14:59:16 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_sqrt.c b/lib/msun/src/e_sqrt.c
index bea3b200abbd..e4b66623c571 100644
--- a/lib/msun/src/e_sqrt.c
+++ b/lib/msun/src/e_sqrt.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_sqrt.c,v 1.5.2.1 1999/08/29 14:59:17 peter Exp $";
 #endif
 
 /* __ieee754_sqrt(x)
diff --git a/lib/msun/src/e_sqrtf.c b/lib/msun/src/e_sqrtf.c
index b7e7d6105004..134504db5888 100644
--- a/lib/msun/src/e_sqrtf.c
+++ b/lib/msun/src/e_sqrtf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_sqrtf.c,v 1.4.2.1 1999/08/29 14:59:17 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/get_hw_float.c b/lib/msun/src/get_hw_float.c
index ffa9d7050c14..c1cdc0bd9b10 100644
--- a/lib/msun/src/get_hw_float.c
+++ b/lib/msun/src/get_hw_float.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/get_hw_float.c,v 1.2.4.1 1999/08/29 14:59:18 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/msun/src/k_cos.c b/lib/msun/src/k_cos.c
index 1694c3f489b8..bc0afaa5843f 100644
--- a/lib/msun/src/k_cos.c
+++ b/lib/msun/src/k_cos.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_cos.c,v 1.4.2.1 1999/08/29 14:59:19 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/k_cosf.c b/lib/msun/src/k_cosf.c
index fb49a6b9994f..abe30d753ff1 100644
--- a/lib/msun/src/k_cosf.c
+++ b/lib/msun/src/k_cosf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_cosf.c,v 1.4.2.1 1999/08/29 14:59:19 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/k_rem_pio2.c b/lib/msun/src/k_rem_pio2.c
index 8971a84e5c75..92ea5f230085 100644
--- a/lib/msun/src/k_rem_pio2.c
+++ b/lib/msun/src/k_rem_pio2.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_rem_pio2.c,v 1.4.2.1 1999/08/29 14:59:20 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/k_rem_pio2f.c b/lib/msun/src/k_rem_pio2f.c
index 00144974a05e..fc73db12023b 100644
--- a/lib/msun/src/k_rem_pio2f.c
+++ b/lib/msun/src/k_rem_pio2f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_rem_pio2f.c,v 1.4.2.1 1999/08/29 14:59:20 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/k_sin.c b/lib/msun/src/k_sin.c
index df2dc26b751c..4f51771fdfdf 100644
--- a/lib/msun/src/k_sin.c
+++ b/lib/msun/src/k_sin.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_sin.c,v 1.4.2.1 1999/08/29 14:59:21 peter Exp $";
 #endif
 
 /* __kernel_sin( x, y, iy)
diff --git a/lib/msun/src/k_sinf.c b/lib/msun/src/k_sinf.c
index ab81d4d265be..a83d2a8c8800 100644
--- a/lib/msun/src/k_sinf.c
+++ b/lib/msun/src/k_sinf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_sinf.c,v 1.4.2.1 1999/08/29 14:59:21 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/k_standard.c b/lib/msun/src/k_standard.c
index 2b62052d8220..72f5d59659d8 100644
--- a/lib/msun/src/k_standard.c
+++ b/lib/msun/src/k_standard.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_standard.c,v 1.4.2.1 1999/08/29 14:59:22 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/k_tan.c b/lib/msun/src/k_tan.c
index d03c3874cd5b..062b76de6c08 100644
--- a/lib/msun/src/k_tan.c
+++ b/lib/msun/src/k_tan.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_tan.c,v 1.4.2.1 1999/08/29 14:59:23 peter Exp $";
 #endif
 
 /* __kernel_tan( x, y, k )
diff --git a/lib/msun/src/k_tanf.c b/lib/msun/src/k_tanf.c
index bb03b9fb4962..1337777e6c9d 100644
--- a/lib/msun/src/k_tanf.c
+++ b/lib/msun/src/k_tanf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_tanf.c,v 1.4.2.1 1999/08/29 14:59:23 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/math.h b/lib/msun/src/math.h
index 6d518775157c..cd649e46109a 100644
--- a/lib/msun/src/math.h
+++ b/lib/msun/src/math.h
@@ -11,7 +11,7 @@
 
 /*
  * from: @(#)fdlibm.h 5.1 93/09/24
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/math.h,v 1.7.2.1 1999/08/29 14:59:23 peter Exp $
  */
 
 #ifndef _MATH_H_
diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h
index 668d49936d65..80e53f0e1f2e 100644
--- a/lib/msun/src/math_private.h
+++ b/lib/msun/src/math_private.h
@@ -11,7 +11,7 @@
 
 /*
  * from: @(#)fdlibm.h 5.1 93/09/24
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/math_private.h,v 1.5.2.1 1999/08/29 14:59:24 peter Exp $
  */
 
 #ifndef _MATH_PRIVATE_H_
diff --git a/lib/msun/src/s_asinh.c b/lib/msun/src/s_asinh.c
index c1dbde88d992..452c305e147d 100644
--- a/lib/msun/src/s_asinh.c
+++ b/lib/msun/src/s_asinh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_asinh.c,v 1.5.2.1 1999/08/29 14:59:24 peter Exp $";
 #endif
 
 /* asinh(x)
diff --git a/lib/msun/src/s_asinhf.c b/lib/msun/src/s_asinhf.c
index 9910b2a43d63..ee156bc98f05 100644
--- a/lib/msun/src/s_asinhf.c
+++ b/lib/msun/src/s_asinhf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_asinhf.c,v 1.5.2.1 1999/08/29 14:59:24 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_atan.c b/lib/msun/src/s_atan.c
index 029fbc29b6fa..d2adea73f551 100644
--- a/lib/msun/src/s_atan.c
+++ b/lib/msun/src/s_atan.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_atan.c,v 1.5.2.1 1999/08/29 14:59:25 peter Exp $";
 #endif
 
 /* atan(x)
diff --git a/lib/msun/src/s_atanf.c b/lib/msun/src/s_atanf.c
index ff702f6e66b0..bcf3ce4a81bd 100644
--- a/lib/msun/src/s_atanf.c
+++ b/lib/msun/src/s_atanf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_atanf.c,v 1.4.2.1 1999/08/29 14:59:25 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_cbrt.c b/lib/msun/src/s_cbrt.c
index 93edad76a033..beb5291c88d6 100644
--- a/lib/msun/src/s_cbrt.c
+++ b/lib/msun/src/s_cbrt.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_cbrt.c,v 1.4.2.1 1999/08/29 14:59:26 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_cbrtf.c b/lib/msun/src/s_cbrtf.c
index c1c2fa1a370c..364b78b422b4 100644
--- a/lib/msun/src/s_cbrtf.c
+++ b/lib/msun/src/s_cbrtf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_cbrtf.c,v 1.4.2.1 1999/08/29 14:59:26 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_ceil.c b/lib/msun/src/s_ceil.c
index 2c59c783c88d..0c4f46c4a17a 100644
--- a/lib/msun/src/s_ceil.c
+++ b/lib/msun/src/s_ceil.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ceil.c,v 1.5.2.1 1999/08/29 14:59:27 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_ceilf.c b/lib/msun/src/s_ceilf.c
index 06993ad8c059..e4c5ff6202be 100644
--- a/lib/msun/src/s_ceilf.c
+++ b/lib/msun/src/s_ceilf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ceilf.c,v 1.4.2.1 1999/08/29 14:59:27 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_copysign.c b/lib/msun/src/s_copysign.c
index 4f758d229d5a..56bfe3792b31 100644
--- a/lib/msun/src/s_copysign.c
+++ b/lib/msun/src/s_copysign.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_copysign.c,v 1.5.2.1 1999/08/29 14:59:28 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_copysignf.c b/lib/msun/src/s_copysignf.c
index ae0980fcaa80..1688263c0a84 100644
--- a/lib/msun/src/s_copysignf.c
+++ b/lib/msun/src/s_copysignf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_copysignf.c,v 1.4.2.1 1999/08/29 14:59:28 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_cos.c b/lib/msun/src/s_cos.c
index 707af78c97f8..3854617279b0 100644
--- a/lib/msun/src/s_cos.c
+++ b/lib/msun/src/s_cos.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_cos.c,v 1.5.2.1 1999/08/29 14:59:29 peter Exp $";
 #endif
 
 /* cos(x)
diff --git a/lib/msun/src/s_cosf.c b/lib/msun/src/s_cosf.c
index 4091350e412b..d06c7bc0ff3a 100644
--- a/lib/msun/src/s_cosf.c
+++ b/lib/msun/src/s_cosf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_cosf.c,v 1.4.2.1 1999/08/29 14:59:29 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_erf.c b/lib/msun/src/s_erf.c
index bfe5b12bba5c..4f68e43b4521 100644
--- a/lib/msun/src/s_erf.c
+++ b/lib/msun/src/s_erf.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_erf.c,v 1.4.2.1 1999/08/29 14:59:30 peter Exp $";
 #endif
 
 /* double erf(double x)
diff --git a/lib/msun/src/s_erff.c b/lib/msun/src/s_erff.c
index e9cc40951328..e3fdb39ae94f 100644
--- a/lib/msun/src/s_erff.c
+++ b/lib/msun/src/s_erff.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_erff.c,v 1.4.2.1 1999/08/29 14:59:30 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_expm1.c b/lib/msun/src/s_expm1.c
index adc879b0ecbb..d9f35c63d8a1 100644
--- a/lib/msun/src/s_expm1.c
+++ b/lib/msun/src/s_expm1.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_expm1.c,v 1.4.2.1 1999/08/29 14:59:31 peter Exp $";
 #endif
 
 /* expm1(x)
diff --git a/lib/msun/src/s_expm1f.c b/lib/msun/src/s_expm1f.c
index 0fc0699b9fc6..e5525d1ce7f6 100644
--- a/lib/msun/src/s_expm1f.c
+++ b/lib/msun/src/s_expm1f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_expm1f.c,v 1.4.2.1 1999/08/29 14:59:31 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_fabs.c b/lib/msun/src/s_fabs.c
index 74e59133685e..870ef39cb94c 100644
--- a/lib/msun/src/s_fabs.c
+++ b/lib/msun/src/s_fabs.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_fabs.c,v 1.4.2.1 1999/08/29 14:59:32 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_fabsf.c b/lib/msun/src/s_fabsf.c
index b14ae6e6c346..45641f41d55b 100644
--- a/lib/msun/src/s_fabsf.c
+++ b/lib/msun/src/s_fabsf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_fabsf.c,v 1.4.2.1 1999/08/29 14:59:32 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_finite.c b/lib/msun/src/s_finite.c
index 88e3298d5d79..e361cfd8cc59 100644
--- a/lib/msun/src/s_finite.c
+++ b/lib/msun/src/s_finite.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_finite.c,v 1.5.2.1 1999/08/29 14:59:33 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_finitef.c b/lib/msun/src/s_finitef.c
index 07038db67a59..02f3c12ff065 100644
--- a/lib/msun/src/s_finitef.c
+++ b/lib/msun/src/s_finitef.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_finitef.c,v 1.4.2.1 1999/08/29 14:59:33 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_floor.c b/lib/msun/src/s_floor.c
index 85ace779ede2..c2f3fb401f76 100644
--- a/lib/msun/src/s_floor.c
+++ b/lib/msun/src/s_floor.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_floor.c,v 1.5.2.1 1999/08/29 14:59:34 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_floorf.c b/lib/msun/src/s_floorf.c
index 116ec1dd6cb8..93122deb131e 100644
--- a/lib/msun/src/s_floorf.c
+++ b/lib/msun/src/s_floorf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_floorf.c,v 1.4.2.1 1999/08/29 14:59:34 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_frexp.c b/lib/msun/src/s_frexp.c
index 178479d316f3..011d35dba730 100644
--- a/lib/msun/src/s_frexp.c
+++ b/lib/msun/src/s_frexp.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_frexp.c,v 1.5.2.1 1999/08/29 14:59:35 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_frexpf.c b/lib/msun/src/s_frexpf.c
index fbec6670ad96..c55430f9b9e4 100644
--- a/lib/msun/src/s_frexpf.c
+++ b/lib/msun/src/s_frexpf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_frexpf.c,v 1.5.2.1 1999/08/29 14:59:35 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_ilogb.c b/lib/msun/src/s_ilogb.c
index d2c82650a88b..b75511d75eb2 100644
--- a/lib/msun/src/s_ilogb.c
+++ b/lib/msun/src/s_ilogb.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ilogb.c,v 1.5.2.1 1999/08/29 14:59:36 peter Exp $";
 #endif
 
 /* ilogb(double x)
diff --git a/lib/msun/src/s_ilogbf.c b/lib/msun/src/s_ilogbf.c
index a912d1a28ff9..e08abad067cb 100644
--- a/lib/msun/src/s_ilogbf.c
+++ b/lib/msun/src/s_ilogbf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ilogbf.c,v 1.4.2.1 1999/08/29 14:59:36 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_isnan.c b/lib/msun/src/s_isnan.c
index 18cfcf2ac936..bd738e1c617f 100644
--- a/lib/msun/src/s_isnan.c
+++ b/lib/msun/src/s_isnan.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_isnan.c,v 1.4.2.1 1999/08/29 14:59:37 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_isnanf.c b/lib/msun/src/s_isnanf.c
index 0e48718a505a..c4fef6ef9c91 100644
--- a/lib/msun/src/s_isnanf.c
+++ b/lib/msun/src/s_isnanf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_isnanf.c,v 1.4.2.1 1999/08/29 14:59:37 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_ldexp.c b/lib/msun/src/s_ldexp.c
index 463170114948..711c227f808e 100644
--- a/lib/msun/src/s_ldexp.c
+++ b/lib/msun/src/s_ldexp.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ldexp.c,v 1.4.2.1 1999/08/29 14:59:37 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_ldexpf.c b/lib/msun/src/s_ldexpf.c
index 5091873072fb..d4f968cbcaf2 100644
--- a/lib/msun/src/s_ldexpf.c
+++ b/lib/msun/src/s_ldexpf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ldexpf.c,v 1.4.2.1 1999/08/29 14:59:39 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_lib_version.c b/lib/msun/src/s_lib_version.c
index 29269d3d4fda..74e5d47b8277 100644
--- a/lib/msun/src/s_lib_version.c
+++ b/lib/msun/src/s_lib_version.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_lib_version.c,v 1.4.2.1 1999/08/29 14:59:39 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_log1p.c b/lib/msun/src/s_log1p.c
index 0a60f9512607..78a893e43883 100644
--- a/lib/msun/src/s_log1p.c
+++ b/lib/msun/src/s_log1p.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_log1p.c,v 1.4.2.1 1999/08/29 14:59:39 peter Exp $";
 #endif
 
 /* double log1p(double x)
diff --git a/lib/msun/src/s_log1pf.c b/lib/msun/src/s_log1pf.c
index 2923d016c58a..20e814936fd3 100644
--- a/lib/msun/src/s_log1pf.c
+++ b/lib/msun/src/s_log1pf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_log1pf.c,v 1.4.2.1 1999/08/29 14:59:40 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_logb.c b/lib/msun/src/s_logb.c
index 8b724f49594c..c2d20eeaa762 100644
--- a/lib/msun/src/s_logb.c
+++ b/lib/msun/src/s_logb.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_logb.c,v 1.5.2.1 1999/08/29 14:59:40 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_logbf.c b/lib/msun/src/s_logbf.c
index 1d345437bb2c..2b0279f4796e 100644
--- a/lib/msun/src/s_logbf.c
+++ b/lib/msun/src/s_logbf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_logbf.c,v 1.4.2.1 1999/08/29 14:59:41 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_matherr.c b/lib/msun/src/s_matherr.c
index 3f7a8275cd14..3e72c285887b 100644
--- a/lib/msun/src/s_matherr.c
+++ b/lib/msun/src/s_matherr.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_matherr.c,v 1.4.2.1 1999/08/29 14:59:41 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_modf.c b/lib/msun/src/s_modf.c
index 50a261d71569..4e66fcf21b60 100644
--- a/lib/msun/src/s_modf.c
+++ b/lib/msun/src/s_modf.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_modf.c,v 1.4.2.1 1999/08/29 14:59:42 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_modff.c b/lib/msun/src/s_modff.c
index bedb49ffb7dd..512c4a42029f 100644
--- a/lib/msun/src/s_modff.c
+++ b/lib/msun/src/s_modff.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_modff.c,v 1.4.2.1 1999/08/29 14:59:43 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_nextafter.c b/lib/msun/src/s_nextafter.c
index a54b82312a4e..411377cce991 100644
--- a/lib/msun/src/s_nextafter.c
+++ b/lib/msun/src/s_nextafter.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_nextafter.c,v 1.4.2.1 1999/08/29 14:59:43 peter Exp $";
 #endif
 
 /* IEEE functions
diff --git a/lib/msun/src/s_nextafterf.c b/lib/msun/src/s_nextafterf.c
index d976a20167c2..021fd0916443 100644
--- a/lib/msun/src/s_nextafterf.c
+++ b/lib/msun/src/s_nextafterf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_nextafterf.c,v 1.4.2.1 1999/08/29 14:59:44 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_rint.c b/lib/msun/src/s_rint.c
index aa4145209528..bf805f0d1957 100644
--- a/lib/msun/src/s_rint.c
+++ b/lib/msun/src/s_rint.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_rint.c,v 1.6.2.1 1999/08/29 14:59:45 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_rintf.c b/lib/msun/src/s_rintf.c
index 3bb8b1cd374b..ae8c9daa6de8 100644
--- a/lib/msun/src/s_rintf.c
+++ b/lib/msun/src/s_rintf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_rintf.c,v 1.5.2.1 1999/08/29 14:59:45 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_scalbn.c b/lib/msun/src/s_scalbn.c
index b69bdcd58cdb..09867f6baa7f 100644
--- a/lib/msun/src/s_scalbn.c
+++ b/lib/msun/src/s_scalbn.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_scalbn.c,v 1.5.2.1 1999/08/29 14:59:46 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_scalbnf.c b/lib/msun/src/s_scalbnf.c
index 7dd75956df3f..c4d8c0ba0d15 100644
--- a/lib/msun/src/s_scalbnf.c
+++ b/lib/msun/src/s_scalbnf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_scalbnf.c,v 1.4.2.1 1999/08/29 14:59:46 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_significand.c b/lib/msun/src/s_significand.c
index 64d4623e857f..bd801e6c87a1 100644
--- a/lib/msun/src/s_significand.c
+++ b/lib/msun/src/s_significand.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_significand.c,v 1.5.2.1 1999/08/29 14:59:47 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_significandf.c b/lib/msun/src/s_significandf.c
index 73cfa71c33b3..f6dd9d303711 100644
--- a/lib/msun/src/s_significandf.c
+++ b/lib/msun/src/s_significandf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_significandf.c,v 1.4.2.1 1999/08/29 14:59:47 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_sin.c b/lib/msun/src/s_sin.c
index e6b099edb527..1d48190b6d39 100644
--- a/lib/msun/src/s_sin.c
+++ b/lib/msun/src/s_sin.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_sin.c,v 1.5.2.1 1999/08/29 14:59:48 peter Exp $";
 #endif
 
 /* sin(x)
diff --git a/lib/msun/src/s_sinf.c b/lib/msun/src/s_sinf.c
index ba3adffc1b60..d27970aa5be1 100644
--- a/lib/msun/src/s_sinf.c
+++ b/lib/msun/src/s_sinf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_sinf.c,v 1.4.2.1 1999/08/29 14:59:49 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_tan.c b/lib/msun/src/s_tan.c
index e02584e3116f..8dde9249c296 100644
--- a/lib/msun/src/s_tan.c
+++ b/lib/msun/src/s_tan.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_tan.c,v 1.5.2.1 1999/08/29 14:59:49 peter Exp $";
 #endif
 
 /* tan(x)
diff --git a/lib/msun/src/s_tanf.c b/lib/msun/src/s_tanf.c
index 65ab1bf925e0..1f632324d786 100644
--- a/lib/msun/src/s_tanf.c
+++ b/lib/msun/src/s_tanf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_tanf.c,v 1.4.2.1 1999/08/29 14:59:50 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_tanh.c b/lib/msun/src/s_tanh.c
index 4f58fcffeecb..9aa9bbd1a05f 100644
--- a/lib/msun/src/s_tanh.c
+++ b/lib/msun/src/s_tanh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_tanh.c,v 1.4.2.1 1999/08/29 14:59:51 peter Exp $";
 #endif
 
 /* Tanh(x)
diff --git a/lib/msun/src/s_tanhf.c b/lib/msun/src/s_tanhf.c
index cdfd5f6c09aa..975db2cdbb51 100644
--- a/lib/msun/src/s_tanhf.c
+++ b/lib/msun/src/s_tanhf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_tanhf.c,v 1.4.2.1 1999/08/29 14:59:51 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/w_acos.c b/lib/msun/src/w_acos.c
index 3e8c6e53cf69..0c7990f84228 100644
--- a/lib/msun/src/w_acos.c
+++ b/lib/msun/src/w_acos.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_acos.c,v 1.4.2.1 1999/08/29 14:59:52 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_acosf.c b/lib/msun/src/w_acosf.c
index c2292c655d5f..e7800edca5cb 100644
--- a/lib/msun/src/w_acosf.c
+++ b/lib/msun/src/w_acosf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_acosf.c,v 1.4.2.1 1999/08/29 14:59:52 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_acosh.c b/lib/msun/src/w_acosh.c
index 197d6d75e2fa..395fa778ad43 100644
--- a/lib/msun/src/w_acosh.c
+++ b/lib/msun/src/w_acosh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_acosh.c,v 1.4.2.1 1999/08/29 14:59:53 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_acoshf.c b/lib/msun/src/w_acoshf.c
index 08798899ff31..c9c1a39e2c75 100644
--- a/lib/msun/src/w_acoshf.c
+++ b/lib/msun/src/w_acoshf.c
@@ -15,7 +15,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_acoshf.c,v 1.4.2.1 1999/08/29 14:59:54 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_asin.c b/lib/msun/src/w_asin.c
index d5b25238ab2d..bd6c6ba3f778 100644
--- a/lib/msun/src/w_asin.c
+++ b/lib/msun/src/w_asin.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_asin.c,v 1.4.2.1 1999/08/29 14:59:54 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_asinf.c b/lib/msun/src/w_asinf.c
index 6972cb9d6b3d..68333e212f06 100644
--- a/lib/msun/src/w_asinf.c
+++ b/lib/msun/src/w_asinf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_asinf.c,v 1.4.2.1 1999/08/29 14:59:55 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_atan2.c b/lib/msun/src/w_atan2.c
index 8f4c826f494e..4328a6fdc0f1 100644
--- a/lib/msun/src/w_atan2.c
+++ b/lib/msun/src/w_atan2.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_atan2.c,v 1.4.2.1 1999/08/29 14:59:55 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_atan2f.c b/lib/msun/src/w_atan2f.c
index 45e5a14d9b99..323d8725aa00 100644
--- a/lib/msun/src/w_atan2f.c
+++ b/lib/msun/src/w_atan2f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_atan2f.c,v 1.4.2.1 1999/08/29 14:59:55 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_atanh.c b/lib/msun/src/w_atanh.c
index d96c9b77cee4..d643f736ebc8 100644
--- a/lib/msun/src/w_atanh.c
+++ b/lib/msun/src/w_atanh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_atanh.c,v 1.4.2.1 1999/08/29 14:59:56 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_atanhf.c b/lib/msun/src/w_atanhf.c
index 9da087b28517..1399224ae2d0 100644
--- a/lib/msun/src/w_atanhf.c
+++ b/lib/msun/src/w_atanhf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_atanhf.c,v 1.4.2.1 1999/08/29 14:59:56 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_cosh.c b/lib/msun/src/w_cosh.c
index f20d4c52c4a2..336655215362 100644
--- a/lib/msun/src/w_cosh.c
+++ b/lib/msun/src/w_cosh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_cosh.c,v 1.4.2.1 1999/08/29 14:59:56 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_coshf.c b/lib/msun/src/w_coshf.c
index 61e74f8c7c99..22f31f221c44 100644
--- a/lib/msun/src/w_coshf.c
+++ b/lib/msun/src/w_coshf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_coshf.c,v 1.4.2.1 1999/08/29 14:59:57 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_exp.c b/lib/msun/src/w_exp.c
index 7d1e74b5a711..08e58f7abfbc 100644
--- a/lib/msun/src/w_exp.c
+++ b/lib/msun/src/w_exp.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_exp.c,v 1.4.2.1 1999/08/29 14:59:57 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_expf.c b/lib/msun/src/w_expf.c
index 07bd13b73ffb..dfb182c8f920 100644
--- a/lib/msun/src/w_expf.c
+++ b/lib/msun/src/w_expf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_expf.c,v 1.4.2.1 1999/08/29 14:59:58 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_fmod.c b/lib/msun/src/w_fmod.c
index 4ee45a16745e..518812e2cfd4 100644
--- a/lib/msun/src/w_fmod.c
+++ b/lib/msun/src/w_fmod.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_fmod.c,v 1.4.2.1 1999/08/29 14:59:58 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_fmodf.c b/lib/msun/src/w_fmodf.c
index b948ee17ae5d..2fd2b2bd3027 100644
--- a/lib/msun/src/w_fmodf.c
+++ b/lib/msun/src/w_fmodf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_fmodf.c,v 1.4.2.1 1999/08/29 14:59:58 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_gamma.c b/lib/msun/src/w_gamma.c
index fb3d12709d89..0e32711cd29d 100644
--- a/lib/msun/src/w_gamma.c
+++ b/lib/msun/src/w_gamma.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_gamma.c,v 1.4.2.1 1999/08/29 14:59:59 peter Exp $";
 #endif
 
 /* double gamma(double x)
diff --git a/lib/msun/src/w_gamma_r.c b/lib/msun/src/w_gamma_r.c
index 2f10023b3191..530abe1c2db0 100644
--- a/lib/msun/src/w_gamma_r.c
+++ b/lib/msun/src/w_gamma_r.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_gamma_r.c,v 1.4.2.1 1999/08/29 15:00:00 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_gammaf.c b/lib/msun/src/w_gammaf.c
index 0e579c78c73f..e6c93069862a 100644
--- a/lib/msun/src/w_gammaf.c
+++ b/lib/msun/src/w_gammaf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_gammaf.c,v 1.4.2.1 1999/08/29 15:00:00 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/w_gammaf_r.c b/lib/msun/src/w_gammaf_r.c
index aa71d6987d18..4a9b3f5a6656 100644
--- a/lib/msun/src/w_gammaf_r.c
+++ b/lib/msun/src/w_gammaf_r.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_gammaf_r.c,v 1.4.2.1 1999/08/29 15:00:01 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_hypot.c b/lib/msun/src/w_hypot.c
index 6486c8ded645..7027c74e113f 100644
--- a/lib/msun/src/w_hypot.c
+++ b/lib/msun/src/w_hypot.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_hypot.c,v 1.4.2.1 1999/08/29 15:00:01 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_hypotf.c b/lib/msun/src/w_hypotf.c
index 77c055d020eb..a10cb72ba5c5 100644
--- a/lib/msun/src/w_hypotf.c
+++ b/lib/msun/src/w_hypotf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_hypotf.c,v 1.4.2.1 1999/08/29 15:00:01 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_j0.c b/lib/msun/src/w_j0.c
index e1a4f85c7eee..b1a03270078d 100644
--- a/lib/msun/src/w_j0.c
+++ b/lib/msun/src/w_j0.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_j0.c,v 1.5.2.1 1999/08/29 15:00:02 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_j0f.c b/lib/msun/src/w_j0f.c
index 2c6df51806b9..b36ab104f39c 100644
--- a/lib/msun/src/w_j0f.c
+++ b/lib/msun/src/w_j0f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_j0f.c,v 1.5.2.1 1999/08/29 15:00:02 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_j1.c b/lib/msun/src/w_j1.c
index 86f1a3f71d9e..bb3e3dc8ab50 100644
--- a/lib/msun/src/w_j1.c
+++ b/lib/msun/src/w_j1.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_j1.c,v 1.5.2.1 1999/08/29 15:00:03 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_j1f.c b/lib/msun/src/w_j1f.c
index 8ef1478dc21d..32a1b6a229c6 100644
--- a/lib/msun/src/w_j1f.c
+++ b/lib/msun/src/w_j1f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_j1f.c,v 1.5.2.1 1999/08/29 15:00:03 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_jn.c b/lib/msun/src/w_jn.c
index 0b087e512b48..2eff814a9bce 100644
--- a/lib/msun/src/w_jn.c
+++ b/lib/msun/src/w_jn.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_jn.c,v 1.6.2.1 1999/08/29 15:00:03 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_jnf.c b/lib/msun/src/w_jnf.c
index 9ce1bede7c82..ca17f592c176 100644
--- a/lib/msun/src/w_jnf.c
+++ b/lib/msun/src/w_jnf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_jnf.c,v 1.5.2.1 1999/08/29 15:00:04 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/w_lgamma.c b/lib/msun/src/w_lgamma.c
index 3ee3999b839b..e4ffc8b68b7f 100644
--- a/lib/msun/src/w_lgamma.c
+++ b/lib/msun/src/w_lgamma.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_lgamma.c,v 1.4.2.1 1999/08/29 15:00:05 peter Exp $";
 #endif
 
 /* double lgamma(double x)
diff --git a/lib/msun/src/w_lgamma_r.c b/lib/msun/src/w_lgamma_r.c
index 80fd27e0eecc..9a4c1873b37b 100644
--- a/lib/msun/src/w_lgamma_r.c
+++ b/lib/msun/src/w_lgamma_r.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_lgamma_r.c,v 1.4.2.1 1999/08/29 15:00:05 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_lgammaf.c b/lib/msun/src/w_lgammaf.c
index 7a237ca0c373..ec78dca8c741 100644
--- a/lib/msun/src/w_lgammaf.c
+++ b/lib/msun/src/w_lgammaf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_lgammaf.c,v 1.4.2.1 1999/08/29 15:00:06 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/w_lgammaf_r.c b/lib/msun/src/w_lgammaf_r.c
index 2646669a1a59..8fbec7454bcd 100644
--- a/lib/msun/src/w_lgammaf_r.c
+++ b/lib/msun/src/w_lgammaf_r.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_lgammaf_r.c,v 1.4.2.1 1999/08/29 15:00:06 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_log.c b/lib/msun/src/w_log.c
index 7150aaa70c11..f88c4355cc8f 100644
--- a/lib/msun/src/w_log.c
+++ b/lib/msun/src/w_log.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_log.c,v 1.4.2.1 1999/08/29 15:00:07 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_log10.c b/lib/msun/src/w_log10.c
index e6cdca11da02..206649179e3f 100644
--- a/lib/msun/src/w_log10.c
+++ b/lib/msun/src/w_log10.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_log10.c,v 1.4.2.1 1999/08/29 15:00:07 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_log10f.c b/lib/msun/src/w_log10f.c
index b5f1247663d4..49ed4599febf 100644
--- a/lib/msun/src/w_log10f.c
+++ b/lib/msun/src/w_log10f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_log10f.c,v 1.4.2.1 1999/08/29 15:00:07 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_logf.c b/lib/msun/src/w_logf.c
index dee641b01675..de2c256b839c 100644
--- a/lib/msun/src/w_logf.c
+++ b/lib/msun/src/w_logf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_logf.c,v 1.4.2.1 1999/08/29 15:00:08 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_powf.c b/lib/msun/src/w_powf.c
index 24a2cf442163..5e15d6998977 100644
--- a/lib/msun/src/w_powf.c
+++ b/lib/msun/src/w_powf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_powf.c,v 1.4.2.1 1999/08/29 15:00:08 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_remainder.c b/lib/msun/src/w_remainder.c
index 7d40df436220..f8674e524870 100644
--- a/lib/msun/src/w_remainder.c
+++ b/lib/msun/src/w_remainder.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_remainder.c,v 1.4.2.1 1999/08/29 15:00:09 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_remainderf.c b/lib/msun/src/w_remainderf.c
index 9cc28d4c1905..df5d98370899 100644
--- a/lib/msun/src/w_remainderf.c
+++ b/lib/msun/src/w_remainderf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_remainderf.c,v 1.4.2.1 1999/08/29 15:00:09 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_scalb.c b/lib/msun/src/w_scalb.c
index c12b5e82f256..62123871d84a 100644
--- a/lib/msun/src/w_scalb.c
+++ b/lib/msun/src/w_scalb.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_scalb.c,v 1.4.2.1 1999/08/29 15:00:10 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_scalbf.c b/lib/msun/src/w_scalbf.c
index 357850303d86..9fd0bc407d57 100644
--- a/lib/msun/src/w_scalbf.c
+++ b/lib/msun/src/w_scalbf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_scalbf.c,v 1.4.2.1 1999/08/29 15:00:11 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_sinh.c b/lib/msun/src/w_sinh.c
index 7ed5ec786651..44b3485e4a1c 100644
--- a/lib/msun/src/w_sinh.c
+++ b/lib/msun/src/w_sinh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_sinh.c,v 1.4.2.1 1999/08/29 15:00:11 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_sinhf.c b/lib/msun/src/w_sinhf.c
index 345440d6442e..7708aaded829 100644
--- a/lib/msun/src/w_sinhf.c
+++ b/lib/msun/src/w_sinhf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_sinhf.c,v 1.4.2.1 1999/08/29 15:00:12 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_sqrt.c b/lib/msun/src/w_sqrt.c
index f9b08a41bf05..2f34ea897fc1 100644
--- a/lib/msun/src/w_sqrt.c
+++ b/lib/msun/src/w_sqrt.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_sqrt.c,v 1.4.2.1 1999/08/29 15:00:12 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_sqrtf.c b/lib/msun/src/w_sqrtf.c
index 1b50a1833ceb..09ac7315ccc0 100644
--- a/lib/msun/src/w_sqrtf.c
+++ b/lib/msun/src/w_sqrtf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_sqrtf.c,v 1.4.2.1 1999/08/29 15:00:13 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_y0.c b/lib/msun/src/w_y0.c
index d2da8ce9b4f4..328073148588 100644
--- a/lib/msun/src/w_y0.c
+++ b/lib/msun/src/w_y0.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_y0.c,v 1.2.4.1 1999/08/29 15:00:13 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_y0f.c b/lib/msun/src/w_y0f.c
index a716441ab9bd..25fb0060159e 100644
--- a/lib/msun/src/w_y0f.c
+++ b/lib/msun/src/w_y0f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_y0f.c,v 1.2.4.1 1999/08/29 15:00:13 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_y1.c b/lib/msun/src/w_y1.c
index cde47aacaacf..19390247b288 100644
--- a/lib/msun/src/w_y1.c
+++ b/lib/msun/src/w_y1.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_y1.c,v 1.2.4.1 1999/08/29 15:00:14 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_y1f.c b/lib/msun/src/w_y1f.c
index 0b8f33225c13..0330f42cbd97 100644
--- a/lib/msun/src/w_y1f.c
+++ b/lib/msun/src/w_y1f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_y1f.c,v 1.2.4.1 1999/08/29 15:00:14 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_yn.c b/lib/msun/src/w_yn.c
index 2323d26ffb56..914afc03fa19 100644
--- a/lib/msun/src/w_yn.c
+++ b/lib/msun/src/w_yn.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_yn.c,v 1.2.4.1 1999/08/29 15:00:15 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_ynf.c b/lib/msun/src/w_ynf.c
index f7a24981c310..84ecafca3716 100644
--- a/lib/msun/src/w_ynf.c
+++ b/lib/msun/src/w_ynf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/w_ynf.c,v 1.2.4.1 1999/08/29 15:00:15 peter Exp $";
 #endif
 
 #include "math.h"
diff --git a/libexec/Makefile b/libexec/Makefile
index 40c4ff505b22..c8744b42797c 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/Makefile,v 1.37.2.3 1999/12/13 15:08:13 peter Exp $
 
 # Present but disabled: kpasswdd
 SUBDIR=	atrun bootpd comsat fingerd ftpd getNAME getty \
diff --git a/libexec/atrun/LEGAL b/libexec/atrun/LEGAL
index af8be572d5cd..b546bee3b151 100644
--- a/libexec/atrun/LEGAL
+++ b/libexec/atrun/LEGAL
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/atrun/LEGAL,v 1.4.2.1 1999/08/29 15:02:38 peter Exp $
 
 -----BEGIN PGP SIGNED MESSAGE-----
 
diff --git a/libexec/atrun/Makefile b/libexec/atrun/Makefile
index 563e10196549..07c82b358fa3 100644
--- a/libexec/atrun/Makefile
+++ b/libexec/atrun/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/atrun/Makefile,v 1.6.2.1 1999/08/29 15:02:38 peter Exp $
 
 MAINSRC= ${.CURDIR}/../../usr.bin/at
 
diff --git a/libexec/atrun/atrun.c b/libexec/atrun/atrun.c
index ae9ebc916a90..aa18a3ef41f4 100644
--- a/libexec/atrun/atrun.c
+++ b/libexec/atrun/atrun.c
@@ -25,7 +25,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/atrun/atrun.c,v 1.13.2.1 1999/08/29 15:02:39 peter Exp $";
 #endif /* not lint */
 
 /* System Headers */
diff --git a/libexec/atrun/atrun.man b/libexec/atrun/atrun.man
index a157f2af4cb5..153927295190 100644
--- a/libexec/atrun/atrun.man
+++ b/libexec/atrun/atrun.man
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/atrun/atrun.man,v 1.5.2.3 1999/08/29 15:02:40 peter Exp $
 .Dd April 12, 1995
 .Dt ATRUN 8
 .Os FreeBSD 2.1
diff --git a/libexec/atrun/gloadavg.c b/libexec/atrun/gloadavg.c
index 6cffe5a4cfec..7d8a4709b8f2 100644
--- a/libexec/atrun/gloadavg.c
+++ b/libexec/atrun/gloadavg.c
@@ -25,7 +25,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/atrun/gloadavg.c,v 1.4.2.1 1999/08/29 15:02:40 peter Exp $";
 #endif /* not lint */
 
 #ifndef __FreeBSD__
diff --git a/libexec/atrun/gloadavg.h b/libexec/atrun/gloadavg.h
index 48890ce54b59..71d358d0602d 100644
--- a/libexec/atrun/gloadavg.h
+++ b/libexec/atrun/gloadavg.h
@@ -25,5 +25,5 @@
 
 double gloadavg(void);
 #if 0
-static char atrun_h_rcsid[] = "$FreeBSD$";
+static char atrun_h_rcsid[] = "$FreeBSD: src/libexec/atrun/gloadavg.h,v 1.3.2.1 1999/08/29 15:02:41 peter Exp $";
 #endif
diff --git a/libexec/bootpd/Announce b/libexec/bootpd/Announce
index 60838d5e978e..c2033d94849a 100644
--- a/libexec/bootpd/Announce
+++ b/libexec/bootpd/Announce
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/Announce,v 1.4.2.1 1999/08/29 15:02:43 peter Exp $
 
 This is an enhanced version of the CMU BOOTP server which was derived
 from the original BOOTP server created by Bill Croft at Stanford.
diff --git a/libexec/bootpd/Changes b/libexec/bootpd/Changes
index d797ea1fa9e5..2119e63835e5 100644
--- a/libexec/bootpd/Changes
+++ b/libexec/bootpd/Changes
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/Changes,v 1.4.2.1 1999/08/29 15:02:44 peter Exp $
 
 Changes, most recent first
 Date, <email> Real Name
diff --git a/libexec/bootpd/Makefile b/libexec/bootpd/Makefile
index f428be888778..68677691a83f 100644
--- a/libexec/bootpd/Makefile
+++ b/libexec/bootpd/Makefile
@@ -1,5 +1,5 @@
 # bootpd/Makefile
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/Makefile,v 1.7.2.1 1999/08/29 15:02:44 peter Exp $
 
 PROG=	bootpd
 CFLAGS+= -DETC_ETHERS
diff --git a/libexec/bootpd/Makefile.UNIX b/libexec/bootpd/Makefile.UNIX
index 5b2c186bcb4b..76cac91ba981 100644
--- a/libexec/bootpd/Makefile.UNIX
+++ b/libexec/bootpd/Makefile.UNIX
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/Makefile.UNIX,v 1.4.2.1 1999/08/29 15:02:45 peter Exp $
 #
 # Makefile for the BOOTP programs:
 #   bootpd	- BOOTP server daemon
diff --git a/libexec/bootpd/Makefile.inc b/libexec/bootpd/Makefile.inc
index 829da300445d..7727187181ae 100644
--- a/libexec/bootpd/Makefile.inc
+++ b/libexec/bootpd/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/Makefile.inc,v 1.3.2.1 1999/08/29 15:02:45 peter Exp $
 
 BINDIR?=	/usr/libexec
diff --git a/libexec/bootpd/Problems b/libexec/bootpd/Problems
index c7f9951946b3..6077a3f18445 100644
--- a/libexec/bootpd/Problems
+++ b/libexec/bootpd/Problems
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/Problems,v 1.4.2.1 1999/08/29 15:02:46 peter Exp $
 
 Common problems and ways to work around them:
 
diff --git a/libexec/bootpd/README b/libexec/bootpd/README
index a88cca5b6450..2fa37810a7e8 100644
--- a/libexec/bootpd/README
+++ b/libexec/bootpd/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/README,v 1.4.2.1 1999/08/29 15:02:47 peter Exp $
 
 This is an enhanced version of the CMU BOOTP server which was derived
 from the original BOOTP server created by Bill Croft at Stanford.
diff --git a/libexec/bootpd/bootp.h b/libexec/bootpd/bootp.h
index 6ff568087511..100e21891da9 100644
--- a/libexec/bootpd/bootp.h
+++ b/libexec/bootpd/bootp.h
@@ -23,7 +23,7 @@ SOFTWARE.
 /*
  * Bootstrap Protocol (BOOTP).  RFC951 and RFC1395.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/bootp.h,v 1.3.2.1 1999/08/29 15:02:47 peter Exp $
  *
  *
  * This file specifies the "implementation-independent" BOOTP protocol
diff --git a/libexec/bootpd/bootpd.8 b/libexec/bootpd/bootpd.8
index 5630167d6cec..8f93ebc58c49 100644
--- a/libexec/bootpd/bootpd.8
+++ b/libexec/bootpd/bootpd.8
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1988, 1989, 1991 Carnegie Mellon University
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/bootpd/bootpd.8,v 1.9.2.1 1999/08/29 15:02:48 peter Exp $
 .\"
 .Dd November 06, 1993
 .Dt BOOTPD 8
diff --git a/libexec/bootpd/bootpd.c b/libexec/bootpd/bootpd.c
index 216e08f18f4f..567de320b109 100644
--- a/libexec/bootpd/bootpd.c
+++ b/libexec/bootpd/bootpd.c
@@ -19,7 +19,7 @@ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
 ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
- $FreeBSD$
+ $FreeBSD: src/libexec/bootpd/bootpd.c,v 1.10.2.2 1999/08/29 15:02:48 peter Exp $
 
 ************************************************************************/
 
diff --git a/libexec/bootpd/bootpgw/Makefile b/libexec/bootpd/bootpgw/Makefile
index 4a658533741f..eb984baa97df 100644
--- a/libexec/bootpd/bootpgw/Makefile
+++ b/libexec/bootpd/bootpgw/Makefile
@@ -1,5 +1,5 @@
 # Makefile
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/bootpgw/Makefile,v 1.3.2.1 1999/08/29 15:02:59 peter Exp $
 
 PROG=	bootpgw
 NOMAN=  true
diff --git a/libexec/bootpd/bootptab.5 b/libexec/bootpd/bootptab.5
index eee489d74e28..83ea0d72a572 100644
--- a/libexec/bootpd/bootptab.5
+++ b/libexec/bootpd/bootptab.5
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1988, 1989, 1991 Carnegie Mellon University
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/bootpd/bootptab.5,v 1.2.2.2 1999/08/29 15:02:49 peter Exp $
 .\"
 .Dd October 31, 1991
 .Dt BOOTPTAB 5
diff --git a/libexec/bootpd/bootptab.mcs b/libexec/bootpd/bootptab.mcs
index 9bce37e07f29..a96e647c75df 100644
--- a/libexec/bootpd/bootptab.mcs
+++ b/libexec/bootpd/bootptab.mcs
@@ -2,7 +2,7 @@
 # Last update: gwr, Sun Dec 12 19:00:00 EDT 1993
 # Blank lines and lines beginning with '#' are ignored.
 #
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/bootptab.mcs,v 1.4.2.1 1999/08/29 15:02:49 peter Exp $
 #
 # Legend:	(see bootptab.5)
 #	first field -- hostname (not indented)
diff --git a/libexec/bootpd/dovend.c b/libexec/bootpd/dovend.c
index 9c8457b74908..953626e7e20c 100644
--- a/libexec/bootpd/dovend.c
+++ b/libexec/bootpd/dovend.c
@@ -1,7 +1,7 @@
 /*
  * dovend.c : Inserts all but the first few vendor options.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/dovend.c,v 1.4.2.1 1999/08/29 15:02:50 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/dumptab.c b/libexec/bootpd/dumptab.c
index 5fa832098062..ddc24e620aeb 100644
--- a/libexec/bootpd/dumptab.c
+++ b/libexec/bootpd/dumptab.c
@@ -1,7 +1,7 @@
 /*
  * dumptab.c - handles dumping the database
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/dumptab.c,v 1.5.2.1 1999/08/29 15:02:51 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/getether.c b/libexec/bootpd/getether.c
index 8f95a59292ad..0f8e4037c28c 100644
--- a/libexec/bootpd/getether.c
+++ b/libexec/bootpd/getether.c
@@ -7,7 +7,7 @@
  * If you figure out how to do this on another system,
  * please let me know.  <gwr@mc.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/getether.c,v 1.8.2.1 1999/08/29 15:02:52 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/getif.c b/libexec/bootpd/getif.c
index ec7cd8f716db..852c58e8159e 100644
--- a/libexec/bootpd/getif.c
+++ b/libexec/bootpd/getif.c
@@ -1,7 +1,7 @@
 /*
  * getif.c : get an interface structure
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/getif.c,v 1.6.2.1 1999/08/29 15:02:52 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/hash.c b/libexec/bootpd/hash.c
index 16b042032e76..53175448db0a 100644
--- a/libexec/bootpd/hash.c
+++ b/libexec/bootpd/hash.c
@@ -19,7 +19,7 @@ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
 ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
- $FreeBSD$
+ $FreeBSD: src/libexec/bootpd/hash.c,v 1.4.2.1 1999/08/29 15:02:53 peter Exp $
 
 ************************************************************************/
 
diff --git a/libexec/bootpd/hwaddr.c b/libexec/bootpd/hwaddr.c
index 9a9de1a98cb5..5f7f047cfa58 100644
--- a/libexec/bootpd/hwaddr.c
+++ b/libexec/bootpd/hwaddr.c
@@ -2,7 +2,7 @@
  * hwaddr.c - routines that deal with hardware addresses.
  * (i.e. Ethernet)
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/hwaddr.c,v 1.6.2.1 1999/08/29 15:02:53 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/hwaddr.h b/libexec/bootpd/hwaddr.h
index 200427356e48..34f2ac199e17 100644
--- a/libexec/bootpd/hwaddr.h
+++ b/libexec/bootpd/hwaddr.h
@@ -1,7 +1,7 @@
 /* 
  * hwaddr.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/hwaddr.h,v 1.4.2.1 1999/08/29 15:02:54 peter Exp $
  */
 
 #ifndef	HWADDR_H
diff --git a/libexec/bootpd/lookup.c b/libexec/bootpd/lookup.c
index 54b3f62242f7..cb3a596cfd5e 100644
--- a/libexec/bootpd/lookup.c
+++ b/libexec/bootpd/lookup.c
@@ -1,7 +1,7 @@
 /*
  * lookup.c - Lookup IP address, HW address, netmask
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/lookup.c,v 1.6.2.1 1999/08/29 15:02:54 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/patchlevel.h b/libexec/bootpd/patchlevel.h
index fc79f18b4068..824b6756f53a 100644
--- a/libexec/bootpd/patchlevel.h
+++ b/libexec/bootpd/patchlevel.h
@@ -1,7 +1,7 @@
 /* 
  * patchlevel.h 
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/patchlevel.h,v 1.4.2.1 1999/08/29 15:02:55 peter Exp $
  */
 
 #define VERSION 	"2.4"
diff --git a/libexec/bootpd/readfile.c b/libexec/bootpd/readfile.c
index 58c65b57edeb..9a277f99903e 100644
--- a/libexec/bootpd/readfile.c
+++ b/libexec/bootpd/readfile.c
@@ -19,7 +19,7 @@ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
 ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
- $FreeBSD$
+ $FreeBSD: src/libexec/bootpd/readfile.c,v 1.5.2.1 1999/08/29 15:02:56 peter Exp $
 
 ************************************************************************/
 
diff --git a/libexec/bootpd/rtmsg.c b/libexec/bootpd/rtmsg.c
index 40b872864cfd..9c6d88e3ee0f 100644
--- a/libexec/bootpd/rtmsg.c
+++ b/libexec/bootpd/rtmsg.c
@@ -39,7 +39,7 @@
 
 /*
  * from arp.c	8.2 (Berkeley) 1/2/94
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/rtmsg.c,v 1.9.2.1 1999/08/29 15:02:56 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/libexec/bootpd/tools/Makefile b/libexec/bootpd/tools/Makefile
index e905bffa7696..f0f68530b2c7 100644
--- a/libexec/bootpd/tools/Makefile
+++ b/libexec/bootpd/tools/Makefile
@@ -1,5 +1,5 @@
 # Makefile
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/tools/Makefile,v 1.3.2.1 1999/08/29 15:03:00 peter Exp $
 
 SUBDIR=	bootpef bootptest
 
diff --git a/libexec/bootpd/tools/Makefile.inc b/libexec/bootpd/tools/Makefile.inc
index 16007eec373b..2fceb89f8b7f 100644
--- a/libexec/bootpd/tools/Makefile.inc
+++ b/libexec/bootpd/tools/Makefile.inc
@@ -1,4 +1,4 @@
 # Makefile.inc
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/tools/Makefile.inc,v 1.3.2.1 1999/08/29 15:03:01 peter Exp $
 
 BINDIR=/usr/sbin
diff --git a/libexec/bootpd/tools/bootpef/Makefile b/libexec/bootpd/tools/bootpef/Makefile
index dfb766255864..f452e9089e92 100644
--- a/libexec/bootpd/tools/bootpef/Makefile
+++ b/libexec/bootpd/tools/bootpef/Makefile
@@ -1,5 +1,5 @@
 # Makefile
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/tools/bootpef/Makefile,v 1.3.2.1 1999/08/29 15:03:02 peter Exp $
 
 PROG=	bootpef
 MAN8=	bootpef.8
diff --git a/libexec/bootpd/tools/bootpef/bootpef.c b/libexec/bootpd/tools/bootpef/bootpef.c
index 893efd87ea35..b43227650b9e 100644
--- a/libexec/bootpd/tools/bootpef/bootpef.c
+++ b/libexec/bootpd/tools/bootpef/bootpef.c
@@ -19,7 +19,7 @@ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
 ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
- $FreeBSD$
+ $FreeBSD: src/libexec/bootpd/tools/bootpef/bootpef.c,v 1.4.2.2 1999/08/29 15:03:02 peter Exp $
 
 ************************************************************************/
 
diff --git a/libexec/bootpd/tools/bootptest/Makefile b/libexec/bootpd/tools/bootptest/Makefile
index 1bc8887432f2..2d255d8b1179 100644
--- a/libexec/bootpd/tools/bootptest/Makefile
+++ b/libexec/bootpd/tools/bootptest/Makefile
@@ -1,5 +1,5 @@
 # Makefile
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/tools/bootptest/Makefile,v 1.5.2.1 1999/08/29 15:03:04 peter Exp $
 
 PROG=	bootptest
 MAN8=	bootptest.8
diff --git a/libexec/bootpd/tools/bootptest/bootptest.c b/libexec/bootpd/tools/bootptest/bootptest.c
index f56a095b73d2..54e6f979c765 100644
--- a/libexec/bootpd/tools/bootptest/bootptest.c
+++ b/libexec/bootpd/tools/bootptest/bootptest.c
@@ -31,7 +31,7 @@
  * 09/28/93 Released version 1.0
  * 09/93 Original developed by Gordon W. Ross <gwr@mc.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/tools/bootptest/bootptest.c,v 1.5.2.2 1999/08/29 15:03:05 peter Exp $
  */
 
 char *usage = "bootptest [-h] server-name [vendor-data-template-file]";
diff --git a/libexec/bootpd/tools/bootptest/print-bootp.c b/libexec/bootpd/tools/bootptest/print-bootp.c
index 977a32dd4165..9d20fcaad99a 100644
--- a/libexec/bootpd/tools/bootptest/print-bootp.c
+++ b/libexec/bootpd/tools/bootptest/print-bootp.c
@@ -23,7 +23,7 @@
  * This file was copied from tcpdump-2.1.1 and modified.
  * There is an e-mail list for tcpdump: <tcpdump@ee.lbl.gov>
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/tools/bootptest/print-bootp.c,v 1.5.2.1 1999/08/29 15:03:05 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/libexec/bootpd/trygetea.c b/libexec/bootpd/trygetea.c
index 0ae63a3a2fba..cbd9df66806a 100644
--- a/libexec/bootpd/trygetea.c
+++ b/libexec/bootpd/trygetea.c
@@ -1,7 +1,7 @@
 /*
  * trygetea.c - test program for getether.c
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/trygetea.c,v 1.4.2.1 1999/08/29 15:02:57 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/trygetif.c b/libexec/bootpd/trygetif.c
index 0e2cca195b23..bd3272583a44 100644
--- a/libexec/bootpd/trygetif.c
+++ b/libexec/bootpd/trygetif.c
@@ -1,7 +1,7 @@
 /*
  * trygetif.c - test program for getif.c
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/trygetif.c,v 1.4.2.1 1999/08/29 15:02:57 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/trylook.c b/libexec/bootpd/trylook.c
index 9484d04b6da3..ec2cb5b28973 100644
--- a/libexec/bootpd/trylook.c
+++ b/libexec/bootpd/trylook.c
@@ -1,7 +1,7 @@
 /*
  * trylook.c - test program for lookup.c
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/trylook.c,v 1.4.2.1 1999/08/29 15:02:57 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/comsat/Makefile b/libexec/comsat/Makefile
index d3a6740c4677..9bbe9aff92f9 100644
--- a/libexec/comsat/Makefile
+++ b/libexec/comsat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/comsat/Makefile,v 1.5.2.1 1999/08/29 15:03:07 peter Exp $
 
 PROG=	comsat
 MAN8=	comsat.8
diff --git a/libexec/comsat/comsat.8 b/libexec/comsat/comsat.8
index eb0d7d30cd0f..c26d17bda764 100644
--- a/libexec/comsat/comsat.8
+++ b/libexec/comsat/comsat.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)comsat.8	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/comsat/comsat.8,v 1.5.2.1 1999/08/29 15:03:08 peter Exp $
 .\"
 .Dd June 4, 1993
 .Dt COMSAT 8
diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c
index ab920a21f553..b920fa70bc29 100644
--- a/libexec/comsat/comsat.c
+++ b/libexec/comsat/comsat.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)comsat.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/comsat/comsat.c,v 1.12.2.1 1999/08/29 15:03:08 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/fingerd/Makefile b/libexec/fingerd/Makefile
index 6c78d8d4c5a4..49a09a20ce63 100644
--- a/libexec/fingerd/Makefile
+++ b/libexec/fingerd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/fingerd/Makefile,v 1.5.2.2 1999/08/29 15:03:09 peter Exp $
 
 PROG=	fingerd
 DPADD=	${LIBUTIL}
diff --git a/libexec/fingerd/fingerd.c b/libexec/fingerd/fingerd.c
index 3420f93f6173..8e673cd7c034 100644
--- a/libexec/fingerd/fingerd.c
+++ b/libexec/fingerd/fingerd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)fingerd.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/fingerd/fingerd.c,v 1.11.2.2 1999/08/29 15:03:10 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index 234233a5650e..20b130d378b7 100644
--- a/libexec/ftpd/Makefile
+++ b/libexec/ftpd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/4/94
-# $FreeBSD$
+# $FreeBSD: src/libexec/ftpd/Makefile,v 1.25.2.1 1999/08/29 15:03:11 peter Exp $
 
 PROG=	ftpd
 MAN8=	ftpd.8
diff --git a/libexec/ftpd/extern.h b/libexec/ftpd/extern.h
index badaaeb2d5fc..2c9464370898 100644
--- a/libexec/ftpd/extern.h
+++ b/libexec/ftpd/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/4/94
- * $FreeBSD$
+ * $FreeBSD: src/libexec/ftpd/extern.h,v 1.11.2.1 1999/08/29 15:03:11 peter Exp $
  */
 
 void	blkfree __P((char **));
diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y
index 359fa81dca20..e3ce9fa0f9d7 100644
--- a/libexec/ftpd/ftpcmd.y
+++ b/libexec/ftpd/ftpcmd.y
@@ -45,7 +45,7 @@
 static char sccsid[] = "@(#)ftpcmd.y	8.3 (Berkeley) 4/6/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.13.2.1 1999/08/29 15:03:11 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8
index 6146ac74180e..acccbddb1d40 100644
--- a/libexec/ftpd/ftpd.8
+++ b/libexec/ftpd/ftpd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ftpd.8	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/ftpd/ftpd.8,v 1.25.2.3 1999/08/29 15:03:12 peter Exp $
 .\"
 .Dd April 19, 1994
 .Dt FTPD 8
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 329bb111e96a..cbe544683c61 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -44,7 +44,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)ftpd.c	8.4 (Berkeley) 4/16/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.52.2.3 1999/10/25 08:31:50 mharo Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/ftpd/logwtmp.c b/libexec/ftpd/logwtmp.c
index d3f2ec56c883..054758586333 100644
--- a/libexec/ftpd/logwtmp.c
+++ b/libexec/ftpd/logwtmp.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)logwtmp.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/ftpd/logwtmp.c,v 1.7.2.1 1999/08/29 15:03:13 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/libexec/ftpd/pathnames.h b/libexec/ftpd/pathnames.h
index a8837a90c446..24b14063fe9f 100644
--- a/libexec/ftpd/pathnames.h
+++ b/libexec/ftpd/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/libexec/ftpd/pathnames.h,v 1.10.2.1 1999/08/29 15:03:14 peter Exp $
  */
 
 #include <paths.h>
diff --git a/libexec/ftpd/popen.c b/libexec/ftpd/popen.c
index 7e6670551774..826bb665d2c9 100644
--- a/libexec/ftpd/popen.c
+++ b/libexec/ftpd/popen.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)popen.c	8.3 (Berkeley) 4/6/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/ftpd/popen.c,v 1.15.2.1 1999/08/29 15:03:14 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/libexec/ftpd/skey-stuff.c b/libexec/ftpd/skey-stuff.c
index f06a4150e2ce..41e2bcd93774 100644
--- a/libexec/ftpd/skey-stuff.c
+++ b/libexec/ftpd/skey-stuff.c
@@ -3,7 +3,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/ftpd/skey-stuff.c,v 1.11.2.1 1999/08/29 15:03:15 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/libexec/getNAME/Makefile b/libexec/getNAME/Makefile
index a88492c48eb9..607a906af0c2 100644
--- a/libexec/getNAME/Makefile
+++ b/libexec/getNAME/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/getNAME/Makefile,v 1.4.2.1 1999/08/29 15:03:16 peter Exp $
 
 PROG=	getNAME
 
diff --git a/libexec/getNAME/getNAME.1 b/libexec/getNAME/getNAME.1
index 27e85bd13ba8..6b0a3949a745 100644
--- a/libexec/getNAME/getNAME.1
+++ b/libexec/getNAME/getNAME.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/getNAME/getNAME.1,v 1.7.2.1 1999/08/29 15:03:16 peter Exp $
 
 .Dd July 8, 1996
 .Dt getNAME 1
diff --git a/libexec/getNAME/getNAME.c b/libexec/getNAME/getNAME.c
index 3fd63bdb6b79..b3c56c011dd7 100644
--- a/libexec/getNAME/getNAME.c
+++ b/libexec/getNAME/getNAME.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)getNAME.c	8.1 (Berkeley) 6/30/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/getNAME/getNAME.c,v 1.6.2.1 1999/08/29 15:03:17 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/getty/Makefile b/libexec/getty/Makefile
index 595ae44a0d5e..16570baf05f7 100644
--- a/libexec/getty/Makefile
+++ b/libexec/getty/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/getty/Makefile,v 1.8.2.1 1999/08/29 15:03:19 peter Exp $
 
 PROG=	getty
 SRCS=	main.c init.c subr.c chat.c
diff --git a/libexec/getty/chat.c b/libexec/getty/chat.c
index 1fdef26ef44a..74ad548219b3 100644
--- a/libexec/getty/chat.c
+++ b/libexec/getty/chat.c
@@ -25,7 +25,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/getty/chat.c,v 1.5.2.1 1999/08/29 15:03:19 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/getty/extern.h b/libexec/getty/extern.h
index 94fe3cc127c5..de07fd213e7f 100644
--- a/libexec/getty/extern.h
+++ b/libexec/getty/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)extern.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/libexec/getty/extern.h,v 1.5.2.1 1999/08/29 15:03:20 peter Exp $
  */
 
 struct delayval;
diff --git a/libexec/getty/getty.8 b/libexec/getty/getty.8
index bd81c0422035..25b195eeba7f 100644
--- a/libexec/getty/getty.8
+++ b/libexec/getty/getty.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)getty.8	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/getty/getty.8,v 1.9.2.1 1999/08/29 15:03:20 peter Exp $
 .\" "
 .Dd June 4, 1993
 .Dt GETTY 8
diff --git a/libexec/getty/gettytab.5 b/libexec/getty/gettytab.5
index 78c12a231029..afe27ec255a4 100644
--- a/libexec/getty/gettytab.5
+++ b/libexec/getty/gettytab.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)gettytab.5	8.4 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/getty/gettytab.5,v 1.18.2.4 1999/09/20 09:49:52 phantom Exp $
 .\" "
 .Dd April 19, 1994
 .Dt GETTYTAB 5
diff --git a/libexec/getty/gettytab.h b/libexec/getty/gettytab.h
index b0a65e8cc685..458206217c6a 100644
--- a/libexec/getty/gettytab.h
+++ b/libexec/getty/gettytab.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)gettytab.h	8.2 (Berkeley) 3/30/94
- * $FreeBSD$
+ * $FreeBSD: src/libexec/getty/gettytab.h,v 1.8.2.3 1999/08/29 15:03:21 peter Exp $
  */
 
 /*
diff --git a/libexec/getty/init.c b/libexec/getty/init.c
index d06378b139fc..9e73cac9fb76 100644
--- a/libexec/getty/init.c
+++ b/libexec/getty/init.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)from: init.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/getty/init.c,v 1.9.2.3 1999/08/29 15:03:22 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/getty/main.c b/libexec/getty/main.c
index 0eac55b56907..0163f7b462b7 100644
--- a/libexec/getty/main.c
+++ b/libexec/getty/main.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)from: main.c	8.1 (Berkeley) 6/20/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/getty/main.c,v 1.23.2.4 1999/08/29 15:03:23 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/getty/pathnames.h b/libexec/getty/pathnames.h
index 035e8b6c14b3..a52d40e7ed06 100644
--- a/libexec/getty/pathnames.h
+++ b/libexec/getty/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pathnames.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/libexec/getty/pathnames.h,v 1.6.2.1 1999/08/29 15:03:23 peter Exp $
  */
 
 #include <paths.h>
diff --git a/libexec/getty/subr.c b/libexec/getty/subr.c
index 13c7bd060293..d6252e7509e7 100644
--- a/libexec/getty/subr.c
+++ b/libexec/getty/subr.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)from: subr.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/getty/subr.c,v 1.14.2.1 1999/08/29 15:03:24 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/getty/ttys.5 b/libexec/getty/ttys.5
index 43404e6ea6ed..685d44c8ffda 100644
--- a/libexec/getty/ttys.5
+++ b/libexec/getty/ttys.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ttys.5	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/getty/ttys.5,v 1.9.2.2 1999/12/07 07:57:58 sheldonh Exp $
 .\" "
 .Dd November 17, 1996
 .Dt TTYS 5
diff --git a/libexec/mail.local/Makefile b/libexec/mail.local/Makefile
index 1e902803f8f6..97db48f3fab6 100644
--- a/libexec/mail.local/Makefile
+++ b/libexec/mail.local/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/mail.local/Makefile,v 1.9.2.1 1999/08/29 15:03:25 peter Exp $
 
 .PATH:	${.CURDIR}/../../contrib/sendmail/mail.local \
 	${.CURDIR}/../../contrib/sendmail/src
diff --git a/libexec/makekey/Makefile b/libexec/makekey/Makefile
index 2028c6dad80b..e2f7ee74e4e9 100644
--- a/libexec/makekey/Makefile
+++ b/libexec/makekey/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/makekey/Makefile,v 1.8.2.1 1999/08/29 15:03:26 peter Exp $
 
 PROG=	makekey
 MAN8=	makekey.8
diff --git a/libexec/makekey/makekey.8 b/libexec/makekey/makekey.8
index 9a85c22f19cb..550bb51242d7 100644
--- a/libexec/makekey/makekey.8
+++ b/libexec/makekey/makekey.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)makekey.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/makekey/makekey.8,v 1.8.2.1 1999/08/29 15:03:27 peter Exp $
 .\"
 .Dd December 11, 1993
 .Dt MAKEKEY 8
diff --git a/libexec/makekey/makekey.c b/libexec/makekey/makekey.c
index 5f9dc04b18a7..8d179ca3d114 100644
--- a/libexec/makekey/makekey.c
+++ b/libexec/makekey/makekey.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)makekey.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/makekey/makekey.c,v 1.7.2.1 1999/08/29 15:03:27 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/libexec/mknetid/Makefile b/libexec/mknetid/Makefile
index 3f5592087b75..ac90497e1565 100644
--- a/libexec/mknetid/Makefile
+++ b/libexec/mknetid/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/mknetid/Makefile,v 1.3.2.1 1999/08/29 15:03:28 peter Exp $
 
 PROG=	mknetid
 SRCS=	mknetid.c hash.c parse_group.c
diff --git a/libexec/mknetid/hash.c b/libexec/mknetid/hash.c
index 8de336f3d5ab..4afc778921e1 100644
--- a/libexec/mknetid/hash.c
+++ b/libexec/mknetid/hash.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/mknetid/hash.c,v 1.4.2.1 1999/08/29 15:03:28 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/mknetid/hash.h b/libexec/mknetid/hash.h
index 04bc784c5c11..0a2d7f7e1f1b 100644
--- a/libexec/mknetid/hash.h
+++ b/libexec/mknetid/hash.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/mknetid/hash.h,v 1.4.2.1 1999/08/29 15:03:29 peter Exp $
  */
 
 /* Groupid entry hung off a member_entry node. */
diff --git a/libexec/mknetid/mknetid.8 b/libexec/mknetid/mknetid.8
index a3e3d99ef1a4..dfcd12aa35c8 100644
--- a/libexec/mknetid/mknetid.8
+++ b/libexec/mknetid/mknetid.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/mknetid/mknetid.8,v 1.6.2.1 1999/08/29 15:03:29 peter Exp $
 .\"
 .Dd June 23, 1996
 .Dt MKNETID 8
diff --git a/libexec/mknetid/mknetid.c b/libexec/mknetid/mknetid.c
index 23414513ad08..6a5b46dbd8f0 100644
--- a/libexec/mknetid/mknetid.c
+++ b/libexec/mknetid/mknetid.c
@@ -55,7 +55,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/mknetid/mknetid.c,v 1.10.2.1 1999/08/29 15:03:30 peter Exp $";
 #endif /* not lint */
 
 #define LINSIZ 1024
diff --git a/libexec/mknetid/parse_group.c b/libexec/mknetid/parse_group.c
index 327847426b8e..eb2fc36e98dd 100644
--- a/libexec/mknetid/parse_group.c
+++ b/libexec/mknetid/parse_group.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)getgrent.c	8.2 (Berkeley) 3/21/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/mknetid/parse_group.c,v 1.5.2.1 1999/08/29 15:03:30 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/named-xfer/Makefile b/libexec/named-xfer/Makefile
index 62ed91a4db3c..b21161a8cb3d 100644
--- a/libexec/named-xfer/Makefile
+++ b/libexec/named-xfer/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/named-xfer/Makefile,v 1.8.2.1 1999/08/29 15:03:31 peter Exp $
 
 USE_LIBBIND=	true
 .include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
diff --git a/libexec/pppoed/Makefile b/libexec/pppoed/Makefile
index 438dee65cca5..9b3410fc12fa 100644
--- a/libexec/pppoed/Makefile
+++ b/libexec/pppoed/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/pppoed/Makefile,v 1.1.4.1 1999/11/28 16:26:51 brian Exp $
 
 PROG=	pppoed
 SRCS=	pppoed.c
diff --git a/libexec/pppoed/pppoed.8 b/libexec/pppoed/pppoed.8
index 808c3dde85a8..160231933e36 100644
--- a/libexec/pppoed/pppoed.8
+++ b/libexec/pppoed/pppoed.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/pppoed/pppoed.8,v 1.2.4.1 1999/11/28 16:26:51 brian Exp $
 .\"
 .Dd November 8, 1999
 .Dt PPPOED 8
diff --git a/libexec/pppoed/pppoed.c b/libexec/pppoed/pppoed.c
index 86063099bc8b..c047f147cc60 100644
--- a/libexec/pppoed/pppoed.c
+++ b/libexec/pppoed/pppoed.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/pppoed/pppoed.c,v 1.2.4.1 1999/11/28 16:26:51 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/libexec/rbootd/Makefile b/libexec/rbootd/Makefile
index f4ad590f046a..ffb233459b63 100644
--- a/libexec/rbootd/Makefile
+++ b/libexec/rbootd/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/rbootd/Makefile,v 1.8.2.1 1999/08/29 15:03:32 peter Exp $
 
 PROG=	rbootd
 SRCS=	bpf.c conf.c parseconf.c rbootd.c rmpproto.c utils.c
diff --git a/libexec/rbootd/bpf.c b/libexec/rbootd/bpf.c
index 98d6e00908ee..c3a55e2eae3a 100644
--- a/libexec/rbootd/bpf.c
+++ b/libexec/rbootd/bpf.c
@@ -49,7 +49,7 @@
 static const char sccsid[] = "@(#)bpf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rbootd/bpf.c,v 1.9.2.1 1999/08/29 15:03:33 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rbootd/conf.c b/libexec/rbootd/conf.c
index 74ff341095f9..ca062d17310b 100644
--- a/libexec/rbootd/conf.c
+++ b/libexec/rbootd/conf.c
@@ -49,7 +49,7 @@
 static const char sccsid[] = "@(#)conf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rbootd/conf.c,v 1.3.2.2 1999/08/29 15:03:33 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rbootd/parseconf.c b/libexec/rbootd/parseconf.c
index 21e4c0b1b2a1..4b7cfa08bd89 100644
--- a/libexec/rbootd/parseconf.c
+++ b/libexec/rbootd/parseconf.c
@@ -49,7 +49,7 @@
 static const char sccsid[] = "@(#)parseconf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rbootd/parseconf.c,v 1.8.2.1 1999/08/29 15:03:34 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rbootd/rbootd.8 b/libexec/rbootd/rbootd.8
index c18558d42f22..54d35043554d 100644
--- a/libexec/rbootd/rbootd.8
+++ b/libexec/rbootd/rbootd.8
@@ -38,7 +38,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)rbootd.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/rbootd/rbootd.8,v 1.8.2.1 1999/08/29 15:03:34 peter Exp $
 .\"
 .\" Utah Hdr: rbootd.man 3.1 92/07/06
 .\" Author: Jeff Forys, University of Utah CSS
diff --git a/libexec/rbootd/rbootd.c b/libexec/rbootd/rbootd.c
index 2f7c38435364..34e20ff86348 100644
--- a/libexec/rbootd/rbootd.c
+++ b/libexec/rbootd/rbootd.c
@@ -55,7 +55,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)rbootd.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rbootd/rbootd.c,v 1.9.2.2 1999/08/29 15:03:35 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rbootd/rmpproto.c b/libexec/rbootd/rmpproto.c
index 80ce805db586..efc59094dc58 100644
--- a/libexec/rbootd/rmpproto.c
+++ b/libexec/rbootd/rmpproto.c
@@ -49,7 +49,7 @@
 static const char sccsid[] = "@(#)rmpproto.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rbootd/rmpproto.c,v 1.5.2.1 1999/08/29 15:03:35 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rbootd/utils.c b/libexec/rbootd/utils.c
index 936451385930..75355d91353d 100644
--- a/libexec/rbootd/utils.c
+++ b/libexec/rbootd/utils.c
@@ -49,7 +49,7 @@
 static const char sccsid[] = "@(#)utils.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rbootd/utils.c,v 1.4.2.1 1999/08/29 15:03:36 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/revnetgroup/Makefile b/libexec/revnetgroup/Makefile
index 9c41089c0648..e39e435a5801 100644
--- a/libexec/revnetgroup/Makefile
+++ b/libexec/revnetgroup/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/revnetgroup/Makefile,v 1.3.2.1 1999/08/29 15:03:37 peter Exp $
 
 PROG=	revnetgroup
 SRCS=	revnetgroup.c hash.c parse_netgroup.c
diff --git a/libexec/revnetgroup/hash.c b/libexec/revnetgroup/hash.c
index c11244ac3b9c..a6a9921a8e5d 100644
--- a/libexec/revnetgroup/hash.c
+++ b/libexec/revnetgroup/hash.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/revnetgroup/hash.c,v 1.5.2.1 1999/08/29 15:03:38 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/libexec/revnetgroup/hash.h b/libexec/revnetgroup/hash.h
index 04a44d67a8fa..8f58af8c27f7 100644
--- a/libexec/revnetgroup/hash.h
+++ b/libexec/revnetgroup/hash.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/revnetgroup/hash.h,v 1.5.2.1 1999/08/29 15:03:39 peter Exp $
  */
 
 /* Groupname entry hung off a member_entry node. */
diff --git a/libexec/revnetgroup/parse_netgroup.c b/libexec/revnetgroup/parse_netgroup.c
index 6b795c61d8a6..e72b11600fc1 100644
--- a/libexec/revnetgroup/parse_netgroup.c
+++ b/libexec/revnetgroup/parse_netgroup.c
@@ -36,7 +36,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/revnetgroup/parse_netgroup.c,v 1.6.2.1 1999/08/29 15:03:39 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/revnetgroup/revnetgroup.8 b/libexec/revnetgroup/revnetgroup.8
index 62953e21de00..9f31d073c8fe 100644
--- a/libexec/revnetgroup/revnetgroup.8
+++ b/libexec/revnetgroup/revnetgroup.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/revnetgroup/revnetgroup.8,v 1.6.2.1 1999/08/29 15:03:40 peter Exp $
 .\"
 .Dd October 24, 1995
 .Dt REVNETGROUP 8
diff --git a/libexec/revnetgroup/revnetgroup.c b/libexec/revnetgroup/revnetgroup.c
index eccdada23c58..8834f6b407d7 100644
--- a/libexec/revnetgroup/revnetgroup.c
+++ b/libexec/revnetgroup/revnetgroup.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/revnetgroup/revnetgroup.c,v 1.9.2.1 1999/08/29 15:03:40 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/libexec/rexecd/Makefile b/libexec/rexecd/Makefile
index fa5203ca98b6..455a0bc04398 100644
--- a/libexec/rexecd/Makefile
+++ b/libexec/rexecd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/rexecd/Makefile,v 1.8.2.2 1999/08/29 15:03:41 peter Exp $
 
 PROG=	rexecd
 MAN8=	rexecd.8
diff --git a/libexec/rexecd/rexecd.8 b/libexec/rexecd/rexecd.8
index 4c8626852df2..e5f3b4facd96 100644
--- a/libexec/rexecd/rexecd.8
+++ b/libexec/rexecd/rexecd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rexecd.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/rexecd/rexecd.8,v 1.8.2.1 1999/08/29 15:03:42 peter Exp $
 .\"
 .Dd September 23, 1994
 .Dt REXECD 8
diff --git a/libexec/rexecd/rexecd.c b/libexec/rexecd/rexecd.c
index 10c2f2be98c6..fdd96e40bb04 100644
--- a/libexec/rexecd/rexecd.c
+++ b/libexec/rexecd/rexecd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)rexecd.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rexecd/rexecd.c,v 1.15.2.2 1999/08/29 15:03:42 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rlogind/Makefile b/libexec/rlogind/Makefile
index a5deb98acefa..65feeef473bb 100644
--- a/libexec/rlogind/Makefile
+++ b/libexec/rlogind/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/rlogind/Makefile,v 1.10.2.1 1999/08/29 15:03:43 peter Exp $
 
 PROG=	rlogind
 SRCS=	rlogind.c
diff --git a/libexec/rlogind/rlogind.8 b/libexec/rlogind/rlogind.8
index 7eebc2bb6d0f..bd1015085da5 100644
--- a/libexec/rlogind/rlogind.8
+++ b/libexec/rlogind/rlogind.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rlogind.8	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/rlogind/rlogind.8,v 1.10.2.1 1999/08/29 15:03:44 peter Exp $
 .\"
 .Dd June 4, 1993
 .Dt RLOGIND 8
diff --git a/libexec/rlogind/rlogind.c b/libexec/rlogind/rlogind.c
index 3296604f4714..bfa50a3d63fa 100644
--- a/libexec/rlogind/rlogind.c
+++ b/libexec/rlogind/rlogind.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)rlogind.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rlogind/rlogind.c,v 1.20.2.2 1999/08/29 15:03:44 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/rpc.rquotad/Makefile b/libexec/rpc.rquotad/Makefile
index 1bda56af794d..a9fc533b9e8f 100644
--- a/libexec/rpc.rquotad/Makefile
+++ b/libexec/rpc.rquotad/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rpc.rquotad/Makefile,v 1.3.2.1 1999/08/29 15:03:45 peter Exp $
 
 PROG =	rpc.rquotad
 SRCS =	rquotad.c
diff --git a/libexec/rpc.rquotad/rpc.rquotad.8 b/libexec/rpc.rquotad/rpc.rquotad.8
index a4fa2c07be93..79db1d424087 100644
--- a/libexec/rpc.rquotad/rpc.rquotad.8
+++ b/libexec/rpc.rquotad/rpc.rquotad.8
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/rpc.rquotad/rpc.rquotad.8,v 1.5.2.1 1999/08/29 15:03:45 peter Exp $
 .\"
 .Dd June 22, 1994
 .Dt RPC.RQUOTAD 8
diff --git a/libexec/rpc.rquotad/rquotad.c b/libexec/rpc.rquotad/rquotad.c
index aba357ac4f15..2e2a2d37fe5d 100644
--- a/libexec/rpc.rquotad/rquotad.c
+++ b/libexec/rpc.rquotad/rquotad.c
@@ -6,7 +6,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rpc.rquotad/rquotad.c,v 1.2.2.1 1999/08/29 15:03:46 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rpc.rstatd/Makefile b/libexec/rpc.rstatd/Makefile
index d4b71ea1b8d7..4fb28f5f10e7 100644
--- a/libexec/rpc.rstatd/Makefile
+++ b/libexec/rpc.rstatd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rpc.rstatd/Makefile,v 1.4.2.1 1999/08/29 15:03:47 peter Exp $
 
 PROG =	rpc.rstatd
 SRCS =	rstatd.c rstat_proc.c
diff --git a/libexec/rpc.rstatd/rpc.rstatd.8 b/libexec/rpc.rstatd/rpc.rstatd.8
index 8860e5541bdb..12fe2510f146 100644
--- a/libexec/rpc.rstatd/rpc.rstatd.8
+++ b/libexec/rpc.rstatd/rpc.rstatd.8
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/rpc.rstatd/rpc.rstatd.8,v 1.4.2.1 1999/08/29 15:03:48 peter Exp $
 .\"
 .Dd June 7, 1993
 .Dt RPC.RSTATD 8
diff --git a/libexec/rpc.rstatd/rstat_proc.c b/libexec/rpc.rstatd/rstat_proc.c
index 7f6bd554f063..37b02cb74cd1 100644
--- a/libexec/rpc.rstatd/rstat_proc.c
+++ b/libexec/rpc.rstatd/rstat_proc.c
@@ -33,7 +33,7 @@ static char sccsid[] = "from: @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro
 static char sccsid[] = "from: @(#)rstat_proc.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rpc.rstatd/rstat_proc.c,v 1.13.2.1 1999/08/29 15:03:48 peter Exp $";
 #endif
 
 /*
diff --git a/libexec/rpc.rstatd/rstatd.c b/libexec/rpc.rstatd/rstatd.c
index 21a0d5640428..651dde9a78d5 100644
--- a/libexec/rpc.rstatd/rstatd.c
+++ b/libexec/rpc.rstatd/rstatd.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rpc.rstatd/rstatd.c,v 1.7.2.1 1999/08/29 15:03:49 peter Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/libexec/rpc.rusersd/Makefile b/libexec/rpc.rusersd/Makefile
index fefc7bfa1d5f..334ddb24c396 100644
--- a/libexec/rpc.rusersd/Makefile
+++ b/libexec/rpc.rusersd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rpc.rusersd/Makefile,v 1.5.2.1 1999/08/29 15:03:50 peter Exp $
 
 PROG =	rpc.rusersd
 SRCS =	rusersd.c rusers_proc.c
diff --git a/libexec/rpc.rusersd/rpc.rusersd.8 b/libexec/rpc.rusersd/rpc.rusersd.8
index 1775cddd4390..699a2251f471 100644
--- a/libexec/rpc.rusersd/rpc.rusersd.8
+++ b/libexec/rpc.rusersd/rpc.rusersd.8
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/rpc.rusersd/rpc.rusersd.8,v 1.5.2.1 1999/08/29 15:03:50 peter Exp $
 .\"
 .Dd June 7, 1993
 .Dt RPC.RUSERSD 8
diff --git a/libexec/rpc.rusersd/rusers_proc.c b/libexec/rpc.rusersd/rusers_proc.c
index 404221796d53..e1e2e62431dd 100644
--- a/libexec/rpc.rusersd/rusers_proc.c
+++ b/libexec/rpc.rusersd/rusers_proc.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rpc.rusersd/rusers_proc.c,v 1.9.2.1 1999/08/29 15:03:51 peter Exp $";
 #endif /* not lint */
 
 #ifdef DEBUG
diff --git a/libexec/rpc.rusersd/rusersd.c b/libexec/rpc.rusersd/rusersd.c
index 9482692a1feb..765950a20247 100644
--- a/libexec/rpc.rusersd/rusersd.c
+++ b/libexec/rpc.rusersd/rusersd.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rpc.rusersd/rusersd.c,v 1.7.2.1 1999/08/29 15:03:51 peter Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/libexec/rpc.rwalld/Makefile b/libexec/rpc.rwalld/Makefile
index 8a0b75c3eedc..a705658db985 100644
--- a/libexec/rpc.rwalld/Makefile
+++ b/libexec/rpc.rwalld/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rpc.rwalld/Makefile,v 1.3.2.1 1999/08/29 15:03:52 peter Exp $
 
 PROG =	rpc.rwalld
 SRCS =	rwalld.c
diff --git a/libexec/rpc.rwalld/rpc.rwalld.8 b/libexec/rpc.rwalld/rpc.rwalld.8
index 116142e46dd9..7b5c24363a86 100644
--- a/libexec/rpc.rwalld/rpc.rwalld.8
+++ b/libexec/rpc.rwalld/rpc.rwalld.8
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/rpc.rwalld/rpc.rwalld.8,v 1.4.2.1 1999/08/29 15:03:52 peter Exp $
 .\"
 .Dd June 7, 1993
 .Dt RPC.RWALLD 8
diff --git a/libexec/rpc.rwalld/rwalld.c b/libexec/rpc.rwalld/rwalld.c
index 985dca93e640..3e2f91be5d14 100644
--- a/libexec/rpc.rwalld/rwalld.c
+++ b/libexec/rpc.rwalld/rwalld.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rpc.rwalld/rwalld.c,v 1.7.2.1 1999/08/29 15:03:53 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/libexec/rpc.sprayd/Makefile b/libexec/rpc.sprayd/Makefile
index 80d73302349d..e9eaf67ac77a 100644
--- a/libexec/rpc.sprayd/Makefile
+++ b/libexec/rpc.sprayd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rpc.sprayd/Makefile,v 1.3.2.1 1999/08/29 15:03:55 peter Exp $
 
 PROG =	rpc.sprayd
 SRCS =	sprayd.c
diff --git a/libexec/rpc.sprayd/rpc.sprayd.8 b/libexec/rpc.sprayd/rpc.sprayd.8
index ebf838263adc..7268f323b8c1 100644
--- a/libexec/rpc.sprayd/rpc.sprayd.8
+++ b/libexec/rpc.sprayd/rpc.sprayd.8
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/rpc.sprayd/rpc.sprayd.8,v 1.5.2.1 1999/08/29 15:03:55 peter Exp $
 .\"
 .Dd June 22, 1994
 .Dt RPC.SPRAYD 8
diff --git a/libexec/rpc.sprayd/sprayd.c b/libexec/rpc.sprayd/sprayd.c
index a6324e86c3d9..51bc0935b83d 100644
--- a/libexec/rpc.sprayd/sprayd.c
+++ b/libexec/rpc.sprayd/sprayd.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rpc.sprayd/sprayd.c,v 1.4.2.1 1999/08/29 15:03:56 peter Exp $";
 #endif /* not lint */
 
 #include <rpc/rpc.h>
diff --git a/libexec/rshd/Makefile b/libexec/rshd/Makefile
index fece4b80a2e1..8ad19c967ce3 100644
--- a/libexec/rshd/Makefile
+++ b/libexec/rshd/Makefile
@@ -1,5 +1,5 @@
 # From:	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/rshd/Makefile,v 1.10.2.1 1999/08/29 15:03:57 peter Exp $
 
 PROG=	rshd
 SRCS=	rshd.c
diff --git a/libexec/rshd/rshd.8 b/libexec/rshd/rshd.8
index e349ea0c7b33..61446c92f044 100644
--- a/libexec/rshd/rshd.8
+++ b/libexec/rshd/rshd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rshd.8	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/rshd/rshd.8,v 1.15.2.1 1999/08/29 15:03:57 peter Exp $
 .\"
 .Dd June 4, 1993
 .Dt RSHD 8
diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c
index c2afeb528fa1..88cba27ca9b4 100644
--- a/libexec/rshd/rshd.c
+++ b/libexec/rshd/rshd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)rshd.c	8.2 (Berkeley) 4/6/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rshd/rshd.c,v 1.23.2.2 1999/08/29 15:03:57 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/rtld-aout/Makefile b/libexec/rtld-aout/Makefile
index d2c99ec79318..e87ecf3a645b 100644
--- a/libexec/rtld-aout/Makefile
+++ b/libexec/rtld-aout/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rtld-aout/Makefile,v 1.27.2.1 1999/08/29 15:03:58 peter Exp $
 PROG=	ld.so
 SRCS=	mdprologue.S rtld.c shlib.c md.c support.c
 MAN1=	rtld.1
diff --git a/libexec/rtld-aout/dynamic.h b/libexec/rtld-aout/dynamic.h
index 00d449f03cb6..ed8b760f2dce 100644
--- a/libexec/rtld-aout/dynamic.h
+++ b/libexec/rtld-aout/dynamic.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-aout/dynamic.h,v 1.4.2.1 1999/08/29 15:03:59 peter Exp $
  */
 
 #ifndef __DYNAMIC_H__
diff --git a/libexec/rtld-aout/i386/md-static-funcs.c b/libexec/rtld-aout/i386/md-static-funcs.c
index 77c25c5c2f67..6bb6b09ba108 100644
--- a/libexec/rtld-aout/i386/md-static-funcs.c
+++ b/libexec/rtld-aout/i386/md-static-funcs.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-aout/i386/md-static-funcs.c,v 1.6.2.1 1999/08/29 15:04:04 peter Exp $
  *
  * Called by ld.so when onanating.
  * This *must* be a static function, so it is not called through a jmpslot.
diff --git a/libexec/rtld-aout/i386/md.c b/libexec/rtld-aout/i386/md.c
index 63b9d17d5af8..dc9ac9f5acb9 100644
--- a/libexec/rtld-aout/i386/md.c
+++ b/libexec/rtld-aout/i386/md.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-aout/i386/md.c,v 1.16.2.1 1999/08/29 15:04:05 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/libexec/rtld-aout/i386/md.h b/libexec/rtld-aout/i386/md.h
index ef5b632bbaee..d8cef0965e2d 100644
--- a/libexec/rtld-aout/i386/md.h
+++ b/libexec/rtld-aout/i386/md.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-aout/i386/md.h,v 1.17.2.1 1999/08/29 15:04:05 peter Exp $
  */
 
 #ifndef __MD_H__
diff --git a/libexec/rtld-aout/i386/mdprologue.S b/libexec/rtld-aout/i386/mdprologue.S
index f111bcac6f95..4b3bd7ba1887 100644
--- a/libexec/rtld-aout/i386/mdprologue.S
+++ b/libexec/rtld-aout/i386/mdprologue.S
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-aout/i386/mdprologue.S,v 1.8.2.1 1999/08/29 15:04:06 peter Exp $
  */
 
 /*
diff --git a/libexec/rtld-aout/rtld.1 b/libexec/rtld-aout/rtld.1
index 52a1b32988f5..2a7f104115d9 100644
--- a/libexec/rtld-aout/rtld.1
+++ b/libexec/rtld-aout/rtld.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/rtld-aout/rtld.1,v 1.15.2.1 1999/08/29 15:04:00 peter Exp $
 .\"
 .\" Copyright (c) 1995 Paul Kranenburg
 .\" All rights reserved.
diff --git a/libexec/rtld-aout/rtld.c b/libexec/rtld-aout/rtld.c
index a55e9bc1199b..75090e632cdc 100644
--- a/libexec/rtld-aout/rtld.c
+++ b/libexec/rtld-aout/rtld.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-aout/rtld.c,v 1.57.2.1 1999/08/29 15:04:00 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/libexec/rtld-aout/shlib.c b/libexec/rtld-aout/shlib.c
index 989cf45d8ab1..ced08ad900bc 100644
--- a/libexec/rtld-aout/shlib.c
+++ b/libexec/rtld-aout/shlib.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-aout/shlib.c,v 1.21.2.1 1999/08/29 15:04:01 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/libexec/rtld-aout/shlib.h b/libexec/rtld-aout/shlib.h
index d05690fe144e..70cfcaab64ff 100644
--- a/libexec/rtld-aout/shlib.h
+++ b/libexec/rtld-aout/shlib.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *-
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-aout/shlib.h,v 1.4.2.1 1999/08/29 15:04:02 peter Exp $
  */
 
 /*
diff --git a/libexec/rtld-aout/support.c b/libexec/rtld-aout/support.c
index 71a84ffa1299..b2140b3ebde8 100644
--- a/libexec/rtld-aout/support.c
+++ b/libexec/rtld-aout/support.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *-
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-aout/support.c,v 1.4.2.1 1999/08/29 15:04:02 peter Exp $
  */
 #include <sys/types.h>
 #include <string.h>
diff --git a/libexec/rtld-aout/support.h b/libexec/rtld-aout/support.h
index da0340783f27..bb093ddaf80f 100644
--- a/libexec/rtld-aout/support.h
+++ b/libexec/rtld-aout/support.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *-
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-aout/support.h,v 1.3.2.1 1999/08/29 15:04:03 peter Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
index 4b02d4b6aecd..d4cfb18d5aee 100644
--- a/libexec/rtld-elf/Makefile
+++ b/libexec/rtld-elf/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/libexec/rtld-elf/Makefile,v 1.4.2.5 1999/08/29 15:04:07 peter Exp $
 #
 MAINTAINER=	jdp
 PROG=		ld-elf.so.1
diff --git a/libexec/rtld-elf/alpha/reloc.c b/libexec/rtld-elf/alpha/reloc.c
index 1b55d06e767c..c12d02d32a97 100644
--- a/libexec/rtld-elf/alpha/reloc.c
+++ b/libexec/rtld-elf/alpha/reloc.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/alpha/reloc.c,v 1.3.2.6 1999/12/17 01:47:15 jkh Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/alpha/rtld_machdep.h b/libexec/rtld-elf/alpha/rtld_machdep.h
index 11927d63cc15..ba82bbc6f287 100644
--- a/libexec/rtld-elf/alpha/rtld_machdep.h
+++ b/libexec/rtld-elf/alpha/rtld_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/alpha/rtld_machdep.h,v 1.1.2.4 1999/08/29 15:04:12 peter Exp $
  */
 
 #ifndef RTLD_MACHDEP_H
diff --git a/libexec/rtld-elf/alpha/rtld_start.S b/libexec/rtld-elf/alpha/rtld_start.S
index d7ec0d341840..e87f2f043ab9 100644
--- a/libexec/rtld-elf/alpha/rtld_start.S
+++ b/libexec/rtld-elf/alpha/rtld_start.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/libexec/rtld-elf/alpha/rtld_start.S,v 1.2.2.1 1999/08/29 15:04:12 peter Exp $	*/
 /*	From: NetBSD: rtld_start.S,v 1.1 1996/12/16 20:38:09 cgd Exp 	*/
 
 /*
diff --git a/libexec/rtld-elf/debug.c b/libexec/rtld-elf/debug.c
index 0c8ca35aedc1..029f944989da 100644
--- a/libexec/rtld-elf/debug.c
+++ b/libexec/rtld-elf/debug.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/debug.c,v 1.1.1.1.2.1 1999/08/29 15:04:08 peter Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/debug.h b/libexec/rtld-elf/debug.h
index b3563386eaff..118fc1ed2eb5 100644
--- a/libexec/rtld-elf/debug.h
+++ b/libexec/rtld-elf/debug.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/debug.h,v 1.1.1.1.2.2 1999/12/17 01:47:14 jkh Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/i386/reloc.c b/libexec/rtld-elf/i386/reloc.c
index b4a2a75c63f2..13f86db3aafc 100644
--- a/libexec/rtld-elf/i386/reloc.c
+++ b/libexec/rtld-elf/i386/reloc.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/i386/reloc.c,v 1.1.2.4 1999/08/29 15:04:13 peter Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/i386/rtld_machdep.h b/libexec/rtld-elf/i386/rtld_machdep.h
index b44129ae53e8..45af6405ed04 100644
--- a/libexec/rtld-elf/i386/rtld_machdep.h
+++ b/libexec/rtld-elf/i386/rtld_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/i386/rtld_machdep.h,v 1.1.2.4 1999/08/29 15:04:14 peter Exp $
  */
 
 #ifndef RTLD_MACHDEP_H
diff --git a/libexec/rtld-elf/i386/rtld_start.S b/libexec/rtld-elf/i386/rtld_start.S
index 76f1392625d7..76725935f69b 100644
--- a/libexec/rtld-elf/i386/rtld_start.S
+++ b/libexec/rtld-elf/i386/rtld_start.S
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/i386/rtld_start.S,v 1.2.2.1 1999/08/29 15:04:14 peter Exp $
  */
 
 	.text
diff --git a/libexec/rtld-elf/malloc.c b/libexec/rtld-elf/malloc.c
index 8aefa41643f0..2a187377246c 100644
--- a/libexec/rtld-elf/malloc.c
+++ b/libexec/rtld-elf/malloc.c
@@ -33,7 +33,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)malloc.c	5.11 (Berkeley) 2/23/91";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/libexec/rtld-elf/malloc.c,v 1.2.2.1 1999/08/29 15:04:08 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff --git a/libexec/rtld-elf/map_object.c b/libexec/rtld-elf/map_object.c
index d7b6978ae9ee..bc8521aceb8a 100644
--- a/libexec/rtld-elf/map_object.c
+++ b/libexec/rtld-elf/map_object.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/map_object.c,v 1.2.2.3 1999/12/17 01:47:14 jkh Exp $
  */
 
 #include <sys/param.h>
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index 8ba21b4f26c7..643729cdac7a 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.13.2.20 1999/12/17 01:47:14 jkh Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h
index c63e7d08836b..50316b209a59 100644
--- a/libexec/rtld-elf/rtld.h
+++ b/libexec/rtld-elf/rtld.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/rtld.h,v 1.5.2.5 1999/12/17 01:47:14 jkh Exp $
  */
 
 #ifndef RTLD_H /* { */
diff --git a/libexec/rtld-elf/xmalloc.c b/libexec/rtld-elf/xmalloc.c
index d6da3340bfd0..a8728e1af58d 100644
--- a/libexec/rtld-elf/xmalloc.c
+++ b/libexec/rtld-elf/xmalloc.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/xmalloc.c,v 1.1.1.1.2.1 1999/08/29 15:04:11 peter Exp $
  */
 
 #include <err.h>
diff --git a/libexec/talkd/Makefile b/libexec/talkd/Makefile
index 100e867ba5be..bfa4ec0b0a74 100644
--- a/libexec/talkd/Makefile
+++ b/libexec/talkd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/talkd/Makefile,v 1.5.2.1 1999/08/29 15:04:15 peter Exp $
 
 PROG=	ntalkd
 SRCS=	talkd.c announce.c process.c table.c print.c ttymsg.c
diff --git a/libexec/talkd/announce.c b/libexec/talkd/announce.c
index dccd8d887b32..c8f622623b22 100644
--- a/libexec/talkd/announce.c
+++ b/libexec/talkd/announce.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)announce.c	8.3 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/talkd/announce.c,v 1.10.2.1 1999/08/29 15:04:16 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/libexec/talkd/print.c b/libexec/talkd/print.c
index 8c1ba9b5e0e1..1ccf1e313019 100644
--- a/libexec/talkd/print.c
+++ b/libexec/talkd/print.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)print.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/talkd/print.c,v 1.8.2.1 1999/08/29 15:04:16 peter Exp $";
 #endif /* not lint */
 
 /* debug print routines */
diff --git a/libexec/talkd/process.c b/libexec/talkd/process.c
index b3659a599afe..a6327a09e7f4 100644
--- a/libexec/talkd/process.c
+++ b/libexec/talkd/process.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)process.c	8.2 (Berkeley) 11/16/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/talkd/process.c,v 1.8.2.1 1999/08/29 15:04:16 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/talkd/table.c b/libexec/talkd/table.c
index 5062c78049d8..838a4fae97b4 100644
--- a/libexec/talkd/table.c
+++ b/libexec/talkd/table.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)table.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/talkd/table.c,v 1.6.2.1 1999/08/29 15:04:17 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/talkd/talkd.c b/libexec/talkd/talkd.c
index ca30ef725f13..3895d7196412 100644
--- a/libexec/talkd/talkd.c
+++ b/libexec/talkd/talkd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)talkd.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/talkd/talkd.c,v 1.9.2.2 1999/08/29 15:04:17 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile
index 068087a62c65..cb79f3cfaa60 100644
--- a/libexec/telnetd/Makefile
+++ b/libexec/telnetd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 12/15/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/telnetd/Makefile,v 1.11.2.1 1999/08/29 15:04:18 peter Exp $
 
 PROG=	telnetd
 CFLAGS+=-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS
diff --git a/libexec/telnetd/ext.h b/libexec/telnetd/ext.h
index bce0e2a71aef..5d0823db4c70 100644
--- a/libexec/telnetd/ext.h
+++ b/libexec/telnetd/ext.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ext.h	8.2 (Berkeley) 12/15/93
- * $FreeBSD$
+ * $FreeBSD: src/libexec/telnetd/ext.h,v 1.6.2.1 1999/08/29 15:04:18 peter Exp $
  */
 
 /*
diff --git a/libexec/telnetd/global.c b/libexec/telnetd/global.c
index cedff5770f81..972d44713161 100644
--- a/libexec/telnetd/global.c
+++ b/libexec/telnetd/global.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)global.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/telnetd/global.c,v 1.2.2.1 1999/08/29 15:04:19 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/telnetd/pathnames.h b/libexec/telnetd/pathnames.h
index ed8ee887a39e..167218a2efc1 100644
--- a/libexec/telnetd/pathnames.h
+++ b/libexec/telnetd/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/libexec/telnetd/pathnames.h,v 1.5.2.1 1999/08/29 15:04:19 peter Exp $
  */
 
 #if BSD > 43
diff --git a/libexec/telnetd/slc.c b/libexec/telnetd/slc.c
index f19f79fbeb5e..501e5f39acd7 100644
--- a/libexec/telnetd/slc.c
+++ b/libexec/telnetd/slc.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)slc.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/telnetd/slc.c,v 1.7.2.1 1999/08/29 15:04:19 peter Exp $";
 #endif /* not lint */
 
 #include "telnetd.h"
diff --git a/libexec/telnetd/state.c b/libexec/telnetd/state.c
index 476a99219198..cda1b05a7376 100644
--- a/libexec/telnetd/state.c
+++ b/libexec/telnetd/state.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)state.c	8.2 (Berkeley) 12/15/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/telnetd/state.c,v 1.8.2.1 1999/08/29 15:04:19 peter Exp $";
 #endif /* not lint */
 
 #include "telnetd.h"
diff --git a/libexec/telnetd/sys_term.c b/libexec/telnetd/sys_term.c
index d7e9ed394808..a90602d9cdc1 100644
--- a/libexec/telnetd/sys_term.c
+++ b/libexec/telnetd/sys_term.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)sys_term.c	8.2 (Berkeley) 12/15/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/telnetd/sys_term.c,v 1.20.2.2 1999/08/29 15:04:20 peter Exp $";
 #endif /* not lint */
 
 #include "telnetd.h"
diff --git a/libexec/telnetd/telnetd.8 b/libexec/telnetd/telnetd.8
index 0d50eb630dcd..e38015eed460 100644
--- a/libexec/telnetd/telnetd.8
+++ b/libexec/telnetd/telnetd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)telnetd.8	8.3 (Berkeley) 3/1/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/telnetd/telnetd.8,v 1.13.2.1 1999/08/29 15:04:20 peter Exp $
 .\"
 .Dd March 1, 1994
 .Dt TELNETD 8
diff --git a/libexec/telnetd/telnetd.c b/libexec/telnetd/telnetd.c
index 5141c2aecf42..71e7bb2ab377 100644
--- a/libexec/telnetd/telnetd.c
+++ b/libexec/telnetd/telnetd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)telnetd.c	8.2 (Berkeley) 12/15/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/telnetd/telnetd.c,v 1.15.2.2 1999/08/29 15:04:20 peter Exp $";
 #endif /* not lint */
 
 #include "telnetd.h"
diff --git a/libexec/telnetd/termstat.c b/libexec/telnetd/termstat.c
index ee9034413223..60c08e4f8c32 100644
--- a/libexec/telnetd/termstat.c
+++ b/libexec/telnetd/termstat.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)termstat.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/telnetd/termstat.c,v 1.8.2.1 1999/08/29 15:04:20 peter Exp $";
 #endif /* not lint */
 
 #include "telnetd.h"
diff --git a/libexec/telnetd/utility.c b/libexec/telnetd/utility.c
index ee6917340820..230d5d8aa6db 100644
--- a/libexec/telnetd/utility.c
+++ b/libexec/telnetd/utility.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)utility.c	8.2 (Berkeley) 12/15/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/telnetd/utility.c,v 1.12.2.1 1999/08/29 15:04:21 peter Exp $";
 #endif /* not lint */
 
 #ifdef __FreeBSD__
diff --git a/libexec/tftpd/Makefile b/libexec/tftpd/Makefile
index ce43894dcb21..9f74d500b054 100644
--- a/libexec/tftpd/Makefile
+++ b/libexec/tftpd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/tftpd/Makefile,v 1.5.2.2 1999/08/29 15:04:21 peter Exp $
 
 PROG=	tftpd
 SRCS=	tftpd.c tftpsubs.c
diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c
index 07475a45e852..07de6cf4fb3e 100644
--- a/libexec/tftpd/tftpd.c
+++ b/libexec/tftpd/tftpd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tftpd.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/tftpd/tftpd.c,v 1.12.2.2 1999/08/29 15:04:22 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/uucpd/Makefile b/libexec/uucpd/Makefile
index 3aeb623eab90..5fff1a1ee38e 100644
--- a/libexec/uucpd/Makefile
+++ b/libexec/uucpd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/uucpd/Makefile,v 1.8.2.1 1999/08/29 15:04:22 peter Exp $
 
 PROG=	uucpd
 MAN8=	uucpd.8
diff --git a/libexec/uucpd/pathnames.h b/libexec/uucpd/pathnames.h
index c06df3685d91..9bee59750300 100644
--- a/libexec/uucpd/pathnames.h
+++ b/libexec/uucpd/pathnames.h
@@ -32,7 +32,7 @@
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/4/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/uucpd/pathnames.h,v 1.5.2.1 1999/08/29 15:04:22 peter Exp $
  */
 
 #include <paths.h>
diff --git a/libexec/uucpd/uucpd.8 b/libexec/uucpd/uucpd.8
index 3566229a028d..e9ee1cf7438d 100644
--- a/libexec/uucpd/uucpd.8
+++ b/libexec/uucpd/uucpd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rshd.8	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/uucpd/uucpd.8,v 1.6.2.1 1999/08/29 15:04:23 peter Exp $
 .\"
 .Dd Feb 18, 1996
 .Dt UUCPD 8
diff --git a/libexec/uucpd/uucpd.c b/libexec/uucpd/uucpd.c
index b1ac24da85f3..e41f8f2b0c10 100644
--- a/libexec/uucpd/uucpd.c
+++ b/libexec/uucpd/uucpd.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)uucpd.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/uucpd/uucpd.c,v 1.15.2.2 1999/08/29 15:04:23 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/xtend/Makefile b/libexec/xtend/Makefile
index 3418457cc3f9..3d7ad7837fe5 100644
--- a/libexec/xtend/Makefile
+++ b/libexec/xtend/Makefile
@@ -1,5 +1,5 @@
 # Makefile for xtend (Stark) 10/30/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/xtend/Makefile,v 1.6.2.1 1999/08/29 15:04:23 peter Exp $
 
 BINMODE=	555
 
diff --git a/libexec/xtend/packet.c b/libexec/xtend/packet.c
index f3a4e04d90d1..f5a21dc85ecd 100644
--- a/libexec/xtend/packet.c
+++ b/libexec/xtend/packet.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/xtend/packet.c,v 1.7.2.1 1999/08/29 15:04:24 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/libexec/xtend/paths.h b/libexec/xtend/paths.h
index da1993efb015..5416a7ebe0ba 100644
--- a/libexec/xtend/paths.h
+++ b/libexec/xtend/paths.h
@@ -1,7 +1,7 @@
 /*
  * Pathnames for files used by xtend
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/xtend/paths.h,v 1.5.2.1 1999/08/29 15:04:24 peter Exp $
  */
 
 #define X10DIR		"/var/spool/xten"
diff --git a/libexec/xtend/status.c b/libexec/xtend/status.c
index 538f30be707d..20c68e3aa814 100644
--- a/libexec/xtend/status.c
+++ b/libexec/xtend/status.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/xtend/status.c,v 1.7.2.1 1999/08/29 15:04:25 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/libexec/xtend/user.c b/libexec/xtend/user.c
index f2c019010e10..6cb99cf478d7 100644
--- a/libexec/xtend/user.c
+++ b/libexec/xtend/user.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/xtend/user.c,v 1.8.2.1 1999/08/29 15:04:25 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/libexec/xtend/xten.h b/libexec/xtend/xten.h
index f07bb2cc528b..7a9df02bd8cf 100644
--- a/libexec/xtend/xten.h
+++ b/libexec/xtend/xten.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/xtend/xten.h,v 1.5.2.1 1999/08/29 15:04:25 peter Exp $
  */
 
 extern char *X10housenames[];
diff --git a/libexec/xtend/xtend.8 b/libexec/xtend/xtend.8
index d3593d2dbf71..e44331b8fde6 100644
--- a/libexec/xtend/xtend.8
+++ b/libexec/xtend/xtend.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/xtend/xtend.8,v 1.9.2.3 1999/08/29 15:04:26 peter Exp $
 .\"
 .Th XTEND 8 "30 Oct 1993"
 .Dd Oct 30, 1993
diff --git a/libexec/xtend/xtend.c b/libexec/xtend/xtend.c
index 1f37deb475e9..9443e64a36f7 100644
--- a/libexec/xtend/xtend.c
+++ b/libexec/xtend/xtend.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/xtend/xtend.c,v 1.6.2.3 1999/08/29 15:04:26 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/xtend/xtend.h b/libexec/xtend/xtend.h
index e338603d7d77..7afc84b43282 100644
--- a/libexec/xtend/xtend.h
+++ b/libexec/xtend/xtend.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/xtend/xtend.h,v 1.5.2.1 1999/08/29 15:04:26 peter Exp $
  */
 
 /*
diff --git a/libexec/ypxfr/Makefile b/libexec/ypxfr/Makefile
index f03b266d2480..e99fef2d2ada 100644
--- a/libexec/ypxfr/Makefile
+++ b/libexec/ypxfr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/ypxfr/Makefile,v 1.7.2.1 1999/08/29 15:04:28 peter Exp $
 
 PROG=	ypxfr
 SRCS=	yp_dblookup.c yp_dbwrite.c yp_error.c \
diff --git a/libexec/ypxfr/yp_dbwrite.c b/libexec/ypxfr/yp_dbwrite.c
index bd45c431da3f..8fc41a4c04f2 100644
--- a/libexec/ypxfr/yp_dbwrite.c
+++ b/libexec/ypxfr/yp_dbwrite.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/ypxfr/yp_dbwrite.c,v 1.7.2.1 1999/08/29 15:04:28 peter Exp $";
 #endif /* not lint */
 
 #include <db.h>
diff --git a/libexec/ypxfr/ypxfr.8 b/libexec/ypxfr/ypxfr.8
index 6bdfd027f261..9732dd8578df 100644
--- a/libexec/ypxfr/ypxfr.8
+++ b/libexec/ypxfr/ypxfr.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/ypxfr/ypxfr.8,v 1.8.2.1 1999/08/29 15:04:28 peter Exp $
 .\"
 .Dd February 5, 1995
 .Dt YPXFR 8
diff --git a/libexec/ypxfr/ypxfr_extern.h b/libexec/ypxfr/ypxfr_extern.h
index 34c3406ee526..05bc613f3e5e 100644
--- a/libexec/ypxfr/ypxfr_extern.h
+++ b/libexec/ypxfr/ypxfr_extern.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/ypxfr/ypxfr_extern.h,v 1.6.2.1 1999/08/29 15:04:29 peter Exp $
  */
 #include <sys/types.h>
 #include <limits.h>
diff --git a/libexec/ypxfr/ypxfr_getmap.c b/libexec/ypxfr/ypxfr_getmap.c
index 085d6319a685..ecf5406ff893 100644
--- a/libexec/ypxfr/ypxfr_getmap.c
+++ b/libexec/ypxfr/ypxfr_getmap.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/ypxfr/ypxfr_getmap.c,v 1.6.2.1 1999/08/29 15:04:29 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/libexec/ypxfr/ypxfr_main.c b/libexec/ypxfr/ypxfr_main.c
index a4ad1a0d56c6..b52d12eae336 100644
--- a/libexec/ypxfr/ypxfr_main.c
+++ b/libexec/ypxfr/ypxfr_main.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/ypxfr/ypxfr_main.c,v 1.12.2.2 1999/08/29 15:04:29 peter Exp $";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/libexec/ypxfr/ypxfr_misc.c b/libexec/ypxfr/ypxfr_misc.c
index e31e9201873a..5b0b08ea1cbb 100644
--- a/libexec/ypxfr/ypxfr_misc.c
+++ b/libexec/ypxfr/ypxfr_misc.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/ypxfr/ypxfr_misc.c,v 1.8.2.1 1999/08/29 15:04:29 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/libexec/ypxfr/ypxfrd_getmap.c b/libexec/ypxfr/ypxfrd_getmap.c
index 72555a339c29..b3b407bb0860 100644
--- a/libexec/ypxfr/ypxfrd_getmap.c
+++ b/libexec/ypxfr/ypxfrd_getmap.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/ypxfr/ypxfrd_getmap.c,v 1.6.2.1 1999/08/29 15:04:30 peter Exp $";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/release/Makefile b/release/Makefile
index 67a4bec505ac..a5aa3359b7bb 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/Makefile,v 1.460.2.31 1999/12/16 00:59:58 jkh Exp $
 #
 # make release CHROOTDIR=/some/dir BUILDNAME=somename [ RELEASETAG=tag ]
 #
diff --git a/release/boot_crunch.conf.generic b/release/boot_crunch.conf.generic
index d9bb5f439ad0..c54d50882b95 100644
--- a/release/boot_crunch.conf.generic
+++ b/release/boot_crunch.conf.generic
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/boot_crunch.conf.generic,v 1.4.2.4 1999/12/02 01:53:05 jkh Exp $
 
 srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin
 srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin /usr/src/sbin/i386
diff --git a/release/boot_crunch.conf.pccard b/release/boot_crunch.conf.pccard
index 93787ee1ab41..01a01b06eb0b 100644
--- a/release/boot_crunch.conf.pccard
+++ b/release/boot_crunch.conf.pccard
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/boot_crunch.conf.pccard,v 1.2.2.4 1999/12/02 01:53:05 jkh Exp $
 
 srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin
 srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin /usr/src/sbin/i386
diff --git a/release/fixit.profile b/release/fixit.profile
index fcd2830756a1..7c4a9a50fc8d 100644
--- a/release/fixit.profile
+++ b/release/fixit.profile
@@ -1,5 +1,5 @@
 :
-# $FreeBSD$
+# $FreeBSD: src/release/fixit.profile,v 1.6.2.2 1999/08/29 15:52:20 peter Exp $
 
 export BLOCKSIZE=K
 export PS1="Fixit# "
diff --git a/release/fixit.services b/release/fixit.services
index ff776b2b6265..b58a47a8401f 100644
--- a/release/fixit.services
+++ b/release/fixit.services
@@ -3,7 +3,7 @@
 #
 # Stripped-down version.
 #
-# $FreeBSD$
+# $FreeBSD: src/release/fixit.services,v 1.3.2.1 1999/08/29 15:52:20 peter Exp $
 #
 # WELL KNOWN PORT NUMBERS
 #
diff --git a/release/fixit_crunch.conf b/release/fixit_crunch.conf
index c6a1ee9e7875..46cde66618f9 100644
--- a/release/fixit_crunch.conf
+++ b/release/fixit_crunch.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/fixit_crunch.conf,v 1.15.2.2 1999/09/04 08:46:24 jkh Exp $
 
 # first, we list the source dirs that our programs reside in.  These are
 # searched in order listed to find the dir containing each program.
diff --git a/release/picobsd/README.html b/release/picobsd/README.html
index aca246fe0d73..fa3c47cc1820 100644
--- a/release/picobsd/README.html
+++ b/release/picobsd/README.html
@@ -14,6 +14,6 @@ build your version of PicoBSD.
 
 <p>Enjoy!</p>
 
-<! $FreeBSD$ >
+<! $FreeBSD: src/release/picobsd/README.html,v 1.2.2.1 1999/08/29 15:52:23 peter Exp $ >
 </body>
 </html>
diff --git a/release/picobsd/build/Makefile.conf b/release/picobsd/build/Makefile.conf
index 34160ba1b66b..dca930055cde 100644
--- a/release/picobsd/build/Makefile.conf
+++ b/release/picobsd/build/Makefile.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/build/Makefile.conf,v 1.1.2.3 1999/08/29 15:52:24 peter Exp $
 #
 # Makefile for building PICOBSD kernels
 
diff --git a/release/picobsd/build/build b/release/picobsd/build/build
index 6f9f71aa2e20..cdc71347b093 100755
--- a/release/picobsd/build/build
+++ b/release/picobsd/build/build
@@ -1,7 +1,7 @@
 #!/bin/sh -
 
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/build/build,v 1.12.2.7 1999/10/17 23:05:11 dwhite Exp $
 #
 # You can set the SRC variable which points to your source tree. It's
 # /usr/src by default (most people shouldn't change it).
diff --git a/release/picobsd/build/clean b/release/picobsd/build/clean
index 84e09a1a83b1..0dbcedbc85b1 100755
--- a/release/picobsd/build/clean
+++ b/release/picobsd/build/clean
@@ -1,7 +1,7 @@
 #! /bin/sh -
 
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/build/clean,v 1.7.2.3 1999/08/29 15:52:25 peter Exp $
 #
 set -e
 
diff --git a/release/picobsd/build/stage1 b/release/picobsd/build/stage1
index c467b17b7700..1aacae75bc3a 100755
--- a/release/picobsd/build/stage1
+++ b/release/picobsd/build/stage1
@@ -1,6 +1,6 @@
 #! /bin/sh -
 
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/build/stage1,v 1.7.2.6 1999/10/17 23:05:12 dwhite Exp $
 #
 # stage1 -- this script fills the mfs for the picobsd kernel
 
diff --git a/release/picobsd/dial/Makefile.mfs b/release/picobsd/dial/Makefile.mfs
index 0041740d79d1..9adb0e682a0e 100644
--- a/release/picobsd/dial/Makefile.mfs
+++ b/release/picobsd/dial/Makefile.mfs
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/dial/Makefile.mfs,v 1.1.2.2 1999/08/28 06:52:43 roger Exp $
 #
 
 DESTDIR?=/mnt
diff --git a/release/picobsd/dial/PICOBSD b/release/picobsd/dial/PICOBSD
index 88aff4cfba77..569e68235fc7 100644
--- a/release/picobsd/dial/PICOBSD
+++ b/release/picobsd/dial/PICOBSD
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/dial/PICOBSD,v 1.1.2.3 1999/08/29 15:52:27 peter Exp $
 #
 machine		"i386"
 cpu		"I386_CPU"
diff --git a/release/picobsd/dial/crunch1/Makefile b/release/picobsd/dial/crunch1/Makefile
index 3f183480fb9b..439c7bd3f7ce 100644
--- a/release/picobsd/dial/crunch1/Makefile
+++ b/release/picobsd/dial/crunch1/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/dial/crunch1/Makefile,v 1.3.2.3 1999/08/29 15:52:28 peter Exp $
 #
 NOCRYPT?=	yes
 SRC?=/usr/src
diff --git a/release/picobsd/dial/crunch1/crunch.conf b/release/picobsd/dial/crunch1/crunch.conf
index c6a8b5dbafc7..87d01eae70b5 100644
--- a/release/picobsd/dial/crunch1/crunch.conf
+++ b/release/picobsd/dial/crunch1/crunch.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/dial/crunch1/crunch.conf,v 1.5.2.5 1999/08/29 15:52:29 peter Exp $
 #
 # NOTE1: the string "/usr/src" will be automatically replaced with the
 # correct value set in 'build' script - you should change it there
diff --git a/release/picobsd/dial/floppy.tree/etc/mfs.rc b/release/picobsd/dial/floppy.tree/etc/mfs.rc
index a774c2baaac4..53eea06dbd97 100644
--- a/release/picobsd/dial/floppy.tree/etc/mfs.rc
+++ b/release/picobsd/dial/floppy.tree/etc/mfs.rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/dial/floppy.tree/etc/mfs.rc,v 1.1.2.2 1999/08/29 15:52:30 peter Exp $
 ### WARNING !!!!!! #####
 # We remove this file during execution (see EOF).
 # Awful things happen if its size is > 1024B
diff --git a/release/picobsd/dial/floppy.tree/etc/ppp/ppp.conf b/release/picobsd/dial/floppy.tree/etc/ppp/ppp.conf
index 440ba294bdf5..ffc8aa4f318b 100644
--- a/release/picobsd/dial/floppy.tree/etc/ppp/ppp.conf
+++ b/release/picobsd/dial/floppy.tree/etc/ppp/ppp.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/dial/floppy.tree/etc/ppp/ppp.conf,v 1.1.1.1.2.1 1999/08/29 15:52:32 peter Exp $
 #
 #  	PPP  Sample Configuration File
 default:
diff --git a/release/picobsd/dial/floppy.tree/etc/ppp/ppp.conf.template b/release/picobsd/dial/floppy.tree/etc/ppp/ppp.conf.template
index 0473c4aec6f2..3ada8cd7e979 100644
--- a/release/picobsd/dial/floppy.tree/etc/ppp/ppp.conf.template
+++ b/release/picobsd/dial/floppy.tree/etc/ppp/ppp.conf.template
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/dial/floppy.tree/etc/ppp/ppp.conf.template,v 1.1.1.1.2.1 1999/08/29 15:52:33 peter Exp $
 #  	PPP  Sample Configuration File
 #
 default:
diff --git a/release/picobsd/dial/floppy.tree/etc/rc b/release/picobsd/dial/floppy.tree/etc/rc
index 0b0c1b52a190..422bdc7aa320 100644
--- a/release/picobsd/dial/floppy.tree/etc/rc
+++ b/release/picobsd/dial/floppy.tree/etc/rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/dial/floppy.tree/etc/rc,v 1.1.2.2 1999/08/29 15:52:31 peter Exp $
 ############################################
 ### Special setup for one floppy PICOBSD ###
 ### THIS IS NOT THE NORMAL /etc/rc !!!!! ###
diff --git a/release/picobsd/dial/floppy.tree/etc/rc.conf b/release/picobsd/dial/floppy.tree/etc/rc.conf
index 0c7684df82c2..954226ae8ef0 100644
--- a/release/picobsd/dial/floppy.tree/etc/rc.conf
+++ b/release/picobsd/dial/floppy.tree/etc/rc.conf
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/dial/floppy.tree/etc/rc.conf,v 1.1.2.2 1999/08/29 15:52:31 peter Exp $
 ###  Network configuration sub-section  ######################
 ### Basic network options: ###
 hostname="pico.mydomain.edu"	# Set this!
diff --git a/release/picobsd/dial/lang/LICENCE.ssh b/release/picobsd/dial/lang/LICENCE.ssh
index c4fa584542ad..d33dcf12125f 100644
--- a/release/picobsd/dial/lang/LICENCE.ssh
+++ b/release/picobsd/dial/lang/LICENCE.ssh
@@ -5,4 +5,4 @@ using strong encryption methods.
 
 <abial@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/dial/lang/LICENCE.ssh,v 1.2.2.1 1999/08/29 15:52:35 peter Exp $
diff --git a/release/picobsd/dial/lang/README.en b/release/picobsd/dial/lang/README.en
index 018b4ecc68db..fcce36caabfc 100644
--- a/release/picobsd/dial/lang/README.en
+++ b/release/picobsd/dial/lang/README.en
@@ -103,4 +103,4 @@ Have fun!
 
 Andrzej Bialecki <abial@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/dial/lang/README.en,v 1.4.2.2 1999/08/29 15:52:35 peter Exp $
diff --git a/release/picobsd/dial/lang/README.pl b/release/picobsd/dial/lang/README.pl
index ef5bdf1f0615..696fbc469f52 100644
--- a/release/picobsd/dial/lang/README.pl
+++ b/release/picobsd/dial/lang/README.pl
@@ -104,4 +104,4 @@ Mi³ej zabawy!
   
 Andrzej Bia³ecki <abial@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/dial/lang/README.pl,v 1.4.2.1 1999/08/29 15:52:36 peter Exp $
diff --git a/release/picobsd/dial/lang/dialup.en b/release/picobsd/dial/lang/dialup.en
index ab1491245c02..994fda6a85f2 100755
--- a/release/picobsd/dial/lang/dialup.en
+++ b/release/picobsd/dial/lang/dialup.en
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/dial/lang/dialup.en,v 1.2.2.2 1999/08/29 15:52:36 peter Exp $
 set_resolv() {
 	echo ""
 	echo "                       Default Domain Name"
diff --git a/release/picobsd/dial/lang/dialup.pl b/release/picobsd/dial/lang/dialup.pl
index 1ace50f921d0..853523de645b 100755
--- a/release/picobsd/dial/lang/dialup.pl
+++ b/release/picobsd/dial/lang/dialup.pl
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/dial/lang/dialup.pl,v 1.2.2.2 1999/08/29 15:52:37 peter Exp $
 set_resolv() {
 	echo ""
 	echo "                       Domy¶lna Nazwa Domeny"
diff --git a/release/picobsd/dial/lang/hosts.en b/release/picobsd/dial/lang/hosts.en
index 53f13bab8b37..7a581127c8db 100644
--- a/release/picobsd/dial/lang/hosts.en
+++ b/release/picobsd/dial/lang/hosts.en
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/dial/lang/hosts.en,v 1.1.1.1.2.1 1999/08/29 15:52:37 peter Exp $
 # This file should contain the addresses and aliases
 # for local hosts that share this file.
 127.0.0.1		localhost localhost.mydomain.edu
diff --git a/release/picobsd/dial/lang/hosts.pl b/release/picobsd/dial/lang/hosts.pl
index 89081d798683..ba71c6edc6cf 100644
--- a/release/picobsd/dial/lang/hosts.pl
+++ b/release/picobsd/dial/lang/hosts.pl
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/dial/lang/hosts.pl,v 1.1.1.1.2.1 1999/08/29 15:52:37 peter Exp $
 # This file should contain the addresses and aliases
 # for local hosts that share this file.
 127.0.0.1		localhost localhost.mydomain.org.pl
diff --git a/release/picobsd/dial/lang/login.en b/release/picobsd/dial/lang/login.en
index e3ceeee2dd3e..fcb4b5df6feb 100755
--- a/release/picobsd/dial/lang/login.en
+++ b/release/picobsd/dial/lang/login.en
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/dial/lang/login.en,v 1.2.2.1 1999/08/29 15:52:38 peter Exp $
 
 if [ "$2" != "root" ]
 then
diff --git a/release/picobsd/dial/lang/login.pl b/release/picobsd/dial/lang/login.pl
index 28df1b7f8157..1ab2ed6a6b0d 100755
--- a/release/picobsd/dial/lang/login.pl
+++ b/release/picobsd/dial/lang/login.pl
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/dial/lang/login.pl,v 1.2.2.1 1999/08/29 15:52:38 peter Exp $
 
 if [ "$2" != "root" ]
 then
diff --git a/release/picobsd/dial/lang/reboot.en b/release/picobsd/dial/lang/reboot.en
index 41433a056ba7..809251ad2200 100755
--- a/release/picobsd/dial/lang/reboot.en
+++ b/release/picobsd/dial/lang/reboot.en
@@ -1,3 +1,3 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/dial/lang/reboot.en,v 1.1.1.1.2.1 1999/08/29 15:52:38 peter Exp $
 exec /sbin/echo "Press Ctrl-Alt-Del instead of $0"
diff --git a/release/picobsd/dial/lang/reboot.pl b/release/picobsd/dial/lang/reboot.pl
index 6da1359bf50e..3886e8de1af0 100755
--- a/release/picobsd/dial/lang/reboot.pl
+++ b/release/picobsd/dial/lang/reboot.pl
@@ -1,3 +1,3 @@
 #!/bin/sh
-#$FreeBSD$
+#$FreeBSD: src/release/picobsd/dial/lang/reboot.pl,v 1.1.1.1.2.1 1999/08/29 15:52:39 peter Exp $
 exec /sbin/echo "Zamiast $0 nacisnij Ctrl-Alt-Del"
diff --git a/release/picobsd/dial/lang/update.en b/release/picobsd/dial/lang/update.en
index 921eb6749d5e..406232095f4b 100755
--- a/release/picobsd/dial/lang/update.en
+++ b/release/picobsd/dial/lang/update.en
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/dial/lang/update.en,v 1.2.2.2 1999/08/29 15:52:39 peter Exp $
 pwd=`pwd`
 echo -n "Updating /etc contents on startup floppy...  "
 mount /dev/fd0a /start_floppy
diff --git a/release/picobsd/dial/lang/update.pl b/release/picobsd/dial/lang/update.pl
index 588ce5f5e018..39b62fcdd3d1 100755
--- a/release/picobsd/dial/lang/update.pl
+++ b/release/picobsd/dial/lang/update.pl
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/dial/lang/update.pl,v 1.2.2.2 1999/08/29 15:52:40 peter Exp $
 pwd=`pwd`
 echo -n "Uaktualniam katalog /etc na dyskietce...  "
 mount /dev/fd0a /start_floppy
diff --git a/release/picobsd/dial/mfs.mtree b/release/picobsd/dial/mfs.mtree
index a1a4fff33ca1..f0036d4f8000 100644
--- a/release/picobsd/dial/mfs.mtree
+++ b/release/picobsd/dial/mfs.mtree
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/dial/mfs.mtree,v 1.1.2.2 1999/08/29 15:52:27 peter Exp $
 #
 /set type=dir uname=root gname=wheel mode=0755
 .              
diff --git a/release/picobsd/doc/src/Makefile b/release/picobsd/doc/src/Makefile
index 98a083bc180e..fe6b375042a5 100644
--- a/release/picobsd/doc/src/Makefile
+++ b/release/picobsd/doc/src/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/doc/src/Makefile,v 1.2.2.1 1999/08/29 15:52:42 peter Exp $
 #
 
 .include "../../Version"
diff --git a/release/picobsd/doc/src/TODO.html b/release/picobsd/doc/src/TODO.html
index c2bbf07e34a0..4ebcbd5252fe 100644
--- a/release/picobsd/doc/src/TODO.html
+++ b/release/picobsd/doc/src/TODO.html
@@ -1,5 +1,5 @@
 <html>
-<! $FreeBSD$ >
+<! $FreeBSD: src/release/picobsd/doc/src/TODO.html,v 1.3.2.2 1999/08/29 15:52:43 peter Exp $ >
 <body>
 <h1><center>		Small FreeBSD ToDo List.
 </center></h1>
diff --git a/release/picobsd/doc/src/UCI.html b/release/picobsd/doc/src/UCI.html
index 5c0caaab5051..842240f17d6d 100644
--- a/release/picobsd/doc/src/UCI.html
+++ b/release/picobsd/doc/src/UCI.html
@@ -1,5 +1,5 @@
 <html>
-<! $FreeBSD$ >
+<! $FreeBSD: src/release/picobsd/doc/src/UCI.html,v 1.3.2.1 1999/08/29 15:52:43 peter Exp $ >
 <body>
 <h1><center>		Unified Configuration Interface Project
 </center></h1>
diff --git a/release/picobsd/doc/src/bugs.html b/release/picobsd/doc/src/bugs.html
index f7c91c99b3fb..ed3b17c1c04c 100644
--- a/release/picobsd/doc/src/bugs.html
+++ b/release/picobsd/doc/src/bugs.html
@@ -1,5 +1,5 @@
 <HTML>
-<! $FreeBSD$ >
+<! $FreeBSD: src/release/picobsd/doc/src/bugs.html,v 1.7.2.2 1999/08/29 15:52:44 peter Exp $ >
 <HEAD>
    <TITLE>History and Bug fixes</TITLE>
 </HEAD>
diff --git a/release/picobsd/doc/src/faq.html b/release/picobsd/doc/src/faq.html
index 4a0d34e98cce..cfd9c586f38e 100644
--- a/release/picobsd/doc/src/faq.html
+++ b/release/picobsd/doc/src/faq.html
@@ -1,5 +1,5 @@
 <HTML>
-<! $FreeBSD$ >
+<! $FreeBSD: src/release/picobsd/doc/src/faq.html,v 1.4.2.2 1999/08/29 15:52:44 peter Exp $ >
 <HEAD>
    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
    <META NAME="Author" CONTENT="Dinesh Nair">
diff --git a/release/picobsd/doc/src/hardware.html b/release/picobsd/doc/src/hardware.html
index 0afede238cf1..98686b0b7db6 100644
--- a/release/picobsd/doc/src/hardware.html
+++ b/release/picobsd/doc/src/hardware.html
@@ -1,5 +1,5 @@
 <html>
-<! $FreeBSD$ >
+<! $FreeBSD: src/release/picobsd/doc/src/hardware.html,v 1.2.2.2 1999/08/29 15:52:45 peter Exp $ >
 <body>
 <h1><center>Lists of supported hardware configurations.</center></h1>
 
diff --git a/release/picobsd/doc/src/how2build.html b/release/picobsd/doc/src/how2build.html
index 8d62df95fafc..5af0c3d956d7 100644
--- a/release/picobsd/doc/src/how2build.html
+++ b/release/picobsd/doc/src/how2build.html
@@ -1,5 +1,5 @@
 <html>
-<! $FreeBSD$ >
+<! $FreeBSD: src/release/picobsd/doc/src/how2build.html,v 1.4.2.2 1999/08/29 15:52:45 peter Exp $ >
 <head>
 <title><center>PicoBSD Development Kit</center></title>
 </head>
diff --git a/release/picobsd/doc/src/intrinsics.html b/release/picobsd/doc/src/intrinsics.html
index c69d022a6126..dc82b04e7499 100644
--- a/release/picobsd/doc/src/intrinsics.html
+++ b/release/picobsd/doc/src/intrinsics.html
@@ -1,5 +1,5 @@
 <html>
-<! $FreeBSD$ >
+<! $FreeBSD: src/release/picobsd/doc/src/intrinsics.html,v 1.2.2.1 1999/08/29 15:52:45 peter Exp $ >
 <head>
 <title><center>Details of building process</center></title>
 </head>
diff --git a/release/picobsd/doc/src/intro.html b/release/picobsd/doc/src/intro.html
index 035cd0c14d21..ca80985e4585 100644
--- a/release/picobsd/doc/src/intro.html
+++ b/release/picobsd/doc/src/intro.html
@@ -1,5 +1,5 @@
 <HTML>
-<! $FreeBSD$ >
+<! $FreeBSD: src/release/picobsd/doc/src/intro.html,v 1.6.2.1 1999/08/29 15:52:46 peter Exp $ >
 <HEAD>
    <TITLE>PicoBSD</TITLE>
 </HEAD>
diff --git a/release/picobsd/floppy.tree/etc/host.conf b/release/picobsd/floppy.tree/etc/host.conf
index 753112455a69..c23ed2a67ec6 100644
--- a/release/picobsd/floppy.tree/etc/host.conf
+++ b/release/picobsd/floppy.tree/etc/host.conf
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/floppy.tree/etc/host.conf,v 1.1.2.2 1999/08/29 15:52:47 peter Exp $
 hosts
 bind
diff --git a/release/picobsd/floppy.tree/etc/login.conf b/release/picobsd/floppy.tree/etc/login.conf
index 1f2f02777ddd..43f5c5f57a9c 100644
--- a/release/picobsd/floppy.tree/etc/login.conf
+++ b/release/picobsd/floppy.tree/etc/login.conf
@@ -1,7 +1,7 @@
 # This file controls resource limits, accounting limits and
 # default user environment settings.
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/floppy.tree/etc/login.conf,v 1.1.2.2 1999/08/29 15:52:48 peter Exp $
 #
 
 
diff --git a/release/picobsd/floppy.tree/etc/mfs.login.conf b/release/picobsd/floppy.tree/etc/mfs.login.conf
index ba74169f9a2b..f795c4f9f5e6 100644
--- a/release/picobsd/floppy.tree/etc/mfs.login.conf
+++ b/release/picobsd/floppy.tree/etc/mfs.login.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/floppy.tree/etc/mfs.login.conf,v 1.1.2.2 1999/08/29 15:52:48 peter Exp $
 
 # Authentication methods
 
diff --git a/release/picobsd/floppy.tree/etc/mfs.rc b/release/picobsd/floppy.tree/etc/mfs.rc
index d746cb73d7a9..fea6eb82ef3e 100644
--- a/release/picobsd/floppy.tree/etc/mfs.rc
+++ b/release/picobsd/floppy.tree/etc/mfs.rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/floppy.tree/etc/mfs.rc,v 1.1.2.2 1999/08/29 15:52:49 peter Exp $
 ### WARNING !!!!!! #####
 # We remove this file during execution (see EOF).
 # Awful things happen if its size is > 1024B
diff --git a/release/picobsd/floppy.tree/etc/ppp/ppp.secret.sample b/release/picobsd/floppy.tree/etc/ppp/ppp.secret.sample
index bfaab7681aa5..fbaf8903b9cc 100644
--- a/release/picobsd/floppy.tree/etc/ppp/ppp.secret.sample
+++ b/release/picobsd/floppy.tree/etc/ppp/ppp.secret.sample
@@ -12,7 +12,7 @@
 #  required for all server socket connections.  Refer to the ppp(8)
 #  and pppctl(8) man pages for further details.
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/floppy.tree/etc/ppp/ppp.secret.sample,v 1.1.2.2 1999/08/29 15:52:53 peter Exp $
 #
 ##################################################
 
diff --git a/release/picobsd/floppy.tree/etc/rc b/release/picobsd/floppy.tree/etc/rc
index 3181121a4cec..3dbfd5b70bcb 100644
--- a/release/picobsd/floppy.tree/etc/rc
+++ b/release/picobsd/floppy.tree/etc/rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/floppy.tree/etc/rc,v 1.1.2.2 1999/08/29 15:52:49 peter Exp $
 ############################################
 ### Special setup for one floppy PICOBSD ###
 ### THIS IS NOT THE NORMAL /etc/rc !!!!! ###
diff --git a/release/picobsd/floppy.tree/etc/rc.conf b/release/picobsd/floppy.tree/etc/rc.conf
index c8548ca51b66..4f609245b363 100644
--- a/release/picobsd/floppy.tree/etc/rc.conf
+++ b/release/picobsd/floppy.tree/etc/rc.conf
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/floppy.tree/etc/rc.conf,v 1.1.2.2 1999/08/29 15:52:50 peter Exp $
 #
 # rc.conf for picobsd.
 # $main_ether and $main_if are set from rc to the ethernet address and
diff --git a/release/picobsd/floppy.tree/etc/rc.firewall b/release/picobsd/floppy.tree/etc/rc.firewall
index c2860baedce0..a5b10d5dffdd 100644
--- a/release/picobsd/floppy.tree/etc/rc.firewall
+++ b/release/picobsd/floppy.tree/etc/rc.firewall
@@ -1,6 +1,6 @@
 ############
 # Setup system for firewall service.
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/floppy.tree/etc/rc.firewall,v 1.1.2.2 1999/08/29 15:52:51 peter Exp $
 
 ############
 # Define the firewall type in /etc/rc.conf.  Valid values are:
diff --git a/release/picobsd/floppy.tree/etc/rc.network b/release/picobsd/floppy.tree/etc/rc.network
index 235db0aa14fd..e38324d7aec5 100644
--- a/release/picobsd/floppy.tree/etc/rc.network
+++ b/release/picobsd/floppy.tree/etc/rc.network
@@ -1,5 +1,5 @@
 #!/bin/sh -
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/floppy.tree/etc/rc.network,v 1.1.2.2 1999/08/29 15:52:51 peter Exp $
 network_pass1() {
     echo -n 'Doing initial network setup:'
     # Set the host name if it is not already set
diff --git a/release/picobsd/floppy.tree/etc/rc.serial b/release/picobsd/floppy.tree/etc/rc.serial
index 40fbd8a334cc..6aadd7f97a0f 100644
--- a/release/picobsd/floppy.tree/etc/rc.serial
+++ b/release/picobsd/floppy.tree/etc/rc.serial
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/floppy.tree/etc/rc.serial,v 1.1.2.2 1999/08/29 15:52:52 peter Exp $
 
 # Change some defaults for serial devices.
 # Standard defaults are:
diff --git a/release/picobsd/floppy.tree/etc/resolv.conf b/release/picobsd/floppy.tree/etc/resolv.conf
index 4438442fb0ed..57a6435103a8 100644
--- a/release/picobsd/floppy.tree/etc/resolv.conf
+++ b/release/picobsd/floppy.tree/etc/resolv.conf
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/floppy.tree/etc/resolv.conf,v 1.1.2.2 1999/08/29 15:52:52 peter Exp $
 domain		mydomain.edu
 nameserver	192.33.4.12
diff --git a/release/picobsd/forth/loader.rc b/release/picobsd/forth/loader.rc
index 8b1887f46a36..ec7b84cdb16a 100644
--- a/release/picobsd/forth/loader.rc
+++ b/release/picobsd/forth/loader.rc
@@ -1,5 +1,5 @@
 \ Simple loader.rc for picobsd floppies
-\ $FreeBSD$
+\ $FreeBSD: src/release/picobsd/forth/loader.rc,v 1.1.2.2 1999/08/29 15:52:54 peter Exp $
 
 include /boot/loader.4th
 
diff --git a/release/picobsd/forth/menu.4th b/release/picobsd/forth/menu.4th
index 2541b2034bc0..c5c9ccf1145d 100644
--- a/release/picobsd/forth/menu.4th
+++ b/release/picobsd/forth/menu.4th
@@ -1,7 +1,7 @@
 \ Simple greeting screen, presenting basic options.
 \ XXX This is far too trivial - I don't have time now to think
 \ XXX about something more fancy... :-/
-\ $FreeBSD$
+\ $FreeBSD: src/release/picobsd/forth/menu.4th,v 1.1.2.2 1999/08/29 15:52:55 peter Exp $
 
 : title
 	f_single
diff --git a/release/picobsd/help/README b/release/picobsd/help/README
index 69babc4612f2..f0b355530eb2 100644
--- a/release/picobsd/help/README
+++ b/release/picobsd/help/README
@@ -5,4 +5,4 @@ and these files are just the beginning of it...
 
 <abial@nask.pl>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/help/README,v 1.1.1.1.2.1 1999/08/29 15:52:56 peter Exp $
diff --git a/release/picobsd/install/floppy.tree/etc/doinstall b/release/picobsd/install/floppy.tree/etc/doinstall
index 1e29e19fddb3..b39fdd23fbcb 100755
--- a/release/picobsd/install/floppy.tree/etc/doinstall
+++ b/release/picobsd/install/floppy.tree/etc/doinstall
@@ -3,7 +3,7 @@
 # PicoBSD installer script for FreeBSD
 #
 # Doug White
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/install/floppy.tree/etc/doinstall,v 1.1.2.1 1999/10/17 23:11:10 dwhite Exp $
 
 #### CONFIGURATION
 
diff --git a/release/picobsd/isp/Makefile.mfs b/release/picobsd/isp/Makefile.mfs
index 73d97e548331..8d5aa942f2d7 100644
--- a/release/picobsd/isp/Makefile.mfs
+++ b/release/picobsd/isp/Makefile.mfs
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/isp/Makefile.mfs,v 1.2.2.2 1999/08/29 15:52:57 peter Exp $
 #
 
 DESTDIR?=/mnt
diff --git a/release/picobsd/isp/PICOBSD b/release/picobsd/isp/PICOBSD
index 009e8a4f8319..8649c2e29e89 100644
--- a/release/picobsd/isp/PICOBSD
+++ b/release/picobsd/isp/PICOBSD
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/isp/PICOBSD,v 1.1.2.3 1999/08/29 15:52:58 peter Exp $
 #
 
 machine		"i386"
diff --git a/release/picobsd/isp/crunch1/Makefile b/release/picobsd/isp/crunch1/Makefile
index d6830bfaef1b..25a002c6b0ba 100644
--- a/release/picobsd/isp/crunch1/Makefile
+++ b/release/picobsd/isp/crunch1/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/isp/crunch1/Makefile,v 1.4.2.4 1999/12/15 11:50:48 luigi Exp $
 #
 SRC?=/usr/src
 
diff --git a/release/picobsd/isp/crunch1/crunch.conf b/release/picobsd/isp/crunch1/crunch.conf
index 270b74da717a..14952f69feab 100644
--- a/release/picobsd/isp/crunch1/crunch.conf
+++ b/release/picobsd/isp/crunch1/crunch.conf
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/isp/crunch1/crunch.conf,v 1.5.2.3 1999/08/29 15:53:00 peter Exp $
 #
 # NOTE: the string "/usr/src" will be automatically replaced with the
 # correct value set in 'build' script - you should change it there
diff --git a/release/picobsd/isp/lang/hosts.en b/release/picobsd/isp/lang/hosts.en
index 53f13bab8b37..c3e2b5e3725a 100644
--- a/release/picobsd/isp/lang/hosts.en
+++ b/release/picobsd/isp/lang/hosts.en
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/isp/lang/hosts.en,v 1.1.1.1.2.1 1999/08/29 15:53:01 peter Exp $
 # This file should contain the addresses and aliases
 # for local hosts that share this file.
 127.0.0.1		localhost localhost.mydomain.edu
diff --git a/release/picobsd/isp/lang/hosts.pl b/release/picobsd/isp/lang/hosts.pl
index 89081d798683..802f7605ee1e 100644
--- a/release/picobsd/isp/lang/hosts.pl
+++ b/release/picobsd/isp/lang/hosts.pl
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/isp/lang/hosts.pl,v 1.1.1.1.2.1 1999/08/29 15:53:02 peter Exp $
 # This file should contain the addresses and aliases
 # for local hosts that share this file.
 127.0.0.1		localhost localhost.mydomain.org.pl
diff --git a/release/picobsd/isp/lang/update.en b/release/picobsd/isp/lang/update.en
index f8c91fd4f171..af425aa7f5ff 100755
--- a/release/picobsd/isp/lang/update.en
+++ b/release/picobsd/isp/lang/update.en
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/isp/lang/update.en,v 1.2.2.2 1999/08/29 15:53:02 peter Exp $
 pwd=`pwd`
 echo -n "Updating /etc contents on startup floppy...  "
 mount /dev/fd0a /start_floppy
diff --git a/release/picobsd/isp/lang/update.pl b/release/picobsd/isp/lang/update.pl
index 645f4c05570a..e1c4ab7ffd14 100755
--- a/release/picobsd/isp/lang/update.pl
+++ b/release/picobsd/isp/lang/update.pl
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/isp/lang/update.pl,v 1.2.2.2 1999/08/29 15:53:03 peter Exp $
 pwd=`pwd`
 echo -n "Uaktualniam katalog /etc na dyskietce...  "
 mount /dev/fd0a /start_floppy
diff --git a/release/picobsd/isp/mfs.mtree b/release/picobsd/isp/mfs.mtree
index d5e5ee419771..e67522ac7b60 100644
--- a/release/picobsd/isp/mfs.mtree
+++ b/release/picobsd/isp/mfs.mtree
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/isp/mfs.mtree,v 1.1.2.3 1999/08/29 15:52:58 peter Exp $
 #
 /set type=dir uname=root gname=wheel mode=0755
 .              
diff --git a/release/picobsd/net/Makefile.mfs b/release/picobsd/net/Makefile.mfs
index 65d461f09cb1..dc93ea1f1699 100644
--- a/release/picobsd/net/Makefile.mfs
+++ b/release/picobsd/net/Makefile.mfs
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/net/Makefile.mfs,v 1.2.2.2 1999/08/29 15:53:05 peter Exp $
 #
 
 DESTDIR?=/mnt
diff --git a/release/picobsd/net/PICOBSD b/release/picobsd/net/PICOBSD
index 47333a2d8a4e..549440cd2604 100644
--- a/release/picobsd/net/PICOBSD
+++ b/release/picobsd/net/PICOBSD
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/net/PICOBSD,v 1.1.2.3 1999/08/29 15:53:05 peter Exp $
 #
 
 machine		"i386"
diff --git a/release/picobsd/net/crunch1/Makefile b/release/picobsd/net/crunch1/Makefile
index 9efdedaa54a8..a8281dd5e504 100644
--- a/release/picobsd/net/crunch1/Makefile
+++ b/release/picobsd/net/crunch1/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/net/crunch1/Makefile,v 1.3.2.4 1999/12/15 11:50:49 luigi Exp $
 #
 SRC?=/usr/src
 
diff --git a/release/picobsd/net/crunch1/crunch.conf b/release/picobsd/net/crunch1/crunch.conf
index 76475fd06e82..7d9161712a3e 100644
--- a/release/picobsd/net/crunch1/crunch.conf
+++ b/release/picobsd/net/crunch1/crunch.conf
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/net/crunch1/crunch.conf,v 1.5.2.5 1999/08/29 15:53:08 peter Exp $
 #
 # NOTE: the string "/usr/src" will be automatically replaced with the
 # correct value set in 'build' script - you should change it there
diff --git a/release/picobsd/net/floppy.tree/etc/host.conf b/release/picobsd/net/floppy.tree/etc/host.conf
index 753112455a69..97c376f94c76 100644
--- a/release/picobsd/net/floppy.tree/etc/host.conf
+++ b/release/picobsd/net/floppy.tree/etc/host.conf
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/net/floppy.tree/etc/host.conf,v 1.1.1.1.2.2 1999/08/29 15:53:09 peter Exp $
 hosts
 bind
diff --git a/release/picobsd/net/floppy.tree/etc/login.conf b/release/picobsd/net/floppy.tree/etc/login.conf
index 1f2f02777ddd..d848453575da 100644
--- a/release/picobsd/net/floppy.tree/etc/login.conf
+++ b/release/picobsd/net/floppy.tree/etc/login.conf
@@ -1,7 +1,7 @@
 # This file controls resource limits, accounting limits and
 # default user environment settings.
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/net/floppy.tree/etc/login.conf,v 1.2.2.3 1999/08/29 15:53:10 peter Exp $
 #
 
 
diff --git a/release/picobsd/net/floppy.tree/etc/mfs.rc b/release/picobsd/net/floppy.tree/etc/mfs.rc
index d746cb73d7a9..412470859a3c 100644
--- a/release/picobsd/net/floppy.tree/etc/mfs.rc
+++ b/release/picobsd/net/floppy.tree/etc/mfs.rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/net/floppy.tree/etc/mfs.rc,v 1.1.2.2 1999/08/29 15:53:11 peter Exp $
 ### WARNING !!!!!! #####
 # We remove this file during execution (see EOF).
 # Awful things happen if its size is > 1024B
diff --git a/release/picobsd/net/floppy.tree/etc/ppp/ppp.secret.sample b/release/picobsd/net/floppy.tree/etc/ppp/ppp.secret.sample
index bfaab7681aa5..e8067115e561 100644
--- a/release/picobsd/net/floppy.tree/etc/ppp/ppp.secret.sample
+++ b/release/picobsd/net/floppy.tree/etc/ppp/ppp.secret.sample
@@ -12,7 +12,7 @@
 #  required for all server socket connections.  Refer to the ppp(8)
 #  and pppctl(8) man pages for further details.
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/net/floppy.tree/etc/ppp/ppp.secret.sample,v 1.1.1.1.2.2 1999/08/29 15:53:14 peter Exp $
 #
 ##################################################
 
diff --git a/release/picobsd/net/floppy.tree/etc/rc b/release/picobsd/net/floppy.tree/etc/rc
index 3b38df65813a..e7ec335ab807 100644
--- a/release/picobsd/net/floppy.tree/etc/rc
+++ b/release/picobsd/net/floppy.tree/etc/rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/net/floppy.tree/etc/rc,v 1.4.2.2 1999/08/29 15:53:11 peter Exp $
 ############################################
 ### Special setup for one floppy PICOBSD ###
 ### THIS IS NOT THE NORMAL /etc/rc !!!!! ###
diff --git a/release/picobsd/net/floppy.tree/etc/rc.conf b/release/picobsd/net/floppy.tree/etc/rc.conf
index 24cb9394bab4..1fa6a9b62413 100644
--- a/release/picobsd/net/floppy.tree/etc/rc.conf
+++ b/release/picobsd/net/floppy.tree/etc/rc.conf
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/net/floppy.tree/etc/rc.conf,v 1.5.2.2 1999/08/29 15:53:12 peter Exp $
 swapfile="NO"		# Set to name of swapfile if aux swapfile desired.
 ###  Network configuration sub-section  ######################
 ### Basic network options: ###
diff --git a/release/picobsd/net/floppy.tree/etc/rc.firewall b/release/picobsd/net/floppy.tree/etc/rc.firewall
index c2860baedce0..73e228c821ce 100644
--- a/release/picobsd/net/floppy.tree/etc/rc.firewall
+++ b/release/picobsd/net/floppy.tree/etc/rc.firewall
@@ -1,6 +1,6 @@
 ############
 # Setup system for firewall service.
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/net/floppy.tree/etc/rc.firewall,v 1.1.1.1.2.2 1999/08/29 15:53:12 peter Exp $
 
 ############
 # Define the firewall type in /etc/rc.conf.  Valid values are:
diff --git a/release/picobsd/net/floppy.tree/etc/rc.network b/release/picobsd/net/floppy.tree/etc/rc.network
index 235db0aa14fd..e66ce0880e0c 100644
--- a/release/picobsd/net/floppy.tree/etc/rc.network
+++ b/release/picobsd/net/floppy.tree/etc/rc.network
@@ -1,5 +1,5 @@
 #!/bin/sh -
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/net/floppy.tree/etc/rc.network,v 1.5.2.2 1999/08/29 15:53:13 peter Exp $
 network_pass1() {
     echo -n 'Doing initial network setup:'
     # Set the host name if it is not already set
diff --git a/release/picobsd/net/floppy.tree/etc/rc.serial b/release/picobsd/net/floppy.tree/etc/rc.serial
index 40fbd8a334cc..a5f0a66cbe25 100644
--- a/release/picobsd/net/floppy.tree/etc/rc.serial
+++ b/release/picobsd/net/floppy.tree/etc/rc.serial
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/net/floppy.tree/etc/rc.serial,v 1.1.1.1.2.2 1999/08/29 15:53:13 peter Exp $
 
 # Change some defaults for serial devices.
 # Standard defaults are:
diff --git a/release/picobsd/net/floppy.tree/etc/resolv.conf b/release/picobsd/net/floppy.tree/etc/resolv.conf
index 4438442fb0ed..862f21ee7455 100644
--- a/release/picobsd/net/floppy.tree/etc/resolv.conf
+++ b/release/picobsd/net/floppy.tree/etc/resolv.conf
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/net/floppy.tree/etc/resolv.conf,v 1.5.2.2 1999/08/29 15:53:13 peter Exp $
 domain		mydomain.edu
 nameserver	192.33.4.12
diff --git a/release/picobsd/net/lang/hosts.en b/release/picobsd/net/lang/hosts.en
index 53f13bab8b37..15a13f3500e0 100644
--- a/release/picobsd/net/lang/hosts.en
+++ b/release/picobsd/net/lang/hosts.en
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/net/lang/hosts.en,v 1.1.1.1.2.1 1999/08/29 15:53:15 peter Exp $
 # This file should contain the addresses and aliases
 # for local hosts that share this file.
 127.0.0.1		localhost localhost.mydomain.edu
diff --git a/release/picobsd/net/lang/hosts.pl b/release/picobsd/net/lang/hosts.pl
index 89081d798683..a535ec206998 100644
--- a/release/picobsd/net/lang/hosts.pl
+++ b/release/picobsd/net/lang/hosts.pl
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/net/lang/hosts.pl,v 1.1.1.1.2.1 1999/08/29 15:53:16 peter Exp $
 # This file should contain the addresses and aliases
 # for local hosts that share this file.
 127.0.0.1		localhost localhost.mydomain.org.pl
diff --git a/release/picobsd/net/lang/update.en b/release/picobsd/net/lang/update.en
index f8c91fd4f171..13984c57c976 100755
--- a/release/picobsd/net/lang/update.en
+++ b/release/picobsd/net/lang/update.en
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/net/lang/update.en,v 1.2.2.2 1999/08/29 15:53:17 peter Exp $
 pwd=`pwd`
 echo -n "Updating /etc contents on startup floppy...  "
 mount /dev/fd0a /start_floppy
diff --git a/release/picobsd/net/lang/update.pl b/release/picobsd/net/lang/update.pl
index 645f4c05570a..1a40ba5a1f5d 100755
--- a/release/picobsd/net/lang/update.pl
+++ b/release/picobsd/net/lang/update.pl
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/net/lang/update.pl,v 1.2.2.2 1999/08/29 15:53:17 peter Exp $
 pwd=`pwd`
 echo -n "Uaktualniam katalog /etc na dyskietce...  "
 mount /dev/fd0a /start_floppy
diff --git a/release/picobsd/net/mfs.mtree b/release/picobsd/net/mfs.mtree
index 031638f2d3f9..1e2eb43f6762 100644
--- a/release/picobsd/net/mfs.mtree
+++ b/release/picobsd/net/mfs.mtree
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/net/mfs.mtree,v 1.1.2.2 1999/08/29 15:53:06 peter Exp $
 #
 /set type=dir uname=root gname=wheel mode=0755
 .              
diff --git a/release/picobsd/router/Makefile.mfs b/release/picobsd/router/Makefile.mfs
index d2c2e63fb4a2..25bdedcf3573 100644
--- a/release/picobsd/router/Makefile.mfs
+++ b/release/picobsd/router/Makefile.mfs
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/router/Makefile.mfs,v 1.2.2.2 1999/08/29 15:53:18 peter Exp $
 #
 
 DESTDIR?=/mnt
diff --git a/release/picobsd/router/PICOBSD b/release/picobsd/router/PICOBSD
index 4d2a19403fd1..f5c461eeeea4 100644
--- a/release/picobsd/router/PICOBSD
+++ b/release/picobsd/router/PICOBSD
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/router/PICOBSD,v 1.1.2.3 1999/08/29 15:53:19 peter Exp $
 #
 
 machine		"i386"
diff --git a/release/picobsd/router/crunch1/Makefile b/release/picobsd/router/crunch1/Makefile
index 4235ae901314..be12758f1ac3 100644
--- a/release/picobsd/router/crunch1/Makefile
+++ b/release/picobsd/router/crunch1/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/router/crunch1/Makefile,v 1.2.2.3 1999/08/29 15:53:21 peter Exp $
 #
 SRC?=/usr/src
 
diff --git a/release/picobsd/router/crunch1/crunch.conf b/release/picobsd/router/crunch1/crunch.conf
index 1ce5d898a2a0..ea54a75d1294 100644
--- a/release/picobsd/router/crunch1/crunch.conf
+++ b/release/picobsd/router/crunch1/crunch.conf
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/router/crunch1/crunch.conf,v 1.3.2.3 1999/08/29 15:53:21 peter Exp $
 #
 # NOTE: the string "/usr/src" will be automatically replaced with the
 # correct value set in 'build' script - you should change it there
diff --git a/release/picobsd/router/floppy.tree/etc/mfs.rc b/release/picobsd/router/floppy.tree/etc/mfs.rc
index aa60593473b1..427bcd044a17 100644
--- a/release/picobsd/router/floppy.tree/etc/mfs.rc
+++ b/release/picobsd/router/floppy.tree/etc/mfs.rc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/router/floppy.tree/etc/mfs.rc,v 1.1.2.2 1999/08/29 15:53:23 peter Exp $
 # This file is interpreted by oinit(8)
 #
 ncons 2
diff --git a/release/picobsd/router/floppy.tree/etc/rc b/release/picobsd/router/floppy.tree/etc/rc
index 794e928a1da5..9ce732d54f2b 100644
--- a/release/picobsd/router/floppy.tree/etc/rc
+++ b/release/picobsd/router/floppy.tree/etc/rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/router/floppy.tree/etc/rc,v 1.4.2.2 1999/08/29 15:53:24 peter Exp $
 ### Special setup for one floppy PICOBSD ###
 ifconfig lo0 inet 127.0.0.1 netmask 0xffffff00
 hostname pico
diff --git a/release/picobsd/router/floppy.tree/etc/rc.firewall b/release/picobsd/router/floppy.tree/etc/rc.firewall
index c2860baedce0..45d585a344ec 100644
--- a/release/picobsd/router/floppy.tree/etc/rc.firewall
+++ b/release/picobsd/router/floppy.tree/etc/rc.firewall
@@ -1,6 +1,6 @@
 ############
 # Setup system for firewall service.
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/router/floppy.tree/etc/rc.firewall,v 1.1.1.1.2.2 1999/08/29 15:53:24 peter Exp $
 
 ############
 # Define the firewall type in /etc/rc.conf.  Valid values are:
diff --git a/release/picobsd/router/lang/hosts.en b/release/picobsd/router/lang/hosts.en
index 53f13bab8b37..3c18abd7777a 100644
--- a/release/picobsd/router/lang/hosts.en
+++ b/release/picobsd/router/lang/hosts.en
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/router/lang/hosts.en,v 1.1.1.1.2.1 1999/08/29 15:53:25 peter Exp $
 # This file should contain the addresses and aliases
 # for local hosts that share this file.
 127.0.0.1		localhost localhost.mydomain.edu
diff --git a/release/picobsd/router/lang/hosts.pl b/release/picobsd/router/lang/hosts.pl
index 89081d798683..3ae5c4f9a4fc 100644
--- a/release/picobsd/router/lang/hosts.pl
+++ b/release/picobsd/router/lang/hosts.pl
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/router/lang/hosts.pl,v 1.1.1.1.2.1 1999/08/29 15:53:26 peter Exp $
 # This file should contain the addresses and aliases
 # for local hosts that share this file.
 127.0.0.1		localhost localhost.mydomain.org.pl
diff --git a/release/picobsd/router/lang/update.en b/release/picobsd/router/lang/update.en
index c73c49dd2f7c..1cbf614da36d 100755
--- a/release/picobsd/router/lang/update.en
+++ b/release/picobsd/router/lang/update.en
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/router/lang/update.en,v 1.2.2.2 1999/08/29 15:53:26 peter Exp $
 echo -n "Updating /etc contents on startup floppy...  "
 mount /dev/fd0a /start_floppy
 cd /etc
diff --git a/release/picobsd/router/lang/update.pl b/release/picobsd/router/lang/update.pl
index dfa5d57081ee..607951db1dd2 100755
--- a/release/picobsd/router/lang/update.pl
+++ b/release/picobsd/router/lang/update.pl
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/router/lang/update.pl,v 1.2.2.2 1999/08/29 15:53:26 peter Exp $
 echo -n "Uaktualniam katalog /etc na dyskietce...  "
 mount /dev/fd0a /start_floppy
 cd /etc
diff --git a/release/picobsd/router/mfs.mtree b/release/picobsd/router/mfs.mtree
index 50362cfb469b..36036d53d169 100644
--- a/release/picobsd/router/mfs.mtree
+++ b/release/picobsd/router/mfs.mtree
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/router/mfs.mtree,v 1.1.2.3 1999/08/29 15:53:20 peter Exp $
 #
 /set type=dir uname=root gname=wheel mode=0755
 .              
diff --git a/release/picobsd/tinyware/aps/Makefile b/release/picobsd/tinyware/aps/Makefile
index cda9bdddba1c..0e7028415b5d 100644
--- a/release/picobsd/tinyware/aps/Makefile
+++ b/release/picobsd/tinyware/aps/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/aps/Makefile,v 1.1.1.1.2.1 1999/08/29 15:53:27 peter Exp $
 #
 PROG=ps
 SRCS+=main.c
diff --git a/release/picobsd/tinyware/aps/README b/release/picobsd/tinyware/aps/README
index f455c7bae307..49bec0d6ba98 100644
--- a/release/picobsd/tinyware/aps/README
+++ b/release/picobsd/tinyware/aps/README
@@ -16,4 +16,4 @@ more general (and less complicated) sysctl(3).
 (As of 1998.07.31 this program is no longer used in PicoBSD. See sps(1) in
 TinyWare collection).
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/aps/README,v 1.2.2.1 1999/08/29 15:53:28 peter Exp $
diff --git a/release/picobsd/tinyware/aps/main.c b/release/picobsd/tinyware/aps/main.c
index eece247af3bd..006214eeb4cd 100644
--- a/release/picobsd/tinyware/aps/main.c
+++ b/release/picobsd/tinyware/aps/main.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/aps/main.c,v 1.1.1.1.2.1 1999/08/29 15:53:29 peter Exp $
  *
  */
 
diff --git a/release/picobsd/tinyware/help/Makefile b/release/picobsd/tinyware/help/Makefile
index 2bf727af61b7..d52052075bfd 100644
--- a/release/picobsd/tinyware/help/Makefile
+++ b/release/picobsd/tinyware/help/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/help/Makefile,v 1.1.1.1.2.1 1999/08/29 15:53:30 peter Exp $
 #
 PROG=help
 SRCS+=help.c
diff --git a/release/picobsd/tinyware/help/README b/release/picobsd/tinyware/help/README
index 9c9900feba3f..4affa6798119 100644
--- a/release/picobsd/tinyware/help/README
+++ b/release/picobsd/tinyware/help/README
@@ -5,4 +5,4 @@ and these files are just the beginning of it...
 
 <abial@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/help/README,v 1.2.2.1 1999/08/29 15:53:31 peter Exp $
diff --git a/release/picobsd/tinyware/help/help.c b/release/picobsd/tinyware/help/help.c
index b57b4f6f1557..45646b03ef50 100644
--- a/release/picobsd/tinyware/help/help.c
+++ b/release/picobsd/tinyware/help/help.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/help/help.c,v 1.4.2.1 1999/08/29 15:53:32 peter Exp $
  */
 
 
diff --git a/release/picobsd/tinyware/msg/Makefile b/release/picobsd/tinyware/msg/Makefile
index 840868872c5e..c258162c46d6 100644
--- a/release/picobsd/tinyware/msg/Makefile
+++ b/release/picobsd/tinyware/msg/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/msg/Makefile,v 1.1.2.1 1999/08/29 15:53:33 peter Exp $
 #
 PROG=msg
 SRCS= 	msg.c
diff --git a/release/picobsd/tinyware/msg/README b/release/picobsd/tinyware/msg/README
index d26e38326a9e..682228d9dfaf 100644
--- a/release/picobsd/tinyware/msg/README
+++ b/release/picobsd/tinyware/msg/README
@@ -12,4 +12,4 @@ kernel tree, contact me directly - the patches are very small and simple.
 Andrzej Bialecki
 <abial@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/msg/README,v 1.2.2.1 1999/08/29 15:53:33 peter Exp $
diff --git a/release/picobsd/tinyware/msg/msg.c b/release/picobsd/tinyware/msg/msg.c
index 1aa458cf11c4..a7dabe6033ad 100644
--- a/release/picobsd/tinyware/msg/msg.c
+++ b/release/picobsd/tinyware/msg/msg.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/msg/msg.c,v 1.1.2.1 1999/08/29 15:53:33 peter Exp $
  */
 
 /*
diff --git a/release/picobsd/tinyware/ns/Makefile b/release/picobsd/tinyware/ns/Makefile
index 5fff143ef5f8..ba2ba00d9ba1 100644
--- a/release/picobsd/tinyware/ns/Makefile
+++ b/release/picobsd/tinyware/ns/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/ns/Makefile,v 1.4.2.3 1999/08/29 15:53:35 peter Exp $
 #
 PROG=ns
 SRCS= 	ns.c
diff --git a/release/picobsd/tinyware/ns/README b/release/picobsd/tinyware/ns/README
index 830915c9e603..3eecd87bfca5 100644
--- a/release/picobsd/tinyware/ns/README
+++ b/release/picobsd/tinyware/ns/README
@@ -40,4 +40,4 @@ Bugs
 Andrzej Bialecki
 <abial@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/ns/README,v 1.3.2.1 1999/08/29 15:53:35 peter Exp $
diff --git a/release/picobsd/tinyware/ns/ns.c b/release/picobsd/tinyware/ns/ns.c
index acabac2e93be..946be0ca6bfd 100644
--- a/release/picobsd/tinyware/ns/ns.c
+++ b/release/picobsd/tinyware/ns/ns.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/ns/ns.c,v 1.5.2.3 1999/08/29 15:53:36 peter Exp $
  */
 
 
diff --git a/release/picobsd/tinyware/oinit/Makefile b/release/picobsd/tinyware/oinit/Makefile
index 1fb9b2dcbba8..ef879cabb13f 100644
--- a/release/picobsd/tinyware/oinit/Makefile
+++ b/release/picobsd/tinyware/oinit/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/oinit/Makefile,v 1.1.1.1.2.1 1999/08/29 15:53:36 peter Exp $
 #
 PROG=oinit
 #CFLAGS+=-DUSE_HISTORY
diff --git a/release/picobsd/tinyware/oinit/README b/release/picobsd/tinyware/oinit/README
index e34c404f4a8d..98025a6c7e38 100644
--- a/release/picobsd/tinyware/oinit/README
+++ b/release/picobsd/tinyware/oinit/README
@@ -120,4 +120,4 @@ The overall framework was taken from FreeBSD /sbin/init.
 Andrzej Bialecki
 <abial@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/oinit/README,v 1.2.2.1 1999/08/29 15:53:37 peter Exp $
diff --git a/release/picobsd/tinyware/oinit/oinit.c b/release/picobsd/tinyware/oinit/oinit.c
index c0555fae0ea8..e509701fa1d1 100644
--- a/release/picobsd/tinyware/oinit/oinit.c
+++ b/release/picobsd/tinyware/oinit/oinit.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/oinit/oinit.c,v 1.3.2.1 1999/08/29 15:53:39 peter Exp $
  */
 
 /*
diff --git a/release/picobsd/tinyware/simple_httpd/Makefile b/release/picobsd/tinyware/simple_httpd/Makefile
index 524040efb534..7331799d0a7e 100644
--- a/release/picobsd/tinyware/simple_httpd/Makefile
+++ b/release/picobsd/tinyware/simple_httpd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/simple_httpd/Makefile,v 1.2.2.3 1999/08/29 15:53:40 peter Exp $
 #
 PROG=simple_httpd
 SRCS= 	simple_httpd.c
diff --git a/release/picobsd/tinyware/simple_httpd/README b/release/picobsd/tinyware/simple_httpd/README
index 6961954615d4..613d9b904141 100644
--- a/release/picobsd/tinyware/simple_httpd/README
+++ b/release/picobsd/tinyware/simple_httpd/README
@@ -164,4 +164,4 @@ This program was originally contributed by Marc Nicholas <marc@netstor.com>
 
 Major rewrite by William Lloyd <wlloyd@slap.net>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/simple_httpd/README,v 1.2.2.3 1999/08/29 15:53:40 peter Exp $
diff --git a/release/picobsd/tinyware/simple_httpd/simple_httpd.c b/release/picobsd/tinyware/simple_httpd/simple_httpd.c
index 71ee3396e9a5..5aea76dc1e76 100644
--- a/release/picobsd/tinyware/simple_httpd/simple_httpd.c
+++ b/release/picobsd/tinyware/simple_httpd/simple_httpd.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/simple_httpd/simple_httpd.c,v 1.2.2.3 1999/08/29 15:53:41 peter Exp $
  */
 
 #include <sys/stat.h>
diff --git a/release/picobsd/tinyware/sps/Makefile b/release/picobsd/tinyware/sps/Makefile
index 8997087da65e..f6067b2ec0be 100644
--- a/release/picobsd/tinyware/sps/Makefile
+++ b/release/picobsd/tinyware/sps/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/sps/Makefile,v 1.1.1.1.2.1 1999/08/29 15:53:41 peter Exp $
 #
 PROG=sps
 SRCS= 	sps.c
diff --git a/release/picobsd/tinyware/sps/README b/release/picobsd/tinyware/sps/README
index cf7b7212d2ac..11a0ed412786 100644
--- a/release/picobsd/tinyware/sps/README
+++ b/release/picobsd/tinyware/sps/README
@@ -14,4 +14,4 @@ command line.
 
 <abial@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/sps/README,v 1.2.2.1 1999/08/29 15:53:42 peter Exp $
diff --git a/release/picobsd/tinyware/sps/sps.c b/release/picobsd/tinyware/sps/sps.c
index 1e490f8c1fe4..0e4b86a5dde8 100644
--- a/release/picobsd/tinyware/sps/sps.c
+++ b/release/picobsd/tinyware/sps/sps.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/sps/sps.c,v 1.1.1.1.2.1 1999/08/29 15:53:42 peter Exp $
  */
 
 /*
diff --git a/release/picobsd/tinyware/view/Makefile b/release/picobsd/tinyware/view/Makefile
index 1c0399d12787..ebb46fb4d663 100644
--- a/release/picobsd/tinyware/view/Makefile
+++ b/release/picobsd/tinyware/view/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/view/Makefile,v 1.2.2.1 1999/08/29 15:53:43 peter Exp $
 
 PROG=view
 SRCS=view.c
diff --git a/release/picobsd/tinyware/view/README b/release/picobsd/tinyware/view/README
index df5f774a95f6..8d11083b1279 100644
--- a/release/picobsd/tinyware/view/README
+++ b/release/picobsd/tinyware/view/README
@@ -83,4 +83,4 @@ Andrzej Bialecki
 
 <abial@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/view/README,v 1.2.2.1 1999/08/29 15:53:44 peter Exp $
diff --git a/release/picobsd/tinyware/view/view.c b/release/picobsd/tinyware/view/view.c
index dfb7608e0816..4fab994e29a1 100644
--- a/release/picobsd/tinyware/view/view.c
+++ b/release/picobsd/tinyware/view/view.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/view/view.c,v 1.3.2.1 1999/08/29 15:53:45 peter Exp $
  */
 
 /*
diff --git a/release/picobsd/tinyware/vm/Makefile b/release/picobsd/tinyware/vm/Makefile
index 359aa3e9cfc4..11052312232f 100644
--- a/release/picobsd/tinyware/vm/Makefile
+++ b/release/picobsd/tinyware/vm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/vm/Makefile,v 1.1.1.1.2.1 1999/08/29 15:53:46 peter Exp $
 #
 PROG=vm
 #CFLAGS+=
diff --git a/release/picobsd/tinyware/vm/README b/release/picobsd/tinyware/vm/README
index c4a940c629e8..64b73574660c 100644
--- a/release/picobsd/tinyware/vm/README
+++ b/release/picobsd/tinyware/vm/README
@@ -7,4 +7,4 @@ consequently it is not displayed in stock version of sysctl(8).
 
 <abial@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/vm/README,v 1.2.2.1 1999/08/29 15:53:47 peter Exp $
diff --git a/release/picobsd/tinyware/vm/vm.c b/release/picobsd/tinyware/vm/vm.c
index 482a2be286b9..6f9896bc9521 100644
--- a/release/picobsd/tinyware/vm/vm.c
+++ b/release/picobsd/tinyware/vm/vm.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/vm/vm.c,v 1.2.2.2 1999/08/29 15:53:47 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/release/picobsd/tools/daemon/Makefile b/release/picobsd/tools/daemon/Makefile
index 0091a8598ff1..7f81b9a85481 100644
--- a/release/picobsd/tools/daemon/Makefile
+++ b/release/picobsd/tools/daemon/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tools/daemon/Makefile,v 1.1.1.1.2.1 1999/08/29 15:53:48 peter Exp $
 #
 PROG=daemon
 NOMAN=yes
diff --git a/release/picobsd/tools/daemon/README b/release/picobsd/tools/daemon/README
index 4d8c060bede1..7baeb20559c1 100644
--- a/release/picobsd/tools/daemon/README
+++ b/release/picobsd/tools/daemon/README
@@ -4,4 +4,4 @@ Documentation: UTSL.
 
 <abial@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tools/daemon/README,v 1.2.2.1 1999/08/29 15:53:48 peter Exp $
diff --git a/release/picobsd/tools/daemon/daemon.c b/release/picobsd/tools/daemon/daemon.c
index 2eace4f40849..f2d09b304ed2 100644
--- a/release/picobsd/tools/daemon/daemon.c
+++ b/release/picobsd/tools/daemon/daemon.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tools/daemon/daemon.c,v 1.1.1.1.2.2 1999/08/29 15:53:49 peter Exp $
  */
 
 
diff --git a/release/picobsd/tools/write_mfs_in_kernel/Makefile b/release/picobsd/tools/write_mfs_in_kernel/Makefile
index bbc6739cf5ea..884a84df4bd2 100644
--- a/release/picobsd/tools/write_mfs_in_kernel/Makefile
+++ b/release/picobsd/tools/write_mfs_in_kernel/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tools/write_mfs_in_kernel/Makefile,v 1.2.2.1 1999/08/29 15:53:50 peter Exp $
 #
 PROG=wmik
 SRCS=write_mfs_in_kernel.c
diff --git a/release/scripts/games-make.sh b/release/scripts/games-make.sh
index 06716d5923f6..3fb1a55ae473 100755
--- a/release/scripts/games-make.sh
+++ b/release/scripts/games-make.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/games-make.sh,v 1.2.2.1 1999/09/11 06:13:57 jkh Exp $
 
 # Move all the games out to their own dist
 if [ -d ${RD}/trees/bin/usr/games ]; then
diff --git a/release/scripts/tar.sh b/release/scripts/tar.sh
index 7281580ab175..0222ed5c3ba0 100644
--- a/release/scripts/tar.sh
+++ b/release/scripts/tar.sh
@@ -32,7 +32,7 @@
 #
 
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/tar.sh,v 1.4.2.1 1999/08/29 15:53:51 peter Exp $
 #
 
 archive=${TAPE:-/dev/rst0}
diff --git a/release/sysinstall/anonFTP.c b/release/sysinstall/anonFTP.c
index 83795cd098ff..45ca773e2eb8 100644
--- a/release/sysinstall/anonFTP.c
+++ b/release/sysinstall/anonFTP.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/anonFTP.c,v 1.23.2.4 1999/12/17 02:46:32 jkh Exp $
  *
  * Copyright (c) 1995
  *	Coranth Gryphon.  All rights reserved.
diff --git a/release/sysinstall/cdrom.c b/release/sysinstall/cdrom.c
index 0b8829dc5497..737e4667c75c 100644
--- a/release/sysinstall/cdrom.c
+++ b/release/sysinstall/cdrom.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/cdrom.c,v 1.45.2.2 1999/08/29 15:53:53 peter Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/command.c b/release/sysinstall/command.c
index 3e3d5c97187d..91bf713ba519 100644
--- a/release/sysinstall/command.c
+++ b/release/sysinstall/command.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/command.c,v 1.16.2.1 1999/08/29 15:53:54 peter Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c
index 2d4028c3446f..875efa999dc7 100644
--- a/release/sysinstall/config.c
+++ b/release/sysinstall/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/config.c,v 1.115.2.35 1999/12/19 22:39:28 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/dev2c.sh b/release/sysinstall/dev2c.sh
index b828355cf279..32aff682d66a 100644
--- a/release/sysinstall/dev2c.sh
+++ b/release/sysinstall/dev2c.sh
@@ -7,7 +7,7 @@
 # this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 # ----------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/release/sysinstall/dev2c.sh,v 1.3.2.1 1999/08/29 15:53:55 peter Exp $
 #
 # During installation, we suffer badly of we have to run MAKEDEV.  MAKEDEV
 # need sh, ln, chown, mknod, awk, rm, test and probably emacs too when
diff --git a/release/sysinstall/devices.c b/release/sysinstall/devices.c
index 76e2a1fb7b79..7da6ef2d7b0a 100644
--- a/release/sysinstall/devices.c
+++ b/release/sysinstall/devices.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/devices.c,v 1.88.2.11 1999/12/17 02:46:32 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/dhcp.c b/release/sysinstall/dhcp.c
index 22eeeeb72e0f..96d44e6f34fb 100644
--- a/release/sysinstall/dhcp.c
+++ b/release/sysinstall/dhcp.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/dhcp.c,v 1.3 1999/08/28 01:34:10 peter Exp $
  *
  * Copyright (c) 1999
  *	C. Stone.  All rights reserved.
diff --git a/release/sysinstall/disks.c b/release/sysinstall/disks.c
index 87e52a6264eb..7f8d4f5a8898 100644
--- a/release/sysinstall/disks.c
+++ b/release/sysinstall/disks.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/disks.c,v 1.108.2.5 1999/12/17 02:46:33 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/dispatch.c b/release/sysinstall/dispatch.c
index 15c6c27424c3..0f8db34366be 100644
--- a/release/sysinstall/dispatch.c
+++ b/release/sysinstall/dispatch.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/dispatch.c,v 1.26.2.6 1999/12/15 01:32:24 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c
index 29e34bde11d8..9eb05f59b138 100644
--- a/release/sysinstall/dist.c
+++ b/release/sysinstall/dist.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/dist.c,v 1.132.2.20 1999/12/18 02:30:08 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/dist.h b/release/sysinstall/dist.h
index ccce9d24442e..28dfa3ba4aa3 100644
--- a/release/sysinstall/dist.h
+++ b/release/sysinstall/dist.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$  */
+/* $FreeBSD: src/release/sysinstall/dist.h,v 1.29.2.10 1999/12/15 01:32:24 jkh Exp $  */
 
 #ifndef _DIST_H_INCLUDE
 #define _DIST_H_INCLUDE
diff --git a/release/sysinstall/dmenu.c b/release/sysinstall/dmenu.c
index 6f5f4e5a175e..dc9c4c93a245 100644
--- a/release/sysinstall/dmenu.c
+++ b/release/sysinstall/dmenu.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/dmenu.c,v 1.37.2.5 1999/12/15 01:32:25 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/doc.c b/release/sysinstall/doc.c
index 19cd4a8b2e8d..0f9ab3413f0f 100644
--- a/release/sysinstall/doc.c
+++ b/release/sysinstall/doc.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/doc.c,v 1.23.2.4 1999/12/19 22:28:53 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/dos.c b/release/sysinstall/dos.c
index ae6eb1e015c9..efda0cdcd221 100644
--- a/release/sysinstall/dos.c
+++ b/release/sysinstall/dos.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/dos.c,v 1.22.2.1 1999/08/29 15:54:00 peter Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/floppy.c b/release/sysinstall/floppy.c
index 576361e6199f..99388d9c7cc3 100644
--- a/release/sysinstall/floppy.c
+++ b/release/sysinstall/floppy.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/floppy.c,v 1.31.2.3 1999/08/29 15:54:00 peter Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/ftp.c b/release/sysinstall/ftp.c
index b32f80ab60a1..6c26272bb4ce 100644
--- a/release/sysinstall/ftp.c
+++ b/release/sysinstall/ftp.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/ftp.c,v 1.36.2.1 1999/08/29 15:54:01 peter Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/globals.c b/release/sysinstall/globals.c
index b12dbd89c9b7..125e92e2ac5b 100644
--- a/release/sysinstall/globals.c
+++ b/release/sysinstall/globals.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/globals.c,v 1.19.2.1 1999/08/29 15:54:01 peter Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/index.c b/release/sysinstall/index.c
index f8a5c4dd41fc..e8196472c304 100644
--- a/release/sysinstall/index.c
+++ b/release/sysinstall/index.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/index.c,v 1.60.2.14 1999/12/19 06:35:25 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index fbad60ef682d..1cb7331a3365 100644
--- a/release/sysinstall/install.c
+++ b/release/sysinstall/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/install.c,v 1.223.2.29 1999/12/19 07:03:02 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/installUpgrade.c b/release/sysinstall/installUpgrade.c
index 10eede748f8b..cfca91cc03e9 100644
--- a/release/sysinstall/installUpgrade.c
+++ b/release/sysinstall/installUpgrade.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/installUpgrade.c,v 1.61.2.8 1999/12/15 01:32:28 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/keymap.c b/release/sysinstall/keymap.c
index 53b076180ebe..7a825932cdf3 100644
--- a/release/sysinstall/keymap.c
+++ b/release/sysinstall/keymap.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/keymap.c,v 1.4.2.1 1999/08/29 15:54:03 peter Exp $
  *
  */
 
diff --git a/release/sysinstall/kget.c b/release/sysinstall/kget.c
index b4fde2dbf183..314adae6c91d 100644
--- a/release/sysinstall/kget.c
+++ b/release/sysinstall/kget.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/kget.c,v 1.1.2.10 1999/09/02 00:55:25 jkh Exp $
  */
 
 #ifdef __alpha__
diff --git a/release/sysinstall/label.c b/release/sysinstall/label.c
index bce434ebb6f9..9a7d78640657 100644
--- a/release/sysinstall/label.c
+++ b/release/sysinstall/label.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/label.c,v 1.84.2.13 1999/12/18 02:04:18 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/lang.c b/release/sysinstall/lang.c
index e9ba25b66c61..0c44c5360619 100644
--- a/release/sysinstall/lang.c
+++ b/release/sysinstall/lang.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/lang.c,v 1.10.2.1 1999/08/29 15:54:05 peter Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/list.h b/release/sysinstall/list.h
index 8300173e0660..647a0a95b500 100644
--- a/release/sysinstall/list.h
+++ b/release/sysinstall/list.h
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/list.h,v 1.1.4.1 1999/08/29 15:54:05 peter Exp $
  *
  * Copyright (c) 1997 FreeBSD, Inc.
  * All rights reserved.
diff --git a/release/sysinstall/main.c b/release/sysinstall/main.c
index 7b6aff6302fe..1f999172a5b8 100644
--- a/release/sysinstall/main.c
+++ b/release/sysinstall/main.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/main.c,v 1.50.2.3 1999/08/29 15:54:06 peter Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/media.c b/release/sysinstall/media.c
index 2ca3ea50d4ea..e9abe5682c04 100644
--- a/release/sysinstall/media.c
+++ b/release/sysinstall/media.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/media.c,v 1.94.2.9 1999/12/17 02:46:33 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c
index 94a33fa439c1..9e03cf44ddea 100644
--- a/release/sysinstall/menus.c
+++ b/release/sysinstall/menus.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/menus.c,v 1.180.2.42 1999/12/19 22:39:29 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/misc.c b/release/sysinstall/misc.c
index d32af17d3012..6bcaf4e68405 100644
--- a/release/sysinstall/misc.c
+++ b/release/sysinstall/misc.c
@@ -1,7 +1,7 @@
 /*
  * Miscellaneous support routines..
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/misc.c,v 1.38.2.1 1999/08/29 15:54:08 peter Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/mouse.c b/release/sysinstall/mouse.c
index 2eec6be8e954..dad59c025264 100644
--- a/release/sysinstall/mouse.c
+++ b/release/sysinstall/mouse.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/mouse.c,v 1.4.2.3 1999/12/17 02:46:34 jkh Exp $
  */
 
 #include "sysinstall.h"
diff --git a/release/sysinstall/msg.c b/release/sysinstall/msg.c
index 499d70501a37..cfd5f5c6e4f9 100644
--- a/release/sysinstall/msg.c
+++ b/release/sysinstall/msg.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/msg.c,v 1.47.2.5 1999/12/17 02:46:34 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/network.c b/release/sysinstall/network.c
index 5e064a7ae070..46097e6a90ec 100644
--- a/release/sysinstall/network.c
+++ b/release/sysinstall/network.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/network.c,v 1.33.2.10 1999/12/17 02:46:34 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/nfs.c b/release/sysinstall/nfs.c
index f9a557239a92..007ddd6b8ddc 100644
--- a/release/sysinstall/nfs.c
+++ b/release/sysinstall/nfs.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/nfs.c,v 1.19.2.2 1999/12/17 02:46:34 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/options.c b/release/sysinstall/options.c
index 4177abea7671..6ddb418cf7cf 100644
--- a/release/sysinstall/options.c
+++ b/release/sysinstall/options.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/options.c,v 1.56.2.10 1999/12/19 20:41:22 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/package.c b/release/sysinstall/package.c
index 8901d08b998a..44ecb1947091 100644
--- a/release/sysinstall/package.c
+++ b/release/sysinstall/package.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/package.c,v 1.65.2.20 1999/12/20 00:16:48 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/pccard.c b/release/sysinstall/pccard.c
index db18ab4edb25..d909cc9f2132 100644
--- a/release/sysinstall/pccard.c
+++ b/release/sysinstall/pccard.c
@@ -1,7 +1,7 @@
 /*
  * PC-card support for sysinstall
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/pccard.c,v 1.5.2.3 1999/12/15 01:32:34 jkh Exp $
  *
  * Copyright (c) 1997-1999
  *	Tatsumi Hosokawa <hosokawa@jp.FreeBSD.org>.  All rights reserved.
diff --git a/release/sysinstall/sysinstall.8 b/release/sysinstall/sysinstall.8
index 98bc9dfe0e30..fb7c2f856f11 100644
--- a/release/sysinstall/sysinstall.8
+++ b/release/sysinstall/sysinstall.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/release/sysinstall/sysinstall.8,v 1.14.2.9 1999/09/04 16:24:51 jkh Exp $
 .\"
 .Dd August 9, 1997
 .Dt SYSINSTALL 8
diff --git a/release/sysinstall/sysinstall.h b/release/sysinstall/sysinstall.h
index 13a65c65dc27..e9871c9b9bfa 100644
--- a/release/sysinstall/sysinstall.h
+++ b/release/sysinstall/sysinstall.h
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/sysinstall.h,v 1.153.2.20 1999/11/19 20:42:05 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/system.c b/release/sysinstall/system.c
index dfe3889507bc..06ee418a6516 100644
--- a/release/sysinstall/system.c
+++ b/release/sysinstall/system.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/system.c,v 1.87.2.11 1999/12/17 02:46:34 jkh Exp $
  *
  * Jordan Hubbard
  *
diff --git a/release/sysinstall/tape.c b/release/sysinstall/tape.c
index 256fe953bf03..05d3173d1d8a 100644
--- a/release/sysinstall/tape.c
+++ b/release/sysinstall/tape.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/tape.c,v 1.20.2.2 1999/12/17 02:46:34 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/tcpip.c b/release/sysinstall/tcpip.c
index 453fe5fab660..77245f8df0b4 100644
--- a/release/sysinstall/tcpip.c
+++ b/release/sysinstall/tcpip.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/tcpip.c,v 1.74.2.14 1999/12/17 02:46:34 jkh Exp $
  *
  * Copyright (c) 1995
  *      Gary J Palmer. All rights reserved.
diff --git a/release/sysinstall/ufs.c b/release/sysinstall/ufs.c
index c9515ae82b28..2d85ee3e485f 100644
--- a/release/sysinstall/ufs.c
+++ b/release/sysinstall/ufs.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/ufs.c,v 1.14.2.1 1999/08/29 15:54:17 peter Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/user.c b/release/sysinstall/user.c
index 372d3fb7aaf8..0f4cd6426748 100644
--- a/release/sysinstall/user.c
+++ b/release/sysinstall/user.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/user.c,v 1.14.2.1 1999/08/29 15:54:17 peter Exp $
  *
  * Copyright (c) 1996
  *      Jörg Wunsch. All rights reserved.
diff --git a/release/sysinstall/variable.c b/release/sysinstall/variable.c
index 1e2bf9a54845..06a932dbddcc 100644
--- a/release/sysinstall/variable.c
+++ b/release/sysinstall/variable.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/variable.c,v 1.24.2.3 1999/09/02 00:55:31 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/release/sysinstall/wizard.c b/release/sysinstall/wizard.c
index 9fa1449e33f9..da7f666180f3 100644
--- a/release/sysinstall/wizard.c
+++ b/release/sysinstall/wizard.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/sysinstall/wizard.c,v 1.13.2.2 1999/08/29 15:54:19 peter Exp $
  *
  */
 
diff --git a/release/texts/alpha/RELNOTES.TXT b/release/texts/alpha/RELNOTES.TXT
index af9027a70fab..71cfa5e7ffcb 100644
--- a/release/texts/alpha/RELNOTES.TXT
+++ b/release/texts/alpha/RELNOTES.TXT
@@ -617,4 +617,4 @@ We sincerely hope you enjoy this release of FreeBSD!
 
                         The FreeBSD Project
 
-# $FreeBSD$
+# $FreeBSD: src/release/texts/alpha/RELNOTES.TXT,v 1.1.2.17 1999/12/12 21:06:54 jkh Exp $
diff --git a/release/texts/i386/RELNOTES.TXT b/release/texts/i386/RELNOTES.TXT
index b3851adb124f..721e13ed36a9 100644
--- a/release/texts/i386/RELNOTES.TXT
+++ b/release/texts/i386/RELNOTES.TXT
@@ -620,4 +620,4 @@ We sincerely hope you enjoy this release of FreeBSD!
 
                         The FreeBSD Project
 
-# $FreeBSD$
+# $FreeBSD: src/release/texts/i386/RELNOTES.TXT,v 1.28.2.23 1999/12/16 23:34:09 jkh Exp $
diff --git a/release/write_mfs_in_kernel.c b/release/write_mfs_in_kernel.c
index 61f90658fea2..b684f0723132 100644
--- a/release/write_mfs_in_kernel.c
+++ b/release/write_mfs_in_kernel.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/write_mfs_in_kernel.c,v 1.4.2.1 1999/08/29 15:52:21 peter Exp $
  *
  * This program patches a filesystem into a kernel made with MFS_ROOT
  * option.
diff --git a/sbin/Makefile b/sbin/Makefile
index 01216da125f1..8908d4fb7232 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.5 (Berkeley) 3/31/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/Makefile,v 1.62.2.6 1999/08/29 15:12:12 peter Exp $
 
 # XXX MISSING:		icheck ncheck
 
diff --git a/sbin/adjkerntz/adjkerntz.8 b/sbin/adjkerntz/adjkerntz.8
index 61a99c1a36aa..0873bdc11433 100644
--- a/sbin/adjkerntz/adjkerntz.8
+++ b/sbin/adjkerntz/adjkerntz.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/adjkerntz/adjkerntz.8,v 1.16.2.1 1999/08/29 15:12:13 peter Exp $
 .\"
 .Dd April 4, 1996
 .Dt ADJKERNTZ 8
diff --git a/sbin/adjkerntz/adjkerntz.c b/sbin/adjkerntz/adjkerntz.c
index 743782a66f5d..994f41e0bfa9 100644
--- a/sbin/adjkerntz/adjkerntz.c
+++ b/sbin/adjkerntz/adjkerntz.c
@@ -32,7 +32,7 @@ static const char copyright[] =
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/adjkerntz/adjkerntz.c,v 1.24.2.1 1999/08/29 15:12:14 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/sbin/atm/Makefile b/sbin/atm/Makefile
index f17c173f261a..80e579f414a1 100644
--- a/sbin/atm/Makefile
+++ b/sbin/atm/Makefile
@@ -23,7 +23,7 @@
 # Copies of this Software may be made, however, the above copyright
 # notice must be reproduced on all copies.
 #
-#	@(#) $FreeBSD$
+#	@(#) $FreeBSD: src/sbin/atm/Makefile,v 1.1.2.1 1999/08/29 15:12:15 peter Exp $
 #
 
 SUBDIR=	atm \
diff --git a/sbin/atm/Makefile.inc b/sbin/atm/Makefile.inc
index 8878187339ca..22cfcbc10837 100644
--- a/sbin/atm/Makefile.inc
+++ b/sbin/atm/Makefile.inc
@@ -23,7 +23,7 @@
 # Copies of this Software may be made, however, the above copyright
 # notice must be reproduced on all copies.
 #
-#	@(#) $FreeBSD$
+#	@(#) $FreeBSD: src/sbin/atm/Makefile.inc,v 1.1.2.1 1999/08/29 15:12:16 peter Exp $
 #
 #
 
diff --git a/sbin/atm/atm/Makefile b/sbin/atm/atm/Makefile
index dab4b348ee8e..0ea135c7718c 100644
--- a/sbin/atm/atm/Makefile
+++ b/sbin/atm/atm/Makefile
@@ -23,7 +23,7 @@
 # Copies of this Software may be made, however, the above copyright
 # notice must be reproduced on all copies.
 #
-#	@(#) $FreeBSD$
+#	@(#) $FreeBSD: src/sbin/atm/atm/Makefile,v 1.3.2.1 1999/08/29 15:12:18 peter Exp $
 #
 #
 
diff --git a/sbin/atm/atm/atm.8 b/sbin/atm/atm/atm.8
index 67764055e31e..97433d6bb70f 100644
--- a/sbin/atm/atm/atm.8
+++ b/sbin/atm/atm/atm.8
@@ -22,7 +22,7 @@
 .\" Copies of this Software may be made, however, the above copyright
 .\" notice must be reproduced on all copies.
 .\"
-.\" @(#) $FreeBSD$
+.\" @(#) $FreeBSD: src/sbin/atm/atm/atm.8,v 1.2.2.1 1999/08/29 15:12:18 peter Exp $
 .\"
 .\"
 .de EX		\"Begin example
diff --git a/sbin/atm/atm/atm.c b/sbin/atm/atm/atm.c
index 95c384c684eb..963203a129b6 100644
--- a/sbin/atm/atm/atm.c
+++ b/sbin/atm/atm/atm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sbin/atm/atm/atm.c,v 1.1.2.1 1999/08/29 15:12:20 peter Exp $
  *
  */
 
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/sbin/atm/atm/atm.c,v 1.1.2.1 1999/08/29 15:12:20 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/sbin/atm/atm/atm.h b/sbin/atm/atm/atm.h
index f36c26853a2e..17f2c05fbe92 100644
--- a/sbin/atm/atm/atm.h
+++ b/sbin/atm/atm/atm.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sbin/atm/atm/atm.h,v 1.2.2.1 1999/08/29 15:12:21 peter Exp $
  *
  */
 
diff --git a/sbin/atm/atm/atm_eni.c b/sbin/atm/atm/atm_eni.c
index 092aebc9bfc9..594310a9ed43 100644
--- a/sbin/atm/atm/atm_eni.c
+++ b/sbin/atm/atm/atm_eni.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sbin/atm/atm/atm_eni.c,v 1.1.2.1 1999/08/29 15:12:21 peter Exp $
  *
  */
 
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/sbin/atm/atm/atm_eni.c,v 1.1.2.1 1999/08/29 15:12:21 peter Exp $";
 #endif
 
 #include <sys/types.h>  
diff --git a/sbin/atm/atm/atm_fore200.c b/sbin/atm/atm/atm_fore200.c
index ce7b786c9385..0325d072fd1b 100644
--- a/sbin/atm/atm/atm_fore200.c
+++ b/sbin/atm/atm/atm_fore200.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sbin/atm/atm/atm_fore200.c,v 1.1.2.1 1999/08/29 15:12:22 peter Exp $
  *
  */
 
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/sbin/atm/atm/atm_fore200.c,v 1.1.2.1 1999/08/29 15:12:22 peter Exp $";
 #endif
 
 #include <sys/types.h>  
diff --git a/sbin/atm/atm/atm_inet.c b/sbin/atm/atm/atm_inet.c
index f0aa7d654ad8..236d6cf7c8cf 100644
--- a/sbin/atm/atm/atm_inet.c
+++ b/sbin/atm/atm/atm_inet.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sbin/atm/atm/atm_inet.c,v 1.1.2.1 1999/08/29 15:12:22 peter Exp $
  *
  */
 
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/sbin/atm/atm/atm_inet.c,v 1.1.2.1 1999/08/29 15:12:22 peter Exp $";
 #endif
 
 #include <sys/types.h>  
diff --git a/sbin/atm/atm/atm_print.c b/sbin/atm/atm/atm_print.c
index 20666b149445..5d4f4b628e65 100644
--- a/sbin/atm/atm/atm_print.c
+++ b/sbin/atm/atm/atm_print.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sbin/atm/atm/atm_print.c,v 1.1.2.1 1999/08/29 15:12:23 peter Exp $
  *
  */
 
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/sbin/atm/atm/atm_print.c,v 1.1.2.1 1999/08/29 15:12:23 peter Exp $";
 #endif
 
 #include <sys/types.h>  
diff --git a/sbin/atm/atm/atm_set.c b/sbin/atm/atm/atm_set.c
index 1e48f2f2cdc6..42327432dd64 100644
--- a/sbin/atm/atm/atm_set.c
+++ b/sbin/atm/atm/atm_set.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sbin/atm/atm/atm_set.c,v 1.1.2.1 1999/08/29 15:12:23 peter Exp $
  *
  */
 
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/sbin/atm/atm/atm_set.c,v 1.1.2.1 1999/08/29 15:12:23 peter Exp $";
 #endif
 
 #include <sys/types.h>  
diff --git a/sbin/atm/atm/atm_show.c b/sbin/atm/atm/atm_show.c
index a57f781c8028..7b680a1e72ba 100644
--- a/sbin/atm/atm/atm_show.c
+++ b/sbin/atm/atm/atm_show.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sbin/atm/atm/atm_show.c,v 1.1.2.1 1999/08/29 15:12:24 peter Exp $
  *
  */
 
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/sbin/atm/atm/atm_show.c,v 1.1.2.1 1999/08/29 15:12:24 peter Exp $";
 #endif
 
 #include <sys/types.h>  
diff --git a/sbin/atm/atm/atm_subr.c b/sbin/atm/atm/atm_subr.c
index 7e67c0368bd9..49574da68e67 100644
--- a/sbin/atm/atm/atm_subr.c
+++ b/sbin/atm/atm/atm_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sbin/atm/atm/atm_subr.c,v 1.1.2.1 1999/08/29 15:12:25 peter Exp $
  *
  */
 
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/sbin/atm/atm/atm_subr.c,v 1.1.2.1 1999/08/29 15:12:25 peter Exp $";
 #endif
 
 #include <sys/types.h>  
diff --git a/sbin/atm/fore_dnld/Makefile b/sbin/atm/fore_dnld/Makefile
index 8162a1d94a83..dc54832b8e28 100644
--- a/sbin/atm/fore_dnld/Makefile
+++ b/sbin/atm/fore_dnld/Makefile
@@ -23,7 +23,7 @@
 # Copies of this Software may be made, however, the above copyright
 # notice must be reproduced on all copies.
 #
-#	@(#) $FreeBSD$
+#	@(#) $FreeBSD: src/sbin/atm/fore_dnld/Makefile,v 1.3.2.1 1999/08/29 15:12:27 peter Exp $
 #
 #
 
diff --git a/sbin/atm/fore_dnld/fore_dnld.8 b/sbin/atm/fore_dnld/fore_dnld.8
index b41a941e9867..e2376a9097e9 100644
--- a/sbin/atm/fore_dnld/fore_dnld.8
+++ b/sbin/atm/fore_dnld/fore_dnld.8
@@ -22,7 +22,7 @@
 .\" Copies of this Software may be made, however, the above copyright
 .\" notice must be reproduced on all copies.
 .\"
-.\" @(#) $FreeBSD$
+.\" @(#) $FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.8,v 1.1.2.1 1999/08/29 15:12:27 peter Exp $
 .\"
 .\"
 .de EX		\"Begin example
diff --git a/sbin/atm/fore_dnld/fore_dnld.c b/sbin/atm/fore_dnld/fore_dnld.c
index 984adc6cb458..b09b5819f039 100644
--- a/sbin/atm/fore_dnld/fore_dnld.c
+++ b/sbin/atm/fore_dnld/fore_dnld.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.c,v 1.2.2.1 1999/08/29 15:12:27 peter Exp $
  *
  */
 
@@ -37,7 +37,7 @@
  */
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.c,v 1.2.2.1 1999/08/29 15:12:27 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/sbin/atm/ilmid/Makefile b/sbin/atm/ilmid/Makefile
index bdeb248fc397..2a83e59971d5 100644
--- a/sbin/atm/ilmid/Makefile
+++ b/sbin/atm/ilmid/Makefile
@@ -23,7 +23,7 @@
 # Copies of this Software may be made, however, the above copyright
 # notice must be reproduced on all copies.
 #
-#	@(#) $FreeBSD$
+#	@(#) $FreeBSD: src/sbin/atm/ilmid/Makefile,v 1.3.2.1 1999/08/29 15:12:29 peter Exp $
 #
 #
 
diff --git a/sbin/atm/ilmid/ilmid.8 b/sbin/atm/ilmid/ilmid.8
index 9ee295882ec4..79f804558da2 100644
--- a/sbin/atm/ilmid/ilmid.8
+++ b/sbin/atm/ilmid/ilmid.8
@@ -22,7 +22,7 @@
 .\" Copies of this Software may be made, however, the above copyright
 .\" notice must be reproduced on all copies.
 .\"
-.\" @(#) $FreeBSD$
+.\" @(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.8,v 1.1.2.1 1999/08/29 15:12:30 peter Exp $
 .\"
 .\"
 .de EX		\"Begin example
diff --git a/sbin/atm/ilmid/ilmid.c b/sbin/atm/ilmid/ilmid.c
index d2127f4d9b75..c26dca613a51 100644
--- a/sbin/atm/ilmid/ilmid.c
+++ b/sbin/atm/ilmid/ilmid.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *      @(#) $FreeBSD$
+ *      @(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.2.2.1 1999/08/29 15:12:31 peter Exp $
  *
  */
 
@@ -48,7 +48,7 @@
 #include <sys/param.h>
 
 #ifndef	lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.2.2.1 1999/08/29 15:12:31 peter Exp $");
 #endif
 
 #include <err.h>
diff --git a/sbin/badsect/badsect.8 b/sbin/badsect/badsect.8
index 6c80a970097f..7a7f855fe860 100644
--- a/sbin/badsect/badsect.8
+++ b/sbin/badsect/badsect.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)badsect.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/badsect/badsect.8,v 1.7.2.1 1999/08/29 15:12:32 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt BADSECT 8
diff --git a/sbin/badsect/badsect.c b/sbin/badsect/badsect.c
index 7ecf1863735d..ed6e6dbebacd 100644
--- a/sbin/badsect/badsect.c
+++ b/sbin/badsect/badsect.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)badsect.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/badsect/badsect.c,v 1.6.2.1 1999/08/29 15:12:33 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8
index facba2507648..5af26eb6b579 100644
--- a/sbin/camcontrol/camcontrol.8
+++ b/sbin/camcontrol/camcontrol.8
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.9.2.9 1999/12/17 02:29:05 ken Exp $
 .\"
 .Dd September 14, 1998
 .Dt CAMCONTROL 8
diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
index 7eb0e65dca4d..ebd8eb4ba536 100644
--- a/sbin/camcontrol/camcontrol.c
+++ b/sbin/camcontrol/camcontrol.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.9.2.6 1999/09/27 17:30:27 billf Exp $
  */
 
 #include <sys/ioctl.h>
diff --git a/sbin/camcontrol/camcontrol.h b/sbin/camcontrol/camcontrol.h
index 4218576a56e6..ee9ff76ec5be 100644
--- a/sbin/camcontrol/camcontrol.h
+++ b/sbin/camcontrol/camcontrol.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/camcontrol/camcontrol.h,v 1.1.2.2 1999/08/29 15:12:36 peter Exp $
  */
 
 #ifndef _CAMCONTROL_H
diff --git a/sbin/camcontrol/modeedit.c b/sbin/camcontrol/modeedit.c
index 74fbb0819909..a27c17511d01 100644
--- a/sbin/camcontrol/modeedit.c
+++ b/sbin/camcontrol/modeedit.c
@@ -45,7 +45,7 @@
  */
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/camcontrol/modeedit.c,v 1.1.2.3 1999/10/01 04:10:19 ken Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8
index e687ad1873d0..9c0142f7fcb0 100644
--- a/sbin/ccdconfig/ccdconfig.8
+++ b/sbin/ccdconfig/ccdconfig.8
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ccdconfig/ccdconfig.8,v 1.6.2.2 1999/08/29 15:12:38 peter Exp $
 .\"
 .Dd July 17, 1995
 .Dt CCDCONFIG 8
diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c
index ae349f7159ff..1337aa84211e 100644
--- a/sbin/ccdconfig/ccdconfig.c
+++ b/sbin/ccdconfig/ccdconfig.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ccdconfig/ccdconfig.c,v 1.10.2.1 1999/08/29 15:12:39 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/clri/clri.8 b/sbin/clri/clri.8
index 7f66eccc54f2..9677284a4a52 100644
--- a/sbin/clri/clri.8
+++ b/sbin/clri/clri.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)clri.8	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/clri/clri.8,v 1.6.2.1 1999/08/29 15:12:41 peter Exp $
 .\"
 .Dd April 19, 1994
 .Dt CLRI 8
diff --git a/sbin/clri/clri.c b/sbin/clri/clri.c
index 85de80f4ee76..84033527c00d 100644
--- a/sbin/clri/clri.c
+++ b/sbin/clri/clri.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)clri.c	8.2 (Berkeley) 9/23/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/clri/clri.c,v 1.3.2.1 1999/08/29 15:12:41 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dhclient/Makefile b/sbin/dhclient/Makefile
index 40d2a5bef23d..ed32d399e4d9 100644
--- a/sbin/dhclient/Makefile
+++ b/sbin/dhclient/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/dhclient/Makefile,v 1.3.2.4 1999/08/29 15:12:43 peter Exp $
 
 DIST_DIR= ${.CURDIR}/../../contrib/isc-dhcp
 
diff --git a/sbin/disklabel/disklabel.5 b/sbin/disklabel/disklabel.5
index 44b6243e4b5c..9baba2900422 100644
--- a/sbin/disklabel/disklabel.5
+++ b/sbin/disklabel/disklabel.5
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)disklabel.5.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/disklabel/disklabel.5,v 1.5.2.1 1999/08/29 15:12:44 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt DISKLABEL 5
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index 6586fc42f6d9..e19b26ed5092 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)disklabel.8	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/disklabel/disklabel.8,v 1.10.2.2 1999/08/29 15:12:45 peter Exp $
 .\"
 .Dd April 19, 1994
 .Dt DISKLABEL 8
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index c0f55204d7b8..d74a51dfddab 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)disklabel.c	8.2 (Berkeley) 1/7/94";
 /* from static char sccsid[] = "@(#)disklabel.c	1.2 (Symmetric) 11/28/85"; */
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/disklabel/disklabel.c,v 1.24.2.1 1999/08/29 15:12:46 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/disklabel/dkcksum.c b/sbin/disklabel/dkcksum.c
index 3a58aa23044b..6d97ad5a0053 100644
--- a/sbin/disklabel/dkcksum.c
+++ b/sbin/disklabel/dkcksum.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)dkcksum.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/disklabel/dkcksum.c,v 1.3.2.1 1999/08/29 15:12:47 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/dmesg/dmesg.8 b/sbin/dmesg/dmesg.8
index fd9e175c23a4..de293ab9ffc9 100644
--- a/sbin/dmesg/dmesg.8
+++ b/sbin/dmesg/dmesg.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dmesg.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/dmesg/dmesg.8,v 1.4.2.1 1999/08/29 15:12:48 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt DMESG 8
diff --git a/sbin/dmesg/dmesg.c b/sbin/dmesg/dmesg.c
index 6071680edd5a..6f1de66a1a30 100644
--- a/sbin/dmesg/dmesg.c
+++ b/sbin/dmesg/dmesg.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)dmesg.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dmesg/dmesg.c,v 1.10.2.1 1999/08/29 15:12:49 peter Exp $";
 #endif /* not lint */
 
 #include <sys/msgbuf.h>
diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile
index 0452bfc49e1a..c3ebc0431461 100644
--- a/sbin/dump/Makefile
+++ b/sbin/dump/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/dump/Makefile,v 1.8.2.1 1999/08/29 15:12:51 peter Exp $
 
 #	dump.h			header file
 #	itime.c			reads /etc/dumpdates
diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8
index 79abc51072ad..b11dbfa885ef 100644
--- a/sbin/dump/dump.8
+++ b/sbin/dump/dump.8
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dump.8	8.3 (Berkeley) 5/1/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/dump/dump.8,v 1.22.2.1 1999/08/29 15:12:51 peter Exp $
 .\"
 .Dd May 1, 1995
 .Dt DUMP 8
diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c
index b6563e529dc9..f5d0ab07be7d 100644
--- a/sbin/dump/dumprmt.c
+++ b/sbin/dump/dumprmt.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)dumprmt.c	8.3 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dump/dumprmt.c,v 1.13.2.1 1999/08/29 15:12:52 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c
index 6209dab66feb..65a3608d2dcd 100644
--- a/sbin/dump/itime.c
+++ b/sbin/dump/itime.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)itime.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dump/itime.c,v 1.2.2.1 1999/08/29 15:12:53 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index 30be0c9280ab..2988f1c2fcee 100644
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dump/main.c,v 1.18.2.2 1999/08/29 15:12:53 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c
index 71dd8d1f6318..5a30d6440cfc 100644
--- a/sbin/dump/optr.c
+++ b/sbin/dump/optr.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)optr.c	8.2 (Berkeley) 1/6/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dump/optr.c,v 1.5.2.3 1999/12/13 15:53:13 imp Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c
index cecc9f53318f..7a9edf14e57b 100644
--- a/sbin/dump/tape.c
+++ b/sbin/dump/tape.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)tape.c	8.4 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dump/tape.c,v 1.10.2.1 1999/08/29 15:12:54 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index 98d08bccd995..3bad104ce798 100644
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)traverse.c	8.7 (Berkeley) 6/15/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dump/traverse.c,v 1.8.2.1 1999/08/29 15:12:55 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/unctime.c b/sbin/dump/unctime.c
index 4e8e6697c931..209d523b00fc 100644
--- a/sbin/dump/unctime.c
+++ b/sbin/dump/unctime.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)unctime.c	8.2 (Berkeley) 6/14/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dump/unctime.c,v 1.2.2.1 1999/08/29 15:12:56 peter Exp $";
 #endif /* not lint */
 
 #include <time.h>
diff --git a/sbin/dumpfs/dumpfs.8 b/sbin/dumpfs/dumpfs.8
index 8c668c13e9a6..5654b38b5feb 100644
--- a/sbin/dumpfs/dumpfs.8
+++ b/sbin/dumpfs/dumpfs.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dumpfs.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/dumpfs/dumpfs.8,v 1.4.2.1 1999/08/29 15:12:57 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt DUMPFS 8
diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c
index 71f161df8a4a..3b4cbf59a53b 100644
--- a/sbin/dumpfs/dumpfs.c
+++ b/sbin/dumpfs/dumpfs.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)dumpfs.c	8.5 (Berkeley) 4/29/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dumpfs/dumpfs.c,v 1.10.2.1 1999/08/29 15:12:58 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dumpon/Makefile b/sbin/dumpon/Makefile
index bd41769b8d2b..e43445858e48 100644
--- a/sbin/dumpon/Makefile
+++ b/sbin/dumpon/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/dumpon/Makefile,v 1.3.2.1 1999/08/29 15:13:00 peter Exp $
 
 PROG=	dumpon
 MAN8=	dumpon.8
diff --git a/sbin/dumpon/dumpon.8 b/sbin/dumpon/dumpon.8
index 61359f413fcf..338b9b06c19a 100644
--- a/sbin/dumpon/dumpon.8
+++ b/sbin/dumpon/dumpon.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)swapon.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/dumpon/dumpon.8,v 1.9.2.2 1999/08/29 15:13:01 peter Exp $
 .\"
 .Dd May 12, 1995
 .Dt DUMPON 8
diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c
index 76cdc60e768b..e6df6a7f6c28 100644
--- a/sbin/dumpon/dumpon.c
+++ b/sbin/dumpon/dumpon.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "From: @(#)swapon.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dumpon/dumpon.c,v 1.6.2.1 1999/08/29 15:13:01 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/fsck/dir.c b/sbin/fsck/dir.c
index f5fb6a0ef30a..6e8f06c89f3a 100644
--- a/sbin/fsck/dir.c
+++ b/sbin/fsck/dir.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)dir.c	8.8 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck/dir.c,v 1.14.2.1 1999/08/29 15:13:03 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/fsck.8 b/sbin/fsck/fsck.8
index 59d7fa8d1a47..16766fde670e 100644
--- a/sbin/fsck/fsck.8
+++ b/sbin/fsck/fsck.8
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fsck.8	8.4 (Berkeley) 5/9/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/fsck/fsck.8,v 1.13.2.1 1999/08/29 15:13:04 peter Exp $
 .\"
 .Dd November 15, 1996
 .Dt FSCK 8
diff --git a/sbin/fsck/inode.c b/sbin/fsck/inode.c
index 98295be26ed4..fd85aabba64d 100644
--- a/sbin/fsck/inode.c
+++ b/sbin/fsck/inode.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)inode.c	8.8 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck/inode.c,v 1.18.2.1 1999/08/29 15:13:04 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/main.c b/sbin/fsck/main.c
index 8d9afdbdbc49..1cc0bc1f5376 100644
--- a/sbin/fsck/main.c
+++ b/sbin/fsck/main.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/14/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck/main.c,v 1.17.2.1 1999/08/29 15:13:05 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/pass1.c b/sbin/fsck/pass1.c
index dd09b009705e..1eaa8bd466c7 100644
--- a/sbin/fsck/pass1.c
+++ b/sbin/fsck/pass1.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass1.c	8.6 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck/pass1.c,v 1.15.2.1 1999/08/29 15:13:06 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/pass1b.c b/sbin/fsck/pass1b.c
index 7ef662f27364..6a2a38d4a2b6 100644
--- a/sbin/fsck/pass1b.c
+++ b/sbin/fsck/pass1b.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass1b.c	8.4 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck/pass1b.c,v 1.6.2.1 1999/08/29 15:13:06 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/pass2.c b/sbin/fsck/pass2.c
index 088ecffb9817..347cf01339e0 100644
--- a/sbin/fsck/pass2.c
+++ b/sbin/fsck/pass2.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass2.c	8.9 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck/pass2.c,v 1.9.2.1 1999/08/29 15:13:07 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/pass3.c b/sbin/fsck/pass3.c
index 80e38e9cbf4f..77dad2c39aec 100644
--- a/sbin/fsck/pass3.c
+++ b/sbin/fsck/pass3.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass3.c	8.2 (Berkeley) 4/27/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck/pass3.c,v 1.6.2.1 1999/08/29 15:13:07 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/pass4.c b/sbin/fsck/pass4.c
index 0012c50adc7e..2a717c9a9fde 100644
--- a/sbin/fsck/pass4.c
+++ b/sbin/fsck/pass4.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass4.c	8.4 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck/pass4.c,v 1.6.2.1 1999/08/29 15:13:08 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/pass5.c b/sbin/fsck/pass5.c
index d5edaace1690..451e6b75bfe0 100644
--- a/sbin/fsck/pass5.c
+++ b/sbin/fsck/pass5.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass5.c	8.9 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck/pass5.c,v 1.16.2.1 1999/08/29 15:13:08 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/preen.c b/sbin/fsck/preen.c
index 3e85a0e18dd9..d91f5fd8007d 100644
--- a/sbin/fsck/preen.c
+++ b/sbin/fsck/preen.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)preen.c	8.5 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck/preen.c,v 1.11.2.1 1999/08/29 15:13:09 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/setup.c b/sbin/fsck/setup.c
index 7444d37536c5..26dfe351352b 100644
--- a/sbin/fsck/setup.c
+++ b/sbin/fsck/setup.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)setup.c	8.10 (Berkeley) 5/9/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck/setup.c,v 1.14.2.1 1999/08/29 15:13:10 peter Exp $";
 #endif /* not lint */
 
 #define DKTYPENAMES
diff --git a/sbin/fsck/utilities.c b/sbin/fsck/utilities.c
index 1efdabcd11d0..eeb894867cf5 100644
--- a/sbin/fsck/utilities.c
+++ b/sbin/fsck/utilities.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)utilities.c	8.6 (Berkeley) 5/19/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck/utilities.c,v 1.10.2.1 1999/08/29 15:13:11 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile
index ef842c9d50b2..a903a169bd34 100644
--- a/sbin/fsdb/Makefile
+++ b/sbin/fsdb/Makefile
@@ -1,6 +1,6 @@
 #	$NetBSD: Makefile,v 1.1.1.1 1995/10/08 23:08:36 thorpej Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/fsdb/Makefile,v 1.8.2.1 1999/08/29 15:13:13 peter Exp $
 
 PROG=	fsdb
 MAN8=	fsdb.8
diff --git a/sbin/fsdb/fsdb.8 b/sbin/fsdb/fsdb.8
index 147f7e084c20..265171a1ed49 100644
--- a/sbin/fsdb/fsdb.8
+++ b/sbin/fsdb/fsdb.8
@@ -26,7 +26,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/fsdb/fsdb.8,v 1.8.2.2 1999/08/29 15:13:14 peter Exp $
 .\"
 .Dd September 14, 1995
 .Dt FSDB 8
diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c
index 8801db08bd16..7a02e4580025 100644
--- a/sbin/fsdb/fsdb.c
+++ b/sbin/fsdb/fsdb.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsdb/fsdb.c,v 1.11.2.1 1999/08/29 15:13:15 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/fsdb/fsdb.h b/sbin/fsdb/fsdb.h
index a7fd5c41d31d..16851089b713 100644
--- a/sbin/fsdb/fsdb.h
+++ b/sbin/fsdb/fsdb.h
@@ -27,7 +27,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/fsdb/fsdb.h,v 1.3.2.1 1999/08/29 15:13:15 peter Exp $
  */
 
 extern int bread __P((int fd, char *buf, daddr_t blk, long size));
diff --git a/sbin/fsdb/fsdbutil.c b/sbin/fsdb/fsdbutil.c
index 3a6205063664..783d5b28db24 100644
--- a/sbin/fsdb/fsdbutil.c
+++ b/sbin/fsdb/fsdbutil.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsdb/fsdbutil.c,v 1.8.2.1 1999/08/29 15:13:16 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/fsirand/fsirand.8 b/sbin/fsirand/fsirand.8
index 84caddc93b4e..e0ea262f39a4 100644
--- a/sbin/fsirand/fsirand.8
+++ b/sbin/fsirand/fsirand.8
@@ -27,7 +27,7 @@
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	$OpenBSD: fsirand.8,v 1.6 1997/02/23 03:58:26 millert Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/fsirand/fsirand.8,v 1.8.2.1 1999/08/29 15:13:18 peter Exp $
 .\"
 .Dd January 25, 1997
 .Dt FSIRAND 8
diff --git a/sbin/fsirand/fsirand.c b/sbin/fsirand/fsirand.c
index 918424faa57b..ea8f2f26f0ca 100644
--- a/sbin/fsirand/fsirand.c
+++ b/sbin/fsirand/fsirand.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsirand/fsirand.c,v 1.6.2.1 1999/08/29 15:13:19 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/i386/Makefile b/sbin/i386/Makefile
index 7a907448fb72..781ffa12847e 100644
--- a/sbin/i386/Makefile
+++ b/sbin/i386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/i386/Makefile,v 1.6.2.1 1999/08/29 15:13:20 peter Exp $
 
 SUBDIR=	comcontrol \
 	fdisk \
diff --git a/sbin/i386/Makefile.inc b/sbin/i386/Makefile.inc
index b915adff92ab..319aed1a7aa6 100644
--- a/sbin/i386/Makefile.inc
+++ b/sbin/i386/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/i386/Makefile.inc,v 1.3.2.1 1999/08/29 15:13:20 peter Exp $
 
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/sbin/i386/comcontrol/comcontrol.8 b/sbin/i386/comcontrol/comcontrol.8
index 4b12b6e0be0c..f9c8e482e607 100644
--- a/sbin/i386/comcontrol/comcontrol.8
+++ b/sbin/i386/comcontrol/comcontrol.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/i386/comcontrol/comcontrol.8,v 1.14.2.1 1999/08/29 15:13:22 peter Exp $
 .Dd May 15, 1994
 .Dt COMCONTROL 8
 .Os FreeBSD
diff --git a/sbin/i386/comcontrol/comcontrol.c b/sbin/i386/comcontrol/comcontrol.c
index 671551e07d60..62f63c621fa7 100644
--- a/sbin/i386/comcontrol/comcontrol.c
+++ b/sbin/i386/comcontrol/comcontrol.c
@@ -28,7 +28,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/i386/comcontrol/comcontrol.c,v 1.7.2.1 1999/08/29 15:13:22 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/sbin/i386/cxconfig/cxconfig.8 b/sbin/i386/cxconfig/cxconfig.8
index 066c4e95e9a0..a3de15740f8a 100644
--- a/sbin/i386/cxconfig/cxconfig.8
+++ b/sbin/i386/cxconfig/cxconfig.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/i386/cxconfig/cxconfig.8,v 1.4.2.1 1999/08/29 15:13:24 peter Exp $
 .Dd December 2, 1994
 .Dt CXCONFIG 8
 .Os FreeBSD
diff --git a/sbin/i386/cxconfig/cxconfig.c b/sbin/i386/cxconfig/cxconfig.c
index 3ae000d58f4b..592d3d03116c 100644
--- a/sbin/i386/cxconfig/cxconfig.c
+++ b/sbin/i386/cxconfig/cxconfig.c
@@ -24,7 +24,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/i386/cxconfig/cxconfig.c,v 1.3.2.1 1999/08/29 15:13:24 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/i386/fdisk/Makefile b/sbin/i386/fdisk/Makefile
index 4a14439057c3..46f27d294b7c 100644
--- a/sbin/i386/fdisk/Makefile
+++ b/sbin/i386/fdisk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/i386/fdisk/Makefile,v 1.3.8.2 1999/08/29 15:13:27 peter Exp $
 
 PROG=	fdisk
 MAN8=	fdisk.8
diff --git a/sbin/i386/fdisk/fdisk.8 b/sbin/i386/fdisk/fdisk.8
index 9ddd557fa672..2fcf1c13700c 100644
--- a/sbin/i386/fdisk/fdisk.8
+++ b/sbin/i386/fdisk/fdisk.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/i386/fdisk/fdisk.8,v 1.11.2.5 1999/08/29 15:13:28 peter Exp $
 .\"
 .Dd October 4, 1996
 .Dt FDISK 8
diff --git a/sbin/i386/fdisk/fdisk.c b/sbin/i386/fdisk/fdisk.c
index 051bd61e08f4..750aa6b64ff2 100644
--- a/sbin/i386/fdisk/fdisk.c
+++ b/sbin/i386/fdisk/fdisk.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/i386/fdisk/fdisk.c,v 1.27.2.5 1999/08/29 15:13:29 peter Exp $";
 #endif /* not lint */
 
 #include <sys/disklabel.h>
diff --git a/sbin/i386/ft/Makefile b/sbin/i386/ft/Makefile
index 16c7bf86af77..122409e2ae29 100644
--- a/sbin/i386/ft/Makefile
+++ b/sbin/i386/ft/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/i386/ft/Makefile,v 1.7.2.1 1999/08/29 15:13:30 peter Exp $
 
 PROG=	ft
 MAN8=	ft.8
diff --git a/sbin/i386/ft/ft.8 b/sbin/i386/ft/ft.8
index 6b709a054eff..835922b1302f 100644
--- a/sbin/i386/ft/ft.8
+++ b/sbin/i386/ft/ft.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ft.8
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/i386/ft/ft.8,v 1.5.2.1 1999/08/29 15:13:31 peter Exp $
 .\"
 .Dd February 7, 1994
 .Dt FT 8
diff --git a/sbin/i386/ft/ft.c b/sbin/i386/ft/ft.c
index f4d3f7df5f5d..49b5f6fc9d47 100644
--- a/sbin/i386/ft/ft.c
+++ b/sbin/i386/ft/ft.c
@@ -36,7 +36,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/i386/ft/ft.c,v 1.6.2.1 1999/08/29 15:13:31 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/i386/ft/ftecc.c b/sbin/i386/ft/ftecc.c
index 6946d53772bf..6e76406ca5b9 100644
--- a/sbin/i386/ft/ftecc.c
+++ b/sbin/i386/ft/ftecc.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/i386/ft/ftecc.c,v 1.5.2.1 1999/08/29 15:13:32 peter Exp $";
 #endif /* not lint */
 
 #include <sys/ftape.h>
diff --git a/sbin/i386/mount_msdos/Makefile b/sbin/i386/mount_msdos/Makefile
index 700aaef1ba6b..7c6fdda6e2aa 100644
--- a/sbin/i386/mount_msdos/Makefile
+++ b/sbin/i386/mount_msdos/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/i386/mount_msdos/Makefile,v 1.10.2.1 1999/08/29 15:13:34 peter Exp $
 #
 
 PROG=	mount_msdos
diff --git a/sbin/i386/mount_msdos/mount_msdos.8 b/sbin/i386/mount_msdos/mount_msdos.8
index e3922c206e59..b41005b1a42b 100644
--- a/sbin/i386/mount_msdos/mount_msdos.8
+++ b/sbin/i386/mount_msdos/mount_msdos.8
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/i386/mount_msdos/mount_msdos.8,v 1.15.2.2 1999/09/03 08:53:58 jkh Exp $
 .\"
 .Dd April 7, 1994
 .Dt MOUNT_MSDOS 8
diff --git a/sbin/i386/mount_msdos/mount_msdos.c b/sbin/i386/mount_msdos/mount_msdos.c
index ebb646adbacc..7596c424298d 100644
--- a/sbin/i386/mount_msdos/mount_msdos.c
+++ b/sbin/i386/mount_msdos/mount_msdos.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/i386/mount_msdos/mount_msdos.c,v 1.15.2.3 1999/11/22 23:03:31 green Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/i386/nextboot/nextboot.8 b/sbin/i386/nextboot/nextboot.8
index 75ad6d3c74cd..6d0e340b3591 100644
--- a/sbin/i386/nextboot/nextboot.8
+++ b/sbin/i386/nextboot/nextboot.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/i386/nextboot/nextboot.8,v 1.8.2.2 1999/08/29 15:13:36 peter Exp $
 .Dd July 9, 1996
 .Dt NEXTBOOT 8
 .\".Os BSD 4
diff --git a/sbin/i386/nextboot/nextboot.c b/sbin/i386/nextboot/nextboot.c
index 5893ca38a8a8..6793928d468d 100644
--- a/sbin/i386/nextboot/nextboot.c
+++ b/sbin/i386/nextboot/nextboot.c
@@ -15,7 +15,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/i386/nextboot/nextboot.c,v 1.5.2.1 1999/08/29 15:13:37 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile
index d21321477f5a..cc25fe2054e3 100644
--- a/sbin/ifconfig/Makefile
+++ b/sbin/ifconfig/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/ifconfig/Makefile,v 1.10.2.2 1999/12/13 02:02:19 jkh Exp $
 
 PROG=	ifconfig
 SRCS=	ifconfig.c
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index cbe9d5107a47..2f6bcc5571c3 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)ifconfig.8	8.3 (Berkeley) 1/5/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.18.2.2 1999/12/13 02:02:20 jkh Exp $
 .\"
 .Dd February 13, 1996
 .Dt IFCONFIG 8
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index f34fe5578ac1..644d724ccbe1 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ifconfig.c	8.2 (Berkeley) 2/16/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.38.2.2 1999/12/13 02:02:20 jkh Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h
index 51f9c84661ca..c7befe897719 100644
--- a/sbin/ifconfig/ifconfig.h
+++ b/sbin/ifconfig/ifconfig.h
@@ -31,7 +31,7 @@
  *
  * so there!
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ifconfig/ifconfig.h,v 1.3.4.2 1999/12/13 02:02:21 jkh Exp $
  */
 
 extern struct ifreq ifr;
diff --git a/sbin/ifconfig/ifmedia.c b/sbin/ifconfig/ifmedia.c
index 3ab28f87c79c..00cbbdcf0dc9 100644
--- a/sbin/ifconfig/ifmedia.c
+++ b/sbin/ifconfig/ifmedia.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: ifconfig.c,v 1.34 1997/04/21 01:17:58 lukem Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sbin/ifconfig/ifmedia.c,v 1.5.2.1 1999/08/29 15:13:41 peter Exp $ */
 
 /*
  * Copyright (c) 1997 Jason R. Thorpe.
diff --git a/sbin/ifconfig/ifvlan.c b/sbin/ifconfig/ifvlan.c
index 3843821781c3..ff90de4b0153 100644
--- a/sbin/ifconfig/ifvlan.c
+++ b/sbin/ifconfig/ifvlan.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ifconfig/ifvlan.c,v 1.2 1999/08/28 00:13:09 peter Exp $
  */
 
 #include <sys/param.h>
@@ -59,7 +59,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ifconfig/ifvlan.c,v 1.2 1999/08/28 00:13:09 peter Exp $";
 #endif
 static int			__tag = 0;
 static int			__have_tag = 0;
diff --git a/sbin/init/Makefile b/sbin/init/Makefile
index c1057906d91f..02f34580cce3 100644
--- a/sbin/init/Makefile
+++ b/sbin/init/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/init/Makefile,v 1.15.2.3 1999/08/29 15:13:43 peter Exp $
 
 PROG=	init
 MAN8=	init.8
diff --git a/sbin/init/init.8 b/sbin/init/init.8
index c25496310309..8254b4486fa7 100644
--- a/sbin/init/init.8
+++ b/sbin/init/init.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)init.8	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/init/init.8,v 1.13.2.6 1999/12/07 07:57:57 sheldonh Exp $
 .\"
 .Dd April 18, 1994
 .Dt INIT 8
diff --git a/sbin/init/init.c b/sbin/init/init.c
index 75287b5d4e4c..1bb311482e1f 100644
--- a/sbin/init/init.c
+++ b/sbin/init/init.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)init.c	8.1 (Berkeley) 7/15/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/init/init.c,v 1.31.2.4 1999/12/04 14:20:51 kato Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ipf/Makefile b/sbin/ipf/Makefile
index dadd54f06694..083c8d9a10a0 100644
--- a/sbin/ipf/Makefile
+++ b/sbin/ipf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ipf/Makefile,v 1.1 1998/03/21 13:52:51 peter Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
 
diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8
index 6f547b8848dd..7095c2ea0824 100644
--- a/sbin/ipfw/ipfw.8
+++ b/sbin/ipfw/ipfw.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.47.2.9 1999/10/20 13:07:36 ru Exp $
 .\"
 .Dd July 20, 1996
 .Dt IPFW 8
diff --git a/sbin/ipfw/ipfw.c b/sbin/ipfw/ipfw.c
index 5a160dcd5951..a78df8097cfa 100644
--- a/sbin/ipfw/ipfw.c
+++ b/sbin/ipfw/ipfw.c
@@ -20,7 +20,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ipfw/ipfw.c,v 1.64.2.10 1999/09/05 12:04:35 green Exp $";
 #endif /* not lint */
 
 
diff --git a/sbin/kget/Makefile b/sbin/kget/Makefile
index d4bce5dbca70..a809c3e35cf9 100644
--- a/sbin/kget/Makefile
+++ b/sbin/kget/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/kget/Makefile,v 1.1.2.2 1999/08/29 15:13:49 peter Exp $
 #
 PROG=	kget
 CFLAGS+= -I${.CURDIR}/../../sys/i386
diff --git a/sbin/kget/kget.8 b/sbin/kget/kget.8
index 7fea15fd9cc7..f2798633830b 100644
--- a/sbin/kget/kget.8
+++ b/sbin/kget/kget.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/kget/kget.8,v 1.1.2.2 1999/08/29 15:13:49 peter Exp $
 .\"
 .Dd Feb 20, 1999
 .Dt KGET 8
diff --git a/sbin/kget/kget.c b/sbin/kget/kget.c
index 605a11bb48fe..f2cea86d2ebe 100644
--- a/sbin/kget/kget.c
+++ b/sbin/kget/kget.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/kget/kget.c,v 1.1.2.2 1999/08/29 15:13:51 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/sbin/kldload/Makefile b/sbin/kldload/Makefile
index 6b044f52630d..f2f4cfdfe840 100644
--- a/sbin/kldload/Makefile
+++ b/sbin/kldload/Makefile
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/kldload/Makefile,v 1.3.2.1 1999/08/29 15:13:52 peter Exp $
 #
 
 PROG=	kldload
diff --git a/sbin/kldload/kldload.8 b/sbin/kldload/kldload.8
index 39b42f0691c1..41b26070f62e 100644
--- a/sbin/kldload/kldload.8
+++ b/sbin/kldload/kldload.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/kldload/kldload.8,v 1.5.2.2 1999/09/04 16:12:06 chris Exp $
 .\"
 .Dd April 25, 1997
 .Dt KLDLOAD 8
diff --git a/sbin/kldload/kldload.c b/sbin/kldload/kldload.c
index 875c7aaa808b..0ae712b78477 100644
--- a/sbin/kldload/kldload.c
+++ b/sbin/kldload/kldload.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/kldload/kldload.c,v 1.5.2.1 1999/08/29 15:13:54 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/kldstat/Makefile b/sbin/kldstat/Makefile
index 64d7c1247cba..b43056106bbf 100644
--- a/sbin/kldstat/Makefile
+++ b/sbin/kldstat/Makefile
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/kldstat/Makefile,v 1.3.2.1 1999/08/29 15:13:55 peter Exp $
 #
 
 PROG=	kldstat
diff --git a/sbin/kldstat/kldstat.8 b/sbin/kldstat/kldstat.8
index f12d5039d8cb..0f9c8dcbe302 100644
--- a/sbin/kldstat/kldstat.8
+++ b/sbin/kldstat/kldstat.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/kldstat/kldstat.8,v 1.5.2.2 1999/09/04 16:12:15 chris Exp $
 .\"
 .Dd April 25, 1997
 .Dt KLDSTAT 8
diff --git a/sbin/kldstat/kldstat.c b/sbin/kldstat/kldstat.c
index 945f442df15a..61f16284b942 100644
--- a/sbin/kldstat/kldstat.c
+++ b/sbin/kldstat/kldstat.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/kldstat/kldstat.c,v 1.5.2.1 1999/08/29 15:13:57 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/kldunload/Makefile b/sbin/kldunload/Makefile
index b87d87275a03..bbd51072b874 100644
--- a/sbin/kldunload/Makefile
+++ b/sbin/kldunload/Makefile
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/kldunload/Makefile,v 1.3.2.1 1999/08/29 15:13:58 peter Exp $
 #
 
 PROG=	kldunload
diff --git a/sbin/kldunload/kldunload.8 b/sbin/kldunload/kldunload.8
index d4ed5e43eadc..5d50d0d9da3a 100644
--- a/sbin/kldunload/kldunload.8
+++ b/sbin/kldunload/kldunload.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/kldunload/kldunload.8,v 1.6.2.2 1999/09/04 16:12:17 chris Exp $
 .\"
 .Dd April 25, 1997
 .Dt KLDUNLOAD 8
diff --git a/sbin/kldunload/kldunload.c b/sbin/kldunload/kldunload.c
index ff33fec3760b..179a9956d070 100644
--- a/sbin/kldunload/kldunload.c
+++ b/sbin/kldunload/kldunload.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/kldunload/kldunload.c,v 1.7.2.1 1999/08/29 15:13:59 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/ldconfig/Makefile b/sbin/ldconfig/Makefile
index 0b9792fab953..f7d6eb576d66 100644
--- a/sbin/ldconfig/Makefile
+++ b/sbin/ldconfig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ldconfig/Makefile,v 1.14.2.1 1999/08/29 15:14:00 peter Exp $
 
 PROG=	ldconfig
 SRCS=	elfhints.c ldconfig.c shlib.c support.c
diff --git a/sbin/ldconfig/elfhints.c b/sbin/ldconfig/elfhints.c
index 18186d6499de..05cf89542f4b 100644
--- a/sbin/ldconfig/elfhints.c
+++ b/sbin/ldconfig/elfhints.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ldconfig/elfhints.c,v 1.1.2.1 1999/08/29 15:14:01 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/ldconfig/ldconfig.8 b/sbin/ldconfig/ldconfig.8
index c6c867b3303d..bae5a0fbac34 100644
--- a/sbin/ldconfig/ldconfig.8
+++ b/sbin/ldconfig/ldconfig.8
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ldconfig/ldconfig.8,v 1.16.2.1 1999/08/29 15:14:02 peter Exp $
 .\"
 .Dd October 3, 1993
 .Dt LDCONFIG 8
diff --git a/sbin/ldconfig/ldconfig.c b/sbin/ldconfig/ldconfig.c
index 1a15272f719d..b3416fc4e462 100644
--- a/sbin/ldconfig/ldconfig.c
+++ b/sbin/ldconfig/ldconfig.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ldconfig/ldconfig.c,v 1.28.2.1 1999/08/29 15:14:02 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ldconfig/ldconfig.h b/sbin/ldconfig/ldconfig.h
index 1ea712c8eb44..654eb8dfa641 100644
--- a/sbin/ldconfig/ldconfig.h
+++ b/sbin/ldconfig/ldconfig.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ldconfig/ldconfig.h,v 1.1.2.1 1999/08/29 15:14:03 peter Exp $
  */
 
 #ifndef LDCONFIG_H
diff --git a/sbin/md5/md5.1 b/sbin/md5/md5.1
index c485184cc440..81a7577d5fdf 100644
--- a/sbin/md5/md5.1
+++ b/sbin/md5/md5.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/md5/md5.1,v 1.7.2.1 1999/12/08 06:30:16 obrien Exp $
 .Dd February 14, 1994
 .Dt MD5 1
 .Os
diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c
index 9a764b120bee..f242b7d9b0ab 100644
--- a/sbin/md5/md5.c
+++ b/sbin/md5/md5.c
@@ -19,7 +19,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/md5/md5.c,v 1.13.2.3 1999/12/08 06:30:16 obrien Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/mknod/mknod.8 b/sbin/mknod/mknod.8
index 8994d091bb98..0c0c151ea730 100644
--- a/sbin/mknod/mknod.8
+++ b/sbin/mknod/mknod.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mknod.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mknod/mknod.8,v 1.7.2.1 1999/08/29 15:14:06 peter Exp $
 .\"
 .Dd December 11, 1993
 .Dt MKNOD 8
diff --git a/sbin/mknod/mknod.c b/sbin/mknod/mknod.c
index 86488b37c92c..7e5553690c18 100644
--- a/sbin/mknod/mknod.c
+++ b/sbin/mknod/mknod.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mknod.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mknod/mknod.c,v 1.8.2.1 1999/08/29 15:14:07 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/modload/Makefile b/sbin/modload/Makefile
index 10dda7792be0..7d662b944d37 100644
--- a/sbin/modload/Makefile
+++ b/sbin/modload/Makefile
@@ -33,7 +33,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/modload/Makefile,v 1.3.2.1 1999/08/29 15:14:08 peter Exp $
 #
 
 PROG=	modload
diff --git a/sbin/modload/modload.8 b/sbin/modload/modload.8
index 7ffc85fd61ed..85c329ab5afc 100644
--- a/sbin/modload/modload.8
+++ b/sbin/modload/modload.8
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/modload/modload.8,v 1.11.2.1 1999/08/29 15:14:09 peter Exp $
 .\"
 .Dd September 22, 1994
 .Dt MODLOAD 8
diff --git a/sbin/modload/modload.c b/sbin/modload/modload.c
index 34694b1f2eb1..9db491e9a56f 100644
--- a/sbin/modload/modload.c
+++ b/sbin/modload/modload.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/modload/modload.c,v 1.23.2.1 1999/08/29 15:14:10 peter Exp $";
 #endif /* not lint */
 
 #include <a.out.h>
diff --git a/sbin/modload/pathnames.h b/sbin/modload/pathnames.h
index d4e33f03dcdb..06544a29cce0 100644
--- a/sbin/modload/pathnames.h
+++ b/sbin/modload/pathnames.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sbin/modload/pathnames.h,v 1.4.2.1 1999/08/29 15:14:11 peter Exp $ */
 #include <paths.h>
 
 #define	_PATH_LKM	"/dev/lkm"
diff --git a/sbin/modunload/Makefile b/sbin/modunload/Makefile
index 0870600ebf48..7afd6e72902b 100644
--- a/sbin/modunload/Makefile
+++ b/sbin/modunload/Makefile
@@ -33,7 +33,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/modunload/Makefile,v 1.3.2.1 1999/08/29 15:14:12 peter Exp $
 #
 
 PROG=	modunload
diff --git a/sbin/modunload/modunload.8 b/sbin/modunload/modunload.8
index 65162af5373c..5b7c96e00af7 100644
--- a/sbin/modunload/modunload.8
+++ b/sbin/modunload/modunload.8
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/modunload/modunload.8,v 1.8.2.1 1999/08/29 15:14:12 peter Exp $
 .\"
 .Dd June 7, 1993
 .Dt MODUNLOAD 8
diff --git a/sbin/modunload/modunload.c b/sbin/modunload/modunload.c
index 64e18daae458..88cb02c4a375 100644
--- a/sbin/modunload/modunload.c
+++ b/sbin/modunload/modunload.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/modunload/modunload.c,v 1.7.2.1 1999/08/29 15:14:13 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/mount/Makefile b/sbin/mount/Makefile
index 96c996db24fe..f1a9971a1c30 100644
--- a/sbin/mount/Makefile
+++ b/sbin/mount/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.6 (Berkeley) 5/8/95
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount/Makefile,v 1.8.2.1 1999/08/29 15:14:15 peter Exp $
 
 PROG=	mount
 SRCS=	mount.c mount_ufs.c getmntopts.c vfslist.c
diff --git a/sbin/mount/extern.h b/sbin/mount/extern.h
index bc11a037ecfd..16e89bebacaa 100644
--- a/sbin/mount/extern.h
+++ b/sbin/mount/extern.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mount/extern.h,v 1.2.2.1 1999/08/29 15:14:16 peter Exp $
  */
 
 /* vfslist.c */
diff --git a/sbin/mount/getmntopts.c b/sbin/mount/getmntopts.c
index ffc18bfac219..ab172718fb35 100644
--- a/sbin/mount/getmntopts.c
+++ b/sbin/mount/getmntopts.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)getmntopts.c	8.3 (Berkeley) 3/29/95";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount/getmntopts.c,v 1.7.2.2 1999/11/22 23:03:47 green Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/sbin/mount/mntopts.h b/sbin/mount/mntopts.h
index 73c3c15a838f..b98741bff377 100644
--- a/sbin/mount/mntopts.h
+++ b/sbin/mount/mntopts.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mntopts.h	8.7 (Berkeley) 3/29/95
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mount/mntopts.h,v 1.14.2.2 1999/11/22 23:03:47 green Exp $
  */
 
 struct mntopt {
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index e882f88a7bca..12be3879fa94 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount.8	8.8 (Berkeley) 6/16/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount/mount.8,v 1.24.2.3 1999/08/29 15:14:18 peter Exp $
 .\"
 .Dd June 16, 1994
 .Dt MOUNT 8
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index 1ba9e570a7f3..a6043bd9ea08 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount.c	8.25 (Berkeley) 5/8/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount/mount.c,v 1.28.2.4 1999/11/22 23:03:48 green Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount/mount_ufs.c b/sbin/mount/mount_ufs.c
index 3c0b6fcb711f..17974815a78a 100644
--- a/sbin/mount/mount_ufs.c
+++ b/sbin/mount/mount_ufs.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_ufs.c	8.4 (Berkeley) 4/26/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount/mount_ufs.c,v 1.15.2.1 1999/08/29 15:14:19 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount/vfslist.c b/sbin/mount/vfslist.c
index d8201882eb33..219c738ebdef 100644
--- a/sbin/mount/vfslist.c
+++ b/sbin/mount/vfslist.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)vfslist.c	8.1 (Berkeley) 5/8/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount/vfslist.c,v 1.3.2.1 1999/08/29 15:14:19 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/mount_cd9660/mount_cd9660.8 b/sbin/mount_cd9660/mount_cd9660.8
index 387c687001a9..d57eb529613c 100644
--- a/sbin/mount_cd9660/mount_cd9660.8
+++ b/sbin/mount_cd9660/mount_cd9660.8
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount_cd9660.8	8.3 (Berkeley) 3/27/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_cd9660/mount_cd9660.8,v 1.6.2.4 1999/08/29 15:14:21 peter Exp $
 .\"
 .Dd March 27, 1994
 .Dt MOUNT_CD9660 8
diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
index 665d22f64787..ffa820669d97 100644
--- a/sbin/mount_cd9660/mount_cd9660.c
+++ b/sbin/mount_cd9660/mount_cd9660.c
@@ -49,7 +49,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)mount_cd9660.c	8.7 (Berkeley) 5/1/95";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_cd9660/mount_cd9660.c,v 1.12.2.3 1999/11/22 23:03:49 green Exp $";
 #endif /* not lint */
 
 #include <sys/cdio.h>
diff --git a/sbin/mount_ext2fs/mount_ext2fs.8 b/sbin/mount_ext2fs/mount_ext2fs.8
index 3360b90d91f5..92f9cced2297 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.8
+++ b/sbin/mount_ext2fs/mount_ext2fs.8
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_ext2fs/mount_ext2fs.8,v 1.5.2.1 1999/08/29 15:14:23 peter Exp $
 .\"
 .Dd January 31, 1996
 .Dt MOUNT_EXT2FS 8
diff --git a/sbin/mount_ext2fs/mount_ext2fs.c b/sbin/mount_ext2fs/mount_ext2fs.c
index ded01952a936..d855c60c3b5e 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.c
+++ b/sbin/mount_ext2fs/mount_ext2fs.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)mount_lfs.c	8.3 (Berkeley) 3/27/94";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_ext2fs/mount_ext2fs.c,v 1.9.2.2 1999/11/22 23:03:50 green Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8
index 262de65a6863..fb0f7f4e4249 100644
--- a/sbin/mount_nfs/mount_nfs.8
+++ b/sbin/mount_nfs/mount_nfs.8
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)mount_nfs.8	8.3 (Berkeley) 3/29/95
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.14.2.1 1999/08/29 15:14:25 peter Exp $
 .\""
 .Dd March 29, 1995
 .Dt MOUNT_NFS 8
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index be1ddadd16db..6c80cb35d0af 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_nfs.c	8.11 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_nfs/mount_nfs.c,v 1.29.2.3 1999/11/22 23:03:51 green Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_ntfs/Makefile b/sbin/mount_ntfs/Makefile
index 6a42178b7518..03147404a266 100644
--- a/sbin/mount_ntfs/Makefile
+++ b/sbin/mount_ntfs/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_ntfs/Makefile,v 1.1.1.1.2.2 1999/08/29 15:14:27 peter Exp $
 #
 
 PROG=	mount_ntfs
diff --git a/sbin/mount_ntfs/mount_ntfs.8 b/sbin/mount_ntfs/mount_ntfs.8
index dbb487221451..6853c1993e54 100644
--- a/sbin/mount_ntfs/mount_ntfs.8
+++ b/sbin/mount_ntfs/mount_ntfs.8
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_ntfs/mount_ntfs.8,v 1.2.2.4 1999/08/29 15:14:28 peter Exp $
 .\"
 .Dd Jan 3, 1999
 .Dt MOUNT_NTFS 8
diff --git a/sbin/mount_ntfs/mount_ntfs.c b/sbin/mount_ntfs/mount_ntfs.c
index 95b86c22a9cf..38d075fcb45d 100644
--- a/sbin/mount_ntfs/mount_ntfs.c
+++ b/sbin/mount_ntfs/mount_ntfs.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mount_ntfs/mount_ntfs.c,v 1.1.1.1.2.3 1999/11/22 23:03:52 green Exp $
  *
  */
 
diff --git a/sbin/mount_null/mount_null.8 b/sbin/mount_null/mount_null.8
index 83e279c307ef..3d65f7ae09c5 100644
--- a/sbin/mount_null/mount_null.8
+++ b/sbin/mount_null/mount_null.8
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount_null.8	8.6 (Berkeley) 5/1/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_null/mount_null.8,v 1.10.2.1 1999/08/29 15:14:29 peter Exp $
 .\"
 .Dd May 1, 1995
 .Dt MOUNT_NULL 8
diff --git a/sbin/mount_null/mount_null.c b/sbin/mount_null/mount_null.c
index cf6120863bac..58341f4c0c4d 100644
--- a/sbin/mount_null/mount_null.c
+++ b/sbin/mount_null/mount_null.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_null.c	8.6 (Berkeley) 4/26/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_null/mount_null.c,v 1.11.2.2 1999/11/22 23:03:53 green Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_portal/Makefile b/sbin/mount_portal/Makefile
index 23a5bd771be8..c7009b10bfec 100644
--- a/sbin/mount_portal/Makefile
+++ b/sbin/mount_portal/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 3/27/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_portal/Makefile,v 1.9.2.1 1999/08/29 15:14:31 peter Exp $
 
 PROG=	mount_portal
 SRCS=	mount_portal.c activate.c conf.c getmntopts.c pt_conf.c \
diff --git a/sbin/mount_portal/activate.c b/sbin/mount_portal/activate.c
index 56464981471c..c015b3366578 100644
--- a/sbin/mount_portal/activate.c
+++ b/sbin/mount_portal/activate.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_portal/activate.c,v 1.6.2.1 1999/08/29 15:14:32 peter Exp $";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/sbin/mount_portal/conf.c b/sbin/mount_portal/conf.c
index d5833e4b2136..b9e6dd7efa4f 100644
--- a/sbin/mount_portal/conf.c
+++ b/sbin/mount_portal/conf.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_portal/conf.c,v 1.7.2.1 1999/08/29 15:14:32 peter Exp $";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/sbin/mount_portal/mount_portal.8 b/sbin/mount_portal/mount_portal.8
index afaa3d7175f5..5e014f42ae57 100644
--- a/sbin/mount_portal/mount_portal.8
+++ b/sbin/mount_portal/mount_portal.8
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_portal.8	8.3 (Berkeley) 3/27/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_portal/mount_portal.8,v 1.4.2.3 1999/08/29 15:14:33 peter Exp $
 .\"
 .Dd March 27, 1994
 .Dt MOUNT_PORTAL 8
diff --git a/sbin/mount_portal/mount_portal.c b/sbin/mount_portal/mount_portal.c
index 48cf609df74e..5e3bba5c2bd9 100644
--- a/sbin/mount_portal/mount_portal.c
+++ b/sbin/mount_portal/mount_portal.c
@@ -45,7 +45,7 @@ char copyright[] =
 static char sccsid[] = "@(#)mount_portal.c	8.6 (Berkeley) 4/26/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_portal/mount_portal.c,v 1.14.2.2 1999/11/22 23:03:54 green Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_portal/pathnames.h b/sbin/mount_portal/pathnames.h
index 6b557704e38f..81605a7aacbb 100644
--- a/sbin/mount_portal/pathnames.h
+++ b/sbin/mount_portal/pathnames.h
@@ -36,7 +36,7 @@
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mount_portal/pathnames.h,v 1.3.2.1 1999/08/29 15:14:33 peter Exp $
  */
 
 #include <paths.h>
diff --git a/sbin/mount_portal/portal.conf b/sbin/mount_portal/portal.conf
index 53a07a92231c..817450af0d2c 100644
--- a/sbin/mount_portal/portal.conf
+++ b/sbin/mount_portal/portal.conf
@@ -1,5 +1,5 @@
 # @(#)portal.conf	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_portal/portal.conf,v 1.3.2.1 1999/08/29 15:14:34 peter Exp $
 tcplisten/	tcplisten tcplisten/
 tcp/		tcp tcp/
 fs/		file fs/
diff --git a/sbin/mount_portal/portald.h b/sbin/mount_portal/portald.h
index 4131834c5575..3abbb0d85464 100644
--- a/sbin/mount_portal/portald.h
+++ b/sbin/mount_portal/portald.h
@@ -36,7 +36,7 @@
  *
  *	@(#)portald.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mount_portal/portald.h,v 1.4.2.1 1999/08/29 15:14:34 peter Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/sbin/mount_portal/pt_conf.c b/sbin/mount_portal/pt_conf.c
index f158a73dd03d..7f3bdccc5422 100644
--- a/sbin/mount_portal/pt_conf.c
+++ b/sbin/mount_portal/pt_conf.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_portal/pt_conf.c,v 1.5.2.1 1999/08/29 15:14:35 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/mount_portal/pt_exec.c b/sbin/mount_portal/pt_exec.c
index 359c78e92164..955f78305cf5 100644
--- a/sbin/mount_portal/pt_exec.c
+++ b/sbin/mount_portal/pt_exec.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_portal/pt_exec.c,v 1.4.2.1 1999/08/29 15:14:35 peter Exp $";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/sbin/mount_portal/pt_file.c b/sbin/mount_portal/pt_file.c
index f22ebd7d2b51..e925da4b6677 100644
--- a/sbin/mount_portal/pt_file.c
+++ b/sbin/mount_portal/pt_file.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_portal/pt_file.c,v 1.7.2.1 1999/08/29 15:14:36 peter Exp $";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/sbin/mount_portal/pt_tcp.c b/sbin/mount_portal/pt_tcp.c
index 49056163aae3..b913bd378da4 100644
--- a/sbin/mount_portal/pt_tcp.c
+++ b/sbin/mount_portal/pt_tcp.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_portal/pt_tcp.c,v 1.8.2.1 1999/08/29 15:14:36 peter Exp $";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/sbin/mount_std/mount_std.8 b/sbin/mount_std/mount_std.8
index df019ce2853e..0501f8df3001 100644
--- a/sbin/mount_std/mount_std.8
+++ b/sbin/mount_std/mount_std.8
@@ -34,7 +34,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_std/mount_std.8,v 1.8.2.1 1999/08/29 15:14:39 peter Exp $
 .\"
 .Dd May 13, 1996
 .Dt MOUNT_STD 8
diff --git a/sbin/mount_std/mount_std.c b/sbin/mount_std/mount_std.c
index 2a95764d8542..49570861f95e 100644
--- a/sbin/mount_std/mount_std.c
+++ b/sbin/mount_std/mount_std.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_std/mount_std.c,v 1.8.2.2 1999/11/22 23:03:55 green Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_umap/mount_umap.8 b/sbin/mount_umap/mount_umap.8
index 4c6abfa3e438..a5a43251c976 100644
--- a/sbin/mount_umap/mount_umap.8
+++ b/sbin/mount_umap/mount_umap.8
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_umap.8	8.4 (Berkeley) 5/1/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_umap/mount_umap.8,v 1.9.2.1 1999/08/29 15:14:41 peter Exp $
 .\"
 .Dd May 1, 1995
 .Dt MOUNT_UMAP 8
diff --git a/sbin/mount_umap/mount_umap.c b/sbin/mount_umap/mount_umap.c
index 0aa7b8c075a3..7b970706bd04 100644
--- a/sbin/mount_umap/mount_umap.c
+++ b/sbin/mount_umap/mount_umap.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_umap.c	8.5 (Berkeley) 4/26/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_umap/mount_umap.c,v 1.13.2.2 1999/11/22 23:03:56 green Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_union/mount_union.8 b/sbin/mount_union/mount_union.8
index 08a48044cdce..bfae355b2856 100644
--- a/sbin/mount_union/mount_union.8
+++ b/sbin/mount_union/mount_union.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_union.8	8.6 (Berkeley) 3/27/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_union/mount_union.8,v 1.5.2.1 1999/08/29 15:14:43 peter Exp $
 .\"
 .Dd March 27, 1994
 .Dt MOUNT_UNION 8
diff --git a/sbin/mount_union/mount_union.c b/sbin/mount_union/mount_union.c
index 1d5d3ebc504c..0699f5726593 100644
--- a/sbin/mount_union/mount_union.c
+++ b/sbin/mount_union/mount_union.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_union.c	8.5 (Berkeley) 3/27/94";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_union/mount_union.c,v 1.10.2.2 1999/11/22 23:03:58 green Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/sbin/mountd/Makefile b/sbin/mountd/Makefile
index 0312e9b657e2..bb45d7556f96 100644
--- a/sbin/mountd/Makefile
+++ b/sbin/mountd/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 1/25/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/mountd/Makefile,v 1.8.2.1 1999/08/29 15:14:45 peter Exp $
 
 PROG=	mountd
 CFLAGS+=-DNFS -DMFS -DCD9660 -DMSDOSFS
diff --git a/sbin/mountd/exports.5 b/sbin/mountd/exports.5
index 5f9a41105a16..a62ac7583de2 100644
--- a/sbin/mountd/exports.5
+++ b/sbin/mountd/exports.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)exports.5	8.3 (Berkeley) 3/29/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mountd/exports.5,v 1.7.2.1 1999/08/29 15:14:46 peter Exp $
 .\"
 .Dd March 29, 1995
 .Dt EXPORTS 5
diff --git a/sbin/mountd/mountd.8 b/sbin/mountd/mountd.8
index 98397f5a33f0..c67f294ef27f 100644
--- a/sbin/mountd/mountd.8
+++ b/sbin/mountd/mountd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mountd.8	8.4 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mountd/mountd.8,v 1.14.2.2 1999/08/29 15:14:47 peter Exp $
 .\"
 .Dd April 28, 1995
 .Dt MOUNTD 8
diff --git a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c
index 23f051383c2b..b05f585a2c43 100644
--- a/sbin/mountd/mountd.c
+++ b/sbin/mountd/mountd.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mountd.c	8.15 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mountd/mountd.c,v 1.34.2.3 1999/11/22 23:03:59 green Exp $";
 #endif /*not lint*/
 
 #include <sys/param.h>
diff --git a/sbin/natd/Makefile b/sbin/natd/Makefile
index 87c165087231..547997785d6c 100644
--- a/sbin/natd/Makefile
+++ b/sbin/natd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/natd/Makefile,v 1.2.2.2 1999/10/28 18:55:34 ru Exp $
 
 MAINTAINER	= ru@FreeBSD.org
 MAINTAINER     += ari@suutari.iki.fi
diff --git a/sbin/natd/icmp.c b/sbin/natd/icmp.c
index 176addeee02d..f9d9642e3045 100644
--- a/sbin/natd/icmp.c
+++ b/sbin/natd/icmp.c
@@ -9,7 +9,7 @@
  *
  * Ari Suutari <suutari@iki.fi>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/natd/icmp.c,v 1.5.2.2 1999/08/29 15:14:48 peter Exp $
  */
 
 #include <stdlib.h>
diff --git a/sbin/natd/natd.8 b/sbin/natd/natd.8
index 42b4be4d4373..d53f24f90932 100644
--- a/sbin/natd/natd.8
+++ b/sbin/natd/natd.8
@@ -1,5 +1,5 @@
 .\" manual page [] for natd 1.4
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/natd/natd.8,v 1.16.2.6 1999/10/28 18:55:35 ru Exp $
 .Dd 15 April 1997
 .Os FreeBSD
 .Dt NATD 8
diff --git a/sbin/natd/natd.c b/sbin/natd/natd.c
index 3d6c856a8ace..0a581018555c 100644
--- a/sbin/natd/natd.c
+++ b/sbin/natd/natd.c
@@ -9,7 +9,7 @@
  *
  * Ari Suutari <suutari@iki.fi>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/natd/natd.c,v 1.11.2.7 1999/10/28 18:55:35 ru Exp $
  */
 
 #define SYSLOG_NAMES
diff --git a/sbin/natd/natd.h b/sbin/natd/natd.h
index ac0dd75de50d..91e62027f59b 100644
--- a/sbin/natd/natd.h
+++ b/sbin/natd/natd.h
@@ -9,7 +9,7 @@
  *
  * Ari Suutari <suutari@iki.fi>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/natd/natd.h,v 1.2.2.3 1999/08/29 15:14:50 peter Exp $
  */
 
 #define PIDFILE	"/var/run/natd.pid"
diff --git a/sbin/natd/samples/natd.cf.sample b/sbin/natd/samples/natd.cf.sample
index d4dcd714bd92..1cebb107eb9b 100644
--- a/sbin/natd/samples/natd.cf.sample
+++ b/sbin/natd/samples/natd.cf.sample
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/natd/samples/natd.cf.sample,v 1.2.2.4 1999/10/28 18:56:08 ru Exp $
 #
 #
 # Configuration file for natd.
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c
index 00e4030c5a4b..63af9b8c86f1 100644
--- a/sbin/newfs/mkfs.c
+++ b/sbin/newfs/mkfs.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)mkfs.c	8.11 (Berkeley) 5/3/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/newfs/mkfs.c,v 1.26.2.1 1999/08/29 15:14:52 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8
index 72a5b18e2bae..bac7db3b3c91 100644
--- a/sbin/newfs/newfs.8
+++ b/sbin/newfs/newfs.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)newfs.8	8.6 (Berkeley) 5/3/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/newfs/newfs.8,v 1.20.2.2 1999/08/29 15:14:53 peter Exp $
 .\"
 .Dd May 3, 1995
 .Dt NEWFS 8
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index 8283ea34d4b3..efe16ba6111c 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)newfs.c	8.13 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/newfs/newfs.c,v 1.27.2.1 1999/08/29 15:14:53 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/sbin/newfs_msdos/Makefile b/sbin/newfs_msdos/Makefile
index cdfd3a86aa0f..0edea9865e97 100644
--- a/sbin/newfs_msdos/Makefile
+++ b/sbin/newfs_msdos/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/newfs_msdos/Makefile,v 1.1.1.1.4.1 1999/08/29 15:14:54 peter Exp $
 
 PROG=	newfs_msdos
 MAN8=	newfs_msdos.8
diff --git a/sbin/newfs_msdos/newfs_msdos.8 b/sbin/newfs_msdos/newfs_msdos.8
index 4e0a51c307ea..e4182d774c35 100644
--- a/sbin/newfs_msdos/newfs_msdos.8
+++ b/sbin/newfs_msdos/newfs_msdos.8
@@ -23,7 +23,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/newfs_msdos/newfs_msdos.8,v 1.5.2.1 1999/08/29 15:14:54 peter Exp $
 .\"
 .Dd July 6, 1998
 .Dt NEWFS_MSDOS 8
diff --git a/sbin/newfs_msdos/newfs_msdos.c b/sbin/newfs_msdos/newfs_msdos.c
index 3eb762cab53a..4014f27927f8 100644
--- a/sbin/newfs_msdos/newfs_msdos.c
+++ b/sbin/newfs_msdos/newfs_msdos.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/newfs_msdos/newfs_msdos.c,v 1.7.2.1 1999/08/29 15:14:55 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/nfsd/nfsd.c b/sbin/nfsd/nfsd.c
index ca7ecefa482e..1071f2095769 100644
--- a/sbin/nfsd/nfsd.c
+++ b/sbin/nfsd/nfsd.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)nfsd.c	8.9 (Berkeley) 3/29/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/nfsd/nfsd.c,v 1.13.2.1 1999/08/29 15:14:56 peter Exp $";
 #endif not lint
 
 #include <sys/param.h>
diff --git a/sbin/nfsiod/nfsiod.8 b/sbin/nfsiod/nfsiod.8
index 007668f4d052..2a84c9e2b97c 100644
--- a/sbin/nfsiod/nfsiod.8
+++ b/sbin/nfsiod/nfsiod.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)nfsiod.8	8.2 (Berkeley) 2/22/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/nfsiod/nfsiod.8,v 1.6.2.2 1999/08/29 15:14:59 peter Exp $
 .\"
 .Dd September 22, 1994
 .Dt NFSIOD 8
diff --git a/sbin/nfsiod/nfsiod.c b/sbin/nfsiod/nfsiod.c
index 65ded3544c70..4080064f1e86 100644
--- a/sbin/nfsiod/nfsiod.c
+++ b/sbin/nfsiod/nfsiod.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)nfsiod.c	8.4 (Berkeley) 5/3/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/nfsiod/nfsiod.c,v 1.8.2.1 1999/08/29 15:15:00 peter Exp $";
 #endif not lint
 
 #include <sys/param.h>
diff --git a/sbin/nologin/nologin.5 b/sbin/nologin/nologin.5
index 8ce22a264715..d46e3050b63e 100644
--- a/sbin/nologin/nologin.5
+++ b/sbin/nologin/nologin.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nologin.8	8.1 (Berkeley) 6/19/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/nologin/nologin.5,v 1.5.2.2 1999/08/29 15:15:01 peter Exp $
 .\"
 .Dd June 19, 1993
 .Dt NOLOGIN 5
diff --git a/sbin/nologin/nologin.8 b/sbin/nologin/nologin.8
index d5f4cb7a5f0b..26e45ef79980 100644
--- a/sbin/nologin/nologin.8
+++ b/sbin/nologin/nologin.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nologin.8	8.1 (Berkeley) 6/19/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/nologin/nologin.8,v 1.2.2.2 1999/08/29 15:15:02 peter Exp $
 .\"
 .Dd June 19, 1993
 .Dt NOLOGIN 8
diff --git a/sbin/nologin/nologin.sh b/sbin/nologin/nologin.sh
index 52279c19ea9a..62a2b126c66a 100644
--- a/sbin/nologin/nologin.sh
+++ b/sbin/nologin/nologin.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)nologin.sh	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/nologin/nologin.sh,v 1.3.2.1 1999/08/29 15:15:03 peter Exp $
 #
 
 echo 'This account is currently not available.'
diff --git a/sbin/nos-tun/nos-tun.8 b/sbin/nos-tun/nos-tun.8
index 9f5ae76d65d0..ca58dcac7b75 100644
--- a/sbin/nos-tun/nos-tun.8
+++ b/sbin/nos-tun/nos-tun.8
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/nos-tun/nos-tun.8,v 1.2.2.1 1999/08/29 15:15:04 peter Exp $
 .\" 
 .Dd April 11, 1998
 .Dt NOS-TUN 8
diff --git a/sbin/nos-tun/nos-tun.c b/sbin/nos-tun/nos-tun.c
index 9cdb008b0cca..95e0e6276d76 100644
--- a/sbin/nos-tun/nos-tun.c
+++ b/sbin/nos-tun/nos-tun.c
@@ -50,7 +50,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/nos-tun/nos-tun.c,v 1.4.2.1 1999/08/29 15:15:05 peter Exp $";
 #endif /* not lint */
 
 #include <fcntl.h>
diff --git a/sbin/ping/Makefile b/sbin/ping/Makefile
index 1df0d93b0530..a20794799949 100644
--- a/sbin/ping/Makefile
+++ b/sbin/ping/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/ping/Makefile,v 1.7.2.1 1999/08/29 15:15:06 peter Exp $
 
 PROG=	ping
 MAN8=	ping.8
diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8
index 565a5afed962..24fc668a766b 100644
--- a/sbin/ping/ping.8
+++ b/sbin/ping/ping.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ping.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ping/ping.8,v 1.19.2.2 1999/08/29 15:15:07 peter Exp $
 .\"
 .Dd March 1, 1997
 .Dt PING 8
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index 1cd55fa7aa7d..4a683d170751 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ping.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ping/ping.c,v 1.42.2.3 1999/11/30 21:55:17 pb Exp $";
 #endif /* not lint */
 
 /*
diff --git a/sbin/quotacheck/quotacheck.8 b/sbin/quotacheck/quotacheck.8
index b942789b6787..2d794ba61bb6 100644
--- a/sbin/quotacheck/quotacheck.8
+++ b/sbin/quotacheck/quotacheck.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)quotacheck.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/quotacheck/quotacheck.8,v 1.3.2.1 1999/08/29 15:15:09 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt QUOTACHECK 8
diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c
index a1e8487b34c1..7c0de0900643 100644
--- a/sbin/quotacheck/quotacheck.c
+++ b/sbin/quotacheck/quotacheck.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)quotacheck.c	8.3 (Berkeley) 1/29/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/quotacheck/quotacheck.c,v 1.10.2.1 1999/08/29 15:15:10 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8
index a7a2c2661664..e1f098a0b552 100644
--- a/sbin/reboot/boot_i386.8
+++ b/sbin/reboot/boot_i386.8
@@ -38,7 +38,7 @@
 .\"
 .\"     @(#)boot_i386.8	8.2 (Berkeley) 4/19/94
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/reboot/boot_i386.8,v 1.16.2.6 1999/10/15 12:52:02 phantom Exp $
 .\"
 .Dd April 19, 1994
 .Dt BOOT 8 i386
diff --git a/sbin/reboot/reboot.8 b/sbin/reboot/reboot.8
index 49b6e8c80f26..abd1e71f6cd5 100644
--- a/sbin/reboot/reboot.8
+++ b/sbin/reboot/reboot.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)reboot.8	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/reboot/reboot.8,v 1.5.2.2 1999/08/29 15:15:12 peter Exp $
 .\"
 .Dd June 9, 1993
 .Dt REBOOT 8
diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c
index 0bb84822fe0b..f8e1411b1022 100644
--- a/sbin/reboot/reboot.c
+++ b/sbin/reboot/reboot.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)reboot.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/reboot/reboot.c,v 1.7.2.1 1999/08/29 15:15:13 peter Exp $";
 #endif /* not lint */
 
 #include <sys/reboot.h>
diff --git a/sbin/restore/Makefile b/sbin/restore/Makefile
index ca0e521a825c..c88b40cb0d6b 100644
--- a/sbin/restore/Makefile
+++ b/sbin/restore/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/restore/Makefile,v 1.9.2.1 1999/08/29 15:15:15 peter Exp $
 
 PROG=	restore
 LINKS=	${BINDIR}/restore ${BINDIR}/rrestore
diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c
index 6338c24b4244..15d64736da65 100644
--- a/sbin/restore/dirs.c
+++ b/sbin/restore/dirs.c
@@ -41,7 +41,7 @@
 static char sccsid[] = "@(#)dirs.c	8.7 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/restore/dirs.c,v 1.13.2.1 1999/08/29 15:15:15 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/restore/extern.h b/sbin/restore/extern.h
index 05ca7428a45f..24adc9133128 100644
--- a/sbin/restore/extern.h
+++ b/sbin/restore/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 1/7/94
- * $FreeBSD$
+ * $FreeBSD: src/sbin/restore/extern.h,v 1.4.2.1 1999/08/29 15:15:16 peter Exp $
  */
 
 struct entry	*addentry __P((char *, ino_t, int));
diff --git a/sbin/restore/interactive.c b/sbin/restore/interactive.c
index ca0bc842673b..7546ba51c81d 100644
--- a/sbin/restore/interactive.c
+++ b/sbin/restore/interactive.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)interactive.c	8.5 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/restore/interactive.c,v 1.7.2.1 1999/08/29 15:15:17 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index f6a6872c9847..d704b53f9a78 100644
--- a/sbin/restore/main.c
+++ b/sbin/restore/main.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/restore/main.c,v 1.9.2.1 1999/08/29 15:15:17 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index 1b349468ea0c..acae4b5c8ad7 100644
--- a/sbin/restore/restore.8
+++ b/sbin/restore/restore.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)restore.8	8.4 (Berkeley) 5/1/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/restore/restore.8,v 1.15.2.1 1999/08/29 15:15:18 peter Exp $
 .\"
 .Dd May 1, 1995
 .Dt RESTORE 8
diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c
index 33496f39adaf..5495c544f876 100644
--- a/sbin/restore/restore.c
+++ b/sbin/restore/restore.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)restore.c	8.3 (Berkeley) 9/13/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/restore/restore.c,v 1.6.2.1 1999/08/29 15:15:18 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/restore/symtab.c b/sbin/restore/symtab.c
index c20521373632..62e2f76e0649 100644
--- a/sbin/restore/symtab.c
+++ b/sbin/restore/symtab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)symtab.c	8.3 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/restore/symtab.c,v 1.6.2.1 1999/08/29 15:15:18 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index ed3258b716a8..0c20108a3575 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -41,7 +41,7 @@
 static char sccsid[] = "@(#)tape.c	8.9 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/restore/tape.c,v 1.15.2.1 1999/08/29 15:15:19 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/restore/utilities.c b/sbin/restore/utilities.c
index b51f90c3a8f7..5bda9d22faa7 100644
--- a/sbin/restore/utilities.c
+++ b/sbin/restore/utilities.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)utilities.c	8.5 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/restore/utilities.c,v 1.7.2.1 1999/08/29 15:15:20 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/route/route.8 b/sbin/route/route.8
index 04cd23ae80c9..c1e0652f707b 100644
--- a/sbin/route/route.8
+++ b/sbin/route/route.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)route.8	8.3 (Berkeley) 3/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/route/route.8,v 1.12.2.4 1999/10/16 21:03:24 nsayer Exp $
 .\"
 .Dd March 19, 1994
 .Dt ROUTE 8
diff --git a/sbin/route/route.c b/sbin/route/route.c
index c664eb6177ea..7b9cdf11549e 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)route.c	8.3 (Berkeley) 3/19/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/route/route.c,v 1.29.2.3 1999/08/29 15:15:22 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/routed/Makefile b/sbin/routed/Makefile
index c4a047bc70ff..17243a822d73 100644
--- a/sbin/routed/Makefile
+++ b/sbin/routed/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/19/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/routed/Makefile,v 1.5.2.1 1999/08/29 15:15:24 peter Exp $
 
 PROG=	routed
 SRCS=	if.c input.c main.c output.c parms.c radix.c rdisc.c table.c \
diff --git a/sbin/routed/defs.h b/sbin/routed/defs.h
index 9d5103169d04..0704fb90d4ef 100644
--- a/sbin/routed/defs.h
+++ b/sbin/routed/defs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)defs.h	8.1 (Berkeley) 6/5/93
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/defs.h,v 1.10.2.1 1999/08/29 15:15:25 peter Exp $
  */
 
 /* Definitions for RIPv2 routing process.
diff --git a/sbin/routed/if.c b/sbin/routed/if.c
index 9658b3a0b481..795d8b05986d 100644
--- a/sbin/routed/if.c
+++ b/sbin/routed/if.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)if.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/routed/if.c,v 1.3.2.1 1999/08/29 15:15:25 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/sbin/routed/input.c b/sbin/routed/input.c
index 87e01cf3dce1..18275fb801d0 100644
--- a/sbin/routed/input.c
+++ b/sbin/routed/input.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)input.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/routed/input.c,v 1.4.2.1 1999/08/29 15:15:26 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/sbin/routed/main.c b/sbin/routed/main.c
index 3baa892a50d2..b2b254f2ee9c 100644
--- a/sbin/routed/main.c
+++ b/sbin/routed/main.c
@@ -42,7 +42,7 @@ char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/routed/main.c,v 1.8.2.1 1999/08/29 15:15:27 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/sbin/routed/output.c b/sbin/routed/output.c
index 27386ce8fb58..d7772c594204 100644
--- a/sbin/routed/output.c
+++ b/sbin/routed/output.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)output.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/routed/output.c,v 1.2.2.1 1999/08/29 15:15:27 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/sbin/routed/parms.c b/sbin/routed/parms.c
index 5f55f0dd8d75..62119be87e61 100644
--- a/sbin/routed/parms.c
+++ b/sbin/routed/parms.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)if.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/routed/parms.c,v 1.4.2.1 1999/08/29 15:15:28 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/sbin/routed/pathnames.h b/sbin/routed/pathnames.h
index 8165ea7a8ead..efc56ddac9ad 100644
--- a/sbin/routed/pathnames.h
+++ b/sbin/routed/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/pathnames.h,v 1.3.2.1 1999/08/29 15:15:29 peter Exp $
  *	$NetBSD$
  */
 
diff --git a/sbin/routed/radix.c b/sbin/routed/radix.c
index 9e375a56ecec..fb852e265254 100644
--- a/sbin/routed/radix.c
+++ b/sbin/routed/radix.c
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)radix.c	8.4 (Berkeley) 11/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/routed/radix.c,v 1.2.2.1 1999/08/29 15:15:30 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/sbin/routed/radix.h b/sbin/routed/radix.h
index b007b0647a13..a213e1b7eb51 100644
--- a/sbin/routed/radix.h
+++ b/sbin/routed/radix.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)radix.h	8.2 (Berkeley) 10/31/94
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/radix.h,v 1.2.2.1 1999/08/29 15:15:30 peter Exp $
  */
 
 #ifndef __RADIX_H_
diff --git a/sbin/routed/rdisc.c b/sbin/routed/rdisc.c
index c41c539edcb1..a7adf5400f38 100644
--- a/sbin/routed/rdisc.c
+++ b/sbin/routed/rdisc.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)rdisc.c	8.1 (Berkeley) x/y/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/routed/rdisc.c,v 1.2.2.1 1999/08/29 15:15:31 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8
index 9bdb084d994a..e363a6ef87a6 100644
--- a/sbin/routed/routed.8
+++ b/sbin/routed/routed.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)routed.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/routed/routed.8,v 1.11.2.1 1999/08/29 15:15:31 peter Exp $
 .\"
 .Dd June 1, 1996
 .Dt ROUTED 8
diff --git a/sbin/routed/rtquery/Makefile b/sbin/routed/rtquery/Makefile
index 7d88aa68e380..e9f1b80f900d 100644
--- a/sbin/routed/rtquery/Makefile
+++ b/sbin/routed/rtquery/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/routed/rtquery/Makefile,v 1.5.2.1 1999/08/29 15:15:35 peter Exp $
 
 PROG=	rtquery
 MAN8=	rtquery.8
diff --git a/sbin/routed/rtquery/rtquery.8 b/sbin/routed/rtquery/rtquery.8
index 91898964bd98..fec1e8423bf5 100644
--- a/sbin/routed/rtquery/rtquery.8
+++ b/sbin/routed/rtquery/rtquery.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/routed/rtquery/rtquery.8,v 1.8.2.1 1999/08/29 15:15:36 peter Exp $
 .Dd June 1, 1996
 .Dt RTQUERY 8
 .Os BSD 4.4
diff --git a/sbin/routed/rtquery/rtquery.c b/sbin/routed/rtquery/rtquery.c
index 8f808dd24050..8ba9fad3b952 100644
--- a/sbin/routed/rtquery/rtquery.c
+++ b/sbin/routed/rtquery/rtquery.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)query.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/routed/rtquery/rtquery.c,v 1.9.2.1 1999/08/29 15:15:37 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/routed/table.c b/sbin/routed/table.c
index 8682b170d8a4..41cedd970e8b 100644
--- a/sbin/routed/table.c
+++ b/sbin/routed/table.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)tables.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/routed/table.c,v 1.6.2.1 1999/08/29 15:15:32 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/sbin/routed/trace.c b/sbin/routed/trace.c
index a17b7c4fa95d..140009db1da1 100644
--- a/sbin/routed/trace.c
+++ b/sbin/routed/trace.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)trace.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/routed/trace.c,v 1.2.2.1 1999/08/29 15:15:33 peter Exp $";
 #endif /* not lint */
 
 #define	RIPCMDS
diff --git a/sbin/savecore/savecore.8 b/sbin/savecore/savecore.8
index 37e1f7184e07..e07f3c114664 100644
--- a/sbin/savecore/savecore.8
+++ b/sbin/savecore/savecore.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)savecore.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/savecore/savecore.8,v 1.7.2.1 1999/08/29 15:15:39 peter Exp $
 .\"
 .Dd September 23, 1994
 .Dt SAVECORE 8
diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c
index f78049ac7f92..47b9f899c63c 100644
--- a/sbin/savecore/savecore.c
+++ b/sbin/savecore/savecore.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)savecore.c	8.3 (Berkeley) 1/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/savecore/savecore.c,v 1.21.2.1 1999/08/29 15:15:40 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/shutdown/shutdown.8 b/sbin/shutdown/shutdown.8
index bf2276b830f4..e9a48285e3dd 100644
--- a/sbin/shutdown/shutdown.8
+++ b/sbin/shutdown/shutdown.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)shutdown.8	8.2 (Berkeley) 4/27/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/shutdown/shutdown.8,v 1.9.2.2 1999/08/29 15:15:41 peter Exp $
 .\"
 .Dd Dec 11, 1998
 .Dt SHUTDOWN 8
diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c
index 5537acb28508..eef45058df4f 100644
--- a/sbin/shutdown/shutdown.c
+++ b/sbin/shutdown/shutdown.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)shutdown.c	8.4 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/shutdown/shutdown.c,v 1.16.2.2 1999/08/29 15:15:42 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/slattach/Makefile b/sbin/slattach/Makefile
index defa38531c41..b4656a7e3e38 100644
--- a/sbin/slattach/Makefile
+++ b/sbin/slattach/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	5.4 (Berkeley) 5/11/90
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/slattach/Makefile,v 1.7.2.1 1999/08/29 15:15:44 peter Exp $
 
 PROG=	slattach
 SRCS=   slattach.c
diff --git a/sbin/slattach/slattach.8 b/sbin/slattach/slattach.8
index 8b5edc51d7ab..042cfd6e3342 100644
--- a/sbin/slattach/slattach.8
+++ b/sbin/slattach/slattach.8
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)slattach.8	6.4 (Berkeley) 3/16/91
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/slattach/slattach.8,v 1.13.2.1 1999/08/29 15:15:44 peter Exp $
 .\"
 .Dd April 4, 1993
 .Dt SLATTACH 8
diff --git a/sbin/slattach/slattach.c b/sbin/slattach/slattach.c
index ba599ba49875..5931b97bfd93 100644
--- a/sbin/slattach/slattach.c
+++ b/sbin/slattach/slattach.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "from: @(#)slattach.c	4.6 (Berkeley) 6/1/90";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/slattach/slattach.c,v 1.33.2.2 1999/08/29 15:15:45 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/spppcontrol/spppcontrol.8 b/sbin/spppcontrol/spppcontrol.8
index 39c3b2d71a45..e69ceeae2e31 100644
--- a/sbin/spppcontrol/spppcontrol.8
+++ b/sbin/spppcontrol/spppcontrol.8
@@ -22,7 +22,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/spppcontrol/spppcontrol.8,v 1.4.2.2 1999/08/29 15:15:47 peter Exp $
 .\"
 .Dd October 11, 1997
 .Os
diff --git a/sbin/spppcontrol/spppcontrol.c b/sbin/spppcontrol/spppcontrol.c
index 15af6b40d714..3d5143cf1ac7 100644
--- a/sbin/spppcontrol/spppcontrol.c
+++ b/sbin/spppcontrol/spppcontrol.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/spppcontrol/spppcontrol.c,v 1.4.2.2 1999/08/29 15:15:47 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/startslip/startslip.1 b/sbin/startslip/startslip.1
index 4c044eb9eed5..e6da82f34662 100644
--- a/sbin/startslip/startslip.1
+++ b/sbin/startslip/startslip.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)startslip.1	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/startslip/startslip.1,v 1.14.2.1 1999/08/29 15:15:49 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt STARTSLIP 1
diff --git a/sbin/startslip/startslip.c b/sbin/startslip/startslip.c
index f0d5ce6180ef..e9682f0f9d35 100644
--- a/sbin/startslip/startslip.c
+++ b/sbin/startslip/startslip.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)startslip.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/startslip/startslip.c,v 1.30.2.1 1999/08/29 15:15:50 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/swapon/swapon.8 b/sbin/swapon/swapon.8
index 5f33d3d75dbe..43c81ae612cd 100644
--- a/sbin/swapon/swapon.8
+++ b/sbin/swapon/swapon.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)swapon.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/swapon/swapon.8,v 1.10.2.3 1999/09/20 09:49:53 phantom Exp $
 .\"
 .Dd June 5, 1993
 .Dt SWAPON 8
diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c
index 4d25da2cbdf6..b3190ddfc479 100644
--- a/sbin/swapon/swapon.c
+++ b/sbin/swapon/swapon.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)swapon.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/swapon/swapon.c,v 1.7.2.1 1999/08/29 15:15:53 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/sysctl/Makefile b/sbin/sysctl/Makefile
index bbfa805063c3..23a59f759ccc 100644
--- a/sbin/sysctl/Makefile
+++ b/sbin/sysctl/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/sysctl/Makefile,v 1.3.2.2 1999/08/29 15:15:54 peter Exp $
 
 PROG=	sysctl
 MAN8=	sysctl.8
diff --git a/sbin/sysctl/pathconf.c b/sbin/sysctl/pathconf.c
index 73777e37dca0..c6c3dd3d38e3 100644
--- a/sbin/sysctl/pathconf.c
+++ b/sbin/sysctl/pathconf.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)pathconf.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/sysctl/pathconf.c,v 1.3.2.1 1999/08/29 15:15:55 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8
index a3bc3b4a89df..35210790859a 100644
--- a/sbin/sysctl/sysctl.8
+++ b/sbin/sysctl/sysctl.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)sysctl.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/sysctl/sysctl.8,v 1.18.2.2 1999/11/22 08:43:59 des Exp $
 .\"
 .Dd September 23, 1994
 .Dt SYSCTL 8
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index adbe632c064d..3509ba1f851e 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)from: sysctl.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/sysctl/sysctl.c,v 1.20.2.2 1999/11/22 08:43:59 des Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/tunefs/tunefs.8 b/sbin/tunefs/tunefs.8
index d68211d64c83..a7bbf950445f 100644
--- a/sbin/tunefs/tunefs.8
+++ b/sbin/tunefs/tunefs.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tunefs.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/tunefs/tunefs.8,v 1.8.2.1 1999/08/29 15:15:58 peter Exp $
 .\"
 .Dd December 11, 1993
 .Dt TUNEFS 8
diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c
index e1b7944e09cd..202614a64ffd 100644
--- a/sbin/tunefs/tunefs.c
+++ b/sbin/tunefs/tunefs.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tunefs.c	8.2 (Berkeley) 4/19/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/tunefs/tunefs.c,v 1.7.2.1 1999/08/29 15:15:59 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/sbin/umount/umount.8 b/sbin/umount/umount.8
index 103a13ae4ec1..cb75e6848a8f 100644
--- a/sbin/umount/umount.8
+++ b/sbin/umount/umount.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)umount.8	8.2 (Berkeley) 5/8/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/umount/umount.8,v 1.5.2.2 1999/11/22 23:04:01 green Exp $
 .\"
 .Dd May 8, 1995
 .Dt UMOUNT 8
diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c
index 43644cb47c34..14867d06ba79 100644
--- a/sbin/umount/umount.c
+++ b/sbin/umount/umount.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)umount.c	8.8 (Berkeley) 5/8/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/umount/umount.c,v 1.15.2.2 1999/11/22 23:04:01 green Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/vinum/Makefile b/sbin/vinum/Makefile
index a22a645c1795..d8bca7434865 100644
--- a/sbin/vinum/Makefile
+++ b/sbin/vinum/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/vinum/Makefile,v 1.6.2.5 1999/08/29 15:16:03 peter Exp $
 
 MAINTAINER  =  grog@FreeBSD.org
 PROG=	vinum
diff --git a/sbin/vinum/commands.c b/sbin/vinum/commands.c
index cd58c35dfd94..5a9b4ad38c35 100644
--- a/sbin/vinum/commands.c
+++ b/sbin/vinum/commands.c
@@ -38,7 +38,7 @@
  *
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sbin/vinum/commands.c,v 1.5.2.5 1999/08/29 15:16:04 peter Exp $ */
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/sbin/vinum/list.c b/sbin/vinum/list.c
index bb4901ed5cf7..4db1aa2cdb49 100644
--- a/sbin/vinum/list.c
+++ b/sbin/vinum/list.c
@@ -39,7 +39,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/vinum/list.c,v 1.8.2.4 1999/08/29 15:16:05 peter Exp $
  */
 
 #include <ctype.h>
diff --git a/sbin/vinum/v.c b/sbin/vinum/v.c
index bb6015d30e7d..58742b6c0970 100644
--- a/sbin/vinum/v.c
+++ b/sbin/vinum/v.c
@@ -38,7 +38,7 @@
  *
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sbin/vinum/v.c,v 1.4.2.5 1999/08/29 15:16:06 peter Exp $ */
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/sbin/vinum/vext.h b/sbin/vinum/vext.h
index e6b032f8d801..e8cee338ebb6 100644
--- a/sbin/vinum/vext.h
+++ b/sbin/vinum/vext.h
@@ -35,7 +35,7 @@
  *
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sbin/vinum/vext.h,v 1.3.2.4 1999/08/29 15:16:07 peter Exp $ */
 
 #define MAXARGS 64					    /* maximum number of args on a line */
 #define PLEXINITSIZE 61440				    /* this is what the system does somewhere */
diff --git a/sbin/vinum/vinum.8 b/sbin/vinum/vinum.8
index 20f1bfb91612..296a88c3adbd 100644
--- a/sbin/vinum/vinum.8
+++ b/sbin/vinum/vinum.8
@@ -34,7 +34,7 @@
 .\" otherwise) arising in any way out of the use of this software, even if
 .\" advised of the possibility of such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/vinum/vinum.8,v 1.5.2.11 1999/09/22 01:32:20 grog Exp $
 .\"
 .Dd 28 March 1999
 .Dt vinum 8
diff --git a/secure/Makefile b/secure/Makefile
deleted file mode 100644
index 344ac6937f5a..000000000000
--- a/secure/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $FreeBSD$
-
-# lib must be first, or it will not work.  This is because we reference
-# the lib's in the directory where they are built from the binaries we
-# want to build.
-
-MAINTAINER=	markm
-
-SUBDIR= lib usr.bin
-
-SDIR= ${.CURDIR}/..
-
-CODAI=	${MAKE} ${MFLAGS} cleandir; \
-	${MAKE} ${MFLAGS} obj; \
-	${MAKE} ${MFLAGS} depend all install
-
-CODAD=	${MAKE} ${MFLAGS} cleandir; \
-	${MAKE} ${MFLAGS} obj; \
-	${MAKE} ${MFLAGS} depend all distribute
-
-# These are the programs which depend on secure libs
-sprog:
-	cd ${SDIR}/bin/ed; ${CODAI}
-	cd ${SDIR}/sbin/init; ${CODAI}
-
-bootstrap:
-	( cd include; ${MAKE} ${MFLAGS} install )
-	( cd lib; ${MAKE} ${MFLAGS} depend all install )
-	${MAKE} ${MFLAGS} cleandir
-	${MAKE} ${MFLAGS} obj
-	${MAKE} ${MFLAGS} depend all install sprog
-
-help-distribute:	distribute
-	cd ${SDIR}/bin/ed; ${CODAD}
-	cd ${SDIR}/sbin/init; ${CODAD}
-
-.include <bsd.subdir.mk>
diff --git a/secure/Makefile.inc b/secure/Makefile.inc
deleted file mode 100644
index 885e72c51f26..000000000000
--- a/secure/Makefile.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-DISTRIBUTION=des
-
-.if exists(${.CURDIR}/../../lib/libcrypt/obj)
-CRYPTOBJDIR=	${.CURDIR}/../../lib/libcrypt/obj
-.else
-CRYPTOBJDIR=	${.CURDIR}/../../lib/libcrypt
-.endif
diff --git a/secure/lib/Makefile b/secure/lib/Makefile
deleted file mode 100644
index ac9918835b2a..000000000000
--- a/secure/lib/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-SUBDIR= libcipher libdes
-
-.include <bsd.subdir.mk>
-
diff --git a/secure/lib/Makefile.inc b/secure/lib/Makefile.inc
deleted file mode 100644
index 1410b215761e..000000000000
--- a/secure/lib/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-.include "${.CURDIR}/../../Makefile.inc"
-.if exists(${.CURDIR}/../../../lib/Makefile.inc)
-.include "${.CURDIR}/../../../lib/Makefile.inc"
-.endif
diff --git a/secure/lib/libcipher/Makefile b/secure/lib/libcipher/Makefile
deleted file mode 100644
index a93667f160a2..000000000000
--- a/secure/lib/libcipher/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# $FreeBSD$
-#
-
-LIB=		cipher
-SRCS=		crypt.c
-PRECIOUSLIB=	yes
-#NOPROFILE=	yes
-
-MAN3=   cipher.3
-MLINKS= cipher.3 encrypt.3 cipher.3 setkey.3
-MLINKS+=cipher.3 des_cipher.3 cipher.3 des_setkey.3
-
-#SUBDIR=		test
-
-.include <bsd.lib.mk>
diff --git a/secure/lib/libcipher/README b/secure/lib/libcipher/README
deleted file mode 100644
index ab8af5acbb29..000000000000
--- a/secure/lib/libcipher/README
+++ /dev/null
@@ -1,98 +0,0 @@
-
-	FreeSec - NetBSD libcrypt replacement
-
-	  David Burren <davidb@werj.com.au>
-	  Release 1.0, March 1994
-
-    Document ref: $FreeBSD$
-
-
-Description
-===========
-This library is a drop-in replacement for the libcrypt used in U.S. copies
-of NetBSD, duplicating that library's functionality.  A suite of verification
-and benchmark tools is provided.
-
-FreeSec 1.0 is an original implementation of the DES algorithm and the
-crypt(3) interfaces used in Unix-style operating systems.  It was produced
-in Australia and as such is not covered by U.S. export restrictions (at
-least for copies that remain outside the U.S.).
-
-
-History
-=======
-An earlier version of the FreeSec library was built using the UFC-crypt
-package that is distributed as part of the GNU library.  UFC-crypt did not
-support the des_cipher() or des_setkey() functions, nor the new-style
-crypt with long keys.  These were implemented in FreeSec 0.2, but at least
-one bug remained, where encryption would only succeed if either the salt
-or the plaintext was zero.  Because of its heritage FreeSec 0.2 was covered
-by the GNU Library Licence.
-
-FreeSec 1.0 is an original implementation by myself, and has been tested
-against the verification suite I'd been using with FreeSec 0.2 (this is not
-encumbered by any licence).  FreeSec 1.0 is covered by a Berkeley-style
-licence, which better fits into the *BSD hierarchy than the earlier GNU
-licence.
-
-
-Why should you use FreeSec?
-===========================
-FreeSec is intended as a replacement for the U.S.-only NetBSD libcrypt,
-to act as a baseline for encryption functionality.
-
-Some other packages (such as Eric Young's libdes package) are faster and
-more complete than FreeSec, but typically have different licencing
-arrangements.  While some applications will justify the use of these
-packages, the idea here is that everyone should have access to *at least*
-the functionality of FreeSec.
-
-
-Performance of FreeSec 1.0
-==========================
-I compare below the performance of three libcrypt implementations.  As can be
-seen, it's between the U.S. library and UFC-crypt.  While the performance of
-FreeSec 1.0 is good enough to keep me happy for now, I hope to improve it in
-future versions.  I was interested to note that while UFC-crypt is faster on
-a 386, hardware characteristics can have markedly different effects on each
-implementation.
-
-
-386DX40, 128k cache	| U.S. BSD	| FreeSec 1.0	| FreeSec 0.2
-CFLAGS=-O2		|		|		|
-========================+===============+===============+==================
-crypt (alternate keys)	| 317		| 341		| 395
-	crypt/sec	|		|		|
-------------------------+---------------+---------------+------------------
-crypt (constant key)	| 317		| 368		| 436
-	crypt/sec	|		|		|
-------------------------+---------------+---------------+------------------
-des_cipher( , , , 1)	| 6037		| 7459		| 3343
-	blocks/sec	|		|		|
-------------------------+---------------+---------------+------------------
-des_cipher( , , , 25)	| 8871		| 9627		| 15926
-	blocks/sec	|		|		|
-
-Notes:	The results tabled here are the average over 10 runs.
-	The entry/exit code for FreeSec 0.2's des_cipher() is particularly
-	inefficient, thus the anomalous result for single encryptions.
-
-
-As an experiment using a machine with a larger register set and an
-obscenely fast CPU, I obtained the following results:
-
-	60 MHz R4400		| FreeSec 1.0	| FreeSec 0.2
-	========================+=================================
-	crypt (alternate keys)	| 2545		| 2702
-		crypt/sec	|		|
-	------------------------+---------------------------------
-	crypt (constant key)	| 2852		| 2981
-		crypt/sec	|		|
-	------------------------+---------------------------------
-	des_cipher( , , , 1)	| 56443		| 21409
-		blocks/sec	|		|
-	------------------------+---------------------------------
-	des_cipher( , , , 25)	| 82531		| 18276
-		blocks/sec	|		|
-
-Obviously your mileage will vary with your hardware and your compiler...
diff --git a/secure/lib/libcipher/README.FreeBSD b/secure/lib/libcipher/README.FreeBSD
deleted file mode 100644
index 2379f73015a1..000000000000
--- a/secure/lib/libcipher/README.FreeBSD
+++ /dev/null
@@ -1,6 +0,0 @@
-$FreeBSD$
-
-This is FreeSec package for NetBSD,  unchanged for
-FreeBSD, except for the Makefile.
-
-The other stuff in libcrypt will be added in stages!
diff --git a/secure/lib/libcipher/cipher.3 b/secure/lib/libcipher/cipher.3
deleted file mode 100644
index a534fd77ce77..000000000000
--- a/secure/lib/libcipher/cipher.3
+++ /dev/null
@@ -1,150 +0,0 @@
-.\" FreeSec: libcrypt for NetBSD
-.\"
-.\" Copyright (c) 1994 David Burren
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 4. Neither the name of the author nor the names of other contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD$
-.\"
-.\" Manual page, using -mandoc macros
-.\"
-.Dd March 9, 1994
-.Dt CIPHER 3
-.Os "FreeSec 1.0"
-.Sh NAME
-.Nm setkey ,
-.Nm encrypt ,
-.Nm des_setkey ,
-.Nm des_cipher ,
-.Nd DES encryption
-.Sh SYNOPSIS
-.Ft int
-.Fn setkey "char *key"
-.Ft int
-.Fn encrypt "char *block" "int flag"
-.Ft int
-.Fn des_setkey "const char *key"
-.Ft int
-.Fn des_cipher "const char *in" "char *out" "long salt" "int count"
-.Sh DESCRIPTION
-The functions,
-.Fn encrypt ,
-.Fn setkey ,
-.Fn des_setkey
-and
-.Fn des_cipher
-provide access to the
-.Tn DES
-algorithm.
-.Fn setkey
-is passed a 64-byte array of binary values (numeric 0 or 1).
-A 56-bit key is extracted from this array by dividing the
-array into groups of 8, and ignoring the last bit in each group.
-That bit is reserved for a byte parity check by DES, but is ignored
-by these functions.
-.Pp
-The
-.Fa block
-argument to
-.Fn encrypt
-is also a 64-byte array of binary values.
-If the value of
-.Fa flag
-is 0,
-.Fa block
-is encrypted otherwise it is decrypted.
-The result is returned in the original array
-.Fa block
-after using the key specified by
-.Fn setkey
-to process it.
-.Pp
-The argument to
-.Fn des_setkey
-is a character array of length 8.
-The least significant bit (the parity bit) in each character is ignored,
-and the remaining bits are concatenated to form a 56-bit key.
-The function
-.Fn des_cipher
-encrypts (or decrypts if
-.Fa count
-is negative) the 64-bits stored in the 8 characters at
-.Fa in
-using
-.Xr abs 3
-of
-.Fa count
-iterations of
-.Tn DES
-and stores the 64-bit result in the 8 characters at
-.Fa out
-(which may be the same as
-.Fa in
-).
-The
-.Fa salt
-introduces disorder in the
-.Tn DES
-algorithm in one of 16777216 or 4096 possible ways
-(ie. with 24 or 12 bits: if bit
-.Em i
-of the
-.Ar salt
-is set, then bits
-.Em i
-and
-.Em i+24
-are swapped in the
-.Tn DES
-E-box output).
-.Pp
-The functions
-.Fn setkey ,
-.Fn encrypt ,
-.Fn des_setkey ,
-and
-.Fn des_cipher
-return 0 on success and 1 on failure.
-.Pp
-The
-.Fn setkey
-and
-.Fn des_setkey
-functions manipulate the same key space.
-.Sh SEE ALSO
-.Xr login 1 ,
-.Xr passwd 1 ,
-.Xr crypt 3 ,
-.Xr getpass 3 ,
-.Xr passwd 5
-.Sh HISTORY
-This library (FreeSec 1.0) was developed outside the United States of America
-as an unencumbered replacement for the U.S.-only NetBSD libcrypt encryption
-library.
-Users should be aware that this code (and programs staticly linked with it)
-may not be exported from the U.S., although it apparently can be imported.
-.Sh AUTHORS
-.An David Burren Aq davidb@werj.com.au
diff --git a/secure/lib/libcipher/crypt.c b/secure/lib/libcipher/crypt.c
deleted file mode 100644
index 4798371b251a..000000000000
--- a/secure/lib/libcipher/crypt.c
+++ /dev/null
@@ -1,623 +0,0 @@
-/*
- * FreeSec: libcrypt for NetBSD
- *
- * Copyright (c) 1994 David Burren
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the author nor the names of other contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- *
- * This is an original implementation of the DES and the crypt(3) interfaces
- * by David Burren <davidb@werj.com.au>.
- *
- * An excellent reference on the underlying algorithm (and related
- * algorithms) is:
- *
- *	B. Schneier, Applied Cryptography: protocols, algorithms,
- *	and source code in C, John Wiley & Sons, 1994.
- *
- * Note that in that book's description of DES the lookups for the initial,
- * pbox, and final permutations are inverted (this has been brought to the
- * attention of the author).  A list of errata for this book has been
- * posted to the sci.crypt newsgroup by the author and is available for FTP.
- *
- * ARCHITECTURE ASSUMPTIONS:
- *	This code assumes that u_longs are 32 bits.  It will probably not
- *	operate on 64-bit machines without modifications.
- *	It is assumed that the 8-byte arrays passed by reference can be
- *	addressed as arrays of u_longs (ie. the CPU is not picky about
- *	alignment).
- */
-#include <sys/types.h>
-#include <sys/param.h>
-#include <pwd.h>
-
-#ifdef DEBUG
-# include <stdio.h>
-#endif
-
-
-static u_char	IP[64] = {
-	58, 50, 42, 34, 26, 18, 10,  2, 60, 52, 44, 36, 28, 20, 12,  4,
-	62, 54, 46, 38, 30, 22, 14,  6, 64, 56, 48, 40, 32, 24, 16,  8,
-	57, 49, 41, 33, 25, 17,  9,  1, 59, 51, 43, 35, 27, 19, 11,  3,
-	61, 53, 45, 37, 29, 21, 13,  5, 63, 55, 47, 39, 31, 23, 15,  7
-};
-
-static u_char	inv_key_perm[64];
-static u_char	u_key_perm[56];
-static u_char	key_perm[56] = {
-	57, 49, 41, 33, 25, 17,  9,  1, 58, 50, 42, 34, 26, 18,
-	10,  2, 59, 51, 43, 35, 27, 19, 11,  3, 60, 52, 44, 36,
-	63, 55, 47, 39, 31, 23, 15,  7, 62, 54, 46, 38, 30, 22,
-	14,  6, 61, 53, 45, 37, 29, 21, 13,  5, 28, 20, 12,  4
-};
-
-static u_char	key_shifts[16] = {
-	1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1
-};
-
-static u_char	inv_comp_perm[56];
-static u_char	comp_perm[48] = {
-	14, 17, 11, 24,  1,  5,  3, 28, 15,  6, 21, 10,
-	23, 19, 12,  4, 26,  8, 16,  7, 27, 20, 13,  2,
-	41, 52, 31, 37, 47, 55, 30, 40, 51, 45, 33, 48,
-	44, 49, 39, 56, 34, 53, 46, 42, 50, 36, 29, 32
-};
-
-/*
- *	No E box is used, as it's replaced by some ANDs, shifts, and ORs.
- */
-
-static u_char	u_sbox[8][64];
-static u_char	sbox[8][64] = {
-	{
-		14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7,
-		 0, 15,  7,  4, 14,  2, 13,  1, 10,  6, 12, 11,  9,  5,  3,  8,
-		 4,  1, 14,  8, 13,  6,  2, 11, 15, 12,  9,  7,  3, 10,  5,  0,
-		15, 12,  8,  2,  4,  9,  1,  7,  5, 11,  3, 14, 10,  0,  6, 13
-	},
-	{
-		15,  1,  8, 14,  6, 11,  3,  4,  9,  7,  2, 13, 12,  0,  5, 10,
-		 3, 13,  4,  7, 15,  2,  8, 14, 12,  0,  1, 10,  6,  9, 11,  5,
-		 0, 14,  7, 11, 10,  4, 13,  1,  5,  8, 12,  6,  9,  3,  2, 15,
-		13,  8, 10,  1,  3, 15,  4,  2, 11,  6,  7, 12,  0,  5, 14,  9
-	},
-	{
-		10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8,
-		13,  7,  0,  9,  3,  4,  6, 10,  2,  8,  5, 14, 12, 11, 15,  1,
-		13,  6,  4,  9,  8, 15,  3,  0, 11,  1,  2, 12,  5, 10, 14,  7,
-		 1, 10, 13,  0,  6,  9,  8,  7,  4, 15, 14,  3, 11,  5,  2, 12
-	},
-	{
-		 7, 13, 14,  3,  0,  6,  9, 10,  1,  2,  8,  5, 11, 12,  4, 15,
-		13,  8, 11,  5,  6, 15,  0,  3,  4,  7,  2, 12,  1, 10, 14,  9,
-		10,  6,  9,  0, 12, 11,  7, 13, 15,  1,  3, 14,  5,  2,  8,  4,
-		 3, 15,  0,  6, 10,  1, 13,  8,  9,  4,  5, 11, 12,  7,  2, 14
-	},
-	{
-		 2, 12,  4,  1,  7, 10, 11,  6,  8,  5,  3, 15, 13,  0, 14,  9,
-		14, 11,  2, 12,  4,  7, 13,  1,  5,  0, 15, 10,  3,  9,  8,  6,
-		 4,  2,  1, 11, 10, 13,  7,  8, 15,  9, 12,  5,  6,  3,  0, 14,
-		11,  8, 12,  7,  1, 14,  2, 13,  6, 15,  0,  9, 10,  4,  5,  3
-	},
-	{
-		12,  1, 10, 15,  9,  2,  6,  8,  0, 13,  3,  4, 14,  7,  5, 11,
-		10, 15,  4,  2,  7, 12,  9,  5,  6,  1, 13, 14,  0, 11,  3,  8,
-		 9, 14, 15,  5,  2,  8, 12,  3,  7,  0,  4, 10,  1, 13, 11,  6,
-		 4,  3,  2, 12,  9,  5, 15, 10, 11, 14,  1,  7,  6,  0,  8, 13
-	},
-	{
-		 4, 11,  2, 14, 15,  0,  8, 13,  3, 12,  9,  7,  5, 10,  6,  1,
-		13,  0, 11,  7,  4,  9,  1, 10, 14,  3,  5, 12,  2, 15,  8,  6,
-		 1,  4, 11, 13, 12,  3,  7, 14, 10, 15,  6,  8,  0,  5,  9,  2,
-		 6, 11, 13,  8,  1,  4, 10,  7,  9,  5,  0, 15, 14,  2,  3, 12
-	},
-	{
-		13,  2,  8,  4,  6, 15, 11,  1, 10,  9,  3, 14,  5,  0, 12,  7,
-		 1, 15, 13,  8, 10,  3,  7,  4, 12,  5,  6, 11,  0, 14,  9,  2,
-		 7, 11,  4,  1,  9, 12, 14,  2,  0,  6, 10, 13, 15,  3,  5,  8,
-		 2,  1, 14,  7,  4, 10,  8, 13, 15, 12,  9,  0,  3,  5,  6, 11
-	}
-};
-
-static u_char	un_pbox[32];
-static u_char	pbox[32] = {
-	16,  7, 20, 21, 29, 12, 28, 17,  1, 15, 23, 26,  5, 18, 31, 10,
-	 2,  8, 24, 14, 32, 27,  3,  9, 19, 13, 30,  6, 22, 11,  4, 25
-};
-
-static u_long	bits32[32] =
-{
-	0x80000000, 0x40000000, 0x20000000, 0x10000000,
-	0x08000000, 0x04000000, 0x02000000, 0x01000000,
-	0x00800000, 0x00400000, 0x00200000, 0x00100000,
-	0x00080000, 0x00040000, 0x00020000, 0x00010000,
-	0x00008000, 0x00004000, 0x00002000, 0x00001000,
-	0x00000800, 0x00000400, 0x00000200, 0x00000100,
-	0x00000080, 0x00000040, 0x00000020, 0x00000010,
-	0x00000008, 0x00000004, 0x00000002, 0x00000001
-};
-
-static u_char	bits8[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 };
-
-static u_long	saltbits;
-static long	old_salt;
-static u_long	*bits28, *bits24;
-static u_char	init_perm[64], final_perm[64];
-static u_long	en_keysl[16], en_keysr[16];
-static u_long	de_keysl[16], de_keysr[16];
-static int	des_initialised = 0;
-static u_char	m_sbox[4][4096];
-static u_long	psbox[4][256];
-static u_long	ip_maskl[8][256], ip_maskr[8][256];
-static u_long	fp_maskl[8][256], fp_maskr[8][256];
-static u_long	key_perm_maskl[8][128], key_perm_maskr[8][128];
-static u_long	comp_maskl[8][128], comp_maskr[8][128];
-static u_long	old_rawkey0, old_rawkey1;
-
-static u_char	ascii64[] =
-	 "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-/*	  0000000000111111111122222222223333333333444444444455555555556666 */
-/*	  0123456789012345678901234567890123456789012345678901234567890123 */
-
-static inline int
-ascii_to_bin(char ch)
-{
-	if (ch > 'z')
-		return(0);
-	if (ch >= 'a')
-		return(ch - 'a' + 38);
-	if (ch > 'Z')
-		return(0);
-	if (ch >= 'A')
-		return(ch - 'A' + 12);
-	if (ch > '9')
-		return(0);
-	if (ch >= '.')
-		return(ch - '.');
-	return(0);
-}
-
-
-static void
-des_init()
-{
-	int	i, j, b, k, inbit, obit;
-	u_long	*p, *il, *ir, *fl, *fr;
-
-	old_rawkey0 = old_rawkey1 = 0L;
-	saltbits = 0L;
-	old_salt = 0L;
-	bits24 = (bits28 = bits32 + 4) + 4;
-
-	/*
-	 * Invert the S-boxes, reordering the input bits.
-	 */
-	for (i = 0; i < 8; i++)
-		for (j = 0; j < 64; j++) {
-			b = (j & 0x20) | ((j & 1) << 4) | ((j >> 1) & 0xf);
-			u_sbox[i][j] = sbox[i][b];
-		}
-
-	/*
-	 * Convert the inverted S-boxes into 4 arrays of 8 bits.
-	 * Each will handle 12 bits of the S-box input.
-	 */
-	for (b = 0; b < 4; b++)
-		for (i = 0; i < 64; i++)
-			for (j = 0; j < 64; j++)
-				m_sbox[b][(i << 6) | j] =
-					(u_sbox[(b << 1)][i] << 4) |
-					u_sbox[(b << 1) + 1][j];
-
-	/*
-	 * Set up the initial & final permutations into a useful form, and
-	 * initialise the inverted key permutation.
-	 */
-	for (i = 0; i < 64; i++) {
-		init_perm[final_perm[i] = IP[i] - 1] = i;
-		inv_key_perm[i] = 255;
-	}
-
-	/*
-	 * Invert the key permutation and initialise the inverted key
-	 * compression permutation.
-	 */
-	for (i = 0; i < 56; i++) {
-		u_key_perm[i] = key_perm[i] - 1;
-		inv_key_perm[key_perm[i] - 1] = i;
-		inv_comp_perm[i] = 255;
-	}
-
-	/*
-	 * Invert the key compression permutation.
-	 */
-	for (i = 0; i < 48; i++) {
-		inv_comp_perm[comp_perm[i] - 1] = i;
-	}
-
-	/*
-	 * Set up the OR-mask arrays for the initial and final permutations,
-	 * and for the key initial and compression permutations.
-	 */
-	for (k = 0; k < 8; k++) {
-		for (i = 0; i < 256; i++) {
-			*(il = &ip_maskl[k][i]) = 0L;
-			*(ir = &ip_maskr[k][i]) = 0L;
-			*(fl = &fp_maskl[k][i]) = 0L;
-			*(fr = &fp_maskr[k][i]) = 0L;
-			for (j = 0; j < 8; j++) {
-				inbit = 8 * k + j;
-				if (i & bits8[j]) {
-					if ((obit = init_perm[inbit]) < 32)
-						*il |= bits32[obit];
-					else
-						*ir |= bits32[obit-32];
-					if ((obit = final_perm[inbit]) < 32)
-						*fl |= bits32[obit];
-					else
-						*fr |= bits32[obit - 32];
-				}
-			}
-		}
-		for (i = 0; i < 128; i++) {
-			*(il = &key_perm_maskl[k][i]) = 0L;
-			*(ir = &key_perm_maskr[k][i]) = 0L;
-			for (j = 0; j < 7; j++) {
-				inbit = 8 * k + j;
-				if (i & bits8[j + 1]) {
-					if ((obit = inv_key_perm[inbit]) == 255)
-						continue;
-					if (obit < 28)
-						*il |= bits28[obit];
-					else
-						*ir |= bits28[obit - 28];
-				}
-			}
-			*(il = &comp_maskl[k][i]) = 0L;
-			*(ir = &comp_maskr[k][i]) = 0L;
-			for (j = 0; j < 7; j++) {
-				inbit = 7 * k + j;
-				if (i & bits8[j + 1]) {
-					if ((obit=inv_comp_perm[inbit]) == 255)
-						continue;
-					if (obit < 24)
-						*il |= bits24[obit];
-					else
-						*ir |= bits24[obit - 24];
-				}
-			}
-		}
-	}
-
-	/*
-	 * Invert the P-box permutation, and convert into OR-masks for
-	 * handling the output of the S-box arrays setup above.
-	 */
-	for (i = 0; i < 32; i++)
-		un_pbox[pbox[i] - 1] = i;
-
-	for (b = 0; b < 4; b++)
-		for (i = 0; i < 256; i++) {
-			*(p = &psbox[b][i]) = 0L;
-			for (j = 0; j < 8; j++) {
-				if (i & bits8[j])
-					*p |= bits32[un_pbox[8 * b + j]];
-			}
-		}
-
-	des_initialised = 1;
-}
-
-
-static void
-setup_salt(long salt)
-{
-	u_long	obit, saltbit;
-	int	i;
-
-	if (salt == old_salt)
-		return;
-	old_salt = salt;
-
-	saltbits = 0L;
-	saltbit = 1;
-	obit = 0x800000;
-	for (i = 0; i < 24; i++) {
-		if (salt & saltbit)
-			saltbits |= obit;
-		saltbit <<= 1;
-		obit >>= 1;
-	}
-}
-
-
-int
-des_setkey(const char *key)
-{
-	u_long	k0, k1, rawkey0, rawkey1;
-	int	shifts, i, b, round;
-
-	if (!des_initialised)
-		des_init();
-
-	rawkey0 = ntohl(*(u_long *) key);
-	rawkey1 = ntohl(*(u_long *) (key + 4));
-
-	if ((rawkey0 | rawkey1)
-	    && rawkey0 == old_rawkey0
-	    && rawkey1 == old_rawkey1) {
-		/*
-		 * Already setup for this key.
-		 * This optimisation fails on a zero key (which is weak and
-		 * has bad parity anyway) in order to simplify the starting
-		 * conditions.
-		 */
-		return(0);
-	}
-	old_rawkey0 = rawkey0;
-	old_rawkey1 = rawkey1;
-
-	/*
-	 *	Do key permutation and split into two 28-bit subkeys.
-	 */
-	k0 = key_perm_maskl[0][rawkey0 >> 25]
-	   | key_perm_maskl[1][(rawkey0 >> 17) & 0x7f]
-	   | key_perm_maskl[2][(rawkey0 >> 9) & 0x7f]
-	   | key_perm_maskl[3][(rawkey0 >> 1) & 0x7f]
-	   | key_perm_maskl[4][rawkey1 >> 25]
-	   | key_perm_maskl[5][(rawkey1 >> 17) & 0x7f]
-	   | key_perm_maskl[6][(rawkey1 >> 9) & 0x7f]
-	   | key_perm_maskl[7][(rawkey1 >> 1) & 0x7f];
-	k1 = key_perm_maskr[0][rawkey0 >> 25]
-	   | key_perm_maskr[1][(rawkey0 >> 17) & 0x7f]
-	   | key_perm_maskr[2][(rawkey0 >> 9) & 0x7f]
-	   | key_perm_maskr[3][(rawkey0 >> 1) & 0x7f]
-	   | key_perm_maskr[4][rawkey1 >> 25]
-	   | key_perm_maskr[5][(rawkey1 >> 17) & 0x7f]
-	   | key_perm_maskr[6][(rawkey1 >> 9) & 0x7f]
-	   | key_perm_maskr[7][(rawkey1 >> 1) & 0x7f];
-	/*
-	 *	Rotate subkeys and do compression permutation.
-	 */
-	shifts = 0;
-	for (round = 0; round < 16; round++) {
-		u_long	t0, t1;
-		int	bit;
-
-		shifts += key_shifts[round];
-
-		t0 = (k0 << shifts) | (k0 >> (28 - shifts));
-		t1 = (k1 << shifts) | (k1 >> (28 - shifts));
-
-		de_keysl[15 - round] =
-		en_keysl[round] = comp_maskl[0][(t0 >> 21) & 0x7f]
-				| comp_maskl[1][(t0 >> 14) & 0x7f]
-				| comp_maskl[2][(t0 >> 7) & 0x7f]
-				| comp_maskl[3][t0 & 0x7f]
-				| comp_maskl[4][(t1 >> 21) & 0x7f]
-				| comp_maskl[5][(t1 >> 14) & 0x7f]
-				| comp_maskl[6][(t1 >> 7) & 0x7f]
-				| comp_maskl[7][t1 & 0x7f];
-
-		de_keysr[15 - round] =
-		en_keysr[round] = comp_maskr[0][(t0 >> 21) & 0x7f]
-				| comp_maskr[1][(t0 >> 14) & 0x7f]
-				| comp_maskr[2][(t0 >> 7) & 0x7f]
-				| comp_maskr[3][t0 & 0x7f]
-				| comp_maskr[4][(t1 >> 21) & 0x7f]
-				| comp_maskr[5][(t1 >> 14) & 0x7f]
-				| comp_maskr[6][(t1 >> 7) & 0x7f]
-				| comp_maskr[7][t1 & 0x7f];
-	}
-	return(0);
-}
-
-
-static int
-do_des(	u_long l_in, u_long r_in, u_long *l_out, u_long *r_out, int count)
-{
-	/*
-	 *	l_in, r_in, l_out, and r_out are in pseudo-"big-endian" format.
-	 */
-	u_long	mask, rawl, rawr, l, r, *kl, *kr, *kl1, *kr1;
-	u_long	f, r48l, r48r;
-	int	i, j, b, round;
-
-	if (count == 0) {
-		return(1);
-	} else if (count > 0) {
-		/*
-		 * Encrypting
-		 */
-		kl1 = en_keysl;
-		kr1 = en_keysr;
-	} else {
-		/*
-		 * Decrypting
-		 */
-		count = -count;
-		kl1 = de_keysl;
-		kr1 = de_keysr;
-	}
-
-	/*
-	 *	Do initial permutation (IP).
-	 */
-	l = ip_maskl[0][l_in >> 24]
-	  | ip_maskl[1][(l_in >> 16) & 0xff]
-	  | ip_maskl[2][(l_in >> 8) & 0xff]
-	  | ip_maskl[3][l_in & 0xff]
-	  | ip_maskl[4][r_in >> 24]
-	  | ip_maskl[5][(r_in >> 16) & 0xff]
-	  | ip_maskl[6][(r_in >> 8) & 0xff]
-	  | ip_maskl[7][r_in & 0xff];
-	r = ip_maskr[0][l_in >> 24]
-	  | ip_maskr[1][(l_in >> 16) & 0xff]
-	  | ip_maskr[2][(l_in >> 8) & 0xff]
-	  | ip_maskr[3][l_in & 0xff]
-	  | ip_maskr[4][r_in >> 24]
-	  | ip_maskr[5][(r_in >> 16) & 0xff]
-	  | ip_maskr[6][(r_in >> 8) & 0xff]
-	  | ip_maskr[7][r_in & 0xff];
-
-	while (count--) {
-		/*
-		 * Do each round.
-		 */
-		kl = kl1;
-		kr = kr1;
-		round = 16;
-		while (round--) {
-			/*
-			 * Expand R to 48 bits (simulate the E-box).
-			 */
-			r48l	= ((r & 0x00000001) << 23)
-				| ((r & 0xf8000000) >> 9)
-				| ((r & 0x1f800000) >> 11)
-				| ((r & 0x01f80000) >> 13)
-				| ((r & 0x001f8000) >> 15);
-
-			r48r	= ((r & 0x0001f800) << 7)
-				| ((r & 0x00001f80) << 5)
-				| ((r & 0x000001f8) << 3)
-				| ((r & 0x0000001f) << 1)
-				| ((r & 0x80000000) >> 31);
-			/*
-			 * Do salting for crypt() and friends, and
-			 * XOR with the permuted key.
-			 */
-			f = (r48l ^ r48r) & saltbits;
-			r48l ^= f ^ *kl++;
-			r48r ^= f ^ *kr++;
-			/*
-			 * Do sbox lookups (which shrink it back to 32 bits)
-			 * and do the pbox permutation at the same time.
-			 */
-			f = psbox[0][m_sbox[0][r48l >> 12]]
-			  | psbox[1][m_sbox[1][r48l & 0xfff]]
-			  | psbox[2][m_sbox[2][r48r >> 12]]
-			  | psbox[3][m_sbox[3][r48r & 0xfff]];
-			/*
-			 * Now that we've permuted things, complete f().
-			 */
-			f ^= l;
-			l = r;
-			r = f;
-		}
-		r = l;
-		l = f;
-	}
-	/*
-	 * Do final permutation (inverse of IP).
-	 */
-	*l_out	= fp_maskl[0][l >> 24]
-		| fp_maskl[1][(l >> 16) & 0xff]
-		| fp_maskl[2][(l >> 8) & 0xff]
-		| fp_maskl[3][l & 0xff]
-		| fp_maskl[4][r >> 24]
-		| fp_maskl[5][(r >> 16) & 0xff]
-		| fp_maskl[6][(r >> 8) & 0xff]
-		| fp_maskl[7][r & 0xff];
-	*r_out	= fp_maskr[0][l >> 24]
-		| fp_maskr[1][(l >> 16) & 0xff]
-		| fp_maskr[2][(l >> 8) & 0xff]
-		| fp_maskr[3][l & 0xff]
-		| fp_maskr[4][r >> 24]
-		| fp_maskr[5][(r >> 16) & 0xff]
-		| fp_maskr[6][(r >> 8) & 0xff]
-		| fp_maskr[7][r & 0xff];
-	return(0);
-}
-
-
-int
-des_cipher(const char *in, char *out, long salt, int count)
-{
-	u_long	l_out, r_out, rawl, rawr;
-	int	retval;
-
-	if (!des_initialised)
-		des_init();
-
-	setup_salt(salt);
-
-	rawl = ntohl(*((u_long *) in)++);
-	rawr = ntohl(*((u_long *) in));
-
-	retval = do_des(rawl, rawr, &l_out, &r_out, count);
-
-	*((u_long *) out)++ = htonl(l_out);
-	*((u_long *) out) = htonl(r_out);
-	return(retval);
-}
-
-
-int
-setkey(char *key)
-{
-	int	i, j;
-	u_long	packed_keys[2];
-	u_char	*p;
-
-	p = (u_char *) packed_keys;
-
-	for (i = 0; i < 8; i++) {
-		p[i] = 0;
-		for (j = 0; j < 8; j++)
-			if (*key++ & 1)
-				p[i] |= bits8[j];
-	}
-	return(des_setkey(p));
-}
-
-
-int
-encrypt(char *block, int flag)
-{
-	u_long	io[2];
-	u_char	*p;
-	int	i, j, retval;
-
-	if (!des_initialised)
-		des_init();
-
-	setup_salt(0L);
-	p = block;
-	for (i = 0; i < 2; i++) {
-		io[i] = 0L;
-		for (j = 0; j < 32; j++)
-			if (*p++ & 1)
-				io[i] |= bits32[j];
-	}
-	retval = do_des(io[0], io[1], io, io + 1, flag ? -1 : 1);
-	for (i = 0; i < 2; i++)
-		for (j = 0; j < 32; j++)
-			block[(i << 5) | j] = (io[i] & bits32[j]) ? 1 : 0;
-	return(retval);
-}
-
diff --git a/secure/lib/libcipher/test/Makefile b/secure/lib/libcipher/test/Makefile
deleted file mode 100644
index 50ae57100caf..000000000000
--- a/secure/lib/libcipher/test/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-#	Hacked Makefile to compile and run the DES-certification program,
-#	but not install anything.
-#
-# $FreeBSD$
-#
-LIBCRYPT!=cd $(.CURDIR)/..; \
-	printf "xxx:\n\techo \$${.OBJDIR}/libcipher.a\n" | make -r -s -f - xxx
-
-#CFLAGS+= -DHAVE_CRYPT16
-LIBCRYPT+= -lcrypt
-
-TARGETS=cert speedcrypt speeddes
-
-all: ${TARGETS}
-
-test: all testcrypt testencrypt testdes testspeed
-
-testcrypt: cert
-	@./cert -c
-
-testencrypt: cert
-	@./cert -e < ${.CURDIR}/cert.input
-
-testdes: cert
-	@./cert -d < ${.CURDIR}/cert.input
-
-testspeed: cryptspeed desspeed
-
-cryptspeed: speedcrypt
-	@./speedcrypt 30 1
-	@./speedcrypt 30 1
-	@./speedcrypt 30 0
-	@./speedcrypt 30 0
-
-desspeed: speeddes
-	@./speeddes 30 1
-	@./speeddes 30 1
-	@./speeddes 40 25
-	@./speeddes 40 25
-
-cert: cert.c ${LIBCRYPT}
-	$(CC) $(CFLAGS) -o cert ${.CURDIR}/cert.c ${LIBCRYPT}
-
-speedcrypt: speedcrypt.c ${LIBCRYPT}
-	$(CC) $(CFLAGS) -o speedcrypt ${.CURDIR}/speedcrypt.c ${LIBCRYPT}
-
-speeddes: speeddes.c ${LIBCRYPT}
-	$(CC) $(CFLAGS) -o speeddes ${.CURDIR}/speeddes.c ${LIBCRYPT}
-
-clean:
-	rm -f ${TARGETS}
-
-install:
-
-.include <bsd.prog.mk>
diff --git a/secure/lib/libcipher/test/README b/secure/lib/libcipher/test/README
deleted file mode 100644
index eb6b0bebbc1d..000000000000
--- a/secure/lib/libcipher/test/README
+++ /dev/null
@@ -1,10 +0,0 @@
-This directory contains test programs to certify DES operation and to
-time the crypt() call (of curiosity value).
-
-Simply type `make test` to run the tests.
-
-The normal `make all` and `make install` that get done during library building
-and installation will build these programs BUT NOT INSTALL THEM.  After all,
-they're only for testing...
-
-- David Burren, January 1994
diff --git a/secure/lib/libcipher/test/cert.c b/secure/lib/libcipher/test/cert.c
deleted file mode 100644
index e9907b9a9232..000000000000
--- a/secure/lib/libcipher/test/cert.c
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- * This DES validation program shipped with FreeSec is derived from that
- * shipped with UFC-crypt which is apparently derived from one distributed
- * with Phil Karns PD DES package.
- *
- * $FreeBSD$
- */
-
-#include <stdio.h>
-
-int totfails = 0;
-
-char *crypt();
-#ifdef HAVE_CRYPT16
-char *crypt16();
-#endif /* HAVE_CRYPT16 */
-
-
-static struct crypt_test {
-	char	*key, *setting, *answer;
-} crypt_tests[] = {
-	"foob",			"ar",		"arlEKn0OzVJn.",
-	"holyhooplasbatman!",	"_X.......",	"_X.......N89y2Z.e4WU",
-	"holyhooplasbatman!",	"_X...X...",	"_X...X...rSUDQ5Na/QM",
-	"holyhooplasbatman!",	"_XX..X...",	"_XX..X...P8vb9xU4JAk",
-	"holyhooplasbatman!",	"_XX..XX..",	"_XX..XX..JDs5IlGLqT2",
-	"holyhooplasbatman!",	"_XX..XXa.",	"_XX..XXa.bFVsOnCNh8Y",
-	"holyhooplasbatman!",	"_XXa.X...",	"_XXa.X...Ghsb3QKNaps",
-#ifdef TAKES_TOO_LONG_ON_SOME_CRYPTS
-	"holyhooplasbatman!",	"_arararar",	"_ararararNGMzvpNjeCc",
-#endif
-	NULL, NULL, NULL,
-};
-
-
-static struct crypt_test crypt16_tests[] = {
-	"foob",			"ar",		"arxo23jZDD5AYbHbqoy9Dalg",
-	"holyhooplasbatman!",	"ar",		"arU5FRLJ3kxIoedlmyrOelEw",
-	NULL, NULL, NULL
-};
-
-
-void good_bye()
-{
-  if(totfails == 0) {
-    printf(" Passed validation\n");
-    exit(0);
-  } else {
-    printf(" %d failures during validation!!!\n", totfails);
-    exit(1);
-  }
-}
-
-
-void put8(cp)
-char *cp;
-{
-	int i,j,t;
-
-	for(i = 0; i < 8; i++){
-		t = 0;
-		for(j = 0; j < 8; j++)
-			t = t << 1 | *cp++;
-		printf("%02x", t);
-	}
-}
-
-
-void print_bits(bits)
-unsigned char *bits;
-{
-	int	i;
-
-	for (i = 0; i < 8; i++) {
-		printf("%02x", bits[i]);
-	}
-}
-
-
-int parse_line(buff, salt, key, plain, answer)
-char *buff;
-long *salt;
-char *key, *plain, *answer;
-{
-	char *ptr1, *ptr2;
-	int val;
-	int i,j,t;
-
-	/*
-	 * Extract salt
-	 */
-	if (sscanf(buff, "%lu", salt) != 1)
-		return(-1);
-	for (ptr2 = buff; *ptr2 && !isspace(*ptr2); ptr2++)
-		;
-
-	/*
-	 * Extract key
-	 */
-	for (ptr1 = ptr2; *ptr1 && isspace(*ptr1); ptr1++)
-		;
-	for (ptr2 = ptr1; *ptr2 && !isspace(*ptr2); ptr2++)
-		;
-	if (ptr2 - ptr1 != 16)
-		return(-1);
-	for (i = 0; i < 8; i++){
-		if (sscanf(ptr1 + 2*i, "%2x", &t) != 1)
-			return(-2);
-		for (j = 0; j < 8; j++)
-			*key++ = (t & 1 << (7 - j)) != 0;
-	}
-
-	/*
-	 * Extract plain
-	 */
-	for (ptr1 = ptr2; *ptr1 && isspace(*ptr1); ptr1++)
-		;
-	for (ptr2 = ptr1; *ptr2 && !isspace(*ptr2); ptr2++)
-		;
-	if (ptr2 - ptr1 != 16)
-		return(-1);
-	for (i = 0; i < 8; i++){
-		if (sscanf(ptr1 + 2*i, "%2x", &t) != 1)
-			return(-2);
-		for (j = 0; j < 8; j++)
-			*plain++ = (t & 1 << (7 - j)) != 0;
-	}
-
-	/*
-	 * Extract answer
-	 */
-	for (ptr1 = ptr2; *ptr1 && isspace(*ptr1); ptr1++)
-		;
-	for (ptr2 = ptr1; *ptr2 && !isspace(*ptr2); ptr2++)
-		;
-	if (ptr2 - ptr1 != 16)
-		return(-1);
-	for (i = 0; i < 8; i++){
-		if (sscanf(ptr1 + 2*i, "%2x", &t) != 1)
-			return(-2);
-		for (j = 0; j < 8; j++)
-			*answer++ = (t & 1 << (7 - j)) != 0;
-	}
-	return(0);
-}
-
-/*
- * Test the setkey and encrypt functions
- */
-void test_encrypt()
-{
-	char key[64],plain[64],cipher[64],answer[64];
-	char buff[BUFSIZ];
-	unsigned long salt;
-	int i;
-	int test;
-	int fail;
-
-	printf("Testing setkey/encrypt\n");
-
-	for(test=0;fgets(buff, BUFSIZ, stdin);test++){
-
-		/*
-		 * Allow comments.
-		 */
-		if (*buff == '#')
-			continue;
-
-		if ((fail = parse_line(buff, &salt, key, plain, answer)) < 0){
-			printf("test %d garbled (%d)\n", test, fail);
-			continue;
-		}
-
-		if (salt)
-			continue;	/* encrypt has no salt support */
-
-		printf(" K: "); put8(key);
-		printf(" P: "); put8(plain);
-		printf(" C: "); put8(answer);
-
-		setkey(key);
-		for(i = 0; i < 64; i++)
-			cipher[i] = plain[i];
-		encrypt(cipher, 0);
-
-		for(i=0;i<64;i++)
-			if(cipher[i] != answer[i])
-				break;
-		fail = 0;
-		if(i != 64){
-			printf(" Enc FAIL ");
-			put8(cipher);
-			fail++; totfails++;
-		}
-
-		encrypt(cipher, 1);
-
-		for(i=0;i<64;i++)
-			if(cipher[i] != plain[i])
-				break;
-		if(i != 64){
-			printf(" Dec FAIL");
-			fail++; totfails++;
-		}
-
-		if(fail == 0)
-			printf(" OK");
-		printf("\n");
-	}
-}
-
-
-void bytes_to_bits(bytes, bits)
-char *bytes;
-unsigned char *bits;
-{
-	int	i, j;
-
-	for (i = 0; i < 8; i++) {
-		bits[i] = 0;
-		for (j = 0; j < 8; j++) {
-			bits[i] |= (bytes[i*8+j] & 1) << (7 - j);
-		}
-	}
-}
-
-
-/*
- * Test the des_setkey and des_cipher functions
- */
-void test_des()
-{
-	char ckey[64], cplain[64], canswer[64];
-	unsigned char key[8], plain[8], cipher[8], answer[8];
-	char buff[BUFSIZ];
-	unsigned long salt;
-	int i;
-	int test;
-	int fail;
-
-	printf("Testing des_setkey/des_cipher\n");
-
-	for(test=0;fgets(buff, BUFSIZ, stdin);test++){
-
-		/*
-		 * Allow comments.
-		 */
-		if (*buff == '#')
-			continue;
-
-		if ((fail = parse_line(buff, &salt, ckey, cplain, canswer)) <0){
-			printf("test %d garbled (%d)\n", test, fail);
-			continue;
-		}
-
-		printf(" S: %06x", salt);
-		printf(" K: "); put8(ckey);
-		printf(" P: "); put8(cplain);
-		printf(" C: "); put8(canswer);
-
-		bytes_to_bits(ckey, key);
-		bytes_to_bits(cplain, plain);
-		bytes_to_bits(canswer, answer);
-		des_setkey(key);
-		des_cipher(plain, cipher, salt, 1);
-
-		for(i = 0; i < 8; i++)
-			if(cipher[i] != answer[i])
-				break;
-		fail = 0;
-		if(i != 8){
-			printf(" Enc FAIL ");
-			print_bits(cipher);
-			fail++; totfails++;
-		}
-
-		des_cipher(cipher, cipher, salt, -1);
-
-		for(i = 0; i < 8; i++)
-			if(cipher[i] != plain[i])
-				break;
-		if(i != 8){
-			printf(" Dec FAIL");
-			fail++; totfails++;
-		}
-
-		if(fail == 0)
-			printf(" OK");
-		printf("\n");
-	}
-}
-
-
-/*
- *	Test the old-style crypt(), the new-style crypt(), and crypt16().
- */
-void test_crypt()
-{
-	char	*result;
-	struct crypt_test	*p;
-
-	printf("Testing crypt() family\n");
-
-	for (p = crypt_tests; p->key; p++) {
-		printf(" crypt(\"%s\", \"%s\"), \"%s\" expected",
-			p->key, p->setting, p->answer);
-		fflush(stdout);
-		result = crypt(p->key, p->setting);
-		if(!strcmp(result, p->answer)) {
-			printf(", OK\n");
-		} else {
-			printf("\n  failed (\"%s\")\n", result);
-			totfails++;
-		}
-	}
-
-#ifdef HAVE_CRYPT16
-	for (p = crypt16_tests; p->key; p++) {
-		printf(" crypt16(\"%s\", \"%s\"), \"%s\" expected",
-			p->key, p->setting, p->answer);
-		fflush(stdout);
-		result = crypt16(p->key, p->setting);
-		if(!strcmp(result, p->answer)) {
-			printf(", OK\n");
-		} else {
-			printf("\n  failed (\"%s\")\n", result);
-			totfails++;
-		}
-	}
-#endif /* HAVE_CRYPT16 */
-}
-
-main(argc, argv)
-int argc;
-char *argv[];
-{
-	if(argc < 1 || !strcmp(argv[1], "-e"))
-		test_encrypt();
-	else if(!strcmp(argv[1], "-d"))
-		test_des();
-	else if(!strcmp(argv[1], "-c"))
-		test_crypt();
-	good_bye();
-}
diff --git a/secure/lib/libcipher/test/cert.input b/secure/lib/libcipher/test/cert.input
deleted file mode 100644
index e7c715c7a9d8..000000000000
--- a/secure/lib/libcipher/test/cert.input
+++ /dev/null
@@ -1,179 +0,0 @@
-# $FreeBSD$
-#
-# Salt, key, plaintext, ciphertext
-#
-0 0101010101010101 95f8a5e5dd31d900 8000000000000000
-0 0101010101010101 dd7f121ca5015619 4000000000000000
-0 0101010101010101 2e8653104f3834ea 2000000000000000
-0 0101010101010101 4bd388ff6cd81d4f 1000000000000000
-0 0101010101010101 20b9e767b2fb1456 0800000000000000
-0 0101010101010101 55579380d77138ef 0400000000000000
-0 0101010101010101 6cc5defaaf04512f 0200000000000000
-0 0101010101010101 0d9f279ba5d87260 0100000000000000
-0 0101010101010101 d9031b0271bd5a0a 0080000000000000
-0 0101010101010101 424250b37c3dd951 0040000000000000
-0 0101010101010101 b8061b7ecd9a21e5 0020000000000000
-0 0101010101010101 f15d0f286b65bd28 0010000000000000
-0 0101010101010101 add0cc8d6e5deba1 0008000000000000
-0 0101010101010101 e6d5f82752ad63d1 0004000000000000
-0 0101010101010101 ecbfe3bd3f591a5e 0002000000000000
-0 0101010101010101 f356834379d165cd 0001000000000000
-0 0101010101010101 2b9f982f20037fa9 0000800000000000
-0 0101010101010101 889de068a16f0be6 0000400000000000
-0 0101010101010101 e19e275d846a1298 0000200000000000
-0 0101010101010101 329a8ed523d71aec 0000100000000000
-0 0101010101010101 e7fce22557d23c97 0000080000000000
-0 0101010101010101 12a9f5817ff2d65d 0000040000000000
-0 0101010101010101 a484c3ad38dc9c19 0000020000000000
-0 0101010101010101 fbe00a8a1ef8ad72 0000010000000000
-0 0101010101010101 750d079407521363 0000008000000000
-0 0101010101010101 64feed9c724c2faf 0000004000000000
-0 0101010101010101 f02b263b328e2b60 0000002000000000
-0 0101010101010101 9d64555a9a10b852 0000001000000000
-0 0101010101010101 d106ff0bed5255d7 0000000800000000
-0 0101010101010101 e1652c6b138c64a5 0000000400000000
-0 0101010101010101 e428581186ec8f46 0000000200000000
-0 0101010101010101 aeb5f5ede22d1a36 0000000100000000
-0 0101010101010101 e943d7568aec0c5c 0000000080000000
-0 0101010101010101 df98c8276f54b04b 0000000040000000
-0 0101010101010101 b160e4680f6c696f 0000000020000000
-0 0101010101010101 fa0752b07d9c4ab8 0000000010000000
-0 0101010101010101 ca3a2b036dbc8502 0000000008000000
-0 0101010101010101 5e0905517bb59bcf 0000000004000000
-0 0101010101010101 814eeb3b91d90726 0000000002000000
-0 0101010101010101 4d49db1532919c9f 0000000001000000
-0 0101010101010101 25eb5fc3f8cf0621 0000000000800000
-0 0101010101010101 ab6a20c0620d1c6f 0000000000400000
-0 0101010101010101 79e90dbc98f92cca 0000000000200000
-0 0101010101010101 866ecedd8072bb0e 0000000000100000
-0 0101010101010101 8b54536f2f3e64a8 0000000000080000
-0 0101010101010101 ea51d3975595b86b 0000000000040000
-0 0101010101010101 caffc6ac4542de31 0000000000020000
-0 0101010101010101 8dd45a2ddf90796c 0000000000010000
-0 0101010101010101 1029d55e880ec2d0 0000000000008000
-0 0101010101010101 5d86cb23639dbea9 0000000000004000
-0 0101010101010101 1d1ca853ae7c0c5f 0000000000002000
-0 0101010101010101 ce332329248f3228 0000000000001000
-0 0101010101010101 8405d1abe24fb942 0000000000000800
-0 0101010101010101 e643d78090ca4207 0000000000000400
-0 0101010101010101 48221b9937748a23 0000000000000200
-0 0101010101010101 dd7c0bbd61fafd54 0000000000000100
-0 0101010101010101 2fbc291a570db5c4 0000000000000080
-0 0101010101010101 e07c30d7e4e26e12 0000000000000040
-0 0101010101010101 0953e2258e8e90a1 0000000000000020
-0 0101010101010101 5b711bc4ceebf2ee 0000000000000010
-0 0101010101010101 cc083f1e6d9e85f6 0000000000000008
-0 0101010101010101 d2fd8867d50d2dfe 0000000000000004
-0 0101010101010101 06e7ea22ce92708f 0000000000000002
-0 0101010101010101 166b40b44aba4bd6 0000000000000001
-0 8001010101010101 0000000000000000 95a8d72813daa94d
-0 4001010101010101 0000000000000000 0eec1487dd8c26d5
-0 2001010101010101 0000000000000000 7ad16ffb79c45926
-0 1001010101010101 0000000000000000 d3746294ca6a6cf3
-0 0801010101010101 0000000000000000 809f5f873c1fd761
-0 0401010101010101 0000000000000000 c02faffec989d1fc
-0 0201010101010101 0000000000000000 4615aa1d33e72f10
-0 0180010101010101 0000000000000000 2055123350c00858
-0 0140010101010101 0000000000000000 df3b99d6577397c8
-0 0120010101010101 0000000000000000 31fe17369b5288c9
-0 0110010101010101 0000000000000000 dfdd3cc64dae1642
-0 0108010101010101 0000000000000000 178c83ce2b399d94
-0 0104010101010101 0000000000000000 50f636324a9b7f80
-0 0102010101010101 0000000000000000 a8468ee3bc18f06d
-0 0101800101010101 0000000000000000 a2dc9e92fd3cde92
-0 0101400101010101 0000000000000000 cac09f797d031287
-0 0101200101010101 0000000000000000 90ba680b22aeb525
-0 0101100101010101 0000000000000000 ce7a24f350e280b6
-0 0101080101010101 0000000000000000 882bff0aa01a0b87
-0 0101040101010101 0000000000000000 25610288924511c2
-0 0101020101010101 0000000000000000 c71516c29c75d170
-0 0101018001010101 0000000000000000 5199c29a52c9f059
-0 0101014001010101 0000000000000000 c22f0a294a71f29f
-0 0101012001010101 0000000000000000 ee371483714c02ea
-0 0101011001010101 0000000000000000 a81fbd448f9e522f
-0 0101010801010101 0000000000000000 4f644c92e192dfed
-0 0101010401010101 0000000000000000 1afa9a66a6df92ae
-0 0101010201010101 0000000000000000 b3c1cc715cb879d8
-0 0101010180010101 0000000000000000 19d032e64ab0bd8b
-0 0101010140010101 0000000000000000 3cfaa7a7dc8720dc
-0 0101010120010101 0000000000000000 b7265f7f447ac6f3
-0 0101010110010101 0000000000000000 9db73b3c0d163f54
-0 0101010108010101 0000000000000000 8181b65babf4a975
-0 0101010104010101 0000000000000000 93c9b64042eaa240
-0 0101010102010101 0000000000000000 5570530829705592
-0 0101010101800101 0000000000000000 8638809e878787a0
-0 0101010101400101 0000000000000000 41b9a79af79ac208
-0 0101010101200101 0000000000000000 7a9be42f2009a892
-0 0101010101100101 0000000000000000 29038d56ba6d2745
-0 0101010101080101 0000000000000000 5495c6abf1e5df51
-0 0101010101040101 0000000000000000 ae13dbd561488933
-0 0101010101020101 0000000000000000 024d1ffa8904e389
-0 0101010101018001 0000000000000000 d1399712f99bf02e
-0 0101010101014001 0000000000000000 14c1d7c1cffec79e
-0 0101010101012001 0000000000000000 1de5279dae3bed6f
-0 0101010101011001 0000000000000000 e941a33f85501303
-0 0101010101010801 0000000000000000 da99dbbc9a03f379
-0 0101010101010401 0000000000000000 b7fc92f91d8e92e9
-0 0101010101010201 0000000000000000 ae8e5caa3ca04e85
-0 0101010101010180 0000000000000000 9cc62df43b6eed74
-0 0101010101010140 0000000000000000 d863dbb5c59a91a0
-0 0101010101010120 0000000000000000 a1ab2190545b91d7
-0 0101010101010110 0000000000000000 0875041e64c570f7
-0 0101010101010108 0000000000000000 5a594528bebef1cc
-0 0101010101010104 0000000000000000 fcdb3291de21f0c0
-0 0101010101010102 0000000000000000 869efd7f9f265a09
-0 1046913489980131 0000000000000000 88d55e54f54c97b4
-0 1007103489988020 0000000000000000 0c0cc00c83ea48fd
-0 10071034c8980120 0000000000000000 83bc8ef3a6570183
-0 1046103489988020 0000000000000000 df725dcad94ea2e9
-0 1086911519190101 0000000000000000 e652b53b550be8b0
-0 1086911519580101 0000000000000000 af527120c485cbb0
-0 5107b01519580101 0000000000000000 0f04ce393db926d5
-0 1007b01519190101 0000000000000000 c9f00ffc74079067
-0 3107915498080101 0000000000000000 7cfd82a593252b4e
-0 3107919498080101 0000000000000000 cb49a2f9e91363e3
-0 10079115b9080140 0000000000000000 00b588be70d23f56
-0 3107911598080140 0000000000000000 406a9a6ab43399ae
-0 1007d01589980101 0000000000000000 6cb773611dca9ada
-0 9107911589980101 0000000000000000 67fd21c17dbb5d70
-0 9107d01589190101 0000000000000000 9592cb4110430787
-0 1007d01598980120 0000000000000000 a6b7ff68a318ddd3
-0 1007940498190101 0000000000000000 4d102196c914ca16
-0 0107910491190401 0000000000000000 2dfa9f4573594965
-0 0107910491190101 0000000000000000 b46604816c0e0774
-0 0107940491190401 0000000000000000 6e7e6221a4f34e87
-0 19079210981a0101 0000000000000000 aa85e74643233199
-0 1007911998190801 0000000000000000 2e5a19db4d1962d6
-0 10079119981a0801 0000000000000000 23a866a809d30894
-0 1007921098190101 0000000000000000 d812d961f017d320
-0 100791159819010b 0000000000000000 055605816e58608f
-0 1004801598190101 0000000000000000 abd88e8b1b7716f1
-0 1004801598190102 0000000000000000 537ac95be69da1e1
-0 1004801598190108 0000000000000000 aed0f6ae3c25cdd8
-0 1002911598100104 0000000000000000 b3e35a5ee53e7b8d
-0 1002911598190104 0000000000000000 61c79c71921a2ef8
-0 1002911598100201 0000000000000000 e2f5728f0995013c
-0 1002911698100101 0000000000000000 1aeac39a61f0a464
-0 7ca110454a1a6e57 01a1d6d039776742 690f5b0d9a26939b
-0 0131d9619dc1376e 5cd54ca83def57da 7a389d10354bd271
-0 07a1133e4a0b2686 0248d43806f67172 868ebb51cab4599a
-0 3849674c2602319e 51454b582ddf440a 7178876e01f19b2a
-0 04b915ba43feb5b6 42fd443059577fa2 af37fb421f8c4095
-0 0113b970fd34f2ce 059b5e0851cf143a 86a560f10ec6d85b
-0 0170f175468fb5e6 0756d8e0774761d2 0cd3da020021dc09
-0 43297fad38e373fe 762514b829bf486a ea676b2cb7db2b7a
-0 07a7137045da2a16 3bdd119049372802 dfd64a815caf1a0f
-0 04689104c2fd3b2f 26955f6835af609a 5c513c9c4886c088
-0 37d06bb516cb7546 164d5e404f275232 0a2aeeae3ff4ab77
-0 1f08260d1ac2465e 6b056e18759f5cca ef1bf03e5dfa575a
-0 584023641aba6176 004bd6ef09176062 88bf0db6d70dee56
-0 025816164629b007 480d39006ee762f2 a1f9915541020b56
-0 49793ebc79b3258f 437540c8698f3cfa 6fbf1cafcffd0556
-0 4fb05e1515ab73a7 072d43a077075292 2f22e49bab7ca1ac
-0 49e95d6d4ca229bf 02fe55778117f12a 5a6b612cc26cce4a
-0 018310dc409b26d6 1d9d5c5018f728c2 5f4c038ed12b2e41
-0 1c587f1c13924fef 305532286d6f295a 63fac0d034d9f793
-1 1c587f1c13924fef 305532286d6f295a 400d307ca24fee60
-57 1c587f1c13924fef 305532286d6f295a 28b568f40e7d43ae
-1 8001010101010101 0000000000000000 f501029f268e45dc
-0 1c587f1c13924fef 305532286d6f295a 63fac0d034d9f793
diff --git a/secure/lib/libcipher/test/speedcrypt.c b/secure/lib/libcipher/test/speedcrypt.c
deleted file mode 100644
index f7507fd789f0..000000000000
--- a/secure/lib/libcipher/test/speedcrypt.c
+++ /dev/null
@@ -1,76 +0,0 @@
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <signal.h>
-#include <stdio.h>
-
-int		keep_going, count, alternate, seconds;
-struct rusage	prior, now;
-
-void
-finish()
-{
-	keep_going = 0;
-}
-
-
-main(int argc, char *argv[])
-{
-	struct itimerval itv;
-	u_long		msecs, key1[8], key2[8];
-	char		*k1, *k2;
-
-	if (argc < 2 || sscanf(argv[1], "%d", &seconds) != 1)
-		seconds = 20;
-
-	if (argc < 3 || sscanf(argv[2], "%d", &alternate) != 1)
-		alternate = 0;
-
-	printf ("Running crypt%s for %d seconds of vtime...\n",
-		alternate ? " with alternate keys" : "", seconds);
-
-	bzero(&itv, sizeof (itv));
-	signal (SIGVTALRM, finish);
-	itv.it_value.tv_sec = seconds;
-	itv.it_value.tv_usec = 0;
-	setitimer(ITIMER_VIRTUAL, &itv, NULL);
-
-	keep_going = 1;
-	if (getrusage(0, &prior) < 0) {
-		perror("getrusage");
-		exit(1);
-	}
-
-	k1 = (char *) key1;
-	k2 = (char *) key2;
-	strcpy(k1, "fredfredfredfredfred");
-	strcpy(k2, "joejoejoejoejoejoejo");
-
-	if (alternate)
-		for (count = 0; keep_going; count++)
-		{
-#if defined(LONGCRYPT)
-			crypt((count & 1) ? k1 : k2, "_ara.X...");
-#else
-			crypt((count & 1) ? k1 : k2, "eek");
-#endif
-		}
-	else
-		for (count = 0; keep_going; count++)
-		{
-#if defined(LONGCRYPT)
-			crypt(k1, "_ara.X...");
-#else
-			crypt(k1, "eek");
-#endif
-		}
-
-	if (getrusage(0, &now) < 0) {
-		perror("getrusage");
-		exit(1);
-	}
-	msecs = (now.ru_utime.tv_sec - prior.ru_utime.tv_sec) * 1000
-	      + (now.ru_utime.tv_usec - prior.ru_utime.tv_usec) / 1000;
-	printf ("\tDid %d crypt()s per second.\n", 1000 * count / msecs);
-	exit(0);
-}
diff --git a/secure/lib/libcipher/test/speeddes.c b/secure/lib/libcipher/test/speeddes.c
deleted file mode 100644
index a5822362f107..000000000000
--- a/secure/lib/libcipher/test/speeddes.c
+++ /dev/null
@@ -1,61 +0,0 @@
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <signal.h>
-#include <stdio.h>
-
-int		keep_going, count, alternate, seconds, iters;
-struct rusage	prior, now;
-u_long		block[3];
-char		*blk;
-
-void
-finish()
-{
-	keep_going = 0;
-}
-
-
-main(int argc, char *argv[])
-{
-	struct itimerval itv;
-	u_long	msecs;
-
-	if (argc < 2 || sscanf(argv[1], "%d", &seconds) != 1)
-		seconds = 20;
-
-	if (argc < 3 || sscanf(argv[2], "%d", &iters) != 1)
-		iters = 1;
-
-	printf ("Running des_cipher( , , 0L, %d) for %d seconds of vtime...\n",
-		iters, seconds);
-
-	bzero(&itv, sizeof (itv));
-	signal (SIGVTALRM, finish);
-	itv.it_value.tv_sec = seconds;
-	itv.it_value.tv_usec = 0;
-	setitimer(ITIMER_VIRTUAL, &itv, NULL);
-
-	keep_going = 1;
-	if (getrusage(0, &prior) < 0) {
-		perror("getrusage");
-		exit(1);
-	}
-
-	blk = (char *) block;
-	(void)des_setkey(blk);
-	for (count = 0; keep_going; count++)
-		(void) des_cipher(blk, blk, 0, iters);
-
-	if (getrusage(0, &now) < 0) {
-		perror("getrusage");
-		exit(1);
-	}
-
-	msecs = (now.ru_utime.tv_sec - prior.ru_utime.tv_sec) * 1000
-	      + (now.ru_utime.tv_usec - prior.ru_utime.tv_usec) / 1000;
-	printf ("Did %d encryptions per second, each of %d iteration(s).\n",
-		1000 * count / msecs, iters);
-	printf ("\tTotal %d blocks per second.\n", (1000*iters*count)/msecs);
-	exit(0);
-}
diff --git a/secure/lib/libcrypt/Makefile b/secure/lib/libcrypt/Makefile
deleted file mode 100644
index c477dc8e581d..000000000000
--- a/secure/lib/libcrypt/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# $FreeBSD$
-#
-
-LCRYPTBASE=     libcrypt
-LDCRYPTBASE=    libdescrypt
-
-.if ${OBJFORMAT} != elf
-LCRYPTSO=       $(LCRYPTBASE).so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-LDCRYPTSO=      $(LDCRYPTBASE).so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-.else
-LCRYPTSO=       $(LCRYPTBASE).so.$(SHLIB_MAJOR)
-LDCRYPTSO=      $(LDCRYPTBASE).so.$(SHLIB_MAJOR)
-.endif
-
-.PATH:	${.CURDIR}/../../../lib/libmd
-
-LIB=	descrypt
-SRCS=	crypt.c crypt-md5.c md5c.c
-MAN3=	crypt.3
-CFLAGS+=	-I${.CURDIR}/../../../lib/libmd -Wall
-PRECIOUSLIB=	yes
-
-.if ${OBJFORMAT} == elf
-SONAME=	${LCRYPTBASE}.so.$(SHLIB_MAJOR)
-.endif
-
-test:
-	cd test ; make test ; make clean
-
-.include <bsd.lib.mk>
-
-# We only install the links if they do not already exist.
-# This may have to be revised
-afterinstall:
-.if !defined(NOPIC) && defined(SHLIB_MAJOR)
-	@cd $(DESTDIR)/$(LIBDIR); \
-	if [ ! -e $(LCRYPTSO) ]; then \
-	rm -f $(LCRYPTSO); \
-	ln -s $(LDCRYPTSO) $(LCRYPTSO); \
-	fi
-.endif
-.if !defined(NOPIC) && defined(SHLIB_MAJOR) && ${OBJFORMAT} == elf
-	@cd $(DESTDIR)/$(LIBDIR); \
-	if [ ! -e $(LCRYPTBASE).so ]; then \
-	rm -f $(LCRYPTBASE).so; \
-	ln -s $(LDCRYPTBASE).so libcrypt.so; \
-	fi
-.endif
-	@cd  $(DESTDIR)/$(LIBDIR); \
-	if [ ! -e $(LCRYPTBASE).a ]; then \
-	rm -f $(LCRYPTBASE).a; \
-	ln -s $(LDCRYPTBASE).a libcrypt.a; \
-	fi
-.if !defined(NOPROFILE)
-	@cd  $(DESTDIR)/$(LIBDIR); \
-	if [ ! -e $(LCRYPTBASE)_p.a ]; then \
-	rm -f $(LCRYPTBASE)_p.a; \
-	ln -s $(LDCRYPTBASE)_p.a libcrypt_p.a; \
-	fi
-.endif
diff --git a/secure/lib/libcrypt/README b/secure/lib/libcrypt/README
deleted file mode 100644
index ab8af5acbb29..000000000000
--- a/secure/lib/libcrypt/README
+++ /dev/null
@@ -1,98 +0,0 @@
-
-	FreeSec - NetBSD libcrypt replacement
-
-	  David Burren <davidb@werj.com.au>
-	  Release 1.0, March 1994
-
-    Document ref: $FreeBSD$
-
-
-Description
-===========
-This library is a drop-in replacement for the libcrypt used in U.S. copies
-of NetBSD, duplicating that library's functionality.  A suite of verification
-and benchmark tools is provided.
-
-FreeSec 1.0 is an original implementation of the DES algorithm and the
-crypt(3) interfaces used in Unix-style operating systems.  It was produced
-in Australia and as such is not covered by U.S. export restrictions (at
-least for copies that remain outside the U.S.).
-
-
-History
-=======
-An earlier version of the FreeSec library was built using the UFC-crypt
-package that is distributed as part of the GNU library.  UFC-crypt did not
-support the des_cipher() or des_setkey() functions, nor the new-style
-crypt with long keys.  These were implemented in FreeSec 0.2, but at least
-one bug remained, where encryption would only succeed if either the salt
-or the plaintext was zero.  Because of its heritage FreeSec 0.2 was covered
-by the GNU Library Licence.
-
-FreeSec 1.0 is an original implementation by myself, and has been tested
-against the verification suite I'd been using with FreeSec 0.2 (this is not
-encumbered by any licence).  FreeSec 1.0 is covered by a Berkeley-style
-licence, which better fits into the *BSD hierarchy than the earlier GNU
-licence.
-
-
-Why should you use FreeSec?
-===========================
-FreeSec is intended as a replacement for the U.S.-only NetBSD libcrypt,
-to act as a baseline for encryption functionality.
-
-Some other packages (such as Eric Young's libdes package) are faster and
-more complete than FreeSec, but typically have different licencing
-arrangements.  While some applications will justify the use of these
-packages, the idea here is that everyone should have access to *at least*
-the functionality of FreeSec.
-
-
-Performance of FreeSec 1.0
-==========================
-I compare below the performance of three libcrypt implementations.  As can be
-seen, it's between the U.S. library and UFC-crypt.  While the performance of
-FreeSec 1.0 is good enough to keep me happy for now, I hope to improve it in
-future versions.  I was interested to note that while UFC-crypt is faster on
-a 386, hardware characteristics can have markedly different effects on each
-implementation.
-
-
-386DX40, 128k cache	| U.S. BSD	| FreeSec 1.0	| FreeSec 0.2
-CFLAGS=-O2		|		|		|
-========================+===============+===============+==================
-crypt (alternate keys)	| 317		| 341		| 395
-	crypt/sec	|		|		|
-------------------------+---------------+---------------+------------------
-crypt (constant key)	| 317		| 368		| 436
-	crypt/sec	|		|		|
-------------------------+---------------+---------------+------------------
-des_cipher( , , , 1)	| 6037		| 7459		| 3343
-	blocks/sec	|		|		|
-------------------------+---------------+---------------+------------------
-des_cipher( , , , 25)	| 8871		| 9627		| 15926
-	blocks/sec	|		|		|
-
-Notes:	The results tabled here are the average over 10 runs.
-	The entry/exit code for FreeSec 0.2's des_cipher() is particularly
-	inefficient, thus the anomalous result for single encryptions.
-
-
-As an experiment using a machine with a larger register set and an
-obscenely fast CPU, I obtained the following results:
-
-	60 MHz R4400		| FreeSec 1.0	| FreeSec 0.2
-	========================+=================================
-	crypt (alternate keys)	| 2545		| 2702
-		crypt/sec	|		|
-	------------------------+---------------------------------
-	crypt (constant key)	| 2852		| 2981
-		crypt/sec	|		|
-	------------------------+---------------------------------
-	des_cipher( , , , 1)	| 56443		| 21409
-		blocks/sec	|		|
-	------------------------+---------------------------------
-	des_cipher( , , , 25)	| 82531		| 18276
-		blocks/sec	|		|
-
-Obviously your mileage will vary with your hardware and your compiler...
diff --git a/secure/lib/libcrypt/README.FreeBSD b/secure/lib/libcrypt/README.FreeBSD
deleted file mode 100644
index e940aeb8e3ea..000000000000
--- a/secure/lib/libcrypt/README.FreeBSD
+++ /dev/null
@@ -1,21 +0,0 @@
-$FreeBSD$
-
-This is FreeSec package for NetBSD,  unchanged for
-FreeBSD, except for the Makefile.
-
-FreeSec was written by David Burren <davidb@werj.com.au>
-
-A few bugs in the original FreeSec release have been fixed.
-
-In order to make libcrypt binaries exportable from the USA,
-only the symbol _crypt() (later to be changed to ___crypt())
-is exported from libcrypt.
-
-This source code was developed outside the USA, and can be
-obtained outside the USA.
-
-					Geoff Rehmet
-					Rhodes University
-					Grahamstown 
-					South Africa
-					8 August 1994
diff --git a/secure/lib/libcrypt/crypt-md5.c b/secure/lib/libcrypt/crypt-md5.c
deleted file mode 100644
index 4cc6a82d24b5..000000000000
--- a/secure/lib/libcrypt/crypt-md5.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@login.dknet.dk> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- * 
- * This has had its entry point changed to crypt_md5 for use in 
- * a dual-personality (DES & MD5) environment)  -- MarkM - Nov 1995
- *
- * $FreeBSD$
- *
- */
-
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$FreeBSD$";
-#endif /* LIBC_SCCS and not lint */
-#endif
-
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
-#include <md5.h>
-
-static unsigned char itoa64[] =		/* 0 ... 63 => ascii - 64 */
-	"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-static void
-to64(s, v, n)
-	char *s;
-	unsigned long v;
-	int n;
-{
-	while (--n >= 0) {
-		*s++ = itoa64[v&0x3f];
-		v >>= 6;
-	}
-}
-
-/*
- * UNIX password
- *
- * Use MD5 for what it is best at...
- */
-
-char *
-crypt_md5(pw, salt)
-	register const char *pw;
-	register const char *salt;
-{
-	static char	*magic = "$1$";	/*
-						 * This string is magic for
-						 * this algorithm.  Having
-						 * it this way, we can get
-						 * get better later on
-						 */
-	static char     passwd[120], *p;
-	static const char *sp,*ep;
-	unsigned char	final[16];
-	int sl,pl,i,j;
-	MD5_CTX	ctx,ctx1;
-	unsigned long l;
-
-	/* Refine the Salt first */
-	sp = salt;
-
-	/* If it starts with the magic string, then skip that */
-	if(!strncmp(sp,magic,strlen(magic)))
-		sp += strlen(magic);
-
-	/* It stops at the first '$', max 8 chars */
-	for(ep=sp;*ep && *ep != '$' && ep < (sp+8);ep++)
-		continue;
-
-	/* get the length of the true salt */
-	sl = ep - sp;
-
-	MD5Init(&ctx);
-
-	/* The password first, since that is what is most unknown */
-	MD5Update(&ctx,pw,strlen(pw));
-
-	/* Then our magic string */
-	MD5Update(&ctx,magic,strlen(magic));
-
-	/* Then the raw salt */
-	MD5Update(&ctx,sp,sl);
-
-	/* Then just as many characters of the MD5(pw,salt,pw) */
-	MD5Init(&ctx1);
-	MD5Update(&ctx1,pw,strlen(pw));
-	MD5Update(&ctx1,sp,sl);
-	MD5Update(&ctx1,pw,strlen(pw));
-	MD5Final(final,&ctx1);
-	for(pl = strlen(pw); pl > 0; pl -= 16)
-		MD5Update(&ctx,final,pl>16 ? 16 : pl);
-
-	/* Don't leave anything around in vm they could use. */
-	memset(final,0,sizeof final);
-
-	/* Then something really weird... */
-	for (j=0,i = strlen(pw); i ; i >>= 1)
-		if(i&1)
-		    MD5Update(&ctx, final+j, 1);
-		else
-		    MD5Update(&ctx, pw+j, 1);
-
-	/* Now make the output string */
-	strcpy(passwd,magic);
-	strncat(passwd,sp,sl);
-	strcat(passwd,"$");
-
-	MD5Final(final,&ctx);
-
-	/*
-	 * and now, just to make sure things don't run too fast
-	 * On a 60 Mhz Pentium this takes 34 msec, so you would
-	 * need 30 seconds to build a 1000 entry dictionary...
-	 */
-	for(i=0;i<1000;i++) {
-		MD5Init(&ctx1);
-		if(i & 1)
-			MD5Update(&ctx1,pw,strlen(pw));
-		else
-			MD5Update(&ctx1,final,16);
-
-		if(i % 3)
-			MD5Update(&ctx1,sp,sl);
-
-		if(i % 7)
-			MD5Update(&ctx1,pw,strlen(pw));
-
-		if(i & 1)
-			MD5Update(&ctx1,final,16);
-		else
-			MD5Update(&ctx1,pw,strlen(pw));
-		MD5Final(final,&ctx1);
-	}
-
-	p = passwd + strlen(passwd);
-
-	l = (final[ 0]<<16) | (final[ 6]<<8) | final[12]; to64(p,l,4); p += 4;
-	l = (final[ 1]<<16) | (final[ 7]<<8) | final[13]; to64(p,l,4); p += 4;
-	l = (final[ 2]<<16) | (final[ 8]<<8) | final[14]; to64(p,l,4); p += 4;
-	l = (final[ 3]<<16) | (final[ 9]<<8) | final[15]; to64(p,l,4); p += 4;
-	l = (final[ 4]<<16) | (final[10]<<8) | final[ 5]; to64(p,l,4); p += 4;
-	l =                    final[11]                ; to64(p,l,2); p += 2;
-	*p = '\0';
-
-	/* Don't leave anything around in vm they could use. */
-	memset(final,0,sizeof final);
-
-	return passwd;
-}
-
diff --git a/secure/lib/libcrypt/crypt.3 b/secure/lib/libcrypt/crypt.3
deleted file mode 100644
index 9726b4096023..000000000000
--- a/secure/lib/libcrypt/crypt.3
+++ /dev/null
@@ -1,159 +0,0 @@
-.\" FreeSec: libcrypt for NetBSD
-.\"
-.\" Copyright (c) 1994 David Burren
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 4. Neither the name of the author nor the names of other contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD$
-.\"
-.\" Manual page, using -mandoc macros
-.\"
-.Dd March 9, 1994
-.Dt CRYPT 3
-.Os "FreeSec 1.0"
-.Sh NAME
-.Nm crypt
-.Nd DES trapdoor encryption
-.Sh SYNOPSIS
-.Ft char
-.Fn *crypt "const char *key" "const char *setting"
-.Sh DESCRIPTION
-The
-.Fn crypt
-function performs password encryption, based on the
-.Tn NBS
-Data Encryption Standard (DES).
-Additional code has been added to deter key search attempts.
-The first argument to
-.Nm crypt
-is a
-.Dv null Ns -terminated
-string, typically a user's typed password.
-The second is in one of three forms:
-if it begins with an underscore (``_'') then an extended format is used
-in interpreting both the the key and the setting, as outlined below.
-if it begins with the string ``$1$'' then an exportable format is used.
-.Ss Extended crypt:
-.Pp
-The
-.Ar key
-is divided into groups of 8 characters (the last group is null-padded)
-and the low-order 7 bits of each each character (56 bits per group) are
-used to form the DES key as follows:
-the first group of 56 bits becomes the initial DES key.
-For each additional group, the XOR of the encryption of the current DES
-key with itself and the group bits becomes the next DES key.
-.Pp
-The setting is a 9-character array consisting of an underscore followed
-by 4 bytes of iteration count and 4 bytes of salt.
-These are encoded as printable characters, 6 bits per character,
-least significant character first.
-The values 0 to 63 are encoded as ``./0-9A-Za-z''.
-This allows 24 bits for both
-.Fa count
-and
-.Fa salt .
-.Ss "Traditional" crypt:
-.Pp
-The first 8 bytes of the key are null-padded, and the low-order 7 bits of
-each character is used to form the 56-bit
-.Tn DES
-key.
-.Pp
-The setting is a 2-character array of the ASCII-encoded salt.
-Thus only 12 bits of
-.Fa salt
-are used.
-.Fa count
-is set to 25.
-.Ss "FreeBSD" or "Exportable" crypt:
-.Pp
-If the salt begins with ``$1$'' then the freely exportable 
-.Tn MD5
-algorithm is used to calculate a hash value, from which the password string
-is generated. The
-.Tn MD5
-derived routine is designed to be time-consuming like the DES based version.
-.Ss Algorithm:
-.Pp
-The
-.Fa salt
-introduces disorder in the
-.Tn DES
-algorithm in one of 16777216 or 4096 possible ways
-(ie. with 24 or 12 bits: if bit
-.Em i
-of the
-.Ar salt
-is set, then bits
-.Em i
-and
-.Em i+24
-are swapped in the
-.Tn DES
-E-box output).
-.Pp
-The DES key is used to encrypt a 64-bit constant using
-.Ar count
-iterations of
-.Tn DES .
-The value returned is a
-.Dv null Ns -terminated
-string, 20 or 13 bytes (plus null) in length, consisting of the
-.Ar setting
-followed by the encoded 64-bit encryption.
-.Pp
-The function
-.Fn crypt
-returns a pointer to the encrypted value on success, and NULL on failure.
-.Sh SEE ALSO
-.Xr login 1 ,
-.Xr passwd 1 ,
-.Xr getpass 3 ,
-.Xr passwd 5
-.Sh BUGS
-The
-.Fn crypt
-function returns a pointer to static data, and subsequent calls to
-.Fn crypt
-will modify the same object.
-.Sh HISTORY
-A rotor-based
-.Fn crypt
-function appeared in
-.At v6 .
-The current style
-.Fn crypt
-first appeared in
-.At v7 .
-.Pp
-This library (FreeSec 1.0) was developed outside the United States of America
-as an unencumbered replacement for the U.S.-only NetBSD libcrypt encryption
-library.
-Users should be aware that this code (and programs staticly linked with it)
-may not be exported from the U.S., although it apparently can be imported.
-.Sh AUTHORS
-.An David Burren Aq davidb@werj.com.au
diff --git a/secure/lib/libcrypt/crypt.c b/secure/lib/libcrypt/crypt.c
deleted file mode 100644
index 9e8c5caaefeb..000000000000
--- a/secure/lib/libcrypt/crypt.c
+++ /dev/null
@@ -1,697 +0,0 @@
-/*
- * FreeSec: libcrypt for NetBSD
- *
- * Copyright (c) 1994 David Burren
- * All rights reserved.
- *
- * Adapted for FreeBSD-2.0 by Geoffrey M. Rehmet
- *	crypt.c should now *only* export crypt(), in order to make
- *	binaries of libcrypt exportable from the USA
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the author nor the names of other contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- *
- * This is an original implementation of the DES and the crypt(3) interfaces
- * by David Burren <davidb@werj.com.au>.
- *
- * An excellent reference on the underlying algorithm (and related
- * algorithms) is:
- *
- *	B. Schneier, Applied Cryptography: protocols, algorithms,
- *	and source code in C, John Wiley & Sons, 1994.
- *
- * Note that in that book's description of DES the lookups for the initial,
- * pbox, and final permutations are inverted (this has been brought to the
- * attention of the author).  A list of errata for this book has been
- * posted to the sci.crypt newsgroup by the author and is available for FTP.
- *
- * ARCHITECTURE ASSUMPTIONS:
- *	This code assumes that u_longs are 32 bits.  It will probably not
- *	operate on 64-bit machines without modifications.
- *	It is assumed that the 8-byte arrays passed by reference can be
- *	addressed as arrays of u_longs (ie. the CPU is not picky about
- *	alignment).
- */
-#include <sys/types.h>
-#include <sys/param.h>
-#include <pwd.h>
-#include <string.h>
-
-char *crypt_md5(const char *pw, const char *salt);
-
-/* We can't always assume gcc */
-#ifdef __GNUC__
-#define INLINE inline
-#endif
-
-
-static u_char	IP[64] = {
-	58, 50, 42, 34, 26, 18, 10,  2, 60, 52, 44, 36, 28, 20, 12,  4,
-	62, 54, 46, 38, 30, 22, 14,  6, 64, 56, 48, 40, 32, 24, 16,  8,
-	57, 49, 41, 33, 25, 17,  9,  1, 59, 51, 43, 35, 27, 19, 11,  3,
-	61, 53, 45, 37, 29, 21, 13,  5, 63, 55, 47, 39, 31, 23, 15,  7
-};
-
-static u_char	inv_key_perm[64];
-static u_char	u_key_perm[56];
-static u_char	key_perm[56] = {
-	57, 49, 41, 33, 25, 17,  9,  1, 58, 50, 42, 34, 26, 18,
-	10,  2, 59, 51, 43, 35, 27, 19, 11,  3, 60, 52, 44, 36,
-	63, 55, 47, 39, 31, 23, 15,  7, 62, 54, 46, 38, 30, 22,
-	14,  6, 61, 53, 45, 37, 29, 21, 13,  5, 28, 20, 12,  4
-};
-
-static u_char	key_shifts[16] = {
-	1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1
-};
-
-static u_char	inv_comp_perm[56];
-static u_char	comp_perm[48] = {
-	14, 17, 11, 24,  1,  5,  3, 28, 15,  6, 21, 10,
-	23, 19, 12,  4, 26,  8, 16,  7, 27, 20, 13,  2,
-	41, 52, 31, 37, 47, 55, 30, 40, 51, 45, 33, 48,
-	44, 49, 39, 56, 34, 53, 46, 42, 50, 36, 29, 32
-};
-
-/*
- *	No E box is used, as it's replaced by some ANDs, shifts, and ORs.
- */
-
-static u_char	u_sbox[8][64];
-static u_char	sbox[8][64] = {
-	{
-		14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7,
-		 0, 15,  7,  4, 14,  2, 13,  1, 10,  6, 12, 11,  9,  5,  3,  8,
-		 4,  1, 14,  8, 13,  6,  2, 11, 15, 12,  9,  7,  3, 10,  5,  0,
-		15, 12,  8,  2,  4,  9,  1,  7,  5, 11,  3, 14, 10,  0,  6, 13
-	},
-	{
-		15,  1,  8, 14,  6, 11,  3,  4,  9,  7,  2, 13, 12,  0,  5, 10,
-		 3, 13,  4,  7, 15,  2,  8, 14, 12,  0,  1, 10,  6,  9, 11,  5,
-		 0, 14,  7, 11, 10,  4, 13,  1,  5,  8, 12,  6,  9,  3,  2, 15,
-		13,  8, 10,  1,  3, 15,  4,  2, 11,  6,  7, 12,  0,  5, 14,  9
-	},
-	{
-		10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8,
-		13,  7,  0,  9,  3,  4,  6, 10,  2,  8,  5, 14, 12, 11, 15,  1,
-		13,  6,  4,  9,  8, 15,  3,  0, 11,  1,  2, 12,  5, 10, 14,  7,
-		 1, 10, 13,  0,  6,  9,  8,  7,  4, 15, 14,  3, 11,  5,  2, 12
-	},
-	{
-		 7, 13, 14,  3,  0,  6,  9, 10,  1,  2,  8,  5, 11, 12,  4, 15,
-		13,  8, 11,  5,  6, 15,  0,  3,  4,  7,  2, 12,  1, 10, 14,  9,
-		10,  6,  9,  0, 12, 11,  7, 13, 15,  1,  3, 14,  5,  2,  8,  4,
-		 3, 15,  0,  6, 10,  1, 13,  8,  9,  4,  5, 11, 12,  7,  2, 14
-	},
-	{
-		 2, 12,  4,  1,  7, 10, 11,  6,  8,  5,  3, 15, 13,  0, 14,  9,
-		14, 11,  2, 12,  4,  7, 13,  1,  5,  0, 15, 10,  3,  9,  8,  6,
-		 4,  2,  1, 11, 10, 13,  7,  8, 15,  9, 12,  5,  6,  3,  0, 14,
-		11,  8, 12,  7,  1, 14,  2, 13,  6, 15,  0,  9, 10,  4,  5,  3
-	},
-	{
-		12,  1, 10, 15,  9,  2,  6,  8,  0, 13,  3,  4, 14,  7,  5, 11,
-		10, 15,  4,  2,  7, 12,  9,  5,  6,  1, 13, 14,  0, 11,  3,  8,
-		 9, 14, 15,  5,  2,  8, 12,  3,  7,  0,  4, 10,  1, 13, 11,  6,
-		 4,  3,  2, 12,  9,  5, 15, 10, 11, 14,  1,  7,  6,  0,  8, 13
-	},
-	{
-		 4, 11,  2, 14, 15,  0,  8, 13,  3, 12,  9,  7,  5, 10,  6,  1,
-		13,  0, 11,  7,  4,  9,  1, 10, 14,  3,  5, 12,  2, 15,  8,  6,
-		 1,  4, 11, 13, 12,  3,  7, 14, 10, 15,  6,  8,  0,  5,  9,  2,
-		 6, 11, 13,  8,  1,  4, 10,  7,  9,  5,  0, 15, 14,  2,  3, 12
-	},
-	{
-		13,  2,  8,  4,  6, 15, 11,  1, 10,  9,  3, 14,  5,  0, 12,  7,
-		 1, 15, 13,  8, 10,  3,  7,  4, 12,  5,  6, 11,  0, 14,  9,  2,
-		 7, 11,  4,  1,  9, 12, 14,  2,  0,  6, 10, 13, 15,  3,  5,  8,
-		 2,  1, 14,  7,  4, 10,  8, 13, 15, 12,  9,  0,  3,  5,  6, 11
-	}
-};
-
-static u_char	un_pbox[32];
-static u_char	pbox[32] = {
-	16,  7, 20, 21, 29, 12, 28, 17,  1, 15, 23, 26,  5, 18, 31, 10,
-	 2,  8, 24, 14, 32, 27,  3,  9, 19, 13, 30,  6, 22, 11,  4, 25
-};
-
-static u_long	bits32[32] =
-{
-	0x80000000, 0x40000000, 0x20000000, 0x10000000,
-	0x08000000, 0x04000000, 0x02000000, 0x01000000,
-	0x00800000, 0x00400000, 0x00200000, 0x00100000,
-	0x00080000, 0x00040000, 0x00020000, 0x00010000,
-	0x00008000, 0x00004000, 0x00002000, 0x00001000,
-	0x00000800, 0x00000400, 0x00000200, 0x00000100,
-	0x00000080, 0x00000040, 0x00000020, 0x00000010,
-	0x00000008, 0x00000004, 0x00000002, 0x00000001
-};
-
-static u_char	bits8[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 };
-
-static u_long	saltbits;
-static long	old_salt;
-static u_long	*bits28, *bits24;
-static u_char	init_perm[64], final_perm[64];
-static u_long	en_keysl[16], en_keysr[16];
-static u_long	de_keysl[16], de_keysr[16];
-static int	des_initialised = 0;
-static u_char	m_sbox[4][4096];
-static u_long	psbox[4][256];
-static u_long	ip_maskl[8][256], ip_maskr[8][256];
-static u_long	fp_maskl[8][256], fp_maskr[8][256];
-static u_long	key_perm_maskl[8][128], key_perm_maskr[8][128];
-static u_long	comp_maskl[8][128], comp_maskr[8][128];
-static u_long	old_rawkey0, old_rawkey1;
-
-static u_char	ascii64[] =
-	 "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-/*	  0000000000111111111122222222223333333333444444444455555555556666 */
-/*	  0123456789012345678901234567890123456789012345678901234567890123 */
-
-static INLINE int
-ascii_to_bin(char ch)
-{
-	if (ch > 'z')
-		return(0);
-	if (ch >= 'a')
-		return(ch - 'a' + 38);
-	if (ch > 'Z')
-		return(0);
-	if (ch >= 'A')
-		return(ch - 'A' + 12);
-	if (ch > '9')
-		return(0);
-	if (ch >= '.')
-		return(ch - '.');
-	return(0);
-}
-
-static void
-des_init()
-{
-	int	i, j, b, k, inbit, obit;
-	u_long	*p, *il, *ir, *fl, *fr;
-
-	old_rawkey0 = old_rawkey1 = 0L;
-	saltbits = 0L;
-	old_salt = 0L;
-	bits24 = (bits28 = bits32 + 4) + 4;
-
-	/*
-	 * Invert the S-boxes, reordering the input bits.
-	 */
-	for (i = 0; i < 8; i++)
-		for (j = 0; j < 64; j++) {
-			b = (j & 0x20) | ((j & 1) << 4) | ((j >> 1) & 0xf);
-			u_sbox[i][j] = sbox[i][b];
-		}
-
-	/*
-	 * Convert the inverted S-boxes into 4 arrays of 8 bits.
-	 * Each will handle 12 bits of the S-box input.
-	 */
-	for (b = 0; b < 4; b++)
-		for (i = 0; i < 64; i++)
-			for (j = 0; j < 64; j++)
-				m_sbox[b][(i << 6) | j] =
-					(u_sbox[(b << 1)][i] << 4) |
-					u_sbox[(b << 1) + 1][j];
-
-	/*
-	 * Set up the initial & final permutations into a useful form, and
-	 * initialise the inverted key permutation.
-	 */
-	for (i = 0; i < 64; i++) {
-		init_perm[final_perm[i] = IP[i] - 1] = i;
-		inv_key_perm[i] = 255;
-	}
-
-	/*
-	 * Invert the key permutation and initialise the inverted key
-	 * compression permutation.
-	 */
-	for (i = 0; i < 56; i++) {
-		u_key_perm[i] = key_perm[i] - 1;
-		inv_key_perm[key_perm[i] - 1] = i;
-		inv_comp_perm[i] = 255;
-	}
-
-	/*
-	 * Invert the key compression permutation.
-	 */
-	for (i = 0; i < 48; i++) {
-		inv_comp_perm[comp_perm[i] - 1] = i;
-	}
-
-	/*
-	 * Set up the OR-mask arrays for the initial and final permutations,
-	 * and for the key initial and compression permutations.
-	 */
-	for (k = 0; k < 8; k++) {
-		for (i = 0; i < 256; i++) {
-			*(il = &ip_maskl[k][i]) = 0L;
-			*(ir = &ip_maskr[k][i]) = 0L;
-			*(fl = &fp_maskl[k][i]) = 0L;
-			*(fr = &fp_maskr[k][i]) = 0L;
-			for (j = 0; j < 8; j++) {
-				inbit = 8 * k + j;
-				if (i & bits8[j]) {
-					if ((obit = init_perm[inbit]) < 32)
-						*il |= bits32[obit];
-					else
-						*ir |= bits32[obit-32];
-					if ((obit = final_perm[inbit]) < 32)
-						*fl |= bits32[obit];
-					else
-						*fr |= bits32[obit - 32];
-				}
-			}
-		}
-		for (i = 0; i < 128; i++) {
-			*(il = &key_perm_maskl[k][i]) = 0L;
-			*(ir = &key_perm_maskr[k][i]) = 0L;
-			for (j = 0; j < 7; j++) {
-				inbit = 8 * k + j;
-				if (i & bits8[j + 1]) {
-					if ((obit = inv_key_perm[inbit]) == 255)
-						continue;
-					if (obit < 28)
-						*il |= bits28[obit];
-					else
-						*ir |= bits28[obit - 28];
-				}
-			}
-			*(il = &comp_maskl[k][i]) = 0L;
-			*(ir = &comp_maskr[k][i]) = 0L;
-			for (j = 0; j < 7; j++) {
-				inbit = 7 * k + j;
-				if (i & bits8[j + 1]) {
-					if ((obit=inv_comp_perm[inbit]) == 255)
-						continue;
-					if (obit < 24)
-						*il |= bits24[obit];
-					else
-						*ir |= bits24[obit - 24];
-				}
-			}
-		}
-	}
-
-	/*
-	 * Invert the P-box permutation, and convert into OR-masks for
-	 * handling the output of the S-box arrays setup above.
-	 */
-	for (i = 0; i < 32; i++)
-		un_pbox[pbox[i] - 1] = i;
-
-	for (b = 0; b < 4; b++)
-		for (i = 0; i < 256; i++) {
-			*(p = &psbox[b][i]) = 0L;
-			for (j = 0; j < 8; j++) {
-				if (i & bits8[j])
-					*p |= bits32[un_pbox[8 * b + j]];
-			}
-		}
-
-	des_initialised = 1;
-}
-
-static void
-setup_salt(long salt)
-{
-	u_long	obit, saltbit;
-	int	i;
-
-	if (salt == old_salt)
-		return;
-	old_salt = salt;
-
-	saltbits = 0L;
-	saltbit = 1;
-	obit = 0x800000;
-	for (i = 0; i < 24; i++) {
-		if (salt & saltbit)
-			saltbits |= obit;
-		saltbit <<= 1;
-		obit >>= 1;
-	}
-}
-
-static int
-des_setkey(const char *key)
-{
-	u_long	k0, k1, rawkey0, rawkey1;
-	int	shifts, round;
-
-	if (!des_initialised)
-		des_init();
-
-	rawkey0 = ntohl(*(u_long *) key);
-	rawkey1 = ntohl(*(u_long *) (key + 4));
-
-	if ((rawkey0 | rawkey1)
-	    && rawkey0 == old_rawkey0
-	    && rawkey1 == old_rawkey1) {
-		/*
-		 * Already setup for this key.
-		 * This optimisation fails on a zero key (which is weak and
-		 * has bad parity anyway) in order to simplify the starting
-		 * conditions.
-		 */
-		return(0);
-	}
-	old_rawkey0 = rawkey0;
-	old_rawkey1 = rawkey1;
-
-	/*
-	 *	Do key permutation and split into two 28-bit subkeys.
-	 */
-	k0 = key_perm_maskl[0][rawkey0 >> 25]
-	   | key_perm_maskl[1][(rawkey0 >> 17) & 0x7f]
-	   | key_perm_maskl[2][(rawkey0 >> 9) & 0x7f]
-	   | key_perm_maskl[3][(rawkey0 >> 1) & 0x7f]
-	   | key_perm_maskl[4][rawkey1 >> 25]
-	   | key_perm_maskl[5][(rawkey1 >> 17) & 0x7f]
-	   | key_perm_maskl[6][(rawkey1 >> 9) & 0x7f]
-	   | key_perm_maskl[7][(rawkey1 >> 1) & 0x7f];
-	k1 = key_perm_maskr[0][rawkey0 >> 25]
-	   | key_perm_maskr[1][(rawkey0 >> 17) & 0x7f]
-	   | key_perm_maskr[2][(rawkey0 >> 9) & 0x7f]
-	   | key_perm_maskr[3][(rawkey0 >> 1) & 0x7f]
-	   | key_perm_maskr[4][rawkey1 >> 25]
-	   | key_perm_maskr[5][(rawkey1 >> 17) & 0x7f]
-	   | key_perm_maskr[6][(rawkey1 >> 9) & 0x7f]
-	   | key_perm_maskr[7][(rawkey1 >> 1) & 0x7f];
-	/*
-	 *	Rotate subkeys and do compression permutation.
-	 */
-	shifts = 0;
-	for (round = 0; round < 16; round++) {
-		u_long	t0, t1;
-
-		shifts += key_shifts[round];
-
-		t0 = (k0 << shifts) | (k0 >> (28 - shifts));
-		t1 = (k1 << shifts) | (k1 >> (28 - shifts));
-
-		de_keysl[15 - round] =
-		en_keysl[round] = comp_maskl[0][(t0 >> 21) & 0x7f]
-				| comp_maskl[1][(t0 >> 14) & 0x7f]
-				| comp_maskl[2][(t0 >> 7) & 0x7f]
-				| comp_maskl[3][t0 & 0x7f]
-				| comp_maskl[4][(t1 >> 21) & 0x7f]
-				| comp_maskl[5][(t1 >> 14) & 0x7f]
-				| comp_maskl[6][(t1 >> 7) & 0x7f]
-				| comp_maskl[7][t1 & 0x7f];
-
-		de_keysr[15 - round] =
-		en_keysr[round] = comp_maskr[0][(t0 >> 21) & 0x7f]
-				| comp_maskr[1][(t0 >> 14) & 0x7f]
-				| comp_maskr[2][(t0 >> 7) & 0x7f]
-				| comp_maskr[3][t0 & 0x7f]
-				| comp_maskr[4][(t1 >> 21) & 0x7f]
-				| comp_maskr[5][(t1 >> 14) & 0x7f]
-				| comp_maskr[6][(t1 >> 7) & 0x7f]
-				| comp_maskr[7][t1 & 0x7f];
-	}
-	return(0);
-}
-
-static int
-do_des(	u_long l_in, u_long r_in, u_long *l_out, u_long *r_out, int count)
-{
-	/*
-	 *	l_in, r_in, l_out, and r_out are in pseudo-"big-endian" format.
-	 */
-	u_long	l, r, *kl, *kr, *kl1, *kr1;
-	u_long	f, r48l, r48r;
-	int	round;
-
-	if (count == 0) {
-		return(1);
-	} else if (count > 0) {
-		/*
-		 * Encrypting
-		 */
-		kl1 = en_keysl;
-		kr1 = en_keysr;
-	} else {
-		/*
-		 * Decrypting
-		 */
-		count = -count;
-		kl1 = de_keysl;
-		kr1 = de_keysr;
-	}
-
-	/*
-	 *	Do initial permutation (IP).
-	 */
-	l = ip_maskl[0][l_in >> 24]
-	  | ip_maskl[1][(l_in >> 16) & 0xff]
-	  | ip_maskl[2][(l_in >> 8) & 0xff]
-	  | ip_maskl[3][l_in & 0xff]
-	  | ip_maskl[4][r_in >> 24]
-	  | ip_maskl[5][(r_in >> 16) & 0xff]
-	  | ip_maskl[6][(r_in >> 8) & 0xff]
-	  | ip_maskl[7][r_in & 0xff];
-	r = ip_maskr[0][l_in >> 24]
-	  | ip_maskr[1][(l_in >> 16) & 0xff]
-	  | ip_maskr[2][(l_in >> 8) & 0xff]
-	  | ip_maskr[3][l_in & 0xff]
-	  | ip_maskr[4][r_in >> 24]
-	  | ip_maskr[5][(r_in >> 16) & 0xff]
-	  | ip_maskr[6][(r_in >> 8) & 0xff]
-	  | ip_maskr[7][r_in & 0xff];
-
-	while (count--) {
-		/*
-		 * Do each round.
-		 */
-		kl = kl1;
-		kr = kr1;
-		round = 16;
-		while (round--) {
-			/*
-			 * Expand R to 48 bits (simulate the E-box).
-			 */
-			r48l	= ((r & 0x00000001) << 23)
-				| ((r & 0xf8000000) >> 9)
-				| ((r & 0x1f800000) >> 11)
-				| ((r & 0x01f80000) >> 13)
-				| ((r & 0x001f8000) >> 15);
-
-			r48r	= ((r & 0x0001f800) << 7)
-				| ((r & 0x00001f80) << 5)
-				| ((r & 0x000001f8) << 3)
-				| ((r & 0x0000001f) << 1)
-				| ((r & 0x80000000) >> 31);
-			/*
-			 * Do salting for crypt() and friends, and
-			 * XOR with the permuted key.
-			 */
-			f = (r48l ^ r48r) & saltbits;
-			r48l ^= f ^ *kl++;
-			r48r ^= f ^ *kr++;
-			/*
-			 * Do sbox lookups (which shrink it back to 32 bits)
-			 * and do the pbox permutation at the same time.
-			 */
-			f = psbox[0][m_sbox[0][r48l >> 12]]
-			  | psbox[1][m_sbox[1][r48l & 0xfff]]
-			  | psbox[2][m_sbox[2][r48r >> 12]]
-			  | psbox[3][m_sbox[3][r48r & 0xfff]];
-			/*
-			 * Now that we've permuted things, complete f().
-			 */
-			f ^= l;
-			l = r;
-			r = f;
-		}
-		r = l;
-		l = f;
-	}
-	/*
-	 * Do final permutation (inverse of IP).
-	 */
-	*l_out	= fp_maskl[0][l >> 24]
-		| fp_maskl[1][(l >> 16) & 0xff]
-		| fp_maskl[2][(l >> 8) & 0xff]
-		| fp_maskl[3][l & 0xff]
-		| fp_maskl[4][r >> 24]
-		| fp_maskl[5][(r >> 16) & 0xff]
-		| fp_maskl[6][(r >> 8) & 0xff]
-		| fp_maskl[7][r & 0xff];
-	*r_out	= fp_maskr[0][l >> 24]
-		| fp_maskr[1][(l >> 16) & 0xff]
-		| fp_maskr[2][(l >> 8) & 0xff]
-		| fp_maskr[3][l & 0xff]
-		| fp_maskr[4][r >> 24]
-		| fp_maskr[5][(r >> 16) & 0xff]
-		| fp_maskr[6][(r >> 8) & 0xff]
-		| fp_maskr[7][r & 0xff];
-	return(0);
-}
-
-static int
-des_cipher(const char *in, char *out, long salt, int count)
-{
-	u_long	l_out, r_out, rawl, rawr;
-	int	retval;
-
-	if (!des_initialised)
-		des_init();
-
-	setup_salt(salt);
-
-	rawl = ntohl(*((u_long *) in)++);
-	rawr = ntohl(*((u_long *) in));
-
-	retval = do_des(rawl, rawr, &l_out, &r_out, count);
-
-	*((u_long *) out)++ = htonl(l_out);
-	*((u_long *) out) = htonl(r_out);
-	return(retval);
-}
-
-char *
-crypt(char *key, char *setting)
-{
-	int		i;
-	u_long		count, salt, l, r0, r1, keybuf[2];
-	u_char		*p, *q;
-	static u_char	output[21];
-
-	if (!strncmp(setting, "$1$", 3))
-		return crypt_md5(key, setting);
-
-	if (!des_initialised)
-		des_init();
-
-
-	/*
-	 * Copy the key, shifting each character up by one bit
-	 * and padding with zeros.
-	 */
-	q = (u_char *) keybuf;
-	while (q - (u_char *) keybuf - 8) {
-		if ((*q++ = *key << 1))
-			key++;
-	}
-	if (des_setkey((u_char *) keybuf))
-		return(NULL);
-
-	if (*setting == _PASSWORD_EFMT1) {
-		/*
-		 * "new"-style:
-		 *	setting - underscore, 4 bytes of count, 4 bytes of salt
-		 *	key - unlimited characters
-		 */
-		for (i = 1, count = 0L; i < 5; i++)
-			count |= ascii_to_bin(setting[i]) << (i - 1) * 6;
-
-		for (i = 5, salt = 0L; i < 9; i++)
-			salt |= ascii_to_bin(setting[i]) << (i - 5) * 6;
-
-		while (*key) {
-			/*
-			 * Encrypt the key with itself.
-			 */
-			if (des_cipher((u_char*)keybuf, (u_char*)keybuf, 0L, 1))
-				return(NULL);
-			/*
-			 * And XOR with the next 8 characters of the key.
-			 */
-			q = (u_char *) keybuf;
-			while (q - (u_char *) keybuf - 8 && *key)
-				*q++ ^= *key++ << 1;
-
-			if (des_setkey((u_char *) keybuf))
-				return(NULL);
-		}
-		strncpy(output, setting, 9);
-
-		/*
-		 * Double check that we weren't given a short setting.
-		 * If we were, the above code will probably have created
-		 * wierd values for count and salt, but we don't really care.
-		 * Just make sure the output string doesn't have an extra
-		 * NUL in it.
-		 */
-		output[9] = '\0';
-		p = output + strlen(output);
-	} else {
-		/*
-		 * "old"-style:
-		 *	setting - 2 bytes of salt
-		 *	key - up to 8 characters
-		 */
-		count = 25;
-
-		salt = (ascii_to_bin(setting[1]) << 6)
-		     |  ascii_to_bin(setting[0]);
-
-		output[0] = setting[0];
-		/*
-		 * If the encrypted password that the salt was extracted from
-		 * is only 1 character long, the salt will be corrupted.  We
-		 * need to ensure that the output string doesn't have an extra
-		 * NUL in it!
-		 */
-		output[1] = setting[1] ? setting[1] : output[0];
-
-		p = output + 2;
-	}
-	setup_salt(salt);
-	/*
-	 * Do it.
-	 */
-	if (do_des(0L, 0L, &r0, &r1, count))
-		return(NULL);
-	/*
-	 * Now encode the result...
-	 */
-	l = (r0 >> 8);
-	*p++ = ascii64[(l >> 18) & 0x3f];
-	*p++ = ascii64[(l >> 12) & 0x3f];
-	*p++ = ascii64[(l >> 6) & 0x3f];
-	*p++ = ascii64[l & 0x3f];
-
-	l = (r0 << 16) | ((r1 >> 16) & 0xffff);
-	*p++ = ascii64[(l >> 18) & 0x3f];
-	*p++ = ascii64[(l >> 12) & 0x3f];
-	*p++ = ascii64[(l >> 6) & 0x3f];
-	*p++ = ascii64[l & 0x3f];
-
-	l = r1 << 2;
-	*p++ = ascii64[(l >> 12) & 0x3f];
-	*p++ = ascii64[(l >> 6) & 0x3f];
-	*p++ = ascii64[l & 0x3f];
-	*p = 0;
-
-	return(output);
-}
diff --git a/secure/lib/libcrypt/test/Makefile b/secure/lib/libcrypt/test/Makefile
deleted file mode 100644
index 0ba817f88cd7..000000000000
--- a/secure/lib/libcrypt/test/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-#	Hacked Makefile to compile and run the DES-certification program,
-#	but not install anything.
-#
-# $FreeBSD$
-#
-LIBCRYPT= $(.OBJDIR)/libdescrypt.a
-
-#CFLAGS+= -DHAVE_CRYPT16
-
-TARGETS=cert speedcrypt
-
-all: ${TARGETS}
-
-test: all testcrypt testspeed
-
-testcrypt: cert
-	@./cert -c
-
-testspeed: cryptspeed
-
-cryptspeed: speedcrypt
-	@./speedcrypt 30 1
-	@./speedcrypt 30 1
-	@./speedcrypt 30 0
-	@./speedcrypt 30 0
-
-cert: cert.c ${LIBCRYPT}
-	$(CC) $(CFLAGS) -o cert ${.CURDIR}/cert.c ${LIBCRYPT}
-
-speedcrypt: speedcrypt.c ${LIBCRYPT}
-	$(CC) $(CFLAGS) -o speedcrypt ${.CURDIR}/speedcrypt.c ${LIBCRYPT}
-
-
-clean:
-	rm -f ${TARGETS}
-
-install:
-
-obj:
-
-.include <bsd.prog.mk>
diff --git a/secure/lib/libcrypt/test/README b/secure/lib/libcrypt/test/README
deleted file mode 100644
index eb6b0bebbc1d..000000000000
--- a/secure/lib/libcrypt/test/README
+++ /dev/null
@@ -1,10 +0,0 @@
-This directory contains test programs to certify DES operation and to
-time the crypt() call (of curiosity value).
-
-Simply type `make test` to run the tests.
-
-The normal `make all` and `make install` that get done during library building
-and installation will build these programs BUT NOT INSTALL THEM.  After all,
-they're only for testing...
-
-- David Burren, January 1994
diff --git a/secure/lib/libcrypt/test/cert.c b/secure/lib/libcrypt/test/cert.c
deleted file mode 100644
index 54c606c34d6b..000000000000
--- a/secure/lib/libcrypt/test/cert.c
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * This DES validation program shipped with FreeSec is derived from that
- * shipped with UFC-crypt which is apparently derived from one distributed
- * with Phil Karns PD DES package.
- *
- * $FreeBSD$
- */
-
-#include <stdio.h>
-
-int totfails = 0;
-
-char *crypt();
-#ifdef HAVE_CRYPT16
-char *crypt16();
-#endif /* HAVE_CRYPT16 */
-
-
-static struct crypt_test {
-	char	*key, *setting, *answer;
-} crypt_tests[] = {
-	"foob",			"ar",		"arlEKn0OzVJn.",
-	"holyhooplasbatman!",	"_X.......",	"_X.......N89y2Z.e4WU",
-	"holyhooplasbatman!",	"_X...X...",	"_X...X...rSUDQ5Na/QM",
-	"holyhooplasbatman!",	"_XX..X...",	"_XX..X...P8vb9xU4JAk",
-	"holyhooplasbatman!",	"_XX..XX..",	"_XX..XX..JDs5IlGLqT2",
-	"holyhooplasbatman!",	"_XX..XXa.",	"_XX..XXa.bFVsOnCNh8Y",
-	"holyhooplasbatman!",	"_XXa.X...",	"_XXa.X...Ghsb3QKNaps",
-#ifdef TAKES_TOO_LONG_ON_SOME_CRYPTS
-	"holyhooplasbatman!",	"_arararar",	"_ararararNGMzvpNjeCc",
-#endif
-	NULL, NULL, NULL,
-};
-
-
-static struct crypt_test crypt16_tests[] = {
-	"foob",			"ar",		"arxo23jZDD5AYbHbqoy9Dalg",
-	"holyhooplasbatman!",	"ar",		"arU5FRLJ3kxIoedlmyrOelEw",
-	NULL, NULL, NULL
-};
-
-
-void good_bye()
-{
-  if(totfails == 0) {
-    printf(" Passed validation\n");
-    exit(0);
-  } else {
-    printf(" %d failures during validation!!!\n", totfails);
-    exit(1);
-  }
-}
-
-
-void put8(cp)
-char *cp;
-{
-	int i,j,t;
-
-	for(i = 0; i < 8; i++){
-		t = 0;
-		for(j = 0; j < 8; j++)
-			t = t << 1 | *cp++;
-		printf("%02x", t);
-	}
-}
-
-
-void print_bits(bits)
-unsigned char *bits;
-{
-	int	i;
-
-	for (i = 0; i < 8; i++) {
-		printf("%02x", bits[i]);
-	}
-}
-
-
-int parse_line(buff, salt, key, plain, answer)
-char *buff;
-long *salt;
-char *key, *plain, *answer;
-{
-	char *ptr1, *ptr2;
-	int val;
-	int i,j,t;
-
-	/*
-	 * Extract salt
-	 */
-	if (sscanf(buff, "%lu", salt) != 1)
-		return(-1);
-	for (ptr2 = buff; *ptr2 && !isspace(*ptr2); ptr2++)
-		;
-
-	/*
-	 * Extract key
-	 */
-	for (ptr1 = ptr2; *ptr1 && isspace(*ptr1); ptr1++)
-		;
-	for (ptr2 = ptr1; *ptr2 && !isspace(*ptr2); ptr2++)
-		;
-	if (ptr2 - ptr1 != 16)
-		return(-1);
-	for (i = 0; i < 8; i++){
-		if (sscanf(ptr1 + 2*i, "%2x", &t) != 1)
-			return(-2);
-		for (j = 0; j < 8; j++)
-			*key++ = (t & 1 << (7 - j)) != 0;
-	}
-
-	/*
-	 * Extract plain
-	 */
-	for (ptr1 = ptr2; *ptr1 && isspace(*ptr1); ptr1++)
-		;
-	for (ptr2 = ptr1; *ptr2 && !isspace(*ptr2); ptr2++)
-		;
-	if (ptr2 - ptr1 != 16)
-		return(-1);
-	for (i = 0; i < 8; i++){
-		if (sscanf(ptr1 + 2*i, "%2x", &t) != 1)
-			return(-2);
-		for (j = 0; j < 8; j++)
-			*plain++ = (t & 1 << (7 - j)) != 0;
-	}
-
-	/*
-	 * Extract answer
-	 */
-	for (ptr1 = ptr2; *ptr1 && isspace(*ptr1); ptr1++)
-		;
-	for (ptr2 = ptr1; *ptr2 && !isspace(*ptr2); ptr2++)
-		;
-	if (ptr2 - ptr1 != 16)
-		return(-1);
-	for (i = 0; i < 8; i++){
-		if (sscanf(ptr1 + 2*i, "%2x", &t) != 1)
-			return(-2);
-		for (j = 0; j < 8; j++)
-			*answer++ = (t & 1 << (7 - j)) != 0;
-	}
-	return(0);
-}
-
-void bytes_to_bits(bytes, bits)
-char *bytes;
-unsigned char *bits;
-{
-	int	i, j;
-
-	for (i = 0; i < 8; i++) {
-		bits[i] = 0;
-		for (j = 0; j < 8; j++) {
-			bits[i] |= (bytes[i*8+j] & 1) << (7 - j);
-		}
-	}
-}
-
-
-
-/*
- *	Test the old-style crypt(), the new-style crypt(), and crypt16().
- */
-void test_crypt()
-{
-	char	*result;
-	struct crypt_test	*p;
-
-	printf("Testing crypt() family\n");
-
-	for (p = crypt_tests; p->key; p++) {
-		printf(" crypt(\"%s\", \"%s\"), \"%s\" expected",
-			p->key, p->setting, p->answer);
-		fflush(stdout);
-		result = crypt(p->key, p->setting);
-		if(!strcmp(result, p->answer)) {
-			printf(", OK\n");
-		} else {
-			printf("\n  failed (\"%s\")\n", result);
-			totfails++;
-		}
-	}
-
-#ifdef HAVE_CRYPT16
-	for (p = crypt16_tests; p->key; p++) {
-		printf(" crypt16(\"%s\", \"%s\"), \"%s\" expected",
-			p->key, p->setting, p->answer);
-		fflush(stdout);
-		result = crypt16(p->key, p->setting);
-		if(!strcmp(result, p->answer)) {
-			printf(", OK\n");
-		} else {
-			printf("\n  failed (\"%s\")\n", result);
-			totfails++;
-		}
-	}
-#endif /* HAVE_CRYPT16 */
-}
-
-main(argc, argv)
-int argc;
-char *argv[];
-{
-	test_crypt();
-	good_bye();
-}
diff --git a/secure/lib/libcrypt/test/cert.input b/secure/lib/libcrypt/test/cert.input
deleted file mode 100644
index e7c715c7a9d8..000000000000
--- a/secure/lib/libcrypt/test/cert.input
+++ /dev/null
@@ -1,179 +0,0 @@
-# $FreeBSD$
-#
-# Salt, key, plaintext, ciphertext
-#
-0 0101010101010101 95f8a5e5dd31d900 8000000000000000
-0 0101010101010101 dd7f121ca5015619 4000000000000000
-0 0101010101010101 2e8653104f3834ea 2000000000000000
-0 0101010101010101 4bd388ff6cd81d4f 1000000000000000
-0 0101010101010101 20b9e767b2fb1456 0800000000000000
-0 0101010101010101 55579380d77138ef 0400000000000000
-0 0101010101010101 6cc5defaaf04512f 0200000000000000
-0 0101010101010101 0d9f279ba5d87260 0100000000000000
-0 0101010101010101 d9031b0271bd5a0a 0080000000000000
-0 0101010101010101 424250b37c3dd951 0040000000000000
-0 0101010101010101 b8061b7ecd9a21e5 0020000000000000
-0 0101010101010101 f15d0f286b65bd28 0010000000000000
-0 0101010101010101 add0cc8d6e5deba1 0008000000000000
-0 0101010101010101 e6d5f82752ad63d1 0004000000000000
-0 0101010101010101 ecbfe3bd3f591a5e 0002000000000000
-0 0101010101010101 f356834379d165cd 0001000000000000
-0 0101010101010101 2b9f982f20037fa9 0000800000000000
-0 0101010101010101 889de068a16f0be6 0000400000000000
-0 0101010101010101 e19e275d846a1298 0000200000000000
-0 0101010101010101 329a8ed523d71aec 0000100000000000
-0 0101010101010101 e7fce22557d23c97 0000080000000000
-0 0101010101010101 12a9f5817ff2d65d 0000040000000000
-0 0101010101010101 a484c3ad38dc9c19 0000020000000000
-0 0101010101010101 fbe00a8a1ef8ad72 0000010000000000
-0 0101010101010101 750d079407521363 0000008000000000
-0 0101010101010101 64feed9c724c2faf 0000004000000000
-0 0101010101010101 f02b263b328e2b60 0000002000000000
-0 0101010101010101 9d64555a9a10b852 0000001000000000
-0 0101010101010101 d106ff0bed5255d7 0000000800000000
-0 0101010101010101 e1652c6b138c64a5 0000000400000000
-0 0101010101010101 e428581186ec8f46 0000000200000000
-0 0101010101010101 aeb5f5ede22d1a36 0000000100000000
-0 0101010101010101 e943d7568aec0c5c 0000000080000000
-0 0101010101010101 df98c8276f54b04b 0000000040000000
-0 0101010101010101 b160e4680f6c696f 0000000020000000
-0 0101010101010101 fa0752b07d9c4ab8 0000000010000000
-0 0101010101010101 ca3a2b036dbc8502 0000000008000000
-0 0101010101010101 5e0905517bb59bcf 0000000004000000
-0 0101010101010101 814eeb3b91d90726 0000000002000000
-0 0101010101010101 4d49db1532919c9f 0000000001000000
-0 0101010101010101 25eb5fc3f8cf0621 0000000000800000
-0 0101010101010101 ab6a20c0620d1c6f 0000000000400000
-0 0101010101010101 79e90dbc98f92cca 0000000000200000
-0 0101010101010101 866ecedd8072bb0e 0000000000100000
-0 0101010101010101 8b54536f2f3e64a8 0000000000080000
-0 0101010101010101 ea51d3975595b86b 0000000000040000
-0 0101010101010101 caffc6ac4542de31 0000000000020000
-0 0101010101010101 8dd45a2ddf90796c 0000000000010000
-0 0101010101010101 1029d55e880ec2d0 0000000000008000
-0 0101010101010101 5d86cb23639dbea9 0000000000004000
-0 0101010101010101 1d1ca853ae7c0c5f 0000000000002000
-0 0101010101010101 ce332329248f3228 0000000000001000
-0 0101010101010101 8405d1abe24fb942 0000000000000800
-0 0101010101010101 e643d78090ca4207 0000000000000400
-0 0101010101010101 48221b9937748a23 0000000000000200
-0 0101010101010101 dd7c0bbd61fafd54 0000000000000100
-0 0101010101010101 2fbc291a570db5c4 0000000000000080
-0 0101010101010101 e07c30d7e4e26e12 0000000000000040
-0 0101010101010101 0953e2258e8e90a1 0000000000000020
-0 0101010101010101 5b711bc4ceebf2ee 0000000000000010
-0 0101010101010101 cc083f1e6d9e85f6 0000000000000008
-0 0101010101010101 d2fd8867d50d2dfe 0000000000000004
-0 0101010101010101 06e7ea22ce92708f 0000000000000002
-0 0101010101010101 166b40b44aba4bd6 0000000000000001
-0 8001010101010101 0000000000000000 95a8d72813daa94d
-0 4001010101010101 0000000000000000 0eec1487dd8c26d5
-0 2001010101010101 0000000000000000 7ad16ffb79c45926
-0 1001010101010101 0000000000000000 d3746294ca6a6cf3
-0 0801010101010101 0000000000000000 809f5f873c1fd761
-0 0401010101010101 0000000000000000 c02faffec989d1fc
-0 0201010101010101 0000000000000000 4615aa1d33e72f10
-0 0180010101010101 0000000000000000 2055123350c00858
-0 0140010101010101 0000000000000000 df3b99d6577397c8
-0 0120010101010101 0000000000000000 31fe17369b5288c9
-0 0110010101010101 0000000000000000 dfdd3cc64dae1642
-0 0108010101010101 0000000000000000 178c83ce2b399d94
-0 0104010101010101 0000000000000000 50f636324a9b7f80
-0 0102010101010101 0000000000000000 a8468ee3bc18f06d
-0 0101800101010101 0000000000000000 a2dc9e92fd3cde92
-0 0101400101010101 0000000000000000 cac09f797d031287
-0 0101200101010101 0000000000000000 90ba680b22aeb525
-0 0101100101010101 0000000000000000 ce7a24f350e280b6
-0 0101080101010101 0000000000000000 882bff0aa01a0b87
-0 0101040101010101 0000000000000000 25610288924511c2
-0 0101020101010101 0000000000000000 c71516c29c75d170
-0 0101018001010101 0000000000000000 5199c29a52c9f059
-0 0101014001010101 0000000000000000 c22f0a294a71f29f
-0 0101012001010101 0000000000000000 ee371483714c02ea
-0 0101011001010101 0000000000000000 a81fbd448f9e522f
-0 0101010801010101 0000000000000000 4f644c92e192dfed
-0 0101010401010101 0000000000000000 1afa9a66a6df92ae
-0 0101010201010101 0000000000000000 b3c1cc715cb879d8
-0 0101010180010101 0000000000000000 19d032e64ab0bd8b
-0 0101010140010101 0000000000000000 3cfaa7a7dc8720dc
-0 0101010120010101 0000000000000000 b7265f7f447ac6f3
-0 0101010110010101 0000000000000000 9db73b3c0d163f54
-0 0101010108010101 0000000000000000 8181b65babf4a975
-0 0101010104010101 0000000000000000 93c9b64042eaa240
-0 0101010102010101 0000000000000000 5570530829705592
-0 0101010101800101 0000000000000000 8638809e878787a0
-0 0101010101400101 0000000000000000 41b9a79af79ac208
-0 0101010101200101 0000000000000000 7a9be42f2009a892
-0 0101010101100101 0000000000000000 29038d56ba6d2745
-0 0101010101080101 0000000000000000 5495c6abf1e5df51
-0 0101010101040101 0000000000000000 ae13dbd561488933
-0 0101010101020101 0000000000000000 024d1ffa8904e389
-0 0101010101018001 0000000000000000 d1399712f99bf02e
-0 0101010101014001 0000000000000000 14c1d7c1cffec79e
-0 0101010101012001 0000000000000000 1de5279dae3bed6f
-0 0101010101011001 0000000000000000 e941a33f85501303
-0 0101010101010801 0000000000000000 da99dbbc9a03f379
-0 0101010101010401 0000000000000000 b7fc92f91d8e92e9
-0 0101010101010201 0000000000000000 ae8e5caa3ca04e85
-0 0101010101010180 0000000000000000 9cc62df43b6eed74
-0 0101010101010140 0000000000000000 d863dbb5c59a91a0
-0 0101010101010120 0000000000000000 a1ab2190545b91d7
-0 0101010101010110 0000000000000000 0875041e64c570f7
-0 0101010101010108 0000000000000000 5a594528bebef1cc
-0 0101010101010104 0000000000000000 fcdb3291de21f0c0
-0 0101010101010102 0000000000000000 869efd7f9f265a09
-0 1046913489980131 0000000000000000 88d55e54f54c97b4
-0 1007103489988020 0000000000000000 0c0cc00c83ea48fd
-0 10071034c8980120 0000000000000000 83bc8ef3a6570183
-0 1046103489988020 0000000000000000 df725dcad94ea2e9
-0 1086911519190101 0000000000000000 e652b53b550be8b0
-0 1086911519580101 0000000000000000 af527120c485cbb0
-0 5107b01519580101 0000000000000000 0f04ce393db926d5
-0 1007b01519190101 0000000000000000 c9f00ffc74079067
-0 3107915498080101 0000000000000000 7cfd82a593252b4e
-0 3107919498080101 0000000000000000 cb49a2f9e91363e3
-0 10079115b9080140 0000000000000000 00b588be70d23f56
-0 3107911598080140 0000000000000000 406a9a6ab43399ae
-0 1007d01589980101 0000000000000000 6cb773611dca9ada
-0 9107911589980101 0000000000000000 67fd21c17dbb5d70
-0 9107d01589190101 0000000000000000 9592cb4110430787
-0 1007d01598980120 0000000000000000 a6b7ff68a318ddd3
-0 1007940498190101 0000000000000000 4d102196c914ca16
-0 0107910491190401 0000000000000000 2dfa9f4573594965
-0 0107910491190101 0000000000000000 b46604816c0e0774
-0 0107940491190401 0000000000000000 6e7e6221a4f34e87
-0 19079210981a0101 0000000000000000 aa85e74643233199
-0 1007911998190801 0000000000000000 2e5a19db4d1962d6
-0 10079119981a0801 0000000000000000 23a866a809d30894
-0 1007921098190101 0000000000000000 d812d961f017d320
-0 100791159819010b 0000000000000000 055605816e58608f
-0 1004801598190101 0000000000000000 abd88e8b1b7716f1
-0 1004801598190102 0000000000000000 537ac95be69da1e1
-0 1004801598190108 0000000000000000 aed0f6ae3c25cdd8
-0 1002911598100104 0000000000000000 b3e35a5ee53e7b8d
-0 1002911598190104 0000000000000000 61c79c71921a2ef8
-0 1002911598100201 0000000000000000 e2f5728f0995013c
-0 1002911698100101 0000000000000000 1aeac39a61f0a464
-0 7ca110454a1a6e57 01a1d6d039776742 690f5b0d9a26939b
-0 0131d9619dc1376e 5cd54ca83def57da 7a389d10354bd271
-0 07a1133e4a0b2686 0248d43806f67172 868ebb51cab4599a
-0 3849674c2602319e 51454b582ddf440a 7178876e01f19b2a
-0 04b915ba43feb5b6 42fd443059577fa2 af37fb421f8c4095
-0 0113b970fd34f2ce 059b5e0851cf143a 86a560f10ec6d85b
-0 0170f175468fb5e6 0756d8e0774761d2 0cd3da020021dc09
-0 43297fad38e373fe 762514b829bf486a ea676b2cb7db2b7a
-0 07a7137045da2a16 3bdd119049372802 dfd64a815caf1a0f
-0 04689104c2fd3b2f 26955f6835af609a 5c513c9c4886c088
-0 37d06bb516cb7546 164d5e404f275232 0a2aeeae3ff4ab77
-0 1f08260d1ac2465e 6b056e18759f5cca ef1bf03e5dfa575a
-0 584023641aba6176 004bd6ef09176062 88bf0db6d70dee56
-0 025816164629b007 480d39006ee762f2 a1f9915541020b56
-0 49793ebc79b3258f 437540c8698f3cfa 6fbf1cafcffd0556
-0 4fb05e1515ab73a7 072d43a077075292 2f22e49bab7ca1ac
-0 49e95d6d4ca229bf 02fe55778117f12a 5a6b612cc26cce4a
-0 018310dc409b26d6 1d9d5c5018f728c2 5f4c038ed12b2e41
-0 1c587f1c13924fef 305532286d6f295a 63fac0d034d9f793
-1 1c587f1c13924fef 305532286d6f295a 400d307ca24fee60
-57 1c587f1c13924fef 305532286d6f295a 28b568f40e7d43ae
-1 8001010101010101 0000000000000000 f501029f268e45dc
-0 1c587f1c13924fef 305532286d6f295a 63fac0d034d9f793
diff --git a/secure/lib/libcrypt/test/speedcrypt.c b/secure/lib/libcrypt/test/speedcrypt.c
deleted file mode 100644
index f7507fd789f0..000000000000
--- a/secure/lib/libcrypt/test/speedcrypt.c
+++ /dev/null
@@ -1,76 +0,0 @@
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <signal.h>
-#include <stdio.h>
-
-int		keep_going, count, alternate, seconds;
-struct rusage	prior, now;
-
-void
-finish()
-{
-	keep_going = 0;
-}
-
-
-main(int argc, char *argv[])
-{
-	struct itimerval itv;
-	u_long		msecs, key1[8], key2[8];
-	char		*k1, *k2;
-
-	if (argc < 2 || sscanf(argv[1], "%d", &seconds) != 1)
-		seconds = 20;
-
-	if (argc < 3 || sscanf(argv[2], "%d", &alternate) != 1)
-		alternate = 0;
-
-	printf ("Running crypt%s for %d seconds of vtime...\n",
-		alternate ? " with alternate keys" : "", seconds);
-
-	bzero(&itv, sizeof (itv));
-	signal (SIGVTALRM, finish);
-	itv.it_value.tv_sec = seconds;
-	itv.it_value.tv_usec = 0;
-	setitimer(ITIMER_VIRTUAL, &itv, NULL);
-
-	keep_going = 1;
-	if (getrusage(0, &prior) < 0) {
-		perror("getrusage");
-		exit(1);
-	}
-
-	k1 = (char *) key1;
-	k2 = (char *) key2;
-	strcpy(k1, "fredfredfredfredfred");
-	strcpy(k2, "joejoejoejoejoejoejo");
-
-	if (alternate)
-		for (count = 0; keep_going; count++)
-		{
-#if defined(LONGCRYPT)
-			crypt((count & 1) ? k1 : k2, "_ara.X...");
-#else
-			crypt((count & 1) ? k1 : k2, "eek");
-#endif
-		}
-	else
-		for (count = 0; keep_going; count++)
-		{
-#if defined(LONGCRYPT)
-			crypt(k1, "_ara.X...");
-#else
-			crypt(k1, "eek");
-#endif
-		}
-
-	if (getrusage(0, &now) < 0) {
-		perror("getrusage");
-		exit(1);
-	}
-	msecs = (now.ru_utime.tv_sec - prior.ru_utime.tv_sec) * 1000
-	      + (now.ru_utime.tv_usec - prior.ru_utime.tv_usec) / 1000;
-	printf ("\tDid %d crypt()s per second.\n", 1000 * count / msecs);
-	exit(0);
-}
diff --git a/secure/lib/libdes/COPYRIGHT b/secure/lib/libdes/COPYRIGHT
deleted file mode 100644
index 32f8fb0cf73f..000000000000
--- a/secure/lib/libdes/COPYRIGHT
+++ /dev/null
@@ -1,50 +0,0 @@
-Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
-All rights reserved.
-
-This package is an DES implementation written by Eric Young (eay@mincom.oz.au).
-The implementation was written so as to conform with MIT's libdes.
-
-This library is free for commercial and non-commercial use as long as
-the following conditions are aheared to.  The following conditions
-apply to all code found in this distribution.
-
-Copyright remains Eric Young's, and as such any Copyright notices in
-the code are not to be removed.
-If this package is used in a product, Eric Young should be given attribution
-as the author of that the SSL library.  This can be in the form of a textual
-message at program startup or in documentation (online or textual) provided
-with the package.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement:
-   This product includes software developed by Eric Young (eay@mincom.oz.au)
-
-THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-The license and distribution terms for any publically available version or
-derivative of this code cannot be changed.  i.e. this code cannot simply be
-copied and put under another distrubution license
-[including the GNU Public License.]
-
-The reason behind this being stated in this direct manner is past
-experience in code simply being copied and the attribution removed
-from it and then being distributed as part of other packages. This
-implementation was a non-trivial and unpaid effort.
diff --git a/secure/lib/libdes/DES.pm b/secure/lib/libdes/DES.pm
deleted file mode 100644
index 6a175b6ca4b0..000000000000
--- a/secure/lib/libdes/DES.pm
+++ /dev/null
@@ -1,19 +0,0 @@
-package DES;
-
-require Exporter;
-require DynaLoader;
-@ISA = qw(Exporter DynaLoader);
-# Items to export into callers namespace by default
-# (move infrequently used names to @EXPORT_OK below)
-@EXPORT = qw(
-);
-# Other items we are prepared to export if requested
-@EXPORT_OK = qw(
-crypt
-);
-
-# Preloaded methods go here.  Autoload methods go after __END__, and are
-# processed by the autosplit program.
-bootstrap DES;
-1;
-__END__
diff --git a/secure/lib/libdes/DES.pod b/secure/lib/libdes/DES.pod
deleted file mode 100644
index 8a739e7ca0d0..000000000000
--- a/secure/lib/libdes/DES.pod
+++ /dev/null
@@ -1,16 +0,0 @@
-crypt	<= 	crypt(buf,salt)
-key	<=	set_odd_parity(key)
-int	<=	is_weak_key(key)
-keysched<=	set_key(key)
-key	<=	ecb_encrypt(string8,ks,enc)
-key	<=	ecb3_encrypt(input,ks1,ks2,enc)
-string	<=	cbc_encrypt(input,ks,ivec,enc)			=> ivec 
-string	<=	cbc3_encrypt(input,ks1,ks2,ivec1,ivec2,enc)	=> ivec1&ivec2 
-ck1,ck2	<=	cbc_cksum(input,ks,ivec)			=> ivec
-string	<=	pcbc_encrypt(input,ks,ivec,enc)			=> ivec 
-string	<=	ofb_encrypt(input,numbits,ks,ivec)		=> ivec
-string	<=	cfb_encrypt(input,numbits,ks,ivec,enc)		=> ivec
-key	<=	random_key()
-key	<=	string_to_key(string)
-key1,key2<=	string_to_2keys(string)
-
diff --git a/secure/lib/libdes/DES.xs b/secure/lib/libdes/DES.xs
deleted file mode 100644
index def220b36b1d..000000000000
--- a/secure/lib/libdes/DES.xs
+++ /dev/null
@@ -1,268 +0,0 @@
-#include "EXTERN.h"
-#include "perl.h"
-#include "XSUB.h"
-#include "des.h"
-
-#define deschar	char
-static STRLEN len;
-
-static int
-not_here(s)
-char *s;
-{
-    croak("%s not implemented on this architecture", s);
-    return -1;
-}
-
-MODULE = DES	PACKAGE = DES	PREFIX = des_
-
-char *
-des_crypt(buf,salt)
-	char *	buf
-	char *	salt
-
-void
-des_set_odd_parity(key)
-	des_cblock *	key
-PPCODE:
-	{
-	SV *s;
-
-	s=sv_newmortal();
-	sv_setpvn(s,(char *)key,8);
-	des_set_odd_parity((des_cblock *)SvPV(s,na));
-	PUSHs(s);
-	}
-
-int
-des_is_weak_key(key)
-	des_cblock *	key
-
-des_key_schedule
-des_set_key(key)
-	des_cblock *	key
-CODE:
-	des_set_key(key,RETVAL);
-OUTPUT:
-RETVAL
-
-des_cblock
-des_ecb_encrypt(input,ks,encrypt)
-	des_cblock *	input
-	des_key_schedule *	ks
-	int	encrypt
-CODE:
-	des_ecb_encrypt(input,&RETVAL,*ks,encrypt);
-OUTPUT:
-RETVAL
-
-void
-des_cbc_encrypt(input,ks,ivec,encrypt)
-	char *	input
-	des_key_schedule *	ks
-	des_cblock *	ivec
-	int	encrypt
-PPCODE:
-	{
-	SV *s;
-	STRLEN len,l;
-	char *c;
-
-	l=SvCUR(ST(0));
-	len=((((unsigned long)l)+7)/8)*8;
-	s=sv_newmortal();
-	sv_setpvn(s,"",0);
-	SvGROW(s,len);
-	SvCUR_set(s,len);
-	c=(char *)SvPV(s,na);
-	des_cbc_encrypt((des_cblock *)input,(des_cblock *)c,
-		l,*ks,ivec,encrypt);
-	sv_setpvn(ST(2),(char *)c[len-8],8);
-	PUSHs(s);
-	}
-
-void
-des_cbc3_encrypt(input,ks1,ks2,ivec1,ivec2,encrypt)
-	char *	input
-	des_key_schedule *	ks1
-	des_key_schedule *	ks2
-	des_cblock *	ivec1
-	des_cblock *	ivec2
-	int	encrypt
-PPCODE:
-	{
-	SV *s;
-	STRLEN len,l;
-
-	l=SvCUR(ST(0));
-	len=((((unsigned long)l)+7)/8)*8;
-	s=sv_newmortal();
-	sv_setpvn(s,"",0);
-	SvGROW(s,len);
-	SvCUR_set(s,len);
-	des_3cbc_encrypt((des_cblock *)input,(des_cblock *)SvPV(s,na),
-		l,*ks1,*ks2,ivec1,ivec2,encrypt);
-	sv_setpvn(ST(3),(char *)ivec1,8);
-	sv_setpvn(ST(4),(char *)ivec2,8);
-	PUSHs(s);
-	}
-
-void
-des_cbc_cksum(input,ks,ivec)
-	char *	input
-	des_key_schedule *	ks
-	des_cblock *	ivec
-PPCODE:
-	{
-	SV *s1,*s2;
-	STRLEN len,l;
-	des_cblock c;
-	unsigned long i1,i2;
-
-	s1=sv_newmortal();
-	s2=sv_newmortal();
-	l=SvCUR(ST(0));
-	des_cbc_cksum((des_cblock *)input,(des_cblock *)c,
-		l,*ks,ivec);
-	i1=c[4]|(c[5]<<8)|(c[6]<<16)|(c[7]<<24);
-	i2=c[0]|(c[1]<<8)|(c[2]<<16)|(c[3]<<24);
-	sv_setiv(s1,i1);
-	sv_setiv(s2,i2);
-	sv_setpvn(ST(2),(char *)c,8);
-	PUSHs(s1);
-	PUSHs(s2);
-	}
-
-void
-des_cfb_encrypt(input,numbits,ks,ivec,encrypt)
-	char *	input
-	int	numbits
-	des_key_schedule *	ks
-	des_cblock *	ivec
-	int	encrypt
-PPCODE:
-	{
-	SV *s;
-	STRLEN len;
-	char *c;
-
-	len=SvCUR(ST(0));
-	s=sv_newmortal();
-	sv_setpvn(s,"",0);
-	SvGROW(s,len);
-	SvCUR_set(s,len);
-	c=(char *)SvPV(s,na);
-	des_cfb_encrypt((unsigned char *)input,(unsigned char *)c,
-		(int)numbits,(long)len,*ks,ivec,encrypt);
-	sv_setpvn(ST(3),(char *)ivec,8);
-	PUSHs(s);
-	}
-
-des_cblock *
-des_ecb3_encrypt(input,ks1,ks2,encrypt)
-	des_cblock *	input
-	des_key_schedule *	ks1
-	des_key_schedule *	ks2
-	int	encrypt
-CODE:
-	{
-	des_cblock c;
-
-	des_3ecb_encrypt((des_cblock *)input,(des_cblock *)&c,
-		*ks1,*ks2,encrypt);
-	RETVAL= &c;
-	}
-OUTPUT:
-RETVAL
-
-void
-des_ofb_encrypt(input,numbits,ks,ivec)
-	unsigned char *	input
-	int	numbits
-	des_key_schedule *	ks
-	des_cblock *	ivec
-PPCODE:
-	{
-	SV *s;
-	STRLEN len,l;
-	unsigned char *c;
-
-	len=SvCUR(ST(0));
-	s=sv_newmortal();
-	sv_setpvn(s,"",0);
-	SvGROW(s,len);
-	SvCUR_set(s,len);
-	c=(unsigned char *)SvPV(s,na);
-	des_ofb_encrypt((unsigned char *)input,(unsigned char *)c,
-		numbits,len,*ks,ivec);
-	sv_setpvn(ST(3),(char *)ivec,8);
-	PUSHs(s);
-	}
-
-void
-des_pcbc_encrypt(input,ks,ivec,encrypt)
-	char *	input
-	des_key_schedule *	ks
-	des_cblock *	ivec
-	int	encrypt
-PPCODE:
-	{
-	SV *s;
-	STRLEN len,l;
-	char *c;
-
-	l=SvCUR(ST(0));
-	len=((((unsigned long)l)+7)/8)*8;
-	s=sv_newmortal();
-	sv_setpvn(s,"",0);
-	SvGROW(s,len);
-	SvCUR_set(s,len);
-	c=(char *)SvPV(s,na);
-	des_pcbc_encrypt((des_cblock *)input,(des_cblock *)c,
-		l,*ks,ivec,encrypt);
-	sv_setpvn(ST(2),(char *)c[len-8],8);
-	PUSHs(s);
-	}
-
-des_cblock *
-des_random_key()
-CODE:
-	{
-	des_cblock c;
-
-	des_random_key(c);
-	RETVAL=&c;
-	}
-OUTPUT:
-RETVAL
-
-des_cblock *
-des_string_to_key(str)
-char *	str
-CODE:
-	{
-	des_cblock c;
-
-	des_string_to_key(str,&c);
-	RETVAL=&c;
-	}
-OUTPUT:
-RETVAL
-
-void
-des_string_to_2keys(str)
-char *	str
-PPCODE:
-	{
-	des_cblock c1,c2;
-	SV *s1,*s2;
-
-	des_string_to_2keys(str,&c1,&c2);
-	EXTEND(sp,2);
-	s1=sv_newmortal();
-	sv_setpvn(s1,(char *)c1,8);
-	s2=sv_newmortal();
-	sv_setpvn(s2,(char *)c2,8);
-	PUSHs(s1);
-	PUSHs(s2);
-	}
diff --git a/secure/lib/libdes/FILES b/secure/lib/libdes/FILES
deleted file mode 100644
index 4c7ea2de7a06..000000000000
--- a/secure/lib/libdes/FILES
+++ /dev/null
@@ -1,96 +0,0 @@
-/* General stuff */
-COPYRIGHT	- Copyright info.
-MODES.DES	- A description of the features of the different modes of DES.
-FILES		- This file.
-INSTALL		- How to make things compile.
-Imakefile	- For use with kerberos.
-README		- What this package is.
-VERSION		- Which version this is and what was changed.
-KERBEROS	- Kerberos version 4 notes.
-Makefile.PL	- An old makefile to build with perl5, not current.
-Makefile.ssl	- The SSLeay makefile
-Makefile.uni	- The normal unix makefile.
-GNUmakefile	- The makefile for use with glibc.
-makefile.bc	- A Borland C makefile
-times		- Some outputs from 'speed' on some machines.
-vms.com		- For use when compiling under VMS
-
-/* My SunOS des(1) replacement */
-des.c		- des(1) source code.
-des.man		- des(1) manual.
-
-/* Testing and timing programs. */
-destest.c	- Source for libdes.a test program.
-speed.c		- Source for libdes.a timing program.
-rpw.c		- Source for libdes.a testing password reading routines.
-
-/* libdes.a source code */
-des_crypt.man	- libdes.a manual page.
-des.h		- Public libdes.a header file.
-ecb_enc.c	- des_ecb_encrypt() source, this contains the basic DES code.
-ecb3_enc.c	- des_ecb3_encrypt() source.
-cbc_ckm.c	- des_cbc_cksum() source.
-cbc_enc.c	- des_cbc_encrypt() source.
-ncbc_enc.c	- des_cbc_encrypt() that is 'normal' in that it copies
-		  the new iv values back in the passed iv vector.
-ede_enc.c	- des_ede3_cbc_encrypt() cbc mode des using triple DES.
-cbc3_enc.c	- des_3cbc_encrypt() source, don't use this function.
-cfb_enc.c	- des_cfb_encrypt() source.
-cfb64enc.c	- des_cfb64_encrypt() cfb in 64 bit mode but setup to be
-		  used as a stream cipher.
-cfb64ede.c	- des_ede3_cfb64_encrypt() cfb in 64 bit mode but setup to be
-		  used as a stream cipher and using triple DES.
-ofb_enc.c	- des_cfb_encrypt() source.
-ofb64_enc.c	- des_ofb_encrypt() ofb in 64 bit mode but setup to be
-		  used as a stream cipher.
-ofb64ede.c	- des_ede3_ofb64_encrypt() ofb in 64 bit mode but setup to be
-		  used as a stream cipher and using triple DES.
-enc_read.c	- des_enc_read() source.
-enc_writ.c	- des_enc_write() source.
-pcbc_enc.c	- des_pcbc_encrypt() source.
-qud_cksm.c	- quad_cksum() source.
-rand_key.c	- des_random_key() source.
-read_pwd.c	- Source for des_read_password() plus related functions.
-set_key.c	- Source for des_set_key().
-str2key.c	- Covert a string of any length into a key.
-fcrypt.c	- A small, fast version of crypt(3).
-des_locl.h	- Internal libdes.a header file.
-podd.h		- Odd parity tables - used in des_set_key().
-sk.h		- Lookup tables used in des_set_key().
-spr.h		- What is left of the S tables - used in ecb_encrypt().
-des_ver.h	- header file for the external definition of the
-		  version string.
-des.doc		- SSLeay documentation for the library.
-
-/* The perl scripts - you can ignore these files they are only
- * included for the curious */
-des.pl		- des in perl anyone? des_set_key and des_ecb_encrypt
-		  both done in a perl library.
-testdes.pl	- Testing program for des.pl
-doIP		- Perl script used to develop IP xor/shift code.
-doPC1		- Perl script used to develop PC1 xor/shift code.
-doPC2		- Generates sk.h.
-PC1		- Output of doPC1 should be the same as output from PC1.
-PC2		- used in development of doPC2.
-shifts.pl	- Perl library used by my perl scripts.
-
-/* I started making a perl5 dynamic library for libdes
- * but did not fully finish, these files are part of that effort. */
-DES.pm
-DES.pod
-DES.xs
-t
-typemap
-
-/* The following are for use with sun RPC implementaions. */
-rpc_des.h
-rpc_enc.c
-
-/* The following are contibuted by Mark Murray <mark@grondar.za>.  They
- * are not normally built into libdes due to machine specific routines
- * contained in them.  They are for use in the most recent incarnation of
- * export kerberos v 4 (eBones). */
-supp.c
-new_rkey.c
-
-
diff --git a/secure/lib/libdes/GNUmakefile b/secure/lib/libdes/GNUmakefile
deleted file mode 100644
index 5863b9063fe9..000000000000
--- a/secure/lib/libdes/GNUmakefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# This was GNUmakefile
-# I have changed the library a bit since I was last able to test the
-# build so this may require a little tweaking.
-# have fun.
-
-ifeq ($(wildcard ../Rules),)
-# no glibc
-include Makefile.uni
-else
-# We are part of glibc
-default_cflags:= -O2
-subdir := des
-headers:= des.h rpc_des.h
-
-routines:= $(destest)
-	cbc3_enc cbc_cksm cbc_enc  cfb64enc cfb_enc  \
-	ecb3_enc ecb_enc  ede_enc  enc_read enc_writ \
-	fcrypt   ncbc_enc ofb64enc ofb_enc  pcbc_enc \
-	qud_cksm rand_key read_pwd rpc_enc  set_key  \
-	str2key  cfb64ede ofb64ede supp
-distribute:= ARTISTIC COPYRIGHT FILES INSTALL Imakefile README VERSION \
-	GNUmakefile times vms.com KERBEROS MODES.DES \
-	des.man des_crypt.man \
-	des_ver.h des_locl.h podd.h sk.h spr.h \
-	des.pl testdes.pl doIP doPC1 doPC2 PC1 PC2 shifts.pl \
-	des.doc makefile.bc
-
-tests:= destest speed
-override +gccwarn := -w
-others:= des rpw
-install:= des
-
-include ../Rules
-endif
-
diff --git a/secure/lib/libdes/INSTALL b/secure/lib/libdes/INSTALL
deleted file mode 100644
index c8cc5bebd6e2..000000000000
--- a/secure/lib/libdes/INSTALL
+++ /dev/null
@@ -1,57 +0,0 @@
-Check the CC and CFLAGS lines in the makefile
-
-If your C library does not support the times(3) function, change the
-#define TIMES to
-#undef TIMES in speed.c
-If it does, check the HZ value for the times(3) function.
-If your system does not define CLK_TCK it will be assumed to
-be 100.0.
-
-If possible use gcc v 2.7.?
-Turn on the maximum optimising (normally '-O3 -fomit-frame-pointer' for gcc)
-
-type 'make'
-
-run './destest' to check things are ok.
-run './rpw' to check the tty code for reading passwords works.
-run './speed' to see how fast those optimisations make the library run :-)
-
-A make install will by default install
-libdes.a      in /usr/local/lib/libdes.a
-des           in /usr/local/bin/des
-des_crypt.man in /usr/local/man/man3/des_crypt.3
-des.man       in /usr/local/man/man1/des.1
-des.h         in /usr/include/des.h
-
-des(1) should be compatible with sunOS's but I have been unable to
-test it.
-
-These routines should compile on MSDOS, most 32bit and 64bit version
-of Unix (BSD and SYSV) and VMS, without modification.
-The only problems should be #include files that are in the wrong places.
-
-These routines can be compiled under MSDOS.
-I have successfully encrypted files using des(1) under MSDOS and then
-decrypted the files on a SparcStation.
-I have been able to compile and test the routines with
-Microsoft C v 5.1 and Turbo C v 2.0.
-The code in this library is in no way optimised for the 16bit
-operation of MSDOS.  Microsoft C generates code that is 40% slower
-than Turbo C's code.  I believe this is due to problems it has with
-code generation with the 32bit shift operation in the IP and FP
-sections.  I have added some 16bit optimization in ecb_encrypt.c
-and this generated a %70 speedup under Turbo C.  Such are the
-limitations of DOS compilers :-(.
-
-For Turbo C v 2.0, make sure to define MSDOS, in the relevant menu.
-
-There is an alternative version of the D_ENCRYPT macro that can be
-enabled with the -DDES_USE_PTR option in the makefile.  This alternative
-macro can make a +-%20 speed difference to the DES encryption speed,
-depending on the compiler/CPU combinations.
-It has its greatest effect on Sparc machines when using the sun compiler.
-If in doubt, try enable/disable it and running speed.  It does not
-seem to affect gcc much.
-
-When building for glibc, ignore all of the above and just unpack into
-glibc-1.??/des and then gmake as per normal.
diff --git a/secure/lib/libdes/Imakefile b/secure/lib/libdes/Imakefile
deleted file mode 100644
index c4592f23a167..000000000000
--- a/secure/lib/libdes/Imakefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# This Imakefile has not been tested for a while but it should still
-# work when placed in the correct directory in the kerberos v 4 distribution
-
-SRCS=   cbc_cksm.c cbc_enc.c ecb_enc.c pcbc_enc.c \
-        qud_cksm.c rand_key.c read_pwd.c set_key.c str2key.c \
-        enc_read.c enc_writ.c fcrypt.c cfb_enc.c \
-	3ecb_enc.c ofb_enc.c ofb64enc.c
-
-OBJS=   cbc_cksm.o cbc_enc.o ecb_enc.o pcbc_enc.o \
-	qud_cksm.o rand_key.o read_pwd.o set_key.o str2key.o \
-	enc_read.o enc_writ.o fcrypt.o cfb_enc.o \
-	3ecb_enc.o ofb_enc.o ofb64enc.o
-
-GENERAL=COPYRIGHT FILES INSTALL Imakefile README VERSION makefile times \
-	vms.com KERBEROS
-DES=    des.c des.man
-TESTING=destest.c speed.c rpw.c
-LIBDES= des_crypt.man des.h des_locl.h podd.h sk.h spr.h
-
-PERL=   des.pl testdes.pl doIP doPC1 doPC2 PC1 PC2 shifts.pl
-
-CODE=    $(GENERAL) $(DES) $(TESTING) $(SRCS) $(LIBDES) $(PERL)
-
-SRCDIR=$(SRCTOP)/lib/des
-
-DBG= -O
-INCLUDE= -I$(SRCDIR)
-CC= cc
-
-library_obj_rule()
-
-install_library_target(des,$(OBJS),$(SRCS),)
-
-test(destest,libdes.a,)
-test(rpw,libdes.a,)
diff --git a/secure/lib/libdes/KERBEROS b/secure/lib/libdes/KERBEROS
deleted file mode 100644
index f401b10014ff..000000000000
--- a/secure/lib/libdes/KERBEROS
+++ /dev/null
@@ -1,41 +0,0 @@
- [ This is an old file, I don't know if it is true anymore
-   but I will leave the file here - eay 21/11/95 ]
-
-To use this library with Bones (kerberos without DES):
-1) Get my modified Bones - eBones.  It can be found on
-   gondwana.ecr.mu.oz.au (128.250.1.63) /pub/athena/eBones-p9.tar.Z
-   and
-   nic.funet.fi (128.214.6.100) /pub/unix/security/Kerberos/eBones-p9.tar.Z
-
-2) Unpack this library in src/lib/des, makeing sure it is version
-   3.00 or greater (libdes.tar.93-10-07.Z).  This versions differences
-   from the version in comp.sources.misc volume 29 patchlevel2.
-   The primarily difference is that it should compile under kerberos :-).
-   It can be found at.
-   ftp.psy.uq.oz.au (130.102.32.1) /pub/DES/libdes.tar.93-10-07.Z
-
-Now do a normal kerberos build and things should work.
-
-One problem I found when I was build on my local sun.
----
-For sunOS 4.1.1 apply the following patch to src/util/ss/make_commands.c
-
-*** make_commands.c.orig	Fri Jul  3 04:18:35 1987
---- make_commands.c	Wed May 20 08:47:42 1992
-***************
-*** 98,104 ****
-       if (!rename(o_file, z_file)) {
-  	  if (!vfork()) {
-  	       chdir("/tmp");
-! 	       execl("/bin/ld", "ld", "-o", o_file+5, "-s", "-r", "-n",
-  		     z_file+5, 0);
-  	       perror("/bin/ld");
-  	       _exit(1);
---- 98,104 ----
-       if (!rename(o_file, z_file)) {
-  	  if (!vfork()) {
-  	       chdir("/tmp");
-! 	       execl("/bin/ld", "ld", "-o", o_file+5, "-s", "-r",
-  		     z_file+5, 0);
-  	       perror("/bin/ld");
-  	       _exit(1);
diff --git a/secure/lib/libdes/MODES.DES b/secure/lib/libdes/MODES.DES
deleted file mode 100644
index 18934b56c335..000000000000
--- a/secure/lib/libdes/MODES.DES
+++ /dev/null
@@ -1,84 +0,0 @@
-Modes of DES
-Quite a bit of the following information has been taken from
-	AS 2805.5.2
-	Australian Standard
-	Electronic funds transfer - Requirements for interfaces,
-	Part 5.2: Modes of operation for an n-bit block cipher algorithm
-	Appendix A
-
-There are several different modes in which DES can be used, they are
-as follows.
-
-Electronic Codebook Mode (ECB) (des_ecb_encrypt())
-- 64 bits are enciphered at a time.
-- The order of the blocks can be rearranged without detection.
-- The same plaintext block always produces the same ciphertext block
-  (for the same key) making it vulnerable to a 'dictionary attack'.
-- An error will only affect one ciphertext block.
-
-Cipher Block Chaining Mode (CBC) (des_cbc_encrypt())
-- a multiple of 64 bits are enciphered at a time.
-- The CBC mode produces the same ciphertext whenever the same
-  plaintext is encrypted using the same key and starting variable.
-- The chaining operation makes the ciphertext blocks dependent on the
-  current and all preceding plaintext blocks and therefore blocks can not
-  be rearranged.
-- The use of different starting variables prevents the same plaintext
-  enciphering to the same ciphertext.
-- An error will affect the current and the following ciphertext blocks.
-
-Cipher Feedback Mode (CFB) (des_cfb_encrypt())
-- a number of bits (j) <= 64 are enciphered at a time.
-- The CFB mode produces the same ciphertext whenever the same
-  plaintext is encrypted using the same key and starting variable.
-- The chaining operation makes the ciphertext variables dependent on the
-  current and all preceding variables and therefore j-bit variables are
-  chained together and con not be rearranged.
-- The use of different starting variables prevents the same plaintext
-  enciphering to the same ciphertext.
-- The strength of the CFB mode depends on the size of k (maximal if
-  j == k).  In my implementation this is always the case.
-- Selection of a small value for j will require more cycles through
-  the encipherment algorithm per unit of plaintext and thus cause
-  greater processing overheads.
-- Only multiples of j bits can be enciphered.
-- An error will affect the current and the following ciphertext variables.
-
-Output Feedback Mode (OFB) (des_ofb_encrypt())
-- a number of bits (j) <= 64 are enciphered at a time.
-- The OFB mode produces the same ciphertext whenever the same
-  plaintext enciphered using the same key and starting variable.  More
-  over, in the OFB mode the same key stream is produced when the same
-  key and start variable are used.  Consequently, for security reasons
-  a specific start variable should be used only once for a given key.
-- The absence of chaining makes the OFB more vulnerable to specific attacks.
-- The use of different start variables values prevents the same
-  plaintext enciphering to the same ciphertext, by producing different
-  key streams.
-- Selection of a small value for j will require more cycles through
-  the encipherment algorithm per unit of plaintext and thus cause
-  greater processing overheads.
-- Only multiples of j bits can be enciphered.
-- OFB mode of operation does not extend ciphertext errors in the
-  resultant plaintext output.  Every bit error in the ciphertext causes
-  only one bit to be in error in the deciphered plaintext.
-- OFB mode is not self-synchronising.  If the two operation of
-  encipherment and decipherment get out of synchronism, the system needs
-  to be re-initialised.
-- Each re-initialisation should use a value of the start variable
-different from the start variable values used before with the same
-key.  The reason for this is that an identical bit stream would be
-produced each time from the same parameters.  This would be
-susceptible to a 'known plaintext' attack.
-
-Triple ECB Mode (des_3ecb_encrypt())
-- Encrypt with key1, decrypt with key2 and encrypt with key1 again.
-- As for ECB encryption but increases the effective key length to 112 bits.
-- If both keys are the same it is equivalent to encrypting once with
-  just one key.
-
-Triple CBC Mode (des_3cbc_encrypt())
-- Encrypt with key1, decrypt with key2 and encrypt with key1 again.
-- As for CBC encryption but increases the effective key length to 112 bits.
-- If both keys are the same it is equivalent to encrypting once with
-  just one key.
diff --git a/secure/lib/libdes/Makefile b/secure/lib/libdes/Makefile
deleted file mode 100644
index 64abbafe6818..000000000000
--- a/secure/lib/libdes/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#	@(#)Makefile	5.4 (Berkeley) 5/7/91
-# $FreeBSD$
-
-LIB=	des
-SRCS=	cbc3_enc.c cbc_cksm.c cbc_enc.c  cfb64enc.c cfb_enc.c  \
-	ecb3_enc.c ecb_enc.c  ede_enc.c  enc_read.c enc_writ.c \
-	ncbc_enc.c new_rkey.c ofb64enc.c ofb_enc.c  pcbc_enc.c \
-	qud_cksm.c rand_key.c read_pwd.c rpc_enc.c  set_key.c  \
-	str2key.c  cfb64ede.c ofb64ede.c supp.c     xcbc_enc.c
-HEADER=	des.h
-
-SHLIB_MAJOR=	3
-SHLIB_MINOR=	0
-
-CFLAGS+=	-Wall
-CLEANFILES+=	des_crypt.3
-
-MAN3=	des_crypt.3
-
-des_crypt.3: des_crypt.man
-	cp ${.OODATE} ${.TARGET}
-
-MLINKS= des_crypt.3 des_read_password.3 \
-	des_crypt.3 des_read_2password.3 des_crypt.3 des_string_to_key.3 \
-	des_crypt.3 des_string_to_2key.3 des_crypt.3 des_read_pw_string.3 \
-	des_crypt.3 des_random_key.3 des_crypt.3 des_set_key.3 \
-	des_crypt.3 des_key_sched.3 des_crypt.3 des_ecb_encrypt.3 \
-	des_crypt.3 des_3ecb_encrypt.3 des_crypt.3 des_cbc_encrypt.3 \
-	des_crypt.3 des_3cbc_encrypt.3 des_crypt.3 des_pcbc_encrypt.3 \
-	des_crypt.3 des_cfb_encrypt.3 des_crypt.3 des_ofb_encrypt.3 \
-	des_crypt.3 des_cbc_cksum.3 des_crypt.3 des_quad_cksum.3 \
-	des_crypt.3 des_enc_read.3 des_crypt.3 des_enc_write.3 \
-	des_crypt.3 des_set_odd_parity.3 des_crypt.3 des_is_weak_key.3
-
-beforeinstall:
-.for i in ${HEADER}
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/$i \
-		${DESTDIR}/usr/include
-.endfor
-
-.include <bsd.lib.mk>
diff --git a/secure/lib/libdes/Makefile.PL b/secure/lib/libdes/Makefile.PL
deleted file mode 100644
index 41a7e0fbba10..000000000000
--- a/secure/lib/libdes/Makefile.PL
+++ /dev/null
@@ -1,14 +0,0 @@
-use ExtUtils::MakeMaker;
-# See lib/ExtUtils/MakeMaker.pm for details of how to influence
-# the contents of the Makefile being created.
-&writeMakefile(
-	'potential_libs' => '',   # e.g., '-lm' 
-	'INC' => '',     # e.g., '-I/usr/include/other' 
-	'DISTNAME' => 'DES',
-	'VERSION' => '0.1',
-	'DEFINE' => '-DPERL5',
-	'OBJECT' => 'DES.o cbc_cksm.o cbc_enc.o ecb_enc.o pcbc_enc.o \
-	rand_key.o set_key.o str2key.o \
-	enc_read.o enc_writ.o fcrypt.o cfb_enc.o \
-	ecb3_enc.o ofb_enc.o cbc3_enc.o',
-	);
diff --git a/secure/lib/libdes/Makefile.ssl b/secure/lib/libdes/Makefile.ssl
deleted file mode 100644
index 81fb3ca4ae4c..000000000000
--- a/secure/lib/libdes/Makefile.ssl
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-# SSLeay/crypto/des/Makefile
-#
-
-DIR=	des
-TOP=	../..
-CC=	cc
-INCLUDES=
-CFLAG=-g
-INSTALLTOP=/usr/local/ssl
-MAKE=		make -f Makefile.ssl
-MAKEDEPEND=	makedepend -fMakefile.ssl
-MAKEFILE=	Makefile.ssl
-
-CFLAGS= $(INCLUDES) $(CFLAG)
-
-GENERAL=Makefile des.org des_locl.org
-TEST=destest.c
-APPS=
-
-LIB=$(TOP)/libcrypto.a
-LIBSRC=	cbc3_enc.c cbc_cksm.c cbc_enc.c  cfb64enc.c cfb_enc.c  \
-	ecb3_enc.c ecb_enc.c  ede_enc.c  enc_read.c enc_writ.c \
-	fcrypt.c   ncbc_enc.c ofb64enc.c ofb_enc.c  pcbc_enc.c \
-	qud_cksm.c rand_key.c read_pwd.c rpc_enc.c  set_key.c  \
-	xcbc_enc.c \
-	str2key.c  cfb64ede.c ofb64ede.c supp.c
-
-LIBOBJ= set_key.o  ecb_enc.o  ede_enc.o  cbc_enc.o  cbc3_enc.o \
-	ecb3_enc.o cfb64enc.o cfb64ede.o cfb_enc.o  ofb64ede.o \
-	enc_read.o enc_writ.o fcrypt.o   ncbc_enc.o ofb64enc.o \
-	ofb_enc.o  str2key.o  pcbc_enc.o qud_cksm.o rand_key.o \
-	xcbc_enc.o \
-	read_pwd.o rpc_enc.o  cbc_cksm.o supp.o
-
-SRC= $(LIBSRC)
-
-EXHEADER= des.h
-HEADER=	des_locl.h rpc_des.h podd.h sk.h spr.h des_ver.h $(EXHEADER)
-
-ALL=    $(GENERAL) $(SRC) $(HEADER)
-
-top:
-	(cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
-
-all:	lib
-
-lib:	$(LIBOBJ)
-	ar r $(LIB) $(LIBOBJ)
-	$(TOP)/util/ranlib.sh $(LIB)
-	@touch lib
-
-files:
-	perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
-
-links:
-	/bin/rm -f Makefile
-	$(TOP)/util/point.sh Makefile.ssl Makefile ;
-	/bin/rm -f des.doc
-	$(TOP)/util/point.sh ../../doc/des.doc des.doc ;
-	$(TOP)/util/mklink.sh ../../include $(EXHEADER)
-	$(TOP)/util/mklink.sh ../../test $(TEST)
-	$(TOP)/util/mklink.sh ../../apps $(APPS)
-
-install: installs
-
-installs:
-	@for i in $(EXHEADER) ; \
-	do  \
-	(cp $$i $(INSTALLTOP)/include/$$i; \
-	chmod 644 $(INSTALLTOP)/include/$$i ) \
-	done;
-
-tags:
-	ctags $(SRC)
-
-tests:
-
-lint:
-	lint -DLINT $(INCLUDES) $(SRC)>fluff
-
-depend:
-	$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
-
-dclean:
-	perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
-	mv -f Makefile.new $(MAKEFILE)
-
-clean:
-	/bin/rm -f *.o *.obj lib tags core .nfs* *.old *.bak fluff
-
-errors:
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/secure/lib/libdes/Makefile.uni b/secure/lib/libdes/Makefile.uni
deleted file mode 100644
index 33f959f00835..000000000000
--- a/secure/lib/libdes/Makefile.uni
+++ /dev/null
@@ -1,155 +0,0 @@
-# You must select the correct terminal control system to be used to
-# turn character echo off when reading passwords.  There a 5 systems
-# SGTTY   - the old BSD system
-# TERMIO  - most system V boxes
-# TERMIOS - SGI (ala IRIX).
-# VMS     - the DEC operating system
-# MSDOS   - we all know what it is :-)
-# read_pwd.c makes a reasonable guess at what is correct.
-
-# If you are on a DEC Alpha, edit des.h and change the DES_LONG
-# define to 'unsigned int'.  I have seen this give a %20 speedup.
-
-OPTS0= -DRAND -DTERMIO #-DNOCONST
-
-# Version 1.94 has changed the strings_to_key function so that it is
-# now compatible with MITs when the string is longer than 8 characters.
-# If you wish to keep the old version, uncomment the following line.
-# This will affect the -E/-D options on des(1).
-#OPTS1= -DOLD_STR_TO_KEY
-
-# This #define specifies the use of an alternative D_ENCRYPT macro in
-# ecb_encrypt.  The choice of macro can make a %20 difference in the
-# speed.  Unfortunatly the choise of the best macro appears to be very
-# dependant on the compiler and the machine in question.
-# For the following combinations use the ALT_ECB option.
-# Sparc 2 (cc -O4), sun 3/260 (cc -O4)
-# For the following combinations do not use the ALT_ECB option.
-# Sparc 2 (gcc2 -O2), sun 3/260 (cc -O2), mvax2 (cc -O), MSDOS (Turbo Cv2)
-# For other machines, experiment with changing the option and run
-# ./speed to see which is faster.
-# DO NOT TURN THIS OPTION ON WHEN COMPILING THIS CODE ON A 64 BIT MACHINE
-# 12-Apr-1996 - It appears to be broken and I'm not bothering to fix
-# it right now, so don't use this option :-)
-#OPTS2= -DDES_PTR
-
-OPTS= $(OPTS0) $(OPTS1) $(OPTS2)
-
-#CC=cc
-#CFLAGS= -O $(OPTS) $(CFLAG)
-
-CC=gcc
-CFLAGS= -O3 -fomit-frame-pointer $(OPTS) $(CFLAG)
-
-LIBDIR=/usr/local/lib
-BINDIR=/usr/local/bin
-INCDIR=/usr/local/include
-MANDIR=/usr/local/man
-MAN1=1
-MAN3=3
-SHELL=/bin/sh
-OBJS=	cbc3_enc.o cbc_cksm.o cbc_enc.o ncbc_enc.o pcbc_enc.o qud_cksm.o \
-	cfb64ede.o cfb64enc.o cfb_enc.o ecb3_enc.o ecb_enc.o  ede_enc.o  \
-	enc_read.o enc_writ.o fcrypt.o  ofb64ede.o ofb64enc.o ofb_enc.o  \
-	rand_key.o read_pwd.o set_key.o rpc_enc.o  str2key.o supp.o
-
-GENERAL=COPYRIGHT FILES INSTALL Imakefile README VERSION Makefile \
-	times vms.com KERBEROS MODES.DES  GNUmakefile des.man \
-	DES.pm DES.pod DES.xs Makefile.PL Makefile.uni typemap t \
-	des_crypt.man Makefile.ssl des.doc makefile.bc des.org \
-	des_locl.org
-DES=	des.c
-TESTING=destest.c speed.c rpw.c
-HEADERS=des_ver.h des.h des_locl.h podd.h sk.h spr.h rpc_des.h
-LIBDES= cbc3_enc.c cbc_cksm.c cbc_enc.c ncbc_enc.c pcbc_enc.c qud_cksm.c \
-	cfb64ede.c cfb64enc.c cfb_enc.c ecb3_enc.c ecb_enc.c  ede_enc.c  \
-	enc_read.c enc_writ.c fcrypt.c  ofb64ede.c ofb64enc.c ofb_enc.c  \
-	rand_key.c read_pwd.c set_key.c rpc_enc.c  str2key.c  supp.c
-
-PERL=	des.pl testdes.pl doIP doPC1 doPC2 PC1 PC2 shifts.pl
-
-ALL=	$(GENERAL) $(DES) $(TESTING) $(LIBDES) $(PERL) $(HEADERS)
-
-DLIB=	libdes.a
-
-all: $(DLIB) destest rpw des speed
-
-test:	all
-	./destest
-
-$(DLIB): $(OBJS)
-	/bin/rm -f $(DLIB)
-	ar cr $(DLIB) $(OBJS)
-	-if test -s /bin/ranlib; then /bin/ranlib $(DLIB); \
-	else if test -s /usr/bin/ranlib; then /usr/bin/ranlib $(DLIB); \
-	else exit 0; fi; fi
-
-destest: destest.o libdes.a
-	$(CC) $(CFLAGS) -o destest destest.o libdes.a
-
-rpw: rpw.o libdes.a
-	$(CC) $(CFLAGS) -o rpw rpw.o libdes.a
-
-speed: speed.o libdes.a
-	$(CC) $(CFLAGS) -o speed speed.o libdes.a
-
-des: des.o libdes.a
-	$(CC) $(CFLAGS) -o des des.o libdes.a
-
-tags:
-	ctags $(DES) $(TESTING) $(LIBDES)
-
-tar:
-	tar chf libdes.tar $(ALL)
-
-shar:
-	shar $(ALL) >libdes.shar
-
-depend:
-	makedepend $(LIBDES) $(DES) $(TESTING)
-
-clean:
-	/bin/rm -f *.o tags core rpw destest des speed $(DLIB) .nfs* *.old \
-	*.bak destest rpw des speed
-
-dclean:
-	sed -e '/^# DO NOT DELETE THIS LINE/ q' Makefile >Makefile.new
-	mv -f Makefile.new Makefile
-
-# Eric is probably going to choke when he next looks at this --tjh
-install: $(DLIB) des
-	if test $(INSTALLTOP); then \
-	    echo SSL style install; \
-	    cp $(DLIB) $(INSTALLTOP)/lib; \
-	    if test -s /bin/ranlib; then \
-	        /bin/ranlib $(INSTALLTOP)/lib/$(DLIB); \
-	    else \
-		if test -s /usr/bin/ranlib; then \
-		/usr/bin/ranlib $(INSTALLTOP)/lib/$(DLIB); \
-	    fi; fi; \
-	    chmod 644 $(INSTALLTOP)/lib/$(DLIB); \
-	    cp des.h $(INSTALLTOP)/include; \
-	    chmod 644 $(INSTALLTOP)/include/des.h; \
-	    cp des $(INSTALLTOP)/bin; \
-	    chmod 755 $(INSTALLTOP)/bin/des; \
-	else \
-	    echo Standalone install; \
-	    cp $(DLIB) $(LIBDIR)/$(DLIB); \
-	    if test -s /bin/ranlib; then \
-	      /bin/ranlib $(LIBDIR)/$(DLIB); \
-	    else \
-	      if test -s /usr/bin/ranlib; then \
-		/usr/bin/ranlib $(LIBDIR)/$(DLIB); \
-	      fi; \
-	    fi; \
-	    chmod 644 $(LIBDIR)/$(DLIB); \
-	    cp des $(BINDIR)/des; \
-	    chmod 711 $(BINDIR)/des; \
-	    cp des_crypt.man $(MANDIR)/man$(MAN3)/des_crypt.$(MAN3); \
-	    chmod 644 $(MANDIR)/man$(MAN3)/des_crypt.$(MAN3); \
-	    cp des.man $(MANDIR)/man$(MAN1)/des.$(MAN1); \
-	    chmod 644 $(MANDIR)/man$(MAN1)/des.$(MAN1); \
-	    cp des.h $(INCDIR)/des.h; \
-	    chmod 644 $(INCDIR)/des.h; \
-	fi
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/secure/lib/libdes/PC1 b/secure/lib/libdes/PC1
deleted file mode 100644
index efb8348b72d7..000000000000
--- a/secure/lib/libdes/PC1
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/local/bin/perl
-
-@PC1=(  57,49,41,33,25,17, 9,
-	 1,58,50,42,34,26,18,
-	10, 2,59,51,43,35,27,
-	19,11, 3,60,52,44,36,
-	"-","-","-","-",
-	63,55,47,39,31,23,15,
-	 7,62,54,46,38,30,22,
-	14, 6,61,53,45,37,29,
-	21,13, 5,28,20,12, 4,
-	"-","-","-","-",
-	);
-
-foreach (@PC1)
-	{
-	if ($_ ne "-")
-		{
-		$_--;
-		$_=int($_/8)*8+7-($_%8);
-		printf "%2d  ",$_;
-		}
-	else
-		{ print "--  "; }
-	print "\n" if (((++$i) % 8) == 0);
-	print "\n" if ((($i) % 32) == 0);
-	}
-
diff --git a/secure/lib/libdes/PC2 b/secure/lib/libdes/PC2
deleted file mode 100644
index 2d560270ecd8..000000000000
--- a/secure/lib/libdes/PC2
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/local/bin/perl
-
-@PC2_C=(14,17,11,24, 1, 5,
-	 3,28,15, 6,21,10,
-	23,19,12, 4,26, 8,
-	16, 7,27,20,13, 2,
-	);
-
-@PC2_D=(41,52,31,37,47,55,
-	30,40,51,45,33,48,
-	44,49,39,56,34,53,
-	46,42,50,36,29,32,
-	);
-
-foreach (@PC2_C) {
-	if ($_ ne "-")
-		{
-		$_--;
-		printf "%2d  ",$_; }
-	else { print "--  "; }
-	$C{$_}=1;
-	print "\n" if (((++$i) % 8) == 0);
-	}
-$i=0;
-print "\n";
-foreach (@PC2_D) {
-	if ($_ ne "-")
-		{
-		$_-=29;
-		printf "%2d  ",$_; }
-	else { print "--  "; }
-	$D{$_}=1;
-	print "\n" if (((++$i) % 8) == 0); }
-
-print "\n";
-foreach $i (0 .. 27)
-	{
-	$_=$C{$i};
-	if ($_ ne "-") {printf "%2d ",$_;}
-	else { print "--  "; }
-	print "\n" if (((++$i) % 8) == 0);
-	}
-print "\n";
-
-print "\n";
-foreach $i (0 .. 27)
-	{
-	$_=$D{$i};
-	if ($_ ne "-") {printf "%2d  ",$_;}
-	else { print "--  "; }
-	print "\n" if (((++$i) % 8) == 0);
-	}
-print "\n";
-sub numsort
-	{
-	$a-$b;
-	}
diff --git a/secure/lib/libdes/README b/secure/lib/libdes/README
deleted file mode 100644
index 3264c2f5d898..000000000000
--- a/secure/lib/libdes/README
+++ /dev/null
@@ -1,48 +0,0 @@
-
-		libdes, Version 3.21 21/11/95
-
-		Copyright (c) 1995, Eric Young
-			  All rights reserved.
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms specified in COPYRIGHT.
-    
---
-The primary ftp site for this library is
-ftp://ftp.psy.uq.oz.au/pub/Crypto/DES/libdes-x.xx.tar.gz
-libdes is now also shipped with SSLeay.  Primary ftp site of
-ftp://ftp.psy.uq.oz.au/pub/Crypto/SSL/SSLeay-x.xx.tar.gz
-
-The best way to build this library is to build it as part of SSLeay.
-
-This kit builds a DES encryption library and a DES encryption program.
-It supports ecb, cbc, ofb, cfb, triple ecb, triple cbc, triple ofb,
-triple cfb, and MIT's pcbc encryption modes and also has a fast
-implementation of crypt(3).
-It contains support routines to read keys from a terminal,
-generate a random key, generate a key from an arbitrary length string,
-read/write encrypted data from/to a file descriptor.
-
-The implementation was written so as to conform with the manual entry
-for the des_crypt(3) library routines from MIT's project Athena.
-
-destest should be run after compilation to test the des routines.
-rpw should be run after compilation to test the read password routines.
-The des program is a replacement for the sun des command.  I believe it
-conforms to the sun version.
-
-The Imakefile is setup for use in the kerberos distribution.
-
-These routines are best compiled with gcc or any other good
-optimising compiler.
-Just turn you optimiser up to the highest settings and run destest
-after the build to make sure everything works.
-
-I believe these routines are close to the fastest and most portable DES
-routines that use small lookup tables (4.5k) that are publicly available.
-The fcrypt routine is faster than ufc's fcrypt (when compiling with
-gcc2 -O2) on the sparc 2 (1410 vs 1270) but is not so good on other machines
-(on a sun3/260 168 vs 336).  It is a function of CPU on chip cache size.
-
-Eric Young (eay@mincom.oz.au or eay@psych.psy.uq.oz.au)
-
diff --git a/secure/lib/libdes/VERSION b/secure/lib/libdes/VERSION
deleted file mode 100644
index 0afb5d4f0ac7..000000000000
--- a/secure/lib/libdes/VERSION
+++ /dev/null
@@ -1,340 +0,0 @@
-Version 3.25 17/07/96
-	Modified read_pwd.c so that stdin can be read if not a tty.
-	Thanks to Jeff Barber <jeffb@issl.atl.hp.com> for the patches.
-	des_init_random_number_generator() shortened due to VMS linker
-	limits.
-	Added RSA's DESX cbc mode.  It is a form of cbc encryption, with 2
-	8 byte quantites xored before and after encryption.
-	des_xcbc_encryption() - the name is funny to preserve the des_
-	prefix on all functions.
-
-Version 3.24 20/04/96
-	The DES_PTR macro option checked and used by SSLeay configuration
-
-Version 3.23 11/04/96
-	Added DES_LONG.  If defined to 'unsigned int' on the DEC Alpha,
-	it gives a %20 speedup :-)
-	Fixed the problem with des.pl under perl5.  The patches were
-	sent by Ed Kubaitis (ejk@uiuc.edu).
-	if fcrypt.c, changed values to handle illegal salt values the way
-	normal crypt() implementations do.  Some programs apparently use
-	them :-(. The patch was sent by Bjorn Gronvall <bg@sics.se>
-
-Version 3.22 29/11/95
-	Bug in des(1), an error with the uuencoding stuff when the
-	'data' is small, thanks to Geoff Keating <keagchon@mehta.anu.edu.au>
-	for the patch.
-
-Version 3.21 22/11/95
-	After some emailing back and forth with 
-	Colin Plumb <colin@nyx10.cs.du.edu>, I've tweaked a few things
-	and in a future version I will probably put in some of the
-	optimisation he suggested for use with the DES_USE_PTR option.
-	Extra routines from Mark Murray <mark@grondar.za> for use in
-	freeBSD.  They mostly involve random number generation for use
-	with kerberos.  They involve evil machine specific system calls
-	etc so I would normally suggest pushing this stuff into the
-	application and/or using RAND_seed()/RAND_bytes() if you are
-	using this DES library as part of SSLeay.
-	Redone the read_pw() function so that it is cleaner and
-	supports termios, thanks to Sameer Parekh <sameer@c2.org>
-	for the initial patches for this.
-	Renamed 3ecb_encrypt() to ecb3_encrypt().  This has been
-	 done just to make things more consistent.
-	I have also now added triple DES versions of cfb and ofb.
-
-Version 3.20
-	Damn, Damn, Damn, as pointed out by Mike_Spreitzer.PARC@xerox.com,
-	my des_random_seed() function was only copying 4 bytes of the
-	passed seed into the init structure.  It is now fixed to copy 8.
-	My own suggestion is to used something like MD5 :-)
-
-Version 3.19 
-	While looking at my code one day, I though, why do I keep on
-	calling des_encrypt(in,out,ks,enc) when every function that
-	calls it has in and out the same.  So I dropped the 'out'
-	parameter, people should not be using this function.
-
-Version 3.18 30/08/95
-	Fixed a few bit with the distribution and the filenames.
-	3.17 had been munged via a move to DOS and back again.
-	NO CODE CHANGES
-
-Version 3.17 14/07/95
-	Fixed ede3 cbc which I had broken in 3.16.  I have also
-	removed some unneeded variables in 7-8 of the routines.
-
-Version 3.16 26/06/95
-	Added des_encrypt2() which does not use IP/FP, used by triple
-	des routines.  Tweaked things a bit elsewhere. %13 speedup on
-	sparc and %6 on a R4400 for ede3 cbc mode.
-
-Version 3.15 06/06/95
-	Added des_ncbc_encrypt(), it is des_cbc mode except that it is
-	'normal' and copies the new iv value back over the top of the
-	passed parameter.
-	CHANGED des_ede3_cbc_encrypt() so that it too now overwrites
-	the iv.  THIS WILL BREAK EXISTING CODE, but since this function
-	only new, I feel I can change it, not so with des_cbc_encrypt :-(.
-	I need to update the documentation.
-
-Version 3.14 31/05/95
-	New release upon the world, as part of my SSL implementation.
-	New copyright and usage stuff.  Basically free for all to use
-	as long as you say it came from me :-)
-
-Version 3.13 31/05/95
-	A fix in speed.c, if HZ is not defined, I set it to 100.0
-	which is reasonable for most unixes except SunOS 4.x.
-	I now have a #ifdef sun but timing for SunOS 4.x looked very
-	good :-(.  At my last job where I used SunOS 4.x, it was
-	defined to be 60.0 (look at the old INSTALL documentation), at
-	the last release had it changed to 100.0 since I now work with
-	Solaris2 and SVR4 boxes.
-	Thanks to  Rory Chisholm <rchishol@math.ethz.ch> for pointing this
-	one out.
-
-Version 3.12 08/05/95
-	As pointed out by The Crypt Keeper <tck@bend.UCSD.EDU>,
-	my D_ENCRYPT macro in crypt() had an un-necessary variable.
-	It has been removed.
-
-Version 3.11 03/05/95
-	Added des_ede3_cbc_encrypt() which is cbc mode des with 3 keys
-	and one iv.  It is a standard and I needed it for my SSL code.
-	It makes more sense to use this for triple DES than
-	3cbc_encrypt().  I have also added (or should I say tested :-)
-	cfb64_encrypt() which is cfb64 but it will encrypt a partial
-	number of bytes - 3 bytes in 3 bytes out.  Again this is for
-	my SSL library, as a form of encryption to use with SSL
-	telnet.
-
-Version 3.10 22/03/95
-	Fixed a bug in 3cbc_encrypt() :-(.  When making repeated calls
-	to cbc3_encrypt, the 2 iv values that were being returned to
-	be used in the next call were reversed :-(.
-	Many thanks to Bill Wade <wade@Stoner.COM> for pointing out
-	this error.
-
-Version 3.09 01/02/95
-	Fixed des_random_key to far more random, it was rather feeble
-	with regards to picking the initial seed.  The problem was
-	pointed out by Olaf Kirch <okir@monad.swb.de>.
-
-Version 3.08 14/12/94
-	Added Makefile.PL so libdes can be built into perl5.
-	Changed des_locl.h so RAND is always defined.
-
-Version 3.07 05/12/94
-	Added GNUmake and stuff so the library can be build with
-	glibc.
-
-Version 3.06 30/08/94
-	Added rpc_enc.c which contains _des_crypt.  This is for use in
-	secure_rpc v 4.0
-	Finally fixed the cfb_enc problems.
-	Fixed a few parameter parsing bugs in des (-3 and -b), thanks
-	to Rob McMillan <R.McMillan@its.gu.edu.au>
-
-Version 3.05 21/04/94
-	for unsigned long l; gcc does not produce ((l>>34) == 0)
-	This causes bugs in cfb_enc.
-	Thanks to Hadmut Danisch <danisch@ira.uka.de>
-
-Version 3.04 20/04/94
-	Added a version number to des.c and libdes.a
-
-Version 3.03 12/01/94
-	Fixed a bug in non zero iv in 3cbc_enc.
-
-Version 3.02 29/10/93
-	I now work in a place where there are 6+ architectures and 14+
-	OS versions :-).
-	Fixed TERMIO definition so the most sys V boxes will work :-)
-
-Release upon comp.sources.misc
-Version 3.01 08/10/93
-	Added des_3cbc_encrypt()
-
-Version 3.00 07/10/93
-	Fixed up documentation.
-	quad_cksum definitely compatible with MIT's now.
-
-Version 2.30 24/08/93
-	Triple DES now defaults to triple cbc but can do triple ecb
-	 with the -b flag.
-	Fixed some MSDOS uuen/uudecoding problems, thanks to
-	Added prototypes.
-	
-Version 2.22 29/06/93
-	Fixed a bug in des_is_weak_key() which stopped it working :-(
-	thanks to engineering@MorningStar.Com.
-
-Version 2.21 03/06/93
-	des(1) with no arguments gives quite a bit of help.
-	Added -c (generate ckecksum) flag to des(1).
-	Added -3 (triple DES) flag to des(1).
-	Added cfb and ofb routines to the library.
-
-Version 2.20 11/03/93
-	Added -u (uuencode) flag to des(1).
-	I have been playing with byte order in quad_cksum to make it
-	 compatible with MIT's version.  All I can say is avid this
-	 function if possible since MIT's output is endian dependent.
-
-Version 2.12 14/10/92
-	Added MSDOS specific macro in ecb_encrypt which gives a %70
-	 speed up when the code is compiled with turbo C.
-
-Version 2.11 12/10/92
-	Speedup in set_key (recoding of PC-1)
-	 I now do it in 47 simple operations, down from 60.
-	 Thanks to John Fletcher (john_fletcher@lccmail.ocf.llnl.gov)
-	 for motivating me to look for a faster system :-)
-	 The speedup is probably less that 1% but it is still 13
-	 instructions less :-).
-
-Version 2.10 06/10/92
-	The code now works on the 64bit ETA10 and CRAY without modifications or
-	 #defines.  I believe the code should work on any machine that
-	 defines long, int or short to be 8 bytes long.
-	Thanks to Shabbir J. Safdar (shabby@mentor.cc.purdue.edu)
-	 for helping me fix the code to run on 64bit machines (he had
-	 access to an ETA10).
-	Thanks also to John Fletcher <john_fletcher@lccmail.ocf.llnl.gov>
-	 for testing the routines on a CRAY.
-	read_password.c has been renamed to read_passwd.c
-	string_to_key.c has been renamed to string2key.c
-
-Version 2.00 14/09/92
-	Made mods so that the library should work on 64bit CPU's.
-	Removed all my uchar and ulong defs.  To many different
-	 versions of unix define them in their header files in too many
-	 different combinations :-)
-	IRIX - Sillicon Graphics mods (mostly in read_password.c).
-	 Thanks to Andrew Daviel (advax@erich.triumf.ca)
-
-Version 1.99 26/08/92
-	Fixed a bug or 2 in enc_read.c
-	Fixed a bug in enc_write.c
-	Fixed a pseudo bug in fcrypt.c (very obscure).
-
-Version 1.98 31/07/92
-	Support for the ETA10.  This is a strange machine that defines
-	longs and ints as 8 bytes and shorts as 4 bytes.
-	Since I do evil things with long * that assume that they are 4
-	bytes.  Look in the Makefile for the option to compile for
-	this machine.  quad_cksum appears to have problems but I
-	will don't have the time to fix it right now, and this is not
-	a function that uses DES and so will not effect the main uses
-	of the library.
-
-Version 1.97 20/05/92 eay
-	Fixed the Imakefile and made some changes to des.h to fix some
-	problems when building this package with Kerberos v 4.
-
-Version 1.96 18/05/92 eay
-	Fixed a small bug in string_to_key() where problems could
-	occur if des_check_key was set to true and the string
-	generated a weak key.
-
-Patch2 posted to comp.sources.misc
-Version 1.95 13/05/92 eay
-	Added an alternative version of the D_ENCRYPT macro in
-	ecb_encrypt and fcrypt.  Depending on the compiler, one version or the
-	other will be faster.  This was inspired by 
-	Dana How <how@isl.stanford.edu>, and her pointers about doing the
-	*(ulong *)((uchar *)ptr+(value&0xfc))
-	vs
-	ptr[value&0x3f]
-	to stop the C compiler doing a <<2 to convert the long array index.
-
-Version 1.94 05/05/92 eay
-	Fixed an incompatibility between my string_to_key and the MIT
-	 version.  When the key is longer than 8 chars, I was wrapping
-	 with a different method.  To use the old version, define
-	 OLD_STR_TO_KEY in the makefile.  Thanks to
-	 viktor@newsu.shearson.com (Viktor Dukhovni).
-
-Version 1.93 28/04/92 eay
-	Fixed the VMS mods so that echo is now turned off in
-	 read_password.  Thanks again to brennan@coco.cchs.su.oz.AU.
-	MSDOS support added.  The routines can be compiled with
-	 Turbo C (v2.0) and MSC (v5.1).  Make sure MSDOS is defined.
-
-Patch1 posted to comp.sources.misc
-Version 1.92 13/04/92 eay
-	Changed D_ENCRYPT so that the rotation of R occurs outside of
-	 the loop.  This required rotating all the longs in sp.h (now
-	 called spr.h). Thanks to Richard Outerbridge <71755.204@CompuServe.COM>
-	speed.c has been changed so it will work without SIGALRM.  If
-	 times(3) is not present it will try to use ftime() instead.
-
-Version 1.91 08/04/92 eay
-	Added -E/-D options to des(1) so it can use string_to_key.
-	Added SVR4 mods suggested by witr@rwwa.COM
-	Added VMS mods suggested by brennan@coco.cchs.su.oz.AU.  If
-	anyone knows how to turn of tty echo in VMS please tell me or
-	implement it yourself :-).
-	Changed FILE *IN/*OUT to *DES_IN/*DES_OUT since it appears VMS
-	does not like IN/OUT being used.
-
-Libdes posted to comp.sources.misc
-Version 1.9 24/03/92 eay
-	Now contains a fast small crypt replacement.
-	Added des(1) command.
-	Added des_rw_mode so people can use cbc encryption with
-	enc_read and enc_write.
-
-Version 1.8 15/10/91 eay
-	Bug in cbc_cksum.
-	Many thanks to Keith Reynolds (keithr@sco.COM) for pointing this
-	one out.
-
-Version 1.7 24/09/91 eay
-	Fixed set_key :-)
-	set_key is 4 times faster and takes less space.
-	There are a few minor changes that could be made.
-
-Version 1.6 19/09/1991 eay
-	Finally go IP and FP finished.
-	Now I need to fix set_key.
-	This version is quite a bit faster that 1.51
-
-Version 1.52 15/06/1991 eay
-	20% speedup in ecb_encrypt by changing the E bit selection
-	to use 2 32bit words.  This also required modification of the
-	sp table.  There is still a way to speedup the IP and IP-1
-	(hints from outer@sq.com) still working on this one :-(.
-
-Version 1.51 07/06/1991 eay
-	Faster des_encrypt by loop unrolling
-	Fixed bug in quad_cksum.c (thanks to hughes@logos.ucs.indiana.edu)
-
-Version 1.50 28/05/1991 eay
-	Optimised the code a bit more for the sparc.  I have improved the
-	speed of the inner des_encrypt by speeding up the initial and
-	final permutations.
-
-Version 1.40 23/10/1990 eay
-	Fixed des_random_key, it did not produce a random key :-(
-
-Version 1.30  2/10/1990 eay
-	Have made des_quad_cksum the same as MIT's, the full package
-	should be compatible with MIT's
-	Have tested on a DECstation 3100
-	Still need to fix des_set_key (make it faster).
-	Does des_cbc_encrypts at 70.5k/sec on a 3100.
-
-Version 1.20 18/09/1990 eay
-	Fixed byte order dependencies.
-	Fixed (I hope) all the word alignment problems.
-	Speedup in des_ecb_encrypt.
-
-Version 1.10 11/09/1990 eay
-	Added des_enc_read and des_enc_write.
-	Still need to fix des_quad_cksum.
-	Still need to document des_enc_read and des_enc_write.
-
-Version 1.00 27/08/1990 eay
-
diff --git a/secure/lib/libdes/cbc3_enc.c b/secure/lib/libdes/cbc3_enc.c
deleted file mode 100644
index a7b53ad5aedf..000000000000
--- a/secure/lib/libdes/cbc3_enc.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* crypto/des/cbc3_enc.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include "des_locl.h"
-
-/* HAS BUGS? DON'T USE */
-void des_3cbc_encrypt(input, output, length, ks1, ks2, iv1, iv2, encrypt)
-des_cblock (*input);
-des_cblock (*output);
-long length;
-des_key_schedule ks1;
-des_key_schedule ks2;
-des_cblock (*iv1);
-des_cblock (*iv2);
-int encrypt;
-	{
-	int off=((int)length-1)/8;
-	long l8=((length+7)/8)*8;
-	des_cblock niv1,niv2;
-
-	if (encrypt == DES_ENCRYPT)
-		{
-		des_cbc_encrypt(input,output,length,ks1,iv1,encrypt);
-		if (length >= sizeof(des_cblock))
-			memcpy(niv1,output[off],sizeof(des_cblock));
-		des_cbc_encrypt(output,output,l8,ks2,iv1,!encrypt);
-		des_cbc_encrypt(output,output,l8,ks1,iv2, encrypt);
-		if (length >= sizeof(des_cblock))
-			memcpy(niv2,output[off],sizeof(des_cblock));
-		}
-	else
-		{
-		if (length >= sizeof(des_cblock))
-			memcpy(niv2,input[off],sizeof(des_cblock));
-		des_cbc_encrypt(input,output,l8,ks1,iv2,encrypt);
-		des_cbc_encrypt(output,output,l8,ks2,iv1,!encrypt);
-		if (length >= sizeof(des_cblock))
-			memcpy(niv1,output[off],sizeof(des_cblock));
-		des_cbc_encrypt(output,output,length,ks1,iv1, encrypt);
-		}
-	memcpy(*iv1,niv1,sizeof(des_cblock));
-	memcpy(*iv2,niv2,sizeof(des_cblock));
-	}
-
diff --git a/secure/lib/libdes/cbc_cksm.c b/secure/lib/libdes/cbc_cksm.c
deleted file mode 100644
index e56c8eb17e6b..000000000000
--- a/secure/lib/libdes/cbc_cksm.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/* crypto/des/cbc_cksm.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include "des_locl.h"
-
-DES_LONG des_cbc_cksum(input, output, length, schedule, ivec)
-des_cblock (*input);
-des_cblock (*output);
-long length;
-des_key_schedule schedule;
-des_cblock (*ivec);
-	{
-	register DES_LONG tout0,tout1,tin0,tin1;
-	register long l=length;
-	DES_LONG tin[2];
-	unsigned char *in,*out,*iv;
-
-	in=(unsigned char *)input;
-	out=(unsigned char *)output;
-	iv=(unsigned char *)ivec;
-
-	c2l(iv,tout0);
-	c2l(iv,tout1);
-	for (; l>0; l-=8)
-		{
-		if (l >= 8)
-			{
-			c2l(in,tin0);
-			c2l(in,tin1);
-			}
-		else
-			c2ln(in,tin0,tin1,l);
-			
-		tin0^=tout0; tin[0]=tin0;
-		tin1^=tout1; tin[1]=tin1;
-		des_encrypt((DES_LONG *)tin,schedule,DES_ENCRYPT);
-		/* fix 15/10/91 eay - thanks to keithr@sco.COM */
-		tout0=tin[0];
-		tout1=tin[1];
-		}
-	if (out != NULL)
-		{
-		l2c(tout0,out);
-		l2c(tout1,out);
-		}
-	tout0=tin0=tin1=tin[0]=tin[1]=0;
-	return(tout1);
-	}
diff --git a/secure/lib/libdes/cbc_enc.c b/secure/lib/libdes/cbc_enc.c
deleted file mode 100644
index 415bcd282b4a..000000000000
--- a/secure/lib/libdes/cbc_enc.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/* crypto/des/cbc_enc.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include "des_locl.h"
-
-void des_cbc_encrypt(input, output, length, schedule, ivec, encrypt)
-des_cblock (*input);
-des_cblock (*output);
-long length;
-des_key_schedule schedule;
-des_cblock (*ivec);
-int encrypt;
-	{
-	register DES_LONG tin0,tin1;
-	register DES_LONG tout0,tout1,xor0,xor1;
-	register unsigned char *in,*out;
-	register long l=length;
-	DES_LONG tin[2];
-	unsigned char *iv;
-
-	in=(unsigned char *)input;
-	out=(unsigned char *)output;
-	iv=(unsigned char *)ivec;
-
-	if (encrypt)
-		{
-		c2l(iv,tout0);
-		c2l(iv,tout1);
-		for (; l>0; l-=8)
-			{
-			if (l >= 8)
-				{
-				c2l(in,tin0);
-				c2l(in,tin1);
-				}
-			else
-				c2ln(in,tin0,tin1,l);
-			tin0^=tout0; tin[0]=tin0;
-			tin1^=tout1; tin[1]=tin1;
-			des_encrypt((DES_LONG *)tin,schedule,DES_ENCRYPT);
-			tout0=tin[0]; l2c(tout0,out);
-			tout1=tin[1]; l2c(tout1,out);
-			}
-		}
-	else
-		{
-		c2l(iv,xor0);
-		c2l(iv,xor1);
-		for (; l>0; l-=8)
-			{
-			c2l(in,tin0); tin[0]=tin0;
-			c2l(in,tin1); tin[1]=tin1;
-			des_encrypt((DES_LONG *)tin,schedule,DES_DECRYPT);
-			tout0=tin[0]^xor0;
-			tout1=tin[1]^xor1;
-			if (l >= 8)
-				{
-				l2c(tout0,out);
-				l2c(tout1,out);
-				}
-			else
-				l2cn(tout0,tout1,out,l);
-			xor0=tin0;
-			xor1=tin1;
-			}
-		}
-	tin0=tin1=tout0=tout1=xor0=xor1=0;
-	tin[0]=tin[1]=0;
-	}
-
diff --git a/secure/lib/libdes/cfb64ede.c b/secure/lib/libdes/cfb64ede.c
deleted file mode 100644
index bfba24a7ec34..000000000000
--- a/secure/lib/libdes/cfb64ede.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/* crypto/des/cfb64ede.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include "des_locl.h"
-
-/* The input and output encrypted as though 64bit cfb mode is being
- * used.  The extra state information to record how much of the
- * 64bit block we have used is contained in *num;
- */
-
-void des_ede3_cfb64_encrypt(in, out, length, ks1,ks2,ks3, ivec, num, encrypt)
-unsigned char *in;
-unsigned char *out;
-long length;
-des_key_schedule ks1,ks2,ks3;
-des_cblock (*ivec);
-int *num;
-int encrypt;
-	{
-	register DES_LONG v0,v1;
-	register long l=length;
-	register int n= *num;
-	DES_LONG ti[2];
-	unsigned char *iv,c,cc;
-
-	iv=(unsigned char *)ivec;
-	if (encrypt)
-		{
-		while (l--)
-			{
-			if (n == 0)
-				{
-				c2l(iv,v0);
-				c2l(iv,v1);
-
-				IP(v0,v1);
-
-				ti[0]=v0;
-				ti[1]=v1;
-				des_encrypt2((DES_LONG *)ti,ks1,DES_ENCRYPT);
-				des_encrypt2((DES_LONG *)ti,ks2,DES_DECRYPT);
-				des_encrypt2((DES_LONG *)ti,ks3,DES_ENCRYPT);
-				v0=ti[0];
-				v1=ti[1];
-
-				FP(v1,v0);
-
-				iv=(unsigned char *)ivec;
-				l2c(v0,iv);
-				l2c(v1,iv);
-				iv=(unsigned char *)ivec;
-				}
-			c= *(in++)^iv[n];
-			*(out++)=c;
-			iv[n]=c;
-			n=(n+1)&0x07;
-			}
-		}
-	else
-		{
-		while (l--)
-			{
-			if (n == 0)
-				{
-				c2l(iv,v0);
-				c2l(iv,v1);
-
-				IP(v0,v1);
-
-				ti[0]=v0;
-				ti[1]=v1;
-				des_encrypt2((DES_LONG *)ti,ks1,DES_ENCRYPT);
-				des_encrypt2((DES_LONG *)ti,ks2,DES_DECRYPT);
-				des_encrypt2((DES_LONG *)ti,ks3,DES_ENCRYPT);
-
-				v0=ti[0];
-				v1=ti[1];
-
-				FP(v1,v0);
-
-				iv=(unsigned char *)ivec;
-				l2c(v0,iv);
-				l2c(v1,iv);
-				iv=(unsigned char *)ivec;
-				}
-			cc= *(in++);
-			c=iv[n];
-			iv[n]=cc;
-			*(out++)=c^cc;
-			n=(n+1)&0x07;
-			}
-		}
-	v0=v1=ti[0]=ti[1]=c=cc=0;
-	*num=n;
-	}
-
-#ifdef undef /* MACRO */
-void des_ede2_cfb64_encrypt(in, out, length, ks1,ks2, ivec, num, encrypt)
-unsigned char *in;
-unsigned char *out;
-long length;
-des_key_schedule ks1,ks2;
-des_cblock (*ivec);
-int *num;
-int encrypt;
-	{
-	des_ede3_cfb64_encrypt(in,out,length,ks1,ks2,ks1,ivec,num,encrypt);
-	}
-#endif
diff --git a/secure/lib/libdes/cfb64enc.c b/secure/lib/libdes/cfb64enc.c
deleted file mode 100644
index 0f1e78060b6b..000000000000
--- a/secure/lib/libdes/cfb64enc.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/* crypto/des/cfb64enc.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include "des_locl.h"
-
-/* The input and output encrypted as though 64bit cfb mode is being
- * used.  The extra state information to record how much of the
- * 64bit block we have used is contained in *num;
- */
-
-void des_cfb64_encrypt(in, out, length, schedule, ivec, num, encrypt)
-unsigned char *in;
-unsigned char *out;
-long length;
-des_key_schedule schedule;
-des_cblock (*ivec);
-int *num;
-int encrypt;
-	{
-	register DES_LONG v0,v1;
-	register long l=length;
-	register int n= *num;
-	DES_LONG ti[2];
-	unsigned char *iv,c,cc;
-
-	iv=(unsigned char *)ivec;
-	if (encrypt)
-		{
-		while (l--)
-			{
-			if (n == 0)
-				{
-				c2l(iv,v0); ti[0]=v0;
-				c2l(iv,v1); ti[1]=v1;
-				des_encrypt((DES_LONG *)ti,
-					schedule,DES_ENCRYPT);
-				iv=(unsigned char *)ivec;
-				v0=ti[0]; l2c(v0,iv);
-				v0=ti[1]; l2c(v0,iv);
-				iv=(unsigned char *)ivec;
-				}
-			c= *(in++)^iv[n];
-			*(out++)=c;
-			iv[n]=c;
-			n=(n+1)&0x07;
-			}
-		}
-	else
-		{
-		while (l--)
-			{
-			if (n == 0)
-				{
-				c2l(iv,v0); ti[0]=v0;
-				c2l(iv,v1); ti[1]=v1;
-				des_encrypt((DES_LONG *)ti,
-					schedule,DES_ENCRYPT);
-				iv=(unsigned char *)ivec;
-				v0=ti[0]; l2c(v0,iv);
-				v0=ti[1]; l2c(v0,iv);
-				iv=(unsigned char *)ivec;
-				}
-			cc= *(in++);
-			c=iv[n];
-			iv[n]=cc;
-			*(out++)=c^cc;
-			n=(n+1)&0x07;
-			}
-		}
-	v0=v1=ti[0]=ti[1]=c=cc=0;
-	*num=n;
-	}
-
diff --git a/secure/lib/libdes/cfb_enc.c b/secure/lib/libdes/cfb_enc.c
deleted file mode 100644
index a2875a503612..000000000000
--- a/secure/lib/libdes/cfb_enc.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/* crypto/des/cfb_enc.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include "des_locl.h"
-
-/* The input and output are loaded in multiples of 8 bits.
- * What this means is that if you hame numbits=12 and length=2
- * the first 12 bits will be retrieved from the first byte and half
- * the second.  The second 12 bits will come from the 3rd and half the 4th
- * byte.
- */
-void des_cfb_encrypt(in, out, numbits, length, schedule, ivec, encrypt)
-unsigned char *in;
-unsigned char *out;
-int numbits;
-long length;
-des_key_schedule schedule;
-des_cblock (*ivec);
-int encrypt;
-	{
-	register DES_LONG d0,d1,v0,v1,n=(numbits+7)/8;
-	register DES_LONG mask0,mask1;
-	register unsigned long l=length;
-	register int num=numbits;
-	DES_LONG ti[2];
-	unsigned char *iv;
-
-	if (num > 64) return;
-	if (num > 32)
-		{
-		mask0=0xffffffffL;
-		if (num == 64)
-			mask1=mask0;
-		else	mask1=(1L<<(num-32))-1;
-		}
-	else
-		{
-		if (num == 32)
-			mask0=0xffffffffL;
-		else	mask0=(1L<<num)-1;
-		mask1=0x00000000;
-		}
-
-	iv=(unsigned char *)ivec;
-	c2l(iv,v0);
-	c2l(iv,v1);
-	if (encrypt)
-		{
-		while (l >= n)
-			{
-			l-=n;
-			ti[0]=v0;
-			ti[1]=v1;
-			des_encrypt((DES_LONG *)ti,schedule,DES_ENCRYPT);
-			c2ln(in,d0,d1,n);
-			in+=n;
-			d0=(d0^ti[0])&mask0;
-			d1=(d1^ti[1])&mask1;
-			l2cn(d0,d1,out,n);
-			out+=n;
-			/* 30-08-94 - eay - changed because l>>32 and
-			 * l<<32 are bad under gcc :-( */
-			if (num == 32)
-				{ v0=v1; v1=d0; }
-			else if (num == 64)
-				{ v0=d0; v1=d1; }
-			else if (num > 32) /* && num != 64 */
-				{
-				v0=((v1>>(num-32))|(d0<<(64-num)))&0xffffffffL;
-				v1=((d0>>(num-32))|(d1<<(64-num)))&0xffffffffL;
-				}
-			else /* num < 32 */
-				{
-				v0=((v0>>num)|(v1<<(32-num)))&0xffffffffL;
-				v1=((v1>>num)|(d0<<(32-num)))&0xffffffffL;
-				}
-			}
-		}
-	else
-		{
-		while (l >= n)
-			{
-			l-=n;
-			ti[0]=v0;
-			ti[1]=v1;
-			des_encrypt((DES_LONG *)ti,schedule,DES_ENCRYPT);
-			c2ln(in,d0,d1,n);
-			in+=n;
-			/* 30-08-94 - eay - changed because l>>32 and
-			 * l<<32 are bad under gcc :-( */
-			if (num == 32)
-				{ v0=v1; v1=d0; }
-			else if (num == 64)
-				{ v0=d0; v1=d1; }
-			else if (num > 32) /* && num != 64 */
-				{
-				v0=((v1>>(num-32))|(d0<<(64-num)))&0xffffffffL;
-				v1=((d0>>(num-32))|(d1<<(64-num)))&0xffffffffL;
-				}
-			else /* num < 32 */
-				{
-				v0=((v0>>num)|(v1<<(32-num)))&0xffffffffL;
-				v1=((v1>>num)|(d0<<(32-num)))&0xffffffffL;
-				}
-			d0=(d0^ti[0])&mask0;
-			d1=(d1^ti[1])&mask1;
-			l2cn(d0,d1,out,n);
-			out+=n;
-			}
-		}
-	iv=(unsigned char *)ivec;
-	l2c(v0,iv);
-	l2c(v1,iv);
-	v0=v1=d0=d1=ti[0]=ti[1]=0;
-	}
-
diff --git a/secure/lib/libdes/des.c b/secure/lib/libdes/des.c
deleted file mode 100644
index 5e349dc64f5f..000000000000
--- a/secure/lib/libdes/des.c
+++ /dev/null
@@ -1,949 +0,0 @@
-/* crypto/des/des.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#ifndef MSDOS
-#include <unistd.h>
-#else
-#include <io.h>
-#define RAND
-#endif
-
-#include <time.h>
-#include "des_ver.h"
-
-#ifdef VMS
-#include <types.h>
-#include <stat.h>
-#else
-#ifndef _IRIX
-#include <sys/types.h>
-#endif
-#include <sys/stat.h>
-#endif
-#if defined(NOCONST)
-#define const
-#endif
-#include "des.h"
-
-#if defined(__STDC__) || defined(VMS) || defined(M_XENIX) || defined(MSDOS)
-#include <string.h>
-#endif
-
-#ifdef RAND
-#define random rand
-#define srandom(s) srand(s)
-#endif
-
-#ifndef NOPROTO
-void usage(void);
-void doencryption(void);
-int uufwrite(unsigned char *data, int size, unsigned int num, FILE *fp);
-void uufwriteEnd(FILE *fp);
-int uufread(unsigned char *out,int size,unsigned int num,FILE *fp);
-int uuencode(unsigned char *in,int num,unsigned char *out);
-int uudecode(unsigned char *in,int num,unsigned char *out);
-#else
-void usage();
-void doencryption();
-int uufwrite();
-void uufwriteEnd();
-int uufread();
-int uuencode();
-int uudecode();
-#endif
-
-#ifdef VMS
-#define EXIT(a) exit(a&0x10000000)
-#else
-#define EXIT(a) exit(a)
-#endif
-
-#define BUFSIZE (8*1024)
-#define VERIFY  1
-#define KEYSIZ	8
-#define KEYSIZB 1024 /* should hit tty line limit first :-) */
-char key[KEYSIZB+1];
-int do_encrypt,longk=0;
-FILE *DES_IN,*DES_OUT,*CKSUM_OUT;
-char uuname[200];
-unsigned char uubuf[50];
-int uubufnum=0;
-#define INUUBUFN	(45*100)
-#define OUTUUBUF	(65*100)
-unsigned char b[OUTUUBUF];
-unsigned char bb[300];
-des_cblock cksum={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-char cksumname[200]="";
-
-int vflag,cflag,eflag,dflag,kflag,bflag,fflag,sflag,uflag,flag3,hflag,error;
-
-int main(argc, argv)
-int argc;
-char **argv;
-	{
-	int i;
-	struct stat ins,outs;
-	char *p;
-	char *in=NULL,*out=NULL;
-
-	vflag=cflag=eflag=dflag=kflag=hflag=bflag=fflag=sflag=uflag=flag3=0;
-	error=0;
-	memset(key,0,sizeof(key));
-
-	for (i=1; i<argc; i++)
-		{
-		p=argv[i];
-		if ((p[0] == '-') && (p[1] != '\0'))
-			{
-			p++;
-			while (*p)
-				{
-				switch (*(p++))
-					{
-				case '3':
-					flag3=1;
-					longk=1;
-					break;
-				case 'c':
-					cflag=1;
-					strncpy(cksumname,p,200);
-					p+=strlen(cksumname);
-					break;
-				case 'C':
-					cflag=1;
-					longk=1;
-					strncpy(cksumname,p,200);
-					p+=strlen(cksumname);
-					break;
-				case 'e':
-					eflag=1;
-					break;
-				case 'v':
-					vflag=1;
-					break;
-				case 'E':
-					eflag=1;
-					longk=1;
-					break;
-				case 'd':
-					dflag=1;
-					break;
-				case 'D':
-					dflag=1;
-					longk=1;
-					break;
-				case 'b':
-					bflag=1;
-					break;
-				case 'f':
-					fflag=1;
-					break;
-				case 's':
-					sflag=1;
-					break;
-				case 'u':
-					uflag=1;
-					strncpy(uuname,p,200);
-					p+=strlen(uuname);
-					break;
-				case 'h':
-					hflag=1;
-					break;
-				case 'k':
-					kflag=1;
-					if ((i+1) == argc)
-						{
-						fputs("must have a key with the -k option\n",stderr);
-						error=1;
-						}
-					else
-						{
-						int j;
-
-						i++;
-						strncpy(key,argv[i],KEYSIZB);
-						for (j=strlen(argv[i])-1; j>=0; j--)
-							argv[i][j]='\0';
-						}
-					break;
-				default:
-					fprintf(stderr,"'%c' unknown flag\n",p[-1]);
-					error=1;
-					break;
-					}
-				}
-			}
-		else
-			{
-			if (in == NULL)
-				in=argv[i];
-			else if (out == NULL)
-				out=argv[i];
-			else
-				error=1;
-			}
-		}
-	if (error) usage();
-	/* We either
-	 * do checksum or
-	 * do encrypt or
-	 * do decrypt or
-	 * do decrypt then ckecksum or
-	 * do checksum then encrypt
-	 */
-	if (((eflag+dflag) == 1) || cflag)
-		{
-		if (eflag) do_encrypt=DES_ENCRYPT;
-		if (dflag) do_encrypt=DES_DECRYPT;
-		}
-	else
-		{
-		if (vflag) 
-			{
-#ifndef _Windows			
-			fprintf(stderr,"des(1) built with %s\n",libdes_version);
-#endif			
-			EXIT(1);
-			}
-		else usage();
-		}
-
-#ifndef _Windows			
-	if (vflag) fprintf(stderr,"des(1) built with %s\n",libdes_version);
-#endif			
-	if (	(in != NULL) &&
-		(out != NULL) &&
-#ifndef MSDOS
-		(stat(in,&ins) != -1) &&
-		(stat(out,&outs) != -1) &&
-		(ins.st_dev == outs.st_dev) &&
-		(ins.st_ino == outs.st_ino))
-#else /* MSDOS */
-		(strcmp(in,out) == 0))
-#endif
-			{
-			fputs("input and output file are the same\n",stderr);
-			EXIT(3);
-			}
-
-	if (!kflag)
-		if (des_read_pw_string(key,KEYSIZB+1,"Enter key:",eflag?VERIFY:0))
-			{
-			fputs("password error\n",stderr);
-			EXIT(2);
-			}
-
-	if (in == NULL)
-		DES_IN=stdin;
-	else if ((DES_IN=fopen(in,"r")) == NULL)
-		{
-		perror("opening input file");
-		EXIT(4);
-		}
-
-	CKSUM_OUT=stdout;
-	if (out == NULL)
-		{
-		DES_OUT=stdout;
-		CKSUM_OUT=stderr;
-		}
-	else if ((DES_OUT=fopen(out,"w")) == NULL)
-		{
-		perror("opening output file");
-		EXIT(5);
-		}
-
-#ifdef MSDOS
-	/* This should set the file to binary mode. */
-	{
-#include <fcntl.h>
-	if (!(uflag && dflag))
-		setmode(fileno(DES_IN),O_BINARY);
-	if (!(uflag && eflag))
-		setmode(fileno(DES_OUT),O_BINARY);
-	}
-#endif
-
-	doencryption();
-	fclose(DES_IN);
-	fclose(DES_OUT);
-	EXIT(0);
-	}
-
-void usage()
-	{
-	char **u;
-	static const char *Usage[]={
-"des <options> [input-file [output-file]]",
-"options:",
-"-v         : des(1) version number",
-"-e         : encrypt using sunOS compatible user key to DES key conversion.",
-"-E         : encrypt ",
-"-d         : decrypt using sunOS compatible user key to DES key conversion.",
-"-D         : decrypt ",
-"-c[ckname] : generate a cbc_cksum using sunOS compatible user key to",
-"             DES key conversion and output to ckname (stdout default,",
-"             stderr if data being output on stdout).  The checksum is",
-"             generated before encryption and after decryption if used",
-"             in conjunction with -[eEdD].",
-"-C[ckname] : generate a cbc_cksum as for -c but compatible with -[ED].",
-"-k key     : use key 'key'",
-"-h         : the key that is entered will be a hexidecimal number",
-"             that is used directly as the des key",
-"-u[uuname] : input file is uudecoded if -[dD] or output uuencoded data if -[eE]",
-"             (uuname is the filename to put in the uuencode header).",
-"-b         : encrypt using DES in ecb encryption mode, the defaut is cbc mode.",
-"-3         : encrypt using tripple DES encryption.  This uses 2 keys",
-"             generated from the input key.  If the input key is less",
-"             than 8 characters long, this is equivelent to normal",
-"             encryption.  Default is tripple cbc, -b makes it tripple ecb.",
-NULL
-};
-	for (u=(char **)Usage; *u; u++)
-		{
-		fputs(*u,stderr);
-		fputc('\n',stderr);
-		}
-
-	EXIT(1);
-	}
-
-void doencryption()
-	{
-#ifdef _LIBC
-	extern int srandom();
-	extern int random();
-	extern unsigned long time();
-#endif
-
-	register int i;
-	des_key_schedule ks,ks2;
-	unsigned char iv[8],iv2[8];
-	char *p;
-	int num=0,j,k,l,rem,ll,len,last,ex=0;
-	des_cblock kk,k2;
-	FILE *O;
-	int Exit=0;
-#ifndef MSDOS
-	static unsigned char buf[BUFSIZE+8],obuf[BUFSIZE+8];
-#else
-	static unsigned char *buf=NULL,*obuf=NULL;
-
-	if (buf == NULL)
-		{
-		if (    (( buf=(unsigned char *)malloc(BUFSIZE+8)) == NULL) ||
-			((obuf=(unsigned char *)malloc(BUFSIZE+8)) == NULL))
-			{
-			fputs("Not enough memory\n",stderr);
-			Exit=10;
-			goto problems;
-			}
-		}
-#endif
-
-	if (hflag)
-		{
-		j=(flag3?16:8);
-		p=key;
-		for (i=0; i<j; i++)
-			{
-			k=0;
-			if ((*p <= '9') && (*p >= '0'))
-				k=(*p-'0')<<4;
-			else if ((*p <= 'f') && (*p >= 'a'))
-				k=(*p-'a'+10)<<4;
-			else if ((*p <= 'F') && (*p >= 'A'))
-				k=(*p-'A'+10)<<4;
-			else
-				{
-				fputs("Bad hex key\n",stderr);
-				Exit=9;
-				goto problems;
-				}
-			p++;
-			if ((*p <= '9') && (*p >= '0'))
-				k|=(*p-'0');
-			else if ((*p <= 'f') && (*p >= 'a'))
-				k|=(*p-'a'+10);
-			else if ((*p <= 'F') && (*p >= 'A'))
-				k|=(*p-'A'+10);
-			else
-				{
-				fputs("Bad hex key\n",stderr);
-				Exit=9;
-				goto problems;
-				}
-			p++;
-			if (i < 8)
-				kk[i]=k;
-			else
-				k2[i-8]=k;
-			}
-		des_set_key((C_Block *)k2,ks2);
-		memset(k2,0,sizeof(k2));
-		}
-	else if (longk || flag3)
-		{
-		if (flag3)
-			{
-			des_string_to_2keys(key,(C_Block *)kk,(C_Block *)k2);
-			des_set_key((C_Block *)k2,ks2);
-			memset(k2,0,sizeof(k2));
-			}
-		else
-			des_string_to_key(key,(C_Block *)kk);
-		}
-	else
-		for (i=0; i<KEYSIZ; i++)
-			{
-			l=0;
-			k=key[i];
-			for (j=0; j<8; j++)
-				{
-				if (k&1) l++;
-				k>>=1;
-				}
-			if (l & 1)
-				kk[i]=key[i]&0x7f;
-			else
-				kk[i]=key[i]|0x80;
-			}
-
-	des_set_key((C_Block *)kk,ks);
-	memset(key,0,sizeof(key));
-	memset(kk,0,sizeof(kk));
-	/* woops - A bug that does not showup under unix :-( */
-	memset(iv,0,sizeof(iv));
-	memset(iv2,0,sizeof(iv2));
-
-	l=1;
-	rem=0;
-	/* first read */
-	if (eflag || (!dflag && cflag))
-		{
-		for (;;)
-			{
-			num=l=fread(&(buf[rem]),1,BUFSIZE,DES_IN);
-			l+=rem;
-			num+=rem;
-			if (l < 0)
-				{
-				perror("read error");
-				Exit=6;
-				goto problems;
-				}
-
-			rem=l%8;
-			len=l-rem;
-			if (feof(DES_IN))
-				{
-				srandom((unsigned int)time(NULL));
-				for (i=7-rem; i>0; i--)
-					buf[l++]=random()&0xff;
-				buf[l++]=rem;
-				ex=1;
-				len+=rem;
-				}
-			else
-				l-=rem;
-
-			if (cflag)
-				{
-				des_cbc_cksum((C_Block *)buf,(C_Block *)cksum,
-					(long)len,ks,(C_Block *)cksum);
-				if (!eflag)
-					{
-					if (feof(DES_IN)) break;
-					else continue;
-					}
-				}
-
-			if (bflag && !flag3)
-				for (i=0; i<l; i+=8)
-					des_ecb_encrypt(
-						(des_cblock *)&(buf[i]),
-						(des_cblock *)&(obuf[i]),
-						ks,do_encrypt);
-			else if (flag3 && bflag)
-				for (i=0; i<l; i+=8)
-					des_ecb2_encrypt(
-						(des_cblock *)&(buf[i]),
-						(des_cblock *)&(obuf[i]),
-						ks,ks2,do_encrypt);
-			else if (flag3 && !bflag)
-				{
-				char tmpbuf[8];
-
-				if (rem) memcpy(tmpbuf,&(buf[l]),
-					(unsigned int)rem);
-				des_3cbc_encrypt(
-					(des_cblock *)buf,(des_cblock *)obuf,
-					(long)l,ks,ks2,(des_cblock *)iv,
-					(des_cblock *)iv2,do_encrypt);
-				if (rem) memcpy(&(buf[l]),tmpbuf,
-					(unsigned int)rem);
-				}
-			else
-				{
-				des_cbc_encrypt(
-					(des_cblock *)buf,(des_cblock *)obuf,
-					(long)l,ks,(des_cblock *)iv,do_encrypt);
-				if (l >= 8) memcpy(iv,&(obuf[l-8]),8);
-				}
-			if (rem) memcpy(buf,&(buf[l]),(unsigned int)rem);
-
-			i=0;
-			while (i < l)
-				{
-				if (uflag)
-					j=uufwrite(obuf,1,(unsigned int)l-i,
-						DES_OUT);
-				else
-					j=fwrite(obuf,1,(unsigned int)l-i,
-						DES_OUT);
-				if (j == -1)
-					{
-					perror("Write error");
-					Exit=7;
-					goto problems;
-					}
-				i+=j;
-				}
-			if (feof(DES_IN))
-				{
-				if (uflag) uufwriteEnd(DES_OUT);
-				break;
-				}
-			}
-		}
-	else /* decrypt */
-		{
-		ex=1;
-		for (;;)
-			{
-			if (ex) {
-				if (uflag)
-					l=uufread(buf,1,BUFSIZE,DES_IN);
-				else
-					l=fread(buf,1,BUFSIZE,DES_IN);
-				ex=0;
-				rem=l%8;
-				l-=rem;
-				}
-			if (l < 0)
-				{
-				perror("read error");
-				Exit=6;
-				goto problems;
-				}
-
-			if (bflag && !flag3)
-				for (i=0; i<l; i+=8)
-					des_ecb_encrypt(
-						(des_cblock *)&(buf[i]),
-						(des_cblock *)&(obuf[i]),
-						ks,do_encrypt);
-			else if (flag3 && bflag)
-				for (i=0; i<l; i+=8)
-					des_ecb2_encrypt(
-						(des_cblock *)&(buf[i]),
-						(des_cblock *)&(obuf[i]),
-						ks,ks2,do_encrypt);
-			else if (flag3 && !bflag)
-				{
-				des_3cbc_encrypt(
-					(des_cblock *)buf,(des_cblock *)obuf,
-					(long)l,ks,ks2,(des_cblock *)iv,
-					(des_cblock *)iv2,do_encrypt);
-				}
-			else
-				{
-				des_cbc_encrypt(
-					(des_cblock *)buf,(des_cblock *)obuf,
-				 	(long)l,ks,(des_cblock *)iv,do_encrypt);
-				if (l >= 8) memcpy(iv,&(buf[l-8]),8);
-				}
-
-			if (uflag)
-				ll=uufread(&(buf[rem]),1,BUFSIZE,DES_IN);
-			else
-				ll=fread(&(buf[rem]),1,BUFSIZE,DES_IN);
-			ll+=rem;
-			rem=ll%8;
-			ll-=rem;
-			if (feof(DES_IN) && (ll == 0))
-				{
-				last=obuf[l-1];
-
-				if ((last > 7) || (last < 0))
-					{
-					fputs("The file was not decrypted correctly.\n",
-						stderr);
-					Exit=8;
-					last=0;
-					}
-				l=l-8+last;
-				}
-			i=0;
-			if (cflag) des_cbc_cksum((C_Block *)obuf,
-				(C_Block *)cksum,(long)l/8*8,ks,
-				(C_Block *)cksum);
-			while (i != l)
-				{
-				j=fwrite(obuf,1,(unsigned int)l-i,DES_OUT);
-				if (j == -1)
-					{
-					perror("Write error");
-					Exit=7;
-					goto problems;
-					}
-				i+=j;
-				}
-			l=ll;
-			if ((l == 0) && feof(DES_IN)) break;
-			}
-		}
-	if (cflag)
-		{
-		l=0;
-		if (cksumname[0] != '\0')
-			{
-			if ((O=fopen(cksumname,"w")) != NULL)
-				{
-				CKSUM_OUT=O;
-				l=1;
-				}
-			}
-		for (i=0; i<8; i++)
-			fprintf(CKSUM_OUT,"%02X",cksum[i]);
-		fprintf(CKSUM_OUT,"\n");
-		if (l) fclose(CKSUM_OUT);
-		}
-problems:
-	memset(buf,0,sizeof(buf));
-	memset(obuf,0,sizeof(obuf));
-	memset(ks,0,sizeof(ks));
-	memset(ks2,0,sizeof(ks2));
-	memset(iv,0,sizeof(iv));
-	memset(iv2,0,sizeof(iv2));
-	memset(kk,0,sizeof(kk));
-	memset(k2,0,sizeof(k2));
-	memset(uubuf,0,sizeof(uubuf));
-	memset(b,0,sizeof(b));
-	memset(bb,0,sizeof(bb));
-	memset(cksum,0,sizeof(cksum));
-	if (Exit) EXIT(Exit);
-	}
-
-int uufwrite(data, size, num, fp)
-unsigned char *data;
-int size;
-unsigned int num;
-FILE *fp;
-      
-     /* We ignore this parameter but it should be > ~50 I believe */
-   
-    
-	{
-	int i,j,left,rem,ret=num;
-	static int start=1;
-
-	if (start)
-		{
-		fprintf(fp,"begin 600 %s\n",
-			(uuname[0] == '\0')?"text.d":uuname);
-		start=0;
-		}
-
-	if (uubufnum)
-		{
-		if (uubufnum+num < 45)
-			{
-			memcpy(&(uubuf[uubufnum]),data,(unsigned int)num);
-			uubufnum+=num;
-			return(num);
-			}
-		else
-			{
-			i=45-uubufnum;
-			memcpy(&(uubuf[uubufnum]),data,(unsigned int)i);
-			j=uuencode((unsigned char *)uubuf,45,b);
-			fwrite(b,1,(unsigned int)j,fp);
-			uubufnum=0;
-			data+=i;
-			num-=i;
-			}
-		}
-
-	for (i=0; i<(((int)num)-INUUBUFN); i+=INUUBUFN)
-		{
-		j=uuencode(&(data[i]),INUUBUFN,b);
-		fwrite(b,1,(unsigned int)j,fp);
-		}
-	rem=(num-i)%45;
-	left=(num-i-rem);
-	if (left)
-		{
-		j=uuencode(&(data[i]),left,b);
-		fwrite(b,1,(unsigned int)j,fp);
-		i+=left;
-		}
-	if (i != num)
-		{
-		memcpy(uubuf,&(data[i]),(unsigned int)rem);
-		uubufnum=rem;
-		}
-	return(ret);
-	}
-
-void uufwriteEnd(fp)
-FILE *fp;
-	{
-	int j;
-	static const char *end=" \nend\n";
-
-	if (uubufnum != 0)
-		{
-		uubuf[uubufnum]='\0';
-		uubuf[uubufnum+1]='\0';
-		uubuf[uubufnum+2]='\0';
-		j=uuencode(uubuf,uubufnum,b);
-		fwrite(b,1,(unsigned int)j,fp);
-		}
-	fwrite(end,1,strlen(end),fp);
-	}
-
-int uufread(out, size, num, fp)
-unsigned char *out;
-int size; /* should always be > ~ 60; I actually ignore this parameter :-) */
-unsigned int num;
-FILE *fp;
-	{
-	int i,j,tot;
-	static int done=0;
-	static int valid=0;
-	static int start=1;
-
-	if (start)
-		{
-		for (;;)
-			{
-			b[0]='\0';
-			fgets((char *)b,300,fp);
-			if (b[0] == '\0')
-				{
-				fprintf(stderr,"no 'begin' found in uuencoded input\n");
-				return(-1);
-				}
-			if (strncmp((char *)b,"begin ",6) == 0) break;
-			}
-		start=0;
-		}
-	if (done) return(0);
-	tot=0;
-	if (valid)
-		{
-		memcpy(out,bb,(unsigned int)valid);
-		tot=valid;
-		valid=0;
-		}
-	for (;;)
-		{
-		b[0]='\0';
-		fgets((char *)b,300,fp);
-		if (b[0] == '\0') break;
-		i=strlen((char *)b);
-		if ((b[0] == 'e') && (b[1] == 'n') && (b[2] == 'd'))
-			{
-			done=1;
-			while (!feof(fp))
-				{
-				fgets((char *)b,300,fp);
-				}
-			break;
-			}
-		i=uudecode(b,i,bb);
-		if (i < 0) break;
-		if ((i+tot+8) > num)
-			{
-			/* num to copy to make it a multiple of 8 */
-			j=(num/8*8)-tot-8;
-			memcpy(&(out[tot]),bb,(unsigned int)j);
-			tot+=j;
-			memcpy(bb,&(bb[j]),(unsigned int)i-j);
-			valid=i-j;
-			break;
-			}
-		memcpy(&(out[tot]),bb,(unsigned int)i);
-		tot+=i;
-		}
-	return(tot);
-	}
-
-#define ccc2l(c,l)      (l =((DES_LONG)(*((c)++)))<<16, \
-			 l|=((DES_LONG)(*((c)++)))<< 8, \
-		 	 l|=((DES_LONG)(*((c)++))))
-
-#define l2ccc(l,c)      (*((c)++)=(unsigned char)(((l)>>16)&0xff), \
-                    *((c)++)=(unsigned char)(((l)>> 8)&0xff), \
-                    *((c)++)=(unsigned char)(((l)    )&0xff))
-
-
-int uuencode(in, num, out)
-unsigned char *in;
-int num;
-unsigned char *out;
-	{
-	int j,i,n,tot=0;
-	DES_LONG l;
-	register unsigned char *p;
-	p=out;
-
-	for (j=0; j<num; j+=45)
-		{
-		if (j+45 > num)
-			i=(num-j);
-		else	i=45;
-		*(p++)=i+' ';
-		for (n=0; n<i; n+=3)
-			{
-			ccc2l(in,l);
-			*(p++)=((l>>18)&0x3f)+' ';
-			*(p++)=((l>>12)&0x3f)+' ';
-			*(p++)=((l>> 6)&0x3f)+' ';
-			*(p++)=((l    )&0x3f)+' ';
-			tot+=4;
-			}
-		*(p++)='\n';
-		tot+=2;
-		}
-	*p='\0';
-	l=0;
-	return(tot);
-	}
-
-int uudecode(in, num, out)
-unsigned char *in;
-int num;
-unsigned char *out;
-	{
-	int j,i,k;
-	unsigned int n=0,space=0;
-	DES_LONG l;
-	DES_LONG w,x,y,z;
-	unsigned int blank=(unsigned int)'\n'-' ';
-
-	for (j=0; j<num; )
-		{
-		n= *(in++)-' ';
-		if (n == blank)
-			{
-			n=0;
-			in--;
-			}
-		if (n > 60)
-			{
-			fprintf(stderr,"uuencoded line length too long\n");
-			return(-1);
-			}
-		j++;
-
-		for (i=0; i<n; j+=4,i+=3)
-			{
-			/* the following is for cases where spaces are
-			 * removed from lines.
-			 */
-			if (space)
-				{
-				w=x=y=z=0;
-				}
-			else
-				{
-				w= *(in++)-' ';
-				x= *(in++)-' ';
-				y= *(in++)-' ';
-				z= *(in++)-' ';
-				}
-			if ((w > 63) || (x > 63) || (y > 63) || (z > 63))
-				{
-				k=0;
-				if (w == blank) k=1;
-				if (x == blank) k=2;
-				if (y == blank) k=3;
-				if (z == blank) k=4;
-				space=1;
-				switch (k) {
-				case 1:	w=0; in--;
-				case 2: x=0; in--;
-				case 3: y=0; in--;
-				case 4: z=0; in--;
-					break;
-				case 0:
-					space=0;
-					fprintf(stderr,"bad uuencoded data values\n");
-					w=x=y=z=0;
-					return(-1);
-					break;
-					}
-				}
-			l=(w<<18)|(x<<12)|(y<< 6)|(z    );
-			l2ccc(l,out);
-			}
-		if (*(in++) != '\n')
-			{
-			fprintf(stderr,"missing nl in uuencoded line\n");
-			w=x=y=z=0;
-			return(-1);
-			}
-		j++;
-		}
-	*out='\0';
-	w=x=y=z=0;
-	return(n);
-	}
diff --git a/secure/lib/libdes/des.doc b/secure/lib/libdes/des.doc
deleted file mode 100644
index e83907ed9e46..000000000000
--- a/secure/lib/libdes/des.doc
+++ /dev/null
@@ -1,494 +0,0 @@
-The DES library.
-
-Please note that this library was originally written to operate with
-eBones, a version of Kerberos that had had encryption removed when it left
-the USA and then put back in.  As such there are some routines that I will
-advise not using but they are still in the library for historical reasons.
-For all calls that have an 'input' and 'output' variables, they can be the
-same.
-
-This library requires the inclusion of 'des.h'.
-
-All of the encryption functions take what is called a des_key_schedule as an 
-argument.  A des_key_schedule is an expanded form of the des key.
-A des_key is 8 bytes of odd parity, the type used to hold the key is a
-des_cblock.  A des_cblock is an array of 8 bytes, often in this library
-description I will refer to input bytes when the function specifies
-des_cblock's as input or output, this just means that the variable should
-be a multiple of 8 bytes.
-
-The define DES_ENCRYPT is passed to specify encryption, DES_DECRYPT to
-specify decryption.  The functions and global variable are as follows:
-
-int des_check_key;
-	DES keys are supposed to be odd parity.  If this variable is set to
-	a non-zero value, des_set_key() will check that the key has odd
-	parity and is not one of the known weak DES keys.  By default this
-	variable is turned off;
-	
-void des_set_odd_parity(
-des_cblock *key );
-	This function takes a DES key (8 bytes) and sets the parity to odd.
-	
-int des_is_weak_key(
-des_cblock *key );
-	This function returns a non-zero value if the DES key passed is a
-	weak, DES key.  If it is a weak key, don't use it, try a different
-	one.  If you are using 'random' keys, the chances of hitting a weak
-	key are 1/2^52 so it is probably not worth checking for them.
-	
-int des_set_key(
-des_cblock *key,
-des_key_schedule schedule);
-	Des_set_key converts an 8 byte DES key into a des_key_schedule.
-	A des_key_schedule is an expanded form of the key which is used to
-	perform actual encryption.  It can be regenerated from the DES key
-	so it only needs to be kept when encryption or decryption is about
-	to occur.  Don't save or pass around des_key_schedule's since they
-	are CPU architecture dependent, DES keys are not.  If des_check_key
-	is non zero, zero is returned if the key has the wrong parity or
-	the key is a weak key, else 1 is returned.
-	
-int des_key_sched(
-des_cblock *key,
-des_key_schedule schedule);
-	An alternative name for des_set_key().
-
-int des_rw_mode;		/* defaults to DES_PCBC_MODE */
-	This flag holds either DES_CBC_MODE or DES_PCBC_MODE (default).
-	This specifies the function to use in the enc_read() and enc_write()
-	functions.
-
-void des_encrypt(
-unsigned long *data,
-des_key_schedule ks,
-int enc);
-	This is the DES encryption function that gets called by just about
-	every other DES routine in the library.  You should not use this
-	function except to implement 'modes' of DES.  I say this because the
-	functions that call this routine do the conversion from 'char *' to
-	long, and this needs to be done to make sure 'non-aligned' memory
-	access do not occur.  The characters are loaded 'little endian',
-	have a look at my source code for more details on how I use this
-	function.
-	Data is a pointer to 2 unsigned long's and ks is the
-	des_key_schedule to use.  enc, is non zero specifies encryption,
-	zero if decryption.
-
-void des_encrypt2(
-unsigned long *data,
-des_key_schedule ks,
-int enc);
-	This functions is the same as des_encrypt() except that the DES
-	initial permutation (IP) and final permutation (FP) have been left
-	out.  As for des_encrypt(), you should not use this function.
-	It is used by the routines in my library that implement triple DES.
-	IP() des_encrypt2() des_encrypt2() des_encrypt2() FP() is the same
-	as des_encrypt() des_encrypt() des_encrypt() except faster :-).
-
-void des_ecb_encrypt(
-des_cblock *input,
-des_cblock *output,
-des_key_schedule ks,
-int enc);
-	This is the basic Electronic Code Book form of DES, the most basic
-	form.  Input is encrypted into output using the key represented by
-	ks.  If enc is non zero (DES_ENCRYPT), encryption occurs, otherwise
-	decryption occurs.  Input is 8 bytes long and output is 8 bytes.
-	(the des_cblock structure is 8 chars).
-	
-void des_ecb3_encrypt(
-des_cblock *input,
-des_cblock *output,
-des_key_schedule ks1,
-des_key_schedule ks2,
-des_key_schedule ks3,
-int enc);
-	This is the 3 key EDE mode of ECB DES.  What this means is that 
-	the 8 bytes of input is encrypted with ks1, decrypted with ks2 and
-	then encrypted again with ks3, before being put into output;
-	C=E(ks3,D(ks2,E(ks1,M))).  There is a macro, des_ecb2_encrypt()
-	that only takes 2 des_key_schedules that implements,
-	C=E(ks1,D(ks2,E(ks1,M))) in that the final encrypt is done with ks1.
-	
-void des_cbc_encrypt(
-des_cblock *input,
-des_cblock *output,
-long length,
-des_key_schedule ks,
-des_cblock *ivec,
-int enc);
-	This routine implements DES in Cipher Block Chaining mode.
-	Input, which should be a multiple of 8 bytes is encrypted
-	(or decrypted) to output which will also be a multiple of 8 bytes.
-	The number of bytes is in length (and from what I've said above,
-	should be a multiple of 8).  If length is not a multiple of 8, I'm
-	not being held responsible :-).  ivec is the initialisation vector.
-	This function does not modify this variable.  To correctly implement
-	cbc mode, you need to do one of 2 things; copy the last 8 bytes of
-	cipher text for use as the next ivec in your application,
-	or use des_ncbc_encrypt(). 
-	Only this routine has this problem with updating the ivec, all
-	other routines that are implementing cbc mode update ivec.
-	
-void des_ncbc_encrypt(
-des_cblock *input,
-des_cblock *output,
-long length,
-des_key_schedule sk,
-des_cblock *ivec,
-int enc);
-	For historical reasons, des_cbc_encrypt() did not update the
-	ivec with the value requires so that subsequent calls to
-	des_cbc_encrypt() would 'chain'.  This was needed so that the same
-	'length' values would not need to be used when decrypting.
-	des_ncbc_encrypt() does the right thing.  It is the same as
-	des_cbc_encrypt accept that ivec is updates with the correct value
-	to pass in subsequent calls to des_ncbc_encrypt().  I advise using
-	des_ncbc_encrypt() instead of des_cbc_encrypt();
-
-void des_xcbc_encrypt(
-des_cblock *input,
-des_cblock *output,
-long length,
-des_key_schedule sk,
-des_cblock *ivec,
-des_cblock *inw,
-des_cblock *outw,
-int enc);
-	This is RSA's DESX mode of DES.  It uses inw and outw to
-	'whiten' the encryption.  inw and outw are secret (unlike the iv)
-	and are as such, part of the key.  So the key is sort of 24 bytes.
-	This is much better than cbc des.
-	
-void des_3cbc_encrypt(
-des_cblock *input,
-des_cblock *output,
-long length,
-des_key_schedule sk1,
-des_key_schedule sk2,
-des_cblock *ivec1,
-des_cblock *ivec2,
-int enc);
-	This function is flawed, do not use it.  I have left it in the
-	library because it is used in my des(1) program and will function
-	correctly when used by des(1).  If I removed the function, people
-	could end up unable to decrypt files.
-	This routine implements outer triple cbc encryption using 2 ks and
-	2 ivec's.  Use des_ede2_cbc_encrypt() instead.
-	
-void des_ede3_cbc_encrypt(
-des_cblock *input,
-des_cblock *output, 
-long length,
-des_key_schedule ks1,
-des_key_schedule ks2, 
-des_key_schedule ks3, 
-des_cblock *ivec,
-int enc);
-	This function implements inner triple CBC DES encryption with 3
-	keys.  What this means is that each 'DES' operation
-	inside the cbc mode is really an C=E(ks3,D(ks2,E(ks1,M))).
-	Again, this is cbc mode so an ivec is requires.
-	This mode is used by SSL.
-	There is also a des_ede2_cbc_encrypt() that only uses 2
-	des_key_schedule's, the first being reused for the final
-	encryption.  C=E(ks1,D(ks2,E(ks1,M))).  This form of triple DES
-	is used by the RSAref library.
-	
-void des_pcbc_encrypt(
-des_cblock *input,
-des_cblock *output,
-long length,
-des_key_schedule ks,
-des_cblock *ivec,
-int enc);
-	This is Propagating Cipher Block Chaining mode of DES.  It is used
-	by Kerberos v4.  It's parameters are the same as des_ncbc_encrypt().
-	
-void des_cfb_encrypt(
-unsigned char *in,
-unsigned char *out,
-int numbits,
-long length,
-des_key_schedule ks,
-des_cblock *ivec,
-int enc);
-	Cipher Feedback Back mode of DES.  This implementation 'feeds back'
-	in numbit blocks.  The input (and output) is in multiples of numbits
-	bits.  numbits should to be a multiple of 8 bits.  Length is the
-	number of bytes input.  If numbits is not a multiple of 8 bits,
-	the extra bits in the bytes will be considered padding.  So if
-	numbits is 12, for each 2 input bytes, the 4 high bits of the
-	second byte will be ignored.  So to encode 72 bits when using
-	a numbits of 12 take 12 bytes.  To encode 72 bits when using
-	numbits of 9 will take 16 bytes.  To encode 80 bits when using
-	numbits of 16 will take 10 bytes. etc, etc.  This padding will
-	apply to both input and output.
-
-	
-void des_cfb64_encrypt(
-unsigned char *in,
-unsigned char *out,
-long length,
-des_key_schedule ks,
-des_cblock *ivec,
-int *num,
-int enc);
-	This is one of the more useful functions in this DES library, it
-	implements CFB mode of DES with 64bit feedback.  Why is this
-	useful you ask?  Because this routine will allow you to encrypt an
-	arbitrary number of bytes, no 8 byte padding.  Each call to this
-	routine will encrypt the input bytes to output and then update ivec
-	and num.  num contains 'how far' we are though ivec.  If this does
-	not make much sense, read more about cfb mode of DES :-).
-	
-void des_ede3_cfb64_encrypt(
-unsigned char *in,
-unsigned char *out,
-long length,
-des_key_schedule ks1,
-des_key_schedule ks2,
-des_key_schedule ks3,
-des_cblock *ivec,
-int *num,
-int enc);
-	Same as des_cfb64_encrypt() accept that the DES operation is
-	triple DES.  As usual, there is a macro for
-	des_ede2_cfb64_encrypt() which reuses ks1.
-
-void des_ofb_encrypt(
-unsigned char *in,
-unsigned char *out,
-int numbits,
-long length,
-des_key_schedule ks,
-des_cblock *ivec);
-	This is a implementation of Output Feed Back mode of DES.  It is
-	the same as des_cfb_encrypt() in that numbits is the size of the
-	units dealt with during input and output (in bits).
-	
-void des_ofb64_encrypt(
-unsigned char *in,
-unsigned char *out,
-long length,
-des_key_schedule ks,
-des_cblock *ivec,
-int *num);
-	The same as des_cfb64_encrypt() except that it is Output Feed Back
-	mode.
-
-void des_ede3_ofb64_encrypt(
-unsigned char *in,
-unsigned char *out,
-long length,
-des_key_schedule ks1,
-des_key_schedule ks2,
-des_key_schedule ks3,
-des_cblock *ivec,
-int *num);
-	Same as des_ofb64_encrypt() accept that the DES operation is
-	triple DES.  As usual, there is a macro for
-	des_ede2_ofb64_encrypt() which reuses ks1.
-
-int des_read_pw_string(
-char *buf,
-int length,
-char *prompt,
-int verify);
-	This routine is used to get a password from the terminal with echo
-	turned off.  Buf is where the string will end up and length is the
-	size of buf.  Prompt is a string presented to the 'user' and if
-	verify is set, the key is asked for twice and unless the 2 copies
-	match, an error is returned.  A return code of -1 indicates a
-	system error, 1 failure due to use interaction, and 0 is success.
-
-unsigned long des_cbc_cksum(
-des_cblock *input,
-des_cblock *output,
-long length,
-des_key_schedule ks,
-des_cblock *ivec);
-	This function produces an 8 byte checksum from input that it puts in
-	output and returns the last 4 bytes as a long.  The checksum is
-	generated via cbc mode of DES in which only the last 8 byes are
-	kept.  I would recommend not using this function but instead using
-	the EVP_Digest routines, or at least using MD5 or SHA.  This
-	function is used by Kerberos v4 so that is why it stays in the
-	library.
-	
-char *crypt(
-const char *buf,
-const char *salt);
-	This is my fast version of the unix crypt(3) function.  This version
-	takes only a small amount of space relative to other fast
-	crypt() implementations.
-
-void des_string_to_key(
-char *str,
-des_cblock *key);
-	This function takes str and converts it into a DES key.  I would
-	recommend using MD5 instead and use the first 8 bytes of output.
-	When I wrote the first version of these routines back in 1990, MD5
-	did not exist but I feel these routines are still sound.  This
-	routines is compatible with the one in MIT's libdes.
-	
-void des_string_to_2keys(
-char *str,
-des_cblock *key1,
-des_cblock *key2);
-	This function takes str and converts it into 2 DES keys.
-	I would recommend using MD5 and using the 16 bytes as the 2 keys.
-	I have nothing against these 2 'string_to_key' routines, it's just
-	that if you say that your encryption key is generated by using the
-	16 bytes of an MD5 hash, every-one knows how you generated your
-	keys.
-
-int des_read_password(
-des_cblock *key,
-char *prompt,
-int verify);
-	This routine combines des_read_pw_string() with des_string_to_key().
-
-int des_read_2passwords(
-des_cblock *key1,
-des_cblock *key2,
-char *prompt,
-int verify);
-	This routine combines des_read_pw_string() with des_string_to_2key().
-
-void des_random_seed(
-des_cblock key);
-	This routine sets a starting point for des_random_key().
-	
-void des_random_key(
-des_cblock ret);
-	This function return a random key.  Make sure to 'seed' the random
-	number generator (with des_random_seed()) before using this function.
-	I personally now use a MD5 based random number system.
-
-int des_enc_read(
-int fd,
-char *buf,
-int len,
-des_key_schedule ks,
-des_cblock *iv);
-	This function will write to a file descriptor the encrypted data
-	from buf.  This data will be preceded by a 4 byte 'byte count' and
-	will be padded out to 8 bytes.  The encryption is either CBC of
-	PCBC depending on the value of des_rw_mode.  If it is DES_PCBC_MODE,
-	pcbc is used, if DES_CBC_MODE, cbc is used.  The default is to use
-	DES_PCBC_MODE.
-
-int des_enc_write(
-int fd,
-char *buf,
-int len,
-des_key_schedule ks,
-des_cblock *iv);
-	This routines read stuff written by des_enc_read() and decrypts it.
-	I have used these routines quite a lot but I don't believe they are
-	suitable for non-blocking io.  If you are after a full
-	authentication/encryption over networks, have a look at SSL instead.
-
-unsigned long des_quad_cksum(
-des_cblock *input,
-des_cblock *output,
-long length,
-int out_count,
-des_cblock *seed);
-	This is a function from Kerberos v4 that is not anything to do with
-	DES but was needed.  It is a cksum that is quicker to generate than
-	des_cbc_cksum();  I personally would use MD5 routines now.
-=====
-Modes of DES
-Quite a bit of the following information has been taken from
-	AS 2805.5.2
-	Australian Standard
-	Electronic funds transfer - Requirements for interfaces,
-	Part 5.2: Modes of operation for an n-bit block cipher algorithm
-	Appendix A
-
-There are several different modes in which DES can be used, they are
-as follows.
-
-Electronic Codebook Mode (ECB) (des_ecb_encrypt())
-- 64 bits are enciphered at a time.
-- The order of the blocks can be rearranged without detection.
-- The same plaintext block always produces the same ciphertext block
-  (for the same key) making it vulnerable to a 'dictionary attack'.
-- An error will only affect one ciphertext block.
-
-Cipher Block Chaining Mode (CBC) (des_cbc_encrypt())
-- a multiple of 64 bits are enciphered at a time.
-- The CBC mode produces the same ciphertext whenever the same
-  plaintext is encrypted using the same key and starting variable.
-- The chaining operation makes the ciphertext blocks dependent on the
-  current and all preceding plaintext blocks and therefore blocks can not
-  be rearranged.
-- The use of different starting variables prevents the same plaintext
-  enciphering to the same ciphertext.
-- An error will affect the current and the following ciphertext blocks.
-
-Cipher Feedback Mode (CFB) (des_cfb_encrypt())
-- a number of bits (j) <= 64 are enciphered at a time.
-- The CFB mode produces the same ciphertext whenever the same
-  plaintext is encrypted using the same key and starting variable.
-- The chaining operation makes the ciphertext variables dependent on the
-  current and all preceding variables and therefore j-bit variables are
-  chained together and can not be rearranged.
-- The use of different starting variables prevents the same plaintext
-  enciphering to the same ciphertext.
-- The strength of the CFB mode depends on the size of k (maximal if
-  j == k).  In my implementation this is always the case.
-- Selection of a small value for j will require more cycles through
-  the encipherment algorithm per unit of plaintext and thus cause
-  greater processing overheads.
-- Only multiples of j bits can be enciphered.
-- An error will affect the current and the following ciphertext variables.
-
-Output Feedback Mode (OFB) (des_ofb_encrypt())
-- a number of bits (j) <= 64 are enciphered at a time.
-- The OFB mode produces the same ciphertext whenever the same
-  plaintext enciphered using the same key and starting variable.  More
-  over, in the OFB mode the same key stream is produced when the same
-  key and start variable are used.  Consequently, for security reasons
-  a specific start variable should be used only once for a given key.
-- The absence of chaining makes the OFB more vulnerable to specific attacks.
-- The use of different start variables values prevents the same
-  plaintext enciphering to the same ciphertext, by producing different
-  key streams.
-- Selection of a small value for j will require more cycles through
-  the encipherment algorithm per unit of plaintext and thus cause
-  greater processing overheads.
-- Only multiples of j bits can be enciphered.
-- OFB mode of operation does not extend ciphertext errors in the
-  resultant plaintext output.  Every bit error in the ciphertext causes
-  only one bit to be in error in the deciphered plaintext.
-- OFB mode is not self-synchronising.  If the two operation of
-  encipherment and decipherment get out of synchronism, the system needs
-  to be re-initialised.
-- Each re-initialisation should use a value of the start variable
- different from the start variable values used before with the same
- key.  The reason for this is that an identical bit stream would be
- produced each time from the same parameters.  This would be
- susceptible to a ' known plaintext' attack.
-
-Triple ECB Mode (des_ecb3_encrypt())
-- Encrypt with key1, decrypt with key2 and encrypt with key3 again.
-- As for ECB encryption but increases the key length to 168 bits.
-  There are theoretic attacks that can be used that make the effective
-  key length 112 bits, but this attack also requires 2^56 blocks of
-  memory, not very likely, even for the NSA.
-- If both keys are the same it is equivalent to encrypting once with
-  just one key.
-- If the first and last key are the same, the key length is 112 bits.
-  There are attacks that could reduce the key space to 55 bit's but it
-  requires 2^56 blocks of memory.
-- If all 3 keys are the same, this is effectively the same as normal
-  ecb mode.
-
-Triple CBC Mode (des_ede3_cbc_encrypt())
-- Encrypt with key1, decrypt with key2 and then encrypt with key3.
-- As for CBC encryption but increases the key length to 168 bits with
-  the same restrictions as for triple ecb mode.
diff --git a/secure/lib/libdes/des.h b/secure/lib/libdes/des.h
deleted file mode 100644
index 9a837f58c421..000000000000
--- a/secure/lib/libdes/des.h
+++ /dev/null
@@ -1,274 +0,0 @@
-/* lib/des/des.h */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_DES_H
-#define HEADER_DES_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include <stdio.h>
-
-/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
- * %20 speed up (longs are 8 bytes, int's are 4). */
-#ifndef DES_LONG
-#define DES_LONG unsigned long
-#endif
-
-typedef unsigned char des_cblock[8];
-typedef struct des_ks_struct
-	{
-	union	{
-		des_cblock _;
-		/* make sure things are correct size on machines with
-		 * 8 byte longs */
-		DES_LONG pad[2];
-		} ks;
-#undef _
-#define _	ks._
-	} des_key_schedule[16];
-
-#define DES_KEY_SZ 	(sizeof(des_cblock))
-#define DES_SCHEDULE_SZ (sizeof(des_key_schedule))
-
-#define DES_ENCRYPT	1
-#define DES_DECRYPT	0
-
-#define DES_CBC_MODE	0
-#define DES_PCBC_MODE	1
-
-#define des_ecb2_encrypt(i,o,k1,k2,e) \
-	des_ecb3_encrypt((i),(o),(k1),(k2),(k1),(e))
-
-#define des_ede2_cbc_encrypt(i,o,l,k1,k2,iv,e) \
-	des_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(e))
-
-#define des_ede2_cfb64_encrypt(i,o,l,k1,k2,iv,n,e) \
-	des_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n),(e))
-
-#define des_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \
-	des_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n))
-
-#define C_Block des_cblock
-#define Key_schedule des_key_schedule
-#ifdef KERBEROS
-#define ENCRYPT DES_ENCRYPT
-#define DECRYPT DES_DECRYPT
-#endif
-#define KEY_SZ DES_KEY_SZ
-#define string_to_key des_string_to_key
-#define read_pw_string des_read_pw_string
-#define random_key des_random_key
-#define pcbc_encrypt des_pcbc_encrypt
-#define set_key des_set_key
-#define key_sched des_key_sched
-#define ecb_encrypt des_ecb_encrypt
-#define cbc_encrypt des_cbc_encrypt
-#define ncbc_encrypt des_ncbc_encrypt
-#define xcbc_encrypt des_xcbc_encrypt
-#define cbc_cksum des_cbc_cksum
-#define quad_cksum des_quad_cksum
-
-/* For compatibility with the MIT lib - eay 20/05/92 */
-typedef des_key_schedule bit_64;
-#define des_fixup_key_parity des_set_odd_parity
-#define des_check_key_parity check_parity
-
-extern int des_check_key;	/* defaults to false */
-extern int des_rw_mode;		/* defaults to DES_PCBC_MODE */
-
-/* The next line is used to disable full ANSI prototypes, if your
- * compiler has problems with the prototypes, make sure this line always
- * evaluates to true :-) */
-#if defined(MSDOS) || defined(__STDC__)
-#undef NOPROTO
-#endif
-#ifndef NOPROTO
-char *des_options(void);
-void des_ecb3_encrypt(des_cblock *input,des_cblock *output,
-	des_key_schedule ks1,des_key_schedule ks2,
-	des_key_schedule ks3, int enc);
-DES_LONG des_cbc_cksum(des_cblock *input,des_cblock *output,
-	long length,des_key_schedule schedule,des_cblock *ivec);
-void des_cbc_encrypt(des_cblock *input,des_cblock *output,long length,
-	des_key_schedule schedule,des_cblock *ivec,int enc);
-void des_ncbc_encrypt(des_cblock *input,des_cblock *output,long length,
-	des_key_schedule schedule,des_cblock *ivec,int enc);
-void des_xcbc_encrypt(des_cblock *input,des_cblock *output,long length,
-	des_key_schedule schedule,des_cblock *ivec,
-	des_cblock *inw,des_cblock *outw,int enc);
-void des_3cbc_encrypt(des_cblock *input,des_cblock *output,long length,
-	des_key_schedule sk1,des_key_schedule sk2,
-	des_cblock *ivec1,des_cblock *ivec2,int enc);
-void des_cfb_encrypt(unsigned char *in,unsigned char *out,int numbits,
-	long length,des_key_schedule schedule,des_cblock *ivec,int enc);
-void des_ecb_encrypt(des_cblock *input,des_cblock *output,
-	des_key_schedule ks,int enc);
-void des_encrypt(DES_LONG *data,des_key_schedule ks, int enc);
-void des_encrypt2(DES_LONG *data,des_key_schedule ks, int enc);
-void des_ede3_cbc_encrypt(des_cblock *input, des_cblock *output, 
-	long length, des_key_schedule ks1, des_key_schedule ks2, 
-	des_key_schedule ks3, des_cblock *ivec, int enc);
-void des_ede3_cfb64_encrypt(unsigned char *in, unsigned char *out,
-	long length, des_key_schedule ks1, des_key_schedule ks2,
-	des_key_schedule ks3, des_cblock *ivec, int *num, int encrypt);
-void des_ede3_ofb64_encrypt(unsigned char *in, unsigned char *out,
-	long length, des_key_schedule ks1, des_key_schedule ks2,
-	des_key_schedule ks3, des_cblock *ivec, int *num);
-
-int des_enc_read(int fd,char *buf,int len,des_key_schedule sched,
-	des_cblock *iv);
-int des_enc_write(int fd,char *buf,int len,des_key_schedule sched,
-	des_cblock *iv);
-#if 0
-#ifdef PERL5
-char *des_crypt(const char *buf,const char *salt);
-#else
-/* some stupid compilers complain because I have declared char instead
- * of const char */
-#ifdef HEADER_DES_LOCL_H
-char *crypt(const char *buf,const char *salt);
-#else
-char *crypt();
-#endif
-#endif
-#endif
-void des_ofb_encrypt(unsigned char *in,unsigned char *out,
-	int numbits,long length,des_key_schedule schedule,des_cblock *ivec);
-void des_pcbc_encrypt(des_cblock *input,des_cblock *output,long length,
-	des_key_schedule schedule,des_cblock *ivec,int enc);
-DES_LONG des_quad_cksum(des_cblock *input,des_cblock *output,
-	long length,int out_count,des_cblock *seed);
-void des_random_seed(des_cblock key);
-void des_random_key(des_cblock ret);
-int des_read_password(des_cblock *key,char *prompt,int verify);
-int des_read_2passwords(des_cblock *key1,des_cblock *key2,
-	char *prompt,int verify);
-int des_read_pw_string(char *buf,int length,char *prompt,int verify);
-void des_set_odd_parity(des_cblock *key);
-int des_is_weak_key(des_cblock *key);
-int des_set_key(des_cblock *key,des_key_schedule schedule);
-int des_key_sched(des_cblock *key,des_key_schedule schedule);
-void des_string_to_key(char *str,des_cblock *key);
-void des_string_to_2keys(char *str,des_cblock *key1,des_cblock *key2);
-void des_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
-	des_key_schedule schedule, des_cblock *ivec, int *num, int enc);
-void des_ofb64_encrypt(unsigned char *in, unsigned char *out, long length,
-	des_key_schedule schedule, des_cblock *ivec, int *num);
-
-/* Extra functions from Mark Murray <mark@grondar.za> */
-void des_cblock_print_file(des_cblock *cb, FILE *fp);
-/* The following functions are not in the normal unix build or the
- * SSLeay build.  When using the SSLeay build, use RAND_seed()
- * and RAND_bytes() instead. */
-int des_new_random_key(des_cblock *key);
-void des_init_random_number_generator(des_cblock *key);
-void des_set_random_generator_seed(des_cblock *key);
-void des_set_sequence_number(des_cblock new_sequence_number);
-void des_generate_random_block(des_cblock *block);
-
-#else
-
-char *des_options();
-void des_ecb3_encrypt();
-DES_LONG des_cbc_cksum();
-void des_cbc_encrypt();
-void des_ncbc_encrypt();
-void des_xcbc_encrypt();
-void des_3cbc_encrypt();
-void des_cfb_encrypt();
-void des_ede3_cfb64_encrypt();
-void des_ede3_ofb64_encrypt();
-void des_ecb_encrypt();
-void des_encrypt();
-void des_encrypt2();
-void des_ede3_cbc_encrypt();
-int des_enc_read();
-int des_enc_write();
-#if 0
-#ifdef PERL5
-char *des_crypt();
-#else
-char *crypt();
-#endif
-#endif
-void des_ofb_encrypt();
-void des_pcbc_encrypt();
-DES_LONG des_quad_cksum();
-void des_random_seed();
-void des_random_key();
-int des_read_password();
-int des_read_2passwords();
-int des_read_pw_string();
-void des_set_odd_parity();
-int des_is_weak_key();
-int des_set_key();
-int des_key_sched();
-void des_string_to_key();
-void des_string_to_2keys();
-void des_cfb64_encrypt();
-void des_ofb64_encrypt();
-
-/* Extra functions from Mark Murray <mark@grondar.za> */
-void des_cblock_print_file();
-/* The following functions are not in the normal unix build or the
- * SSLeay build.  When using the SSLeay build, use RAND_seed()
- * and RAND_bytes() instead. */
-int des_new_random_key();
-void des_init_random_number_generator();
-void des_set_random_generator_seed();
-void des_set_sequence_number();
-void des_generate_random_block();
-
-#endif
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/secure/lib/libdes/des.man b/secure/lib/libdes/des.man
deleted file mode 100644
index 734119906b8f..000000000000
--- a/secure/lib/libdes/des.man
+++ /dev/null
@@ -1,186 +0,0 @@
-.TH DES 1 
-.SH NAME
-des - encrypt or decrypt data using Data Encryption Standard
-.SH SYNOPSIS
-.B des
-(
-.B \-e
-|
-.B \-E
-) | (
-.B \-d
-|
-.B \-D
-) | (
-.B \-\fR[\fPcC\fR][\fPckname\fR]\fP
-) |
-[
-.B \-b3hfs
-] [
-.B \-k
-.I key
-]
-] [
-.B \-u\fR[\fIuuname\fR]
-[
-.I input-file
-[
-.I output-file
-] ]
-.SH DESCRIPTION
-.B des
-encrypts and decrypts data using the
-Data Encryption Standard algorithm.
-One of
-.B \-e, \-E
-(for encrypt) or
-.B \-d, \-D
-(for decrypt) must be specified.
-It is also possible to use
-.B \-c
-or
-.B \-C
-in conjunction or instead of the a encrypt/decrypt option to generate
-a 16 character hexadecimal checksum, generated via the
-.I des_cbc_cksum.
-.LP
-Two standard encryption modes are supported by the
-.B des
-program, Cipher Block Chaining (the default) and Electronic Code Book
-(specified with
-.B \-b
-).
-.LP
-The key used for the DES
-algorithm is obtained by prompting the user unless the
-.B `\-k
-.I key'
-option is given.
-If the key is an argument to the
-.B des
-command, it is potentially visible to users executing
-.BR ps (1)
-or a derivative.  To minimise this possibility,
-.B des
-takes care to destroy the key argument immediately upon entry.
-If your shell keeps a history file be careful to make sure it is not
-world readable.
-.LP
-Since this program attempts to maintain compatability with sunOS's
-des(1) command, there are 2 different methods used to convert the user
-supplied key to a des key.
-Whenever and one or more of
-.B \-E, \-D, \-C
-or
-.B \-3
-options are used, the key conversion procedure will not be compatible
-with the sunOS des(1) version but will use all the user supplied
-character to generate the des key.
-.B des
-command reads from standard input unless
-.I input-file
-is specified and writes to standard output unless
-.I output-file
-is given.
-.SH OPTIONS
-.TP
-.B \-b
-Select ECB
-(eight bytes at a time) encryption mode.
-.TP
-.B \-3
-Encrypt using triple encryption.
-By default triple cbc encryption is used but if the
-.B \-b
-option is used then triple ecb encryption is performed.
-If the key is less than 8 characters long, the flag has no effect.
-.TP
-.B \-e
-Encrypt data using an 8 byte key in a manner compatible with sunOS
-des(1).
-.TP
-.B \-E
-Encrypt data using a key of nearly unlimited length (1024 bytes).
-This will product a more secure encryption.
-.TP
-.B \-d
-Decrypt data that was encrypted with the \-e option.
-.TP
-.B \-D
-Decrypt data that was encrypted with the \-E option.
-.TP
-.B \-c
-Generate a 16 character hexadecimal cbc checksum and output this to
-stderr.
-If a filename was specified after the
-.B \-c
-option, the checksum is output to that file.
-The checksum is generated using a key generated in a sunOS compatible
-manner.
-.TP
-.B \-C
-A cbc checksum is generated in the same manner as described for the
-.B \-c
-option but the DES key is generated in the same manner as used for the
-.B \-E
-and
-.B \-D
-options
-.TP
-.B \-f
-Does nothing - allowed for compatibility with sunOS des(1) command.
-.TP
-.B \-s
-Does nothing - allowed for compatibility with sunOS des(1) command.
-.TP
-.B "\-k \fIkey\fP"
-Use the encryption 
-.I key
-specified.
-.TP
-.B "\-h"
-The
-.I key
-is assumed to be a 16 character hexadecimal number.
-If the
-.B "\-3"
-option is used the key is assumed to be a 32 character hexadecimal
-number.
-.TP
-.B \-u
-This flag is used to read and write uuencoded files.  If decrypting,
-the input file is assumed to contain uuencoded, DES encrypted data.
-If encrypting, the characters following the -u are used as the name of
-the uuencoded file to embed in the begin line of the uuencoded
-output.  If there is no name specified after the -u, the name text.des
-will be embedded in the header.
-.SH SEE ALSO
-.B ps (1)
-.B des_crypt(3)
-.SH BUGS
-.LP
-The problem with using the
-.B -e
-option is the short key length.
-It would be better to use a real 56-bit key rather than an
-ASCII-based 56-bit pattern.  Knowing that the key was derived from ASCII
-radically reduces the time necessary for a brute-force cryptographic attack.
-My attempt to remove this problem is to add an alternative text-key to
-DES-key function.  This alternative function (accessed via
-.B -E, -D, -S
-and
-.B -3
-)
-uses DES to help generate the key.
-.LP
-Be carefully when using the -u option.  Doing des -ud <filename> will
-not decrypt filename (the -u option will gobble the d option).
-.LP
-The VMS operating system operates in a world where files are always a
-multiple of 512 bytes.  This causes problems when encrypted data is
-send from unix to VMS since a 88 byte file will suddenly be padded
-with 424 null bytes.  To get around this problem, use the -u option
-to uuencode the data before it is send to the VMS system.
-.SH AUTHOR
-.LP
-Eric Young (eay@mincom.oz.au or eay@psych.psy.uq.oz.au)
diff --git a/secure/lib/libdes/des.pl b/secure/lib/libdes/des.pl
deleted file mode 100755
index d80e7cbf67d2..000000000000
--- a/secure/lib/libdes/des.pl
+++ /dev/null
@@ -1,552 +0,0 @@
-#!/usr/bin/perl
-# des.pl - eric young 22/11/1991 eay@mincom.oz.au or eay@psych.psy.uq.oz.au
-#
-# Copyright (C) 1993 Eric Young
-#
-# 11 April 1996 - patched to circumvent Perl 5 (through 5.002) problem
-#                 with sign-extension on right shift operations.
-#                 Ed Kubaitis - ejk@uiuc.edu
-#
-# eay - 92/08/31 - I think I have fixed all problems for 64bit
-# versions of perl but I could be wrong since I have not tested it yet :-).
-#
-# This is an implementation of DES in perl.
-# The two routines (des_set_key and des_ecb_encrypt)
-# take 8 byte objects as arguments.
-#
-# des_set_key takes an 8 byte string as a key and returns a key schedule
-# for use in calls to des_ecb_encrypt.
-# des_ecb_encrypt takes three arguments, the first is a key schedule
-# (make sure to pass it by reference with the *), the second is 1
-# to encrypt, 0 to decrypt.  The third argument is an 8 byte object
-# to encrypt.  The function returns an 8 byte object that has been
-# DES encrypted.
-#
-# example:
-# require 'des.pl'
-#
-# $key =pack("C8",0x12,0x23,0x45,0x67,0x89,0xab,0xcd,0xef);
-# @ks=  &des_set_key($key);
-#
-# $outbytes= &des_ecb_encrypt(*ks,1,$data);
-# @enc =unpack("C8",$outbytes);
-#
-                 
-package des;
-
-eval("usr integer;") if (int($]) > 4);
-
-# The following 8 arrays are used in des_set_key
-@skb0=(
-# for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 
-0x00000000,0x00000010,0x20000000,0x20000010,
-0x00010000,0x00010010,0x20010000,0x20010010,
-0x00000800,0x00000810,0x20000800,0x20000810,
-0x00010800,0x00010810,0x20010800,0x20010810,
-0x00000020,0x00000030,0x20000020,0x20000030,
-0x00010020,0x00010030,0x20010020,0x20010030,
-0x00000820,0x00000830,0x20000820,0x20000830,
-0x00010820,0x00010830,0x20010820,0x20010830,
-0x00080000,0x00080010,0x20080000,0x20080010,
-0x00090000,0x00090010,0x20090000,0x20090010,
-0x00080800,0x00080810,0x20080800,0x20080810,
-0x00090800,0x00090810,0x20090800,0x20090810,
-0x00080020,0x00080030,0x20080020,0x20080030,
-0x00090020,0x00090030,0x20090020,0x20090030,
-0x00080820,0x00080830,0x20080820,0x20080830,
-0x00090820,0x00090830,0x20090820,0x20090830,
-);
-@skb1=(
-# for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 
-0x00000000,0x02000000,0x00002000,0x02002000,
-0x00200000,0x02200000,0x00202000,0x02202000,
-0x00000004,0x02000004,0x00002004,0x02002004,
-0x00200004,0x02200004,0x00202004,0x02202004,
-0x00000400,0x02000400,0x00002400,0x02002400,
-0x00200400,0x02200400,0x00202400,0x02202400,
-0x00000404,0x02000404,0x00002404,0x02002404,
-0x00200404,0x02200404,0x00202404,0x02202404,
-0x10000000,0x12000000,0x10002000,0x12002000,
-0x10200000,0x12200000,0x10202000,0x12202000,
-0x10000004,0x12000004,0x10002004,0x12002004,
-0x10200004,0x12200004,0x10202004,0x12202004,
-0x10000400,0x12000400,0x10002400,0x12002400,
-0x10200400,0x12200400,0x10202400,0x12202400,
-0x10000404,0x12000404,0x10002404,0x12002404,
-0x10200404,0x12200404,0x10202404,0x12202404,
-);
-@skb2=(
-# for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 
-0x00000000,0x00000001,0x00040000,0x00040001,
-0x01000000,0x01000001,0x01040000,0x01040001,
-0x00000002,0x00000003,0x00040002,0x00040003,
-0x01000002,0x01000003,0x01040002,0x01040003,
-0x00000200,0x00000201,0x00040200,0x00040201,
-0x01000200,0x01000201,0x01040200,0x01040201,
-0x00000202,0x00000203,0x00040202,0x00040203,
-0x01000202,0x01000203,0x01040202,0x01040203,
-0x08000000,0x08000001,0x08040000,0x08040001,
-0x09000000,0x09000001,0x09040000,0x09040001,
-0x08000002,0x08000003,0x08040002,0x08040003,
-0x09000002,0x09000003,0x09040002,0x09040003,
-0x08000200,0x08000201,0x08040200,0x08040201,
-0x09000200,0x09000201,0x09040200,0x09040201,
-0x08000202,0x08000203,0x08040202,0x08040203,
-0x09000202,0x09000203,0x09040202,0x09040203,
-);
-@skb3=(
-# for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 
-0x00000000,0x00100000,0x00000100,0x00100100,
-0x00000008,0x00100008,0x00000108,0x00100108,
-0x00001000,0x00101000,0x00001100,0x00101100,
-0x00001008,0x00101008,0x00001108,0x00101108,
-0x04000000,0x04100000,0x04000100,0x04100100,
-0x04000008,0x04100008,0x04000108,0x04100108,
-0x04001000,0x04101000,0x04001100,0x04101100,
-0x04001008,0x04101008,0x04001108,0x04101108,
-0x00020000,0x00120000,0x00020100,0x00120100,
-0x00020008,0x00120008,0x00020108,0x00120108,
-0x00021000,0x00121000,0x00021100,0x00121100,
-0x00021008,0x00121008,0x00021108,0x00121108,
-0x04020000,0x04120000,0x04020100,0x04120100,
-0x04020008,0x04120008,0x04020108,0x04120108,
-0x04021000,0x04121000,0x04021100,0x04121100,
-0x04021008,0x04121008,0x04021108,0x04121108,
-);
-@skb4=(
-# for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 
-0x00000000,0x10000000,0x00010000,0x10010000,
-0x00000004,0x10000004,0x00010004,0x10010004,
-0x20000000,0x30000000,0x20010000,0x30010000,
-0x20000004,0x30000004,0x20010004,0x30010004,
-0x00100000,0x10100000,0x00110000,0x10110000,
-0x00100004,0x10100004,0x00110004,0x10110004,
-0x20100000,0x30100000,0x20110000,0x30110000,
-0x20100004,0x30100004,0x20110004,0x30110004,
-0x00001000,0x10001000,0x00011000,0x10011000,
-0x00001004,0x10001004,0x00011004,0x10011004,
-0x20001000,0x30001000,0x20011000,0x30011000,
-0x20001004,0x30001004,0x20011004,0x30011004,
-0x00101000,0x10101000,0x00111000,0x10111000,
-0x00101004,0x10101004,0x00111004,0x10111004,
-0x20101000,0x30101000,0x20111000,0x30111000,
-0x20101004,0x30101004,0x20111004,0x30111004,
-);
-@skb5=(
-# for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 
-0x00000000,0x08000000,0x00000008,0x08000008,
-0x00000400,0x08000400,0x00000408,0x08000408,
-0x00020000,0x08020000,0x00020008,0x08020008,
-0x00020400,0x08020400,0x00020408,0x08020408,
-0x00000001,0x08000001,0x00000009,0x08000009,
-0x00000401,0x08000401,0x00000409,0x08000409,
-0x00020001,0x08020001,0x00020009,0x08020009,
-0x00020401,0x08020401,0x00020409,0x08020409,
-0x02000000,0x0A000000,0x02000008,0x0A000008,
-0x02000400,0x0A000400,0x02000408,0x0A000408,
-0x02020000,0x0A020000,0x02020008,0x0A020008,
-0x02020400,0x0A020400,0x02020408,0x0A020408,
-0x02000001,0x0A000001,0x02000009,0x0A000009,
-0x02000401,0x0A000401,0x02000409,0x0A000409,
-0x02020001,0x0A020001,0x02020009,0x0A020009,
-0x02020401,0x0A020401,0x02020409,0x0A020409,
-);
-@skb6=(
-# for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 
-0x00000000,0x00000100,0x00080000,0x00080100,
-0x01000000,0x01000100,0x01080000,0x01080100,
-0x00000010,0x00000110,0x00080010,0x00080110,
-0x01000010,0x01000110,0x01080010,0x01080110,
-0x00200000,0x00200100,0x00280000,0x00280100,
-0x01200000,0x01200100,0x01280000,0x01280100,
-0x00200010,0x00200110,0x00280010,0x00280110,
-0x01200010,0x01200110,0x01280010,0x01280110,
-0x00000200,0x00000300,0x00080200,0x00080300,
-0x01000200,0x01000300,0x01080200,0x01080300,
-0x00000210,0x00000310,0x00080210,0x00080310,
-0x01000210,0x01000310,0x01080210,0x01080310,
-0x00200200,0x00200300,0x00280200,0x00280300,
-0x01200200,0x01200300,0x01280200,0x01280300,
-0x00200210,0x00200310,0x00280210,0x00280310,
-0x01200210,0x01200310,0x01280210,0x01280310,
-);
-@skb7=(
-# for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 
-0x00000000,0x04000000,0x00040000,0x04040000,
-0x00000002,0x04000002,0x00040002,0x04040002,
-0x00002000,0x04002000,0x00042000,0x04042000,
-0x00002002,0x04002002,0x00042002,0x04042002,
-0x00000020,0x04000020,0x00040020,0x04040020,
-0x00000022,0x04000022,0x00040022,0x04040022,
-0x00002020,0x04002020,0x00042020,0x04042020,
-0x00002022,0x04002022,0x00042022,0x04042022,
-0x00000800,0x04000800,0x00040800,0x04040800,
-0x00000802,0x04000802,0x00040802,0x04040802,
-0x00002800,0x04002800,0x00042800,0x04042800,
-0x00002802,0x04002802,0x00042802,0x04042802,
-0x00000820,0x04000820,0x00040820,0x04040820,
-0x00000822,0x04000822,0x00040822,0x04040822,
-0x00002820,0x04002820,0x00042820,0x04042820,
-0x00002822,0x04002822,0x00042822,0x04042822,
-);
-
-@shifts2=(0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0);
-
-# used in ecb_encrypt
-@SP0=(
-0x00410100, 0x00010000, 0x40400000, 0x40410100,
-0x00400000, 0x40010100, 0x40010000, 0x40400000,
-0x40010100, 0x00410100, 0x00410000, 0x40000100,
-0x40400100, 0x00400000, 0x00000000, 0x40010000,
-0x00010000, 0x40000000, 0x00400100, 0x00010100,
-0x40410100, 0x00410000, 0x40000100, 0x00400100,
-0x40000000, 0x00000100, 0x00010100, 0x40410000,
-0x00000100, 0x40400100, 0x40410000, 0x00000000,
-0x00000000, 0x40410100, 0x00400100, 0x40010000,
-0x00410100, 0x00010000, 0x40000100, 0x00400100,
-0x40410000, 0x00000100, 0x00010100, 0x40400000,
-0x40010100, 0x40000000, 0x40400000, 0x00410000,
-0x40410100, 0x00010100, 0x00410000, 0x40400100,
-0x00400000, 0x40000100, 0x40010000, 0x00000000,
-0x00010000, 0x00400000, 0x40400100, 0x00410100,
-0x40000000, 0x40410000, 0x00000100, 0x40010100,
-);
-@SP1=(
-0x08021002, 0x00000000, 0x00021000, 0x08020000,
-0x08000002, 0x00001002, 0x08001000, 0x00021000,
-0x00001000, 0x08020002, 0x00000002, 0x08001000,
-0x00020002, 0x08021000, 0x08020000, 0x00000002,
-0x00020000, 0x08001002, 0x08020002, 0x00001000,
-0x00021002, 0x08000000, 0x00000000, 0x00020002,
-0x08001002, 0x00021002, 0x08021000, 0x08000002,
-0x08000000, 0x00020000, 0x00001002, 0x08021002,
-0x00020002, 0x08021000, 0x08001000, 0x00021002,
-0x08021002, 0x00020002, 0x08000002, 0x00000000,
-0x08000000, 0x00001002, 0x00020000, 0x08020002,
-0x00001000, 0x08000000, 0x00021002, 0x08001002,
-0x08021000, 0x00001000, 0x00000000, 0x08000002,
-0x00000002, 0x08021002, 0x00021000, 0x08020000,
-0x08020002, 0x00020000, 0x00001002, 0x08001000,
-0x08001002, 0x00000002, 0x08020000, 0x00021000,
-);
-@SP2=(
-0x20800000, 0x00808020, 0x00000020, 0x20800020,
-0x20008000, 0x00800000, 0x20800020, 0x00008020,
-0x00800020, 0x00008000, 0x00808000, 0x20000000,
-0x20808020, 0x20000020, 0x20000000, 0x20808000,
-0x00000000, 0x20008000, 0x00808020, 0x00000020,
-0x20000020, 0x20808020, 0x00008000, 0x20800000,
-0x20808000, 0x00800020, 0x20008020, 0x00808000,
-0x00008020, 0x00000000, 0x00800000, 0x20008020,
-0x00808020, 0x00000020, 0x20000000, 0x00008000,
-0x20000020, 0x20008000, 0x00808000, 0x20800020,
-0x00000000, 0x00808020, 0x00008020, 0x20808000,
-0x20008000, 0x00800000, 0x20808020, 0x20000000,
-0x20008020, 0x20800000, 0x00800000, 0x20808020,
-0x00008000, 0x00800020, 0x20800020, 0x00008020,
-0x00800020, 0x00000000, 0x20808000, 0x20000020,
-0x20800000, 0x20008020, 0x00000020, 0x00808000,
-);
-@SP3=(
-0x00080201, 0x02000200, 0x00000001, 0x02080201,
-0x00000000, 0x02080000, 0x02000201, 0x00080001,
-0x02080200, 0x02000001, 0x02000000, 0x00000201,
-0x02000001, 0x00080201, 0x00080000, 0x02000000,
-0x02080001, 0x00080200, 0x00000200, 0x00000001,
-0x00080200, 0x02000201, 0x02080000, 0x00000200,
-0x00000201, 0x00000000, 0x00080001, 0x02080200,
-0x02000200, 0x02080001, 0x02080201, 0x00080000,
-0x02080001, 0x00000201, 0x00080000, 0x02000001,
-0x00080200, 0x02000200, 0x00000001, 0x02080000,
-0x02000201, 0x00000000, 0x00000200, 0x00080001,
-0x00000000, 0x02080001, 0x02080200, 0x00000200,
-0x02000000, 0x02080201, 0x00080201, 0x00080000,
-0x02080201, 0x00000001, 0x02000200, 0x00080201,
-0x00080001, 0x00080200, 0x02080000, 0x02000201,
-0x00000201, 0x02000000, 0x02000001, 0x02080200,
-);
-@SP4=(
-0x01000000, 0x00002000, 0x00000080, 0x01002084,
-0x01002004, 0x01000080, 0x00002084, 0x01002000,
-0x00002000, 0x00000004, 0x01000004, 0x00002080,
-0x01000084, 0x01002004, 0x01002080, 0x00000000,
-0x00002080, 0x01000000, 0x00002004, 0x00000084,
-0x01000080, 0x00002084, 0x00000000, 0x01000004,
-0x00000004, 0x01000084, 0x01002084, 0x00002004,
-0x01002000, 0x00000080, 0x00000084, 0x01002080,
-0x01002080, 0x01000084, 0x00002004, 0x01002000,
-0x00002000, 0x00000004, 0x01000004, 0x01000080,
-0x01000000, 0x00002080, 0x01002084, 0x00000000,
-0x00002084, 0x01000000, 0x00000080, 0x00002004,
-0x01000084, 0x00000080, 0x00000000, 0x01002084,
-0x01002004, 0x01002080, 0x00000084, 0x00002000,
-0x00002080, 0x01002004, 0x01000080, 0x00000084,
-0x00000004, 0x00002084, 0x01002000, 0x01000004,
-);
-@SP5=(
-0x10000008, 0x00040008, 0x00000000, 0x10040400,
-0x00040008, 0x00000400, 0x10000408, 0x00040000,
-0x00000408, 0x10040408, 0x00040400, 0x10000000,
-0x10000400, 0x10000008, 0x10040000, 0x00040408,
-0x00040000, 0x10000408, 0x10040008, 0x00000000,
-0x00000400, 0x00000008, 0x10040400, 0x10040008,
-0x10040408, 0x10040000, 0x10000000, 0x00000408,
-0x00000008, 0x00040400, 0x00040408, 0x10000400,
-0x00000408, 0x10000000, 0x10000400, 0x00040408,
-0x10040400, 0x00040008, 0x00000000, 0x10000400,
-0x10000000, 0x00000400, 0x10040008, 0x00040000,
-0x00040008, 0x10040408, 0x00040400, 0x00000008,
-0x10040408, 0x00040400, 0x00040000, 0x10000408,
-0x10000008, 0x10040000, 0x00040408, 0x00000000,
-0x00000400, 0x10000008, 0x10000408, 0x10040400,
-0x10040000, 0x00000408, 0x00000008, 0x10040008,
-);
-@SP6=(
-0x00000800, 0x00000040, 0x00200040, 0x80200000,
-0x80200840, 0x80000800, 0x00000840, 0x00000000,
-0x00200000, 0x80200040, 0x80000040, 0x00200800,
-0x80000000, 0x00200840, 0x00200800, 0x80000040,
-0x80200040, 0x00000800, 0x80000800, 0x80200840,
-0x00000000, 0x00200040, 0x80200000, 0x00000840,
-0x80200800, 0x80000840, 0x00200840, 0x80000000,
-0x80000840, 0x80200800, 0x00000040, 0x00200000,
-0x80000840, 0x00200800, 0x80200800, 0x80000040,
-0x00000800, 0x00000040, 0x00200000, 0x80200800,
-0x80200040, 0x80000840, 0x00000840, 0x00000000,
-0x00000040, 0x80200000, 0x80000000, 0x00200040,
-0x00000000, 0x80200040, 0x00200040, 0x00000840,
-0x80000040, 0x00000800, 0x80200840, 0x00200000,
-0x00200840, 0x80000000, 0x80000800, 0x80200840,
-0x80200000, 0x00200840, 0x00200800, 0x80000800,
-);
-@SP7=(
-0x04100010, 0x04104000, 0x00004010, 0x00000000,
-0x04004000, 0x00100010, 0x04100000, 0x04104010,
-0x00000010, 0x04000000, 0x00104000, 0x00004010,
-0x00104010, 0x04004010, 0x04000010, 0x04100000,
-0x00004000, 0x00104010, 0x00100010, 0x04004000,
-0x04104010, 0x04000010, 0x00000000, 0x00104000,
-0x04000000, 0x00100000, 0x04004010, 0x04100010,
-0x00100000, 0x00004000, 0x04104000, 0x00000010,
-0x00100000, 0x00004000, 0x04000010, 0x04104010,
-0x00004010, 0x04000000, 0x00000000, 0x00104000,
-0x04100010, 0x04004010, 0x04004000, 0x00100010,
-0x04104000, 0x00000010, 0x00100010, 0x04004000,
-0x04104010, 0x00100000, 0x04100000, 0x04000010,
-0x00104000, 0x00004010, 0x04004010, 0x04100000,
-0x00000010, 0x04104000, 0x00104010, 0x00000000,
-0x04000000, 0x04100010, 0x00004000, 0x00104010,
-);
-
-sub main'des_set_key
-	{
-	local($param)=@_;
-	local(@key);
-	local($c,$d,$i,$s,$t);
-	local(@ks)=();
-
-	# Get the bytes in the order we want.
-	@key=unpack("C8",$param);
-
-	$c=	($key[0]    )|
-		($key[1]<< 8)|
-		($key[2]<<16)|
-		($key[3]<<24);
-	$d=	($key[4]    )|
-		($key[5]<< 8)|
-		($key[6]<<16)|
-		($key[7]<<24);
-
-	&doPC1(*c,*d);
-
-	for $i (@shifts2)
-		{
-		if ($i)
-			{
-			$c=($c>>2)|($c<<26);
-			$d=($d>>2)|($d<<26);
-			}
-		else
-			{
-			$c=($c>>1)|($c<<27);
-			$d=($d>>1)|($d<<27);
-			}
-		$c&=0x0fffffff;
-		$d&=0x0fffffff;
-		$s=	$skb0[ ($c    )&0x3f                 ]|
-			$skb1[(($c>> 6)&0x03)|(($c>> 7)&0x3c)]|
-			$skb2[(($c>>13)&0x0f)|(($c>>14)&0x30)]|
-			$skb3[(($c>>20)&0x01)|(($c>>21)&0x06) |
-					     (($c>>22)&0x38)];
-		$t=     $skb4[ ($d    )&0x3f                ]|
-			$skb5[(($d>> 7)&0x03)|(($d>> 8)&0x3c)]|
-			$skb6[ ($d>>15)&0x3f                 ]|
-			$skb7[(($d>>21)&0x0f)|(($d>>22)&0x30)];
-		push(@ks,(($t<<16)|($s&0x0000ffff))&0xffffffff);
-		$s=      (($s>>16)&0x0000ffff)|($t&0xffff0000) ;
-		push(@ks,(($s<<4)|(($s>>28)&0xf))&0xffffffff);
-		}
-	@ks;
-	}
-
-sub doPC1
-	{
-	local(*a,*b)=@_;
-	local($t);
-
-	$t=(($b>>4)^$a)&0x0f0f0f0f;
-	$b^=($t<<4); $a^=$t;
-	# do $a first 
-	$t=(($a<<18)^$a)&0xcccc0000;
-	$a=$a^$t^(($t>>18)&0x00003fff);
-	$t=(($a<<17)^$a)&0xaaaa0000;
-	$a=$a^$t^(($t>>17)&0x00007fff);
-	$t=(($a<< 8)^$a)&0x00ff0000;
-	$a=$a^$t^(($t>> 8)&0x00ffffff);
-	$t=(($a<<17)^$a)&0xaaaa0000;
-	$a=$a^$t^(($t>>17)&0x00007fff);
-
-	# now do $b
-	$t=(($b<<24)^$b)&0xff000000;
-	$b=$b^$t^(($t>>24)&0x000000ff);
-	$t=(($b<< 8)^$b)&0x00ff0000;
-	$b=$b^$t^(($t>> 8)&0x00ffffff);
-	$t=(($b<<14)^$b)&0x33330000;
-	$b=$b^$t^(($t>>14)&0x0003ffff);
-	$b=(($b&0x00aa00aa)<<7)|(($b&0x55005500)>>7)|($b&0xaa55aa55);
-	$b=(($b>>8)&0x00ffffff)|((($a&0xf0000000)>>4)&0x0fffffff);
-	$a&=0x0fffffff;
-	}
-
-sub doIP
-	{
-	local(*a,*b)=@_;
-	local($t);
-
-	$t=(($b>> 4)^$a)&0x0f0f0f0f;
-	$b^=($t<< 4); $a^=$t;
-	$t=(($a>>16)^$b)&0x0000ffff;
-	$a^=($t<<16); $b^=$t;
-	$t=(($b>> 2)^$a)&0x33333333;
-	$b^=($t<< 2); $a^=$t;
-	$t=(($a>> 8)^$b)&0x00ff00ff;
-	$a^=($t<< 8); $b^=$t;
-	$t=(($b>> 1)^$a)&0x55555555;
-	$b^=($t<< 1); $a^=$t;
-	$t=$a;
-	$a=$b&0xffffffff;
-	$b=$t&0xffffffff;
-	}
-
-sub doFP
-	{
-	local(*a,*b)=@_;
-	local($t);
-
-	$t=(($b>> 1)^$a)&0x55555555;
-	$b^=($t<< 1); $a^=$t;
-	$t=(($a>> 8)^$b)&0x00ff00ff;
-	$a^=($t<< 8); $b^=$t;
-	$t=(($b>> 2)^$a)&0x33333333;
-	$b^=($t<< 2); $a^=$t;
-	$t=(($a>>16)^$b)&0x0000ffff;
-	$a^=($t<<16); $b^=$t;
-	$t=(($b>> 4)^$a)&0x0f0f0f0f;
-	$b^=($t<< 4); $a^=$t;
-	$a&=0xffffffff;
-	$b&=0xffffffff;
-	}
-
-sub main'des_ecb_encrypt
-	{
-	local(*ks,$encrypt,$in)=@_;
-	local($l,$r,$i,$t,$u,@input);
-	
-	@input=unpack("C8",$in);
-	# Get the bytes in the order we want.
-	$l=	($input[0]    )|
-		($input[1]<< 8)|
-		($input[2]<<16)|
-		($input[3]<<24);
-	$r=	($input[4]    )|
-		($input[5]<< 8)|
-		($input[6]<<16)|
-		($input[7]<<24);
-
-	$l&=0xffffffff;
-	$r&=0xffffffff;
-	&doIP(*l,*r);
-	if ($encrypt)
-		{
-		for ($i=0; $i<32; $i+=4)
-			{
-			$t=((($r&0x7fffffff)<<1)|(($r>>31)&0x00000001));
-			$u=$t^$ks[$i  ];
-			$t=$t^$ks[$i+1];
-			$t2=(($t&0x0000000f)<<28);
-
-			$t=((($t>>4)&0x0fffffff)|(($t&0x0000000f)<<28));
-			$l^=	$SP1[ $t     &0x3f]|
-				$SP3[($t>> 8)&0x3f]|
-				$SP5[($t>>16)&0x3f]|
-				$SP7[($t>>24)&0x3f]|
-				$SP0[ $u     &0x3f]|
-				$SP2[($u>> 8)&0x3f]|
-				$SP4[($u>>16)&0x3f]|
-				$SP6[($u>>24)&0x3f];
-
-			$t=(($l<<1)|(($l>>31)&0x1))&0xffffffff;
-			$u=$t^$ks[$i+2];
-			$t=$t^$ks[$i+3];
-			$t=((($t>>4)&0x0fffffff)|($t<<28))&0xffffffff;
-			$r^=	$SP1[ $t     &0x3f]|
-				$SP3[($t>> 8)&0x3f]|
-				$SP5[($t>>16)&0x3f]|
-				$SP7[($t>>24)&0x3f]|
-				$SP0[ $u     &0x3f]|
-				$SP2[($u>> 8)&0x3f]|
-				$SP4[($u>>16)&0x3f]|
-				$SP6[($u>>24)&0x3f];
-			}
-		}
-	else	
-		{
-		for ($i=30; $i>0; $i-=4)
-			{
-			$t=(($r<<1)|(($r>>31)&0x1))&0xffffffff;
-			$u=$t^$ks[$i  ];
-			$t=$t^$ks[$i+1];
-			$t=((($t>>4)&0x0fffffff)|($t<<28))&0xffffffff;
-			$l^=	$SP1[ $t     &0x3f]|
-				$SP3[($t>> 8)&0x3f]|
-				$SP5[($t>>16)&0x3f]|
-				$SP7[($t>>24)&0x3f]|
-				$SP0[ $u     &0x3f]|
-				$SP2[($u>> 8)&0x3f]|
-				$SP4[($u>>16)&0x3f]|
-				$SP6[($u>>24)&0x3f];
-
-			$t=(($l<<1)|(($l>>31)&0x1))&0xffffffff;
-			$u=$t^$ks[$i-2];
-			$t=$t^$ks[$i-1];
-			$t=((($t>>4)&0x0fffffff)|($t<<28))&0xffffffff;
-			$r^=	$SP1[ $t     &0x3f]|
-				$SP3[($t>> 8)&0x3f]|
-				$SP5[($t>>16)&0x3f]|
-				$SP7[($t>>24)&0x3f]|
-				$SP0[ $u     &0x3f]|
-				$SP2[($u>> 8)&0x3f]|
-				$SP4[($u>>16)&0x3f]|
-				$SP6[($u>>24)&0x3f];
-			}
-		}
-	&doFP(*l,*r);
-	pack("C8",$l&0xff, 
-	          ($l>> 8)&0x00ffffff,
-	          ($l>>16)&0x0000ffff,
-		  ($l>>24)&0x000000ff,
-		  $r&0xff,
-	          ($r>> 8)&0x00ffffff,
-	          ($r>>16)&0x0000ffff,
-		  ($r>>24)&0x000000ff);
-	}
diff --git a/secure/lib/libdes/des_crypt.man b/secure/lib/libdes/des_crypt.man
deleted file mode 100644
index 9feb447129eb..000000000000
--- a/secure/lib/libdes/des_crypt.man
+++ /dev/null
@@ -1,508 +0,0 @@
-.TH DES_CRYPT 3 
-.SH NAME
-des_read_password, des_read_2password,
-des_string_to_key, des_string_to_2key, des_read_pw_string,
-des_random_key, des_set_key,
-des_key_sched, des_ecb_encrypt, des_3ecb_encrypt, des_cbc_encrypt,
-des_3cbc_encrypt,
-des_pcbc_encrypt, des_cfb_encrypt, des_ofb_encrypt,
-des_cbc_cksum, des_quad_cksum,
-des_enc_read, des_enc_write, des_set_odd_parity,
-des_is_weak_key, crypt \- (non USA) DES encryption
-.SH SYNOPSIS
-.nf
-.nj
-.ft B
-#include <des.h>
-.PP
-.B int des_read_password(key,prompt,verify)
-des_cblock *key;
-char *prompt;
-int verify;
-.PP
-.B int des_read_2password(key1,key2,prompt,verify)
-des_cblock *key1,*key2;
-char *prompt;
-int verify;
-.PP
-.B int des_string_to_key(str,key)
-char *str;
-des_cblock *key;
-.PP
-.B int des_string_to_2keys(str,key1,key2)
-char *str;
-des_cblock *key1,*key2;
-.PP
-.B int des_read_pw_string(buf,length,prompt,verify)
-char *buf;
-int length;
-char *prompt;
-int verify;
-.PP
-.B int des_random_key(key)
-des_cblock *key;
-.PP
-.B int des_set_key(key,schedule)
-des_cblock *key;
-des_key_schedule schedule;
-.PP
-.B int des_key_sched(key,schedule)
-des_cblock *key;
-des_key_schedule schedule;
-.PP
-.B int des_ecb_encrypt(input,output,schedule,encrypt)
-des_cblock *input;
-des_cblock *output;
-des_key_schedule schedule;
-int encrypt;
-.PP
-.B int des_3ecb_encrypt(input,output,ks1,ks2,encrypt)
-des_cblock *input;
-des_cblock *output;
-des_key_schedule ks1,ks2;
-int encrypt;
-.PP
-.B int des_cbc_encrypt(input,output,length,schedule,ivec,encrypt)
-des_cblock *input;
-des_cblock *output;
-long length;
-des_key_schedule schedule;
-des_cblock *ivec;
-int encrypt;
-.PP
-.B int des_3cbc_encrypt(input,output,length,sk1,sk2,ivec1,ivec2,encrypt)
-des_cblock *input;
-des_cblock *output;
-long length;
-des_key_schedule sk1;
-des_key_schedule sk2;
-des_cblock *ivec1;
-des_cblock *ivec2;
-int encrypt;
-.PP
-.B int des_pcbc_encrypt(input,output,length,schedule,ivec,encrypt)
-des_cblock *input;
-des_cblock *output;
-long length;
-des_key_schedule schedule;
-des_cblock *ivec;
-int encrypt;
-.PP
-.B int des_cfb_encrypt(input,output,numbits,length,schedule,ivec,encrypt)
-unsigned char *input;
-unsigned char *output;
-int numbits;
-long length;
-des_key_schedule schedule;
-des_cblock *ivec;
-int encrypt;
-.PP
-.B int des_ofb_encrypt(input,output,numbits,length,schedule,ivec)
-unsigned char *input,*output;
-int numbits;
-long length;
-des_key_schedule schedule;
-des_cblock *ivec;
-.PP
-.B unsigned long des_cbc_cksum(input,output,length,schedule,ivec)
-des_cblock *input;
-des_cblock *output;
-long length;
-des_key_schedule schedule;
-des_cblock *ivec;
-.PP
-.B unsigned long des_quad_cksum(input,output,length,out_count,seed)
-des_cblock *input;
-des_cblock *output;
-long length;
-int out_count;
-des_cblock *seed;
-.PP
-.B int des_check_key;
-.PP
-.B int des_enc_read(fd,buf,len,sched,iv)
-int fd;
-char *buf;
-int len;
-des_key_schedule sched;
-des_cblock *iv;
-.PP
-.B int des_enc_write(fd,buf,len,sched,iv)
-int fd;
-char *buf;
-int len;
-des_key_schedule sched;
-des_cblock *iv;
-.PP
-.B extern int des_rw_mode;
-.PP
-.B void des_set_odd_parity(key)
-des_cblock *key;
-.PP
-.B int des_is_weak_key(key)
-des_cblock *key;
-.PP
-.B char *crypt(passwd,salt)
-char *passwd;
-char *salt;
-.PP
-.fi
-.SH DESCRIPTION
-This library contains a fast implementation of the DES encryption
-algorithm.
-.PP
-There are two phases to the use of DES encryption.
-The first is the generation of a
-.I des_key_schedule
-from a key,
-the second is the actual encryption.
-A des key is of type
-.I des_cblock.
-This type is made from 8 characters with odd parity.
-The least significant bit in the character is the parity bit.
-The key schedule is an expanded form of the key; it is used to speed the
-encryption process.
-.PP
-.I des_read_password
-writes the string specified by prompt to the standard output,
-turns off echo and reads an input string from standard input
-until terminated with a newline.
-If verify is non-zero, it prompts and reads the input again and verifies
-that both entered passwords are the same.
-The entered string is converted into a des key by using the
-.I des_string_to_key
-routine.
-The new key is placed in the
-.I des_cblock
-that was passed (by reference) to the routine.
-If there were no errors,
-.I des_read_password
-returns 0,
--1 is returned if there was a terminal error and 1 is returned for
-any other error.
-.PP
-.I des_read_2password
-operates in the same way as
-.I des_read_password
-except that it generates 2 keys by using the
-.I des_string_to_2key
-function.
-.PP
-.I des_read_pw_string
-is called by
-.I des_read_password
-to read and verify a string from a terminal device.
-The string is returned in
-.I buf.
-The size of
-.I buf
-is passed to the routine via the
-.I length
-parameter.
-.PP
-.I des_string_to_key
-converts a string into a valid des key.
-.PP
-.I des_string_to_2key
-converts a string into 2 valid des keys.
-This routine is best suited for used to generate keys for use with
-.I des_3ecb_encrypt.
-.PP
-.I des_random_key
-returns a random key that is made of a combination of process id,
-time and an increasing counter.
-.PP
-Before a des key can be used it is converted into a
-.I des_key_schedule
-via the
-.I des_set_key
-routine.
-If the
-.I des_check_key
-flag is non-zero,
-.I des_set_key
-will check that the key passed is of odd parity and is not a week or
-semi-weak key.
-If the parity is wrong,
-then -1 is returned.
-If the key is a weak key,
-then -2 is returned.
-If an error is returned,
-the key schedule is not generated.
-.PP
-.I des_key_sched
-is another name for the
-.I des_set_key
-function.
-.PP
-The following routines mostly operate on an input and output stream of
-.I des_cblock's.
-.PP
-.I des_ecb_encrypt
-is the basic DES encryption routine that encrypts or decrypts a single 8-byte
-.I des_cblock
-in
-.I electronic code book
-mode.
-It always transforms the input data, pointed to by
-.I input,
-into the output data,
-pointed to by the
-.I output
-argument.
-If the
-.I encrypt
-argument is non-zero (DES_ENCRYPT),
-the
-.I input
-(cleartext) is encrypted in to the
-.I output
-(ciphertext) using the key_schedule specified by the
-.I schedule
-argument,
-previously set via
-.I des_set_key.
-If
-.I encrypt
-is zero (DES_DECRYPT),
-the
-.I input
-(now ciphertext)
-is decrypted into the
-.I output
-(now cleartext).
-Input and output may overlap.
-No meaningful value is returned.
-.PP
-.I des_3ecb_encrypt
-encrypts/decrypts the
-.I input
-block by using triple ecb DES encryption.
-This involves encrypting the input with 
-.I ks1,
-decryption with the key schedule
-.I ks2,
-and then encryption with the first again.
-This routine greatly reduces the chances of brute force breaking of
-DES and has the advantage of if
-.I ks1
-and
-.I ks2
-are the same, it is equivalent to just encryption using ecb mode and
-.I ks1
-as the key.
-.PP
-.I des_cbc_encrypt
-encrypts/decrypts using the
-.I cipher-block-chaining
-mode of DES.
-If the
-.I encrypt
-argument is non-zero,
-the routine cipher-block-chain encrypts the cleartext data pointed to by the
-.I input
-argument into the ciphertext pointed to by the
-.I output
-argument,
-using the key schedule provided by the
-.I schedule
-argument,
-and initialisation vector provided by the
-.I ivec
-argument.
-If the
-.I length
-argument is not an integral multiple of eight bytes, 
-the last block is copied to a temporary area and zero filled.
-The output is always
-an integral multiple of eight bytes.
-To make multiple cbc encrypt calls on a large amount of data appear to
-be one 
-.I des_cbc_encrypt
-call, the
-.I ivec
-of subsequent calls should be the last 8 bytes of the output.
-.PP
-.I des_3cbc_encrypt
-encrypts/decrypts the
-.I input
-block by using triple cbc DES encryption.
-This involves encrypting the input with key schedule
-.I ks1,
-decryption with the key schedule
-.I ks2,
-and then encryption with the first again.
-2 initialisation vectors are required,
-.I ivec1
-and
-.I ivec2.
-Unlike
-.I des_cbc_encrypt,
-these initialisation vectors are modified by the subroutine.
-This routine greatly reduces the chances of brute force breaking of
-DES and has the advantage of if
-.I ks1
-and
-.I ks2
-are the same, it is equivalent to just encryption using cbc mode and
-.I ks1
-as the key.
-.PP
-.I des_pcbc_encrypt
-encrypt/decrypts using a modified block chaining mode.
-It provides better error propagation characteristics than cbc
-encryption.
-.PP
-.I des_cfb_encrypt
-encrypt/decrypts using cipher feedback mode.  This method takes an
-array of characters as input and outputs and array of characters.  It
-does not require any padding to 8 character groups.  Note: the ivec
-variable is changed and the new changed value needs to be passed to
-the next call to this function.  Since this function runs a complete
-DES ecb encryption per numbits, this function is only suggested for
-use when sending small numbers of characters.
-.PP
-.I des_ofb_encrypt
-encrypt using output feedback mode.  This method takes an
-array of characters as input and outputs and array of characters.  It
-does not require any padding to 8 character groups.  Note: the ivec
-variable is changed and the new changed value needs to be passed to
-the next call to this function.  Since this function runs a complete
-DES ecb encryption per numbits, this function is only suggested for
-use when sending small numbers of characters.
-.PP
-.I des_cbc_cksum
-produces an 8 byte checksum based on the input stream (via cbc encryption).
-The last 4 bytes of the checksum is returned and the complete 8 bytes is
-placed in
-.I output.
-.PP
-.I des_quad_cksum
-returns a 4 byte checksum from the input bytes.
-The algorithm can be iterated over the input,
-depending on
-.I out_count,
-1, 2, 3 or 4 times.
-If
-.I output
-is non-NULL,
-the 8 bytes generated by each pass are written into
-.I output.
-.PP
-.I des_enc_write
-is used to write
-.I len
-bytes
-to file descriptor
-.I fd
-from buffer
-.I buf.
-The data is encrypted via
-.I pcbc_encrypt
-(default) using
-.I sched
-for the key and
-.I iv
-as a starting vector.
-The actual data send down
-.I fd
-consists of 4 bytes (in network byte order) containing the length of the
-following encrypted data.  The encrypted data then follows, padded with random
-data out to a multiple of 8 bytes.
-.PP
-.I des_enc_read
-is used to read
-.I len
-bytes
-from file descriptor
-.I fd
-into buffer
-.I buf.
-The data being read from
-.I fd
-is assumed to have come from
-.I des_enc_write
-and is decrypted using
-.I sched
-for the key schedule and
-.I iv
-for the initial vector.
-The
-.I des_enc_read/des_enc_write
-pair can be used to read/write to files, pipes and sockets.
-I have used them in implementing a version of rlogin in which all
-data is encrypted.
-.PP
-.I des_rw_mode
-is used to specify the encryption mode to use with 
-.I des_enc_read
-and 
-.I des_end_write.
-If set to
-.I DES_PCBC_MODE
-(the default), des_pcbc_encrypt is used.
-If set to
-.I DES_CBC_MODE
-des_cbc_encrypt is used.
-These two routines and the variable are not part of the normal MIT library.
-.PP
-.I des_set_odd_parity
-sets the parity of the passed
-.I key
-to odd.  This routine is not part of the standard MIT library.
-.PP
-.I des_is_weak_key
-returns 1 is the passed key is a weak key (pick again :-),
-0 if it is ok.
-This routine is not part of the standard MIT library.
-.PP
-.I crypt
-is a replacement for the normal system crypt.
-It is much faster than the system crypt.
-.PP
-.SH FILES
-/usr/include/des.h
-.br
-/usr/lib/libdes.a
-.PP
-The encryption routines have been tested on 16bit, 32bit and 64bit
-machines of various endian and even works under VMS.
-.PP
-.SH BUGS
-.PP
-If you think this manual is sparse,
-read the des_crypt(3) manual from the MIT kerberos (or bones outside
-of the USA) distribution.
-.PP
-.I des_cfb_encrypt
-and
-.I des_ofb_encrypt
-operates on input of 8 bits.  What this means is that if you set
-numbits to 12, and length to 2, the first 12 bits will come from the 1st
-input byte and the low half of the second input byte.  The second 12
-bits will have the low 8 bits taken from the 3rd input byte and the
-top 4 bits taken from the 4th input byte.  The same holds for output.
-This function has been implemented this way because most people will
-be using a multiple of 8 and because once you get into pulling bytes input
-bytes apart things get ugly!
-.PP
-.I des_read_pw_string
-is the most machine/OS dependent function and normally generates the
-most problems when porting this code.
-.PP
-.I des_string_to_key
-is probably different from the MIT version since there are lots
-of fun ways to implement one-way encryption of a text string.
-.PP
-The routines are optimised for 32 bit machines and so are not efficient
-on IBM PCs.
-.PP
-NOTE: extensive work has been done on this library since this document
-was origionally written.  Please try to read des.doc from the libdes
-distribution since it is far more upto date and documents more of the
-functions.  Libdes is now also being shipped as part of SSLeay, a
-general cryptographic library that amonst other things implements
-netscapes SSL protocoll.  The most recent version can be found in
-SSLeay distributions.
-.SH AUTHOR
-Eric Young (eay@mincom.oz.au or eay@psych.psy.uq.oz.au)
diff --git a/secure/lib/libdes/des_locl.h b/secure/lib/libdes/des_locl.h
deleted file mode 100644
index 87a2b4a1f081..000000000000
--- a/secure/lib/libdes/des_locl.h
+++ /dev/null
@@ -1,299 +0,0 @@
-/* lib/des/des_locl.h */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
- *
- * Always modify des_locl.org since des_locl.h is automatically generated from
- * it during SSLeay configuration.
- *
- * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
- */
-
-#ifndef HEADER_DES_LOCL_H
-#define HEADER_DES_LOCL_H
-
-#if defined(WIN32) || defined(WIN16)
-#ifndef MSDOS
-#define MSDOS
-#endif
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#ifndef MSDOS
-#include <unistd.h>
-#endif
-#include "des.h"
-
-/* the following is tweaked from a config script, that is why it is a
- * protected undef/define */
-#ifndef DES_PTR
-#undef DES_PTR
-#endif
-
-#ifdef MSDOS		/* Visual C++ 2.1 (Windows NT/95) */
-#include <stdlib.h>
-#include <errno.h>
-#include <time.h>
-#include <io.h>
-#ifndef RAND
-#define RAND
-#endif
-#undef NOPROTO
-#endif
-
-#if defined(__STDC__) || defined(VMS) || defined(M_XENIX) || defined(MSDOS)
-#include <string.h>
-#endif
-
-#ifndef RAND
-#define RAND
-#endif
-
-#ifdef linux
-#undef RAND
-#endif
-
-#ifdef MSDOS
-#define getpid() 2
-#define RAND
-#undef NOPROTO
-#endif
-
-#if defined(NOCONST)
-#define const
-#endif
-
-#ifdef __STDC__
-#undef NOPROTO
-#endif
-
-#ifdef RAND
-#define srandom(s) srand(s)
-#define random rand
-#endif
-
-#define ITERATIONS 16
-#define HALF_ITERATIONS 8
-
-/* used in des_read and des_write */
-#define MAXWRITE	(1024*16)
-#define BSIZE		(MAXWRITE+4)
-
-#define c2l(c,l)	(l =((DES_LONG)(*((c)++)))    , \
-			 l|=((DES_LONG)(*((c)++)))<< 8L, \
-			 l|=((DES_LONG)(*((c)++)))<<16L, \
-			 l|=((DES_LONG)(*((c)++)))<<24L)
-
-/* NOTE - c is not incremented as per c2l */
-#define c2ln(c,l1,l2,n)	{ \
-			c+=n; \
-			l1=l2=0; \
-			switch (n) { \
-			case 8: l2 =((DES_LONG)(*(--(c))))<<24L; \
-			case 7: l2|=((DES_LONG)(*(--(c))))<<16L; \
-			case 6: l2|=((DES_LONG)(*(--(c))))<< 8L; \
-			case 5: l2|=((DES_LONG)(*(--(c))));     \
-			case 4: l1 =((DES_LONG)(*(--(c))))<<24L; \
-			case 3: l1|=((DES_LONG)(*(--(c))))<<16L; \
-			case 2: l1|=((DES_LONG)(*(--(c))))<< 8L; \
-			case 1: l1|=((DES_LONG)(*(--(c))));     \
-				} \
-			}
-
-#define l2c(l,c)	(*((c)++)=(unsigned char)(((l)     )&0xff), \
-			 *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
-			 *((c)++)=(unsigned char)(((l)>>16L)&0xff), \
-			 *((c)++)=(unsigned char)(((l)>>24L)&0xff))
-
-/* replacements for htonl and ntohl since I have no idea what to do
- * when faced with machines with 8 byte longs. */
-#define HDRSIZE 4
-
-#define n2l(c,l)	(l =((DES_LONG)(*((c)++)))<<24L, \
-			 l|=((DES_LONG)(*((c)++)))<<16L, \
-			 l|=((DES_LONG)(*((c)++)))<< 8L, \
-			 l|=((DES_LONG)(*((c)++))))
-
-#define l2n(l,c)	(*((c)++)=(unsigned char)(((l)>>24L)&0xff), \
-			 *((c)++)=(unsigned char)(((l)>>16L)&0xff), \
-			 *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
-			 *((c)++)=(unsigned char)(((l)     )&0xff))
-
-/* NOTE - c is not incremented as per l2c */
-#define l2cn(l1,l2,c,n)	{ \
-			c+=n; \
-			switch (n) { \
-			case 8: *(--(c))=(unsigned char)(((l2)>>24L)&0xff); \
-			case 7: *(--(c))=(unsigned char)(((l2)>>16L)&0xff); \
-			case 6: *(--(c))=(unsigned char)(((l2)>> 8L)&0xff); \
-			case 5: *(--(c))=(unsigned char)(((l2)     )&0xff); \
-			case 4: *(--(c))=(unsigned char)(((l1)>>24L)&0xff); \
-			case 3: *(--(c))=(unsigned char)(((l1)>>16L)&0xff); \
-			case 2: *(--(c))=(unsigned char)(((l1)>> 8L)&0xff); \
-			case 1: *(--(c))=(unsigned char)(((l1)     )&0xff); \
-				} \
-			}
-
-#if defined(WIN32)
-#define	ROTATE(a,n)	(_lrotr(a,n))
-#else
-#define	ROTATE(a,n)	(((a)>>(n))+((a)<<(32-(n))))
-#endif
-
-/* The changes to this macro may help or hinder, depending on the
- * compiler and the achitecture.  gcc2 always seems to do well :-).
- * Inspired by Dana How <how@isl.stanford.edu>
- * DO NOT use the alternative version on machines with 8 byte longs.
- * It does not seem to work on the Alpha, even when DES_LONG is 4
- * bytes, probably an issue of accessing non-word aligned objects :-( */
-#ifdef DES_PTR
-
-#define D_ENCRYPT(L,R,S) { \
-	u=((R^s[S  ])<<2);	\
-	t= R^s[S+1]; \
-	t=ROTATE(t,2); \
-	L^= (\
-	*(DES_LONG *)((unsigned char *)des_SP+0x100+((t    )&0xfc))+ \
-	*(DES_LONG *)((unsigned char *)des_SP+0x300+((t>> 8)&0xfc))+ \
-	*(DES_LONG *)((unsigned char *)des_SP+0x500+((t>>16)&0xfc))+ \
-	*(DES_LONG *)((unsigned char *)des_SP+0x700+((t>>24)&0xfc))+ \
-	*(DES_LONG *)((unsigned char *)des_SP      +((u    )&0xfc))+ \
-	*(DES_LONG *)((unsigned char *)des_SP+0x200+((u>> 8)&0xfc))+ \
-	*(DES_LONG *)((unsigned char *)des_SP+0x400+((u>>16)&0xfc))+ \
-	*(DES_LONG *)((unsigned char *)des_SP+0x600+((u>>24)&0xfc))); }
-#else /* original version */
-#ifdef undef
-#define D_ENCRYPT(L,R,S)	\
-	U.l=R^s[S+1]; \
-	T.s[0]=((U.s[0]>>4)|(U.s[1]<<12))&0x3f3f; \
-	T.s[1]=((U.s[1]>>4)|(U.s[0]<<12))&0x3f3f; \
-	U.l=(R^s[S  ])&0x3f3f3f3fL; \
-	L^=	des_SPtrans[1][(T.c[0])]| \
-		des_SPtrans[3][(T.c[1])]| \
-		des_SPtrans[5][(T.c[2])]| \
-		des_SPtrans[7][(T.c[3])]| \
-		des_SPtrans[0][(U.c[0])]| \
-		des_SPtrans[2][(U.c[1])]| \
-		des_SPtrans[4][(U.c[2])]| \
-		des_SPtrans[6][(U.c[3])];
-#else
-#define D_ENCRYPT(Q,R,S) {\
-	u=(R^s[S  ]); \
-	t=R^s[S+1]; \
-	t=ROTATE(t,4); \
-	Q^=	des_SPtrans[1][(t     )&0x3f]| \
-		des_SPtrans[3][(t>> 8L)&0x3f]| \
-		des_SPtrans[5][(t>>16L)&0x3f]| \
-		des_SPtrans[7][(t>>24L)&0x3f]| \
-		des_SPtrans[0][(u     )&0x3f]| \
-		des_SPtrans[2][(u>> 8L)&0x3f]| \
-		des_SPtrans[4][(u>>16L)&0x3f]| \
-		des_SPtrans[6][(u>>24L)&0x3f]; }
-#endif
-#endif
-
-	/* IP and FP
-	 * The problem is more of a geometric problem that random bit fiddling.
-	 0  1  2  3  4  5  6  7      62 54 46 38 30 22 14  6
-	 8  9 10 11 12 13 14 15      60 52 44 36 28 20 12  4
-	16 17 18 19 20 21 22 23      58 50 42 34 26 18 10  2
-	24 25 26 27 28 29 30 31  to  56 48 40 32 24 16  8  0
-
-	32 33 34 35 36 37 38 39      63 55 47 39 31 23 15  7
-	40 41 42 43 44 45 46 47      61 53 45 37 29 21 13  5
-	48 49 50 51 52 53 54 55      59 51 43 35 27 19 11  3
-	56 57 58 59 60 61 62 63      57 49 41 33 25 17  9  1
-
-	The output has been subject to swaps of the form
-	0 1 -> 3 1 but the odd and even bits have been put into
-	2 3    2 0
-	different words.  The main trick is to remember that
-	t=((l>>size)^r)&(mask);
-	r^=t;
-	l^=(t<<size);
-	can be used to swap and move bits between words.
-
-	So l =  0  1  2  3  r = 16 17 18 19
-	        4  5  6  7      20 21 22 23
-	        8  9 10 11      24 25 26 27
-	       12 13 14 15      28 29 30 31
-	becomes (for size == 2 and mask == 0x3333)
-	   t =   2^16  3^17 -- --   l =  0  1 16 17  r =  2  3 18 19
-		 6^20  7^21 -- --        4  5 20 21       6  7 22 23
-		10^24 11^25 -- --        8  9 24 25      10 11 24 25
-		14^28 15^29 -- --       12 13 28 29      14 15 28 29
-
-	Thanks for hints from Richard Outerbridge - he told me IP&FP
-	could be done in 15 xor, 10 shifts and 5 ands.
-	When I finally started to think of the problem in 2D
-	I first got ~42 operations without xors.  When I remembered
-	how to use xors :-) I got it to its final state.
-	*/
-#define PERM_OP(a,b,t,n,m) ((t)=((((a)>>(n))^(b))&(m)),\
-	(b)^=(t),\
-	(a)^=((t)<<(n)))
-
-#define IP(l,r) \
-	{ \
-	register DES_LONG tt; \
-	PERM_OP(r,l,tt, 4,0x0f0f0f0fL); \
-	PERM_OP(l,r,tt,16,0x0000ffffL); \
-	PERM_OP(r,l,tt, 2,0x33333333L); \
-	PERM_OP(l,r,tt, 8,0x00ff00ffL); \
-	PERM_OP(r,l,tt, 1,0x55555555L); \
-	}
-
-#define FP(l,r) \
-	{ \
-	register DES_LONG tt; \
-	PERM_OP(l,r,tt, 1,0x55555555L); \
-	PERM_OP(r,l,tt, 8,0x00ff00ffL); \
-	PERM_OP(l,r,tt, 2,0x33333333L); \
-	PERM_OP(r,l,tt,16,0x0000ffffL); \
-	PERM_OP(l,r,tt, 4,0x0f0f0f0fL); \
-	}
-#endif
diff --git a/secure/lib/libdes/des_ver.h b/secure/lib/libdes/des_ver.h
deleted file mode 100644
index b895af89edac..000000000000
--- a/secure/lib/libdes/des_ver.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* crypto/des/des_ver.h */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-extern char *DES_version;	/* SSLeay version string */
-extern char *libdes_version;	/* old libdes version string */
diff --git a/secure/lib/libdes/destest.c b/secure/lib/libdes/destest.c
deleted file mode 100644
index b3cc23e5a51c..000000000000
--- a/secure/lib/libdes/destest.c
+++ /dev/null
@@ -1,834 +0,0 @@
-/* crypto/des/destest.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#if defined(WIN32) || defined(WIN16) || defined(WINDOWS)
-#ifndef MSDOS
-#define MSDOS
-#endif
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#ifndef MSDOS
-#include <unistd.h>
-#else
-#include <io.h>
-#endif
-#include <string.h>
-#include "des.h"
-
-/* tisk tisk - the test keys don't all have odd parity :-( */
-/* test data */
-#define NUM_TESTS 34
-static unsigned char key_data[NUM_TESTS][8]={
-	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-	{0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
-	{0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-	{0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
-	{0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
-	{0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
-	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-	{0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10},
-	{0x7C,0xA1,0x10,0x45,0x4A,0x1A,0x6E,0x57},
-	{0x01,0x31,0xD9,0x61,0x9D,0xC1,0x37,0x6E},
-	{0x07,0xA1,0x13,0x3E,0x4A,0x0B,0x26,0x86},
-	{0x38,0x49,0x67,0x4C,0x26,0x02,0x31,0x9E},
-	{0x04,0xB9,0x15,0xBA,0x43,0xFE,0xB5,0xB6},
-	{0x01,0x13,0xB9,0x70,0xFD,0x34,0xF2,0xCE},
-	{0x01,0x70,0xF1,0x75,0x46,0x8F,0xB5,0xE6},
-	{0x43,0x29,0x7F,0xAD,0x38,0xE3,0x73,0xFE},
-	{0x07,0xA7,0x13,0x70,0x45,0xDA,0x2A,0x16},
-	{0x04,0x68,0x91,0x04,0xC2,0xFD,0x3B,0x2F},
-	{0x37,0xD0,0x6B,0xB5,0x16,0xCB,0x75,0x46},
-	{0x1F,0x08,0x26,0x0D,0x1A,0xC2,0x46,0x5E},
-	{0x58,0x40,0x23,0x64,0x1A,0xBA,0x61,0x76},
-	{0x02,0x58,0x16,0x16,0x46,0x29,0xB0,0x07},
-	{0x49,0x79,0x3E,0xBC,0x79,0xB3,0x25,0x8F},
-	{0x4F,0xB0,0x5E,0x15,0x15,0xAB,0x73,0xA7},
-	{0x49,0xE9,0x5D,0x6D,0x4C,0xA2,0x29,0xBF},
-	{0x01,0x83,0x10,0xDC,0x40,0x9B,0x26,0xD6},
-	{0x1C,0x58,0x7F,0x1C,0x13,0x92,0x4F,0xEF},
-	{0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01},
-	{0x1F,0x1F,0x1F,0x1F,0x0E,0x0E,0x0E,0x0E},
-	{0xE0,0xFE,0xE0,0xFE,0xF1,0xFE,0xF1,0xFE},
-	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-	{0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
-	{0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
-	{0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10}};
-
-static unsigned char plain_data[NUM_TESTS][8]={
-	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-	{0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
-	{0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x01},
-	{0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
-	{0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
-	{0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
-	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-	{0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
-	{0x01,0xA1,0xD6,0xD0,0x39,0x77,0x67,0x42},
-	{0x5C,0xD5,0x4C,0xA8,0x3D,0xEF,0x57,0xDA},
-	{0x02,0x48,0xD4,0x38,0x06,0xF6,0x71,0x72},
-	{0x51,0x45,0x4B,0x58,0x2D,0xDF,0x44,0x0A},
-	{0x42,0xFD,0x44,0x30,0x59,0x57,0x7F,0xA2},
-	{0x05,0x9B,0x5E,0x08,0x51,0xCF,0x14,0x3A},
-	{0x07,0x56,0xD8,0xE0,0x77,0x47,0x61,0xD2},
-	{0x76,0x25,0x14,0xB8,0x29,0xBF,0x48,0x6A},
-	{0x3B,0xDD,0x11,0x90,0x49,0x37,0x28,0x02},
-	{0x26,0x95,0x5F,0x68,0x35,0xAF,0x60,0x9A},
-	{0x16,0x4D,0x5E,0x40,0x4F,0x27,0x52,0x32},
-	{0x6B,0x05,0x6E,0x18,0x75,0x9F,0x5C,0xCA},
-	{0x00,0x4B,0xD6,0xEF,0x09,0x17,0x60,0x62},
-	{0x48,0x0D,0x39,0x00,0x6E,0xE7,0x62,0xF2},
-	{0x43,0x75,0x40,0xC8,0x69,0x8F,0x3C,0xFA},
-	{0x07,0x2D,0x43,0xA0,0x77,0x07,0x52,0x92},
-	{0x02,0xFE,0x55,0x77,0x81,0x17,0xF1,0x2A},
-	{0x1D,0x9D,0x5C,0x50,0x18,0xF7,0x28,0xC2},
-	{0x30,0x55,0x32,0x28,0x6D,0x6F,0x29,0x5A},
-	{0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
-	{0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
-	{0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
-	{0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
-	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-	{0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}};
-
-static unsigned char cipher_data[NUM_TESTS][8]={
-	{0x8C,0xA6,0x4D,0xE9,0xC1,0xB1,0x23,0xA7},
-	{0x73,0x59,0xB2,0x16,0x3E,0x4E,0xDC,0x58},
-	{0x95,0x8E,0x6E,0x62,0x7A,0x05,0x55,0x7B},
-	{0xF4,0x03,0x79,0xAB,0x9E,0x0E,0xC5,0x33},
-	{0x17,0x66,0x8D,0xFC,0x72,0x92,0x53,0x2D},
-	{0x8A,0x5A,0xE1,0xF8,0x1A,0xB8,0xF2,0xDD},
-	{0x8C,0xA6,0x4D,0xE9,0xC1,0xB1,0x23,0xA7},
-	{0xED,0x39,0xD9,0x50,0xFA,0x74,0xBC,0xC4},
-	{0x69,0x0F,0x5B,0x0D,0x9A,0x26,0x93,0x9B},
-	{0x7A,0x38,0x9D,0x10,0x35,0x4B,0xD2,0x71},
-	{0x86,0x8E,0xBB,0x51,0xCA,0xB4,0x59,0x9A},
-	{0x71,0x78,0x87,0x6E,0x01,0xF1,0x9B,0x2A},
-	{0xAF,0x37,0xFB,0x42,0x1F,0x8C,0x40,0x95},
-	{0x86,0xA5,0x60,0xF1,0x0E,0xC6,0xD8,0x5B},
-	{0x0C,0xD3,0xDA,0x02,0x00,0x21,0xDC,0x09},
-	{0xEA,0x67,0x6B,0x2C,0xB7,0xDB,0x2B,0x7A},
-	{0xDF,0xD6,0x4A,0x81,0x5C,0xAF,0x1A,0x0F},
-	{0x5C,0x51,0x3C,0x9C,0x48,0x86,0xC0,0x88},
-	{0x0A,0x2A,0xEE,0xAE,0x3F,0xF4,0xAB,0x77},
-	{0xEF,0x1B,0xF0,0x3E,0x5D,0xFA,0x57,0x5A},
-	{0x88,0xBF,0x0D,0xB6,0xD7,0x0D,0xEE,0x56},
-	{0xA1,0xF9,0x91,0x55,0x41,0x02,0x0B,0x56},
-	{0x6F,0xBF,0x1C,0xAF,0xCF,0xFD,0x05,0x56},
-	{0x2F,0x22,0xE4,0x9B,0xAB,0x7C,0xA1,0xAC},
-	{0x5A,0x6B,0x61,0x2C,0xC2,0x6C,0xCE,0x4A},
-	{0x5F,0x4C,0x03,0x8E,0xD1,0x2B,0x2E,0x41},
-	{0x63,0xFA,0xC0,0xD0,0x34,0xD9,0xF7,0x93},
-	{0x61,0x7B,0x3A,0x0C,0xE8,0xF0,0x71,0x00},
-	{0xDB,0x95,0x86,0x05,0xF8,0xC8,0xC6,0x06},
-	{0xED,0xBF,0xD1,0xC6,0x6C,0x29,0xCC,0xC7},
-	{0x35,0x55,0x50,0xB2,0x15,0x0E,0x24,0x51},
-	{0xCA,0xAA,0xAF,0x4D,0xEA,0xF1,0xDB,0xAE},
-	{0xD5,0xD4,0x4F,0xF7,0x20,0x68,0x3D,0x0D},
-	{0x2A,0x2B,0xB0,0x08,0xDF,0x97,0xC2,0xF2}};
-
-static unsigned char cipher_ecb2[NUM_TESTS-1][8]={
-	{0x92,0x95,0xB5,0x9B,0xB3,0x84,0x73,0x6E},
-	{0x19,0x9E,0x9D,0x6D,0xF3,0x9A,0xA8,0x16},
-	{0x2A,0x4B,0x4D,0x24,0x52,0x43,0x84,0x27},
-	{0x35,0x84,0x3C,0x01,0x9D,0x18,0xC5,0xB6},
-	{0x4A,0x5B,0x2F,0x42,0xAA,0x77,0x19,0x25},
-	{0xA0,0x6B,0xA9,0xB8,0xCA,0x5B,0x17,0x8A},
-	{0xAB,0x9D,0xB7,0xFB,0xED,0x95,0xF2,0x74},
-	{0x3D,0x25,0x6C,0x23,0xA7,0x25,0x2F,0xD6},
-	{0xB7,0x6F,0xAB,0x4F,0xBD,0xBD,0xB7,0x67},
-	{0x8F,0x68,0x27,0xD6,0x9C,0xF4,0x1A,0x10},
-	{0x82,0x57,0xA1,0xD6,0x50,0x5E,0x81,0x85},
-	{0xA2,0x0F,0x0A,0xCD,0x80,0x89,0x7D,0xFA},
-	{0xCD,0x2A,0x53,0x3A,0xDB,0x0D,0x7E,0xF3},
-	{0xD2,0xC2,0xBE,0x27,0xE8,0x1B,0x68,0xE3},
-	{0xE9,0x24,0xCF,0x4F,0x89,0x3C,0x5B,0x0A},
-	{0xA7,0x18,0xC3,0x9F,0xFA,0x9F,0xD7,0x69},
-	{0x77,0x2C,0x79,0xB1,0xD2,0x31,0x7E,0xB1},
-	{0x49,0xAB,0x92,0x7F,0xD0,0x22,0x00,0xB7},
-	{0xCE,0x1C,0x6C,0x7D,0x85,0xE3,0x4A,0x6F},
-	{0xBE,0x91,0xD6,0xE1,0x27,0xB2,0xE9,0x87},
-	{0x70,0x28,0xAE,0x8F,0xD1,0xF5,0x74,0x1A},
-	{0xAA,0x37,0x80,0xBB,0xF3,0x22,0x1D,0xDE},
-	{0xA6,0xC4,0xD2,0x5E,0x28,0x93,0xAC,0xB3},
-	{0x22,0x07,0x81,0x5A,0xE4,0xB7,0x1A,0xAD},
-	{0xDC,0xCE,0x05,0xE7,0x07,0xBD,0xF5,0x84},
-	{0x26,0x1D,0x39,0x2C,0xB3,0xBA,0xA5,0x85},
-	{0xB4,0xF7,0x0F,0x72,0xFB,0x04,0xF0,0xDC},
-	{0x95,0xBA,0xA9,0x4E,0x87,0x36,0xF2,0x89},
-	{0xD4,0x07,0x3A,0xF1,0x5A,0x17,0x82,0x0E},
-	{0xEF,0x6F,0xAF,0xA7,0x66,0x1A,0x7E,0x89},
-	{0xC1,0x97,0xF5,0x58,0x74,0x8A,0x20,0xE7},
-	{0x43,0x34,0xCF,0xDA,0x22,0xC4,0x86,0xC8},
-	{0x08,0xD7,0xB4,0xFB,0x62,0x9D,0x08,0x85}};
-
-static unsigned char cbc_key [8]={0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef};
-static unsigned char cbc2_key[8]={0xf0,0xe1,0xd2,0xc3,0xb4,0xa5,0x96,0x87};
-static unsigned char cbc3_key[8]={0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10};
-static unsigned char cbc_iv  [8]={0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10};
-static char cbc_data[40]="7654321 Now is the time for ";
-
-static unsigned char cbc_ok[32]={
-	0xcc,0xd1,0x73,0xff,0xab,0x20,0x39,0xf4,
-	0xac,0xd8,0xae,0xfd,0xdf,0xd8,0xa1,0xeb,
-	0x46,0x8e,0x91,0x15,0x78,0x88,0xba,0x68,
-	0x1d,0x26,0x93,0x97,0xf7,0xfe,0x62,0xb4};
-
-static unsigned char xcbc_ok[32]={
-	0x86,0x74,0x81,0x0D,0x61,0xA4,0xA5,0x48,
-	0xB9,0x93,0x03,0xE1,0xB8,0xBB,0xBD,0xBD,
-	0x64,0x30,0x0B,0xB9,0x06,0x65,0x81,0x76,
-	0x04,0x1D,0x77,0x62,0x17,0xCA,0x2B,0xD2,
-	};
-
-static unsigned char cbc3_ok[32]={
-	0x3F,0xE3,0x01,0xC9,0x62,0xAC,0x01,0xD0,
-	0x22,0x13,0x76,0x3C,0x1C,0xBD,0x4C,0xDC,
-	0x79,0x96,0x57,0xC0,0x64,0xEC,0xF5,0xD4,
-	0x1C,0x67,0x38,0x12,0xCF,0xDE,0x96,0x75};
-
-static unsigned char pcbc_ok[32]={
-	0xcc,0xd1,0x73,0xff,0xab,0x20,0x39,0xf4,
-	0x6d,0xec,0xb4,0x70,0xa0,0xe5,0x6b,0x15,
-	0xae,0xa6,0xbf,0x61,0xed,0x7d,0x9c,0x9f,
-	0xf7,0x17,0x46,0x3b,0x8a,0xb3,0xcc,0x88};
-
-static unsigned char cfb_key[8]={0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef};
-static unsigned char cfb_iv[8]={0x12,0x34,0x56,0x78,0x90,0xab,0xcd,0xef};
-static unsigned char cfb_buf1[40],cfb_buf2[40],cfb_tmp[8];
-static unsigned char plain[24]=
-	{
-	0x4e,0x6f,0x77,0x20,0x69,0x73,
-	0x20,0x74,0x68,0x65,0x20,0x74,
-	0x69,0x6d,0x65,0x20,0x66,0x6f,
-	0x72,0x20,0x61,0x6c,0x6c,0x20
-	};
-static unsigned char cfb_cipher8[24]= {
-	0xf3,0x1f,0xda,0x07,0x01,0x14, 0x62,0xee,0x18,0x7f,0x43,0xd8,
-	0x0a,0x7c,0xd9,0xb5,0xb0,0xd2, 0x90,0xda,0x6e,0x5b,0x9a,0x87 };
-static unsigned char cfb_cipher16[24]={
-	0xF3,0x09,0x87,0x87,0x7F,0x57, 0xF7,0x3C,0x36,0xB6,0xDB,0x70,
-	0xD8,0xD5,0x34,0x19,0xD3,0x86, 0xB2,0x23,0xB7,0xB2,0xAD,0x1B };
-static unsigned char cfb_cipher32[24]={
-	0xF3,0x09,0x62,0x49,0xA4,0xDF, 0xA4,0x9F,0x33,0xDC,0x7B,0xAD,
-	0x4C,0xC8,0x9F,0x64,0xE4,0x53, 0xE5,0xEC,0x67,0x20,0xDA,0xB6 };
-static unsigned char cfb_cipher48[24]={
-	0xF3,0x09,0x62,0x49,0xC7,0xF4, 0x30,0xB5,0x15,0xEC,0xBB,0x85,
-	0x97,0x5A,0x13,0x8C,0x68,0x60, 0xE2,0x38,0x34,0x3C,0xDC,0x1F };
-static unsigned char cfb_cipher64[24]={
-	0xF3,0x09,0x62,0x49,0xC7,0xF4, 0x6E,0x51,0xA6,0x9E,0x83,0x9B,
-	0x1A,0x92,0xF7,0x84,0x03,0x46, 0x71,0x33,0x89,0x8E,0xA6,0x22 };
-
-static unsigned char ofb_key[8]={0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef};
-static unsigned char ofb_iv[8]={0x12,0x34,0x56,0x78,0x90,0xab,0xcd,0xef};
-static unsigned char ofb_buf1[24],ofb_buf2[24],ofb_tmp[8];
-static unsigned char ofb_cipher[24]=
-	{
-	0xf3,0x09,0x62,0x49,0xc7,0xf4,0x6e,0x51,
-	0x35,0xf2,0x4a,0x24,0x2e,0xeb,0x3d,0x3f,
-	0x3d,0x6d,0x5b,0xe3,0x25,0x5a,0xf8,0xc3
-	};
-
-DES_LONG cbc_cksum_ret=0xB462FEF7L;
-unsigned char cbc_cksum_data[8]={0x1D,0x26,0x93,0x97,0xf7,0xfe,0x62,0xb4};
-
-#ifndef NOPROTO
-static char *pt(unsigned char *p);
-static int cfb_test(int bits, unsigned char *cfb_cipher);
-static int cfb64_test(unsigned char *cfb_cipher);
-static int ede_cfb64_test(unsigned char *cfb_cipher);
-#else
-static char *pt();
-static int cfb_test();
-static int cfb64_test();
-static int ede_cfb64_test();
-#endif
-
-int main(argc,argv)
-int argc;
-char *argv[];
-	{
-	int i,j,err=0;
-	des_cblock in,out,outin,iv3;
-	des_key_schedule ks,ks2,ks3;
-	unsigned char cbc_in[40];
-	unsigned char cbc_out[40];
-	DES_LONG cs;
-	unsigned char qret[4][4],cret[8];
-	DES_LONG lqret[4];
-	int num;
-	char *str;
-
-	printf("Doing ecb\n");
-	for (i=0; i<NUM_TESTS; i++)
-		{
-		if ((j=des_key_sched((C_Block *)(key_data[i]),ks)) != 0)
-			{
-			printf("Key error %2d:%d\n",i+1,j);
-			err=1;
-			}
-		memcpy(in,plain_data[i],8);
-		memset(out,0,8);
-		memset(outin,0,8);
-		des_ecb_encrypt((C_Block *)in,(C_Block *)out,ks,DES_ENCRYPT);
-		des_ecb_encrypt((C_Block *)out,(C_Block *)outin,ks,DES_DECRYPT);
-
-		if (memcmp(out,cipher_data[i],8) != 0)
-			{
-			printf("Encryption error %2d\nk=%s p=%s o=%s act=%s\n",
-				i+1,pt(key_data[i]),pt(in),pt(cipher_data[i]),
-				pt(out));
-			err=1;
-			}
-		if (memcmp(in,outin,8) != 0)
-			{
-			printf("Decryption error %2d\nk=%s p=%s o=%s act=%s\n",
-				i+1,pt(key_data[i]),pt(out),pt(in),pt(outin));
-			err=1;
-			}
-		}
-
-	printf("Doing ede ecb\n");
-	for (i=0; i<(NUM_TESTS-1); i++)
-		{
-		if ((j=des_key_sched((C_Block *)(key_data[i]),ks)) != 0)
-			{
-			err=1;
-			printf("Key error %2d:%d\n",i+1,j);
-			}
-		if ((j=des_key_sched((C_Block *)(key_data[i+1]),ks2)) != 0)
-			{
-			printf("Key error %2d:%d\n",i+2,j);
-			err=1;
-			}
-		if ((j=des_key_sched((C_Block *)(key_data[i+2]),ks3)) != 0)
-			{
-			printf("Key error %2d:%d\n",i+3,j);
-			err=1;
-			}
-		memcpy(in,plain_data[i],8);
-		memset(out,0,8);
-		memset(outin,0,8);
-		des_ecb2_encrypt((C_Block *)in,(C_Block *)out,ks,ks2,
-			DES_ENCRYPT);
-		des_ecb2_encrypt((C_Block *)out,(C_Block *)outin,ks,ks2,
-			DES_DECRYPT);
-
-		if (memcmp(out,cipher_ecb2[i],8) != 0)
-			{
-			printf("Encryption error %2d\nk=%s p=%s o=%s act=%s\n",
-				i+1,pt(key_data[i]),pt(in),pt(cipher_ecb2[i]),
-				pt(out));
-			err=1;
-			}
-		if (memcmp(in,outin,8) != 0)
-			{
-			printf("Decryption error %2d\nk=%s p=%s o=%s act=%s\n",
-				i+1,pt(key_data[i]),pt(out),pt(in),pt(outin));
-			err=1;
-			}
-		}
-
-	printf("Doing cbc\n");
-	if ((j=des_key_sched((C_Block *)cbc_key,ks)) != 0)
-		{
-		printf("Key error %d\n",j);
-		err=1;
-		}
-	memset(cbc_out,0,40);
-	memset(cbc_in,0,40);
-	des_cbc_encrypt((C_Block *)cbc_data,(C_Block *)cbc_out,
-		(long)strlen((char *)cbc_data)+1,ks,
-		(C_Block *)cbc_iv,DES_ENCRYPT);
-	if (memcmp(cbc_out,cbc_ok,32) != 0)
-		printf("cbc_encrypt encrypt error\n");
-	des_cbc_encrypt((C_Block *)cbc_out,(C_Block *)cbc_in,
-		(long)strlen((char *)cbc_data)+1,ks,
-		(C_Block *)cbc_iv,DES_DECRYPT);
-	if (memcmp(cbc_in,cbc_data,32) != 0)
-		{
-		printf("cbc_encrypt decrypt error\n");
-		err=1;
-		}
-
-	printf("Doing desx cbc\n");
-	if ((j=des_key_sched((C_Block *)cbc_key,ks)) != 0)
-		{
-		printf("Key error %d\n",j);
-		err=1;
-		}
-	memset(cbc_out,0,40);
-	memset(cbc_in,0,40);
-	memcpy(iv3,cbc_iv,sizeof(cbc_iv));
-	des_xcbc_encrypt((C_Block *)cbc_data,(C_Block *)cbc_out,
-		(long)strlen((char *)cbc_data)+1,ks,
-		(C_Block *)iv3,
-		(C_Block *)cbc2_key, (C_Block *)cbc3_key, DES_ENCRYPT);
-	if (memcmp(cbc_out,xcbc_ok,32) != 0)
-		{
-		printf("des_xcbc_encrypt encrypt error\n");
-		}
-	memcpy(iv3,cbc_iv,sizeof(cbc_iv));
-	des_xcbc_encrypt((C_Block *)cbc_out,(C_Block *)cbc_in,
-		(long)strlen((char *)cbc_data)+1,ks,
-		(C_Block *)iv3,
-		(C_Block *)cbc2_key, (C_Block *)cbc3_key, DES_DECRYPT);
-	if (memcmp(cbc_in,cbc_data,32) != 0)
-		{
-		printf("des_xcbc_encrypt decrypt error\n");
-		err=1;
-		}
-
-	printf("Doing ede cbc\n");
-	if ((j=des_key_sched((C_Block *)cbc_key,ks)) != 0)
-		{
-		printf("Key error %d\n",j);
-		err=1;
-		}
-	if ((j=des_key_sched((C_Block *)cbc2_key,ks2)) != 0)
-		{
-		printf("Key error %d\n",j);
-		err=1;
-		}
-	if ((j=des_key_sched((C_Block *)cbc3_key,ks3)) != 0)
-		{
-		printf("Key error %d\n",j);
-		err=1;
-		}
-	memset(cbc_out,0,40);
-	memset(cbc_in,0,40);
-	i=strlen((char *)cbc_data)+1;
-	i=((i+7)/8)*8;
-	memcpy(iv3,cbc_iv,sizeof(cbc_iv));
-
-	des_ede3_cbc_encrypt((C_Block *)cbc_data,(C_Block *)cbc_out,
-		16L,ks,ks2,ks3,(C_Block *)iv3,DES_ENCRYPT);
-	des_ede3_cbc_encrypt((C_Block *)&(cbc_data[16]),
-		(C_Block *)&(cbc_out[16]),
-		(long)i-16,ks,ks2,ks3,(C_Block *)iv3,DES_ENCRYPT);
-	if (memcmp(cbc_out,cbc3_ok,
-		(unsigned int)(strlen((char *)cbc_data)+1+7)/8*8) != 0)
-		{
-		printf("des_ede3_cbc_encrypt encrypt error\n");
-		err=1;
-		}
-
-	memcpy(iv3,cbc_iv,sizeof(cbc_iv));
-	des_ede3_cbc_encrypt((C_Block *)cbc_out,(C_Block *)cbc_in,
-		(long)i,ks,ks2,ks3,(C_Block *)iv3,DES_DECRYPT);
-	if (memcmp(cbc_in,cbc_data,strlen(cbc_data)+1) != 0)
-		{
-		printf("des_ede3_cbc_encrypt decrypt error\n");
-		err=1;
-		}
-
-	printf("Doing pcbc\n");
-	if ((j=des_key_sched((C_Block *)cbc_key,ks)) != 0)
-		{
-		printf("Key error %d\n",j);
-		err=1;
-		}
-	memset(cbc_out,0,40);
-	memset(cbc_in,0,40);
-	des_pcbc_encrypt((C_Block *)cbc_data,(C_Block *)cbc_out,
-		(long)strlen(cbc_data)+1,ks,(C_Block *)cbc_iv,DES_ENCRYPT);
-	if (memcmp(cbc_out,pcbc_ok,32) != 0)
-		{
-		printf("pcbc_encrypt encrypt error\n");
-		err=1;
-		}
-	des_pcbc_encrypt((C_Block *)cbc_out,(C_Block *)cbc_in,
-		(long)strlen(cbc_data)+1,ks,(C_Block *)cbc_iv,DES_DECRYPT);
-	if (memcmp(cbc_in,cbc_data,32) != 0)
-		{
-		printf("pcbc_encrypt decrypt error\n");
-		err=1;
-		}
-
-	printf("Doing ");
-	printf("cfb8 ");
-	err+=cfb_test(8,cfb_cipher8);
-	printf("cfb16 ");
-	err+=cfb_test(16,cfb_cipher16);
-	printf("cfb32 ");
-	err+=cfb_test(32,cfb_cipher32);
-	printf("cfb48 ");
-	err+=cfb_test(48,cfb_cipher48);
-	printf("cfb64 ");
-	err+=cfb_test(64,cfb_cipher64);
-
-	printf("cfb64() ");
-	err+=cfb64_test(cfb_cipher64);
-
-	memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
-	for (i=0; i<sizeof(plain); i++)
-		des_cfb_encrypt(&(plain[i]),&(cfb_buf1[i]),
-			8,(long)1,ks,(C_Block *)cfb_tmp,DES_ENCRYPT);
-	if (memcmp(cfb_cipher8,cfb_buf1,sizeof(plain)) != 0)
-		{
-		printf("cfb_encrypt small encrypt error\n");
-		err=1;
-		}
-
-	memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
-	for (i=0; i<sizeof(plain); i++)
-		des_cfb_encrypt(&(cfb_buf1[i]),&(cfb_buf2[i]),
-			8,(long)1,ks,(C_Block *)cfb_tmp,DES_DECRYPT);
-	if (memcmp(plain,cfb_buf2,sizeof(plain)) != 0)
-		{
-		printf("cfb_encrypt small decrypt error\n");
-		err=1;
-		}
-
-	printf("ede_cfb64() ");
-	err+=ede_cfb64_test(cfb_cipher64);
-
-	printf("done\n");
-
-	printf("Doing ofb\n");
-	des_key_sched((C_Block *)ofb_key,ks);
-	memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
-	des_ofb_encrypt(plain,ofb_buf1,64,(long)sizeof(plain)/8,ks,
-		(C_Block *)ofb_tmp);
-	if (memcmp(ofb_cipher,ofb_buf1,sizeof(ofb_buf1)) != 0)
-		{
-		printf("ofb_encrypt encrypt error\n");
-		err=1;
-		}
-	memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
-	des_ofb_encrypt(ofb_buf1,ofb_buf2,64,(long)sizeof(ofb_buf1)/8,ks,
-		(C_Block *)ofb_tmp);
-	if (memcmp(plain,ofb_buf2,sizeof(ofb_buf2)) != 0)
-		{
-		printf("ofb_encrypt decrypt error\n");
-		err=1;
-		}
-
-	printf("Doing ofb64\n");
-	des_key_sched((C_Block *)ofb_key,ks);
-	memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
-	memset(ofb_buf1,0,sizeof(ofb_buf1));
-	memset(ofb_buf2,0,sizeof(ofb_buf1));
-	num=0;
-	for (i=0; i<sizeof(plain); i++)
-		{
-		des_ofb64_encrypt(&(plain[i]),&(ofb_buf1[i]),1,ks,
-			(C_Block *)ofb_tmp,&num);
-		}
-	if (memcmp(ofb_cipher,ofb_buf1,sizeof(ofb_buf1)) != 0)
-		{
-		printf("ofb64_encrypt encrypt error\n");
-		err=1;
-		}
-	memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
-	num=0;
-	des_ofb64_encrypt(ofb_buf1,ofb_buf2,(long)sizeof(ofb_buf1),ks,
-		(C_Block *)ofb_tmp,&num);
-	if (memcmp(plain,ofb_buf2,sizeof(ofb_buf2)) != 0)
-		{
-		printf("ofb64_encrypt decrypt error\n");
-		err=1;
-		}
-
-	printf("Doing ede_ofb64\n");
-	des_key_sched((C_Block *)ofb_key,ks);
-	memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
-	memset(ofb_buf1,0,sizeof(ofb_buf1));
-	memset(ofb_buf2,0,sizeof(ofb_buf1));
-	num=0;
-	for (i=0; i<sizeof(plain); i++)
-		{
-		des_ede3_ofb64_encrypt(&(plain[i]),&(ofb_buf1[i]),1,ks,ks,ks,
-			(C_Block *)ofb_tmp,&num);
-		}
-	if (memcmp(ofb_cipher,ofb_buf1,sizeof(ofb_buf1)) != 0)
-		{
-		printf("ede_ofb64_encrypt encrypt error\n");
-		err=1;
-		}
-	memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
-	num=0;
-	des_ede3_ofb64_encrypt(ofb_buf1,ofb_buf2,(long)sizeof(ofb_buf1),ks,
-		ks,ks,(C_Block *)ofb_tmp,&num);
-	if (memcmp(plain,ofb_buf2,sizeof(ofb_buf2)) != 0)
-		{
-		printf("ede_ofb64_encrypt decrypt error\n");
-		err=1;
-		}
-
-	printf("Doing cbc_cksum\n");
-	des_key_sched((C_Block *)cbc_key,ks);
-	cs=des_cbc_cksum((C_Block *)cbc_data,(C_Block *)cret,
-		(long)strlen(cbc_data),ks,(C_Block *)cbc_iv);
-	if (cs != cbc_cksum_ret)
-		{
-		printf("bad return value (%08lX), should be %08lX\n",
-			(unsigned long)cs,(unsigned long)cbc_cksum_ret);
-		err=1;
-		}
-	if (memcmp(cret,cbc_cksum_data,8) != 0)
-		{
-		printf("bad cbc_cksum block returned\n");
-		err=1;
-		}
-
-	printf("Doing quad_cksum\n");
-	cs=quad_cksum((C_Block *)cbc_data,(C_Block *)qret,
-		(long)strlen(cbc_data),2,(C_Block *)cbc_iv);
-	for (i=0; i<4; i++)
-		{
-		lqret[i]=0;
-		memcpy(&(lqret[i]),&(qret[i][0]),4);
-		}
-	{ /* Big-endian fix */
-	static DES_LONG l=1;
-	static unsigned char *c=(unsigned char *)&l;
-	DES_LONG ll;
-
-	if (!c[0])
-		{
-		ll=lqret[0]^lqret[3];
-		lqret[0]^=ll;
-		lqret[3]^=ll;
-		ll=lqret[1]^lqret[2];
-		lqret[1]^=ll;
-		lqret[2]^=ll;
-		}
-	}
-	if (cs != 0x70d7a63aL)
-		{
-		printf("quad_cksum error, ret %08lx should be 70d7a63a\n",
-			(unsigned long)cs);
-		err=1;
-		}
-	if (lqret[0] != 0x327eba8dL)
-		{
-		printf("quad_cksum error, out[0] %08lx is not %08lx\n",
-			(unsigned long)lqret[0],0x327eba8dL);
-		err=1;
-		}
-	if (lqret[1] != 0x201a49ccL)
-		{
-		printf("quad_cksum error, out[1] %08lx is not %08lx\n",
-			(unsigned long)lqret[1],0x201a49ccL);
-		err=1;
-		}
-	if (lqret[2] != 0x70d7a63aL)
-		{
-		printf("quad_cksum error, out[2] %08lx is not %08lx\n",
-			(unsigned long)lqret[2],0x70d7a63aL);
-		err=1;
-		}
-	if (lqret[3] != 0x501c2c26L)
-		{
-		printf("quad_cksum error, out[3] %08lx is not %08lx\n",
-			(unsigned long)lqret[3],0x501c2c26L);
-		err=1;
-		}
-
-	printf("input word alignment test");
-	for (i=0; i<4; i++)
-		{
-		printf(" %d",i);
-		des_cbc_encrypt((C_Block *)&(cbc_out[i]),(C_Block *)cbc_in,
-			(long)strlen(cbc_data)+1,ks,(C_Block *)cbc_iv,
-			DES_ENCRYPT);
-		}
-	printf("\noutput word alignment test");
-	for (i=0; i<4; i++)
-		{
-		printf(" %d",i);
-		des_cbc_encrypt((C_Block *)cbc_out,(C_Block *)&(cbc_in[i]),
-			(long)strlen(cbc_data)+1,ks,(C_Block *)cbc_iv,
-			DES_ENCRYPT);
-		}
-	printf("\n");
-	printf("fast crypt test ");
-	str=crypt("testing","ef");
-	if (strcmp("efGnQx2725bI2",str) != 0)
-		{
-		printf("fast crypt error, %s should be efGnQx2725bI2\n",str);
-		err=1;
-		}
-	str=crypt("bca76;23","yA");
-	if (strcmp("yA1Rp/1hZXIJk",str) != 0)
-		{
-		printf("fast crypt error, %s should be yA1Rp/1hZXIJk\n",str);
-		err=1;
-		}
-	printf("\n");
-	exit(err);
-	return(0);
-	}
-
-static char *pt(p)
-unsigned char *p;
-	{
-	static char bufs[10][20];
-	static int bnum=0;
-	char *ret;
-	int i;
-	static char *f="0123456789ABCDEF";
-
-	ret= &(bufs[bnum++][0]);
-	bnum%=10;
-	for (i=0; i<8; i++)
-		{
-		ret[i*2]=f[(p[i]>>4)&0xf];
-		ret[i*2+1]=f[p[i]&0xf];
-		}
-	ret[16]='\0';
-	return(ret);
-	}
-
-static int cfb_test(bits, cfb_cipher)
-int bits;
-unsigned char *cfb_cipher;
-	{
-	des_key_schedule ks;
-	int i,err=0;
-
-	des_key_sched((C_Block *)cfb_key,ks);
-	memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
-	des_cfb_encrypt(plain,cfb_buf1,bits,(long)sizeof(plain),ks,
-		(C_Block *)cfb_tmp,DES_ENCRYPT);
-	if (memcmp(cfb_cipher,cfb_buf1,sizeof(plain)) != 0)
-		{
-		err=1;
-		printf("cfb_encrypt encrypt error\n");
-		for (i=0; i<24; i+=8)
-			printf("%s\n",pt(&(cfb_buf1[i])));
-		}
-	memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
-	des_cfb_encrypt(cfb_buf1,cfb_buf2,bits,(long)sizeof(plain),ks,
-		(C_Block *)cfb_tmp,DES_DECRYPT);
-	if (memcmp(plain,cfb_buf2,sizeof(plain)) != 0)
-		{
-		err=1;
-		printf("cfb_encrypt decrypt error\n");
-		for (i=0; i<24; i+=8)
-			printf("%s\n",pt(&(cfb_buf1[i])));
-		}
-	return(err);
-	}
-
-static int cfb64_test(cfb_cipher)
-unsigned char *cfb_cipher;
-	{
-	des_key_schedule ks;
-	int err=0,i,n;
-
-	des_key_sched((C_Block *)cfb_key,ks);
-	memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
-	n=0;
-	des_cfb64_encrypt(plain,cfb_buf1,(long)12,ks,
-		(C_Block *)cfb_tmp,&n,DES_ENCRYPT);
-	des_cfb64_encrypt(&(plain[12]),&(cfb_buf1[12]),
-		(long)sizeof(plain)-12,ks,
-		(C_Block *)cfb_tmp,&n,DES_ENCRYPT);
-	if (memcmp(cfb_cipher,cfb_buf1,sizeof(plain)) != 0)
-		{
-		err=1;
-		printf("cfb_encrypt encrypt error\n");
-		for (i=0; i<24; i+=8)
-			printf("%s\n",pt(&(cfb_buf1[i])));
-		}
-	memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
-	n=0;
-	des_cfb64_encrypt(cfb_buf1,cfb_buf2,(long)17,ks,
-		(C_Block *)cfb_tmp,&n,DES_DECRYPT);
-	des_cfb64_encrypt(&(cfb_buf1[17]),&(cfb_buf2[17]),
-		(long)sizeof(plain)-17,ks,
-		(C_Block *)cfb_tmp,&n,DES_DECRYPT);
-	if (memcmp(plain,cfb_buf2,sizeof(plain)) != 0)
-		{
-		err=1;
-		printf("cfb_encrypt decrypt error\n");
-		for (i=0; i<24; i+=8)
-			printf("%s\n",pt(&(cfb_buf2[i])));
-		}
-	return(err);
-	}
-
-static int ede_cfb64_test(cfb_cipher)
-unsigned char *cfb_cipher;
-	{
-	des_key_schedule ks;
-	int err=0,i,n;
-
-	des_key_sched((C_Block *)cfb_key,ks);
-	memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
-	n=0;
-	des_ede3_cfb64_encrypt(plain,cfb_buf1,(long)12,ks,ks,ks,
-		(C_Block *)cfb_tmp,&n,DES_ENCRYPT);
-	des_ede3_cfb64_encrypt(&(plain[12]),&(cfb_buf1[12]),
-		(long)sizeof(plain)-12,ks,ks,ks,
-		(C_Block *)cfb_tmp,&n,DES_ENCRYPT);
-	if (memcmp(cfb_cipher,cfb_buf1,sizeof(plain)) != 0)
-		{
-		err=1;
-		printf("ede_cfb_encrypt encrypt error\n");
-		for (i=0; i<24; i+=8)
-			printf("%s\n",pt(&(cfb_buf1[i])));
-		}
-	memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
-	n=0;
-	des_ede3_cfb64_encrypt(cfb_buf1,cfb_buf2,(long)17,ks,ks,ks,
-		(C_Block *)cfb_tmp,&n,DES_DECRYPT);
-	des_ede3_cfb64_encrypt(&(cfb_buf1[17]),&(cfb_buf2[17]),
-		(long)sizeof(plain)-17,ks,ks,ks,
-		(C_Block *)cfb_tmp,&n,DES_DECRYPT);
-	if (memcmp(plain,cfb_buf2,sizeof(plain)) != 0)
-		{
-		err=1;
-		printf("ede_cfb_encrypt decrypt error\n");
-		for (i=0; i<24; i+=8)
-			printf("%s\n",pt(&(cfb_buf2[i])));
-		}
-	return(err);
-	}
diff --git a/secure/lib/libdes/doIP b/secure/lib/libdes/doIP
deleted file mode 100644
index 18cf23130364..000000000000
--- a/secure/lib/libdes/doIP
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/local/bin/perl
-
-@l=(
-	 0, 1, 2, 3, 4, 5, 6, 7,
-	 8, 9,10,11,12,13,14,15,
-	16,17,18,19,20,21,22,23,
-	24,25,26,27,28,29,30,31
-	);
-@r=(
-	32,33,34,35,36,37,38,39,
-	40,41,42,43,44,45,46,47,
-	48,49,50,51,52,53,54,55,
-	56,57,58,59,60,61,62,63
-	);
-
-require 'shifts.pl';
-
-sub PERM_OP
-	{
-	local(*a,*b,*t,$n,$m)=@_;
-
-	@z=&shift(*a,-$n);
-	@z=&xor(*b,*z);
-	@z=&and(*z,$m);
-	@b=&xor(*b,*z);
-	@z=&shift(*z,$n);
-	@a=&xor(*a,*z);
-	}
-
-
-@L=@l;
-@R=@r;
-&PERM_OP(*R,*L,*T,4,0x0f0f0f0f);
-&PERM_OP(*L,*R,*T,16,0x0000ffff);
-&PERM_OP(*R,*L,*T,2,0x33333333);
-&PERM_OP(*L,*R,*T,8,0x00ff00ff);
-&PERM_OP(*R,*L,*T,1,0x55555555);
-	&printit(@L);
-	&printit(@R);
-&PERM_OP(*R,*L,*T,1,0x55555555);
-&PERM_OP(*L,*R,*T,8,0x00ff00ff);
-&PERM_OP(*R,*L,*T,2,0x33333333);
-&PERM_OP(*L,*R,*T,16,0x0000ffff);
-&PERM_OP(*R,*L,*T,4,0x0f0f0f0f);
-	&printit(@L);
-	&printit(@R);
diff --git a/secure/lib/libdes/doPC1 b/secure/lib/libdes/doPC1
deleted file mode 100644
index 096afd8c4614..000000000000
--- a/secure/lib/libdes/doPC1
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/usr/local/bin/perl
-
-@l=(
-	 0, 1, 2, 3, 4, 5, 6, 7,
-	 8, 9,10,11,12,13,14,15,
-	16,17,18,19,20,21,22,23,
-	24,25,26,27,28,29,30,31
-	);
-@r=(
-	32,33,34,35,36,37,38,39,
-	40,41,42,43,44,45,46,47,
-	48,49,50,51,52,53,54,55,
-	56,57,58,59,60,61,62,63
-	);
-
-require 'shifts.pl';
-
-sub PERM_OP
-	{
-	local(*a,*b,*t,$n,$m)=@_;
-
-	@z=&shift(*a,-$n);
-	@z=&xor(*b,*z);
-	@z=&and(*z,$m);
-	@b=&xor(*b,*z);
-	@z=&shift(*z,$n);
-	@a=&xor(*a,*z);
-	}
-
-sub HPERM_OP2
-	{
-	local(*a,*t,$n,$m)=@_;
-	local(@x,@y,$i);
-
-	@z=&shift(*a,16-$n);
-	@z=&xor(*a,*z);
-	@z=&and(*z,$m);
-	@a=&xor(*a,*z);
-	@z=&shift(*z,$n-16);
-	@a=&xor(*a,*z);
-	}
-
-sub HPERM_OP
-        {
-        local(*a,*t,$n,$m)=@_;
-        local(@x,@y,$i);
-
-        for ($i=0; $i<16; $i++)
-                {
-                $x[$i]=$a[$i];
-                $y[$i]=$a[16+$i];
-                }
-        @z=&shift(*x,-$n);
-        @z=&xor(*y,*z);
-        @z=&and(*z,$m);
-        @y=&xor(*y,*z);
-        @z=&shift(*z,$n);
-        @x=&xor(*x,*z);
-        for ($i=0; $i<16; $i++)
-                {
-                $a[$i]=$x[$i];
-                $a[16+$i]=$y[$i];
-                }
-        }
-
-@L=@l;
-@R=@r;
-
-	print "---\n"; &printit(@R);
-&PERM_OP(*R,*L,*T,4,0x0f0f0f0f);
-	print "---\n"; &printit(@R);
-&HPERM_OP2(*L,*T,-2,0xcccc0000);
-&HPERM_OP2(*R,*T,-2,0xcccc0000);
-	print "---\n"; &printit(@R);
-&PERM_OP(*R,*L,*T,1,0x55555555);
-	print "---\n"; &printit(@R);
-&PERM_OP(*L,*R,*T,8,0x00ff00ff);
-	print "---\n"; &printit(@R);
-&PERM_OP(*R,*L,*T,1,0x55555555);
-	print "---\n"; &printit(@R);
-#	&printit(@L);
-	&printit(@R);
-print <<"EOF";
-==============================
-63  55  47  39  31  23  15   7  
-62  54  46  38  30  22  14   6  
-61  53  45  37  29  21  13   5  
-60  52  44  36  --  --  --  --  
-
-57  49  41  33  25  17   9   1  
-58  50  42  34  26  18  10   2  
-59  51  43  35  27  19  11   3  
-28  20  12   4  --  --  --  --  
-EOF
-exit(1);
-@A=&and(*R,0x000000ff);
-@A=&shift(*A,16);
-@B=&and(*R,0x0000ff00);
-@C=&and(*R,0x00ff0000);
-@C=&shift(*C,-16);
-@D=&and(*L,0xf0000000);
-@D=&shift(*D,-4);
-@A=&or(*A,*B);
-@B=&or(*D,*C);
-@R=&or(*A,*B);
-@L=&and(*L,0x0fffffff);
-
-	&printit(@L);
-	&printit(@R);
-
diff --git a/secure/lib/libdes/doPC2 b/secure/lib/libdes/doPC2
deleted file mode 100644
index fa5cf74cf713..000000000000
--- a/secure/lib/libdes/doPC2
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/usr/local/bin/perl
-
-@PC2_C=(14,17,11,24, 1, 5,
-	 3,28,15, 6,21,10,
-	23,19,12, 4,26, 8,
-	16, 7,27,20,13, 2,
-	);
-
-@PC2_D=(41,52,31,37,47,55,
-	30,40,51,45,33,48,
-	44,49,39,56,34,53,
-	46,42,50,36,29,32,
-	);
-
-$i=0;
-foreach (@PC2_C) {
-	$_--;
-#	printf "%2d,",$_;
-	$C{$_}=$i;
-	++$i;
-#	print "\n" if ((($i) % 8) == 0);
-	}
-$i=0;
-#print "\n";
-foreach (@PC2_D) {
-	$_-=28;
-	$_--;
-#	printf "%2d,",$_;
-	$D{$_}=$i;
-	$i++;
-#	print "\n" if ((($i) % 8) == 0);
-	}
-
-#print "\n";
-foreach $i (0 .. 27)
-	{
-	$_=$C{$i};
-#	printf "%2d,",$_;
-	$i++;
-#	print "\n" if ((($i) % 8) == 0);
-	}
-#print "\n";
-
-#print "\n";
-foreach $i (0 .. 27)
-	{
-	$_=$D{$i};
-#	printf "%2d,",$_;
-	$i++;
-#	print "\n" if ((($i) % 8) == 0);
-	}
-#print "\n";
-
-print "static ulong skb[8][64]={\n";
-&doit("C",*C, 0, 1, 2, 3, 4, 5);
-&doit("C",*C, 6, 7, 9,10,11,12);
-&doit("C",*C,13,14,15,16,18,19);
-&doit("C",*C,20,22,23,25,26,27);
-
-&doit("D",*D, 0, 1, 2, 3, 4, 5);
-&doit("D",*D, 7, 8,10,11,12,13);
-&doit("D",*D,15,16,17,18,19,20);
-&doit("D",*D,21,22,23,24,26,27);
-print "};\n";
-
-sub doit
-	{
-	local($l,*A,@b)=@_;
-	local(@out);
-
-	printf("/* for $l bits (numbered as per FIPS 46) %d %d %d %d %d %d */\n",
-		$b[0]+1, $b[1]+1, $b[2]+1, $b[3]+1, $b[4]+1, $b[5]+1);
-	for ($i=0; $i<64; $i++)
-		{
-		$out[$i]=0;
-		$j=1;
-#print "\n";
-		for ($k=0; $k<6; $k++)
-			{
-			$l=$A{$b[$k]};
-#print"$l - ";
-			if ((1<<$k) & $i)
-				{
-				$ll=int($l/6)*8+($l%6);
-				$out[$i]|=1<<($ll);
-				}
-			}
-		$pp=$out[$i];
-		$pp=($pp&0xff0000ff)|   (($pp&0x00ff0000)>>8)|
-					(($pp&0x0000ff00)<<8);
-		printf("0x%08X,",$pp);
-		print "\n" if (($i+1) % 4 == 0);
-		}
-	}
diff --git a/secure/lib/libdes/ecb3_enc.c b/secure/lib/libdes/ecb3_enc.c
deleted file mode 100644
index 030770ce4aa7..000000000000
--- a/secure/lib/libdes/ecb3_enc.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* crypto/des/ecb3_enc.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include "des_locl.h"
-
-void des_ecb3_encrypt(input, output, ks1, ks2, ks3, encrypt)
-des_cblock (*input);
-des_cblock (*output);
-des_key_schedule ks1;
-des_key_schedule ks2;
-des_key_schedule ks3;
-int encrypt;
-	{
-	register DES_LONG l0,l1;
-	register unsigned char *in,*out;
-	DES_LONG ll[2];
-
-	in=(unsigned char *)input;
-	out=(unsigned char *)output;
-	c2l(in,l0);
-	c2l(in,l1);
-	IP(l0,l1);
-	ll[0]=l0;
-	ll[1]=l1;
-	des_encrypt2(ll,ks1,encrypt);
-	des_encrypt2(ll,ks2,!encrypt);
-	des_encrypt2(ll,ks3,encrypt);
-	l0=ll[0];
-	l1=ll[1];
-	FP(l1,l0);
-	l2c(l0,out);
-	l2c(l1,out);
-	}
diff --git a/secure/lib/libdes/ecb_enc.c b/secure/lib/libdes/ecb_enc.c
deleted file mode 100644
index f142192dc80c..000000000000
--- a/secure/lib/libdes/ecb_enc.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/* crypto/des/ecb_enc.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include "des_locl.h"
-#include "spr.h"
-
-char *libdes_version="libdes v 3.24 - 20-Apr-1996 - eay";
-char *DES_version="DES part of SSLeay 0.6.3 06-Aug-1996";
-
-char *des_options()
-	{
-#ifdef DES_PTR
-	if (sizeof(DES_LONG) != sizeof(long))
-		return("des(ptr,int)");
-	else
-		return("des(ptr,long)");
-#else
-	if (sizeof(DES_LONG) != sizeof(long))
-		return("des(idx,int)");
-	else
-		return("des(idx,long)");
-#endif
-	}
-		
-
-void des_ecb_encrypt(input, output, ks, encrypt)
-des_cblock (*input);
-des_cblock (*output);
-des_key_schedule ks;
-int encrypt;
-	{
-	register DES_LONG l;
-	register unsigned char *in,*out;
-	DES_LONG ll[2];
-
-	in=(unsigned char *)input;
-	out=(unsigned char *)output;
-	c2l(in,l); ll[0]=l;
-	c2l(in,l); ll[1]=l;
-	des_encrypt(ll,ks,encrypt);
-	l=ll[0]; l2c(l,out);
-	l=ll[1]; l2c(l,out);
-	l=ll[0]=ll[1]=0;
-	}
-
-void des_encrypt(data, ks, encrypt)
-DES_LONG *data;
-des_key_schedule ks;
-int encrypt;
-	{
-	register DES_LONG l,r,t,u;
-#ifdef DES_PTR
-	register unsigned char *des_SP=(unsigned char *)des_SPtrans;
-#endif
-#ifdef undef
-	union fudge {
-		DES_LONG  l;
-		unsigned short s[2];
-		unsigned char  c[4];
-		} U,T;
-#endif
-	register int i;
-	register DES_LONG *s;
-
-	u=data[0];
-	r=data[1];
-
-	IP(u,r);
-	/* Things have been modified so that the initial rotate is
-	 * done outside the loop.  This required the
-	 * des_SPtrans values in sp.h to be rotated 1 bit to the right.
-	 * One perl script later and things have a 5% speed up on a sparc2.
-	 * Thanks to Richard Outerbridge <71755.204@CompuServe.COM>
-	 * for pointing this out. */
-	l=(r<<1)|(r>>31);
-	r=(u<<1)|(u>>31);
-
-	/* clear the top bits on machines with 8byte longs */
-	l&=0xffffffffL;
-	r&=0xffffffffL;
-
-	s=(DES_LONG *)ks;
-	/* I don't know if it is worth the effort of loop unrolling the
-	 * inner loop
-	 */
-	if (encrypt)
-		{
-		for (i=0; i<32; i+=8)
-			{
-			D_ENCRYPT(l,r,i+0); /*  1 */
-			D_ENCRYPT(r,l,i+2); /*  2 */
-			D_ENCRYPT(l,r,i+4); /*  3 */
-			D_ENCRYPT(r,l,i+6); /*  4 */
-			}
-		}
-	else
-		{
-		for (i=30; i>0; i-=8)
-			{
-			D_ENCRYPT(l,r,i-0); /* 16 */
-			D_ENCRYPT(r,l,i-2); /* 15 */
-			D_ENCRYPT(l,r,i-4); /* 14 */
-			D_ENCRYPT(r,l,i-6); /* 13 */
-			}
-		}
-	l=(l>>1)|(l<<31);
-	r=(r>>1)|(r<<31);
-	/* clear the top bits on machines with 8byte longs */
-	l&=0xffffffffL;
-	r&=0xffffffffL;
-
-	FP(r,l);
-	data[0]=l;
-	data[1]=r;
-	l=r=t=u=0;
-	}
-
-void des_encrypt2(data, ks, encrypt)
-DES_LONG *data;
-des_key_schedule ks;
-int encrypt;
-	{
-	register DES_LONG l,r,t,u;
-#ifdef DES_PTR
-	register unsigned char *des_SP=(unsigned char *)des_SPtrans;
-#endif
-#ifdef undef
-	union fudge {
-		DES_LONG  l;
-		unsigned short s[2];
-		unsigned char  c[4];
-		} U,T;
-#endif
-	register int i;
-	register DES_LONG *s;
-
-	u=data[0];
-	r=data[1];
-
-	/* Things have been modified so that the initial rotate is
-	 * done outside the loop.  This required the
-	 * des_SPtrans values in sp.h to be rotated 1 bit to the right.
-	 * One perl script later and things have a 5% speed up on a sparc2.
-	 * Thanks to Richard Outerbridge <71755.204@CompuServe.COM>
-	 * for pointing this out. */
-	l=(r<<1)|(r>>31);
-	r=(u<<1)|(u>>31);
-
-	/* clear the top bits on machines with 8byte longs */
-	l&=0xffffffffL;
-	r&=0xffffffffL;
-
-	s=(DES_LONG *)ks;
-	/* I don't know if it is worth the effort of loop unrolling the
-	 * inner loop */
-	if (encrypt)
-		{
-		for (i=0; i<32; i+=8)
-			{
-			D_ENCRYPT(l,r,i+0); /*  1 */
-			D_ENCRYPT(r,l,i+2); /*  2 */
-			D_ENCRYPT(l,r,i+4); /*  3 */
-			D_ENCRYPT(r,l,i+6); /*  4 */
-			}
-		}
-	else
-		{
-		for (i=30; i>0; i-=8)
-			{
-			D_ENCRYPT(l,r,i-0); /* 16 */
-			D_ENCRYPT(r,l,i-2); /* 15 */
-			D_ENCRYPT(l,r,i-4); /* 14 */
-			D_ENCRYPT(r,l,i-6); /* 13 */
-			}
-		}
-	l=(l>>1)|(l<<31);
-	r=(r>>1)|(r<<31);
-	/* clear the top bits on machines with 8byte longs */
-	l&=0xffffffffL;
-	r&=0xffffffffL;
-
-	data[0]=l;
-	data[1]=r;
-	l=r=t=u=0;
-	}
diff --git a/secure/lib/libdes/ede_enc.c b/secure/lib/libdes/ede_enc.c
deleted file mode 100644
index c8a9e80937bc..000000000000
--- a/secure/lib/libdes/ede_enc.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/* crypto/des/ede_enc.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include "des_locl.h"
-
-void des_ede3_cbc_encrypt(input, output, length, ks1, ks2, ks3, ivec, encrypt)
-des_cblock (*input);
-des_cblock (*output);
-long length;
-des_key_schedule ks1;
-des_key_schedule ks2;
-des_key_schedule ks3;
-des_cblock (*ivec);
-int encrypt;
-	{
-	register DES_LONG tin0,tin1;
-	register DES_LONG tout0,tout1,xor0,xor1;
-	register unsigned char *in,*out;
-	register long l=length;
-	DES_LONG tin[2];
-	unsigned char *iv;
-
-	in=(unsigned char *)input;
-	out=(unsigned char *)output;
-	iv=(unsigned char *)ivec;
-
-	if (encrypt)
-		{
-		c2l(iv,tout0);
-		c2l(iv,tout1);
-		for (; l>0; l-=8)
-			{
-			if (l >= 8)
-				{
-				c2l(in,tin0);
-				c2l(in,tin1);
-				}
-			else
-				c2ln(in,tin0,tin1,l);
-			tin0^=tout0;
-			tin1^=tout1;
-
-			IP(tin0,tin1);
-
-			tin[0]=tin0;
-			tin[1]=tin1;
-			des_encrypt2((DES_LONG *)tin,ks1,DES_ENCRYPT);
-			des_encrypt2((DES_LONG *)tin,ks2,DES_DECRYPT);
-			des_encrypt2((DES_LONG *)tin,ks3,DES_ENCRYPT);
-			tout0=tin[0];
-			tout1=tin[1];
-
-			FP(tout1,tout0);
-
-			l2c(tout0,out);
-			l2c(tout1,out);
-			}
-		iv=(unsigned char *)ivec;
-		l2c(tout0,iv);
-		l2c(tout1,iv);
-		}
-	else
-		{
-		c2l(iv,xor0);
-		c2l(iv,xor1);
-		for (; l>0; l-=8)
-			{
-			register DES_LONG t0,t1;
-
-			c2l(in,tin0);
-			c2l(in,tin1);
-
-			t0=tin0;
-			t1=tin1;
-			IP(tin0,tin1);  
-
-			tin[0]=tin0;
-			tin[1]=tin1;
-			des_encrypt2((DES_LONG *)tin,ks3,DES_DECRYPT);
-			des_encrypt2((DES_LONG *)tin,ks2,DES_ENCRYPT);
-			des_encrypt2((DES_LONG *)tin,ks1,DES_DECRYPT);
-			tout0=tin[0];
-			tout1=tin[1];
-
-			FP(tout1,tout0); /**/
-
-			tout0^=xor0;
-			tout1^=xor1;
-			if (l >= 8)
-				{
-				l2c(tout0,out);
-				l2c(tout1,out);
-				}
-			else
-				l2cn(tout0,tout1,out,l);
-			xor0=t0;
-			xor1=t1;
-			}
-		iv=(unsigned char *)ivec;
-		l2c(xor0,iv);
-		l2c(xor1,iv);
-		}
-	tin0=tin1=tout0=tout1=xor0=xor1=0;
-	tin[0]=tin[1]=0;
-	}
-
-#ifdef undef /* MACRO */
-void des_ede2_cbc_encrypt(input, output, length, ks1, ks2, ivec, enc)
-des_cblock (*input);
-des_cblock (*output);
-long length;
-des_key_schedule ks1;
-des_key_schedule ks2;
-des_cblock (*ivec);
-int enc;
-	{
-	des_ede3_cbc_encrypt(input,output,length,ks1,ks2,ks1,ivec,enc);
-	}
-#endif
diff --git a/secure/lib/libdes/enc_read.c b/secure/lib/libdes/enc_read.c
deleted file mode 100644
index 00989d292852..000000000000
--- a/secure/lib/libdes/enc_read.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/* crypto/des/enc_read.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <errno.h>
-#include "des_locl.h"
-
-/* This has some uglies in it but it works - even over sockets. */
-/*extern int errno;*/
-int des_rw_mode=DES_PCBC_MODE;
-
-int des_enc_read(fd, buf, len, sched, iv)
-int fd;
-char *buf;
-int len;
-des_key_schedule sched;
-des_cblock (*iv);
-	{
-	/* data to be unencrypted */
-	int net_num=0;
-	static unsigned char *net=NULL;
-	/* extra unencrypted data 
-	 * for when a block of 100 comes in but is des_read one byte at
-	 * a time. */
-	static char *unnet=NULL;
-	static int unnet_start=0;
-	static int unnet_left=0;
-	static char *tmpbuf=NULL;
-	int i;
-	long num=0,rnum;
-	unsigned char *p;
-
-	if (tmpbuf == NULL)
-		{
-		tmpbuf=(char *)malloc(BSIZE);
-		if (tmpbuf == NULL) return(-1);
-		}
-	if (net == NULL)
-		{
-		net=(unsigned char *)malloc(BSIZE);
-		if (net == NULL) return(-1);
-		}
-	if (unnet == NULL)
-		{
-		unnet=(char *)malloc(BSIZE);
-		if (unnet == NULL) return(-1);
-		}
-	/* left over data from last decrypt */
-	if (unnet_left != 0)
-		{
-		if (unnet_left < len)
-			{
-			/* we still still need more data but will return
-			 * with the number of bytes we have - should always
-			 * check the return value */
-			memcpy(buf,&(unnet[unnet_start]),
-				(unsigned int)unnet_left);
-			/* eay 26/08/92 I had the next 2 lines
-			 * reversed :-( */
-			i=unnet_left;
-			unnet_start=unnet_left=0;
-			}
-		else
-			{
-			memcpy(buf,&(unnet[unnet_start]),(unsigned int)len);
-			unnet_start+=len;
-			unnet_left-=len;
-			i=len;
-			}
-		return(i);
-		}
-
-	/* We need to get more data. */
-	if (len > MAXWRITE) len=MAXWRITE;
-
-	/* first - get the length */
-	while (net_num < HDRSIZE) 
-		{
-		i=read(fd,&(net[net_num]),(unsigned int)HDRSIZE-net_num);
-		if ((i == -1) && (errno == EINTR)) continue;
-		if (i <= 0) return(0);
-		net_num+=i;
-		}
-
-	/* we now have at net_num bytes in net */
-	p=net;
-	/* num=0;  */
-	n2l(p,num);
-	/* num should be rounded up to the next group of eight
-	 * we make sure that we have read a multiple of 8 bytes from the net.
-	 */
-	if ((num > MAXWRITE) || (num < 0)) /* error */
-		return(-1);
-	rnum=(num < 8)?8:((num+7)/8*8);
-
-	net_num=0;
-	while (net_num < rnum)
-		{
-		i=read(fd,&(net[net_num]),(unsigned int)rnum-net_num);
-		if ((i == -1) && (errno == EINTR)) continue;
-		if (i <= 0) return(0);
-		net_num+=i;
-		}
-
-	/* Check if there will be data left over. */
-	if (len < num)
-		{
-		if (des_rw_mode & DES_PCBC_MODE)
-			des_pcbc_encrypt((des_cblock *)net,(des_cblock *)unnet,
-				num,sched,iv,DES_DECRYPT);
-		else
-			des_cbc_encrypt((des_cblock *)net,(des_cblock *)unnet,
-				num,sched,iv,DES_DECRYPT);
-		memcpy(buf,unnet,(unsigned int)len);
-		unnet_start=len;
-		unnet_left=(int)num-len;
-
-		/* The following line is done because we return num
-		 * as the number of bytes read. */
-		num=len;
-		}
-	else
-		{
-		/* >output is a multiple of 8 byes, if len < rnum
-		 * >we must be careful.  The user must be aware that this
-		 * >routine will write more bytes than he asked for.
-		 * >The length of the buffer must be correct.
-		 * FIXED - Should be ok now 18-9-90 - eay */
-		if (len < rnum)
-			{
-
-			if (des_rw_mode & DES_PCBC_MODE)
-				des_pcbc_encrypt((des_cblock *)net,
-					(des_cblock *)tmpbuf,
-					num,sched,iv,DES_DECRYPT);
-			else
-				des_cbc_encrypt((des_cblock *)net,
-					(des_cblock *)tmpbuf,
-					num,sched,iv,DES_DECRYPT);
-
-			/* eay 26/08/92 fix a bug that returned more
-			 * bytes than you asked for (returned len bytes :-( */
-			memcpy(buf,tmpbuf,(unsigned int)num);
-			}
-		else
-			{
-			if (des_rw_mode & DES_PCBC_MODE)
-				des_pcbc_encrypt((des_cblock *)net,
-					(des_cblock *)buf,num,sched,iv,
-					DES_DECRYPT);
-			else
-				des_cbc_encrypt((des_cblock *)net,
-					(des_cblock *)buf,num,sched,iv,
-					DES_DECRYPT);
-			}
-		}
-	return((int)num);
-	}
-
diff --git a/secure/lib/libdes/enc_writ.c b/secure/lib/libdes/enc_writ.c
deleted file mode 100644
index 2f15d088ab3d..000000000000
--- a/secure/lib/libdes/enc_writ.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/* crypto/des/enc_writ.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <errno.h>
-#include <time.h>
-#include "des_locl.h"
-
-int des_enc_write(fd, buf, len, sched, iv)
-int fd;
-char *buf;
-int len;
-des_key_schedule sched;
-des_cblock (*iv);
-	{
-#ifdef _LIBC
-	extern int srandom();
-	extern unsigned long time();
-	extern int random();
-	extern int write();
-#endif
-
-	long rnum;
-	int i,j,k,outnum;
-	static char *outbuf=NULL;
-	char shortbuf[8];
-	char *p;
-	static int start=1;
-
-	if (outbuf == NULL)
-		{
-		outbuf=(char *)malloc(BSIZE+HDRSIZE);
-		if (outbuf == NULL) return(-1);
-		}
-	/* If we are sending less than 8 bytes, the same char will look
-	 * the same if we don't pad it out with random bytes */
-	if (start)
-		{
-		start=0;
-		srandom((unsigned int)time(NULL));
-		}
-
-	/* lets recurse if we want to send the data in small chunks */
-	if (len > MAXWRITE)
-		{
-		j=0;
-		for (i=0; i<len; i+=k)
-			{
-			k=des_enc_write(fd,&(buf[i]),
-				((len-i) > MAXWRITE)?MAXWRITE:(len-i),sched,iv);
-			if (k < 0)
-				return(k);
-			else
-				j+=k;
-			}
-		return(j);
-		}
-
-	/* write length first */
-	p=outbuf;
-	l2n(len,p);
-
-	/* pad short strings */
-	if (len < 8)
-		{
-		p=shortbuf;
-		memcpy(shortbuf,buf,(unsigned int)len);
-		for (i=len; i<8; i++)
-			shortbuf[i]=random();
-		rnum=8;
-		}
-	else
-		{
-		p=buf;
-		rnum=((len+7)/8*8); /* round up to nearest eight */
-		}
-
-	if (des_rw_mode & DES_PCBC_MODE)
-		des_pcbc_encrypt((des_cblock *)p,
-			(des_cblock *)&(outbuf[HDRSIZE]),
-			(long)((len<8)?8:len),sched,iv,DES_ENCRYPT); 
-	else
-		des_cbc_encrypt((des_cblock *)p,
-			(des_cblock *)&(outbuf[HDRSIZE]),
-			(long)((len<8)?8:len),sched,iv,DES_ENCRYPT); 
-
-	/* output */
-	outnum=(int)rnum+HDRSIZE;
-
-	for (j=0; j<outnum; j+=i)
-		{
-		/* eay 26/08/92 I was not doing writing from where we
-		 * got upto. */
-		i=write(fd,&(outbuf[j]),(unsigned int)(outnum-j));
-		if (i == -1)
-			{
-			if (errno == EINTR)
-				i=0;
-			else 	/* This is really a bad error - very bad
-				 * It will stuff-up both ends. */
-				return(-1);
-			}
-		}
-
-	return(len);
-	}
diff --git a/secure/lib/libdes/fcrypt.c b/secure/lib/libdes/fcrypt.c
deleted file mode 100644
index 85080ea4df11..000000000000
--- a/secure/lib/libdes/fcrypt.c
+++ /dev/null
@@ -1,669 +0,0 @@
-/* crypto/des/fcrypt.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-
-/* Eric Young.
- * This version of crypt has been developed from my MIT compatable
- * DES library.
- * The library is available at pub/Crypto/DES at ftp.psy.uq.oz.au
- * eay@mincom.oz.au or eay@psych.psy.uq.oz.au
- */
-
-#ifndef HEADER_DES_LOCL_H
-
-#if defined(NOCONST)
-#define const
-#endif
-
-/* I now assume that you have des.h available */
-#include "des.h"
-
-#define ITERATIONS 16
-#define HALF_ITERATIONS 8
-
-#define c2l(c,l)	(l =((DES_LONG)(*((c)++)))    , \
-			 l|=((DES_LONG)(*((c)++)))<< 8, \
-			 l|=((DES_LONG)(*((c)++)))<<16, \
-			 l|=((DES_LONG)(*((c)++)))<<24)
-
-#define l2c(l,c)	(*((c)++)=(unsigned char)(((l)    )&0xff), \
-			 *((c)++)=(unsigned char)(((l)>> 8)&0xff), \
-			 *((c)++)=(unsigned char)(((l)>>16)&0xff), \
-			 *((c)++)=(unsigned char)(((l)>>24)&0xff))
-
-static const DES_LONG des_SPtrans[8][64]={
-{
-/* nibble 0 */
-0x00820200L, 0x00020000L, 0x80800000L, 0x80820200L,
-0x00800000L, 0x80020200L, 0x80020000L, 0x80800000L,
-0x80020200L, 0x00820200L, 0x00820000L, 0x80000200L,
-0x80800200L, 0x00800000L, 0x00000000L, 0x80020000L,
-0x00020000L, 0x80000000L, 0x00800200L, 0x00020200L,
-0x80820200L, 0x00820000L, 0x80000200L, 0x00800200L,
-0x80000000L, 0x00000200L, 0x00020200L, 0x80820000L,
-0x00000200L, 0x80800200L, 0x80820000L, 0x00000000L,
-0x00000000L, 0x80820200L, 0x00800200L, 0x80020000L,
-0x00820200L, 0x00020000L, 0x80000200L, 0x00800200L,
-0x80820000L, 0x00000200L, 0x00020200L, 0x80800000L,
-0x80020200L, 0x80000000L, 0x80800000L, 0x00820000L,
-0x80820200L, 0x00020200L, 0x00820000L, 0x80800200L,
-0x00800000L, 0x80000200L, 0x80020000L, 0x00000000L,
-0x00020000L, 0x00800000L, 0x80800200L, 0x00820200L,
-0x80000000L, 0x80820000L, 0x00000200L, 0x80020200L,
-},{
-/* nibble 1 */
-0x10042004L, 0x00000000L, 0x00042000L, 0x10040000L,
-0x10000004L, 0x00002004L, 0x10002000L, 0x00042000L,
-0x00002000L, 0x10040004L, 0x00000004L, 0x10002000L,
-0x00040004L, 0x10042000L, 0x10040000L, 0x00000004L,
-0x00040000L, 0x10002004L, 0x10040004L, 0x00002000L,
-0x00042004L, 0x10000000L, 0x00000000L, 0x00040004L,
-0x10002004L, 0x00042004L, 0x10042000L, 0x10000004L,
-0x10000000L, 0x00040000L, 0x00002004L, 0x10042004L,
-0x00040004L, 0x10042000L, 0x10002000L, 0x00042004L,
-0x10042004L, 0x00040004L, 0x10000004L, 0x00000000L,
-0x10000000L, 0x00002004L, 0x00040000L, 0x10040004L,
-0x00002000L, 0x10000000L, 0x00042004L, 0x10002004L,
-0x10042000L, 0x00002000L, 0x00000000L, 0x10000004L,
-0x00000004L, 0x10042004L, 0x00042000L, 0x10040000L,
-0x10040004L, 0x00040000L, 0x00002004L, 0x10002000L,
-0x10002004L, 0x00000004L, 0x10040000L, 0x00042000L,
-},{
-/* nibble 2 */
-0x41000000L, 0x01010040L, 0x00000040L, 0x41000040L,
-0x40010000L, 0x01000000L, 0x41000040L, 0x00010040L,
-0x01000040L, 0x00010000L, 0x01010000L, 0x40000000L,
-0x41010040L, 0x40000040L, 0x40000000L, 0x41010000L,
-0x00000000L, 0x40010000L, 0x01010040L, 0x00000040L,
-0x40000040L, 0x41010040L, 0x00010000L, 0x41000000L,
-0x41010000L, 0x01000040L, 0x40010040L, 0x01010000L,
-0x00010040L, 0x00000000L, 0x01000000L, 0x40010040L,
-0x01010040L, 0x00000040L, 0x40000000L, 0x00010000L,
-0x40000040L, 0x40010000L, 0x01010000L, 0x41000040L,
-0x00000000L, 0x01010040L, 0x00010040L, 0x41010000L,
-0x40010000L, 0x01000000L, 0x41010040L, 0x40000000L,
-0x40010040L, 0x41000000L, 0x01000000L, 0x41010040L,
-0x00010000L, 0x01000040L, 0x41000040L, 0x00010040L,
-0x01000040L, 0x00000000L, 0x41010000L, 0x40000040L,
-0x41000000L, 0x40010040L, 0x00000040L, 0x01010000L,
-},{
-/* nibble 3 */
-0x00100402L, 0x04000400L, 0x00000002L, 0x04100402L,
-0x00000000L, 0x04100000L, 0x04000402L, 0x00100002L,
-0x04100400L, 0x04000002L, 0x04000000L, 0x00000402L,
-0x04000002L, 0x00100402L, 0x00100000L, 0x04000000L,
-0x04100002L, 0x00100400L, 0x00000400L, 0x00000002L,
-0x00100400L, 0x04000402L, 0x04100000L, 0x00000400L,
-0x00000402L, 0x00000000L, 0x00100002L, 0x04100400L,
-0x04000400L, 0x04100002L, 0x04100402L, 0x00100000L,
-0x04100002L, 0x00000402L, 0x00100000L, 0x04000002L,
-0x00100400L, 0x04000400L, 0x00000002L, 0x04100000L,
-0x04000402L, 0x00000000L, 0x00000400L, 0x00100002L,
-0x00000000L, 0x04100002L, 0x04100400L, 0x00000400L,
-0x04000000L, 0x04100402L, 0x00100402L, 0x00100000L,
-0x04100402L, 0x00000002L, 0x04000400L, 0x00100402L,
-0x00100002L, 0x00100400L, 0x04100000L, 0x04000402L,
-0x00000402L, 0x04000000L, 0x04000002L, 0x04100400L,
-},{
-/* nibble 4 */
-0x02000000L, 0x00004000L, 0x00000100L, 0x02004108L,
-0x02004008L, 0x02000100L, 0x00004108L, 0x02004000L,
-0x00004000L, 0x00000008L, 0x02000008L, 0x00004100L,
-0x02000108L, 0x02004008L, 0x02004100L, 0x00000000L,
-0x00004100L, 0x02000000L, 0x00004008L, 0x00000108L,
-0x02000100L, 0x00004108L, 0x00000000L, 0x02000008L,
-0x00000008L, 0x02000108L, 0x02004108L, 0x00004008L,
-0x02004000L, 0x00000100L, 0x00000108L, 0x02004100L,
-0x02004100L, 0x02000108L, 0x00004008L, 0x02004000L,
-0x00004000L, 0x00000008L, 0x02000008L, 0x02000100L,
-0x02000000L, 0x00004100L, 0x02004108L, 0x00000000L,
-0x00004108L, 0x02000000L, 0x00000100L, 0x00004008L,
-0x02000108L, 0x00000100L, 0x00000000L, 0x02004108L,
-0x02004008L, 0x02004100L, 0x00000108L, 0x00004000L,
-0x00004100L, 0x02004008L, 0x02000100L, 0x00000108L,
-0x00000008L, 0x00004108L, 0x02004000L, 0x02000008L,
-},{
-/* nibble 5 */
-0x20000010L, 0x00080010L, 0x00000000L, 0x20080800L,
-0x00080010L, 0x00000800L, 0x20000810L, 0x00080000L,
-0x00000810L, 0x20080810L, 0x00080800L, 0x20000000L,
-0x20000800L, 0x20000010L, 0x20080000L, 0x00080810L,
-0x00080000L, 0x20000810L, 0x20080010L, 0x00000000L,
-0x00000800L, 0x00000010L, 0x20080800L, 0x20080010L,
-0x20080810L, 0x20080000L, 0x20000000L, 0x00000810L,
-0x00000010L, 0x00080800L, 0x00080810L, 0x20000800L,
-0x00000810L, 0x20000000L, 0x20000800L, 0x00080810L,
-0x20080800L, 0x00080010L, 0x00000000L, 0x20000800L,
-0x20000000L, 0x00000800L, 0x20080010L, 0x00080000L,
-0x00080010L, 0x20080810L, 0x00080800L, 0x00000010L,
-0x20080810L, 0x00080800L, 0x00080000L, 0x20000810L,
-0x20000010L, 0x20080000L, 0x00080810L, 0x00000000L,
-0x00000800L, 0x20000010L, 0x20000810L, 0x20080800L,
-0x20080000L, 0x00000810L, 0x00000010L, 0x20080010L,
-},{
-/* nibble 6 */
-0x00001000L, 0x00000080L, 0x00400080L, 0x00400001L,
-0x00401081L, 0x00001001L, 0x00001080L, 0x00000000L,
-0x00400000L, 0x00400081L, 0x00000081L, 0x00401000L,
-0x00000001L, 0x00401080L, 0x00401000L, 0x00000081L,
-0x00400081L, 0x00001000L, 0x00001001L, 0x00401081L,
-0x00000000L, 0x00400080L, 0x00400001L, 0x00001080L,
-0x00401001L, 0x00001081L, 0x00401080L, 0x00000001L,
-0x00001081L, 0x00401001L, 0x00000080L, 0x00400000L,
-0x00001081L, 0x00401000L, 0x00401001L, 0x00000081L,
-0x00001000L, 0x00000080L, 0x00400000L, 0x00401001L,
-0x00400081L, 0x00001081L, 0x00001080L, 0x00000000L,
-0x00000080L, 0x00400001L, 0x00000001L, 0x00400080L,
-0x00000000L, 0x00400081L, 0x00400080L, 0x00001080L,
-0x00000081L, 0x00001000L, 0x00401081L, 0x00400000L,
-0x00401080L, 0x00000001L, 0x00001001L, 0x00401081L,
-0x00400001L, 0x00401080L, 0x00401000L, 0x00001001L,
-},{
-/* nibble 7 */
-0x08200020L, 0x08208000L, 0x00008020L, 0x00000000L,
-0x08008000L, 0x00200020L, 0x08200000L, 0x08208020L,
-0x00000020L, 0x08000000L, 0x00208000L, 0x00008020L,
-0x00208020L, 0x08008020L, 0x08000020L, 0x08200000L,
-0x00008000L, 0x00208020L, 0x00200020L, 0x08008000L,
-0x08208020L, 0x08000020L, 0x00000000L, 0x00208000L,
-0x08000000L, 0x00200000L, 0x08008020L, 0x08200020L,
-0x00200000L, 0x00008000L, 0x08208000L, 0x00000020L,
-0x00200000L, 0x00008000L, 0x08000020L, 0x08208020L,
-0x00008020L, 0x08000000L, 0x00000000L, 0x00208000L,
-0x08200020L, 0x08008020L, 0x08008000L, 0x00200020L,
-0x08208000L, 0x00000020L, 0x00200020L, 0x08008000L,
-0x08208020L, 0x00200000L, 0x08200000L, 0x08000020L,
-0x00208000L, 0x00008020L, 0x08008020L, 0x08200000L,
-0x00000020L, 0x08208000L, 0x00208020L, 0x00000000L,
-0x08000000L, 0x08200020L, 0x00008000L, 0x00208020L}};
-static const DES_LONG skb[8][64]={
-{
-/* for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
-0x00000000L,0x00000010L,0x20000000L,0x20000010L,
-0x00010000L,0x00010010L,0x20010000L,0x20010010L,
-0x00000800L,0x00000810L,0x20000800L,0x20000810L,
-0x00010800L,0x00010810L,0x20010800L,0x20010810L,
-0x00000020L,0x00000030L,0x20000020L,0x20000030L,
-0x00010020L,0x00010030L,0x20010020L,0x20010030L,
-0x00000820L,0x00000830L,0x20000820L,0x20000830L,
-0x00010820L,0x00010830L,0x20010820L,0x20010830L,
-0x00080000L,0x00080010L,0x20080000L,0x20080010L,
-0x00090000L,0x00090010L,0x20090000L,0x20090010L,
-0x00080800L,0x00080810L,0x20080800L,0x20080810L,
-0x00090800L,0x00090810L,0x20090800L,0x20090810L,
-0x00080020L,0x00080030L,0x20080020L,0x20080030L,
-0x00090020L,0x00090030L,0x20090020L,0x20090030L,
-0x00080820L,0x00080830L,0x20080820L,0x20080830L,
-0x00090820L,0x00090830L,0x20090820L,0x20090830L,
-},{
-/* for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 */
-0x00000000L,0x02000000L,0x00002000L,0x02002000L,
-0x00200000L,0x02200000L,0x00202000L,0x02202000L,
-0x00000004L,0x02000004L,0x00002004L,0x02002004L,
-0x00200004L,0x02200004L,0x00202004L,0x02202004L,
-0x00000400L,0x02000400L,0x00002400L,0x02002400L,
-0x00200400L,0x02200400L,0x00202400L,0x02202400L,
-0x00000404L,0x02000404L,0x00002404L,0x02002404L,
-0x00200404L,0x02200404L,0x00202404L,0x02202404L,
-0x10000000L,0x12000000L,0x10002000L,0x12002000L,
-0x10200000L,0x12200000L,0x10202000L,0x12202000L,
-0x10000004L,0x12000004L,0x10002004L,0x12002004L,
-0x10200004L,0x12200004L,0x10202004L,0x12202004L,
-0x10000400L,0x12000400L,0x10002400L,0x12002400L,
-0x10200400L,0x12200400L,0x10202400L,0x12202400L,
-0x10000404L,0x12000404L,0x10002404L,0x12002404L,
-0x10200404L,0x12200404L,0x10202404L,0x12202404L,
-},{
-/* for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 */
-0x00000000L,0x00000001L,0x00040000L,0x00040001L,
-0x01000000L,0x01000001L,0x01040000L,0x01040001L,
-0x00000002L,0x00000003L,0x00040002L,0x00040003L,
-0x01000002L,0x01000003L,0x01040002L,0x01040003L,
-0x00000200L,0x00000201L,0x00040200L,0x00040201L,
-0x01000200L,0x01000201L,0x01040200L,0x01040201L,
-0x00000202L,0x00000203L,0x00040202L,0x00040203L,
-0x01000202L,0x01000203L,0x01040202L,0x01040203L,
-0x08000000L,0x08000001L,0x08040000L,0x08040001L,
-0x09000000L,0x09000001L,0x09040000L,0x09040001L,
-0x08000002L,0x08000003L,0x08040002L,0x08040003L,
-0x09000002L,0x09000003L,0x09040002L,0x09040003L,
-0x08000200L,0x08000201L,0x08040200L,0x08040201L,
-0x09000200L,0x09000201L,0x09040200L,0x09040201L,
-0x08000202L,0x08000203L,0x08040202L,0x08040203L,
-0x09000202L,0x09000203L,0x09040202L,0x09040203L,
-},{
-/* for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 */
-0x00000000L,0x00100000L,0x00000100L,0x00100100L,
-0x00000008L,0x00100008L,0x00000108L,0x00100108L,
-0x00001000L,0x00101000L,0x00001100L,0x00101100L,
-0x00001008L,0x00101008L,0x00001108L,0x00101108L,
-0x04000000L,0x04100000L,0x04000100L,0x04100100L,
-0x04000008L,0x04100008L,0x04000108L,0x04100108L,
-0x04001000L,0x04101000L,0x04001100L,0x04101100L,
-0x04001008L,0x04101008L,0x04001108L,0x04101108L,
-0x00020000L,0x00120000L,0x00020100L,0x00120100L,
-0x00020008L,0x00120008L,0x00020108L,0x00120108L,
-0x00021000L,0x00121000L,0x00021100L,0x00121100L,
-0x00021008L,0x00121008L,0x00021108L,0x00121108L,
-0x04020000L,0x04120000L,0x04020100L,0x04120100L,
-0x04020008L,0x04120008L,0x04020108L,0x04120108L,
-0x04021000L,0x04121000L,0x04021100L,0x04121100L,
-0x04021008L,0x04121008L,0x04021108L,0x04121108L,
-},{
-/* for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
-0x00000000L,0x10000000L,0x00010000L,0x10010000L,
-0x00000004L,0x10000004L,0x00010004L,0x10010004L,
-0x20000000L,0x30000000L,0x20010000L,0x30010000L,
-0x20000004L,0x30000004L,0x20010004L,0x30010004L,
-0x00100000L,0x10100000L,0x00110000L,0x10110000L,
-0x00100004L,0x10100004L,0x00110004L,0x10110004L,
-0x20100000L,0x30100000L,0x20110000L,0x30110000L,
-0x20100004L,0x30100004L,0x20110004L,0x30110004L,
-0x00001000L,0x10001000L,0x00011000L,0x10011000L,
-0x00001004L,0x10001004L,0x00011004L,0x10011004L,
-0x20001000L,0x30001000L,0x20011000L,0x30011000L,
-0x20001004L,0x30001004L,0x20011004L,0x30011004L,
-0x00101000L,0x10101000L,0x00111000L,0x10111000L,
-0x00101004L,0x10101004L,0x00111004L,0x10111004L,
-0x20101000L,0x30101000L,0x20111000L,0x30111000L,
-0x20101004L,0x30101004L,0x20111004L,0x30111004L,
-},{
-/* for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 */
-0x00000000L,0x08000000L,0x00000008L,0x08000008L,
-0x00000400L,0x08000400L,0x00000408L,0x08000408L,
-0x00020000L,0x08020000L,0x00020008L,0x08020008L,
-0x00020400L,0x08020400L,0x00020408L,0x08020408L,
-0x00000001L,0x08000001L,0x00000009L,0x08000009L,
-0x00000401L,0x08000401L,0x00000409L,0x08000409L,
-0x00020001L,0x08020001L,0x00020009L,0x08020009L,
-0x00020401L,0x08020401L,0x00020409L,0x08020409L,
-0x02000000L,0x0A000000L,0x02000008L,0x0A000008L,
-0x02000400L,0x0A000400L,0x02000408L,0x0A000408L,
-0x02020000L,0x0A020000L,0x02020008L,0x0A020008L,
-0x02020400L,0x0A020400L,0x02020408L,0x0A020408L,
-0x02000001L,0x0A000001L,0x02000009L,0x0A000009L,
-0x02000401L,0x0A000401L,0x02000409L,0x0A000409L,
-0x02020001L,0x0A020001L,0x02020009L,0x0A020009L,
-0x02020401L,0x0A020401L,0x02020409L,0x0A020409L,
-},{
-/* for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 */
-0x00000000L,0x00000100L,0x00080000L,0x00080100L,
-0x01000000L,0x01000100L,0x01080000L,0x01080100L,
-0x00000010L,0x00000110L,0x00080010L,0x00080110L,
-0x01000010L,0x01000110L,0x01080010L,0x01080110L,
-0x00200000L,0x00200100L,0x00280000L,0x00280100L,
-0x01200000L,0x01200100L,0x01280000L,0x01280100L,
-0x00200010L,0x00200110L,0x00280010L,0x00280110L,
-0x01200010L,0x01200110L,0x01280010L,0x01280110L,
-0x00000200L,0x00000300L,0x00080200L,0x00080300L,
-0x01000200L,0x01000300L,0x01080200L,0x01080300L,
-0x00000210L,0x00000310L,0x00080210L,0x00080310L,
-0x01000210L,0x01000310L,0x01080210L,0x01080310L,
-0x00200200L,0x00200300L,0x00280200L,0x00280300L,
-0x01200200L,0x01200300L,0x01280200L,0x01280300L,
-0x00200210L,0x00200310L,0x00280210L,0x00280310L,
-0x01200210L,0x01200310L,0x01280210L,0x01280310L,
-},{
-/* for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 */
-0x00000000L,0x04000000L,0x00040000L,0x04040000L,
-0x00000002L,0x04000002L,0x00040002L,0x04040002L,
-0x00002000L,0x04002000L,0x00042000L,0x04042000L,
-0x00002002L,0x04002002L,0x00042002L,0x04042002L,
-0x00000020L,0x04000020L,0x00040020L,0x04040020L,
-0x00000022L,0x04000022L,0x00040022L,0x04040022L,
-0x00002020L,0x04002020L,0x00042020L,0x04042020L,
-0x00002022L,0x04002022L,0x00042022L,0x04042022L,
-0x00000800L,0x04000800L,0x00040800L,0x04040800L,
-0x00000802L,0x04000802L,0x00040802L,0x04040802L,
-0x00002800L,0x04002800L,0x00042800L,0x04042800L,
-0x00002802L,0x04002802L,0x00042802L,0x04042802L,
-0x00000820L,0x04000820L,0x00040820L,0x04040820L,
-0x00000822L,0x04000822L,0x00040822L,0x04040822L,
-0x00002820L,0x04002820L,0x00042820L,0x04042820L,
-0x00002822L,0x04002822L,0x00042822L,0x04042822L,
-} };
-
-/* See ecb_encrypt.c for a pseudo description of these macros. */
-#define PERM_OP(a,b,t,n,m) ((t)=((((a)>>(n))^(b))&(m)),\
-	(b)^=(t),\
-	(a)^=((t)<<(n)))
-
-#define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\
-	(a)=(a)^(t)^(t>>(16-(n))))\
-
-#endif 
-
-#ifndef NOPROTO
-static int body(DES_LONG *out0, DES_LONG *out1,
-	des_key_schedule ks, DES_LONG Eswap0, DES_LONG Eswap1);
-#ifndef HEADER_DES_LOCL_H
-static int fcrypt_set_key(des_cblock (*key), des_key_schedule schedule);
-#endif
-
-#else
-
-static int body();
-#ifndef HEADER_DES_LOCL_H
-static int fcrypt_set_key();
-#endif
-#endif
-
-#ifdef HEADER_DES_LOCL_H
-#define fcrypt_set_key(a,b)	des_set_key(a,b)
-#else
-static int fcrypt_set_key(key, schedule)
-des_cblock (*key);
-des_key_schedule schedule;
-	{
-	static const int shifts2[16]={0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0};
-	register DES_LONG c,d,t,s;
-	register unsigned char *in;
-	register DES_LONG *k;
-	register int i;
-
-	k=(DES_LONG *)schedule;
-	in=(unsigned char *)key;
-
-	c2l(in,c);
-	c2l(in,d);
-
-	/* I now do it in 47 simple operations :-)
-	 * Thanks to John Fletcher (john_fletcher@lccmail.ocf.llnl.gov)
-	 * for the inspiration. :-) */
-	PERM_OP (d,c,t,4,0x0f0f0f0fL);
-	HPERM_OP(c,t,-2,0xcccc0000L);
-	HPERM_OP(d,t,-2,0xcccc0000L);
-	PERM_OP (d,c,t,1,0x55555555L);
-	PERM_OP (c,d,t,8,0x00ff00ffL);
-	PERM_OP (d,c,t,1,0x55555555L);
-	d=	(((d&0x000000ffL)<<16)| (d&0x0000ff00L)     |
-		 ((d&0x00ff0000L)>>16)|((c&0xf0000000L)>>4));
-	c&=0x0fffffffL;
-
-	for (i=0; i<ITERATIONS; i++)
-		{
-		if (shifts2[i])
-			{ c=((c>>2)|(c<<26)); d=((d>>2)|(d<<26)); }
-		else
-			{ c=((c>>1)|(c<<27)); d=((d>>1)|(d<<27)); }
-		c&=0x0fffffffL;
-		d&=0x0fffffffL;
-		/* could be a few less shifts but I am to lazy at this
-		 * point in time to investigate */
-		s=	skb[0][ (c     )&0x3f                 ]|
-			skb[1][((c>> 6L)&0x03)|((c>> 7L)&0x3c)]|
-			skb[2][((c>>13L)&0x0f)|((c>>14L)&0x30)]|
-			skb[3][((c>>20L)&0x01)|((c>>21L)&0x06) |
-					       ((c>>22L)&0x38)];
-		t=	skb[4][ (d     )&0x3f                 ]|
-			skb[5][((d>> 7L)&0x03)|((d>> 8L)&0x3c)]|
-			skb[6][ (d>>15L)&0x3f                 ]|
-			skb[7][((d>>21L)&0x0f)|((d>>22L)&0x30)];
-
-		/* table contained 0213 4657 */
-		*(k++)=((t<<16)|(s&0x0000ffffL))&0xffffffffL;
-		s=     ((s>>16)|(t&0xffff0000L));
-		
-		s=(s<<4)|(s>>28);
-		*(k++)=s&0xffffffffL;
-		}
-	return(0);
-	}
-#endif
-
-/******************************************************************
- * modified stuff for crypt.
- ******************************************************************/
-
-/* The changes to this macro may help or hinder, depending on the
- * compiler and the achitecture.  gcc2 always seems to do well :-). 
- * Inspired by Dana How <how@isl.stanford.edu>
- * DO NOT use the alternative version on machines with 8 byte longs.
- */
-#ifdef DES_PTR
-#define CR_ENCRYPT(L,R,S) \
-	t=(R^(R>>16)); \
-	u=(t&E0); \
-	t=(t&E1); \
-	u=((u^(u<<16))^R^s[S  ])<<2; \
-	t=(t^(t<<16))^R^s[S+1]; \
-	t=(t>>2)|(t<<30); \
-	L^= \
-	*(DES_LONG *)((unsigned char *)des_SP+0x0100+((t    )&0xfc))+ \
-	*(DES_LONG *)((unsigned char *)des_SP+0x0300+((t>> 8)&0xfc))+ \
-	*(DES_LONG *)((unsigned char *)des_SP+0x0500+((t>>16)&0xfc))+ \
-	*(DES_LONG *)((unsigned char *)des_SP+0x0700+((t>>24)&0xfc))+ \
-	*(DES_LONG *)((unsigned char *)des_SP+       ((u    )&0xfc))+ \
-  	*(DES_LONG *)((unsigned char *)des_SP+0x0200+((u>> 8)&0xfc))+ \
-  	*(DES_LONG *)((unsigned char *)des_SP+0x0400+((u>>16)&0xfc))+ \
- 	*(DES_LONG *)((unsigned char *)des_SP+0x0600+((u>>24)&0xfc));
-#else /* original version */
-#define CR_ENCRYPT(L,R,S)	\
-	t=(R^(R>>16)); \
-	u=(t&E0); \
-	t=(t&E1); \
-	u=(u^(u<<16))^R^s[S  ]; \
-	t=(t^(t<<16))^R^s[S+1]; \
-	t=(t>>4)|(t<<28); \
-	L^=	des_SPtrans[1][(t    )&0x3f]| \
-		des_SPtrans[3][(t>> 8)&0x3f]| \
-		des_SPtrans[5][(t>>16)&0x3f]| \
-		des_SPtrans[7][(t>>24)&0x3f]| \
-		des_SPtrans[0][(u    )&0x3f]| \
-		des_SPtrans[2][(u>> 8)&0x3f]| \
-		des_SPtrans[4][(u>>16)&0x3f]| \
-		des_SPtrans[6][(u>>24)&0x3f];
-#endif
-
-/* Added more values to handle illegal salt values the way normal
- * crypt() implementations do.  The patch was sent by 
- * Bjorn Gronvall <bg@sics.se>
- */
-static unsigned const char con_salt[128]={
-0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,
-0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,0xE0,0xE1,
-0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,
-0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,
-0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,
-0xFA,0xFB,0xFC,0xFD,0xFE,0xFF,0x00,0x01,
-0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,
-0x0A,0x0B,0x05,0x06,0x07,0x08,0x09,0x0A,
-0x0B,0x0C,0x0D,0x0E,0x0F,0x10,0x11,0x12,
-0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,
-0x1B,0x1C,0x1D,0x1E,0x1F,0x20,0x21,0x22,
-0x23,0x24,0x25,0x20,0x21,0x22,0x23,0x24,
-0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,
-0x2D,0x2E,0x2F,0x30,0x31,0x32,0x33,0x34,
-0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,
-0x3D,0x3E,0x3F,0x40,0x41,0x42,0x43,0x44,
-};
-
-static unsigned const char cov_2char[64]={
-0x2E,0x2F,0x30,0x31,0x32,0x33,0x34,0x35,
-0x36,0x37,0x38,0x39,0x41,0x42,0x43,0x44,
-0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,
-0x4D,0x4E,0x4F,0x50,0x51,0x52,0x53,0x54,
-0x55,0x56,0x57,0x58,0x59,0x5A,0x61,0x62,
-0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,
-0x6B,0x6C,0x6D,0x6E,0x6F,0x70,0x71,0x72,
-0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A
-};
-
-#ifndef NOPROTO
-#ifdef PERL5
-char *des_crypt(char *buf,char *salt);
-#else
-char *crypt(const char *buf,const char *salt);
-#endif
-#else
-#ifdef PERL5
-char *des_crypt();
-#else
-char *crypt();
-#endif
-#endif
-
-#ifdef PERL5
-char *des_crypt(buf,salt)
-#else
-char *crypt(buf,salt)
-#endif
-const char *buf;
-const char *salt;
-	{
-	unsigned int i,j,x,y;
-	DES_LONG Eswap0,Eswap1;
-	DES_LONG out[2],ll;
-	des_cblock key;
-	des_key_schedule ks;
-	static unsigned char buff[20];
-	unsigned char bb[9];
-	unsigned char *b=bb;
-	unsigned char c,u;
-
-	/* eay 25/08/92
-	 * If you call crypt("pwd","*") as often happens when you
-	 * have * as the pwd field in /etc/passwd, the function
-	 * returns *\0XXXXXXXXX
-	 * The \0 makes the string look like * so the pwd "*" would
-	 * crypt to "*".  This was found when replacing the crypt in
-	 * our shared libraries.  People found that the disbled
-	 * accounts effectivly had no passwd :-(. */
-	x=buff[0]=((salt[0] == '\0')?'A':salt[0]);
-	Eswap0=con_salt[x];
-	x=buff[1]=((salt[1] == '\0')?'A':salt[1]);
-	Eswap1=con_salt[x]<<4;
-
-	for (i=0; i<8; i++)
-		{
-		c= *(buf++);
-		if (!c) break;
-		key[i]=(c<<1);
-		}
-	for (; i<8; i++)
-		key[i]=0;
-
-	fcrypt_set_key((des_cblock *)(key),ks);
-	body(&(out[0]),&(out[1]),ks,Eswap0,Eswap1);
-
-	ll=out[0]; l2c(ll,b);
-	ll=out[1]; l2c(ll,b);
-	y=0;
-	u=0x80;
-	bb[8]=0;
-	for (i=2; i<13; i++)
-		{
-		c=0;
-		for (j=0; j<6; j++)
-			{
-			c<<=1;
-			if (bb[y] & u) c|=1;
-			u>>=1;
-			if (!u)
-				{
-				y++;
-				u=0x80;
-				}
-			}
-		buff[i]=cov_2char[c];
-		}
-	buff[13]='\0';
-	return((char *)buff);
-	}
-
-static int body(out0, out1, ks, Eswap0, Eswap1)
-DES_LONG *out0;
-DES_LONG *out1;
-des_key_schedule ks;
-DES_LONG Eswap0;
-DES_LONG Eswap1;
-	{
-	register DES_LONG l,r,t,u;
-#ifdef DES_PTR
-	register unsigned char *des_SP=(unsigned char *)des_SPtrans;
-#endif
-	register DES_LONG *s;
-	register int i,j;
-	register DES_LONG E0,E1;
-
-	l=0;
-	r=0;
-
-	s=(DES_LONG *)ks;
-	E0=Eswap0;
-	E1=Eswap1;
-
-	for (j=0; j<25; j++)
-		{
-		for (i=0; i<(ITERATIONS*2); i+=4)
-			{
-			CR_ENCRYPT(l,r,  i);	/*  1 */
-			CR_ENCRYPT(r,l,  i+2);	/*  2 */
-			}
-		t=l;
-		l=r;
-		r=t;
-		}
-	t=r;
-	r=(l>>1L)|(l<<31L);
-	l=(t>>1L)|(t<<31L);
-	/* clear the top bits on machines with 8byte longs */
-	l&=0xffffffffL;
-	r&=0xffffffffL;
-
-	PERM_OP(r,l,t, 1,0x55555555L);
-	PERM_OP(l,r,t, 8,0x00ff00ffL);
-	PERM_OP(r,l,t, 2,0x33333333L);
-	PERM_OP(l,r,t,16,0x0000ffffL);
-	PERM_OP(r,l,t, 4,0x0f0f0f0fL);
-
-	*out0=l;
-	*out1=r;
-	return(0);
-	}
-
diff --git a/secure/lib/libdes/makefile.bc b/secure/lib/libdes/makefile.bc
deleted file mode 100644
index 1fe6d4915a91..000000000000
--- a/secure/lib/libdes/makefile.bc
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Origional BC Makefile from Teun <Teun.Nijssen@kub.nl>
-#
-#
-CC      = bcc
-TLIB    = tlib /0 /C
-# note: the -3 flag produces code for 386, 486, Pentium etc; omit it for 286s
-OPTIMIZE= -3 -O2
-#WINDOWS= -W
-CFLAGS  = -c -ml -d $(OPTIMIZE) $(WINDOWS) -DMSDOS
-LFLAGS  = -ml $(WINDOWS)
-
-.c.obj:
-	$(CC) $(CFLAGS) $*.c
-
-.obj.exe:
-	$(CC) $(LFLAGS) -e$*.exe $*.obj libdes.lib  
-
-all: $(LIB) destest.exe rpw.exe des.exe speed.exe
-
-# "make clean": use a directory containing only libdes .exe and .obj files...
-clean:
-	del *.exe
-	del *.obj
-	del libdes.lib
-	del libdes.rsp
-
-OBJS=   cbc_cksm.obj cbc_enc.obj  ecb_enc.obj  pcbc_enc.obj \
-	qud_cksm.obj rand_key.obj set_key.obj  str2key.obj \
-	enc_read.obj enc_writ.obj fcrypt.obj   cfb_enc.obj \
-	ecb3_enc.obj ofb_enc.obj  cbc3_enc.obj read_pwd.obj\
-	cfb64enc.obj ofb64enc.obj ede_enc.obj  cfb64ede.obj\
-	ofb64ede.obj supp.obj
-
-LIB=    libdes.lib
-
-$(LIB): $(OBJS)
-	del $(LIB)
-	makersp "+%s &\n" &&|
-	$(OBJS)
-|       >libdes.rsp
-	$(TLIB) libdes.lib @libdes.rsp,nul
-	del libdes.rsp
-
-destest.exe: destest.obj libdes.lib
-rpw.exe:     rpw.obj libdes.lib
-speed.exe:   speed.obj libdes.lib
-des.exe:     des.obj libdes.lib
-
-
diff --git a/secure/lib/libdes/ncbc_enc.c b/secure/lib/libdes/ncbc_enc.c
deleted file mode 100644
index 4595dcb89151..000000000000
--- a/secure/lib/libdes/ncbc_enc.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* crypto/des/ncbc_enc.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include "des_locl.h"
-
-void des_ncbc_encrypt(input, output, length, schedule, ivec, encrypt)
-des_cblock (*input);
-des_cblock (*output);
-long length;
-des_key_schedule schedule;
-des_cblock (*ivec);
-int encrypt;
-	{
-	register DES_LONG tin0,tin1;
-	register DES_LONG tout0,tout1,xor0,xor1;
-	register unsigned char *in,*out;
-	register long l=length;
-	DES_LONG tin[2];
-	unsigned char *iv;
-
-	in=(unsigned char *)input;
-	out=(unsigned char *)output;
-	iv=(unsigned char *)ivec;
-
-	if (encrypt)
-		{
-		c2l(iv,tout0);
-		c2l(iv,tout1);
-		for (; l>0; l-=8)
-			{
-			if (l >= 8)
-				{
-				c2l(in,tin0);
-				c2l(in,tin1);
-				}
-			else
-				c2ln(in,tin0,tin1,l);
-			tin0^=tout0; tin[0]=tin0;
-			tin1^=tout1; tin[1]=tin1;
-			des_encrypt((DES_LONG *)tin,schedule,DES_ENCRYPT);
-			tout0=tin[0]; l2c(tout0,out);
-			tout1=tin[1]; l2c(tout1,out);
-			}
-		iv=(unsigned char *)ivec;
-		l2c(tout0,iv);
-		l2c(tout1,iv);
-		}
-	else
-		{
-		c2l(iv,xor0);
-		c2l(iv,xor1);
-		for (; l>0; l-=8)
-			{
-			c2l(in,tin0); tin[0]=tin0;
-			c2l(in,tin1); tin[1]=tin1;
-			des_encrypt((DES_LONG *)tin,schedule,DES_DECRYPT);
-			tout0=tin[0]^xor0;
-			tout1=tin[1]^xor1;
-			if (l >= 8)
-				{
-				l2c(tout0,out);
-				l2c(tout1,out);
-				}
-			else
-				l2cn(tout0,tout1,out,l);
-			xor0=tin0;
-			xor1=tin1;
-			}
-		iv=(unsigned char *)ivec;
-		l2c(xor0,iv);
-		l2c(xor1,iv);
-		}
-	tin0=tin1=tout0=tout1=xor0=xor1=0;
-	tin[0]=tin[1]=0;
-	}
-
diff --git a/secure/lib/libdes/new_rkey.c b/secure/lib/libdes/new_rkey.c
deleted file mode 100644
index 3435df194092..000000000000
--- a/secure/lib/libdes/new_rkey.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/* crypto/des/new_rkey.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/*
- * Copyright (c) 1995
- *	Mark Murray.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Mark Murray
- *	and Eric Young
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY MARK MURRAY AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-/* 21-Nov-95 - eay - I've finally put this into libdes, I have made a
- * few changes since it need to compile on all version of unix and
- * there were a few things that would not :-) */
-
-#include <fcntl.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/time.h>
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <machine/types.h>
-
-#include "des_locl.h"
-
-/* This counter keeps track of the pseudo-random sequence */
-static union {
-	DES_LONG ul0, ul1;
-	unsigned char uc[8];
-} counter;
-
-/* The current encryption schedule */
-static des_key_schedule current_key;
-
-/*
- *   des_set_random_generator_seed: starts a new pseudorandom sequence
- *                                  dependant on the supplied key
- */
-void
-des_set_random_generator_seed(new_key)
-	des_cblock *new_key;
-{
-	des_key_sched(new_key, current_key);
-
-	/* reset the counter */
-	counter.ul0 = counter.ul1 = 0;
-}
-
-/*
- *   des_set_sequence_number: set the counter to a known value
- */
-void
-des_set_sequence_number(new_counter)
-	des_cblock new_counter;
-{
-	memcpy((char *)counter.uc,(char *)new_counter,sizeof(counter));
-}
-
-/*
- *   des_generate_random_block: returns the next 64 bit random number
- */
-
-void des_generate_random_block(random_block)
-	des_cblock *random_block;
-{
-	/* Encrypt the counter to get pseudo-random numbers */
-    	des_ecb_encrypt(&counter.uc, random_block, current_key, DES_ENCRYPT);
-
-	/* increment the 64-bit counter 
-	 * (or that could be a 128 bit counter on a 64 bit box - eay */
-	if (!++counter.ul0) counter.ul1++;
-}
-
-/*
- *   des_new_random_key: Invents a new, random strong key with odd parity.
- */
-int 
-des_new_random_key(new_key)
-	des_cblock *new_key;
-{
-	do {
-		des_generate_random_block(new_key);
-		des_set_odd_parity(new_key);
-	} while (des_is_weak_key(new_key));
-	return(0);
-}
-
-/*
- *   des_init_random_number_generator: intialises the random number generator
- *                                     to a truly nasty sequence using system
- *                                     supplied volatile variables.
- */
-void
-des_init_random_number_generator(key)
-	des_cblock *key;
-{
-	/* 64-bit structures */
-	struct {
-		u_int32_t pid;
-		u_int32_t hostid;
-	} sysblock;
-	struct timeval timeblock;
-	struct {
-		u_int32_t tv_sec;
-		u_int32_t tv_usec;
-	} time64bit;
-	u_int32_t devrandom[2];
-	des_cblock new_key;
-	int mib[2];
-	size_t len;
-	int dr;
-
-	/* Get host ID using official BSD 4.4 method */
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_HOSTID;
-	len = sizeof(sysblock.hostid);
-	sysctl(mib, 2, &sysblock.hostid, &len, NULL, 0);
-
-	/* Get Process ID */
-	sysblock.pid = getpid();
-
-	/* Generate a new key, and use it to seed the random generator */
-	des_set_random_generator_seed(key);
-	des_set_sequence_number((unsigned char *)&sysblock);
-	des_new_random_key(&new_key);
-	des_set_random_generator_seed(&new_key);
-
-	/* Try to confuse the sequence counter */
-	gettimeofday(&timeblock, NULL);
-	time64bit.tv_sec = (u_int32_t)timeblock.tv_sec;
-	time64bit.tv_usec = (u_int32_t)timeblock.tv_usec;
-	/* If /dev/random is available, read some muck */
-	dr = open("/dev/random", O_RDONLY);
-	if (dr >= 0) {
-		/* Set the descriptor into non-blocking mode. */
-		fcntl(dr, F_SETFL, O_NONBLOCK);
-		len = read(dr, devrandom, sizeof(devrandom));
-		close(dr);
-		if (len > 0) {
-			time64bit.tv_sec ^= devrandom[0];
-			time64bit.tv_usec ^= devrandom[1];
-		}
-#ifdef DEBUG
-		printf("DEBUG: read from /dev/random %d %x %x\n",
-			len, devrandom[0], devrandom[1]);
-#endif
-	}
-#ifdef DEBUG
-	else printf("Cannot open /dev/random\n");
-#endif
-	des_set_sequence_number((unsigned char *)&time64bit);
-
-	/* Do the work */
-	des_new_random_key(&new_key);
-	des_set_random_generator_seed(&new_key);
-}
diff --git a/secure/lib/libdes/ofb64ede.c b/secure/lib/libdes/ofb64ede.c
deleted file mode 100644
index 2bcb0d8986f5..000000000000
--- a/secure/lib/libdes/ofb64ede.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/* crypto/des/ofb64ede.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include "des_locl.h"
-
-/* The input and output encrypted as though 64bit ofb mode is being
- * used.  The extra state information to record how much of the
- * 64bit block we have used is contained in *num;
- */
-void des_ede3_ofb64_encrypt(in, out, length, k1,k2,k3, ivec, num)
-register unsigned char *in;
-register unsigned char *out;
-long length;
-des_key_schedule k1,k2,k3;
-des_cblock (*ivec);
-int *num;
-	{
-	register DES_LONG v0,v1;
-	register int n= *num;
-	register long l=length;
-	des_cblock d;
-	register char *dp;
-	DES_LONG ti[2];
-	unsigned char *iv;
-	int save=0;
-
-	iv=(unsigned char *)ivec;
-	c2l(iv,v0);
-	c2l(iv,v1);
-	ti[0]=v0;
-	ti[1]=v1;
-	dp=(char *)d;
-	l2c(v0,dp);
-	l2c(v1,dp);
-	while (l--)
-		{
-		if (n == 0)
-			{
-			IP(v0,v1);
-
-			ti[0]=v0;
-			ti[1]=v1;
-			des_encrypt2((DES_LONG *)ti,k1,DES_ENCRYPT);
-			des_encrypt2((DES_LONG *)ti,k2,DES_DECRYPT);
-			des_encrypt2((DES_LONG *)ti,k3,DES_ENCRYPT);
-			v0=ti[0];
-			v1=ti[1];
-
-			FP(v1,v0);
-
-			dp=(char *)d;
-			l2c(v0,dp);
-			l2c(v1,dp);
-			save++;
-			}
-		*(out++)= *(in++)^d[n];
-		n=(n+1)&0x07;
-		}
-	if (save)
-		{
-/*		v0=ti[0];
-		v1=ti[1];*/
-		iv=(unsigned char *)ivec;
-		l2c(v0,iv);
-		l2c(v1,iv);
-		}
-	v0=v1=ti[0]=ti[1]=0;
-	*num=n;
-	}
-
-#ifdef undef /* MACRO */
-void des_ede2_ofb64_encrypt(in, out, length, k1,k2, ivec, num)
-register unsigned char *in;
-register unsigned char *out;
-long length;
-des_key_schedule k1,k2;
-des_cblock (*ivec);
-int *num;
-	{
-	des_ede3_ofb64_encrypt(in, out, length, k1,k2,k1, ivec, num);
-	}
-#endif
diff --git a/secure/lib/libdes/ofb64enc.c b/secure/lib/libdes/ofb64enc.c
deleted file mode 100644
index d3fa6c5cf18f..000000000000
--- a/secure/lib/libdes/ofb64enc.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/* crypto/des/ofb64enc.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include "des_locl.h"
-
-/* The input and output encrypted as though 64bit ofb mode is being
- * used.  The extra state information to record how much of the
- * 64bit block we have used is contained in *num;
- */
-void des_ofb64_encrypt(in, out, length, schedule, ivec, num)
-register unsigned char *in;
-register unsigned char *out;
-long length;
-des_key_schedule schedule;
-des_cblock (*ivec);
-int *num;
-	{
-	register DES_LONG v0,v1,t;
-	register int n= *num;
-	register long l=length;
-	des_cblock d;
-	register char *dp;
-	DES_LONG ti[2];
-	unsigned char *iv;
-	int save=0;
-
-	iv=(unsigned char *)ivec;
-	c2l(iv,v0);
-	c2l(iv,v1);
-	ti[0]=v0;
-	ti[1]=v1;
-	dp=(char *)d;
-	l2c(v0,dp);
-	l2c(v1,dp);
-	while (l--)
-		{
-		if (n == 0)
-			{
-			des_encrypt((DES_LONG *)ti,schedule,DES_ENCRYPT);
-			dp=(char *)d;
-			t=ti[0]; l2c(t,dp);
-			t=ti[1]; l2c(t,dp);
-			save++;
-			}
-		*(out++)= *(in++)^d[n];
-		n=(n+1)&0x07;
-		}
-	if (save)
-		{
-		v0=ti[0];
-		v1=ti[1];
-		iv=(unsigned char *)ivec;
-		l2c(v0,iv);
-		l2c(v1,iv);
-		}
-	t=v0=v1=ti[0]=ti[1]=0;
-	*num=n;
-	}
-
diff --git a/secure/lib/libdes/ofb_enc.c b/secure/lib/libdes/ofb_enc.c
deleted file mode 100644
index 27b369183e50..000000000000
--- a/secure/lib/libdes/ofb_enc.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/* crypto/des/ofb_enc.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include "des_locl.h"
-
-/* The input and output are loaded in multiples of 8 bits.
- * What this means is that if you hame numbits=12 and length=2
- * the first 12 bits will be retrieved from the first byte and half
- * the second.  The second 12 bits will come from the 3rd and half the 4th
- * byte.
- */
-void des_ofb_encrypt(in, out, numbits, length, schedule, ivec)
-unsigned char *in;
-unsigned char *out;
-int numbits;
-long length;
-des_key_schedule schedule;
-des_cblock (*ivec);
-	{
-	register DES_LONG d0,d1,v0,v1,n=(numbits+7)/8;
-	register DES_LONG mask0,mask1;
-	register long l=length;
-	register int num=numbits;
-	DES_LONG ti[2];
-	unsigned char *iv;
-
-	if (num > 64) return;
-	if (num > 32)
-		{
-		mask0=0xffffffffL;
-		if (num >= 64)
-			mask1=mask0;
-		else
-			mask1=(1L<<(num-32))-1;
-		}
-	else
-		{
-		if (num == 32)
-			mask0=0xffffffffL;
-		else
-			mask0=(1L<<num)-1;
-		mask1=0x00000000;
-		}
-
-	iv=(unsigned char *)ivec;
-	c2l(iv,v0);
-	c2l(iv,v1);
-	ti[0]=v0;
-	ti[1]=v1;
-	while (l-- > 0)
-		{
-		des_encrypt((DES_LONG *)ti,schedule,DES_ENCRYPT);
-		c2ln(in,d0,d1,n);
-		in+=n;
-		d0=(d0^ti[0])&mask0;
-		d1=(d1^ti[1])&mask1;
-		l2cn(d0,d1,out,n);
-		out+=n;
-		}
-	v0=ti[0];
-	v1=ti[1];
-	iv=(unsigned char *)ivec;
-	l2c(v0,iv);
-	l2c(v1,iv);
-	v0=v1=d0=d1=ti[0]=ti[1]=0;
-	}
-
diff --git a/secure/lib/libdes/pcbc_enc.c b/secure/lib/libdes/pcbc_enc.c
deleted file mode 100644
index 1271d02cf8f0..000000000000
--- a/secure/lib/libdes/pcbc_enc.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/* crypto/des/pcbc_enc.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include "des_locl.h"
-
-void des_pcbc_encrypt(input, output, length, schedule, ivec, encrypt)
-des_cblock (*input);
-des_cblock (*output);
-long length;
-des_key_schedule schedule;
-des_cblock (*ivec);
-int encrypt;
-	{
-	register DES_LONG sin0,sin1,xor0,xor1,tout0,tout1;
-	DES_LONG tin[2];
-	unsigned char *in,*out,*iv;
-
-	in=(unsigned char *)input;
-	out=(unsigned char *)output;
-	iv=(unsigned char *)ivec;
-
-	if (encrypt)
-		{
-		c2l(iv,xor0);
-		c2l(iv,xor1);
-		for (; length>0; length-=8)
-			{
-			if (length >= 8)
-				{
-				c2l(in,sin0);
-				c2l(in,sin1);
-				}
-			else
-				c2ln(in,sin0,sin1,length);
-			tin[0]=sin0^xor0;
-			tin[1]=sin1^xor1;
-			des_encrypt((DES_LONG *)tin,schedule,DES_ENCRYPT);
-			tout0=tin[0];
-			tout1=tin[1];
-			xor0=sin0^tout0;
-			xor1=sin1^tout1;
-			l2c(tout0,out);
-			l2c(tout1,out);
-			}
-		}
-	else
-		{
-		c2l(iv,xor0); c2l(iv,xor1);
-		for (; length>0; length-=8)
-			{
-			c2l(in,sin0);
-			c2l(in,sin1);
-			tin[0]=sin0;
-			tin[1]=sin1;
-			des_encrypt((DES_LONG *)tin,schedule,DES_DECRYPT);
-			tout0=tin[0]^xor0;
-			tout1=tin[1]^xor1;
-			if (length >= 8)
-				{
-				l2c(tout0,out);
-				l2c(tout1,out);
-				}
-			else
-				l2cn(tout0,tout1,out,length);
-			xor0=tout0^sin0;
-			xor1=tout1^sin1;
-			}
-		}
-	tin[0]=tin[1]=0;
-	sin0=sin1=xor0=xor1=tout0=tout1=0;
-	}
diff --git a/secure/lib/libdes/podd.h b/secure/lib/libdes/podd.h
deleted file mode 100644
index 420fc43fa3e4..000000000000
--- a/secure/lib/libdes/podd.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* crypto/des/podd.h */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-static const unsigned char odd_parity[256]={
-  1,  1,  2,  2,  4,  4,  7,  7,  8,  8, 11, 11, 13, 13, 14, 14,
- 16, 16, 19, 19, 21, 21, 22, 22, 25, 25, 26, 26, 28, 28, 31, 31,
- 32, 32, 35, 35, 37, 37, 38, 38, 41, 41, 42, 42, 44, 44, 47, 47,
- 49, 49, 50, 50, 52, 52, 55, 55, 56, 56, 59, 59, 61, 61, 62, 62,
- 64, 64, 67, 67, 69, 69, 70, 70, 73, 73, 74, 74, 76, 76, 79, 79,
- 81, 81, 82, 82, 84, 84, 87, 87, 88, 88, 91, 91, 93, 93, 94, 94,
- 97, 97, 98, 98,100,100,103,103,104,104,107,107,109,109,110,110,
-112,112,115,115,117,117,118,118,121,121,122,122,124,124,127,127,
-128,128,131,131,133,133,134,134,137,137,138,138,140,140,143,143,
-145,145,146,146,148,148,151,151,152,152,155,155,157,157,158,158,
-161,161,162,162,164,164,167,167,168,168,171,171,173,173,174,174,
-176,176,179,179,181,181,182,182,185,185,186,186,188,188,191,191,
-193,193,194,194,196,196,199,199,200,200,203,203,205,205,206,206,
-208,208,211,211,213,213,214,214,217,217,218,218,220,220,223,223,
-224,224,227,227,229,229,230,230,233,233,234,234,236,236,239,239,
-241,241,242,242,244,244,247,247,248,248,251,251,253,253,254,254};
diff --git a/secure/lib/libdes/qud_cksm.c b/secure/lib/libdes/qud_cksm.c
deleted file mode 100644
index dc74c94cd1ff..000000000000
--- a/secure/lib/libdes/qud_cksm.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/* crypto/des/qud_cksm.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/* From "Message Authentication"  R.R. Jueneman, S.M. Matyas, C.H. Meyer
- * IEEE Communications Magazine Sept 1985 Vol. 23 No. 9 p 29-40
- * This module in only based on the code in this paper and is
- * almost definitely not the same as the MIT implementation.
- */
-#include "des_locl.h"
-
-/* bug fix for dos - 7/6/91 - Larry hughes@logos.ucs.indiana.edu */
-#define Q_B0(a)	(((DES_LONG)(a)))
-#define Q_B1(a)	(((DES_LONG)(a))<<8)
-#define Q_B2(a)	(((DES_LONG)(a))<<16)
-#define Q_B3(a)	(((DES_LONG)(a))<<24)
-
-/* used to scramble things a bit */
-/* Got the value MIT uses via brute force :-) 2/10/90 eay */
-#define NOISE	((DES_LONG)83653421L)
-
-DES_LONG des_quad_cksum(input, output, length, out_count, seed)
-des_cblock (*input);
-des_cblock (*output);
-long length;
-int out_count;
-des_cblock (*seed);
-	{
-	DES_LONG z0,z1,t0,t1;
-	int i;
-	long l;
-	unsigned char *cp;
-	unsigned char *lp;
-
-	if (out_count < 1) out_count=1;
-	lp=(unsigned char *)output;
-
-	z0=Q_B0((*seed)[0])|Q_B1((*seed)[1])|Q_B2((*seed)[2])|Q_B3((*seed)[3]);
-	z1=Q_B0((*seed)[4])|Q_B1((*seed)[5])|Q_B2((*seed)[6])|Q_B3((*seed)[7]);
-
-	for (i=0; ((i<4)&&(i<out_count)); i++)
-		{
-		cp=(unsigned char *)input;
-		l=length;
-		while (l > 0)
-			{
-			if (l > 1)
-				{
-				t0= (DES_LONG)(*(cp++));
-				t0|=(DES_LONG)Q_B1(*(cp++));
-				l--;
-				}
-			else
-				t0= (DES_LONG)(*(cp++));
-			l--;
-			/* add */
-			t0+=z0;
-			t0&=0xffffffffL;
-			t1=z1;
-			/* square, well sort of square */
-			z0=((((t0*t0)&0xffffffffL)+((t1*t1)&0xffffffffL))
-				&0xffffffffL)%0x7fffffffL; 
-			z1=((t0*((t1+NOISE)&0xffffffffL))&0xffffffffL)%0x7fffffffL;
-			}
-		if (lp != NULL)
-			{
-			/* I believe I finally have things worked out.
-			 * The MIT library assumes that the checksum
-			 * is one huge number and it is returned in a
-			 * host dependant byte order.
-			 */
-			static DES_LONG ltmp=1;
-			static unsigned char *c=(unsigned char *)&ltmp;
-
-			if (c[0])
-				{
-				l2c(z0,lp);
-				l2c(z1,lp);
-				}
-			else
-				{
-				lp=output[out_count-i-1];
-				l2n(z1,lp);
-				l2n(z0,lp);
-				}
-			}
-		}
-	return(z0);
-	}
-
diff --git a/secure/lib/libdes/rand_key.c b/secure/lib/libdes/rand_key.c
deleted file mode 100644
index 4d20201c58ea..000000000000
--- a/secure/lib/libdes/rand_key.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* crypto/des/rand_key.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include "des_locl.h"
-#include <time.h>
-
-static int seed=0;
-static des_cblock init;
-
-void des_random_seed(key)
-des_cblock key;
-	{
-	memcpy(init,key,sizeof(des_cblock));
-	seed=1;
-	}
-
-void des_random_key(ret)
-unsigned char *ret;
-	{
-	des_key_schedule ks;
-	static DES_LONG c=0;
-	static unsigned short pid=0;
-	static des_cblock data={0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef};
-	des_cblock key;
-	unsigned char *p;
-	DES_LONG t;
-	int i;
-
-#ifdef MSDOS
-	pid=1;
-#else
-	if (!pid) pid=getpid();
-#endif
-	p=key;
-	if (seed)
-		{
-		for (i=0; i<8; i++)
-			{
-			data[i] ^= init[i];
-			init[i]=0;
-			}
-		seed=0;
-		}
-	t=(DES_LONG)time(NULL);
-	l2c(t,p);
-	t=(DES_LONG)((pid)|((c++)<<16));
-	l2c(t,p);
-
-	des_set_odd_parity((des_cblock *)data);
-	des_set_key((des_cblock *)data,ks);
-	des_cbc_cksum((des_cblock *)key,(des_cblock *)key,
-		(long)sizeof(key),ks,(des_cblock *)data);
-
-	des_set_odd_parity((des_cblock *)key);
-	des_set_key((des_cblock *)key,ks);
-	des_cbc_cksum((des_cblock *)key,(des_cblock *)data,
-		(long)sizeof(key),ks,(des_cblock *)key);
-
-	memcpy(ret,data,sizeof(key));
-	memset(key,0,sizeof(key));
-	memset(ks,0,sizeof(ks));
-	t=0;
-	}
diff --git a/secure/lib/libdes/read_pwd.c b/secure/lib/libdes/read_pwd.c
deleted file mode 100644
index 240aa1606a9c..000000000000
--- a/secure/lib/libdes/read_pwd.c
+++ /dev/null
@@ -1,433 +0,0 @@
-/* crypto/des/read_pwd.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifdef WIN16TTY
-#undef WIN16
-#undef _WINDOWS
-#include <graph.h>
-#endif
-
-/* 06-Apr-92 Luke Brennan    Support for VMS */
-#include "des_locl.h"
-#include <signal.h>
-#include <string.h>
-#include <setjmp.h>
-#include <errno.h>
-
-/* There are 5 types of terminal interface supported,
- * TERMIO, TERMIOS, VMS, MSDOS and SGTTY
- */
-
-#if defined(__sgi) && !defined(TERMIOS)
-#define TERMIOS
-#undef TERMIO
-#undef SGTTY
-#endif
-
-#if defined(linux) && !defined(TERMIO)
-#undef TERMIOS
-#define TERMIO
-#undef SGTTY
-#endif
-
-#ifdef _LIBC
-#define TERMIO
-#endif
-
-#if !defined(TERMIO) && !defined(TERMIOS) && !defined(VMS) && !defined(MSDOS)
-#define SGTTY
-#endif
-
-#ifdef TERMIOS
-#include <termios.h>
-#define TTY_STRUCT		struct termios
-#define TTY_FLAGS		c_lflag
-#define	TTY_get(tty,data)	tcgetattr(tty,data)
-#define TTY_set(tty,data)	tcsetattr(tty,TCSANOW,data)
-#endif
-
-#ifdef TERMIO
-#include <termio.h>
-#define TTY_STRUCT		struct termio
-#define TTY_FLAGS		c_lflag
-#define TTY_get(tty,data)	ioctl(tty,TCGETA,data)
-#define TTY_set(tty,data)	ioctl(tty,TCSETA,data)
-#endif
-
-#ifdef SGTTY
-#include <sgtty.h>
-#define TTY_STRUCT		struct sgttyb
-#define TTY_FLAGS		sg_flags
-#define TTY_get(tty,data)	ioctl(tty,TIOCGETP,data)
-#define TTY_set(tty,data)	ioctl(tty,TIOCSETP,data)
-#endif
-
-#if !defined(_LIBC) && !defined(MSDOS) && !defined(VMS)
-#include <sys/ioctl.h>
-#endif
-
-#ifdef MSDOS
-#include <conio.h>
-#define fgets(a,b,c) noecho_fgets(a,b,c)
-#endif
-
-#ifdef VMS
-#include <ssdef.h>
-#include <iodef.h>
-#include <ttdef.h>
-#include <descrip.h>
-struct IOSB {
-	short iosb$w_value;
-	short iosb$w_count;
-	long  iosb$l_info;
-	};
-#endif
-
-#ifndef NX509_SIG
-#define NX509_SIG 32
-#endif
-
-#ifndef NOPROTO
-static void read_till_nl(FILE *);
-static int read_pw(char *buf, char *buff, int size, char *prompt, int verify);
-static void recsig(int);
-static void pushsig(void);
-static void popsig(void);
-#if defined(MSDOS) && !defined(WIN16)
-static int noecho_fgets(char *buf, int size, FILE *tty);
-#endif
-#else
-static void read_till_nl();
-static int read_pw();
-static void recsig();
-static void pushsig();
-static void popsig();
-#if defined(MSDOS) && !defined(WIN16)
-static int noecho_fgets();
-#endif
-#endif
-
-#ifndef NOPROTO
-static void (*savsig[NX509_SIG])(int );
-#else
-static void (*savsig[NX509_SIG])();
-#endif
-static jmp_buf save;
-
-int des_read_password(key, prompt, verify)
-des_cblock (*key);
-char *prompt;
-int verify;
-	{
-	int ok;
-	char buf[BUFSIZ],buff[BUFSIZ];
-
-	if ((ok=read_pw(buf,buff,BUFSIZ,prompt,verify)) == 0)
-		des_string_to_key(buf,key);
-	memset(buf,0,BUFSIZ);
-	memset(buff,0,BUFSIZ);
-	return(ok);
-	}
-
-int des_read_2passwords(key1, key2, prompt, verify)
-des_cblock (*key1);
-des_cblock (*key2);
-char *prompt;
-int verify;
-	{
-	int ok;
-	char buf[BUFSIZ],buff[BUFSIZ];
-
-	if ((ok=read_pw(buf,buff,BUFSIZ,prompt,verify)) == 0)
-		des_string_to_2keys(buf,key1,key2);
-	memset(buf,0,BUFSIZ);
-	memset(buff,0,BUFSIZ);
-	return(ok);
-	}
-
-int des_read_pw_string(buf, length, prompt, verify)
-char *buf;
-int length;
-char *prompt;
-int verify;
-	{
-	char buff[BUFSIZ];
-	int ret;
-
-	ret=read_pw(buf,buff,(length>BUFSIZ)?BUFSIZ:length,prompt,verify);
-	memset(buff,0,BUFSIZ);
-	return(ret);
-	}
-
-#ifndef WIN16
-
-static void read_till_nl(in)
-FILE *in;
-	{
-#define SIZE 4
-	char buf[SIZE+1];
-
-	do	{
-		fgets(buf,SIZE,in);
-		} while (strchr(buf,'\n') == NULL);
-	}
-
-
-/* return 0 if ok, 1 (or -1) otherwise */
-static int read_pw(buf, buff, size, prompt, verify)
-char *buf;
-char *buff;
-int size;
-char *prompt;
-int verify;
-	{
-#ifdef VMS
-	struct IOSB iosb;
-	$DESCRIPTOR(terminal,"TT");
-	long tty_orig[3], tty_new[3];
-	long status;
-	unsigned short channel = 0;
-#else
-#ifndef MSDOS
-	TTY_STRUCT tty_orig,tty_new;
-#endif
-#endif
-	int number=5;
-	int ok=0;
-	int ps=0;
-	int is_a_tty=1;
-
-	FILE *tty=NULL;
-	char *p;
-
-#ifndef MSDOS
-	if ((tty=fopen("/dev/tty","r")) == NULL)
-		tty=stdin;
-#else /* MSDOS */
-	if ((tty=fopen("con","r")) == NULL)
-		tty=stdin;
-#endif /* MSDOS */
-
-#if defined(TTY_get) && !defined(VMS)
-	if (TTY_get(fileno(tty),&tty_orig) == -1)
-		{
-#ifdef ENOTTY
-		if (errno == ENOTTY)
-			is_a_tty=0;
-		else
-#endif
-			return(-1);
-		}
-	memcpy(&(tty_new),&(tty_orig),sizeof(tty_orig));
-#endif
-#ifdef VMS
-	status = SYS$ASSIGN(&terminal,&channel,0,0);
-	if (status != SS$_NORMAL)
-		return(-1);
-	status=SYS$QIOW(0,channel,IO$_SENSEMODE,&iosb,0,0,tty_orig,12,0,0,0,0);
-	if ((status != SS$_NORMAL) || (iosb.iosb$w_value != SS$_NORMAL))
-		return(-1);
-#endif
-
-	if (setjmp(save))
-		{
-		ok=0;
-		goto error;
-		}
-	pushsig();
-	ps=1;
-
-#ifdef TTY_FLAGS
-	tty_new.TTY_FLAGS &= ~ECHO;
-#endif
-
-#if defined(TTY_set) && !defined(VMS)
-	if (is_a_tty && (TTY_set(fileno(tty),&tty_new) == -1))
-		return(-1);
-#endif
-#ifdef VMS
-	tty_new[0] = tty_orig[0];
-	tty_new[1] = tty_orig[1] | TT$M_NOECHO;
-	tty_new[2] = tty_orig[2];
-	status = SYS$QIOW(0,channel,IO$_SETMODE,&iosb,0,0,tty_new,12,0,0,0,0);
-	if ((status != SS$_NORMAL) || (iosb.iosb$w_value != SS$_NORMAL))
-		return(-1);
-#endif
-	ps=2;
-
-	while ((!ok) && (number--))
-		{
-		fputs(prompt,stderr);
-		fflush(stderr);
-
-		buf[0]='\0';
-		fgets(buf,size,tty);
-		if (feof(tty)) goto error;
-		if (ferror(tty)) goto error;
-		if ((p=(char *)strchr(buf,'\n')) != NULL)
-			*p='\0';
-		else	read_till_nl(tty);
-		if (verify)
-			{
-			fprintf(stderr,"\nVerifying password - %s",prompt);
-			fflush(stderr);
-			buff[0]='\0';
-			fgets(buff,size,tty);
-			if (feof(tty)) goto error;
-			if ((p=(char *)strchr(buff,'\n')) != NULL)
-				*p='\0';
-			else	read_till_nl(tty);
-				
-			if (strcmp(buf,buff) != 0)
-				{
-				fprintf(stderr,"\nVerify failure");
-				fflush(stderr);
-				break;
-				/* continue; */
-				}
-			}
-		ok=1;
-		}
-
-error:
-	fprintf(stderr,"\n");
-#ifdef DEBUG
-	perror("fgets(tty)");
-#endif
-	/* What can we do if there is an error? */
-#if defined(TTY_set) && !defined(VMS) 
-	if (ps >= 2) TTY_set(fileno(tty),&tty_orig);
-#endif
-#ifdef VMS
-	if (ps >= 2)
-		status = SYS$QIOW(0,channel,IO$_SETMODE,&iosb,0,0
-			,tty_orig,12,0,0,0,0);
-#endif
-	
-	if (ps >= 1) popsig();
-	if (stdin != tty) fclose(tty);
-#ifdef VMS
-	status = SYS$DASSGN(channel);
-#endif
-	return(!ok);
-	}
-
-#else /* WIN16 */
-
-static int read_pw(buf, buff, size, prompt, verify)
-char *buf;
-char *buff;
-int size;
-char *prompt;
-int verify;
-	{ 
-	memset(buf,0,size);
-	memset(buff,0,size);
-	return(0);
-	}
-
-#endif
-
-static void pushsig()
-	{
-	int i;
-
-	for (i=1; i<NX509_SIG; i++)
-		savsig[i]=signal(i,recsig);
-	}
-
-static void popsig()
-	{
-	int i;
-
-	for (i=1; i<NX509_SIG; i++)
-		signal(i,savsig[i]);
-	}
-
-static void recsig(i)
-int i;
-	{
-	longjmp(save,1);
-#ifdef LINT
-	i=i;
-#endif
-	}
-
-#if defined(MSDOS) && !defined(WIN16)
-static int noecho_fgets(buf,size,tty)
-char *buf;
-int size;
-FILE *tty;
-	{
-	int i;
-	char *p;
-
-	p=buf;
-	for (;;)
-		{
-		if (size == 0)
-			{
-			*p='\0';
-			break;
-			}
-		size--;
-#ifdef WIN16TTY
-		i=_inchar();
-#else
-		i=getch();
-#endif
-		if (i == '\r') i='\n';
-		*(p++)=i;
-		if (i == '\n')
-			{
-			*p='\0';
-			break;
-			}
-		}
-	return(strlen(buf));
-	}
-#endif
diff --git a/secure/lib/libdes/rpc_des.h b/secure/lib/libdes/rpc_des.h
deleted file mode 100644
index 0b0bbf58dcc8..000000000000
--- a/secure/lib/libdes/rpc_des.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* crypto/des/rpc_des.h */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/*  @(#)des.h	2.2 88/08/10 4.0 RPCSRC; from 2.7 88/02/08 SMI  */
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * Generic DES driver interface
- * Keep this file hardware independent!
- * Copyright (c) 1986 by Sun Microsystems, Inc.
- */
-
-#define DES_MAXLEN 	65536	/* maximum # of bytes to encrypt  */
-#define DES_QUICKLEN	16	/* maximum # of bytes to encrypt quickly */
-
-#ifdef HEADER_DES_H
-#undef ENCRYPT
-#undef DECRYPT
-#endif
-
-enum desdir { ENCRYPT, DECRYPT };
-enum desmode { CBC, ECB };
-
-/*
- * parameters to ioctl call
- */
-struct desparams {
-	unsigned char des_key[8];	/* key (with low bit parity) */
-	enum desdir des_dir;	/* direction */
-	enum desmode des_mode;	/* mode */
-	unsigned char des_ivec[8];	/* input vector */
-	unsigned des_len;	/* number of bytes to crypt */
-	union {
-		unsigned char UDES_data[DES_QUICKLEN];
-		unsigned char *UDES_buf;
-	} UDES;
-#	define des_data UDES.UDES_data	/* direct data here if quick */
-#	define des_buf	UDES.UDES_buf	/* otherwise, pointer to data */
-};
-
-/*
- * Encrypt an arbitrary sized buffer
- */
-#define	DESIOCBLOCK	_IOWR(d, 6, struct desparams)
-
-/* 
- * Encrypt of small amount of data, quickly
- */
-#define DESIOCQUICK	_IOWR(d, 7, struct desparams) 
-
diff --git a/secure/lib/libdes/rpc_enc.c b/secure/lib/libdes/rpc_enc.c
deleted file mode 100644
index d674865c9d6f..000000000000
--- a/secure/lib/libdes/rpc_enc.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* crypto/des/rpc_enc.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include "rpc_des.h"
-#include "des_locl.h"
-#include "des_ver.h"
-
-#ifndef NOPROTO
-int _des_crypt(char *buf,int len,struct desparams *desp);
-#else
-int _des_crypt();
-#endif
-
-int _des_crypt(buf, len, desp)
-char *buf;
-int len;
-struct desparams *desp;
-	{
-	des_key_schedule ks;
-	int enc;
-
-	des_set_key((des_cblock *)desp->des_key,ks);
-	enc=(desp->des_dir == ENCRYPT)?DES_ENCRYPT:DES_DECRYPT;
-
-	if (desp->des_mode == CBC)
-		des_ecb_encrypt((des_cblock *)desp->UDES.UDES_buf,
-				(des_cblock *)desp->UDES.UDES_buf,ks,enc);
-	else
-		{
-		des_ncbc_encrypt((des_cblock *)desp->UDES.UDES_buf,
-				(des_cblock *)desp->UDES.UDES_buf,
-				(long)len,ks,
-				(des_cblock *)desp->des_ivec,enc);
-#ifdef undef
-		/* len will always be %8 if called from common_crypt
-		 * in secure_rpc.
-		 * Libdes's cbc encrypt does not copy back the iv,
-		 * so we have to do it here. */
-		/* It does now :-) eay 20/09/95 */
-
-		a=(char *)&(desp->UDES.UDES_buf[len-8]);
-		b=(char *)&(desp->des_ivec[0]);
-
-		*(a++)= *(b++); *(a++)= *(b++);
-		*(a++)= *(b++); *(a++)= *(b++);
-		*(a++)= *(b++); *(a++)= *(b++);
-		*(a++)= *(b++); *(a++)= *(b++);
-#endif
-		}
-	return(1);	
-	}
-
diff --git a/secure/lib/libdes/rpw.c b/secure/lib/libdes/rpw.c
deleted file mode 100644
index 69c6b8490a88..000000000000
--- a/secure/lib/libdes/rpw.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* crypto/des/rpw.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include "des.h"
-
-int main(argc,argv)
-int argc;
-char *argv[];
-	{
-	des_cblock k,k1;
-	int i;
-
-	printf("read passwd\n");
-	if ((i=des_read_password((C_Block *)k,"Enter password:",0)) == 0)
-		{
-		printf("password = ");
-		for (i=0; i<8; i++)
-			printf("%02x ",k[i]);
-		}
-	else
-		printf("error %d\n",i);
-	printf("\n");
-	printf("read 2passwds and verify\n");
-	if ((i=des_read_2passwords((C_Block *)k,(C_Block *)k1,
-		"Enter verified password:",1)) == 0)
-		{
-		printf("password1 = ");
-		for (i=0; i<8; i++)
-			printf("%02x ",k[i]);
-		printf("\n");
-		printf("password2 = ");
-		for (i=0; i<8; i++)
-			printf("%02x ",k1[i]);
-		printf("\n");
-		exit(1);
-		}
-	else
-		{
-		printf("error %d\n",i);
-		exit(0);
-		}
-#ifdef LINT
-	return(0);
-#endif
-	}
diff --git a/secure/lib/libdes/set_key.c b/secure/lib/libdes/set_key.c
deleted file mode 100644
index 8365ee4ab6f4..000000000000
--- a/secure/lib/libdes/set_key.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/* crypto/des/set_key.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/* set_key.c v 1.4 eay 24/9/91
- * 1.4 Speed up by 400% :-)
- * 1.3 added register declarations.
- * 1.2 unrolled make_key_sched a bit more
- * 1.1 added norm_expand_bits
- * 1.0 First working version
- */
-#include "des_locl.h"
-#include "podd.h"
-#include "sk.h"
-
-#ifndef NOPROTO
-static int check_parity(des_cblock (*key));
-#else
-static int check_parity();
-#endif
-
-int des_check_key=0;
-
-void des_set_odd_parity(key)
-des_cblock (*key);
-	{
-	int i;
-
-	for (i=0; i<DES_KEY_SZ; i++)
-		(*key)[i]=odd_parity[(*key)[i]];
-	}
-
-static int check_parity(key)
-des_cblock (*key);
-	{
-	int i;
-
-	for (i=0; i<DES_KEY_SZ; i++)
-		{
-		if ((*key)[i] != odd_parity[(*key)[i]])
-			return(0);
-		}
-	return(1);
-	}
-
-/* Weak and semi week keys as take from
- * %A D.W. Davies
- * %A W.L. Price
- * %T Security for Computer Networks
- * %I John Wiley & Sons
- * %D 1984
- * Many thanks to smb@ulysses.att.com (Steven Bellovin) for the reference
- * (and actual cblock values).
- */
-#define NUM_WEAK_KEY	16
-static des_cblock weak_keys[NUM_WEAK_KEY]={
-	/* weak keys */
-	{0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01},
-	{0xFE,0xFE,0xFE,0xFE,0xFE,0xFE,0xFE,0xFE},
-	{0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F},
-	{0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0},
-	/* semi-weak keys */
-	{0x01,0xFE,0x01,0xFE,0x01,0xFE,0x01,0xFE},
-	{0xFE,0x01,0xFE,0x01,0xFE,0x01,0xFE,0x01},
-	{0x1F,0xE0,0x1F,0xE0,0x0E,0xF1,0x0E,0xF1},
-	{0xE0,0x1F,0xE0,0x1F,0xF1,0x0E,0xF1,0x0E},
-	{0x01,0xE0,0x01,0xE0,0x01,0xF1,0x01,0xF1},
-	{0xE0,0x01,0xE0,0x01,0xF1,0x01,0xF1,0x01},
-	{0x1F,0xFE,0x1F,0xFE,0x0E,0xFE,0x0E,0xFE},
-	{0xFE,0x1F,0xFE,0x1F,0xFE,0x0E,0xFE,0x0E},
-	{0x01,0x1F,0x01,0x1F,0x01,0x0E,0x01,0x0E},
-	{0x1F,0x01,0x1F,0x01,0x0E,0x01,0x0E,0x01},
-	{0xE0,0xFE,0xE0,0xFE,0xF1,0xFE,0xF1,0xFE},
-	{0xFE,0xE0,0xFE,0xE0,0xFE,0xF1,0xFE,0xF1}};
-
-int des_is_weak_key(key)
-des_cblock (*key);
-	{
-	int i;
-
-	for (i=0; i<NUM_WEAK_KEY; i++)
-		/* Added == 0 to comparision, I obviously don't run
-		 * this section very often :-(, thanks to
-		 * engineering@MorningStar.Com for the fix
-		 * eay 93/06/29 */
-		if (memcmp(weak_keys[i],key,sizeof(key)) == 0) return(1);
-	return(0);
-	}
-
-/* NOW DEFINED IN des_local.h
- * See ecb_encrypt.c for a pseudo description of these macros. 
- * #define PERM_OP(a,b,t,n,m) ((t)=((((a)>>(n))^(b))&(m)),\
- * 	(b)^=(t),\
- * 	(a)=((a)^((t)<<(n))))
- */
-
-#define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\
-	(a)=(a)^(t)^(t>>(16-(n))))
-
-/* return 0 if key parity is odd (correct),
- * return -1 if key parity error,
- * return -2 if illegal weak key.
- */
-int des_set_key(key, schedule)
-des_cblock (*key);
-des_key_schedule schedule;
-	{
-	static int shifts2[16]={0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0};
-	register DES_LONG c,d,t,s;
-	register unsigned char *in;
-	register DES_LONG *k;
-	register int i;
-
-	if (des_check_key)
-		{
-		if (!check_parity(key))
-			return(-1);
-
-		if (des_is_weak_key(key))
-			return(-2);
-		}
-
-	k=(DES_LONG *)schedule;
-	in=(unsigned char *)key;
-
-	c2l(in,c);
-	c2l(in,d);
-
-	/* do PC1 in 60 simple operations */ 
-/*	PERM_OP(d,c,t,4,0x0f0f0f0fL);
-	HPERM_OP(c,t,-2, 0xcccc0000L);
-	HPERM_OP(c,t,-1, 0xaaaa0000L);
-	HPERM_OP(c,t, 8, 0x00ff0000L);
-	HPERM_OP(c,t,-1, 0xaaaa0000L);
-	HPERM_OP(d,t,-8, 0xff000000L);
-	HPERM_OP(d,t, 8, 0x00ff0000L);
-	HPERM_OP(d,t, 2, 0x33330000L);
-	d=((d&0x00aa00aaL)<<7L)|((d&0x55005500L)>>7L)|(d&0xaa55aa55L);
-	d=(d>>8)|((c&0xf0000000L)>>4);
-	c&=0x0fffffffL; */
-
-	/* I now do it in 47 simple operations :-)
-	 * Thanks to John Fletcher (john_fletcher@lccmail.ocf.llnl.gov)
-	 * for the inspiration. :-) */
-	PERM_OP (d,c,t,4,0x0f0f0f0fL);
-	HPERM_OP(c,t,-2,0xcccc0000L);
-	HPERM_OP(d,t,-2,0xcccc0000L);
-	PERM_OP (d,c,t,1,0x55555555L);
-	PERM_OP (c,d,t,8,0x00ff00ffL);
-	PERM_OP (d,c,t,1,0x55555555L);
-	d=	(((d&0x000000ffL)<<16L)| (d&0x0000ff00L)     |
-		 ((d&0x00ff0000L)>>16L)|((c&0xf0000000L)>>4L));
-	c&=0x0fffffffL;
-
-	for (i=0; i<ITERATIONS; i++)
-		{
-		if (shifts2[i])
-			{ c=((c>>2L)|(c<<26L)); d=((d>>2L)|(d<<26L)); }
-		else
-			{ c=((c>>1L)|(c<<27L)); d=((d>>1L)|(d<<27L)); }
-		c&=0x0fffffffL;
-		d&=0x0fffffffL;
-		/* could be a few less shifts but I am to lazy at this
-		 * point in time to investigate */
-		s=	des_skb[0][ (c    )&0x3f                ]|
-			des_skb[1][((c>> 6)&0x03)|((c>> 7L)&0x3c)]|
-			des_skb[2][((c>>13)&0x0f)|((c>>14L)&0x30)]|
-			des_skb[3][((c>>20)&0x01)|((c>>21L)&0x06) |
-						  ((c>>22L)&0x38)];
-		t=	des_skb[4][ (d    )&0x3f                ]|
-			des_skb[5][((d>> 7L)&0x03)|((d>> 8L)&0x3c)]|
-			des_skb[6][ (d>>15L)&0x3f                ]|
-			des_skb[7][((d>>21L)&0x0f)|((d>>22L)&0x30)];
-
-		/* table contained 0213 4657 */
-		*(k++)=((t<<16L)|(s&0x0000ffffL))&0xffffffffL;
-		s=     ((s>>16L)|(t&0xffff0000L));
-		
-		s=(s<<4L)|(s>>28L);
-		*(k++)=s&0xffffffffL;
-		}
-	return(0);
-	}
-
-int des_key_sched(key, schedule)
-des_cblock (*key);
-des_key_schedule schedule;
-	{
-	return(des_set_key(key,schedule));
-	}
diff --git a/secure/lib/libdes/shifts.pl b/secure/lib/libdes/shifts.pl
deleted file mode 100755
index 2865f561b91f..000000000000
--- a/secure/lib/libdes/shifts.pl
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/usr/bin/perl
-	{
-	local(*a,$n)=@_;
-	local(@r,$i,$j,$k,$d,@z);
-
-	@r=&shift(*a,$n);
-	foreach $i (0 .. 31)
-		{
-		@z=split(/\^/,$r[$i]);
-		for ($j=0; $j <= $#z; $j++)
-			{
-			($d)=($z[$j] =~ /^(..)/);
-			($k)=($z[$j] =~ /\[(.*)\]$/);
-			$k.=",$n" if ($k ne "");
-			$k="$n"	  if ($k eq "");
-			$d="$d[$k]";
-			$z[$j]=$d;
-			}
-		$r[$i]=join('^',@z);
-		}
-	return(@r);
-	}
-
-sub shift
-	{
-	local(*a,$n)=@_;
-	local(@f);
-
-	if ($n > 0)
-		{
-		@f=&shiftl(*a,$n);
-		}
-	else
-		{
-		@f=&shiftr(*a,-$n);
-		}
-	return(@f);
-	}
-
-sub shiftr
-	{
-	local(*a,$n)=@_;
-	local(@r,$i);
-
-	$#r=31;
-	foreach $i (0 .. 31)
-		{
-		if (($i+$n) > 31)
-			{
-			$r[$i]="--";
-			}
-		else
-			{
-			$r[$i]=$a[$i+$n];
-			}
-		}
-	return(@r);
-	}
-
-sub shiftl
-	{
-	local(*a,$n)=@_;
-	local(@r,$i);
-
-	$#r=31;
-	foreach $i (0 .. 31)
-		{
-		if ($i < $n)
-			{
-			$r[$i]="--";
-			}
-		else
-			{
-			$r[$i]=$a[$i-$n];
-			}
-		}
-	return(@r);
-	}
-
-sub printit
-	{
-	local(@a)=@_;
-	local($i);
-
-	foreach $i (0 .. 31)
-		{
-		printf "%2s  ",$a[$i];
-		print "\n" if (($i%8) == 7);
-		}
-	print "\n";
-	}
-
-sub xor
-	{
-	local(*a,*b)=@_;
-	local(@r,$i);
-
-	$#r=31;
-	foreach $i (0 .. 31)
-		{
-		$r[$i]=&compress($a[$i].'^'.$b[$i]);
-#		$r[$i]=$a[$i]."^".$b[$i];
-		}
-	return(@r);
-	}
-
-sub and
-	{
-	local(*a,$m)=@_;
-	local(@r,$i);
-
-	$#r=31;
-	foreach $i (0 .. 31)
-		{
-		$r[$i]=(($m & (1<<$i))?($a[$i]):('--'));
-		}
-	return(@r);
-	}
-
-sub or
-	{
-	local(*a,*b)=@_;
-	local(@r,$i);
-
-	$#r=31;
-	foreach $i (0 .. 31)
-		{
-		$r[$i]='--'   if (($a[$i] eq '--') && ($b[$i] eq '--'));
-		$r[$i]=$a[$i] if (($a[$i] ne '--') && ($b[$i] eq '--'));
-		$r[$i]=$b[$i] if (($a[$i] eq '--') && ($b[$i] ne '--'));
-		$r[$i]='++'   if (($a[$i] ne '--') && ($b[$i] ne '--'));
-		}
-	return(@r);
-	}
-
-sub compress
-	{
-	local($s)=@_;
-	local($_,$i,@a,%a,$r);
-
-	$s =~ s/\^\^/\^/g;
-	$s =~ s/^\^//;
-	$s =~ s/\^$//;
-	@a=split(/\^/,$s);
-
-	while ($#a >= 0)
-		{
-		$_=shift(@a);
-		next unless /\d/;
-		$a{$_}++;
-		}
-	foreach $i (sort keys %a)
-		{
-		next if ($a{$i}%2 == 0);
-		$r.="$i^";
-		}
-	chop($r);
-	return($r);
-	}
-1;
diff --git a/secure/lib/libdes/sk.h b/secure/lib/libdes/sk.h
deleted file mode 100644
index 217c8ab0fb0c..000000000000
--- a/secure/lib/libdes/sk.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/* crypto/des/sk.h */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-static const DES_LONG des_skb[8][64]={
-{
-/* for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
-0x00000000L,0x00000010L,0x20000000L,0x20000010L,
-0x00010000L,0x00010010L,0x20010000L,0x20010010L,
-0x00000800L,0x00000810L,0x20000800L,0x20000810L,
-0x00010800L,0x00010810L,0x20010800L,0x20010810L,
-0x00000020L,0x00000030L,0x20000020L,0x20000030L,
-0x00010020L,0x00010030L,0x20010020L,0x20010030L,
-0x00000820L,0x00000830L,0x20000820L,0x20000830L,
-0x00010820L,0x00010830L,0x20010820L,0x20010830L,
-0x00080000L,0x00080010L,0x20080000L,0x20080010L,
-0x00090000L,0x00090010L,0x20090000L,0x20090010L,
-0x00080800L,0x00080810L,0x20080800L,0x20080810L,
-0x00090800L,0x00090810L,0x20090800L,0x20090810L,
-0x00080020L,0x00080030L,0x20080020L,0x20080030L,
-0x00090020L,0x00090030L,0x20090020L,0x20090030L,
-0x00080820L,0x00080830L,0x20080820L,0x20080830L,
-0x00090820L,0x00090830L,0x20090820L,0x20090830L,
-},{
-/* for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 */
-0x00000000L,0x02000000L,0x00002000L,0x02002000L,
-0x00200000L,0x02200000L,0x00202000L,0x02202000L,
-0x00000004L,0x02000004L,0x00002004L,0x02002004L,
-0x00200004L,0x02200004L,0x00202004L,0x02202004L,
-0x00000400L,0x02000400L,0x00002400L,0x02002400L,
-0x00200400L,0x02200400L,0x00202400L,0x02202400L,
-0x00000404L,0x02000404L,0x00002404L,0x02002404L,
-0x00200404L,0x02200404L,0x00202404L,0x02202404L,
-0x10000000L,0x12000000L,0x10002000L,0x12002000L,
-0x10200000L,0x12200000L,0x10202000L,0x12202000L,
-0x10000004L,0x12000004L,0x10002004L,0x12002004L,
-0x10200004L,0x12200004L,0x10202004L,0x12202004L,
-0x10000400L,0x12000400L,0x10002400L,0x12002400L,
-0x10200400L,0x12200400L,0x10202400L,0x12202400L,
-0x10000404L,0x12000404L,0x10002404L,0x12002404L,
-0x10200404L,0x12200404L,0x10202404L,0x12202404L,
-},{
-/* for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 */
-0x00000000L,0x00000001L,0x00040000L,0x00040001L,
-0x01000000L,0x01000001L,0x01040000L,0x01040001L,
-0x00000002L,0x00000003L,0x00040002L,0x00040003L,
-0x01000002L,0x01000003L,0x01040002L,0x01040003L,
-0x00000200L,0x00000201L,0x00040200L,0x00040201L,
-0x01000200L,0x01000201L,0x01040200L,0x01040201L,
-0x00000202L,0x00000203L,0x00040202L,0x00040203L,
-0x01000202L,0x01000203L,0x01040202L,0x01040203L,
-0x08000000L,0x08000001L,0x08040000L,0x08040001L,
-0x09000000L,0x09000001L,0x09040000L,0x09040001L,
-0x08000002L,0x08000003L,0x08040002L,0x08040003L,
-0x09000002L,0x09000003L,0x09040002L,0x09040003L,
-0x08000200L,0x08000201L,0x08040200L,0x08040201L,
-0x09000200L,0x09000201L,0x09040200L,0x09040201L,
-0x08000202L,0x08000203L,0x08040202L,0x08040203L,
-0x09000202L,0x09000203L,0x09040202L,0x09040203L,
-},{
-/* for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 */
-0x00000000L,0x00100000L,0x00000100L,0x00100100L,
-0x00000008L,0x00100008L,0x00000108L,0x00100108L,
-0x00001000L,0x00101000L,0x00001100L,0x00101100L,
-0x00001008L,0x00101008L,0x00001108L,0x00101108L,
-0x04000000L,0x04100000L,0x04000100L,0x04100100L,
-0x04000008L,0x04100008L,0x04000108L,0x04100108L,
-0x04001000L,0x04101000L,0x04001100L,0x04101100L,
-0x04001008L,0x04101008L,0x04001108L,0x04101108L,
-0x00020000L,0x00120000L,0x00020100L,0x00120100L,
-0x00020008L,0x00120008L,0x00020108L,0x00120108L,
-0x00021000L,0x00121000L,0x00021100L,0x00121100L,
-0x00021008L,0x00121008L,0x00021108L,0x00121108L,
-0x04020000L,0x04120000L,0x04020100L,0x04120100L,
-0x04020008L,0x04120008L,0x04020108L,0x04120108L,
-0x04021000L,0x04121000L,0x04021100L,0x04121100L,
-0x04021008L,0x04121008L,0x04021108L,0x04121108L,
-},{
-/* for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
-0x00000000L,0x10000000L,0x00010000L,0x10010000L,
-0x00000004L,0x10000004L,0x00010004L,0x10010004L,
-0x20000000L,0x30000000L,0x20010000L,0x30010000L,
-0x20000004L,0x30000004L,0x20010004L,0x30010004L,
-0x00100000L,0x10100000L,0x00110000L,0x10110000L,
-0x00100004L,0x10100004L,0x00110004L,0x10110004L,
-0x20100000L,0x30100000L,0x20110000L,0x30110000L,
-0x20100004L,0x30100004L,0x20110004L,0x30110004L,
-0x00001000L,0x10001000L,0x00011000L,0x10011000L,
-0x00001004L,0x10001004L,0x00011004L,0x10011004L,
-0x20001000L,0x30001000L,0x20011000L,0x30011000L,
-0x20001004L,0x30001004L,0x20011004L,0x30011004L,
-0x00101000L,0x10101000L,0x00111000L,0x10111000L,
-0x00101004L,0x10101004L,0x00111004L,0x10111004L,
-0x20101000L,0x30101000L,0x20111000L,0x30111000L,
-0x20101004L,0x30101004L,0x20111004L,0x30111004L,
-},{
-/* for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 */
-0x00000000L,0x08000000L,0x00000008L,0x08000008L,
-0x00000400L,0x08000400L,0x00000408L,0x08000408L,
-0x00020000L,0x08020000L,0x00020008L,0x08020008L,
-0x00020400L,0x08020400L,0x00020408L,0x08020408L,
-0x00000001L,0x08000001L,0x00000009L,0x08000009L,
-0x00000401L,0x08000401L,0x00000409L,0x08000409L,
-0x00020001L,0x08020001L,0x00020009L,0x08020009L,
-0x00020401L,0x08020401L,0x00020409L,0x08020409L,
-0x02000000L,0x0A000000L,0x02000008L,0x0A000008L,
-0x02000400L,0x0A000400L,0x02000408L,0x0A000408L,
-0x02020000L,0x0A020000L,0x02020008L,0x0A020008L,
-0x02020400L,0x0A020400L,0x02020408L,0x0A020408L,
-0x02000001L,0x0A000001L,0x02000009L,0x0A000009L,
-0x02000401L,0x0A000401L,0x02000409L,0x0A000409L,
-0x02020001L,0x0A020001L,0x02020009L,0x0A020009L,
-0x02020401L,0x0A020401L,0x02020409L,0x0A020409L,
-},{
-/* for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 */
-0x00000000L,0x00000100L,0x00080000L,0x00080100L,
-0x01000000L,0x01000100L,0x01080000L,0x01080100L,
-0x00000010L,0x00000110L,0x00080010L,0x00080110L,
-0x01000010L,0x01000110L,0x01080010L,0x01080110L,
-0x00200000L,0x00200100L,0x00280000L,0x00280100L,
-0x01200000L,0x01200100L,0x01280000L,0x01280100L,
-0x00200010L,0x00200110L,0x00280010L,0x00280110L,
-0x01200010L,0x01200110L,0x01280010L,0x01280110L,
-0x00000200L,0x00000300L,0x00080200L,0x00080300L,
-0x01000200L,0x01000300L,0x01080200L,0x01080300L,
-0x00000210L,0x00000310L,0x00080210L,0x00080310L,
-0x01000210L,0x01000310L,0x01080210L,0x01080310L,
-0x00200200L,0x00200300L,0x00280200L,0x00280300L,
-0x01200200L,0x01200300L,0x01280200L,0x01280300L,
-0x00200210L,0x00200310L,0x00280210L,0x00280310L,
-0x01200210L,0x01200310L,0x01280210L,0x01280310L,
-},{
-/* for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 */
-0x00000000L,0x04000000L,0x00040000L,0x04040000L,
-0x00000002L,0x04000002L,0x00040002L,0x04040002L,
-0x00002000L,0x04002000L,0x00042000L,0x04042000L,
-0x00002002L,0x04002002L,0x00042002L,0x04042002L,
-0x00000020L,0x04000020L,0x00040020L,0x04040020L,
-0x00000022L,0x04000022L,0x00040022L,0x04040022L,
-0x00002020L,0x04002020L,0x00042020L,0x04042020L,
-0x00002022L,0x04002022L,0x00042022L,0x04042022L,
-0x00000800L,0x04000800L,0x00040800L,0x04040800L,
-0x00000802L,0x04000802L,0x00040802L,0x04040802L,
-0x00002800L,0x04002800L,0x00042800L,0x04042800L,
-0x00002802L,0x04002802L,0x00042802L,0x04042802L,
-0x00000820L,0x04000820L,0x00040820L,0x04040820L,
-0x00000822L,0x04000822L,0x00040822L,0x04040822L,
-0x00002820L,0x04002820L,0x00042820L,0x04042820L,
-0x00002822L,0x04002822L,0x00042822L,0x04042822L,
-}};
diff --git a/secure/lib/libdes/speed.c b/secure/lib/libdes/speed.c
deleted file mode 100644
index 583c0a9f2a22..000000000000
--- a/secure/lib/libdes/speed.c
+++ /dev/null
@@ -1,310 +0,0 @@
-/* crypto/des/speed.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/* 11-Sep-92 Andrew Daviel   Support for Silicon Graphics IRIX added */
-/* 06-Apr-92 Luke Brennan    Support for VMS and add extra signal calls */
-
-#ifndef MSDOS
-#define TIMES
-#endif
-
-#include <stdio.h>
-#ifndef MSDOS
-#include <unistd.h>
-#else
-#include <io.h>
-#endif
-#include <signal.h>
-#ifndef VMS
-#ifndef _IRIX
-#include <time.h>
-#endif
-#ifdef TIMES
-#include <sys/types.h>
-#include <sys/times.h>
-#endif
-#else /* VMS */
-#include <types.h>
-struct tms {
-	time_t tms_utime;
-	time_t tms_stime;
-	time_t tms_uchild;	/* I dunno...  */
-	time_t tms_uchildsys;	/* so these names are a guess :-) */
-	}
-#endif
-#ifndef TIMES
-#include <sys/timeb.h>
-#endif
-
-#ifdef sun
-#include <limits.h>
-#include <sys/param.h>
-#endif
-
-#include "des.h"
-
-/* The following if from times(3) man page.  It may need to be changed */
-#ifndef HZ
-#ifndef CLK_TCK
-#ifndef VMS
-#define HZ	100.0
-#else /* VMS */
-#define HZ	100.0
-#endif
-#else /* CLK_TCK */
-#define HZ ((double)CLK_TCK)
-#endif
-#endif
-
-#define BUFSIZE	((long)1024*8)
-long run=0;
-
-#ifndef NOPROTO
-double Time_F(int s);
-#else
-double Time_F();
-#endif
-
-#ifdef SIGALRM
-#if defined(__STDC__) || defined(sgi)
-#define SIGRETTYPE void
-#else
-#define SIGRETTYPE int
-#endif
-
-#ifndef NOPROTO
-SIGRETTYPE sig_done(int sig);
-#else
-SIGRETTYPE sig_done();
-#endif
-
-SIGRETTYPE sig_done(sig)
-int sig;
-	{
-	signal(SIGALRM,sig_done);
-	run=0;
-#ifdef LINT
-	sig=sig;
-#endif
-	}
-#endif
-
-#define START	0
-#define STOP	1
-
-double Time_F(s)
-int s;
-	{
-	double ret;
-#ifdef TIMES
-	static struct tms tstart,tend;
-
-	if (s == START)
-		{
-		times(&tstart);
-		return(0);
-		}
-	else
-		{
-		times(&tend);
-		ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ;
-		return((ret == 0.0)?1e-6:ret);
-		}
-#else /* !times() */
-	static struct timeb tstart,tend;
-	long i;
-
-	if (s == START)
-		{
-		ftime(&tstart);
-		return(0);
-		}
-	else
-		{
-		ftime(&tend);
-		i=(long)tend.millitm-(long)tstart.millitm;
-		ret=((double)(tend.time-tstart.time))+((double)i)/1000.0;
-		return((ret == 0.0)?1e-6:ret);
-		}
-#endif
-	}
-
-int main(argc,argv)
-int argc;
-char **argv;
-	{
-	long count;
-	static unsigned char buf[BUFSIZE];
-	static des_cblock key ={0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0};
-	static des_cblock key2={0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12};
-	static des_cblock key3={0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34};
-	des_key_schedule sch,sch2,sch3;
-	double a,b,c,d,e;
-#ifndef SIGALARM
-	long ca,cb,cc,cd,ce;
-#endif
-
-#ifndef TIMES
-	printf("To get the most acurate results, try to run this\n");
-	printf("program when this computer is idle.\n");
-#endif
-
-	des_set_key((C_Block *)key2,sch2);
-	des_set_key((C_Block *)key3,sch3);
-
-#ifndef SIGALRM
-	printf("First we calculate the approximate speed ...\n");
-	des_set_key((C_Block *)key,sch);
-	count=10;
-	do	{
-		long i;
-
-		count*=2;
-		Time_F(START);
-		for (i=count; i; i--)
-			des_ecb_encrypt((C_Block *)buf,(C_Block *)buf,
-				&(sch[0]),DES_ENCRYPT);
-		d=Time_F(STOP);
-		} while (d < 3.0);
-	ca=count;
-	cb=count*3;
-	cc=count*3*8/BUFSIZE+1;
-	cd=count*8/BUFSIZE+1;
-	ce=count/20+1;
-	printf("Doing set_key %ld times\n",ca);
-#define COND(d)	(count != (d))
-#define COUNT(d) (d)
-#else
-#define COND(c)	(run)
-#define COUNT(d) (count)
-	signal(SIGALRM,sig_done);
-	printf("Doing set_key for 10 seconds\n");
-	alarm(10);
-#endif
-
-	Time_F(START);
-	for (count=0,run=1; COND(ca); count++)
-		des_set_key((C_Block *)key,sch);
-	d=Time_F(STOP);
-	printf("%ld set_key's in %.2f seconds\n",count,d);
-	a=((double)COUNT(ca))/d;
-
-#ifdef SIGALRM
-	printf("Doing des_ecb_encrypt's for 10 seconds\n");
-	alarm(10);
-#else
-	printf("Doing des_ecb_encrypt %ld times\n",cb);
-#endif
-	Time_F(START);
-	for (count=0,run=1; COND(cb); count++)
-		des_ecb_encrypt((C_Block *)buf,(C_Block *)buf,
-			&(sch[0]),DES_ENCRYPT);
-	d=Time_F(STOP);
-	printf("%ld des_ecb_encrypt's in %.2f second\n",count,d);
-	b=((double)COUNT(cb)*8)/d;
-
-#ifdef SIGALRM
-	printf("Doing des_cbc_encrypt on %ld byte blocks for 10 seconds\n",
-		BUFSIZE);
-	alarm(10);
-#else
-	printf("Doing des_cbc_encrypt %ld times on %ld byte blocks\n",cc,
-		BUFSIZE);
-#endif
-	Time_F(START);
-	for (count=0,run=1; COND(cc); count++)
-		des_ncbc_encrypt((C_Block *)buf,(C_Block *)buf,BUFSIZE,&(sch[0]),
-			(C_Block *)&(key[0]),DES_ENCRYPT);
-	d=Time_F(STOP);
-	printf("%ld des_cbc_encrypt's of %ld byte blocks in %.2f second\n",
-		count,BUFSIZE,d);
-	c=((double)COUNT(cc)*BUFSIZE)/d;
-
-#ifdef SIGALRM
-	printf("Doing des_ede_cbc_encrypt on %ld byte blocks for 10 seconds\n",
-		BUFSIZE);
-	alarm(10);
-#else
-	printf("Doing des_ede_cbc_encrypt %ld times on %ld byte blocks\n",cd,
-		BUFSIZE);
-#endif
-	Time_F(START);
-	for (count=0,run=1; COND(cd); count++)
-		des_ede3_cbc_encrypt((C_Block *)buf,(C_Block *)buf,BUFSIZE,
-			&(sch[0]),
-			&(sch2[0]),
-			&(sch3[0]),
-			(C_Block *)&(key[0]),
-			DES_ENCRYPT);
-	d=Time_F(STOP);
-	printf("%ld des_ede_cbc_encrypt's of %ld byte blocks in %.2f second\n",
-		count,BUFSIZE,d);
-	d=((double)COUNT(cd)*BUFSIZE)/d;
-
-#ifdef SIGALRM
-	printf("Doing crypt for 10 seconds\n");
-	alarm(10);
-#else
-	printf("Doing crypt %ld times\n",ce);
-#endif
-	Time_F(START);
-	for (count=0,run=1; COND(ce); count++)
-		crypt("testing1","ef");
-	e=Time_F(STOP);
-	printf("%ld crypts in %.2f second\n",count,e);
-	e=((double)COUNT(ce))/e;
-
-	printf("set_key            per sec = %12.2f (%5.1fuS)\n",a,1.0e6/a);
-	printf("DES ecb bytes      per sec = %12.2f (%5.1fuS)\n",b,8.0e6/b);
-	printf("DES cbc bytes      per sec = %12.2f (%5.1fuS)\n",c,8.0e6/c);
-	printf("DES ede cbc bytes  per sec = %12.2f (%5.1fuS)\n",d,8.0e6/d);
-	printf("crypt              per sec = %12.2f (%5.1fuS)\n",e,1.0e6/e);
-	exit(0);
-#ifdef LINT
-	return(0);
-#endif
-	}
diff --git a/secure/lib/libdes/spr.h b/secure/lib/libdes/spr.h
deleted file mode 100644
index 58cc13085fdf..000000000000
--- a/secure/lib/libdes/spr.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/* crypto/des/spr.h */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-static const DES_LONG des_SPtrans[8][64]={
-{
-/* nibble 0 */
-0x00820200L, 0x00020000L, 0x80800000L, 0x80820200L,
-0x00800000L, 0x80020200L, 0x80020000L, 0x80800000L,
-0x80020200L, 0x00820200L, 0x00820000L, 0x80000200L,
-0x80800200L, 0x00800000L, 0x00000000L, 0x80020000L,
-0x00020000L, 0x80000000L, 0x00800200L, 0x00020200L,
-0x80820200L, 0x00820000L, 0x80000200L, 0x00800200L,
-0x80000000L, 0x00000200L, 0x00020200L, 0x80820000L,
-0x00000200L, 0x80800200L, 0x80820000L, 0x00000000L,
-0x00000000L, 0x80820200L, 0x00800200L, 0x80020000L,
-0x00820200L, 0x00020000L, 0x80000200L, 0x00800200L,
-0x80820000L, 0x00000200L, 0x00020200L, 0x80800000L,
-0x80020200L, 0x80000000L, 0x80800000L, 0x00820000L,
-0x80820200L, 0x00020200L, 0x00820000L, 0x80800200L,
-0x00800000L, 0x80000200L, 0x80020000L, 0x00000000L,
-0x00020000L, 0x00800000L, 0x80800200L, 0x00820200L,
-0x80000000L, 0x80820000L, 0x00000200L, 0x80020200L,
-},{
-/* nibble 1 */
-0x10042004L, 0x00000000L, 0x00042000L, 0x10040000L,
-0x10000004L, 0x00002004L, 0x10002000L, 0x00042000L,
-0x00002000L, 0x10040004L, 0x00000004L, 0x10002000L,
-0x00040004L, 0x10042000L, 0x10040000L, 0x00000004L,
-0x00040000L, 0x10002004L, 0x10040004L, 0x00002000L,
-0x00042004L, 0x10000000L, 0x00000000L, 0x00040004L,
-0x10002004L, 0x00042004L, 0x10042000L, 0x10000004L,
-0x10000000L, 0x00040000L, 0x00002004L, 0x10042004L,
-0x00040004L, 0x10042000L, 0x10002000L, 0x00042004L,
-0x10042004L, 0x00040004L, 0x10000004L, 0x00000000L,
-0x10000000L, 0x00002004L, 0x00040000L, 0x10040004L,
-0x00002000L, 0x10000000L, 0x00042004L, 0x10002004L,
-0x10042000L, 0x00002000L, 0x00000000L, 0x10000004L,
-0x00000004L, 0x10042004L, 0x00042000L, 0x10040000L,
-0x10040004L, 0x00040000L, 0x00002004L, 0x10002000L,
-0x10002004L, 0x00000004L, 0x10040000L, 0x00042000L,
-},{
-/* nibble 2 */
-0x41000000L, 0x01010040L, 0x00000040L, 0x41000040L,
-0x40010000L, 0x01000000L, 0x41000040L, 0x00010040L,
-0x01000040L, 0x00010000L, 0x01010000L, 0x40000000L,
-0x41010040L, 0x40000040L, 0x40000000L, 0x41010000L,
-0x00000000L, 0x40010000L, 0x01010040L, 0x00000040L,
-0x40000040L, 0x41010040L, 0x00010000L, 0x41000000L,
-0x41010000L, 0x01000040L, 0x40010040L, 0x01010000L,
-0x00010040L, 0x00000000L, 0x01000000L, 0x40010040L,
-0x01010040L, 0x00000040L, 0x40000000L, 0x00010000L,
-0x40000040L, 0x40010000L, 0x01010000L, 0x41000040L,
-0x00000000L, 0x01010040L, 0x00010040L, 0x41010000L,
-0x40010000L, 0x01000000L, 0x41010040L, 0x40000000L,
-0x40010040L, 0x41000000L, 0x01000000L, 0x41010040L,
-0x00010000L, 0x01000040L, 0x41000040L, 0x00010040L,
-0x01000040L, 0x00000000L, 0x41010000L, 0x40000040L,
-0x41000000L, 0x40010040L, 0x00000040L, 0x01010000L,
-},{
-/* nibble 3 */
-0x00100402L, 0x04000400L, 0x00000002L, 0x04100402L,
-0x00000000L, 0x04100000L, 0x04000402L, 0x00100002L,
-0x04100400L, 0x04000002L, 0x04000000L, 0x00000402L,
-0x04000002L, 0x00100402L, 0x00100000L, 0x04000000L,
-0x04100002L, 0x00100400L, 0x00000400L, 0x00000002L,
-0x00100400L, 0x04000402L, 0x04100000L, 0x00000400L,
-0x00000402L, 0x00000000L, 0x00100002L, 0x04100400L,
-0x04000400L, 0x04100002L, 0x04100402L, 0x00100000L,
-0x04100002L, 0x00000402L, 0x00100000L, 0x04000002L,
-0x00100400L, 0x04000400L, 0x00000002L, 0x04100000L,
-0x04000402L, 0x00000000L, 0x00000400L, 0x00100002L,
-0x00000000L, 0x04100002L, 0x04100400L, 0x00000400L,
-0x04000000L, 0x04100402L, 0x00100402L, 0x00100000L,
-0x04100402L, 0x00000002L, 0x04000400L, 0x00100402L,
-0x00100002L, 0x00100400L, 0x04100000L, 0x04000402L,
-0x00000402L, 0x04000000L, 0x04000002L, 0x04100400L,
-},{
-/* nibble 4 */
-0x02000000L, 0x00004000L, 0x00000100L, 0x02004108L,
-0x02004008L, 0x02000100L, 0x00004108L, 0x02004000L,
-0x00004000L, 0x00000008L, 0x02000008L, 0x00004100L,
-0x02000108L, 0x02004008L, 0x02004100L, 0x00000000L,
-0x00004100L, 0x02000000L, 0x00004008L, 0x00000108L,
-0x02000100L, 0x00004108L, 0x00000000L, 0x02000008L,
-0x00000008L, 0x02000108L, 0x02004108L, 0x00004008L,
-0x02004000L, 0x00000100L, 0x00000108L, 0x02004100L,
-0x02004100L, 0x02000108L, 0x00004008L, 0x02004000L,
-0x00004000L, 0x00000008L, 0x02000008L, 0x02000100L,
-0x02000000L, 0x00004100L, 0x02004108L, 0x00000000L,
-0x00004108L, 0x02000000L, 0x00000100L, 0x00004008L,
-0x02000108L, 0x00000100L, 0x00000000L, 0x02004108L,
-0x02004008L, 0x02004100L, 0x00000108L, 0x00004000L,
-0x00004100L, 0x02004008L, 0x02000100L, 0x00000108L,
-0x00000008L, 0x00004108L, 0x02004000L, 0x02000008L,
-},{
-/* nibble 5 */
-0x20000010L, 0x00080010L, 0x00000000L, 0x20080800L,
-0x00080010L, 0x00000800L, 0x20000810L, 0x00080000L,
-0x00000810L, 0x20080810L, 0x00080800L, 0x20000000L,
-0x20000800L, 0x20000010L, 0x20080000L, 0x00080810L,
-0x00080000L, 0x20000810L, 0x20080010L, 0x00000000L,
-0x00000800L, 0x00000010L, 0x20080800L, 0x20080010L,
-0x20080810L, 0x20080000L, 0x20000000L, 0x00000810L,
-0x00000010L, 0x00080800L, 0x00080810L, 0x20000800L,
-0x00000810L, 0x20000000L, 0x20000800L, 0x00080810L,
-0x20080800L, 0x00080010L, 0x00000000L, 0x20000800L,
-0x20000000L, 0x00000800L, 0x20080010L, 0x00080000L,
-0x00080010L, 0x20080810L, 0x00080800L, 0x00000010L,
-0x20080810L, 0x00080800L, 0x00080000L, 0x20000810L,
-0x20000010L, 0x20080000L, 0x00080810L, 0x00000000L,
-0x00000800L, 0x20000010L, 0x20000810L, 0x20080800L,
-0x20080000L, 0x00000810L, 0x00000010L, 0x20080010L,
-},{
-/* nibble 6 */
-0x00001000L, 0x00000080L, 0x00400080L, 0x00400001L,
-0x00401081L, 0x00001001L, 0x00001080L, 0x00000000L,
-0x00400000L, 0x00400081L, 0x00000081L, 0x00401000L,
-0x00000001L, 0x00401080L, 0x00401000L, 0x00000081L,
-0x00400081L, 0x00001000L, 0x00001001L, 0x00401081L,
-0x00000000L, 0x00400080L, 0x00400001L, 0x00001080L,
-0x00401001L, 0x00001081L, 0x00401080L, 0x00000001L,
-0x00001081L, 0x00401001L, 0x00000080L, 0x00400000L,
-0x00001081L, 0x00401000L, 0x00401001L, 0x00000081L,
-0x00001000L, 0x00000080L, 0x00400000L, 0x00401001L,
-0x00400081L, 0x00001081L, 0x00001080L, 0x00000000L,
-0x00000080L, 0x00400001L, 0x00000001L, 0x00400080L,
-0x00000000L, 0x00400081L, 0x00400080L, 0x00001080L,
-0x00000081L, 0x00001000L, 0x00401081L, 0x00400000L,
-0x00401080L, 0x00000001L, 0x00001001L, 0x00401081L,
-0x00400001L, 0x00401080L, 0x00401000L, 0x00001001L,
-},{
-/* nibble 7 */
-0x08200020L, 0x08208000L, 0x00008020L, 0x00000000L,
-0x08008000L, 0x00200020L, 0x08200000L, 0x08208020L,
-0x00000020L, 0x08000000L, 0x00208000L, 0x00008020L,
-0x00208020L, 0x08008020L, 0x08000020L, 0x08200000L,
-0x00008000L, 0x00208020L, 0x00200020L, 0x08008000L,
-0x08208020L, 0x08000020L, 0x00000000L, 0x00208000L,
-0x08000000L, 0x00200000L, 0x08008020L, 0x08200020L,
-0x00200000L, 0x00008000L, 0x08208000L, 0x00000020L,
-0x00200000L, 0x00008000L, 0x08000020L, 0x08208020L,
-0x00008020L, 0x08000000L, 0x00000000L, 0x00208000L,
-0x08200020L, 0x08008020L, 0x08008000L, 0x00200020L,
-0x08208000L, 0x00000020L, 0x00200020L, 0x08008000L,
-0x08208020L, 0x00200000L, 0x08200000L, 0x08000020L,
-0x00208000L, 0x00008020L, 0x08008020L, 0x08200000L,
-0x00000020L, 0x08208000L, 0x00208020L, 0x00000000L,
-0x08000000L, 0x08200020L, 0x00008000L, 0x00208020L,
-}};
diff --git a/secure/lib/libdes/str2key.c b/secure/lib/libdes/str2key.c
deleted file mode 100644
index af889d7efb23..000000000000
--- a/secure/lib/libdes/str2key.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/* crypto/des/str2key.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include "des_locl.h"
-
-extern int des_check_key;
-
-void des_string_to_key(str, key)
-char *str;
-des_cblock (*key);
-	{
-	des_key_schedule ks;
-	int i,length;
-	register unsigned char j;
-
-	memset(key,0,8);
-	length=strlen(str);
-#ifdef OLD_STR_TO_KEY
-	for (i=0; i<length; i++)
-		(*key)[i%8]^=(str[i]<<1);
-#else /* MIT COMPATIBLE */
-	for (i=0; i<length; i++)
-		{
-		j=str[i];
-		if ((i%16) < 8)
-			(*key)[i%8]^=(j<<1);
-		else
-			{
-			/* Reverse the bit order 05/05/92 eay */
-			j=((j<<4)&0xf0)|((j>>4)&0x0f);
-			j=((j<<2)&0xcc)|((j>>2)&0x33);
-			j=((j<<1)&0xaa)|((j>>1)&0x55);
-			(*key)[7-(i%8)]^=j;
-			}
-		}
-#endif
-	des_set_odd_parity((des_cblock *)key);
-	i=des_check_key;
-	des_check_key=0;
-	des_set_key((des_cblock *)key,ks);
-	des_check_key=i;
-	des_cbc_cksum((des_cblock *)str,(des_cblock *)key,(long)length,ks,
-		(des_cblock *)key);
-	memset(ks,0,sizeof(ks));
-	des_set_odd_parity((des_cblock *)key);
-	}
-
-void des_string_to_2keys(str, key1, key2)
-char *str;
-des_cblock (*key1);
-des_cblock (*key2);
-	{
-	des_key_schedule ks;
-	int i,length;
-	register unsigned char j;
-
-	memset(key1,0,8);
-	memset(key2,0,8);
-	length=strlen(str);
-#ifdef OLD_STR_TO_KEY
-	if (length <= 8)
-		{
-		for (i=0; i<length; i++)
-			{
-			(*key2)[i]=(*key1)[i]=(str[i]<<1);
-			}
-		}
-	else
-		{
-		for (i=0; i<length; i++)
-			{
-			if ((i/8)&1)
-				(*key2)[i%8]^=(str[i]<<1);
-			else
-				(*key1)[i%8]^=(str[i]<<1);
-			}
-		}
-#else /* MIT COMPATIBLE */
-	for (i=0; i<length; i++)
-		{
-		j=str[i];
-		if ((i%32) < 16)
-			{
-			if ((i%16) < 8)
-				(*key1)[i%8]^=(j<<1);
-			else
-				(*key2)[i%8]^=(j<<1);
-			}
-		else
-			{
-			j=((j<<4)&0xf0)|((j>>4)&0x0f);
-			j=((j<<2)&0xcc)|((j>>2)&0x33);
-			j=((j<<1)&0xaa)|((j>>1)&0x55);
-			if ((i%16) < 8)
-				(*key1)[7-(i%8)]^=j;
-			else
-				(*key2)[7-(i%8)]^=j;
-			}
-		}
-	if (length <= 8) memcpy(key2,key1,8);
-#endif
-	des_set_odd_parity((des_cblock *)key1);
-	des_set_odd_parity((des_cblock *)key2);
-	i=des_check_key;
-	des_check_key=0;
-	des_set_key((des_cblock *)key1,ks);
-	des_cbc_cksum((des_cblock *)str,(des_cblock *)key1,(long)length,ks,
-		(des_cblock *)key1);
-	des_set_key((des_cblock *)key2,ks);
-	des_cbc_cksum((des_cblock *)str,(des_cblock *)key2,(long)length,ks,
-		(des_cblock *)key2);
-	des_check_key=i;
-	memset(ks,0,sizeof(ks));
-	des_set_odd_parity(key1);
-	des_set_odd_parity(key2);
-	}
diff --git a/secure/lib/libdes/supp.c b/secure/lib/libdes/supp.c
deleted file mode 100644
index c098f2eb4f4c..000000000000
--- a/secure/lib/libdes/supp.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* crypto/des/supp.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/*
- * Copyright (c) 1995
- *	Mark Murray.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Mark Murray
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY MARK MURRAY AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#include <stdio.h>
-#include "des_locl.h"
-
-void des_cblock_print_file(cb, fp)
-	des_cblock *cb;
-	FILE *fp;
-{
-	int i;
-	unsigned int *p = (unsigned int *)cb;
-
-	fprintf(fp, " 0x { ");
-	for (i = 0; i < 8; i++) {
-		fprintf(fp, "%x", p[i]);
-		if (i != 7) fprintf(fp, ", ");
-	}
-	fprintf(fp, " }");
-}
diff --git a/secure/lib/libdes/t/perl b/secure/lib/libdes/t/perl
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/secure/lib/libdes/t/perl
+++ /dev/null
diff --git a/secure/lib/libdes/t/test b/secure/lib/libdes/t/test
deleted file mode 100644
index 97acd0552e43..000000000000
--- a/secure/lib/libdes/t/test
+++ /dev/null
@@ -1,27 +0,0 @@
-#!./perl
-
-BEGIN { push(@INC, qw(../../../lib ../../lib ../lib lib)); }
-
-use DES;
-
-$key='00000000';
-$ks=DES::set_key($key);
-@a=split(//,$ks);
-foreach (@a) { printf "%02x-",ord($_); }
-print "\n";
-
-
-$key=DES::random_key();
-print "($_)\n";
-@a=split(//,$key);
-foreach (@a) { printf "%02x-",ord($_); }
-print "\n";
-$str="this is and again into the breach";
-($k1,$k2)=DES::string_to_2keys($str);
-@a=split(//,$k1);
-foreach (@a) { printf "%02x-",ord($_); }
-print "\n";
-@a=split(//,$k2);
-foreach (@a) { printf "%02x-",ord($_); }
-print "\n";
-
diff --git a/secure/lib/libdes/testdes.pl b/secure/lib/libdes/testdes.pl
deleted file mode 100755
index 67fbd47f3695..000000000000
--- a/secure/lib/libdes/testdes.pl
+++ /dev/null
@@ -1,167 +0,0 @@
-#!/usr/bin/perl
-
-# des.pl tesing code
-
-require 'des.pl';
-
-$num_tests=34;
-@key_data=(
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
-	0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF,
-	0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10,
-	0x7C,0xA1,0x10,0x45,0x4A,0x1A,0x6E,0x57,
-	0x01,0x31,0xD9,0x61,0x9D,0xC1,0x37,0x6E,
-	0x07,0xA1,0x13,0x3E,0x4A,0x0B,0x26,0x86,
-	0x38,0x49,0x67,0x4C,0x26,0x02,0x31,0x9E,
-	0x04,0xB9,0x15,0xBA,0x43,0xFE,0xB5,0xB6,
-	0x01,0x13,0xB9,0x70,0xFD,0x34,0xF2,0xCE,
-	0x01,0x70,0xF1,0x75,0x46,0x8F,0xB5,0xE6,
-	0x43,0x29,0x7F,0xAD,0x38,0xE3,0x73,0xFE,
-	0x07,0xA7,0x13,0x70,0x45,0xDA,0x2A,0x16,
-	0x04,0x68,0x91,0x04,0xC2,0xFD,0x3B,0x2F,
-	0x37,0xD0,0x6B,0xB5,0x16,0xCB,0x75,0x46,
-	0x1F,0x08,0x26,0x0D,0x1A,0xC2,0x46,0x5E,
-	0x58,0x40,0x23,0x64,0x1A,0xBA,0x61,0x76,
-	0x02,0x58,0x16,0x16,0x46,0x29,0xB0,0x07,
-	0x49,0x79,0x3E,0xBC,0x79,0xB3,0x25,0x8F,
-	0x4F,0xB0,0x5E,0x15,0x15,0xAB,0x73,0xA7,
-	0x49,0xE9,0x5D,0x6D,0x4C,0xA2,0x29,0xBF,
-	0x01,0x83,0x10,0xDC,0x40,0x9B,0x26,0xD6,
-	0x1C,0x58,0x7F,0x1C,0x13,0x92,0x4F,0xEF,
-	0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,
-	0x1F,0x1F,0x1F,0x1F,0x0E,0x0E,0x0E,0x0E,
-	0xE0,0xFE,0xE0,0xFE,0xF1,0xFE,0xF1,0xFE,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF,
-	0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10,
-	);
-
-@plain_data=(
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x01,
-	0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
-	0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,
-	0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF,
-	0x01,0xA1,0xD6,0xD0,0x39,0x77,0x67,0x42,
-	0x5C,0xD5,0x4C,0xA8,0x3D,0xEF,0x57,0xDA,
-	0x02,0x48,0xD4,0x38,0x06,0xF6,0x71,0x72,
-	0x51,0x45,0x4B,0x58,0x2D,0xDF,0x44,0x0A,
-	0x42,0xFD,0x44,0x30,0x59,0x57,0x7F,0xA2,
-	0x05,0x9B,0x5E,0x08,0x51,0xCF,0x14,0x3A,
-	0x07,0x56,0xD8,0xE0,0x77,0x47,0x61,0xD2,
-	0x76,0x25,0x14,0xB8,0x29,0xBF,0x48,0x6A,
-	0x3B,0xDD,0x11,0x90,0x49,0x37,0x28,0x02,
-	0x26,0x95,0x5F,0x68,0x35,0xAF,0x60,0x9A,
-	0x16,0x4D,0x5E,0x40,0x4F,0x27,0x52,0x32,
-	0x6B,0x05,0x6E,0x18,0x75,0x9F,0x5C,0xCA,
-	0x00,0x4B,0xD6,0xEF,0x09,0x17,0x60,0x62,
-	0x48,0x0D,0x39,0x00,0x6E,0xE7,0x62,0xF2,
-	0x43,0x75,0x40,0xC8,0x69,0x8F,0x3C,0xFA,
-	0x07,0x2D,0x43,0xA0,0x77,0x07,0x52,0x92,
-	0x02,0xFE,0x55,0x77,0x81,0x17,0xF1,0x2A,
-	0x1D,0x9D,0x5C,0x50,0x18,0xF7,0x28,0xC2,
-	0x30,0x55,0x32,0x28,0x6D,0x6F,0x29,0x5A,
-	0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF,
-	0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF,
-	0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF);
-
-@cipher_data=(
-	0x8C,0xA6,0x4D,0xE9,0xC1,0xB1,0x23,0xA7,
-	0x73,0x59,0xB2,0x16,0x3E,0x4E,0xDC,0x58,
-	0x95,0x8E,0x6E,0x62,0x7A,0x05,0x55,0x7B,
-	0xF4,0x03,0x79,0xAB,0x9E,0x0E,0xC5,0x33,
-	0x17,0x66,0x8D,0xFC,0x72,0x92,0x53,0x2D,
-	0x8A,0x5A,0xE1,0xF8,0x1A,0xB8,0xF2,0xDD,
-	0x8C,0xA6,0x4D,0xE9,0xC1,0xB1,0x23,0xA7,
-	0xED,0x39,0xD9,0x50,0xFA,0x74,0xBC,0xC4,
-	0x69,0x0F,0x5B,0x0D,0x9A,0x26,0x93,0x9B,
-	0x7A,0x38,0x9D,0x10,0x35,0x4B,0xD2,0x71,
-	0x86,0x8E,0xBB,0x51,0xCA,0xB4,0x59,0x9A,
-	0x71,0x78,0x87,0x6E,0x01,0xF1,0x9B,0x2A,
-	0xAF,0x37,0xFB,0x42,0x1F,0x8C,0x40,0x95,
-	0x86,0xA5,0x60,0xF1,0x0E,0xC6,0xD8,0x5B,
-	0x0C,0xD3,0xDA,0x02,0x00,0x21,0xDC,0x09,
-	0xEA,0x67,0x6B,0x2C,0xB7,0xDB,0x2B,0x7A,
-	0xDF,0xD6,0x4A,0x81,0x5C,0xAF,0x1A,0x0F,
-	0x5C,0x51,0x3C,0x9C,0x48,0x86,0xC0,0x88,
-	0x0A,0x2A,0xEE,0xAE,0x3F,0xF4,0xAB,0x77,
-	0xEF,0x1B,0xF0,0x3E,0x5D,0xFA,0x57,0x5A,
-	0x88,0xBF,0x0D,0xB6,0xD7,0x0D,0xEE,0x56,
-	0xA1,0xF9,0x91,0x55,0x41,0x02,0x0B,0x56,
-	0x6F,0xBF,0x1C,0xAF,0xCF,0xFD,0x05,0x56,
-	0x2F,0x22,0xE4,0x9B,0xAB,0x7C,0xA1,0xAC,
-	0x5A,0x6B,0x61,0x2C,0xC2,0x6C,0xCE,0x4A,
-	0x5F,0x4C,0x03,0x8E,0xD1,0x2B,0x2E,0x41,
-	0x63,0xFA,0xC0,0xD0,0x34,0xD9,0xF7,0x93,
-	0x61,0x7B,0x3A,0x0C,0xE8,0xF0,0x71,0x00,
-	0xDB,0x95,0x86,0x05,0xF8,0xC8,0xC6,0x06,
-	0xED,0xBF,0xD1,0xC6,0x6C,0x29,0xCC,0xC7,
-	0x35,0x55,0x50,0xB2,0x15,0x0E,0x24,0x51,
-	0xCA,0xAA,0xAF,0x4D,0xEA,0xF1,0xDB,0xAE,
-	0xD5,0xD4,0x4F,0xF7,0x20,0x68,0x3D,0x0D,
-	0x2A,0x2B,0xB0,0x08,0xDF,0x97,0xC2,0xF2);
-
-print "Doing ecb tests\n";
-for ($i=0; $i<$num_tests; $i++)
-	{
-	printf "Doing test $i\n";
-	$key =pack("C8",splice(@key_data   ,0,8));
-	$data=pack("C8",splice(@plain_data ,0,8));
-	$res =pack("C8",splice(@cipher_data,0,8));
-
-	@ks=  &des_set_key($key);
-	$out1= &des_ecb_encrypt(*ks,1,$data);
-	$out2= &des_ecb_encrypt(*ks,0,$out1);
-	$out3= &des_ecb_encrypt(*ks,0,$res);
-	&eprint("encryption failure",$res,$out1)
-		if ($out1 ne $res);
-	&eprint("encryption/decryption failure",$data,$out2)
-		if ($out2 ne $data);
-	&eprint("decryption failure",$data,$out3)
-		if ($data ne $out3);
-	}
-print "Done\n";
-
-print "doing speed test over 30 seconds\n";
-$SIG{'ALRM'}='done';
-sub done {$done=1;}
-$done=0;
-
-$count=0;
-$d=pack("C8",0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef);
-@ks=  &des_set_key($d);
-alarm(30);
-$start=(times)[0];
-while (!$done)
-	{
-	$count++;
-	$d=&des_ecb_encrypt(*ks,1,$d);
-	}
-$end=(times)[0];
-$t=$end-$start;
-printf "$count DESs in %.2f seconds is %.2f DESs/sec or %.2f bytes/sec\n",
-	1.0*$t,1.0*$count/$t,$count*8.0/$t;
-
-sub eprint
-	{
-	local($s,$c,$e)=@_;
-	local(@k);
-
-	@k=unpack("C8",$c);
-	printf "%02x%02x%02x%02x %02x%02x%02x%02x - ",unpack("C8",$c);
-	printf "%02x%02x%02x%02x %02x%02x%02x%02x :",unpack("C8",$e);
-	print " $s\n";
-	}
diff --git a/secure/lib/libdes/times b/secure/lib/libdes/times
deleted file mode 100644
index f5080ef99c0f..000000000000
--- a/secure/lib/libdes/times
+++ /dev/null
@@ -1,216 +0,0 @@
-existing library on a DEC 3000/500
-set_key            per sec =    256294.06 (  3.9uS)
-DES ecb bytes      per sec =   3553694.40 (  2.3uS)
-DES cbc bytes      per sec =   3661004.80 (  2.2uS)
-DES ede cbc bytes  per sec =   1353115.99 (  5.9uS)
-crypt              per sec =     16829.40 ( 59.4uS)
-
-Intel P6/200 (NEXTSTEP) - cc -O3 (cc: gcc 2.5.8)
-set_key            per sec =    219220.82 (  4.6uS)
-DES ecb bytes      per sec =   2438014.04 (  3.3uS)
-DES cbc bytes      per sec =   2467648.85 (  3.2uS)
-DES ede cbc bytes  per sec =    942121.58 (  8.5uS)
-crypt              per sec =     11398.73 ( 87.7uS)
-
-# DECstation Alpha 3000 Model 700 AXP / OSF1 V3.0
-# gcc 2.6.3 / Young libdes 3.21
-set_key            per sec =    149369.74 (  6.7uS)
-DES ecb bytes      per sec =   2011976.68 (  4.0uS)
-DES cbc bytes      per sec =   2002245.35 (  4.0uS)
-DES ede cbc bytes  per sec =    793677.19 ( 10.1uS)
-crypt              per sec =      9244.52 (108.2uS)
-
-# Sun Ultra I gcc 2.7.2 / Young libdes 3.21
-set_key            per sec =    147172.22 (  6.8uS)
-DES ecb bytes      per sec =   1815054.70 (  4.4uS)
-DES cbc bytes      per sec =   1829405.18 (  4.4uS)
-DES ede cbc bytes  per sec =    714490.23 ( 11.2uS)
-crypt              per sec =      8896.24 (112.4uS)
-
-SGI Challenge (MIPS R4400 200mhz) - gcc -O2
-set_key       per sec =    114141.13 (  8.8uS)
-DES ecb bytes per sec =   1573472.84 (  5.1uS)
-DES cbc bytes per sec =   1580418.20 (  5.1uS)
-crypt         per sec =      7137.84 (140.1uS)
-
-DEC Alpha DEC  4000/710 AXP OSF/1 v 3.0 - gcc -O2 2.6.1
-set_key       per sec =    123138.49 (  8.1uS)
-DES ecb bytes per sec =   1407546.76 (  5.7uS)
-DES cbc bytes per sec =   1404103.21 (  5.7uS)
-crypt         per sec =      7746.76 (129.1uS)
-
-DEC Alpha DEC  4000/710 AXP OSF/1 v 3.0 - cc -O4 'DEC Compiler Driver 3.11'
-set_key       per sec =    135160.83 (  7.4uS)
-DES ecb bytes per sec =   1267753.22 (  6.3uS)
-DES cbc bytes per sec =   1260564.90 (  6.3uS)
-crypt         per sec =      6479.37 (154.3uS)
-
-SGI Challenge (MIPS R4400 200mhz) - cc -O2
-set_key       per sec =    124000.10 (  8.1uS)
-DES ecb bytes per sec =   1338138.45 (  6.0uS)
-DES cbc bytes per sec =   1356515.84 (  5.9uS)
-crypt         per sec =      6223.92 (160.7uS)
-
-Intel P5/133 (NEXTSTEP) - cc -O3 (cc: gcc 2.5.8)
-set_key            per sec =     81923.10 ( 12.2uS)
-DES ecb bytes      per sec =   1104711.61 (  7.2uS)
-DES cbc bytes      per sec =   1091536.05 (  7.3uS)
-DES ede cbc bytes  per sec =    410502.62 ( 19.5uS)
-crypt              per sec =      4849.60 (206.2uS)
-
-Sun SPARC 20 (NEXTSTEP) - cc -O3 (cc: gcc 2.5.8)
-set_key            per sec =     60973.05 ( 16.4uS)
-DES ecb bytes      per sec =    806032.15 (  9.9uS)
-DES cbc bytes      per sec =    801534.95 ( 10.0uS)
-DES ede cbc bytes  per sec =    298799.73 ( 26.8uS)
-crypt              per sec =      3678.42 (271.9uS)
-
-SGI Indy (MIPS R4600 133mhz) -cc -O2
-set_key       per sec =     88470.54 ( 11.3uS)
-DES ecb bytes per sec =   1023040.33 (  7.8uS)
-DES cbc bytes per sec =   1033610.01 (  7.7uS)
-crypt         per sec =      4641.51 (215.4uS)
-
-HP-UX 9000/887 cc +O3
-set_key       per sec =     76824.30 ( 13.0uS)
-DES ecb bytes per sec =   1048911.20 (  7.6uS)
-DES cbc bytes per sec =   1072332.80 (  7.5uS)
-crypt         per sec =      4968.64 (201.3uS)
-
-IRIX 5.2 IP22 (R4000) cc -O2 (galilo)
-set_key       per sec =     60615.73 ( 16.5uS)
-DES ecb bytes per sec =    584741.32 ( 13.7uS)
-DES cbc bytes per sec =    584306.94 ( 13.7uS)
-crypt         per sec =      3049.33 (327.9uS)
-
-HP-UX 9000/867 cc -O
-set_key       per sec =     48600.00 ( 20.6uS)
-DES ecb bytes per sec =    616235.14 ( 13.0uS)
-DES cbc bytes per sec =    638669.44 ( 12.5uS)
-crypt         per sec =      3016.68 (331.5uS)
-
-HP-UX 9000/867 gcc -O2
-set_key       per sec =     52120.50 ( 19.2uS)
-DES ecb bytes per sec =    715156.55 ( 11.2uS)
-DES cbc bytes per sec =    724424.28 ( 11.0uS)
-crypt         per sec =      3295.87 (303.4uS)
-
-DGUX AViiON mc88110 gcc -O2
-set_key       per sec =     55604.91 ( 18.0uS)
-DES ecb bytes per sec =    658513.25 ( 12.1uS)
-DES cbc bytes per sec =    675552.71 ( 11.8uS)
-crypt         per sec =      3438.10 (290.9uS)
-
-Sparc 10 cc -O2 (orb)
-set_key       per sec =     53002.30 ( 18.9uS)
-DES ecb bytes per sec =    705250.40 ( 11.3uS)
-DES cbc bytes per sec =    714342.40 ( 11.2uS)
-crypt         per sec =      2943.99 (339.7uS)
-
-Sparc 10 gcc -O2 (orb)
-set_key       per sec =     58681.21 ( 17.0uS)
-DES ecb bytes per sec =    772390.20 ( 10.4uS)
-DES cbc bytes per sec =    774144.00 ( 10.3uS)
-crypt         per sec =      3606.90 (277.2uS)
-
-DEC Alpha DEC  4000/610 AXP OSF/1 v 1.3 - gcc v 2.3.3
-set_key       per sec =    101840.19 (  9.8uS)
-DES ecb bytes per sec =   1223712.35 (  6.5uS)
-DES cbc bytes per sec =   1230542.98 (  6.5uS)
-crypt         per sec =      6428.75 (155.6uS)
-
-DEC Alpha DEC 4000/610 APX OSF/1 v 1.3 - cc -O2 - OSF/1 AXP
-set_key       per sec =    114198.91 (  8.8uS)
-DES ecb bytes per sec =   1022710.93 (  7.8uS)
-DES cbc bytes per sec =   1008821.93 (  7.9uS)
-crypt         per sec =      5454.13 (183.3uS)
-
-DEC Alpha - DEC 3000/500 AXP OSF/1 - cc -O2 - 02/12/92
-set_key       per sec =     83587.04 ( 12.0uS)
-DES ecb bytes per sec =    822620.82 (  9.7uS)
-DES cbc bytes per sec =    832929.60 (  9.6uS)
-crypt         per sec =      4807.62 (208.0uS)
-
-sun sparc 10/30 - gcc -O2
-set_key       per sec =     42005.24 ( 23.8uS)
-DES ecb bytes per sec =    555949.47 ( 14.4uS)
-DES cbc bytes per sec =    549440.28 ( 14.6uS)
-crypt         per sec =      2580.25 (387.6uS)
-
-PA-RISC 1.1 HP 710
-set_key       per sec =     38916.86
-DES ecb bytes per sec =    505971.82
-DES cbc bytes per sec =    515381.13
-crypt         per sec =      2438.24
-
-iris (spike) cc -O2
-set_key       per sec =     23128.83 ( 43.2uS)
-DES ecb bytes per sec =    261577.94 ( 30.6uS)
-DES cbc bytes per sec =    261746.41 ( 30.6uS)
-crypt         per sec =      1231.76 (811.8uS)
-
-sun sparc 10/30 - cc -O4
-set_key       per sec =     38379.86 ( 26.1uS)
-DES ecb bytes per sec =    460051.34 ( 17.4uS)
-DES cbc bytes per sec =    464970.54 ( 17.2uS)
-crypt         per sec =      2092.64 (477.9uS)
-
-sun sparc 2 - gcc2 -O2
-set_key       per sec =     21559.10
-DES ecb bytes per sec =    305566.92
-DES cbc bytes per sec =    303497.50
-crypt         per sec =      1410.48
-
-RS/6000 model 320
-set_key       per sec =     14371.93
-DES ecb bytes per sec =    222231.26
-DES cbc bytes per sec =    223926.79
-crypt         per sec =       981.20
-
-80486dx/66MHz Solaris 2.1 - gcc -O2 (gcc 2.6.3)
-set_key       per sec =     26814.15 ( 37.3uS)
-DES ecb bytes per sec =    345029.95 ( 23.2uS)
-DES cbc bytes per sec =    344064.00 ( 23.3uS)
-crypt         per sec =      1551.97 (644.3uS)
-
-80486dx/50MHz Solaris 2.1 - gcc -O2 (gcc 2.5.2)
-set_key       per sec =     18558.29 ( 53.9uS)
-DES ecb bytes per sec =    240873.90 ( 33.2uS)
-DES cbc bytes per sec =    239993.37 ( 33.3uS)
-crypt         per sec =      1073.67 (931.4uS)
-
-80486dx/50MHz Solaris 2.1 - cc -xO4 (cc: PC2.0.1 30 April 1993)
-set_key       per sec =     18302.79 ( 54.6uS)
-DES ecb bytes per sec =    242640.29 ( 33.0uS)
-DES cbc bytes per sec =    239568.89 ( 33.4uS)
-crypt         per sec =      1057.92 (945.2uS)
-
-68030 HP400
-set_key       per sec =      5251.28
-DES ecb bytes per sec =     56186.56
-DES cbc bytes per sec =     58681.53
-crypt         per sec =       276.15
-
-80486sx/33MHz MSDOS Turbo C v 2.0
-set_key       per sec =      1883.22 (531.0uS)
-DES ecb bytes per sec =     63393.31 (126.2uS)
-DES cbc bytes per sec =     63416.83 (126.1uS)
-crypt         per sec =       158.71 (6300.6uS)
-
-80486sx/33MHz MSDOS djgpp gcc 1.39 (32bit compiler)
-set_key       per sec =     12603.08 (79.3)
-DES ecb bytes per sec =    158875.15 (50.4)
-DES cbc bytes per sec =    159893.85 (50.0)
-crypt         per sec =       780.24 (1281.7)
-
-Version 1.99 26/08/92
-8MHz 68000 Atari-ST gcc 2.1 -O2 MiNT 0.94
-set_key       per sec =       325.68 (3070.5uS)
-DES ecb bytes per sec =      4173.67 (1916.8uS)
-DES cbc bytes per sec =      4249.89 (1882.4uS)
-crypt         per sec =        20.19 (49521.6uS)
-
-8088/4.77mh MSDOS Turbo C v 2.0
-set_key       per sec =        35.09
-DES ecb bytes per sec =       563.63
-crypt         per sec =         2.69
diff --git a/secure/lib/libdes/typemap b/secure/lib/libdes/typemap
deleted file mode 100644
index a524f53634e7..000000000000
--- a/secure/lib/libdes/typemap
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# DES SECTION
-#
-deschar *	T_DESCHARP
-des_cblock *	T_CBLOCK
-des_cblock	T_CBLOCK
-des_key_schedule	T_SCHEDULE
-des_key_schedule *	T_SCHEDULE
-
-INPUT
-T_CBLOCK
-	$var=(des_cblock *)SvPV($arg,len);
-	if (len < DES_KEY_SZ)
-		{
-		croak(\"$var needs to be at least %u bytes long\",DES_KEY_SZ);
-		}
-
-T_SCHEDULE
-	$var=(des_key_schedule *)SvPV($arg,len);
-	if (len < DES_SCHEDULE_SZ)
-		{
-		croak(\"$var needs to be at least %u bytes long\",
-			DES_SCHEDULE_SZ);
-		}
-
-OUTPUT
-T_CBLOCK
-	sv_setpvn($arg,(char *)$var,DES_KEY_SZ);
-
-T_SCHEDULE
-	sv_setpvn($arg,(char *)$var,DES_SCHEDULE_SZ);
-
-T_DESCHARP
-	sv_setpvn($arg,(char *)$var,len);
diff --git a/secure/lib/libdes/vms.com b/secure/lib/libdes/vms.com
deleted file mode 100644
index 885ea8e36b50..000000000000
--- a/secure/lib/libdes/vms.com
+++ /dev/null
@@ -1,90 +0,0 @@
-$! --- VMS.com ---
-$!
-$ GoSub defines
-$ GoSub linker_options
-$ If (P1 .nes. "")
-$ Then 
-$   GoSub 'P1'
-$ Else
-$   GoSub lib
-$   GoSub destest
-$   GoSub rpw
-$   GoSub speed
-$   GoSub des
-$ EndIF
-$!
-$ Exit
-$!
-$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-$!
-$DEFINES:
-$ OPT_FILE := "VAX_LINKER_OPTIONS.OPT"
-$!
-$ CC_OPTS := "/NODebug/OPTimize/NOWarn"
-$!
-$ LINK_OPTS := "/NODebug/NOTraceback/Contiguous"
-$!
-$ OBJS  = "cbc_cksm.obj,cbc_enc.obj,ecb_enc.obj,pcbc_enc.obj," + -
-          "qud_cksm.obj,rand_key.obj,read_pwd.obj,set_key.obj,"      + -
-          "str2key.obj,enc_read.obj,enc_writ.obj,fcrypt.obj,"           + -
-	  "cfb_enc.obj,3ecb_enc.obj,ofb_enc.obj"
-	   
-	   
-$!
-$ LIBDES = "cbc_cksm.c,cbc_enc.c,ecb_enc.c,enc_read.c,"           + -
-           "enc_writ.c,pcbc_enc.c,qud_cksm.c,rand_key.c,"         + -
-           "read_pwd.c,set_key.c,str2key.c,fcrypt.c,"                + -
-	   "cfb_enc.c,3ecb_enc.c,ofb_enc.c"
-$ Return
-$!
-$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-$!
-$LINKER_OPTIONS:
-$ If (f$search(OPT_FILE) .eqs. "")
-$ Then
-$   Create 'OPT_FILE'
-$DECK
-! Default system options file to link against the sharable C runtime library
-!
-Sys$Share:VAXcRTL.exe/Share
-$EOD
-$ EndIF
-$ Return
-$!
-$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-$!
-$LIB:
-$ CC 'CC_OPTS' 'LIBDES'
-$ If (f$search("LIBDES.OLB") .nes. "")
-$ Then Library /Object /Replace libdes 'OBJS'
-$ Else Library /Create /Object  libdes 'OBJS'
-$ EndIF
-$ Return
-$!
-$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-$!
-$DESTEST:
-$ CC 'CC_OPTS' destest
-$ Link 'link_opts' /Exec=destest destest.obj,libdes/LIBRARY,'opt_file'/Option
-$ Return
-$!
-$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-$!
-$RPW:
-$ CC 'CC_OPTS' rpw
-$ Link 'link_opts' /Exec=rpw  rpw.obj,libdes/LIBRARY,'opt_file'/Option
-$ Return
-$!
-$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-$!
-$SPEED:
-$ CC 'CC_OPTS' speed
-$ Link 'link_opts' /Exec=speed speed.obj,libdes/LIBRARY,'opt_file'/Option
-$ Return
-$!
-$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-$!
-$DES:
-$ CC 'CC_OPTS' des
-$ Link 'link_opts' /Exec=des des.obj,libdes/LIBRARY,'opt_file'/Option
-$ Return
diff --git a/secure/lib/libdes/xcbc_enc.c b/secure/lib/libdes/xcbc_enc.c
deleted file mode 100644
index 9071acf6c53d..000000000000
--- a/secure/lib/libdes/xcbc_enc.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/* crypto/des/xcbc_enc.c */
-/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au)
- * All rights reserved.
- * 
- * This file is part of an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
- * The implementation was written so as to conform with Netscapes SSL
- * specification.  This library and applications are
- * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
- * as long as the following conditions are aheared to.
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.  If this code is used in a product,
- * Eric Young should be given attribution as the author of the parts used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by Eric Young (eay@mincom.oz.au)
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include "des_locl.h"
-
-/* RSA's DESX */
-
-static unsigned char desx_white_in2out[256]={
-0xBD,0x56,0xEA,0xF2,0xA2,0xF1,0xAC,0x2A,0xB0,0x93,0xD1,0x9C,0x1B,0x33,0xFD,0xD0,
-0x30,0x04,0xB6,0xDC,0x7D,0xDF,0x32,0x4B,0xF7,0xCB,0x45,0x9B,0x31,0xBB,0x21,0x5A,
-0x41,0x9F,0xE1,0xD9,0x4A,0x4D,0x9E,0xDA,0xA0,0x68,0x2C,0xC3,0x27,0x5F,0x80,0x36,
-0x3E,0xEE,0xFB,0x95,0x1A,0xFE,0xCE,0xA8,0x34,0xA9,0x13,0xF0,0xA6,0x3F,0xD8,0x0C,
-0x78,0x24,0xAF,0x23,0x52,0xC1,0x67,0x17,0xF5,0x66,0x90,0xE7,0xE8,0x07,0xB8,0x60,
-0x48,0xE6,0x1E,0x53,0xF3,0x92,0xA4,0x72,0x8C,0x08,0x15,0x6E,0x86,0x00,0x84,0xFA,
-0xF4,0x7F,0x8A,0x42,0x19,0xF6,0xDB,0xCD,0x14,0x8D,0x50,0x12,0xBA,0x3C,0x06,0x4E,
-0xEC,0xB3,0x35,0x11,0xA1,0x88,0x8E,0x2B,0x94,0x99,0xB7,0x71,0x74,0xD3,0xE4,0xBF,
-0x3A,0xDE,0x96,0x0E,0xBC,0x0A,0xED,0x77,0xFC,0x37,0x6B,0x03,0x79,0x89,0x62,0xC6,
-0xD7,0xC0,0xD2,0x7C,0x6A,0x8B,0x22,0xA3,0x5B,0x05,0x5D,0x02,0x75,0xD5,0x61,0xE3,
-0x18,0x8F,0x55,0x51,0xAD,0x1F,0x0B,0x5E,0x85,0xE5,0xC2,0x57,0x63,0xCA,0x3D,0x6C,
-0xB4,0xC5,0xCC,0x70,0xB2,0x91,0x59,0x0D,0x47,0x20,0xC8,0x4F,0x58,0xE0,0x01,0xE2,
-0x16,0x38,0xC4,0x6F,0x3B,0x0F,0x65,0x46,0xBE,0x7E,0x2D,0x7B,0x82,0xF9,0x40,0xB5,
-0x1D,0x73,0xF8,0xEB,0x26,0xC7,0x87,0x97,0x25,0x54,0xB1,0x28,0xAA,0x98,0x9D,0xA5,
-0x64,0x6D,0x7A,0xD4,0x10,0x81,0x44,0xEF,0x49,0xD6,0xAE,0x2E,0xDD,0x76,0x5C,0x2F,
-0xA7,0x1C,0xC9,0x09,0x69,0x9A,0x83,0xCF,0x29,0x39,0xB9,0xE9,0x4C,0xFF,0x43,0xAB,
-	};
-
-void des_xwhite_in2out(des_key,in_white,out_white)
-des_cblock (*des_key);
-des_cblock (*in_white);
-des_cblock (*out_white);
-	{
-	unsigned char *key,*in,*out;
-	int out0,out1;
-	int i;
-
-	key=(unsigned char *)des_key;
-	in=(unsigned char *)in_white;
-	out=(unsigned char *)out_white;
-
-	out[0]=out[1]=out[2]=out[3]=out[4]=out[5]=out[6]=out[7]=0;
-	out0=out1=0;
-	for (i=0; i<8; i++)
-		{
-		out[i]=key[i]^desx_white_in2out[out0^out1];
-		out0=out1;
-		out1=(int)out[i&0x07];
-		}
-
-	out0=out[0];
-	out1=out[i];
-	for (i=0; i<8; i++)
-		{
-		out[i]=in[i]^desx_white_in2out[out0^out1];
-		out0=out1;
-		out1=(int)out[i&0x07];
-		}
-	}
-
-void des_xcbc_encrypt(input, output, length, schedule, ivec, inw,outw,encrypt)
-des_cblock (*input);
-des_cblock (*output);
-long length;
-des_key_schedule schedule;
-des_cblock (*ivec);
-des_cblock (*inw);
-des_cblock (*outw);
-int encrypt;
-	{
-	register DES_LONG tin0,tin1;
-	register DES_LONG tout0,tout1,xor0,xor1;
-	register DES_LONG inW0,inW1,outW0,outW1;
-	register unsigned char *in,*out;
-	register long l=length;
-	DES_LONG tin[2];
-	unsigned char *iv;
-
-	in=(unsigned char *)inw;
-	c2l(in,inW0);
-	c2l(in,inW1);
-	in=(unsigned char *)outw;
-	c2l(in,outW0);
-	c2l(in,outW1);
-
-	in=(unsigned char *)input;
-	out=(unsigned char *)output;
-	iv=(unsigned char *)ivec;
-
-	if (encrypt)
-		{
-		c2l(iv,tout0);
-		c2l(iv,tout1);
-		for (; l>0; l-=8)
-			{
-			if (l >= 8)
-				{
-				c2l(in,tin0);
-				c2l(in,tin1);
-				}
-			else
-				c2ln(in,tin0,tin1,l);
-			tin0^=tout0^inW0; tin[0]=tin0;
-			tin1^=tout1^inW1; tin[1]=tin1;
-			des_encrypt((DES_LONG *)tin,schedule,DES_ENCRYPT);
-			tout0=tin[0]^outW0; l2c(tout0,out);
-			tout1=tin[1]^outW1; l2c(tout1,out);
-			}
-		iv=(unsigned char *)ivec;
-		l2c(tout0,iv);
-		l2c(tout1,iv);
-		}
-	else
-		{
-		c2l(iv,xor0);
-		c2l(iv,xor1);
-		for (; l>0; l-=8)
-			{
-			c2l(in,tin0); tin[0]=tin0^outW0;
-			c2l(in,tin1); tin[1]=tin1^outW1;
-			des_encrypt((DES_LONG *)tin,schedule,DES_DECRYPT);
-			tout0=tin[0]^xor0^inW0;
-			tout1=tin[1]^xor1^inW1;
-			if (l >= 8)
-				{
-				l2c(tout0,out);
-				l2c(tout1,out);
-				}
-			else
-				l2cn(tout0,tout1,out,l);
-			xor0=tin0;
-			xor1=tin1;
-			}
-		iv=(unsigned char *)ivec;
-		l2c(xor0,iv);
-		l2c(xor1,iv);
-		}
-	tin0=tin1=tout0=tout1=xor0=xor1=0;
-	inW0=inW1=outW0=outW1=0;
-	tin[0]=tin[1]=0;
-	}
-
diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile
deleted file mode 100644
index ee8fddf4625c..000000000000
--- a/secure/usr.bin/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-SUBDIR= bdes
-
-.include <bsd.subdir.mk>
-
diff --git a/secure/usr.bin/Makefile.inc b/secure/usr.bin/Makefile.inc
deleted file mode 100644
index c4fd273268a5..000000000000
--- a/secure/usr.bin/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD$
-
-BINDIR=	/usr/bin
-.include "${.CURDIR}/../../Makefile.inc"
diff --git a/secure/usr.bin/bdes/Makefile b/secure/usr.bin/bdes/Makefile
deleted file mode 100644
index 78af60c8e60f..000000000000
--- a/secure/usr.bin/bdes/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
-
-PROG=	bdes
-SRCS=	bdes.c
-
-.if exists(${.OBJDIR}/../../lib/libcipher)
-LDFLAGS+= -L${.OBJDIR}/../../lib/libcipher
-.else
-LDFLAGS+= -L${.CURDIR}/../../lib/libcipher
-.endif
-
-LDADD+= -lcipher
-DPADD+= libcipher.a
-
-.include <bsd.prog.mk>
diff --git a/secure/usr.bin/bdes/bdes.1 b/secure/usr.bin/bdes/bdes.1
deleted file mode 100644
index 48179fda7624..000000000000
--- a/secure/usr.bin/bdes/bdes.1
+++ /dev/null
@@ -1,304 +0,0 @@
-.\" Copyright (c) 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Matt Bishop of Dartmouth College.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"	@(#)bdes.1	8.1 (Berkeley) 6/29/93
-.\"
-.TH BDES 1 "June 29, 1993"
-.UC 6
-.SH NAME
-bdes \- encrypt/decrypt using the Data Encryption Standard
-.SH SYNOPSIS
-.nf
-.ft B
-bdes [ \-abdp ] [ \-F N ] [ \-f N ] [ \-k key ]
-.ti +5
-[ \-m N ] [ \-o N ] [ \-v vector ]
-.ft R
-.fi
-.SH DESCRIPTION
-.I Bdes
-implements all DES modes of operation described in FIPS PUB 81, 
-including alternative cipher feedback mode and both authentication
-modes.
-.I Bdes
-reads from the standard input and writes to the standard output.
-By default, the input is encrypted using cipher block chaining mode.
-Using the same key for encryption and decryption preserves plain text.
-.PP
-All modes but the electronic code book mode require an initialization
-vector; if none is supplied, the zero vector is used.
-If no
-.I key
-is specified on the command line, the user is prompted for one (see
-.IR getpass (3)
-for more details).
-.PP
-The options are as follows:
-.TP
-\-a
-The key and initialization vector strings are to be taken as ASCII,
-suppressing the special interpretation given to leading ``0X'', ``0x'',
-``0B'', and ``0b'' characters.
-This flag applies to
-.I both
-the key and initialization vector.
-.TP
-\-b
-Use electronic code book mode.
-.TP
-\-d
-Decrypt the input.
-.TP
-\-F
-Use
-.IR N -bit
-alternative cipher feedback mode.
-Currently
-.I N
-must be a multiple of 7 between 7 and 56 inclusive (this does not conform
-to the alternative CFB mode specification).
-.TP
-\-f
-Use
-.IR N -bit
-cipher feedback mode.
-Currently
-.I N
-must be a multiple of 8 between 8 and 64 inclusive (this does not conform
-to the standard CFB mode specification).
-.TP
-\-k
-Use
-.I key
-as the cryptographic key.
-.TP
-\-m
-Compute a message authentication code (MAC) of
-.I N
-bits on the input.
-The value of
-.I N
-must be between 1 and 64 inclusive; if
-.I N
-is not a multiple of 8, enough 0 bits will be added to pad the MAC length
-to the nearest multiple of 8.
-Only the MAC is output.
-MACs are only available in cipher block chaining mode or in cipher feedback
-mode.
-.TP
-\-o
-Use
-.IR N -bit
-output feedback mode.
-Currently
-.I N
-must be a multiple of 8 between 8 and 64 inclusive (this does not conform
-to the OFB mode specification).
-.TP
-\-p
-Disable the resetting of the parity bit.
-This flag forces the parity bit of the key to be used as typed, rather than
-making each character be of odd parity.
-It is used only if the key is given in ASCII.
-.TP
-\-v
-Set the initialization vector to
-.IR vector ;
-the vector is interpreted in the same way as the key.
-The vector is ignored in electronic codebook mode.
-.PP
-The key and initialization vector are taken as sequences of ASCII
-characters which are then mapped into their bit representations.
-If either begins with ``0X'' or ``0x'',
-that one is taken as a sequence of hexadecimal digits indicating the
-bit pattern;
-if either begins with ``0B'' or ``0b'',
-that one is taken as a sequence of binary digits indicating the bit pattern.
-In either case,
-only the leading 64 bits of the key or initialization vector
-are used,
-and if fewer than 64 bits are provided, enough 0 bits are appended
-to pad the key to 64 bits.
-.PP
-According to the DES standard, the low-order bit of each character in the
-key string is deleted.
-Since most ASCII representations set the high-order bit to 0, simply
-deleting the low-order bit effectively reduces the size of the key space
-from 2\u\s-356\s0\d to 2\u\s-348\s0\d keys.
-To prevent this, the high-order bit must be a function depending in part
-upon the low-order bit; so, the high-order bit is set to whatever value
-gives odd parity.
-This preserves the key space size.
-Note this resetting of the parity bit is
-.I not
-done if the key is given in binary or hex, and can be disabled for ASCII
-keys as well.
-.PP
-The DES is considered a very strong cryptosystem, and other than table lookup
-attacks, key search attacks, and Hellman's time-memory tradeoff (all of which
-are very expensive and time-consuming), no cryptanalytic methods for breaking
-the DES are known in the open literature.
-No doubt the choice of keys and key security are the most vulnerable aspect
-of
-.IR bdes .
-.SH IMPLEMENTATION NOTES
-For implementors wishing to write software compatible with this program,
-the following notes are provided.
-This software is believed to be compatible with the implementation of the
-data encryption standard distributed by Sun Microsystems, Inc.
-.PP
-In the ECB and CBC modes, plaintext is encrypted in units of 64 bits (8 bytes,
-also called a block).
-To ensure that the plaintext file is encrypted correctly,
-.I bdes
-will (internally) append from 1 to 8 bytes, the last byte containing an
-integer stating how many bytes of that final block are from the plaintext
-file, and encrypt the resulting block.
-Hence, when decrypting, the last block may contain from 0 to 7 characters
-present in the plaintext file, and the last byte tells how many.
-Note that if during decryption the last byte of the file does not contain an
-integer between 0 and 7, either the file has been corrupted or an incorrect
-key has been given.
-A similar mechanism is used for the OFB and CFB modes, except that those
-simply require the length of the input to be a multiple of the mode size,
-and the final byte contains an integer between 0 and one less than the number
-of bytes being used as the mode.
-(This was another reason that the mode size must be a multiple of 8 for those
-modes.)
-.PP
-Unlike Sun's implementation, unused bytes of that last block are not filled
-with random data, but instead contain what was in those byte positions in
-the preceding block.
-This is quicker and more portable, and does not weaken the encryption
-significantly.
-.PP
-If the key is entered in ASCII, the parity bits of the key characters are set
-so that each key character is of odd parity.
-Unlike Sun's implementation, it is possible to enter binary or hexadecimal
-keys on the command line, and if this is done, the parity bits are
-.I not
-reset.
-This allows testing using arbitrary bit patterns as keys.
-.PP
-The Sun implementation always uses an initialization vector of 0
-(that is, all zeroes).
-By default,
-.I bdes
-does too, but this may be changed from the command line.
-.SH SEE ALSO
-crypt(3), getpass(3)
-.sp
-.IR "Data Encryption Standard" ,
-Federal Information Processing Standard #46,
-National Bureau of Standards,
-U.S. Department of Commerce,
-Washington DC
-(Jan. 1977)
-.sp
-.IR "DES Modes of Operation" ,
-Federal Information Processing Standard #81,
-National Bureau of Standards,
-U.S. Department of Commerce
-Washington DC
-(Dec. 1980)
-.sp
-Dorothy Denning,
-.IR "Cryptography and Data Security" ,
-Addison-Wesley Publishing Co.,
-Reading, MA
-\(co1982.
-.sp
-Matt Bishop,
-.IR "Implementation Notes on bdes(1)" ,
-Technical Report PCS-TR-91-158,
-Department of Mathematics and Computer Science,
-Dartmouth College,
-Hanover, NH  03755
-(Apr. 1991).
-.SH DISCLAIMER
-.nf
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-.fi
-.SH BUGS
-There is a controversy raging over whether the DES will still be secure
-in a few years.
-The advent of special-purpose hardware could reduce the cost of any of the
-methods of attack named above so that they are no longer computationally
-infeasible.
-.PP
-As the key or key schedule is stored in memory, the encryption can be
-compromised if memory is readable.
-Additionally, programs which display programs' arguments may compromise the
-key and initialization vector, if they are specified on the command line.
-To avoid this
-.I bdes
-overwrites its arguments, however, the obvious race cannot currently be
-avoided.
-.PP
-Certain specific keys should be avoided because they introduce potential
-weaknesses; these keys, called the
-.I weak
-and
-.I semiweak
-keys, are (in hex notation, where p is either 0 or 1, and P is either
-e or f):
-.sp
-.nf
-.in +10n
-.ta \w'0x0p0p0p0p0p0p0p0p\0\0\0'u+5n
-0x0p0p0p0p0p0p0p0p	0x0p1P0p1P0p0P0p0P
-0x0pep0pep0pfp0pfp	0x0pfP0pfP0pfP0pfP
-0x1P0p1P0p0P0p0P0p	0x1P1P1P1P0P0P0P0P
-0x1Pep1Pep0Pfp0Pfp	0x1PfP1PfP0PfP0PfP
-0xep0pep0pfp0pfp0p	0xep1Pep1pfp0Pfp0P
-0xepepepepepepepep	0xepfPepfPfpfPfpfP
-0xfP0pfP0pfP0pfP0p	0xfP1PfP1PfP0PfP0P
-0xfPepfPepfPepfPep	0xfPfPfPfPfPfPfPfP
-.fi
-.in -10n
-.sp
-This is inherent in the DES algorithm (see Moore and Simmons,
-\*(LqCycle structure of the DES with weak and semi-weak keys,\*(Rq
-.I "Advances in Cryptology \- Crypto '86 Proceedings" ,
-Springer-Verlag New York, \(co1987, pp. 9-32.)
diff --git a/secure/usr.bin/bdes/bdes.c b/secure/usr.bin/bdes/bdes.c
deleted file mode 100644
index 257d54968953..000000000000
--- a/secure/usr.bin/bdes/bdes.c
+++ /dev/null
@@ -1,1046 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Matt Bishop of Dartmouth College.
- *
- * The United States Government has rights in this work pursuant
- * to contract no. NAG 2-680 between the National Aeronautics and
- * Space Administration and Dartmouth College.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)bdes.c	8.1 (Berkeley) 6/6/93";
-#endif /* not lint */
-
-/*
- * BDES -- DES encryption package for Berkeley Software Distribution 4.4
- * options:
- *	-a	key is in ASCII
- *	-b	use ECB (electronic code book) mode
- *	-d	invert (decrypt) input
- *	-f b	use b-bit CFB (cipher feedback) mode
- *	-F b	use b-bit CFB (cipher feedback) alternative mode
- *	-k key	use key as the cryptographic key
- *	-m b	generate a MAC of length b
- *	-o b	use b-bit OFB (output feedback) mode
- *	-p	don't reset the parity bit
- *	-v v	use v as the initialization vector (ignored for ECB)
- * note: the last character of the last block is the integer indicating
- * how many characters of that block are to be output
- *
- * Author: Matt Bishop
- *	   Department of Mathematics and Computer Science
- *	   Dartmouth College
- *	   Hanover, NH  03755
- * Email:  Matt.Bishop@dartmouth.edu
- *	   ...!decvax!dartvax!Matt.Bishop
- *
- * See Technical Report PCS-TR91-158, Department of Mathematics and Computer
- * Science, Dartmouth College, for a detailed description of the implemen-
- * tation and differences between it and Sun's.  The DES is described in
- * FIPS PUB 46, and the modes in FIPS PUB 81 (see either the manual page
- * or the technical report for a complete reference).
- */
-
-#include <errno.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-
-/*
- * BSD and System V systems offer special library calls that do
- * block moves and fills, so if possible we take advantage of them
- */
-#define	MEMCPY(dest,src,len)	bcopy((src),(dest),(len))
-#define	MEMZERO(dest,len)	bzero((dest),(len))
-
-/* Hide the calls to the primitive encryption routines. */
-#define	FASTWAY
-#ifdef	FASTWAY
-#define	DES_KEY(buf) \
-	if (des_setkey(buf)) \
-		err("des_setkey", 0);
-#define	DES_XFORM(buf) \
-	if (des_cipher(buf, buf, 0L, (inverse ? -1 : 1))) \
-		err("des_cipher", 0);
-#else
-#define	DES_KEY(buf)	{						\
-				char bits1[64];	/* bits of key */	\
-				expand(buf, bits1);			\
-				if (setkey(bits1))			\
-					err("setkey", 0);		\
-			}
-#define	DES_XFORM(buf)	{						\
-				char bits1[64];	/* bits of message */	\
-				expand(buf, bits1);			\
-				if (encrypt(bits1, inverse))		\
-					err("encrypt", 0);		\
-				compress(bits1, buf);			\
-			}
-#endif
-
-/*
- * this does an error-checking write
- */
-#define	READ(buf, n)	fread(buf, sizeof(char), n, stdin)
-#define WRITE(buf,n)						\
-		if (fwrite(buf, sizeof(char), n, stdout) != n)	\
-			err(bn, NULL);
-
-/*
- * some things to make references easier
- */
-typedef char Desbuf[8];
-#define	CHAR(x,i)	(x[i])
-#define	UCHAR(x,i)	(x[i])
-#define	BUFFER(x)	(x)
-#define	UBUFFER(x)	(x)
-
-/*
- * global variables and related macros
- */
-#define KEY_DEFAULT		0	/* interpret radix of key from key */
-#define KEY_ASCII		1	/* key is in ASCII characters */
-int keybase = KEY_DEFAULT;		/* how to interpret the key */
-
-enum { 					/* encrypt, decrypt, authenticate */
-	MODE_ENCRYPT, MODE_DECRYPT, MODE_AUTHENTICATE
-} mode = MODE_ENCRYPT;
-enum {					/* ecb, cbc, cfb, cfba, ofb? */
-	ALG_ECB, ALG_CBC, ALG_CFB, ALG_OFB, ALG_CFBA
-} alg = ALG_CBC;
-
-Desbuf ivec;				/* initialization vector */
-char bits[] = {				/* used to extract bits from a char */
-	'\200', '\100', '\040', '\020', '\010', '\004', '\002', '\001'
-};
-int inverse;				/* 0 to encrypt, 1 to decrypt */
-int macbits = -1;			/* number of bits in authentication */
-int fbbits = -1;			/* number of feedback bits */
-int pflag;				/* 1 to preserve parity bits */
-
-main(ac, av)
-	int ac;				/* arg count */
-	char **av;			/* arg vector */
-{
-	extern int optind;		/* option (argument) number */
-	extern char *optarg;		/* argument to option if any */
-	register int i;			/* counter in a for loop */
-	register char *p;		/* used to obtain the key */
-	Desbuf msgbuf;			/* I/O buffer */
-	int kflag;			/* command-line encryptiooon key */
-	int argc;			/* the real arg count */
-	char **argv;			/* the real argument vector */
-
-	/*
-	 * Hide the arguments from ps(1) by making private copies of them
-	 * and clobbering the global (visible to ps(1)) ones.
-	 */
-	argc = ac;
-	ac = 1;
-	argv = malloc((argc + 1) * sizeof(char *));
-	for (i = 0; i < argc; ++i) {
-		argv[i] = strdup(av[i]);
-		MEMZERO(av[i], strlen(av[i]));
-	}
-	argv[argc] = NULL;
-
-	/* initialize the initialization vctor */
-	MEMZERO(ivec, 8);
-
-	/* process the argument list */
-	kflag = 0;
-	while ((i = getopt(argc, argv, "abdF:f:k:m:o:pv:")) != EOF)
-		switch(i) {
-		case 'a':		/* key is ASCII */
-			keybase = KEY_ASCII;
-			break;
-		case 'b':		/* use ECB mode */
-			alg = ALG_ECB;
-			break;
-		case 'd':		/* decrypt */
-			mode = MODE_DECRYPT;
-			break;
-		case 'F':		/* use alternative CFB mode */
-			alg = ALG_CFBA;
-			if ((fbbits = setbits(optarg, 7)) > 56 || fbbits == 0)
-				err(-1, "-F: number must be 1-56 inclusive");
-			else if (fbbits == -1)
-				err(-1, "-F: number must be a multiple of 7");
-			break;
-		case 'f':		/* use CFB mode */
-			alg = ALG_CFB;
-			if ((fbbits = setbits(optarg, 8)) > 64 || fbbits == 0)
-				err(-1, "-f: number must be 1-64 inclusive");
-			else if (fbbits == -1)
-				err(-1, "-f: number must be a multiple of 8");
-			break;
-		case 'k':		/* encryption key */
-			kflag = 1;
-			cvtkey(BUFFER(msgbuf), optarg);
-			break;
-		case 'm':		/* number of bits for MACing */
-			mode = MODE_AUTHENTICATE;
-			if ((macbits = setbits(optarg, 1)) > 64)
-				err(-1, "-m: number must be 0-64 inclusive");
-			break;
-		case 'o':		/* use OFB mode */
-			alg = ALG_OFB;
-			if ((fbbits = setbits(optarg, 8)) > 64 || fbbits == 0)
-				err(-1, "-o: number must be 1-64 inclusive");
-			else if (fbbits == -1)
-				err(-1, "-o: number must be a multiple of 8");
-			break;
-		case 'p':		/* preserve parity bits */
-			pflag = 1;
-			break;
-		case 'v':		/* set initialization vector */
-			cvtkey(BUFFER(ivec), optarg);
-			break;
-		default:		/* error */
-			usage();
-		}
-
-	if (!kflag) {
-		/*
-		 * if the key's not ASCII, assume it is
-		 */
-		keybase = KEY_ASCII;
-		/*
-		 * get the key
-		 */
-		p = getpass("Enter key: ");
-		/*
-		 * copy it, nul-padded, into the key area
-		 */
-		cvtkey(BUFFER(msgbuf), p);
-	}
-
-	makekey(msgbuf);
-	inverse = (alg == ALG_CBC || alg == ALG_ECB) && mode == MODE_DECRYPT;
-
-	switch(alg) {
-	case ALG_CBC:
-		switch(mode) {
-		case MODE_AUTHENTICATE:	/* authenticate using CBC mode */
-			cbcauth();
-			break;
-		case MODE_DECRYPT:	/* decrypt using CBC mode */
-			cbcdec();
-			break;
-		case MODE_ENCRYPT:	/* encrypt using CBC mode */
-			cbcenc();
-			break;
-		}
-		break;
-	case ALG_CFB:
-		switch(mode) {
-		case MODE_AUTHENTICATE:	/* authenticate using CFB mode */
-			cfbauth();
-			break;
-		case MODE_DECRYPT:	/* decrypt using CFB mode */
-			cfbdec();
-			break;
-		case MODE_ENCRYPT:	/* encrypt using CFB mode */
-			cfbenc();
-			break;
-		}
-		break;
-	case ALG_CFBA:
-		switch(mode) {
-		case MODE_AUTHENTICATE:	/* authenticate using CFBA mode */
-			err(-1, "can't authenticate with CFBA mode");
-			break;
-		case MODE_DECRYPT:	/* decrypt using CFBA mode */
-			cfbadec();
-			break;
-		case MODE_ENCRYPT:	/* encrypt using CFBA mode */
-			cfbaenc();
-			break;
-		}
-		break;
-	case ALG_ECB:
-		switch(mode) {
-		case MODE_AUTHENTICATE:	/* authenticate using ECB mode */
-			err(-1, "can't authenticate with ECB mode");
-			break;
-		case MODE_DECRYPT:	/* decrypt using ECB mode */
-			ecbdec();
-			break;
-		case MODE_ENCRYPT:	/* encrypt using ECB mode */
-			ecbenc();
-			break;
-		}
-		break;
-	case ALG_OFB:
-		switch(mode) {
-		case MODE_AUTHENTICATE:	/* authenticate using OFB mode */
-			err(-1, "can't authenticate with OFB mode");
-			break;
-		case MODE_DECRYPT:	/* decrypt using OFB mode */
-			ofbdec();
-			break;
-		case MODE_ENCRYPT:	/* encrypt using OFB mode */
-			ofbenc();
-			break;
-		}
-		break;
-	}
-	exit(0);
-}
-
-/*
- * print a warning message and, possibly, terminate
- */
-err(n, s)
-	int n;			/* offending block number */
-	char *s;		/* the message */
-{
-	if (n > 0)
-		(void)fprintf(stderr, "bdes (block %d): ", n);
-	else
-		(void)fprintf(stderr, "bdes: ");
-	(void)fprintf(stderr, "%s\n", s ? s : strerror(errno));
-	exit(1);
-}
-
-/*
- * map a hex character to an integer
- */
-tobinhex(c, radix)
-	char c;			/* char to be converted */
-	int radix;		/* base (2 to 16) */
-{
-	switch(c) {
-	case '0':		return(0x0);
-	case '1':		return(0x1);
-	case '2':		return(radix > 2 ? 0x2 : -1);
-	case '3':		return(radix > 3 ? 0x3 : -1);
-	case '4':		return(radix > 4 ? 0x4 : -1);
-	case '5':		return(radix > 5 ? 0x5 : -1);
-	case '6':		return(radix > 6 ? 0x6 : -1);
-	case '7':		return(radix > 7 ? 0x7 : -1);
-	case '8':		return(radix > 8 ? 0x8 : -1);
-	case '9':		return(radix > 9 ? 0x9 : -1);
-	case 'A': case 'a':	return(radix > 10 ? 0xa : -1);
-	case 'B': case 'b':	return(radix > 11 ? 0xb : -1);
-	case 'C': case 'c':	return(radix > 12 ? 0xc : -1);
-	case 'D': case 'd':	return(radix > 13 ? 0xd : -1);
-	case 'E': case 'e':	return(radix > 14 ? 0xe : -1);
-	case 'F': case 'f':	return(radix > 15 ? 0xf : -1);
-	}
-	/*
-	 * invalid character
-	 */
-	return(-1);
-}
-
-/*
- * convert the key to a bit pattern
- */
-cvtkey(obuf, ibuf)
-	char *obuf;			/* bit pattern */
-	char *ibuf;			/* the key itself */
-{
-	register int i, j;		/* counter in a for loop */
-	int nbuf[64];			/* used for hex/key translation */
-
-	/*
-	 * just switch on the key base
-	 */
-	switch(keybase) {
-	case KEY_ASCII:			/* ascii to integer */
-		(void)strncpy(obuf, ibuf, 8);
-		return;
-	case KEY_DEFAULT:		/* tell from context */
-		/*
-		 * leading '0x' or '0X' == hex key
-		 */
-		if (ibuf[0] == '0' && (ibuf[1] == 'x' || ibuf[1] == 'X')) {
-			ibuf = &ibuf[2];
-			/*
-			 * now translate it, bombing on any illegal hex digit
-			 */
-			for (i = 0; ibuf[i] && i < 16; i++)
-				if ((nbuf[i] = tobinhex(ibuf[i], 16)) == -1)
-					err(-1, "bad hex digit in key");
-			while (i < 16)
-				nbuf[i++] = 0;
-			for (i = 0; i < 8; i++)
-				obuf[i] =
-				    ((nbuf[2*i]&0xf)<<4) | (nbuf[2*i+1]&0xf);
-			/* preserve parity bits */
-			pflag = 1;
-			return;
-		}
-		/*
-		 * leading '0b' or '0B' == binary key
-		 */
-		if (ibuf[0] == '0' && (ibuf[1] == 'b' || ibuf[1] == 'B')) {
-			ibuf = &ibuf[2];
-			/*
-			 * now translate it, bombing on any illegal binary digit
-			 */
-			for (i = 0; ibuf[i] && i < 16; i++)
-				if ((nbuf[i] = tobinhex(ibuf[i], 2)) == -1)
-					err(-1, "bad binary digit in key");
-			while (i < 64)
-				nbuf[i++] = 0;
-			for (i = 0; i < 8; i++)
-				for (j = 0; j < 8; j++)
-					obuf[i] = (obuf[i]<<1)|nbuf[8*i+j];
-			/* preserve parity bits */
-			pflag = 1;
-			return;
-		}
-		/*
-		 * no special leader -- ASCII
-		 */
-		(void)strncpy(obuf, ibuf, 8);
-	}
-}
-
-/*
- * convert an ASCII string into a decimal number:
- * 1. must be between 0 and 64 inclusive
- * 2. must be a valid decimal number
- * 3. must be a multiple of mult
- */
-setbits(s, mult)
-	char *s;			/* the ASCII string */
-	int mult;			/* what it must be a multiple of */
-{
-	register char *p;		/* pointer in a for loop */
-	register int n = 0;		/* the integer collected */
-
-	/*
-	 * skip white space
-	 */
-	while (isspace(*s))
-		s++;
-	/*
-	 * get the integer
-	 */
-	for (p = s; *p; p++) {
-		if (isdigit(*p))
-			n = n * 10 + *p - '0';
-		else {
-			err(-1, "bad decimal digit in MAC length");
-		}
-	}
-	/*
-	 * be sure it's a multiple of mult
-	 */
-	return((n % mult != 0) ? -1 : n);
-}
-
-/*****************
- * DES FUNCTIONS *
- *****************/
-/*
- * This sets the DES key and (if you're using the deszip version)
- * the direction of the transformation.  This uses the Sun
- * to map the 64-bit key onto the 56 bits that the key schedule
- * generation routines use: the old way, which just uses the user-
- * supplied 64 bits as is, and the new way, which resets the parity
- * bit to be the same as the low-order bit in each character.  The
- * new way generates a greater variety of key schedules, since many
- * systems set the parity (high) bit of each character to 0, and the
- * DES ignores the low order bit of each character.
- */
-makekey(buf)
-	Desbuf buf;				/* key block */
-{
-	register int i, j;			/* counter in a for loop */
-	register int par;			/* parity counter */
-
-	/*
-	 * if the parity is not preserved, flip it
-	 */
-	if (!pflag) {
-		for (i = 0; i < 8; i++) {
-			par = 0;
-			for (j = 1; j < 8; j++)
-				if ((bits[j]&UCHAR(buf, i)) != 0)
-					par++;
-			if ((par&01) == 01)
-				UCHAR(buf, i) = UCHAR(buf, i)&0177;
-			else
-				UCHAR(buf, i) = (UCHAR(buf, i)&0177)|0200;
-		}
-	}
-
-	DES_KEY(UBUFFER(buf));
-}
-
-/*
- * This encrypts using the Electronic Code Book mode of DES
- */
-ecbenc()
-{
-	register int n;		/* number of bytes actually read */
-	register int bn;	/* block number */
-	Desbuf msgbuf;		/* I/O buffer */
-
-	for (bn = 0; (n = READ(BUFFER(msgbuf),  8)) == 8; bn++) {
-		/*
-		 * do the transformation
-		 */
-		DES_XFORM(UBUFFER(msgbuf));
-		WRITE(BUFFER(msgbuf), 8);
-	}
-	/*
-	 * at EOF or last block -- in either ase, the last byte contains
-	 * the character representation of the number of bytes in it
-	 */
-	bn++;
-	MEMZERO(&CHAR(msgbuf, n), 8 - n);
-	CHAR(msgbuf, 7) = n;
-	DES_XFORM(UBUFFER(msgbuf));
-	WRITE(BUFFER(msgbuf), 8);
-
-}
-
-/*
- * This decrypts using the Electronic Code Book mode of DES
- */
-ecbdec()
-{
-	register int n;		/* number of bytes actually read */
-	register int c;		/* used to test for EOF */
-	register int bn;	/* block number */
-	Desbuf msgbuf;		/* I/O buffer */
-
-	for (bn = 1; (n = READ(BUFFER(msgbuf), 8)) == 8; bn++) {
-		/*
-		 * do the transformation
-		 */
-		DES_XFORM(UBUFFER(msgbuf));
-		/*
-		 * if the last one, handle it specially
-		 */
-		if ((c = getchar()) == EOF) {
-			n = CHAR(msgbuf, 7);
-			if (n < 0 || n > 7)
-				err(bn, "decryption failed (block corrupted)");
-		}
-		else
-			(void)ungetc(c, stdin);
-		WRITE(BUFFER(msgbuf), n);
-	}
-	if (n > 0)
-		err(bn, "decryption failed (incomplete block)");
-}
-
-/*
- * This encrypts using the Cipher Block Chaining mode of DES
- */
-cbcenc()
-{
-	register int n;		/* number of bytes actually read */
-	register int bn;	/* block number */
-	Desbuf msgbuf;		/* I/O buffer */
-
-	/*
-	 * do the transformation
-	 */
-	for (bn = 1; (n = READ(BUFFER(msgbuf), 8)) == 8; bn++) {
-		for (n = 0; n < 8; n++)
-			CHAR(msgbuf, n) ^= CHAR(ivec, n);
-		DES_XFORM(UBUFFER(msgbuf));
-		MEMCPY(BUFFER(ivec), BUFFER(msgbuf), 8);
-		WRITE(BUFFER(msgbuf), 8);
-	}
-	/*
-	 * at EOF or last block -- in either case, the last byte contains
-	 * the character representation of the number of bytes in it
-	 */
-	bn++;
-	MEMZERO(&CHAR(msgbuf, n), 8 - n);
-	CHAR(msgbuf, 7) = n;
-	for (n = 0; n < 8; n++)
-		CHAR(msgbuf, n) ^= CHAR(ivec, n);
-	DES_XFORM(UBUFFER(msgbuf));
-	WRITE(BUFFER(msgbuf), 8);
-
-}
-
-/*
- * This decrypts using the Cipher Block Chaining mode of DES
- */
-cbcdec()
-{
-	register int n;		/* number of bytes actually read */
-	Desbuf msgbuf;		/* I/O buffer */
-	Desbuf ibuf;		/* temp buffer for initialization vector */
-	register int c;		/* used to test for EOF */
-	register int bn;	/* block number */
-
-	for (bn = 0; (n = READ(BUFFER(msgbuf), 8)) == 8; bn++) {
-		/*
-		 * do the transformation
-		 */
-		MEMCPY(BUFFER(ibuf), BUFFER(msgbuf), 8);
-		DES_XFORM(UBUFFER(msgbuf));
-		for (c = 0; c < 8; c++)
-			UCHAR(msgbuf, c) ^= UCHAR(ivec, c);
-		MEMCPY(BUFFER(ivec), BUFFER(ibuf), 8);
-		/*
-		 * if the last one, handle it specially
-		 */
-		if ((c = getchar()) == EOF) {
-			n = CHAR(msgbuf, 7);
-			if (n < 0 || n > 7)
-				err(bn, "decryption failed (block corrupted)");
-		}
-		else
-			(void)ungetc(c, stdin);
-		WRITE(BUFFER(msgbuf), n);
-	}
-	if (n > 0)
-		err(bn, "decryption failed (incomplete block)");
-}
-
-/*
- * This authenticates using the Cipher Block Chaining mode of DES
- */
-cbcauth()
-{
-	register int n, j;		/* number of bytes actually read */
-	Desbuf msgbuf;		/* I/O buffer */
-	Desbuf encbuf;		/* encryption buffer */
-
-	/*
-	 * do the transformation
-	 * note we DISCARD the encrypted block;
-	 * we only care about the last one
-	 */
-	while ((n = READ(BUFFER(msgbuf), 8)) == 8) {
-		for (n = 0; n < 8; n++)
-			CHAR(encbuf, n) = CHAR(msgbuf, n) ^ CHAR(ivec, n);
-		DES_XFORM(UBUFFER(encbuf));
-		MEMCPY(BUFFER(ivec), BUFFER(encbuf), 8);
-	}
-	/*
-	 * now compute the last one, right padding with '\0' if need be
-	 */
-	if (n > 0) {
-		MEMZERO(&CHAR(msgbuf, n), 8 - n);
-		for (n = 0; n < 8; n++)
-			CHAR(encbuf, n) = CHAR(msgbuf, n) ^ CHAR(ivec, n);
-		DES_XFORM(UBUFFER(encbuf));
-	}
-	/*
-	 * drop the bits
-	 * we write chars until fewer than 7 bits,
-	 * and then pad the last one with 0 bits
-	 */
-	for (n = 0; macbits > 7; n++, macbits -= 8)
-		(void)putchar(CHAR(encbuf, n));
-	if (macbits > 0) {
-		CHAR(msgbuf, 0) = 0x00;
-		for (j = 0; j < macbits; j++)
-			CHAR(msgbuf, 0) |= (CHAR(encbuf, n)&bits[j]);
-		(void)putchar(CHAR(msgbuf, 0));
-	}
-}
-
-/*
- * This encrypts using the Cipher FeedBack mode of DES
- */
-cfbenc()
-{
-	register int n;		/* number of bytes actually read */
-	register int nbytes;	/* number of bytes to read */
-	register int bn;	/* block number */
-	char ibuf[8];		/* input buffer */
-	Desbuf msgbuf;		/* encryption buffer */
-
-	/*
-	 * do things in bytes, not bits
-	 */
-	nbytes = fbbits / 8;
-	/*
-	 * do the transformation
-	 */
-	for (bn = 1; (n = READ(ibuf, nbytes)) == nbytes; bn++) {
-		MEMCPY(BUFFER(msgbuf), BUFFER(ivec), 8);
-		DES_XFORM(UBUFFER(msgbuf));
-		for (n = 0; n < 8 - nbytes; n++)
-			UCHAR(ivec, n) = UCHAR(ivec, n+nbytes);
-		for (n = 0; n < nbytes; n++)
-			UCHAR(ivec, 8-nbytes+n) = ibuf[n] ^ UCHAR(msgbuf, n);
-		WRITE(&CHAR(ivec, 8-nbytes), nbytes);
-	}
-	/*
-	 * at EOF or last block -- in either case, the last byte contains
-	 * the character representation of the number of bytes in it
-	 */
-	bn++;
-	MEMZERO(&ibuf[n], nbytes - n);
-	ibuf[nbytes - 1] = n;
-	MEMCPY(BUFFER(msgbuf), BUFFER(ivec), 8);
-	DES_XFORM(UBUFFER(msgbuf));
-	for (n = 0; n < nbytes; n++)
-		ibuf[n] ^= UCHAR(msgbuf, n);
-	WRITE(ibuf, nbytes);
-}
-
-/*
- * This decrypts using the Cipher Block Chaining mode of DES
- */
-cfbdec()
-{
-	register int n;		/* number of bytes actually read */
-	register int c;		/* used to test for EOF */
-	register int nbytes;	/* number of bytes to read */
-	register int bn;	/* block number */
-	char ibuf[8];		/* input buffer */
-	char obuf[8];		/* output buffer */
-	Desbuf msgbuf;		/* encryption buffer */
-
-	/*
-	 * do things in bytes, not bits
-	 */
-	nbytes = fbbits / 8;
-	/*
-	 * do the transformation
-	 */
-	for (bn = 1; (n = READ(ibuf, nbytes)) == nbytes; bn++) {
-		MEMCPY(BUFFER(msgbuf), BUFFER(ivec), 8);
-		DES_XFORM(UBUFFER(msgbuf));
-		for (c = 0; c < 8 - nbytes; c++)
-			CHAR(ivec, c) = CHAR(ivec, c+nbytes);
-		for (c = 0; c < nbytes; c++) {
-			CHAR(ivec, 8-nbytes+c) = ibuf[c];
-			obuf[c] = ibuf[c] ^ UCHAR(msgbuf, c);
-		}
-		/*
-		 * if the last one, handle it specially
-		 */
-		if ((c = getchar()) == EOF) {
-			n = obuf[nbytes-1];
-			if (n < 0 || n > nbytes-1)
-				err(bn, "decryption failed (block corrupted)");
-		}
-		else
-			(void)ungetc(c, stdin);
-		WRITE(obuf, n);
-	}
-	if (n > 0)
-		err(bn, "decryption failed (incomplete block)");
-}
-
-/*
- * This encrypts using the alternative Cipher FeedBack mode of DES
- */
-cfbaenc()
-{
-	register int n;		/* number of bytes actually read */
-	register int nbytes;	/* number of bytes to read */
-	register int bn;	/* block number */
-	char ibuf[8];		/* input buffer */
-	char obuf[8];		/* output buffer */
-	Desbuf msgbuf;		/* encryption buffer */
-
-	/*
-	 * do things in bytes, not bits
-	 */
-	nbytes = fbbits / 7;
-	/*
-	 * do the transformation
-	 */
-	for (bn = 1; (n = READ(ibuf, nbytes)) == nbytes; bn++) {
-		MEMCPY(BUFFER(msgbuf), BUFFER(ivec), 8);
-		DES_XFORM(UBUFFER(msgbuf));
-		for (n = 0; n < 8 - nbytes; n++)
-			UCHAR(ivec, n) = UCHAR(ivec, n+nbytes);
-		for (n = 0; n < nbytes; n++)
-			UCHAR(ivec, 8-nbytes+n) = (ibuf[n] ^ UCHAR(msgbuf, n))
-							|0200;
-		for (n = 0; n < nbytes; n++)
-			obuf[n] = CHAR(ivec, 8-nbytes+n)&0177;
-		WRITE(obuf, nbytes);
-	}
-	/*
-	 * at EOF or last block -- in either case, the last byte contains
-	 * the character representation of the number of bytes in it
-	 */
-	bn++;
-	MEMZERO(&ibuf[n], nbytes - n);
-	ibuf[nbytes - 1] = ('0' + n)|0200;
-	MEMCPY(BUFFER(msgbuf), BUFFER(ivec), 8);
-	DES_XFORM(UBUFFER(msgbuf));
-	for (n = 0; n < nbytes; n++)
-		ibuf[n] ^= UCHAR(msgbuf, n);
-	WRITE(ibuf, nbytes);
-}
-
-/*
- * This decrypts using the alternative Cipher Block Chaining mode of DES
- */
-cfbadec()
-{
-	register int n;		/* number of bytes actually read */
-	register int c;		/* used to test for EOF */
-	register int nbytes;	/* number of bytes to read */
-	register int bn;	/* block number */
-	char ibuf[8];		/* input buffer */
-	char obuf[8];		/* output buffer */
-	Desbuf msgbuf;		/* encryption buffer */
-
-	/*
-	 * do things in bytes, not bits
-	 */
-	nbytes = fbbits / 7;
-	/*
-	 * do the transformation
-	 */
-	for (bn = 1; (n = READ(ibuf, nbytes)) == nbytes; bn++) {
-		MEMCPY(BUFFER(msgbuf), BUFFER(ivec), 8);
-		DES_XFORM(UBUFFER(msgbuf));
-		for (c = 0; c < 8 - nbytes; c++)
-			CHAR(ivec, c) = CHAR(ivec, c+nbytes);
-		for (c = 0; c < nbytes; c++) {
-			CHAR(ivec, 8-nbytes+c) = ibuf[c]|0200;
-			obuf[c] = (ibuf[c] ^ UCHAR(msgbuf, c))&0177;
-		}
-		/*
-		 * if the last one, handle it specially
-		 */
-		if ((c = getchar()) == EOF) {
-			if ((n = (obuf[nbytes-1] - '0')) < 0
-						|| n > nbytes-1)
-				err(bn, "decryption failed (block corrupted)");
-		}
-		else
-			(void)ungetc(c, stdin);
-		WRITE(obuf, n);
-	}
-	if (n > 0)
-		err(bn, "decryption failed (incomplete block)");
-}
-
-
-/*
- * This encrypts using the Output FeedBack mode of DES
- */
-ofbenc()
-{
-	register int n;		/* number of bytes actually read */
-	register int c;		/* used to test for EOF */
-	register int nbytes;	/* number of bytes to read */
-	register int bn;	/* block number */
-	char ibuf[8];		/* input buffer */
-	char obuf[8];		/* output buffer */
-	Desbuf msgbuf;		/* encryption buffer */
-
-	/*
-	 * do things in bytes, not bits
-	 */
-	nbytes = fbbits / 8;
-	/*
-	 * do the transformation
-	 */
-	for (bn = 1; (n = READ(ibuf, nbytes)) == nbytes; bn++) {
-		MEMCPY(BUFFER(msgbuf), BUFFER(ivec), 8);
-		DES_XFORM(UBUFFER(msgbuf));
-		for (n = 0; n < 8 - nbytes; n++)
-			UCHAR(ivec, n) = UCHAR(ivec, n+nbytes);
-		for (n = 0; n < nbytes; n++) {
-			UCHAR(ivec, 8-nbytes+n) = UCHAR(msgbuf, n);
-			obuf[n] = ibuf[n] ^ UCHAR(msgbuf, n);
-		}
-		WRITE(obuf, nbytes);
-	}
-	/*
-	 * at EOF or last block -- in either case, the last byte contains
-	 * the character representation of the number of bytes in it
-	 */
-	bn++;
-	MEMZERO(&ibuf[n], nbytes - n);
-	ibuf[nbytes - 1] = n;
-	MEMCPY(BUFFER(msgbuf), BUFFER(ivec), 8);
-	DES_XFORM(UBUFFER(msgbuf));
-	for (c = 0; c < nbytes; c++)
-		ibuf[c] ^= UCHAR(msgbuf, c);
-	WRITE(ibuf, nbytes);
-}
-
-/*
- * This decrypts using the Output Block Chaining mode of DES
- */
-ofbdec()
-{
-	register int n;		/* number of bytes actually read */
-	register int c;		/* used to test for EOF */
-	register int nbytes;	/* number of bytes to read */
-	register int bn;	/* block number */
-	char ibuf[8];		/* input buffer */
-	char obuf[8];		/* output buffer */
-	Desbuf msgbuf;		/* encryption buffer */
-
-	/*
-	 * do things in bytes, not bits
-	 */
-	nbytes = fbbits / 8;
-	/*
-	 * do the transformation
-	 */
-	for (bn = 1; (n = READ(ibuf, nbytes)) == nbytes; bn++) {
-		MEMCPY(BUFFER(msgbuf), BUFFER(ivec), 8);
-		DES_XFORM(UBUFFER(msgbuf));
-		for (c = 0; c < 8 - nbytes; c++)
-			CHAR(ivec, c) = CHAR(ivec, c+nbytes);
-		for (c = 0; c < nbytes; c++) {
-			CHAR(ivec, 8-nbytes+c) = UCHAR(msgbuf, c);
-			obuf[c] = ibuf[c] ^ UCHAR(msgbuf, c);
-		}
-		/*
-		 * if the last one, handle it specially
-		 */
-		if ((c = getchar()) == EOF) {
-			n = obuf[nbytes-1];
-			if (n < 0 || n > nbytes-1)
-				err(bn, "decryption failed (block corrupted)");
-		}
-		else
-			(void)ungetc(c, stdin);
-		/*
-		 * dump it
-		 */
-		WRITE(obuf, n);
-	}
-	if (n > 0)
-		err(bn, "decryption failed (incomplete block)");
-}
-
-/*
- * This authenticates using the Cipher FeedBack mode of DES
- */
-cfbauth()
-{
-	register int n, j;	/* number of bytes actually read */
-	register int nbytes;	/* number of bytes to read */
-	char ibuf[8];		/* input buffer */
-	Desbuf msgbuf;		/* encryption buffer */
-
-	/*
-	 * do things in bytes, not bits
-	 */
-	nbytes = fbbits / 8;
-	/*
-	 * do the transformation
-	 */
-	while ((n = READ(ibuf, nbytes)) == nbytes) {
-		MEMCPY(BUFFER(msgbuf), BUFFER(ivec), 8);
-		DES_XFORM(UBUFFER(msgbuf));
-		for (n = 0; n < 8 - nbytes; n++)
-			UCHAR(ivec, n) = UCHAR(ivec, n+nbytes);
-		for (n = 0; n < nbytes; n++)
-			UCHAR(ivec, 8-nbytes+n) = ibuf[n] ^ UCHAR(msgbuf, n);
-	}
-	/*
-	 * at EOF or last block -- in either case, the last byte contains
-	 * the character representation of the number of bytes in it
-	 */
-	MEMZERO(&ibuf[n], nbytes - n);
-	ibuf[nbytes - 1] = '0' + n;
-	MEMCPY(BUFFER(msgbuf), BUFFER(ivec), 8);
-	DES_XFORM(UBUFFER(msgbuf));
-	for (n = 0; n < nbytes; n++)
-		ibuf[n] ^= UCHAR(msgbuf, n);
-	/*
-	 * drop the bits
-	 * we write chars until fewer than 7 bits,
-	 * and then pad the last one with 0 bits
-	 */
-	for (n = 0; macbits > 7; n++, macbits -= 8)
-		(void)putchar(CHAR(msgbuf, n));
-	if (macbits > 0) {
-		CHAR(msgbuf, 0) = 0x00;
-		for (j = 0; j < macbits; j++)
-			CHAR(msgbuf, 0) |= (CHAR(msgbuf, n)&bits[j]);
-		(void)putchar(CHAR(msgbuf, 0));
-	}
-}
-
-#ifndef FASTWAY
-/*
- * change from 8 bits/Uchar to 1 bit/Uchar
- */
-expand(from, to)
-	Desbuf from;			/* 8bit/unsigned char string */
-	char *to;			/* 1bit/char string */
-{
-	register int i, j;		/* counters in for loop */
-
-	for (i = 0; i < 8; i++)
-		for (j = 0; j < 8; j++)
-			*to++ = (CHAR(from, i)>>(7-j))&01;
-}
-
-/*
- * change from 1 bit/char to 8 bits/Uchar
- */
-compress(from, to)
-	char *from;			/* 1bit/char string */
-	Desbuf to;			/* 8bit/unsigned char string */
-{
-	register int i, j;		/* counters in for loop */
-
-	for (i = 0; i < 8; i++) {
-	 	CHAR(to, i) = 0;
-		for (j = 0; j < 8; j++)
-			CHAR(to, i) = ((*from++)<<(7-j))|CHAR(to, i);
-	}
-}
-#endif
-
-/*
- * message about usage
- */
-usage()
-{
-	(void)fprintf(stderr, "%s\n",
-"usage: bdes [-abdp] [-F bit] [-f bit] [-k key] [-m bit] [-o bit] [-v vector]");
-	exit(1);
-}
diff --git a/secure/usr.bin/bdes/bdes.ps b/secure/usr.bin/bdes/bdes.ps
deleted file mode 100644
index 471c267af751..000000000000
--- a/secure/usr.bin/bdes/bdes.ps
+++ /dev/null
@@ -1,2945 +0,0 @@
-%!
-%%BoundingBox: (atend)
-%%Pages: (atend)
-%%DocumentFonts: (atend)
-%%EndComments
-%
-% FrameMaker PostScript Prolog 2.0, for use with FrameMaker 2.0
-% Copyright (c) 1986,87,89 by Frame Technology, Inc.  All rights reserved.
-%
-% Known Problems:
-%	Due to bugs in Transcript, the 'PS-Adobe-' is omitted from line 1
-/FMversion (2.0) def 
-% Set up Color vs. Black-and-White
-	/FMPrintInColor systemdict /colorimage known def
-% Uncomment this line to force b&w on color printer
-%   /FMPrintInColor false def
-/FrameDict 190 dict def 
-systemdict /errordict known not {/errordict 10 dict def
-		errordict /rangecheck {stop} put} if
-% The readline in 23.0 doesn't recognize cr's as nl's on AppleTalk
-FrameDict /tmprangecheck errordict /rangecheck get put 
-errordict /rangecheck {FrameDict /bug true put} put 
-FrameDict /bug false put 
-mark 
-% Some PS machines read past the CR, so keep the following 3 lines together!
-currentfile 5 string readline
-00
-0000000000
-cleartomark 
-errordict /rangecheck FrameDict /tmprangecheck get put 
-FrameDict /bug get { 
-	/readline {
-		/gstring exch def
-		/gfile exch def
-		/gindex 0 def
-		{
-			gfile read pop 
-			dup 10 eq {exit} if 
-			dup 13 eq {exit} if 
-			gstring exch gindex exch put 
-			/gindex gindex 1 add def 
-		} loop
-		pop 
-		gstring 0 gindex getinterval true 
-		} def
-	} if
-/FMVERSION {
-	FMversion ne {
-		/Times-Roman findfont 18 scalefont setfont
-		100 100 moveto
-		(FrameMaker version does not match postscript_prolog!)
-		dup =
-		show showpage
-		} if
-	} def 
-/FMLOCAL {
-	FrameDict begin
-	0 def 
-	end 
-	} def 
-	/gstring FMLOCAL
-	/gfile FMLOCAL
-	/gindex FMLOCAL
-	/orgxfer FMLOCAL
-	/orgproc FMLOCAL
-	/organgle FMLOCAL
-	/orgfreq FMLOCAL
-	/yscale FMLOCAL
-	/xscale FMLOCAL
-	/manualfeed FMLOCAL
-	/paperheight FMLOCAL
-	/paperwidth FMLOCAL
-/FMDOCUMENT { 
-	array /FMfonts exch def 
-	/#copies exch def
-	FrameDict begin
-	0 ne dup {setmanualfeed} if
-	/manualfeed exch def
-	/paperheight exch def
-	/paperwidth exch def
-	setpapername
-	manualfeed {true} {papersize} ifelse 
-	{manualpapersize} {false} ifelse 
-	{desperatepapersize} if
-	/yscale exch def
-	/xscale exch def
-	currenttransfer cvlit /orgxfer exch def
-	currentscreen cvlit /orgproc exch def
-	/organgle exch def /orgfreq exch def
-	end 
-	} def 
-	/pagesave FMLOCAL
-	/orgmatrix FMLOCAL
-	/landscape FMLOCAL
-/FMBEGINPAGE { 
-	FrameDict begin 
-	/pagesave save def
-	3.86 setmiterlimit
-	/landscape exch 0 ne def
-	landscape { 
-		90 rotate 0 exch neg translate pop 
-		}
-		{pop pop}
-		ifelse
-	xscale yscale scale
-	/orgmatrix matrix def
-	gsave 
-	} def 
-/FMENDPAGE {
-	grestore 
-	pagesave restore
-	end 
-	showpage
-	} def 
-/FMDEFINEFONT { 
-	FrameDict begin
-	findfont 
-	ReEncode 
-	2 index exch 
-	definefont exch 
-	scalefont 
-	FMfonts 3 1 roll 
-	put
-	end 
-	} bind def
-/FMNORMALIZEGRAPHICS { 
-	newpath
-	0.0 0.0 moveto
-	1 setlinewidth
-	0 setlinecap
-	0 0 0 sethsbcolor
-	0 setgray 
-	} bind def
-	/fx FMLOCAL
-	/fy FMLOCAL
-	/fh FMLOCAL
-	/fw FMLOCAL
-	/llx FMLOCAL
-	/lly FMLOCAL
-	/urx FMLOCAL
-	/ury FMLOCAL
-/FMBEGINEPSF { 
-	end 
-	/FMEPSF save def 
-	/showpage {} def 
-	FMNORMALIZEGRAPHICS 
-	[/fy /fx /fh /fw /ury /urx /lly /llx] {exch def} forall 
-	fx fy translate 
-	rotate
-	fw urx llx sub div fh ury lly sub div scale 
-	llx neg lly neg translate 
-	} bind def
-/FMENDEPSF {
-	FMEPSF restore
-	FrameDict begin 
-	} bind def
-FrameDict begin 
-/setmanualfeed {
-%%BeginFeature *ManualFeed True
-	 statusdict /manualfeed true put
-%%EndFeature
-	} def
-/max {2 copy lt {exch} if pop} bind def
-/min {2 copy gt {exch} if pop} bind def
-/inch {72 mul} def
-/pagedimen { 
-	paperheight sub abs 16 lt exch 
-	paperwidth sub abs 16 lt and
-	{/papername exch def} {pop} ifelse
-	} def
-	/papersizedict FMLOCAL
-/setpapername { 
-	/papersizedict 14 dict def 
-	papersizedict begin
-	/papername /unknown def 
-		/Letter 8.5 inch 11.0 inch pagedimen
-		/LetterSmall 7.68 inch 10.16 inch pagedimen
-		/Tabloid 11.0 inch 17.0 inch pagedimen
-		/Ledger 17.0 inch 11.0 inch pagedimen
-		/Legal 8.5 inch 14.0 inch pagedimen
-		/Statement 5.5 inch 8.5 inch pagedimen
-		/Executive 7.5 inch 10.0 inch pagedimen
-		/A3 11.69 inch 16.5 inch pagedimen
-		/A4 8.26 inch 11.69 inch pagedimen
-		/A4Small 7.47 inch 10.85 inch pagedimen
-		/B4 10.125 inch 14.33 inch pagedimen
-		/B5 7.16 inch 10.125 inch pagedimen
-	end
-	} def
-/papersize {
-	papersizedict begin
-		/Letter {lettertray} def
-		/LetterSmall {lettertray lettersmall} def
-		/Tabloid {11x17tray} def
-		/Ledger {ledgertray} def
-		/Legal {legaltray} def
-		/Statement {statementtray} def
-		/Executive {executivetray} def
-		/A3 {a3tray} def
-		/A4 {a4tray} def
-		/A4Small {a4tray a4small} def
-		/B4 {b4tray} def
-		/B5 {b5tray} def
-		/unknown {unknown} def
-	papersizedict dup papername known {papername} {/unknown} ifelse get
-	end
-	/FMdicttop countdictstack 1 add def
-	statusdict begin stopped end 
-	countdictstack -1 FMdicttop {pop end} for
-	} def
-/manualpapersize {
-	papersizedict begin
-		/Letter {letter} def
-		/LetterSmall {lettersmall} def
-		/Tabloid {11x17} def
-		/Ledger {ledger} def
-		/Legal {legal} def
-		/Statement {statement} def
-		/Executive {executive} def
-		/A3 {a3} def
-		/A4 {a4} def
-		/A4Small {a4small} def
-		/B4 {b4} def
-		/B5 {b5} def
-		/unknown {unknown} def
-	papersizedict dup papername known {papername} {/unknown} ifelse get
-	end
-	stopped 
-	} def
-/desperatepapersize {
-	statusdict /setpageparams known
-		{
-		paperwidth paperheight 0 1 
-		statusdict begin
-		{setpageparams} stopped pop 
-		end
-		} if
-	} def
-/savematrix {
-	orgmatrix currentmatrix pop
-	} bind def
-/restorematrix {
-	orgmatrix setmatrix
-	} bind def
-/dmatrix matrix def
-/dpi    72 0 dmatrix defaultmatrix dtransform
-    dup mul exch   dup mul add   sqrt def
-/freq dpi 18.75 div 8 div round dup 0 eq {pop 1} if 8 mul dpi exch div def
-/sangle 1 0 dmatrix defaultmatrix dtransform exch atan def
-/DiacriticEncoding [
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /space /exclam /quotedbl
-/numbersign /dollar /percent /ampersand /quotesingle /parenleft
-/parenright /asterisk /plus /comma /hyphen /period /slash /zero /one
-/two /three /four /five /six /seven /eight /nine /colon /semicolon
-/less /equal /greater /question /at /A /B /C /D /E /F /G /H /I /J /K
-/L /M /N /O /P /Q /R /S /T /U /V /W /X /Y /Z /bracketleft /backslash
-/bracketright /asciicircum /underscore /grave /a /b /c /d /e /f /g /h
-/i /j /k /l /m /n /o /p /q /r /s /t /u /v /w /x /y /z /braceleft /bar
-/braceright /asciitilde /.notdef /Adieresis /Aring /Ccedilla /Eacute
-/Ntilde /Odieresis /Udieresis /aacute /agrave /acircumflex /adieresis
-/atilde /aring /ccedilla /eacute /egrave /ecircumflex /edieresis
-/iacute /igrave /icircumflex /idieresis /ntilde /oacute /ograve
-/ocircumflex /odieresis /otilde /uacute /ugrave /ucircumflex
-/udieresis /dagger /.notdef /cent /sterling /section /bullet
-/paragraph /germandbls /registered /copyright /trademark /acute
-/dieresis /.notdef /AE /Oslash /.notdef /.notdef /.notdef /.notdef
-/yen /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/ordfeminine /ordmasculine /.notdef /ae /oslash /questiondown
-/exclamdown /logicalnot /.notdef /florin /.notdef /.notdef
-/guillemotleft /guillemotright /ellipsis /.notdef /Agrave /Atilde
-/Otilde /OE /oe /endash /emdash /quotedblleft /quotedblright
-/quoteleft /quoteright /.notdef /.notdef /ydieresis /Ydieresis
-/fraction /currency /guilsinglleft /guilsinglright /fi /fl /daggerdbl
-/periodcentered /quotesinglbase /quotedblbase /perthousand
-/Acircumflex /Ecircumflex /Aacute /Edieresis /Egrave /Iacute
-/Icircumflex /Idieresis /Igrave /Oacute /Ocircumflex /.notdef /Ograve
-/Uacute /Ucircumflex /Ugrave /dotlessi /circumflex /tilde /macron
-/breve /dotaccent /ring /cedilla /hungarumlaut /ogonek /caron
-] def
-/ReEncode { 
-	dup 
-	length 
-	dict begin 
-	{
-	1 index /FID ne 
-		{def} 
-		{pop pop} ifelse 
-	} forall
-	Encoding StandardEncoding eq 
-	{
-		/Encoding DiacriticEncoding def
-	}if
-	currentdict 
-	end 
-	} bind def
-/graymode true def
-	/bwidth FMLOCAL
-	/bpside FMLOCAL
-	/bstring FMLOCAL
-	/onbits FMLOCAL
-	/offbits FMLOCAL
-	/xindex FMLOCAL
-	/yindex FMLOCAL
-	/x FMLOCAL
-	/y FMLOCAL
-/setpattern {
-	 /bwidth  exch def
-	 /bpside  exch def
-	 /bstring exch def
-	 /onbits 0 def  /offbits 0 def
-	 freq sangle landscape {90 add} if 
-		{/y exch def
-		 /x exch def
-		 /xindex x 1 add 2 div bpside mul cvi def
-		 /yindex y 1 add 2 div bpside mul cvi def
-		 bstring yindex bwidth mul xindex 8 idiv add get
-		 1 7 xindex 8 mod sub bitshift and 0 ne
-		 {/onbits  onbits  1 add def 1}
-		 {/offbits offbits 1 add def 0}
-		 ifelse
-		}
-		setscreen
-	 {} settransfer
-	 offbits offbits onbits add div FMsetgray
-	/graymode false def
-	} bind def
-/grayness {
-	FMsetgray
-	graymode not {
-		/graymode true def
-		orgxfer cvx settransfer
-		orgfreq organgle orgproc cvx setscreen
-		} if
-	} bind def
-	/HUE FMLOCAL
-	/SAT FMLOCAL
-	/BRIGHT FMLOCAL
-	/Colors FMLOCAL
-FMPrintInColor 
-	
-	{
-	/HUE 0 def
-	/SAT 0 def
-	/BRIGHT 0 def
-	% array of arrays Hue and Sat values for the separations [HUE BRIGHT]
-	/Colors   
-	[[0    0  ]    % black
-	 [0    0  ]    % white
-	 [0.00 1.0]    % red
-	 [0.37 1.0]    % green
-	 [0.60 1.0]    % blue
-	 [0.50 1.0]    % cyan
-	 [0.83 1.0]    % magenta
-	 [0.16 1.0]    % comment / yellow
-	 ] def
-      
-	/BEGINBITMAPCOLOR { 
-		BITMAPCOLOR} def
-	/BEGINBITMAPCOLORc { 
-		BITMAPCOLORc} def
-	/K { 
-		Colors exch get dup
-		0 get /HUE exch store 
-		1 get /BRIGHT exch store
-		  HUE 0 eq BRIGHT 0 eq and
-			{1.0 SAT sub setgray}
-			{HUE SAT BRIGHT sethsbcolor} 
-		  ifelse
-		} def
-	/FMsetgray { 
-		/SAT exch 1.0 exch sub store 
-		  HUE 0 eq BRIGHT 0 eq and
-			{1.0 SAT sub setgray}
-			{HUE SAT BRIGHT sethsbcolor} 
-		  ifelse
-		} bind def
-	}
-	
-	{
-	/BEGINBITMAPCOLOR { 
-		BITMAPGRAY} def
-	/BEGINBITMAPCOLORc { 
-		BITMAPGRAYc} def
-	/FMsetgray {setgray} bind def
-	/K { 
-		pop
-		} def
-	}
-ifelse
-/normalize {
-	transform round exch round exch itransform
-	} bind def
-/dnormalize {
-	dtransform round exch round exch idtransform
-	} bind def
-/lnormalize { 
-	0 dtransform exch cvi 2 idiv 2 mul 1 add exch idtransform pop
-	} bind def
-/H { 
-	lnormalize setlinewidth
-	} bind def
-/Z {
-	setlinecap
-	} bind def
-/X { 
-	fillprocs exch get exec
-	} bind def
-/V { 
-	gsave eofill grestore
-	} bind def
-/N { 
-	stroke
-	} bind def
-/M {newpath moveto} bind def
-/E {lineto} bind def
-/D {curveto} bind def
-/O {closepath} bind def
-	/n FMLOCAL
-/L { 
- 	/n exch def
-	newpath
-	normalize
-	moveto 
-	2 1 n {pop normalize lineto} for
-	} bind def
-/Y { 
-	L 
-	closepath
-	} bind def
-	/x1 FMLOCAL
-	/x2 FMLOCAL
-	/y1 FMLOCAL
-	/y2 FMLOCAL
-	/rad FMLOCAL
-/R { 
-	/y2 exch def
-	/x2 exch def
-	/y1 exch def
-	/x1 exch def
-	x1 y1
-	x2 y1
-	x2 y2
-	x1 y2
-	4 Y 
-	} bind def
-/RR { 
-	/rad exch def
-	normalize
-	/y2 exch def
-	/x2 exch def
-	normalize
-	/y1 exch def
-	/x1 exch def
-	newpath
-	x1 y1 rad add moveto
-	x1 y2 x2 y2 rad arcto
-	x2 y2 x2 y1 rad arcto
-	x2 y1 x1 y1 rad arcto
-	x1 y1 x1 y2 rad arcto
-	closepath
-	16 {pop} repeat
-	} bind def
-/C { 
-	grestore
-	gsave
-	R 
-	clip
-	} bind def
-/U { 
-	grestore
-	gsave
-	} bind def
-/F { 
-	FMfonts exch get
-	setfont
-	} bind def
-/T { 
-	moveto show
-	} bind def
-/RF { 
-	rotate
-	0 ne {-1 1 scale} if
-	} bind def
-/TF { 
-	gsave
-	moveto 
-	RF
-	show
-	grestore
-	} bind def
-/P { 
-	moveto
-	0 32 3 2 roll widthshow
-	} bind def
-/PF { 
-	gsave
-	moveto 
-	RF
-	0 32 3 2 roll widthshow
-	grestore
-	} bind def
-/S { 
-	moveto
-	0 exch ashow
-	} bind def
-/SF { 
-	gsave
-	moveto
-	RF
-	0 exch ashow
-	grestore
-	} bind def
-/B { 
-	moveto
-	0 32 4 2 roll 0 exch awidthshow
-	} bind def
-/BF { 
-	gsave
-	moveto
-	RF
-	0 32 4 2 roll 0 exch awidthshow
-	grestore
-	} bind def
-	/x FMLOCAL
-	/y FMLOCAL
-	/dx FMLOCAL
-	/dy FMLOCAL
-	/dl FMLOCAL
-	/t FMLOCAL
-	/t2 FMLOCAL
-	/Cos FMLOCAL
-	/Sin FMLOCAL
-	/r FMLOCAL
-/W { 
-	dnormalize
-	/dy exch def
-	/dx exch def
-	normalize
-	/y  exch def
-	/x  exch def
-	/dl dx dx mul dy dy mul add sqrt def
-	dl 0.0 gt {
-		/t currentlinewidth def
-		savematrix
-		/Cos dx dl div def
-		/Sin dy dl div def
-		/r [Cos Sin Sin neg Cos 0.0 0.0] def
-		/t2 t 2.5 mul 3.5 max def
-		newpath
-		x y translate
-		r concat
-		0.0 0.0 moveto
-		dl t 2.7 mul sub 0.0 rlineto
-		stroke
-		restorematrix
-		x dx add y dy add translate
-		r concat
-		t 0.67 mul setlinewidth
-		t 1.61 mul neg  0.0 translate
-		0.0 0.0 moveto
-		t2 1.7 mul neg  t2 2.0 div     moveto
-		0.0 0.0 lineto
-		t2 1.7 mul neg  t2 2.0 div neg lineto
-		stroke
-		t setlinewidth
-		restorematrix
-		} if
-	} bind def
-/G { 
-	gsave
-	newpath
-	normalize translate 0.0 0.0 moveto 
-	dnormalize scale 
-	0.0 0.0 1.0 5 3 roll arc 
-	closepath fill
-	grestore
-	} bind def
-/A { 
-	gsave
-	savematrix
-	newpath
-	2 index 2 div add exch 3 index 2 div sub exch 
-	normalize 2 index 2 div sub exch 3 index 2 div add exch 
-	translate 
-	scale 
-	0.0 0.0 1.0 5 3 roll arc 
-	restorematrix
-	stroke
-	grestore
-	} bind def
-	/x FMLOCAL
-	/y FMLOCAL
-	/w FMLOCAL
-	/h FMLOCAL
-	/xx FMLOCAL
-	/yy FMLOCAL
-	/ww FMLOCAL
-	/hh FMLOCAL
-	/FMsaveobject FMLOCAL
-	/FMoptop FMLOCAL
-	/FMdicttop FMLOCAL
-/BEGINPRINTCODE { 
-	/FMdicttop countdictstack 1 add def 
-	/FMoptop count 4 sub def 
-	/FMsaveobject save def
-	userdict begin 
-	/showpage {} def 
-	FMNORMALIZEGRAPHICS 
-	3 index neg 3 index neg translate
-	} bind def
-/ENDPRINTCODE {
-	count -1 FMoptop {pop pop} for 
-	countdictstack -1 FMdicttop {pop end} for 
-	FMsaveobject restore 
-	} bind def
-/gn { 
-	0 
-	{	46 mul 
-		cf read pop 
-		32 sub 
-		dup 46 lt {exit} if 
-		46 sub add 
-		} loop
-	add 
-	} bind def
-	/str FMLOCAL
-/cfs { 
-	/str sl string def 
-	0 1 sl 1 sub {str exch val put} for 
-	str def 
-	} bind def
-/ic [ 
-	0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0223
-	0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0223
-	0
-	{0 hx} {1 hx} {2 hx} {3 hx} {4 hx} {5 hx} {6 hx} {7 hx} {8 hx} {9 hx}
-	{10 hx} {11 hx} {12 hx} {13 hx} {14 hx} {15 hx} {16 hx} {17 hx} {18 hx}
-	{19 hx} {gn hx} {0} {1} {2} {3} {4} {5} {6} {7} {8} {9} {10} {11} {12}
-	{13} {14} {15} {16} {17} {18} {19} {gn} {0 wh} {1 wh} {2 wh} {3 wh}
-	{4 wh} {5 wh} {6 wh} {7 wh} {8 wh} {9 wh} {10 wh} {11 wh} {12 wh}
-	{13 wh} {14 wh} {gn wh} {0 bl} {1 bl} {2 bl} {3 bl} {4 bl} {5 bl} {6 bl}
-	{7 bl} {8 bl} {9 bl} {10 bl} {11 bl} {12 bl} {13 bl} {14 bl} {gn bl}
-	{0 fl} {1 fl} {2 fl} {3 fl} {4 fl} {5 fl} {6 fl} {7 fl} {8 fl} {9 fl}
-	{10 fl} {11 fl} {12 fl} {13 fl} {14 fl} {gn fl}
-	] def
-	/sl FMLOCAL
-	/val FMLOCAL
-	/ws FMLOCAL
-	/im FMLOCAL
-	/bs FMLOCAL
-	/cs FMLOCAL
-	/len FMLOCAL
-	/pos FMLOCAL
-/ms { 
-	/sl exch def 
-	/val 255 def 
-	/ws cfs 
-	/im cfs 
-	/val 0 def 
-	/bs cfs 
-	/cs cfs 
-	} bind def
-400 ms 
-/ip { 
-	is 
-	0 
-	cf cs readline pop 
-	{	ic exch get exec 
-		add 
-		} forall 
-	pop 
-	
-	} bind def
-/wh { 
-	/len exch def 
-	/pos exch def 
-	ws 0 len getinterval im pos len getinterval copy pop
-	pos len 
-	} bind def
-/bl { 
-	/len exch def 
-	/pos exch def 
-	bs 0 len getinterval im pos len getinterval copy pop
-	pos len 
-	} bind def
-/s1 1 string def
-/fl { 
-	/len exch def 
-	/pos exch def 
-	/val cf s1 readhexstring pop 0 get def
-	pos 1 pos len add 1 sub {im exch val put} for
-	pos len 
-	} bind def
-/hx { 
-	3 copy getinterval 
-	cf exch readhexstring pop pop 
-	} bind def
-	/h FMLOCAL
-	/w FMLOCAL
-	/d FMLOCAL
-	/lb FMLOCAL
-	/bitmapsave FMLOCAL
-	/is FMLOCAL
-	/cf FMLOCAL
-/wbytes { 
-	dup 
-	8 eq {pop} {1 eq {7 add 8 idiv} {3 add 4 idiv} ifelse} ifelse
-	} bind def
-/BEGINBITMAPBWc { 
-	1 {} COMMONBITMAPc
-	} bind def
-/BEGINBITMAPGRAYc { 
-	8 {} COMMONBITMAPc
-	} bind def
-/BEGINBITMAP2BITc { 
-	2 {} COMMONBITMAPc
-	} bind def
-/COMMONBITMAPc { 
-	/r exch def
-	/d exch def
-	gsave
-	translate rotate scale /h exch def /w exch def
-	/lb w d wbytes def 
-	sl lb lt {lb ms} if 
-	/bitmapsave save def 
-	r                    
-	/is im 0 lb getinterval def 
-	ws 0 lb getinterval is copy pop 
-	/cf currentfile def 
-	w h d [w 0 0 h neg 0 h] 
-	{ip} image 
-	bitmapsave restore 
-	grestore
-	} bind def
-/BEGINBITMAPBW { 
-	1 {} COMMONBITMAP
-	} bind def
-/BEGINBITMAPGRAY { 
-	8 {} COMMONBITMAP
-	} bind def
-/BEGINBITMAP2BIT { 
-	2 {} COMMONBITMAP
-	} bind def
-/COMMONBITMAP { 
-	/r exch def
-	/d exch def
-	gsave
-	translate rotate scale /h exch def /w exch def
-	/bitmapsave save def 
-	r                    
-	/is w d wbytes string def
-	/cf currentfile def 
-	w h d [w 0 0 h neg 0 h] 
-	{cf is readhexstring pop} image
-	bitmapsave restore 
-	grestore
-	} bind def
-	/proc1 FMLOCAL
-	/proc2 FMLOCAL
-	/newproc FMLOCAL
-/Fmcc {
-    /proc2 exch cvlit def
-    /proc1 exch cvlit def
-    /newproc proc1 length proc2 length add array def
-    newproc 0 proc1 putinterval
-    newproc proc1 length proc2 putinterval
-    newproc cvx
-} bind def
-/ngrayt 256 array def
-/nredt 256 array def
-/nbluet 256 array def
-/ngreent 256 array def
-	/gryt FMLOCAL
-	/blut FMLOCAL
-	/grnt FMLOCAL
-	/redt FMLOCAL
-	/indx FMLOCAL
-	/cynu FMLOCAL
-	/magu FMLOCAL
-	/yelu FMLOCAL
-	/k FMLOCAL
-	/u FMLOCAL
-/colorsetup {
-	currentcolortransfer
-	/gryt exch def
-	/blut exch def
-	/grnt exch def
-	/redt exch def
-	0 1 255 {
-		/indx exch def
-		/cynu 1 red indx get 255 div sub def
-		/magu 1 green indx get 255 div sub def
-		/yelu 1 blue indx get 255 div sub def
-		/k cynu magu min yelu min def
-		/u k currentundercolorremoval exec def
-		nredt indx 1 0 cynu u sub max sub redt exec put
-		ngreent indx 1 0 magu u sub max sub grnt exec put
-		nbluet indx 1 0 yelu u sub max sub blut exec put
-		ngrayt indx 1 k currentblackgeneration exec sub gryt exec put
-	} for
-	{255 mul cvi nredt exch get}
-	{255 mul cvi ngreent exch get}
-	{255 mul cvi nbluet exch get}
-	{255 mul cvi ngrayt exch get}
-	setcolortransfer
-	{pop 0} setundercolorremoval
-	{} setblackgeneration
-	} bind def
-	/tran FMLOCAL
-/fakecolorsetup {
-	/tran 256 string def
-	0 1 255 {/indx exch def 
-		tran indx
-		red indx get 77 mul
-		green indx get 151 mul
-		blue indx get 28 mul
-		add add 256 idiv put} for
-	currenttransfer
-	{255 mul cvi tran exch get 255.0 div}
-	exch Fmcc settransfer
-} bind def
-/BITMAPCOLOR { 
-	/d 8 def
-	gsave
-	translate rotate scale /h exch def /w exch def
-	/bitmapsave save def 
-	colorsetup
-	/is w d wbytes string def
-	/cf currentfile def 
-	w h d [w 0 0 h neg 0 h] 
-	{cf is readhexstring pop} {is} {is} true 3 colorimage 
-	bitmapsave restore 
-	grestore
-	} bind def
-/BITMAPCOLORc { 
-	/d 8 def
-	gsave
-	translate rotate scale /h exch def /w exch def
-	/lb w d wbytes def 
-	sl lb lt {lb ms} if 
-	/bitmapsave save def 
-	colorsetup
-	/is im 0 lb getinterval def 
-	ws 0 lb getinterval is copy pop 
-	/cf currentfile def 
-	w h d [w 0 0 h neg 0 h] 
-	{ip} {is} {is} true 3 colorimage
-	bitmapsave restore 
-	grestore
-	} bind def
-/BITMAPGRAY { 
-	8 {fakecolorsetup} COMMONBITMAP
-	} bind def
-/BITMAPGRAYc { 
-	8 {fakecolorsetup} COMMONBITMAPc
-	} bind def
-/ENDBITMAP {
-	} bind def
-end 
-%%EndProlog
-%%BeginSetup
-(2.0) FMVERSION
-1 1 612 792 0 1 16 FMDOCUMENT
-/fillprocs 32 array def
-fillprocs 0 { 0.000000 grayness } put
-fillprocs 1 { 0.100000 grayness } put
-fillprocs 2 { 0.300000 grayness } put
-fillprocs 3 { 0.500000 grayness } put
-fillprocs 4 { 0.700000 grayness } put
-fillprocs 5 { 0.900000 grayness } put
-fillprocs 6 { 0.970000 grayness } put
-fillprocs 7 { 1.000000 grayness } put
-fillprocs 8 {<0f87c3e1f0783c1e> 8 1 setpattern } put
-fillprocs 9 {<0f1e3c78f0e1c387> 8 1 setpattern } put
-fillprocs 10 {<cccccccccccccccc> 8 1 setpattern } put
-fillprocs 11 {<ffff0000ffff0000> 8 1 setpattern } put
-fillprocs 12 {<8142241818244281> 8 1 setpattern } put
-fillprocs 13 {<8040201008040201> 8 1 setpattern } put
-fillprocs 14 {<03060c183060c081> 8 1 setpattern } put
-fillprocs 15 {} put
-fillprocs 16 { 1.000000 grayness } put
-fillprocs 17 { 0.900000 grayness } put
-fillprocs 18 { 0.700000 grayness } put
-fillprocs 19 { 0.500000 grayness } put
-fillprocs 20 { 0.300000 grayness } put
-fillprocs 21 { 0.100000 grayness } put
-fillprocs 22 { 0.030000 grayness } put
-fillprocs 23 { 0.000000 grayness } put
-fillprocs 24 {<f0783c1e0f87c3e1> 8 1 setpattern } put
-fillprocs 25 {<f0e1c3870f1e3c78> 8 1 setpattern } put
-fillprocs 26 {<3333333333333333> 8 1 setpattern } put
-fillprocs 27 {<0000ffff0000ffff> 8 1 setpattern } put
-fillprocs 28 {<7ebddbe7e7dbbd7e> 8 1 setpattern } put
-fillprocs 29 {<7fbfdfeff7fbfdfe> 8 1 setpattern } put
-fillprocs 30 {<fcf9f3e7cf9f3f7e> 8 1 setpattern } put
-fillprocs 31 {} put
-%%EndSetup
-0 12 /Helvetica-Bold FMDEFINEFONT
-1 12 /Helvetica-BoldOblique FMDEFINEFONT
-%%Page: "-1" 1
-%%BeginPaperSize: Letter
-%%EndPaperSize
-612 792 0 FMBEGINPAGE
-144 144 468 396 R
-7 X
-0 K
-V
-0 F
-0 X
-1.2 (IMPLEMENT) 178.34 388 S
-1.2 (A) 258.88 388 S
-1.2 (TION NOTES ON ) 267.85 388 S
-1 F
-1.2 (bdes) 382.61 388 S
-0 F
-1.2 (\0501\051) 415.4 388 S
-1.2 (Matt Bishop) 265.09 338 S
-1.2 (T) 197.74 288 S
-1.2 (echnical Report PCS-TR91-158) 205.38 288 S
-FMENDPAGE
-%%EndPage: "-1" 2
-%%Page: "0" 2
-612 792 0 FMBEGINPAGE
-72 72 540 720 R
-7 X
-0 K
-V
-FMENDPAGE
-%%EndPage: "0" 3
-0 12 /Times-Roman FMDEFINEFONT
-1 18 /Times-Bold FMDEFINEFONT
-2 18 /Times-BoldItalic FMDEFINEFONT
-3 12 /Times-Italic FMDEFINEFONT
-4 12 /Times-Bold FMDEFINEFONT
-5 10 /Times-Roman FMDEFINEFONT
-6 12 /Courier FMDEFINEFONT
-7 12 /Courier-Oblique FMDEFINEFONT
-8 12 /ZapfDingbats FMDEFINEFONT
-9 12 /Symbol FMDEFINEFONT
-10 12 /Courier-Bold FMDEFINEFONT
-%%Page: "1" 3
-612 792 0 FMBEGINPAGE
-72 745.99 540 756 R
-7 X
-0 K
-V
-72 32.69 540 42.7 R
-V
-0 F
-0 X
-(Page 1 of 11) 479.71 34.7 T
-72 72 540 720 R
-7 X
-V
-1 F
-0 X
-(Implementation Notes on ) 179.84 708 T
-2 F
-(bdes) 378.21 708 T
-1 F
-(\0501\051) 411.19 708 T
-0 F
-( ) 432.17 708 T
-3 F
-(Matt Bishop) 276.51 676 T
-0 F
-(Department of Mathematics and Computer Science) 182.92 656 T
-(Dartmouth College) 259.86 642 T
-(Hanover) 257.45 628 T
-(, NH 03755) 298.26 628 T
-3 F
-(ABSTRACT) 277.68 602 T
-0 F
-0.27 (This note describes the implementation of ) 108 582 P
-3 F
-0.27 (bdes) 314.13 582 P
-0 F
-0.27 (, the \336le encryption program being) 336.12 582 P
-0.36 (distributed in the 4.4 release of the Berkeley Software Distribution. It implements) 108 568 P
-(all modes of the Data Encryption Standard program.) 108 554 T
-4 F
-(1. Intr) 72 528 T
-(oduction) 104.43 528 T
-0 F
--0.09 (The Data Encryption Standard is a standard endorsed by the federal government. It is con-) 108 504 P
--0.56 (siderably stronger than the algorithm used by the ) 72 484 P
-5 F
--0.47 (UNIX) 305.36 484 P
-0 F
--0.56 (\252 ) 330.34 484 P
-3 F
--0.56 (crypt) 344.53 484 P
-0 F
--0.56 (\0501\051 program, and therefore is a more) 369.18 484 P
-0.11 (suitable candidate for protecting information, especially information contained in ) 72 464 P
-5 F
-0.09 (ASCII) 466.05 464 P
-0 F
-0.11 ( \336les. The) 492.14 464 P
--0.65 (program ) 72 444 P
-3 F
--0.65 (bdes) 114.99 444 P
-0 F
--0.65 (\0501\051 implements the DES and all of its modes, including the two authentication modes.) 136.97 444 P
--0.59 (Because others may wish to write software compatible with this program, this note presents) 108 420 P
--0.04 (the layout of the encrypted \336les produced by ) 72 400 P
-3 F
--0.04 (bdes) 288.86 400 P
-0 F
--0.04 ( as well as internal details relevant to the imple-) 310.85 400 P
--0.15 (mentation. Whereever possible and appropriate, the description of the ) 72 380 P
-3 F
--0.15 (des) 408.04 380 P
-0 F
--0.15 (\0501\051 program given in [4]) 424.03 380 P
--0.2 (has been followed; thus, ) 72 360 P
-3 F
--0.2 (bdes) 190.77 360 P
-0 F
--0.2 ( is completely compatible with that program. However) 212.75 360 P
--0.2 (, ) 473.33 360 P
-3 F
--0.2 (bdes) 479.12 360 P
-0 F
--0.2 ( also of-) 501.11 360 P
-(fers several extensions to ) 72 340 T
-3 F
-(des) 195.9 340 T
-0 F
-( that are not compatible, and these will be explicitly pointed out.) 211.89 340 T
--0.14 (In this note, strings typed as shown will be in ) 108 316 P
-6 F
--0.34 (Courier Roman font) 326.78 316 P
-0 F
--0.14 (, and strings to be) 455.62 316 P
--0.42 (chosen by the user will be in ) 72 296 P
-7 F
--1 (Courier Oblique font) 209.32 296 P
-0 F
--0.42 (. The space character \050) 351.24 296 P
-5 F
--0.35 (ASCII) 457.79 296 P
-0 F
--0.42 ( <) 483.88 296 P
-5 F
--0.35 (SP) 493.23 296 P
-0 F
--0.42 (>, octal) 504.34 296 P
--0.43 (40, decimal 32, hex 20\051 will be represented as \322) 72 276 P
-8 F
--0.47 (z) 296.98 276 P
-0 F
--0.43 (\323 and the newline character \050) 301.96 276 P
-5 F
--0.35 (ASCII) 438.03 276 P
-0 F
--0.43 ( <) 464.13 276 P
-5 F
--0.35 (NL) 473.46 276 P
-0 F
--0.43 (>, octal 12,) 486.79 276 P
--0.05 (decimal 10, hex a\051 as \322) 72 256 P
-9 F
--0.05 (\277) 181.65 256 P
-0 F
--0.05 (\323. Because it is often more convenient to represent arbitrary characters as) 189.54 256 P
-1.13 (a sequence of hexadecimal digits, that representation will often be used; these digits will be in) 72 236 P
-10 F
-(Courier Bold font) 72 216 T
-0 F
-( with spaces often inserted for readability) 194.33 216 T
-(.) 392.07 216 T
-4 F
-(2. Overview and Use) 72 184 T
-3 F
--0.39 (Bdes) 108 160 P
-0 F
--0.39 ( implements the Data Encryption Standard algorithm in software, and enables the user) 131.32 160 P
--0.61 (to encrypt data using any of the four modes of operation of the DES \050Electronic Code Book, Cipher) 72 140 P
-72 72 540 720 C
-72 72 540 117 C
-72 72 549 108 R
-7 X
-0 K
-V
-5 F
-0 X
-(This work is based on work funded by grant NAG2-680 from the National
-Aeronautics and Space Administration to ) 72 101.33 T
-(Dartmouth College.) 72 89.33 T
-(UNIX is a Registered T) 72 77.33 T
-(rademark of A) 166.58 77.33 T
-(T&T Bell Laboratories.) 223.75 77.33 T
-72 72 540 720 C
-0 0 612 792 C
-72 126 225 126 2 L
-7 X
-0 K
-V
-0.5 H
-2 Z
-0 X
-N
-FMENDPAGE
-%%EndPage: "1" 4
-%%Page: "2" 4
-612 792 0 FMBEGINPAGE
-72 745.99 540 756 R
-7 X
-0 K
-V
-72 32.69 540 42.7 R
-V
-0 F
-0 X
-(Page 2 of 11) 479.71 34.7 T
-72 72 540 720 R
-7 X
-V
-0 X
-0.31 (Block Chaining, ) 72 712 P
-3 F
-0.31 (k) 154.25 712 P
-0 F
-0.31 (-bit Cipher Feed Back, and ) 159.58 712 P
-3 F
-0.31 (k) 293.71 712 P
-0 F
-0.31 (-bit Output Feed Back\051 as well as the Alternate ) 299.04 712 P
-3 F
-0.31 (k) 530.68 712 P
-0 F
-0.31 (-) 536.01 712 P
--0.04 (bit Cipher Feed Back mode. Further) 72 692 P
--0.04 (, ) 244.52 692 P
-3 F
--0.04 (bdes) 250.48 692 P
-0 F
--0.04 ( supports message authentication code generation based) 272.46 692 P
-(on both the Cipher Block Chaining mode and the ) 72 672 T
-3 F
-(k) 310.86 672 T
-0 F
-(-bit Cipher Feed Back mode.) 316.19 672 T
-0.07 (By default, ) 108 648 P
-3 F
-0.07 (bdes) 164.43 648 P
-0 F
-0.07 ( encrypts an input \336le using Cipher Block Chaining mode, and is invoked) 186.41 648 P
--0.4 (as a \336lter) 72 628 P
--0.4 (. The key may be speci\336ed either on the command line or may be typed to the prompt. So,) 114.51 628 P
-(if the input \336le ) 72 608 T
-7 F
-(inputf) 145.96 608 T
-(ile) 189.14 608 T
-0 F
-( contains the message) 210.73 608 T
-6 F
-(a) 253.9 584 T
-8 F
-(z) 261.1 584 T
-6 F
-(test) 266.07 584 T
-8 F
-(z) 294.86 584 T
-6 F
-(message) 299.83 584 T
-9 F
-(\277) 350.21 584 T
-0 F
-(then the following command encrypts it using the key ) 72 560 T
-6 F
-(abcdefgh) 333.5 560 T
-0 F
-(:) 391.07 560 T
-6 F
-(bdes -k abcdefgh < ) 158.48 536 T
-7 F
-(inputf) 295.21 536 T
-(ile) 338.38 536 T
-6 F
-( > ) 359.97 536 T
-7 F
-(outputf) 381.56 536 T
-(ile) 431.93 536 T
-0 F
-(The option ) 72 512 T
-4 F
-(-k) 127.3 512 T
-0 F
-( indicates the next ar) 137.96 512 T
-(gument is the key) 237.01 512 T
-(. Now ) 321.17 512 T
-7 F
-(outputf) 353.48 512 T
-(ile) 403.86 512 T
-0 F
-( contains) 425.45 512 T
-10 F
-(16 0e eb af 68 a0 d0 19 f1 a2 9b 31 0d 8a 01 c3) 136.89 488 T
-0 F
-0.06 (Other modes are speci\336ed using command-line options, as is control of the way the key is) 108 464 P
-(interpreted. The next sections contain several examples, and the Appendix has the manual page.) 72 444 T
-4 F
-(3. Keys and Parity) 72 412 T
-0 F
-0.58 (The key consists of 64 bits, and may be presented in any of hex, binary) 108 388 P
-0.58 (, or as a string of) 456.48 388 P
-5 F
-0.12 (ASCII) 72 368 P
-0 F
-0.14 ( characters. If the key is given in hex or binary) 98.1 368 P
-0.14 (, it is used as is with no changes. However) 322.21 368 P
-0.14 (, if) 526.53 368 P
--0.27 (the key is given in ) 72 348 P
-5 F
--0.23 (ASCII) 161.59 348 P
-0 F
--0.27 (, a delicate problem arises: by convention, the parity bit is usually set to 0.) 187.69 348 P
--0.47 (This high-order bit is generally ignored by applications; but the DES
-does not do so. Instead, it dis-) 72 328 P
--0.14 (cards the low-order bit, ef) 72 308 P
--0.14 (fectively reducing the size of the space of possible keys from 2) 195.44 308 P
-5 F
--0.12 (56) 495.97 312.8 P
-0 F
--0.14 ( to 2) 505.97 308 P
-5 F
--0.12 (48) 527.01 312.8 P
-0 F
--0.14 (.) 537 308 P
--0.46 ( T) 108 284 P
--0.46 (o preserve the size of the key space, the value of the parity bit must be related to the value) 117.03 284 P
--0.09 (in the low-order bit, so the program sets the high-order bit to make each character in the key be of) 72 264 P
--0.7 (odd parity) 72 244 P
--0.7 (. \050Note that the initial value of the parity bit is ) 119.49 244 P
-3 F
--0.7 (not) 334.99 244 P
-0 F
--0.7 ( used in this computation.\051 For example,) 350.31 244 P
-(if the key is ) 72 224 T
-6 F
-(abcdefgh) 131.29 224 T
-0 F
-(, the actual key bits used are determined as follows:) 188.86 224 T
-5 F
-(ASCII) 99 200 T
-0 F
-( key) 125.1 200 T
-6 F
-(a) 243 200 T
-(b) 279 200 T
-(c) 315 200 T
-(d) 351 200 T
-(e) 387 200 T
-(f) 423 200 T
-(g) 459 200 T
-(h) 495 200 T
-5 F
-(ASCII) 99 180 T
-0 F
-( key bits \050hex\051) 125.1 180 T
-10 F
-(61) 243 180 T
-(62) 279 180 T
-(63) 315 180 T
-(64) 351 180 T
-(65) 387 180 T
-(66) 423 180 T
-(67) 459 180 T
-(68) 495 180 T
-0 F
-(parity) 99 160 T
-(odd) 243 160 T
-(odd) 279 160 T
-(even) 315 160 T
-(odd) 351 160 T
-(even) 387 160 T
-(even) 423 160 T
-(odd) 459 160 T
-(odd) 495 160 T
-(key bits used \050hex\051) 99 140 T
-10 F
-(61) 243 140 T
-(62) 279 140 T
-(e3) 315 140 T
-(64) 351 140 T
-(e5) 387 140 T
-(e6) 423 140 T
-(67) 459 140 T
-(68) 495 140 T
-0 F
-0.18 (This convention \050as opposed to requiring even parity) 108 120 P
-0.18 (, or simply copying the low-order bit) 362 120 P
--0.41 (to the high-order bit\051 was chosen to provide compatibility with the encryption program ) 72 100 P
-3 F
--0.41 (des) 486.77 100 P
-0 F
--0.41 ( distrib-) 502.76 100 P
--0.52 (uted by Sun Microsystems, Inc. [4]. Whether the key is entered on the command line or on the key-) 72 80 P
-FMENDPAGE
-%%EndPage: "2" 5
-%%Page: "3" 5
-612 792 0 FMBEGINPAGE
-72 745.99 540 756 R
-7 X
-0 K
-V
-72 32.69 540 42.7 R
-V
-0 F
-0 X
-(Page 3 of 11) 479.71 34.7 T
-72 72 540 720 R
-7 X
-V
-0 X
-1.89 (board, by default it is processed into the same key schedule generated by Sun\325) 72 712 P
-1.89 (s ) 471.02 712 P
-3 F
-1.89 (des) 480.58 712 P
-0 F
-1.89 (, so \336les) 496.56 712 P
-(encrypted on a Sun can be decrypted using ) 72 692 T
-3 F
-(bdes) 280.51 692 T
-0 F
-( \050and vice versa\051.) 302.49 692 T
--0.3 (If the user does not wish to use the Sun convention, the option \320) 108 668 P
-4 F
--0.3 (p) 411.9 668 P
-0 F
--0.3 ( will disable the parity bit) 418.57 668 P
--0.62 (changing; with it, the parity bit is that of the character typed. This
-is useful when the key is a known) 72 648 P
-5 F
-(ASCII) 72 628 T
-0 F
-( string and the \336le was encrypted on a system which does not alter parity bits.) 98.1 628 T
--0.24 (A key may be represented as a bit vector) 108 604 P
--0.24 (, rather than an ) 300.74 604 P
-5 F
--0.2 (ASCII) 374.7 604 P
-0 F
--0.24 ( string, in one of two ways. It) 400.8 604 P
-0.19 (may be represented as a string of up to 16 hexadecimal digits; if fewer than 16 are given, the key) 72 584 P
-0.16 (is right \336lled with 0 bits. Or) 72 564 P
-0.16 (, it may be represented as a string of up to 64 binary digits, and again) 206.11 564 P
-0.15 (if fewer than 64 are given, the key is right-\336lled with 0 bits. Bit
-vector keys must be given on the) 72 544 P
-0.51 (command line, and must begin with the characters ) 72 524 P
-6 F
-1.24 (0x) 320.28 524 P
-0 F
-0.51 ( or ) 334.67 524 P
-6 F
-1.24 (0X) 351.69 524 P
-0 F
-0.51 ( \050for hexadecimal\051 or ) 366.08 524 P
-6 F
-1.24 (0b) 472.71 524 P
-0 F
-0.51 ( or ) 487.1 524 P
-6 F
-1.24 (0B) 504.12 524 P
-0 F
-0.51 ( \050for) 518.51 524 P
-(binary\051. For example, all of the following strings generate the same key schedule:) 72 504 T
-5 F
-(ASCII) 72 480 T
-0 F
-( key) 98.1 480 T
-6 F
-(abcdefgh) 180 480 T
-0 F
-(hexadecimal key) 72 460 T
-6 F
-(0x6162e364e5e66768) 180 460 T
-0 F
-(binary key) 72 440 T
-6 F
-(0b0110000101100010111000110110100011100101111000-) 180 440 T
-(1100110011101101000) 180 420 T
-0 F
--0.14 ( Note that giving the key on the command line as ) 108 396 P
-6 F
--0.34 (0x6162636465666768) 345.27 396 P
-0 F
--0.14 ( will ) 474.8 396 P
-3 F
--0.14 (not) 499.17 396 P
-0 F
--0.14 ( reset) 514.5 396 P
-0.25 (the parity bits, because it is interpreted as a sequence of hex digits, not ) 72 376 P
-5 F
-0.21 (ASCII) 416.58 376 P
-0 F
-0.25 ( characters. The dif-) 442.68 376 P
-0.69 (ference in interpretation is that here the user can specify all bits of the key exactly) 72 356 P
-0.69 (, whereas \050on) 474.34 356 P
-0.25 (most terminals\051 it is not possible to control how the parity bit of ) 72 336 P
-5 F
-0.21 (ASCII) 384.76 336 P
-0 F
-0.25 ( characters is set. On some) 410.85 336 P
-0.36 (systems, it is possible to use a \322Meta\323 key to set the parity bit for an ) 72 316 P
-5 F
-0.3 (ASCII) 407.23 316 P
-0 F
-0.36 ( character; should this) 433.33 316 P
--0.3 (be the case and the user desire ) 72 296 P
-3 F
--0.3 (bdes) 218.09 296 P
-0 F
--0.3 ( not to reset the parity bit, the option ) 240.07 296 P
-4 F
--0.3 (\320p) 415.25 296 P
-0 F
--0.3 ( will force the parity bit) 427.92 296 P
-(to be used as typed.) 72 276 T
-4 F
-(4. Encryption Output Repr) 72 244 T
-(esentation) 211.05 244 T
-0 F
-0.01 (All modes of the DES output ciphertext in blocks; the size of the block is 64 bits \0508 bytes\051) 108 220 P
--0.25 (for ECB and CBC modes, and ) 72 200 P
-3 F
--0.25 (k) 218.74 200 P
-0 F
--0.25 ( bits for the ) 224.07 200 P
-3 F
--0.25 (k) 281.02 200 P
-0 F
--0.25 (-bit CFB and OFB modes, and there are as many out-) 286.35 200 P
--0.5 (put blocks as input blocks. However) 72 180 P
--0.5 (, as the length of the input is usually not a multiple of the block) 243.55 180 P
--0.35 (size, some padding is necessary; but as padding must be done by appending characters, these char-) 72 160 P
-0.29 (acters must be distinguished from the input characters somehow) 72 140 P
-0.29 (. The mechanism used is that the) 381.35 140 P
-0.31 (last character of the \050decrypted\051 last block is the
-\050integer\051 number of characters from the input in) 72 120 P
-(the last block.) 72 100 T
-FMENDPAGE
-%%EndPage: "3" 6
-%%Page: "4" 6
-612 792 0 FMBEGINPAGE
-72 745.99 540 756 R
-7 X
-0 K
-V
-72 32.69 540 42.7 R
-V
-0 F
-0 X
-(Page 4 of 11) 479.71 34.7 T
-72 72 540 720 R
-7 X
-V
-0 X
--0.59 (For example, suppose ) 108 712 P
-7 F
--1.41 (inputf) 214.16 712 P
--1.41 (ile) 257.34 712 P
-0 F
--0.59 ( contains \322) 278.93 712 P
-6 F
--1.41 (This) 329.04 712 P
-8 F
--0.65 (z) 357.83 712 P
-6 F
--1.41 (is) 362.8 712 P
-8 F
--0.65 (z) 377.2 712 P
-6 F
--1.41 (a) 382.17 712 P
-8 F
--0.65 (z) 389.37 712 P
-6 F
--1.41 (test) 394.35 712 P
-9 F
--0.59 (\277) 423.13 712 P
-0 F
--0.59 (\323, and it is encrypted in) 431.02 712 P
-(CBC mode using the key \322) 72 692 T
-6 F
-(abcdef#@) 200.93 692 T
-0 F
-(\323 and the initialization vector ) 258.5 692 T
-6 F
-(0x0) 401.4 692 T
-0 F
-(; the command is) 422.99 692 T
-6 F
-(bdes -k abcdef#@ < ) 158.48 668 T
-7 F
-(inputf) 295.21 668 T
-(ile) 338.38 668 T
-6 F
-( > ) 359.97 668 T
-7 F
-(outputf) 381.56 668 T
-(ile) 431.93 668 T
-0 F
-(as CBC is the default encryption mode and ) 72 644 T
-6 F
-(0x0) 281.2 644 T
-0 F
-( the default initialization vector:) 302.79 644 T
-(text) 72 620 T
-6 F
-(T) 117 620 T
-(h) 144 620 T
-(i) 171 620 T
-(s) 198 620 T
-8 F
-(z) 225 620 T
-6 F
-(i) 252 620 T
-(s) 279 620 T
-8 F
-(z) 306 620 T
-6 F
-(a) 333 620 T
-8 F
-(z) 360 620 T
-6 F
-(t) 387 620 T
-(e) 414 620 T
-(s) 441 620 T
-(t) 468 620 T
-9 F
-(\277) 495 620 T
-0 F
-(hex) 72 600 T
-10 F
-(54) 117 600 T
-(68) 144 600 T
-(69) 171 600 T
-(73) 198 600 T
-(20) 225 600 T
-(69) 252 600 T
-(73) 279 600 T
-(20) 306 600 T
-(61) 333 600 T
-(20) 360 600 T
-(74) 387 600 T
-(65) 414 600 T
-(73) 441 600 T
-(74) 468 600 T
-(0a) 495 600 T
-0 F
-(input) 72 580 T
-10 F
-(54) 117 580 T
-(68) 144 580 T
-(69) 171 580 T
-(73) 198 580 T
-(20) 225 580 T
-(69) 252 580 T
-(73) 279 580 T
-(20) 306 580 T
-(61) 333 580 T
-(20) 360 580 T
-(74) 387 580 T
-(65) 414 580 T
-(73) 441 580 T
-(74) 468 580 T
-(0a) 495 580 T
-(07) 522 580 T
-0 F
-(output) 72 560 T
-10 F
-(a5) 117 560 T
-(5f) 144 560 T
-(81) 171 560 T
-(53) 198 560 T
-(51) 225 560 T
-(98) 252 560 T
-(47) 279 560 T
-(02) 306 560 T
-(db) 333 560 T
-(5a) 360 560 T
-(c5) 387 560 T
-(fe) 414 560 T
-(50) 441 560 T
-(3d) 468 560 T
-(40) 495 560 T
-(ce) 522 560 T
-0 F
-0.04 (Notice that the text is 15 characters long, so there are 7 bytes following the last full block.) 108 540 P
-3 F
-0.22 (Bdes) 72 520 P
-0 F
-0.22 ( pads this to a full block by appending one byte containing the ) 95.32 520 P
-5 F
-0.19 (ASCII) 399.67 520 P
-0 F
-0.22 ( character with numeric) 425.77 520 P
-(value 7 \050the ) 72 500 T
-5 F
-(ASCII) 131.62 500 T
-0 F
-( character <) 157.71 500 T
-5 F
-(BEL) 214.42 500 T
-0 F
-(>\051. The result is then encrypted.) 233.3 500 T
-0.44 (As another example, suppose ) 108 476 P
-7 F
-1.07 (inputf) 253.34 476 P
-1.07 (ile) 296.52 476 P
-0 F
-0.44 ( contains \322) 318.11 476 P
-6 F
-1.07 (test) 370.29 476 P
-0 F
-0.44 (\323, and it is encrypted in ECB) 399.08 476 P
-(mode using the key \322) 72 456 T
-6 F
-(abcdef#@) 173.93 456 T
-0 F
-(\323; the command is) 231.5 456 T
-6 F
-(bdes -b \320k abcdef#@ < ) 147.69 432 T
-7 F
-(inputf) 306 432 T
-(ile) 349.18 432 T
-6 F
-( > ) 370.76 432 T
-7 F
-(outputf) 392.35 432 T
-(ile) 442.73 432 T
-0 F
-(because the option ) 72 408 T
-4 F
-(\320b) 164.26 408 T
-0 F
-( signi\336es ECB mode:) 176.93 408 T
-(text) 72 384 T
-6 F
-(t) 144 384 T
-(e) 171 384 T
-(s) 198 384 T
-(t) 225 384 T
-0 F
-(hex) 72 364 T
-10 F
-(74) 144 364 T
-(65) 171 364 T
-(73) 198 364 T
-(74) 225 364 T
-0 F
-(input) 72 344 T
-10 F
-(74) 144 344 T
-(65) 171 344 T
-(73) 198 344 T
-(74) 225 344 T
-(00) 252 344 T
-(00) 279 344 T
-(00) 306 344 T
-(04) 333 344 T
-0 F
-(output) 72 324 T
-10 F
-(0d) 144 324 T
-(8a) 171 324 T
-(6e) 198 324 T
-(57) 225 324 T
-(9c) 252 324 T
-(8f) 279 324 T
-(27) 306 324 T
-(5d) 333 324 T
-0 F
--0.31 (Finally) 108 304 P
--0.31 (, if the length of the message is indeed a multiple of the block size, an extra block of) 141.21 304 P
-0.83 (all 0 bits is added. Suppose ) 72 284 P
-7 F
-1.99 (inputf) 210.57 284 P
-1.99 (ile) 253.74 284 P
-0 F
-0.83 ( contains \322) 275.33 284 P
-6 F
-1.99 (test) 328.28 284 P
-9 F
-0.83 (\277) 357.07 284 P
-0 F
-0.83 (\323, and it is encrypted in 40-bit CFB) 364.96 284 P
-1.51 (mode using the key \322) 72 264 P
-6 F
-3.62 (abcdef#@) 179.96 264 P
-0 F
-1.51 (\323 and the initialization vector ) 237.53 264 P
-6 F
-3.62 (0x0123456789abcdef) 387.97 264 P
-0 F
-1.51 (; the) 517.5 264 P
-(command is) 72 244 T
-6 F
--0.99 (bdes -f40 -v0x0123456789abcdef -kabcdef#@ < ) 72 220 P
-7 F
--0.99 (inputf) 383.67 220 P
--0.99 (ile) 426.85 220 P
-6 F
--0.99 ( > ) 448.43 220 P
-7 F
--0.99 (outputf) 468.04 220 P
--0.99 (ile) 518.41 220 P
-0 F
-0.16 (because the option ) 72 196 P
-4 F
-0.16 (\320f40 ) 164.75 196 P
-0 F
-0.16 (signi\336es 40-bit CFB mode, and ) 189.89 196 P
-4 F
-0.16 (-v0x01234566789abcdef) 343.96 196 P
-0 F
-0.16 ( sets the initial-) 465.89 196 P
-(ization vector \050note that spaces between the option and its ar) 72 176 T
-(gument are optional\051:) 361.57 176 T
-(text) 72 152 T
-6 F
-(t) 144 152 T
-(e) 171 152 T
-(s) 198 152 T
-(t) 225 152 T
-9 F
-(\277) 252 152 T
-0 F
-(hex) 72 132 T
-10 F
-(74) 144 132 T
-(65) 171 132 T
-(73) 198 132 T
-(74) 225 132 T
-(0a) 252 132 T
-0 F
-(input) 72 112 T
-10 F
-(74) 144 112 T
-(65) 171 112 T
-(73) 198 112 T
-(74) 225 112 T
-(0a) 252 112 T
-(00) 279 112 T
-(00) 306 112 T
-(00) 333 112 T
-(00) 360 112 T
-(00) 387 112 T
-0 F
-(output) 72 92 T
-10 F
-(e2) 144 92 T
-(c2) 171 92 T
-(69) 198 92 T
-(a4) 225 92 T
-(5b) 252 92 T
-(3c) 279 92 T
-(3d) 306 92 T
-(b3) 333 92 T
-(f5) 360 92 T
-(3c) 387 92 T
-FMENDPAGE
-%%EndPage: "4" 7
-1 12 /Times-BoldItalic FMDEFINEFONT
-2 14 /Symbol FMDEFINEFONT
-%%Page: "5" 7
-612 792 0 FMBEGINPAGE
-72 745.99 540 756 R
-7 X
-0 K
-V
-72 32.69 540 42.7 R
-V
-0 F
-0 X
-(Page 5 of 11) 479.71 34.7 T
-72 72 540 720 R
-7 X
-V
-0 X
-(Note here the block size is 40 bits \0505 bytes\051, not 64 bits \0508 bytes\051.) 108 712 T
--0.4 (This technique allows complete compatibility with Sun\325) 108 688 P
--0.4 (s ) 374.11 688 P
-3 F
--0.4 (des) 381.37 688 P
-0 F
--0.4 ( program. In Sun\325) 397.36 688 P
--0.4 (s implemen-) 480.77 688 P
-0.02 (tation, padding is done with random bytes rather than bytes containing all zero bits. Cryptograph-) 72 668 P
-0.85 (ically) 72 648 P
-0.85 (, this makes no dif) 97.87 648 P
-0.85 (ference, as the DES is a suf) 189.32 648 P
-0.85 (\336ciently good random cipher to obscure the) 325.74 648 P
-(input \050see for example [2], Chapter 6\051, and known plaintext attacks are very dif) 72 628 T
-(\336cult [1].) 451.82 628 T
-4 F
-(5. Differ) 72 596 T
-(ences Between the Standard CFB and OFB Modes and ) 114.41 596 T
-1 F
-(bdes) 397.26 596 T
-0 F
--0.11 (The UNIX operating system treats all \336les as streams of 8-bit bytes. In order to implement) 108 572 P
--0.08 (the CFB and OFB modes properly) 72 552 P
--0.08 (, it would be necessary to read ) 235.74 552 P
-3 F
--0.08 (k) 383.74 552 P
-0 F
--0.08 ( bits from the \336le, where ) 389.07 552 P
-3 F
--0.08 (k) 509.51 552 P
-0 F
--0.08 ( is an) 514.84 552 P
-0.98 (integer between 1 and 64 inclusive. However) 72 532 P
-0.98 (, this would require considerable buf) 294.22 532 P
-0.98 (fering and be) 474.77 532 P
-0.23 (quite inef) 72 512 P
-0.23 (\336cient and prohibitively slow) 117.65 512 P
-0.23 (. For these reasons, the current implementation of ) 258.48 512 P
-3 F
-0.23 (bdes) 501.48 512 P
-0 F
-0.23 ( re-) 523.46 512 P
-0.47 (quires that ) 72 492 P
-3 F
-0.47 (k) 126.23 492 P
-0 F
-0.47 ( be a multiple of 8, so that an integral number of bytes will always be read from the) 131.56 492 P
-(\336le. Other than this change, this mode is implemented as described in [3].) 72 472 T
--0.58 (A similar observation holds for the alternate CFB mode described in [3]. Here, only the low) 108 448 P
-0.23 (7 bits of each byte are signi\336cant, and hence the parameter ) 72 428 P
-3 F
-0.23 (k) 358.95 428 P
-0 F
-0.23 ( is an integer from 1 to 56 inclusive;) 364.28 428 P
-(bdes requires k to be a multiple of 7. The high-order bit is retained for encryption and decryption,) 72 408 T
-(but output \050whether from encryption or decryption\051 always has the high-order bit set to zero.) 72 388 T
-4 F
-(6. Message Authentication Code Modes) 72 356 T
-0 F
-0.57 (The Data Encryption Standard provides two modes of authentication, each providing be-) 108 332 P
-1.27 (tween 1 and 64 bits of authentication data. In both cases an ) 72 312 P
-3 F
-1.27 (n) 373.32 312 P
-0 F
-1.27 (-bit message authentication code) 379.32 312 P
-0.62 (\050MAC\051 is generated, where 1) 72 292 P
-2 F
-0.73 ( ) 214.71 292 P
-9 F
-0.62 (\243) 218.94 292 P
-0 F
-0.62 ( ) 225.52 292 P
-3 F
-0.62 (n) 229.15 292 P
-0 F
-0.62 ( ) 235.14 292 P
-9 F
-0.62 (\243) 238.76 292 P
-0 F
-0.62 ( 64. The \336rst is based on the CBC encryption mode, and the) 245.35 292 P
-(second on CFB mode. Both work the same.) 72 272 T
-0.13 (First, the \336le is padded to a multiple of the block size by appending enough zero bits. It is) 108 248 P
--0.16 (then encrypted using the standard CBC \050or CFB\051 algorithm, but
-all encrypted text is discarded ex-) 72 228 P
--0.44 (cept for the last block. The ) 72 208 P
-3 F
--0.44 (n) 200.9 208 P
-0 F
--0.44 ( leading bits of the last block are used as the MAC. Note that the block) 206.9 208 P
-(size constrains the number of bits available as the MAC.) 72 188 T
-0.71 (The implementation allows the user to specify that the MAC is to be computed in either) 108 164 P
--0.01 (CBC or CFB mode, and the user can specify any number of bits from 1 to 64 inclusive. However) 72 144 P
--0.01 (,) 537 144 P
--0.11 (because the UNIX operating system can only output bits in multiples of 8, if the number of bits of) 72 124 P
--0.08 (MAC is not a multiple of 8, the MAC will be right-padded with the minimum number of zero bits) 72 104 P
--0.31 (necessary to make the MAC length be a multiple of 8. However) 72 84 P
--0.31 (, note that as the standard \050[3], Ap-) 374.6 84 P
-FMENDPAGE
-%%EndPage: "5" 8
-%%Page: "6" 8
-612 792 0 FMBEGINPAGE
-72 745.99 540 756 R
-7 X
-0 K
-V
-72 32.69 540 42.7 R
-V
-0 F
-0 X
-(Page 6 of 11) 479.71 34.7 T
-72 72 540 720 R
-7 X
-V
-0 X
--0.14 (pendix F\051 requires an incomplete \336nal block be right-padded with
-zeroes, the technique of forcing) 72 712 P
-(the last octet to contain the number of bytes in the message is ) 72 692 T
-3 F
-(not) 369.47 692 T
-0 F
-( used here.) 384.8 692 T
--0.39 (For example, suppose ) 108 668 P
-7 F
--0.94 (inputf) 214.76 668 P
--0.94 (ile) 257.93 668 P
-0 F
--0.39 ( contains \322) 279.52 668 P
-6 F
--0.94 (This) 330.04 668 P
-8 F
--0.43 (z) 358.82 668 P
-6 F
--0.94 (is) 363.8 668 P
-8 F
--0.43 (z) 378.19 668 P
-6 F
--0.94 (a) 383.17 668 P
-8 F
--0.43 (z) 390.36 668 P
-6 F
--0.94 (test) 395.34 668 P
-9 F
--0.39 (\277) 424.13 668 P
-0 F
--0.39 (\323, and a 64-bit MAC is) 432.02 668 P
--0.73 (to be generated using CBC mode, the key \322) 72 648 P
-6 F
--1.74 (abcdef#@) 274.39 648 P
-0 F
--0.73 (\323 and the initialization vector ) 331.96 648 P
-6 F
--1.74 (0x0) 471.23 648 P
-0 F
--0.73 (; the com-) 492.82 648 P
-(mand is) 72 628 T
-6 F
-(bdes -m 64 -k abcdef#@ < ) 136.89 604 T
-7 F
-(inputf) 316.79 604 T
-(ile) 359.97 604 T
-6 F
-( > ) 381.56 604 T
-7 F
-(outputf) 403.15 604 T
-(ile) 453.52 604 T
-0 F
-(as CBC is the default encryption mode and ) 72 580 T
-6 F
-(0x0) 281.2 580 T
-0 F
-( the default initialization vector:) 302.79 580 T
-(text) 72 556 T
-6 F
-(T) 117 556 T
-(h) 144 556 T
-(i) 171 556 T
-(s) 198 556 T
-8 F
-(z) 225 556 T
-6 F
-(i) 252 556 T
-(s) 279 556 T
-8 F
-(z) 306 556 T
-6 F
-(a) 333 556 T
-8 F
-(z) 360 556 T
-6 F
-(t) 387 556 T
-(e) 414 556 T
-(s) 441 556 T
-(t) 468 556 T
-9 F
-(\277) 495 556 T
-0 F
-(hex) 72 536 T
-10 F
-(54) 117 536 T
-(68) 144 536 T
-(69) 171 536 T
-(73) 198 536 T
-(20) 225 536 T
-(69) 252 536 T
-(73) 279 536 T
-(20) 306 536 T
-(61) 333 536 T
-(20) 360 536 T
-(74) 387 536 T
-(65) 414 536 T
-(73) 441 536 T
-(74) 468 536 T
-(0a) 495 536 T
-0 F
-(input) 72 516 T
-10 F
-(54) 117 516 T
-(68) 144 516 T
-(69) 171 516 T
-(73) 198 516 T
-(20) 225 516 T
-(69) 252 516 T
-(73) 279 516 T
-(20) 306 516 T
-(61) 333 516 T
-(20) 360 516 T
-(74) 387 516 T
-(65) 414 516 T
-(73) 441 516 T
-(74) 468 516 T
-(0a) 495 516 T
-(00) 522 516 T
-0 F
-(output) 72 496 T
-10 F
-(43) 117 496 T
-(18) 144 496 T
-(de) 171 496 T
-(74) 198 496 T
-(24) 225 496 T
-(a9) 252 496 T
-(65) 279 496 T
-(d1) 306 496 T
-0 F
-0.04 (Notice that the text is 15 characters long, so there are 7 bytes following the last full block.) 108 476 P
-3 F
-(Bdes) 72 456 T
-0 F
-( pads this to a full block by appending a zero-\336lled byte. The result is then encrypted and the) 95.32 456 T
-(last block of output is used as the MAC.) 72 436 T
-0.06 (As another example, suppose we used the same text, and wanted a 36-bit MAC to be gen-) 108 412 P
-6.91 (erated using 40-bit CFB mode, the key \322) 72 392 P
-6 F
-16.58 (abcdef#@) 314.9 392 P
-0 F
-6.91 (\323 and the initialization vector) 372.47 392 P
-6 F
-(0x0123456789abcdef) 72 372 T
-0 F
-(; the command is) 201.53 372 T
-6 F
-(bdes -m 36 -f 40 -v 0x0123456789abcdef < ) 79.32 348 T
-7 F
-(inputf) 374.36 348 T
-(ile) 417.54 348 T
-6 F
-( > ) 439.13 348 T
-7 F
-(outputf) 460.71 348 T
-(ile) 511.09 348 T
-0 F
--0.19 (where ) 72 324 P
-4 F
--0.19 (\320m 36) 104.11 324 P
-0 F
--0.19 ( is the option to generate a 36-bit MAC, ) 134.91 324 P
-4 F
--0.19 (\320f 40) 327.79 324 P
-0 F
--0.19 ( indicates 40-bit CFB is to be used, and) 352.58 324 P
-4 F
--0.31 (\320v 0x123456789abcdef) 72 304 P
-0 F
--0.31 ( sets the initialization vector) 186.62 304 P
--0.31 (. Note that, as the key is not given on the com-) 319.95 304 P
-(mand line, the user will be prompted for it. It gives:) 72 284 T
-(text) 72 260 T
-6 F
-(T) 117 260 T
-(h) 144 260 T
-(i) 171 260 T
-(s) 198 260 T
-8 F
-(z) 225 260 T
-6 F
-(i) 252 260 T
-(s) 279 260 T
-8 F
-(z) 306 260 T
-6 F
-(a) 333 260 T
-8 F
-(z) 360 260 T
-6 F
-(t) 387 260 T
-(e) 414 260 T
-(s) 441 260 T
-(t) 468 260 T
-9 F
-(\277) 495 260 T
-0 F
-(hex) 72 240 T
-10 F
-(54) 117 240 T
-(68) 144 240 T
-(69) 171 240 T
-(73) 198 240 T
-(20) 225 240 T
-(69) 252 240 T
-(73) 279 240 T
-(20) 306 240 T
-(61) 333 240 T
-(20) 360 240 T
-(74) 387 240 T
-(65) 414 240 T
-(73) 441 240 T
-(74) 468 240 T
-(0a) 495 240 T
-0 F
-(input) 72 220 T
-10 F
-(54) 117 220 T
-(68) 144 220 T
-(69) 171 220 T
-(73) 198 220 T
-(20) 225 220 T
-(69) 252 220 T
-(73) 279 220 T
-(20) 306 220 T
-(61) 333 220 T
-(20) 360 220 T
-(74) 387 220 T
-(65) 414 220 T
-(73) 441 220 T
-(74) 468 220 T
-(0a) 495 220 T
-0 F
-(output) 72 200 T
-10 F
-(2b) 117 200 T
-(18) 144 200 T
-(68) 171 200 T
-(2d) 198 200 T
-(60) 225 200 T
-0 F
-0.19 (Note that the MAC is padded on the right by four zero bits to produce \336ve characters that) 108 180 P
-(can be output.) 72 160 T
-4 F
-(7. Differ) 72 128 T
-(ences Between ) 114.41 128 T
-1 F
-(bdes) 191.01 128 T
-4 F
-( and Sun\325) 212.99 128 T
-(s DES Implementation) 261.88 128 T
-0 F
-0.02 (The program ) 108 104 P
-3 F
-0.02 (bdes) 173.33 104 P
-0 F
-0.02 ( is designed to be completely compatible with Sun Microsystems, Inc.\325) 195.31 104 P
-0.02 (s) 535.33 104 P
-0.57 (implementation of the Data Encryption Standard, called ) 72 84 P
-3 F
-0.57 (des) 347.14 84 P
-0 F
-0.57 ( and described in [4]. Thus, \336les en-) 363.13 84 P
-FMENDPAGE
-%%EndPage: "6" 9
-%%Page: "7" 9
-612 792 0 FMBEGINPAGE
-72 745.99 540 756 R
-7 X
-0 K
-V
-72 32.69 540 42.7 R
-V
-0 F
-0 X
-(Page 7 of 11) 479.71 34.7 T
-72 72 540 720 R
-7 X
-V
-0 X
-0.44 (crypted using ) 72 712 P
-3 F
-0.44 (des) 140.84 712 P
-0 F
-0.44 ( can be decrypted using ) 156.83 712 P
-3 F
-0.44 (bdes) 275.29 712 P
-0 F
-0.44 (, and vice versa, provided modes common to both) 297.27 712 P
--0.34 (are used. However) 72 692 P
--0.34 (, ) 160.41 692 P
-3 F
--0.34 (bdes) 166.06 692 P
-0 F
--0.34 ( does not allow \336les to be named on the command line, nor does it support) 188.05 692 P
--0.68 (hardware devices \050and so the ) 72 672 P
-4 F
--0.68 (-s) 210.83 672 P
-0 F
--0.68 ( and ) 219.49 672 P
-4 F
--0.68 (-f) 241.45 672 P
-0 F
--0.68 ( options of Sun\325) 249.44 672 P
--0.68 (s ) 323.71 672 P
-3 F
--0.68 (des) 330.7 672 P
-0 F
--0.68 ( are not available\051. Further) 346.69 672 P
--0.68 (, as encryption) 471.07 672 P
--0.05 (is the default, the Sun ) 72 652 P
-3 F
--0.05 (des) 179.01 652 P
-0 F
--0.05 ( ) 195 652 P
-4 F
--0.05 (-e) 197.95 652 P
-0 F
--0.05 ( option is not recognized. As the manual page to ) 207.27 652 P
-3 F
--0.05 (bdes) 441.6 652 P
-0 F
--0.05 ( is in the appen-) 463.59 652 P
-(dix, these dif) 72 632 T
-(ferences will not be elaborated upon further) 134.08 632 T
-(.) 343.24 632 T
-0.44 (Sun\325) 108 608 P
-0.44 (s ) 130 608 P
-3 F
-0.44 (des) 138.1 608 P
-0 F
-0.44 ( supports the use of special-purpose hardware to encrypt and decrypt. Although) 154.09 608 P
-3 F
-1.33 (bdes) 72 588 P
-0 F
-1.33 ( does not directly support the use of such hardware, it uses the library routine ) 93.98 588 P
-3 F
-1.33 (encrypt) 487.05 588 P
-0 F
-1.33 (\0503\051,) 523.02 588 P
--0.09 (which may) 72 568 P
--0.09 (. Hardware support was not included directly to support as lar) 124.1 568 P
--0.09 (ge a number of platforms) 419.11 568 P
-(as possible with installers needing to know as little about the hardware as possible.) 72 548 T
--0.08 (Sun\325) 108 524 P
--0.08 (s ) 130 524 P
-3 F
--0.08 (des) 137.58 524 P
-0 F
--0.08 ( supports only the CBC and ECB encryption modes; ) 153.57 524 P
-3 F
--0.08 (bdes) 407.07 524 P
-0 F
--0.08 ( supports all modes de-) 429.05 524 P
-0.26 (scribed in [3] \050although CFB and OFB are not completely supported\051 as well as both CBC-based) 72 504 P
-(and CFB-based MACs.) 72 484 T
-0.15 (Although input with length not a multiple of the block size is handled in the same way by) 108 460 P
--0.47 (both ) 72 440 P
-3 F
--0.47 (des) 95.85 440 P
-0 F
--0.47 ( and ) 111.84 440 P
-3 F
--0.47 (bdes) 134.21 440 P
-0 F
--0.47 (, dif) 156.19 440 P
--0.47 (ferent values of the padding bytes are used in all but the last byte of the input.) 174.82 440 P
-(Where ) 72 420 T
-3 F
-(bdes) 106.96 420 T
-0 F
-( puts zero bytes, ) 128.94 420 T
-3 F
-(des) 209.89 420 T
-0 F
-( puts bytes containing random values. The reason for Sun\325) 225.87 420 T
-(s doing) 505.02 420 T
-0.47 (so is to prevent a known plaintext attack on the \336le should an
-attacker determine that the input\325) 72 400 P
-0.47 (s) 535.33 400 P
--0.29 (length were a multiple of the block size. W) 72 380 P
--0.29 (ith ) 276.05 380 P
-3 F
--0.29 (bdes) 291.43 380 P
-0 F
--0.29 (, the plaintext contents of the last block of input) 313.41 380 P
-0.31 (for such a \336le is known \050a block with all bits zero\051. W) 72 360 P
-0.31 (ith ) 333.99 360 P
-3 F
-0.31 (des) 349.96 360 P
-0 F
-0.31 (, the plaintext contents of that block) 365.95 360 P
-0.73 (are not known. Cryptanalytically) 72 340 P
-0.73 (, given the information about the strength of the DES currently) 231.29 340 P
-0.2 (known, it is widely believed that known plaintext attacks are infeasible
-\050see for example [1]\051 and) 72 320 P
-1.86 (so initializing and invoking the pseudorandom number generator seems unnecessary) 72 300 P
-1.86 (. But this) 492.63 300 P
-(means that ciphertexts produced from a plaintext by ) 72 280 T
-3 F
-(bdes) 324.48 280 T
-0 F
-( and ) 346.47 280 T
-3 F
-(des) 369.78 280 T
-0 F
-( will dif) 385.77 280 T
-(fer in the last block.) 423.54 280 T
-4 F
-(Refer) 72 248 T
-(ences) 100.41 248 T
-0 F
-([1]) 72 224 T
-0.37 (D. Denning, \322The Data Encryption Standard: Fifteen Y) 108 224 P
-0.37 (ears of Public Scrutiny) 374.87 224 P
-0.37 (,\323 ) 484.8 224 P
-3 F
-0.37 (Pr) 496.49 224 P
-0.37 (oceed-) 508.04 224 P
--0.47 (ings of the Sixth Annual Computer Security Applications Confer) 108 204 P
--0.47 (ence) 411.65 204 P
-0 F
--0.47 ( pp. x\320xv \050Dec. 1990\051.) 433.62 204 P
-([2]) 72 180 T
-(A. Konheim, ) 108 180 T
-3 F
-(Cryptography: A Primer) 173.29 180 T
-0 F
-(, John W) 291.4 180 T
-(iley and Sons, Inc., New Y) 333.9 180 T
-(ork, NY \0501981\051.) 461.94 180 T
-([3]) 72 156 T
-3 F
-0.63 (DES Modes of Operation) 108 156 P
-0 F
-0.63 (, Federal Information Processing Standards Publication 81, Na-) 231.47 156 P
--0.07 (tional Bureau of Standards, U.S. Department of Commerce, W) 108 136 P
--0.07 (ashington, DC \050Dec. 1980\051.) 407.62 136 P
-([4]) 72 112 T
-3 F
-(UNIX User) 108 112 T
-(\325) 162.74 112 T
-(s Manual) 165.18 112 T
-0 F
-(, Sun Microsystems Inc., Mountain V) 210.16 112 T
-(iew) 390 112 T
-(, CA \050Mar) 406.54 112 T
-(. 1988\051.) 455.51 112 T
-4 F
-(Appendix. The UNIX System Manual Page for ) 72 80 T
-1 F
-(bdes) 313.2 80 T
-FMENDPAGE
-%%EndPage: "7" 10
-1 11 /Times-Bold FMDEFINEFONT
-%%Page: "8" 10
-612 792 0 FMBEGINPAGE
-72 745.99 540 756 R
-7 X
-0 K
-V
-72 32.69 540 42.7 R
-V
-0 F
-0 X
-(Page 8 of 11) 479.71 34.7 T
-72 72 540 720 R
-7 X
-V
-1 F
-0 X
-(NAME) 72 712.67 T
-0 F
-(bdes - encrypt/decrypt using the Data Encryption Standard) 108 689 T
-1 F
-(SYNOPSIS) 72 663.67 T
-4 F
-(bdes) 108 640 T
-0 F
-( [) 131.33 640 T
-3 F
-( ) 138.32 640 T
-4 F
-(-abdp) 141.32 640 T
-0 F
-( ] [ ) 171.31 640 T
-4 F
-(-F) 188.3 640 T
-0 F
-( ) 199.62 640 T
-3 F
-(b) 202.62 640 T
-0 F
-( ] [ ) 208.61 640 T
-4 F
-(-f) 225.6 640 T
-0 F
-( ) 233.58 640 T
-3 F
-(b) 236.58 640 T
-0 F
-( ] [ ) 242.58 640 T
-4 F
-(-k) 259.56 640 T
-0 F
-( ) 270.22 640 T
-3 F
-(key) 273.22 640 T
-0 F
-( ] [ ) 289.2 640 T
-4 F
-(-m) 306.18 640 T
-0 F
-( ) 320.16 640 T
-3 F
-(b) 323.16 640 T
-0 F
-( ] [ ) 329.16 640 T
-4 F
-(-o) 346.14 640 T
-0 F
-( ) 356.13 640 T
-3 F
-(b) 359.13 640 T
-0 F
-( ] [ ) 365.13 640 T
-4 F
-(-v) 382.11 640 T
-0 F
-( ) 392.1 640 T
-3 F
-(vector) 395.1 640 T
-0 F
-( ]) 425.07 640 T
-1 F
-(DESCRIPTION) 72 614.67 T
-3 F
--0.69 (Bdes) 108 591 P
-0 F
--0.69 ( reads from the standard input and writes on the standard output. It implements all DES) 131.32 591 P
--0.09 (modes of operation described in FIPS PUB 81 including alternative cipher feedback mode) 108 577 P
-0.74 (and both authentication modes. All modes but the electronic code book mode require an) 108 563 P
--0.14 (initialization vector; if none is supplied, the zero vector is used. T) 108 549 P
--0.14 (o protect the key and ini-) 420.44 549 P
-0.29 (tialization vector from being read by) 108 535 P
-3 F
-0.29 ( ps) 284.98 535 P
-0 F
-0.29 (\0501\051, ) 298.94 535 P
-3 F
-0.29 (bdes ) 319.21 535 P
-0 F
-0.29 (hides its ar) 344.48 535 P
-0.29 (guments on entry) 396.81 535 P
-0.29 (. If no ) 479.89 535 P
-3 F
-0.29 (key ) 512.74 535 P
-0 F
-0.29 (is) 532 535 P
--0.61 (given, one is requested from the controlling terminal if that can be opened, or from the stan-) 108 521 P
-(dard input if not.) 108 507 T
--0.17 (The key and initialization vector are taken as sequences of ) 108 489 P
-5 F
--0.14 (ASCII) 389.38 489 P
-0 F
--0.17 ( characters which are then) 415.48 489 P
--0.35 (mapped into their bit representations. If either begins with
-\3240x\325 or \3240X\325, that one is taken as) 108 475 P
-1.02 (a sequence of hexadecimal digits indicating the bit pattern; if either begins with \3240b\325 or) 108 461 P
--0.73 (\3240B\325, that one is taken as a sequence of binary digits
-indicating the bit pattern. In either case,) 108 447 P
--0.37 (only the leading 64 bits of the key or initialization vector are used, and if fewer than 64 bits) 108 433 P
-0.35 (are provided, enough 0 bits are appended to pad the key to 64 bits. Note that if the key is) 108 419 P
-0.03 (not entered on the command line, it is interpreted in the same way) 108 405 P
-0.03 (, because with 4.4 BSD,) 424.31 405 P
--0.36 (the password reading function ) 108 391 P
-3 F
--0.36 (getpass) 254.45 391 P
-0 F
--0.36 (\0503\051 allows enough characters for either hex or binary) 290.43 391 P
-(keys to be entered.) 108 377 T
-0.04 (According to the DES standard, the low-order bit of each character in the key string is de-) 108 359 P
--0.18 (leted. Since most ) 108 345 P
-5 F
--0.15 (ASCII) 192.75 345 P
-0 F
--0.18 ( representations set the high-order bit to 0, simply deleting the low-) 218.84 345 P
--0.29 (order bit ef) 108 331 P
--0.29 (fectively reduces the size of the key space from 2) 160.49 331 P
-5 F
--0.24 (56) 394.67 335.8 P
-0 F
--0.29 ( to 2) 404.67 331 P
-5 F
--0.24 (48) 425.41 335.8 P
-0 F
--0.29 ( keys. T) 435.4 331 P
--0.29 (o prevent this,) 472.29 331 P
--0.46 (the high-order bit must be a function depending in part upon the low-order bit; so, the high-) 108 317 P
-0.11 (order bit is set to whatever value gives odd parity) 108 303 P
-0.11 (. This preserves the key space size. Note) 345.05 303 P
-(this resetting of the parity bit is ) 108 289 T
-3 F
-(not) 260.92 289 T
-0 F
-( done if the key is given in binary or hex.) 276.24 289 T
--0.38 (By default, the standard input is encrypted using cipher block chaining mode and is written) 108 271 P
-0.18 (to the standard output. Using the same key for encryption and decryption preserves plain-) 108 257 P
-(text, so) 108 243 T
-( bdes ) 225.81 225 T
-3 F
-(key) 253.79 225 T
-0 F
-( < plaintext | bdes \320i ) 269.77 225 T
-3 F
-(key) 370.21 225 T
-0 F
-( ) 386.19 225 T
-(is a very expensive equivalent of ) 108 201 T
-3 F
-(cat) 268.54 201 T
-0 F
-(\0501\051.) 283.2 201 T
-(Options are:) 108 183 T
-( ) 108 165 T
-4 F
-(\320a) 111 165 T
-0 F
--0.75 (The key and initialization vector strings are to be taken as ) 144 165 P
-5 F
--0.62 (ASCII) 415.89 165 P
-0 F
--0.75 ( suppressing the spe-) 441.98 165 P
-0.3 (cial interpretation given to leading \3240x\325, \3240X\325, \3240b\325,
-and \3240B\325 characters. Note this) 144 151 P
-(\337ag applies to ) 144 137 T
-3 F
-(both) 214.29 137 T
-0 F
-( the key and initialization vector) 235.62 137 T
-(.) 389.85 137 T
-4 F
-(\320b) 108 119 T
-0 F
-(Use electronic code book mode.) 144 119 T
-4 F
-(\320d) 108 101 T
-0 F
-(Decrypt the input.) 144 101 T
-FMENDPAGE
-%%EndPage: "8" 11
-%%Page: "9" 11
-612 792 0 FMBEGINPAGE
-72 745.99 540 756 R
-7 X
-0 K
-V
-72 32.69 540 42.7 R
-V
-0 F
-0 X
-(Page 9 of 11) 479.71 34.7 T
-72 72 540 720 R
-7 X
-V
-4 F
-0 X
-(\320f) 108 712 T
-0 F
-( ) 117.99 712 T
-3 F
-(b) 120.99 712 T
-0 F
--0.29 (Use ) 144 712 P
-3 F
--0.29 (b) 165.36 712 P
-0 F
--0.29 (-bit cipher feedback mode. Currently ) 171.35 712 P
-3 F
--0.29 (b) 350.42 712 P
-0 F
--0.29 ( must be a multiple of 8 between 8 and) 356.42 712 P
-(64 inclusive \050this does not conform to the standard CFB mode speci\336cation\051.) 144 698 T
-4 F
-(\320F) 108 680 T
-0 F
-( ) 121.32 680 T
-3 F
-(b) 124.32 680 T
-0 F
--0.29 (Use ) 144 680 P
-3 F
--0.29 (b) 165.36 680 P
-0 F
--0.29 (-bit alternative cipher feedback mode. Currently ) 171.36 680 P
-3 F
--0.29 (b) 403.77 680 P
-0 F
--0.29 ( must be a multiple of 7 be-) 409.77 680 P
--0.12 (tween 7 and 56 inclusive \050this does not conform to the alternative CFB mode spec-) 144 666 P
-(i\336cation\051.) 144 652 T
-4 F
-(\320k) 108 634 T
-0 F
-( ) 120.67 634 T
-3 F
-(key) 123.66 634 T
-0 F
-0.37 (Use the string ) 144 616 P
-3 F
-0.37 (key) 214.74 616 P
-0 F
-0.37 ( as the cryptographic key) 230.72 616 P
-0.37 (. If this ar) 352.01 616 P
-0.37 (gument is not given, the user) 399.54 616 P
-(will be prompted for the key) 144 602 T
-(.) 280.12 602 T
-4 F
-(\320m) 108 584 T
-0 F
-( ) 123.99 584 T
-3 F
-(b) 126.99 584 T
-0 F
-0.71 (Compute a message authentication code \050MAC\051 of ) 144 584 P
-3 F
-0.71 (b) 395.78 584 P
-0 F
-0.71 ( bits on the input. ) 401.77 584 P
-3 F
-0.71 (b) 491.94 584 P
-0 F
-0.71 ( must be) 497.94 584 P
-0.11 (between 1 and 64 inclusive; if ) 144 570 P
-3 F
-0.11 (b) 291.87 570 P
-0 F
-0.11 ( is not a multiple of 8, enough 0 bits will be added) 297.86 570 P
--0.44 (to pad the MAC length to the nearest multiple of 8. Only the MAC is output. MACs) 144 556 P
-(are only available in cipher block chaining mode or in cipher feedback mode.) 144 542 T
-4 F
-(\320o) 108 524 T
-0 F
-( ) 119.99 524 T
-3 F
-(b) 122.99 524 T
-0 F
--0.34 (Use ) 144 524 P
-3 F
--0.34 (b) 165.31 524 P
-0 F
--0.34 (-bit output feedback mode. Currently ) 171.31 524 P
-3 F
--0.34 (b) 350.83 524 P
-0 F
--0.34 ( must be a multiple of 8 between 8 and) 356.83 524 P
-(64 inclusive \050this does not conform to the OFB mode speci\336cation\051.) 144 510 T
-4 F
-(\320p) 108 492 T
-0 F
--0.14 (Disable the resetting of the parity bit. This \337ag forces the parity bit of the key to be) 144 492 P
-0.03 (used as typed, rather than making each character be of odd parity) 144 478 P
-0.03 (. It is used only if) 455.91 478 P
-(the key is given in ) 144 464 T
-5 F
-(ASCII) 234.95 464 T
-0 F
-(.) 261.04 464 T
-4 F
-(\320v) 108 446 T
-0 F
-( ) 119.99 446 T
-3 F
-(vector) 122.99 446 T
-0 F
--0.5 (Set the initialization vector to ) 144 428 P
-3 F
--0.5 (v) 286.44 428 P
-0 F
--0.5 (; the vector is interpreted in the same way as the key) 291.76 428 P
--0.5 (.) 537 428 P
-(The vector is ignored in electronic codebook mode.) 144 414 T
--0.55 (The DES is considered a very strong cryptosystem, and other than table lookup attacks, key) 108 396 P
-0.24 (search attacks, and Hellman\325) 108 382 P
-0.24 (s time-memory tradeof) 246.61 382 P
-0.24 (f \050all of which are very expensive and) 356.8 382 P
-0.66 (time-consuming\051, no cryptanalytic methods for breaking the DES are known in the open) 108 368 P
-0.33 (literature. No doubt the choice of keys and key security are the most vulnerable aspect of) 108 354 P
-3 F
-(bdes) 108 340 T
-0 F
-(.) 129.98 340 T
-4 F
-(IMPLEMENT) 72 314 T
-(A) 146.41 314 T
-(TION NOTES) 154.18 314 T
-0 F
-0.57 (For implementors wishing to write software compatible with this program, the following) 108 290 P
--0.23 (notes are provided. This software is completely compatible with the implementation of the) 108 276 P
-(data encryption standard distributed by Sun Microsystems, Inc.) 108 262 T
-0.11 (In the ECB and CBC modes, plaintext is encrypted in units of 64 bits \0508 bytes, also called) 108 244 P
-0.52 (a block\051. T) 108 230 P
-0.52 (o ensure that the plaintext \336le is encrypted correctly) 160.49 230 P
-0.52 (, ) 413.01 230 P
-3 F
-0.52 (bdes ) 419.53 230 P
-0 F
-0.52 (will \050internally\051 ap-) 445.03 230 P
-0.29 (pend from 1 to 8 bytes, the last byte containing an integer stating how many bytes of that) 108 216 P
--0.71 (\336nal block are from the plaintext \336le, and encrypt the resulting block. Hence, when decrypt-) 108 202 P
-0.27 (ing, the last block may contain from 0 to 7 characters present in the plaintext \336le, and the) 108 188 P
--0.59 (last byte tells how many) 108 174 P
--0.59 (. Note that if during decryption the last byte of the \336le does not con-) 221.46 174 P
-0.41 (tain an integer between 0 and 7, either the \336le has been corrupted or an incorrect key has) 108 160 P
-0.48 (been given. A similar mechanism is used for the OFB and CFB modes, except that those) 108 146 P
-0.26 (simply require the length of the input to be a multiple of the mode size, and the \336nal byte) 108 132 P
--0.73 (contains an integer between 0 and one less than the number of bytes being used as the mode.) 108 118 P
-(\050This was another reason that the mode size must be a multiple of 8 for those modes.\051) 108 104 T
-FMENDPAGE
-%%EndPage: "9" 12
-%%Page: "10" 12
-612 792 0 FMBEGINPAGE
-72 745.99 540 756 R
-7 X
-0 K
-V
-72 32.69 540 42.7 R
-V
-0 F
-0 X
-(Page 10 of 11) 473.71 34.7 T
-72 72 540 720 R
-7 X
-V
-0 X
-0.94 (Unlike Sun\325) 108 712 P
-0.94 (s implementation, unused bytes of that last block are not \336lled with random) 166.58 712 P
-0.57 (data, but instead contain what was in those byte positions in the preceding block. This is) 108 698 P
-(quicker and more portable, and does not weaken the encryption signi\336cantly) 108 684 T
-(.) 473.95 684 T
-0.36 (If the key is entered in ) 108 666 P
-5 F
-0.3 (ASCII) 220.76 666 P
-0 F
-0.36 (, the parity bits of the key characters are set so that each key) 246.85 666 P
-1.03 (character is of odd parity) 108 652 P
-1.03 (. Unlike Sun\325) 231.23 652 P
-1.03 (s implementation, it is possible to enter binary or) 296.92 652 P
--0.57 (hexadecimal keys on the command line, and if this is done, the parity bits are ) 108 638 P
-3 F
--0.57 (not ) 472.85 638 P
-0 F
--0.57 (reset. This) 490.61 638 P
-(allows testing using arbitrary bit patterns as keys.) 108 624 T
-0.64 (The Sun implementation always uses an initialization vector of 0 \050that is, all zeroes\051. By) 108 606 P
-(default, ) 108 592 T
-3 F
-(bdes ) 147.3 592 T
-0 F
-(does too, but this may be changed from the command line.) 172.29 592 T
-4 F
-(FILES) 72 566 T
-0 F
-(/dev/tty) 108 542 T
-(controlling terminal for typed key) 180 542 T
-4 F
-(SEE ALSO) 72 516 T
-3 F
-(crypt) 108 492 T
-0 F
-(\0501\051, ) 132.65 492 T
-3 F
-(crypt) 152.63 492 T
-0 F
-(\0503\051) 177.27 492 T
-3 F
--0.4 (Data Encryption Standar) 108 474 P
--0.4 (d) 228.02 474 P
-0 F
--0.4 (, Federal Information Processing Standard #46, National Bureau) 234.02 474 P
-(of Standards, U.S. Department of Commerce, W) 108 460 T
-(ashington DC \050Jan. 1977\051.) 340.2 460 T
-3 F
-0.16 (DES) 108 442 P
-0 F
-0.16 ( ) 129.98 442 P
-3 F
-0.16 (Modes of Operation, ) 133.15 442 P
-0 F
-0.16 (Federal Information Processing Standard #81, National Bureau) 236.24 442 P
-(of Standards, U.S. Department of Commerce, W) 108 428 T
-(ashington DC \050Dec. 1980\051.) 340.2 428 T
-2.75 (Dorothy Denning, ) 108 410 P
-3 F
-2.75 (Cryptography and Data Security) 203.77 410 P
-0 F
-2.75 (, Addison-W) 368.8 410 P
-2.75 (esley Publishing Co.,) 432.55 410 P
-(Reading, MA \2511982.) 108 396 T
--0.19 ( Matt Bishop, \322Implementation Notes on ) 108 378 P
-3 F
--0.19 (bdes) 305.76 378 P
-0 F
--0.19 (\0501\051\323, T) 327.75 378 P
--0.19 (echnical Report PCS-TR-91-158, De-) 359.35 378 P
-0.34 (partment of Mathematics and Computer Science, Dartmouth College, Hanover) 108 364 P
-0.34 (, NH \050Apr) 488.01 364 P
-0.34 (.) 537 364 P
-(1991\051.) 108 350 T
-4 F
-(CAUTION) 72 324 T
-0 F
--0.55 (Certain speci\336c keys should be avoided because they introduce potential weaknesses; these) 108 300 P
--0.44 (keys, called the ) 108 286 P
-3 F
--0.44 (weak) 183.95 286 P
-0 F
--0.44 ( and ) 208.6 286 P
-3 F
--0.44 (semiweak) 231.03 286 P
-0 F
--0.44 ( keys, are \050in hex notation, where ) 277.66 286 P
-6 F
--1.06 (p) 437.45 286 P
-0 F
--0.44 ( is either ) 444.64 286 P
-6 F
--1.06 (0) 487.63 286 P
-0 F
--0.44 ( or ) 494.82 286 P
-6 F
--1.06 (1) 509.93 286 P
-0 F
--0.44 (, and) 517.12 286 P
-6 F
-(P) 108 272 T
-0 F
-( is either ) 115.2 272 T
-6 F
-(e) 159.5 272 T
-0 F
-( or ) 166.7 272 T
-6 F
-(f) 182.68 272 T
-0 F
-(\051:) 189.88 272 T
-6 F
-(0x0p0p0p0p0p0p0p0p) 144 254 T
-(0x0p1P0p1P0p0P0p0P) 360 254 T
-(0x0pep0pep0pfp0pfp) 144 236 T
-(0x0pfP0pfP0pfP0pfP) 360 236 T
-(0x1P0p1P0p0P0p0P0p) 144 218 T
-(0x1P1P1P1P0P0P0P0P) 360 218 T
-(0x1Pep1Pep0Pfp0Pfp) 144 200 T
-(0x1PfP1PfP0PfP0PfP) 360 200 T
-(0xep0pep0pfp0pfp0p) 144 182 T
-(0xep1Pep1pfp0Pfp0P) 360 182 T
-(0xepepepepepepepep) 144 164 T
-(0xepfPepfPfpfPfpfP) 360 164 T
-(0xfP0pfP0pfP0pfP0p) 144 146 T
-(0xfP1PfP1PfP0PfP0P) 360 146 T
-(0xfPepfPepfPepfPep) 144 128 T
-(0xfPfPfPfPfPfPfPfP) 360 128 T
-0 F
-0.13 (The weakness of these keys is inherent in the DES algorithm \050see for example Moore and) 108 110 P
--0.57 (Simmons, \322Cycle structure of the DES with weak and semi-weak keys,\323) 108 96 P
-3 F
--0.57 ( Advances in Cryp-) 449.43 96 P
-(tology \320 Crypto \32486 Pr) 108 82 T
-(oceedings) 216.83 82 T
-0 F
-(, Springer) 264.79 82 T
-(-V) 311.85 82 T
-(erlag New Y) 323.17 82 T
-(ork, \2511987, pp. 9-32\051.) 383.25 82 T
-FMENDPAGE
-%%EndPage: "10" 13
-%%Page: "11" 13
-612 792 0 FMBEGINPAGE
-72 745.99 540 756 R
-7 X
-0 K
-V
-72 32.69 540 42.7 R
-V
-0 F
-0 X
-(Page 11 of 11) 473.71 34.7 T
-72 72 540 720 R
-7 X
-V
-4 F
-0 X
-(BUGS) 72 712 T
-0 F
--0.18 (There is a controversy raging over whether the DES will still be secure in a few years. The) 108 688 P
-0.31 (advent of special-purpose hardware could reduce the cost of any of the methods of attack) 108 674 P
-(named above so that they are no longer computationally infeasible.) 108 660 T
-0.32 (Programs which display programs\325 ar) 108 642 P
-0.32 (guments may compromise the key and initialization) 289.59 642 P
-0.76 (vector if they are speci\336ed on the command line. T) 108 628 P
-0.76 (o avoid this ) 358.46 628 P
-3 F
-0.76 (bdes) 419.7 628 P
-0 F
-0.76 ( overwrites its ar) 441.68 628 P
-0.76 (gu-) 524.01 628 P
-(ments. However) 108 614 T
-(, the obvious race cannot currently be avoided.) 186.12 614 T
-0.25 (As the key or key schedule is kept in memory throughout the run of this program, the en-) 108 596 P
-(cryption can be compromised if memory is readable.) 108 582 T
--0.4 (There is no warranty of merchantability nor any warranty of \336tness for a particular purpose) 108 564 P
-0.05 (nor any other warranty) 108 550 P
-0.05 (, either express or implied, as to the accuracy of the enclosed mate-) 216.95 550 P
-(rials or as to their suitability for any particular purpose.) 108 536 T
--0.06 (Accordingly) 108 518 P
--0.06 (, the user assumes full responsibility for their use. Further) 167.18 518 P
--0.06 (, the author assumes) 442.93 518 P
--0.25 (no obligation to furnish any assistance of any kind whatsoever) 108 504 P
--0.25 (, or to furnish any additional) 404.69 504 P
-(information or documentation.) 108 490 T
-4 F
-(AUTHOR) 72 464 T
-0 F
--0.54 (Matt Bishop, Department of Mathematics and Computer Science, Bradley Hall, Dartmouth) 108 440 P
-(College, Hanover) 108 426 T
-(, NH 03755) 192.12 426 T
-(Electronic mail addresses:) 108 408 T
-(Internet: Matt.Bishop@dartmouth.edu) 108 390 T
-(UUCP: decvax!dartvax!Matt.Bishop) 108 372 T
-FMENDPAGE
-%%EndPage: "11" 14
-%%Trailer
-%%BoundingBox: 0 0 612 792
-%%Pages: 13 1
-%%DocumentFonts: Helvetica-Bold
-%%+ Helvetica-BoldOblique
-%%+ Times-Roman
-%%+ Times-Bold
-%%+ Times-BoldItalic
-%%+ Times-Italic
-%%+ Courier
-%%+ Courier-Oblique
-%%+ ZapfDingbats
-%%+ Symbol
-%%+ Courier-Bold
diff --git a/secure/usr.sbin/xntpd/lib/authdes.c b/secure/usr.sbin/xntpd/lib/authdes.c
deleted file mode 100644
index d6d8d1bb6622..000000000000
--- a/secure/usr.sbin/xntpd/lib/authdes.c
+++ /dev/null
@@ -1,869 +0,0 @@
-/*
- * authdes.c - an implementation of the DES cipher algorithm for NTP
- */
-#include <sys/types.h>
-
-#include <netinet/in.h>
-
-#if BYTE_ORDER == BIG_ENDIAN
-#define XNTP_BIG_ENDIAN
-#endif
-#if BYTE_ORDER == LITTLE_ENDIAN
-#define XNTP_LITTLE_ENDIAN
-#endif
-
-/*
- * There are two entries in here.  auth_subkeys() called to
- * compute the encryption and decryption key schedules, while
- * auth_des() is called to do the actual encryption/decryption
- */
-
-/*
- * Byte order woes.  The DES code is sensitive to byte order.  This
- * used to be resolved by calling ntohl() and htonl() to swap things
- * around, but this turned out to be quite costly on Vaxes where those
- * things are actual functions.  The code now straightens out byte
- * order troubles on its own, with no performance penalty for little
- * end first machines, but at great expense to cleanliness.
- */
-#if !defined(XNTP_BIG_ENDIAN) && !defined(XNTP_LITTLE_ENDIAN)
-	/*
-	 * Pick one or the other.
-	 */
-	BYTE_ORDER_NOT_DEFINED_FOR_AUTHENTICATION
-#endif
-
-/*
- * Key setup.  Here we entirely permute a key, saving the results
- * for both the encryption and decryption.  Note that while the
- * decryption subkeys are simply the encryption keys reordered,
- * we save both so that a common cipher routine may be used.
- */
-
-/*
- * Permuted choice 1 tables.  These are used to extract bits
- * from the left and right parts of the key to form Ci and Di.
- * The code that uses these tables knows which bits from which
- * part of each key are used to form Ci and Di.
- */
-static u_long PC1_CL[8] = {
-	0x00000000, 0x00000010, 0x00001000, 0x00001010,
-	0x00100000, 0x00100010, 0x00101000, 0x00101010
-};
-
-static u_long PC1_DL[16] = {
-	0x00000000, 0x00100000, 0x00001000, 0x00101000,
-	0x00000010, 0x00100010, 0x00001010, 0x00101010,
-	0x00000001, 0x00100001, 0x00001001, 0x00101001,
-	0x00000011, 0x00100011, 0x00001011, 0x00101011
-};
-
-static u_long PC1_CR[16] = {
-	0x00000000, 0x00000001, 0x00000100, 0x00000101,
-	0x00010000, 0x00010001, 0x00010100, 0x00010101,
-	0x01000000, 0x01000001, 0x01000100, 0x01000101,
-	0x01010000, 0x01010001, 0x01010100, 0x01010101
-};
-
-static u_long PC1_DR[8] = {
-	0x00000000, 0x01000000, 0x00010000, 0x01010000,
-	0x00000100, 0x01000100, 0x00010100, 0x01010100
-};
-
-
-/*
- * At the start of some iterations of the key schedule we do
- * a circular left shift by one place, while for others we do a shift by
- * two places.  This has bits set for the iterations where we do 2 bit
- * shifts, starting at the low order bit.
- */
-#define	TWO_BIT_SHIFTS	0x7efc
-
-/*
- * Permuted choice 2 tables.  The first actually produces the low order
- * 24 bits of the subkey Ki from the 28 bit value of Ci.  The second produces
- * the high order 24 bits from Di.  The tables are indexed by six bit
- * segments of Ci and Di respectively.  The code is handcrafted to compute
- * the appropriate 6 bit chunks.
- *
- * Note that for ease of computation, the 24 bit values are produced with
- * six bits going into each byte.
- */
-static u_long PC2_C[4][64] = {
-	0x00000000, 0x00040000, 0x01000000, 0x01040000,
-	0x00000400, 0x00040400, 0x01000400, 0x01040400,
-	0x00200000, 0x00240000, 0x01200000, 0x01240000,
-	0x00200400, 0x00240400, 0x01200400, 0x01240400,
-	0x00000001, 0x00040001, 0x01000001, 0x01040001,
-	0x00000401, 0x00040401, 0x01000401, 0x01040401,
-	0x00200001, 0x00240001, 0x01200001, 0x01240001,
-	0x00200401, 0x00240401, 0x01200401, 0x01240401,
-	0x02000000, 0x02040000, 0x03000000, 0x03040000,
-	0x02000400, 0x02040400, 0x03000400, 0x03040400,
-	0x02200000, 0x02240000, 0x03200000, 0x03240000,
-	0x02200400, 0x02240400, 0x03200400, 0x03240400,
-	0x02000001, 0x02040001, 0x03000001, 0x03040001,
-	0x02000401, 0x02040401, 0x03000401, 0x03040401,
-	0x02200001, 0x02240001, 0x03200001, 0x03240001,
-	0x02200401, 0x02240401, 0x03200401, 0x03240401,
-
-	0x00000000, 0x00000002, 0x00000800, 0x00000802,
-	0x08000000, 0x08000002, 0x08000800, 0x08000802,
-	0x00010000, 0x00010002, 0x00010800, 0x00010802,
-	0x08010000, 0x08010002, 0x08010800, 0x08010802,
-	0x00000100, 0x00000102, 0x00000900, 0x00000902,
-	0x08000100, 0x08000102, 0x08000900, 0x08000902,
-	0x00010100, 0x00010102, 0x00010900, 0x00010902,
-	0x08010100, 0x08010102, 0x08010900, 0x08010902,
-	0x00000010, 0x00000012, 0x00000810, 0x00000812,
-	0x08000010, 0x08000012, 0x08000810, 0x08000812,
-	0x00010010, 0x00010012, 0x00010810, 0x00010812,
-	0x08010010, 0x08010012, 0x08010810, 0x08010812,
-	0x00000110, 0x00000112, 0x00000910, 0x00000912,
-	0x08000110, 0x08000112, 0x08000910, 0x08000912,
-	0x00010110, 0x00010112, 0x00010910, 0x00010912,
-	0x08010110, 0x08010112, 0x08010910, 0x08010912,
-
-	0x00000000, 0x04000000, 0x00002000, 0x04002000,
-	0x10000000, 0x14000000, 0x10002000, 0x14002000,
-	0x00000020, 0x04000020, 0x00002020, 0x04002020,
-	0x10000020, 0x14000020, 0x10002020, 0x14002020,
-	0x00080000, 0x04080000, 0x00082000, 0x04082000,
-	0x10080000, 0x14080000, 0x10082000, 0x14082000,
-	0x00080020, 0x04080020, 0x00082020, 0x04082020,
-	0x10080020, 0x14080020, 0x10082020, 0x14082020,
-	0x20000000, 0x24000000, 0x20002000, 0x24002000,
-	0x30000000, 0x34000000, 0x30002000, 0x34002000,
-	0x20000020, 0x24000020, 0x20002020, 0x24002020,
-	0x30000020, 0x34000020, 0x30002020, 0x34002020,
-	0x20080000, 0x24080000, 0x20082000, 0x24082000,
-	0x30080000, 0x34080000, 0x30082000, 0x34082000,
-	0x20080020, 0x24080020, 0x20082020, 0x24082020,
-	0x30080020, 0x34080020, 0x30082020, 0x34082020,
-
-	0x00000000, 0x00100000, 0x00000008, 0x00100008,
-	0x00000200, 0x00100200, 0x00000208, 0x00100208,
-	0x00020000, 0x00120000, 0x00020008, 0x00120008,
-	0x00020200, 0x00120200, 0x00020208, 0x00120208,
-	0x00000004, 0x00100004, 0x0000000c, 0x0010000c,
-	0x00000204, 0x00100204, 0x0000020c, 0x0010020c,
-	0x00020004, 0x00120004, 0x0002000c, 0x0012000c,
-	0x00020204, 0x00120204, 0x0002020c, 0x0012020c,
-	0x00001000, 0x00101000, 0x00001008, 0x00101008,
-	0x00001200, 0x00101200, 0x00001208, 0x00101208,
-	0x00021000, 0x00121000, 0x00021008, 0x00121008,
-	0x00021200, 0x00121200, 0x00021208, 0x00121208,
-	0x00001004, 0x00101004, 0x0000100c, 0x0010100c,
-	0x00001204, 0x00101204, 0x0000120c, 0x0010120c,
-	0x00021004, 0x00121004, 0x0002100c, 0x0012100c,
-	0x00021204, 0x00121204, 0x0002120c, 0x0012120c
-};
-
-static u_long PC2_D[4][64] = {
-	0x00000000, 0x00000200, 0x00020000, 0x00020200,
-	0x00000001, 0x00000201, 0x00020001, 0x00020201,
-	0x08000000, 0x08000200, 0x08020000, 0x08020200,
-	0x08000001, 0x08000201, 0x08020001, 0x08020201,
-	0x00200000, 0x00200200, 0x00220000, 0x00220200,
-	0x00200001, 0x00200201, 0x00220001, 0x00220201,
-	0x08200000, 0x08200200, 0x08220000, 0x08220200,
-	0x08200001, 0x08200201, 0x08220001, 0x08220201,
-	0x00000002, 0x00000202, 0x00020002, 0x00020202,
-	0x00000003, 0x00000203, 0x00020003, 0x00020203,
-	0x08000002, 0x08000202, 0x08020002, 0x08020202,
-	0x08000003, 0x08000203, 0x08020003, 0x08020203,
-	0x00200002, 0x00200202, 0x00220002, 0x00220202,
-	0x00200003, 0x00200203, 0x00220003, 0x00220203,
-	0x08200002, 0x08200202, 0x08220002, 0x08220202,
-	0x08200003, 0x08200203, 0x08220003, 0x08220203,
-
-	0x00000000, 0x00000010, 0x20000000, 0x20000010,
-	0x00100000, 0x00100010, 0x20100000, 0x20100010,
-	0x00000800, 0x00000810, 0x20000800, 0x20000810,
-	0x00100800, 0x00100810, 0x20100800, 0x20100810,
-	0x04000000, 0x04000010, 0x24000000, 0x24000010,
-	0x04100000, 0x04100010, 0x24100000, 0x24100010,
-	0x04000800, 0x04000810, 0x24000800, 0x24000810,
-	0x04100800, 0x04100810, 0x24100800, 0x24100810,
-	0x00000004, 0x00000014, 0x20000004, 0x20000014,
-	0x00100004, 0x00100014, 0x20100004, 0x20100014,
-	0x00000804, 0x00000814, 0x20000804, 0x20000814,
-	0x00100804, 0x00100814, 0x20100804, 0x20100814,
-	0x04000004, 0x04000014, 0x24000004, 0x24000014,
-	0x04100004, 0x04100014, 0x24100004, 0x24100014,
-	0x04000804, 0x04000814, 0x24000804, 0x24000814,
-	0x04100804, 0x04100814, 0x24100804, 0x24100814,
-
-	0x00000000, 0x00001000, 0x00010000, 0x00011000,
-	0x02000000, 0x02001000, 0x02010000, 0x02011000,
-	0x00000020, 0x00001020, 0x00010020, 0x00011020,
-	0x02000020, 0x02001020, 0x02010020, 0x02011020,
-	0x00040000, 0x00041000, 0x00050000, 0x00051000,
-	0x02040000, 0x02041000, 0x02050000, 0x02051000,
-	0x00040020, 0x00041020, 0x00050020, 0x00051020,
-	0x02040020, 0x02041020, 0x02050020, 0x02051020,
-	0x00002000, 0x00003000, 0x00012000, 0x00013000,
-	0x02002000, 0x02003000, 0x02012000, 0x02013000,
-	0x00002020, 0x00003020, 0x00012020, 0x00013020,
-	0x02002020, 0x02003020, 0x02012020, 0x02013020,
-	0x00042000, 0x00043000, 0x00052000, 0x00053000,
-	0x02042000, 0x02043000, 0x02052000, 0x02053000,
-	0x00042020, 0x00043020, 0x00052020, 0x00053020,
-	0x02042020, 0x02043020, 0x02052020, 0x02053020,
-
-	0x00000000, 0x00000400, 0x01000000, 0x01000400,
-	0x00000100, 0x00000500, 0x01000100, 0x01000500,
-	0x10000000, 0x10000400, 0x11000000, 0x11000400,
-	0x10000100, 0x10000500, 0x11000100, 0x11000500,
-	0x00080000, 0x00080400, 0x01080000, 0x01080400,
-	0x00080100, 0x00080500, 0x01080100, 0x01080500,
-	0x10080000, 0x10080400, 0x11080000, 0x11080400,
-	0x10080100, 0x10080500, 0x11080100, 0x11080500,
-	0x00000008, 0x00000408, 0x01000008, 0x01000408,
-	0x00000108, 0x00000508, 0x01000108, 0x01000508,
-	0x10000008, 0x10000408, 0x11000008, 0x11000408,
-	0x10000108, 0x10000508, 0x11000108, 0x11000508,
-	0x00080008, 0x00080408, 0x01080008, 0x01080408,
-	0x00080108, 0x00080508, 0x01080108, 0x01080508,
-	0x10080008, 0x10080408, 0x11080008, 0x11080408,
-	0x10080108, 0x10080508, 0x11080108, 0x11080508
-};
-
-
-
-/*
- * Permute the key to give us our key schedule.
- */
-void
-DESauth_subkeys(key, encryptkeys, decryptkeys)
-	u_long *key;
-	u_char *encryptkeys;
-	u_char *decryptkeys;
-{
-	register u_long tmp;
-	register u_long c, d;
-	register u_char *ek, *dk;
-	register int two_bit_shifts;
-	register int i;
-
-	/*
-	 * The first permutted choice gives us the 28 bits for C0 and
-	 * 28 for D0.  C0 gets 12 bits from the left key and 16 from
-	 * the right, while D0 gets 16 from the left and 12 from the
-	 * right.  The code knows which bits go where.
-	 */
-	tmp = *key;	/* left part of key */
-	c =  PC1_CL[(tmp >> 29) & 0x7]
-	  | (PC1_CL[(tmp >> 21) & 0x7] << 1)
-	  | (PC1_CL[(tmp >> 13) & 0x7] << 2)
-	  | (PC1_CL[(tmp >>  5) & 0x7] << 3);
-	d =  PC1_DL[(tmp >> 25) & 0xf]
-	  | (PC1_DL[(tmp >> 17) & 0xf] << 1)
-	  | (PC1_DL[(tmp >>  9) & 0xf] << 2)
-	  | (PC1_DL[(tmp >>  1) & 0xf] << 3);
-
-	tmp = *(key+1);	/* right part of key */
-	c |= PC1_CR[(tmp >> 28) & 0xf]
-	  | (PC1_CR[(tmp >> 20) & 0xf] << 1)
-	  | (PC1_CR[(tmp >> 12) & 0xf] << 2)
-	  | (PC1_CR[(tmp >>  4) & 0xf] << 3);
-	d |= PC1_DR[(tmp >> 25) & 0x7]
-	  | (PC1_DR[(tmp >> 17) & 0x7] << 1)
-	  | (PC1_DR[(tmp >>  9) & 0x7] << 2)
-	  | (PC1_DR[(tmp >>  1) & 0x7] << 3);
-
-	/*
-	 * Now iterate to compute the key schedule.  Note that we
-	 * record the entire set of subkeys in 6 bit chunks since
-	 * they are used that way.  At 6 bits/char, we need
-	 * 48/6 char's/subkey * 16 subkeys/encryption == 128 chars.
-	 * encryptkeys and decryptkeys must be this big.
-	 */
-	ek = encryptkeys;
-	dk = decryptkeys + (8 * 15);
-	two_bit_shifts = TWO_BIT_SHIFTS;
-	for (i = 16; i > 0; i--) {
-		/*
-		 * Do the rotation.  One bit and two bit rotations
-		 * are done separately.  Note C and D are 28 bits.
-		 */
-		if (two_bit_shifts & 0x1) {
-			c = ((c << 2) & 0xffffffc) | (c >> 26);
-			d = ((d << 2) & 0xffffffc) | (d >> 26);
-		} else {
-			c = ((c << 1) & 0xffffffe) | (c >> 27);
-			d = ((d << 1) & 0xffffffe) | (d >> 27);
-		}
-		two_bit_shifts >>= 1;
-
-		/*
-		 * Apply permutted choice 2 to C to get the first
-		 * 24 bits worth of keys.  Note that bits 9, 18, 22
-		 * and 25 (using DES numbering) in C are unused.  The
-		 * shift-mask stuff is done to delete these bits from
-		 * the indices, since this cuts the table size in half.
-		 */
-		tmp = PC2_C[0][((c >> 22) & 0x3f)]
-		    | PC2_C[1][((c >> 15) & 0xf) | ((c >> 16) & 0x30)]
-		    | PC2_C[2][((c >>  4) & 0x3) | ((c >>  9) & 0x3c)]
-		    | PC2_C[3][((c      ) & 0x7) | ((c >>  4) & 0x38)];
-		*ek++ = *dk++ = (u_char)(tmp >> 24);
-		*ek++ = *dk++ = (u_char)(tmp >> 16);
-		*ek++ = *dk++ = (u_char)(tmp >>  8);
-		*ek++ = *dk++ = (u_char)tmp;
-
-		/*
-		 * Apply permutted choice 2 to D to get the other half.
-		 * Here, bits 7, 10, 15 and 26 go unused.  The sqeezing
-		 * actually turns out to be cheaper here.
-		 */
-		tmp = PC2_D[0][((d >> 22) & 0x3f)]
-		    | PC2_D[1][((d >> 14) & 0xf) | ((d >> 15) & 0x30)]
-		    | PC2_D[2][((d >>  7) & 0x3f)]
-		    | PC2_D[3][((d      ) & 0x3) | ((d >>  1) & 0x3c)];
-		*ek++ = *dk++ = (u_char)(tmp >> 24);
-		*ek++ = *dk++ = (u_char)(tmp >> 16);
-		*ek++ = *dk++ = (u_char)(tmp >>  8);
-		*ek++ = *dk++ = (u_char)tmp;
-
-		/*
-		 * We are filling in the decryption subkeys from the end.
-		 * Space it back 16 elements to get to the start of the
-		 * next set.
-		 */
-		dk -= 16;
-	}
-}
-
-/*
- * The DES algorithm.  This is intended to be fairly speedy at the
- * expense of some memory.
- *
- * This uses all the standard hacks.  The S boxes and the P permutation
- * are precomputed into one table.  The E box never actually appears
- * explicitly since it is easy to apply this algorithmically.  The
- * initial permutation and final (inverse initial) permuation are
- * computed from tables designed to permute four bits at a time.  This
- * should run pretty fast on machines with 32 bit words and
- * bit field/multiple bit shift instructions which are fast.
- */
-
-/*
- * The initial permutation array.  This is used to compute both the
- * left and the right halves of the initial permutation using bytes
- * from words made from the following operations:
- *
- * ((left & 0x55555555) << 1) | (right & 0x55555555)  for left half
- * (left & 0xaaaaaaaa) | ((right & 0xaaaaaaaa) >> 1)  for right half
- *
- * The scheme is that we index into the table using each byte.  The
- * result from the high order byte is or'd with the result from the
- * next byte shifted left once is or'd with the result from the next
- * byte shifted left twice if or'd with the result from the low order
- * byte shifted left by three.  Clear?
- */
-static u_long IP[256] = {
-	0x00000000, 0x00000010, 0x00000001, 0x00000011,
-	0x00001000, 0x00001010, 0x00001001, 0x00001011,
-	0x00000100, 0x00000110, 0x00000101, 0x00000111,
-	0x00001100, 0x00001110, 0x00001101, 0x00001111,
-	0x00100000, 0x00100010, 0x00100001, 0x00100011,
-	0x00101000, 0x00101010, 0x00101001, 0x00101011,
-	0x00100100, 0x00100110, 0x00100101, 0x00100111,
-	0x00101100, 0x00101110, 0x00101101, 0x00101111,
-	0x00010000, 0x00010010, 0x00010001, 0x00010011,
-	0x00011000, 0x00011010, 0x00011001, 0x00011011,
-	0x00010100, 0x00010110, 0x00010101, 0x00010111,
-	0x00011100, 0x00011110, 0x00011101, 0x00011111,
-	0x00110000, 0x00110010, 0x00110001, 0x00110011,
-	0x00111000, 0x00111010, 0x00111001, 0x00111011,
-	0x00110100, 0x00110110, 0x00110101, 0x00110111,
-	0x00111100, 0x00111110, 0x00111101, 0x00111111,
-	0x10000000, 0x10000010, 0x10000001, 0x10000011,
-	0x10001000, 0x10001010, 0x10001001, 0x10001011,
-	0x10000100, 0x10000110, 0x10000101, 0x10000111,
-	0x10001100, 0x10001110, 0x10001101, 0x10001111,
-	0x10100000, 0x10100010, 0x10100001, 0x10100011,
-	0x10101000, 0x10101010, 0x10101001, 0x10101011,
-	0x10100100, 0x10100110, 0x10100101, 0x10100111,
-	0x10101100, 0x10101110, 0x10101101, 0x10101111,
-	0x10010000, 0x10010010, 0x10010001, 0x10010011,
-	0x10011000, 0x10011010, 0x10011001, 0x10011011,
-	0x10010100, 0x10010110, 0x10010101, 0x10010111,
-	0x10011100, 0x10011110, 0x10011101, 0x10011111,
-	0x10110000, 0x10110010, 0x10110001, 0x10110011,
-	0x10111000, 0x10111010, 0x10111001, 0x10111011,
-	0x10110100, 0x10110110, 0x10110101, 0x10110111,
-	0x10111100, 0x10111110, 0x10111101, 0x10111111,
-	0x01000000, 0x01000010, 0x01000001, 0x01000011,
-	0x01001000, 0x01001010, 0x01001001, 0x01001011,
-	0x01000100, 0x01000110, 0x01000101, 0x01000111,
-	0x01001100, 0x01001110, 0x01001101, 0x01001111,
-	0x01100000, 0x01100010, 0x01100001, 0x01100011,
-	0x01101000, 0x01101010, 0x01101001, 0x01101011,
-	0x01100100, 0x01100110, 0x01100101, 0x01100111,
-	0x01101100, 0x01101110, 0x01101101, 0x01101111,
-	0x01010000, 0x01010010, 0x01010001, 0x01010011,
-	0x01011000, 0x01011010, 0x01011001, 0x01011011,
-	0x01010100, 0x01010110, 0x01010101, 0x01010111,
-	0x01011100, 0x01011110, 0x01011101, 0x01011111,
-	0x01110000, 0x01110010, 0x01110001, 0x01110011,
-	0x01111000, 0x01111010, 0x01111001, 0x01111011,
-	0x01110100, 0x01110110, 0x01110101, 0x01110111,
-	0x01111100, 0x01111110, 0x01111101, 0x01111111,
-	0x11000000, 0x11000010, 0x11000001, 0x11000011,
-	0x11001000, 0x11001010, 0x11001001, 0x11001011,
-	0x11000100, 0x11000110, 0x11000101, 0x11000111,
-	0x11001100, 0x11001110, 0x11001101, 0x11001111,
-	0x11100000, 0x11100010, 0x11100001, 0x11100011,
-	0x11101000, 0x11101010, 0x11101001, 0x11101011,
-	0x11100100, 0x11100110, 0x11100101, 0x11100111,
-	0x11101100, 0x11101110, 0x11101101, 0x11101111,
-	0x11010000, 0x11010010, 0x11010001, 0x11010011,
-	0x11011000, 0x11011010, 0x11011001, 0x11011011,
-	0x11010100, 0x11010110, 0x11010101, 0x11010111,
-	0x11011100, 0x11011110, 0x11011101, 0x11011111,
-	0x11110000, 0x11110010, 0x11110001, 0x11110011,
-	0x11111000, 0x11111010, 0x11111001, 0x11111011,
-	0x11110100, 0x11110110, 0x11110101, 0x11110111,
-	0x11111100, 0x11111110, 0x11111101, 0x11111111
-};
-
-/*
- * The final permutation array.  Like the IP array, used
- * to compute both the left and right results from the nibbles
- * of words computed from:
- *
- * ((left & 0x0f0f0f0f) << 4) | (right & 0x0f0f0f0f)  for left result
- * (left & 0xf0f0f0f0) | ((right & 0xf0f0f0f0) >> 4)  for right result
- *
- * The result from the high order byte is shifted left 6 bits and
- * or'd with the result from the next byte shifted left 4 bits, which
- * is or'd with the result from the next byte shifted left 2 bits,
- * which is or'd with the result from the low byte.
- *
- * There is one of these for big end machines (the natural order for
- * DES) and a second for little end machines.  One is a byte swapped
- * version of the other.
- */
-#ifndef XNTP_LITTLE_ENDIAN
-	/*
-	 * Big end version
-	 */
-static u_long FP[256] = {
-	0x00000000, 0x02000000, 0x00020000, 0x02020000,
-	0x00000200, 0x02000200, 0x00020200, 0x02020200,
-	0x00000002, 0x02000002, 0x00020002, 0x02020002,
-	0x00000202, 0x02000202, 0x00020202, 0x02020202,
-	0x01000000, 0x03000000, 0x01020000, 0x03020000,
-	0x01000200, 0x03000200, 0x01020200, 0x03020200,
-	0x01000002, 0x03000002, 0x01020002, 0x03020002,
-	0x01000202, 0x03000202, 0x01020202, 0x03020202,
-	0x00010000, 0x02010000, 0x00030000, 0x02030000,
-	0x00010200, 0x02010200, 0x00030200, 0x02030200,
-	0x00010002, 0x02010002, 0x00030002, 0x02030002,
-	0x00010202, 0x02010202, 0x00030202, 0x02030202,
-	0x01010000, 0x03010000, 0x01030000, 0x03030000,
-	0x01010200, 0x03010200, 0x01030200, 0x03030200,
-	0x01010002, 0x03010002, 0x01030002, 0x03030002,
-	0x01010202, 0x03010202, 0x01030202, 0x03030202,
-	0x00000100, 0x02000100, 0x00020100, 0x02020100,
-	0x00000300, 0x02000300, 0x00020300, 0x02020300,
-	0x00000102, 0x02000102, 0x00020102, 0x02020102,
-	0x00000302, 0x02000302, 0x00020302, 0x02020302,
-	0x01000100, 0x03000100, 0x01020100, 0x03020100,
-	0x01000300, 0x03000300, 0x01020300, 0x03020300,
-	0x01000102, 0x03000102, 0x01020102, 0x03020102,
-	0x01000302, 0x03000302, 0x01020302, 0x03020302,
-	0x00010100, 0x02010100, 0x00030100, 0x02030100,
-	0x00010300, 0x02010300, 0x00030300, 0x02030300,
-	0x00010102, 0x02010102, 0x00030102, 0x02030102,
-	0x00010302, 0x02010302, 0x00030302, 0x02030302,
-	0x01010100, 0x03010100, 0x01030100, 0x03030100,
-	0x01010300, 0x03010300, 0x01030300, 0x03030300,
-	0x01010102, 0x03010102, 0x01030102, 0x03030102,
-	0x01010302, 0x03010302, 0x01030302, 0x03030302,
-	0x00000001, 0x02000001, 0x00020001, 0x02020001,
-	0x00000201, 0x02000201, 0x00020201, 0x02020201,
-	0x00000003, 0x02000003, 0x00020003, 0x02020003,
-	0x00000203, 0x02000203, 0x00020203, 0x02020203,
-	0x01000001, 0x03000001, 0x01020001, 0x03020001,
-	0x01000201, 0x03000201, 0x01020201, 0x03020201,
-	0x01000003, 0x03000003, 0x01020003, 0x03020003,
-	0x01000203, 0x03000203, 0x01020203, 0x03020203,
-	0x00010001, 0x02010001, 0x00030001, 0x02030001,
-	0x00010201, 0x02010201, 0x00030201, 0x02030201,
-	0x00010003, 0x02010003, 0x00030003, 0x02030003,
-	0x00010203, 0x02010203, 0x00030203, 0x02030203,
-	0x01010001, 0x03010001, 0x01030001, 0x03030001,
-	0x01010201, 0x03010201, 0x01030201, 0x03030201,
-	0x01010003, 0x03010003, 0x01030003, 0x03030003,
-	0x01010203, 0x03010203, 0x01030203, 0x03030203,
-	0x00000101, 0x02000101, 0x00020101, 0x02020101,
-	0x00000301, 0x02000301, 0x00020301, 0x02020301,
-	0x00000103, 0x02000103, 0x00020103, 0x02020103,
-	0x00000303, 0x02000303, 0x00020303, 0x02020303,
-	0x01000101, 0x03000101, 0x01020101, 0x03020101,
-	0x01000301, 0x03000301, 0x01020301, 0x03020301,
-	0x01000103, 0x03000103, 0x01020103, 0x03020103,
-	0x01000303, 0x03000303, 0x01020303, 0x03020303,
-	0x00010101, 0x02010101, 0x00030101, 0x02030101,
-	0x00010301, 0x02010301, 0x00030301, 0x02030301,
-	0x00010103, 0x02010103, 0x00030103, 0x02030103,
-	0x00010303, 0x02010303, 0x00030303, 0x02030303,
-	0x01010101, 0x03010101, 0x01030101, 0x03030101,
-	0x01010301, 0x03010301, 0x01030301, 0x03030301,
-	0x01010103, 0x03010103, 0x01030103, 0x03030103,
-	0x01010303, 0x03010303, 0x01030303, 0x03030303
-};
-#else
-	/*
-	 * Byte swapped for little end machines.
-	 */
-static u_long FP[256] = {
-	0x00000000, 0x00000002, 0x00000200, 0x00000202,
-	0x00020000, 0x00020002, 0x00020200, 0x00020202,
-	0x02000000, 0x02000002, 0x02000200, 0x02000202,
-	0x02020000, 0x02020002, 0x02020200, 0x02020202,
-	0x00000001, 0x00000003, 0x00000201, 0x00000203,
-	0x00020001, 0x00020003, 0x00020201, 0x00020203,
-	0x02000001, 0x02000003, 0x02000201, 0x02000203,
-	0x02020001, 0x02020003, 0x02020201, 0x02020203,
-	0x00000100, 0x00000102, 0x00000300, 0x00000302,
-	0x00020100, 0x00020102, 0x00020300, 0x00020302,
-	0x02000100, 0x02000102, 0x02000300, 0x02000302,
-	0x02020100, 0x02020102, 0x02020300, 0x02020302,
-	0x00000101, 0x00000103, 0x00000301, 0x00000303,
-	0x00020101, 0x00020103, 0x00020301, 0x00020303,
-	0x02000101, 0x02000103, 0x02000301, 0x02000303,
-	0x02020101, 0x02020103, 0x02020301, 0x02020303,
-	0x00010000, 0x00010002, 0x00010200, 0x00010202,
-	0x00030000, 0x00030002, 0x00030200, 0x00030202,
-	0x02010000, 0x02010002, 0x02010200, 0x02010202,
-	0x02030000, 0x02030002, 0x02030200, 0x02030202,
-	0x00010001, 0x00010003, 0x00010201, 0x00010203,
-	0x00030001, 0x00030003, 0x00030201, 0x00030203,
-	0x02010001, 0x02010003, 0x02010201, 0x02010203,
-	0x02030001, 0x02030003, 0x02030201, 0x02030203,
-	0x00010100, 0x00010102, 0x00010300, 0x00010302,
-	0x00030100, 0x00030102, 0x00030300, 0x00030302,
-	0x02010100, 0x02010102, 0x02010300, 0x02010302,
-	0x02030100, 0x02030102, 0x02030300, 0x02030302,
-	0x00010101, 0x00010103, 0x00010301, 0x00010303,
-	0x00030101, 0x00030103, 0x00030301, 0x00030303,
-	0x02010101, 0x02010103, 0x02010301, 0x02010303,
-	0x02030101, 0x02030103, 0x02030301, 0x02030303,
-	0x01000000, 0x01000002, 0x01000200, 0x01000202,
-	0x01020000, 0x01020002, 0x01020200, 0x01020202,
-	0x03000000, 0x03000002, 0x03000200, 0x03000202,
-	0x03020000, 0x03020002, 0x03020200, 0x03020202,
-	0x01000001, 0x01000003, 0x01000201, 0x01000203,
-	0x01020001, 0x01020003, 0x01020201, 0x01020203,
-	0x03000001, 0x03000003, 0x03000201, 0x03000203,
-	0x03020001, 0x03020003, 0x03020201, 0x03020203,
-	0x01000100, 0x01000102, 0x01000300, 0x01000302,
-	0x01020100, 0x01020102, 0x01020300, 0x01020302,
-	0x03000100, 0x03000102, 0x03000300, 0x03000302,
-	0x03020100, 0x03020102, 0x03020300, 0x03020302,
-	0x01000101, 0x01000103, 0x01000301, 0x01000303,
-	0x01020101, 0x01020103, 0x01020301, 0x01020303,
-	0x03000101, 0x03000103, 0x03000301, 0x03000303,
-	0x03020101, 0x03020103, 0x03020301, 0x03020303,
-	0x01010000, 0x01010002, 0x01010200, 0x01010202,
-	0x01030000, 0x01030002, 0x01030200, 0x01030202,
-	0x03010000, 0x03010002, 0x03010200, 0x03010202,
-	0x03030000, 0x03030002, 0x03030200, 0x03030202,
-	0x01010001, 0x01010003, 0x01010201, 0x01010203,
-	0x01030001, 0x01030003, 0x01030201, 0x01030203,
-	0x03010001, 0x03010003, 0x03010201, 0x03010203,
-	0x03030001, 0x03030003, 0x03030201, 0x03030203,
-	0x01010100, 0x01010102, 0x01010300, 0x01010302,
-	0x01030100, 0x01030102, 0x01030300, 0x01030302,
-	0x03010100, 0x03010102, 0x03010300, 0x03010302,
-	0x03030100, 0x03030102, 0x03030300, 0x03030302,
-	0x01010101, 0x01010103, 0x01010301, 0x01010303,
-	0x01030101, 0x01030103, 0x01030301, 0x01030303,
-	0x03010101, 0x03010103, 0x03010301, 0x03010303,
-	0x03030101, 0x03030103, 0x03030301, 0x03030303
-};
-#endif
-
-
-/*
- * The SP table is actually the S boxes and the P permutation
- * table combined.
- */
-static u_long SP[8][64] = {
-	0x00808200, 0x00000000, 0x00008000, 0x00808202,
-	0x00808002, 0x00008202, 0x00000002, 0x00008000,
-	0x00000200, 0x00808200, 0x00808202, 0x00000200,
-	0x00800202, 0x00808002, 0x00800000, 0x00000002,
-	0x00000202, 0x00800200, 0x00800200, 0x00008200,
-	0x00008200, 0x00808000, 0x00808000, 0x00800202,
-	0x00008002, 0x00800002, 0x00800002, 0x00008002,
-	0x00000000, 0x00000202, 0x00008202, 0x00800000,
-	0x00008000, 0x00808202, 0x00000002, 0x00808000,
-	0x00808200, 0x00800000, 0x00800000, 0x00000200,
-	0x00808002, 0x00008000, 0x00008200, 0x00800002,
-	0x00000200, 0x00000002, 0x00800202, 0x00008202,
-	0x00808202, 0x00008002, 0x00808000, 0x00800202,
-	0x00800002, 0x00000202, 0x00008202, 0x00808200,
-	0x00000202, 0x00800200, 0x00800200, 0x00000000,
-	0x00008002, 0x00008200, 0x00000000, 0x00808002,
-
-	0x40084010, 0x40004000, 0x00004000, 0x00084010,
-	0x00080000, 0x00000010, 0x40080010, 0x40004010,
-	0x40000010, 0x40084010, 0x40084000, 0x40000000,
-	0x40004000, 0x00080000, 0x00000010, 0x40080010,
-	0x00084000, 0x00080010, 0x40004010, 0x00000000,
-	0x40000000, 0x00004000, 0x00084010, 0x40080000,
-	0x00080010, 0x40000010, 0x00000000, 0x00084000,
-	0x00004010, 0x40084000, 0x40080000, 0x00004010,
-	0x00000000, 0x00084010, 0x40080010, 0x00080000,
-	0x40004010, 0x40080000, 0x40084000, 0x00004000,
-	0x40080000, 0x40004000, 0x00000010, 0x40084010,
-	0x00084010, 0x00000010, 0x00004000, 0x40000000,
-	0x00004010, 0x40084000, 0x00080000, 0x40000010,
-	0x00080010, 0x40004010, 0x40000010, 0x00080010,
-	0x00084000, 0x00000000, 0x40004000, 0x00004010,
-	0x40000000, 0x40080010, 0x40084010, 0x00084000,
-
-	0x00000104, 0x04010100, 0x00000000, 0x04010004,
-	0x04000100, 0x00000000, 0x00010104, 0x04000100,
-	0x00010004, 0x04000004, 0x04000004, 0x00010000,
-	0x04010104, 0x00010004, 0x04010000, 0x00000104,
-	0x04000000, 0x00000004, 0x04010100, 0x00000100,
-	0x00010100, 0x04010000, 0x04010004, 0x00010104,
-	0x04000104, 0x00010100, 0x00010000, 0x04000104,
-	0x00000004, 0x04010104, 0x00000100, 0x04000000,
-	0x04010100, 0x04000000, 0x00010004, 0x00000104,
-	0x00010000, 0x04010100, 0x04000100, 0x00000000,
-	0x00000100, 0x00010004, 0x04010104, 0x04000100,
-	0x04000004, 0x00000100, 0x00000000, 0x04010004,
-	0x04000104, 0x00010000, 0x04000000, 0x04010104,
-	0x00000004, 0x00010104, 0x00010100, 0x04000004,
-	0x04010000, 0x04000104, 0x00000104, 0x04010000,
-	0x00010104, 0x00000004, 0x04010004, 0x00010100,
-
-	0x80401000, 0x80001040, 0x80001040, 0x00000040,
-	0x00401040, 0x80400040, 0x80400000, 0x80001000,
-	0x00000000, 0x00401000, 0x00401000, 0x80401040,
-	0x80000040, 0x00000000, 0x00400040, 0x80400000,
-	0x80000000, 0x00001000, 0x00400000, 0x80401000,
-	0x00000040, 0x00400000, 0x80001000, 0x00001040,
-	0x80400040, 0x80000000, 0x00001040, 0x00400040,
-	0x00001000, 0x00401040, 0x80401040, 0x80000040,
-	0x00400040, 0x80400000, 0x00401000, 0x80401040,
-	0x80000040, 0x00000000, 0x00000000, 0x00401000,
-	0x00001040, 0x00400040, 0x80400040, 0x80000000,
-	0x80401000, 0x80001040, 0x80001040, 0x00000040,
-	0x80401040, 0x80000040, 0x80000000, 0x00001000,
-	0x80400000, 0x80001000, 0x00401040, 0x80400040,
-	0x80001000, 0x00001040, 0x00400000, 0x80401000,
-	0x00000040, 0x00400000, 0x00001000, 0x00401040,
-
-	0x00000080, 0x01040080, 0x01040000, 0x21000080,
-	0x00040000, 0x00000080, 0x20000000, 0x01040000,
-	0x20040080, 0x00040000, 0x01000080, 0x20040080,
-	0x21000080, 0x21040000, 0x00040080, 0x20000000,
-	0x01000000, 0x20040000, 0x20040000, 0x00000000,
-	0x20000080, 0x21040080, 0x21040080, 0x01000080,
-	0x21040000, 0x20000080, 0x00000000, 0x21000000,
-	0x01040080, 0x01000000, 0x21000000, 0x00040080,
-	0x00040000, 0x21000080, 0x00000080, 0x01000000,
-	0x20000000, 0x01040000, 0x21000080, 0x20040080,
-	0x01000080, 0x20000000, 0x21040000, 0x01040080,
-	0x20040080, 0x00000080, 0x01000000, 0x21040000,
-	0x21040080, 0x00040080, 0x21000000, 0x21040080,
-	0x01040000, 0x00000000, 0x20040000, 0x21000000,
-	0x00040080, 0x01000080, 0x20000080, 0x00040000,
-	0x00000000, 0x20040000, 0x01040080, 0x20000080,
-
-	0x10000008, 0x10200000, 0x00002000, 0x10202008,
-	0x10200000, 0x00000008, 0x10202008, 0x00200000,
-	0x10002000, 0x00202008, 0x00200000, 0x10000008,
-	0x00200008, 0x10002000, 0x10000000, 0x00002008,
-	0x00000000, 0x00200008, 0x10002008, 0x00002000,
-	0x00202000, 0x10002008, 0x00000008, 0x10200008,
-	0x10200008, 0x00000000, 0x00202008, 0x10202000,
-	0x00002008, 0x00202000, 0x10202000, 0x10000000,
-	0x10002000, 0x00000008, 0x10200008, 0x00202000,
-	0x10202008, 0x00200000, 0x00002008, 0x10000008,
-	0x00200000, 0x10002000, 0x10000000, 0x00002008,
-	0x10000008, 0x10202008, 0x00202000, 0x10200000,
-	0x00202008, 0x10202000, 0x00000000, 0x10200008,
-	0x00000008, 0x00002000, 0x10200000, 0x00202008,
-	0x00002000, 0x00200008, 0x10002008, 0x00000000,
-	0x10202000, 0x10000000, 0x00200008, 0x10002008,
-
-	0x00100000, 0x02100001, 0x02000401, 0x00000000,
-	0x00000400, 0x02000401, 0x00100401, 0x02100400,
-	0x02100401, 0x00100000, 0x00000000, 0x02000001,
-	0x00000001, 0x02000000, 0x02100001, 0x00000401,
-	0x02000400, 0x00100401, 0x00100001, 0x02000400,
-	0x02000001, 0x02100000, 0x02100400, 0x00100001,
-	0x02100000, 0x00000400, 0x00000401, 0x02100401,
-	0x00100400, 0x00000001, 0x02000000, 0x00100400,
-	0x02000000, 0x00100400, 0x00100000, 0x02000401,
-	0x02000401, 0x02100001, 0x02100001, 0x00000001,
-	0x00100001, 0x02000000, 0x02000400, 0x00100000,
-	0x02100400, 0x00000401, 0x00100401, 0x02100400,
-	0x00000401, 0x02000001, 0x02100401, 0x02100000,
-	0x00100400, 0x00000000, 0x00000001, 0x02100401,
-	0x00000000, 0x00100401, 0x02100000, 0x00000400,
-	0x02000001, 0x02000400, 0x00000400, 0x00100001,
-
-	0x08000820, 0x00000800, 0x00020000, 0x08020820,
-	0x08000000, 0x08000820, 0x00000020, 0x08000000,
-	0x00020020, 0x08020000, 0x08020820, 0x00020800,
-	0x08020800, 0x00020820, 0x00000800, 0x00000020,
-	0x08020000, 0x08000020, 0x08000800, 0x00000820,
-	0x00020800, 0x00020020, 0x08020020, 0x08020800,
-	0x00000820, 0x00000000, 0x00000000, 0x08020020,
-	0x08000020, 0x08000800, 0x00020820, 0x00020000,
-	0x00020820, 0x00020000, 0x08020800, 0x00000800,
-	0x00000020, 0x08020020, 0x00000800, 0x00020820,
-	0x08000800, 0x00000020, 0x08000020, 0x08020000,
-	0x08020020, 0x08000000, 0x00020000, 0x08000820,
-	0x00000000, 0x08020820, 0x00020020, 0x08000020,
-	0x08020000, 0x08000800, 0x08000820, 0x00000000,
-	0x08020820, 0x00020800, 0x00020800, 0x00000820,
-	0x00000820, 0x00020020, 0x08000000, 0x08020800
-};
-
-
-
-/*
- * DESauth_des - perform an in place DES encryption on 64 bits
- *
- * Note that the `data' argument is always in big-end-first
- * byte order, i.e. *(char *)data is the high order byte of
- * the 8 byte data word.  We modify the initial and final
- * permutation computations for little-end-first machines to
- * swap bytes into the natural host order at the beginning and
- * back to big-end order at the end.  This is unclean but avoids
- * a byte swapping performance penalty on Vaxes (which are slow already).
- */
-void
-DESauth_des(data, subkeys)
-	u_long *data;
-	u_char *subkeys;
-{
-	register u_long left, right;
-	register u_long temp;
-	register u_char *kp;
-	register int i;
-
-	/*
-	 * Do the initial permutation.  The first operation gets
-	 * all the bits which are used to form the left half of the
-	 * permutted result in one word, which is then used to
-	 * index the appropriate table a byte at a time.
-	 */
-	temp = ((*data & 0x55555555) << 1) | (*(data+1) & 0x55555555);
-#ifdef XNTP_LITTLE_ENDIAN
-	/*
-	 * Modify the computation to use the opposite set of bytes.
-	 */
-	left = (IP[(temp >> 24) & 0xff] << 3)
-	     | (IP[(temp >> 16) & 0xff] << 2)
-	     | (IP[(temp >>  8) & 0xff] << 1)
-	     | IP[temp & 0xff];
-#else
-	left = IP[(temp >> 24) & 0xff]
-	     | (IP[(temp >> 16) & 0xff] << 1)
-	     | (IP[(temp >>  8) & 0xff] << 2)
-	     | (IP[temp & 0xff] << 3);
-#endif
-
-	/*
-	 * Same thing again except for the right half.
-	 */
-	temp = (*data & 0xaaaaaaaa) | ((*(data+1) & 0xaaaaaaaa) >> 1);
-#ifdef XNTP_LITTLE_ENDIAN
-	right = (IP[(temp >> 24) & 0xff] << 3)
-	      | (IP[(temp >> 16) & 0xff] << 2)
-	      | (IP[(temp >>  8) & 0xff] << 1)
-	      | IP[temp & 0xff];
-#else
-	right = IP[(temp >> 24) & 0xff]
-	      | (IP[(temp >> 16) & 0xff] << 1)
-	      | (IP[(temp >>  8) & 0xff] << 2)
-	      | (IP[temp & 0xff] << 3);
-#endif
-
-	/*
-	 * Do the 16 rounds through the cipher function.  We actually
-	 * do two at a time, one on the left half and one on the right
-	 * half.
-	 */
-	kp = subkeys;
-	for (i = 0; i < 8; i++) {
-		/*
-		 * The E expansion is easy to compute algorithmically.
-		 * Take a look at its form and compare it to
-		 * everything involving temp below.  Note that
-		 * since SP[0-7] don't have any bits in common set
-		 * it is okay to do the successive xor's.
-		 */
-		temp = (right >> 1) | ((right & 1) ? 0x80000000 : 0);
-		left ^= SP[0][((temp >> 26) & 0x3f) ^ *kp++];
-		left ^= SP[1][((temp >> 22) & 0x3f) ^ *kp++];
-		left ^= SP[2][((temp >> 18) & 0x3f) ^ *kp++];
-		left ^= SP[3][((temp >> 14) & 0x3f) ^ *kp++];
-		left ^= SP[4][((temp >> 10) & 0x3f) ^ *kp++];
-		left ^= SP[5][((temp >>  6) & 0x3f) ^ *kp++];
-		left ^= SP[6][((temp >>  2) & 0x3f) ^ *kp++];
-		left ^= SP[7][(((right << 1) | ((right & 0x80000000)?1:0))
-				& 0x3f) ^ *kp++];
-
-		/*
-		 * Careful here.  Right now `right' is actually the
-		 * left side and `left' is the right side.  Do the
-		 * same thing again, except swap `left' and `right'
-		 */
-		temp = (left >> 1) | ((left & 1) ? 0x80000000 : 0);
-		right ^= SP[0][((temp >> 26) & 0x3f) ^ *kp++];
-		right ^= SP[1][((temp >> 22) & 0x3f) ^ *kp++];
-		right ^= SP[2][((temp >> 18) & 0x3f) ^ *kp++];
-		right ^= SP[3][((temp >> 14) & 0x3f) ^ *kp++];
-		right ^= SP[4][((temp >> 10) & 0x3f) ^ *kp++];
-		right ^= SP[5][((temp >>  6) & 0x3f) ^ *kp++];
-		right ^= SP[6][((temp >>  2) & 0x3f) ^ *kp++];
-		right ^= SP[7][(((left << 1) | ((left & 0x80000000)?1:0))
-				& 0x3f) ^ *kp++];
-
-		/*
-		 * By the time we get here, all is straightened out
-		 * again.  `left' is left and `right' is right.
-		 */
-	}
-
-	/*
-	 * Now the final permutation.  Note this is like the IP above
-	 * except that the data is computed from
-	 *
- 	 * ((left & 0x0f0f0f0f) << 4) | (right & 0x0f0f0f0f)  for left result
- 	 * (left & 0xf0f0f0f0) | ((right & 0xf0f0f0f0) >> 4)  for right result
-	 *
-	 * Just to confuse things more, we're supposed to swap the right
-	 * and the left halves before doing this.  Instead, we'll just
-	 * switch which goes where when computing the temporary.
-	 *
-	 * This operation also byte swaps stuff back into big end byte
-	 * order.  This is accomplished by modifying the FP table for
-	 * little end machines, however, so we don't have to worry about
-	 * it here.
-	 */
-	temp = ((right & 0x0f0f0f0f) << 4) | (left & 0x0f0f0f0f);
-	*data = (FP[(temp >> 24) & 0xff] << 6)
-	      | (FP[(temp >> 16) & 0xff] << 4)
-	      | (FP[(temp >>  8) & 0xff] << 2)
-	      |  FP[temp & 0xff];
-
-	temp = (right & 0xf0f0f0f0) | ((left & 0xf0f0f0f0) >> 4);
-	*(data+1) = (FP[(temp >> 24) & 0xff] << 6)
-		  | (FP[(temp >> 16) & 0xff] << 4)
-		  | (FP[(temp >>  8) & 0xff] << 2)
-		  |  FP[temp & 0xff];
-};
diff --git a/share/Makefile.inc b/share/Makefile.inc
index dbe7ccfdebca..fa6d4901b4c9 100644
--- a/share/Makefile.inc
+++ b/share/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/share/Makefile.inc,v 1.3.2.1 1999/08/29 16:43:22 peter Exp $
 
 BINDIR?=	${SHAREDIR}
 BINOWN=		${SHAREOWN}
diff --git a/share/dict/Makefile b/share/dict/Makefile
index 20321abf8671..692367f0ad24 100644
--- a/share/dict/Makefile
+++ b/share/dict/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/share/dict/Makefile,v 1.5.2.1 1999/08/29 16:43:24 peter Exp $
 
 # XXX MISSING:	connectives words
 FILES=	README propernames web2 web2a
diff --git a/share/dict/README b/share/dict/README
index 8d6680b2914a..67f1e9622a43 100644
--- a/share/dict/README
+++ b/share/dict/README
@@ -1,5 +1,5 @@
 #	@(#)README	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/share/dict/README,v 1.6.2.1 1999/08/29 16:43:24 peter Exp $
 
 WEB ---- (introduction provided by jaw@riacs) -------------------------
 
diff --git a/share/doc/Makefile b/share/doc/Makefile
index d83447874000..c705a74a961d 100644
--- a/share/doc/Makefile
+++ b/share/doc/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/Makefile,v 1.13.2.1 1999/08/29 16:43:25 peter Exp $
 
 SUBDIR=	psd smm usd papers
 
diff --git a/share/doc/papers/Makefile b/share/doc/papers/Makefile
index de3497d15f33..178ecd5bea67 100644
--- a/share/doc/papers/Makefile
+++ b/share/doc/papers/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/Makefile,v 1.6.2.1 1999/08/29 16:43:26 peter Exp $
 
 SUBDIR=	beyond4.3 diskperf fsinterface kernmalloc kerntune malloc memfs \
 	newvm nqnfs px relengr sysperf \
diff --git a/share/doc/papers/beyond4.3/Makefile b/share/doc/papers/beyond4.3/Makefile
index 4a34ff8197c1..5cef0373f8db 100644
--- a/share/doc/papers/beyond4.3/Makefile
+++ b/share/doc/papers/beyond4.3/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.2 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/beyond4.3/Makefile,v 1.6.2.1 1999/08/29 16:43:27 peter Exp $
 
 VOLUME=	papers
 SRCS=	beyond43.ms
diff --git a/share/doc/papers/contents/Makefile b/share/doc/papers/contents/Makefile
index 1f701059222d..d44b0b4a9f37 100644
--- a/share/doc/papers/contents/Makefile
+++ b/share/doc/papers/contents/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/contents/Makefile,v 1.4.2.1 1999/08/29 16:43:28 peter Exp $
 
 VOLUME=	papers
 DOC=	contents
diff --git a/share/doc/papers/contents/contents.ms b/share/doc/papers/contents/contents.ms
index bf96340481ca..6fd4bf52b5b8 100644
--- a/share/doc/papers/contents/contents.ms
+++ b/share/doc/papers/contents/contents.ms
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/contents/contents.ms,v 1.3.2.1 1999/08/29 16:43:28 peter Exp $
 .\"
 .OH '''Papers Contents'
 .EH 'Papers Contents'''
diff --git a/share/doc/papers/diskperf/Makefile b/share/doc/papers/diskperf/Makefile
index 2dbe2a343300..73a2f9d8483a 100644
--- a/share/doc/papers/diskperf/Makefile
+++ b/share/doc/papers/diskperf/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	6.3 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/diskperf/Makefile,v 1.4.2.1 1999/08/29 16:43:30 peter Exp $
 
 VOLUME=	papers
 DOC=	diskperf
diff --git a/share/doc/papers/diskperf/conclusions.ms b/share/doc/papers/diskperf/conclusions.ms
index 9e20f1a64708..ef6f2cfbeb1f 100644
--- a/share/doc/papers/diskperf/conclusions.ms
+++ b/share/doc/papers/diskperf/conclusions.ms
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)conclusions.ms	6.2 (Berkeley) 4/16/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/diskperf/conclusions.ms,v 1.5.2.1 1999/08/29 16:43:30 peter Exp $
 .\"
 .ds RH Conclusions
 .NH
diff --git a/share/doc/papers/diskperf/tests.ms b/share/doc/papers/diskperf/tests.ms
index 40bbe0fd6723..b0cfda5d75ff 100644
--- a/share/doc/papers/diskperf/tests.ms
+++ b/share/doc/papers/diskperf/tests.ms
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tests.ms	6.2 (Berkeley) 4/16/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/diskperf/tests.ms,v 1.4.2.1 1999/08/29 16:43:31 peter Exp $
 .\"
 .ds RH Tests
 .NH
diff --git a/share/doc/papers/fsinterface/Makefile b/share/doc/papers/fsinterface/Makefile
index 7e73162ade30..a5e672e62ba8 100644
--- a/share/doc/papers/fsinterface/Makefile
+++ b/share/doc/papers/fsinterface/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.3 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/fsinterface/Makefile,v 1.5.2.1 1999/08/29 16:43:31 peter Exp $
 
 VOLUME=	papers
 DOC=	fsinterface
diff --git a/share/doc/papers/fsinterface/fsinterface.ms b/share/doc/papers/fsinterface/fsinterface.ms
index dd4bb2b931d8..0b891e57a539 100644
--- a/share/doc/papers/fsinterface/fsinterface.ms
+++ b/share/doc/papers/fsinterface/fsinterface.ms
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fsinterface.ms	1.4 (Berkeley) 4/16/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/fsinterface/fsinterface.ms,v 1.6.2.1 1999/08/29 16:43:32 peter Exp $
 .\"
 .if \nv .rm CM
 .de UX
diff --git a/share/doc/papers/kernmalloc/Makefile b/share/doc/papers/kernmalloc/Makefile
index cda921940afa..0037ffbddda4 100644
--- a/share/doc/papers/kernmalloc/Makefile
+++ b/share/doc/papers/kernmalloc/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	1.8 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/kernmalloc/Makefile,v 1.4.2.1 1999/08/29 16:43:33 peter Exp $
 
 VOLUME=	papers
 DOC=	kernmalloc
diff --git a/share/doc/papers/kernmalloc/kernmalloc.t b/share/doc/papers/kernmalloc/kernmalloc.t
index 3b768ca50daf..e462eb288710 100644
--- a/share/doc/papers/kernmalloc/kernmalloc.t
+++ b/share/doc/papers/kernmalloc/kernmalloc.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)kernmalloc.t	5.1 (Berkeley) 4/16/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/kernmalloc/kernmalloc.t,v 1.4.2.1 1999/08/29 16:43:33 peter Exp $
 .\"
 .\" reference a system routine name
 .de RN
diff --git a/share/doc/papers/kerntune/1.t b/share/doc/papers/kerntune/1.t
index 49b653f501f8..23f35213d8c5 100644
--- a/share/doc/papers/kerntune/1.t
+++ b/share/doc/papers/kerntune/1.t
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)1.t	1.2 (Berkeley) 11/8/90
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/kerntune/1.t,v 1.4.2.1 1999/08/29 16:43:34 peter Exp $
 .\"
 .ds RH Introduction
 .NH 1
diff --git a/share/doc/papers/kerntune/Makefile b/share/doc/papers/kerntune/Makefile
index 1e1bcf3f720a..751addb9d4a8 100644
--- a/share/doc/papers/kerntune/Makefile
+++ b/share/doc/papers/kerntune/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	1.5 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/kerntune/Makefile,v 1.5.2.1 1999/08/29 16:43:35 peter Exp $
 
 VOLUME=	papers
 DOC=	kerntune
diff --git a/share/doc/papers/malloc/Makefile b/share/doc/papers/malloc/Makefile
index 5e2c318194f0..d5f10845b721 100644
--- a/share/doc/papers/malloc/Makefile
+++ b/share/doc/papers/malloc/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	6.3 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/malloc/Makefile,v 1.3.2.1 1999/08/29 16:43:36 peter Exp $
 
 VOLUME=	papers
 DOC=	malloc
diff --git a/share/doc/papers/malloc/abs.ms b/share/doc/papers/malloc/abs.ms
index b92c2d149304..e077b3c8d29c 100644
--- a/share/doc/papers/malloc/abs.ms
+++ b/share/doc/papers/malloc/abs.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/malloc/abs.ms,v 1.4.2.1 1999/08/29 16:43:36 peter Exp $
 .\"
 .if n .ND
 .TL
diff --git a/share/doc/papers/malloc/alternatives.ms b/share/doc/papers/malloc/alternatives.ms
index 36acdeecb1d0..c5f2fa7915ed 100644
--- a/share/doc/papers/malloc/alternatives.ms
+++ b/share/doc/papers/malloc/alternatives.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/malloc/alternatives.ms,v 1.4.2.1 1999/08/29 16:43:37 peter Exp $
 .\"
 .ds RH Alternative implementations
 .NH
diff --git a/share/doc/papers/malloc/conclusion.ms b/share/doc/papers/malloc/conclusion.ms
index 1643c9018c01..fc7d50663ffc 100644
--- a/share/doc/papers/malloc/conclusion.ms
+++ b/share/doc/papers/malloc/conclusion.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/malloc/conclusion.ms,v 1.4.2.1 1999/08/29 16:43:37 peter Exp $
 .\"
 .ds RH Conclusion and experience.
 .NH
diff --git a/share/doc/papers/malloc/implementation.ms b/share/doc/papers/malloc/implementation.ms
index 7dbb10f2a32c..a4e46dcee786 100644
--- a/share/doc/papers/malloc/implementation.ms
+++ b/share/doc/papers/malloc/implementation.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/malloc/implementation.ms,v 1.7.2.1 1999/08/29 16:43:37 peter Exp $
 .\"
 .ds RH Implementation
 .NH
diff --git a/share/doc/papers/malloc/intro.ms b/share/doc/papers/malloc/intro.ms
index 49f6acd42afa..0ebbdc9aa1a2 100644
--- a/share/doc/papers/malloc/intro.ms
+++ b/share/doc/papers/malloc/intro.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/malloc/intro.ms,v 1.5.2.1 1999/08/29 16:43:38 peter Exp $
 .\"
 .ds RH Introduction
 .NH
diff --git a/share/doc/papers/malloc/kernel.ms b/share/doc/papers/malloc/kernel.ms
index 50f654f07959..ec553bb09921 100644
--- a/share/doc/papers/malloc/kernel.ms
+++ b/share/doc/papers/malloc/kernel.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/malloc/kernel.ms,v 1.6.2.1 1999/08/29 16:43:38 peter Exp $
 .\"
 .ds RH The kernel and memory
 .NH
diff --git a/share/doc/papers/malloc/malloc.ms b/share/doc/papers/malloc/malloc.ms
index ced8957748ca..f18be6535b58 100644
--- a/share/doc/papers/malloc/malloc.ms
+++ b/share/doc/papers/malloc/malloc.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/malloc/malloc.ms,v 1.6.2.1 1999/08/29 16:43:39 peter Exp $
 .\"
 .ds RH Malloc and free
 .NH
diff --git a/share/doc/papers/malloc/performance.ms b/share/doc/papers/malloc/performance.ms
index 997a5a80cf72..dd6ce6e817a5 100644
--- a/share/doc/papers/malloc/performance.ms
+++ b/share/doc/papers/malloc/performance.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/malloc/performance.ms,v 1.5.2.1 1999/08/29 16:43:39 peter Exp $
 .\"
 .ds RH Performance
 .NH
diff --git a/share/doc/papers/malloc/problems.ms b/share/doc/papers/malloc/problems.ms
index cc8f55182b91..fbf40c4d86c3 100644
--- a/share/doc/papers/malloc/problems.ms
+++ b/share/doc/papers/malloc/problems.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/malloc/problems.ms,v 1.4.2.1 1999/08/29 16:43:40 peter Exp $
 .\"
 .ds RH The problems
 .NH
diff --git a/share/doc/papers/memfs/Makefile b/share/doc/papers/memfs/Makefile
index 114d7929e6a9..fcf32d69e008 100644
--- a/share/doc/papers/memfs/Makefile
+++ b/share/doc/papers/memfs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	1.8 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/memfs/Makefile,v 1.8.2.1 1999/08/29 16:43:41 peter Exp $
 
 VOLUME=	papers
 DOC=	memfs
diff --git a/share/doc/papers/newvm/1.t b/share/doc/papers/newvm/1.t
index 02ac8be22d1a..0fa57e5b2930 100644
--- a/share/doc/papers/newvm/1.t
+++ b/share/doc/papers/newvm/1.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)1.t	5.1 (Berkeley) 4/16/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/newvm/1.t,v 1.5.2.1 1999/08/29 16:43:42 peter Exp $
 .\"
 .NH
 Motivations for a New Virtual Memory System
diff --git a/share/doc/papers/newvm/Makefile b/share/doc/papers/newvm/Makefile
index 8a912980da9b..0436c36dcef2 100644
--- a/share/doc/papers/newvm/Makefile
+++ b/share/doc/papers/newvm/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	1.4 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/newvm/Makefile,v 1.4.2.1 1999/08/29 16:43:42 peter Exp $
 
 VOLUME=	papers
 DOC=	newvm
diff --git a/share/doc/papers/newvm/a.t b/share/doc/papers/newvm/a.t
index bb20df115a55..68985226bd5b 100644
--- a/share/doc/papers/newvm/a.t
+++ b/share/doc/papers/newvm/a.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)a.t	5.1 (Berkeley) 4/16/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/newvm/a.t,v 1.5.2.1 1999/08/29 16:43:43 peter Exp $
 .\"
 .sp 2
 .ne 2i
diff --git a/share/doc/papers/nqnfs/Makefile b/share/doc/papers/nqnfs/Makefile
index a937ed71355a..8d408fd173bd 100644
--- a/share/doc/papers/nqnfs/Makefile
+++ b/share/doc/papers/nqnfs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 4/20/94
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/nqnfs/Makefile,v 1.4.2.1 1999/08/29 16:43:44 peter Exp $
 
 VOLUME=	papers
 DOC=	nqnfs
diff --git a/share/doc/papers/px/Makefile b/share/doc/papers/px/Makefile
index 86d52889a7d2..ff8e2220527d 100644
--- a/share/doc/papers/px/Makefile
+++ b/share/doc/papers/px/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.3 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/px/Makefile,v 1.6.2.1 1999/08/29 16:43:45 peter Exp $
 
 VOLUME=	papers
 DOC=	px
diff --git a/share/doc/papers/relengr/Makefile b/share/doc/papers/relengr/Makefile
index f84170e755c5..528d7719f1d3 100644
--- a/share/doc/papers/relengr/Makefile
+++ b/share/doc/papers/relengr/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	1.6 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/relengr/Makefile,v 1.5.2.1 1999/08/29 16:43:47 peter Exp $
 
 VOLUME=	papers
 DOC=	releng
diff --git a/share/doc/papers/sysperf/Makefile b/share/doc/papers/sysperf/Makefile
index c86fb8f66d56..830d499bfedc 100644
--- a/share/doc/papers/sysperf/Makefile
+++ b/share/doc/papers/sysperf/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	1.6 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/sysperf/Makefile,v 1.4.2.1 1999/08/29 16:43:48 peter Exp $
 
 VOLUME=	papers
 DOC=	sysperf
diff --git a/share/doc/psd/05.sysman/1.2.t b/share/doc/psd/05.sysman/1.2.t
index 8527a75f8f3e..d110b71b8850 100644
--- a/share/doc/psd/05.sysman/1.2.t
+++ b/share/doc/psd/05.sysman/1.2.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)1.2.t	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/05.sysman/1.2.t,v 1.4.2.1 1999/08/29 16:43:50 peter Exp $
 .\"
 .sh "Memory management\(dg
 .NH 3
diff --git a/share/doc/psd/05.sysman/2.3.t b/share/doc/psd/05.sysman/2.3.t
index edf3e10fb52e..a962e1c528a7 100644
--- a/share/doc/psd/05.sysman/2.3.t
+++ b/share/doc/psd/05.sysman/2.3.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)2.3.t	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/05.sysman/2.3.t,v 1.4.2.1 1999/08/29 16:43:50 peter Exp $
 .\"
 .sh "Interprocess communications
 .NH 3
diff --git a/share/doc/psd/05.sysman/Makefile b/share/doc/psd/05.sysman/Makefile
index fbba0b7708d3..c8ece0ebebba 100644
--- a/share/doc/psd/05.sysman/Makefile
+++ b/share/doc/psd/05.sysman/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/05.sysman/Makefile,v 1.4.2.1 1999/08/29 16:43:51 peter Exp $
 
 VOLUME=	psd/05.sysman
 SRCS=	0.t 1.0.t 1.1.t 1.2.t 1.3.t 1.4.t 1.5.t 1.6.t 1.7.t \
diff --git a/share/doc/psd/12.make/Makefile b/share/doc/psd/12.make/Makefile
index b266f9b6f959..b89450b477b8 100644
--- a/share/doc/psd/12.make/Makefile
+++ b/share/doc/psd/12.make/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 8/14/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/12.make/Makefile,v 1.3.2.1 1999/08/29 16:43:52 peter Exp $
 
 VOLUME=	psd/12.make
 SRCS=	tutorial.ms
diff --git a/share/doc/psd/13.rcs/Makefile b/share/doc/psd/13.rcs/Makefile
index ed497da4d8db..8cb2a671f19c 100644
--- a/share/doc/psd/13.rcs/Makefile
+++ b/share/doc/psd/13.rcs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/13.rcs/Makefile,v 1.1.4.1 1999/08/29 16:43:52 peter Exp $
 
 SUBDIR=	rcs rcs_func
 
diff --git a/share/doc/psd/13.rcs/Makefile.inc b/share/doc/psd/13.rcs/Makefile.inc
index 666dbd862ff2..bfd90456eea4 100644
--- a/share/doc/psd/13.rcs/Makefile.inc
+++ b/share/doc/psd/13.rcs/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/13.rcs/Makefile.inc,v 1.1.4.1 1999/08/29 16:43:53 peter Exp $
 
 VOLUME=	psd/13.rcs
 MACROS=	-ms
diff --git a/share/doc/psd/13.rcs/rcs/Makefile b/share/doc/psd/13.rcs/rcs/Makefile
index bfc41a11f52e..9bab0c6788e3 100644
--- a/share/doc/psd/13.rcs/rcs/Makefile
+++ b/share/doc/psd/13.rcs/rcs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/13.rcs/rcs/Makefile,v 1.2.2.1 1999/08/29 16:43:54 peter Exp $
 
 SRCS=	rcs.ms
 USE_PIC=	yes
diff --git a/share/doc/psd/13.rcs/rcs_func/Makefile b/share/doc/psd/13.rcs/rcs_func/Makefile
index 7c78765d40ed..2d4392d5488e 100644
--- a/share/doc/psd/13.rcs/rcs_func/Makefile
+++ b/share/doc/psd/13.rcs/rcs_func/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/13.rcs/rcs_func/Makefile,v 1.2.2.1 1999/08/29 16:43:55 peter Exp $
 
 SRCS=	rcs_func.ms
 DOC=	rcs_func
diff --git a/share/doc/psd/18.gprof/Makefile b/share/doc/psd/18.gprof/Makefile
index 6ef848949974..ef4820ffc383 100644
--- a/share/doc/psd/18.gprof/Makefile
+++ b/share/doc/psd/18.gprof/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 8/14/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/18.gprof/Makefile,v 1.4.2.1 1999/08/29 16:43:56 peter Exp $
 
 VOLUME=	psd/18.gprof
 SRCS=	header.me abstract.me intro.me profiling.me gathering.me \
diff --git a/share/doc/psd/19.curses/Makefile b/share/doc/psd/19.curses/Makefile
index 37c4cb4c7e2d..9ee0cf8e3f96 100644
--- a/share/doc/psd/19.curses/Makefile
+++ b/share/doc/psd/19.curses/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 8/14/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/19.curses/Makefile,v 1.8.2.1 1999/08/29 16:43:57 peter Exp $
 
 VOLUME=	psd/19.curses
 SRCS=	Master
diff --git a/share/doc/psd/20.ipctut/Makefile b/share/doc/psd/20.ipctut/Makefile
index ce215084fbef..d4f679f134a6 100644
--- a/share/doc/psd/20.ipctut/Makefile
+++ b/share/doc/psd/20.ipctut/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 8/14/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/20.ipctut/Makefile,v 1.4.2.1 1999/08/29 16:43:58 peter Exp $
 
 VOLUME=	psd/20.ipctut
 SRCS=	tutor.me
diff --git a/share/doc/psd/21.ipc/5.t b/share/doc/psd/21.ipc/5.t
index 8ce44b2018c1..06381bc6b7ad 100644
--- a/share/doc/psd/21.ipc/5.t
+++ b/share/doc/psd/21.ipc/5.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)5.t	8.1 (Berkeley) 8/14/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/21.ipc/5.t,v 1.4.2.1 1999/08/29 16:43:59 peter Exp $
 .\"
 .\".ds RH "Advanced Topics
 .bp
diff --git a/share/doc/psd/21.ipc/Makefile b/share/doc/psd/21.ipc/Makefile
index 08e53049d872..2419ecdf77db 100644
--- a/share/doc/psd/21.ipc/Makefile
+++ b/share/doc/psd/21.ipc/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/21.ipc/Makefile,v 1.4.2.1 1999/08/29 16:44:00 peter Exp $
 
 VOLUME=	psd/21.ipc
 SRCS=	0.t 1.t 2.t 3.t 4.t 5.t
diff --git a/share/doc/psd/22.rpcgen/Makefile b/share/doc/psd/22.rpcgen/Makefile
index d3832282c88b..1a1266e9e611 100644
--- a/share/doc/psd/22.rpcgen/Makefile
+++ b/share/doc/psd/22.rpcgen/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/22.rpcgen/Makefile,v 1.3.2.1 1999/08/29 16:44:00 peter Exp $
 
 VOLUME=	psd/22.rpcgen
 SRCS=	rpcgen.ms
diff --git a/share/doc/psd/23.rpc/Makefile b/share/doc/psd/23.rpc/Makefile
index 16247c89fff1..586be624f6b3 100644
--- a/share/doc/psd/23.rpc/Makefile
+++ b/share/doc/psd/23.rpc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/23.rpc/Makefile,v 1.3.2.1 1999/08/29 16:44:02 peter Exp $
 
 VOLUME=	psd/23.rpc
 SRCS=	rpc.prog.ms
diff --git a/share/doc/psd/24.xdr/Makefile b/share/doc/psd/24.xdr/Makefile
index 8e4f2182b2ff..ca21a74781c5 100644
--- a/share/doc/psd/24.xdr/Makefile
+++ b/share/doc/psd/24.xdr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/24.xdr/Makefile,v 1.3.2.1 1999/08/29 16:44:03 peter Exp $
 
 VOLUME=	psd/24.xdr
 SRCS=	xdr.nts.ms
diff --git a/share/doc/psd/25.xdrrfc/Makefile b/share/doc/psd/25.xdrrfc/Makefile
index b2281b29243b..6462f40784c1 100644
--- a/share/doc/psd/25.xdrrfc/Makefile
+++ b/share/doc/psd/25.xdrrfc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/25.xdrrfc/Makefile,v 1.3.2.1 1999/08/29 16:44:04 peter Exp $
 
 VOLUME=	psd/25.xdrrfc
 SRCS=	xdr.rfc.ms
diff --git a/share/doc/psd/26.rpcrfc/Makefile b/share/doc/psd/26.rpcrfc/Makefile
index b61fb9f330fb..fe02a1711af7 100644
--- a/share/doc/psd/26.rpcrfc/Makefile
+++ b/share/doc/psd/26.rpcrfc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/26.rpcrfc/Makefile,v 1.3.2.1 1999/08/29 16:44:04 peter Exp $
 
 VOLUME=	psd/26.rpcrfc
 SRCS=	rpc.rfc.ms
diff --git a/share/doc/psd/27.nfsrpc/Makefile b/share/doc/psd/27.nfsrpc/Makefile
index e01f6af45300..784fc07eea1a 100644
--- a/share/doc/psd/27.nfsrpc/Makefile
+++ b/share/doc/psd/27.nfsrpc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/27.nfsrpc/Makefile,v 1.3.2.1 1999/08/29 16:44:05 peter Exp $
 
 VOLUME=	psd/27.nfsrfc
 SRCS=	nfs.rfc.ms
diff --git a/share/doc/psd/28.cvs/Makefile b/share/doc/psd/28.cvs/Makefile
index d09702e5dace..97524e85fc03 100644
--- a/share/doc/psd/28.cvs/Makefile
+++ b/share/doc/psd/28.cvs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/28.cvs/Makefile,v 1.1.4.1 1999/08/29 16:44:06 peter Exp $
 
 VOLUME= psd/28.cvs
 MACROS= -ms
diff --git a/share/doc/psd/Makefile b/share/doc/psd/Makefile
index 83b72e079c93..411a4605c6d2 100644
--- a/share/doc/psd/Makefile
+++ b/share/doc/psd/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/Makefile,v 1.12.2.1 1999/08/29 16:43:49 peter Exp $
 
 # The following modules do not build/install:
 # 10.gdb
diff --git a/share/doc/psd/contents/Makefile b/share/doc/psd/contents/Makefile
index 59495e5f3420..a3878158141c 100644
--- a/share/doc/psd/contents/Makefile
+++ b/share/doc/psd/contents/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/contents/Makefile,v 1.3.2.1 1999/08/29 16:44:07 peter Exp $
 
 VOLUME=	psd
 SRCS=	contents.ms
diff --git a/share/doc/psd/title/Makefile b/share/doc/psd/title/Makefile
index 7999e324c2f4..173501e5658e 100644
--- a/share/doc/psd/title/Makefile
+++ b/share/doc/psd/title/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/title/Makefile,v 1.4.2.1 1999/08/29 16:44:08 peter Exp $
 
 VOLUME=	psd
 SRCS=	Title
diff --git a/share/doc/smm/01.setup/2.t b/share/doc/smm/01.setup/2.t
index 4220a6d9b811..c10d46be44d8 100644
--- a/share/doc/smm/01.setup/2.t
+++ b/share/doc/smm/01.setup/2.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)2.t	8.1 (Berkeley) 7/27/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/smm/01.setup/2.t,v 1.6.2.1 1999/08/29 16:44:10 peter Exp $
 .\"
 .ds lq ``
 .ds rq ''
diff --git a/share/doc/smm/01.setup/Makefile b/share/doc/smm/01.setup/Makefile
index 73b6c4da286c..c1ba9bf3302a 100644
--- a/share/doc/smm/01.setup/Makefile
+++ b/share/doc/smm/01.setup/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 7/27/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/01.setup/Makefile,v 1.4.2.1 1999/08/29 16:44:11 peter Exp $
 
 VOLUME=	smm/01.setup
 SRCS=	0.t 1.t 2.t 3.t 4.t 5.t 6.t
diff --git a/share/doc/smm/02.config/Makefile b/share/doc/smm/02.config/Makefile
index fd07ffe7c8af..4560e81eafa9 100644
--- a/share/doc/smm/02.config/Makefile
+++ b/share/doc/smm/02.config/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/02.config/Makefile,v 1.3.2.1 1999/08/29 16:44:12 peter Exp $
 
 VOLUME=	smm/02.config
 SRCS=	0.t 1.t 2.t 3.t 4.t 5.t 6.t a.t b.t c.t d.t e.t
diff --git a/share/doc/smm/03.fsck/Makefile b/share/doc/smm/03.fsck/Makefile
index 60fe632ad3f8..d989298c73c0 100644
--- a/share/doc/smm/03.fsck/Makefile
+++ b/share/doc/smm/03.fsck/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/03.fsck/Makefile,v 1.3.2.1 1999/08/29 16:44:13 peter Exp $
 
 VOLUME=	smm/03.fsck
 SRCS=	0.t 1.t 2.t 3.t 4.t
diff --git a/share/doc/smm/04.quotas/Makefile b/share/doc/smm/04.quotas/Makefile
index e3c68ff48c56..25b218da1ebd 100644
--- a/share/doc/smm/04.quotas/Makefile
+++ b/share/doc/smm/04.quotas/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/04.quotas/Makefile,v 1.4.2.1 1999/08/29 16:44:13 peter Exp $
 
 VOLUME=	smm/04.quotas
 SRCS=	quotas.ms
diff --git a/share/doc/smm/05.fastfs/Makefile b/share/doc/smm/05.fastfs/Makefile
index 7928d2d6eafc..dbf4f0fdf29f 100644
--- a/share/doc/smm/05.fastfs/Makefile
+++ b/share/doc/smm/05.fastfs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/05.fastfs/Makefile,v 1.4.2.1 1999/08/29 16:44:15 peter Exp $
 
 VOLUME=	smm/05.fastfs
 SRCS=	0.t 1.t 2.t 3.t 4.t 5.t 6.t
diff --git a/share/doc/smm/06.nfs/Makefile b/share/doc/smm/06.nfs/Makefile
index 99f0762ac6ef..c8d4444d2de1 100644
--- a/share/doc/smm/06.nfs/Makefile
+++ b/share/doc/smm/06.nfs/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/06.nfs/Makefile,v 1.4.2.1 1999/08/29 16:44:16 peter Exp $
 
 VOLUME=	smm/06.nfs
 SRCS=	0.t 1.t 2.t ref.t
diff --git a/share/doc/smm/08.sendmailop/Makefile b/share/doc/smm/08.sendmailop/Makefile
index 4ee85e24b71d..5cfd1ac4949a 100644
--- a/share/doc/smm/08.sendmailop/Makefile
+++ b/share/doc/smm/08.sendmailop/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 2/28/94
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/08.sendmailop/Makefile,v 1.4.2.1 1999/08/29 16:44:17 peter Exp $
 
 VOLUME=	smm/08.sendmailop
 SRCS=	op.me
diff --git a/share/doc/smm/09.sendmail/Makefile b/share/doc/smm/09.sendmail/Makefile
index f403e5d55bb6..9208640fa1fd 100644
--- a/share/doc/smm/09.sendmail/Makefile
+++ b/share/doc/smm/09.sendmail/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 2/28/94
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/09.sendmail/Makefile,v 1.4.2.1 1999/08/29 16:44:18 peter Exp $
 
 VOLUME=	smm/09.sendmail
 SRCS=	intro.me
diff --git a/share/doc/smm/10.named/Makefile b/share/doc/smm/10.named/Makefile
index 41c348ee5797..009dab0ee068 100644
--- a/share/doc/smm/10.named/Makefile
+++ b/share/doc/smm/10.named/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/10.named/Makefile,v 1.3.2.1 1999/08/29 16:44:19 peter Exp $
 
 SRCDIR=	${.CURDIR}/../../../../contrib/bind/doc/bog
 
diff --git a/share/doc/smm/11.timedop/Makefile b/share/doc/smm/11.timedop/Makefile
index ad09e787076a..ac9e5ec4eb9a 100644
--- a/share/doc/smm/11.timedop/Makefile
+++ b/share/doc/smm/11.timedop/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/11.timedop/Makefile,v 1.3.2.1 1999/08/29 16:44:20 peter Exp $
 
 VOLUME=	smm/11.timedop
 SRCS=	timed.ms
diff --git a/share/doc/smm/12.timed/Makefile b/share/doc/smm/12.timed/Makefile
index 797a483190d3..a8344bd2706a 100644
--- a/share/doc/smm/12.timed/Makefile
+++ b/share/doc/smm/12.timed/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/12.timed/Makefile,v 1.4.2.1 1999/08/29 16:44:21 peter Exp $
 
 VOLUME=	smm/12.timed
 SRCS=	timed.ms
diff --git a/share/doc/smm/18.net/Makefile b/share/doc/smm/18.net/Makefile
index 4068b9137dcc..68899d7150b3 100644
--- a/share/doc/smm/18.net/Makefile
+++ b/share/doc/smm/18.net/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/10/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/18.net/Makefile,v 1.5.2.1 1999/08/29 16:44:22 peter Exp $
 
 VOLUME=	smm/18.net
 SRCS=	0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t 8.t 9.t a.t b.t c.t d.t e.t f.t
diff --git a/share/doc/smm/Makefile b/share/doc/smm/Makefile
index 6aa898781f3a..8cf0a4a03e80 100644
--- a/share/doc/smm/Makefile
+++ b/share/doc/smm/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/10/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/Makefile,v 1.13.2.1 1999/08/29 16:44:09 peter Exp $
 
 # The following modules do not describe FreeBSD:
 # 14.uucpimpl, 15.uucpnet
diff --git a/share/doc/smm/contents/Makefile b/share/doc/smm/contents/Makefile
index ac97e4244366..5c55cf5fa8c8 100644
--- a/share/doc/smm/contents/Makefile
+++ b/share/doc/smm/contents/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/contents/Makefile,v 1.3.2.1 1999/08/29 16:44:23 peter Exp $
 
 VOLUME=	smm
 SRCS=	contents.ms
diff --git a/share/doc/smm/title/Makefile b/share/doc/smm/title/Makefile
index 1cfc3d0f1071..2f30a9cce02d 100644
--- a/share/doc/smm/title/Makefile
+++ b/share/doc/smm/title/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/title/Makefile,v 1.4.2.1 1999/08/29 16:44:24 peter Exp $
 
 VOLUME=	smm
 SRCS=	Title
diff --git a/share/doc/usd/04.csh/Makefile b/share/doc/usd/04.csh/Makefile
index c455e3fa3508..c259604b07c8 100644
--- a/share/doc/usd/04.csh/Makefile
+++ b/share/doc/usd/04.csh/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/04.csh/Makefile,v 1.4.2.1 1999/08/29 16:44:26 peter Exp $
 
 VOLUME=	usd/04.csh
 SRCS=	tabs csh.1 csh.2 csh.3 csh.4 csh.a csh.g
diff --git a/share/doc/usd/07.mail/Makefile b/share/doc/usd/07.mail/Makefile
index b4eb7d632e21..623a7e19bb9e 100644
--- a/share/doc/usd/07.mail/Makefile
+++ b/share/doc/usd/07.mail/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/07.mail/Makefile,v 1.3.2.1 1999/08/29 16:44:26 peter Exp $
 
 VOLUME=	usd/07.mail
 SRCS=	mail0.nr mail1.nr mail2.nr mail3.nr mail4.nr mail5.nr mail6.nr \
diff --git a/share/doc/usd/10.exref/Makefile b/share/doc/usd/10.exref/Makefile
index 8df4f7208726..8c9ad80a8fc0 100644
--- a/share/doc/usd/10.exref/Makefile
+++ b/share/doc/usd/10.exref/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/10.exref/Makefile,v 1.9.2.1 1999/08/29 16:44:27 peter Exp $
 
 SUBDIR=	exref summary 
 
diff --git a/share/doc/usd/10.exref/Makefile.inc b/share/doc/usd/10.exref/Makefile.inc
index 931a35dfbbee..3c9112058a31 100644
--- a/share/doc/usd/10.exref/Makefile.inc
+++ b/share/doc/usd/10.exref/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/10.exref/Makefile.inc,v 1.1.4.1 1999/08/29 16:44:28 peter Exp $
 
 VOLUME=	usd/10.exref
 MACROS=	-ms
diff --git a/share/doc/usd/10.exref/exref/Makefile b/share/doc/usd/10.exref/exref/Makefile
index 7af18f93ef38..e446adcf2146 100644
--- a/share/doc/usd/10.exref/exref/Makefile
+++ b/share/doc/usd/10.exref/exref/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/10.exref/exref/Makefile,v 1.3.2.1 1999/08/29 16:44:29 peter Exp $
 
 SRCS=	ex.rm
 
diff --git a/share/doc/usd/10.exref/summary/Makefile b/share/doc/usd/10.exref/summary/Makefile
index 198bf6e2e65c..a5deb4f1fbe2 100644
--- a/share/doc/usd/10.exref/summary/Makefile
+++ b/share/doc/usd/10.exref/summary/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/10.exref/summary/Makefile,v 1.2.2.1 1999/08/29 16:44:30 peter Exp $
 
 SRCS=	ex.summary
 DOC=	summary
diff --git a/share/doc/usd/11.vitut/Makefile b/share/doc/usd/11.vitut/Makefile
index ea96ddfee238..08415c5fa993 100644
--- a/share/doc/usd/11.vitut/Makefile
+++ b/share/doc/usd/11.vitut/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/11.vitut/Makefile,v 1.4.2.1 1999/08/29 16:44:30 peter Exp $
 
 VOLUME=	usd/11.edit
 SRCS=	edittut.ms
diff --git a/share/doc/usd/12.vi/Makefile b/share/doc/usd/12.vi/Makefile
index 0f885a0aefb5..58b662446cc8 100644
--- a/share/doc/usd/12.vi/Makefile
+++ b/share/doc/usd/12.vi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/12.vi/Makefile,v 1.8.2.1 1999/08/29 16:44:31 peter Exp $
 
 SUBDIR=	vi viapwh summary 
 
diff --git a/share/doc/usd/12.vi/Makefile.inc b/share/doc/usd/12.vi/Makefile.inc
index 93562246bdb6..710eb5e8b816 100644
--- a/share/doc/usd/12.vi/Makefile.inc
+++ b/share/doc/usd/12.vi/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/12.vi/Makefile.inc,v 1.1.4.1 1999/08/29 16:44:32 peter Exp $
 
 VOLUME=		usd/12.vi
 MACROS=		-ms
diff --git a/share/doc/usd/12.vi/summary/Makefile b/share/doc/usd/12.vi/summary/Makefile
index 753f837b3d34..1211b48731c7 100644
--- a/share/doc/usd/12.vi/summary/Makefile
+++ b/share/doc/usd/12.vi/summary/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/12.vi/summary/Makefile,v 1.2.2.1 1999/08/29 16:44:34 peter Exp $
 
 SRCS=	vi.summary
 DOC=	summary
diff --git a/share/doc/usd/12.vi/vi/Makefile b/share/doc/usd/12.vi/vi/Makefile
index dfd199f22bea..c4750793de34 100644
--- a/share/doc/usd/12.vi/vi/Makefile
+++ b/share/doc/usd/12.vi/vi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/12.vi/vi/Makefile,v 1.2.2.1 1999/08/29 16:44:34 peter Exp $
 
 SRCS=	vi.in vi.chars
 #DOC=	tutorial
diff --git a/share/doc/usd/12.vi/viapwh/Makefile b/share/doc/usd/12.vi/viapwh/Makefile
index baad1ce71e2c..c23f50d2db9f 100644
--- a/share/doc/usd/12.vi/viapwh/Makefile
+++ b/share/doc/usd/12.vi/viapwh/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/12.vi/viapwh/Makefile,v 1.2.2.1 1999/08/29 16:44:35 peter Exp $
 
 SRCS=	vi.apwh.ms
 DOC=	viapwh
diff --git a/share/doc/usd/13.viref/Makefile b/share/doc/usd/13.viref/Makefile
index 70bf70b6bacc..4b4a498759d0 100644
--- a/share/doc/usd/13.viref/Makefile
+++ b/share/doc/usd/13.viref/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.16 (Berkeley) 8/15/94
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/13.viref/Makefile,v 1.7.2.1 1999/08/29 16:44:36 peter Exp $
 
 VOLUME=	usd/13.viref
 SRCS=	vi.ref
diff --git a/share/doc/usd/18.msdiffs/Makefile b/share/doc/usd/18.msdiffs/Makefile
index faf76bbb64f3..3140695d753d 100644
--- a/share/doc/usd/18.msdiffs/Makefile
+++ b/share/doc/usd/18.msdiffs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/18.msdiffs/Makefile,v 1.4.2.1 1999/08/29 16:44:37 peter Exp $
 
 VOLUME=	usd/18.msdiffs
 SRCS=	ms.diffs
diff --git a/share/doc/usd/19.memacros/Makefile b/share/doc/usd/19.memacros/Makefile
index 1febb24810f1..1d9cd747b260 100644
--- a/share/doc/usd/19.memacros/Makefile
+++ b/share/doc/usd/19.memacros/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/19.memacros/Makefile,v 1.4.2.1 1999/08/29 16:44:38 peter Exp $
 
 VOLUME=	usd/19.memacros
 SRCS=	intro.me
diff --git a/share/doc/usd/19.memacros/intro.me b/share/doc/usd/19.memacros/intro.me
index c5e2012400d2..8580b636cba0 100644
--- a/share/doc/usd/19.memacros/intro.me
+++ b/share/doc/usd/19.memacros/intro.me
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)intro.me	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/19.memacros/intro.me,v 1.4.2.1 1999/08/29 16:44:39 peter Exp $
 .\"
 .UC 7
 .ll 6.5i
diff --git a/share/doc/usd/20.meref/Makefile b/share/doc/usd/20.meref/Makefile
index 98432e7dcb40..ae2cf21dcc79 100644
--- a/share/doc/usd/20.meref/Makefile
+++ b/share/doc/usd/20.meref/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/20.meref/Makefile,v 1.4.2.1 1999/08/29 16:44:40 peter Exp $
 
 VOLUME=	usd/20.meref
 SRCS=	ref.me
diff --git a/share/doc/usd/30.rogue/Makefile b/share/doc/usd/30.rogue/Makefile
index cd8c0efe08e3..93e31480e193 100644
--- a/share/doc/usd/30.rogue/Makefile
+++ b/share/doc/usd/30.rogue/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/30.rogue/Makefile,v 1.7.2.1 1999/08/29 16:44:41 peter Exp $
 
 .if exists(${.CURDIR}/../../../../games)
 VOLUME=	usd/30.rogue
diff --git a/share/doc/usd/31.trek/Makefile b/share/doc/usd/31.trek/Makefile
index d3945238d7da..d33c0ed19c6e 100644
--- a/share/doc/usd/31.trek/Makefile
+++ b/share/doc/usd/31.trek/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/31.trek/Makefile,v 1.6.2.1 1999/08/29 16:44:42 peter Exp $
 
 .if exists(${.CURDIR}/../../../../games)
 VOLUME=	usd/31.trek
diff --git a/share/doc/usd/Makefile b/share/doc/usd/Makefile
index 5424e865ef5f..10e878bb8485 100644
--- a/share/doc/usd/Makefile
+++ b/share/doc/usd/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 4/20/94
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/Makefile,v 1.7.2.1 1999/08/29 16:44:25 peter Exp $
 
 # The following modules are encumbered:
 # 01.begin 02.learn 03.shell 05.dc 06.bc 09.edtut 10.edadv 15.sed 16.awk
diff --git a/share/doc/usd/contents/Makefile b/share/doc/usd/contents/Makefile
index 4b9a691cf15f..d760df3e5151 100644
--- a/share/doc/usd/contents/Makefile
+++ b/share/doc/usd/contents/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/contents/Makefile,v 1.3.2.1 1999/08/29 16:44:43 peter Exp $
 
 VOLUME=	usd
 SRCS=	contents.ms
diff --git a/share/doc/usd/title/Makefile b/share/doc/usd/title/Makefile
index 8aba70622bc9..1c7af145c235 100644
--- a/share/doc/usd/title/Makefile
+++ b/share/doc/usd/title/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/title/Makefile,v 1.4.2.1 1999/08/29 16:44:44 peter Exp $
 
 VOLUME=	usd
 SRCS=	Title
diff --git a/share/examples/FreeBSD_version/Makefile b/share/examples/FreeBSD_version/Makefile
index 69dc00b759a7..caa46ab1edbf 100644
--- a/share/examples/FreeBSD_version/Makefile
+++ b/share/examples/FreeBSD_version/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/FreeBSD_version/Makefile,v 1.3.2.1 1999/08/29 16:44:46 peter Exp $
 
 PROG=	FreeBSD_version
 NOMAN=
diff --git a/share/examples/Makefile b/share/examples/Makefile
index 3591fc648403..a35539d1f6c0 100644
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/Makefile,v 1.23.2.3 1999/08/29 16:44:45 peter Exp $
 #
 # Doing a make install builds /usr/share/examples
 
diff --git a/share/examples/atapi/burnaudio b/share/examples/atapi/burnaudio
index f1e1056fa8d6..1fe0c36a1765 100755
--- a/share/examples/atapi/burnaudio
+++ b/share/examples/atapi/burnaudio
@@ -26,7 +26,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/atapi/burnaudio,v 1.1.2.1 1999/08/29 16:44:47 peter Exp $
 #
 
 device=/dev/r$1
diff --git a/share/examples/atapi/burndata b/share/examples/atapi/burndata
index 0a7577f4ea0c..829c08a19f0b 100755
--- a/share/examples/atapi/burndata
+++ b/share/examples/atapi/burndata
@@ -26,7 +26,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/atapi/burndata,v 1.1.2.1 1999/08/29 16:44:48 peter Exp $
 
 device=/dev/r$1
 wormcontrol -f$device prepdisk double
diff --git a/share/examples/atm/NOTES b/share/examples/atm/NOTES
index aad41906178e..308ce27a9535 100644
--- a/share/examples/atm/NOTES
+++ b/share/examples/atm/NOTES
@@ -50,5 +50,5 @@ without halting on systems which can't support the larger sizes.
 
 
 
-	@(#) $FreeBSD$
+	@(#) $FreeBSD: src/share/examples/atm/NOTES,v 1.1.2.1 1999/08/29 16:44:48 peter Exp $
 
diff --git a/share/examples/atm/README b/share/examples/atm/README
index a2e23f28bbbf..34a799f570c9 100644
--- a/share/examples/atm/README
+++ b/share/examples/atm/README
@@ -136,5 +136,5 @@ copyright notices are reproduced in the files where the material appears.
 
 --------------------------------------------------------------------------------
 
-	@(#) $FreeBSD$
+	@(#) $FreeBSD: src/share/examples/atm/README,v 1.1.2.1 1999/08/29 16:44:49 peter Exp $
 
diff --git a/share/examples/atm/Startup b/share/examples/atm/Startup
index 8898e45c8821..af75e119d3ac 100644
--- a/share/examples/atm/Startup
+++ b/share/examples/atm/Startup
@@ -123,5 +123,5 @@ See the file atm-config.sh for an example ATM startup script.
 
     See the man pages scspd(8) and atmarpd(8) for further information.
 
-	@(#) $FreeBSD$
+	@(#) $FreeBSD: src/share/examples/atm/Startup,v 1.1.2.1 1999/08/29 16:44:50 peter Exp $
 
diff --git a/share/examples/atm/atm-config.sh b/share/examples/atm/atm-config.sh
index b15060e83714..9f506b42a073 100755
--- a/share/examples/atm/atm-config.sh
+++ b/share/examples/atm/atm-config.sh
@@ -24,7 +24,7 @@
 # Copies of this Software may be made, however, the above copyright
 # notice must be reproduced on all copies.
 #
-#	@(#) $FreeBSD$
+#	@(#) $FreeBSD: src/share/examples/atm/atm-config.sh,v 1.1.2.1 1999/08/29 16:44:50 peter Exp $
 #
 #
 
diff --git a/share/examples/atm/atm-sockets.txt b/share/examples/atm/atm-sockets.txt
index b4cc8e9d00d1..6341fd6cd69b 100644
--- a/share/examples/atm/atm-sockets.txt
+++ b/share/examples/atm/atm-sockets.txt
@@ -568,5 +568,5 @@ main(argc, argv)
 	exit(0);
 }
 
-	@(#) $FreeBSD$
+	@(#) $FreeBSD: src/share/examples/atm/atm-sockets.txt,v 1.2.2.1 1999/08/29 16:44:50 peter Exp $
 
diff --git a/share/examples/atm/cpcs-design.txt b/share/examples/atm/cpcs-design.txt
index 94901f23998e..0e48d1b9a4b7 100644
--- a/share/examples/atm/cpcs-design.txt
+++ b/share/examples/atm/cpcs-design.txt
@@ -80,5 +80,5 @@ o The Streaming Mode service is not supported.
 o The Abort service is not supported.
 
 
-	@(#) $FreeBSD$
+	@(#) $FreeBSD: src/share/examples/atm/cpcs-design.txt,v 1.1.2.1 1999/08/29 16:44:51 peter Exp $
 
diff --git a/share/examples/atm/sscf-design.txt b/share/examples/atm/sscf-design.txt
index 5334d74bdbac..f442eed17b11 100644
--- a/share/examples/atm/sscf-design.txt
+++ b/share/examples/atm/sscf-design.txt
@@ -125,5 +125,5 @@ o The Parameter Data parameter is not supported for the following primitives:
 	AAL-RELEASE indication
 
 
-	@(#) $FreeBSD$
+	@(#) $FreeBSD: src/share/examples/atm/sscf-design.txt,v 1.1.2.1 1999/08/29 16:44:51 peter Exp $
 
diff --git a/share/examples/atm/sscop-design.txt b/share/examples/atm/sscop-design.txt
index 2b546bd6aeac..007ef461b06e 100644
--- a/share/examples/atm/sscop-design.txt
+++ b/share/examples/atm/sscop-design.txt
@@ -216,5 +216,5 @@ o For the AA-ESTABLISH request and response signals, only BR=YES is supported
 o For the AA-DATA request signal, only PR=NO is supported (Q.SAAL1 only)
 
 
-	@(#) $FreeBSD$
+	@(#) $FreeBSD: src/share/examples/atm/sscop-design.txt,v 1.1.2.1 1999/08/29 16:44:51 peter Exp $
 
diff --git a/share/examples/bootforth/README b/share/examples/bootforth/README
index b8eb8a0f3a16..56d74c2e5bc9 100644
--- a/share/examples/bootforth/README
+++ b/share/examples/bootforth/README
@@ -32,4 +32,4 @@ configuration to distinguish one from the other.
 Daniel C. Sobral
 <dcs@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/share/examples/bootforth/README,v 1.1.2.2 1999/08/29 16:44:53 peter Exp $
diff --git a/share/examples/bootforth/boot.4th b/share/examples/bootforth/boot.4th
index 631775b304f7..c361c9ce0d7b 100644
--- a/share/examples/bootforth/boot.4th
+++ b/share/examples/bootforth/boot.4th
@@ -1,6 +1,6 @@
 \ Example of the file which is automatically loaded by /boot/loader
 \ on startup.
-\ $FreeBSD$
+\ $FreeBSD: src/share/examples/bootforth/boot.4th,v 1.1.2.1 1999/08/29 16:44:53 peter Exp $
 
 \ Load the screen manipulation words
 
diff --git a/share/examples/bootforth/frames.4th b/share/examples/bootforth/frames.4th
index ff91c5b7ec87..4d0334507a1f 100644
--- a/share/examples/bootforth/frames.4th
+++ b/share/examples/bootforth/frames.4th
@@ -1,6 +1,6 @@
 \ Words implementing frame drawing
 \ XXX Filled boxes are left as an exercise for the reader... ;-/
-\ $FreeBSD$
+\ $FreeBSD: src/share/examples/bootforth/frames.4th,v 1.1.2.1 1999/08/29 16:44:53 peter Exp $
 
 marker task-frames.4th
 
diff --git a/share/examples/bootforth/loader.rc b/share/examples/bootforth/loader.rc
index d216a460416f..acd22cc9b670 100644
--- a/share/examples/bootforth/loader.rc
+++ b/share/examples/bootforth/loader.rc
@@ -1,6 +1,6 @@
 \ Example of the file which is automatically loaded by /boot/loader
 \ on startup.
-\ $FreeBSD$
+\ $FreeBSD: src/share/examples/bootforth/loader.rc,v 1.2.2.2 1999/08/29 16:44:54 peter Exp $
 
 cr .( Loading Forth extensions:)
 
diff --git a/share/examples/bootforth/menuconf.4th b/share/examples/bootforth/menuconf.4th
index 97efd5af8af4..4e5a69ccb174 100644
--- a/share/examples/bootforth/menuconf.4th
+++ b/share/examples/bootforth/menuconf.4th
@@ -1,7 +1,7 @@
 \ Simple greeting screen, presenting basic options.
 \ XXX This is far too trivial - I don't have time now to think
 \ XXX about something more fancy... :-/
-\ $FreeBSD$
+\ $FreeBSD: src/share/examples/bootforth/menuconf.4th,v 1.2.2.2 1999/08/29 16:44:54 peter Exp $
 
 : title
 	f_single
diff --git a/share/examples/bootforth/screen.4th b/share/examples/bootforth/screen.4th
index 3ea79e453d80..95ba109a5bf3 100644
--- a/share/examples/bootforth/screen.4th
+++ b/share/examples/bootforth/screen.4th
@@ -1,5 +1,5 @@
 \ Screen manipulation related words.
-\ $FreeBSD$
+\ $FreeBSD: src/share/examples/bootforth/screen.4th,v 1.1.2.1 1999/08/29 16:44:54 peter Exp $
 
 marker task-screen.4th
 
diff --git a/share/examples/cvsup/README b/share/examples/cvsup/README
index 06d0a928ce1c..9ab329676dad 100644
--- a/share/examples/cvsup/README
+++ b/share/examples/cvsup/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/cvsup/README,v 1.13.2.2 1999/08/29 16:44:55 peter Exp $
 
 This directory contains sample "supfiles" for obtaining and updating
 the FreeBSD sources via the Internet.  These supfiles will work
diff --git a/share/examples/cvsup/cvs-supfile b/share/examples/cvsup/cvs-supfile
index 320d9e3e27ca..fbd5edd2caef 100644
--- a/share/examples/cvsup/cvs-supfile
+++ b/share/examples/cvsup/cvs-supfile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/cvsup/cvs-supfile,v 1.17.2.8 1999/12/12 16:47:36 dillon Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # CVS development tree of the FreeBSD system.
diff --git a/share/examples/cvsup/doc-supfile b/share/examples/cvsup/doc-supfile
index cc4db5383b65..a2bcafe02ac9 100644
--- a/share/examples/cvsup/doc-supfile
+++ b/share/examples/cvsup/doc-supfile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/cvsup/doc-supfile,v 1.1.2.2 1999/08/29 16:44:56 peter Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # FreeBSD-current source tree.
diff --git a/share/examples/cvsup/gnats-supfile b/share/examples/cvsup/gnats-supfile
index 640915fbe3d4..2ff45a1adf87 100644
--- a/share/examples/cvsup/gnats-supfile
+++ b/share/examples/cvsup/gnats-supfile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/cvsup/gnats-supfile,v 1.1.4.2 1999/08/29 16:44:57 peter Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # FreeBSD GNATS bug report database.
diff --git a/share/examples/cvsup/ports-supfile b/share/examples/cvsup/ports-supfile
index 27b27ecb595c..271f620097c5 100644
--- a/share/examples/cvsup/ports-supfile
+++ b/share/examples/cvsup/ports-supfile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/cvsup/ports-supfile,v 1.14.2.5 1999/08/29 16:44:57 peter Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # FreeBSD-current ports collection.
diff --git a/share/examples/cvsup/secure-cvs-supfile b/share/examples/cvsup/secure-cvs-supfile
index e56bea1f5612..3c0139ad311a 100644
--- a/share/examples/cvsup/secure-cvs-supfile
+++ b/share/examples/cvsup/secure-cvs-supfile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/cvsup/secure-cvs-supfile,v 1.7.2.3 1999/08/31 17:59:28 jdp Exp $
 #
 # This file contains all of the "CVSup collections" that make up the CVS
 # development tree of the FreeBSD international secure distribution.  If
diff --git a/share/examples/cvsup/secure-stable-supfile b/share/examples/cvsup/secure-stable-supfile
index d52ee6be596c..bf98e2e384bd 100644
--- a/share/examples/cvsup/secure-stable-supfile
+++ b/share/examples/cvsup/secure-stable-supfile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/cvsup/secure-stable-supfile,v 1.9.2.5 1999/08/31 17:59:28 jdp Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # source tree of the FreeBSD-stable international secure distribution.
diff --git a/share/examples/cvsup/secure-supfile b/share/examples/cvsup/secure-supfile
index d68ed1a29f1a..45574617d306 100644
--- a/share/examples/cvsup/secure-supfile
+++ b/share/examples/cvsup/secure-supfile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/cvsup/secure-supfile,v 1.8.2.3 1999/08/31 17:59:29 jdp Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # source tree of the FreeBSD-current international secure distribution.
diff --git a/share/examples/cvsup/stable-supfile b/share/examples/cvsup/stable-supfile
index 0b5e18f4f0f8..f5a5ab46d0b6 100644
--- a/share/examples/cvsup/stable-supfile
+++ b/share/examples/cvsup/stable-supfile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/cvsup/stable-supfile,v 1.12.2.6 1999/10/04 17:48:17 ru Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # FreeBSD-stable source tree.
diff --git a/share/examples/cvsup/standard-supfile b/share/examples/cvsup/standard-supfile
index a2e866ad12cb..b87df898ef26 100644
--- a/share/examples/cvsup/standard-supfile
+++ b/share/examples/cvsup/standard-supfile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/cvsup/standard-supfile,v 1.12.2.4 1999/08/31 17:59:30 jdp Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # FreeBSD-current source tree.
diff --git a/share/examples/cvsup/www-supfile b/share/examples/cvsup/www-supfile
index 45c375016353..e1540b3ac607 100644
--- a/share/examples/cvsup/www-supfile
+++ b/share/examples/cvsup/www-supfile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/cvsup/www-supfile,v 1.1.2.2 1999/08/29 16:45:00 peter Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # FreeBSD-current source tree.
diff --git a/share/examples/drivers/make_device_driver.sh b/share/examples/drivers/make_device_driver.sh
index 81a7db4f9679..35b74f14ccff 100755
--- a/share/examples/drivers/make_device_driver.sh
+++ b/share/examples/drivers/make_device_driver.sh
@@ -29,7 +29,7 @@ DONE
 cat >${UPPER} <<DONE
 # Configuration file for kernel type: ${UPPER}
 ident	${UPPER}
-# \$FreeBSD$"
+# \$FreeBSD: src/share/examples/drivers/make_device_driver.sh,v 1.4.2.2 1999/08/29 16:45:01 peter Exp $"
 DONE
 
 grep -v GENERIC < GENERIC >>${UPPER}
@@ -45,7 +45,7 @@ cat >../isa/${1}.c <<DONE
  * Copyright ME
  *
  * ${1} driver
- * \$FreeBSD$
+ * \$FreeBSD: src/share/examples/drivers/make_device_driver.sh,v 1.4.2.2 1999/08/29 16:45:01 peter Exp $
  */
 
 
diff --git a/share/examples/drivers/make_pci_drive.sh b/share/examples/drivers/make_pci_drive.sh
index fed2fbd35e5b..79058bbafbc1 100644
--- a/share/examples/drivers/make_pci_drive.sh
+++ b/share/examples/drivers/make_pci_drive.sh
@@ -36,7 +36,7 @@ DONE
 cat >${UPPER} <<DONE
 # Configuration file for kernel type: ${UPPER}
 ident	${UPPER}
-# \$FreeBSD$"
+# \$FreeBSD: src/share/examples/drivers/make_pci_drive.sh,v 1.1.2.2 1999/08/29 16:45:01 peter Exp $"
 DONE
 
 grep -v GENERIC < GENERIC >>${UPPER}
@@ -52,7 +52,7 @@ cat >../../pci/${1}.c <<DONE
  * Copyright ME
  *
  * ${1} driver
- * \$FreeBSD$
+ * \$FreeBSD: src/share/examples/drivers/make_pci_drive.sh,v 1.1.2.2 1999/08/29 16:45:01 peter Exp $
  */
 
 
@@ -434,7 +434,7 @@ DONE
 if [ -d /usr/src/sys/modules/${1} ]
 then
 	cat >/usr/src/sys/modules/${1}/Makefile <<DONE
-# $FreeBSD$
+# $FreeBSD: src/share/examples/drivers/make_pci_drive.sh,v 1.1.2.2 1999/08/29 16:45:01 peter Exp $
 #	${UPPER} KLD Module
 #
 #	This happens not to work, pci devices can't be modules
diff --git a/share/examples/drivers/make_pseudo_driver.sh b/share/examples/drivers/make_pseudo_driver.sh
index 32cce89d0a93..17462544bf68 100644
--- a/share/examples/drivers/make_pseudo_driver.sh
+++ b/share/examples/drivers/make_pseudo_driver.sh
@@ -21,7 +21,7 @@ DONE
 cat >${UPPER} <<DONE
 # Configuration file for kernel type: ${UPPER}
 ident	${UPPER}
-# \$FreeBSD$"
+# \$FreeBSD: src/share/examples/drivers/make_pseudo_driver.sh,v 1.3.2.2 1999/08/29 16:45:02 peter Exp $"
 DONE
 
 grep -v GENERIC < GENERIC >>${UPPER}
@@ -37,7 +37,7 @@ cat >../../dev/${1}.c <<DONE
  * Copyright ME
  *
  * ${1} driver
- * \$FreeBSD$
+ * \$FreeBSD: src/share/examples/drivers/make_pseudo_driver.sh,v 1.3.2.2 1999/08/29 16:45:02 peter Exp $
  */
 
 
diff --git a/share/examples/etc/README.examples b/share/examples/etc/README.examples
index 38d3eaafc5db..3f31e3fcad5a 100644
--- a/share/examples/etc/README.examples
+++ b/share/examples/etc/README.examples
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/examples/etc/README.examples,v 1.3.2.2 1999/08/29 16:45:03 peter Exp $
 
 The /usr/share/examples/etc directory contains the original
 distribution versions of the files which are shipped in /etc.  This is
diff --git a/share/examples/find_interface/Makefile b/share/examples/find_interface/Makefile
index 184c6417702b..aa3ed6b125d5 100644
--- a/share/examples/find_interface/Makefile
+++ b/share/examples/find_interface/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/find_interface/Makefile,v 1.3.2.1 1999/08/29 16:45:04 peter Exp $
 
 PROG=	find_interface
 NOMAN=
diff --git a/share/examples/find_interface/find_interface.c b/share/examples/find_interface/find_interface.c
index 73a7fe839d79..591351143185 100644
--- a/share/examples/find_interface/find_interface.c
+++ b/share/examples/find_interface/find_interface.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/find_interface/find_interface.c,v 1.4.2.1 1999/08/29 16:45:04 peter Exp $
  */
 
 /*
diff --git a/share/examples/isdn/FAQ b/share/examples/isdn/FAQ
index 6ed0cf1a3156..c80e8f68b4e0 100644
--- a/share/examples/isdn/FAQ
+++ b/share/examples/isdn/FAQ
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-$FreeBSD$
+$FreeBSD: src/share/examples/isdn/FAQ,v 1.1.2.1 1999/11/16 17:28:43 joe Exp $
 
                    ISDN4BSD Frequently Asked Questions
                    ===================================
diff --git a/share/examples/isdn/Overview b/share/examples/isdn/Overview
index e8e09e2c3cd5..64146f2e1a33 100644
--- a/share/examples/isdn/Overview
+++ b/share/examples/isdn/Overview
@@ -4,7 +4,7 @@
 
 	Copyright (c) 1998 Hellmuth Michaelis. All rights reserved.
 
- $FreeBSD$
+ $FreeBSD: src/share/examples/isdn/Overview,v 1.1.2.1 1999/08/29 16:45:06 peter Exp $
 
 	Last edit-date: [Tue Oct 27 11:26:03 1998]
 
diff --git a/share/examples/isdn/README b/share/examples/isdn/README
index bc3202c677f8..4cce72f300b0 100644
--- a/share/examples/isdn/README
+++ b/share/examples/isdn/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/examples/isdn/README,v 1.1.2.1 1999/11/16 17:28:44 joe Exp $
 
 Note: This is a modified README from the isdn4bsd 0.83.00 ftp-distribution. 
 
diff --git a/share/examples/isdn/ROADMAP b/share/examples/isdn/ROADMAP
index c228984484cb..b3a83a8b6772 100644
--- a/share/examples/isdn/ROADMAP
+++ b/share/examples/isdn/ROADMAP
@@ -2,7 +2,7 @@
 	Roadmap of isdn4bsd as integrated into FreeBSD
 	==============================================
 
- $FreeBSD$
+ $FreeBSD: src/share/examples/isdn/ROADMAP,v 1.1.2.1 1999/08/29 16:45:06 peter Exp $
 
 	last edit-date: [Mon Jan 18 14:47:09 1999]
 
diff --git a/share/examples/isdn/Resources b/share/examples/isdn/Resources
index 3aa7fd8b5c66..eaf7c0a5180e 100644
--- a/share/examples/isdn/Resources
+++ b/share/examples/isdn/Resources
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/examples/isdn/Resources,v 1.1.2.1 1999/11/16 17:28:44 joe Exp $
 
 Download sites for isdn4bsd
 ===========================
diff --git a/share/examples/isdn/isdnd_acct b/share/examples/isdn/isdnd_acct
index be97a4ae458f..fb760f1e5288 100644
--- a/share/examples/isdn/isdnd_acct
+++ b/share/examples/isdn/isdnd_acct
@@ -29,7 +29,7 @@
 #	accounting report script for the isdnd daemon accounting info
 #	-------------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/isdn/isdnd_acct,v 1.1.2.2 1999/11/16 17:28:44 joe Exp $
 #
 #	last edit-date: [Wed May  5 16:24:16 1999]
 #
diff --git a/share/examples/kld/cdev/module/Makefile b/share/examples/kld/cdev/module/Makefile
index 2c1b8f92121b..6e63e2cde524 100644
--- a/share/examples/kld/cdev/module/Makefile
+++ b/share/examples/kld/cdev/module/Makefile
@@ -34,7 +34,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/kld/cdev/module/Makefile,v 1.1.2.1 1999/08/29 16:45:07 peter Exp $
 #
 # Copyright (c) 1993 Terrence R. Lambert.
 # All rights reserved.
diff --git a/share/examples/kld/cdev/test/Makefile b/share/examples/kld/cdev/test/Makefile
index 001fde1d11e1..a30e25370858 100644
--- a/share/examples/kld/cdev/test/Makefile
+++ b/share/examples/kld/cdev/test/Makefile
@@ -64,7 +64,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/kld/cdev/test/Makefile,v 1.1.2.1 1999/08/29 16:45:08 peter Exp $
 #
 PROG=	testcdev
 NOMAN=
diff --git a/share/examples/kld/syscall/module/syscall.c b/share/examples/kld/syscall/module/syscall.c
index 2376725ed93e..eff23f87c359 100644
--- a/share/examples/kld/syscall/module/syscall.c
+++ b/share/examples/kld/syscall/module/syscall.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/kld/syscall/module/syscall.c,v 1.1.2.1 1999/08/29 16:45:09 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/share/examples/kld/syscall/test/call.c b/share/examples/kld/syscall/test/call.c
index 9183997821cd..05a1b2d0d630 100644
--- a/share/examples/kld/syscall/test/call.c
+++ b/share/examples/kld/syscall/test/call.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/kld/syscall/test/call.c,v 1.2.2.1 1999/08/29 16:45:10 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/share/examples/libvgl/demo.c b/share/examples/libvgl/demo.c
index 3147c47687c7..c54a0a84ccf8 100644
--- a/share/examples/libvgl/demo.c
+++ b/share/examples/libvgl/demo.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/libvgl/demo.c,v 1.1.4.1 1999/08/29 16:45:11 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/share/examples/lkm/misc/module/Makefile b/share/examples/lkm/misc/module/Makefile
index 40ca537fb9ba..c241ccfb14c1 100644
--- a/share/examples/lkm/misc/module/Makefile
+++ b/share/examples/lkm/misc/module/Makefile
@@ -34,7 +34,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/lkm/misc/module/Makefile,v 1.5.2.1 1999/08/29 16:45:12 peter Exp $
 #
 BINDIR=	/tmp
 SRCS=	misccall.c miscmod.c
diff --git a/share/examples/lkm/misc/test/Makefile b/share/examples/lkm/misc/test/Makefile
index 105a2ea9537b..bb755f87b960 100644
--- a/share/examples/lkm/misc/test/Makefile
+++ b/share/examples/lkm/misc/test/Makefile
@@ -34,7 +34,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/lkm/misc/test/Makefile,v 1.5.2.1 1999/08/29 16:45:13 peter Exp $
 #
 PROG=	testmisc
 NOMAN=
diff --git a/share/examples/mdoc/example.1 b/share/examples/mdoc/example.1
index 53ba9cfaccc8..10bdc84e3ec8 100644
--- a/share/examples/mdoc/example.1
+++ b/share/examples/mdoc/example.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/examples/mdoc/example.1,v 1.10.2.1 1999/12/12 17:41:56 mpp Exp $
 .\" Note: All FreeBSD man pages should have a FreeBSD revision
 .\" control id to make it easier for translation teams to track
 .\" changes.
diff --git a/share/examples/mdoc/example.3 b/share/examples/mdoc/example.3
index b2dc5567706d..fbcf4ffc0f1d 100644
--- a/share/examples/mdoc/example.3
+++ b/share/examples/mdoc/example.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/examples/mdoc/example.3,v 1.10.2.1 1999/12/12 17:41:57 mpp Exp $
 .\" Note: All FreeBSD man pages should have a FreeBSD revision
 .\" control id to make it easier for translation teams to track
 .\" changes.
diff --git a/share/examples/mdoc/example.4 b/share/examples/mdoc/example.4
index 45be91440422..540afe071ff2 100644
--- a/share/examples/mdoc/example.4
+++ b/share/examples/mdoc/example.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/examples/mdoc/example.4,v 1.8.2.1 1999/12/12 17:41:57 mpp Exp $
 .\" Note: All FreeBSD man pages should have a FreeBSD revision
 .\" control id to make it easier for translation teams to track
 .\" changes.
diff --git a/share/examples/perfmon/Makefile b/share/examples/perfmon/Makefile
index e1e7e9faf090..29d33fc943ac 100644
--- a/share/examples/perfmon/Makefile
+++ b/share/examples/perfmon/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/perfmon/Makefile,v 1.3.2.1 1999/08/29 16:45:14 peter Exp $
 
 PROG=	perfmon
 NOMAN=
diff --git a/share/examples/perfmon/README b/share/examples/perfmon/README
index ccd6877a175a..e75373a929ba 100644
--- a/share/examples/perfmon/README
+++ b/share/examples/perfmon/README
@@ -21,4 +21,4 @@ The following options are not implemented on Pentium CPUs:
 There is one mandatory argument, which must be the number of the counter.
 All numbers can be specified in any format acceptable to strtol(3).
 
-$FreeBSD$
+$FreeBSD: src/share/examples/perfmon/README,v 1.3.2.1 1999/08/29 16:45:14 peter Exp $
diff --git a/share/examples/perfmon/perfmon.c b/share/examples/perfmon/perfmon.c
index 34e38849b22b..63cff519f47d 100644
--- a/share/examples/perfmon/perfmon.c
+++ b/share/examples/perfmon/perfmon.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/perfmon/perfmon.c,v 1.4.2.1 1999/08/29 16:45:15 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/share/examples/ppi/Makefile b/share/examples/ppi/Makefile
index 1836d8abc17c..4e65d1ef9391 100644
--- a/share/examples/ppi/Makefile
+++ b/share/examples/ppi/Makefile
@@ -1,6 +1,6 @@
 # Makefile to build LCD control software for ppi(4) interface.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppi/Makefile,v 1.1.2.1 1999/08/29 16:45:16 peter Exp $
 
 PROG=	ppilcd
 NOMAN=	YES
diff --git a/share/examples/ppi/ppilcd.c b/share/examples/ppi/ppilcd.c
index 91a3effcbec9..f8a5320472df 100644
--- a/share/examples/ppi/ppilcd.c
+++ b/share/examples/ppi/ppilcd.c
@@ -2,7 +2,7 @@
  * Control LCD module hung off parallel port using the
  * ppi 'geek port' interface.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/ppi/ppilcd.c,v 1.1.2.1 1999/08/29 16:45:17 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/share/examples/ppp/chap-auth b/share/examples/ppp/chap-auth
index 1e56b07575c0..7ba4a93c1a5b 100755
--- a/share/examples/ppp/chap-auth
+++ b/share/examples/ppp/chap-auth
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/chap-auth,v 1.1.2.2 1999/08/29 16:45:18 peter Exp $
 
 #
 # Display a window to request a users CHAP secret, accepting the relevant
diff --git a/share/examples/ppp/isdnd.rc b/share/examples/ppp/isdnd.rc
index 2955256ff6cf..095f676fe264 100644
--- a/share/examples/ppp/isdnd.rc
+++ b/share/examples/ppp/isdnd.rc
@@ -10,7 +10,7 @@
 #
 #	then ppp will not work over ISDN !
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/isdnd.rc,v 1.2.2.3 1999/09/24 12:23:00 brian Exp $
 #
 #------------------------------------------------------------------------------
 
diff --git a/share/examples/ppp/login-auth b/share/examples/ppp/login-auth
index e866e1d9c092..3fedc1dd6ea0 100755
--- a/share/examples/ppp/login-auth
+++ b/share/examples/ppp/login-auth
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/login-auth,v 1.1.2.2 1999/08/29 16:45:18 peter Exp $
 
 #
 # Display a window to request a users password, expecting a login name
diff --git a/share/examples/ppp/ppp.conf.isdn b/share/examples/ppp/ppp.conf.isdn
index 8bfd02e8a59d..7a3a2ea38333 100644
--- a/share/examples/ppp/ppp.conf.isdn
+++ b/share/examples/ppp/ppp.conf.isdn
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.conf.isdn,v 1.2.2.4 1999/11/16 17:59:23 joe Exp $
 
 # This is an example ppp profile for bringing up a multilink ppp connection
 # over ISDN.  It needs at least version 0.83.0 of the i4b code.  An example
diff --git a/share/examples/ppp/ppp.conf.sample b/share/examples/ppp/ppp.conf.sample
index 85061cd92580..0a1211f9a281 100644
--- a/share/examples/ppp/ppp.conf.sample
+++ b/share/examples/ppp/ppp.conf.sample
@@ -4,7 +4,7 @@
 #
 #           Originally written by Toshiharu OHNO
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.conf.sample,v 1.2.2.6 1999/08/29 16:45:19 peter Exp $
 #
 #################################################################
 
diff --git a/share/examples/ppp/ppp.conf.span-isp b/share/examples/ppp/ppp.conf.span-isp
index 5bf42a777d5a..b8c0dc82fea9 100644
--- a/share/examples/ppp/ppp.conf.span-isp
+++ b/share/examples/ppp/ppp.conf.span-isp
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.conf.span-isp,v 1.1.2.2 1999/08/29 16:45:19 peter Exp $
 
 # This advanced ppp configuration file explains how to implement
 # the following:
diff --git a/share/examples/ppp/ppp.conf.span-isp.working b/share/examples/ppp/ppp.conf.span-isp.working
index e8ec5fc90f39..6adbd135d463 100644
--- a/share/examples/ppp/ppp.conf.span-isp.working
+++ b/share/examples/ppp/ppp.conf.span-isp.working
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.conf.span-isp.working,v 1.1.2.2 1999/08/29 16:45:20 peter Exp $
 
 # This is a working example of ppp.conf.span-isp that uses ppp connections
 # to the same machine through 3 null-modem serial cables.
diff --git a/share/examples/ppp/ppp.linkdown.sample b/share/examples/ppp/ppp.linkdown.sample
index b2a073c070fd..e584d3e38d28 100644
--- a/share/examples/ppp/ppp.linkdown.sample
+++ b/share/examples/ppp/ppp.linkdown.sample
@@ -12,7 +12,7 @@
 #  3) If no label has been found, use MYADDR if it exists.
 #
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.linkdown.sample,v 1.1.2.2 1999/08/29 16:45:20 peter Exp $
 #
 #########################################################################
 
diff --git a/share/examples/ppp/ppp.linkdown.span-isp b/share/examples/ppp/ppp.linkdown.span-isp
index ae00b57cdd3c..285c4d9fd7ca 100644
--- a/share/examples/ppp/ppp.linkdown.span-isp
+++ b/share/examples/ppp/ppp.linkdown.span-isp
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.linkdown.span-isp,v 1.1.2.2 1999/08/29 16:45:20 peter Exp $
 
 # Refer to ppp.conf.span-isp for a description of what this file is for.
 # This file is only required on the Gateway machine.
diff --git a/share/examples/ppp/ppp.linkdown.span-isp.working b/share/examples/ppp/ppp.linkdown.span-isp.working
index 104e8c3b5b69..bdee5795e06a 100644
--- a/share/examples/ppp/ppp.linkdown.span-isp.working
+++ b/share/examples/ppp/ppp.linkdown.span-isp.working
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.linkdown.span-isp.working,v 1.1.2.2 1999/08/29 16:45:22 peter Exp $
 
 # This is a working example of ppp.linkdown.span-isp that uses ppp connections
 # to the same machine through 3 null-modem serial cables.
diff --git a/share/examples/ppp/ppp.linkup.sample b/share/examples/ppp/ppp.linkup.sample
index 18073cf712e7..d24c5a08b5a0 100644
--- a/share/examples/ppp/ppp.linkup.sample
+++ b/share/examples/ppp/ppp.linkup.sample
@@ -12,7 +12,7 @@
 #  3) If no label has been found, use MYADDR if it exists.
 #
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.linkup.sample,v 1.1.2.2 1999/08/29 16:45:22 peter Exp $
 #
 #########################################################################
 
diff --git a/share/examples/ppp/ppp.linkup.span-isp b/share/examples/ppp/ppp.linkup.span-isp
index 1d0cc9b68143..c1ab50dd72da 100644
--- a/share/examples/ppp/ppp.linkup.span-isp
+++ b/share/examples/ppp/ppp.linkup.span-isp
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.linkup.span-isp,v 1.1.2.2 1999/08/29 16:45:22 peter Exp $
 
 # Refer to ppp.conf.span-isp for a description of what this file is for.
 # This file is only required on the Gateway machine.
diff --git a/share/examples/ppp/ppp.linkup.span-isp.working b/share/examples/ppp/ppp.linkup.span-isp.working
index 9e7e5eb5bf66..12eeda5d82a1 100644
--- a/share/examples/ppp/ppp.linkup.span-isp.working
+++ b/share/examples/ppp/ppp.linkup.span-isp.working
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.linkup.span-isp.working,v 1.1.2.2 1999/08/29 16:45:22 peter Exp $
 
 # This is a working example of ppp.linkup.span-isp that uses ppp connections
 # to the same machine through 3 null-modem serial cables.
diff --git a/share/examples/ppp/ppp.secret.sample b/share/examples/ppp/ppp.secret.sample
index 57d2375fb6b0..3d3f96d2270a 100644
--- a/share/examples/ppp/ppp.secret.sample
+++ b/share/examples/ppp/ppp.secret.sample
@@ -27,7 +27,7 @@
 #  ``auth'' or ``cbcp'' callback is enabled (see ``set callback'').
 #  A ``*'' specifies that the client must specify the number.
 #  
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.secret.sample,v 1.1.2.2 1999/08/29 16:45:23 peter Exp $
 #
 ##################################################
 
diff --git a/share/examples/ppp/ppp.secret.span-isp b/share/examples/ppp/ppp.secret.span-isp
index 8370f379717e..73f1c7eda043 100644
--- a/share/examples/ppp/ppp.secret.span-isp
+++ b/share/examples/ppp/ppp.secret.span-isp
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.secret.span-isp,v 1.1.2.2 1999/08/29 16:45:23 peter Exp $
 
 # Refer to ppp.conf.span-isp for a description of what this file is for.
 # This file is only required on the Receiver machine.
diff --git a/share/examples/ppp/ppp.secret.span-isp.working b/share/examples/ppp/ppp.secret.span-isp.working
index cc8bc3d63dbe..bb6fe990c8a1 100644
--- a/share/examples/ppp/ppp.secret.span-isp.working
+++ b/share/examples/ppp/ppp.secret.span-isp.working
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.secret.span-isp.working,v 1.1.2.2 1999/08/29 16:45:24 peter Exp $
 
 # This is a working example of ppp.secret.span-isp that uses ppp connections
 # to the same machine through 3 null-modem serial cables.
diff --git a/share/examples/printing/README b/share/examples/printing/README
index f83eaa9c236a..5aaa4e85921c 100644
--- a/share/examples/printing/README
+++ b/share/examples/printing/README
@@ -1,4 +1,4 @@
-# $FreeBSD$ 
+# $FreeBSD: src/share/examples/printing/README,v 1.5.4.1 1999/08/29 16:45:25 peter Exp $ 
 #
 # The files in this directory are generated automatically
 # from doc/handbook/printing.sgml, do not edit it here!
diff --git a/share/examples/scsi_target/Makefile b/share/examples/scsi_target/Makefile
index 67f2a4ec24f0..d4e872da7614 100644
--- a/share/examples/scsi_target/Makefile
+++ b/share/examples/scsi_target/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/scsi_target/Makefile,v 1.1.2.1 1999/08/29 16:45:26 peter Exp $
 
 PROG=	scsi_target
 SRCS=	scsi_target.c
diff --git a/share/examples/scsi_target/scsi_target.c b/share/examples/scsi_target/scsi_target.c
index a0a91a1e56a1..a97303cb187f 100644
--- a/share/examples/scsi_target/scsi_target.c
+++ b/share/examples/scsi_target/scsi_target.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/scsi_target/scsi_target.c,v 1.2.2.3 1999/08/29 16:45:27 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/share/info/Makefile b/share/info/Makefile
index 7502e3ab5615..228a33ca3741 100644
--- a/share/info/Makefile
+++ b/share/info/Makefile
@@ -1,5 +1,5 @@
 #       @(#)Makefile    8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/share/info/Makefile,v 1.6.2.1 1999/08/29 16:45:28 peter Exp $
 
 NOOBJ=  noobj
 
diff --git a/share/isdn/0.al.uu b/share/isdn/0.al.uu
index dc6b0b9764f1..5639584876ca 100644
--- a/share/isdn/0.al.uu
+++ b/share/isdn/0.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/0.al.uu,v 1.2.2.1 1999/11/16 17:21:24 joe Exp $
 begin 666 0.al
 M5=75U=?7UM?4U=;3U-37U55555545%15U=7555175U965U15U=34U-?7U];6
 MT=?555175%555575U=75U=55U=37U]?7U]37U]34U5555=55555455145516
diff --git a/share/isdn/1.al.uu b/share/isdn/1.al.uu
index 291babc88a96..92d78d0e970e 100644
--- a/share/isdn/1.al.uu
+++ b/share/isdn/1.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/1.al.uu,v 1.2.2.1 1999/11/16 17:21:25 joe Exp $
 begin 666 1.al
 M55=75%755=545U1455145575U-37UM'6U];6UM155%175U975U74U-35U-77
 MU]75U=75U=565=;5U-'1U]345%=75U15U=75U]?7U]545E975%75U]?55555
diff --git a/share/isdn/2.al.uu b/share/isdn/2.al.uu
index e854c1dde7e0..c35f1ad83682 100644
--- a/share/isdn/2.al.uu
+++ b/share/isdn/2.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/2.al.uu,v 1.2.2.1 1999/11/16 17:21:26 joe Exp $
 begin 666 2.al
 MU]?455175U14U=375U;55U145%175U75U]'0T]/0T=?4U5545%175E%15U15
 MU=?6UM564U-045=75E34UM#2W=W=TM#6U-555=5555=65U15U=55U=555U%1
diff --git a/share/isdn/3.al.uu b/share/isdn/3.al.uu
index 55ec87115d94..b847ce5b578b 100644
--- a/share/isdn/3.al.uu
+++ b/share/isdn/3.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/3.al.uu,v 1.2.2.1 1999/11/16 17:21:27 joe Exp $
 begin 666 3.al
 MU=755537UE1555=75E=75%145%75U-?1UM;1UM;7U-555%=75U=75575U=?7
 MU]?7U]355%545%155%15U-?7UM;1T=?4U-5555175E965E=45=?0T]?4UM55
diff --git a/share/isdn/4.al.uu b/share/isdn/4.al.uu
index d6afc6802266..934262514125 100644
--- a/share/isdn/4.al.uu
+++ b/share/isdn/4.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/4.al.uu,v 1.2.2.1 1999/11/16 17:21:27 joe Exp $
 begin 666 4.al
 M5-77UM'0T]/0U]31UE975U=45U=45%165E=75%155575U-?7U-34U=?6UM35
 MU=37U55555175E=75%75U-?4U-;1T-;1T=34U=555%545555U]?4U]?45514
diff --git a/share/isdn/5.al.uu b/share/isdn/5.al.uu
index 15b23f8fdc29..6fed943fd8de 100644
--- a/share/isdn/5.al.uu
+++ b/share/isdn/5.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/5.al.uu,v 1.2.2.1 1999/11/16 17:21:28 joe Exp $
 begin 666 5.al
 MU];7U-35U=75U=75U=?4U];6UM355%=555=5U5145%145=37UM?7U-34U=55
 M55175%15U]?6T='6UM35U5145U=64594U=55U-?6U]34U5545%755=75U-?6
diff --git a/share/isdn/6.al.uu b/share/isdn/6.al.uu
index 2b370ff1b148..9fa53d3b8201 100644
--- a/share/isdn/6.al.uu
+++ b/share/isdn/6.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/6.al.uu,v 1.2.2.1 1999/11/16 17:21:29 joe Exp $
 begin 666 6.al
 MU=74U-74U=755U965U=65U=45575U-?6T=;6U-34U-155=75U-1555545U=4
 M5%155555U=75U=37U%755=55U=56UM#2W=/0UM955=74U-36UM1555545U!3
diff --git a/share/isdn/7.al.uu b/share/isdn/7.al.uu
index b691bb06c580..ad0d558b7414 100644
--- a/share/isdn/7.al.uu
+++ b/share/isdn/7.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/7.al.uu,v 1.2.2.1 1999/11/16 17:21:30 joe Exp $
 begin 666 7.al
 MUU565E!05E=145=45=36T=;6U]3555755-74U];1T-/0UM155U9145%15E=4
 M5U14U=75U-74U-34U]?4U-34UM;555555U14U=?4U555U%565U55U-35U=37
diff --git a/share/isdn/8.al.uu b/share/isdn/8.al.uu
index fa3853485edf..c9f6c1fadf31 100644
--- a/share/isdn/8.al.uu
+++ b/share/isdn/8.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/8.al.uu,v 1.2.2.1 1999/11/16 17:21:30 joe Exp $
 begin 666 8.al
 MT]945E=14%975%145%145%15U=75U=555=74U];7U]'1T=?4U-545%=65E97
 M5U=45%155-75U-?6UM34U]34U-?7U]?1UM?7U-355%=145%375!14574U];0
diff --git a/share/isdn/9.al.uu b/share/isdn/9.al.uu
index a2bf30b6d0e7..567c9bd19179 100644
--- a/share/isdn/9.al.uu
+++ b/share/isdn/9.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/9.al.uu,v 1.2.2.1 1999/11/16 17:21:31 joe Exp $
 begin 666 9.al
 M5U145-75U=75U574U-145E=5U-?1T-35UU55U5=5U-;6U5165E75U]355U%6
 M5U15U5555U;6W]1<4U545=31W=[?W=#4T=#1U]545U=04U-15U1455545U14
diff --git a/share/isdn/Makefile b/share/isdn/Makefile
index 99025d809128..abfc292170d1 100644
--- a/share/isdn/Makefile
+++ b/share/isdn/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/Makefile,v 1.1.2.2 1999/11/16 17:21:32 joe Exp $
 
 FILES=	0.al 1.al 2.al 3.al 4.al 5.al 6.al 7.al 8.al 9.al beep.al msg.al
 
diff --git a/share/isdn/beep.al.uu b/share/isdn/beep.al.uu
index b03e1b0da57e..c487f382dabd 100644
--- a/share/isdn/beep.al.uu
+++ b/share/isdn/beep.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/beep.al.uu,v 1.2.2.1 1999/11/16 17:21:32 joe Exp $
 begin 666 beep.al
 MO)PU,P+EEA$*#)^YI;%F."<QX[>(XFZ5M+"!#"<F-H&[OHQK!%.:Z`\[.`>Q
 MI[N-`CPT>I_$`P[`LJ6]ZC(F/FFUMH5E48RQCATZ(3SCN;JTU@`3EY(9/3L+
diff --git a/share/isdn/msg.al.uu b/share/isdn/msg.al.uu
index aec318d78bbf..775ea3d655d1 100644
--- a/share/isdn/msg.al.uu
+++ b/share/isdn/msg.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/msg.al.uu,v 1.2.2.1 1999/11/16 17:21:33 joe Exp $
 begin 666 msg.al
 MT]'0T-=7U==45=35551755555%1555545U145=37T-#3TM/0U]355=75U557
 M45%15U=75U=75-74U-75U-;3TM/0UM;7U-75U=34U%575E%15E905-'4U=35
diff --git a/share/man/Makefile b/share/man/Makefile
index 259dc9a77b57..a75c4fc0eb20 100644
--- a/share/man/Makefile
+++ b/share/man/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/16/94
-# $FreeBSD$
+# $FreeBSD: src/share/man/Makefile,v 1.9.2.2 1999/08/29 16:45:30 peter Exp $
 
 # XXX MISSING:	man3f
 SUBDIR=	man1 man3 man4 man5 man6 man7 man8 man9
diff --git a/share/man/man0/Makefile b/share/man/man0/Makefile
index 688c43f34d51..83ade0fc824c 100644
--- a/share/man/man0/Makefile
+++ b/share/man/man0/Makefile
@@ -3,7 +3,7 @@
 # All rights reserved.
 #
 #	From: @(#)Makefile	8.2 (Berkeley) 1/29/94
-# $FreeBSD$
+# $FreeBSD: src/share/man/man0/Makefile,v 1.4.2.1 1999/08/29 16:45:31 peter Exp $
 #
 SRCS=	man1 man2 man3 man4 man5 man6 man7 man8
 
diff --git a/share/man/man0/title.urm b/share/man/man0/title.urm
index 92664033d26d..8b67ffc200f5 100644
--- a/share/man/man0/title.urm
+++ b/share/man/man0/title.urm
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)title.urm	8.7 (Berkeley) 4/20/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man0/title.urm,v 1.6.2.1 1999/08/29 16:45:32 peter Exp $
 .\"
 .af % i
 .EH ''''
diff --git a/share/man/man0/xrs.pl b/share/man/man0/xrs.pl
index feb6b5f654b7..28e184d205b9 100755
--- a/share/man/man0/xrs.pl
+++ b/share/man/man0/xrs.pl
@@ -21,7 +21,7 @@
 #
 # usage: xrs manpages ...
 #
-# $FreeBSD$
+# $FreeBSD: src/share/man/man0/xrs.pl,v 1.4.2.1 1999/08/29 16:45:32 peter Exp $
 
 sub mysort {
 
diff --git a/share/man/man1/Makefile b/share/man/man1/Makefile
index 7241953b0bb8..1e8eae1f7a48 100644
--- a/share/man/man1/Makefile
+++ b/share/man/man1/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/share/man/man1/Makefile,v 1.7.2.2 1999/12/10 13:02:57 sheldonh Exp $
 
 MAN1=	builtin.1 intro.1
 
diff --git a/share/man/man1/builtin.1 b/share/man/man1/builtin.1
index a0a14695f8c2..6d91a7d62dae 100644
--- a/share/man/man1/builtin.1
+++ b/share/man/man1/builtin.1
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/man/man1/builtin.1,v 1.2.2.1 1999/12/10 13:02:58 sheldonh Exp $
 .\"
 .Dd September 1, 1999
 .Dt BUILTIN 1
diff --git a/share/man/man1/intro.1 b/share/man/man1/intro.1
index e17807dfd8b4..dce77caedb95 100644
--- a/share/man/man1/intro.1
+++ b/share/man/man1/intro.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)intro.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man1/intro.1,v 1.12.2.3 1999/08/29 16:45:34 peter Exp $
 .\"
 .Dd December 30, 1993
 .Dt INTRO 1
diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile
index 239f80fcbe0f..9d7c2dfdc9a4 100644
--- a/share/man/man3/Makefile
+++ b/share/man/man3/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 12/13/93
-# $FreeBSD$
+# $FreeBSD: src/share/man/man3/Makefile,v 1.13.2.1 1999/08/29 16:45:37 peter Exp $
 
 MAN3=	assert.3 bitstring.3 end.3 fpgetround.3 intro.3 pthread.3 queue.3 \
 	stdarg.3 sysexits.3
diff --git a/share/man/man3/assert.3 b/share/man/man3/assert.3
index eaf1f55b844a..7cb4fba5b4e8 100644
--- a/share/man/man3/assert.3
+++ b/share/man/man3/assert.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)assert.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/assert.3,v 1.4.2.2 1999/08/29 16:45:38 peter Exp $
 .\"
 .Dd January 26, 1999
 .Dt ASSERT 3
diff --git a/share/man/man3/bitstring.3 b/share/man/man3/bitstring.3
index 7d2e5546d893..38befc494c4e 100644
--- a/share/man/man3/bitstring.3
+++ b/share/man/man3/bitstring.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)bitstring.3	8.1 (Berkeley) 7/19/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/bitstring.3,v 1.4.2.1 1999/08/29 16:45:38 peter Exp $
 .\"
 .Dd July 19, 1993
 .Dt BITSTRING 3
diff --git a/share/man/man3/end.3 b/share/man/man3/end.3
index a23713d9a68e..1714d633a96f 100644
--- a/share/man/man3/end.3
+++ b/share/man/man3/end.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)end.3	6.4 (Berkeley) 1/24/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/end.3,v 1.2.2.1 1999/08/29 16:45:38 peter Exp $
 .\"
 .Dd January 24, 1994
 .Dt END 3
diff --git a/share/man/man3/fpgetround.3 b/share/man/man3/fpgetround.3
index 87064bc2f295..bc6dde4fe26b 100644
--- a/share/man/man3/fpgetround.3
+++ b/share/man/man3/fpgetround.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fpgetround.3	1.0 (Berkeley) 9/23/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/fpgetround.3,v 1.6.2.1 1999/08/29 16:45:39 peter Exp $
 .\"
 .Dd August 23, 1993
 .Dt FPGETROUND 3
diff --git a/share/man/man3/intro.3 b/share/man/man3/intro.3
index 623cb208ee11..506a0a43882c 100644
--- a/share/man/man3/intro.3
+++ b/share/man/man3/intro.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)intro.3	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/intro.3,v 1.6.2.1 1999/08/29 16:45:39 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt INTRO 3
diff --git a/share/man/man3/pthread.3 b/share/man/man3/pthread.3
index 4e6e56b260a4..6a54fa9bd63e 100644
--- a/share/man/man3/pthread.3
+++ b/share/man/man3/pthread.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread.3,v 1.7.2.1 1999/08/29 16:45:40 peter Exp $
 .\"
 .Dd September 10, 1998
 .Dt PTHREAD 3
diff --git a/share/man/man3/queue.3 b/share/man/man3/queue.3
index d84108f9d68e..c7f9bd9a163d 100644
--- a/share/man/man3/queue.3
+++ b/share/man/man3/queue.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)queue.3	8.2 (Berkeley) 1/24/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/queue.3,v 1.13.2.1 1999/08/29 16:45:40 peter Exp $
 .\"
 .Dd January 24, 1994
 .Dt QUEUE 3
diff --git a/share/man/man3/stdarg.3 b/share/man/man3/stdarg.3
index 3bc512a75922..eef3845ad7bb 100644
--- a/share/man/man3/stdarg.3
+++ b/share/man/man3/stdarg.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)stdarg.3	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/stdarg.3,v 1.3.2.1 1999/08/29 16:45:40 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt STDARG 3
diff --git a/share/man/man3/sysexits.3 b/share/man/man3/sysexits.3
index ba2e0608248c..62cf55976c69 100644
--- a/share/man/man3/sysexits.3
+++ b/share/man/man3/sysexits.3
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/sysexits.3,v 1.4.2.1 1999/08/29 16:45:41 peter Exp $
 .\"
 .\" "
 .Dd March 31, 1996
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 2b149ba5c176..455998f42182 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
-# $FreeBSD$
+# $FreeBSD: src/share/man/man4/Makefile,v 1.51.2.8 1999/12/16 16:24:05 phantom Exp $
 
 MAN4=	ahc.4 al.4 alpm.4 amd.4 atkbd.4 atkbdc.4 ax.4 bpf.4 bridge.4 ccd.4 \
 	cd.4 ch.4 da.4 ddb.4 divert.4 de.4 drum.4 \
diff --git a/share/man/man4/ahc.4 b/share/man/man4/ahc.4
index 4308f8fd5247..2ebc1c0cb521 100644
--- a/share/man/man4/ahc.4
+++ b/share/man/man4/ahc.4
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ahc.4,v 1.19.2.3 1999/11/21 08:15:31 phantom Exp $
 .\"
 .Dd October 15, 1998
 .Dt AHC 4
diff --git a/share/man/man4/al.4 b/share/man/man4/al.4
index f2094db63421..fc9db87b2fe0 100644
--- a/share/man/man4/al.4
+++ b/share/man/man4/al.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/al.4,v 1.6.2.2 1999/11/21 08:15:32 phantom Exp $
 .\"
 .Dd May 20, 1999
 .Dt AL 4
diff --git a/share/man/man4/alpm.4 b/share/man/man4/alpm.4
index 76f61507f5be..19353fd3467a 100644
--- a/share/man/man4/alpm.4
+++ b/share/man/man4/alpm.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/man/man4/alpm.4,v 1.1.2.1 1999/11/01 22:53:02 nsouch Exp $
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
diff --git a/share/man/man4/amd.4 b/share/man/man4/amd.4
index 289e181111c7..7b58a8fa8770 100644
--- a/share/man/man4/amd.4
+++ b/share/man/man4/amd.4
@@ -21,7 +21,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/amd.4,v 1.1.2.1 1999/12/14 10:33:08 phantom Exp $
 .\"
 .Dd Friday 10, 1999
 .Dt AMD 4
diff --git a/share/man/man4/atkbd.4 b/share/man/man4/atkbd.4
index 049a01821bbe..4314365cf2ea 100644
--- a/share/man/man4/atkbd.4
+++ b/share/man/man4/atkbd.4
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/atkbd.4,v 1.11.2.3 1999/11/21 08:15:32 phantom Exp $
 .\"
 .Dd May 21, 1999
 .Dt ATKBD 4
diff --git a/share/man/man4/atkbdc.4 b/share/man/man4/atkbdc.4
index 1c51715c84cd..605fc5a0ada8 100644
--- a/share/man/man4/atkbdc.4
+++ b/share/man/man4/atkbdc.4
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/atkbdc.4,v 1.6.2.2 1999/11/21 08:15:32 phantom Exp $
 .\"
 .Dd February 9, 1999
 .Dt ATKBDC 4
diff --git a/share/man/man4/ax.4 b/share/man/man4/ax.4
index 6056f1a374f4..3293e29dbfcd 100644
--- a/share/man/man4/ax.4
+++ b/share/man/man4/ax.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ax.4,v 1.9.2.3 1999/11/21 08:15:32 phantom Exp $
 .\"
 .Dd January 2, 1999
 .Dt AX 4
diff --git a/share/man/man4/bpf.4 b/share/man/man4/bpf.4
index e7f06de7ea4c..5af1a90024a1 100644
--- a/share/man/man4/bpf.4
+++ b/share/man/man4/bpf.4
@@ -20,7 +20,7 @@
 .\" This document is derived in part from the enet man page (enet.4)
 .\" distributed with 4.3BSD Unix.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/bpf.4,v 1.16.2.2 1999/10/30 13:16:37 phantom Exp $
 .\"
 .Dd January 16, 1996
 .Dt BPF 4
diff --git a/share/man/man4/bridge.4 b/share/man/man4/bridge.4
index 564450cd33dd..6763f856e87d 100644
--- a/share/man/man4/bridge.4
+++ b/share/man/man4/bridge.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/bridge.4,v 1.2.2.2 1999/08/29 16:45:42 peter Exp $
 .\"
 .Dd Sep 28, 1998
 .Dt BRIDGE 4
diff --git a/share/man/man4/ccd.4 b/share/man/man4/ccd.4
index 5ce3ec0e579d..0a90bdedd41f 100644
--- a/share/man/man4/ccd.4
+++ b/share/man/man4/ccd.4
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ccd.4,v 1.6.2.1 1999/10/30 16:10:50 phantom Exp $
 .\"
 .Dd August 9, 1995
 .Dt CCD 4
diff --git a/share/man/man4/cd.4 b/share/man/man4/cd.4
index a3b354fa24ab..c1765e8db881 100644
--- a/share/man/man4/cd.4
+++ b/share/man/man4/cd.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/cd.4,v 1.12.2.4 1999/08/29 16:45:43 peter Exp $
 .\"
 .Dd October 10, 1998
 .Dt CD 4
diff --git a/share/man/man4/ch.4 b/share/man/man4/ch.4
index db3f98be6327..c7080cb595d2 100644
--- a/share/man/man4/ch.4
+++ b/share/man/man4/ch.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ch.4,v 1.12.2.5 1999/10/30 16:10:50 phantom Exp $
 .\"
 .Dd May 14, 1998
 .Dt CH 4
diff --git a/share/man/man4/da.4 b/share/man/man4/da.4
index 8b850cc9c1b4..c171ccd9b290 100644
--- a/share/man/man4/da.4
+++ b/share/man/man4/da.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/da.4,v 1.12.2.5 1999/08/29 16:45:44 peter Exp $
 .\"
 .Dd October 15, 1998
 .Dt DA 4
diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4
index a4648e5cec1a..a96214b7184f 100644
--- a/share/man/man4/ddb.4
+++ b/share/man/man4/ddb.4
@@ -57,7 +57,7 @@
 .\" 	Created.
 .\" 	[90/08/30            dbg]
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.6.2.1 1999/08/29 16:45:44 peter Exp $
 .Dd January 16, 1996
 .Dt DDB 4
 .Os FreeBSD
diff --git a/share/man/man4/de.4 b/share/man/man4/de.4
index 9ea71440ae9c..6a4264ac698f 100644
--- a/share/man/man4/de.4
+++ b/share/man/man4/de.4
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/de.4,v 1.7.2.2 1999/11/21 08:15:33 phantom Exp $
 .\"
 .Dd January 19, 1997
 .Dt DE 4
diff --git a/share/man/man4/divert.4 b/share/man/man4/divert.4
index f82b19e427c8..1b432a4a3b6a 100644
--- a/share/man/man4/divert.4
+++ b/share/man/man4/divert.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/divert.4,v 1.12.2.1 1999/08/29 16:45:45 peter Exp $
 .\"
 .Dd June 18, 1996
 .Dt DIVERT 4
diff --git a/share/man/man4/drum.4 b/share/man/man4/drum.4
index ea3cf912bc5d..ecfe3a2a0395 100644
--- a/share/man/man4/drum.4
+++ b/share/man/man4/drum.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)drum.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/drum.4,v 1.2.2.1 1999/08/29 16:45:45 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt DRUM 4
diff --git a/share/man/man4/dummynet.4 b/share/man/man4/dummynet.4
index 62b89d5c039c..4385a74d63ae 100644
--- a/share/man/man4/dummynet.4
+++ b/share/man/man4/dummynet.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/dummynet.4,v 1.2.2.1 1999/08/29 16:45:45 peter Exp $
 .\"
 .Dd Sep 28, 1998
 .Dt DUMMYNET 4
diff --git a/share/man/man4/fd.4 b/share/man/man4/fd.4
index 671eb8b3cd86..44f6d601c78a 100644
--- a/share/man/man4/fd.4
+++ b/share/man/man4/fd.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fd.4	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/fd.4,v 1.4.2.1 1999/08/29 16:45:46 peter Exp $
 .\"
 .Dd June 9, 1993
 .Dt FD 4
diff --git a/share/man/man4/fdc.4 b/share/man/man4/fdc.4
index 97348c1ca653..222f96c6382c 100644
--- a/share/man/man4/fdc.4
+++ b/share/man/man4/fdc.4
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/fdc.4,v 1.15.2.3 1999/11/21 08:15:33 phantom Exp $
 .\"
 .Dd August 31, 1994
 .Dt FDC 4
diff --git a/share/man/man4/fpa.4 b/share/man/man4/fpa.4
index f7ffa2b1de4e..63eacb2193d0 100644
--- a/share/man/man4/fpa.4
+++ b/share/man/man4/fpa.4
@@ -2,7 +2,7 @@
 .\" Copyright (c) 1995, Matt Thomas
 .\" All rights reserved.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/fpa.4,v 1.10.2.2 1999/11/21 08:15:34 phantom Exp $
 .\"
 .Dd March 13, 1995
 .Dt FPA 4
diff --git a/share/man/man4/fxp.4 b/share/man/man4/fxp.4
index d63c70b2abda..67ac41260b7c 100644
--- a/share/man/man4/fxp.4
+++ b/share/man/man4/fxp.4
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/fxp.4,v 1.9.2.2 1999/11/21 08:15:34 phantom Exp $
 .\"
 .Dd January 19, 1997
 .Dt FXP 4
diff --git a/share/man/man4/icmp.4 b/share/man/man4/icmp.4
index 51c3bab6a303..4d0841c2c456 100644
--- a/share/man/man4/icmp.4
+++ b/share/man/man4/icmp.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)icmp.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/icmp.4,v 1.6.2.1 1999/08/29 16:45:47 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt ICMP 4
diff --git a/share/man/man4/ifmib.4 b/share/man/man4/ifmib.4
index ca80a1006005..9a28527e8726 100644
--- a/share/man/man4/ifmib.4
+++ b/share/man/man4/ifmib.4
@@ -25,7 +25,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ifmib.4,v 1.7.2.1 1999/08/29 16:45:47 peter Exp $
 .\"
 .Dd November 15, 1996
 .Dt IFMIB 4
diff --git a/share/man/man4/iic.4 b/share/man/man4/iic.4
index 7d62ecb6f618..9a9ac9e936ca 100644
--- a/share/man/man4/iic.4
+++ b/share/man/man4/iic.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/iic.4,v 1.1.2.2 1999/10/30 16:10:51 phantom Exp $
 .\"
 .Dd October 25, 1998
 .Dt IIC 4
diff --git a/share/man/man4/iicbb.4 b/share/man/man4/iicbb.4
index 1bf49d091bde..eb2e559fc01a 100644
--- a/share/man/man4/iicbb.4
+++ b/share/man/man4/iicbb.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/iicbb.4,v 1.1.2.2 1999/10/30 16:10:51 phantom Exp $
 .\"
 .Dd October 25, 1998
 .Dt IICBB 4
diff --git a/share/man/man4/iicbus.4 b/share/man/man4/iicbus.4
index 8f98bfd722cb..805b24f0e275 100644
--- a/share/man/man4/iicbus.4
+++ b/share/man/man4/iicbus.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/iicbus.4,v 1.1.2.2 1999/10/30 16:10:52 phantom Exp $
 .\"
 .Dd August 6, 1998
 .Dt IICBUS 4
diff --git a/share/man/man4/iicsmb.4 b/share/man/man4/iicsmb.4
index f26c6f26cd00..fd821416deae 100644
--- a/share/man/man4/iicsmb.4
+++ b/share/man/man4/iicsmb.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/iicsmb.4,v 1.1.2.2 1999/10/30 16:10:52 phantom Exp $
 .\"
 .Dd August 10, 1998
 .Dt IICSMB 4
diff --git a/share/man/man4/imm.4 b/share/man/man4/imm.4
index e4135c90ca5c..c007725b183e 100644
--- a/share/man/man4/imm.4
+++ b/share/man/man4/imm.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/imm.4,v 1.1.2.1 1999/10/30 16:10:52 phantom Exp $
 .\"
 .Dd October 27, 1998
 .Dt IMM 4
diff --git a/share/man/man4/inet.4 b/share/man/man4/inet.4
index b4bc113a59ab..eac1f99898ff 100644
--- a/share/man/man4/inet.4
+++ b/share/man/man4/inet.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)inet.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/inet.4,v 1.8.2.2 1999/08/29 16:45:47 peter Exp $
 .\"
 .Dd February 14, 1995
 .Dt INET 4
diff --git a/share/man/man4/intpm.4 b/share/man/man4/intpm.4
index 3c8055a824be..940a108aa3db 100644
--- a/share/man/man4/intpm.4
+++ b/share/man/man4/intpm.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/man/man4/intpm.4,v 1.4.2.1 1999/11/01 22:53:03 nsouch Exp $
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
diff --git a/share/man/man4/intro.4 b/share/man/man4/intro.4
index d933fea9e830..6024380b8d42 100644
--- a/share/man/man4/intro.4
+++ b/share/man/man4/intro.4
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/intro.4,v 1.11.2.2 1999/08/29 16:45:48 peter Exp $
 .\"
 .Dd January 20, 1996
 .Dt INTRO 4
diff --git a/share/man/man4/ip.4 b/share/man/man4/ip.4
index ed8a2bcd9d9b..7e144bc4f18f 100644
--- a/share/man/man4/ip.4
+++ b/share/man/man4/ip.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ip.4	8.2 (Berkeley) 11/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ip.4,v 1.9.2.3 1999/08/29 16:45:48 peter Exp $
 .\"
 .Dd November 30, 1993
 .Dt IP 4
diff --git a/share/man/man4/ipfirewall.4 b/share/man/man4/ipfirewall.4
index c5c3e7437b3f..ff05818dc36e 100644
--- a/share/man/man4/ipfirewall.4
+++ b/share/man/man4/ipfirewall.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ipfirewall.4,v 1.12.2.3 1999/11/17 12:37:11 phantom Exp $
 .\"
 .Dd June 22, 1997
 .Dt IPFIREWALL 4
diff --git a/share/man/man4/keyboard.4 b/share/man/man4/keyboard.4
index 1e8c82e0b8a1..c6ae2df936eb 100644
--- a/share/man/man4/keyboard.4
+++ b/share/man/man4/keyboard.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/keyboard.4,v 1.18.2.2 1999/11/21 08:15:34 phantom Exp $
 .\"
 .Dd January 8, 1995
 .Dt KEYBOARD 4
diff --git a/share/man/man4/kld.4 b/share/man/man4/kld.4
index 308d7b6bed43..75e4058573bc 100644
--- a/share/man/man4/kld.4
+++ b/share/man/man4/kld.4
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/kld.4,v 1.2.2.3 1999/08/29 16:45:49 peter Exp $
 .\"
 .Dd November 08, 1998
 .Dt KLD 4
diff --git a/share/man/man4/lkm.4 b/share/man/man4/lkm.4
index 8ee7fc241c20..bf2434f2e117 100644
--- a/share/man/man4/lkm.4
+++ b/share/man/man4/lkm.4
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/lkm.4,v 1.10.2.1 1999/08/29 16:45:49 peter Exp $
 .\"
 .Dd January 17, 1996
 .Dt LKM 4
diff --git a/share/man/man4/lo.4 b/share/man/man4/lo.4
index 32e2508500fb..bbc357b6d73f 100644
--- a/share/man/man4/lo.4
+++ b/share/man/man4/lo.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lo.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/lo.4,v 1.5.2.2 1999/08/29 16:45:49 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt LO 4
diff --git a/share/man/man4/lp.4 b/share/man/man4/lp.4
index dba34cea8a0f..3d8b3f57fa02 100644
--- a/share/man/man4/lp.4
+++ b/share/man/man4/lp.4
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	Id: man4.i386/lp.4,v 1.9 1999/02/14 12:06:16 nsouch Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/lp.4,v 1.1.2.2 1999/08/29 16:45:50 peter Exp $
 .\"
 .Dd March 4, 1996
 .Os
diff --git a/share/man/man4/lpbb.4 b/share/man/man4/lpbb.4
index 406409b4b9df..ed2e56af53cd 100644
--- a/share/man/man4/lpbb.4
+++ b/share/man/man4/lpbb.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/lpbb.4,v 1.1.2.3 1999/10/30 16:10:53 phantom Exp $
 .\"
 .Dd October 25, 1998
 .Dt LPBB 4
diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile
index 0ddef49710fc..47d8a32919cd 100644
--- a/share/man/man4/man4.i386/Makefile
+++ b/share/man/man4/man4.i386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.95.2.15 1999/11/19 07:15:24 jhay Exp $
 
 MAN4=	adv.4 adw.4 aha.4 ahb.4 aic.4 apm.4 ar.4 asc.4 \
 	bktr.4 bt.4 cs.4 cx.4 cy.4 \
diff --git a/share/man/man4/man4.i386/adv.4 b/share/man/man4/man4.i386/adv.4
index 1c9c1514ef1f..fda1a3d7fe7e 100644
--- a/share/man/man4/man4.i386/adv.4
+++ b/share/man/man4/man4.i386/adv.4
@@ -21,7 +21,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/adv.4,v 1.1.2.2 1999/08/29 16:46:01 peter Exp $
 .\"
 .Dd October 16, 1998
 .Dt ADV 4 i386
diff --git a/share/man/man4/man4.i386/adw.4 b/share/man/man4/man4.i386/adw.4
index 9cc50d46d4c1..bc1d8739604d 100644
--- a/share/man/man4/man4.i386/adw.4
+++ b/share/man/man4/man4.i386/adw.4
@@ -21,7 +21,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/adw.4,v 1.1.2.2 1999/08/29 16:46:01 peter Exp $
 .\"
 .Dd October 16, 1998
 .Dt ADW 4 i386
diff --git a/share/man/man4/man4.i386/aha.4 b/share/man/man4/man4.i386/aha.4
index 0d49eb7503d1..77145dc8f26e 100644
--- a/share/man/man4/man4.i386/aha.4
+++ b/share/man/man4/man4.i386/aha.4
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/aha.4,v 1.7.2.2 1999/08/29 16:46:02 peter Exp $
 .\"
 .Dd October 15, 1998
 .Dt AHA 4 i386
diff --git a/share/man/man4/man4.i386/ahb.4 b/share/man/man4/man4.i386/ahb.4
index a0fced45c7c2..05858252b99d 100644
--- a/share/man/man4/man4.i386/ahb.4
+++ b/share/man/man4/man4.i386/ahb.4
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/ahb.4,v 1.9.2.2 1999/08/29 16:46:02 peter Exp $
 .\"
 .Dd October 15, 1998
 .Dt AHB 4 i386
diff --git a/share/man/man4/man4.i386/aic.4 b/share/man/man4/man4.i386/aic.4
index c3eecbbf26cd..610a8594ba32 100644
--- a/share/man/man4/man4.i386/aic.4
+++ b/share/man/man4/man4.i386/aic.4
@@ -21,7 +21,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/aic.4,v 1.4.2.1 1999/08/29 16:46:03 peter Exp $
 .\"
 .Dd November 29, 1994
 .Dt AIC 4 i386
diff --git a/share/man/man4/man4.i386/apm.4 b/share/man/man4/man4.i386/apm.4
index 54cb1bad1016..9b2fdd4d5069 100644
--- a/share/man/man4/man4.i386/apm.4
+++ b/share/man/man4/man4.i386/apm.4
@@ -9,7 +9,7 @@
 .\" the author assume any responsibility for damages incurred with its 
 .\" use.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/apm.4,v 1.9.2.2 1999/08/29 16:46:05 peter Exp $
 .\"
 .Dd November 1, 1994
 .Dt APM 4 i386
diff --git a/share/man/man4/man4.i386/ar.4 b/share/man/man4/man4.i386/ar.4
index fe57fce21413..60e92a513603 100644
--- a/share/man/man4/man4.i386/ar.4
+++ b/share/man/man4/man4.i386/ar.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/ar.4,v 1.9.2.2 1999/08/29 16:46:05 peter Exp $
 .\"
 .Dd November 19, 1995
 .Dt AR 4 i386
diff --git a/share/man/man4/man4.i386/asc.4 b/share/man/man4/man4.i386/asc.4
index 4d9e87cbfa92..beecaffbfa4b 100644
--- a/share/man/man4/man4.i386/asc.4
+++ b/share/man/man4/man4.i386/asc.4
@@ -29,7 +29,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/asc.4,v 1.8.2.3 1999/09/22 22:27:36 phantom Exp $
 .Dd January 19, 1995
 .Dt ASC 4 i386
 .Os FreeBSD
diff --git a/share/man/man4/man4.i386/bktr.4 b/share/man/man4/man4.i386/bktr.4
index bffe57828420..b80490414b4d 100644
--- a/share/man/man4/man4.i386/bktr.4
+++ b/share/man/man4/man4.i386/bktr.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/bktr.4,v 1.2.2.2 1999/08/29 16:46:08 peter Exp $
 .\"
 .Dd January 28, 1998
 .Dt BKTR 4 i386
diff --git a/share/man/man4/man4.i386/bt.4 b/share/man/man4/man4.i386/bt.4
index d4b4c2c1671f..11b324968bf2 100644
--- a/share/man/man4/man4.i386/bt.4
+++ b/share/man/man4/man4.i386/bt.4
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/bt.4,v 1.6.2.2 1999/08/29 16:46:08 peter Exp $
 .\"
 .Dd October 16, 1998
 .Dt BT 4 i386
diff --git a/share/man/man4/man4.i386/cs.4 b/share/man/man4/man4.i386/cs.4
index d1d8eb3e047e..caac06127d9f 100644
--- a/share/man/man4/man4.i386/cs.4
+++ b/share/man/man4/man4.i386/cs.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/cs.4,v 1.2.2.1 1999/08/29 16:46:08 peter Exp $
 .\"
 .Dd July 20, 1998
 .Dt CS 4 i386
diff --git a/share/man/man4/man4.i386/cx.4 b/share/man/man4/man4.i386/cx.4
index 4912e0ce3d75..aa20d517f485 100644
--- a/share/man/man4/man4.i386/cx.4
+++ b/share/man/man4/man4.i386/cx.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/cx.4,v 1.4.2.3 1999/08/29 16:46:09 peter Exp $
 .\"
 .Dd December 12, 1994
 .Dt CX 4 i386
diff --git a/share/man/man4/man4.i386/cy.4 b/share/man/man4/man4.i386/cy.4
index 29ec39f5be6f..bc08de0c83e2 100644
--- a/share/man/man4/man4.i386/cy.4
+++ b/share/man/man4/man4.i386/cy.4
@@ -35,7 +35,7 @@
 .\"     from: @(#)dca.4	5.2 (Berkeley) 3/27/91
 .\"	from: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp
 .\"	from: sio.4,v 1.16 1995/06/26 06:05:30 bde Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/cy.4,v 1.9.2.2 1999/08/29 16:46:10 peter Exp $
 .\"
 .Dd June 14, 1999
 .Dt CY 4 i386
diff --git a/share/man/man4/man4.i386/dgb.4 b/share/man/man4/man4.i386/dgb.4
index b47dedcf1d4b..40d2bb577345 100644
--- a/share/man/man4/man4.i386/dgb.4
+++ b/share/man/man4/man4.i386/dgb.4
@@ -35,7 +35,7 @@
 .\"     from: @(#)dca.4	5.2 (Berkeley) 3/27/91
 .\"	from: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp
 .\"	from: sio.4,v 1.15 1994/12/06 20:14:30 bde Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/dgb.4,v 1.7.2.3 1999/11/03 20:54:52 chris Exp $
 .\"
 .Dd Oct 13, 1995
 .Dt DGB 4 i386
diff --git a/share/man/man4/man4.i386/dpt.4 b/share/man/man4/man4.i386/dpt.4
index 87415860d75c..1d1e175b936f 100644
--- a/share/man/man4/man4.i386/dpt.4
+++ b/share/man/man4/man4.i386/dpt.4
@@ -21,7 +21,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/dpt.4,v 1.1.2.2 1999/08/29 16:46:11 peter Exp $
 .\"
 .Dd October 16, 1998
 .Dt DPT 4 i386
diff --git a/share/man/man4/man4.i386/ed.4 b/share/man/man4/man4.i386/ed.4
index 881be24500b8..64073bf9da3c 100644
--- a/share/man/man4/man4.i386/ed.4
+++ b/share/man/man4/man4.i386/ed.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/ed.4,v 1.13.2.2 1999/08/29 16:46:11 peter Exp $
 .\"
 .Dd October 28, 1995
 .Dt ED 4 i386
diff --git a/share/man/man4/man4.i386/el.4 b/share/man/man4/man4.i386/el.4
index 8ceb5a98cf14..bd873d10f447 100644
--- a/share/man/man4/man4.i386/el.4
+++ b/share/man/man4/man4.i386/el.4
@@ -21,7 +21,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/el.4,v 1.7.2.1 1999/08/29 16:46:12 peter Exp $
 .\"
 .Dd July 10, 1995
 .Dt EL 4 i386
diff --git a/share/man/man4/man4.i386/ep.4 b/share/man/man4/man4.i386/ep.4
index c809d621f1bd..0ebf9a6e98b0 100644
--- a/share/man/man4/man4.i386/ep.4
+++ b/share/man/man4/man4.i386/ep.4
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/ep.4,v 1.9.2.1 1999/08/29 16:46:12 peter Exp $
 .\"
 .Dd February 04, 1993
 .Dt EP 4 i386
diff --git a/share/man/man4/man4.i386/ex.4 b/share/man/man4/man4.i386/ex.4
index 57e0823b3d67..daa01d3411ff 100644
--- a/share/man/man4/man4.i386/ex.4
+++ b/share/man/man4/man4.i386/ex.4
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/ex.4,v 1.6.2.1 1999/08/29 16:46:12 peter Exp $
 .\"
 .Dd January 19, 1997
 .Dt EX 4 i386
diff --git a/share/man/man4/man4.i386/fe.4 b/share/man/man4/man4.i386/fe.4
index ae1b9cf23e65..69a8230e66c8 100644
--- a/share/man/man4/man4.i386/fe.4
+++ b/share/man/man4/man4.i386/fe.4
@@ -21,7 +21,7 @@
 .\" Contributed by M. Sekiguchi <seki@sysrap.cs.fujitsu.co.jp>.
 .\" for fe driver.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/fe.4,v 1.11.2.1 1999/08/29 16:46:13 peter Exp $
 .Dd March 3, 1996
 .Dt FE 4 i386
 .Sh NAME
diff --git a/share/man/man4/man4.i386/gsc.4 b/share/man/man4/man4.i386/gsc.4
index 15daf92fdac9..9fe292a22b0d 100644
--- a/share/man/man4/man4.i386/gsc.4
+++ b/share/man/man4/man4.i386/gsc.4
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/gsc.4,v 1.9.2.1 1999/08/29 16:46:14 peter Exp $
 .\"
 .Dd January 9, 1995
 .Os FreeBSD
diff --git a/share/man/man4/man4.i386/ie.4 b/share/man/man4/man4.i386/ie.4
index 36a36f71d124..4d4549617486 100644
--- a/share/man/man4/man4.i386/ie.4
+++ b/share/man/man4/man4.i386/ie.4
@@ -2,7 +2,7 @@
 .\" Copyright (c) 1994, Wilko Bulte
 .\" All rights reserved.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/ie.4,v 1.7.2.1 1999/08/29 16:46:14 peter Exp $
 .\"
 .Dd September 23, 1994
 .Dt IE 4 i386
diff --git a/share/man/man4/man4.i386/io.4 b/share/man/man4/man4.i386/io.4
index 904fc778240e..e25794f04955 100644
--- a/share/man/man4/man4.i386/io.4
+++ b/share/man/man4/man4.i386/io.4
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/io.4,v 1.5.2.1 1999/08/29 16:46:15 peter Exp $
 .\"
 .Dd Jan 1, 1996
 .Dt IO 4 i386
diff --git a/share/man/man4/man4.i386/joy.4 b/share/man/man4/man4.i386/joy.4
index 039542c1b7a5..d8471dfc7ef4 100644
--- a/share/man/man4/man4.i386/joy.4
+++ b/share/man/man4/man4.i386/joy.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/joy.4,v 1.9.2.2 1999/08/29 16:46:15 peter Exp $
 .\"
 .Dd January 23, 1995
 .Dt JOY 4 i386
diff --git a/share/man/man4/man4.i386/labpc.4 b/share/man/man4/man4.i386/labpc.4
index 4e980eaa8913..5e7618b14843 100644
--- a/share/man/man4/man4.i386/labpc.4
+++ b/share/man/man4/man4.i386/labpc.4
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/labpc.4,v 1.6.2.1 1999/08/29 16:46:16 peter Exp $
 .\"
 .rm ES
 .rm EE
diff --git a/share/man/man4/man4.i386/le.4 b/share/man/man4/man4.i386/le.4
index 15bc77e7a2f1..1fbc82480201 100644
--- a/share/man/man4/man4.i386/le.4
+++ b/share/man/man4/man4.i386/le.4
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/le.4,v 1.5.2.2 1999/12/07 03:19:22 chris Exp $
 .\"
 .Dd January 19, 1997
 .Dt LE 4 i386
diff --git a/share/man/man4/man4.i386/lnc.4 b/share/man/man4/man4.i386/lnc.4
index d201f44b10f4..37fddf467092 100644
--- a/share/man/man4/man4.i386/lnc.4
+++ b/share/man/man4/man4.i386/lnc.4
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/lnc.4,v 1.6.2.1 1999/08/29 16:46:17 peter Exp $
 .\"
 .Dd January 19, 1997
 .Dt LNC 4 i386
diff --git a/share/man/man4/man4.i386/lpt.4 b/share/man/man4/man4.i386/lpt.4
index 48928e2e46c3..d807a7542bc2 100644
--- a/share/man/man4/man4.i386/lpt.4
+++ b/share/man/man4/man4.i386/lpt.4
@@ -29,7 +29,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	from: lpt.4,v 1.1 1993/08/06 10:34:12 cgd Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/lpt.4,v 1.8.2.1 1999/08/29 16:46:17 peter Exp $
 .\"
 .Dd August 28, 1993
 .Dt LPT 4 i386
diff --git a/share/man/man4/man4.i386/matcd.4 b/share/man/man4/man4.i386/matcd.4
index c0cdeea0a712..aa53c4e4297b 100644
--- a/share/man/man4/man4.i386/matcd.4
+++ b/share/man/man4/man4.i386/matcd.4
@@ -81,7 +81,7 @@
 .\"<3>	Text brought in sync with changes made in versions 1(22) - 1(25)
 .\"	Frank Durda IV  24-Sep-95
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/matcd.4,v 1.10.2.1 1999/08/29 16:46:17 peter Exp $
 .\"
 .Dd September 24, 1995
 .Dt MATCD 4 i386
diff --git a/share/man/man4/man4.i386/mcd.4 b/share/man/man4/man4.i386/mcd.4
index 939c2a556ac4..b9f09e25744f 100644
--- a/share/man/man4/man4.i386/mcd.4
+++ b/share/man/man4/man4.i386/mcd.4
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/mcd.4,v 1.6.2.2 1999/08/29 16:46:18 peter Exp $
 .\"
 .Dd December 8, 1994
 .Dt MCD 4 i386
diff --git a/share/man/man4/man4.i386/meteor.4 b/share/man/man4/man4.i386/meteor.4
index 1e75294d6672..89f866478022 100644
--- a/share/man/man4/man4.i386/meteor.4
+++ b/share/man/man4/man4.i386/meteor.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/meteor.4,v 1.7.2.2 1999/08/29 16:46:19 peter Exp $
 .\"
 .Dd August 15, 1995
 .br
diff --git a/share/man/man4/man4.i386/mse.4 b/share/man/man4/man4.i386/mse.4
index 61f14d9c1195..b41b2c74704a 100644
--- a/share/man/man4/man4.i386/mse.4
+++ b/share/man/man4/man4.i386/mse.4
@@ -10,7 +10,7 @@
 .\" this software for any purpose.  It is provided "as is"
 .\" without express or implied warranty.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/mse.4,v 1.5.2.2 1999/11/09 12:20:04 yokota Exp $
 .\"
 .Dd December 3, 1997
 .Dt MSE 4 i386
diff --git a/share/man/man4/man4.i386/npx.4 b/share/man/man4/man4.i386/npx.4
index 5beb8e1bf958..aa7dfaed8b29 100644
--- a/share/man/man4/man4.i386/npx.4
+++ b/share/man/man4/man4.i386/npx.4
@@ -28,7 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	from: npx.4,v 1.1 1993/08/06 10:58:03 cgd Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/npx.4,v 1.5.2.1 1999/08/29 16:46:22 peter Exp $
 .\"
 .Dd August 28, 1993
 .Dt NPX 4 i386
diff --git a/share/man/man4/man4.i386/perfmon.4 b/share/man/man4/man4.i386/perfmon.4
index 794d009ccb0d..72b1add66e17 100644
--- a/share/man/man4/man4.i386/perfmon.4
+++ b/share/man/man4/man4.i386/perfmon.4
@@ -26,7 +26,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/perfmon.4,v 1.6.2.1 1999/08/29 16:46:23 peter Exp $
 .Dd March 26, 1996
 .Dt PERFMON 4 i386
 .Os FreeBSD 2.2
diff --git a/share/man/man4/man4.i386/pnp.4 b/share/man/man4/man4.i386/pnp.4
index df9adec6a9c3..9ebaeee9f38f 100644
--- a/share/man/man4/man4.i386/pnp.4
+++ b/share/man/man4/man4.i386/pnp.4
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/pnp.4,v 1.2.2.2 1999/08/29 16:46:24 peter Exp $
 .\"
 .Dd September 7, 1997
 .Dt PNP 4 i386
diff --git a/share/man/man4/man4.i386/ppc.4 b/share/man/man4/man4.i386/ppc.4
index e153ad7c0e57..7bc7f2bbfd40 100644
--- a/share/man/man4/man4.i386/ppc.4
+++ b/share/man/man4/man4.i386/ppc.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/ppc.4,v 1.2.2.4 1999/11/23 10:22:52 jkoshy Exp $
 .\"
 .Dd March 5, 1998
 .Dt PPC 4 i386
diff --git a/share/man/man4/man4.i386/rdp.4 b/share/man/man4/man4.i386/rdp.4
index c1bda7b15b78..7f23789b21dc 100644
--- a/share/man/man4/man4.i386/rdp.4
+++ b/share/man/man4/man4.i386/rdp.4
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/rdp.4,v 1.1.1.1.2.2 1999/08/29 16:46:24 peter Exp $
 .\"
 .\"
 .\" " (emacs disconfusion)
diff --git a/share/man/man4/man4.i386/scd.4 b/share/man/man4/man4.i386/scd.4
index d7650dc2b799..5bc5f4a9d258 100644
--- a/share/man/man4/man4.i386/scd.4
+++ b/share/man/man4/man4.i386/scd.4
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/scd.4,v 1.6.2.2 1999/08/29 16:46:26 peter Exp $
 .\"
 .Dd January 1, 1995
 .Dt SCD 4 i386
diff --git a/share/man/man4/man4.i386/spkr.4 b/share/man/man4/man4.i386/spkr.4
index 9bc1b7e76648..ca6fd0928b72 100644
--- a/share/man/man4/man4.i386/spkr.4
+++ b/share/man/man4/man4.i386/spkr.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/spkr.4,v 1.10.2.2 1999/08/29 16:46:28 peter Exp $
 .\"
 .Dd November 7, 1993
 .Dt SPKR 4 i386
diff --git a/share/man/man4/man4.i386/sr.4 b/share/man/man4/man4.i386/sr.4
index e2105a316ee2..0424654c616f 100644
--- a/share/man/man4/man4.i386/sr.4
+++ b/share/man/man4/man4.i386/sr.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/sr.4,v 1.10.2.1 1999/08/29 16:46:29 peter Exp $
 .\"
 .Dd July 4, 1996
 .Dt SR 4 i386
diff --git a/share/man/man4/man4.i386/tw.4 b/share/man/man4/man4.i386/tw.4
index cb6772e04c88..4318de124ff5 100644
--- a/share/man/man4/man4.i386/tw.4
+++ b/share/man/man4/man4.i386/tw.4
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/tw.4,v 1.8.2.2 1999/08/29 16:46:31 peter Exp $
 .\"
 .Dd Oct 30, 1993
 .Dt TW 4 i386
diff --git a/share/man/man4/man4.i386/tx.4 b/share/man/man4/man4.i386/tx.4
index 131761d21577..020d047b91d7 100644
--- a/share/man/man4/man4.i386/tx.4
+++ b/share/man/man4/man4.i386/tx.4
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/tx.4,v 1.5.2.2 1999/08/29 16:46:31 peter Exp $
 .\"
 .Dd January 28, 1997
 .Dt TX 4 i386
diff --git a/share/man/man4/man4.i386/vx.4 b/share/man/man4/man4.i386/vx.4
index 0a695e8b54d9..29864050598b 100644
--- a/share/man/man4/man4.i386/vx.4
+++ b/share/man/man4/man4.i386/vx.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/vx.4,v 1.7.2.1 1999/08/29 16:46:33 peter Exp $
 .\"
 .Dd January 15, 1996
 .Dt VX 4 i386
diff --git a/share/man/man4/man4.i386/wd.4 b/share/man/man4/man4.i386/wd.4
index 9aff25816fc2..56574a516640 100644
--- a/share/man/man4/man4.i386/wd.4
+++ b/share/man/man4/man4.i386/wd.4
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/wd.4,v 1.10.2.2 1999/08/29 16:46:34 peter Exp $
 .\"
 .Dd August 31, 1994
 .Dt WD 4 i386
diff --git a/share/man/man4/man4.i386/wfd.4 b/share/man/man4/man4.i386/wfd.4
index cec6f88b41da..65423c557e6d 100644
--- a/share/man/man4/man4.i386/wfd.4
+++ b/share/man/man4/man4.i386/wfd.4
@@ -25,7 +25,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/wfd.4,v 1.5.2.4 1999/09/05 15:14:14 mpp Exp $
 .\"
 .Dd January 16, 1998
 .Dt WFD 4 i386
diff --git a/share/man/man4/man4.i386/wi.4 b/share/man/man4/man4.i386/wi.4
index 0a14e09ad594..fe6fd9b4651d 100644
--- a/share/man/man4/man4.i386/wi.4
+++ b/share/man/man4/man4.i386/wi.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/wi.4,v 1.3.2.3 1999/08/29 16:46:35 peter Exp $
 .\"
 .Dd April 21, 1999
 .Dt WI 4 i386
diff --git a/share/man/man4/man4.i386/wl.4 b/share/man/man4/man4.i386/wl.4
index f8e3de03d5dd..224600ea639f 100644
--- a/share/man/man4/man4.i386/wl.4
+++ b/share/man/man4/man4.i386/wl.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/wl.4,v 1.6.2.1 1999/08/29 16:46:36 peter Exp $
 .Dd July 7, 1997
 .Dt WL 4 i386
 .Os FreeBSD
diff --git a/share/man/man4/man4.i386/wt.4 b/share/man/man4/man4.i386/wt.4
index 8aae54ec1a01..30c4e89ce879 100644
--- a/share/man/man4/man4.i386/wt.4
+++ b/share/man/man4/man4.i386/wt.4
@@ -21,7 +21,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/wt.4,v 1.4.2.1 1999/08/29 16:46:36 peter Exp $
 .\"
 .Dd July 10, 1995
 .Dt WT 4 i386
diff --git a/share/man/man4/man4.i386/ze.4 b/share/man/man4/man4.i386/ze.4
index 2c8b52c803fb..f68a57cf15e2 100644
--- a/share/man/man4/man4.i386/ze.4
+++ b/share/man/man4/man4.i386/ze.4
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/ze.4,v 1.6.2.1 1999/08/29 16:46:38 peter Exp $
 .\"
 .Dd January 19, 1997
 .Dt ZE 4 i386
diff --git a/share/man/man4/man4.i386/zp.4 b/share/man/man4/man4.i386/zp.4
index e081a3567eb8..3f3b16b16d35 100644
--- a/share/man/man4/man4.i386/zp.4
+++ b/share/man/man4/man4.i386/zp.4
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/zp.4,v 1.5.2.1 1999/08/29 16:46:38 peter Exp $
 .\"
 .Dd January 19, 1997
 .Dt ZP 4 i386
diff --git a/share/man/man4/mem.4 b/share/man/man4/mem.4
index 3dba95e51753..b6fc6cbd3ab2 100644
--- a/share/man/man4/mem.4
+++ b/share/man/man4/mem.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mem.4	5.3 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mem.4,v 1.6.2.3 1999/11/21 08:15:35 phantom Exp $
 .\"
 .Dd May 2, 1991
 .Dt MEM 4
diff --git a/share/man/man4/mouse.4 b/share/man/man4/mouse.4
index 714a7c9b0e42..1a8d07998665 100644
--- a/share/man/man4/mouse.4
+++ b/share/man/man4/mouse.4
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mouse.4,v 1.6.2.2 1999/11/21 08:15:35 phantom Exp $
 .\"
 .Dd December 3, 1997
 .Dt MOUSE 4
diff --git a/share/man/man4/mtio.4 b/share/man/man4/mtio.4
index 18c8ad28f2bb..834718898667 100644
--- a/share/man/man4/mtio.4
+++ b/share/man/man4/mtio.4
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mtio.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mtio.4,v 1.6.2.2 1999/11/21 08:15:35 phantom Exp $
 .\"
 .Dd February 11, 1996
 .Dt MTIO 4
diff --git a/share/man/man4/mx.4 b/share/man/man4/mx.4
index 23668b10b3e7..1753a9ab6f5c 100644
--- a/share/man/man4/mx.4
+++ b/share/man/man4/mx.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mx.4,v 1.8.2.2 1999/11/21 08:15:35 phantom Exp $
 .\"
 .Dd November 5, 1998
 .Dt MX 4
diff --git a/share/man/man4/natm.4 b/share/man/man4/natm.4
index 3d83a2b630b7..a7b51b09cbd6 100644
--- a/share/man/man4/natm.4
+++ b/share/man/man4/natm.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/natm.4,v 1.1.2.3 1999/10/30 16:10:54 phantom Exp $
 .\"
 .Dd December 29, 1997
 .Dt NATM 4
diff --git a/share/man/man4/ncr.4 b/share/man/man4/ncr.4
index 52d22a25d38a..f9dfa43b862a 100644
--- a/share/man/man4/ncr.4
+++ b/share/man/man4/ncr.4
@@ -21,7 +21,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ncr.4,v 1.10.2.3 1999/11/21 08:15:36 phantom Exp $
 .\"
 .Dd July 10, 1996
 .Dt NCR 4
diff --git a/share/man/man4/netintro.4 b/share/man/man4/netintro.4
index 40c641797896..88cdf8c835cb 100644
--- a/share/man/man4/netintro.4
+++ b/share/man/man4/netintro.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)netintro.4	8.2 (Berkeley) 11/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/netintro.4,v 1.8.2.1 1999/08/29 16:45:50 peter Exp $
 .\"
 .Dd November 30, 1993
 .Dt NETINTRO 4
diff --git a/share/man/man4/nlpt.4 b/share/man/man4/nlpt.4
index beb5ca8a090b..410b3026ff35 100644
--- a/share/man/man4/nlpt.4
+++ b/share/man/man4/nlpt.4
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/nlpt.4,v 1.1.2.2 1999/10/30 16:10:54 phantom Exp $
 .\"
 .Dd February 14, 1999
 .Dt LPT 4
diff --git a/share/man/man4/null.4 b/share/man/man4/null.4
index 518aab86b7b5..05fa3aadf9fd 100644
--- a/share/man/man4/null.4
+++ b/share/man/man4/null.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)null.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/null.4,v 1.3.2.1 1999/08/29 16:45:51 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt NULL 4
diff --git a/share/man/man4/ohci.4 b/share/man/man4/ohci.4
index 55884a2817e0..f000cdee7d76 100644
--- a/share/man/man4/ohci.4
+++ b/share/man/man4/ohci.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ohci.4,v 1.4.2.1 1999/11/17 21:36:21 phantom Exp $
 .\"
 .Dd February 21, 1999
 .Dt OHCI 4
diff --git a/share/man/man4/pass.4 b/share/man/man4/pass.4
index affda0d0371d..e071e0276495 100644
--- a/share/man/man4/pass.4
+++ b/share/man/man4/pass.4
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pass.4,v 1.2.2.2 1999/08/29 16:45:51 peter Exp $
 .\"
 .Dd October 10, 1998
 .Dt PASS 4
diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4
index 31769870b7db..76c7092954e8 100644
--- a/share/man/man4/pcm.4
+++ b/share/man/man4/pcm.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pcm.4,v 1.8.2.3 1999/11/21 08:15:36 phantom Exp $
 .\"
 .Dd June 3, 1998
 .Dt PCM 4
diff --git a/share/man/man4/pcvt.4 b/share/man/man4/pcvt.4
index afb9395283ea..23e6aad71966 100644
--- a/share/man/man4/pcvt.4
+++ b/share/man/man4/pcvt.4
@@ -31,7 +31,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)pcvt.4, 3.20, Last Edit-Date: [Sun Apr  2 18:23:39 1995]
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pcvt.4,v 1.18.2.2 1999/11/21 08:15:36 phantom Exp $
 .\"
 .\" Man page pcvt(4) created after pcvt_ioctl.h on 13-Jan-93
 .\" by Joerg Wunsch
diff --git a/share/man/man4/pn.4 b/share/man/man4/pn.4
index ba1b5b6d166f..7438fb31b996 100644
--- a/share/man/man4/pn.4
+++ b/share/man/man4/pn.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pn.4,v 1.8.2.2 1999/11/21 08:15:36 phantom Exp $
 .\"
 .Dd November 7, 1998
 .Dt PN 4
diff --git a/share/man/man4/ppbus.4 b/share/man/man4/ppbus.4
index f0d687655e62..c288d23ec627 100644
--- a/share/man/man4/ppbus.4
+++ b/share/man/man4/ppbus.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ppbus.4,v 1.3.2.2 1999/10/30 16:10:54 phantom Exp $
 .\"
 .Dd March 1, 1998
 .Dt PPBUS 4
diff --git a/share/man/man4/ppi.4 b/share/man/man4/ppi.4
index ca77e5a26bfb..e96909849c51 100644
--- a/share/man/man4/ppi.4
+++ b/share/man/man4/ppi.4
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ppi.4,v 1.1.2.1 1999/08/29 16:45:52 peter Exp $
 .\"
 .Dd January 2, 1998
 .Dt PPI 4
diff --git a/share/man/man4/ppp.4 b/share/man/man4/ppp.4
index d33e77eaa7d5..7925cf7a3c32 100644
--- a/share/man/man4/ppp.4
+++ b/share/man/man4/ppp.4
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From:	@(#)lo.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ppp.4,v 1.2.2.1 1999/10/30 16:10:55 phantom Exp $
 .\"
 .Dd August 10, 1996
 .Dt PPP 4
diff --git a/share/man/man4/psm.4 b/share/man/man4/psm.4
index c2f5f37e8bd8..be90287f5fea 100644
--- a/share/man/man4/psm.4
+++ b/share/man/man4/psm.4
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/psm.4,v 1.21.2.2 1999/11/21 08:15:37 phantom Exp $
 .\"
 .Dd January 30, 1999
 .Dt PSM 4
diff --git a/share/man/man4/pt.4 b/share/man/man4/pt.4
index 4cb1830b1734..fd6e19c4b81c 100644
--- a/share/man/man4/pt.4
+++ b/share/man/man4/pt.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pt.4,v 1.5.2.2 1999/08/29 16:45:52 peter Exp $
 .\"
 .Dd March 2, 1995
 .Dt PT 4
diff --git a/share/man/man4/pty.4 b/share/man/man4/pty.4
index eb1211838081..934f30365159 100644
--- a/share/man/man4/pty.4
+++ b/share/man/man4/pty.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pty.4	8.2 (Berkeley) 11/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pty.4,v 1.6.2.1 1999/08/29 16:45:52 peter Exp $
 .\"
 .Dd November 30, 1993
 .Dt PTY 4
diff --git a/share/man/man4/rl.4 b/share/man/man4/rl.4
index f3830ef35f7c..e9c204eb4785 100644
--- a/share/man/man4/rl.4
+++ b/share/man/man4/rl.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/rl.4,v 1.11.2.2 1999/11/21 08:15:37 phantom Exp $
 .\"
 .Dd November 4, 1998
 .Dt RL 4
diff --git a/share/man/man4/route.4 b/share/man/man4/route.4
index 9135be28b270..31a7057c3b82 100644
--- a/share/man/man4/route.4
+++ b/share/man/man4/route.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)route.4	8.6 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/route.4,v 1.6.2.2 1999/09/15 08:31:11 ru Exp $
 .\"
 .Dd October 8, 1996
 .Dt ROUTE 4
diff --git a/share/man/man4/sa.4 b/share/man/man4/sa.4
index a57e5ea8feee..0a7a4433772a 100644
--- a/share/man/man4/sa.4
+++ b/share/man/man4/sa.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sa.4,v 1.12.2.6 1999/08/29 16:45:54 peter Exp $
 .\"
 .Dd June 6, 1999
 .Dt SA 4
diff --git a/share/man/man4/screen.4 b/share/man/man4/screen.4
index fe06591c4a05..640e85690473 100644
--- a/share/man/man4/screen.4
+++ b/share/man/man4/screen.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/screen.4,v 1.13.2.2 1999/11/21 08:15:37 phantom Exp $
 .\"
 .Dd January 8, 1995
 .Dt SCREEN 4
diff --git a/share/man/man4/scsi.4 b/share/man/man4/scsi.4
index 951da805fb86..7f830be9f010 100644
--- a/share/man/man4/scsi.4
+++ b/share/man/man4/scsi.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/scsi.4,v 1.12.2.3 1999/10/30 16:10:55 phantom Exp $
 .Dd October 15, 1998
 .Dt SCSI 4
 .Os FreeBSD 3.0
diff --git a/share/man/man4/sd.4 b/share/man/man4/sd.4
index cc5a075665d3..3b4e05fa643a 100644
--- a/share/man/man4/sd.4
+++ b/share/man/man4/sd.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sd.4,v 1.12.2.1 1999/08/29 16:45:55 peter Exp $
 .\"
 .Dd October 15, 1998
 .Dt SD 4
diff --git a/share/man/man4/sf.4 b/share/man/man4/sf.4
index 892bcc7bc679..6119ab8d7388 100644
--- a/share/man/man4/sf.4
+++ b/share/man/man4/sf.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sf.4,v 1.5.2.3 1999/11/21 08:15:37 phantom Exp $
 .\"
 .Dd July 22, 1999
 .Dt SF 4
diff --git a/share/man/man4/si.4 b/share/man/man4/si.4
index 627d73821ac2..74dd5229915e 100644
--- a/share/man/man4/si.4
+++ b/share/man/man4/si.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/si.4,v 1.18.2.2 1999/11/21 08:15:38 phantom Exp $
 .Dd September 16, 1995
 .Os FreeBSD
 .Dt SI 4
diff --git a/share/man/man4/sio.4 b/share/man/man4/sio.4
index 04d70b05cd6a..f9e5c48ca7f9 100644
--- a/share/man/man4/sio.4
+++ b/share/man/man4/sio.4
@@ -34,7 +34,7 @@
 .\"
 .\"     from: @(#)dca.4	5.2 (Berkeley) 3/27/91
 .\"	from: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sio.4,v 1.32.2.3 1999/11/21 08:15:38 phantom Exp $
 .\"
 .Dd October 10, 1995
 .Dt SIO 4
diff --git a/share/man/man4/sis.4 b/share/man/man4/sis.4
index 3613ffbfe7ad..7e95f80a65c9 100644
--- a/share/man/man4/sis.4
+++ b/share/man/man4/sis.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sis.4,v 1.2.2.2 1999/11/21 08:15:38 phantom Exp $
 .\"
 .Dd September 4, 1999
 .Dt SIS 4
diff --git a/share/man/man4/sk.4 b/share/man/man4/sk.4
index b52a2999178f..e89fab79660f 100644
--- a/share/man/man4/sk.4
+++ b/share/man/man4/sk.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sk.4,v 1.4.2.2 1999/11/21 08:15:39 phantom Exp $
 .\"
 .Dd July 3, 1999
 .Dt SK 4
diff --git a/share/man/man4/sl.4 b/share/man/man4/sl.4
index b4bb2318f138..910ed4116dac 100644
--- a/share/man/man4/sl.4
+++ b/share/man/man4/sl.4
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From:	@(#)lo.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sl.4,v 1.6.2.1 1999/10/30 16:10:56 phantom Exp $
 .\"
 .Dd August 10, 1996
 .Dt SL 4
diff --git a/share/man/man4/smb.4 b/share/man/man4/smb.4
index b042cf9bee42..35773affadfd 100644
--- a/share/man/man4/smb.4
+++ b/share/man/man4/smb.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/smb.4,v 1.1.2.2 1999/10/30 16:10:56 phantom Exp $
 .\"
 .Dd October 25, 1998
 .Dt SMB 4
diff --git a/share/man/man4/smbus.4 b/share/man/man4/smbus.4
index ea032b2e90c1..bd2df065fe5c 100644
--- a/share/man/man4/smbus.4
+++ b/share/man/man4/smbus.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/smbus.4,v 1.2.2.2 1999/10/30 16:10:57 phantom Exp $
 .\"
 .Dd August 10, 1998
 .Dt SMBBUS 4
diff --git a/share/man/man4/smp.4 b/share/man/man4/smp.4
index 4bae004fdebf..45344fe5b437 100644
--- a/share/man/man4/smp.4
+++ b/share/man/man4/smp.4
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/smp.4,v 1.4.2.1 1999/10/30 16:10:58 phantom Exp $
 .\"
 .Dd August 4, 1997
 .Dt SMP 4
diff --git a/share/man/man4/snp.4 b/share/man/man4/snp.4
index 082a64989ccb..572ac962f1d5 100644
--- a/share/man/man4/snp.4
+++ b/share/man/man4/snp.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snp.4,v 1.14.2.1 1999/08/29 16:45:55 peter Exp $
 .\"
 .Dd February 24, 1995
 .Dt SNP 4
diff --git a/share/man/man4/splash.4 b/share/man/man4/splash.4
index f2e62ff4bd0b..d5adf77c0ad7 100644
--- a/share/man/man4/splash.4
+++ b/share/man/man4/splash.4
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/splash.4,v 1.7.2.2 1999/11/21 08:15:39 phantom Exp $
 .\"
 .Dd February 9, 1999
 .Dt SPLASH 4
diff --git a/share/man/man4/sppp.4 b/share/man/man4/sppp.4
index 6e5ae40313fa..37fe75043a3e 100644
--- a/share/man/man4/sppp.4
+++ b/share/man/man4/sppp.4
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sppp.4,v 1.6.2.1 1999/08/29 16:45:55 peter Exp $
 .\"
 .Dd May 19, 1997
 .Dt SPPP 4
diff --git a/share/man/man4/ssc.4 b/share/man/man4/ssc.4
index e179376bb2d3..22eff77f995e 100644
--- a/share/man/man4/ssc.4
+++ b/share/man/man4/ssc.4
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ssc.4,v 1.2.2.2 1999/10/30 16:10:58 phantom Exp $
 .\"
 .Dd December 29, 1997
 .Dt SSC 4
diff --git a/share/man/man4/st.4 b/share/man/man4/st.4
index 84418570307b..cfe0f0ff4eed 100644
--- a/share/man/man4/st.4
+++ b/share/man/man4/st.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/st.4,v 1.12.2.1 1999/08/29 16:45:55 peter Exp $
 .\"
 .Dd October 15, 1998
 .Dt ST 4
diff --git a/share/man/man4/ste.4 b/share/man/man4/ste.4
index ace8e4ada8ba..ed89568d76cb 100644
--- a/share/man/man4/ste.4
+++ b/share/man/man4/ste.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ste.4,v 1.3.2.2 1999/11/21 08:15:39 phantom Exp $
 .\"
 .Dd August 21, 1999
 .Dt STE 4
diff --git a/share/man/man4/su.4 b/share/man/man4/su.4
index 4c636629a7a3..896825b2fc58 100644
--- a/share/man/man4/su.4
+++ b/share/man/man4/su.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/su.4,v 1.11.2.2 1999/10/30 16:10:58 phantom Exp $
 .\"
 .Dd August 27, 1993
 .Dt SU 4
diff --git a/share/man/man4/syscons.4 b/share/man/man4/syscons.4
index 7054f518660c..947263086724 100644
--- a/share/man/man4/syscons.4
+++ b/share/man/man4/syscons.4
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/syscons.4,v 1.9.2.2 1999/11/21 08:15:40 phantom Exp $
 .\"
 .Dd February 9, 1999
 .Dt SYSCONS 4
diff --git a/share/man/man4/sysmouse.4 b/share/man/man4/sysmouse.4
index 7817eaa6faa7..6b432c6ee59e 100644
--- a/share/man/man4/sysmouse.4
+++ b/share/man/man4/sysmouse.4
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sysmouse.4,v 1.11.2.2 1999/11/21 08:15:40 phantom Exp $
 .\"
 .Dd December 3, 1997
 .Dt SYSMOUSE 4
diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4
index 14ecbb5d93c4..324ea642c699 100644
--- a/share/man/man4/tcp.4
+++ b/share/man/man4/tcp.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)tcp.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/tcp.4,v 1.9.2.1 1999/08/29 16:45:56 peter Exp $
 .\"
 .Dd February 14, 1995
 .Dt TCP 4
diff --git a/share/man/man4/termios.4 b/share/man/man4/termios.4
index 94f57c033315..be98db012bb4 100644
--- a/share/man/man4/termios.4
+++ b/share/man/man4/termios.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)termios.4	8.4 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/termios.4,v 1.7.2.3 1999/08/29 16:45:56 peter Exp $
 .\"
 .Dd April 19, 1994
 .Dt TERMIOS 4
diff --git a/share/man/man4/ti.4 b/share/man/man4/ti.4
index 3d12ae697aae..81c17b072305 100644
--- a/share/man/man4/ti.4
+++ b/share/man/man4/ti.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ti.4,v 1.4.2.2 1999/11/21 08:15:40 phantom Exp $
 .\"
 .Dd March 4, 1999
 .Dt TI 4
diff --git a/share/man/man4/tl.4 b/share/man/man4/tl.4
index 25465365da5c..900cd7726f48 100644
--- a/share/man/man4/tl.4
+++ b/share/man/man4/tl.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/tl.4,v 1.6.2.2 1999/11/21 08:15:40 phantom Exp $
 .\"
 .Dd May 1, 1998
 .Dt TL 4
diff --git a/share/man/man4/ttcp.4 b/share/man/man4/ttcp.4
index 6b89b410add1..585f52735b3b 100644
--- a/share/man/man4/ttcp.4
+++ b/share/man/man4/ttcp.4
@@ -25,7 +25,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ttcp.4,v 1.6.2.1 1999/08/29 16:45:56 peter Exp $
 .\"
 .Dd January 18, 1995
 .Dt TTCP 4
diff --git a/share/man/man4/tty.4 b/share/man/man4/tty.4
index 367033c62307..534cd94a06e9 100644
--- a/share/man/man4/tty.4
+++ b/share/man/man4/tty.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tty.4	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/tty.4,v 1.7.2.1 1999/08/29 16:45:56 peter Exp $
 .\"
 .Dd August 14, 1992
 .Dt TTY 4
diff --git a/share/man/man4/tun.4 b/share/man/man4/tun.4
index 97b579fc964b..7919ac900017 100644
--- a/share/man/man4/tun.4
+++ b/share/man/man4/tun.4
@@ -1,5 +1,5 @@
 .\" $NetBSD: tun.4,v 1.1 1996/06/25 22:17:37 pk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/tun.4,v 1.5.2.1 1999/08/29 16:45:56 peter Exp $
 .\" Based on PR#2411
 .\"
 .Dd March 10, 1996
diff --git a/share/man/man4/udp.4 b/share/man/man4/udp.4
index 87ba9ab47297..1682d8b19b29 100644
--- a/share/man/man4/udp.4
+++ b/share/man/man4/udp.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)udp.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/udp.4,v 1.6.2.1 1999/08/29 16:45:56 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt UDP 4
diff --git a/share/man/man4/uhci.4 b/share/man/man4/uhci.4
index 77444b4871d3..4443cca336cc 100644
--- a/share/man/man4/uhci.4
+++ b/share/man/man4/uhci.4
@@ -29,7 +29,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/man/man4/uhci.4,v 1.5.2.1 1999/11/17 21:36:21 phantom Exp $
 .\"
 .Dd February 21, 1999
 .Dt UHCI 4
diff --git a/share/man/man4/uk.4 b/share/man/man4/uk.4
index e1b81e2f2da0..5e4342409184 100644
--- a/share/man/man4/uk.4
+++ b/share/man/man4/uk.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/uk.4,v 1.12.2.2 1999/10/30 16:10:59 phantom Exp $
 .\"
 .Dd October 11, 1993
 .Dt UK 4
diff --git a/share/man/man4/ukbd.4 b/share/man/man4/ukbd.4
index 5ea9869a99f2..0cb7e243712c 100644
--- a/share/man/man4/ukbd.4
+++ b/share/man/man4/ukbd.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/man/man4/ukbd.4,v 1.8.2.2 1999/11/21 08:15:41 phantom Exp $
 .\"
 .Dd April 11, 1999
 .Dt UKBD 4
diff --git a/share/man/man4/ums.4 b/share/man/man4/ums.4
index 7a254e8b130f..2d985483d2a7 100644
--- a/share/man/man4/ums.4
+++ b/share/man/man4/ums.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/man/man4/ums.4,v 1.7.2.2 1999/11/21 08:15:41 phantom Exp $
 .\"
 .Dd April 11, 1999
 .Dt UMS 4
diff --git a/share/man/man4/unix.4 b/share/man/man4/unix.4
index 6f5d2c8657d6..c32722c2afa9 100644
--- a/share/man/man4/unix.4
+++ b/share/man/man4/unix.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)unix.4	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/unix.4,v 1.2.2.1 1999/08/29 16:45:57 peter Exp $
 .\"
 .Dd June 9, 1993
 .Dt UNIX 4
diff --git a/share/man/man4/update.4 b/share/man/man4/update.4
index 8a16a248287e..e41791d5bff3 100644
--- a/share/man/man4/update.4
+++ b/share/man/man4/update.4
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/update.4,v 1.4.2.2 1999/10/30 15:27:55 phantom Exp $
 .\"
 .Dd February 11, 1996
 .Dt UPDATE 4
diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4
index 596d7adfaa8f..53ffeba24f37 100644
--- a/share/man/man4/usb.4
+++ b/share/man/man4/usb.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/usb.4,v 1.5.2.2 1999/11/21 08:15:41 phantom Exp $
 .\"
 .Dd February 21, 1999
 .Dt USB 4
diff --git a/share/man/man4/vga.4 b/share/man/man4/vga.4
index 53d958e7f0b4..ef58cc6a09e6 100644
--- a/share/man/man4/vga.4
+++ b/share/man/man4/vga.4
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/vga.4,v 1.6.2.2 1999/11/21 08:15:41 phantom Exp $
 .\"
 .Dd February 9, 1999
 .Dt VGA 4
diff --git a/share/man/man4/vinum.4 b/share/man/man4/vinum.4
index de3dfb3a7c06..af5c740ef088 100644
--- a/share/man/man4/vinum.4
+++ b/share/man/man4/vinum.4
@@ -34,7 +34,7 @@
 .\" otherwise) arising in any way out of the use of this software, even if
 .\" advised of the possibility of such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/vinum.4,v 1.6.2.9 1999/10/05 05:29:57 grog Exp $
 .\"
 .Dd 5 October 1999
 .Dt vinum 4
diff --git a/share/man/man4/vn.4 b/share/man/man4/vn.4
index 324cc8f5987f..ad1c934d2710 100644
--- a/share/man/man4/vn.4
+++ b/share/man/man4/vn.4
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/vn.4,v 1.2.2.1 1999/10/30 16:11:00 phantom Exp $
 .\"
 .Dd December 30, 1995
 .Dt VN 4
diff --git a/share/man/man4/vpo.4 b/share/man/man4/vpo.4
index 6b5e8661e2fd..434e5b5852a1 100644
--- a/share/man/man4/vpo.4
+++ b/share/man/man4/vpo.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/vpo.4,v 1.1.2.3 1999/11/01 22:53:03 nsouch Exp $
 .\"
 .Dd March 5, 1998
 .Dt VPO 4
diff --git a/share/man/man4/vr.4 b/share/man/man4/vr.4
index b4365ad78424..e9d3fc9bdf21 100644
--- a/share/man/man4/vr.4
+++ b/share/man/man4/vr.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/vr.4,v 1.7.2.2 1999/11/21 08:15:42 phantom Exp $
 .\"
 .Dd November 22, 1998
 .Dt VR 4
diff --git a/share/man/man4/wb.4 b/share/man/man4/wb.4
index 016cb4aece31..c3f161a5e711 100644
--- a/share/man/man4/wb.4
+++ b/share/man/man4/wb.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/wb.4,v 1.6.2.2 1999/11/21 08:15:42 phantom Exp $
 .\"
 .Dd November 4, 1998
 .Dt WB 4
diff --git a/share/man/man4/worm.4 b/share/man/man4/worm.4
index e84cedd5bd2d..5c121293c906 100644
--- a/share/man/man4/worm.4
+++ b/share/man/man4/worm.4
@@ -32,7 +32,7 @@
 .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/worm.4,v 1.17.2.1 1999/08/29 16:45:57 peter Exp $
 .\" "
 .Dd October 15, 1998
 .Dt WORM 4
diff --git a/share/man/man4/wst.4 b/share/man/man4/wst.4
index f3b11ed267c4..dab37acbfdb7 100644
--- a/share/man/man4/wst.4
+++ b/share/man/man4/wst.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/wst.4,v 1.1.2.4 1999/10/30 16:11:00 phantom Exp $
 .\"
 .Dd August 27, 1998
 .Dt WST 4
diff --git a/share/man/man4/xl.4 b/share/man/man4/xl.4
index 0379cd5eea6e..410af378680c 100644
--- a/share/man/man4/xl.4
+++ b/share/man/man4/xl.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/xl.4,v 1.7.2.2 1999/11/21 08:15:42 phantom Exp $
 .\"
 .Dd August 16, 1998
 .Dt XL 4
diff --git a/share/man/man4/xpt.4 b/share/man/man4/xpt.4
index 11afc48f3ea3..87867d6c8efd 100644
--- a/share/man/man4/xpt.4
+++ b/share/man/man4/xpt.4
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/xpt.4,v 1.2.2.1 1999/08/29 16:45:57 peter Exp $
 .\"
 .Dd October 10, 1998
 .Dt XPT 4
diff --git a/share/man/man4/yp.4 b/share/man/man4/yp.4
index 83c8642f3d41..c6e386dc102e 100644
--- a/share/man/man4/yp.4
+++ b/share/man/man4/yp.4
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)yp.8	1.0 (deraadt) 4/26/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/yp.4,v 1.14.2.1 1999/08/29 16:45:58 peter Exp $
 .\"
 .Dd April 5, 1993
 .Dt YP 4
diff --git a/share/man/man4/zero.4 b/share/man/man4/zero.4
index ba9d617bb450..733c50e8c543 100644
--- a/share/man/man4/zero.4
+++ b/share/man/man4/zero.4
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/zero.4,v 1.2.2.1 1999/08/29 16:45:58 peter Exp $
 .\"
 .Dd April 7, 1996
 .Dt ZERO 4
diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile
index 8aa8dd6f52be..fcc8f37755b5 100644
--- a/share/man/man5/Makefile
+++ b/share/man/man5/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$FreeBSD$
+#	$FreeBSD: src/share/man/man5/Makefile,v 1.24.2.1 1999/10/30 22:08:58 green Exp $
 
 #MISSING: dump.5 plot.5
 MAN5=	a.out.5 acct.5 core.5 devfs.5 dir.5 disktab.5 ethers.5 \
diff --git a/share/man/man5/a.out.5 b/share/man/man5/a.out.5
index b70666ee150a..803941849153 100644
--- a/share/man/man5/a.out.5
+++ b/share/man/man5/a.out.5
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)a.out.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/a.out.5,v 1.7.2.1 1999/08/29 16:46:44 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt A.OUT 5
diff --git a/share/man/man5/acct.5 b/share/man/man5/acct.5
index 5af8637174fe..3a38f8b48f23 100644
--- a/share/man/man5/acct.5
+++ b/share/man/man5/acct.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)acct.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/acct.5,v 1.5.2.1 1999/08/29 16:46:44 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt ACCT 5
diff --git a/share/man/man5/core.5 b/share/man/man5/core.5
index 5937308abe72..18b48636b783 100644
--- a/share/man/man5/core.5
+++ b/share/man/man5/core.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)core.5	8.3 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/core.5,v 1.7.2.1 1999/08/29 16:46:44 peter Exp $
 .\"
 .Dd December 11, 1993
 .Dt CORE 5
diff --git a/share/man/man5/devfs.5 b/share/man/man5/devfs.5
index 734450874c58..d0fc3d8a79a0 100644
--- a/share/man/man5/devfs.5
+++ b/share/man/man5/devfs.5
@@ -36,7 +36,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/devfs.5,v 1.4.2.2 1999/08/29 16:46:45 peter Exp $
 .\"
 .Dd December 14, 1996
 .Dt DEVFS 5
diff --git a/share/man/man5/dir.5 b/share/man/man5/dir.5
index 6e5e8d9ae87a..3e04d494a340 100644
--- a/share/man/man5/dir.5
+++ b/share/man/man5/dir.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dir.5	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/dir.5,v 1.9.2.1 1999/08/29 16:46:45 peter Exp $
 .\"
 .Dd April 19, 1994
 .Dt DIR 5
diff --git a/share/man/man5/disktab.5 b/share/man/man5/disktab.5
index 4423b0f487dc..d07881567297 100644
--- a/share/man/man5/disktab.5
+++ b/share/man/man5/disktab.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)disktab.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/disktab.5,v 1.3.2.1 1999/08/29 16:46:45 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt DISKTAB 5
diff --git a/share/man/man5/elf.5 b/share/man/man5/elf.5
index 375a172349d3..01689bc7f026 100644
--- a/share/man/man5/elf.5
+++ b/share/man/man5/elf.5
@@ -22,7 +22,7 @@
 .\"OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\"SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/man/man5/elf.5,v 1.1.2.3 1999/12/07 22:45:18 chris Exp $
 .\"
 .Dd July 31, 1999
 .Dt ELF 5
diff --git a/share/man/man5/ethers.5 b/share/man/man5/ethers.5
index ed68dd77bd78..1e19069b7f9d 100644
--- a/share/man/man5/ethers.5
+++ b/share/man/man5/ethers.5
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/ethers.5,v 1.6.2.1 1999/08/29 16:46:45 peter Exp $
 .\"
 .Dd April 12, 1995
 .Dt ETHERS 5
diff --git a/share/man/man5/fbtab.5 b/share/man/man5/fbtab.5
index 728e86b605ec..3725f546ac20 100644
--- a/share/man/man5/fbtab.5
+++ b/share/man/man5/fbtab.5
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/fbtab.5,v 1.4.2.1 1999/08/29 16:46:46 peter Exp $
 .\"
 .Dd August 22, 1994
 .Dt FBTAB 5
diff --git a/share/man/man5/fdesc.5 b/share/man/man5/fdesc.5
index 8493398f1635..7a2955fc952b 100644
--- a/share/man/man5/fdesc.5
+++ b/share/man/man5/fdesc.5
@@ -36,7 +36,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/fdesc.5,v 1.4.2.2 1999/08/29 16:46:46 peter Exp $
 .\"
 .Dd December 14, 1996
 .Dt FDESC 5
diff --git a/share/man/man5/forward.5 b/share/man/man5/forward.5
index 1088ebabc03d..47e5f104ca00 100644
--- a/share/man/man5/forward.5
+++ b/share/man/man5/forward.5
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/forward.5,v 1.2.2.2 1999/08/29 16:46:46 peter Exp $
 .\"
 .Dd July 2, 1996
 .Dt FORWARD 5
diff --git a/share/man/man5/fs.5 b/share/man/man5/fs.5
index 0798bdaf3042..9ab0adcadf42 100644
--- a/share/man/man5/fs.5
+++ b/share/man/man5/fs.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fs.5	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/fs.5,v 1.8.2.1 1999/08/29 16:46:46 peter Exp $
 .\"
 .Dd April 19, 1994
 .Dt FS 5
diff --git a/share/man/man5/fstab.5 b/share/man/man5/fstab.5
index deaac9e69556..540862bd513c 100644
--- a/share/man/man5/fstab.5
+++ b/share/man/man5/fstab.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fstab.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/fstab.5,v 1.9.2.1 1999/08/29 16:46:47 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt FSTAB 5
diff --git a/share/man/man5/group.5 b/share/man/man5/group.5
index fcbb39eebd24..48851313eb5b 100644
--- a/share/man/man5/group.5
+++ b/share/man/man5/group.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)group.5	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/group.5,v 1.13.2.1 1999/08/29 16:46:47 peter Exp $
 .\"
 .Dd September 29, 1994
 .Dt GROUP 5
diff --git a/share/man/man5/hosts.5 b/share/man/man5/hosts.5
index 00ca8ceccb33..cf7a440699d8 100644
--- a/share/man/man5/hosts.5
+++ b/share/man/man5/hosts.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)hosts.5	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/hosts.5,v 1.4.2.1 1999/08/29 16:46:47 peter Exp $
 .\"
 .Dd December 11, 1993
 .Dt HOSTS 5
diff --git a/share/man/man5/hosts.equiv.5 b/share/man/man5/hosts.equiv.5
index 3d74c7f39b7b..ef7753fc9764 100644
--- a/share/man/man5/hosts.equiv.5
+++ b/share/man/man5/hosts.equiv.5
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/hosts.equiv.5,v 1.6.2.1 1999/08/29 16:46:47 peter Exp $
 .\"
 .Dd Feb 1996
 .Dt HOSTS.EQUIV 5
diff --git a/share/man/man5/hosts.lpd.5 b/share/man/man5/hosts.lpd.5
index ab87d4866d95..cb89fdaa4e37 100644
--- a/share/man/man5/hosts.lpd.5
+++ b/share/man/man5/hosts.lpd.5
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/hosts.lpd.5,v 1.3.2.1 1999/08/29 16:46:47 peter Exp $
 .\"
 .Dd June 1, 1996
 .Dt HOSTS.LPD 5
diff --git a/share/man/man5/intro.5 b/share/man/man5/intro.5
index a50030653ba6..c3b782d341da 100644
--- a/share/man/man5/intro.5
+++ b/share/man/man5/intro.5
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/intro.5,v 1.2.4.1 1999/08/29 16:46:48 peter Exp $
 .\"
 .Dd February 16, 1997
 .Dt INTRO 5
diff --git a/share/man/man5/kernfs.5 b/share/man/man5/kernfs.5
index 1976f134c3bc..3e78770bbf7c 100644
--- a/share/man/man5/kernfs.5
+++ b/share/man/man5/kernfs.5
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/kernfs.5,v 1.6.2.2 1999/08/29 16:46:48 peter Exp $
 .\"
 .Dd December 14, 1996
 .Dt KERNFS 5
diff --git a/share/man/man5/link.5 b/share/man/man5/link.5
index 2991453a7570..0c142dd2b7d6 100644
--- a/share/man/man5/link.5
+++ b/share/man/man5/link.5
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/link.5,v 1.12.2.1 1999/08/29 16:46:48 peter Exp $
 .\"
 .Dd October 23, 1993
 .Dt LINK 5
diff --git a/share/man/man5/networks.5 b/share/man/man5/networks.5
index 6bd1285af173..895f5ebda2ac 100644
--- a/share/man/man5/networks.5
+++ b/share/man/man5/networks.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)networks.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/networks.5,v 1.4.2.1 1999/08/29 16:46:48 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt NETWORKS 5
diff --git a/share/man/man5/passwd.5 b/share/man/man5/passwd.5
index 890f021571b9..25e0fc7587c0 100644
--- a/share/man/man5/passwd.5
+++ b/share/man/man5/passwd.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)passwd.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/passwd.5,v 1.22.2.3 1999/08/29 16:46:48 peter Exp $
 .\"
 .Dd September 29, 1994
 .Dt PASSWD 5
diff --git a/share/man/man5/pbm.5 b/share/man/man5/pbm.5
index 285ac43d2323..4183c9cf4b76 100644
--- a/share/man/man5/pbm.5
+++ b/share/man/man5/pbm.5
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/pbm.5,v 1.5.2.1 1999/08/29 16:46:49 peter Exp $
 .\"
 .Dd September 27, 1991
 .Dt PBM 5
diff --git a/share/man/man5/phones.5 b/share/man/man5/phones.5
index e13f368a15f9..86d0ea7e3089 100644
--- a/share/man/man5/phones.5
+++ b/share/man/man5/phones.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)phones.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/phones.5,v 1.2.2.1 1999/08/29 16:46:49 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt PHONES 5
diff --git a/share/man/man5/procfs.5 b/share/man/man5/procfs.5
index c4003e1207dc..84402d5f35d6 100644
--- a/share/man/man5/procfs.5
+++ b/share/man/man5/procfs.5
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/procfs.5,v 1.10.2.1 1999/08/29 16:46:49 peter Exp $
 .\" Written by Garrett Wollman
 .\" This file is in the public domain.
 .\"
diff --git a/share/man/man5/protocols.5 b/share/man/man5/protocols.5
index 4756025f4e24..87be6d6fdae6 100644
--- a/share/man/man5/protocols.5
+++ b/share/man/man5/protocols.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)protocols.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/protocols.5,v 1.2.2.1 1999/08/29 16:46:49 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt PROTOCOLS 5
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index 13b95d7b1759..96ba7353f597 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.27.2.22 1999/11/28 16:04:59 brian Exp $
 .\"
 .Dd April 26, 1997
 .Dt RC.CONF 5
diff --git a/share/man/man5/remote.5 b/share/man/man5/remote.5
index 0f89a7c9f5ed..ae323ee1ed06 100644
--- a/share/man/man5/remote.5
+++ b/share/man/man5/remote.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)remote.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/remote.5,v 1.4.2.1 1999/08/29 16:46:50 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt REMOTE 5
diff --git a/share/man/man5/resolver.5 b/share/man/man5/resolver.5
index 7cfde209a387..65385cc09e2a 100644
--- a/share/man/man5/resolver.5
+++ b/share/man/man5/resolver.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)resolver.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/resolver.5,v 1.5.2.1 1999/08/29 16:46:50 peter Exp $
 .\"
 .Dd November 11, 1993
 .Dt RESOLVER 5
diff --git a/share/man/man5/services.5 b/share/man/man5/services.5
index 30321fb9864c..2a5b24aa83ea 100644
--- a/share/man/man5/services.5
+++ b/share/man/man5/services.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)services.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/services.5,v 1.4.2.1 1999/08/29 16:46:50 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt SERVICES 5
diff --git a/share/man/man5/shells.5 b/share/man/man5/shells.5
index 70626ad3ef5b..5788b948774e 100644
--- a/share/man/man5/shells.5
+++ b/share/man/man5/shells.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)shells.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/shells.5,v 1.2.2.1 1999/08/29 16:46:50 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt SHELLS 5
diff --git a/share/man/man5/stab.5 b/share/man/man5/stab.5
index 29d283688f32..9acf248cea64 100644
--- a/share/man/man5/stab.5
+++ b/share/man/man5/stab.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)stab.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/stab.5,v 1.3.2.1 1999/08/29 16:46:51 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt STAB 5
diff --git a/share/man/man5/types.5 b/share/man/man5/types.5
index 907fbdf9f2ab..c2275886b14d 100644
--- a/share/man/man5/types.5
+++ b/share/man/man5/types.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)types.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/types.5,v 1.8.2.1 1999/08/29 16:46:51 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt TYPES 5
diff --git a/share/man/man5/utmp.5 b/share/man/man5/utmp.5
index b430b8f8b4d0..5734de4bd43b 100644
--- a/share/man/man5/utmp.5
+++ b/share/man/man5/utmp.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)utmp.5	8.2 (Berkeley) 3/17/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/utmp.5,v 1.8.2.1 1999/08/29 16:46:51 peter Exp $
 .\"
 .Dd March 17, 1994
 .Dt UTMP 5
diff --git a/share/man/man6/Makefile b/share/man/man6/Makefile
index 5384a50bae34..e026a36d6314 100644
--- a/share/man/man6/Makefile
+++ b/share/man/man6/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/man/man6/Makefile,v 1.1.4.1 1999/08/29 16:46:55 peter Exp $
 
 MAN6=	intro.6
 
diff --git a/share/man/man6/intro.6 b/share/man/man6/intro.6
index 56e569c63431..0e1d668cc958 100644
--- a/share/man/man6/intro.6
+++ b/share/man/man6/intro.6
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man6/intro.6,v 1.2.4.1 1999/08/29 16:46:55 peter Exp $
 .\"
 .Dd February 16, 1997
 .Dt INTRO 6
diff --git a/share/man/man7/Makefile b/share/man/man7/Makefile
index 5af00101d4c4..1c88eb7de5a0 100644
--- a/share/man/man7/Makefile
+++ b/share/man/man7/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/share/man/man7/Makefile,v 1.9.2.1 1999/08/29 16:46:56 peter Exp $
 
 #MISSING: eqnchar.7 ms.7 term.7
 MAN7=	ascii.7 clocks.7 environ.7 hier.7 hostname.7 intro.7 mailaddr.7 \
diff --git a/share/man/man7/ascii.7 b/share/man/man7/ascii.7
index 7bfbe2b180c7..bfb43738656c 100644
--- a/share/man/man7/ascii.7
+++ b/share/man/man7/ascii.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ascii.7	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/ascii.7,v 1.2.2.1 1999/08/29 16:46:56 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt ASCII 7
diff --git a/share/man/man7/clocks.7 b/share/man/man7/clocks.7
index f845c254604b..1c5ddf7bd332 100644
--- a/share/man/man7/clocks.7
+++ b/share/man/man7/clocks.7
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/clocks.7,v 1.8.2.1 1999/08/29 16:46:57 peter Exp $
 .\" "
 .Dd April 1, 1996
 .Os
diff --git a/share/man/man7/environ.7 b/share/man/man7/environ.7
index 856c932c2a38..4494d10e46e7 100644
--- a/share/man/man7/environ.7
+++ b/share/man/man7/environ.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)environ.7	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/environ.7,v 1.10.2.3 1999/08/29 16:46:57 peter Exp $
 .\"
 .Dd April 19, 1994
 .Dt ENVIRON 7
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 016e10160354..5740156ee1a3 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hier.7	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/hier.7,v 1.16.2.6 1999/12/08 22:04:43 dcs Exp $
 .\"
 .Dd June 5, 1993
 .Dt HIER 7
diff --git a/share/man/man7/hostname.7 b/share/man/man7/hostname.7
index 7c10ab6274d7..e94202e04ee2 100644
--- a/share/man/man7/hostname.7
+++ b/share/man/man7/hostname.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)hostname.7	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/hostname.7,v 1.4.2.1 1999/08/29 16:46:58 peter Exp $
 .\"
 .Dd December 30, 1993
 .Dt HOSTNAME 7
diff --git a/share/man/man7/intro.7 b/share/man/man7/intro.7
index b1bbd27a28f3..c933a75df61d 100644
--- a/share/man/man7/intro.7
+++ b/share/man/man7/intro.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)intro.7	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/intro.7,v 1.4.2.1 1999/08/29 16:46:58 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt INTRO 7
diff --git a/share/man/man7/mailaddr.7 b/share/man/man7/mailaddr.7
index 745fe26b58ee..5eb83fc3e024 100644
--- a/share/man/man7/mailaddr.7
+++ b/share/man/man7/mailaddr.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mailaddr.7	8.1 (Berkeley) 6/16/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/mailaddr.7,v 1.5.2.1 1999/08/29 16:46:58 peter Exp $
 .\"
 .Dd June 16, 1993
 .Dt MAILADDR 7
diff --git a/share/man/man7/man.7 b/share/man/man7/man.7
index 34e787f4b627..16c35e8c5123 100644
--- a/share/man/man7/man.7
+++ b/share/man/man7/man.7
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/man.7,v 1.1.4.2 1999/10/30 14:12:18 phantom Exp $
 .\"
 .Dd November 30, 1998
 .Os
diff --git a/share/man/man7/mdoc.7 b/share/man/man7/mdoc.7
index d34904c05cd7..f8570f37cc72 100644
--- a/share/man/man7/mdoc.7
+++ b/share/man/man7/mdoc.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mdoc.7	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/mdoc.7,v 1.8.2.7 1999/12/12 17:35:57 mpp Exp $
 .\"
 .Dd December 30, 1993
 .Os
diff --git a/share/man/man7/mdoc.samples.7 b/share/man/man7/mdoc.samples.7
index ad3b016a52de..0fcfac297735 100644
--- a/share/man/man7/mdoc.samples.7
+++ b/share/man/man7/mdoc.samples.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mdoc.samples.7	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/mdoc.samples.7,v 1.17.2.7 1999/12/12 17:35:57 mpp Exp $
 .\"
 .\" This tutorial sampler invokes every macro in the package several
 .\" times and is guaranteed to give a worst case performance
diff --git a/share/man/man7/operator.7 b/share/man/man7/operator.7
index 1f4d9b891ea5..a9b7fc6ed6e2 100644
--- a/share/man/man7/operator.7
+++ b/share/man/man7/operator.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)operator.7	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/operator.7,v 1.2.2.1 1999/08/29 16:47:00 peter Exp $
 .\"
 .Dd June 9, 1993
 .Dt OPERATOR 7
diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7
index 8fc977f1c04a..d7efdefd8d99 100644
--- a/share/man/man7/ports.7
+++ b/share/man/man7/ports.7
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/ports.7,v 1.9.2.7 1999/08/29 16:47:00 peter Exp $
 .\"
 .Dd January 25, 1998
 .Dt PORTS 7
diff --git a/share/man/man7/security.7 b/share/man/man7/security.7
index c664a086025a..d71263ccb06a 100644
--- a/share/man/man7/security.7
+++ b/share/man/man7/security.7
@@ -2,7 +2,7 @@
 .\" the BSD Copyright as specified in the file "/usr/src/COPYRIGHT" in
 .\" the source tree.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/security.7,v 1.4.2.4 1999/09/05 15:23:41 mpp Exp $
 .\"
 .Dd December 20, 1998
 .Dt SECURITY 7
diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile
index 55a5e86a108f..ca3393e47821 100644
--- a/share/man/man8/Makefile
+++ b/share/man/man8/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/share/man/man8/Makefile,v 1.9.2.1 1999/08/29 16:47:03 peter Exp $
 
 MAN8=	adding_user.8 diskless.8 intro.8 rc.8 sticky.8
 
diff --git a/share/man/man8/adding_user.8 b/share/man/man8/adding_user.8
index d52f385bc88d..15eed03078e9 100644
--- a/share/man/man8/adding_user.8
+++ b/share/man/man8/adding_user.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)adduser.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/adding_user.8,v 1.2.2.1 1999/08/29 16:47:04 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt ADDING_USER 8
diff --git a/share/man/man8/diskless.8 b/share/man/man8/diskless.8
index 2d3984c611ef..f2d216646a0c 100644
--- a/share/man/man8/diskless.8
+++ b/share/man/man8/diskless.8
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/diskless.8,v 1.2.4.5 1999/12/08 13:19:08 phantom Exp $
 .\"
 .Dd October 2, 1994
 .Dt DISKLESS 8
diff --git a/share/man/man8/intro.8 b/share/man/man8/intro.8
index 9b03f284dd5a..f96bfd363c10 100644
--- a/share/man/man8/intro.8
+++ b/share/man/man8/intro.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)intro.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/intro.8,v 1.2.2.1 1999/08/29 16:47:04 peter Exp $
 .\"
 .Dd December 11, 1993
 .Dt INTRO 8
diff --git a/share/man/man8/man8.i386/MAKEDEV.8 b/share/man/man8/man8.i386/MAKEDEV.8
index 9c9fae69e489..c00bba1c7203 100644
--- a/share/man/man8/man8.i386/MAKEDEV.8
+++ b/share/man/man8/man8.i386/MAKEDEV.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)MAKEDEV.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/man8.i386/MAKEDEV.8,v 1.10.2.3 1999/09/22 21:45:48 phantom Exp $
 .\"
 .Dd June 5, 1993
 .Dt MAKEDEV 8 i386
diff --git a/share/man/man8/man8.i386/Makefile b/share/man/man8/man8.i386/Makefile
index acf876f6fe7c..779d1e05e579 100644
--- a/share/man/man8/man8.i386/Makefile
+++ b/share/man/man8/man8.i386/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/share/man/man8/man8.i386/Makefile,v 1.5.2.1 1999/08/29 16:47:06 peter Exp $
 
 MAN8=	MAKEDEV.8 crash.8
 MANSUBDIR=/i386
diff --git a/share/man/man8/man8.i386/crash.8 b/share/man/man8/man8.i386/crash.8
index 209f79520d9c..f0b8b1eeaee1 100644
--- a/share/man/man8/man8.i386/crash.8
+++ b/share/man/man8/man8.i386/crash.8
@@ -34,7 +34,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/man8.i386/crash.8,v 1.7.2.1 1999/08/29 16:47:07 peter Exp $
 .\"
 .Dd February 2, 1996
 .Dt CRASH 8 i386
diff --git a/share/man/man8/rc.8 b/share/man/man8/rc.8
index cfcc786f5a38..6298592e6938 100644
--- a/share/man/man8/rc.8
+++ b/share/man/man8/rc.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rc.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/rc.8,v 1.7.2.1 1999/08/29 16:47:04 peter Exp $
 .\"
 .Dd December 11, 1993
 .Dt RC 8
diff --git a/share/man/man8/sticky.8 b/share/man/man8/sticky.8
index becef0960144..e6488b7aaeb1 100644
--- a/share/man/man8/sticky.8
+++ b/share/man/man8/sticky.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sticky.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/sticky.8,v 1.4.2.2 1999/08/29 16:47:04 peter Exp $
 .\"
 .Dd June 5, 1993
 .Dt STICKY 8
diff --git a/share/man/man9/BUS_CONNECT_INTR.9 b/share/man/man9/BUS_CONNECT_INTR.9
index 6a88375c7fe7..8a54bc549448 100644
--- a/share/man/man9/BUS_CONNECT_INTR.9
+++ b/share/man/man9/BUS_CONNECT_INTR.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/BUS_CONNECT_INTR.9,v 1.1.2.2 1999/08/29 16:47:10 peter Exp $
 .\"
 .Dd June 16, 1998
 .Os
diff --git a/share/man/man9/BUS_CREATE_INTR.9 b/share/man/man9/BUS_CREATE_INTR.9
index 8588db3adc88..eb1236f002dc 100644
--- a/share/man/man9/BUS_CREATE_INTR.9
+++ b/share/man/man9/BUS_CREATE_INTR.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/BUS_CREATE_INTR.9,v 1.1.2.2 1999/08/29 16:47:11 peter Exp $
 .\"
 .Dd June 16, 1998
 .Os
diff --git a/share/man/man9/BUS_PRINT_CHILD.9 b/share/man/man9/BUS_PRINT_CHILD.9
index 64df88c88aa9..63164cef43b3 100644
--- a/share/man/man9/BUS_PRINT_CHILD.9
+++ b/share/man/man9/BUS_PRINT_CHILD.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/BUS_PRINT_CHILD.9,v 1.1.2.2 1999/08/29 16:47:11 peter Exp $
 .\"
 .Dd June 16, 1998
 .Os
diff --git a/share/man/man9/BUS_READ_IVAR.9 b/share/man/man9/BUS_READ_IVAR.9
index 803f46401fa6..124e38ff2976 100644
--- a/share/man/man9/BUS_READ_IVAR.9
+++ b/share/man/man9/BUS_READ_IVAR.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/BUS_READ_IVAR.9,v 1.1.2.2 1999/08/29 16:47:11 peter Exp $
 .\"
 .Dd June 16, 1998
 .Os
diff --git a/share/man/man9/DEVICE_ATTACH.9 b/share/man/man9/DEVICE_ATTACH.9
index f97089161170..fcdef8b38fe2 100644
--- a/share/man/man9/DEVICE_ATTACH.9
+++ b/share/man/man9/DEVICE_ATTACH.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/DEVICE_ATTACH.9,v 1.1.2.2 1999/08/29 16:47:11 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_ATTACH 9
diff --git a/share/man/man9/DEVICE_DETACH.9 b/share/man/man9/DEVICE_DETACH.9
index e0f27ef28b7a..46a63bbfbbfb 100644
--- a/share/man/man9/DEVICE_DETACH.9
+++ b/share/man/man9/DEVICE_DETACH.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/DEVICE_DETACH.9,v 1.1.2.2 1999/08/29 16:47:11 peter Exp $
 .\"
 .Dd June 16, 1998
 .Os
diff --git a/share/man/man9/DEVICE_PROBE.9 b/share/man/man9/DEVICE_PROBE.9
index 9300e619d9b1..d74e43c892a4 100644
--- a/share/man/man9/DEVICE_PROBE.9
+++ b/share/man/man9/DEVICE_PROBE.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/DEVICE_PROBE.9,v 1.1.2.1 1999/08/29 16:47:12 peter Exp $
 .\"
 .Dd June 16, 1998
 .Os
diff --git a/share/man/man9/DEVICE_SHUTDOWN.9 b/share/man/man9/DEVICE_SHUTDOWN.9
index 4a7847dafb76..13a67171f005 100644
--- a/share/man/man9/DEVICE_SHUTDOWN.9
+++ b/share/man/man9/DEVICE_SHUTDOWN.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/DEVICE_SHUTDOWN.9,v 1.1.2.1 1999/08/29 16:47:12 peter Exp $
 .\"
 .Dd June 16, 1998
 .Os
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index e6405d1595fe..63c298b043f3 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/man/man9/Makefile,v 1.43.2.2 1999/09/12 00:45:57 chris Exp $
 
 MAN9=	MD5.9 \
 	VFS.9 VFS_FHTOVP.9 VFS_INIT.9 VFS_MOUNT.9 VFS_QUOTACTL.9 \
diff --git a/share/man/man9/VFS.9 b/share/man/man9/VFS.9
index c84100b6d1a0..7b07fcb160ba 100644
--- a/share/man/man9/VFS.9
+++ b/share/man/man9/VFS.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VFS.9,v 1.2.2.1 1999/08/29 16:47:12 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_FHTOVP.9 b/share/man/man9/VFS_FHTOVP.9
index 875fed481f4e..393f40d2fa84 100644
--- a/share/man/man9/VFS_FHTOVP.9
+++ b/share/man/man9/VFS_FHTOVP.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VFS_FHTOVP.9,v 1.4.2.1 1999/08/29 16:47:12 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_INIT.9 b/share/man/man9/VFS_INIT.9
index 3381e136c608..6db361a999c1 100644
--- a/share/man/man9/VFS_INIT.9
+++ b/share/man/man9/VFS_INIT.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VFS_INIT.9,v 1.5.2.1 1999/08/29 16:47:12 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_MOUNT.9 b/share/man/man9/VFS_MOUNT.9
index a202935aa1a9..aaff760a18dc 100644
--- a/share/man/man9/VFS_MOUNT.9
+++ b/share/man/man9/VFS_MOUNT.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VFS_MOUNT.9,v 1.5.2.1 1999/08/29 16:47:13 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_QUOTACTL.9 b/share/man/man9/VFS_QUOTACTL.9
index 006e622dd98a..93b930005787 100644
--- a/share/man/man9/VFS_QUOTACTL.9
+++ b/share/man/man9/VFS_QUOTACTL.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VFS_QUOTACTL.9,v 1.4.2.1 1999/08/29 16:47:13 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_ROOT.9 b/share/man/man9/VFS_ROOT.9
index 9c633ce6e44a..1d36774929ff 100644
--- a/share/man/man9/VFS_ROOT.9
+++ b/share/man/man9/VFS_ROOT.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VFS_ROOT.9,v 1.4.2.1 1999/08/29 16:47:13 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_START.9 b/share/man/man9/VFS_START.9
index c327c82dbdd0..b4e9fcdd6900 100644
--- a/share/man/man9/VFS_START.9
+++ b/share/man/man9/VFS_START.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VFS_START.9,v 1.4.2.1 1999/08/29 16:47:13 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_STATFS.9 b/share/man/man9/VFS_STATFS.9
index 61b9787bb282..aef794e7b72b 100644
--- a/share/man/man9/VFS_STATFS.9
+++ b/share/man/man9/VFS_STATFS.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VFS_STATFS.9,v 1.4.2.1 1999/08/29 16:47:14 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_SYNC.9 b/share/man/man9/VFS_SYNC.9
index b1b0a34134df..d225c8713739 100644
--- a/share/man/man9/VFS_SYNC.9
+++ b/share/man/man9/VFS_SYNC.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VFS_SYNC.9,v 1.5.2.1 1999/08/29 16:47:14 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_UNMOUNT.9 b/share/man/man9/VFS_UNMOUNT.9
index 03fb7f3d95aa..65a72b162a8a 100644
--- a/share/man/man9/VFS_UNMOUNT.9
+++ b/share/man/man9/VFS_UNMOUNT.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VFS_UNMOUNT.9,v 1.4.2.1 1999/08/29 16:47:14 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_VGET.9 b/share/man/man9/VFS_VGET.9
index 98767c9c4b7d..c92469711a0e 100644
--- a/share/man/man9/VFS_VGET.9
+++ b/share/man/man9/VFS_VGET.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VFS_VGET.9,v 1.4.2.1 1999/08/29 16:47:14 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_VPTOFH.9 b/share/man/man9/VFS_VPTOFH.9
index ade15c061fe5..18128c874ead 100644
--- a/share/man/man9/VFS_VPTOFH.9
+++ b/share/man/man9/VFS_VPTOFH.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VFS_VPTOFH.9,v 1.5.2.1 1999/08/29 16:47:14 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_ABORTOP.9 b/share/man/man9/VOP_ABORTOP.9
index 4cfe66f40151..1a69de72fc46 100644
--- a/share/man/man9/VOP_ABORTOP.9
+++ b/share/man/man9/VOP_ABORTOP.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_ABORTOP.9,v 1.4.2.1 1999/08/29 16:47:14 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_ACCESS.9 b/share/man/man9/VOP_ACCESS.9
index d56e1ca8037d..a0b29b6b7b94 100644
--- a/share/man/man9/VOP_ACCESS.9
+++ b/share/man/man9/VOP_ACCESS.9
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_ACCESS.9,v 1.5.2.1 1999/08/29 16:47:15 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_ADVLOCK.9 b/share/man/man9/VOP_ADVLOCK.9
index 311dda222cea..40ecf4f426e4 100644
--- a/share/man/man9/VOP_ADVLOCK.9
+++ b/share/man/man9/VOP_ADVLOCK.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_ADVLOCK.9,v 1.4.2.2 1999/08/29 16:47:15 peter Exp $
 .\"
 .Dd June 30, 1999
 .Os
diff --git a/share/man/man9/VOP_ATTRIB.9 b/share/man/man9/VOP_ATTRIB.9
index c6302d35daa7..f7f27ca9cf17 100644
--- a/share/man/man9/VOP_ATTRIB.9
+++ b/share/man/man9/VOP_ATTRIB.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_ATTRIB.9,v 1.6.2.1 1999/08/29 16:47:15 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_BWRITE.9 b/share/man/man9/VOP_BWRITE.9
index cb62d4b19a6f..83860d8aa9fc 100644
--- a/share/man/man9/VOP_BWRITE.9
+++ b/share/man/man9/VOP_BWRITE.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_BWRITE.9,v 1.3.2.1 1999/08/29 16:47:15 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_CREATE.9 b/share/man/man9/VOP_CREATE.9
index ddffbe197a29..cd21dce5aaa0 100644
--- a/share/man/man9/VOP_CREATE.9
+++ b/share/man/man9/VOP_CREATE.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_CREATE.9,v 1.6.2.1 1999/08/29 16:47:15 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_FSYNC.9 b/share/man/man9/VOP_FSYNC.9
index 6c7e2df15a34..0e4d5bdbfa10 100644
--- a/share/man/man9/VOP_FSYNC.9
+++ b/share/man/man9/VOP_FSYNC.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_FSYNC.9,v 1.5.2.1 1999/08/29 16:47:15 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_GETPAGES.9 b/share/man/man9/VOP_GETPAGES.9
index 0194327c750d..0a97ee99ea8f 100644
--- a/share/man/man9/VOP_GETPAGES.9
+++ b/share/man/man9/VOP_GETPAGES.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_GETPAGES.9,v 1.3.2.1 1999/08/29 16:47:16 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_INACTIVE.9 b/share/man/man9/VOP_INACTIVE.9
index 95d21db33d33..33295776769b 100644
--- a/share/man/man9/VOP_INACTIVE.9
+++ b/share/man/man9/VOP_INACTIVE.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_INACTIVE.9,v 1.3.2.1 1999/08/29 16:47:16 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_IOCTL.9 b/share/man/man9/VOP_IOCTL.9
index c22e2acf8daf..1c97e9476367 100644
--- a/share/man/man9/VOP_IOCTL.9
+++ b/share/man/man9/VOP_IOCTL.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_IOCTL.9,v 1.4.2.1 1999/08/29 16:47:16 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_LINK.9 b/share/man/man9/VOP_LINK.9
index 0eba06e46dc6..aac72156d95f 100644
--- a/share/man/man9/VOP_LINK.9
+++ b/share/man/man9/VOP_LINK.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_LINK.9,v 1.4.2.2 1999/08/29 16:47:16 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_LOCK.9 b/share/man/man9/VOP_LOCK.9
index 7061f7b77282..43ab188b2f9f 100644
--- a/share/man/man9/VOP_LOCK.9
+++ b/share/man/man9/VOP_LOCK.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_LOCK.9,v 1.4.2.2 1999/08/29 16:47:16 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_LOOKUP.9 b/share/man/man9/VOP_LOOKUP.9
index 4ad768178a0f..95a17067a147 100644
--- a/share/man/man9/VOP_LOOKUP.9
+++ b/share/man/man9/VOP_LOOKUP.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_LOOKUP.9,v 1.7.2.1 1999/08/29 16:47:16 peter Exp $
 .\"
 .Dd November 24, 1997
 .Os FreeBSD
diff --git a/share/man/man9/VOP_MMAP.9 b/share/man/man9/VOP_MMAP.9
index 0e772d2dfbca..c934aedc9536 100644
--- a/share/man/man9/VOP_MMAP.9
+++ b/share/man/man9/VOP_MMAP.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_MMAP.9,v 1.3.2.1 1999/08/29 16:47:17 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_OPENCLOSE.9 b/share/man/man9/VOP_OPENCLOSE.9
index 8c0a0f6f24cd..bf5c08bb156b 100644
--- a/share/man/man9/VOP_OPENCLOSE.9
+++ b/share/man/man9/VOP_OPENCLOSE.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_OPENCLOSE.9,v 1.4.2.1 1999/08/29 16:47:17 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_PATHCONF.9 b/share/man/man9/VOP_PATHCONF.9
index cfb392db48a8..6ba9437f13de 100644
--- a/share/man/man9/VOP_PATHCONF.9
+++ b/share/man/man9/VOP_PATHCONF.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_PATHCONF.9,v 1.5.2.1 1999/08/29 16:47:17 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_PRINT.9 b/share/man/man9/VOP_PRINT.9
index b686ebf30f3c..a722919be6ae 100644
--- a/share/man/man9/VOP_PRINT.9
+++ b/share/man/man9/VOP_PRINT.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_PRINT.9,v 1.3.2.1 1999/08/29 16:47:17 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_RDWR.9 b/share/man/man9/VOP_RDWR.9
index 5e67262da0c7..818bacbd4f4f 100644
--- a/share/man/man9/VOP_RDWR.9
+++ b/share/man/man9/VOP_RDWR.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_RDWR.9,v 1.7.2.1 1999/08/29 16:47:18 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_READDIR.9 b/share/man/man9/VOP_READDIR.9
index 11a4ce0d56d5..e51084516d4e 100644
--- a/share/man/man9/VOP_READDIR.9
+++ b/share/man/man9/VOP_READDIR.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_READDIR.9,v 1.5.2.1 1999/08/29 16:47:18 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_READLINK.9 b/share/man/man9/VOP_READLINK.9
index 8d364da09275..f64b0909848a 100644
--- a/share/man/man9/VOP_READLINK.9
+++ b/share/man/man9/VOP_READLINK.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_READLINK.9,v 1.6.2.1 1999/08/29 16:47:18 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_REALLOCBLKS.9 b/share/man/man9/VOP_REALLOCBLKS.9
index 51da82793da1..811016244be2 100644
--- a/share/man/man9/VOP_REALLOCBLKS.9
+++ b/share/man/man9/VOP_REALLOCBLKS.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_REALLOCBLKS.9,v 1.4.2.1 1999/08/29 16:47:18 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_REMOVE.9 b/share/man/man9/VOP_REMOVE.9
index 05a7e454c823..f87e1ab1e499 100644
--- a/share/man/man9/VOP_REMOVE.9
+++ b/share/man/man9/VOP_REMOVE.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_REMOVE.9,v 1.5.2.1 1999/08/29 16:47:18 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_RENAME.9 b/share/man/man9/VOP_RENAME.9
index d4398556bf16..ff1abd9e4bb4 100644
--- a/share/man/man9/VOP_RENAME.9
+++ b/share/man/man9/VOP_RENAME.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_RENAME.9,v 1.6.2.1 1999/08/29 16:47:18 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_STRATEGY.9 b/share/man/man9/VOP_STRATEGY.9
index 5633f3d5dc34..d8a9a900f6ff 100644
--- a/share/man/man9/VOP_STRATEGY.9
+++ b/share/man/man9/VOP_STRATEGY.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_STRATEGY.9,v 1.6.2.1 1999/08/29 16:47:19 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/at_exit.9 b/share/man/man9/at_exit.9
index 352e6b229e22..2115f063c848 100644
--- a/share/man/man9/at_exit.9
+++ b/share/man/man9/at_exit.9
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/at_exit.9,v 1.8.2.1 1999/08/29 16:47:19 peter Exp $
 .\" "
 .Dd August 15, 1996
 .Os
diff --git a/share/man/man9/at_fork.9 b/share/man/man9/at_fork.9
index 369bc54d776b..2d52cfc87587 100644
--- a/share/man/man9/at_fork.9
+++ b/share/man/man9/at_fork.9
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/at_fork.9,v 1.7.2.1 1999/08/29 16:47:19 peter Exp $
 .\" "
 .Dd August 15, 1996
 .Os
diff --git a/share/man/man9/at_shutdown.9 b/share/man/man9/at_shutdown.9
index 2552c4351beb..803eb95a55c4 100644
--- a/share/man/man9/at_shutdown.9
+++ b/share/man/man9/at_shutdown.9
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/at_shutdown.9,v 1.12.2.1 1999/08/29 16:47:19 peter Exp $
 .\" "
 .Dd August 15, 1996
 .Os
diff --git a/share/man/man9/bios.9 b/share/man/man9/bios.9
index 1546b518297c..a3c87cb2b6d9 100644
--- a/share/man/man9/bios.9
+++ b/share/man/man9/bios.9
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/bios.9,v 1.3.2.1 1999/08/29 16:47:19 peter Exp $
 .\"
 .\" Copyright (c) 1997 Michael Smith
 .\" All rights reserved.
diff --git a/share/man/man9/buf.9 b/share/man/man9/buf.9
index e32cfe1e224b..215f273f6139 100644
--- a/share/man/man9/buf.9
+++ b/share/man/man9/buf.9
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/buf.9,v 1.1.2.3 1999/10/30 14:19:10 phantom Exp $
 .\"
 .Dd December 22, 1998
 .Dt BUF 9
diff --git a/share/man/man9/bus_generic_attach.9 b/share/man/man9/bus_generic_attach.9
index 8bbcffc8ec4c..57031f63db79 100644
--- a/share/man/man9/bus_generic_attach.9
+++ b/share/man/man9/bus_generic_attach.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/bus_generic_attach.9,v 1.1.2.2 1999/08/29 16:47:20 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt BUS_GENERIC_ATTACH 9
diff --git a/share/man/man9/bus_generic_detach.9 b/share/man/man9/bus_generic_detach.9
index 8b15c3bec469..06156018e19d 100644
--- a/share/man/man9/bus_generic_detach.9
+++ b/share/man/man9/bus_generic_detach.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/bus_generic_detach.9,v 1.1.2.2 1999/08/29 16:47:20 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt BUS_GENERIC_DETACH 9
diff --git a/share/man/man9/bus_generic_map_intr.9 b/share/man/man9/bus_generic_map_intr.9
index ce019503f85a..57af1cf958a2 100644
--- a/share/man/man9/bus_generic_map_intr.9
+++ b/share/man/man9/bus_generic_map_intr.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/bus_generic_map_intr.9,v 1.1.2.2 1999/08/29 16:47:20 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt BUS_GENERIC_MAP_INTR 9
diff --git a/share/man/man9/bus_generic_print_child.9 b/share/man/man9/bus_generic_print_child.9
index a36df228fdb4..7745afb20523 100644
--- a/share/man/man9/bus_generic_print_child.9
+++ b/share/man/man9/bus_generic_print_child.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/bus_generic_print_child.9,v 1.1.2.3 1999/08/29 16:47:20 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt BUS_GENERIC_PRINT_CHILD 9
diff --git a/share/man/man9/bus_generic_read_ivar.9 b/share/man/man9/bus_generic_read_ivar.9
index a7fdec4949e1..9d8f1e41c518 100644
--- a/share/man/man9/bus_generic_read_ivar.9
+++ b/share/man/man9/bus_generic_read_ivar.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/bus_generic_read_ivar.9,v 1.1.2.3 1999/08/29 16:47:20 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt BUS_GENERIC_READ_IVAR 9
diff --git a/share/man/man9/bus_generic_shutdown.9 b/share/man/man9/bus_generic_shutdown.9
index b51d6e059aef..18c6f8dbb85d 100644
--- a/share/man/man9/bus_generic_shutdown.9
+++ b/share/man/man9/bus_generic_shutdown.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/bus_generic_shutdown.9,v 1.1.2.2 1999/08/29 16:47:21 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt BUS_GENERIC_SHUTDOWN 9
diff --git a/share/man/man9/cd.9 b/share/man/man9/cd.9
index 2f6bc4bf1dbf..d1939ecdac64 100644
--- a/share/man/man9/cd.9
+++ b/share/man/man9/cd.9
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/cd.9,v 1.9.2.2 1999/08/29 16:47:21 peter Exp $
 .\"
 .Dd October 10, 1998
 .Dt CD 9
diff --git a/share/man/man9/devclass.9 b/share/man/man9/devclass.9
index 003c63d87ff5..724c51a7c770 100644
--- a/share/man/man9/devclass.9
+++ b/share/man/man9/devclass.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/devclass.9,v 1.1.2.3 1999/08/29 16:47:21 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVCLASS 9
diff --git a/share/man/man9/devclass_add_driver.9 b/share/man/man9/devclass_add_driver.9
index b4c0a9f68cdf..c14aeb5b22f9 100644
--- a/share/man/man9/devclass_add_driver.9
+++ b/share/man/man9/devclass_add_driver.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/devclass_add_driver.9,v 1.1.2.2 1999/08/29 16:47:21 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVCLASS_ADD_DRIVER 9
diff --git a/share/man/man9/devclass_find.9 b/share/man/man9/devclass_find.9
index 6fa9e2c53d17..9bad65907a43 100644
--- a/share/man/man9/devclass_find.9
+++ b/share/man/man9/devclass_find.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/devclass_find.9,v 1.1.2.2 1999/08/29 16:47:21 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVCLASS_FIND 9
diff --git a/share/man/man9/devclass_get_device.9 b/share/man/man9/devclass_get_device.9
index bb502b6f4a9f..1e586a2e37ed 100644
--- a/share/man/man9/devclass_get_device.9
+++ b/share/man/man9/devclass_get_device.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/devclass_get_device.9,v 1.1.2.2 1999/08/29 16:47:21 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVCLASS_GET_DEVICE 9
diff --git a/share/man/man9/devclass_get_devices.9 b/share/man/man9/devclass_get_devices.9
index 8a824fe11ff4..78f86199f8b5 100644
--- a/share/man/man9/devclass_get_devices.9
+++ b/share/man/man9/devclass_get_devices.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/devclass_get_devices.9,v 1.1.2.2 1999/08/29 16:47:22 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVCLASS_GET_DEVICES 9
diff --git a/share/man/man9/devclass_get_maxunit.9 b/share/man/man9/devclass_get_maxunit.9
index e1d6468130ab..bf9b54455f8f 100644
--- a/share/man/man9/devclass_get_maxunit.9
+++ b/share/man/man9/devclass_get_maxunit.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/devclass_get_maxunit.9,v 1.1.2.2 1999/08/29 16:47:22 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVCLASS_GET_MAXUNIT 9
diff --git a/share/man/man9/devclass_get_name.9 b/share/man/man9/devclass_get_name.9
index 3241a42a32ae..c8f5a29a4b20 100644
--- a/share/man/man9/devclass_get_name.9
+++ b/share/man/man9/devclass_get_name.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/devclass_get_name.9,v 1.1.2.2 1999/08/29 16:47:22 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVCLASS_GET_NAME 9
diff --git a/share/man/man9/devclass_get_softc.9 b/share/man/man9/devclass_get_softc.9
index 9472945c3424..aee68dc268cc 100644
--- a/share/man/man9/devclass_get_softc.9
+++ b/share/man/man9/devclass_get_softc.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/devclass_get_softc.9,v 1.1.2.3 1999/08/29 16:47:22 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVCLASS_GET_SOFTC 9
diff --git a/share/man/man9/devfs_add_devswf.9 b/share/man/man9/devfs_add_devswf.9
index 31d6603dbb89..5e3b85b0c814 100644
--- a/share/man/man9/devfs_add_devswf.9
+++ b/share/man/man9/devfs_add_devswf.9
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/devfs_add_devswf.9,v 1.8.2.1 1999/08/29 16:47:22 peter Exp $
 .\"
 .Dd December 31, 1995
 .Os FreeBSD
diff --git a/share/man/man9/devfs_link.9 b/share/man/man9/devfs_link.9
index 92b01ffbddaa..758e45aad758 100644
--- a/share/man/man9/devfs_link.9
+++ b/share/man/man9/devfs_link.9
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/devfs_link.9,v 1.10.2.2 1999/08/29 16:47:22 peter Exp $
 .\"
 .Dd December 31, 1995
 .Os FreeBSD
diff --git a/share/man/man9/devfs_remove_dev.9 b/share/man/man9/devfs_remove_dev.9
index 248e468cfef4..5e3c2ea1ee83 100644
--- a/share/man/man9/devfs_remove_dev.9
+++ b/share/man/man9/devfs_remove_dev.9
@@ -29,7 +29,7 @@
 .\" -translation to english:
 .\" - You can't claim it's yours without admitting to the bits I wrote.
 .\" - You don't need to say anything in binary releases unless asked.
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/devfs_remove_dev.9,v 1.4.2.1 1999/08/29 16:47:22 peter Exp $
 .\"
 .Dd December 25, 1997
 .Os FreeBSD
diff --git a/share/man/man9/device.9 b/share/man/man9/device.9
index e5792da2173c..7ac161d51988 100644
--- a/share/man/man9/device.9
+++ b/share/man/man9/device.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device.9,v 1.1.2.3 1999/08/29 16:47:23 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE 9
diff --git a/share/man/man9/device_add_child.9 b/share/man/man9/device_add_child.9
index de4ef9f71108..d07881b1531c 100644
--- a/share/man/man9/device_add_child.9
+++ b/share/man/man9/device_add_child.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_add_child.9,v 1.1.2.2 1999/08/29 16:47:23 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_ADD_CHILD 9
diff --git a/share/man/man9/device_delete_child.9 b/share/man/man9/device_delete_child.9
index 195c0f82bd83..b2f05e268321 100644
--- a/share/man/man9/device_delete_child.9
+++ b/share/man/man9/device_delete_child.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_delete_child.9,v 1.1.2.2 1999/08/29 16:47:23 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_DELETE_CHILD 9
diff --git a/share/man/man9/device_enable.9 b/share/man/man9/device_enable.9
index 7185dba397ff..d8ff5ac7e8ea 100644
--- a/share/man/man9/device_enable.9
+++ b/share/man/man9/device_enable.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_enable.9,v 1.1.2.2 1999/08/29 16:47:23 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_ENABLE 9
diff --git a/share/man/man9/device_find_child.9 b/share/man/man9/device_find_child.9
index 56b1d8ccbc71..191f3514460a 100644
--- a/share/man/man9/device_find_child.9
+++ b/share/man/man9/device_find_child.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_find_child.9,v 1.1.2.3 1999/08/29 16:47:23 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_FIND_CHILD 9
diff --git a/share/man/man9/device_get_devclass.9 b/share/man/man9/device_get_devclass.9
index 0b060cd40186..092977af4147 100644
--- a/share/man/man9/device_get_devclass.9
+++ b/share/man/man9/device_get_devclass.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_get_devclass.9,v 1.1.2.2 1999/08/29 16:47:23 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_GET_DEVCLASS 9
diff --git a/share/man/man9/device_get_driver.9 b/share/man/man9/device_get_driver.9
index 67fd91ee2957..eee849ad68e4 100644
--- a/share/man/man9/device_get_driver.9
+++ b/share/man/man9/device_get_driver.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_get_driver.9,v 1.1.2.2 1999/08/29 16:47:24 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_GET_DRIVER 9
diff --git a/share/man/man9/device_get_ivars.9 b/share/man/man9/device_get_ivars.9
index 56691170d4f0..ed992b138ac6 100644
--- a/share/man/man9/device_get_ivars.9
+++ b/share/man/man9/device_get_ivars.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_get_ivars.9,v 1.1.2.2 1999/08/29 16:47:24 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_GET_IVARS 9
diff --git a/share/man/man9/device_get_softc.9 b/share/man/man9/device_get_softc.9
index 1a40f7eeb04c..359486ab10a2 100644
--- a/share/man/man9/device_get_softc.9
+++ b/share/man/man9/device_get_softc.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_get_softc.9,v 1.1.2.2 1999/08/29 16:47:24 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_GET_SOFTC 9
diff --git a/share/man/man9/device_get_state.9 b/share/man/man9/device_get_state.9
index f80e19b2a4c8..8d6b4c3219b8 100644
--- a/share/man/man9/device_get_state.9
+++ b/share/man/man9/device_get_state.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_get_state.9,v 1.1.2.2 1999/08/29 16:47:24 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_GET_STATE 9
diff --git a/share/man/man9/device_get_unit.9 b/share/man/man9/device_get_unit.9
index 7c2a83f87e0e..935b4ce04289 100644
--- a/share/man/man9/device_get_unit.9
+++ b/share/man/man9/device_get_unit.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_get_unit.9,v 1.1.2.2 1999/08/29 16:47:24 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_GET_UNIT 9
diff --git a/share/man/man9/device_probe_and_attach.9 b/share/man/man9/device_probe_and_attach.9
index bbe69552979a..4b97164cd61b 100644
--- a/share/man/man9/device_probe_and_attach.9
+++ b/share/man/man9/device_probe_and_attach.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_probe_and_attach.9,v 1.1.2.2 1999/08/29 16:47:24 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_PROBE_AND_ATTACH 9
diff --git a/share/man/man9/device_set_desc.9 b/share/man/man9/device_set_desc.9
index 5f4eea446637..13c2be726ece 100644
--- a/share/man/man9/device_set_desc.9
+++ b/share/man/man9/device_set_desc.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_set_desc.9,v 1.1.2.2 1999/08/29 16:47:24 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_SET_DESC 9
diff --git a/share/man/man9/devstat.9 b/share/man/man9/devstat.9
index 224199849388..24022c82ea23 100644
--- a/share/man/man9/devstat.9
+++ b/share/man/man9/devstat.9
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/devstat.9,v 1.1.2.5 1999/09/21 19:30:45 phantom Exp $
 .\"
 .Dd May 22, 1998
 .Dt DEVSTAT 9
diff --git a/share/man/man9/driver.9 b/share/man/man9/driver.9
index e1d28cbbf09f..a3147075019b 100644
--- a/share/man/man9/driver.9
+++ b/share/man/man9/driver.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/driver.9,v 1.1.2.2 1999/08/29 16:47:25 peter Exp $
 .\"
 .Dd June 16, 1998
 .Dt DRIVER 9
diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9
index 49208230c92d..e95f2876b08e 100644
--- a/share/man/man9/ifnet.9
+++ b/share/man/man9/ifnet.9
@@ -26,7 +26,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/ifnet.9,v 1.6.2.3 1999/09/15 08:51:50 ru Exp $
 .Dd January 15, 1997
 .Os FreeBSD 3.0
 .Dt IFNET 9
diff --git a/share/man/man9/intro.9 b/share/man/man9/intro.9
index 56f6bfb61398..e33f38be1a73 100644
--- a/share/man/man9/intro.9
+++ b/share/man/man9/intro.9
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/intro.9,v 1.8.2.2 1999/08/29 16:47:25 peter Exp $
 .\"
 .Dd December 13, 1995
 .Dt INTRO 9
diff --git a/share/man/man9/namei.9 b/share/man/man9/namei.9
index aa3f0913700b..13f20e46fb86 100644
--- a/share/man/man9/namei.9
+++ b/share/man/man9/namei.9
@@ -30,7 +30,7 @@
 .\" If you integrate this manpage in another OS, I'd appreciate a note 
 .\"	- eivind@freebsd.org
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/namei.9,v 1.1.2.5 1999/10/30 15:27:56 phantom Exp $
 .\"
 .Dd September 26th, 1998
 .Os
diff --git a/share/man/man9/posix4.9 b/share/man/man9/posix4.9
index 3a02d7360b99..e3025b8353d0 100644
--- a/share/man/man9/posix4.9
+++ b/share/man/man9/posix4.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/posix4.9,v 1.3.2.2 1999/08/29 16:47:25 peter Exp $
 .Dd March 1, 1998
 .Dt POSIX.1B 9
 .Os FreeBSD 3.0
diff --git a/share/man/man9/rtalloc.9 b/share/man/man9/rtalloc.9
index db0d4b4f31e8..67a7d6c22d04 100644
--- a/share/man/man9/rtalloc.9
+++ b/share/man/man9/rtalloc.9
@@ -26,7 +26,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/rtalloc.9,v 1.7.2.1 1999/08/29 16:47:26 peter Exp $
 .Dd October 8, 1996
 .Os
 .Dt RTALLOC 9
diff --git a/share/man/man9/rtentry.9 b/share/man/man9/rtentry.9
index ac24d8e1a1d8..85163c791955 100644
--- a/share/man/man9/rtentry.9
+++ b/share/man/man9/rtentry.9
@@ -26,7 +26,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/rtentry.9,v 1.8.2.2 1999/08/29 16:47:26 peter Exp $
 .Dd October 8, 1996
 .Os
 .Dt RTENTRY 9
diff --git a/share/man/man9/scsiconf.9 b/share/man/man9/scsiconf.9
index de4d24adad21..9a1d84b142fe 100644
--- a/share/man/man9/scsiconf.9
+++ b/share/man/man9/scsiconf.9
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/scsiconf.9,v 1.6.2.1 1999/08/29 16:47:26 peter Exp $
 .\"
 .Dd January 29, 1997
 .Dt SCSICONF 9
diff --git a/share/man/man9/sd.9 b/share/man/man9/sd.9
index ee17ffcd8bb4..b33c2b6bdd49 100644
--- a/share/man/man9/sd.9
+++ b/share/man/man9/sd.9
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/sd.9,v 1.5.2.1 1999/08/29 16:47:26 peter Exp $
 .\"
 .Dd February 1, 1997
 .Dt SD 9
diff --git a/share/man/man9/sleep.9 b/share/man/man9/sleep.9
index a02fe2523835..1f6bd01f7962 100644
--- a/share/man/man9/sleep.9
+++ b/share/man/man9/sleep.9
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/sleep.9,v 1.13.2.4 1999/11/03 10:41:16 joerg Exp $
 .\" "
 .Dd December 17, 1998
 .Os
diff --git a/share/man/man9/spl.9 b/share/man/man9/spl.9
index 2aa96ebdc59d..0d8590dfcc9e 100644
--- a/share/man/man9/spl.9
+++ b/share/man/man9/spl.9
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/spl.9,v 1.7.2.1 1999/08/29 16:47:27 peter Exp $
 .\" "
 .Dd July 21, 1996
 .Os
diff --git a/share/man/man9/st.9 b/share/man/man9/st.9
index e424db9d6257..5641f4e30071 100644
--- a/share/man/man9/st.9
+++ b/share/man/man9/st.9
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/st.9,v 1.5.2.1 1999/08/29 16:47:27 peter Exp $
 .\"
 .Dd February 1, 1997
 .Dt ST 9
diff --git a/share/man/man9/style.9 b/share/man/man9/style.9
index 831ea33cfe76..3f3b3c9a679d 100644
--- a/share/man/man9/style.9
+++ b/share/man/man9/style.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/style.9,v 1.22.2.7 1999/10/10 09:29:31 cpiazza Exp $
 .\"
 .Dd December 14, 1995
 .Dt STYLE 9
diff --git a/share/man/man9/suser.9 b/share/man/man9/suser.9
index 8af8187ab0b5..8d1f3c44c38c 100644
--- a/share/man/man9/suser.9
+++ b/share/man/man9/suser.9
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/suser.9,v 1.5.2.1 1999/08/29 16:47:28 peter Exp $
 .\"
 .Dd Oct 15, 1996
 .Dt SUSER 9
diff --git a/share/man/man9/timeout.9 b/share/man/man9/timeout.9
index 0857d715c41c..c9f76ae19eaa 100644
--- a/share/man/man9/timeout.9
+++ b/share/man/man9/timeout.9
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/timeout.9,v 1.7.2.1 1999/08/29 16:47:28 peter Exp $
 .\"
 .Dd September 10, 1996
 .Dt TIMEOUT 9
diff --git a/share/man/man9/uio.9 b/share/man/man9/uio.9
index b2aa68403f55..0654934a9459 100644
--- a/share/man/man9/uio.9
+++ b/share/man/man9/uio.9
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/uio.9,v 1.4.2.1 1999/08/29 16:47:29 peter Exp $
 .\" "
 .Dd February 2, 1997
 .Os
diff --git a/share/man/man9/vget.9 b/share/man/man9/vget.9
index b0d4c5758b50..d6dd08b6cc52 100644
--- a/share/man/man9/vget.9
+++ b/share/man/man9/vget.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vget.9,v 1.4.2.1 1999/08/29 16:47:29 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/vnode.9 b/share/man/man9/vnode.9
index 1810a291a283..13d4de6da16e 100644
--- a/share/man/man9/vnode.9
+++ b/share/man/man9/vnode.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vnode.9,v 1.7.2.2 1999/08/29 16:47:30 peter Exp $
 .\"
 .Dd June 30, 1999
 .Os
diff --git a/share/man/man9/vput.9 b/share/man/man9/vput.9
index 88f829aaa3db..98a47dd3dad6 100644
--- a/share/man/man9/vput.9
+++ b/share/man/man9/vput.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vput.9,v 1.5.2.1 1999/08/29 16:47:30 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/vref.9 b/share/man/man9/vref.9
index 8bbbfaf028fc..03d8b0fefc57 100644
--- a/share/man/man9/vref.9
+++ b/share/man/man9/vref.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vref.9,v 1.5.2.1 1999/08/29 16:47:30 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/vrele.9 b/share/man/man9/vrele.9
index a5c0e751ad3e..f41f9e11fca4 100644
--- a/share/man/man9/vrele.9
+++ b/share/man/man9/vrele.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vrele.9,v 1.5.2.1 1999/08/29 16:47:31 peter Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/misc/Makefile b/share/misc/Makefile
index f437dc04e7f1..d71190990504 100644
--- a/share/misc/Makefile
+++ b/share/misc/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/misc/Makefile,v 1.15.2.1 1999/08/29 16:47:37 peter Exp $
 
 FILES=	ascii birthtoken bsd-family-tree eqnchar flowers init.ee inter.phone \
 	iso3166 iso639 man.template mdoc.template operator scsi_modes
diff --git a/share/misc/inter.phone b/share/misc/inter.phone
index e0f4c45e6b3e..760a125a3623 100644
--- a/share/misc/inter.phone
+++ b/share/misc/inter.phone
@@ -1,6 +1,6 @@
 # Country Code : City Code : City : Country
 #	@(#)inter.phone	8.1 (Berkeley) 6/9/93
-# $FreeBSD$
+# $FreeBSD: src/share/misc/inter.phone,v 1.17.2.1 1999/08/29 16:47:38 peter Exp $
 #
 7:095:Moscow:Russia
 7:::Kazakhstan
diff --git a/share/misc/iso3166 b/share/misc/iso3166
index a6fe68cf00b8..e0c627bcb207 100644
--- a/share/misc/iso3166
+++ b/share/misc/iso3166
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/misc/iso3166,v 1.4.2.2 1999/08/29 16:47:38 peter Exp $
 #
 # ISO 3166 country codes
 # Ths includes many places that are not legally independent countries,
diff --git a/share/misc/iso639 b/share/misc/iso639
index a321f526b796..5c2d710b126d 100644
--- a/share/misc/iso639
+++ b/share/misc/iso639
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/misc/iso639,v 1.1.2.1 1999/08/29 16:47:39 peter Exp $
 #
 # ISO 639 language codes
 #
diff --git a/share/mk/Makefile b/share/mk/Makefile
index e8abc6348f67..f6c9267d0e99 100644
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/Makefile,v 1.21.2.4 1999/08/29 16:47:40 peter Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
 
 FILES=	bsd.README
diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index 6a0cee323eb6..efb72249f09c 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -1,5 +1,5 @@
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.README,v 1.13.2.1 1999/08/29 16:47:40 peter Exp $
 
 XXX This document is seriously out of date, it is currenly being revised.
 
diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index 4a4f7b4742aa..ef16bc3fbb0e 100644
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.dep.mk,v 1.26.2.1 1999/08/29 16:47:41 peter Exp $
 #
 # The include file <bsd.dep.mk> handles Makefile dependencies.
 #
diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
index 000e75a8ab90..fe18281a1a6b 100644
--- a/share/mk/bsd.doc.mk
+++ b/share/mk/bsd.doc.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.doc.mk	5.3 (Berkeley) 1/2/91
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.doc.mk,v 1.46.2.1 1999/08/29 16:47:41 peter Exp $
 #
 # The include file <bsd.doc.mk> handles installing BSD troff documents.
 #
diff --git a/share/mk/bsd.docb.mk b/share/mk/bsd.docb.mk
index 0e5df47b4d2d..c0f97420a5b0 100644
--- a/share/mk/bsd.docb.mk
+++ b/share/mk/bsd.docb.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.docb.mk,v 1.3.2.1 1999/08/29 16:47:42 peter Exp $
 #
 # The include file <bsd.docb.mk> handles installing SGML/docbook documents.
 #
diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk
index 373ec3bb62c1..fe7dadc98ae6 100644
--- a/share/mk/bsd.info.mk
+++ b/share/mk/bsd.info.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.info.mk,v 1.54.2.1 1999/08/29 16:47:42 peter Exp $
 #
 # The include file <bsd.info.mk> handles installing GNU (tech)info files.
 # Texinfo is a documentation system that uses a single source
diff --git a/share/mk/bsd.kern.mk b/share/mk/bsd.kern.mk
index c4a268a09cb7..073569ba80c6 100644
--- a/share/mk/bsd.kern.mk
+++ b/share/mk/bsd.kern.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.kern.mk,v 1.12.2.1 1999/08/29 16:47:43 peter Exp $
 
 #
 # Warning flags for compiling the kernel and components of the kernel.
diff --git a/share/mk/bsd.kmod.mk b/share/mk/bsd.kmod.mk
index f8e4258c5aa2..14114f1bea20 100644
--- a/share/mk/bsd.kmod.mk
+++ b/share/mk/bsd.kmod.mk
@@ -1,5 +1,5 @@
 #	From: @(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.kmod.mk,v 1.58.2.1 1999/08/29 16:47:43 peter Exp $
 #
 # The include file <bsd.kmod.mk> handles installing Loadable Kernel Modules.
 #
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 2a860a3577ad..83d8d2673627 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.lib.mk	5.26 (Berkeley) 5/2/91
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.84.2.2 1999/08/29 16:47:43 peter Exp $
 #
 
 .if !target(__initialized__)
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index 4bd00747993f..a84cd7750ed2 100644
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.libnames.mk,v 1.20.2.3 1999/11/22 07:08:06 julian Exp $
 #
 # The include file <bsd.libnames.mk> define library names. 
 # Other include files (e.g. bsd.prog.mk, bsd.lib.mk) include this 
diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
index 3c47134dbbc1..a8c2543db901 100644
--- a/share/mk/bsd.man.mk
+++ b/share/mk/bsd.man.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.man.mk,v 1.30.2.1 1999/08/29 16:47:44 peter Exp $
 #
 # The include file <bsd.man.mk> handles installing manual pages and 
 # their links.
diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk
index 0917a35ecf99..fa970ee465ed 100644
--- a/share/mk/bsd.obj.mk
+++ b/share/mk/bsd.obj.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.obj.mk,v 1.26.2.1 1999/08/29 16:47:45 peter Exp $
 #
 # The include file <bsd.obj.mk> handles creating the 'obj' directory
 # and cleaning up object files, etc.
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 88f3f5218594..e27b1c753898 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.own.mk,v 1.21.2.2 1999/11/09 00:13:13 phantom Exp $
 #
 # The include file <bsd.own.mk> set common variables for owner,
 # group, mode, and directories. Defaults are in brackets.
diff --git a/share/mk/bsd.port.post.mk b/share/mk/bsd.port.post.mk
index 82c203c86ec3..830365ba218c 100644
--- a/share/mk/bsd.port.post.mk
+++ b/share/mk/bsd.port.post.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.port.post.mk,v 1.1.4.2 1999/08/29 16:47:46 peter Exp $
 
 AFTERPORTMK=	yes
 
diff --git a/share/mk/bsd.port.pre.mk b/share/mk/bsd.port.pre.mk
index 4c22c64d0844..79c710703734 100644
--- a/share/mk/bsd.port.pre.mk
+++ b/share/mk/bsd.port.pre.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.port.pre.mk,v 1.1.4.2 1999/08/29 16:47:46 peter Exp $
 
 BEFOREPORTMK=	yes
 
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 9d29b79f98f0..e37a5a1f7e58 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.80.2.2 1999/08/29 16:47:47 peter Exp $
 
 .if !target(__initialized__)
 __initialized__:
diff --git a/share/mk/bsd.sgml.mk b/share/mk/bsd.sgml.mk
index a4de905a32ea..fa21c23f8387 100644
--- a/share/mk/bsd.sgml.mk
+++ b/share/mk/bsd.sgml.mk
@@ -1,7 +1,7 @@
 #       bsd.sgml.mk - 8 Sep 1995 John Fieber
 #       This file is in the public domain.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.sgml.mk,v 1.27.2.1 1999/08/29 16:47:47 peter Exp $
 #
 # The include file <bsd.sgml.mk> handles installing sgml documents.
 #
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk
index 4c51cebab5a0..1df9ffe5efd2 100644
--- a/share/mk/bsd.subdir.mk
+++ b/share/mk/bsd.subdir.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.subdir.mk	5.9 (Berkeley) 2/1/91
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.subdir.mk,v 1.25.2.1 1999/08/29 16:47:48 peter Exp $
 #
 # The include file <bsd.subdir.mk> contains the default targets
 # for building subdirectories. 
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index abdc9f97a9cc..512459adab9f 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,5 +1,5 @@
 #	from: @(#)sys.mk	8.2 (Berkeley) 3/21/94
-# $FreeBSD$
+# $FreeBSD: src/share/mk/sys.mk,v 1.43.2.1 1999/08/29 16:47:48 peter Exp $
 
 unix		?=	We run FreeBSD, not UNIX.
 
diff --git a/share/skel/dot.cshrc b/share/skel/dot.cshrc
index 45f376775af0..d64d8d0b6ddf 100644
--- a/share/skel/dot.cshrc
+++ b/share/skel/dot.cshrc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/skel/dot.cshrc,v 1.9.2.1 1999/08/29 16:47:50 peter Exp $
 #
 # .cshrc - csh resource script, read at beginning 
 #	   of execution by each shell
diff --git a/share/skel/dot.login b/share/skel/dot.login
index 9282e599230b..b8e3d37c701b 100644
--- a/share/skel/dot.login
+++ b/share/skel/dot.login
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/skel/dot.login,v 1.11.2.2 1999/12/13 05:47:28 dcs Exp $
 #
 # .login - csh login script, read by login shell, 
 #	   after `.cshrc' at login.
diff --git a/share/skel/dot.login_conf b/share/skel/dot.login_conf
index f4ac63b5812d..bb59905c5995 100644
--- a/share/skel/dot.login_conf
+++ b/share/skel/dot.login_conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/skel/dot.login_conf,v 1.1.4.1 1999/08/29 16:47:51 peter Exp $
 #
 # see login.conf(5)
 #
diff --git a/share/skel/dot.mail_aliases b/share/skel/dot.mail_aliases
index 98e32ce47e48..44e0e917cddb 100644
--- a/share/skel/dot.mail_aliases
+++ b/share/skel/dot.mail_aliases
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/skel/dot.mail_aliases,v 1.1.4.1 1999/08/29 16:47:51 peter Exp $
 #
 # .mail_aliases - private mail aliases
 #
diff --git a/share/skel/dot.mailrc b/share/skel/dot.mailrc
index 9ab6ac0c8e8c..f683eba23145 100644
--- a/share/skel/dot.mailrc
+++ b/share/skel/dot.mailrc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/skel/dot.mailrc,v 1.5.2.1 1999/08/29 16:47:51 peter Exp $
 #
 # .mailrc - mail resources
 #
diff --git a/share/skel/dot.profile b/share/skel/dot.profile
index a5d3713fc00f..603558fc19ab 100644
--- a/share/skel/dot.profile
+++ b/share/skel/dot.profile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/skel/dot.profile,v 1.18.2.1 1999/08/29 16:47:52 peter Exp $
 #
 # .profile - Bourne Shell startup script for login shells
 #
diff --git a/share/skel/dot.rhosts b/share/skel/dot.rhosts
index 30132d57c4be..1eb2dc871f4c 100644
--- a/share/skel/dot.rhosts
+++ b/share/skel/dot.rhosts
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/skel/dot.rhosts,v 1.5.2.1 1999/08/29 16:47:52 peter Exp $
 #
 # .rhosts - trusted remote host name and user data base
 #
diff --git a/share/skel/dot.shrc b/share/skel/dot.shrc
index fbc2feec7e70..f95a5be35012 100644
--- a/share/skel/dot.shrc
+++ b/share/skel/dot.shrc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/skel/dot.shrc,v 1.1.4.1 1999/08/29 16:47:53 peter Exp $
 #
 # .shrc - bourne shell startup file 
 #
diff --git a/share/syscons/Makefile b/share/syscons/Makefile
index 9cbf100f13b9..56f2285d86c0 100644
--- a/share/syscons/Makefile
+++ b/share/syscons/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/Makefile,v 1.3.2.1 1999/08/29 16:47:54 peter Exp $
 
 SUBDIR= fonts keymaps scrnmaps
 
diff --git a/share/syscons/fonts/INDEX.fonts b/share/syscons/fonts/INDEX.fonts
index 2673d968b655..70a535f87f5e 100644
--- a/share/syscons/fonts/INDEX.fonts
+++ b/share/syscons/fonts/INDEX.fonts
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/INDEX.fonts,v 1.8.2.3 1999/09/20 10:26:18 jmas Exp $
 #
 # database for vidfont(8) 
 #
diff --git a/share/syscons/fonts/Makefile b/share/syscons/fonts/Makefile
index cc62fb2b6a16..26c3b1c45903 100644
--- a/share/syscons/fonts/Makefile
+++ b/share/syscons/fonts/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/Makefile,v 1.18.2.1 1999/08/29 16:47:55 peter Exp $
 
 FONTS=	cp437-8x8.fnt cp437-8x14.fnt cp437-8x16.fnt \
 	cp437-thin-8x8.fnt cp437-thin-8x16.fnt \
diff --git a/share/syscons/keymaps/INDEX.keymaps b/share/syscons/keymaps/INDEX.keymaps
index b99aeca93802..872e3c9bf7fc 100644
--- a/share/syscons/keymaps/INDEX.keymaps
+++ b/share/syscons/keymaps/INDEX.keymaps
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/INDEX.keymaps,v 1.25.2.7 1999/11/30 13:48:40 yokota Exp $
 #
 # database for kbdmap(8) 
 #
diff --git a/share/syscons/keymaps/Makefile b/share/syscons/keymaps/Makefile
index 24051fda15c3..1dead4022975 100644
--- a/share/syscons/keymaps/Makefile
+++ b/share/syscons/keymaps/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/Makefile,v 1.33.2.6 1999/11/29 01:25:15 yokota Exp $
 
 KEYMAPS=  INDEX.keymaps
 KEYMAPS+= be.iso.kbd be.iso.acc.kbd
diff --git a/share/syscons/keymaps/estonian.cp850.kbd b/share/syscons/keymaps/estonian.cp850.kbd
index 37828df4aef4..4133deacc6bb 100644
--- a/share/syscons/keymaps/estonian.cp850.kbd
+++ b/share/syscons/keymaps/estonian.cp850.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/estonian.cp850.kbd,v 1.1.2.1 1999/11/29 01:25:15 yokota Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/estonian.iso.kbd b/share/syscons/keymaps/estonian.iso.kbd
index 8c8966d12972..57f018b7cc63 100644
--- a/share/syscons/keymaps/estonian.iso.kbd
+++ b/share/syscons/keymaps/estonian.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/estonian.iso.kbd,v 1.1.2.1 1999/11/29 01:25:15 yokota Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/estonian.iso15.kbd b/share/syscons/keymaps/estonian.iso15.kbd
index 4291fc1a29aa..68e8c7a657ec 100644
--- a/share/syscons/keymaps/estonian.iso15.kbd
+++ b/share/syscons/keymaps/estonian.iso15.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/estonian.iso15.kbd,v 1.1.2.1 1999/11/29 01:25:16 yokota Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/swissfrench.cp850.kbd b/share/syscons/keymaps/swissfrench.cp850.kbd
index 5c90e8e867bb..be049ac7c704 100644
--- a/share/syscons/keymaps/swissfrench.cp850.kbd
+++ b/share/syscons/keymaps/swissfrench.cp850.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/swissfrench.cp850.kbd,v 1.1.2.1 1999/11/29 01:25:16 yokota Exp $
 #
 # swiss-french cp850 keymap
 # original 13.06.1998 by Francois Tamone <tamone@eig.unige.ch>
diff --git a/share/syscons/keymaps/swissfrench.iso.acc.kbd b/share/syscons/keymaps/swissfrench.iso.acc.kbd
index 9d993240483c..7dcbac0bba3c 100644
--- a/share/syscons/keymaps/swissfrench.iso.acc.kbd
+++ b/share/syscons/keymaps/swissfrench.iso.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/swissfrench.iso.acc.kbd,v 1.1.2.1 1999/11/29 01:25:16 yokota Exp $
 #
 # swissfrench ISO 8859-1 keymap, accent keys
 # created 14.11.1999 by Martin Blapp <mb@imp.ch>
diff --git a/share/syscons/keymaps/swissfrench.iso.kbd b/share/syscons/keymaps/swissfrench.iso.kbd
index 953a505561a7..f962de0927ed 100644
--- a/share/syscons/keymaps/swissfrench.iso.kbd
+++ b/share/syscons/keymaps/swissfrench.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/swissfrench.iso.kbd,v 1.2.2.2 1999/11/29 01:25:16 yokota Exp $
 #
 # swissfrench ISO 8859-1 keymap, no dead keys
 # created 14.11.1999 by Martin Blapp <mb@imp.ch>
diff --git a/share/syscons/keymaps/swissgerman.cp850.kbd b/share/syscons/keymaps/swissgerman.cp850.kbd
index 448fbdbbf262..0555d3308336 100644
--- a/share/syscons/keymaps/swissgerman.cp850.kbd
+++ b/share/syscons/keymaps/swissgerman.cp850.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/swissgerman.cp850.kbd,v 1.1.2.1 1999/11/29 01:25:16 yokota Exp $
 #
 # swiss-german cp850 keymap
 # original 21.10.1996 by Adrian Steinmann <ast@marabu.ch>
diff --git a/share/syscons/keymaps/swissgerman.iso.acc.kbd b/share/syscons/keymaps/swissgerman.iso.acc.kbd
index 3c1c5420999d..54428b2b8358 100644
--- a/share/syscons/keymaps/swissgerman.iso.acc.kbd
+++ b/share/syscons/keymaps/swissgerman.iso.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/swissgerman.iso.acc.kbd,v 1.1.2.1 1999/11/29 01:25:16 yokota Exp $
 #
 # swissgerman ISO 8859-1 keymap, accent keys
 # created 14.11.1999 by Martin Blapp <mb@imp.ch>
diff --git a/share/syscons/keymaps/swissgerman.iso.kbd b/share/syscons/keymaps/swissgerman.iso.kbd
index 55d5ddaf0bd4..1a2671b495d3 100644
--- a/share/syscons/keymaps/swissgerman.iso.kbd
+++ b/share/syscons/keymaps/swissgerman.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/swissgerman.iso.kbd,v 1.3.2.2 1999/11/29 01:25:16 yokota Exp $
 #
 # swissgerman ISO 8859-1 keymap, no dead keys
 # created 14.11.1999 by Martin Blapp <mb@imp.ch>
diff --git a/share/syscons/scrnmaps/Makefile b/share/syscons/scrnmaps/Makefile
index f9ad6c4d174e..000c5e45a3cf 100644
--- a/share/syscons/scrnmaps/Makefile
+++ b/share/syscons/scrnmaps/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/scrnmaps/Makefile,v 1.12.2.1 1999/08/29 16:48:00 peter Exp $
 
 SCRMAPS = koi8-r2cp866.scm iso-8859-1_to_cp437.scm
 
diff --git a/share/tabset/Makefile b/share/tabset/Makefile
index 937f16bedc0f..969fe532348f 100644
--- a/share/tabset/Makefile
+++ b/share/tabset/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/tabset/Makefile,v 1.8.2.1 1999/08/29 16:48:02 peter Exp $
 
 FILES=	3101 9837 aa aed512 beehive diablo dtc382 hp700-wy ibm3101 std \
 	stdcrt tandem653 teleray vt100 vt100-w wyse-adds xerox1720 xerox1730 \
diff --git a/share/termcap/Makefile b/share/termcap/Makefile
index 8d586b5d2a60..a7720362d15b 100644
--- a/share/termcap/Makefile
+++ b/share/termcap/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/termcap/Makefile,v 1.11.2.1 1999/08/29 16:48:03 peter Exp $
 
 # reorder gives an editor command for most common terminals
 # (in reverse order from n'th to 1'st most commonly used)
diff --git a/share/termcap/termcap.5 b/share/termcap/termcap.5
index c713ab91cc48..e2fb7b900ca8 100644
--- a/share/termcap/termcap.5
+++ b/share/termcap/termcap.5
@@ -51,7 +51,7 @@
 .\" *                                                                          *
 .\" ***************************************************************************/
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/termcap/termcap.5,v 1.9.2.1 1999/08/29 16:48:03 peter Exp $
 .\"
 .Dd April 16, 1994
 .Dt TERMCAP 5
diff --git a/share/termcap/termcap.src b/share/termcap/termcap.src
index 1095f135f736..fa622cffd71d 100644
--- a/share/termcap/termcap.src
+++ b/share/termcap/termcap.src
@@ -30,7 +30,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)termcap.src	8.2 (Berkeley) 11/17/93
-# $FreeBSD$
+# $FreeBSD: src/share/termcap/termcap.src,v 1.84.2.2 1999/11/22 10:36:39 jkoshy Exp $
 
 #	Termcap source file
 #	John Kunze, Berkeley
diff --git a/share/timedef/Makefile b/share/timedef/Makefile
index da947e9129e8..9295f18cfc0e 100644
--- a/share/timedef/Makefile
+++ b/share/timedef/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/Makefile,v 1.4.2.1 1999/08/29 16:48:05 peter Exp $
 
 SUBDIR = data
 
diff --git a/share/timedef/data/Makefile b/share/timedef/data/Makefile
index 2057b51c78a1..3dd0feb97fcd 100644
--- a/share/timedef/data/Makefile
+++ b/share/timedef/data/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/data/Makefile,v 1.28.2.5 1999/08/29 16:48:06 peter Exp $
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
diff --git a/share/timedef/data/da_DK.ISO_8859-1.src b/share/timedef/data/da_DK.ISO_8859-1.src
index 9b20264403d3..8abba609b1b8 100644
--- a/share/timedef/data/da_DK.ISO_8859-1.src
+++ b/share/timedef/data/da_DK.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/data/da_DK.ISO_8859-1.src,v 1.3.2.1 1999/08/29 16:48:07 peter Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/de_AT.ISO_8859-1.src b/share/timedef/data/de_AT.ISO_8859-1.src
index a54e69c8af5d..94d1f624d87d 100644
--- a/share/timedef/data/de_AT.ISO_8859-1.src
+++ b/share/timedef/data/de_AT.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/data/de_AT.ISO_8859-1.src,v 1.1.4.1 1999/08/29 16:48:07 peter Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/de_DE.ISO_8859-1.src b/share/timedef/data/de_DE.ISO_8859-1.src
index 1911dd5c8636..766097d642b3 100644
--- a/share/timedef/data/de_DE.ISO_8859-1.src
+++ b/share/timedef/data/de_DE.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/data/de_DE.ISO_8859-1.src,v 1.6.2.1 1999/08/29 16:48:08 peter Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/en_GB.ISO_8859-1.src b/share/timedef/data/en_GB.ISO_8859-1.src
index d75253801b4c..1ccacb384fad 100644
--- a/share/timedef/data/en_GB.ISO_8859-1.src
+++ b/share/timedef/data/en_GB.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/data/en_GB.ISO_8859-1.src,v 1.3.2.1 1999/08/29 16:48:08 peter Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/en_US.ISO_8859-1.src b/share/timedef/data/en_US.ISO_8859-1.src
index 24f2c519ff34..339638b8d6ba 100644
--- a/share/timedef/data/en_US.ISO_8859-1.src
+++ b/share/timedef/data/en_US.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/data/en_US.ISO_8859-1.src,v 1.3.2.1 1999/08/29 16:48:09 peter Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/es_ES.ISO_8859-1.src b/share/timedef/data/es_ES.ISO_8859-1.src
index 1eac378fe2de..7da2456765cc 100644
--- a/share/timedef/data/es_ES.ISO_8859-1.src
+++ b/share/timedef/data/es_ES.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/data/es_ES.ISO_8859-1.src,v 1.2.2.1 1999/08/29 16:48:09 peter Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/fi_FI.ISO_8859-1.src b/share/timedef/data/fi_FI.ISO_8859-1.src
index c9a1ec1fec6a..a0cec7fc91a2 100644
--- a/share/timedef/data/fi_FI.ISO_8859-1.src
+++ b/share/timedef/data/fi_FI.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/data/fi_FI.ISO_8859-1.src,v 1.1.4.1 1999/08/29 16:48:09 peter Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/data/fr_FR.ISO_8859-1.src b/share/timedef/data/fr_FR.ISO_8859-1.src
index 0e649b262ef4..276153d21fe8 100644
--- a/share/timedef/data/fr_FR.ISO_8859-1.src
+++ b/share/timedef/data/fr_FR.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/data/fr_FR.ISO_8859-1.src,v 1.4.2.1 1999/08/29 16:48:10 peter Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/hr_HR.ISO_8859-2.src b/share/timedef/data/hr_HR.ISO_8859-2.src
index c0842489663b..054bea37567d 100644
--- a/share/timedef/data/hr_HR.ISO_8859-2.src
+++ b/share/timedef/data/hr_HR.ISO_8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/data/hr_HR.ISO_8859-2.src,v 1.1.4.1 1999/08/29 16:48:10 peter Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/is_IS.ISO_8859-1.src b/share/timedef/data/is_IS.ISO_8859-1.src
index 5ae39bc965d5..2cc16d3719cf 100644
--- a/share/timedef/data/is_IS.ISO_8859-1.src
+++ b/share/timedef/data/is_IS.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/data/is_IS.ISO_8859-1.src,v 1.3.2.1 1999/08/29 16:48:11 peter Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/it_IT.ISO_8859-1.src b/share/timedef/data/it_IT.ISO_8859-1.src
index c95629473aa0..4db5d26142e7 100644
--- a/share/timedef/data/it_IT.ISO_8859-1.src
+++ b/share/timedef/data/it_IT.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/data/it_IT.ISO_8859-1.src,v 1.3.2.2 1999/08/29 16:48:11 peter Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/ja_JP.EUC.src b/share/timedef/data/ja_JP.EUC.src
index 019ec4f136c5..5762b69dc638 100644
--- a/share/timedef/data/ja_JP.EUC.src
+++ b/share/timedef/data/ja_JP.EUC.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/data/ja_JP.EUC.src,v 1.1.4.1 1999/08/29 16:48:12 peter Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/ja_JP.SJIS.src b/share/timedef/data/ja_JP.SJIS.src
index 9a6559beebb2..2547c8c0a359 100644
--- a/share/timedef/data/ja_JP.SJIS.src
+++ b/share/timedef/data/ja_JP.SJIS.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/data/ja_JP.SJIS.src,v 1.3.2.1 1999/08/29 16:48:12 peter Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/ko_KR.EUC.src b/share/timedef/data/ko_KR.EUC.src
index 65fed23993f5..10555ad0d558 100644
--- a/share/timedef/data/ko_KR.EUC.src
+++ b/share/timedef/data/ko_KR.EUC.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/data/ko_KR.EUC.src,v 1.3.4.1 1999/08/29 16:48:12 peter Exp $
 #
 # Choi Jun Ho <jazz.snu.ac.kr>
 # 27 Mar 1997
diff --git a/share/timedef/data/lt_LN.ISO_8859-1.src b/share/timedef/data/lt_LN.ISO_8859-1.src
index e583885b0d8a..0f51c0729561 100644
--- a/share/timedef/data/lt_LN.ISO_8859-1.src
+++ b/share/timedef/data/lt_LN.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/data/lt_LN.ISO_8859-1.src,v 1.1.4.1 1999/08/29 16:48:13 peter Exp $
 # This is Latin. The week with seven days was introduced in the
 # Roman Empire 321 AD. (Konstantin I)
 #
diff --git a/share/timedef/data/nl_NL.ISO_8859-1.src b/share/timedef/data/nl_NL.ISO_8859-1.src
index 57bcb1b3a05f..e1441c6ef8b4 100644
--- a/share/timedef/data/nl_NL.ISO_8859-1.src
+++ b/share/timedef/data/nl_NL.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/data/nl_NL.ISO_8859-1.src,v 1.1.4.1 1999/08/29 16:48:13 peter Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/no_NO.ISO_8859-1.src b/share/timedef/data/no_NO.ISO_8859-1.src
index faea620bcba3..8f4ef5c461af 100644
--- a/share/timedef/data/no_NO.ISO_8859-1.src
+++ b/share/timedef/data/no_NO.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/data/no_NO.ISO_8859-1.src,v 1.5.2.1 1999/08/29 16:48:14 peter Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/pt_PT.ISO_8859-1.src b/share/timedef/data/pt_PT.ISO_8859-1.src
index 355033fb3ac6..569853e292b9 100644
--- a/share/timedef/data/pt_PT.ISO_8859-1.src
+++ b/share/timedef/data/pt_PT.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/data/pt_PT.ISO_8859-1.src,v 1.4.2.1 1999/08/29 16:48:14 peter Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/ru_SU.CP866.src b/share/timedef/data/ru_SU.CP866.src
index b65125e9d113..8a3f3740c465 100644
--- a/share/timedef/data/ru_SU.CP866.src
+++ b/share/timedef/data/ru_SU.CP866.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/data/ru_SU.CP866.src,v 1.7.2.1 1999/08/29 16:48:14 peter Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/ru_SU.KOI8-R.src b/share/timedef/data/ru_SU.KOI8-R.src
index 5328b66623c1..f2211a655a38 100644
--- a/share/timedef/data/ru_SU.KOI8-R.src
+++ b/share/timedef/data/ru_SU.KOI8-R.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/data/ru_SU.KOI8-R.src,v 1.7.2.1 1999/08/29 16:48:15 peter Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/sl_SI.ISO_8859-2.src b/share/timedef/data/sl_SI.ISO_8859-2.src
index 874996ce8489..1b9666bd8432 100644
--- a/share/timedef/data/sl_SI.ISO_8859-2.src
+++ b/share/timedef/data/sl_SI.ISO_8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/data/sl_SI.ISO_8859-2.src,v 1.1.4.1 1999/08/29 16:48:15 peter Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/sv_SE.ISO_8859-1.src b/share/timedef/data/sv_SE.ISO_8859-1.src
index 7778f1a48946..cb576f988750 100644
--- a/share/timedef/data/sv_SE.ISO_8859-1.src
+++ b/share/timedef/data/sv_SE.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/data/sv_SE.ISO_8859-1.src,v 1.1.4.1 1999/08/29 16:48:16 peter Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/data/zh_CN.EUC.src b/share/timedef/data/zh_CN.EUC.src
index 22c0975db769..9a12fc417339 100644
--- a/share/timedef/data/zh_CN.EUC.src
+++ b/share/timedef/data/zh_CN.EUC.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/data/zh_CN.EUC.src,v 1.2.2.1 1999/08/29 16:48:16 peter Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/zh_TW.Big5.src b/share/timedef/data/zh_TW.Big5.src
index b0e0cc572816..2265bb22ac5f 100644
--- a/share/timedef/data/zh_TW.Big5.src
+++ b/share/timedef/data/zh_TW.Big5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/data/zh_TW.Big5.src,v 1.1.2.2 1999/08/29 16:48:17 peter Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile
index 670f4fef32a2..dd5e145e08b1 100644
--- a/share/zoneinfo/Makefile
+++ b/share/zoneinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/zoneinfo/Makefile,v 1.15.2.1 1999/08/29 16:48:23 peter Exp $
 
 CLEANFILES+=	yearistype
 
diff --git a/sys/Makefile b/sys/Makefile
index 99d39ff2a28c..545b0705c11d 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/Makefile,v 1.16.2.2 1999/08/29 16:20:04 peter Exp $
 
 # This is the old aout only boot loader.
 .if	exists(${MACHINE}/boot) && ${OBJFORMAT} == "aout"
diff --git a/sys/alpha/alpha/atomic.s b/sys/alpha/alpha/atomic.s
index 19132522aebd..65b5d05ee84d 100644
--- a/sys/alpha/alpha/atomic.s
+++ b/sys/alpha/alpha/atomic.s
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/atomic.s,v 1.1.2.1 1999/08/29 15:56:21 peter Exp $
  */
 
 #include <machine/asm.h>
diff --git a/sys/alpha/alpha/autoconf.c b/sys/alpha/alpha/autoconf.c
index 4494325a1e29..806e5ed400eb 100644
--- a/sys/alpha/alpha/autoconf.c
+++ b/sys/alpha/alpha/autoconf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.13.2.2 1999/08/29 15:56:21 peter Exp $
  */
 
 #include "opt_bootp.h"
diff --git a/sys/alpha/alpha/busdma_machdep.c b/sys/alpha/alpha/busdma_machdep.c
index ef02204074b0..d5ad8f741769 100644
--- a/sys/alpha/alpha/busdma_machdep.c
+++ b/sys/alpha/alpha/busdma_machdep.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.1.2.1 1999/08/29 15:56:22 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/alpha/clock.c b/sys/alpha/alpha/clock.c
index e14c4bdae42b..9b92fd0bbd25 100644
--- a/sys/alpha/alpha/clock.c
+++ b/sys/alpha/alpha/clock.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/alpha/clock.c,v 1.5.2.3 1999/08/29 15:56:22 peter Exp $ */
 /* $NetBSD: clock.c,v 1.20 1998/01/31 10:32:47 ross Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/clock_if.m b/sys/alpha/alpha/clock_if.m
index 80c6849c5ee3..337ae92cef64 100644
--- a/sys/alpha/alpha/clock_if.m
+++ b/sys/alpha/alpha/clock_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/alpha/alpha/clock_if.m,v 1.2.2.2 1999/08/29 15:56:22 peter Exp $
 #
 
 #include <machine/clockvar.h>
diff --git a/sys/alpha/alpha/cons.c b/sys/alpha/alpha/cons.c
index 75eac1d73a0e..18cdfb4fb18e 100644
--- a/sys/alpha/alpha/cons.c
+++ b/sys/alpha/alpha/cons.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.c	7.2 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/cons.c,v 1.3.2.1 1999/08/29 15:56:23 peter Exp $
  */
 
 #include "opt_devfs.h"
diff --git a/sys/alpha/alpha/cpuconf.c b/sys/alpha/alpha/cpuconf.c
index d70dc873b6fd..4d77efc8cb5f 100644
--- a/sys/alpha/alpha/cpuconf.c
+++ b/sys/alpha/alpha/cpuconf.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.2.2.1 1999/08/29 15:56:23 peter Exp $ */
 /*	$NetBSD: cpuconf.c,v 1.10 1998/03/20 21:48:21 thorpej Exp $	*/
 
 /*
diff --git a/sys/alpha/alpha/dec_axppci_33.c b/sys/alpha/alpha/dec_axppci_33.c
index 09766478c3e9..44c4fcf81175 100644
--- a/sys/alpha/alpha/dec_axppci_33.c
+++ b/sys/alpha/alpha/dec_axppci_33.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.1.2.1 1999/08/29 15:56:24 peter Exp $ */
 /* $NetBSD: dec_axppci_33.c,v 1.38 1998/07/07 08:49:12 ross Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/dec_eb164.c b/sys/alpha/alpha/dec_eb164.c
index 20884072c0a7..419ec73ac241 100644
--- a/sys/alpha/alpha/dec_eb164.c
+++ b/sys/alpha/alpha/dec_eb164.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/alpha/dec_eb164.c,v 1.6.2.1 1999/08/29 15:56:24 peter Exp $ */
 /* $NetBSD: dec_eb164.c,v 1.26 1998/04/17 02:45:19 mjacob Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/dec_eb64plus.c b/sys/alpha/alpha/dec_eb64plus.c
index 19a7bd5aa208..e983b4a84ef3 100644
--- a/sys/alpha/alpha/dec_eb64plus.c
+++ b/sys/alpha/alpha/dec_eb64plus.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/alpha/dec_eb64plus.c,v 1.1.2.1 1999/08/29 15:56:24 peter Exp $ */
 
 /*
  * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
diff --git a/sys/alpha/alpha/dec_kn8ae.c b/sys/alpha/alpha/dec_kn8ae.c
index d205d38e0a39..e63e8115d053 100644
--- a/sys/alpha/alpha/dec_kn8ae.c
+++ b/sys/alpha/alpha/dec_kn8ae.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/alpha/dec_kn8ae.c,v 1.3.2.1 1999/08/29 15:56:25 peter Exp $ */
 /* $NetBSD: dec_kn8ae.c,v 1.15 1998/02/13 00:12:50 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/diskslice_machdep.c b/sys/alpha/alpha/diskslice_machdep.c
index eac7508c4ab5..823ccafe25bd 100644
--- a/sys/alpha/alpha/diskslice_machdep.c
+++ b/sys/alpha/alpha/diskslice_machdep.c
@@ -36,7 +36,7 @@
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
  *	from: i386/isa Id: diskslice_machdep.c,v 1.31 1998/08/10 07:22:14 phk Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/diskslice_machdep.c,v 1.6.2.1 1999/08/29 15:56:25 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/alpha/elf_machdep.c b/sys/alpha/alpha/elf_machdep.c
index 9532e0aafb72..e7d99e49c295 100644
--- a/sys/alpha/alpha/elf_machdep.c
+++ b/sys/alpha/alpha/elf_machdep.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.3.2.2 1999/08/29 15:56:26 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/alpha/exception.s b/sys/alpha/alpha/exception.s
index 417c5ddd9211..a69ea9018223 100644
--- a/sys/alpha/alpha/exception.s
+++ b/sys/alpha/alpha/exception.s
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/alpha/exception.s,v 1.2.2.1 1999/08/29 15:56:27 peter Exp $ */
 /* $NetBSD: locore.s,v 1.47 1998/03/22 07:26:32 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/fp_emulate.c b/sys/alpha/alpha/fp_emulate.c
index ad07a8ea597f..6b858445c75c 100644
--- a/sys/alpha/alpha/fp_emulate.c
+++ b/sys/alpha/alpha/fp_emulate.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/fp_emulate.c,v 1.2.2.2 1999/08/29 15:56:27 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/alpha/genassym.c b/sys/alpha/alpha/genassym.c
index 7cfa27ca3f35..ff7203f266a3 100644
--- a/sys/alpha/alpha/genassym.c
+++ b/sys/alpha/alpha/genassym.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.4.2.1 1999/08/29 15:56:28 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/alpha/gensetdefs.c b/sys/alpha/alpha/gensetdefs.c
index c58025e2b77e..a2dc812ebc9a 100644
--- a/sys/alpha/alpha/gensetdefs.c
+++ b/sys/alpha/alpha/gensetdefs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/gensetdefs.c,v 1.2.2.1 1999/08/29 15:56:28 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/alpha/alpha/ieee_float.c b/sys/alpha/alpha/ieee_float.c
index 44a6ef373839..54c902f1f5c6 100644
--- a/sys/alpha/alpha/ieee_float.c
+++ b/sys/alpha/alpha/ieee_float.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/ieee_float.c,v 1.1.2.1 1999/08/29 15:56:29 peter Exp $
  */
 
 /*
diff --git a/sys/alpha/alpha/ieee_float.h b/sys/alpha/alpha/ieee_float.h
index ae5b8701a944..dd6c2d1c46b3 100644
--- a/sys/alpha/alpha/ieee_float.h
+++ b/sys/alpha/alpha/ieee_float.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/ieee_float.h,v 1.1.2.1 1999/08/29 15:56:29 peter Exp $
  */
 
 #define S_FORMAT	0	/* IEEE single */
diff --git a/sys/alpha/alpha/in_cksum.c b/sys/alpha/alpha/in_cksum.c
index 945021359587..74f0e85f7333 100644
--- a/sys/alpha/alpha/in_cksum.c
+++ b/sys/alpha/alpha/in_cksum.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/alpha/in_cksum.c,v 1.1.2.1 1999/08/29 15:56:30 peter Exp $ */
 /* $NetBSD: in_cksum.c,v 1.7 1997/09/02 13:18:15 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/interrupt.c b/sys/alpha/alpha/interrupt.c
index 95394560d782..332c18eca422 100644
--- a/sys/alpha/alpha/interrupt.c
+++ b/sys/alpha/alpha/interrupt.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.9.2.1 1999/08/29 15:56:30 peter Exp $ */
 /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/ipl_funcs.c b/sys/alpha/alpha/ipl_funcs.c
index fe761c69135a..4d6a249d32ee 100644
--- a/sys/alpha/alpha/ipl_funcs.c
+++ b/sys/alpha/alpha/ipl_funcs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/ipl_funcs.c,v 1.9.2.2 1999/08/29 15:56:31 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/alpha/alpha/locore.s b/sys/alpha/alpha/locore.s
index 4414fc4166f3..050c6dd654f3 100644
--- a/sys/alpha/alpha/locore.s
+++ b/sys/alpha/alpha/locore.s
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/locore.s,v 1.6.2.1 1999/08/29 15:56:31 peter Exp $
  */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c
index e7b7c1aa5bef..70ebd24f16ba 100644
--- a/sys/alpha/alpha/machdep.c
+++ b/sys/alpha/alpha/machdep.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.30.2.7 1999/09/15 18:45:14 dfr Exp $
  */
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/alpha/alpha/mem.c b/sys/alpha/alpha/mem.c
index 1cb473680436..6332ec52d8b9 100644
--- a/sys/alpha/alpha/mem.c
+++ b/sys/alpha/alpha/mem.c
@@ -38,7 +38,7 @@
  *
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/mem.c,v 1.4.2.1 1999/08/29 15:56:32 peter Exp $
  */
 
 /*
diff --git a/sys/alpha/alpha/pmap.c b/sys/alpha/alpha/pmap.c
index fd08257cb233..2288894ad822 100644
--- a/sys/alpha/alpha/pmap.c
+++ b/sys/alpha/alpha/pmap.c
@@ -43,7 +43,7 @@
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
  *	from:	i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp
  *		with some ideas from NetBSD's alpha pmap
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.12.2.3 1999/08/29 15:56:32 peter Exp $
  */
 
 /*
diff --git a/sys/alpha/alpha/procfs_machdep.c b/sys/alpha/alpha/procfs_machdep.c
index 3e79dea995d6..f606fe1ee253 100644
--- a/sys/alpha/alpha/procfs_machdep.c
+++ b/sys/alpha/alpha/procfs_machdep.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_machdep.c	8.3 (Berkeley) 1/27/94
  *
  * From:
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/procfs_machdep.c,v 1.2.2.1 1999/08/29 15:56:33 peter Exp $
  */
 
 /*
diff --git a/sys/alpha/alpha/promcons.c b/sys/alpha/alpha/promcons.c
index 2cd1b4c4134d..a8d60441645b 100644
--- a/sys/alpha/alpha/promcons.c
+++ b/sys/alpha/alpha/promcons.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.3.2.2 1999/08/29 15:56:34 peter Exp $ */
 /* $NetBSD: promcons.c,v 1.13 1998/03/21 22:52:59 mycroft Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/setdef0.c b/sys/alpha/alpha/setdef0.c
index 49f662ae1d6c..d65f39d5d754 100644
--- a/sys/alpha/alpha/setdef0.c
+++ b/sys/alpha/alpha/setdef0.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/setdef0.c,v 1.1.2.1 1999/08/29 15:56:34 peter Exp $
  */
 
 #ifdef __ELF__
diff --git a/sys/alpha/alpha/setdef1.c b/sys/alpha/alpha/setdef1.c
index 13668f08cefc..85782255691f 100644
--- a/sys/alpha/alpha/setdef1.c
+++ b/sys/alpha/alpha/setdef1.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/setdef1.c,v 1.1.2.1 1999/08/29 15:56:35 peter Exp $
  */
 
 #ifdef __ELF__
diff --git a/sys/alpha/alpha/support.s b/sys/alpha/alpha/support.s
index e7b6873c58d1..c7335aa7b33f 100644
--- a/sys/alpha/alpha/support.s
+++ b/sys/alpha/alpha/support.s
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.3.2.1 1999/08/29 15:56:35 peter Exp $
  */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/alpha/alpha/swtch.s b/sys/alpha/alpha/swtch.s
index 5c937e6d8599..2c5cd3da7219 100644
--- a/sys/alpha/alpha/swtch.s
+++ b/sys/alpha/alpha/swtch.s
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/alpha/swtch.s,v 1.7.2.2 1999/08/29 15:56:36 peter Exp $ */
 /* $NetBSD: locore.s,v 1.47 1998/03/22 07:26:32 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/symbols.raw b/sys/alpha/alpha/symbols.raw
index ff6cb91c771f..94d7cc4d3972 100644
--- a/sys/alpha/alpha/symbols.raw
+++ b/sys/alpha/alpha/symbols.raw
@@ -1,6 +1,6 @@
 #	@(#)symbols.raw	7.6 (Berkeley) 5/8/91
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/alpha/alpha/symbols.raw,v 1.1.2.2 1999/08/29 15:56:36 peter Exp $
 #
 
 
diff --git a/sys/alpha/alpha/sys_machdep.c b/sys/alpha/alpha/sys_machdep.c
index 6cfa0c833475..c86599ea3733 100644
--- a/sys/alpha/alpha/sys_machdep.c
+++ b/sys/alpha/alpha/sys_machdep.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sys_machdep.c	5.5 (Berkeley) 1/19/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.3.2.1 1999/08/29 15:56:36 peter Exp $
  *
  */
 
diff --git a/sys/alpha/alpha/timerreg.h b/sys/alpha/alpha/timerreg.h
index 0bfd7fc8cd63..2e5a944af284 100644
--- a/sys/alpha/alpha/timerreg.h
+++ b/sys/alpha/alpha/timerreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: Header: timerreg.h,v 1.2 93/02/28 15:08:58 mccanne Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/timerreg.h,v 1.1.2.1 1999/08/29 15:56:37 peter Exp $
  */
 
 /*
diff --git a/sys/alpha/alpha/trap.c b/sys/alpha/alpha/trap.c
index 014e57da263a..dc4124bec61c 100644
--- a/sys/alpha/alpha/trap.c
+++ b/sys/alpha/alpha/trap.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.10.2.2 1999/08/29 15:56:37 peter Exp $ */
 /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/vm_machdep.c b/sys/alpha/alpha/vm_machdep.c
index 02e5af989faf..82bde8ea0d4e 100644
--- a/sys/alpha/alpha/vm_machdep.c
+++ b/sys/alpha/alpha/vm_machdep.c
@@ -38,7 +38,7 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.7.2.2 1999/08/29 15:56:38 peter Exp $
  */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index 5b9aef6c626e..645cdd6bbc00 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.14.2.14 1999/10/10 23:04:57 wpaul Exp $
 
 machine		"alpha"
 cpu		"EV4"
diff --git a/sys/alpha/conf/Makefile.alpha b/sys/alpha/conf/Makefile.alpha
index d9d7cf17148e..c486cfa7ca5d 100644
--- a/sys/alpha/conf/Makefile.alpha
+++ b/sys/alpha/conf/Makefile.alpha
@@ -1,7 +1,7 @@
 # Makefile.alpha -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.alpha	7.1 5/10/91
-# $FreeBSD$
+# $FreeBSD: src/sys/alpha/conf/Makefile.alpha,v 1.16.2.6 1999/08/29 15:56:41 peter Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/alpha/conf/SIMOS b/sys/alpha/conf/SIMOS
index b2afddcece0e..bc5d058a1154 100644
--- a/sys/alpha/conf/SIMOS
+++ b/sys/alpha/conf/SIMOS
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/alpha/conf/SIMOS,v 1.3.2.1 1999/08/29 15:56:41 peter Exp $
 
 machine		"alpha"
 cpu		"EV5"
diff --git a/sys/alpha/conf/devices.alpha b/sys/alpha/conf/devices.alpha
index a6de7cd2c0aa..83315a9c19e0 100644
--- a/sys/alpha/conf/devices.alpha
+++ b/sys/alpha/conf/devices.alpha
@@ -1,6 +1,6 @@
 # This file tells what major numbers the various possible swap devices have.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/alpha/conf/devices.alpha,v 1.2.2.1 1999/08/29 15:56:42 peter Exp $
 #
 wd	0
 wfd	1
diff --git a/sys/alpha/conf/files.alpha b/sys/alpha/conf/files.alpha
index ed494389b952..152c38b8e9ad 100644
--- a/sys/alpha/conf/files.alpha
+++ b/sys/alpha/conf/files.alpha
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/alpha/conf/files.alpha,v 1.15.2.3 1999/12/06 21:03:17 archie Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/alpha/conf/majors.alpha b/sys/alpha/conf/majors.alpha
index d7cf8e29d539..d3b9314ca7c3 100644
--- a/sys/alpha/conf/majors.alpha
+++ b/sys/alpha/conf/majors.alpha
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/alpha/conf/majors.alpha,v 1.7.2.1 1999/08/29 15:56:43 peter Exp $
 
 Hopefully, this list will one day be obsoleted by DEVFS, but for now
 this is the current allocation of device major numbers.
diff --git a/sys/alpha/conf/options.alpha b/sys/alpha/conf/options.alpha
index ddfdf462f65d..323755dd892a 100644
--- a/sys/alpha/conf/options.alpha
+++ b/sys/alpha/conf/options.alpha
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/alpha/conf/options.alpha,v 1.8.2.2 1999/08/29 15:56:43 peter Exp $
 
 EV5			opt_global.h
 EV4			opt_global.h
diff --git a/sys/alpha/include/alpha_cpu.h b/sys/alpha/include/alpha_cpu.h
index 3e2bfb0fa3df..46374ecb76f2 100644
--- a/sys/alpha/include/alpha_cpu.h
+++ b/sys/alpha/include/alpha_cpu.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/alpha_cpu.h,v 1.5.2.1 1999/08/29 15:56:45 peter Exp $ */
 /* From: NetBSD: alpha_cpu.h,v 1.15 1997/09/20 19:02:34 mjacob Exp */
 
 /*
diff --git a/sys/alpha/include/ansi.h b/sys/alpha/include/ansi.h
index f9b1f424114b..7e94f4b66f6e 100644
--- a/sys/alpha/include/ansi.h
+++ b/sys/alpha/include/ansi.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/ansi.h,v 1.4.2.1 1999/08/29 15:56:45 peter Exp $ */
 /* From: NetBSD: ansi.h,v 1.9 1997/11/23 20:20:53 kleink Exp */
 
 /*-
diff --git a/sys/alpha/include/asm.h b/sys/alpha/include/asm.h
index 72e0fc97c51f..bcda30c8107c 100644
--- a/sys/alpha/include/asm.h
+++ b/sys/alpha/include/asm.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/asm.h,v 1.2.2.1 1999/08/29 15:56:46 peter Exp $ */
 /* From: NetBSD: asm.h,v 1.18 1997/11/03 04:22:06 ross Exp */
 
 /* 
diff --git a/sys/alpha/include/atomic.h b/sys/alpha/include/atomic.h
index d8b0499fd4dd..cc3c55bae2a7 100644
--- a/sys/alpha/include/atomic.h
+++ b/sys/alpha/include/atomic.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.1.2.1 1999/08/29 15:56:46 peter Exp $
  */
 
 #ifndef _MACHINE_ATOMIC_H_
diff --git a/sys/alpha/include/bootinfo.h b/sys/alpha/include/bootinfo.h
index 86b7e7a729bb..e8be5b328057 100644
--- a/sys/alpha/include/bootinfo.h
+++ b/sys/alpha/include/bootinfo.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/bootinfo.h,v 1.4.2.1 1999/08/29 15:56:47 peter Exp $ */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
diff --git a/sys/alpha/include/bus.h b/sys/alpha/include/bus.h
index dfa6b45d7d7f..017088e28840 100644
--- a/sys/alpha/include/bus.h
+++ b/sys/alpha/include/bus.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/bus.h,v 1.2.2.1 1999/08/29 15:56:47 peter Exp $ */
 
 #ifndef _ALPHA_BUS_H_
 #define _ALPHA_BUS_H_
diff --git a/sys/alpha/include/bus_memio.h b/sys/alpha/include/bus_memio.h
index f111ca9a7ba5..da41128df174 100644
--- a/sys/alpha/include/bus_memio.h
+++ b/sys/alpha/include/bus_memio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/bus_memio.h,v 1.1.2.1 1999/08/29 15:56:48 peter Exp $
  */
 
 #ifndef _ALPHA_BUS_MEMIO_H_
diff --git a/sys/alpha/include/bus_pio.h b/sys/alpha/include/bus_pio.h
index 1e437c86a66e..a022dd4566a7 100644
--- a/sys/alpha/include/bus_pio.h
+++ b/sys/alpha/include/bus_pio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/bus_pio.h,v 1.1.2.1 1999/08/29 15:56:48 peter Exp $
  */
 
 #ifndef _ALPHA_BUS_PIO_H_
diff --git a/sys/alpha/include/bwx.h b/sys/alpha/include/bwx.h
index bbc3142d8926..713c35cac07a 100644
--- a/sys/alpha/include/bwx.h
+++ b/sys/alpha/include/bwx.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/bwx.h,v 1.2.2.1 1999/08/29 15:56:48 peter Exp $
  */
 
 #ifndef _MACHINE_BWX_H_
diff --git a/sys/alpha/include/chipset.h b/sys/alpha/include/chipset.h
index 86e5ac0cf70b..9c50a46220af 100644
--- a/sys/alpha/include/chipset.h
+++ b/sys/alpha/include/chipset.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/chipset.h,v 1.6.2.1 1999/08/29 15:56:50 peter Exp $
  */
 
 #ifndef _MACHINE_CHIPSET_H_
diff --git a/sys/alpha/include/clock.h b/sys/alpha/include/clock.h
index f243f8b20334..652a222d0af8 100644
--- a/sys/alpha/include/clock.h
+++ b/sys/alpha/include/clock.h
@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/clock.h,v 1.3.2.1 1999/08/29 15:56:50 peter Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
diff --git a/sys/alpha/include/cons.h b/sys/alpha/include/cons.h
index 22600524bfd3..ac501c341bf8 100644
--- a/sys/alpha/include/cons.h
+++ b/sys/alpha/include/cons.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.h	7.2 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/cons.h,v 1.1.2.2 1999/08/29 15:56:50 peter Exp $
  */
 
 #ifndef _MACHINE_CONS_H_
diff --git a/sys/alpha/include/console.h b/sys/alpha/include/console.h
index fca8f136c9b7..e94fc5c55963 100644
--- a/sys/alpha/include/console.h
+++ b/sys/alpha/include/console.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/console.h,v 1.41.2.4 1999/08/29 15:56:51 peter Exp $
  *	from: i386/include console.h,v 1.43
  */
 
diff --git a/sys/alpha/include/cpu.h b/sys/alpha/include/cpu.h
index 0ed37435c932..a5a76cc6c964 100644
--- a/sys/alpha/include/cpu.h
+++ b/sys/alpha/include/cpu.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.4.2.2 1999/08/29 15:56:51 peter Exp $ */
 /* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */
 
 /*
diff --git a/sys/alpha/include/cpufunc.h b/sys/alpha/include/cpufunc.h
index e47091d33ea6..28bc31fa2c57 100644
--- a/sys/alpha/include/cpufunc.h
+++ b/sys/alpha/include/cpufunc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/cpufunc.h,v 1.3.2.1 1999/08/29 15:56:51 peter Exp $
  */
 
 #ifndef _MACHINE_CPUFUNC_H_
diff --git a/sys/alpha/include/elf.h b/sys/alpha/include/elf.h
index 892d96d0337e..d9a69d640a25 100644
--- a/sys/alpha/include/elf.h
+++ b/sys/alpha/include/elf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/elf.h,v 1.5.2.3 1999/08/29 15:56:52 peter Exp $
  */
 
 #ifndef _MACHINE_ELF_H_
diff --git a/sys/alpha/include/elf_machdep.h b/sys/alpha/include/elf_machdep.h
index fe6bcc21114c..3cf2368038e2 100644
--- a/sys/alpha/include/elf_machdep.h
+++ b/sys/alpha/include/elf_machdep.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/sys/alpha/include/elf_machdep.h,v 1.1.1.1.2.1 1999/08/29 15:56:52 peter Exp $
 /* From: NetBSD: elf_machdep.h,v 1.3 1997/04/06 08:47:24 cgd Exp */
 
 #define	ELF32_MACHDEP_ENDIANNESS	XXX	/* break compilation */
diff --git a/sys/alpha/include/endian.h b/sys/alpha/include/endian.h
index 67e4540eb426..1cfbdcbb72ee 100644
--- a/sys/alpha/include/endian.h
+++ b/sys/alpha/include/endian.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/endian.h,v 1.2.2.1 1999/08/29 15:56:52 peter Exp $ */
 /* From: NetBSD: endian.h,v 1.5 1997/10/09 15:42:19 bouyer Exp */
 
 /*
diff --git a/sys/alpha/include/float.h b/sys/alpha/include/float.h
index 1a3d871d7529..c43b256eefcf 100644
--- a/sys/alpha/include/float.h
+++ b/sys/alpha/include/float.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/float.h,v 1.1.2.1 1999/08/29 15:56:53 peter Exp $ */
 /* From: NetBSD: float.h,v 1.6 1997/07/17 21:36:03 thorpej Exp */
 
 /*
diff --git a/sys/alpha/include/fpu.h b/sys/alpha/include/fpu.h
index 66c557722429..6715120ade2f 100644
--- a/sys/alpha/include/fpu.h
+++ b/sys/alpha/include/fpu.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/fpu.h,v 1.2.2.1 1999/08/29 15:56:53 peter Exp $
  */
 
 #ifndef _MACHINE_FPU_H_
diff --git a/sys/alpha/include/frame.h b/sys/alpha/include/frame.h
index 95c0a93c2a1f..678c751da281 100644
--- a/sys/alpha/include/frame.h
+++ b/sys/alpha/include/frame.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/frame.h,v 1.2.2.1 1999/08/29 15:56:54 peter Exp $ */
 /* From: NetBSD: frame.h,v 1.4 1997/04/06 08:47:27 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/ieee.h b/sys/alpha/include/ieee.h
index 654d6ee86122..3a429bbe4fb8 100644
--- a/sys/alpha/include/ieee.h
+++ b/sys/alpha/include/ieee.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/ieee.h,v 1.1.1.1.2.1 1999/08/29 15:56:54 peter Exp $ */
 /* From: NetBSD: ieee.h,v 1.2 1997/04/06 08:47:27 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/ieeefp.h b/sys/alpha/include/ieeefp.h
index b357101c0cea..14a35fa920e4 100644
--- a/sys/alpha/include/ieeefp.h
+++ b/sys/alpha/include/ieeefp.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/ieeefp.h,v 1.2.2.1 1999/08/29 15:56:55 peter Exp $ */
 /* From: NetBSD: ieeefp.h,v 1.2 1997/04/06 08:47:28 cgd Exp */
 
 /* 
diff --git a/sys/alpha/include/in_cksum.h b/sys/alpha/include/in_cksum.h
index 7691d71efad9..f34361aaadfa 100644
--- a/sys/alpha/include/in_cksum.h
+++ b/sys/alpha/include/in_cksum.h
@@ -33,7 +33,7 @@
  *	from tahoe:	in_cksum.c	1.2	86/01/05
  *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
  *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/in_cksum.h,v 1.1.2.1 1999/08/29 15:56:56 peter Exp $
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/alpha/include/inst.h b/sys/alpha/include/inst.h
index b4088bc009c8..6efdb4ce442c 100644
--- a/sys/alpha/include/inst.h
+++ b/sys/alpha/include/inst.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/inst.h,v 1.1.2.1 1999/08/29 15:56:56 peter Exp $
  */
 
 #ifndef _MACHINE_INST_H_
diff --git a/sys/alpha/include/intr.h b/sys/alpha/include/intr.h
index 4f003886ec1f..67a3a14ff80b 100644
--- a/sys/alpha/include/intr.h
+++ b/sys/alpha/include/intr.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/intr.h,v 1.5.2.1 1999/08/29 15:56:56 peter Exp $
  */
 
 #ifndef _MACHINE_INTR_H_
diff --git a/sys/alpha/include/intrcnt.h b/sys/alpha/include/intrcnt.h
index d32494281fb3..b86991b2345e 100644
--- a/sys/alpha/include/intrcnt.h
+++ b/sys/alpha/include/intrcnt.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/intrcnt.h,v 1.1.2.1 1999/08/29 15:56:57 peter Exp $ */
 /* $NetBSD: intrcnt.h,v 1.17 1998/11/19 01:48:04 ross Exp $ */
 
 /*
diff --git a/sys/alpha/include/ipl.h b/sys/alpha/include/ipl.h
index 956e141ca169..e184b7fa3f09 100644
--- a/sys/alpha/include/ipl.h
+++ b/sys/alpha/include/ipl.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/ipl.h,v 1.7.2.1 1999/08/29 15:56:58 peter Exp $
  */
 
 #ifndef _MACHINE_IPL_H_
diff --git a/sys/alpha/include/limits.h b/sys/alpha/include/limits.h
index 99ca2d89843f..0c484ce33958 100644
--- a/sys/alpha/include/limits.h
+++ b/sys/alpha/include/limits.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/limits.h,v 1.1.2.1 1999/08/29 15:56:58 peter Exp $ */
 /* From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/lock.h b/sys/alpha/include/lock.h
index ae4b7c67c911..d63b08de8f60 100644
--- a/sys/alpha/include/lock.h
+++ b/sys/alpha/include/lock.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/lock.h,v 1.3.2.1 1999/08/29 15:56:59 peter Exp $
  */
 
 
diff --git a/sys/alpha/include/md_var.h b/sys/alpha/include/md_var.h
index 54ff47aa727e..90862ed9317d 100644
--- a/sys/alpha/include/md_var.h
+++ b/sys/alpha/include/md_var.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/md_var.h,v 1.5.2.1 1999/08/29 15:56:59 peter Exp $
  */
 
 #ifndef _MACHINE_MD_VAR_H_
diff --git a/sys/alpha/include/mouse.h b/sys/alpha/include/mouse.h
index a08d0276517f..e76712c1e150 100644
--- a/sys/alpha/include/mouse.h
+++ b/sys/alpha/include/mouse.h
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/mouse.h,v 1.12.2.2 1999/08/29 15:57:00 peter Exp $
  *	from: i386/include mouse.h,v 1.10
  */
 
diff --git a/sys/alpha/include/pal.h b/sys/alpha/include/pal.h
index b3393ce70c5a..f79df7bc2dbe 100644
--- a/sys/alpha/include/pal.h
+++ b/sys/alpha/include/pal.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/pal.h,v 1.1.2.1 1999/08/29 15:57:00 peter Exp $ */
 /* From: NetBSD: pal.h,v 1.1 1997/09/06 01:23:53 thorpej Exp */
 
 /* 
diff --git a/sys/alpha/include/param.h b/sys/alpha/include/param.h
index d9c6017710cb..7133a72a6528 100644
--- a/sys/alpha/include/param.h
+++ b/sys/alpha/include/param.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/param.h,v 1.7.2.2 1999/08/29 15:57:01 peter Exp $ */
 /* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */
 
 /*
diff --git a/sys/alpha/include/pc/bios.h b/sys/alpha/include/pc/bios.h
index d85f674478d7..9dc2cb0fecf5 100644
--- a/sys/alpha/include/pc/bios.h
+++ b/sys/alpha/include/pc/bios.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/pc/bios.h,v 1.4.2.1 1999/08/29 15:57:14 peter Exp $
  *      from: i386/include/pc bios.h,v 1.2
  */
 
diff --git a/sys/alpha/include/pc/display.h b/sys/alpha/include/pc/display.h
index fad568c0cb81..8dd1b4b07396 100644
--- a/sys/alpha/include/pc/display.h
+++ b/sys/alpha/include/pc/display.h
@@ -1,7 +1,7 @@
 /*
  * IBM PC display definitions
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/pc/display.h,v 1.5.2.1 1999/08/29 15:57:14 peter Exp $
  *	from: i386/include/pc display.h,v 1.4
  */
 
diff --git a/sys/alpha/include/pc/msdos.h b/sys/alpha/include/pc/msdos.h
index d1b777fc613e..f4438912827c 100644
--- a/sys/alpha/include/pc/msdos.h
+++ b/sys/alpha/include/pc/msdos.h
@@ -3,7 +3,7 @@
  * [obtained from mtools -wfj]
  * how to decipher DOS disk structures in coexisting with DOS
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/pc/msdos.h,v 1.5.2.1 1999/08/29 15:57:15 peter Exp $
  *	from: i386/include/pc msdos.h,v 1.4
  */
 
diff --git a/sys/alpha/include/pc/vesa.h b/sys/alpha/include/pc/vesa.h
index 5b214086311a..442a45a17e36 100644
--- a/sys/alpha/include/pc/vesa.h
+++ b/sys/alpha/include/pc/vesa.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/pc/vesa.h,v 1.1.2.1 1999/08/29 15:57:15 peter Exp $
  * from: i386/include/pc vesa.h,v 1.1
  */
 
diff --git a/sys/alpha/include/pcb.h b/sys/alpha/include/pcb.h
index 3caa144f8e4f..84f282ff2398 100644
--- a/sys/alpha/include/pcb.h
+++ b/sys/alpha/include/pcb.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/pcb.h,v 1.2.2.1 1999/08/29 15:57:01 peter Exp $ */
 /* From: NetBSD: pcb.h,v 1.6 1997/04/06 08:47:33 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/pmap.h b/sys/alpha/include/pmap.h
index 412bb37ac1c2..037011f8fc5d 100644
--- a/sys/alpha/include/pmap.h
+++ b/sys/alpha/include/pmap.h
@@ -43,7 +43,7 @@
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
  *	from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.3.2.1 1999/08/29 15:57:02 peter Exp $
  */
 
 #ifndef _MACHINE_PMAP_H_
diff --git a/sys/alpha/include/proc.h b/sys/alpha/include/proc.h
index b2a28df6eb44..a9bdf4cbc49c 100644
--- a/sys/alpha/include/proc.h
+++ b/sys/alpha/include/proc.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/proc.h,v 1.5.2.1 1999/08/29 15:57:03 peter Exp $ */
 /* From: NetBSD: proc.h,v 1.3 1997/04/06 08:47:36 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/profile.h b/sys/alpha/include/profile.h
index 6908651c2a44..078bad545cfa 100644
--- a/sys/alpha/include/profile.h
+++ b/sys/alpha/include/profile.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/profile.h,v 1.1.1.1.2.1 1999/08/29 15:57:03 peter Exp $ */
 /* From: NetBSD: profile.h,v 1.9 1997/04/06 08:47:37 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/psl.h b/sys/alpha/include/psl.h
index 9fcb97233262..60f5b1b7a01c 100644
--- a/sys/alpha/include/psl.h
+++ b/sys/alpha/include/psl.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/psl.h,v 1.1.2.1 1999/08/29 15:57:04 peter Exp $
  */
 
 /*
diff --git a/sys/alpha/include/pte.h b/sys/alpha/include/pte.h
index 8ceb6a5f377e..4a6b8d72d681 100644
--- a/sys/alpha/include/pte.h
+++ b/sys/alpha/include/pte.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/pte.h,v 1.2.2.1 1999/08/29 15:57:04 peter Exp $ */
 /* From: NetBSD: pte.h,v 1.10 1997/09/02 19:07:22 thorpej Exp */
 
 /*
diff --git a/sys/alpha/include/ptrace.h b/sys/alpha/include/ptrace.h
index d69c5474fb5b..86403bccb292 100644
--- a/sys/alpha/include/ptrace.h
+++ b/sys/alpha/include/ptrace.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/ptrace.h,v 1.2.2.1 1999/08/29 15:57:06 peter Exp $
  */
 
 #ifndef _MACHINE_PTRACE_H_
diff --git a/sys/alpha/include/reg.h b/sys/alpha/include/reg.h
index 0b5dabfdc2b4..6c0b01a75c6f 100644
--- a/sys/alpha/include/reg.h
+++ b/sys/alpha/include/reg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/reg.h,v 1.2.2.2 1999/08/29 15:57:06 peter Exp $ */
 /* From: NetBSD: reg.h,v 1.3 1997/04/06 08:47:40 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/resource.h b/sys/alpha/include/resource.h
index 3232293e9a40..15e63d8bce13 100644
--- a/sys/alpha/include/resource.h
+++ b/sys/alpha/include/resource.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/resource.h,v 1.1.2.1 1999/08/29 15:57:07 peter Exp $ */
 /*
  * Copyright 1998 Massachusetts Institute of Technology
  *
diff --git a/sys/alpha/include/setjmp.h b/sys/alpha/include/setjmp.h
index 5fcfe2ab55fc..2602f6d1bb32 100644
--- a/sys/alpha/include/setjmp.h
+++ b/sys/alpha/include/setjmp.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/setjmp.h,v 1.2.2.1 1999/08/29 15:57:07 peter Exp $ */
 /* From: NetBSD: setjmp.h,v 1.2 1997/04/06 08:47:41 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/signal.h b/sys/alpha/include/signal.h
index 07eaba12425a..16df0307b90a 100644
--- a/sys/alpha/include/signal.h
+++ b/sys/alpha/include/signal.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/signal.h,v 1.2.2.1 1999/08/29 15:57:08 peter Exp $ */
 /* From: NetBSD: signal.h,v 1.3 1997/04/06 08:47:43 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/stdarg.h b/sys/alpha/include/stdarg.h
index 2003b7bd4e1a..52914149b450 100644
--- a/sys/alpha/include/stdarg.h
+++ b/sys/alpha/include/stdarg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/stdarg.h,v 1.1.2.1 1999/08/29 15:57:08 peter Exp $ */
 /* From: NetBSD: stdarg.h,v 1.7 1997/04/06 08:47:44 cgd Exp */
 
 /*-
diff --git a/sys/alpha/include/swiz.h b/sys/alpha/include/swiz.h
index 4b6397aeccec..de0a62eb93ec 100644
--- a/sys/alpha/include/swiz.h
+++ b/sys/alpha/include/swiz.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/swiz.h,v 1.2.2.1 1999/08/29 15:57:08 peter Exp $
  */
 
 #ifndef _MACHINE_SWIZ_H_
diff --git a/sys/alpha/include/sysarch.h b/sys/alpha/include/sysarch.h
index 8eda490525ef..8410a911b521 100644
--- a/sys/alpha/include/sysarch.h
+++ b/sys/alpha/include/sysarch.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/include/sysarch.h,v 1.2.2.1 1999/08/29 15:57:09 peter Exp $
  */
 
 /*
diff --git a/sys/alpha/include/types.h b/sys/alpha/include/types.h
index 03e186996b34..2b19ff9f137d 100644
--- a/sys/alpha/include/types.h
+++ b/sys/alpha/include/types.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/types.h,v 1.9.2.1 1999/08/29 15:57:09 peter Exp $ */
 /* From: NetBSD: types.h,v 1.8 1997/04/06 08:47:45 cgd Exp */
 
 /*-
diff --git a/sys/alpha/include/varargs.h b/sys/alpha/include/varargs.h
index d355ec8ac931..c2924c687457 100644
--- a/sys/alpha/include/varargs.h
+++ b/sys/alpha/include/varargs.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/varargs.h,v 1.1.2.1 1999/08/29 15:57:10 peter Exp $ */
 /* From: NetBSD: varargs.h,v 1.7 1997/04/06 08:47:46 cgd Exp */
 
 /*-
diff --git a/sys/alpha/include/vmparam.h b/sys/alpha/include/vmparam.h
index b055549c3ab8..91ec4c542370 100644
--- a/sys/alpha/include/vmparam.h
+++ b/sys/alpha/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/include/vmparam.h,v 1.4.2.1 1999/08/29 15:57:10 peter Exp $ */
 /* From: NetBSD: vmparam.h,v 1.6 1997/09/23 23:23:23 mjacob Exp */
 #ifndef	_ALPHA_VMPARAM_H
 #define	_ALPHA_VMPARAM_H
diff --git a/sys/alpha/isa/isa.c b/sys/alpha/isa/isa.c
index c74b87b4d3ef..6910227e1287 100644
--- a/sys/alpha/isa/isa.c
+++ b/sys/alpha/isa/isa.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/isa/isa.c,v 1.8.2.2 1999/08/29 15:57:16 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/isa/mcclock_isa.c b/sys/alpha/isa/mcclock_isa.c
index 364d6ffb2082..e5605abb3b76 100644
--- a/sys/alpha/isa/mcclock_isa.c
+++ b/sys/alpha/isa/mcclock_isa.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/isa/mcclock_isa.c,v 1.3.2.2 1999/08/29 15:57:17 peter Exp $ */
 /* $NetBSD: mcclock_tlsb.c,v 1.8 1998/05/13 02:50:29 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/pci/apecs.c b/sys/alpha/pci/apecs.c
index 4aa9aacc5e87..e1f872a268c1 100644
--- a/sys/alpha/pci/apecs.c
+++ b/sys/alpha/pci/apecs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/pci/apecs.c,v 1.5.2.1 1999/08/29 15:57:18 peter Exp $
  */
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/alpha/pci/apecsvar.h b/sys/alpha/pci/apecsvar.h
index a5fa82e2511a..665260c8e23a 100644
--- a/sys/alpha/pci/apecsvar.h
+++ b/sys/alpha/pci/apecsvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/pci/apecsvar.h,v 1.1.2.1 1999/08/29 15:57:18 peter Exp $
  */
 
 extern void apecs_init(void);
diff --git a/sys/alpha/pci/cia.c b/sys/alpha/pci/cia.c
index e76ab4e24a1b..ce0d66e3b043 100644
--- a/sys/alpha/pci/cia.c
+++ b/sys/alpha/pci/cia.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/pci/cia.c,v 1.14.2.3 1999/08/29 15:57:19 peter Exp $
  */
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/alpha/pci/ciareg.h b/sys/alpha/pci/ciareg.h
index 8da36a401ed1..21d6ea5e8087 100644
--- a/sys/alpha/pci/ciareg.h
+++ b/sys/alpha/pci/ciareg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/pci/ciareg.h,v 1.1.2.1 1999/08/29 15:57:20 peter Exp $ */
 /* $NetBSD: ciareg.h,v 1.22 1998/06/06 20:40:14 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/pci/ciavar.h b/sys/alpha/pci/ciavar.h
index 1e50032dec90..1a412cd89c62 100644
--- a/sys/alpha/pci/ciavar.h
+++ b/sys/alpha/pci/ciavar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/pci/ciavar.h,v 1.1.2.1 1999/08/29 15:57:20 peter Exp $
  */
 
 extern void cia_init(void);
diff --git a/sys/alpha/pci/lca.c b/sys/alpha/pci/lca.c
index 94c52fef99ff..2485be820276 100644
--- a/sys/alpha/pci/lca.c
+++ b/sys/alpha/pci/lca.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/pci/lca.c,v 1.5.2.1 1999/08/29 15:57:21 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/pci/lcavar.h b/sys/alpha/pci/lcavar.h
index 1619539b5a2c..5cb4c9a78890 100644
--- a/sys/alpha/pci/lcavar.h
+++ b/sys/alpha/pci/lcavar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/pci/lcavar.h,v 1.1.2.1 1999/08/29 15:57:22 peter Exp $
  */
 
 extern void lca_init(void);
diff --git a/sys/alpha/pci/pcibus.c b/sys/alpha/pci/pcibus.c
index a3a021a4df43..6edef34db98c 100644
--- a/sys/alpha/pci/pcibus.c
+++ b/sys/alpha/pci/pcibus.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.8.2.1 1999/08/29 15:57:22 peter Exp $
  *
  */
 
diff --git a/sys/alpha/pci/pcibus.h b/sys/alpha/pci/pcibus.h
index 27c5ffa00ef8..aaf6bd50c0e4 100644
--- a/sys/alpha/pci/pcibus.h
+++ b/sys/alpha/pci/pcibus.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/pci/pcibus.h,v 1.2.2.1 1999/08/29 15:57:23 peter Exp $
  */
 
 void pci_init_resources(void);
diff --git a/sys/alpha/tc/am7990.c b/sys/alpha/tc/am7990.c
index 47fd860e62fa..c48cac3bb0a4 100644
--- a/sys/alpha/tc/am7990.c
+++ b/sys/alpha/tc/am7990.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tc/am7990.c,v 1.2.2.1 1999/08/29 15:57:24 peter Exp $ */
 /*	$NetBSD: am7990.c,v 1.43 1998/03/29 22:36:42 mycroft Exp $	*/
 
 /*-
diff --git a/sys/alpha/tc/am7990reg.h b/sys/alpha/tc/am7990reg.h
index dc3f56a520b5..145bc4e71efa 100644
--- a/sys/alpha/tc/am7990reg.h
+++ b/sys/alpha/tc/am7990reg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tc/am7990reg.h,v 1.1.2.1 1999/08/29 15:57:24 peter Exp $ */
 /*	$NetBSD: am7990reg.h,v 1.4 1997/03/27 21:01:49 veego Exp $	*/
 
 /*-
diff --git a/sys/alpha/tc/am7990var.h b/sys/alpha/tc/am7990var.h
index a5968fa8fd03..939513ce95f0 100644
--- a/sys/alpha/tc/am7990var.h
+++ b/sys/alpha/tc/am7990var.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tc/am7990var.h,v 1.1.2.1 1999/08/29 15:57:25 peter Exp $ */
 /*	$NetBSD: am7990var.h,v 1.18 1998/01/12 09:23:16 thorpej Exp $	*/
 
 /*-
diff --git a/sys/alpha/tc/ascvar.h b/sys/alpha/tc/ascvar.h
index eafdeb3bd1ee..7937bc14e762 100644
--- a/sys/alpha/tc/ascvar.h
+++ b/sys/alpha/tc/ascvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tc/ascvar.h,v 1.1.2.1 1999/08/29 15:57:25 peter Exp $ */
 /*	$NetBSD: ascvar.h,v 1.4 1997/11/28 18:23:40 mhitch Exp $	*/
 
 
diff --git a/sys/alpha/tc/esp.c b/sys/alpha/tc/esp.c
index 1e82344c959f..687221d526c1 100644
--- a/sys/alpha/tc/esp.c
+++ b/sys/alpha/tc/esp.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tc/esp.c,v 1.1.2.1 1999/08/29 15:57:26 peter Exp $ */
 /*	$NetBSD: esp.c,v 1.8.4.2 1996/09/10 17:28:16 cgd Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/espreg.h b/sys/alpha/tc/espreg.h
index 5c6ddb474eac..2e9d1a8b886f 100644
--- a/sys/alpha/tc/espreg.h
+++ b/sys/alpha/tc/espreg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tc/espreg.h,v 1.1.2.1 1999/08/29 15:57:26 peter Exp $ */
 /*	$NetBSD: espreg.h,v 1.2.4.1 1996/09/10 17:28:17 cgd Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/espvar.h b/sys/alpha/tc/espvar.h
index 72e26411efc0..efedbae2cc40 100644
--- a/sys/alpha/tc/espvar.h
+++ b/sys/alpha/tc/espvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tc/espvar.h,v 1.2.2.1 1999/08/29 15:57:27 peter Exp $ */
 /*	$NetBSD: espvar.h,v 1.3.4.1 1996/09/10 17:28:18 cgd Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/if_le_dec.c b/sys/alpha/tc/if_le_dec.c
index c0c7e6d3904c..a47d562141e9 100644
--- a/sys/alpha/tc/if_le_dec.c
+++ b/sys/alpha/tc/if_le_dec.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tc/if_le_dec.c,v 1.1.2.1 1999/08/29 15:57:28 peter Exp $ */
 /*	$NetBSD: if_le_dec.c,v 1.8 1997/07/22 04:32:21 jonathan Exp $	*/
 
 /*-
diff --git a/sys/alpha/tc/if_le_ioasic.c b/sys/alpha/tc/if_le_ioasic.c
index 91ba6e524651..fe9dbe5ffe4b 100644
--- a/sys/alpha/tc/if_le_ioasic.c
+++ b/sys/alpha/tc/if_le_ioasic.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tc/if_le_ioasic.c,v 1.1.2.1 1999/08/29 15:57:29 peter Exp $ */
 /*	$NetBSD: if_le_ioasic.c,v 1.10 1998/01/19 02:49:48 thorpej Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/if_levar.h b/sys/alpha/tc/if_levar.h
index 9353ab219754..658db5f7ab8a 100644
--- a/sys/alpha/tc/if_levar.h
+++ b/sys/alpha/tc/if_levar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tc/if_levar.h,v 1.1.2.1 1999/08/29 15:57:29 peter Exp $ */
 /*	$NetBSD: if_levar.h,v 1.4 1997/03/15 18:12:07 is Exp $	*/
 
 /*-
diff --git a/sys/alpha/tc/ioasic.c b/sys/alpha/tc/ioasic.c
index 48e4b9b08c83..7b83229ed74a 100644
--- a/sys/alpha/tc/ioasic.c
+++ b/sys/alpha/tc/ioasic.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tc/ioasic.c,v 1.1.2.1 1999/08/29 15:57:30 peter Exp $ */
 /* from $NetBSD: ioasic.c,v 1.19 1998/05/27 00:18:13 thorpej Exp $ */
 
 /*-
diff --git a/sys/alpha/tc/ioasicreg.h b/sys/alpha/tc/ioasicreg.h
index d1f9db8a2c93..bbb4f6f0d3da 100644
--- a/sys/alpha/tc/ioasicreg.h
+++ b/sys/alpha/tc/ioasicreg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tc/ioasicreg.h,v 1.1.2.1 1999/08/29 15:57:30 peter Exp $ */
 /* $NetBSD: ioasicreg.h,v 1.2 1997/04/06 22:30:28 cgd Exp $ */
 
 /* 
diff --git a/sys/alpha/tc/ioasicvar.h b/sys/alpha/tc/ioasicvar.h
index d7747a7546b6..c37959134fe3 100644
--- a/sys/alpha/tc/ioasicvar.h
+++ b/sys/alpha/tc/ioasicvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tc/ioasicvar.h,v 1.1.2.1 1999/08/29 15:57:31 peter Exp $ */
 /*	$NetBSD: ioasicvar.h,v 1.5 1998/01/19 02:50:19 thorpej Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/mcclock_ioasic.c b/sys/alpha/tc/mcclock_ioasic.c
index 31c8d95c2ecd..1cb2a54ef0b6 100644
--- a/sys/alpha/tc/mcclock_ioasic.c
+++ b/sys/alpha/tc/mcclock_ioasic.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tc/mcclock_ioasic.c,v 1.1.2.1 1999/08/29 15:57:31 peter Exp $ */
 /* $NetBSD: mcclock_ioasic.c,v 1.8 1997/09/02 13:20:14 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/tc/sticreg.h b/sys/alpha/tc/sticreg.h
index 7101582da71b..c738b8fde1e5 100644
--- a/sys/alpha/tc/sticreg.h
+++ b/sys/alpha/tc/sticreg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tc/sticreg.h,v 1.1.2.1 1999/08/29 15:57:31 peter Exp $ */
 /*	$NetBSD: sticreg.h,v 1.1 1997/11/08 07:27:50 jonathan Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/sticvar.h b/sys/alpha/tc/sticvar.h
index be394eadded2..61611a4ba8c9 100644
--- a/sys/alpha/tc/sticvar.h
+++ b/sys/alpha/tc/sticvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tc/sticvar.h,v 1.1.2.1 1999/08/29 15:57:32 peter Exp $ */
 /*	$NetBSD: sticvar.h,v 1.1 1997/11/08 07:27:51 jonathan Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/tc.c b/sys/alpha/tc/tc.c
index 83c8c3d6e8c2..04824580b2f3 100644
--- a/sys/alpha/tc/tc.c
+++ b/sys/alpha/tc/tc.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tc/tc.c,v 1.1.2.1 1999/08/29 15:57:32 peter Exp $ */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
diff --git a/sys/alpha/tc/tcasic.c b/sys/alpha/tc/tcasic.c
index 0e9b859413db..6675a402f8a2 100644
--- a/sys/alpha/tc/tcasic.c
+++ b/sys/alpha/tc/tcasic.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tc/tcasic.c,v 1.1.2.1 1999/08/29 15:57:33 peter Exp $ */
 /* from $NetBSD: tcasic.c,v 1.23 1998/05/14 00:01:31 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/tc/tcdevs.h b/sys/alpha/tc/tcdevs.h
index 993fd3903572..934c7ef93078 100644
--- a/sys/alpha/tc/tcdevs.h
+++ b/sys/alpha/tc/tcdevs.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tc/tcdevs.h,v 1.1.2.1 1999/08/29 15:57:33 peter Exp $ */
 /*	$NetBSD: tcdevs.h,v 1.12 1998/06/18 23:29:46 jonathan Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/tcdevs_data.h b/sys/alpha/tc/tcdevs_data.h
index 214fcd0c8883..d31910454cd4 100644
--- a/sys/alpha/tc/tcdevs_data.h
+++ b/sys/alpha/tc/tcdevs_data.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tc/tcdevs_data.h,v 1.1.2.1 1999/08/29 15:57:33 peter Exp $ */
 /*	$NetBSD: tcdevs_data.h,v 1.12 1998/06/18 23:29:46 jonathan Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/tcds.c b/sys/alpha/tc/tcds.c
index ead20e817fce..50eabfd3ee2c 100644
--- a/sys/alpha/tc/tcds.c
+++ b/sys/alpha/tc/tcds.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tc/tcds.c,v 1.1.2.1 1999/08/29 15:57:34 peter Exp $ */
 /* from $NetBSD: tcds.c,v 1.25 1998/05/26 23:43:05 thorpej Exp $ */
 
 /*-
diff --git a/sys/alpha/tc/tcds_dma.c b/sys/alpha/tc/tcds_dma.c
index f69251506b83..16547be0e2ca 100644
--- a/sys/alpha/tc/tcds_dma.c
+++ b/sys/alpha/tc/tcds_dma.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tc/tcds_dma.c,v 1.1.2.1 1999/08/29 15:57:34 peter Exp $ */
 /*	$NetBSD: tcds_dma.c,v 1.6.4.1 1996/09/10 17:28:19 cgd Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/tcdsreg.h b/sys/alpha/tc/tcdsreg.h
index da48eb802f1d..9f5f66ca8a12 100644
--- a/sys/alpha/tc/tcdsreg.h
+++ b/sys/alpha/tc/tcdsreg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tc/tcdsreg.h,v 1.1.2.1 1999/08/29 15:57:34 peter Exp $ */
 /*	$NetBSD: tcdsreg.h,v 1.1 1995/12/20 00:40:36 cgd Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/tcdsvar.h b/sys/alpha/tc/tcdsvar.h
index 72b631bfc387..2bbea7c5b27e 100644
--- a/sys/alpha/tc/tcdsvar.h
+++ b/sys/alpha/tc/tcdsvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tc/tcdsvar.h,v 1.1.2.1 1999/08/29 15:57:36 peter Exp $ */
 /*	$NetBSD: tcdsvar.h,v 1.3.4.1 1996/09/10 17:28:20 cgd Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/tcreg.h b/sys/alpha/tc/tcreg.h
index e64eaab955b0..5cd1995f9bc6 100644
--- a/sys/alpha/tc/tcreg.h
+++ b/sys/alpha/tc/tcreg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tc/tcreg.h,v 1.1.2.1 1999/08/29 15:57:36 peter Exp $ */
 /*	$NetBSD: tcreg.h,v 1.1 1995/12/20 00:48:36 cgd Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/tcvar.h b/sys/alpha/tc/tcvar.h
index d23ad4a3e011..0dddc4967209 100644
--- a/sys/alpha/tc/tcvar.h
+++ b/sys/alpha/tc/tcvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tc/tcvar.h,v 1.1.2.1 1999/08/29 15:57:37 peter Exp $ */
 /*	$NetBSD: tcvar.h,v 1.13 1998/05/22 21:15:48 thorpej Exp $	*/
 
 /*
diff --git a/sys/alpha/tlsb/dwlpx.c b/sys/alpha/tlsb/dwlpx.c
index 038ed162bb39..e84b99926539 100644
--- a/sys/alpha/tlsb/dwlpx.c
+++ b/sys/alpha/tlsb/dwlpx.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/tlsb/dwlpx.c,v 1.7.2.1 1999/08/29 15:57:40 peter Exp $
  */
 
 #include "opt_simos.h"
diff --git a/sys/alpha/tlsb/dwlpxreg.h b/sys/alpha/tlsb/dwlpxreg.h
index 1eb95e9bd43f..6d0d3924abf0 100644
--- a/sys/alpha/tlsb/dwlpxreg.h
+++ b/sys/alpha/tlsb/dwlpxreg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tlsb/dwlpxreg.h,v 1.2.2.1 1999/08/29 15:57:40 peter Exp $ */
 /* $NetBSD: dwlpxreg.h,v 1.9 1998/03/21 22:02:42 mjacob Exp $ */
 
 /*
diff --git a/sys/alpha/tlsb/gbusvar.h b/sys/alpha/tlsb/gbusvar.h
index cc0bd8e47835..1385443c40bb 100644
--- a/sys/alpha/tlsb/gbusvar.h
+++ b/sys/alpha/tlsb/gbusvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/tlsb/gbusvar.h,v 1.3.2.1 1999/08/29 15:57:41 peter Exp $
  */
 /* $NetBSD: gbusvar.h,v 1.1 1998/05/13 02:50:29 thorpej Exp $ */
 
diff --git a/sys/alpha/tlsb/kftxx.c b/sys/alpha/tlsb/kftxx.c
index a72b3383a0d9..7af85fb30542 100644
--- a/sys/alpha/tlsb/kftxx.c
+++ b/sys/alpha/tlsb/kftxx.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tlsb/kftxx.c,v 1.4.2.1 1999/08/29 15:57:41 peter Exp $ */
 /* $NetBSD: kftxx.c,v 1.9 1998/05/14 00:01:32 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/tlsb/kftxxreg.h b/sys/alpha/tlsb/kftxxreg.h
index 8ebeb3169732..fe9447093d14 100644
--- a/sys/alpha/tlsb/kftxxreg.h
+++ b/sys/alpha/tlsb/kftxxreg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tlsb/kftxxreg.h,v 1.2.2.1 1999/08/29 15:57:42 peter Exp $ */
 /* $NetBSD: kftxxreg.h,v 1.4 1997/06/04 01:47:15 cgd Exp $ */
 
 /*
diff --git a/sys/alpha/tlsb/kftxxvar.h b/sys/alpha/tlsb/kftxxvar.h
index 2bdb24882dd2..346a0bd128bb 100644
--- a/sys/alpha/tlsb/kftxxvar.h
+++ b/sys/alpha/tlsb/kftxxvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/tlsb/kftxxvar.h,v 1.3.2.1 1999/08/29 15:57:42 peter Exp $
  */
 
 /*
diff --git a/sys/alpha/tlsb/mcclock_tlsb.c b/sys/alpha/tlsb/mcclock_tlsb.c
index 294efecacf2a..fea37ce6a7e5 100644
--- a/sys/alpha/tlsb/mcclock_tlsb.c
+++ b/sys/alpha/tlsb/mcclock_tlsb.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tlsb/mcclock_tlsb.c,v 1.3.2.2 1999/08/29 15:57:42 peter Exp $ */
 /* $NetBSD: mcclock_tlsb.c,v 1.8 1998/05/13 02:50:29 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/tlsb/tlsbvar.h b/sys/alpha/tlsb/tlsbvar.h
index f8690b4a40c9..83a94b87766f 100644
--- a/sys/alpha/tlsb/tlsbvar.h
+++ b/sys/alpha/tlsb/tlsbvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/alpha/tlsb/tlsbvar.h,v 1.2.2.1 1999/08/29 15:57:43 peter Exp $ */
 /* $NetBSD: tlsbvar.h,v 1.5 1998/05/13 23:23:23 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/tlsb/zs_tlsb.c b/sys/alpha/tlsb/zs_tlsb.c
index 07f91ff6fdcd..4bf3d912efb1 100644
--- a/sys/alpha/tlsb/zs_tlsb.c
+++ b/sys/alpha/tlsb/zs_tlsb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.6.2.2 1999/08/29 15:57:44 peter Exp $
  */
 /*
  * This driver is a hopeless hack to get the SimOS console working.  A real
diff --git a/sys/alpha/tlsb/zsreg.h b/sys/alpha/tlsb/zsreg.h
index f087a7ba55fe..2a76c53f295b 100644
--- a/sys/alpha/tlsb/zsreg.h
+++ b/sys/alpha/tlsb/zsreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/tlsb/zsreg.h,v 1.2.2.1 1999/08/29 15:57:44 peter Exp $
  */
 
 #define ZSC_CHANNELA	0x80
diff --git a/sys/alpha/tlsb/zsvar.h b/sys/alpha/tlsb/zsvar.h
index 84701544274b..ec84aa0c1661 100644
--- a/sys/alpha/tlsb/zsvar.h
+++ b/sys/alpha/tlsb/zsvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/alpha/tlsb/zsvar.h,v 1.1.2.1 1999/08/29 15:57:45 peter Exp $
  */
 
 int zs_cnattach(vm_offset_t base, vm_offset_t offset);
diff --git a/sys/boot/alpha/Makefile b/sys/boot/alpha/Makefile
index a36f2cf53d61..74edfccc6d1a 100644
--- a/sys/boot/alpha/Makefile
+++ b/sys/boot/alpha/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/alpha/Makefile,v 1.1.1.1.2.1 1999/08/29 16:20:06 peter Exp $
 
 SUBDIR=		libalpha
 SUBDIR+=	boot1 boot2 netboot
diff --git a/sys/boot/alpha/boot1/boot1.c b/sys/boot/alpha/boot1/boot1.c
index 5a6ee6cd3824..60e8ad0ecc39 100644
--- a/sys/boot/alpha/boot1/boot1.c
+++ b/sys/boot/alpha/boot1/boot1.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/alpha/boot1/boot1.c,v 1.3.2.1 1999/08/29 16:20:07 peter Exp $
  * From	$NetBSD: bootxx.c,v 1.4 1997/09/06 14:08:29 drochner Exp $ 
  */
 
diff --git a/sys/boot/alpha/boot1/sys.c b/sys/boot/alpha/boot1/sys.c
index 4766c9a02c35..1fb65d18220d 100644
--- a/sys/boot/alpha/boot1/sys.c
+++ b/sys/boot/alpha/boot1/sys.c
@@ -25,7 +25,7 @@
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:34  rpd
  *	fromL Id: sys.c,v 1.21 1997/06/09 05:10:56 bde Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/alpha/boot1/sys.c,v 1.2.2.1 1999/08/29 16:20:08 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/alpha/boot2/conf.c b/sys/boot/alpha/boot2/conf.c
index a105c7f18144..879e3e837f7a 100644
--- a/sys/boot/alpha/boot2/conf.c
+++ b/sys/boot/alpha/boot2/conf.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/alpha/boot2/conf.c,v 1.2.2.1 1999/08/29 16:20:08 peter Exp $
  * From	$NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $	 
  */
 
diff --git a/sys/boot/alpha/boot2/version b/sys/boot/alpha/boot2/version
index bc9aa00ed9ab..79d6bffc8a87 100644
--- a/sys/boot/alpha/boot2/version
+++ b/sys/boot/alpha/boot2/version
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/alpha/boot2/version,v 1.1.1.1.2.1 1999/08/29 16:20:09 peter Exp $
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
diff --git a/sys/boot/alpha/common/main.c b/sys/boot/alpha/common/main.c
index b9c5ff736583..bd788507c3c9 100644
--- a/sys/boot/alpha/common/main.c
+++ b/sys/boot/alpha/common/main.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/alpha/common/main.c,v 1.9.2.1 1999/08/29 16:20:10 peter Exp $
  */
 
 
diff --git a/sys/boot/alpha/common/setdef0.c b/sys/boot/alpha/common/setdef0.c
index 49f662ae1d6c..9efb325eef0a 100644
--- a/sys/boot/alpha/common/setdef0.c
+++ b/sys/boot/alpha/common/setdef0.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/alpha/common/setdef0.c,v 1.1.1.1.2.1 1999/08/29 16:20:11 peter Exp $
  */
 
 #ifdef __ELF__
diff --git a/sys/boot/alpha/common/setdef1.c b/sys/boot/alpha/common/setdef1.c
index 13668f08cefc..2104110bacc9 100644
--- a/sys/boot/alpha/common/setdef1.c
+++ b/sys/boot/alpha/common/setdef1.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/alpha/common/setdef1.c,v 1.1.1.1.2.1 1999/08/29 16:20:11 peter Exp $
  */
 
 #ifdef __ELF__
diff --git a/sys/boot/alpha/libalpha/Makefile b/sys/boot/alpha/libalpha/Makefile
index fe642eb1336f..743edc52044c 100644
--- a/sys/boot/alpha/libalpha/Makefile
+++ b/sys/boot/alpha/libalpha/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/alpha/libalpha/Makefile,v 1.6.2.1 1999/08/29 16:20:12 peter Exp $
 
 LIB=		alpha
 NOPIC=		true
diff --git a/sys/boot/alpha/libalpha/OSFpal.c b/sys/boot/alpha/libalpha/OSFpal.c
index 870296b65479..ee4e1f51cf06 100644
--- a/sys/boot/alpha/libalpha/OSFpal.c
+++ b/sys/boot/alpha/libalpha/OSFpal.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/alpha/libalpha/OSFpal.c,v 1.1.1.1.2.1 1999/08/29 16:20:12 peter Exp $
  * From	$NetBSD: OSFpal.c,v 1.5 1998/06/24 01:33:19 ross Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/alpha_copy.c b/sys/boot/alpha/libalpha/alpha_copy.c
index 95b6cba677e4..bdfc33a6b899 100644
--- a/sys/boot/alpha/libalpha/alpha_copy.c
+++ b/sys/boot/alpha/libalpha/alpha_copy.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/alpha/libalpha/alpha_copy.c,v 1.3.2.1 1999/08/29 16:20:13 peter Exp $
  */
 /*
  * MD primitives supporting placement of module data 
diff --git a/sys/boot/alpha/libalpha/alpha_module.c b/sys/boot/alpha/libalpha/alpha_module.c
index 4ac21d42242d..6c2aff52990e 100644
--- a/sys/boot/alpha/libalpha/alpha_module.c
+++ b/sys/boot/alpha/libalpha/alpha_module.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/alpha/libalpha/alpha_module.c,v 1.2.2.1 1999/08/29 16:20:13 peter Exp $
  */
 
 /*
diff --git a/sys/boot/alpha/libalpha/bbinfo.h b/sys/boot/alpha/libalpha/bbinfo.h
index 94aa4bbff07f..76c3489e1d3a 100644
--- a/sys/boot/alpha/libalpha/bbinfo.h
+++ b/sys/boot/alpha/libalpha/bbinfo.h
@@ -1,5 +1,5 @@
 /* 
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/alpha/libalpha/bbinfo.h,v 1.1.1.1.2.1 1999/08/29 16:20:14 peter Exp $
  * From $NetBSD: bbinfo.h,v 1.2 1997/04/06 08:40:57 cgd Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/bootinfo.c b/sys/boot/alpha/libalpha/bootinfo.c
index 8b74e0d2c06e..b527aaba9f05 100644
--- a/sys/boot/alpha/libalpha/bootinfo.c
+++ b/sys/boot/alpha/libalpha/bootinfo.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/alpha/libalpha/bootinfo.c,v 1.3.2.1 1999/08/29 16:20:14 peter Exp $
  */
 
 #include <stand.h>
diff --git a/sys/boot/alpha/libalpha/common.h b/sys/boot/alpha/libalpha/common.h
index ff184763dd84..510cbd3476fd 100644
--- a/sys/boot/alpha/libalpha/common.h
+++ b/sys/boot/alpha/libalpha/common.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/alpha/libalpha/common.h,v 1.1.1.1.2.1 1999/08/29 16:20:14 peter Exp $
  * From: $NetBSD: common.h,v 1.2 1998/01/05 07:02:48 perry Exp $	
  */
 
diff --git a/sys/boot/alpha/libalpha/delay.c b/sys/boot/alpha/libalpha/delay.c
index faaf9829c3db..6c5ced8f86a7 100644
--- a/sys/boot/alpha/libalpha/delay.c
+++ b/sys/boot/alpha/libalpha/delay.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/alpha/libalpha/delay.c,v 1.1.1.1.2.1 1999/08/29 16:20:15 peter Exp $
  */
 
 #include <stand.h>
diff --git a/sys/boot/alpha/libalpha/devicename.c b/sys/boot/alpha/libalpha/devicename.c
index d8ee1133299e..b0daf8d67b7c 100644
--- a/sys/boot/alpha/libalpha/devicename.c
+++ b/sys/boot/alpha/libalpha/devicename.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/alpha/libalpha/devicename.c,v 1.3.2.1 1999/08/29 16:20:15 peter Exp $
  */
 
 #include <stand.h>
diff --git a/sys/boot/alpha/libalpha/elf_freebsd.c b/sys/boot/alpha/libalpha/elf_freebsd.c
index 4efd603e3d64..05ae770bd190 100644
--- a/sys/boot/alpha/libalpha/elf_freebsd.c
+++ b/sys/boot/alpha/libalpha/elf_freebsd.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/alpha/libalpha/elf_freebsd.c,v 1.6.2.2 1999/08/29 16:20:16 peter Exp $ */
 /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */
 
 /*-
diff --git a/sys/boot/alpha/libalpha/getsecs.c b/sys/boot/alpha/libalpha/getsecs.c
index 13f1e53e1bf3..530adb897ba5 100644
--- a/sys/boot/alpha/libalpha/getsecs.c
+++ b/sys/boot/alpha/libalpha/getsecs.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/alpha/libalpha/getsecs.c,v 1.1.1.1.2.1 1999/08/29 16:20:16 peter Exp $
  * From:	$NetBSD: getsecs.c,v 1.5 1998/01/05 07:02:49 perry Exp $	
  */
 
diff --git a/sys/boot/alpha/libalpha/libalpha.h b/sys/boot/alpha/libalpha/libalpha.h
index 8e1dd71e09f0..474a86567a11 100644
--- a/sys/boot/alpha/libalpha/libalpha.h
+++ b/sys/boot/alpha/libalpha/libalpha.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/alpha/libalpha/libalpha.h,v 1.4.2.1 1999/08/29 16:20:16 peter Exp $ */
 
 /*
  * Copyright (c) 1996
diff --git a/sys/boot/alpha/libalpha/pal.S b/sys/boot/alpha/libalpha/pal.S
index d411318b54ae..97e861bd34c2 100644
--- a/sys/boot/alpha/libalpha/pal.S
+++ b/sys/boot/alpha/libalpha/pal.S
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/alpha/libalpha/pal.S,v 1.1.1.1.2.1 1999/08/29 16:20:18 peter Exp $
  * From: $NetBSD: pal.s,v 1.12 1998/02/27 03:44:53 thorpej Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/prom.c b/sys/boot/alpha/libalpha/prom.c
index 435ae064f862..09270755bf4d 100644
--- a/sys/boot/alpha/libalpha/prom.c
+++ b/sys/boot/alpha/libalpha/prom.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/alpha/libalpha/prom.c,v 1.1.1.1.2.1 1999/08/29 16:20:18 peter Exp $ */
 /* $NetBSD: prom.c,v 1.3 1997/09/06 14:03:58 drochner Exp $ */
 
 /*  
diff --git a/sys/boot/alpha/libalpha/prom_disp.S b/sys/boot/alpha/libalpha/prom_disp.S
index 184f1d3c9f00..fbe980c0e244 100644
--- a/sys/boot/alpha/libalpha/prom_disp.S
+++ b/sys/boot/alpha/libalpha/prom_disp.S
@@ -1,5 +1,5 @@
 /* 
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/boot/alpha/libalpha/prom_disp.S,v 1.1.1.1.2.1 1999/08/29 16:20:18 peter Exp $ 
  * From: $NetBSD: prom_disp.S,v 1.2 1997/04/06 08:41:00 cgd Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/prom_swpal.S b/sys/boot/alpha/libalpha/prom_swpal.S
index be57632ddd9b..0b7f5c8588ae 100644
--- a/sys/boot/alpha/libalpha/prom_swpal.S
+++ b/sys/boot/alpha/libalpha/prom_swpal.S
@@ -1,5 +1,5 @@
 /* 
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/alpha/libalpha/prom_swpal.S,v 1.1.1.1.2.1 1999/08/29 16:20:19 peter Exp $
  * From: $NetBSD: prom_swpal.S,v 1.2 1997/04/06 08:41:01 cgd Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/reboot.c b/sys/boot/alpha/libalpha/reboot.c
index 3361c6c90348..8cc249b53c8e 100644
--- a/sys/boot/alpha/libalpha/reboot.c
+++ b/sys/boot/alpha/libalpha/reboot.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/alpha/libalpha/reboot.c,v 1.1.1.1.2.1 1999/08/29 16:20:19 peter Exp $
  */
 
 #include <stand.h>
diff --git a/sys/boot/alpha/libalpha/srmdisk.c b/sys/boot/alpha/libalpha/srmdisk.c
index 6039a7289168..875993296d48 100644
--- a/sys/boot/alpha/libalpha/srmdisk.c
+++ b/sys/boot/alpha/libalpha/srmdisk.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/alpha/libalpha/srmdisk.c,v 1.4.2.1 1999/08/29 16:20:19 peter Exp $
  */
 
 /*
diff --git a/sys/boot/alpha/libalpha/srmnet.c b/sys/boot/alpha/libalpha/srmnet.c
index d36e557bc1fb..c70da478d785 100644
--- a/sys/boot/alpha/libalpha/srmnet.c
+++ b/sys/boot/alpha/libalpha/srmnet.c
@@ -1,5 +1,5 @@
 /* 
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/alpha/libalpha/srmnet.c,v 1.1.1.1.2.1 1999/08/29 16:20:20 peter Exp $
  * From: $NetBSD: if_prom.c,v 1.10 1997/09/06 14:08:33 drochner Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/start.S b/sys/boot/alpha/libalpha/start.S
index e8f69b459986..f4d71f86412d 100644
--- a/sys/boot/alpha/libalpha/start.S
+++ b/sys/boot/alpha/libalpha/start.S
@@ -1,5 +1,5 @@
 /* 
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/boot/alpha/libalpha/start.S,v 1.2.2.1 1999/08/29 16:20:20 peter Exp $ 
  * From: $NetBSD: start.S,v 1.4 1998/03/28 00:54:15 cgd Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/time.c b/sys/boot/alpha/libalpha/time.c
index 18af172558c8..e7b3bdb2dac7 100644
--- a/sys/boot/alpha/libalpha/time.c
+++ b/sys/boot/alpha/libalpha/time.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/alpha/libalpha/time.c,v 1.1.1.1.2.1 1999/08/29 16:20:20 peter Exp $
  */
 
 #include <stand.h>
diff --git a/sys/boot/alpha/netboot/conf.c b/sys/boot/alpha/netboot/conf.c
index 354f9cd1a90d..84af703d6062 100644
--- a/sys/boot/alpha/netboot/conf.c
+++ b/sys/boot/alpha/netboot/conf.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/alpha/netboot/conf.c,v 1.2.2.1 1999/08/29 16:20:22 peter Exp $
  * From: $NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $
  */
 
diff --git a/sys/boot/alpha/netboot/version b/sys/boot/alpha/netboot/version
index bc9aa00ed9ab..dd9b3e6ecadb 100644
--- a/sys/boot/alpha/netboot/version
+++ b/sys/boot/alpha/netboot/version
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/alpha/netboot/version,v 1.1.1.1.2.1 1999/08/29 16:20:22 peter Exp $
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
diff --git a/sys/boot/common/Makefile.inc b/sys/boot/common/Makefile.inc
index 0d1dc1411c55..da80fbd4f8f3 100644
--- a/sys/boot/common/Makefile.inc
+++ b/sys/boot/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.8.2.1 1999/08/29 16:20:23 peter Exp $
 
 SRCS+=	bcache.c boot.c commands.c console.c devopen.c interp.c 
 SRCS+=	interp_backslash.c interp_parse.c load_aout.c load_elf.c ls.c misc.c 
diff --git a/sys/boot/common/bcache.c b/sys/boot/common/bcache.c
index c52854ece5ff..5e1ee1a2eb82 100644
--- a/sys/boot/common/bcache.c
+++ b/sys/boot/common/bcache.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/common/bcache.c,v 1.4.2.2 1999/08/29 16:20:24 peter Exp $
  */
 
 /*
diff --git a/sys/boot/common/boot.c b/sys/boot/common/boot.c
index 8511ac016bd7..97500b777a62 100644
--- a/sys/boot/common/boot.c
+++ b/sys/boot/common/boot.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/common/boot.c,v 1.10.2.1 1999/08/29 16:20:24 peter Exp $
  */
 
 /*
diff --git a/sys/boot/common/bootstrap.h b/sys/boot/common/bootstrap.h
index 00e3b8af9287..c74fcc76036d 100644
--- a/sys/boot/common/bootstrap.h
+++ b/sys/boot/common/bootstrap.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/common/bootstrap.h,v 1.18.2.2 1999/08/29 16:20:25 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/boot/common/commands.c b/sys/boot/common/commands.c
index aa81abcf15b1..4e1e2edf1d4b 100644
--- a/sys/boot/common/commands.c
+++ b/sys/boot/common/commands.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/common/commands.c,v 1.9.2.3 1999/08/29 16:20:25 peter Exp $
  */
 
 #include <stand.h>
diff --git a/sys/boot/common/console.c b/sys/boot/common/console.c
index 3f2a8790118a..aa9361960955 100644
--- a/sys/boot/common/console.c
+++ b/sys/boot/common/console.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/common/console.c,v 1.4.2.1 1999/08/29 16:20:26 peter Exp $
  */
 
 #include <stand.h>
diff --git a/sys/boot/common/dev_net.c b/sys/boot/common/dev_net.c
index a7fe7a050c5a..20589f46eda7 100644
--- a/sys/boot/common/dev_net.c
+++ b/sys/boot/common/dev_net.c
@@ -1,5 +1,5 @@
 /*	
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/common/dev_net.c,v 1.3.2.1 1999/08/29 16:20:26 peter Exp $
  * From: $NetBSD: dev_net.c,v 1.12 1997/12/10 20:38:37 gwr Exp $
  */
 
diff --git a/sys/boot/common/dev_net.h b/sys/boot/common/dev_net.h
index 3b3d10728a3d..c364c7d92a4d 100644
--- a/sys/boot/common/dev_net.h
+++ b/sys/boot/common/dev_net.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/common/dev_net.h,v 1.1.1.1.2.1 1999/08/29 16:20:26 peter Exp $
  */
 
 extern struct devsw netdev;
diff --git a/sys/boot/common/devopen.c b/sys/boot/common/devopen.c
index 77d6ffac9851..a1333d447d58 100644
--- a/sys/boot/common/devopen.c
+++ b/sys/boot/common/devopen.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/common/devopen.c,v 1.2.2.1 1999/08/29 16:20:27 peter Exp $
  */
 
 
diff --git a/sys/boot/common/gensetdefs.c b/sys/boot/common/gensetdefs.c
index a78e456de16e..eacd61c930d9 100644
--- a/sys/boot/common/gensetdefs.c
+++ b/sys/boot/common/gensetdefs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/common/gensetdefs.c,v 1.1.2.1 1999/08/29 16:20:27 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/boot/common/interp.c b/sys/boot/common/interp.c
index 4f321bd31c49..91c75a979023 100644
--- a/sys/boot/common/interp.c
+++ b/sys/boot/common/interp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/common/interp.c,v 1.12.2.6 1999/08/29 16:20:27 peter Exp $
  */
 /*
  * Simple commandline interpreter, toplevel and misc.
diff --git a/sys/boot/common/interp_backslash.c b/sys/boot/common/interp_backslash.c
index 6325e4ef3489..4ba143407168 100644
--- a/sys/boot/common/interp_backslash.c
+++ b/sys/boot/common/interp_backslash.c
@@ -11,7 +11,7 @@
  * Jordan K. Hubbard
  * 29 August 1998
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/common/interp_backslash.c,v 1.3.2.1 1999/08/29 16:20:28 peter Exp $
  *
  * Routine for doing backslash elimination.
  */
diff --git a/sys/boot/common/interp_forth.c b/sys/boot/common/interp_forth.c
index 8b965ff86747..3d203c645f8a 100644
--- a/sys/boot/common/interp_forth.c
+++ b/sys/boot/common/interp_forth.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/common/interp_forth.c,v 1.9.2.3 1999/08/29 16:20:28 peter Exp $
  */
 
 #include <sys/param.h>		/* to pick up __FreeBSD_version */
diff --git a/sys/boot/common/interp_parse.c b/sys/boot/common/interp_parse.c
index 0f83c430766c..95c5b455b61d 100644
--- a/sys/boot/common/interp_parse.c
+++ b/sys/boot/common/interp_parse.c
@@ -11,7 +11,7 @@
  * Jordan K. Hubbard
  * 29 August 1998
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/common/interp_parse.c,v 1.6.2.2 1999/08/29 16:20:29 peter Exp $
  * 
  * The meat of the simple parser.
  */
diff --git a/sys/boot/common/isapnp.c b/sys/boot/common/isapnp.c
index 19417068601a..abdaa4a249b7 100644
--- a/sys/boot/common/isapnp.c
+++ b/sys/boot/common/isapnp.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/common/isapnp.c,v 1.4.2.1 1999/08/29 16:20:29 peter Exp $
  */
 
 /*
diff --git a/sys/boot/common/isapnp.h b/sys/boot/common/isapnp.h
index 3ebd66a0d230..792363028fac 100644
--- a/sys/boot/common/isapnp.h
+++ b/sys/boot/common/isapnp.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/common/isapnp.h,v 1.2.2.2 1999/08/29 16:20:29 peter Exp $
  */
 
 #ifndef _I386_ISA_PNP_H_
diff --git a/sys/boot/common/load.c b/sys/boot/common/load.c
index e91c5fb8b569..85853e51f6fe 100644
--- a/sys/boot/common/load.c
+++ b/sys/boot/common/load.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/common/load.c,v 1.1.1.1.2.1 1999/08/29 16:20:30 peter Exp $
  */
 
 #include <stand.h>
diff --git a/sys/boot/common/load_aout.c b/sys/boot/common/load_aout.c
index 3885ed32cbab..96e28f2d13e9 100644
--- a/sys/boot/common/load_aout.c
+++ b/sys/boot/common/load_aout.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/common/load_aout.c,v 1.11.2.3 1999/08/29 16:20:30 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/common/load_elf.c b/sys/boot/common/load_elf.c
index 024fece0718f..91c28ba2755d 100644
--- a/sys/boot/common/load_elf.c
+++ b/sys/boot/common/load_elf.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/common/load_elf.c,v 1.10.2.2 1999/08/29 16:20:31 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/common/ls.c b/sys/boot/common/ls.c
index ef99d7067a9d..14c4afc40e20 100644
--- a/sys/boot/common/ls.c
+++ b/sys/boot/common/ls.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/common/ls.c,v 1.7.2.1 1999/08/29 16:20:31 peter Exp $
  * From: $NetBSD: ls.c,v 1.3 1997/06/13 13:48:47 drochner Exp $
  */
 
diff --git a/sys/boot/common/merge_help.awk b/sys/boot/common/merge_help.awk
index 9741ed3663e4..e48c6b3621e6 100644
--- a/sys/boot/common/merge_help.awk
+++ b/sys/boot/common/merge_help.awk
@@ -1,6 +1,6 @@
 #!/usr/bin/awk -f
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/common/merge_help.awk,v 1.1.2.1 1999/08/29 16:20:31 peter Exp $
 #
 # Merge two boot loader help files for FreeBSD 3.0
 # Joe Abley <jabley@patho.gen.nz>
diff --git a/sys/boot/common/misc.c b/sys/boot/common/misc.c
index 819d4a46594c..1edb96d00768 100644
--- a/sys/boot/common/misc.c
+++ b/sys/boot/common/misc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/common/misc.c,v 1.5.2.1 1999/08/29 16:20:32 peter Exp $
  */
 
 #include <string.h>
diff --git a/sys/boot/common/module.c b/sys/boot/common/module.c
index 63f1c9ff7391..1d846837a45f 100644
--- a/sys/boot/common/module.c
+++ b/sys/boot/common/module.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/common/module.c,v 1.7.2.4 1999/12/01 18:31:47 dcs Exp $
  */
 
 /*
diff --git a/sys/boot/common/panic.c b/sys/boot/common/panic.c
index bad1e45c5dc1..371ac4a27124 100644
--- a/sys/boot/common/panic.c
+++ b/sys/boot/common/panic.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/common/panic.c,v 1.4.2.1 1999/08/29 16:20:33 peter Exp $
  * From: $NetBSD: panic.c,v 1.2 1997/03/22 01:48:36 thorpej Exp $
  */
 
diff --git a/sys/boot/common/pnpdata b/sys/boot/common/pnpdata
index f2e262070d96..c7c53fa46437 100644
--- a/sys/boot/common/pnpdata
+++ b/sys/boot/common/pnpdata
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/common/pnpdata,v 1.1.2.1 1999/08/29 16:20:34 peter Exp $
 #
 # This file contains the system default Plug-and-Play data.  It is
 # derived from a number of sources, including:
diff --git a/sys/boot/ficl/Makefile b/sys/boot/ficl/Makefile
index 5f724bbcaf36..23433b50978d 100644
--- a/sys/boot/ficl/Makefile
+++ b/sys/boot/ficl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.7.2.2 1999/08/29 16:20:35 peter Exp $
 #
 LIB=			ficl
 NOPROFILE=		yes
diff --git a/sys/boot/ficl/dict.c b/sys/boot/ficl/dict.c
index 6e5a95e4e239..4d74f1cf4716 100644
--- a/sys/boot/ficl/dict.c
+++ b/sys/boot/ficl/dict.c
@@ -17,7 +17,7 @@
 ** 29 jun 1998 (sadler) added variable sized hash table support
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/dict.c,v 1.3.2.2 1999/11/27 18:35:49 dcs Exp $ */
 
 #ifdef TESTMAIN
 #include <stdio.h>
diff --git a/sys/boot/ficl/softwords/freebsd.fr b/sys/boot/ficl/softwords/freebsd.fr
index 785e682633f8..7cdb4297ee00 100644
--- a/sys/boot/ficl/softwords/freebsd.fr
+++ b/sys/boot/ficl/softwords/freebsd.fr
@@ -22,7 +22,7 @@
 \ ** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 \ ** SUCH DAMAGE.
 \ **
-\ ** $FreeBSD$
+\ ** $FreeBSD: src/sys/boot/ficl/softwords/freebsd.fr,v 1.1.2.3 1999/08/29 16:20:36 peter Exp $
 
 \ Words for use in scripts:
 \ % ignore errors here
diff --git a/sys/boot/forth/loader.4th b/sys/boot/forth/loader.4th
index 132633af6e45..b7e16f3f1158 100644
--- a/sys/boot/forth/loader.4th
+++ b/sys/boot/forth/loader.4th
@@ -22,7 +22,7 @@
 \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 \ SUCH DAMAGE.
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/forth/loader.4th,v 1.2.2.4 1999/11/24 18:04:45 dcs Exp $
 
 include /boot/support.4th
 
diff --git a/sys/boot/forth/loader.4th.8 b/sys/boot/forth/loader.4th.8
index 43df39059dc7..1438e8367dc0 100644
--- a/sys/boot/forth/loader.4th.8
+++ b/sys/boot/forth/loader.4th.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/boot/forth/loader.4th.8,v 1.1.2.5 1999/10/30 15:59:18 phantom Exp $
 .\"
 .Dd May 16, 1999
 .Dt LOADER.4TH 8
diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf
index b66eff01caef..f574226290c5 100644
--- a/sys/boot/forth/loader.conf
+++ b/sys/boot/forth/loader.conf
@@ -6,7 +6,7 @@
 #
 # All arguments must be in double quotes.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.3.2.3 1999/08/29 16:20:38 peter Exp $
 
 ##############################################################
 ###  Basic configuration options  ############################
diff --git a/sys/boot/forth/loader.conf.5 b/sys/boot/forth/loader.conf.5
index 90e3f8277d37..09e3f211ecf7 100644
--- a/sys/boot/forth/loader.conf.5
+++ b/sys/boot/forth/loader.conf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/boot/forth/loader.conf.5,v 1.1.2.5 1999/11/26 08:46:58 dcs Exp $
 .Dd April 18, 1999
 .Dt LOADER.CONF 5
 .Os
diff --git a/sys/boot/forth/loader.rc b/sys/boot/forth/loader.rc
index 9ba2f271c89f..f6603db63a1c 100644
--- a/sys/boot/forth/loader.rc
+++ b/sys/boot/forth/loader.rc
@@ -1,5 +1,5 @@
 \ Loader.rc
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/forth/loader.rc,v 1.1.2.2 1999/11/24 18:04:45 dcs Exp $
 \
 \ Includes additional commands
 include /boot/loader.4th
diff --git a/sys/boot/forth/support.4th b/sys/boot/forth/support.4th
index dbad5be3de6b..e58916bc84db 100644
--- a/sys/boot/forth/support.4th
+++ b/sys/boot/forth/support.4th
@@ -22,7 +22,7 @@
 \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 \ SUCH DAMAGE.
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/forth/support.4th,v 1.1.2.3 1999/11/24 18:04:46 dcs Exp $
 
 \ Loader.rc support functions:
 \
diff --git a/sys/boot/i386/Makefile b/sys/boot/i386/Makefile
index 2ee6e63a5195..6a4d1a9e0f5b 100644
--- a/sys/boot/i386/Makefile
+++ b/sys/boot/i386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/Makefile,v 1.7.2.2 1999/08/29 16:20:40 peter Exp $
 
 SUBDIR=		mbr boot0 kgzldr btx boot2 libi386 loader
 
diff --git a/sys/boot/i386/boot0/Makefile b/sys/boot/i386/boot0/Makefile
index 5ccddf250292..5e973344c333 100644
--- a/sys/boot/i386/boot0/Makefile
+++ b/sys/boot/i386/boot0/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.6.2.2 1999/08/29 16:20:41 peter Exp $
 
 PROG=		boot0
 NOMAN=
diff --git a/sys/boot/i386/boot0/boot0.m4 b/sys/boot/i386/boot0/boot0.m4
index d318d2a07e87..6e423d6f160a 100644
--- a/sys/boot/i386/boot0/boot0.m4
+++ b/sys/boot/i386/boot0/boot0.m4
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/boot0/boot0.m4,v 1.3.2.2 1999/08/29 16:20:42 peter Exp $
 
 define(_al,0x0)dnl
 define(_cl,0x1)dnl
diff --git a/sys/boot/i386/boot0/boot0.s b/sys/boot/i386/boot0/boot0.s
index 00c63914604a..bbd35734e264 100644
--- a/sys/boot/i386/boot0/boot0.s
+++ b/sys/boot/i386/boot0/boot0.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/boot0/boot0.s,v 1.6.2.4 1999/08/29 16:20:42 peter Exp $
 
 # A 512-byte boot manager.
 
diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile
index ecc3e1ae8546..f53c1fbcc528 100644
--- a/sys/boot/i386/boot2/Makefile
+++ b/sys/boot/i386/boot2/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.11.2.2 1999/08/29 16:20:43 peter Exp $
 
 PROG=		boot2
 NOMAN=
diff --git a/sys/boot/i386/boot2/boot1.m4 b/sys/boot/i386/boot2/boot1.m4
index 94dd13bd18b9..2000baf246fc 100644
--- a/sys/boot/i386/boot2/boot1.m4
+++ b/sys/boot/i386/boot2/boot1.m4
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/boot2/boot1.m4,v 1.3.2.2 1999/08/29 16:20:44 peter Exp $
 
 define(_al,0x0)dnl
 define(_cl,0x1)dnl
diff --git a/sys/boot/i386/boot2/boot1.s b/sys/boot/i386/boot2/boot1.s
index d78aaf29b4a6..49043bfcedec 100644
--- a/sys/boot/i386/boot2/boot1.s
+++ b/sys/boot/i386/boot2/boot1.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/boot2/boot1.s,v 1.8.2.2 1999/08/29 16:20:44 peter Exp $
 
 		.set MEM_REL,0x700		# Relocation address
 		.set MEM_ARG,0x900		# Arguments
diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c
index eefcf086c5f2..d0b9b9966966 100644
--- a/sys/boot/i386/boot2/boot2.c
+++ b/sys/boot/i386/boot2/boot2.c
@@ -14,7 +14,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.18.2.5 1999/08/29 16:20:44 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/i386/boot2/lib.h b/sys/boot/i386/boot2/lib.h
index 4bb93cfe9d3e..ac112bc2b239 100644
--- a/sys/boot/i386/boot2/lib.h
+++ b/sys/boot/i386/boot2/lib.h
@@ -14,7 +14,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/boot2/lib.h,v 1.1.2.1 1999/08/29 16:20:46 peter Exp $
  */
 
 void sio_init(void);
diff --git a/sys/boot/i386/boot2/sio.s b/sys/boot/i386/boot2/sio.s
index e29820586a3b..82b6126293ec 100644
--- a/sys/boot/i386/boot2/sio.s
+++ b/sys/boot/i386/boot2/sio.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/boot2/sio.s,v 1.3.2.1 1999/08/29 16:20:46 peter Exp $
 
 		.set SIO_PRT,SIOPRT		# Base port
 		.set SIO_FMT,SIOFMT		# 8N1
diff --git a/sys/boot/i386/btx/Makefile b/sys/boot/i386/btx/Makefile
index 08005be319cb..693cad7b39dc 100644
--- a/sys/boot/i386/btx/Makefile
+++ b/sys/boot/i386/btx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/btx/Makefile,v 1.4.2.1 1999/08/29 16:20:47 peter Exp $
 
 SUBDIR=	btx btxldr lib # client ldrtst
 
diff --git a/sys/boot/i386/btx/btx/Makefile b/sys/boot/i386/btx/btx/Makefile
index ac42dfb8d5d0..4917ba7ee868 100644
--- a/sys/boot/i386/btx/btx/Makefile
+++ b/sys/boot/i386/btx/btx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/btx/btx/Makefile,v 1.5.2.2 1999/11/10 02:38:33 jhb Exp $
 
 M4?=	m4
 
diff --git a/sys/boot/i386/btx/btx/btx.m4 b/sys/boot/i386/btx/btx/btx.m4
index 70649bbb6c91..18b6e5c074e6 100644
--- a/sys/boot/i386/btx/btx/btx.m4
+++ b/sys/boot/i386/btx/btx/btx.m4
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/btx/btx/btx.m4,v 1.1.1.1.2.1 1999/08/29 16:20:48 peter Exp $
 
 define(_al,0x0)dnl
 define(_cl,0x1)dnl
diff --git a/sys/boot/i386/btx/btx/btx.s b/sys/boot/i386/btx/btx/btx.s
index c315b5675523..9d1e50b48fa9 100644
--- a/sys/boot/i386/btx/btx/btx.s
+++ b/sys/boot/i386/btx/btx/btx.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/btx/btx/btx.s,v 1.8.2.4 1999/11/10 02:38:34 jhb Exp $
 
 #
 # Memory layout.
diff --git a/sys/boot/i386/btx/btxldr/Makefile b/sys/boot/i386/btx/btxldr/Makefile
index 33e6275360b7..5c1b016e848a 100644
--- a/sys/boot/i386/btx/btxldr/Makefile
+++ b/sys/boot/i386/btx/btxldr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/btx/btxldr/Makefile,v 1.6.2.1 1999/08/29 16:20:50 peter Exp $
 
 ORG=0x100000
 AFLAGS+=	--assembler-with-cpp
diff --git a/sys/boot/i386/btx/btxldr/btxldr.s b/sys/boot/i386/btx/btxldr/btxldr.s
index 92748f1abafa..04fd92d5b3bd 100644
--- a/sys/boot/i386/btx/btxldr/btxldr.s
+++ b/sys/boot/i386/btx/btxldr/btxldr.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/btx/btxldr/btxldr.s,v 1.4.2.2 1999/08/29 16:20:51 peter Exp $
 
 #
 # Prototype BTX loader program, written in a couple of hours.  The
diff --git a/sys/boot/i386/btx/lib/Makefile b/sys/boot/i386/btx/lib/Makefile
index 40c65657ea7a..cd88caeb4670 100644
--- a/sys/boot/i386/btx/lib/Makefile
+++ b/sys/boot/i386/btx/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/btx/lib/Makefile,v 1.2.2.1 1999/08/29 16:20:51 peter Exp $
 
 OBJS=		btxcsu.o btxsys.o btxv86.o
 AFLAGS+=	-elf
diff --git a/sys/boot/i386/btx/lib/btxcsu.s b/sys/boot/i386/btx/lib/btxcsu.s
index f08ae754f826..f3e84196e8f0 100644
--- a/sys/boot/i386/btx/lib/btxcsu.s
+++ b/sys/boot/i386/btx/lib/btxcsu.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/btx/lib/btxcsu.s,v 1.2.2.1 1999/08/29 16:20:52 peter Exp $
 
 #
 # BTX C startup code (ELF).
diff --git a/sys/boot/i386/btx/lib/btxsys.s b/sys/boot/i386/btx/lib/btxsys.s
index 9c77b4295e7c..01645493d99a 100644
--- a/sys/boot/i386/btx/lib/btxsys.s
+++ b/sys/boot/i386/btx/lib/btxsys.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/btx/lib/btxsys.s,v 1.1.2.1 1999/08/29 16:20:52 peter Exp $
 
 #
 # BTX system calls.
diff --git a/sys/boot/i386/btx/lib/btxv86.h b/sys/boot/i386/btx/lib/btxv86.h
index 1152f8b1d963..2641d2f73606 100644
--- a/sys/boot/i386/btx/lib/btxv86.h
+++ b/sys/boot/i386/btx/lib/btxv86.h
@@ -14,7 +14,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/btx/lib/btxv86.h,v 1.4.2.1 1999/08/29 16:20:53 peter Exp $
  */
 
 #ifndef _BTXV86_H_
diff --git a/sys/boot/i386/btx/lib/btxv86.s b/sys/boot/i386/btx/lib/btxv86.s
index 0d7d1116322d..bc4a3af5abc2 100644
--- a/sys/boot/i386/btx/lib/btxv86.s
+++ b/sys/boot/i386/btx/lib/btxv86.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/btx/lib/btxv86.s,v 1.2.2.1 1999/08/29 16:20:53 peter Exp $
 
 #
 # BTX V86 interface.
diff --git a/sys/boot/i386/kgzldr/Makefile b/sys/boot/i386/kgzldr/Makefile
index 63295fb6d519..82edcb059b42 100644
--- a/sys/boot/i386/kgzldr/Makefile
+++ b/sys/boot/i386/kgzldr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/kgzldr/Makefile,v 1.2.2.2 1999/08/29 16:20:54 peter Exp $
 
 PROG=	kgzldr.o
 SRCS=	start.s boot.c inflate.c lib.c crt.s sio.s
diff --git a/sys/boot/i386/kgzldr/boot.c b/sys/boot/i386/kgzldr/boot.c
index cbcd498fadd2..e796f742b98c 100644
--- a/sys/boot/i386/kgzldr/boot.c
+++ b/sys/boot/i386/kgzldr/boot.c
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/kgzldr/boot.c,v 1.1.1.1.2.2 1999/08/29 16:20:54 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/boot/i386/kgzldr/crt.s b/sys/boot/i386/kgzldr/crt.s
index cfb479fd2d84..5944bdb31943 100644
--- a/sys/boot/i386/kgzldr/crt.s
+++ b/sys/boot/i386/kgzldr/crt.s
@@ -24,7 +24,7 @@
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 #	From: btx.s 1.10 1999/02/25 16:27:41 rnordier
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/kgzldr/crt.s,v 1.1.1.1.2.2 1999/08/29 16:20:55 peter Exp $
 #
 
 # Screen defaults and assumptions.
diff --git a/sys/boot/i386/kgzldr/kgzldr.h b/sys/boot/i386/kgzldr/kgzldr.h
index 5cd5b44b6005..f82b1dc37925 100644
--- a/sys/boot/i386/kgzldr/kgzldr.h
+++ b/sys/boot/i386/kgzldr/kgzldr.h
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/kgzldr/kgzldr.h,v 1.1.1.1.2.2 1999/08/29 16:20:55 peter Exp $
  */
 
 #define KGZ_CRT	 0x1		/* Video console */
diff --git a/sys/boot/i386/kgzldr/lib.c b/sys/boot/i386/kgzldr/lib.c
index ebec384a0b27..42f75a5faa1a 100644
--- a/sys/boot/i386/kgzldr/lib.c
+++ b/sys/boot/i386/kgzldr/lib.c
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/kgzldr/lib.c,v 1.1.1.1.2.2 1999/08/29 16:20:56 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/boot/i386/kgzldr/sio.s b/sys/boot/i386/kgzldr/sio.s
index bb354e297dd0..ec74fe1a1b21 100644
--- a/sys/boot/i386/kgzldr/sio.s
+++ b/sys/boot/i386/kgzldr/sio.s
@@ -24,7 +24,7 @@
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 #	From: sio.s 1.3 1999/01/10 14:48:03 rnordier
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/kgzldr/sio.s,v 1.1.1.1.2.2 1999/08/29 16:20:56 peter Exp $
 #
 
 		.set SIO_PRT,SIOPRT		# Base port
diff --git a/sys/boot/i386/kgzldr/start.s b/sys/boot/i386/kgzldr/start.s
index 550fa526d946..a5224e1e300f 100644
--- a/sys/boot/i386/kgzldr/start.s
+++ b/sys/boot/i386/kgzldr/start.s
@@ -23,7 +23,7 @@
 # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/kgzldr/start.s,v 1.1.1.1.2.2 1999/08/29 16:20:56 peter Exp $
 #
 
 		.set entry,0x10			# kgz.entry
diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile
index e28ac4acc04a..5e08bc7eed98 100644
--- a/sys/boot/i386/libi386/Makefile
+++ b/sys/boot/i386/libi386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.13.2.1 1999/08/29 16:20:58 peter Exp $
 #
 LIB=			i386
 NOPIC=
diff --git a/sys/boot/i386/libi386/aout_freebsd.c b/sys/boot/i386/libi386/aout_freebsd.c
index b81e55155389..503769085507 100644
--- a/sys/boot/i386/libi386/aout_freebsd.c
+++ b/sys/boot/i386/libi386/aout_freebsd.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/libi386/aout_freebsd.c,v 1.11.2.1 1999/08/29 16:20:58 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/i386/libi386/biosdisk.c b/sys/boot/i386/libi386/biosdisk.c
index ecdbfaa57c6b..2ffd0cb52ad9 100644
--- a/sys/boot/i386/libi386/biosdisk.c
+++ b/sys/boot/i386/libi386/biosdisk.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.20.2.7 1999/08/29 16:20:59 peter Exp $
  */
 
 /*
diff --git a/sys/boot/i386/libi386/biospci.c b/sys/boot/i386/libi386/biospci.c
index 483384c2c157..3ca21878e8f0 100644
--- a/sys/boot/i386/libi386/biospci.c
+++ b/sys/boot/i386/libi386/biospci.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/libi386/biospci.c,v 1.1.2.1 1999/08/29 16:21:00 peter Exp $
  */
 
 /*
diff --git a/sys/boot/i386/libi386/biospnp.c b/sys/boot/i386/libi386/biospnp.c
index 616a22cdc458..c70d665b1bab 100644
--- a/sys/boot/i386/libi386/biospnp.c
+++ b/sys/boot/i386/libi386/biospnp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/libi386/biospnp.c,v 1.3.2.1 1999/08/29 16:21:00 peter Exp $
  */
 
 /*
diff --git a/sys/boot/i386/libi386/bootinfo.c b/sys/boot/i386/libi386/bootinfo.c
index 180dfdbb355e..83243f4e99be 100644
--- a/sys/boot/i386/libi386/bootinfo.c
+++ b/sys/boot/i386/libi386/bootinfo.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/libi386/bootinfo.c,v 1.15.2.3 1999/08/29 16:21:01 peter Exp $
  */
 
 #include <stand.h>
diff --git a/sys/boot/i386/libi386/comconsole.c b/sys/boot/i386/libi386/comconsole.c
index ee6fbc8f53a7..40edc5fb5da1 100644
--- a/sys/boot/i386/libi386/comconsole.c
+++ b/sys/boot/i386/libi386/comconsole.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/libi386/comconsole.c,v 1.6.2.1 1999/08/29 16:21:01 peter Exp $
  */
 
 #include <stand.h>
diff --git a/sys/boot/i386/libi386/devicename.c b/sys/boot/i386/libi386/devicename.c
index dfa685eb1b87..941609fe6edc 100644
--- a/sys/boot/i386/libi386/devicename.c
+++ b/sys/boot/i386/libi386/devicename.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/libi386/devicename.c,v 1.3.2.1 1999/08/29 16:21:02 peter Exp $
  */
 
 #include <stand.h>
diff --git a/sys/boot/i386/libi386/elf_freebsd.c b/sys/boot/i386/libi386/elf_freebsd.c
index a3d3ef9412d6..2c22ca298712 100644
--- a/sys/boot/i386/libi386/elf_freebsd.c
+++ b/sys/boot/i386/libi386/elf_freebsd.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/libi386/elf_freebsd.c,v 1.6.2.1 1999/08/29 16:21:02 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/i386/libi386/gatea20.c b/sys/boot/i386/libi386/gatea20.c
index b85265489e7d..5fb18696b167 100644
--- a/sys/boot/i386/libi386/gatea20.c
+++ b/sys/boot/i386/libi386/gatea20.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/libi386/gatea20.c,v 1.1.1.1.2.1 1999/08/29 16:21:02 peter Exp $
  * From: $NetBSD: gatea20.c,v 1.2 1997/10/29 00:32:49 fvdl Exp $
  */
 
diff --git a/sys/boot/i386/libi386/i386_module.c b/sys/boot/i386/libi386/i386_module.c
index 7040e9fcd300..cd5586346a42 100644
--- a/sys/boot/i386/libi386/i386_module.c
+++ b/sys/boot/i386/libi386/i386_module.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/libi386/i386_module.c,v 1.2.2.1 1999/08/29 16:21:03 peter Exp $
  */
 
 /*
diff --git a/sys/boot/i386/libi386/libi386.h b/sys/boot/i386/libi386/libi386.h
index 1868faa9c2b6..7cc284968beb 100644
--- a/sys/boot/i386/libi386/libi386.h
+++ b/sys/boot/i386/libi386/libi386.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/libi386/libi386.h,v 1.8.2.2 1999/08/29 16:21:03 peter Exp $
  */
 
 
diff --git a/sys/boot/i386/libi386/pread.c b/sys/boot/i386/libi386/pread.c
index fb73f042216f..8b8146b77dc6 100644
--- a/sys/boot/i386/libi386/pread.c
+++ b/sys/boot/i386/libi386/pread.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/libi386/pread.c,v 1.1.1.1.2.1 1999/08/29 16:21:04 peter Exp $
  * From: $NetBSD: pread.c,v 1.2 1997/03/22 01:48:38 thorpej Exp $
  */
 
diff --git a/sys/boot/i386/libi386/vidconsole.c b/sys/boot/i386/libi386/vidconsole.c
index a79bb05ce093..f2ac9774e210 100644
--- a/sys/boot/i386/libi386/vidconsole.c
+++ b/sys/boot/i386/libi386/vidconsole.c
@@ -26,7 +26,7 @@
  *
  * 	From Id: probe_keyboard.c,v 1.13 1997/06/09 05:10:55 bde Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/libi386/vidconsole.c,v 1.11.2.1 1999/08/29 16:21:04 peter Exp $
  */
 
 #include <stand.h>
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index 81acf1a35353..aa085497e570 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/sys/boot/i386/loader/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.28.2.4 1999/08/29 16:21:06 peter Exp $
 
 BASE=		loader
 PROG=		${BASE}
diff --git a/sys/boot/i386/loader/conf.c b/sys/boot/i386/loader/conf.c
index 6ffa49f6a43b..9ff52ee226f7 100644
--- a/sys/boot/i386/loader/conf.c
+++ b/sys/boot/i386/loader/conf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/loader/conf.c,v 1.10.2.1 1999/08/29 16:21:06 peter Exp $
  */
 
 #include <stand.h>
diff --git a/sys/boot/i386/loader/loader.8 b/sys/boot/i386/loader/loader.8
index ef847c10e68f..17492671c232 100644
--- a/sys/boot/i386/loader/loader.8
+++ b/sys/boot/i386/loader/loader.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/boot/i386/loader/loader.8,v 1.1.2.7 1999/08/29 16:21:07 peter Exp $
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
diff --git a/sys/boot/i386/loader/main.c b/sys/boot/i386/loader/main.c
index 327773820633..ad3ee165b7ca 100644
--- a/sys/boot/i386/loader/main.c
+++ b/sys/boot/i386/loader/main.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/loader/main.c,v 1.14.2.1 1999/08/29 16:21:07 peter Exp $
  */
 
 /*
diff --git a/sys/boot/i386/loader/version b/sys/boot/i386/loader/version
index 01f8500452c3..a569e178dadd 100644
--- a/sys/boot/i386/loader/version
+++ b/sys/boot/i386/loader/version
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/i386/loader/version,v 1.2.2.4 1999/08/29 16:21:07 peter Exp $
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
diff --git a/sys/boot/i386/mbr/Makefile b/sys/boot/i386/mbr/Makefile
index 1090ab02bb11..d7e819256bf5 100644
--- a/sys/boot/i386/mbr/Makefile
+++ b/sys/boot/i386/mbr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/mbr/Makefile,v 1.1.1.1.2.2 1999/08/29 16:21:08 peter Exp $
 
 PROG=		mbr
 NOMAN=
diff --git a/sys/boot/i386/mbr/mbr.m4 b/sys/boot/i386/mbr/mbr.m4
index c8783b92059e..b2bafc2c10ba 100644
--- a/sys/boot/i386/mbr/mbr.m4
+++ b/sys/boot/i386/mbr/mbr.m4
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/mbr/mbr.m4,v 1.1.1.1.2.2 1999/08/29 16:21:09 peter Exp $
 
 define(_al,0x0)dnl
 define(_cl,0x1)dnl
diff --git a/sys/boot/i386/mbr/mbr.s b/sys/boot/i386/mbr/mbr.s
index 6c030de1c79b..ae139534b28d 100644
--- a/sys/boot/i386/mbr/mbr.s
+++ b/sys/boot/i386/mbr/mbr.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/mbr/mbr.s,v 1.2.2.2 1999/08/29 16:21:09 peter Exp $
 
 # Master boot record
 
diff --git a/sys/boot/pc98/Makefile b/sys/boot/pc98/Makefile
index 5d013df2dce7..6341145ad7d8 100644
--- a/sys/boot/pc98/Makefile
+++ b/sys/boot/pc98/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/Makefile,v 1.1.2.2 1999/08/29 16:21:10 peter Exp $
 
 SUBDIR=		btx boot2 libpc98 loader
 
diff --git a/sys/boot/pc98/boot2/Makefile b/sys/boot/pc98/boot2/Makefile
index c7db0f0be252..cf98f3c045ce 100644
--- a/sys/boot/pc98/boot2/Makefile
+++ b/sys/boot/pc98/boot2/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/boot2/Makefile,v 1.1.2.2 1999/08/29 16:21:12 peter Exp $
 #
 
 PROG=	boot
diff --git a/sys/boot/pc98/boot2/asm.S b/sys/boot/pc98/boot2/asm.S
index f14c7f55104c..89b6b6469b24 100644
--- a/sys/boot/pc98/boot2/asm.S
+++ b/sys/boot/pc98/boot2/asm.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:13  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/asm.S,v 1.1.2.2 1999/08/29 16:21:13 peter Exp $
  */
 
 
diff --git a/sys/boot/pc98/boot2/asm.h b/sys/boot/pc98/boot2/asm.h
index 6f4bcc39e52d..d4784126e4e3 100644
--- a/sys/boot/pc98/boot2/asm.h
+++ b/sys/boot/pc98/boot2/asm.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.7  92/02/29  15:33:41  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/asm.h,v 1.1.2.2 1999/08/29 16:21:13 peter Exp $
  */
 
 #define S_ARG0	 4(%esp)
diff --git a/sys/boot/pc98/boot2/bios.S b/sys/boot/pc98/boot2/bios.S
index 88d9506c46b4..1d4be6f7fd86 100644
--- a/sys/boot/pc98/boot2/bios.S
+++ b/sys/boot/pc98/boot2/bios.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/bios.S,v 1.1.2.2 1999/08/29 16:21:14 peter Exp $
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/boot.c b/sys/boot/pc98/boot2/boot.c
index df8e755062a3..a2aa3a5aa6c6 100644
--- a/sys/boot/pc98/boot2/boot.c
+++ b/sys/boot/pc98/boot2/boot.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, [92/04/03  16:51:14  rvb]
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/boot.c,v 1.1.2.3 1999/08/29 16:21:14 peter Exp $
  */
 
 
diff --git a/sys/boot/pc98/boot2/boot.h b/sys/boot/pc98/boot2/boot.h
index 4e32192eebc6..77f58c3190e7 100644
--- a/sys/boot/pc98/boot2/boot.h
+++ b/sys/boot/pc98/boot2/boot.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:03  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/boot.h,v 1.1.2.2 1999/08/29 16:21:14 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/pc98/boot2/boot2.S b/sys/boot/pc98/boot2/boot2.S
index 9cad5ec9c3af..8cdbff046d23 100644
--- a/sys/boot/pc98/boot2/boot2.S
+++ b/sys/boot/pc98/boot2/boot2.S
@@ -25,7 +25,7 @@
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:26  rpd
  *	boot2.S,v 1.6 1995/01/25 21:37:40 bde Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/boot2.S,v 1.1.2.2 1999/08/29 16:21:15 peter Exp $
  */
 /*
  * Ported to PC-9801 by Yoshio Kimura
diff --git a/sys/boot/pc98/boot2/disk.c b/sys/boot/pc98/boot2/disk.c
index ad9d3ff74d88..2bd2c1117abb 100644
--- a/sys/boot/pc98/boot2/disk.c
+++ b/sys/boot/pc98/boot2/disk.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:49  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/disk.c,v 1.1.2.2 1999/08/29 16:21:15 peter Exp $
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/io.c b/sys/boot/pc98/boot2/io.c
index dc5fb00f94ce..3c4a0a0dff8f 100644
--- a/sys/boot/pc98/boot2/io.c
+++ b/sys/boot/pc98/boot2/io.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:57  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/io.c,v 1.1.2.2 1999/08/29 16:21:16 peter Exp $
  */
 
 #include "boot.h"
diff --git a/sys/boot/pc98/boot2/serial.S b/sys/boot/pc98/boot2/serial.S
index f2df31aec6cf..0398297eb58a 100644
--- a/sys/boot/pc98/boot2/serial.S
+++ b/sys/boot/pc98/boot2/serial.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/serial.S,v 1.1.2.2 1999/08/29 16:21:16 peter Exp $
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/start.S b/sys/boot/pc98/boot2/start.S
index a7e69355d621..6e7c0e665bb1 100644
--- a/sys/boot/pc98/boot2/start.S
+++ b/sys/boot/pc98/boot2/start.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:29  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/start.S,v 1.1.2.2 1999/08/29 16:21:17 peter Exp $
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/sys.c b/sys/boot/pc98/boot2/sys.c
index 1b138b36d479..27a3f9e31063 100644
--- a/sys/boot/pc98/boot2/sys.c
+++ b/sys/boot/pc98/boot2/sys.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:34  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/sys.c,v 1.1.2.2 1999/08/29 16:21:17 peter Exp $
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/table.c b/sys/boot/pc98/boot2/table.c
index b6e113a014a8..41c2071272b0 100644
--- a/sys/boot/pc98/boot2/table.c
+++ b/sys/boot/pc98/boot2/table.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:43  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/table.c,v 1.1.2.3 1999/08/29 16:21:18 peter Exp $
  */
 
 /*
diff --git a/sys/boot/pc98/btx/Makefile b/sys/boot/pc98/btx/Makefile
index 08005be319cb..3f720fe92797 100644
--- a/sys/boot/pc98/btx/Makefile
+++ b/sys/boot/pc98/btx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/btx/Makefile,v 1.1.2.2 1999/08/29 16:21:20 peter Exp $
 
 SUBDIR=	btx btxldr lib # client ldrtst
 
diff --git a/sys/boot/pc98/btx/btx/Makefile b/sys/boot/pc98/btx/btx/Makefile
index da25d34f7fe8..102bfd350d2a 100644
--- a/sys/boot/pc98/btx/btx/Makefile
+++ b/sys/boot/pc98/btx/btx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/btx/btx/Makefile,v 1.1.2.3 1999/11/14 01:51:15 nyan Exp $
 
 M4?=	m4
 
diff --git a/sys/boot/pc98/btx/btx/btx.m4 b/sys/boot/pc98/btx/btx/btx.m4
index 70649bbb6c91..4f054bce0d1d 100644
--- a/sys/boot/pc98/btx/btx/btx.m4
+++ b/sys/boot/pc98/btx/btx/btx.m4
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/btx/btx/btx.m4,v 1.1.2.2 1999/08/29 16:21:22 peter Exp $
 
 define(_al,0x0)dnl
 define(_cl,0x1)dnl
diff --git a/sys/boot/pc98/btx/btx/btx.s b/sys/boot/pc98/btx/btx/btx.s
index 944c1aa167b4..70b39d4add34 100644
--- a/sys/boot/pc98/btx/btx/btx.s
+++ b/sys/boot/pc98/btx/btx/btx.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/btx/btx/btx.s,v 1.1.2.4 1999/11/14 01:51:16 nyan Exp $
 
 #
 # Memory layout.
diff --git a/sys/boot/pc98/btx/btxldr/Makefile b/sys/boot/pc98/btx/btxldr/Makefile
index b6f40162d23a..87fcbe9f31e2 100644
--- a/sys/boot/pc98/btx/btxldr/Makefile
+++ b/sys/boot/pc98/btx/btxldr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/btx/btxldr/Makefile,v 1.1.2.2 1999/08/29 16:21:23 peter Exp $
 
 ORG=0x100000
 #AFLAGS+=	-x assembler-with-cpp
diff --git a/sys/boot/pc98/btx/btxldr/btxldr.s b/sys/boot/pc98/btx/btxldr/btxldr.s
index cc8c6a1c06d3..2e99da585571 100644
--- a/sys/boot/pc98/btx/btxldr/btxldr.s
+++ b/sys/boot/pc98/btx/btxldr/btxldr.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/btx/btxldr/btxldr.s,v 1.1.2.2 1999/08/29 16:21:24 peter Exp $
 
 #
 # Prototype BTX loader program, written in a couple of hours.  The
diff --git a/sys/boot/pc98/btx/lib/Makefile b/sys/boot/pc98/btx/lib/Makefile
index 40c65657ea7a..45facfec5822 100644
--- a/sys/boot/pc98/btx/lib/Makefile
+++ b/sys/boot/pc98/btx/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/btx/lib/Makefile,v 1.1.2.2 1999/08/29 16:21:24 peter Exp $
 
 OBJS=		btxcsu.o btxsys.o btxv86.o
 AFLAGS+=	-elf
diff --git a/sys/boot/pc98/btx/lib/btxcsu.s b/sys/boot/pc98/btx/lib/btxcsu.s
index f08ae754f826..9eb7dff86b33 100644
--- a/sys/boot/pc98/btx/lib/btxcsu.s
+++ b/sys/boot/pc98/btx/lib/btxcsu.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/btx/lib/btxcsu.s,v 1.1.2.2 1999/08/29 16:21:25 peter Exp $
 
 #
 # BTX C startup code (ELF).
diff --git a/sys/boot/pc98/btx/lib/btxsys.s b/sys/boot/pc98/btx/lib/btxsys.s
index 9c77b4295e7c..628ce8dcd5b9 100644
--- a/sys/boot/pc98/btx/lib/btxsys.s
+++ b/sys/boot/pc98/btx/lib/btxsys.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/btx/lib/btxsys.s,v 1.1.2.2 1999/08/29 16:21:25 peter Exp $
 
 #
 # BTX system calls.
diff --git a/sys/boot/pc98/btx/lib/btxv86.h b/sys/boot/pc98/btx/lib/btxv86.h
index 1152f8b1d963..31c71ce39737 100644
--- a/sys/boot/pc98/btx/lib/btxv86.h
+++ b/sys/boot/pc98/btx/lib/btxv86.h
@@ -14,7 +14,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/btx/lib/btxv86.h,v 1.1.2.2 1999/08/29 16:21:26 peter Exp $
  */
 
 #ifndef _BTXV86_H_
diff --git a/sys/boot/pc98/btx/lib/btxv86.s b/sys/boot/pc98/btx/lib/btxv86.s
index 0d7d1116322d..0a82713f5e96 100644
--- a/sys/boot/pc98/btx/lib/btxv86.s
+++ b/sys/boot/pc98/btx/lib/btxv86.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/btx/lib/btxv86.s,v 1.1.2.2 1999/08/29 16:21:26 peter Exp $
 
 #
 # BTX V86 interface.
diff --git a/sys/boot/pc98/libpc98/Makefile b/sys/boot/pc98/libpc98/Makefile
index cde163e3e382..31384c9c9974 100644
--- a/sys/boot/pc98/libpc98/Makefile
+++ b/sys/boot/pc98/libpc98/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.1.2.2 1999/08/29 16:21:27 peter Exp $
 #
 LIB=			pc98
 NOPIC=
diff --git a/sys/boot/pc98/libpc98/biosdisk.c b/sys/boot/pc98/libpc98/biosdisk.c
index 27c86d6dcaca..9dc618ef323a 100644
--- a/sys/boot/pc98/libpc98/biosdisk.c
+++ b/sys/boot/pc98/libpc98/biosdisk.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/libpc98/biosdisk.c,v 1.1.2.7 1999/09/24 11:55:03 nyan Exp $
  */
 
 /*
diff --git a/sys/boot/pc98/libpc98/bootinfo.c b/sys/boot/pc98/libpc98/bootinfo.c
index 03d949e01aa5..6dff07673d25 100644
--- a/sys/boot/pc98/libpc98/bootinfo.c
+++ b/sys/boot/pc98/libpc98/bootinfo.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/libpc98/bootinfo.c,v 1.1.2.2 1999/08/29 16:21:28 peter Exp $
  */
 
 #include <stand.h>
diff --git a/sys/boot/pc98/libpc98/comconsole.c b/sys/boot/pc98/libpc98/comconsole.c
index 958b4e01942a..d42025a9959e 100644
--- a/sys/boot/pc98/libpc98/comconsole.c
+++ b/sys/boot/pc98/libpc98/comconsole.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/libpc98/comconsole.c,v 1.1.2.2 1999/08/29 16:21:29 peter Exp $
  */
 
 #include <stand.h>
diff --git a/sys/boot/pc98/libpc98/gatea20.c b/sys/boot/pc98/libpc98/gatea20.c
index cad48c1badc3..d97ded2d728a 100644
--- a/sys/boot/pc98/libpc98/gatea20.c
+++ b/sys/boot/pc98/libpc98/gatea20.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/libpc98/gatea20.c,v 1.1.2.2 1999/08/29 16:21:30 peter Exp $
  * From: $NetBSD: gatea20.c,v 1.2 1997/10/29 00:32:49 fvdl Exp $
  */
 
diff --git a/sys/boot/pc98/libpc98/vidconsole.c b/sys/boot/pc98/libpc98/vidconsole.c
index 096330165986..8c36d7bc63ef 100644
--- a/sys/boot/pc98/libpc98/vidconsole.c
+++ b/sys/boot/pc98/libpc98/vidconsole.c
@@ -26,7 +26,7 @@
  *
  * 	From Id: probe_keyboard.c,v 1.13 1997/06/09 05:10:55 bde Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/libpc98/vidconsole.c,v 1.1.2.4 1999/12/03 13:23:16 nyan Exp $
  */
 
 #include <stand.h>
diff --git a/sys/boot/pc98/loader/Makefile b/sys/boot/pc98/loader/Makefile
index d751184e3fe5..cfb742e49341 100644
--- a/sys/boot/pc98/loader/Makefile
+++ b/sys/boot/pc98/loader/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.1.2.6 1999/08/29 16:21:31 peter Exp $
 
 BASE=		loader
 PROG=		${BASE}
diff --git a/sys/boot/pc98/loader/main.c b/sys/boot/pc98/loader/main.c
index 0fabadfe5b8e..e41d947172b6 100644
--- a/sys/boot/pc98/loader/main.c
+++ b/sys/boot/pc98/loader/main.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/loader/main.c,v 1.1.2.4 1999/08/29 16:21:32 peter Exp $
  */
 
 /*
diff --git a/sys/cam/cam.c b/sys/cam/cam.c
index 4c28e42954fc..d796d30035bb 100644
--- a/sys/cam/cam.c
+++ b/sys/cam/cam.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam.c,v 1.2.2.1 1999/08/29 16:21:34 peter Exp $
  */
 #include <sys/param.h>
 
diff --git a/sys/cam/cam.h b/sys/cam/cam.h
index 7f656032eddc..3b85b873c57d 100644
--- a/sys/cam/cam.h
+++ b/sys/cam/cam.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam.h,v 1.1.2.2 1999/08/29 16:21:35 peter Exp $
  */
 
 #ifndef _CAM_CAM_H
diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h
index f6fd2bb371d6..af34f63173c3 100644
--- a/sys/cam/cam_ccb.h
+++ b/sys/cam/cam_ccb.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.3.2.5 1999/08/29 16:21:35 peter Exp $
  */
 
 #ifndef _CAM_CAM_CCB_H
diff --git a/sys/cam/cam_conf.h b/sys/cam/cam_conf.h
index fc777c17d392..af3827421ce3 100644
--- a/sys/cam/cam_conf.h
+++ b/sys/cam/cam_conf.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_conf.h,v 1.1.2.1 1999/08/29 16:21:35 peter Exp $
  */
 
 #ifndef _CAM_CAM_CONF_H
diff --git a/sys/cam/cam_debug.h b/sys/cam/cam_debug.h
index d2cbc7c05499..05b3ebf09e29 100644
--- a/sys/cam/cam_debug.h
+++ b/sys/cam/cam_debug.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_debug.h,v 1.3.2.1 1999/08/29 16:21:36 peter Exp $
  */
 #ifndef	_CAM_CAM_DEBUG_H
 #define _CAM_CAM_DEBUG_H 1
diff --git a/sys/cam/cam_extend.c b/sys/cam/cam_extend.c
index 41528e27a89d..acf89fa3cd8d 100644
--- a/sys/cam/cam_extend.c
+++ b/sys/cam/cam_extend.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_extend.c,v 1.1.2.1 1999/08/29 16:21:36 peter Exp $
  */
 /*
  * XXX XXX XXX XXX  We should get DEVFS working so that we
diff --git a/sys/cam/cam_extend.h b/sys/cam/cam_extend.h
index 21ade23b40ac..eb66dfcb4e22 100644
--- a/sys/cam/cam_extend.h
+++ b/sys/cam/cam_extend.h
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_extend.h,v 1.1.2.1 1999/08/29 16:21:36 peter Exp $
  */
 
 #ifndef _CAM_CAM_EXTEND_H
diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c
index 4c6e76ada56c..3a3bee15f1a1 100644
--- a/sys/cam/cam_periph.c
+++ b/sys/cam/cam_periph.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_periph.c,v 1.9.2.9 1999/12/04 00:14:37 mjacob Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/cam/cam_periph.h b/sys/cam/cam_periph.h
index acb7bd643391..987f6bc35caa 100644
--- a/sys/cam/cam_periph.h
+++ b/sys/cam/cam_periph.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_periph.h,v 1.3.2.2 1999/08/29 16:21:38 peter Exp $
  */
 
 #ifndef _CAM_CAM_PERIPH_H
diff --git a/sys/cam/cam_queue.c b/sys/cam/cam_queue.c
index 988a1a2f42e3..f0eb123b4ccd 100644
--- a/sys/cam/cam_queue.c
+++ b/sys/cam/cam_queue.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_queue.c,v 1.1.2.4 1999/09/14 03:51:31 jkh Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/cam/cam_queue.h b/sys/cam/cam_queue.h
index d3459315a7c9..e81798035772 100644
--- a/sys/cam/cam_queue.h
+++ b/sys/cam/cam_queue.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_queue.h,v 1.2.2.3 1999/08/29 16:21:39 peter Exp $
  */
 
 #ifndef _CAM_CAM_QUEUE_H
diff --git a/sys/cam/cam_sim.c b/sys/cam/cam_sim.c
index c8843e24c825..5d8658890387 100644
--- a/sys/cam/cam_sim.c
+++ b/sys/cam/cam_sim.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_sim.c,v 1.1.2.2 1999/08/29 16:21:39 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/cam/cam_sim.h b/sys/cam/cam_sim.h
index 532504911633..1021d7db4351 100644
--- a/sys/cam/cam_sim.h
+++ b/sys/cam/cam_sim.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_sim.h,v 1.1.2.2 1999/08/29 16:21:40 peter Exp $
  */
 
 #ifndef _CAM_CAM_SIM_H
diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index ea18e1f7e6fd..29ccf4fce039 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_xpt.c,v 1.42.2.20 1999/10/16 23:45:28 mjacob Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/cam/cam_xpt.h b/sys/cam/cam_xpt.h
index 6d41f6c52f78..7317e107c2a9 100644
--- a/sys/cam/cam_xpt.h
+++ b/sys/cam/cam_xpt.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_xpt.h,v 1.1.2.1 1999/08/29 16:21:42 peter Exp $
  */
 
 #ifndef _CAM_CAM_XPT_H
diff --git a/sys/cam/cam_xpt_periph.h b/sys/cam/cam_xpt_periph.h
index 111402f04504..140c09758323 100644
--- a/sys/cam/cam_xpt_periph.h
+++ b/sys/cam/cam_xpt_periph.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_xpt_periph.h,v 1.1.2.1 1999/08/29 16:21:42 peter Exp $
  */
 
 #ifndef _CAM_CAM_XPT_PERIPH_H
diff --git a/sys/cam/cam_xpt_sim.h b/sys/cam/cam_xpt_sim.h
index 8730a1b6bafc..ff4f89d881cb 100644
--- a/sys/cam/cam_xpt_sim.h
+++ b/sys/cam/cam_xpt_sim.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_xpt_sim.h,v 1.1.2.1 1999/08/29 16:21:42 peter Exp $
  */
 
 #ifndef _CAM_CAM_XPT_SIM_H
diff --git a/sys/cam/scsi/scsi_all.c b/sys/cam/scsi/scsi_all.c
index a1ea40251e2a..68cff222f84e 100644
--- a/sys/cam/scsi/scsi_all.c
+++ b/sys/cam/scsi/scsi_all.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.9.2.1 1999/08/29 16:21:44 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/cam/scsi/scsi_all.h b/sys/cam/scsi/scsi_all.h
index d6d802bfceac..aec825174154 100644
--- a/sys/cam/scsi/scsi_all.h
+++ b/sys/cam/scsi/scsi_all.h
@@ -14,7 +14,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.6.2.3 1999/08/29 16:21:45 peter Exp $
  */
 
 /*
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
index b8eafe1fafb1..d6762a4f3690 100644
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.14.2.9 1999/12/11 23:03:03 ken Exp $
  */
 /*
  * Portions of this driver taken from the original FreeBSD cd driver.
diff --git a/sys/cam/scsi/scsi_ch.c b/sys/cam/scsi/scsi_ch.c
index 6277b7a7a4c9..b88e4b6473fc 100644
--- a/sys/cam/scsi/scsi_ch.c
+++ b/sys/cam/scsi/scsi_ch.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.9.2.4 1999/08/29 16:21:46 peter Exp $
  */
 /*
  * Derived from the NetBSD SCSI changer driver.
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index 57942f74555e..6f9882f5dfa6 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.19.2.10 1999/08/29 16:21:46 peter Exp $
  */
 
 #include "opt_hw_wdog.h"
diff --git a/sys/cam/scsi/scsi_da.h b/sys/cam/scsi/scsi_da.h
index 88a0fcd81bb9..121d94db0c3d 100644
--- a/sys/cam/scsi/scsi_da.h
+++ b/sys/cam/scsi/scsi_da.h
@@ -46,7 +46,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_da.h,v 1.2.2.1 1999/08/29 16:21:47 peter Exp $
  */
 
 #ifndef	_SCSI_SCSI_DA_H
diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c
index 2073419f04fc..b331fd48123a 100644
--- a/sys/cam/scsi/scsi_pass.c
+++ b/sys/cam/scsi/scsi_pass.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.5.2.5 1999/08/29 16:21:47 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/cam/scsi/scsi_pass.h b/sys/cam/scsi/scsi_pass.h
index 39e92c35227e..57deffa95a89 100644
--- a/sys/cam/scsi/scsi_pass.h
+++ b/sys/cam/scsi/scsi_pass.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_pass.h,v 1.1.2.2 1999/08/29 16:21:48 peter Exp $
  */
 
 #ifndef _SCSI_PASS_H
diff --git a/sys/cam/scsi/scsi_pt.c b/sys/cam/scsi/scsi_pt.c
index 35b810598ce0..8d73d5ea72c6 100644
--- a/sys/cam/scsi/scsi_pt.c
+++ b/sys/cam/scsi/scsi_pt.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.4.2.5 1999/08/29 16:21:48 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/cam/scsi/scsi_pt.h b/sys/cam/scsi/scsi_pt.h
index b5eea824fcf6..b2a7cf50bbf5 100644
--- a/sys/cam/scsi/scsi_pt.h
+++ b/sys/cam/scsi/scsi_pt.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_pt.h,v 1.1.2.1 1999/08/29 16:21:49 peter Exp $
  */
 
 #ifndef	_SCSI_SCSI_PT_H
diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c
index afc88536da7a..5d3a088680a3 100644
--- a/sys/cam/scsi/scsi_sa.c
+++ b/sys/cam/scsi/scsi_sa.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.16.2.12 1999/12/04 01:15:59 mjacob Exp $
  *
  * Implementation of SCSI Sequential Access Peripheral driver for CAM.
  *
diff --git a/sys/cam/scsi/scsi_sa.h b/sys/cam/scsi/scsi_sa.h
index be52eca28567..a760c27c8343 100644
--- a/sys/cam/scsi/scsi_sa.h
+++ b/sys/cam/scsi/scsi_sa.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_sa.h,v 1.3.2.3 1999/08/29 16:21:50 peter Exp $
  */
 
 #ifndef	_SCSI_SCSI_SA_H
diff --git a/sys/cam/scsi/scsi_targ_bh.c b/sys/cam/scsi/scsi_targ_bh.c
index c5a5ec5c22e0..c8805ea34d1f 100644
--- a/sys/cam/scsi/scsi_targ_bh.c
+++ b/sys/cam/scsi/scsi_targ_bh.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_targ_bh.c,v 1.1.2.2 1999/08/29 16:21:50 peter Exp $
  */
 #include <stddef.h>	/* For offsetof */
 
diff --git a/sys/cam/scsi/scsi_target.c b/sys/cam/scsi/scsi_target.c
index d47d88c83b65..3b0e13bbc4a7 100644
--- a/sys/cam/scsi/scsi_target.c
+++ b/sys/cam/scsi/scsi_target.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.7.2.6 1999/10/27 21:52:21 mjacob Exp $
  */
 #include <stddef.h>	/* For offsetof */
 
diff --git a/sys/cam/scsi/scsi_targetio.h b/sys/cam/scsi/scsi_targetio.h
index b5fefbd6b9af..b64dc4180729 100644
--- a/sys/cam/scsi/scsi_targetio.h
+++ b/sys/cam/scsi/scsi_targetio.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_targetio.h,v 1.1.2.2 1999/08/29 16:21:52 peter Exp $
  */
 
 #ifndef _CAM_SCSI_SCSI_TARGETIO_H_
diff --git a/sys/coda/cnode.h b/sys/coda/cnode.h
index 4c65427ad762..ca4eb2f28917 100644
--- a/sys/coda/cnode.h
+++ b/sys/coda/cnode.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/cnode.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/cnode.h,v 1.5.2.1 1999/08/29 16:21:54 peter Exp $
  * 
  */
 
diff --git a/sys/coda/coda.h b/sys/coda/coda.h
index 1f7654a150d6..6895bbc3303d 100644
--- a/sys/coda/coda.h
+++ b/sys/coda/coda.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda.h,v 1.6.2.1 1999/08/29 16:21:54 peter Exp $
  * 
  */
 
diff --git a/sys/coda/coda_fbsd.c b/sys/coda/coda_fbsd.c
index 6edf071e09ae..a8ee6b410d0c 100644
--- a/sys/coda/coda_fbsd.c
+++ b/sys/coda/coda_fbsd.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_fbsd.cr,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda_fbsd.c,v 1.11.2.1 1999/08/29 16:21:54 peter Exp $
  * 
  */
 
diff --git a/sys/coda/coda_io.h b/sys/coda/coda_io.h
index 6692bc297c23..994b0cfc059d 100644
--- a/sys/coda/coda_io.h
+++ b/sys/coda/coda_io.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_io.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda_io.h,v 1.4.2.1 1999/08/29 16:21:55 peter Exp $
  * 
  */
 
diff --git a/sys/coda/coda_kernel.h b/sys/coda/coda_kernel.h
index cc0fd957f81c..34ed5cb676e1 100644
--- a/sys/coda/coda_kernel.h
+++ b/sys/coda/coda_kernel.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_kernel.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda_kernel.h,v 1.3.2.1 1999/08/29 16:21:55 peter Exp $
  * 
  */
 
diff --git a/sys/coda/coda_namecache.c b/sys/coda/coda_namecache.c
index a8dfa813cad4..f90243256acc 100644
--- a/sys/coda/coda_namecache.c
+++ b/sys/coda/coda_namecache.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_namecache.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda_namecache.c,v 1.8.2.1 1999/08/29 16:21:55 peter Exp $
  * 
  */
 
diff --git a/sys/coda/coda_namecache.h b/sys/coda/coda_namecache.h
index 2499a845cfac..421e4872a03a 100644
--- a/sys/coda/coda_namecache.h
+++ b/sys/coda/coda_namecache.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_namecache.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda_namecache.h,v 1.4.2.1 1999/08/29 16:21:56 peter Exp $
  * 
  */
 
diff --git a/sys/coda/coda_opstats.h b/sys/coda/coda_opstats.h
index 8661a07ebfa0..f64a8d187628 100644
--- a/sys/coda/coda_opstats.h
+++ b/sys/coda/coda_opstats.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_opstats.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda_opstats.h,v 1.4.2.1 1999/08/29 16:21:56 peter Exp $
  * 
  */
 
diff --git a/sys/coda/coda_pioctl.h b/sys/coda/coda_pioctl.h
index 95ab8c9debaa..385e398d839f 100644
--- a/sys/coda/coda_pioctl.h
+++ b/sys/coda/coda_pioctl.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_pioctl.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda_pioctl.h,v 1.4.2.1 1999/08/29 16:21:56 peter Exp $
  * 
  */
 
diff --git a/sys/coda/coda_psdev.c b/sys/coda/coda_psdev.c
index 32d4df550b8c..e165f6403700 100644
--- a/sys/coda/coda_psdev.c
+++ b/sys/coda/coda_psdev.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_psdev.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda_psdev.c,v 1.10.2.1 1999/08/29 16:21:57 peter Exp $
  * 
  */
 
diff --git a/sys/coda/coda_psdev.h b/sys/coda/coda_psdev.h
index c6276f3e710c..884db95cb672 100644
--- a/sys/coda/coda_psdev.h
+++ b/sys/coda/coda_psdev.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_psdev.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda_psdev.h,v 1.1.2.1 1999/08/29 16:21:57 peter Exp $
  * 
  */
 
diff --git a/sys/coda/coda_subr.c b/sys/coda/coda_subr.c
index 14d1c7aed91b..aa9c6e6a736f 100644
--- a/sys/coda/coda_subr.c
+++ b/sys/coda/coda_subr.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_subr.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda_subr.c,v 1.9.2.1 1999/08/29 16:21:57 peter Exp $
  * 
   */
 
diff --git a/sys/coda/coda_subr.h b/sys/coda/coda_subr.h
index 71c8a3de3812..c86dc5667976 100644
--- a/sys/coda/coda_subr.h
+++ b/sys/coda/coda_subr.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_subr.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda_subr.h,v 1.6.2.1 1999/08/29 16:21:58 peter Exp $
  * 
  */
 
diff --git a/sys/coda/coda_venus.c b/sys/coda/coda_venus.c
index 5002c300f558..25e9e8056f3b 100644
--- a/sys/coda/coda_venus.c
+++ b/sys/coda/coda_venus.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/cfs/coda_venus.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda_venus.c,v 1.6.2.1 1999/08/29 16:21:58 peter Exp $
  * 
  */
 
diff --git a/sys/coda/coda_venus.h b/sys/coda/coda_venus.h
index 392a73f07114..aaa28ab303f0 100644
--- a/sys/coda/coda_venus.h
+++ b/sys/coda/coda_venus.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_venus.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda_venus.h,v 1.3.2.1 1999/08/29 16:21:59 peter Exp $
  * 
  */
 
diff --git a/sys/coda/coda_vfsops.c b/sys/coda/coda_vfsops.c
index 920135c82683..08a114997197 100644
--- a/sys/coda/coda_vfsops.c
+++ b/sys/coda/coda_vfsops.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  *  	@(#) src/sys/cfs/coda_vfsops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda_vfsops.c,v 1.11.2.1 1999/08/29 16:21:59 peter Exp $
  * 
  */
 
diff --git a/sys/coda/coda_vfsops.h b/sys/coda/coda_vfsops.h
index 13a006d1b1c7..b402ef50b57f 100644
--- a/sys/coda/coda_vfsops.h
+++ b/sys/coda/coda_vfsops.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/cfs/coda_vfsops.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda_vfsops.h,v 1.3.2.1 1999/08/29 16:22:00 peter Exp $
  * 
  */
 
diff --git a/sys/coda/coda_vnops.c b/sys/coda/coda_vnops.c
index 18bbb23fb025..ed88df87a287 100644
--- a/sys/coda/coda_vnops.c
+++ b/sys/coda/coda_vnops.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  *  	@(#) src/sys/coda/coda_vnops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda_vnops.c,v 1.13.2.1 1999/08/29 16:22:00 peter Exp $
  * 
  */
 
diff --git a/sys/coda/coda_vnops.h b/sys/coda/coda_vnops.h
index a638264ac668..170edb3d2b39 100644
--- a/sys/coda/coda_vnops.h
+++ b/sys/coda/coda_vnops.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_vnops.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/coda/coda_vnops.h,v 1.4.2.1 1999/08/29 16:22:01 peter Exp $
  * 
   */
 
diff --git a/sys/conf/files b/sys/conf/files
index e3a51d08c413..4952e5c05339 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files,v 1.190.2.20 1999/12/08 19:46:57 julian Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 1e0bd68cc5ec..1f97ab3976dc 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,12 +32,12 @@
 # SUCH DAMAGE.
 #
 #	@(#)newvers.sh	8.1 (Berkeley) 4/20/94
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/newvers.sh,v 1.41.2.13 1999/12/17 03:03:56 jkh Exp $
 
 TYPE="FreeBSD"
 REVISION="3.4"
 BRANCH="RELEASE"
-RELEASE="${REVISION}-${BRANCH}"
+RELEASE=3.4-RELEASE
 SNAPDATE=""
 if [ "X${SNAPDATE}" != "X" ]; then
 	RELEASE="${RELEASE}-${SNAPDATE}"
diff --git a/sys/conf/nfsswapkernel.c b/sys/conf/nfsswapkernel.c
index 8f8a67e2f130..898d1b9f7439 100644
--- a/sys/conf/nfsswapkernel.c
+++ b/sys/conf/nfsswapkernel.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * from: @(#)nfsswapvmunix.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/conf/nfsswapkernel.c,v 1.5.2.1 1999/08/29 16:22:03 peter Exp $
  */
 
 /*
diff --git a/sys/conf/options b/sys/conf/options
index 6f08cc1c55fd..f7e732bd9685 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options,v 1.121.2.21 1999/12/08 19:46:58 julian Exp $
 #
 #        On the handling of kernel options   
 # 
diff --git a/sys/conf/param.c b/sys/conf/param.c
index a9d24496fd66..9fbab252ef9a 100644
--- a/sys/conf/param.c
+++ b/sys/conf/param.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.c	8.3 (Berkeley) 8/20/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/conf/param.c,v 1.32.2.2 1999/08/29 16:22:04 peter Exp $
  */
 
 #include <stddef.h>
diff --git a/sys/conf/systags.sh b/sys/conf/systags.sh
index 0c32922df67d..e3a5a2ac6cfe 100644
--- a/sys/conf/systags.sh
+++ b/sys/conf/systags.sh
@@ -38,7 +38,7 @@
 #
 # First written May 16, 1992 by Van Jacobson, Lawrence Berkeley Laboratory.
 #
-# from: $FreeBSD$
+# from: $FreeBSD: src/sys/conf/systags.sh,v 1.4.4.2 1999/08/29 16:22:05 peter Exp $
 
 rm -f tags tags.tmp tags.cfiles tags.sfiles tags.hfiles
 MACHINE=`uname -m`
diff --git a/sys/contrib/dev/fla/README b/sys/contrib/dev/fla/README
index d9a4569d3f55..4d1b3c57e7b2 100644
--- a/sys/contrib/dev/fla/README
+++ b/sys/contrib/dev/fla/README
@@ -195,4 +195,4 @@ Good Luck,
 
 Poul-Henning
 
-$FreeBSD$
+$FreeBSD: src/sys/contrib/dev/fla/README,v 1.2.2.3 1999/09/08 17:13:30 phk Exp $
diff --git a/sys/contrib/dev/fla/fla.c b/sys/contrib/dev/fla/fla.c
index 8bf7fcb2b360..a0fb7fa1a72f 100644
--- a/sys/contrib/dev/fla/fla.c
+++ b/sys/contrib/dev/fla/fla.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/contrib/dev/fla/fla.c,v 1.1.2.2 1999/08/29 16:22:06 peter Exp $ 
  *
  */
 
diff --git a/sys/contrib/dev/oltr/if_oltr.c b/sys/contrib/dev/oltr/if_oltr.c
index 563579b79b81..c68e3c953d51 100644
--- a/sys/contrib/dev/oltr/if_oltr.c
+++ b/sys/contrib/dev/oltr/if_oltr.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/dev/oltr/if_oltr.c,v 1.5.2.1 1999/08/29 16:22:07 peter Exp $
  */
 
 
diff --git a/sys/contrib/softupdates/ffs_softdep.c b/sys/contrib/softupdates/ffs_softdep.c
index 5c0f271d5ce7..bb554e236a77 100644
--- a/sys/contrib/softupdates/ffs_softdep.c
+++ b/sys/contrib/softupdates/ffs_softdep.c
@@ -53,7 +53,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ffs_softdep.c	9.36 (McKusick) 5/6/99
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/softupdates/ffs_softdep.c,v 1.34.2.3 1999/08/29 16:22:08 peter Exp $
  */
 
 /*
diff --git a/sys/contrib/softupdates/softdep.h b/sys/contrib/softupdates/softdep.h
index 8bbc409accbb..208127b5d79d 100644
--- a/sys/contrib/softupdates/softdep.h
+++ b/sys/contrib/softupdates/softdep.h
@@ -53,7 +53,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)softdep.h	9.6 (McKusick) 2/25/99
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/softupdates/softdep.h,v 1.6.2.2 1999/08/29 16:22:10 peter Exp $
  */
 
 #include <sys/queue.h>
diff --git a/sys/ddb/db_access.c b/sys/ddb/db_access.c
index 04de1083bb92..d8d8492751a2 100644
--- a/sys/ddb/db_access.c
+++ b/sys/ddb/db_access.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_access.c,v 1.14.4.1 1999/08/29 16:22:11 peter Exp $
  */
 
 /*
diff --git a/sys/ddb/db_access.h b/sys/ddb/db_access.h
index 715c1cb002c3..5694b1472c86 100644
--- a/sys/ddb/db_access.h
+++ b/sys/ddb/db_access.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_access.h,v 1.8.4.1 1999/08/29 16:22:12 peter Exp $
  */
 
 #ifndef _DDB_DB_ACCESS_H_
diff --git a/sys/ddb/db_aout.c b/sys/ddb/db_aout.c
index 3f0e84381fdc..bd1581b68698 100644
--- a/sys/ddb/db_aout.c
+++ b/sys/ddb/db_aout.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_aout.c,v 1.22.2.1 1999/08/29 16:22:12 peter Exp $
  */
 
 /*
diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c
index 9ac0001255f8..2b01c836ae16 100644
--- a/sys/ddb/db_break.c
+++ b/sys/ddb/db_break.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_break.c,v 1.17.2.1 1999/08/29 16:22:13 peter Exp $
  */
 
 /*
diff --git a/sys/ddb/db_break.h b/sys/ddb/db_break.h
index 008acab85b1e..6162652488fd 100644
--- a/sys/ddb/db_break.h
+++ b/sys/ddb/db_break.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_break.h,v 1.11.2.1 1999/08/29 16:22:13 peter Exp $
  */
 
 /*
diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c
index 56935dd2185c..398cad75d9d9 100644
--- a/sys/ddb/db_command.c
+++ b/sys/ddb/db_command.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_command.c,v 1.29.2.1 1999/08/29 16:22:13 peter Exp $
  */
 
 /*
diff --git a/sys/ddb/db_command.h b/sys/ddb/db_command.h
index a95f5b3aaee3..3931e7beb95f 100644
--- a/sys/ddb/db_command.h
+++ b/sys/ddb/db_command.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_command.h,v 1.10.4.1 1999/08/29 16:22:14 peter Exp $
  */
 
 #ifndef _DDB_DB_COMMAND_H_
diff --git a/sys/ddb/db_elf.c b/sys/ddb/db_elf.c
index 8f6843e83b69..39b3927bbaca 100644
--- a/sys/ddb/db_elf.c
+++ b/sys/ddb/db_elf.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ddb/db_elf.c,v 1.4.2.1 1999/08/29 16:22:14 peter Exp $ */
 /*	$NetBSD: db_elf.c,v 1.4 1998/05/03 18:49:54 thorpej Exp $	*/
 
 /*-
diff --git a/sys/ddb/db_examine.c b/sys/ddb/db_examine.c
index e8a3f73af771..bed3274c497e 100644
--- a/sys/ddb/db_examine.c
+++ b/sys/ddb/db_examine.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_examine.c,v 1.24.2.1 1999/08/29 16:22:15 peter Exp $
  */
 
 /*
diff --git a/sys/ddb/db_expr.c b/sys/ddb/db_expr.c
index 61f7fc13b94c..1ea5f048728b 100644
--- a/sys/ddb/db_expr.c
+++ b/sys/ddb/db_expr.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_expr.c,v 1.12.4.1 1999/08/29 16:22:15 peter Exp $
  */
 
 /*
diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c
index 96b15ae45f51..31a85fa909ae 100644
--- a/sys/ddb/db_input.c
+++ b/sys/ddb/db_input.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_input.c,v 1.23.2.2 1999/08/29 16:22:15 peter Exp $
  */
 
 /*
diff --git a/sys/ddb/db_kld.c b/sys/ddb/db_kld.c
index e528f21042e1..4abe17ac327a 100644
--- a/sys/ddb/db_kld.c
+++ b/sys/ddb/db_kld.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_kld.c,v 1.4.2.1 1999/08/29 16:22:16 peter Exp $
  *	from db_aout.c,v 1.20 1998/06/07 17:09:36 dfr Exp
  */
 
diff --git a/sys/ddb/db_lex.c b/sys/ddb/db_lex.c
index 392b8b07cb30..48496c4e2e59 100644
--- a/sys/ddb/db_lex.c
+++ b/sys/ddb/db_lex.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_lex.c,v 1.17.2.1 1999/08/29 16:22:16 peter Exp $
  */
 
 /*
diff --git a/sys/ddb/db_lex.h b/sys/ddb/db_lex.h
index c4e0ee2a6ba4..7c6063170b9e 100644
--- a/sys/ddb/db_lex.h
+++ b/sys/ddb/db_lex.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_lex.h,v 1.11.2.1 1999/08/29 16:22:17 peter Exp $
  */
 
 #ifndef _DDB_DB_LEX_H_
diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c
index 5d2d98e3acfd..ff4af0d02aaf 100644
--- a/sys/ddb/db_output.c
+++ b/sys/ddb/db_output.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_output.c,v 1.24.2.1 1999/08/29 16:22:17 peter Exp $
  */
 
 /*
diff --git a/sys/ddb/db_output.h b/sys/ddb/db_output.h
index 8172bbba6d83..acf9452e58ed 100644
--- a/sys/ddb/db_output.h
+++ b/sys/ddb/db_output.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_output.h,v 1.10.4.1 1999/08/29 16:22:17 peter Exp $
  */
 
 #ifndef _DDB_DB_OUTPUT_H_
diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c
index 86d50e925349..3f8dbca96d92 100644
--- a/sys/ddb/db_print.c
+++ b/sys/ddb/db_print.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_print.c,v 1.23.2.1 1999/08/29 16:22:18 peter Exp $
  */
 
 /*
diff --git a/sys/ddb/db_ps.c b/sys/ddb/db_ps.c
index 4640b419dd55..59b811890606 100644
--- a/sys/ddb/db_ps.c
+++ b/sys/ddb/db_ps.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_ps.c,v 1.16.2.1 1999/08/29 16:22:18 peter Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c
index 6acafe7a29b9..926d21651688 100644
--- a/sys/ddb/db_run.c
+++ b/sys/ddb/db_run.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_run.c,v 1.16.2.1 1999/08/29 16:22:19 peter Exp $
  */
 
 /*
diff --git a/sys/ddb/db_sym.c b/sys/ddb/db_sym.c
index ab56722d587d..a09bdbaf18ab 100644
--- a/sys/ddb/db_sym.c
+++ b/sys/ddb/db_sym.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_sym.c,v 1.27.2.1 1999/08/29 16:22:19 peter Exp $
  */
 
 /*
diff --git a/sys/ddb/db_sym.h b/sys/ddb/db_sym.h
index c66a8c6f7b0f..3b7cfa3241f6 100644
--- a/sys/ddb/db_sym.h
+++ b/sys/ddb/db_sym.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_sym.h,v 1.15.2.1 1999/08/29 16:22:20 peter Exp $
  */
 
 #ifndef _DDB_DB_SYM_H_
diff --git a/sys/ddb/db_trap.c b/sys/ddb/db_trap.c
index 2111957ec456..b79591699ba5 100644
--- a/sys/ddb/db_trap.c
+++ b/sys/ddb/db_trap.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_trap.c,v 1.13.4.1 1999/08/29 16:22:20 peter Exp $
  */
 
 /*
diff --git a/sys/ddb/db_variables.c b/sys/ddb/db_variables.c
index 9bcb7ddfcde5..8d65301405ae 100644
--- a/sys/ddb/db_variables.c
+++ b/sys/ddb/db_variables.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_variables.c,v 1.16.2.1 1999/08/29 16:22:21 peter Exp $
  */
 
 /*
diff --git a/sys/ddb/db_variables.h b/sys/ddb/db_variables.h
index f430f0d8c94d..eebc22a41755 100644
--- a/sys/ddb/db_variables.h
+++ b/sys/ddb/db_variables.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_variables.h,v 1.10.2.1 1999/08/29 16:22:21 peter Exp $
  */
 
 /*
diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c
index d38a89e54bb5..15f3a61ba44f 100644
--- a/sys/ddb/db_watch.c
+++ b/sys/ddb/db_watch.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_watch.c,v 1.17.2.1 1999/08/29 16:22:21 peter Exp $
  */
 
 /*
diff --git a/sys/ddb/db_watch.h b/sys/ddb/db_watch.h
index 18943f43942d..2aa15444e808 100644
--- a/sys/ddb/db_watch.h
+++ b/sys/ddb/db_watch.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_watch.h,v 1.10.4.1 1999/08/29 16:22:22 peter Exp $
  */
 
 /*
diff --git a/sys/ddb/db_write_cmd.c b/sys/ddb/db_write_cmd.c
index f86b38f95af3..b1def267feb8 100644
--- a/sys/ddb/db_write_cmd.c
+++ b/sys/ddb/db_write_cmd.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_write_cmd.c,v 1.11.2.1 1999/08/29 16:22:22 peter Exp $
  */
 
 /*
diff --git a/sys/ddb/ddb.h b/sys/ddb/ddb.h
index 9cfce24a4edf..e835ecebed01 100644
--- a/sys/ddb/ddb.h
+++ b/sys/ddb/ddb.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/ddb.h,v 1.20.2.1 1999/08/29 16:22:23 peter Exp $
  */
 
 /*
diff --git a/sys/dev/advansys/advansys.c b/sys/dev/advansys/advansys.c
index 19cb21ad6fb5..587361fbaa61 100644
--- a/sys/dev/advansys/advansys.c
+++ b/sys/dev/advansys/advansys.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/advansys.c,v 1.7.2.5 1999/09/14 04:01:10 jkh Exp $
  */
 /*
  * Ported from:
diff --git a/sys/dev/advansys/advansys.h b/sys/dev/advansys/advansys.h
index 9108e2d2ff86..1bf5f80352e4 100644
--- a/sys/dev/advansys/advansys.h
+++ b/sys/dev/advansys/advansys.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  * All rights reserved.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/advansys.h,v 1.1.2.1 1999/08/29 16:22:26 peter Exp $
  */
 
 #ifndef _ADVANSYS_H_
diff --git a/sys/dev/advansys/advlib.c b/sys/dev/advansys/advlib.c
index 4db062356644..d7b4bde4dc0a 100644
--- a/sys/dev/advansys/advlib.c
+++ b/sys/dev/advansys/advlib.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/advlib.c,v 1.10.2.3 1999/08/29 16:22:26 peter Exp $
  */
 /*
  * Ported from:
diff --git a/sys/dev/advansys/advlib.h b/sys/dev/advansys/advlib.h
index e7dc69d64eb1..aa44a03041bf 100644
--- a/sys/dev/advansys/advlib.h
+++ b/sys/dev/advansys/advlib.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/advlib.h,v 1.4.2.2 1999/09/14 04:07:44 gibbs Exp $
  */
 /*
  * Ported from:
diff --git a/sys/dev/advansys/advmcode.c b/sys/dev/advansys/advmcode.c
index 22491297f6cb..e0b605b9712d 100644
--- a/sys/dev/advansys/advmcode.c
+++ b/sys/dev/advansys/advmcode.c
@@ -1,7 +1,7 @@
 /*
  * Downloadable microcode for Advanced Systems Inc. SCSI controllers
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/advmcode.c,v 1.5.2.1 1999/08/29 16:22:27 peter Exp $
  *
  * Obtained from:
  * advansys.c - Linux Host Driver for AdvanSys SCSI Adapters
diff --git a/sys/dev/advansys/advmcode.h b/sys/dev/advansys/advmcode.h
index 666bb774e0eb..e4dc72c22930 100644
--- a/sys/dev/advansys/advmcode.h
+++ b/sys/dev/advansys/advmcode.h
@@ -1,7 +1,7 @@
 /*
  * Exported interface to downloadable microcode for AdvanSys SCSI Adapters
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/advmcode.h,v 1.4.2.1 1999/08/29 16:22:27 peter Exp $
  *
  * Obtained from:
  *
diff --git a/sys/dev/advansys/adwcam.c b/sys/dev/advansys/adwcam.c
index b30f16c8e933..bfe9e53c6bb0 100644
--- a/sys/dev/advansys/adwcam.c
+++ b/sys/dev/advansys/adwcam.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/adwcam.c,v 1.2.2.3 1999/09/14 04:07:44 gibbs Exp $
  */
 /*
  * Ported from:
diff --git a/sys/dev/advansys/adwlib.c b/sys/dev/advansys/adwlib.c
index 289c3c67b1ee..53b4893ad797 100644
--- a/sys/dev/advansys/adwlib.c
+++ b/sys/dev/advansys/adwlib.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/adwlib.c,v 1.2.2.1 1999/08/29 16:22:28 peter Exp $
  */
 /*
  * Ported from:
diff --git a/sys/dev/advansys/adwlib.h b/sys/dev/advansys/adwlib.h
index 3773cf14eaa2..6a4f1b11a803 100644
--- a/sys/dev/advansys/adwlib.h
+++ b/sys/dev/advansys/adwlib.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/adwlib.h,v 1.1.2.1 1999/08/29 16:22:29 peter Exp $
  */
 /*
  * Ported from:
diff --git a/sys/dev/advansys/adwmcode.c b/sys/dev/advansys/adwmcode.c
index 84f77e541d14..9db2c833bd24 100644
--- a/sys/dev/advansys/adwmcode.c
+++ b/sys/dev/advansys/adwmcode.c
@@ -2,7 +2,7 @@
  * Downloadable microcode for Second Generation
  * Advanced Systems Inc. SCSI controllers
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/adwmcode.c,v 1.1.2.1 1999/08/29 16:22:29 peter Exp $
  *
  * Obtained from:
  * advansys.c - Linux Host Driver for AdvanSys SCSI Adapters
diff --git a/sys/dev/advansys/adwmcode.h b/sys/dev/advansys/adwmcode.h
index 99d2d6fa8c5c..407f350eeeeb 100644
--- a/sys/dev/advansys/adwmcode.h
+++ b/sys/dev/advansys/adwmcode.h
@@ -1,7 +1,7 @@
 /*
  * Exported interface to downloadable microcode for AdvanSys SCSI Adapters
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/adwmcode.h,v 1.1.2.1 1999/08/29 16:22:29 peter Exp $
  *
  * Obtained from:
  *
diff --git a/sys/dev/advansys/adwvar.h b/sys/dev/advansys/adwvar.h
index 1820b8a68ade..350d5052e680 100644
--- a/sys/dev/advansys/adwvar.h
+++ b/sys/dev/advansys/adwvar.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  * All rights reserved.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/adwvar.h,v 1.1.2.1 1999/08/29 16:22:30 peter Exp $
  */
 
 #ifndef _ADWVAR_H_
diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c
index c5c5245e98ca..ae6a090ab6bf 100644
--- a/sys/dev/aha/aha.c
+++ b/sys/dev/aha/aha.c
@@ -55,7 +55,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aha/aha.c,v 1.19.2.6 1999/09/14 04:07:49 gibbs Exp $
  */
 
 #include "pnp.h"
diff --git a/sys/dev/aha/ahareg.h b/sys/dev/aha/ahareg.h
index 0e2ce77c9cf3..695937b6c1cc 100644
--- a/sys/dev/aha/ahareg.h
+++ b/sys/dev/aha/ahareg.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aha/ahareg.h,v 1.5.2.2 1999/08/29 16:22:32 peter Exp $
  */
 
 #ifndef _AHAREG_H_
diff --git a/sys/dev/aic/aic.c b/sys/dev/aic/aic.c
index 2880e683625f..ef760363a120 100644
--- a/sys/dev/aic/aic.c
+++ b/sys/dev/aic/aic.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic/aic.c,v 1.3.2.5 1999/12/16 23:23:56 luoqi Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/aic/aic6360reg.h b/sys/dev/aic/aic6360reg.h
index 7dafac46d420..eee9fb2c7d37 100644
--- a/sys/dev/aic/aic6360reg.h
+++ b/sys/dev/aic/aic6360reg.h
@@ -29,7 +29,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic/aic6360reg.h,v 1.1.2.1 1999/10/22 01:00:04 luoqi Exp $
  */
 
 #define SCSISEQ		0x00	/* SCSI sequence control */
diff --git a/sys/dev/aic/aic_isa.c b/sys/dev/aic/aic_isa.c
index d87a1223d1d5..afd052eb0017 100644
--- a/sys/dev/aic/aic_isa.c
+++ b/sys/dev/aic/aic_isa.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic/aic_isa.c,v 1.1.2.2 1999/10/25 19:11:44 luoqi Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/aic/aicvar.h b/sys/dev/aic/aicvar.h
index 973a45c958cf..0a0d8d4df476 100644
--- a/sys/dev/aic/aicvar.h
+++ b/sys/dev/aic/aicvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic/aicvar.h,v 1.1.2.3 1999/12/04 22:49:48 luoqi Exp $
  */
 
 #include "aic.h"
diff --git a/sys/dev/aic7xxx/93cx6.c b/sys/dev/aic7xxx/93cx6.c
index 49d7952c4497..58cad1f077b5 100644
--- a/sys/dev/aic7xxx/93cx6.c
+++ b/sys/dev/aic7xxx/93cx6.c
@@ -18,7 +18,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/93cx6.c,v 1.1.2.3 1999/08/29 16:22:33 peter Exp $
  */
 
 /*
diff --git a/sys/dev/aic7xxx/93cx6.h b/sys/dev/aic7xxx/93cx6.h
index b1694834a06b..ea56fc97c8bb 100644
--- a/sys/dev/aic7xxx/93cx6.h
+++ b/sys/dev/aic7xxx/93cx6.h
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/93cx6.h,v 1.1.2.1 1999/08/29 16:22:33 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/aic7xxx/Makefile b/sys/dev/aic7xxx/Makefile
index aa478151de4e..f67c620c0ec2 100644
--- a/sys/dev/aic7xxx/Makefile
+++ b/sys/dev/aic7xxx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/aic7xxx/Makefile,v 1.5.2.1 1999/08/29 16:22:34 peter Exp $
 
 PROG=	aicasm
 
diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c
index 7adb396422c1..d328056a1c68 100644
--- a/sys/dev/aic7xxx/aic7xxx.c
+++ b/sys/dev/aic7xxx/aic7xxx.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.16.2.15 1999/12/12 05:02:27 gibbs Exp $
  */
 /*
  * A few notes on features of the driver.
diff --git a/sys/dev/aic7xxx/aic7xxx.h b/sys/dev/aic7xxx/aic7xxx.h
index 31b0312907f2..970fa1d543d5 100644
--- a/sys/dev/aic7xxx/aic7xxx.h
+++ b/sys/dev/aic7xxx/aic7xxx.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.h,v 1.5.2.6 1999/12/12 05:02:29 gibbs Exp $
  */
 
 #ifndef _AIC7XXX_H_
diff --git a/sys/dev/aic7xxx/aic7xxx.reg b/sys/dev/aic7xxx/aic7xxx.reg
index 1deaaaca8f5d..3f9d076c6ae3 100644
--- a/sys/dev/aic7xxx/aic7xxx.reg
+++ b/sys/dev/aic7xxx/aic7xxx.reg
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.reg,v 1.12.2.6 1999/12/12 05:02:29 gibbs Exp $
  */
 
 /*
diff --git a/sys/dev/aic7xxx/aic7xxx.seq b/sys/dev/aic7xxx/aic7xxx.seq
index 4acaefe55234..83deb1536eb8 100644
--- a/sys/dev/aic7xxx/aic7xxx.seq
+++ b/sys/dev/aic7xxx/aic7xxx.seq
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.seq,v 1.84.2.9 1999/12/12 05:02:29 gibbs Exp $
  */
 
 #include <dev/aic7xxx/aic7xxx.reg>
diff --git a/sys/dev/aic7xxx/aicasm.c b/sys/dev/aic7xxx/aicasm.c
index 9af5c8343274..61a34f0fb575 100644
--- a/sys/dev/aic7xxx/aicasm.c
+++ b/sys/dev/aic7xxx/aicasm.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm.c,v 1.20.2.3 1999/09/11 15:52:55 gibbs Exp $
  */
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/sys/dev/aic7xxx/aicasm.h b/sys/dev/aic7xxx/aicasm.h
index 7e6b4683dfdb..adc5f11ded76 100644
--- a/sys/dev/aic7xxx/aicasm.h
+++ b/sys/dev/aic7xxx/aicasm.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm.h,v 1.4.2.2 1999/12/12 05:02:30 gibbs Exp $
  */
 
 #include <sys/queue.h>
diff --git a/sys/dev/aic7xxx/aicasm_gram.y b/sys/dev/aic7xxx/aicasm_gram.y
index 4d090598e4fa..d165d1a5d4bf 100644
--- a/sys/dev/aic7xxx/aicasm_gram.y
+++ b/sys/dev/aic7xxx/aicasm_gram.y
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm_gram.y,v 1.6.2.2 1999/12/12 05:02:31 gibbs Exp $
  */
 
 #include <stdio.h>
diff --git a/sys/dev/aic7xxx/aicasm_scan.l b/sys/dev/aic7xxx/aicasm_scan.l
index 28689cbd4996..a5f0583d597f 100644
--- a/sys/dev/aic7xxx/aicasm_scan.l
+++ b/sys/dev/aic7xxx/aicasm_scan.l
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm_scan.l,v 1.6.2.2 1999/12/12 05:02:31 gibbs Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/dev/aic7xxx/aicasm_symbol.c b/sys/dev/aic7xxx/aicasm_symbol.c
index 8c250d2317ec..e07379454ded 100644
--- a/sys/dev/aic7xxx/aicasm_symbol.c
+++ b/sys/dev/aic7xxx/aicasm_symbol.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm_symbol.c,v 1.5.2.3 1999/12/12 05:02:32 gibbs Exp $
  */
 
 
diff --git a/sys/dev/aic7xxx/aicasm_symbol.h b/sys/dev/aic7xxx/aicasm_symbol.h
index 79809db8e6a5..42a1ba642387 100644
--- a/sys/dev/aic7xxx/aicasm_symbol.h
+++ b/sys/dev/aic7xxx/aicasm_symbol.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm_symbol.h,v 1.4.2.2 1999/12/12 05:02:32 gibbs Exp $
  */
 
 #include <sys/queue.h>
diff --git a/sys/dev/aic7xxx/sequencer.h b/sys/dev/aic7xxx/sequencer.h
index 4f054916ebe8..7e12be628be5 100644
--- a/sys/dev/aic7xxx/sequencer.h
+++ b/sys/dev/aic7xxx/sequencer.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/sequencer.h,v 1.4.2.2 1999/12/12 05:02:32 gibbs Exp $
  */
 
 struct ins_format1 {
diff --git a/sys/dev/bktr/CHANGELOG.TXT b/sys/dev/bktr/CHANGELOG.TXT
index 9bdc151dd868..b2aa3d649594 100755
--- a/sys/dev/bktr/CHANGELOG.TXT
+++ b/sys/dev/bktr/CHANGELOG.TXT
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/CHANGELOG.TXT,v 1.2.2.2 1999/10/07 09:46:27 roger Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_audio.c b/sys/dev/bktr/bktr_audio.c
index 9f27a668159d..c6c583063bf5 100644
--- a/sys/dev/bktr/bktr_audio.c
+++ b/sys/dev/bktr/bktr_audio.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_audio.c,v 1.1.2.1 1999/10/01 17:14:07 roger Exp $ */
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
  * and TV Tuner cards using the Brooktree Bt848, Bt848A, Bt849A, Bt878, Bt879
diff --git a/sys/dev/bktr/bktr_audio.h b/sys/dev/bktr/bktr_audio.h
index 79bb36614355..afd3c69affc8 100644
--- a/sys/dev/bktr/bktr_audio.h
+++ b/sys/dev/bktr/bktr_audio.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_audio.h,v 1.1.2.1 1999/10/01 17:14:07 roger Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_card.c b/sys/dev/bktr/bktr_card.c
index e3c570ef62cc..af54fe917858 100644
--- a/sys/dev/bktr/bktr_card.c
+++ b/sys/dev/bktr/bktr_card.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.2.2.3 1999/10/15 13:38:40 roger Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_card.h b/sys/dev/bktr/bktr_card.h
index 208c4dcc99ac..850a29bfd65f 100644
--- a/sys/dev/bktr/bktr_card.h
+++ b/sys/dev/bktr/bktr_card.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_card.h,v 1.2.2.1 1999/10/01 17:14:08 roger Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 538c0058911e..8326b5ed0f69 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.100.2.1 1999/10/01 17:14:09 roger Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_core.h b/sys/dev/bktr/bktr_core.h
index f6870936a0f0..60271977fd79 100644
--- a/sys/dev/bktr/bktr_core.h
+++ b/sys/dev/bktr/bktr_core.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_core.h,v 1.1.2.1 1999/10/01 17:14:10 roger Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_i2c.c b/sys/dev/bktr/bktr_i2c.c
index b5c8bee7486d..eac70a4e0e57 100644
--- a/sys/dev/bktr/bktr_i2c.c
+++ b/sys/dev/bktr/bktr_i2c.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/bktr/bktr_i2c.c,v 1.9.2.1 1999/10/01 17:14:10 roger Exp $
  *
  */
 
diff --git a/sys/dev/bktr/bktr_i2c.h b/sys/dev/bktr/bktr_i2c.h
index 075e9885ae5d..9ec8f713daae 100644
--- a/sys/dev/bktr/bktr_i2c.h
+++ b/sys/dev/bktr/bktr_i2c.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/bktr/bktr_i2c.h,v 1.2.2.1 1999/10/01 17:14:10 roger Exp $
  *
  */
 #ifndef _BT848_I2C_H
diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c
index f67377ae4c9a..8c901da92129 100644
--- a/sys/dev/bktr/bktr_os.c
+++ b/sys/dev/bktr/bktr_os.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.1.2.2 1999/10/07 09:46:27 roger Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_os.h b/sys/dev/bktr/bktr_os.h
index 50334d096f68..562b47c94201 100644
--- a/sys/dev/bktr/bktr_os.h
+++ b/sys/dev/bktr/bktr_os.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_os.h,v 1.1.2.1 1999/10/01 17:14:11 roger Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_reg.h b/sys/dev/bktr/bktr_reg.h
index 0299221869e4..f21b1fec2e76 100644
--- a/sys/dev/bktr/bktr_reg.h
+++ b/sys/dev/bktr/bktr_reg.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/bktr/bktr_reg.h,v 1.35.2.1 1999/10/01 17:14:11 roger Exp $
  *
  * Copyright (c) 1999 Roger Hardiman
  * Copyright (c) 1998 Amancio Hasty
diff --git a/sys/dev/bktr/bktr_tuner.c b/sys/dev/bktr/bktr_tuner.c
index 04db92fcb130..ebfeaf7896ab 100644
--- a/sys/dev/bktr/bktr_tuner.c
+++ b/sys/dev/bktr/bktr_tuner.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_tuner.c,v 1.1.2.2 1999/10/07 09:46:28 roger Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_tuner.h b/sys/dev/bktr/bktr_tuner.h
index d7a67c0f834f..7710f7052cc5 100644
--- a/sys/dev/bktr/bktr_tuner.h
+++ b/sys/dev/bktr/bktr_tuner.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_tuner.h,v 1.1.2.1 1999/10/01 17:14:12 roger Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/buslogic/bt.c b/sys/dev/buslogic/bt.c
index d51a74b51716..ed92a908000a 100644
--- a/sys/dev/buslogic/bt.c
+++ b/sys/dev/buslogic/bt.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/buslogic/bt.c,v 1.13.2.6 1999/09/14 04:07:50 gibbs Exp $
  */
 
  /*
diff --git a/sys/dev/buslogic/btreg.h b/sys/dev/buslogic/btreg.h
index 98b1bc5bf001..cf9f84f11b07 100644
--- a/sys/dev/buslogic/btreg.h
+++ b/sys/dev/buslogic/btreg.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/buslogic/btreg.h,v 1.3.2.3 1999/08/29 16:22:43 peter Exp $
  */
 
 #ifndef _BTREG_H_
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index 9f31db7d5206..d420b0729422 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ccd/ccd.c,v 1.37.2.4 1999/08/29 16:22:43 peter Exp $ */
 
 /*	$NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $	*/
 
diff --git a/sys/dev/dec/mcclock.c b/sys/dev/dec/mcclock.c
index a8a94be5e3d0..a5278fe353b9 100644
--- a/sys/dev/dec/mcclock.c
+++ b/sys/dev/dec/mcclock.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/dec/mcclock.c,v 1.2.2.2 1999/08/29 16:22:45 peter Exp $ */
 /* $NetBSD: mcclock.c,v 1.11 1998/04/19 07:50:25 jonathan Exp $ */
 
 /*
diff --git a/sys/dev/dec/mcclock_if.m b/sys/dev/dec/mcclock_if.m
index 01b8a64dc6a2..394bcaf94783 100644
--- a/sys/dev/dec/mcclock_if.m
+++ b/sys/dev/dec/mcclock_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/dec/mcclock_if.m,v 1.2.2.1 1999/08/29 16:22:45 peter Exp $
 #
 
 INTERFACE mcclock;
diff --git a/sys/dev/dpt/dpt.h b/sys/dev/dpt/dpt.h
index 6f41ac91cb83..9b8e297ec3a6 100644
--- a/sys/dev/dpt/dpt.h
+++ b/sys/dev/dpt/dpt.h
@@ -40,7 +40,7 @@
  */
 
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sys/dev/dpt/dpt.h,v 1.4.2.1 1999/08/29 16:22:46 peter Exp $"
 
 #ifndef _DPT_H
 #define _DPT_H
diff --git a/sys/dev/dpt/dpt_control.c b/sys/dev/dpt/dpt_control.c
index f4bda1ae27f9..616e001ec19f 100644
--- a/sys/dev/dpt/dpt_control.c
+++ b/sys/dev/dpt/dpt_control.c
@@ -36,7 +36,7 @@
  * future.
  */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sys/dev/dpt/dpt_control.c,v 1.10.2.3 1999/08/29 16:22:47 peter Exp $"
 
 #include "opt_dpt.h"
 
diff --git a/sys/dev/dpt/dpt_scsi.c b/sys/dev/dpt/dpt_scsi.c
index 4f5cdaf9469a..12f9994c6250 100644
--- a/sys/dev/dpt/dpt_scsi.c
+++ b/sys/dev/dpt/dpt_scsi.c
@@ -43,7 +43,7 @@
  *	       arrays that span controllers (Wow!).
  */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sys/dev/dpt/dpt_scsi.c,v 1.22.2.3 1999/09/14 04:07:51 gibbs Exp $"
 
 #define _DPT_C_
 
diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c
index b94904e5be3e..6df08336a87e 100644
--- a/sys/dev/fb/fb.c
+++ b/sys/dev/fb/fb.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fb/fb.c,v 1.3.2.1 1999/08/29 16:22:49 peter Exp $
  */
 
 #include "fb.h"
diff --git a/sys/dev/fb/fbreg.h b/sys/dev/fb/fbreg.h
index fe8386256b58..8def937eceda 100644
--- a/sys/dev/fb/fbreg.h
+++ b/sys/dev/fb/fbreg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fb/fbreg.h,v 1.2.2.2 1999/08/29 16:22:49 peter Exp $
  */
 
 #ifndef _DEV_FB_FBREG_H_
diff --git a/sys/dev/fb/splash.c b/sys/dev/fb/splash.c
index 4b0dd482c971..d6b0632ec533 100644
--- a/sys/dev/fb/splash.c
+++ b/sys/dev/fb/splash.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fb/splash.c,v 1.2.2.2 1999/08/29 16:22:50 peter Exp $
  */
 
 #include "splash.h"
diff --git a/sys/dev/fb/splashreg.h b/sys/dev/fb/splashreg.h
index c09030232f49..1d470d5d7352 100644
--- a/sys/dev/fb/splashreg.h
+++ b/sys/dev/fb/splashreg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fb/splashreg.h,v 1.2.2.1 1999/08/29 16:22:50 peter Exp $
  */
 
 #ifndef _DEV_FB_SPLASHREG_H_
diff --git a/sys/dev/fb/vgareg.h b/sys/dev/fb/vgareg.h
index 4c48a94de630..067a58131902 100644
--- a/sys/dev/fb/vgareg.h
+++ b/sys/dev/fb/vgareg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fb/vgareg.h,v 1.1.2.1 1999/08/29 16:22:51 peter Exp $
  */
 
 #ifndef _DEV_FB_VGAREG_H_
diff --git a/sys/dev/hea/eni.c b/sys/dev/hea/eni.c
index 173eb0db78be..fc143ada27e3 100644
--- a/sys/dev/hea/eni.c
+++ b/sys/dev/hea/eni.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hea/eni.c,v 1.5.2.1 1999/08/29 16:22:52 peter Exp $
  *
  */
 
@@ -42,7 +42,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef	lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni.c,v 1.5.2.1 1999/08/29 16:22:52 peter Exp $");
 #endif
 
 /*
diff --git a/sys/dev/hea/eni.h b/sys/dev/hea/eni.h
index e44a2a9f43e6..bac1e8549e73 100644
--- a/sys/dev/hea/eni.h
+++ b/sys/dev/hea/eni.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hea/eni.h,v 1.1.2.1 1999/08/29 16:22:53 peter Exp $
  *
  */
 
diff --git a/sys/dev/hea/eni_buffer.c b/sys/dev/hea/eni_buffer.c
index 7dd408153a3e..44161db83413 100644
--- a/sys/dev/hea/eni_buffer.c
+++ b/sys/dev/hea/eni_buffer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hea/eni_buffer.c,v 1.2.2.1 1999/08/29 16:22:53 peter Exp $
  *
  */
 
@@ -42,7 +42,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni_buffer.c,v 1.2.2.1 1999/08/29 16:22:53 peter Exp $");
 #endif
 
 static int	eni_test_memory __P((Eni_unit *));
diff --git a/sys/dev/hea/eni_globals.c b/sys/dev/hea/eni_globals.c
index 0c7d5207e81b..8f5b86a55698 100644
--- a/sys/dev/hea/eni_globals.c
+++ b/sys/dev/hea/eni_globals.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hea/eni_globals.c,v 1.2.2.2 1999/08/29 16:22:54 peter Exp $
  *
  */
 
@@ -42,7 +42,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni_globals.c,v 1.2.2.2 1999/08/29 16:22:54 peter Exp $");
 #endif
 
 /*
diff --git a/sys/dev/hea/eni_if.c b/sys/dev/hea/eni_if.c
index 208220ac99b3..c03195fe6f36 100644
--- a/sys/dev/hea/eni_if.c
+++ b/sys/dev/hea/eni_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hea/eni_if.c,v 1.3.2.1 1999/08/29 16:22:54 peter Exp $
  *
  */
 
@@ -43,7 +43,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni_if.c,v 1.3.2.1 1999/08/29 16:22:54 peter Exp $");
 #endif
 
 static void	eni_get_stats __P((Eni_unit *));
diff --git a/sys/dev/hea/eni_init.c b/sys/dev/hea/eni_init.c
index 996c0eccb9a1..3fab65d290a5 100644
--- a/sys/dev/hea/eni_init.c
+++ b/sys/dev/hea/eni_init.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hea/eni_init.c,v 1.2.2.1 1999/08/29 16:22:55 peter Exp $
  *
  */
 
@@ -42,7 +42,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni_init.c,v 1.2.2.1 1999/08/29 16:22:55 peter Exp $");
 #endif
 
 /*
diff --git a/sys/dev/hea/eni_intr.c b/sys/dev/hea/eni_intr.c
index cbf7ef02eaa8..50d9ecd1b48b 100644
--- a/sys/dev/hea/eni_intr.c
+++ b/sys/dev/hea/eni_intr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hea/eni_intr.c,v 1.3.2.1 1999/08/29 16:22:55 peter Exp $
  *
  */
 
@@ -43,7 +43,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni_intr.c,v 1.3.2.1 1999/08/29 16:22:55 peter Exp $");
 #endif
 
 static void	eni_suni_intr __P((Eni_unit *));
diff --git a/sys/dev/hea/eni_receive.c b/sys/dev/hea/eni_receive.c
index 68de65e6ff6b..d737a42b8f40 100644
--- a/sys/dev/hea/eni_receive.c
+++ b/sys/dev/hea/eni_receive.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hea/eni_receive.c,v 1.3.2.1 1999/08/29 16:22:56 peter Exp $
  *
  */
 
@@ -42,7 +42,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni_receive.c,v 1.3.2.1 1999/08/29 16:22:56 peter Exp $");
 #endif
 
 static void	eni_recv_stack __P((void *, KBuffer *));
diff --git a/sys/dev/hea/eni_stats.h b/sys/dev/hea/eni_stats.h
index ddcc55ff775c..4f6dd6c83bb8 100644
--- a/sys/dev/hea/eni_stats.h
+++ b/sys/dev/hea/eni_stats.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hea/eni_stats.h,v 1.1.2.1 1999/08/29 16:22:57 peter Exp $
  *
  */
 
diff --git a/sys/dev/hea/eni_suni.h b/sys/dev/hea/eni_suni.h
index 3ebce6030679..ce179bc3ac98 100644
--- a/sys/dev/hea/eni_suni.h
+++ b/sys/dev/hea/eni_suni.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hea/eni_suni.h,v 1.1.2.1 1999/08/29 16:22:58 peter Exp $
  *
  */
 
diff --git a/sys/dev/hea/eni_transmit.c b/sys/dev/hea/eni_transmit.c
index c9f750807aa2..25721becb8eb 100644
--- a/sys/dev/hea/eni_transmit.c
+++ b/sys/dev/hea/eni_transmit.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hea/eni_transmit.c,v 1.3.2.1 1999/08/29 16:22:58 peter Exp $
  *
  */
 
@@ -43,7 +43,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni_transmit.c,v 1.3.2.1 1999/08/29 16:22:58 peter Exp $");
 #endif
 
 /*
diff --git a/sys/dev/hea/eni_var.h b/sys/dev/hea/eni_var.h
index f13a99d94fab..91002a4c7dac 100644
--- a/sys/dev/hea/eni_var.h
+++ b/sys/dev/hea/eni_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hea/eni_var.h,v 1.1.2.1 1999/08/29 16:22:58 peter Exp $
  *
  */
 
diff --git a/sys/dev/hea/eni_vcm.c b/sys/dev/hea/eni_vcm.c
index d552ddf89a18..a91708ef1c46 100644
--- a/sys/dev/hea/eni_vcm.c
+++ b/sys/dev/hea/eni_vcm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hea/eni_vcm.c,v 1.2.2.1 1999/08/29 16:22:59 peter Exp $
  *
  */
 
@@ -43,7 +43,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni_vcm.c,v 1.2.2.1 1999/08/29 16:22:59 peter Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore.h b/sys/dev/hfa/fore.h
index 04099824075e..d3203bfa37cf 100644
--- a/sys/dev/hfa/fore.h
+++ b/sys/dev/hfa/fore.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore.h,v 1.1.2.1 1999/08/29 16:23:00 peter Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_aali.h b/sys/dev/hfa/fore_aali.h
index c5bf8038f1a3..061f32a8c58f 100644
--- a/sys/dev/hfa/fore_aali.h
+++ b/sys/dev/hfa/fore_aali.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_aali.h,v 1.1.2.1 1999/08/29 16:23:01 peter Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_buffer.c b/sys/dev/hfa/fore_buffer.c
index a6511e9541e8..4cf226728ca0 100644
--- a/sys/dev/hfa/fore_buffer.c
+++ b/sys/dev/hfa/fore_buffer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_buffer.c,v 1.2.2.1 1999/08/29 16:23:01 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_buffer.c,v 1.2.2.1 1999/08/29 16:23:01 peter Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_command.c b/sys/dev/hfa/fore_command.c
index f7c308075d9b..7e7b7597c099 100644
--- a/sys/dev/hfa/fore_command.c
+++ b/sys/dev/hfa/fore_command.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_command.c,v 1.4.2.1 1999/08/29 16:23:02 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_command.c,v 1.4.2.1 1999/08/29 16:23:02 peter Exp $");
 #endif
 
 /*
diff --git a/sys/dev/hfa/fore_globals.c b/sys/dev/hfa/fore_globals.c
index ff8cc6c2e949..7c83a68b96f8 100644
--- a/sys/dev/hfa/fore_globals.c
+++ b/sys/dev/hfa/fore_globals.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_globals.c,v 1.2.2.2 1999/08/29 16:23:02 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_globals.c,v 1.2.2.2 1999/08/29 16:23:02 peter Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_if.c b/sys/dev/hfa/fore_if.c
index 4311a8e7b0e2..0a63a94c032f 100644
--- a/sys/dev/hfa/fore_if.c
+++ b/sys/dev/hfa/fore_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_if.c,v 1.3.2.1 1999/08/29 16:23:03 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_if.c,v 1.3.2.1 1999/08/29 16:23:03 peter Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_include.h b/sys/dev/hfa/fore_include.h
index 4ffe4ce424c6..7e2cf3715beb 100644
--- a/sys/dev/hfa/fore_include.h
+++ b/sys/dev/hfa/fore_include.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_include.h,v 1.1.2.1 1999/08/29 16:23:03 peter Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_init.c b/sys/dev/hfa/fore_init.c
index 1594f3e6b06e..887ea032a267 100644
--- a/sys/dev/hfa/fore_init.c
+++ b/sys/dev/hfa/fore_init.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_init.c,v 1.4.2.1 1999/08/29 16:23:03 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_init.c,v 1.4.2.1 1999/08/29 16:23:03 peter Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_intr.c b/sys/dev/hfa/fore_intr.c
index aa7f05cce99a..3cd5447f30ce 100644
--- a/sys/dev/hfa/fore_intr.c
+++ b/sys/dev/hfa/fore_intr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_intr.c,v 1.2.2.1 1999/08/29 16:23:04 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_intr.c,v 1.2.2.1 1999/08/29 16:23:04 peter Exp $");
 #endif
 
 #if defined(sun)
diff --git a/sys/dev/hfa/fore_load.c b/sys/dev/hfa/fore_load.c
index 578d243b73b2..b1c7c6ce6043 100644
--- a/sys/dev/hfa/fore_load.c
+++ b/sys/dev/hfa/fore_load.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_load.c,v 1.5.2.1 1999/08/29 16:23:04 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_load.c,v 1.5.2.1 1999/08/29 16:23:04 peter Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_output.c b/sys/dev/hfa/fore_output.c
index c58550d776a6..a81d59792bcb 100644
--- a/sys/dev/hfa/fore_output.c
+++ b/sys/dev/hfa/fore_output.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_output.c,v 1.2.2.1 1999/08/29 16:23:05 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_output.c,v 1.2.2.1 1999/08/29 16:23:05 peter Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_receive.c b/sys/dev/hfa/fore_receive.c
index aae431f30dd3..40a41d775770 100644
--- a/sys/dev/hfa/fore_receive.c
+++ b/sys/dev/hfa/fore_receive.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_receive.c,v 1.3.2.1 1999/08/29 16:23:06 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_receive.c,v 1.3.2.1 1999/08/29 16:23:06 peter Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_slave.h b/sys/dev/hfa/fore_slave.h
index 9f7d3224fcb4..6e88f8d0e8a3 100644
--- a/sys/dev/hfa/fore_slave.h
+++ b/sys/dev/hfa/fore_slave.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_slave.h,v 1.1.2.1 1999/08/29 16:23:06 peter Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_stats.c b/sys/dev/hfa/fore_stats.c
index a01c5e50f6a7..8fa6a1aa057a 100644
--- a/sys/dev/hfa/fore_stats.c
+++ b/sys/dev/hfa/fore_stats.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_stats.c,v 1.3.2.1 1999/08/29 16:23:06 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_stats.c,v 1.3.2.1 1999/08/29 16:23:06 peter Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_stats.h b/sys/dev/hfa/fore_stats.h
index 53b568f69ebd..a1e17a722346 100644
--- a/sys/dev/hfa/fore_stats.h
+++ b/sys/dev/hfa/fore_stats.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_stats.h,v 1.1.2.1 1999/08/29 16:23:07 peter Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_timer.c b/sys/dev/hfa/fore_timer.c
index df5cff86b42a..f7b9653790c3 100644
--- a/sys/dev/hfa/fore_timer.c
+++ b/sys/dev/hfa/fore_timer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_timer.c,v 1.2.2.1 1999/08/29 16:23:08 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_timer.c,v 1.2.2.1 1999/08/29 16:23:08 peter Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_transmit.c b/sys/dev/hfa/fore_transmit.c
index ebf14f321ef3..20d09ac698e4 100644
--- a/sys/dev/hfa/fore_transmit.c
+++ b/sys/dev/hfa/fore_transmit.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_transmit.c,v 1.2.2.1 1999/08/29 16:23:08 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_transmit.c,v 1.2.2.1 1999/08/29 16:23:08 peter Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_var.h b/sys/dev/hfa/fore_var.h
index 5a1533f3c2c6..eb54e2595eab 100644
--- a/sys/dev/hfa/fore_var.h
+++ b/sys/dev/hfa/fore_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_var.h,v 1.1.2.1 1999/08/29 16:23:09 peter Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_vcm.c b/sys/dev/hfa/fore_vcm.c
index e2bc530ef5e3..3c19ff3c5dec 100644
--- a/sys/dev/hfa/fore_vcm.c
+++ b/sys/dev/hfa/fore_vcm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_vcm.c,v 1.3.2.1 1999/08/29 16:23:09 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_vcm.c,v 1.3.2.1 1999/08/29 16:23:09 peter Exp $");
 #endif
 
 
diff --git a/sys/dev/iicbus/if_ic.c b/sys/dev/iicbus/if_ic.c
index 07caf3f41c72..6147e9493af5 100644
--- a/sys/dev/iicbus/if_ic.c
+++ b/sys/dev/iicbus/if_ic.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/iicbus/if_ic.c,v 1.3.2.1 1999/08/29 16:23:11 peter Exp $
  */
 
 /*
diff --git a/sys/dev/iicbus/iic.c b/sys/dev/iicbus/iic.c
index b529ef4e2862..1ca341f10c87 100644
--- a/sys/dev/iicbus/iic.c
+++ b/sys/dev/iicbus/iic.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/iicbus/iic.c,v 1.6.2.3 1999/11/02 22:29:03 nsouch Exp $
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/iicbus/iicbb.c b/sys/dev/iicbus/iicbb.c
index 8bd75fe99f21..47a6693f8cae 100644
--- a/sys/dev/iicbus/iicbb.c
+++ b/sys/dev/iicbus/iicbb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/iicbus/iicbb.c,v 1.2.2.2 1999/08/29 16:23:12 peter Exp $
  *
  */
 
diff --git a/sys/dev/iicbus/iicbb_if.m b/sys/dev/iicbus/iicbb_if.m
index a99bfe86b888..2517695e0664 100644
--- a/sys/dev/iicbus/iicbb_if.m
+++ b/sys/dev/iicbus/iicbb_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/iicbus/iicbb_if.m,v 1.2.2.1 1999/08/29 16:23:12 peter Exp $
 #
 
 INTERFACE iicbb;
diff --git a/sys/dev/iicbus/iicbus.c b/sys/dev/iicbus/iicbus.c
index 9e28b1ab7e6a..ff5cae886208 100644
--- a/sys/dev/iicbus/iicbus.c
+++ b/sys/dev/iicbus/iicbus.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/iicbus/iicbus.c,v 1.7.2.2 1999/11/01 22:48:28 nsouch Exp $
  *
  */
 
diff --git a/sys/dev/iicbus/iicbus.h b/sys/dev/iicbus/iicbus.h
index 59bbaef4d3fe..fdcfb1d44d62 100644
--- a/sys/dev/iicbus/iicbus.h
+++ b/sys/dev/iicbus/iicbus.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/iicbus/iicbus.h,v 1.3.2.1 1999/08/29 16:23:14 peter Exp $
  *
  */
 #ifndef __IICBUS_H
diff --git a/sys/dev/iicbus/iicbus_if.m b/sys/dev/iicbus/iicbus_if.m
index ba30c61e0b9f..30fcbadc427b 100644
--- a/sys/dev/iicbus/iicbus_if.m
+++ b/sys/dev/iicbus/iicbus_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/iicbus/iicbus_if.m,v 1.3.2.1 1999/08/29 16:23:15 peter Exp $
 #
 
 INTERFACE iicbus;
diff --git a/sys/dev/iicbus/iiconf.c b/sys/dev/iicbus/iiconf.c
index 52e92f74344d..0ddd6b606c79 100644
--- a/sys/dev/iicbus/iiconf.c
+++ b/sys/dev/iicbus/iiconf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/iicbus/iiconf.c,v 1.4.2.5 1999/11/01 22:48:28 nsouch Exp $
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/iicbus/iiconf.h b/sys/dev/iicbus/iiconf.h
index 15919108115a..a281c6e2b72d 100644
--- a/sys/dev/iicbus/iiconf.h
+++ b/sys/dev/iicbus/iiconf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/iicbus/iiconf.h,v 1.3.2.3 1999/08/29 16:23:16 peter Exp $
  */
 #ifndef __IICONF_H
 #define __IICONF_H
diff --git a/sys/dev/iicbus/iicsmb.c b/sys/dev/iicbus/iicsmb.c
index 8ed0e2bde5ec..e46aec569a90 100644
--- a/sys/dev/iicbus/iicsmb.c
+++ b/sys/dev/iicbus/iicsmb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/iicbus/iicsmb.c,v 1.2.2.1 1999/08/29 16:23:16 peter Exp $
  *
  */
 
diff --git a/sys/dev/isp/asm_pci.h b/sys/dev/isp/asm_pci.h
index e7fdae1ba66a..f11be7a9164c 100644
--- a/sys/dev/isp/asm_pci.h
+++ b/sys/dev/isp/asm_pci.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/asm_pci.h,v 1.4.2.7 1999/12/03 07:30:43 mjacob Exp $ */
 /*
  * Copyright (C) 1995, 1996, 1997, 1998, 1999 Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c
index f298ab724ef0..6d435279d3bb 100644
--- a/sys/dev/isp/isp.c
+++ b/sys/dev/isp/isp.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.11.2.11 1999/12/03 07:40:31 mjacob Exp $ */
 
 /*
  * Machine and OS Independent (well, as best as possible)
diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c
index 50f4824f59e7..2c138681082d 100644
--- a/sys/dev/isp/isp_freebsd.c
+++ b/sys/dev/isp/isp_freebsd.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.10.2.9 1999/10/17 19:45:06 mjacob Exp $ */
 
 /*
  * Platform (FreeBSD) dependent common attachment code for Qlogic adapters.
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h
index b946d3454c62..9e0a4345fc32 100644
--- a/sys/dev/isp/isp_freebsd.h
+++ b/sys/dev/isp/isp_freebsd.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.9.2.8 1999/12/03 07:33:14 mjacob Exp $ */
 
 /*
  * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions (CAM version)
diff --git a/sys/dev/isp/isp_inline.h b/sys/dev/isp/isp_inline.h
index 5b6a793c89e9..ae0cf3ccddcd 100644
--- a/sys/dev/isp/isp_inline.h
+++ b/sys/dev/isp/isp_inline.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/isp_inline.h,v 1.1.4.2 1999/12/03 07:34:27 mjacob Exp $ */
 /*
  * Qlogic Inline Functions
  *
diff --git a/sys/dev/isp/ispmbox.h b/sys/dev/isp/ispmbox.h
index d323be717456..6b704f5f3925 100644
--- a/sys/dev/isp/ispmbox.h
+++ b/sys/dev/isp/ispmbox.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/ispmbox.h,v 1.4.2.7 1999/10/17 19:46:23 mjacob Exp $ */
 
 /*
  * Mailbox and Queue Entry Definitions for for Qlogic ISP SCSI adapters.
diff --git a/sys/dev/isp/ispreg.h b/sys/dev/isp/ispreg.h
index e342415b2b73..79153e1cecbe 100644
--- a/sys/dev/isp/ispreg.h
+++ b/sys/dev/isp/ispreg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/ispreg.h,v 1.4.2.4 1999/10/17 19:47:17 mjacob Exp $ */
 
 /*
  * Machine Independent (well, as best as possible) register
diff --git a/sys/dev/isp/ispvar.h b/sys/dev/isp/ispvar.h
index 590dbd6fe9ac..c28fc6c2c912 100644
--- a/sys/dev/isp/ispvar.h
+++ b/sys/dev/isp/ispvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/ispvar.h,v 1.8.2.9 1999/12/03 07:36:55 mjacob Exp $ */
 
 /*
  * Soft Definitions for for Qlogic ISP SCSI adapters.
diff --git a/sys/dev/kbd/atkbd.c b/sys/dev/kbd/atkbd.c
index 8d95af091507..5472cf283357 100644
--- a/sys/dev/kbd/atkbd.c
+++ b/sys/dev/kbd/atkbd.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/kbd/atkbd.c,v 1.3.2.6 1999/08/29 16:23:34 peter Exp $
  */
 
 #include "atkbd.h"
diff --git a/sys/dev/kbd/atkbdc.c b/sys/dev/kbd/atkbdc.c
index 692f4d078d00..6fda01c12389 100644
--- a/sys/dev/kbd/atkbdc.c
+++ b/sys/dev/kbd/atkbdc.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/kbd/atkbdc.c,v 1.1.2.1 1999/08/29 16:23:35 peter Exp $
  * from kbdio.c,v 1.13 1998/09/25 11:55:46 yokota Exp
  */
 
diff --git a/sys/dev/kbd/atkbdcreg.h b/sys/dev/kbd/atkbdcreg.h
index c8d637006205..52fef3f6c646 100644
--- a/sys/dev/kbd/atkbdcreg.h
+++ b/sys/dev/kbd/atkbdcreg.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/kbd/atkbdcreg.h,v 1.1.2.1 1999/08/29 16:23:35 peter Exp $
  * from kbdio.h,v 1.8 1998/09/25 11:55:46 yokota Exp
  */
 
diff --git a/sys/dev/kbd/atkbdreg.h b/sys/dev/kbd/atkbdreg.h
index 00a530be4967..6f750829b8dc 100644
--- a/sys/dev/kbd/atkbdreg.h
+++ b/sys/dev/kbd/atkbdreg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/kbd/atkbdreg.h,v 1.1.2.2 1999/08/29 16:23:36 peter Exp $
  */
 
 #ifndef _DEV_KBD_ATKBDREG_H_
diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c
index fcc3a121b9e9..40533d4ece53 100644
--- a/sys/dev/kbd/kbd.c
+++ b/sys/dev/kbd/kbd.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/kbd/kbd.c,v 1.3.2.3 1999/08/29 16:23:36 peter Exp $
  */
 
 #include "kbd.h"
diff --git a/sys/dev/kbd/kbdreg.h b/sys/dev/kbd/kbdreg.h
index 4f898da399bb..9f732c0c467b 100644
--- a/sys/dev/kbd/kbdreg.h
+++ b/sys/dev/kbd/kbdreg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/kbd/kbdreg.h,v 1.2.2.2 1999/08/29 16:23:37 peter Exp $
  */
 
 #ifndef _DEV_KBD_KBDREG_H_
diff --git a/sys/dev/kbd/kbdtables.h b/sys/dev/kbd/kbdtables.h
index 68ef5e2fa377..148fe3055a36 100644
--- a/sys/dev/kbd/kbdtables.h
+++ b/sys/dev/kbd/kbdtables.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/kbd/kbdtables.h,v 1.42.2.3 1999/08/29 16:23:38 peter Exp $
  */
 
 #ifndef KBD_DFLT_KEYMAP
diff --git a/sys/dev/pccard/if_xe.c b/sys/dev/pccard/if_xe.c
index 9e5ff56cd802..2af04dca9e2e 100644
--- a/sys/dev/pccard/if_xe.c
+++ b/sys/dev/pccard/if_xe.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	$Id: if_xe.c,v 1.20 1999/06/13 19:17:40 scott Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pccard/if_xe.c,v 1.2.2.6 1999/09/18 19:33:08 obrien Exp $
  */
 
 /*
diff --git a/sys/dev/pccard/if_xereg.h b/sys/dev/pccard/if_xereg.h
index 981c5c4bd06c..448f4413e57d 100644
--- a/sys/dev/pccard/if_xereg.h
+++ b/sys/dev/pccard/if_xereg.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	$Id: if_xereg.h,v 1.5 1999/05/20 21:53:58 scott Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pccard/if_xereg.h,v 1.1.1.2.2.4 1999/09/18 19:34:45 obrien Exp $
  */
 
 /*
diff --git a/sys/dev/pci/ohci_pci.c b/sys/dev/pci/ohci_pci.c
index ece467c1a5aa..88c990068262 100644
--- a/sys/dev/pci/ohci_pci.c
+++ b/sys/dev/pci/ohci_pci.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/pci/ohci_pci.c,v 1.12 1999/01/13 01:05:43 n_hibma Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pci/uhci_pci.c b/sys/dev/pci/uhci_pci.c
index 817c3ce23417..e308f8280a11 100644
--- a/sys/dev/pci/uhci_pci.c
+++ b/sys/dev/pci/uhci_pci.c
@@ -1,4 +1,4 @@
-/*	FreeBSD $FreeBSD$ */
+/*	FreeBSD $FreeBSD: src/sys/dev/pci/uhci_pci.c,v 1.8.2.3 1999/08/29 16:23:42 peter Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pdq/pdq.c b/sys/dev/pdq/pdq.c
index 24e4d0c2b8c3..93bf9fedb891 100644
--- a/sys/dev/pdq/pdq.c
+++ b/sys/dev/pdq/pdq.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pdq/pdq.c,v 1.2.6.2 1999/08/29 16:23:44 peter Exp $
  *
  */
 
diff --git a/sys/dev/pdq/pdq_ifsubr.c b/sys/dev/pdq/pdq_ifsubr.c
index b9599676a8da..0c10afab5567 100644
--- a/sys/dev/pdq/pdq_ifsubr.c
+++ b/sys/dev/pdq/pdq_ifsubr.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pdq/pdq_ifsubr.c,v 1.7.2.1 1999/08/29 16:23:46 peter Exp $
  *
  */
 
diff --git a/sys/dev/pdq/pdqreg.h b/sys/dev/pdq/pdqreg.h
index f3cfa84fdcb5..bad8b53c4ba1 100644
--- a/sys/dev/pdq/pdqreg.h
+++ b/sys/dev/pdq/pdqreg.h
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pdq/pdqreg.h,v 1.1.1.1.6.1 1999/08/29 16:23:46 peter Exp $
  *
  */
 
diff --git a/sys/dev/pdq/pdqvar.h b/sys/dev/pdq/pdqvar.h
index 8320eaec69f9..b65212f70ded 100644
--- a/sys/dev/pdq/pdqvar.h
+++ b/sys/dev/pdq/pdqvar.h
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pdq/pdqvar.h,v 1.2.2.1 1999/08/29 16:23:47 peter Exp $
  *
  */
 
diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c
index a302c489a7c6..6897cbea68ff 100644
--- a/sys/dev/ppbus/if_plip.c
+++ b/sys/dev/ppbus/if_plip.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/if_plip.c,v 1.7.2.3 1999/08/29 16:23:48 peter Exp $
  */
 
 /*
diff --git a/sys/dev/ppbus/immio.c b/sys/dev/ppbus/immio.c
index d0ddb82c0c02..35311bde51b5 100644
--- a/sys/dev/ppbus/immio.c
+++ b/sys/dev/ppbus/immio.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/immio.c,v 1.5.2.1 1999/08/29 16:23:48 peter Exp $
  *
  */
 
diff --git a/sys/dev/ppbus/lpbb.c b/sys/dev/ppbus/lpbb.c
index fbf6bde0122e..dd6b1770c03a 100644
--- a/sys/dev/ppbus/lpbb.c
+++ b/sys/dev/ppbus/lpbb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/lpbb.c,v 1.4.2.1 1999/08/29 16:23:49 peter Exp $
  *
  */
 
diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c
index fa99833655f7..d1b553ff7f7b 100644
--- a/sys/dev/ppbus/lpt.c
+++ b/sys/dev/ppbus/lpt.c
@@ -48,7 +48,7 @@
  *	from: unknown origin, 386BSD 0.1
  *	From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp
  *	From Id: nlpt.c,v 1.14 1999/02/08 13:55:43 des Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/lpt.c,v 1.2.2.2 1999/08/29 16:23:49 peter Exp $
  */
 
 /*
diff --git a/sys/dev/ppbus/lpt.h b/sys/dev/ppbus/lpt.h
index 2270ef96fe7e..ff6a9ea226c5 100644
--- a/sys/dev/ppbus/lpt.h
+++ b/sys/dev/ppbus/lpt.h
@@ -34,7 +34,7 @@
  *	Id: lptreg.h,v 1.6 1997/02/22 09:36:52 peter Exp 
  *	From Id: nlpt.h,v 1.3 1999/01/10 12:04:54 nsouch Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/lpt.h,v 1.2.2.2 1999/08/29 16:23:50 peter Exp $
  */
 
 /*
diff --git a/sys/dev/ppbus/nlpt.c b/sys/dev/ppbus/nlpt.c
index 97f44a14ed29..5b6b659b7ca6 100644
--- a/sys/dev/ppbus/nlpt.c
+++ b/sys/dev/ppbus/nlpt.c
@@ -47,7 +47,7 @@
  *
  *	from: unknown origin, 386BSD 0.1
  *	From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/nlpt.c,v 1.12.2.2 1999/08/29 16:23:50 peter Exp $
  */
 
 /*
diff --git a/sys/dev/ppbus/nlpt.h b/sys/dev/ppbus/nlpt.h
index 87f31fa450d4..3c74f7bc869f 100644
--- a/sys/dev/ppbus/nlpt.h
+++ b/sys/dev/ppbus/nlpt.h
@@ -27,7 +27,7 @@
  *	@(#)lptreg.h      1.1 (Berkeley) 12/19/90
  *	Id: lptreg.h,v 1.6 1997/02/22 09:36:52 peter Exp 
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/nlpt.h,v 1.3.2.1 1999/08/29 16:23:51 peter Exp $
  */
 #ifndef __NLPT_H
 #define __NLPT_H
diff --git a/sys/dev/ppbus/ppb_1284.c b/sys/dev/ppbus/ppb_1284.c
index 30221747dddf..38cd145656c1 100644
--- a/sys/dev/ppbus/ppb_1284.c
+++ b/sys/dev/ppbus/ppb_1284.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/ppb_1284.c,v 1.8.2.1 1999/08/29 16:23:52 peter Exp $
  *
  */
 
diff --git a/sys/dev/ppbus/ppb_1284.h b/sys/dev/ppbus/ppb_1284.h
index f975c26e2475..a90cec73de09 100644
--- a/sys/dev/ppbus/ppb_1284.h
+++ b/sys/dev/ppbus/ppb_1284.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/ppb_1284.h,v 1.4.2.1 1999/08/29 16:23:52 peter Exp $
  *
  */
 #ifndef __1284_H
diff --git a/sys/dev/ppbus/ppb_base.c b/sys/dev/ppbus/ppb_base.c
index da7fa8ee9cf4..023f383b5790 100644
--- a/sys/dev/ppbus/ppb_base.c
+++ b/sys/dev/ppbus/ppb_base.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/ppb_base.c,v 1.6.2.1 1999/08/29 16:23:52 peter Exp $
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/ppbus/ppb_msq.c b/sys/dev/ppbus/ppb_msq.c
index 2fa5bd92976e..a6d8a1f697f4 100644
--- a/sys/dev/ppbus/ppb_msq.c
+++ b/sys/dev/ppbus/ppb_msq.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/ppb_msq.c,v 1.4.2.1 1999/08/29 16:23:53 peter Exp $
  *
  */
 #include <machine/stdarg.h>
diff --git a/sys/dev/ppbus/ppb_msq.h b/sys/dev/ppbus/ppb_msq.h
index 11ca529830a1..d527cca9f6ed 100644
--- a/sys/dev/ppbus/ppb_msq.h
+++ b/sys/dev/ppbus/ppb_msq.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/ppb_msq.h,v 1.3.2.1 1999/08/29 16:23:53 peter Exp $
  *
  */
 #ifndef __PPB_MSQ_H
diff --git a/sys/dev/ppbus/ppbconf.c b/sys/dev/ppbus/ppbconf.c
index 4c4110c5f15a..859c4bccd9a0 100644
--- a/sys/dev/ppbus/ppbconf.c
+++ b/sys/dev/ppbus/ppbconf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/ppbconf.c,v 1.13.2.1 1999/08/29 16:23:54 peter Exp $
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/ppbus/ppbconf.h b/sys/dev/ppbus/ppbconf.h
index 720e31611925..d400e52b9fde 100644
--- a/sys/dev/ppbus/ppbconf.h
+++ b/sys/dev/ppbus/ppbconf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/ppbconf.h,v 1.11.2.2 1999/08/29 16:23:55 peter Exp $
  *
  */
 #ifndef __PPBCONF_H
diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c
index 4c776cbdf142..e66d6a353fce 100644
--- a/sys/dev/ppbus/ppi.c
+++ b/sys/dev/ppbus/ppi.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/ppi.c,v 1.9.2.1 1999/08/29 16:23:55 peter Exp $
  *
  */
 #include "ppi.h"
diff --git a/sys/dev/ppbus/ppi.h b/sys/dev/ppbus/ppi.h
index bbe14fdc7900..319be36c5d63 100644
--- a/sys/dev/ppbus/ppi.h
+++ b/sys/dev/ppbus/ppi.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/ppi.h,v 1.2.2.1 1999/08/29 16:23:56 peter Exp $
  *
  */
 #ifndef __PPI_H
diff --git a/sys/dev/ppbus/pps.c b/sys/dev/ppbus/pps.c
index 00c6792970b1..19e269233e35 100644
--- a/sys/dev/ppbus/pps.c
+++ b/sys/dev/ppbus/pps.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/pps.c,v 1.12.2.2 1999/08/29 16:23:57 peter Exp $
  *
  * This driver implements a draft-mogul-pps-api-02.txt PPS source.
  *
diff --git a/sys/dev/ppbus/vpo.c b/sys/dev/ppbus/vpo.c
index f589ecfee36a..a299918f1199 100644
--- a/sys/dev/ppbus/vpo.c
+++ b/sys/dev/ppbus/vpo.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/vpo.c,v 1.11.2.3 1999/08/29 16:23:57 peter Exp $
  *
  */
 
diff --git a/sys/dev/ppbus/vpoio.c b/sys/dev/ppbus/vpoio.c
index 628bfb607347..8aef14fb5b04 100644
--- a/sys/dev/ppbus/vpoio.c
+++ b/sys/dev/ppbus/vpoio.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/vpoio.c,v 1.5.2.1 1999/08/29 16:23:58 peter Exp $
  *
  */
 
diff --git a/sys/dev/ppbus/vpoio.h b/sys/dev/ppbus/vpoio.h
index e007d3e8e422..93ae345716e8 100644
--- a/sys/dev/ppbus/vpoio.h
+++ b/sys/dev/ppbus/vpoio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/vpoio.h,v 1.2.2.1 1999/08/29 16:23:58 peter Exp $
  *
  */
 #ifndef __VP0IO_H
diff --git a/sys/dev/smbus/smb.c b/sys/dev/smbus/smb.c
index 5f11cdd26d26..33ea07100f99 100644
--- a/sys/dev/smbus/smb.c
+++ b/sys/dev/smbus/smb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/smbus/smb.c,v 1.6.2.2 1999/11/01 22:48:29 nsouch Exp $
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/smbus/smbconf.c b/sys/dev/smbus/smbconf.c
index f7e9212212b6..990fb0050831 100644
--- a/sys/dev/smbus/smbconf.c
+++ b/sys/dev/smbus/smbconf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/smbus/smbconf.c,v 1.4.2.3 1999/11/01 23:17:25 nsouch Exp $
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/smbus/smbconf.h b/sys/dev/smbus/smbconf.h
index f2c43423921f..7f2844436501 100644
--- a/sys/dev/smbus/smbconf.h
+++ b/sys/dev/smbus/smbconf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/smbus/smbconf.h,v 1.2.2.3 1999/11/01 22:48:30 nsouch Exp $
  */
 #ifndef __SMBONF_H
 #define __SMBONF_H
diff --git a/sys/dev/smbus/smbus.c b/sys/dev/smbus/smbus.c
index 4c51e0a6db8d..58c32edd5073 100644
--- a/sys/dev/smbus/smbus.c
+++ b/sys/dev/smbus/smbus.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/smbus/smbus.c,v 1.7.2.2 1999/11/01 22:48:30 nsouch Exp $
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/smbus/smbus.h b/sys/dev/smbus/smbus.h
index 9f96b9dfe172..f99376432cb4 100644
--- a/sys/dev/smbus/smbus.h
+++ b/sys/dev/smbus/smbus.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/smbus/smbus.h,v 1.1.1.1.2.1 1999/08/29 16:24:03 peter Exp $
  *
  */
 #ifndef __SMBUS_H
diff --git a/sys/dev/smbus/smbus_if.m b/sys/dev/smbus/smbus_if.m
index d520c2b35709..ceff881ced52 100644
--- a/sys/dev/smbus/smbus_if.m
+++ b/sys/dev/smbus/smbus_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/smbus/smbus_if.m,v 1.4.2.1 1999/08/29 16:24:03 peter Exp $
 #
 
 INTERFACE smbus;
diff --git a/sys/dev/syscons/scvesactl.c b/sys/dev/syscons/scvesactl.c
index 7b7c6f1a9db3..916ce5551786 100644
--- a/sys/dev/syscons/scvesactl.c
+++ b/sys/dev/syscons/scvesactl.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/syscons/scvesactl.c,v 1.9.2.1 1999/08/29 16:24:04 peter Exp $
  */
 
 #include "sc.h"
diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c
index 88b2e0170b9a..67f2b90155e5 100644
--- a/sys/dev/syscons/scvidctl.c
+++ b/sys/dev/syscons/scvidctl.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/syscons/scvidctl.c,v 1.7.2.4 1999/12/09 10:58:41 yokota Exp $
  */
 
 #include "sc.h"
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 065c40dc24b8..e8f6f22f801e 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/syscons/syscons.c,v 1.293.2.11 1999/12/08 09:52:26 yokota Exp $
  */
 
 #include "sc.h"
diff --git a/sys/dev/syscons/syscons.h b/sys/dev/syscons/syscons.h
index 9b83e2742c6f..57e8c6f950fd 100644
--- a/sys/dev/syscons/syscons.h
+++ b/sys/dev/syscons/syscons.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/syscons/syscons.h,v 1.46.2.2 1999/08/29 16:24:07 peter Exp $
  */
 
 #ifndef _DEV_SYSCONS_SYSCONS_H_
diff --git a/sys/dev/usb/hid.c b/sys/dev/usb/hid.c
index bb852b78e253..b44ce1cddec2 100644
--- a/sys/dev/usb/hid.c
+++ b/sys/dev/usb/hid.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: hid.c,v 1.7 1999/01/08 11:58:25 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/hid.c,v 1.6.2.1 1999/05/08 23:04:43 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/hid.h b/sys/dev/usb/hid.h
index 68ca0b47ac39..5f294f1fb007 100644
--- a/sys/dev/usb/hid.h
+++ b/sys/dev/usb/hid.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: hid.h,v 1.3 1998/11/25 22:32:04 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/hid.h,v 1.4.2.1 1999/05/08 23:04:44 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index 16953cb8e410..321a36e8120d 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: ohci.c,v 1.27 1999/01/13 10:33:53 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ohci.c,v 1.10.2.3 1999/10/29 20:28:14 nsayer Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ohcireg.h b/sys/dev/usb/ohcireg.h
index c84c71e45ec7..1fa936481fc0 100644
--- a/sys/dev/usb/ohcireg.h
+++ b/sys/dev/usb/ohcireg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ohcireg.h,v 1.7 1998/12/10 23:16:47 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ohcireg.h,v 1.5.2.1 1999/05/08 23:04:45 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ohcivar.h b/sys/dev/usb/ohcivar.h
index 7b15cbe84067..1b60096851e3 100644
--- a/sys/dev/usb/ohcivar.h
+++ b/sys/dev/usb/ohcivar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ohcivar.h,v 1.4 1998/12/26 12:53:01 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ohcivar.h,v 1.5.2.1 1999/05/08 23:04:45 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index cc14a7df0180..78d3974e10d7 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: ugen.c,v 1.11 1999/01/08 11:58:25 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ugen.c,v 1.8.2.1 1999/05/08 23:04:46 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index f544da463c7b..f5c7fea52887 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: uhci.c,v 1.24 1999/02/20 23:26:16 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/uhci.c,v 1.7.2.4 1999/07/24 18:23:03 gehenna Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uhcireg.h b/sys/dev/usb/uhcireg.h
index bad7a4c81302..75f966181b8e 100644
--- a/sys/dev/usb/uhcireg.h
+++ b/sys/dev/usb/uhcireg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: uhcireg.h,v 1.5 1998/12/27 23:40:52 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/uhcireg.h,v 1.4.2.1 1999/05/08 23:04:47 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uhcivar.h b/sys/dev/usb/uhcivar.h
index 3ef1b33e863e..f8d0ab8d0816 100644
--- a/sys/dev/usb/uhcivar.h
+++ b/sys/dev/usb/uhcivar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: uhcivar.h,v 1.5 1998/12/26 12:53:02 augustss Exp $	*/
-/*	FreeBSD $FreeBSD$ */
+/*	FreeBSD $FreeBSD: src/sys/dev/usb/uhcivar.h,v 1.5.2.2 1999/08/29 16:24:09 peter Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 1729a92e6fed..1dc9dd794f7c 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: uhid.c,v 1.15 1999/01/10 11:13:36 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/uhid.c,v 1.8.2.1 1999/05/08 23:04:49 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c
index 2b189762babb..dd6bd0fe47d3 100644
--- a/sys/dev/usb/uhub.c
+++ b/sys/dev/usb/uhub.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: uhub.c,v 1.16 1999/01/10 19:13:15 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/uhub.c,v 1.7.2.1 1999/05/08 23:04:49 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c
index 82721c582c5f..7fac54d5d909 100644
--- a/sys/dev/usb/ukbd.c
+++ b/sys/dev/usb/ukbd.c
@@ -1,5 +1,5 @@
 /*      $NetBSD: ukbd.c,v 1.22 1999/01/09 12:10:36 drochner Exp $        */
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ukbd.c,v 1.8.2.1 1999/05/09 11:02:23 yokota Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index bbc67c524aa5..2fd6cf6fde27 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: ulpt.c,v 1.11 1999/01/10 11:13:36 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ulpt.c,v 1.8.2.1 1999/05/08 23:04:50 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index 1063fa70f3a5..affdd9ac3747 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: ums.c,v 1.22 1999/01/12 22:06:48 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ums.c,v 1.9.2.2 1999/07/25 18:35:35 gehenna Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 4b4fe0f52ac9..628153da7220 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb.c,v 1.12 1999/01/10 19:13:16 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usb.c,v 1.7.2.1 1999/05/08 23:04:51 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h
index 514630e0904f..20dd6e846b20 100644
--- a/sys/dev/usb/usb.h
+++ b/sys/dev/usb/usb.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb.h,v 1.17 1999/01/03 01:09:18 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usb.h,v 1.7.2.1 1999/05/08 23:04:52 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usb_if.m b/sys/dev/usb/usb_if.m
index 8729f016ba17..e2878e0a4e10 100644
--- a/sys/dev/usb/usb_if.m
+++ b/sys/dev/usb/usb_if.m
@@ -25,7 +25,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/usb/usb_if.m,v 1.3.2.2 1999/08/29 16:24:09 peter Exp $
 #
 
 # USB interface description
diff --git a/sys/dev/usb/usb_mem.h b/sys/dev/usb/usb_mem.h
index 3144ef3aa221..34f00caf7a96 100644
--- a/sys/dev/usb/usb_mem.h
+++ b/sys/dev/usb/usb_mem.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb_mem.h,v 1.4 1999/01/09 12:16:54 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usb_mem.h,v 1.5.2.1 1999/05/08 23:04:53 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index 49a38ce8f0b4..39215f818bd8 100644
--- a/sys/dev/usb/usb_port.h
+++ b/sys/dev/usb/usb_port.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb_port.h,v 1.5 1999/01/08 11:58:25 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usb_port.h,v 1.10.2.1 1999/05/08 23:04:54 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usb_quirks.c b/sys/dev/usb/usb_quirks.c
index 2d093ae1a073..9e990fdd2beb 100644
--- a/sys/dev/usb/usb_quirks.c
+++ b/sys/dev/usb/usb_quirks.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb_quirks.c,v 1.8 1999/01/08 11:58:25 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.6.2.1 1999/05/08 23:04:54 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usb_quirks.h b/sys/dev/usb/usb_quirks.h
index 5518a5b20c94..ce07b2cdaae3 100644
--- a/sys/dev/usb/usb_quirks.h
+++ b/sys/dev/usb/usb_quirks.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb_quirks.h,v 1.5 1998/12/29 15:23:59 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usb_quirks.h,v 1.5.2.1 1999/05/08 23:04:55 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c
index 6cdde3b566eb..eee0f4a405c0 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb_subr.c,v 1.29 1999/03/18 12:08:43 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.7.2.1 1999/05/08 23:04:55 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbcdc.h b/sys/dev/usb/usbcdc.h
index df7484a1f68b..6added3a6734 100644
--- a/sys/dev/usb/usbcdc.h
+++ b/sys/dev/usb/usbcdc.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbcdc.h,v 1.3 1999/01/03 01:09:18 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbcdc.h,v 1.1.2.1 1999/05/08 23:04:57 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index f7ba43b5dc58..bfdf3941a42c 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.7.2.1 1999/05/08 23:04:57 n_hibma Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 8e59b3721546..a4bdbabedc1a 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.7.2.1 1999/05/08 23:04:58 n_hibma Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index a57e4e75f65e..be3e07e3a69a 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbdi.c,v 1.20 1999/01/08 11:58:26 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdi.c,v 1.8.2.1 1999/05/08 23:04:58 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h
index 70fa554a0db7..fa719b97fd70 100644
--- a/sys/dev/usb/usbdi.h
+++ b/sys/dev/usb/usbdi.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbdi.h,v 1.16 1999/01/08 11:58:26 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdi.h,v 1.5.2.1 1999/05/08 23:04:59 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbdi_util.c b/sys/dev/usb/usbdi_util.c
index 27b7a32c9e02..9a0ed356f13a 100644
--- a/sys/dev/usb/usbdi_util.c
+++ b/sys/dev/usb/usbdi_util.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbdi_util.c,v 1.13 1999/01/08 11:58:26 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdi_util.c,v 1.6.2.1 1999/05/08 23:05:00 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbdi_util.h b/sys/dev/usb/usbdi_util.h
index 6505617ce62b..f97f2400be01 100644
--- a/sys/dev/usb/usbdi_util.h
+++ b/sys/dev/usb/usbdi_util.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbdi_util.h,v 1.12 1999/01/01 15:25:57 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdi_util.h,v 1.5.2.1 1999/05/08 23:05:00 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h
index 8e61d8543b62..f4e5b64094e7 100644
--- a/sys/dev/usb/usbdivar.h
+++ b/sys/dev/usb/usbdivar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbdivar.h,v 1.16 1999/01/08 11:58:26 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.7.2.1 1999/05/08 23:05:01 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbhid.h b/sys/dev/usb/usbhid.h
index bffca689b531..00c61cc1dc31 100644
--- a/sys/dev/usb/usbhid.h
+++ b/sys/dev/usb/usbhid.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbhid.h,v 1.3 1998/12/26 12:53:04 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbhid.h,v 1.4.2.1 1999/05/08 23:05:02 n_hibma Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/vinum/COPYRIGHT b/sys/dev/vinum/COPYRIGHT
index f0295e6a6d0e..0003d519483f 100644
--- a/sys/dev/vinum/COPYRIGHT
+++ b/sys/dev/vinum/COPYRIGHT
@@ -33,5 +33,5 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/COPYRIGHT,v 1.3.2.1 1999/08/29 16:24:11 peter Exp $
  */
diff --git a/sys/dev/vinum/Makefile b/sys/dev/vinum/Makefile
index 83e94ec2e222..1de05260e16c 100644
--- a/sys/dev/vinum/Makefile
+++ b/sys/dev/vinum/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$ 
+# $FreeBSD: src/sys/dev/vinum/Makefile,v 1.5.2.1 1999/08/29 16:24:12 peter Exp $ 
 
 .PATH:  ${.CURDIR}/../../sys/dev/ccd
 KMOD=   vinum_mod
diff --git a/sys/dev/vinum/makestatetext b/sys/dev/vinum/makestatetext
index 3cb709c6b460..1c202e597111 100755
--- a/sys/dev/vinum/makestatetext
+++ b/sys/dev/vinum/makestatetext
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Make statetexts.h from vinumstate.h
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/vinum/makestatetext,v 1.4.2.2 1999/08/29 16:24:12 peter Exp $
 infile=vinumstate.h
 ofile=statetexts.h
 cat > $ofile <<FOO
diff --git a/sys/dev/vinum/request.h b/sys/dev/vinum/request.h
index 04812f868fd3..119c55734e53 100644
--- a/sys/dev/vinum/request.h
+++ b/sys/dev/vinum/request.h
@@ -33,7 +33,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/request.h,v 1.6.2.5 1999/09/13 08:03:53 grog Exp $
  */
 
 /* Information needed to set up a transfer */
diff --git a/sys/dev/vinum/vinum.c b/sys/dev/vinum/vinum.c
index de370212e955..46853f5e498f 100644
--- a/sys/dev/vinum/vinum.c
+++ b/sys/dev/vinum/vinum.c
@@ -35,7 +35,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinum.c,v 1.7.2.5 1999/08/29 16:24:13 peter Exp $
  */
 
 #define STATIC static					    /* nothing while we're testing XXX */
diff --git a/sys/dev/vinum/vinumconfig.c b/sys/dev/vinum/vinumconfig.c
index 82f7a81df4cf..12d39268c10d 100644
--- a/sys/dev/vinum/vinumconfig.c
+++ b/sys/dev/vinum/vinumconfig.c
@@ -45,7 +45,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumconfig.c,v 1.8.2.7 1999/08/29 16:24:14 peter Exp $
  */
 
 #define STATIC static
diff --git a/sys/dev/vinum/vinumdaemon.c b/sys/dev/vinum/vinumdaemon.c
index 9d885b9e1019..a9d17ef6cf50 100644
--- a/sys/dev/vinum/vinumdaemon.c
+++ b/sys/dev/vinum/vinumdaemon.c
@@ -34,7 +34,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumdaemon.c,v 1.1.2.6 1999/08/29 16:24:15 peter Exp $
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumext.h b/sys/dev/vinum/vinumext.h
index 30bef5abc754..4d471f7a62ff 100644
--- a/sys/dev/vinum/vinumext.h
+++ b/sys/dev/vinum/vinumext.h
@@ -33,7 +33,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumext.h,v 1.6.2.5 1999/08/29 16:24:15 peter Exp $
  */
 
 /* vinumext.h: external definitions */
diff --git a/sys/dev/vinum/vinumhdr.h b/sys/dev/vinum/vinumhdr.h
index 22b62d6040c0..411a38c233b2 100644
--- a/sys/dev/vinum/vinumhdr.h
+++ b/sys/dev/vinum/vinumhdr.h
@@ -35,7 +35,7 @@
  */
 
 /* Header files used by all modules */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/vinum/vinumhdr.h,v 1.6.2.5 1999/08/29 16:24:16 peter Exp $ */
 
 #include <sys/param.h>
 #ifdef KERNEL
diff --git a/sys/dev/vinum/vinuminterrupt.c b/sys/dev/vinum/vinuminterrupt.c
index bb62f676cfa4..65f316ce683e 100644
--- a/sys/dev/vinum/vinuminterrupt.c
+++ b/sys/dev/vinum/vinuminterrupt.c
@@ -39,7 +39,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinuminterrupt.c,v 1.7.2.4 1999/08/29 16:24:16 peter Exp $
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumio.c b/sys/dev/vinum/vinumio.c
index 7f90311a53d9..57b68ab1ff44 100644
--- a/sys/dev/vinum/vinumio.c
+++ b/sys/dev/vinum/vinumio.c
@@ -33,7 +33,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumio.c,v 1.7.2.11 1999/10/13 08:39:08 grog Exp $
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumio.h b/sys/dev/vinum/vinumio.h
index 3b99fdd45598..68e5e77c63cb 100644
--- a/sys/dev/vinum/vinumio.h
+++ b/sys/dev/vinum/vinumio.h
@@ -33,7 +33,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumio.h,v 1.6.2.4 1999/08/29 16:24:18 peter Exp $
  */
 
 #ifdef VINUMDEBUG
diff --git a/sys/dev/vinum/vinumioctl.c b/sys/dev/vinum/vinumioctl.c
index d983785897b2..184bae4bebe0 100644
--- a/sys/dev/vinum/vinumioctl.c
+++ b/sys/dev/vinum/vinumioctl.c
@@ -41,7 +41,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumioctl.c,v 1.6.2.6 1999/08/29 16:24:19 peter Exp $
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumkw.h b/sys/dev/vinum/vinumkw.h
index d084c5055ff9..c0b0d15d5690 100644
--- a/sys/dev/vinum/vinumkw.h
+++ b/sys/dev/vinum/vinumkw.h
@@ -33,7 +33,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumkw.h,v 1.6.2.5 1999/08/29 16:24:20 peter Exp $
  */
 
 /*
diff --git a/sys/dev/vinum/vinumlock.c b/sys/dev/vinum/vinumlock.c
index 769d0303070a..42bae7a1fb42 100644
--- a/sys/dev/vinum/vinumlock.c
+++ b/sys/dev/vinum/vinumlock.c
@@ -37,7 +37,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumlock.c,v 1.5.2.7 1999/09/01 23:28:02 grog Exp $
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinummemory.c b/sys/dev/vinum/vinummemory.c
index e13d7249dd84..62f92f2685a9 100644
--- a/sys/dev/vinum/vinummemory.c
+++ b/sys/dev/vinum/vinummemory.c
@@ -33,7 +33,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinummemory.c,v 1.6.2.6 1999/08/29 16:24:21 peter Exp $
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumparser.c b/sys/dev/vinum/vinumparser.c
index 7eb8a44ac262..ab8343453e94 100644
--- a/sys/dev/vinum/vinumparser.c
+++ b/sys/dev/vinum/vinumparser.c
@@ -33,7 +33,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumparser.c,v 1.5.2.6 1999/08/29 16:24:21 peter Exp $
  */
 
 /*
diff --git a/sys/dev/vinum/vinumraid5.c b/sys/dev/vinum/vinumraid5.c
index b1be512e34c0..c4edbef81d0f 100644
--- a/sys/dev/vinum/vinumraid5.c
+++ b/sys/dev/vinum/vinumraid5.c
@@ -38,7 +38,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumraid5.c,v 1.3.2.2 1999/08/29 16:24:22 peter Exp $
  */
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
diff --git a/sys/dev/vinum/vinumrequest.c b/sys/dev/vinum/vinumrequest.c
index 9504ded4bd36..52a5f6b506e1 100644
--- a/sys/dev/vinum/vinumrequest.c
+++ b/sys/dev/vinum/vinumrequest.c
@@ -37,7 +37,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumrequest.c,v 1.7.2.6 1999/08/29 16:24:22 peter Exp $
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumrevive.c b/sys/dev/vinum/vinumrevive.c
index 34265d15cc63..880ef99803f5 100644
--- a/sys/dev/vinum/vinumrevive.c
+++ b/sys/dev/vinum/vinumrevive.c
@@ -37,7 +37,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumrevive.c,v 1.8.2.4 1999/08/29 16:24:23 peter Exp $
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumstate.c b/sys/dev/vinum/vinumstate.c
index ad31981539ff..042f4c9e75c7 100644
--- a/sys/dev/vinum/vinumstate.c
+++ b/sys/dev/vinum/vinumstate.c
@@ -37,7 +37,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumstate.c,v 1.7.2.7 1999/08/29 16:24:24 peter Exp $
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumstate.h b/sys/dev/vinum/vinumstate.h
index a97e3bcb31ed..10874a6f966e 100644
--- a/sys/dev/vinum/vinumstate.h
+++ b/sys/dev/vinum/vinumstate.h
@@ -33,7 +33,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumstate.h,v 1.4.2.4 1999/08/29 16:24:25 peter Exp $
  */
 
 /*
diff --git a/sys/dev/vinum/vinumutil.c b/sys/dev/vinum/vinumutil.c
index 45b8bde65f1a..5dfb2a253812 100644
--- a/sys/dev/vinum/vinumutil.c
+++ b/sys/dev/vinum/vinumutil.c
@@ -35,7 +35,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumutil.c,v 1.5.2.5 1999/08/29 16:24:25 peter Exp $
  */
 
 /* This file contains utility routines used both in kernel and user context */
diff --git a/sys/dev/vinum/vinumvar.h b/sys/dev/vinum/vinumvar.h
index 794086ff8637..62202ddb66a8 100644
--- a/sys/dev/vinum/vinumvar.h
+++ b/sys/dev/vinum/vinumvar.h
@@ -37,7 +37,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vinum/vinumvar.h,v 1.7.2.5 1999/08/29 16:24:26 peter Exp $
  */
 
 #include <sys/time.h>
diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c
index de344d986a9c..d0457bc26208 100644
--- a/sys/dev/vn/vn.c
+++ b/sys/dev/vn/vn.c
@@ -38,7 +38,7 @@
  * from: Utah Hdr: vn.c 1.13 94/04/02
  *
  *	from: @(#)vn.c	8.6 (Berkeley) 4/1/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vn/vn.c,v 1.71.2.2 1999/08/29 16:24:28 peter Exp $
  */
 
 /*
diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index aa941df73901..1a7e811db0f6 100644
--- a/sys/dev/vx/if_vx.c
+++ b/sys/dev/vx/if_vx.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vx/if_vx.c,v 1.19.2.1 1999/08/29 16:24:29 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/control_w.h b/sys/gnu/i386/fpemul/control_w.h
index 5c7aca44cc87..69d5b68b9f8d 100644
--- a/sys/gnu/i386/fpemul/control_w.h
+++ b/sys/gnu/i386/fpemul/control_w.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/control_w.h,v 1.6.4.1 1999/08/29 16:24:30 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/div_small.s b/sys/gnu/i386/fpemul/div_small.s
index 944a93f3b192..4f567d2fdd75 100644
--- a/sys/gnu/i386/fpemul/div_small.s
+++ b/sys/gnu/i386/fpemul/div_small.s
@@ -57,7 +57,7 @@
  * W. Metzenthen   June 1994.
  *
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/div_small.s,v 1.7.4.1 1999/08/29 16:24:31 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/errors.c b/sys/gnu/i386/fpemul/errors.c
index 7ee9136bc15b..bdfd5914e6ae 100644
--- a/sys/gnu/i386/fpemul/errors.c
+++ b/sys/gnu/i386/fpemul/errors.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/errors.c,v 1.9.2.1 1999/08/29 16:24:31 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/exception.h b/sys/gnu/i386/fpemul/exception.h
index 50e7d602eb69..43a9a88ad460 100644
--- a/sys/gnu/i386/fpemul/exception.h
+++ b/sys/gnu/i386/fpemul/exception.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/exception.h,v 1.8.4.1 1999/08/29 16:24:32 peter Exp $
  *
  *
  */
diff --git a/sys/gnu/i386/fpemul/fpu_arith.c b/sys/gnu/i386/fpemul/fpu_arith.c
index e8fa93f44400..7c6b3b7ebca5 100644
--- a/sys/gnu/i386/fpemul/fpu_arith.c
+++ b/sys/gnu/i386/fpemul/fpu_arith.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/fpu_arith.c,v 1.8.4.1 1999/08/29 16:24:32 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_asm.h b/sys/gnu/i386/fpemul/fpu_asm.h
index ab505e906dc1..d67360e6242d 100644
--- a/sys/gnu/i386/fpemul/fpu_asm.h
+++ b/sys/gnu/i386/fpemul/fpu_asm.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/fpu_asm.h,v 1.7.4.1 1999/08/29 16:24:33 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_aux.c b/sys/gnu/i386/fpemul/fpu_aux.c
index 71b759f1e571..7ef061e7238e 100644
--- a/sys/gnu/i386/fpemul/fpu_aux.c
+++ b/sys/gnu/i386/fpemul/fpu_aux.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/fpu_aux.c,v 1.8.4.1 1999/08/29 16:24:34 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_emu.h b/sys/gnu/i386/fpemul/fpu_emu.h
index 0dd2f7e49b21..0f227a90a060 100644
--- a/sys/gnu/i386/fpemul/fpu_emu.h
+++ b/sys/gnu/i386/fpemul/fpu_emu.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/fpu_emu.h,v 1.6.4.1 1999/08/29 16:24:34 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_entry.c b/sys/gnu/i386/fpemul/fpu_entry.c
index 8f4a8f77f8f4..8cb616622532 100644
--- a/sys/gnu/i386/fpemul/fpu_entry.c
+++ b/sys/gnu/i386/fpemul/fpu_entry.c
@@ -55,7 +55,7 @@
  *
  * W. Metzenthen   June 1994.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/fpu_entry.c,v 1.19.2.1 1999/08/29 16:24:34 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_etc.c b/sys/gnu/i386/fpemul/fpu_etc.c
index cd91e80da62f..d8be4d3c02b5 100644
--- a/sys/gnu/i386/fpemul/fpu_etc.c
+++ b/sys/gnu/i386/fpemul/fpu_etc.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/fpu_etc.c,v 1.7.4.1 1999/08/29 16:24:35 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_proto.h b/sys/gnu/i386/fpemul/fpu_proto.h
index fc36478eedb5..7e5d0c43d770 100644
--- a/sys/gnu/i386/fpemul/fpu_proto.h
+++ b/sys/gnu/i386/fpemul/fpu_proto.h
@@ -1,6 +1,6 @@
 /*
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/fpu_proto.h,v 1.7.4.1 1999/08/29 16:24:35 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_system.h b/sys/gnu/i386/fpemul/fpu_system.h
index aff0a0d9114b..f7ee0f0a2c49 100644
--- a/sys/gnu/i386/fpemul/fpu_system.h
+++ b/sys/gnu/i386/fpemul/fpu_system.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/fpu_system.h,v 1.6.4.1 1999/08/29 16:24:36 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_trig.c b/sys/gnu/i386/fpemul/fpu_trig.c
index b1d913facd22..162bc371c358 100644
--- a/sys/gnu/i386/fpemul/fpu_trig.c
+++ b/sys/gnu/i386/fpemul/fpu_trig.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/fpu_trig.c,v 1.9.4.1 1999/08/29 16:24:36 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/get_address.c b/sys/gnu/i386/fpemul/get_address.c
index 4ae998b2d3fc..b39cf1d008e1 100644
--- a/sys/gnu/i386/fpemul/get_address.c
+++ b/sys/gnu/i386/fpemul/get_address.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/get_address.c,v 1.7.2.1 1999/08/29 16:24:37 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/load_store.c b/sys/gnu/i386/fpemul/load_store.c
index 2cfbba506147..2c1cae7f635c 100644
--- a/sys/gnu/i386/fpemul/load_store.c
+++ b/sys/gnu/i386/fpemul/load_store.c
@@ -57,7 +57,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/load_store.c,v 1.12.2.1 1999/08/29 16:24:37 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/math_emu.h b/sys/gnu/i386/fpemul/math_emu.h
index 302be7b655ac..048966475824 100644
--- a/sys/gnu/i386/fpemul/math_emu.h
+++ b/sys/gnu/i386/fpemul/math_emu.h
@@ -1,6 +1,6 @@
 /*
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/math_emu.h,v 1.4.4.1 1999/08/29 16:24:37 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/poly_2xm1.c b/sys/gnu/i386/fpemul/poly_2xm1.c
index e5a651574e4d..684a855438b3 100644
--- a/sys/gnu/i386/fpemul/poly_2xm1.c
+++ b/sys/gnu/i386/fpemul/poly_2xm1.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/poly_2xm1.c,v 1.7.4.1 1999/08/29 16:24:38 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/poly_atan.c b/sys/gnu/i386/fpemul/poly_atan.c
index 4f937fb82dc8..893b00b0209a 100644
--- a/sys/gnu/i386/fpemul/poly_atan.c
+++ b/sys/gnu/i386/fpemul/poly_atan.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/poly_atan.c,v 1.9.4.1 1999/08/29 16:24:39 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/poly_div.s b/sys/gnu/i386/fpemul/poly_div.s
index 505588d38bd8..bb38ea81f9e5 100644
--- a/sys/gnu/i386/fpemul/poly_div.s
+++ b/sys/gnu/i386/fpemul/poly_div.s
@@ -57,7 +57,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/poly_div.s,v 1.7.4.1 1999/08/29 16:24:39 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/poly_l2.c b/sys/gnu/i386/fpemul/poly_l2.c
index 19a550165f92..50efa46ef5c1 100644
--- a/sys/gnu/i386/fpemul/poly_l2.c
+++ b/sys/gnu/i386/fpemul/poly_l2.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/poly_l2.c,v 1.9.4.1 1999/08/29 16:24:39 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/poly_mul64.s b/sys/gnu/i386/fpemul/poly_mul64.s
index 2c6f12e2a2f5..fc5acabb00a5 100644
--- a/sys/gnu/i386/fpemul/poly_mul64.s
+++ b/sys/gnu/i386/fpemul/poly_mul64.s
@@ -59,7 +59,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/poly_mul64.s,v 1.7.4.1 1999/08/29 16:24:40 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/poly_sin.c b/sys/gnu/i386/fpemul/poly_sin.c
index efc478f59d9c..4fe764d4c729 100644
--- a/sys/gnu/i386/fpemul/poly_sin.c
+++ b/sys/gnu/i386/fpemul/poly_sin.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/poly_sin.c,v 1.9.4.1 1999/08/29 16:24:40 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/poly_tan.c b/sys/gnu/i386/fpemul/poly_tan.c
index 7dbbddfccd56..0e595711c38a 100644
--- a/sys/gnu/i386/fpemul/poly_tan.c
+++ b/sys/gnu/i386/fpemul/poly_tan.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/poly_tan.c,v 1.9.4.1 1999/08/29 16:24:41 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/polynomial.s b/sys/gnu/i386/fpemul/polynomial.s
index 172bcc67dd6e..307d4aa5fc8e 100644
--- a/sys/gnu/i386/fpemul/polynomial.s
+++ b/sys/gnu/i386/fpemul/polynomial.s
@@ -64,7 +64,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/polynomial.s,v 1.7.4.1 1999/08/29 16:24:41 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_add_sub.c b/sys/gnu/i386/fpemul/reg_add_sub.c
index df08bcd97a1b..0d66ee1ed0b1 100644
--- a/sys/gnu/i386/fpemul/reg_add_sub.c
+++ b/sys/gnu/i386/fpemul/reg_add_sub.c
@@ -55,7 +55,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/reg_add_sub.c,v 1.7.4.1 1999/08/29 16:24:42 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_compare.c b/sys/gnu/i386/fpemul/reg_compare.c
index a23a7a5b1503..a66e782c4c78 100644
--- a/sys/gnu/i386/fpemul/reg_compare.c
+++ b/sys/gnu/i386/fpemul/reg_compare.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/reg_compare.c,v 1.10.4.1 1999/08/29 16:24:43 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_constant.h b/sys/gnu/i386/fpemul/reg_constant.h
index 6c22cd7f48d0..77da961549d9 100644
--- a/sys/gnu/i386/fpemul/reg_constant.h
+++ b/sys/gnu/i386/fpemul/reg_constant.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/reg_constant.h,v 1.6.4.1 1999/08/29 16:24:43 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_div.s b/sys/gnu/i386/fpemul/reg_div.s
index fe73048da9a5..856c58eb50f8 100644
--- a/sys/gnu/i386/fpemul/reg_div.s
+++ b/sys/gnu/i386/fpemul/reg_div.s
@@ -60,7 +60,7 @@
  * W. Metzenthen   June 1994.
  *
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/reg_div.s,v 1.8.4.1 1999/08/29 16:24:43 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_ld_str.c b/sys/gnu/i386/fpemul/reg_ld_str.c
index 5a2bcb812695..debc1feca447 100644
--- a/sys/gnu/i386/fpemul/reg_ld_str.c
+++ b/sys/gnu/i386/fpemul/reg_ld_str.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/reg_ld_str.c,v 1.12.2.1 1999/08/29 16:24:44 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_mul.c b/sys/gnu/i386/fpemul/reg_mul.c
index 1b9cf2bce8c3..8aca0e957eed 100644
--- a/sys/gnu/i386/fpemul/reg_mul.c
+++ b/sys/gnu/i386/fpemul/reg_mul.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/reg_mul.c,v 1.7.4.1 1999/08/29 16:24:44 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_norm.s b/sys/gnu/i386/fpemul/reg_norm.s
index 40d6a1d83ceb..0458d41f4b15 100644
--- a/sys/gnu/i386/fpemul/reg_norm.s
+++ b/sys/gnu/i386/fpemul/reg_norm.s
@@ -61,7 +61,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/reg_norm.s,v 1.7.4.1 1999/08/29 16:24:45 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_round.s b/sys/gnu/i386/fpemul/reg_round.s
index a01422f31b6b..06ba1b5457c9 100644
--- a/sys/gnu/i386/fpemul/reg_round.s
+++ b/sys/gnu/i386/fpemul/reg_round.s
@@ -65,7 +65,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/reg_round.s,v 1.8.4.1 1999/08/29 16:24:46 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_u_add.s b/sys/gnu/i386/fpemul/reg_u_add.s
index fb7080966fe5..d052b9a30c10 100644
--- a/sys/gnu/i386/fpemul/reg_u_add.s
+++ b/sys/gnu/i386/fpemul/reg_u_add.s
@@ -62,7 +62,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/reg_u_add.s,v 1.8.4.1 1999/08/29 16:24:46 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_u_div.s b/sys/gnu/i386/fpemul/reg_u_div.s
index 8a7c234b0a94..d8ef4eca77c1 100644
--- a/sys/gnu/i386/fpemul/reg_u_div.s
+++ b/sys/gnu/i386/fpemul/reg_u_div.s
@@ -57,7 +57,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/reg_u_div.s,v 1.8.4.1 1999/08/29 16:24:46 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_u_mul.s b/sys/gnu/i386/fpemul/reg_u_mul.s
index 4ce893cbd744..7bde4e72fb55 100644
--- a/sys/gnu/i386/fpemul/reg_u_mul.s
+++ b/sys/gnu/i386/fpemul/reg_u_mul.s
@@ -57,7 +57,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/reg_u_mul.s,v 1.8.4.1 1999/08/29 16:24:47 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_u_sub.s b/sys/gnu/i386/fpemul/reg_u_sub.s
index e24c4afce717..d273c3040bfe 100644
--- a/sys/gnu/i386/fpemul/reg_u_sub.s
+++ b/sys/gnu/i386/fpemul/reg_u_sub.s
@@ -61,7 +61,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/reg_u_sub.s,v 1.8.4.1 1999/08/29 16:24:48 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/status_w.h b/sys/gnu/i386/fpemul/status_w.h
index 4d15641598e2..51e4edb63cd2 100644
--- a/sys/gnu/i386/fpemul/status_w.h
+++ b/sys/gnu/i386/fpemul/status_w.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/status_w.h,v 1.5.4.1 1999/08/29 16:24:48 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/version.h b/sys/gnu/i386/fpemul/version.h
index 38f6b93aebb5..f7020a13b69a 100644
--- a/sys/gnu/i386/fpemul/version.h
+++ b/sys/gnu/i386/fpemul/version.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/version.h,v 1.5.4.1 1999/08/29 16:24:49 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/wm_shrx.s b/sys/gnu/i386/fpemul/wm_shrx.s
index e64219fd9419..c5b8afd42b55 100644
--- a/sys/gnu/i386/fpemul/wm_shrx.s
+++ b/sys/gnu/i386/fpemul/wm_shrx.s
@@ -62,7 +62,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/wm_shrx.s,v 1.7.4.1 1999/08/29 16:24:50 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/wm_sqrt.s b/sys/gnu/i386/fpemul/wm_sqrt.s
index dac6389796a0..c8f09094ead1 100644
--- a/sys/gnu/i386/fpemul/wm_sqrt.s
+++ b/sys/gnu/i386/fpemul/wm_sqrt.s
@@ -60,7 +60,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/fpemul/wm_sqrt.s,v 1.8.4.1 1999/08/29 16:24:50 peter Exp $
  *
  */
 
diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c
index c79bb1b05117..6c14a002bb07 100644
--- a/sys/gnu/i386/isa/dgb.c
+++ b/sys/gnu/i386/isa/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $FreeBSD$
+ *  dgb.c $FreeBSD: src/sys/gnu/i386/isa/dgb.c,v 1.41.2.3 1999/08/29 16:24:53 peter Exp $
  *
  *  Digiboard driver.
  *
diff --git a/sys/gnu/i386/isa/dgm.c b/sys/gnu/i386/isa/dgm.c
index 86cdc9e14a6c..c42c07f28582 100644
--- a/sys/gnu/i386/isa/dgm.c
+++ b/sys/gnu/i386/isa/dgm.c
@@ -1,5 +1,5 @@
 /*-
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/isa/dgm.c,v 1.6.2.2 1999/08/29 16:24:54 peter Exp $
  *
  *  This driver and the associated header files support the ISA PC/Xem
  *  Digiboards.  Its evolutionary roots are described below.
diff --git a/sys/gnu/i386/isa/dgmbios.h b/sys/gnu/i386/isa/dgmbios.h
index 498bced5358a..e197e928d1ec 100644
--- a/sys/gnu/i386/isa/dgmbios.h
+++ b/sys/gnu/i386/isa/dgmbios.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/isa/dgmbios.h,v 1.2.2.1 1999/08/29 16:24:54 peter Exp $
  *
  * This file is an ascii copy of the file sxbios.bin included in the
  * Digiboard PC/Xem driver for Linux.  It is copyright 1992, DIGI 
diff --git a/sys/gnu/i386/isa/dgmfep.h b/sys/gnu/i386/isa/dgmfep.h
index 7921fa3b058f..ee248a0f0eec 100644
--- a/sys/gnu/i386/isa/dgmfep.h
+++ b/sys/gnu/i386/isa/dgmfep.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/i386/isa/dgmfep.h,v 1.2.2.1 1999/08/29 16:24:55 peter Exp $
  *
  * This file is an ascii copy of the file sxbios.bin included in the
  * Digiboard PC/Xem driver for Linux.  It is copyright 1992, DIGI 
diff --git a/sys/gnu/i386/isa/dgmreg.h b/sys/gnu/i386/isa/dgmreg.h
index 2f052b530c11..f89f6e5872bc 100644
--- a/sys/gnu/i386/isa/dgmreg.h
+++ b/sys/gnu/i386/isa/dgmreg.h
@@ -1,5 +1,5 @@
 /*-
- *  dgmreg.h $FreeBSD$
+ *  dgmreg.h $FreeBSD: src/sys/gnu/i386/isa/dgmreg.h,v 1.1.2.1 1999/08/29 16:24:56 peter Exp $
  *
  *  Digiboard driver.
  *
diff --git a/sys/gnu/i386/isa/dgreg.h b/sys/gnu/i386/isa/dgreg.h
index 73c29624294e..aadb7e670969 100644
--- a/sys/gnu/i386/isa/dgreg.h
+++ b/sys/gnu/i386/isa/dgreg.h
@@ -1,5 +1,5 @@
 /*-
- *  dgreg.h $FreeBSD$
+ *  dgreg.h $FreeBSD: src/sys/gnu/i386/isa/dgreg.h,v 1.8.2.1 1999/08/29 16:24:56 peter Exp $
  *
  *  Digiboard driver.
  *
diff --git a/sys/i386/Makefile b/sys/i386/Makefile
index e31c1394861c..e66b55feff75 100644
--- a/sys/i386/Makefile
+++ b/sys/i386/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	7.3 (Berkeley) 6/9/91
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/Makefile,v 1.5.2.1 1999/08/29 16:04:30 peter Exp $
 
 # Makefile for i386 tags file
 
diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c
index c019d73ffa4b..c51a929b7fd0 100644
--- a/sys/i386/apm/apm.c
+++ b/sys/i386/apm/apm.c
@@ -15,7 +15,7 @@
  *
  * Sep, 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/apm/apm.c,v 1.77.2.14 1999/10/31 06:04:40 iwasaki Exp $
  */
 
 #include "opt_devfs.h"
diff --git a/sys/i386/apm/apm.h b/sys/i386/apm/apm.h
index 5fb744887428..fba4bf5e2cbe 100644
--- a/sys/i386/apm/apm.h
+++ b/sys/i386/apm/apm.h
@@ -15,7 +15,7 @@
  *
  * Sep, 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/i386/apm/apm.h,v 1.1.2.1 1999/10/13 19:08:29 nsayer Exp $
  */
 
 #define APM_NEVENTS 16
diff --git a/sys/i386/apm/apm_init/Makefile b/sys/i386/apm/apm_init/Makefile
index b17b884b6398..e15e54c6b276 100644
--- a/sys/i386/apm/apm_init/Makefile
+++ b/sys/i386/apm/apm_init/Makefile
@@ -12,7 +12,7 @@
 #
 # Sep., 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/apm/apm_init/Makefile,v 1.8.2.1 1999/08/29 16:04:36 peter Exp $
 #
 
 OBJS = apm_init.o real_prot.o table.o
diff --git a/sys/i386/apm/apm_init/apm_init.S b/sys/i386/apm/apm_init/apm_init.S
index fd29f055dc10..2f06370eac76 100644
--- a/sys/i386/apm/apm_init/apm_init.S
+++ b/sys/i386/apm/apm_init/apm_init.S
@@ -12,7 +12,7 @@
  *
  * Sep., 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/apm/apm_init/apm_init.S,v 1.10.4.1 1999/08/29 16:04:36 peter Exp $
  */
 
 /*
diff --git a/sys/i386/apm/apm_init/bin2asm.c b/sys/i386/apm/apm_init/bin2asm.c
index 41c3a6562390..812aed249faf 100644
--- a/sys/i386/apm/apm_init/bin2asm.c
+++ b/sys/i386/apm/apm_init/bin2asm.c
@@ -12,7 +12,7 @@
  *
  * Sep., 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/apm/apm_init/bin2asm.c,v 1.7.2.1 1999/08/29 16:04:37 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/sys/i386/apm/apm_init/real_prot.S b/sys/i386/apm/apm_init/real_prot.S
index 8040e524cf57..4ace2656261e 100644
--- a/sys/i386/apm/apm_init/real_prot.S
+++ b/sys/i386/apm/apm_init/real_prot.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:13  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/apm/apm_init/real_prot.S,v 1.6.2.1 1999/08/29 16:04:37 peter Exp $
  */
 
 
diff --git a/sys/i386/apm/apm_init/real_prot.h b/sys/i386/apm/apm_init/real_prot.h
index 3acb8624e2e7..42541641d028 100644
--- a/sys/i386/apm/apm_init/real_prot.h
+++ b/sys/i386/apm/apm_init/real_prot.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.7  92/02/29  15:33:41  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/apm/apm_init/real_prot.h,v 1.7.2.1 1999/08/29 16:04:38 peter Exp $
  */
 
 /*
diff --git a/sys/i386/apm/apm_init/rmaouthdr b/sys/i386/apm/apm_init/rmaouthdr
index 39f45126f096..8e6daf107eb2 100644
--- a/sys/i386/apm/apm_init/rmaouthdr
+++ b/sys/i386/apm/apm_init/rmaouthdr
@@ -1,6 +1,6 @@
 #!/bin/csh -f
 #
 #	from: Mach, Revision 2.2  92/04/04  11:36:01  rpd
-# $FreeBSD$ 
+# $FreeBSD: src/sys/i386/apm/apm_init/rmaouthdr,v 1.3.4.1 1999/08/29 16:04:38 peter Exp $ 
 #
 dd if=$1 of=$2 ibs=32 skip=1 obs=1024b
diff --git a/sys/i386/apm/apm_init/table.c b/sys/i386/apm/apm_init/table.c
index 1f3e329c965a..f9b1aea99d0c 100644
--- a/sys/i386/apm/apm_init/table.c
+++ b/sys/i386/apm/apm_init/table.c
@@ -12,7 +12,7 @@
  *
  * Sep., 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/apm/apm_init/table.c,v 1.7.4.1 1999/08/29 16:04:39 peter Exp $
  */
 
 #include <apm_bios.h>
diff --git a/sys/i386/apm/apm_setup.h b/sys/i386/apm/apm_setup.h
index 98e892ec6a02..26efbb92b2cb 100644
--- a/sys/i386/apm/apm_setup.h
+++ b/sys/i386/apm/apm_setup.h
@@ -10,7 +10,7 @@
  *
  * Sep., 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/apm/apm_setup.h,v 1.9.2.1 1999/08/29 16:04:33 peter Exp $
  */
 
 extern u_long	apm_version;
diff --git a/sys/i386/apm/apm_setup.s b/sys/i386/apm/apm_setup.s
index 4930998fb5e4..5b409f63cf4d 100644
--- a/sys/i386/apm/apm_setup.s
+++ b/sys/i386/apm/apm_setup.s
@@ -11,7 +11,7 @@
  *
  * Sep., 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/apm/apm_setup.s,v 1.13.2.1 1999/08/29 16:04:34 peter Exp $
  */
 
 #include "apm.h"
diff --git a/sys/i386/boot/Makefile b/sys/i386/boot/Makefile
index 3b0adfcc13a5..87b8b49829e6 100644
--- a/sys/i386/boot/Makefile
+++ b/sys/i386/boot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/boot/Makefile,v 1.30.2.1 1999/08/29 16:04:40 peter Exp $
 
 SUBDIR=	cdboot dosboot kzipboot netboot rawboot
 
diff --git a/sys/i386/boot/Makefile.inc b/sys/i386/boot/Makefile.inc
index 5050c0351094..e1290a101cea 100644
--- a/sys/i386/boot/Makefile.inc
+++ b/sys/i386/boot/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/boot/Makefile.inc,v 1.5.2.1 1999/08/29 16:04:41 peter Exp $
 
 BINDIR?=	/usr/mdec
 CFLAGS+=	-aout
diff --git a/sys/i386/boot/biosboot/Makefile b/sys/i386/boot/biosboot/Makefile
index 3139674e074d..220500ab1c12 100644
--- a/sys/i386/boot/biosboot/Makefile
+++ b/sys/i386/boot/biosboot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/boot/biosboot/Makefile,v 1.68.2.1 1999/08/29 16:04:42 peter Exp $
 #
 
 PROG=	boot
diff --git a/sys/i386/boot/biosboot/README.386BSD b/sys/i386/boot/biosboot/README.386BSD
index 3d7c09da5968..106e547a15b1 100644
--- a/sys/i386/boot/biosboot/README.386BSD
+++ b/sys/i386/boot/biosboot/README.386BSD
@@ -169,4 +169,4 @@ Before you do this ensure you have a booting floppy with correct
 disktab and bootblock files on it so that if it doesn't work, you can
 re-disklabel from the floppy.
 
-$FreeBSD$
+$FreeBSD: src/sys/i386/boot/biosboot/README.386BSD,v 1.10.2.1 1999/08/29 16:04:43 peter Exp $
diff --git a/sys/i386/boot/biosboot/README.MACH b/sys/i386/boot/biosboot/README.MACH
index 73d090a404bd..b85c89323cd6 100644
--- a/sys/i386/boot/biosboot/README.MACH
+++ b/sys/i386/boot/biosboot/README.MACH
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:33:55  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/boot/biosboot/README.MACH,v 1.6.2.1 1999/08/29 16:04:43 peter Exp $
  */
 
 ********NOTE: This is not all relevant to the 386BSD version**********
diff --git a/sys/i386/boot/biosboot/README.serial b/sys/i386/boot/biosboot/README.serial
index 7edcdeec060c..2261fed214ec 100644
--- a/sys/i386/boot/biosboot/README.serial
+++ b/sys/i386/boot/biosboot/README.serial
@@ -193,4 +193,4 @@ CAVEATS:
 	  from the new kernel.
 
 
-$FreeBSD$
+$FreeBSD: src/sys/i386/boot/biosboot/README.serial,v 1.10.2.1 1999/08/29 16:04:44 peter Exp $
diff --git a/sys/i386/boot/biosboot/asm.S b/sys/i386/boot/biosboot/asm.S
index f14c7f55104c..3927463df0a5 100644
--- a/sys/i386/boot/biosboot/asm.S
+++ b/sys/i386/boot/biosboot/asm.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:13  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/boot/biosboot/asm.S,v 1.12.2.1 1999/08/29 16:04:45 peter Exp $
  */
 
 
diff --git a/sys/i386/boot/biosboot/asm.h b/sys/i386/boot/biosboot/asm.h
index 6f4bcc39e52d..a0cfc124b477 100644
--- a/sys/i386/boot/biosboot/asm.h
+++ b/sys/i386/boot/biosboot/asm.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.7  92/02/29  15:33:41  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/boot/biosboot/asm.h,v 1.8.4.1 1999/08/29 16:04:45 peter Exp $
  */
 
 #define S_ARG0	 4(%esp)
diff --git a/sys/i386/boot/biosboot/bios.S b/sys/i386/boot/biosboot/bios.S
index 30fc76432427..68a18123e201 100644
--- a/sys/i386/boot/biosboot/bios.S
+++ b/sys/i386/boot/biosboot/bios.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/boot/biosboot/bios.S,v 1.14.2.1 1999/08/29 16:04:46 peter Exp $
  */
 
 /*
diff --git a/sys/i386/boot/biosboot/boot.c b/sys/i386/boot/biosboot/boot.c
index a83c9fdd5c15..6bd6ae966a89 100644
--- a/sys/i386/boot/biosboot/boot.c
+++ b/sys/i386/boot/biosboot/boot.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, [92/04/03  16:51:14  rvb]
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/boot/biosboot/boot.c,v 1.74.2.1 1999/08/29 16:04:46 peter Exp $
  */
 
 
diff --git a/sys/i386/boot/biosboot/boot.h b/sys/i386/boot/biosboot/boot.h
index d5c413201754..a0a4e38dc400 100644
--- a/sys/i386/boot/biosboot/boot.h
+++ b/sys/i386/boot/biosboot/boot.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:03  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/boot/biosboot/boot.h,v 1.24.2.1 1999/08/29 16:04:47 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/boot/biosboot/boot2.S b/sys/i386/boot/biosboot/boot2.S
index 1b25853b4e79..1f9714b380e7 100644
--- a/sys/i386/boot/biosboot/boot2.S
+++ b/sys/i386/boot/biosboot/boot2.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:26  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/boot/biosboot/boot2.S,v 1.11.4.1 1999/08/29 16:04:47 peter Exp $
  */
 
 #include	"asm.h"
diff --git a/sys/i386/boot/biosboot/disk.c b/sys/i386/boot/biosboot/disk.c
index 62fdde42681a..e8327807d66a 100644
--- a/sys/i386/boot/biosboot/disk.c
+++ b/sys/i386/boot/biosboot/disk.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:49  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/boot/biosboot/disk.c,v 1.26.4.1 1999/08/29 16:04:48 peter Exp $
  */
 
 /*
diff --git a/sys/i386/boot/biosboot/io.c b/sys/i386/boot/biosboot/io.c
index f70516002c15..01790960e288 100644
--- a/sys/i386/boot/biosboot/io.c
+++ b/sys/i386/boot/biosboot/io.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:57  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/boot/biosboot/io.c,v 1.25.2.1 1999/08/29 16:04:48 peter Exp $
  */
 
 #include "boot.h"
diff --git a/sys/i386/boot/biosboot/probe_keyboard.c b/sys/i386/boot/biosboot/probe_keyboard.c
index 41d7e9769a3d..0cc5664fd42f 100644
--- a/sys/i386/boot/biosboot/probe_keyboard.c
+++ b/sys/i386/boot/biosboot/probe_keyboard.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/boot/biosboot/probe_keyboard.c,v 1.14.2.1 1999/08/29 16:04:49 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/i386/boot/biosboot/serial.S b/sys/i386/boot/biosboot/serial.S
index 3b5072bdd98e..b5523e810847 100644
--- a/sys/i386/boot/biosboot/serial.S
+++ b/sys/i386/boot/biosboot/serial.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/boot/biosboot/serial.S,v 1.11.2.1 1999/08/29 16:04:49 peter Exp $
  */
 
 /*
diff --git a/sys/i386/boot/biosboot/start.S b/sys/i386/boot/biosboot/start.S
index 90fac5589d58..67a9e3a3a9e2 100644
--- a/sys/i386/boot/biosboot/start.S
+++ b/sys/i386/boot/biosboot/start.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:29  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/boot/biosboot/start.S,v 1.12.2.1 1999/08/29 16:04:50 peter Exp $
  */
 
 /*
diff --git a/sys/i386/boot/biosboot/sys.c b/sys/i386/boot/biosboot/sys.c
index 289a732cc3ca..04f3f033d676 100644
--- a/sys/i386/boot/biosboot/sys.c
+++ b/sys/i386/boot/biosboot/sys.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:34  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/boot/biosboot/sys.c,v 1.21.4.1 1999/08/29 16:04:51 peter Exp $
  */
 
 #include "boot.h"
diff --git a/sys/i386/boot/biosboot/table.c b/sys/i386/boot/biosboot/table.c
index ac59b24311e3..be6d696494a7 100644
--- a/sys/i386/boot/biosboot/table.c
+++ b/sys/i386/boot/biosboot/table.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:43  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/boot/biosboot/table.c,v 1.17.2.1 1999/08/29 16:04:52 peter Exp $
  */
 
 /*
diff --git a/sys/i386/boot/cdboot/Makefile b/sys/i386/boot/cdboot/Makefile
index 1278a287cdce..f4e0e78353a2 100644
--- a/sys/i386/boot/cdboot/Makefile
+++ b/sys/i386/boot/cdboot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/boot/cdboot/Makefile,v 1.5.2.1 1999/08/29 16:04:54 peter Exp $
 #
 
 PROG=	boot
diff --git a/sys/i386/boot/cdboot/asm.S b/sys/i386/boot/cdboot/asm.S
index 2190a35b5f2b..3c11f9d3c85b 100644
--- a/sys/i386/boot/cdboot/asm.S
+++ b/sys/i386/boot/cdboot/asm.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:13  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/boot/cdboot/asm.S,v 1.1.2.1 1999/08/29 16:04:54 peter Exp $
  */
 
 
diff --git a/sys/i386/boot/cdboot/boot.c b/sys/i386/boot/cdboot/boot.c
index bee6b87d06f7..5cd069700d17 100644
--- a/sys/i386/boot/cdboot/boot.c
+++ b/sys/i386/boot/cdboot/boot.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, [92/04/03  16:51:14  rvb]
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/boot/cdboot/boot.c,v 1.2.2.1 1999/08/29 16:04:55 peter Exp $
  */
 
 
diff --git a/sys/i386/boot/cdboot/boot.h b/sys/i386/boot/cdboot/boot.h
index c0973b33eef3..48caee727fbe 100644
--- a/sys/i386/boot/cdboot/boot.h
+++ b/sys/i386/boot/cdboot/boot.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:03  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/boot/cdboot/boot.h,v 1.2.2.1 1999/08/29 16:04:55 peter Exp $
  */
 /*
  * Extensions for El Torito CD-ROM booting:
diff --git a/sys/i386/boot/cdboot/cdrom.c b/sys/i386/boot/cdboot/cdrom.c
index 5668abcf0e57..46f73c357fb0 100644
--- a/sys/i386/boot/cdboot/cdrom.c
+++ b/sys/i386/boot/cdboot/cdrom.c
@@ -27,7 +27,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/boot/cdboot/cdrom.c,v 1.3.2.1 1999/08/29 16:04:55 peter Exp $
  */
 
 
diff --git a/sys/i386/boot/cdboot/malloc.c b/sys/i386/boot/cdboot/malloc.c
index a68e776e456d..46bca588e62f 100644
--- a/sys/i386/boot/cdboot/malloc.c
+++ b/sys/i386/boot/cdboot/malloc.c
@@ -27,7 +27,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/boot/cdboot/malloc.c,v 1.1.2.1 1999/08/29 16:04:56 peter Exp $
  */
 
 /*
diff --git a/sys/i386/boot/dosboot/Makefile b/sys/i386/boot/dosboot/Makefile
index 88a25c73a3fc..2bc4839fe659 100644
--- a/sys/i386/boot/dosboot/Makefile
+++ b/sys/i386/boot/dosboot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/boot/dosboot/Makefile,v 1.5.2.1 1999/08/29 16:04:57 peter Exp $
 #
 
 MPROG=	fbsdboot.exe
diff --git a/sys/i386/boot/dosboot/ansi.h b/sys/i386/boot/dosboot/ansi.h
index 23f6d9ba92aa..d1a493ce0263 100644
--- a/sys/i386/boot/dosboot/ansi.h
+++ b/sys/i386/boot/dosboot/ansi.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.

  *

  *	from: @(#)ansi.h	7.1 (Berkeley) 3/9/91

- * $FreeBSD$

+ * $FreeBSD: src/sys/i386/boot/dosboot/ansi.h,v 1.4.4.1 1999/08/29 16:04:58 peter Exp $

  */

 

 #ifndef	_ANSI_H_

diff --git a/sys/i386/boot/dosboot/boot.c b/sys/i386/boot/dosboot/boot.c
index 0eb6d19203b8..1e18e0831f92 100644
--- a/sys/i386/boot/dosboot/boot.c
+++ b/sys/i386/boot/dosboot/boot.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.

  *

  *	from: Mach, [92/04/03  16:51:14  rvb]

- * $FreeBSD$

+ * $FreeBSD: src/sys/i386/boot/dosboot/boot.c,v 1.4.4.1 1999/08/29 16:04:58 peter Exp $

  */

 

 

diff --git a/sys/i386/boot/dosboot/boot.h b/sys/i386/boot/dosboot/boot.h
index f72fa1dc7c12..f526b9e3f562 100644
--- a/sys/i386/boot/dosboot/boot.h
+++ b/sys/i386/boot/dosboot/boot.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.

  *

  *	from: Mach, Revision 2.2  92/04/04  11:35:03  rpd

- * $FreeBSD$

+ * $FreeBSD: src/sys/i386/boot/dosboot/boot.h,v 1.4.4.1 1999/08/29 16:04:59 peter Exp $

  */

 

 #include "types.h"

diff --git a/sys/i386/boot/dosboot/bootinfo.h b/sys/i386/boot/dosboot/bootinfo.h
index 7f5649174233..eec5385b7a8b 100644
--- a/sys/i386/boot/dosboot/bootinfo.h
+++ b/sys/i386/boot/dosboot/bootinfo.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

  * SUCH DAMAGE.

  *

- * $FreeBSD$

+ * $FreeBSD: src/sys/i386/boot/dosboot/bootinfo.h,v 1.4.4.1 1999/08/29 16:05:00 peter Exp $

  */

 

 #ifndef	_MACHINE_BOOTINFO_H_

diff --git a/sys/i386/boot/dosboot/cdefs.h b/sys/i386/boot/dosboot/cdefs.h
index 07f727d8e7e3..388395b2ec72 100644
--- a/sys/i386/boot/dosboot/cdefs.h
+++ b/sys/i386/boot/dosboot/cdefs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.

  *

  *      from: @(#)cdefs.h       8.1 (Berkeley) 6/2/93

- * $FreeBSD$

+ * $FreeBSD: src/sys/i386/boot/dosboot/cdefs.h,v 1.4.4.1 1999/08/29 16:05:01 peter Exp $

  */

 

 #ifndef _CDEFS_H_

diff --git a/sys/i386/boot/dosboot/dinode.h b/sys/i386/boot/dosboot/dinode.h
index 99a8849b190d..009da97a0849 100644
--- a/sys/i386/boot/dosboot/dinode.h
+++ b/sys/i386/boot/dosboot/dinode.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.

  *

  *	from: @(#)dinode.h	7.10 (Berkeley) 5/8/91

- * $FreeBSD$

+ * $FreeBSD: src/sys/i386/boot/dosboot/dinode.h,v 1.4.4.1 1999/08/29 16:05:01 peter Exp $

  */

 

 #ifndef _UFS_DINODE_H_

diff --git a/sys/i386/boot/dosboot/dir.h b/sys/i386/boot/dosboot/dir.h
index 1b72f4749c03..b8c42899b445 100644
--- a/sys/i386/boot/dosboot/dir.h
+++ b/sys/i386/boot/dosboot/dir.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.

  *

  *	from: @(#)dir.h	7.3 (Berkeley) 2/5/91

- * $FreeBSD$

+ * $FreeBSD: src/sys/i386/boot/dosboot/dir.h,v 1.4.4.1 1999/08/29 16:05:01 peter Exp $

  */

 

 /*

diff --git a/sys/i386/boot/dosboot/disk.c b/sys/i386/boot/dosboot/disk.c
index 3f93ab82a858..64abb7ea0bb2 100644
--- a/sys/i386/boot/dosboot/disk.c
+++ b/sys/i386/boot/dosboot/disk.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.

  *

  *	from: Mach, Revision 2.2  92/04/04  11:35:49  rpd

- * $FreeBSD$

+ * $FreeBSD: src/sys/i386/boot/dosboot/disk.c,v 1.4.4.1 1999/08/29 16:05:02 peter Exp $

  */

 #include <stdio.h>

 #include <memory.h>

diff --git a/sys/i386/boot/dosboot/disklabe.h b/sys/i386/boot/dosboot/disklabe.h
index d3983d3c6787..7d2829451bce 100644
--- a/sys/i386/boot/dosboot/disklabe.h
+++ b/sys/i386/boot/dosboot/disklabe.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.

  *

  *	@(#)disklabel.h	8.1 (Berkeley) 6/2/93

- * $FreeBSD$

+ * $FreeBSD: src/sys/i386/boot/dosboot/disklabe.h,v 1.5.2.1 1999/08/29 16:05:02 peter Exp $

  */

 

 #ifndef _SYS_DISKLABEL_H_

diff --git a/sys/i386/boot/dosboot/dkbad.h b/sys/i386/boot/dosboot/dkbad.h
index 1aea5ded055c..487c317ae36f 100644
--- a/sys/i386/boot/dosboot/dkbad.h
+++ b/sys/i386/boot/dosboot/dkbad.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.

  *

  *	@(#)dkbad.h	8.1 (Berkeley) 6/2/93

- * $FreeBSD$

+ * $FreeBSD: src/sys/i386/boot/dosboot/dkbad.h,v 1.4.4.1 1999/08/29 16:05:03 peter Exp $

  */

 

 #ifndef _SYS_DKBAD_H_

diff --git a/sys/i386/boot/dosboot/endian.h b/sys/i386/boot/dosboot/endian.h
index 84d04b25d008..a98ed0c03437 100644
--- a/sys/i386/boot/dosboot/endian.h
+++ b/sys/i386/boot/dosboot/endian.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.

  *

  *	from: @(#)endian.h	7.8 (Berkeley) 4/3/91

- * $FreeBSD$

+ * $FreeBSD: src/sys/i386/boot/dosboot/endian.h,v 1.4.4.1 1999/08/29 16:05:03 peter Exp $

  */

 

 #ifndef _MACHINE_ENDIAN_H_

diff --git a/sys/i386/boot/dosboot/exec.h b/sys/i386/boot/dosboot/exec.h
index d64f63b77489..8bd63831a6cd 100644
--- a/sys/i386/boot/dosboot/exec.h
+++ b/sys/i386/boot/dosboot/exec.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.

  *

  *	@(#)exec.h	8.3 (Berkeley) 1/21/94

- * $FreeBSD$

+ * $FreeBSD: src/sys/i386/boot/dosboot/exec.h,v 1.4.4.1 1999/08/29 16:05:04 peter Exp $

  */

 

 #ifndef _SYS_EXEC_H_

diff --git a/sys/i386/boot/dosboot/fs.h b/sys/i386/boot/dosboot/fs.h
index f4c397d3cac6..c1fa204ace0d 100644
--- a/sys/i386/boot/dosboot/fs.h
+++ b/sys/i386/boot/dosboot/fs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.

  *

  *	from: @(#)fs.h	7.12 (Berkeley) 5/8/91

- * $FreeBSD$

+ * $FreeBSD: src/sys/i386/boot/dosboot/fs.h,v 1.4.4.1 1999/08/29 16:05:04 peter Exp $

  */

 

 #ifndef _UFS_FS_H_

diff --git a/sys/i386/boot/dosboot/imgact.h b/sys/i386/boot/dosboot/imgact.h
index f3ec5571819c..3b80d922fe8a 100644
--- a/sys/i386/boot/dosboot/imgact.h
+++ b/sys/i386/boot/dosboot/imgact.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.

  *

  *	from: @(#)exec.h	8.1 (Berkeley) 6/11/93

- * $FreeBSD$

+ * $FreeBSD: src/sys/i386/boot/dosboot/imgact.h,v 1.4.4.1 1999/08/29 16:05:05 peter Exp $

  */

 

 #ifndef	_IMGACT_AOUT_H_

diff --git a/sys/i386/boot/dosboot/inode.h b/sys/i386/boot/dosboot/inode.h
index 26ae12090e08..753704c006cc 100644
--- a/sys/i386/boot/dosboot/inode.h
+++ b/sys/i386/boot/dosboot/inode.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.

  *

  *	from: @(#)inode.h	7.17 (Berkeley) 5/8/91

- * $FreeBSD$

+ * $FreeBSD: src/sys/i386/boot/dosboot/inode.h,v 1.5.2.1 1999/08/29 16:05:05 peter Exp $

  */

 

 #ifndef _UFS_INODE_H_

diff --git a/sys/i386/boot/dosboot/mexec.h b/sys/i386/boot/dosboot/mexec.h
index b045a235ece3..26957525b6d9 100644
--- a/sys/i386/boot/dosboot/mexec.h
+++ b/sys/i386/boot/dosboot/mexec.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.

  *

  *	@(#)exec.h	8.1 (Berkeley) 6/11/93

- * $FreeBSD$

+ * $FreeBSD: src/sys/i386/boot/dosboot/mexec.h,v 1.4.4.1 1999/08/29 16:05:06 peter Exp $

  */

 

 #ifndef	_EXEC_H_

diff --git a/sys/i386/boot/dosboot/param.h b/sys/i386/boot/dosboot/param.h
index 394c1f797d7e..79b52c04df0a 100644
--- a/sys/i386/boot/dosboot/param.h
+++ b/sys/i386/boot/dosboot/param.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.

  *

  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91

- * $FreeBSD$

+ * $FreeBSD: src/sys/i386/boot/dosboot/param.h,v 1.4.4.1 1999/08/29 16:05:07 peter Exp $

  */

 

 #ifndef _MACHINE_PARAM_H_

diff --git a/sys/i386/boot/dosboot/quota.h b/sys/i386/boot/dosboot/quota.h
index 5ad06ce018bb..740976761b4b 100644
--- a/sys/i386/boot/dosboot/quota.h
+++ b/sys/i386/boot/dosboot/quota.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.

  *

  *	from: @(#)quota.h	7.9 (Berkeley) 2/22/91

- * $FreeBSD$

+ * $FreeBSD: src/sys/i386/boot/dosboot/quota.h,v 1.4.4.1 1999/08/29 16:05:07 peter Exp $

  */

 

 #ifndef _QUOTA_

diff --git a/sys/i386/boot/dosboot/reboot.h b/sys/i386/boot/dosboot/reboot.h
index 65453b05e51f..3b13490ec0af 100644
--- a/sys/i386/boot/dosboot/reboot.h
+++ b/sys/i386/boot/dosboot/reboot.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.

  *

  *	@(#)reboot.h	8.1 (Berkeley) 6/2/93

- * $FreeBSD$

+ * $FreeBSD: src/sys/i386/boot/dosboot/reboot.h,v 1.5.4.1 1999/08/29 16:05:08 peter Exp $

  */

 

 #ifndef _SYS_REBOOT_H_

diff --git a/sys/i386/boot/dosboot/sys.c b/sys/i386/boot/dosboot/sys.c
index 04a25af8d907..740eaaf552b5 100644
--- a/sys/i386/boot/dosboot/sys.c
+++ b/sys/i386/boot/dosboot/sys.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.

  *

  *	from: Mach, Revision 2.2  92/04/04  11:36:34  rpd

- * $FreeBSD$

+ * $FreeBSD: src/sys/i386/boot/dosboot/sys.c,v 1.4.4.1 1999/08/29 16:05:08 peter Exp $

  */

 #include <stdio.h>

 #include <string.h>

diff --git a/sys/i386/boot/dosboot/syslimit.h b/sys/i386/boot/dosboot/syslimit.h
index 0d914230c3b6..0964f8da0c03 100644
--- a/sys/i386/boot/dosboot/syslimit.h
+++ b/sys/i386/boot/dosboot/syslimit.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)syslimits.h	7.4 (Berkeley) 2/4/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/boot/dosboot/syslimit.h,v 1.4.4.1 1999/08/29 16:05:09 peter Exp $
  */
 
 #ifndef _SYS_SYSLIMITS_H_
diff --git a/sys/i386/boot/dosboot/sysparam.h b/sys/i386/boot/dosboot/sysparam.h
index 4f93f2cc0266..946af4705d54 100644
--- a/sys/i386/boot/dosboot/sysparam.h
+++ b/sys/i386/boot/dosboot/sysparam.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.

  *

  *	@(#)param.h	8.2 (Berkeley) 1/21/94

- * $FreeBSD$

+ * $FreeBSD: src/sys/i386/boot/dosboot/sysparam.h,v 1.4.4.1 1999/08/29 16:05:09 peter Exp $

  */

 

 #ifndef _SYS_PARAM_H_

diff --git a/sys/i386/boot/dosboot/types.h b/sys/i386/boot/dosboot/types.h
index 85b64942897a..bdf3e22b17cc 100644
--- a/sys/i386/boot/dosboot/types.h
+++ b/sys/i386/boot/dosboot/types.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.

  *

  *	@(#)types.h	8.4 (Berkeley) 1/21/94

- * $FreeBSD$

+ * $FreeBSD: src/sys/i386/boot/dosboot/types.h,v 1.4.4.1 1999/08/29 16:05:10 peter Exp $

  */

 

 #ifndef _SYS_TYPES_H_

diff --git a/sys/i386/boot/kzipboot/Makefile b/sys/i386/boot/kzipboot/Makefile
index 1c37ac40cae6..e1b875da1379 100644
--- a/sys/i386/boot/kzipboot/Makefile
+++ b/sys/i386/boot/kzipboot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/boot/kzipboot/Makefile,v 1.10.2.1 1999/08/29 16:05:12 peter Exp $
 
 PROG= kztail.o kzhead.o
 BINMODE = 444	# target is a relocatable object
diff --git a/sys/i386/boot/netboot/3c509.c b/sys/i386/boot/netboot/3c509.c
index accc948c6b4f..6086d66ca0e6 100644
--- a/sys/i386/boot/netboot/3c509.c
+++ b/sys/i386/boot/netboot/3c509.c
@@ -18,7 +18,7 @@ Author: Martin Renters.
 
 3c509 support added by Serge Babkin (babkin@hq.icb.chel.su)
 
-$FreeBSD$
+$FreeBSD: src/sys/i386/boot/netboot/3c509.c,v 1.5.4.1 1999/08/29 16:05:14 peter Exp $
 
 ***************************************************************************/
 
diff --git a/sys/i386/boot/netboot/Makefile b/sys/i386/boot/netboot/Makefile
index 84d3d97103e1..8fe1e2a4f02a 100644
--- a/sys/i386/boot/netboot/Makefile
+++ b/sys/i386/boot/netboot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/boot/netboot/Makefile,v 1.22.2.1 1999/08/29 16:05:15 peter Exp $
 #
 # Makefile for NETBOOT
 #
diff --git a/sys/i386/boot/netboot/netboot.8 b/sys/i386/boot/netboot/netboot.8
index 2717ec53cc0d..c08ef091baa0 100644
--- a/sys/i386/boot/netboot/netboot.8
+++ b/sys/i386/boot/netboot/netboot.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/i386/boot/netboot/netboot.8,v 1.4.2.1 1999/08/29 16:05:16 peter Exp $
 .Dd May 15, 1997
 .Dt NETBOOT 8
 .\".Os BSD 4
diff --git a/sys/i386/boot/rawboot/Makefile b/sys/i386/boot/rawboot/Makefile
index 474788b2c88c..5ba8507b9443 100644
--- a/sys/i386/boot/rawboot/Makefile
+++ b/sys/i386/boot/rawboot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/boot/rawboot/Makefile,v 1.12.2.1 1999/08/29 16:05:17 peter Exp $
 #
 
 PROG=	boot
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 24b9363ee94b..ca7b59487846 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -15,7 +15,7 @@
 # device lines is also present in the ./LINT configuration file. If you are
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.143.2.24 1999/12/05 01:56:42 luoqi Exp $
 
 machine		"i386"
 cpu		"I386_CPU"
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 56c697e0e820..1ec5738cf671 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/conf/LINT,v 1.539.2.52 1999/12/15 19:35:13 joe Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
diff --git a/sys/i386/conf/LKM b/sys/i386/conf/LKM
index 72dc70ee7e10..fcf5c3d5d366 100644
--- a/sys/i386/conf/LKM
+++ b/sys/i386/conf/LKM
@@ -2,7 +2,7 @@
 # LKM - verification kernel for LKMs.  This is not intended to be run
 # on any real hardware, only to make it possible to test-link LKMs.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/conf/LKM,v 1.3.2.1 1999/08/29 16:05:22 peter Exp $
 #
 
 ##
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386
index d88e7b4f85fe..162e91f2b143 100644
--- a/sys/i386/conf/Makefile.i386
+++ b/sys/i386/conf/Makefile.i386
@@ -1,7 +1,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/conf/Makefile.i386,v 1.136.2.9 1999/09/05 21:03:48 jkh Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/i386/conf/PCCARD b/sys/i386/conf/PCCARD
index 2cdf70493d98..1e1e24a06d89 100644
--- a/sys/i386/conf/PCCARD
+++ b/sys/i386/conf/PCCARD
@@ -16,7 +16,7 @@
 # device lines is also present in the ./LINT configuration file. If you are
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/conf/PCCARD,v 1.15.2.4 1999/08/29 17:05:59 iwasaki Exp $
 
 machine		"i386"
 cpu		"I386_CPU"
diff --git a/sys/i386/conf/devices.i386 b/sys/i386/conf/devices.i386
index eeac8f2048c5..ba71e2d96467 100644
--- a/sys/i386/conf/devices.i386
+++ b/sys/i386/conf/devices.i386
@@ -1,6 +1,6 @@
 # This file tells what major numbers the various possible swap devices have.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/conf/devices.i386,v 1.15.2.1 1999/08/29 16:05:24 peter Exp $
 #
 wd	0
 wfd	1
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
index 1a662ea2adbd..db80082481b4 100644
--- a/sys/i386/conf/files.i386
+++ b/sys/i386/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/conf/files.i386,v 1.220.2.17 1999/12/06 21:03:19 archie Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/i386/conf/majors.i386 b/sys/i386/conf/majors.i386
index 96f340e69ff2..2b40f818fd57 100644
--- a/sys/i386/conf/majors.i386
+++ b/sys/i386/conf/majors.i386
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/i386/conf/majors.i386,v 1.65.2.1 1999/08/29 16:05:25 peter Exp $
 
 Hopefully, this list will one day be obsoleted by DEVFS, but for now
 this is the current allocation of device major numbers.
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index 9660cb454612..b1ea1a85bc27 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/conf/options.i386,v 1.103.2.7 1999/11/16 18:26:31 joe Exp $
 
 DISABLE_PSE
 IDE_DELAY
diff --git a/sys/i386/eisa/3c5x9.c b/sys/i386/eisa/3c5x9.c
index 5a6ffdd43a41..546518c74bf7 100644
--- a/sys/i386/eisa/3c5x9.c
+++ b/sys/i386/eisa/3c5x9.c
@@ -19,7 +19,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/eisa/3c5x9.c,v 1.10.2.1 1999/08/29 16:05:27 peter Exp $
  */
 
 #include "eisa.h"
diff --git a/sys/i386/eisa/adv_eisa.c b/sys/i386/eisa/adv_eisa.c
index d526ea201b6a..4d693f7caf40 100644
--- a/sys/i386/eisa/adv_eisa.c
+++ b/sys/i386/eisa/adv_eisa.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/eisa/adv_eisa.c,v 1.2.2.2 1999/09/14 04:07:54 gibbs Exp $
  */
 
 #include "eisa.h"
diff --git a/sys/i386/eisa/ahb.c b/sys/i386/eisa/ahb.c
index 0737242e05a6..37897df9b76b 100644
--- a/sys/i386/eisa/ahb.c
+++ b/sys/i386/eisa/ahb.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/eisa/ahb.c,v 1.4.2.5 1999/09/14 04:07:54 gibbs Exp $
  */
 
 #include "eisa.h"
diff --git a/sys/i386/eisa/ahbreg.h b/sys/i386/eisa/ahbreg.h
index c72f068aa3b9..e7f1c4c288fe 100644
--- a/sys/i386/eisa/ahbreg.h
+++ b/sys/i386/eisa/ahbreg.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/eisa/ahbreg.h,v 1.1.2.1 1999/08/29 16:05:29 peter Exp $
  */
 
 /* Resource Constatns */
diff --git a/sys/i386/eisa/ahc_eisa.c b/sys/i386/eisa/ahc_eisa.c
index 55885f9fc0b5..450bbcf2ecd9 100644
--- a/sys/i386/eisa/ahc_eisa.c
+++ b/sys/i386/eisa/ahc_eisa.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/eisa/ahc_eisa.c,v 1.4.2.4 1999/09/14 04:07:54 gibbs Exp $
  */
 
 #include "eisa.h"
diff --git a/sys/i386/eisa/bt_eisa.c b/sys/i386/eisa/bt_eisa.c
index cf0125f9db24..a8501ee59861 100644
--- a/sys/i386/eisa/bt_eisa.c
+++ b/sys/i386/eisa/bt_eisa.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/eisa/bt_eisa.c,v 1.1.2.4 1999/09/14 04:07:55 gibbs Exp $
  */
 
 #include "eisa.h"
diff --git a/sys/i386/eisa/dpt_eisa.c b/sys/i386/eisa/dpt_eisa.c
index 8a47bfd69359..0352717c7243 100644
--- a/sys/i386/eisa/dpt_eisa.c
+++ b/sys/i386/eisa/dpt_eisa.c
@@ -33,7 +33,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/eisa/dpt_eisa.c,v 1.4.2.2 1999/09/14 04:07:55 gibbs Exp $
  */
 
 #include "eisa.h"
diff --git a/sys/i386/eisa/dpt_eisa.h b/sys/i386/eisa/dpt_eisa.h
index d7ebba08a51a..707662951fc7 100644
--- a/sys/i386/eisa/dpt_eisa.h
+++ b/sys/i386/eisa/dpt_eisa.h
@@ -32,7 +32,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/eisa/dpt_eisa.h,v 1.2.2.1 1999/08/29 16:05:30 peter Exp $
  */
 
 #define DPT_EISA_SLOT_OFFSET		0xc00
diff --git a/sys/i386/eisa/eisaconf.c b/sys/i386/eisa/eisaconf.c
index de21d379b4f8..2ba69d521def 100644
--- a/sys/i386/eisa/eisaconf.c
+++ b/sys/i386/eisa/eisaconf.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/eisa/eisaconf.c,v 1.37.2.1 1999/08/29 16:05:31 peter Exp $
  */
 
 #include "opt_eisa.h"
diff --git a/sys/i386/eisa/eisaconf.h b/sys/i386/eisa/eisaconf.h
index d5d8c05e9867..61c935891a70 100644
--- a/sys/i386/eisa/eisaconf.h
+++ b/sys/i386/eisa/eisaconf.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/eisa/eisaconf.h,v 1.17.2.1 1999/08/29 16:05:31 peter Exp $
  */
 
 #ifndef _I386_EISA_EISACONF_H_
diff --git a/sys/i386/eisa/if_fea.c b/sys/i386/eisa/if_fea.c
index 41bdf76ed3c0..9469d96dbb72 100644
--- a/sys/i386/eisa/if_fea.c
+++ b/sys/i386/eisa/if_fea.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/eisa/if_fea.c,v 1.13.2.1 1999/08/29 16:05:32 peter Exp $
  */
 
 /*
diff --git a/sys/i386/i386/atomic.c b/sys/i386/i386/atomic.c
index c19ba9e027b2..cbd7c9862a68 100644
--- a/sys/i386/i386/atomic.c
+++ b/sys/i386/i386/atomic.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/atomic.c,v 1.2.2.2 1999/08/29 16:05:33 peter Exp $
  */
 
 /* This file creates publically callable functions to perform various
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index 0a37e4350dc4..8341f557e9e3 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/autoconf.c,v 1.111.2.1 1999/08/29 16:05:34 peter Exp $
  */
 
 /*
diff --git a/sys/i386/i386/bios.c b/sys/i386/i386/bios.c
index 85fd5a8c9d4b..c0bcfc711bee 100644
--- a/sys/i386/i386/bios.c
+++ b/sys/i386/i386/bios.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/bios.c,v 1.11.2.2 1999/08/29 16:05:35 peter Exp $
  */
 
 /*
diff --git a/sys/i386/i386/bioscall.s b/sys/i386/i386/bioscall.s
index 7e83550186a0..14e34428b319 100644
--- a/sys/i386/i386/bioscall.s
+++ b/sys/i386/i386/bioscall.s
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/bioscall.s,v 1.1.2.1 1999/08/29 16:05:35 peter Exp $
  */
 
 /*
diff --git a/sys/i386/i386/busdma_machdep.c b/sys/i386/i386/busdma_machdep.c
index 3587bd656634..c78770f5b814 100644
--- a/sys/i386/i386/busdma_machdep.c
+++ b/sys/i386/i386/busdma_machdep.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.12.2.2 1999/09/14 04:07:56 gibbs Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/cons.c b/sys/i386/i386/cons.c
index c47f98da9b59..7f51d6fcc8cd 100644
--- a/sys/i386/i386/cons.c
+++ b/sys/i386/i386/cons.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.c	7.2 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/cons.c,v 1.61.2.1 1999/08/29 16:05:36 peter Exp $
  */
 
 #include "opt_devfs.h"
diff --git a/sys/i386/i386/cons.h b/sys/i386/i386/cons.h
index ac7b1b94ae5c..b9e279a58d7f 100644
--- a/sys/i386/i386/cons.h
+++ b/sys/i386/i386/cons.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.h	7.2 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/cons.h,v 1.19.2.1 1999/08/29 16:05:36 peter Exp $
  */
 
 #ifndef _MACHINE_CONS_H_
diff --git a/sys/i386/i386/db_disasm.c b/sys/i386/i386/db_disasm.c
index 1faa8807f848..818a06f028da 100644
--- a/sys/i386/i386/db_disasm.c
+++ b/sys/i386/i386/db_disasm.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/db_disasm.c,v 1.21.2.1 1999/08/29 16:05:37 peter Exp $
  */
 
 /*
diff --git a/sys/i386/i386/db_interface.c b/sys/i386/i386/db_interface.c
index 9a3441da56cb..569b07fdee81 100644
--- a/sys/i386/i386/db_interface.c
+++ b/sys/i386/i386/db_interface.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/db_interface.c,v 1.43.2.1 1999/08/29 16:05:37 peter Exp $
  */
 
 /*
diff --git a/sys/i386/i386/db_trace.c b/sys/i386/i386/db_trace.c
index 183fdefce91f..b005f9b07084 100644
--- a/sys/i386/i386/db_trace.c
+++ b/sys/i386/i386/db_trace.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/db_trace.c,v 1.31.2.1 1999/08/29 16:05:38 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/elf_machdep.c b/sys/i386/i386/elf_machdep.c
index 06222eb3ff5c..b68526c1fff8 100644
--- a/sys/i386/i386/elf_machdep.c
+++ b/sys/i386/i386/elf_machdep.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/elf_machdep.c,v 1.4.2.1 1999/08/29 16:05:38 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/exception.s b/sys/i386/i386/exception.s
index 5cd5ec90873f..9e2f2bca89dd 100644
--- a/sys/i386/i386/exception.s
+++ b/sys/i386/i386/exception.s
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/exception.s,v 1.55.2.2 1999/08/29 16:05:39 peter Exp $
  */
 
 #include "npx.h"
diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c
index c7ca4c510bdb..f99347d65f63 100644
--- a/sys/i386/i386/genassym.c
+++ b/sys/i386/i386/genassym.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/genassym.c,v 1.62.2.3 1999/11/15 20:19:23 luoqi Exp $
  */
 
 #include "opt_vm86.h"
diff --git a/sys/i386/i386/globals.s b/sys/i386/i386/globals.s
index e3e07b9d99da..01584474c62a 100644
--- a/sys/i386/i386/globals.s
+++ b/sys/i386/i386/globals.s
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/globals.s,v 1.8.2.2 1999/08/29 16:05:40 peter Exp $
  */
 
 #include "opt_vm86.h"
diff --git a/sys/i386/i386/i686_mem.c b/sys/i386/i386/i686_mem.c
index 5458a2d33372..3050a9ee1852 100644
--- a/sys/i386/i386/i686_mem.c
+++ b/sys/i386/i386/i686_mem.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/i686_mem.c,v 1.6.2.2 1999/10/12 22:58:01 green Exp $
  */
 
 #include "opt_smp.h"
diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c
index b49136bb8dc6..9ca216b06a7d 100644
--- a/sys/i386/i386/identcpu.c
+++ b/sys/i386/i386/identcpu.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/identcpu.c,v 1.57.2.8 1999/09/10 20:47:22 phk Exp $
  */
 
 #include "opt_cpu.h"
diff --git a/sys/i386/i386/in_cksum.c b/sys/i386/i386/in_cksum.c
index def6b5a4144a..85b21ec2a35e 100644
--- a/sys/i386/i386/in_cksum.c
+++ b/sys/i386/i386/in_cksum.c
@@ -32,7 +32,7 @@
  *
  *	from tahoe:	in_cksum.c	1.2	86/01/05
  *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/in_cksum.c,v 1.13.2.1 1999/08/29 16:05:42 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/initcpu.c b/sys/i386/i386/initcpu.c
index 15c1c53a9227..4ea0235f62a3 100644
--- a/sys/i386/i386/initcpu.c
+++ b/sys/i386/i386/initcpu.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/initcpu.c,v 1.17.2.1 1999/08/29 16:05:42 peter Exp $
  */
 
 #include "opt_cpu.h"
diff --git a/sys/i386/i386/k6_mem.c b/sys/i386/i386/k6_mem.c
index 1045b28c9f77..26487ba3d720 100644
--- a/sys/i386/i386/k6_mem.c
+++ b/sys/i386/i386/k6_mem.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/k6_mem.c,v 1.3.2.1 1999/08/31 01:19:17 msmith Exp $
  *
  */
 
diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s
index e9a7baf65a39..a05f72ec8447 100644
--- a/sys/i386/i386/locore.s
+++ b/sys/i386/i386/locore.s
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/locore.s,v 1.118.2.4 1999/12/04 13:13:58 kato Exp $
  *
  *		originally from: locore.s, by William F. Jolitz
  *
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index 41f6e115af69..f1293e3cb147 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.322.2.9 1999/11/15 20:19:25 luoqi Exp $
  */
 
 #include "apm.h"
diff --git a/sys/i386/i386/math_emu.h b/sys/i386/i386/math_emu.h
index 6e189b4a5594..fdecd8ddd257 100644
--- a/sys/i386/i386/math_emu.h
+++ b/sys/i386/i386/math_emu.h
@@ -3,7 +3,7 @@
  *
  * (C) 1991 Linus Torvalds
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/math_emu.h,v 1.6.2.1 1999/08/29 16:05:44 peter Exp $
  */
 #ifndef _LINUX_MATH_EMU_H
 #define _LINUX_MATH_EMU_H
diff --git a/sys/i386/i386/math_emulate.c b/sys/i386/i386/math_emulate.c
index c7218dd32c5c..d0fc1f29bce4 100644
--- a/sys/i386/i386/math_emulate.c
+++ b/sys/i386/i386/math_emulate.c
@@ -6,7 +6,7 @@
  * [expediant "port" of linux 8087 emulator to 386BSD, with apologies -wfj]
  *
  *	from: 386BSD 0.1
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/math_emulate.c,v 1.32.2.1 1999/08/29 16:05:45 peter Exp $
  */
 
 /*
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index 26804ad9497a..52bc9ef7507d 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c
@@ -38,7 +38,7 @@
  *
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/mem.c,v 1.53.2.5 1999/08/31 06:45:41 msmith Exp $
  */
 
 /*
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index bce307d34476..155d6039693e 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.88.2.5 1999/10/30 20:14:26 tegge Exp $
  */
 
 #include "opt_smp.h"
diff --git a/sys/i386/i386/mpapic.c b/sys/i386/i386/mpapic.c
index ef591aa7b51d..e87a7219a5ab 100644
--- a/sys/i386/i386/mpapic.c
+++ b/sys/i386/i386/mpapic.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/mpapic.c,v 1.33.2.1 1999/08/29 16:05:47 peter Exp $
  */
 
 #include "opt_smp.h"
diff --git a/sys/i386/i386/mpboot.s b/sys/i386/i386/mpboot.s
index b5127d696bd6..3931406a06b9 100644
--- a/sys/i386/i386/mpboot.s
+++ b/sys/i386/i386/mpboot.s
@@ -31,7 +31,7 @@
  * mpboot.s:	FreeBSD machine support for the Intel MP Spec
  *		multiprocessor systems.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/mpboot.s,v 1.8.2.1 1999/08/29 16:05:47 peter Exp $
  */
 
 #include "opt_vm86.h"
diff --git a/sys/i386/i386/mplock.s b/sys/i386/i386/mplock.s
index bb1a4bf2a86d..dd0d3e66f146 100644
--- a/sys/i386/i386/mplock.s
+++ b/sys/i386/i386/mplock.s
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/mplock.s,v 1.25.2.1 1999/08/29 16:05:48 peter Exp $
  *
  * Functions for locking between CPUs in a SMP system.
  *
diff --git a/sys/i386/i386/perfmon.c b/sys/i386/i386/perfmon.c
index a485249181f1..dc79a030c154 100644
--- a/sys/i386/i386/perfmon.c
+++ b/sys/i386/i386/perfmon.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/perfmon.c,v 1.17.2.2 1999/08/29 16:05:49 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index c3ae6b4dd534..64ce95f2fb1a 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.219.2.6 1999/09/02 23:56:47 msmith Exp $
  */
 
 /*
diff --git a/sys/i386/i386/procfs_machdep.c b/sys/i386/i386/procfs_machdep.c
index 6b1589599860..b5c595e7c56d 100644
--- a/sys/i386/i386/procfs_machdep.c
+++ b/sys/i386/i386/procfs_machdep.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_machdep.c	8.3 (Berkeley) 1/27/94
  *
  * From:
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/procfs_machdep.c,v 1.11.2.1 1999/08/29 16:05:51 peter Exp $
  */
 
 /*
diff --git a/sys/i386/i386/simplelock.s b/sys/i386/i386/simplelock.s
index 6bf9862ffee7..e6eee4b7dee6 100644
--- a/sys/i386/i386/simplelock.s
+++ b/sys/i386/i386/simplelock.s
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/simplelock.s,v 1.9.2.1 1999/08/29 16:05:51 peter Exp $
  */
 
 /*
diff --git a/sys/i386/i386/support.s b/sys/i386/i386/support.s
index d9ae76bfa651..fb32d686a1fd 100644
--- a/sys/i386/i386/support.s
+++ b/sys/i386/i386/support.s
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/support.s,v 1.60.2.1 1999/08/29 16:05:52 peter Exp $
  */
 
 #include "npx.h"
diff --git a/sys/i386/i386/swapgeneric.c b/sys/i386/i386/swapgeneric.c
index 8b4f0f153c11..c682088bad0a 100644
--- a/sys/i386/i386/swapgeneric.c
+++ b/sys/i386/i386/swapgeneric.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)swapgeneric.c	5.5 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/swapgeneric.c,v 1.25.2.1 1999/08/29 16:05:52 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/swtch.s b/sys/i386/i386/swtch.s
index cc3c06d17575..5516ec2ae4b4 100644
--- a/sys/i386/i386/swtch.s
+++ b/sys/i386/i386/swtch.s
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/swtch.s,v 1.75.2.2 1999/08/29 16:05:53 peter Exp $
  */
 
 #include "npx.h"
diff --git a/sys/i386/i386/symbols.raw b/sys/i386/i386/symbols.raw
index 3f22255c6a12..94d1786b3364 100644
--- a/sys/i386/i386/symbols.raw
+++ b/sys/i386/i386/symbols.raw
@@ -1,6 +1,6 @@
 #	@(#)symbols.raw	7.6 (Berkeley) 5/8/91
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/i386/symbols.raw,v 1.13.2.1 1999/08/29 16:05:54 peter Exp $
 #
 
 
diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c
index 298c7d9b37a4..8620f745258a 100644
--- a/sys/i386/i386/sys_machdep.c
+++ b/sys/i386/i386/sys_machdep.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sys_machdep.c	5.5 (Berkeley) 1/19/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.38.2.1 1999/08/29 16:05:55 peter Exp $
  *
  */
 
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index 7363f5145d04..58cff2efa578 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/trap.c,v 1.133.2.1 1999/08/29 16:05:56 peter Exp $
  */
 
 /*
diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c
index a2ecfd6dd798..9422bcc2cb27 100644
--- a/sys/i386/i386/userconfig.c
+++ b/sys/i386/i386/userconfig.c
@@ -46,7 +46,7 @@
  ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  **
- ** $FreeBSD$
+ ** $FreeBSD: src/sys/i386/i386/userconfig.c,v 1.126.2.12 1999/12/06 21:03:20 archie Exp $
  **/
 
 /**
@@ -2513,7 +2513,7 @@ visuserconfig(void)
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/userconfig.c,v 1.126.2.12 1999/12/06 21:03:20 archie Exp $
  */
 
 #include "scbus.h"
diff --git a/sys/i386/i386/vm86.c b/sys/i386/i386/vm86.c
index f5bb06b7dc47..7c36dbfdfb0f 100644
--- a/sys/i386/i386/vm86.c
+++ b/sys/i386/i386/vm86.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/vm86.c,v 1.19.2.3 1999/08/29 16:05:57 peter Exp $
  */
 
 #include "opt_vm86.h"
diff --git a/sys/i386/i386/vm86bios.s b/sys/i386/i386/vm86bios.s
index b2d23018dc8f..e4563eaf53d7 100644
--- a/sys/i386/i386/vm86bios.s
+++ b/sys/i386/i386/vm86bios.s
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/vm86bios.s,v 1.7.2.2 1999/08/29 16:05:58 peter Exp $
  */
 
 #include "opt_vm86.h"
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index 18f717a211fe..041c66ba4f5d 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -38,7 +38,7 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.115.2.1 1999/08/29 16:05:58 peter Exp $
  */
 
 #include "npx.h"
diff --git a/sys/i386/ibcs2/Makefile b/sys/i386/ibcs2/Makefile
index f90560ee821e..ecf11cfcee21 100644
--- a/sys/i386/ibcs2/Makefile
+++ b/sys/i386/ibcs2/Makefile
@@ -1,6 +1,6 @@
 # Makefile for syscall tables
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/ibcs2/Makefile,v 1.1.4.1 1999/08/29 16:06:02 peter Exp $
 
 all:
 	@echo "make ibcs2_sysent.c, ibcs2_isc_sysent.c or ibcs2_xenix_sysent.c only"
diff --git a/sys/i386/ibcs2/coff.h b/sys/i386/ibcs2/coff.h
index a0eecd97ba95..f000df886a06 100644
--- a/sys/i386/ibcs2/coff.h
+++ b/sys/i386/ibcs2/coff.h
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/coff.h,v 1.4.4.1 1999/08/29 16:06:02 peter Exp $
  */
 
 #ifndef _COFF_H
diff --git a/sys/i386/ibcs2/ibcs2_fcntl.c b/sys/i386/ibcs2/ibcs2_fcntl.c
index 7e706befa52f..7d1bb0e46fba 100644
--- a/sys/i386/ibcs2/ibcs2_fcntl.c
+++ b/sys/i386/ibcs2/ibcs2_fcntl.c
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_fcntl.c,v 1.11.2.1 1999/08/29 16:06:03 peter Exp $
  */
 
 #include "opt_spx_hack.h"
diff --git a/sys/i386/ibcs2/ibcs2_ipc.c b/sys/i386/ibcs2/ibcs2_ipc.c
index 272ff9dfe62e..e1ea03b75ec4 100644
--- a/sys/i386/ibcs2/ibcs2_ipc.c
+++ b/sys/i386/ibcs2/ibcs2_ipc.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_ipc.c,v 1.13.2.1 1999/08/29 16:06:04 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/ibcs2/ibcs2_ipc.h b/sys/i386/ibcs2/ibcs2_ipc.h
index 29ba971be0f6..48b1c49938d6 100644
--- a/sys/i386/ibcs2/ibcs2_ipc.h
+++ b/sys/i386/ibcs2/ibcs2_ipc.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_ipc.h,v 1.3.4.1 1999/08/29 16:06:05 peter Exp $
  */
 
 
diff --git a/sys/i386/ibcs2/ibcs2_isc.c b/sys/i386/ibcs2/ibcs2_isc.c
index bc268b6ac8ea..0c83e7ac09fe 100644
--- a/sys/i386/ibcs2/ibcs2_isc.c
+++ b/sys/i386/ibcs2/ibcs2_isc.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_isc.c,v 1.11.2.1 1999/08/29 16:06:06 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c
index 721660f7cbce..ad2fc1769605 100644
--- a/sys/i386/ibcs2/ibcs2_misc.c
+++ b/sys/i386/ibcs2/ibcs2_misc.c
@@ -45,7 +45,7 @@
  *
  *	@(#)sun_misc.c	8.1 (Berkeley) 6/18/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_misc.c,v 1.30.2.1 1999/08/29 16:06:06 peter Exp $
  */
 
 /*
diff --git a/sys/i386/ibcs2/ibcs2_msg.c b/sys/i386/ibcs2/ibcs2_msg.c
index f432705a4cdc..f9660698c76b 100644
--- a/sys/i386/ibcs2/ibcs2_msg.c
+++ b/sys/i386/ibcs2/ibcs2_msg.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_msg.c,v 1.5.2.1 1999/08/29 16:06:06 peter Exp $
  */
 
 /*
diff --git a/sys/i386/ibcs2/ibcs2_other.c b/sys/i386/ibcs2/ibcs2_other.c
index 3578b3a07e5d..655d8e33c7f7 100644
--- a/sys/i386/ibcs2/ibcs2_other.c
+++ b/sys/i386/ibcs2/ibcs2_other.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_other.c,v 1.9.2.1 1999/08/29 16:06:07 peter Exp $
  */
 
 /*
diff --git a/sys/i386/ibcs2/ibcs2_poll.h b/sys/i386/ibcs2/ibcs2_poll.h
index 6bd86ced28fd..ed72bc6b6a65 100644
--- a/sys/i386/ibcs2/ibcs2_poll.h
+++ b/sys/i386/ibcs2/ibcs2_poll.h
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_poll.h,v 1.3.4.1 1999/08/29 16:06:07 peter Exp $
  */
 
 
diff --git a/sys/i386/ibcs2/ibcs2_signal.c b/sys/i386/ibcs2/ibcs2_signal.c
index 378c19aa94ac..6cb13749749f 100644
--- a/sys/i386/ibcs2/ibcs2_signal.c
+++ b/sys/i386/ibcs2/ibcs2_signal.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_signal.c,v 1.12.2.1 1999/08/29 16:06:08 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/ibcs2/ibcs2_sysvec.c b/sys/i386/ibcs2/ibcs2_sysvec.c
index 4dcc4f4f2328..921ab90627af 100644
--- a/sys/i386/ibcs2/ibcs2_sysvec.c
+++ b/sys/i386/ibcs2/ibcs2_sysvec.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_sysvec.c,v 1.13.2.2 1999/08/29 16:06:09 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/ibcs2/ibcs2_xenix.c b/sys/i386/ibcs2/ibcs2_xenix.c
index 4895418404d1..b230e2e34fd2 100644
--- a/sys/i386/ibcs2/ibcs2_xenix.c
+++ b/sys/i386/ibcs2/ibcs2_xenix.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_xenix.c,v 1.17.2.1 1999/08/29 16:06:09 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c
index 1c6dc1c28327..265637cf69d3 100644
--- a/sys/i386/ibcs2/imgact_coff.c
+++ b/sys/i386/ibcs2/imgact_coff.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/imgact_coff.c,v 1.34.2.1 1999/08/29 16:06:10 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/ibcs2/syscalls.conf b/sys/i386/ibcs2/syscalls.conf
index f000929cc5b2..3ac3a0b1b6ab 100644
--- a/sys/i386/ibcs2/syscalls.conf
+++ b/sys/i386/ibcs2/syscalls.conf
@@ -1,4 +1,4 @@
-#	syscalls.conf $FreeBSD$
+#	syscalls.conf $FreeBSD: src/sys/i386/ibcs2/syscalls.conf,v 1.5.2.1 1999/08/29 16:06:11 peter Exp $
 sysnames="/dev/null"
 sysproto="ibcs2_proto.h"
 sysproto_h=_IBCS2_SYSPROTO_H_
diff --git a/sys/i386/ibcs2/syscalls.isc b/sys/i386/ibcs2/syscalls.isc
index 883374875c56..dbe49fe33eaa 100644
--- a/sys/i386/ibcs2/syscalls.isc
+++ b/sys/i386/ibcs2/syscalls.isc
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $FreeBSD: src/sys/i386/ibcs2/syscalls.isc,v 1.4.4.1 1999/08/29 16:06:12 peter Exp $
 
 #include <sys/param.h>
 #include <sys/sysent.h>
diff --git a/sys/i386/ibcs2/syscalls.isc.conf b/sys/i386/ibcs2/syscalls.isc.conf
index b9a3e554ead5..5ec17c90db4c 100644
--- a/sys/i386/ibcs2/syscalls.isc.conf
+++ b/sys/i386/ibcs2/syscalls.isc.conf
@@ -1,4 +1,4 @@
-#	syscalls.conf $FreeBSD$
+#	syscalls.conf $FreeBSD: src/sys/i386/ibcs2/syscalls.isc.conf,v 1.4.2.1 1999/08/29 16:06:12 peter Exp $
 sysnames="/dev/null"
 #sysproto="ibcs2_isc.h"
 sysproto="/dev/null"
diff --git a/sys/i386/ibcs2/syscalls.master b/sys/i386/ibcs2/syscalls.master
index ccbdf1f86ba7..0db127f1a634 100644
--- a/sys/i386/ibcs2/syscalls.master
+++ b/sys/i386/ibcs2/syscalls.master
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.8.4.1 1999/08/29 16:06:13 peter Exp $
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; System call name/number master file (or rather, slave, from IBCS2).
diff --git a/sys/i386/ibcs2/syscalls.xenix b/sys/i386/ibcs2/syscalls.xenix
index 61182e6a34fc..9e9a094b7445 100644
--- a/sys/i386/ibcs2/syscalls.xenix
+++ b/sys/i386/ibcs2/syscalls.xenix
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $FreeBSD: src/sys/i386/ibcs2/syscalls.xenix,v 1.5.4.1 1999/08/29 16:06:13 peter Exp $
 
 #include <sys/param.h>
 #include <sys/sysent.h>
diff --git a/sys/i386/ibcs2/syscalls.xenix.conf b/sys/i386/ibcs2/syscalls.xenix.conf
index 18469ec7834c..c22c48f2bf59 100644
--- a/sys/i386/ibcs2/syscalls.xenix.conf
+++ b/sys/i386/ibcs2/syscalls.xenix.conf
@@ -1,4 +1,4 @@
-#	syscalls.conf $FreeBSD$
+#	syscalls.conf $FreeBSD: src/sys/i386/ibcs2/syscalls.xenix.conf,v 1.4.2.1 1999/08/29 16:06:14 peter Exp $
 sysnames="/dev/null"
 sysproto="ibcs2_xenix.h"
 sysproto_h=_IBCS2_XENIX_H_
diff --git a/sys/i386/include/ansi.h b/sys/i386/include/ansi.h
index 22059f1d0725..228a2dac17f2 100644
--- a/sys/i386/include/ansi.h
+++ b/sys/i386/include/ansi.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ansi.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/ansi.h,v 1.16.2.1 1999/08/29 16:06:16 peter Exp $
  */
 
 #ifndef _MACHINE_ANSI_H_
diff --git a/sys/i386/include/apic.h b/sys/i386/include/apic.h
index 38c70709e7c2..b92595898918 100644
--- a/sys/i386/include/apic.h
+++ b/sys/i386/include/apic.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/apic.h,v 1.12.2.1 1999/08/29 16:06:16 peter Exp $
  */
 
 #ifndef _MACHINE_APIC_H_
diff --git a/sys/i386/include/apm_bios.h b/sys/i386/include/apm_bios.h
index 36812a201cf4..2f1049bb7466 100644
--- a/sys/i386/include/apm_bios.h
+++ b/sys/i386/include/apm_bios.h
@@ -12,7 +12,7 @@
  *
  * Aug, 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/apm_bios.h,v 1.21.2.2 1999/08/29 16:06:17 peter Exp $
  */
 
 #ifndef	_MACHINE_APM_BIOS_H_
diff --git a/sys/i386/include/apm_segments.h b/sys/i386/include/apm_segments.h
index 9111b5cb0f09..3c06400defca 100644
--- a/sys/i386/include/apm_segments.h
+++ b/sys/i386/include/apm_segments.h
@@ -12,7 +12,7 @@
  *
  * Sep., 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/apm_segments.h,v 1.7.4.1 1999/08/29 16:06:17 peter Exp $
  */
 
 #ifndef _MACHINE_APM_SEGMENTS_H
diff --git a/sys/i386/include/asm.h b/sys/i386/include/asm.h
index 7ac124366024..ea12317f5a61 100644
--- a/sys/i386/include/asm.h
+++ b/sys/i386/include/asm.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)DEFS.h	5.1 (Berkeley) 4/23/90
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/asm.h,v 1.4.4.1 1999/08/29 16:06:18 peter Exp $
  */
 
 #ifndef _MACHINE_ASM_H_
diff --git a/sys/i386/include/asmacros.h b/sys/i386/include/asmacros.h
index 12335d0a4354..6f697c767211 100644
--- a/sys/i386/include/asmacros.h
+++ b/sys/i386/include/asmacros.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/asmacros.h,v 1.16.4.1 1999/08/29 16:06:18 peter Exp $
  */
 
 #ifndef _MACHINE_ASMACROS_H_
diff --git a/sys/i386/include/asnames.h b/sys/i386/include/asnames.h
index b47b50e42fcf..d66d06beaee6 100644
--- a/sys/i386/include/asnames.h
+++ b/sys/i386/include/asnames.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/asnames.h,v 1.26.2.6 1999/09/10 01:18:44 msmith Exp $
  */
 
 #ifndef _MACHINE_ASNAMES_H_
diff --git a/sys/i386/include/atomic.h b/sys/i386/include/atomic.h
index 5471e0cace9f..cf8f538bda59 100644
--- a/sys/i386/include/atomic.h
+++ b/sys/i386/include/atomic.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/atomic.h,v 1.1.2.2 1999/08/29 16:06:20 peter Exp $
  */
 #ifndef _MACHINE_ATOMIC_H_
 #define _MACHINE_ATOMIC_H_
diff --git a/sys/i386/include/bootinfo.h b/sys/i386/include/bootinfo.h
index b8d1af3b2c51..bae9a1299db8 100644
--- a/sys/i386/include/bootinfo.h
+++ b/sys/i386/include/bootinfo.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/bootinfo.h,v 1.12.2.1 1999/08/29 16:06:20 peter Exp $
  */
 
 #ifndef	_MACHINE_BOOTINFO_H_
diff --git a/sys/i386/include/bus.h b/sys/i386/include/bus.h
index 87206c2b3078..789463294875 100644
--- a/sys/i386/include/bus.h
+++ b/sys/i386/include/bus.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/include/bus.h,v 1.4.2.1 1999/08/29 16:06:21 peter Exp $ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
diff --git a/sys/i386/include/bus_memio.h b/sys/i386/include/bus_memio.h
index 3533a671fe8d..190a7d94f68b 100644
--- a/sys/i386/include/bus_memio.h
+++ b/sys/i386/include/bus_memio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/bus_memio.h,v 1.1.4.1 1999/08/29 16:06:21 peter Exp $
  */
 
 #ifndef _I386_BUS_MEMIO_H_
diff --git a/sys/i386/include/bus_pio.h b/sys/i386/include/bus_pio.h
index 8742dd195e0b..72b4441ab9ae 100644
--- a/sys/i386/include/bus_pio.h
+++ b/sys/i386/include/bus_pio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/bus_pio.h,v 1.1.4.1 1999/08/29 16:06:22 peter Exp $
  */
 
 #ifndef _I386_BUS_PIO_H_
diff --git a/sys/i386/include/cdk.h b/sys/i386/include/cdk.h
index 8080f2b469f2..074d2515bf8f 100644
--- a/sys/i386/include/cdk.h
+++ b/sys/i386/include/cdk.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/cdk.h,v 1.4.4.1 1999/08/29 16:06:22 peter Exp $
  */
 
 /*****************************************************************************/
diff --git a/sys/i386/include/clock.h b/sys/i386/include/clock.h
index 8d0e2d3ef20e..ef5a74488318 100644
--- a/sys/i386/include/clock.h
+++ b/sys/i386/include/clock.h
@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/clock.h,v 1.34.2.3 1999/10/31 06:04:47 iwasaki Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
diff --git a/sys/i386/include/comstats.h b/sys/i386/include/comstats.h
index 0b8fc4e0de3f..31fe5484a2ae 100644
--- a/sys/i386/include/comstats.h
+++ b/sys/i386/include/comstats.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/comstats.h,v 1.4.4.1 1999/08/29 16:06:24 peter Exp $
  */
 
 /*****************************************************************************/
diff --git a/sys/i386/include/cons.h b/sys/i386/include/cons.h
index 1f578c4cd69b..84d6e020c8ee 100644
--- a/sys/i386/include/cons.h
+++ b/sys/i386/include/cons.h
@@ -3,6 +3,6 @@
  * needs to access these functions.  In the mean time, just include the
  * header where it sits.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/cons.h,v 1.4.4.1 1999/08/29 16:06:24 peter Exp $
  */
 #include <i386/i386/cons.h>
diff --git a/sys/i386/include/console.h b/sys/i386/include/console.h
index 4585e9ba7e4a..41f06a9ed158 100644
--- a/sys/i386/include/console.h
+++ b/sys/i386/include/console.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/console.h,v 1.43.2.3 1999/08/29 16:06:25 peter Exp $
  */
 
 #ifndef	_MACHINE_CONSOLE_H_
diff --git a/sys/i386/include/cpu.h b/sys/i386/include/cpu.h
index baff33e0fa26..11923e1dede0 100644
--- a/sys/i386/include/cpu.h
+++ b/sys/i386/include/cpu.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cpu.h	5.4 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/cpu.h,v 1.36.2.2 1999/08/29 16:06:25 peter Exp $
  */
 
 #ifndef _MACHINE_CPU_H_
diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h
index 8f6a37056043..e603e7dbede3 100644
--- a/sys/i386/include/cpufunc.h
+++ b/sys/i386/include/cpufunc.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.85.2.2 1999/11/15 20:19:28 luoqi Exp $
  */
 
 /*
diff --git a/sys/i386/include/cputypes.h b/sys/i386/include/cputypes.h
index 93e01e26287d..7330fd7ca105 100644
--- a/sys/i386/include/cputypes.h
+++ b/sys/i386/include/cputypes.h
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/cputypes.h,v 1.11.2.2 1999/08/29 16:06:26 peter Exp $
  */
 
 #ifndef _MACHINE_CPUTYPES_H_
diff --git a/sys/i386/include/db_machdep.h b/sys/i386/include/db_machdep.h
index d5022d81e92d..7cc03fbb8e5e 100644
--- a/sys/i386/include/db_machdep.h
+++ b/sys/i386/include/db_machdep.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/db_machdep.h,v 1.13.4.1 1999/08/29 16:06:27 peter Exp $
  */
 
 #ifndef _MACHINE_DB_MACHDEP_H_
diff --git a/sys/i386/include/elf.h b/sys/i386/include/elf.h
index 756c08c02042..803425e8bf5d 100644
--- a/sys/i386/include/elf.h
+++ b/sys/i386/include/elf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/elf.h,v 1.5.2.3 1999/08/29 16:06:28 peter Exp $
  */
 
 #ifndef _MACHINE_ELF_H_
diff --git a/sys/i386/include/endian.h b/sys/i386/include/endian.h
index 9023c7680107..122670e8cda6 100644
--- a/sys/i386/include/endian.h
+++ b/sys/i386/include/endian.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)endian.h	7.8 (Berkeley) 4/3/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/endian.h,v 1.16.2.1 1999/08/29 16:06:28 peter Exp $
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/i386/include/exec.h b/sys/i386/include/exec.h
index c233b09655b2..c823d4ec1a93 100644
--- a/sys/i386/include/exec.h
+++ b/sys/i386/include/exec.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/exec.h,v 1.7.4.1 1999/08/29 16:06:29 peter Exp $
  */
 
 #ifndef	_EXEC_H_
diff --git a/sys/i386/include/float.h b/sys/i386/include/float.h
index 5cdbc97f7d4b..f197ea4146aa 100644
--- a/sys/i386/include/float.h
+++ b/sys/i386/include/float.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)float.h	7.1 (Berkeley) 5/8/90
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/float.h,v 1.7.4.1 1999/08/29 16:06:29 peter Exp $
  */
 
 #ifndef _MACHINE_FLOAT_H_
diff --git a/sys/i386/include/floatingpoint.h b/sys/i386/include/floatingpoint.h
index c3e674f7f30c..fd79fb69de06 100644
--- a/sys/i386/include/floatingpoint.h
+++ b/sys/i386/include/floatingpoint.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#) floatingpoint.h	1.0 (Berkeley) 9/23/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/floatingpoint.h,v 1.9.2.1 1999/08/29 16:06:29 peter Exp $
  */
 
 #ifndef _FLOATINGPOINT_H_
diff --git a/sys/i386/include/frame.h b/sys/i386/include/frame.h
index 9dd30ce3bab5..0c3d9724e919 100644
--- a/sys/i386/include/frame.h
+++ b/sys/i386/include/frame.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)frame.h	5.2 (Berkeley) 1/18/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/frame.h,v 1.15.2.1 1999/08/29 16:06:30 peter Exp $
  */
 
 #ifndef _MACHINE_FRAME_H_
diff --git a/sys/i386/include/globaldata.h b/sys/i386/include/globaldata.h
index 248ddf472259..8d2726d98382 100644
--- a/sys/i386/include/globaldata.h
+++ b/sys/i386/include/globaldata.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/globaldata.h,v 1.6.2.2 1999/08/29 16:06:30 peter Exp $
  */
 
 /*
diff --git a/sys/i386/include/i4b_cause.h b/sys/i386/include/i4b_cause.h
index f94df0f9ca1c..295731f6231d 100644
--- a/sys/i386/include/i4b_cause.h
+++ b/sys/i386/include/i4b_cause.h
@@ -27,7 +27,7 @@
  *	i4b_cause.h - causes and cause handling for i4b
  *	-----------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/i4b_cause.h,v 1.1.2.2 1999/11/15 22:14:51 joe Exp $
  *
  *      last edit-date: [Sun Feb 14 10:37:46 1999]
  *
diff --git a/sys/i386/include/i4b_debug.h b/sys/i386/include/i4b_debug.h
index e2f1ee17f583..fd876e86fa2d 100644
--- a/sys/i386/include/i4b_debug.h
+++ b/sys/i386/include/i4b_debug.h
@@ -27,7 +27,7 @@
  *	i4b_debug.h - i4b debug header file
  *	-----------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i386/include/i4b_debug.h,v 1.1.2.2 1999/11/15 22:14:51 joe Exp $ 
  *
  *      last edit-date: [Fri May 28 16:27:07 1999]
  *
diff --git a/sys/i386/include/i4b_ioctl.h b/sys/i386/include/i4b_ioctl.h
index 785379f2549c..fccc82c28a7c 100644
--- a/sys/i386/include/i4b_ioctl.h
+++ b/sys/i386/include/i4b_ioctl.h
@@ -27,7 +27,7 @@
  *	i4b_ioctl.h - messages kernel <--> userland
  *	-------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i386/include/i4b_ioctl.h,v 1.1.2.2 1999/11/15 22:14:51 joe Exp $ 
  *
  *      last edit-date: [Fri Jul 30 08:53:47 1999]
  *
diff --git a/sys/i386/include/i4b_rbch_ioctl.h b/sys/i386/include/i4b_rbch_ioctl.h
index 62d2829b8b83..01ed5d7ab350 100644
--- a/sys/i386/include/i4b_rbch_ioctl.h
+++ b/sys/i386/include/i4b_rbch_ioctl.h
@@ -27,7 +27,7 @@
  *	i4b_rbch_ioctl.h raw B-channel driver interface ioctls
  *	------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/i4b_rbch_ioctl.h,v 1.2 1999/08/28 00:44:14 peter Exp $
  *
  *      last edit-date: [Fri Jul  9 08:35:07 1999]
  *
diff --git a/sys/i386/include/i4b_tel_ioctl.h b/sys/i386/include/i4b_tel_ioctl.h
index 0f1004acae30..9ff12fdb52de 100644
--- a/sys/i386/include/i4b_tel_ioctl.h
+++ b/sys/i386/include/i4b_tel_ioctl.h
@@ -27,7 +27,7 @@
  *	i4b_tel_ioctl.h telephony interface ioctls
  *	------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i386/include/i4b_tel_ioctl.h,v 1.1.2.2 1999/11/15 22:40:08 joe Exp $ 
  *
  *      last edit-date: [Fri Jul  9 08:34:28 1999]
  *
diff --git a/sys/i386/include/i4b_trace.h b/sys/i386/include/i4b_trace.h
index 3001e6466ee8..450d3169c184 100644
--- a/sys/i386/include/i4b_trace.h
+++ b/sys/i386/include/i4b_trace.h
@@ -27,7 +27,7 @@
  *	i4b_trace.h - header file for trace data read device
  *	----------------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i386/include/i4b_trace.h,v 1.1.2.2 1999/11/15 22:40:09 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:39:26 1999]
  *
diff --git a/sys/i386/include/ieeefp.h b/sys/i386/include/ieeefp.h
index 441885413cd8..c17e6f7d31df 100644
--- a/sys/i386/include/ieeefp.h
+++ b/sys/i386/include/ieeefp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * 	from: @(#) ieeefp.h 	1.0 (Berkeley) 9/23/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/ieeefp.h,v 1.5.4.1 1999/08/29 16:06:33 peter Exp $
  */
 
 /*
diff --git a/sys/i386/include/if_wavelan_ieee.h b/sys/i386/include/if_wavelan_ieee.h
index ef5f5ae709cc..3a6f2f866ab0 100644
--- a/sys/i386/include/if_wavelan_ieee.h
+++ b/sys/i386/include/if_wavelan_ieee.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/if_wavelan_ieee.h,v 1.1.2.2 1999/08/29 16:06:33 peter Exp $
  */
 
 #ifndef _IF_WAVELAN_IEEE_H
diff --git a/sys/i386/include/if_wl_wavelan.h b/sys/i386/include/if_wl_wavelan.h
index 63c5a93f7d9b..5f8ea875d7dd 100644
--- a/sys/i386/include/if_wl_wavelan.h
+++ b/sys/i386/include/if_wl_wavelan.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/include/if_wl_wavelan.h,v 1.3.2.1 1999/08/29 16:06:33 peter Exp $ */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/i386/include/iic.h b/sys/i386/include/iic.h
index 5d362c1a2dd4..40a7450339fa 100644
--- a/sys/i386/include/iic.h
+++ b/sys/i386/include/iic.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/iic.h,v 1.2.2.1 1999/08/29 16:06:34 peter Exp $
  *
  */
 #ifndef __IIC_H
diff --git a/sys/i386/include/in_cksum.h b/sys/i386/include/in_cksum.h
index f2d9beb18993..faef6c37a76d 100644
--- a/sys/i386/include/in_cksum.h
+++ b/sys/i386/include/in_cksum.h
@@ -33,7 +33,7 @@
  *	from tahoe:	in_cksum.c	1.2	86/01/05
  *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
  *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/in_cksum.h,v 1.5.2.1 1999/08/29 16:06:34 peter Exp $
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/i386/include/ioctl_bt848.h b/sys/i386/include/ioctl_bt848.h
index 30e18d156da3..bb7664bf904c 100644
--- a/sys/i386/include/ioctl_bt848.h
+++ b/sys/i386/include/ioctl_bt848.h
@@ -1,7 +1,7 @@
 /*
  * extensions to ioctl_meteor.h for the bt848 cards
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/ioctl_bt848.h,v 1.19.2.4 1999/09/08 08:43:08 roger Exp $
  */
 
 /*
diff --git a/sys/i386/include/ioctl_ctx.h b/sys/i386/include/ioctl_ctx.h
index 8be709aea314..ffa5721b7d5a 100644
--- a/sys/i386/include/ioctl_ctx.h
+++ b/sys/i386/include/ioctl_ctx.h
@@ -7,7 +7,7 @@
  *	of this software, nor does the author assume any responsibility
  *	for damages incurred with its use
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/ioctl_ctx.h,v 1.5.4.1 1999/08/29 16:06:35 peter Exp $
  */
 
 /*
diff --git a/sys/i386/include/ioctl_fd.h b/sys/i386/include/ioctl_fd.h
index 3b4da37da238..ad8aa2b12bb1 100644
--- a/sys/i386/include/ioctl_fd.h
+++ b/sys/i386/include/ioctl_fd.h
@@ -24,7 +24,7 @@
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/ioctl_fd.h,v 1.11.4.1 1999/08/29 16:06:35 peter Exp $
  */
 
 #ifndef	_MACHINE_IOCTL_FD_H_
diff --git a/sys/i386/include/ipl.h b/sys/i386/include/ipl.h
index 42a0bdf67628..be6e3467b8d2 100644
--- a/sys/i386/include/ipl.h
+++ b/sys/i386/include/ipl.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/ipl.h,v 1.15.2.1 1999/08/29 16:06:36 peter Exp $
  */
 
 #ifndef _MACHINE_IPL_H_
diff --git a/sys/i386/include/limits.h b/sys/i386/include/limits.h
index cfaefcee4c3a..ae7d1dc8aa4b 100644
--- a/sys/i386/include/limits.h
+++ b/sys/i386/include/limits.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/limits.h,v 1.11.4.1 1999/08/29 16:06:37 peter Exp $
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/i386/include/lock.h b/sys/i386/include/lock.h
index 5a292228ddca..cfbced84303a 100644
--- a/sys/i386/include/lock.h
+++ b/sys/i386/include/lock.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/lock.h,v 1.6.2.1 1999/08/29 16:06:38 peter Exp $
  */
 
 
diff --git a/sys/i386/include/lpt.h b/sys/i386/include/lpt.h
index 56d196a62fef..9f87eec411d9 100644
--- a/sys/i386/include/lpt.h
+++ b/sys/i386/include/lpt.h
@@ -11,7 +11,7 @@
  *
  *	Geoff Rehmet, Rhodes University, South Africa <csgr@cs.ru.ac.za>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/lpt.h,v 1.6.4.1 1999/08/29 16:06:38 peter Exp $
  */
 
 #ifndef	_MACHINE_LPT_H_
diff --git a/sys/i386/include/md_var.h b/sys/i386/include/md_var.h
index 81bb6f772e5e..e2afde4a57e2 100644
--- a/sys/i386/include/md_var.h
+++ b/sys/i386/include/md_var.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/md_var.h,v 1.28.2.1 1999/08/29 16:06:39 peter Exp $
  */
 
 #ifndef _MACHINE_MD_VAR_H_
diff --git a/sys/i386/include/mouse.h b/sys/i386/include/mouse.h
index 12d49a2a5d75..c06bad156be9 100644
--- a/sys/i386/include/mouse.h
+++ b/sys/i386/include/mouse.h
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/mouse.h,v 1.11.2.2 1999/08/29 16:06:39 peter Exp $
  */
 
 #ifndef _MACHINE_MOUSE_H_
diff --git a/sys/i386/include/mpapic.h b/sys/i386/include/mpapic.h
index a0099364a99f..682619bee03f 100644
--- a/sys/i386/include/mpapic.h
+++ b/sys/i386/include/mpapic.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/mpapic.h,v 1.11.2.1 1999/08/29 16:06:40 peter Exp $
  */
 
 #ifndef _MACHINE_MPAPIC_H_
diff --git a/sys/i386/include/mtpr.h b/sys/i386/include/mtpr.h
index 679de2eed30d..b385d0153a59 100644
--- a/sys/i386/include/mtpr.h
+++ b/sys/i386/include/mtpr.h
@@ -1,4 +1,4 @@
 /*
  *	Unused in 386BSD port
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/mtpr.h,v 1.4.4.1 1999/08/29 16:06:40 peter Exp $
  */
diff --git a/sys/i386/include/npx.h b/sys/i386/include/npx.h
index 6ca6b192189c..486b2221606d 100644
--- a/sys/i386/include/npx.h
+++ b/sys/i386/include/npx.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.h	5.3 (Berkeley) 1/18/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/npx.h,v 1.14.2.1 1999/08/29 16:06:41 peter Exp $
  */
 
 /*
diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h
index fa33243cb163..e24bec171aee 100644
--- a/sys/i386/include/param.h
+++ b/sys/i386/include/param.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/param.h,v 1.48.2.1 1999/08/29 16:06:41 peter Exp $
  */
 
 #ifndef _MACHINE_PARAM_H_
diff --git a/sys/i386/include/pc/bios.h b/sys/i386/include/pc/bios.h
index 35cb978f0e8f..8d88fe4cf467 100644
--- a/sys/i386/include/pc/bios.h
+++ b/sys/i386/include/pc/bios.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/pc/bios.h,v 1.2.2.1 1999/08/29 16:07:04 peter Exp $
  */
 
 /* 
diff --git a/sys/i386/include/pc/display.h b/sys/i386/include/pc/display.h
index cd2d5ff35b73..71dda64f7f75 100644
--- a/sys/i386/include/pc/display.h
+++ b/sys/i386/include/pc/display.h
@@ -1,7 +1,7 @@
 /*
  * IBM PC display definitions
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/pc/display.h,v 1.4.4.1 1999/08/29 16:07:05 peter Exp $
  */
 
 /* Color attributes for foreground text */
diff --git a/sys/i386/include/pc/msdos.h b/sys/i386/include/pc/msdos.h
index b56bddc967dd..cfc7a02e1319 100644
--- a/sys/i386/include/pc/msdos.h
+++ b/sys/i386/include/pc/msdos.h
@@ -3,7 +3,7 @@
  * [obtained from mtools -wfj]
  * how to decipher DOS disk structures in coexisting with DOS
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/pc/msdos.h,v 1.4.4.1 1999/08/29 16:07:05 peter Exp $
  */
 
 #define MSECTOR_SIZE	512		/* MSDOS sector size in bytes */
diff --git a/sys/i386/include/pc/vesa.h b/sys/i386/include/pc/vesa.h
index 97c4a180d6f9..0ea838b0e7ea 100644
--- a/sys/i386/include/pc/vesa.h
+++ b/sys/i386/include/pc/vesa.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/pc/vesa.h,v 1.4.2.2 1999/08/29 16:07:06 peter Exp $
  */
 
 #ifndef _MACHINE_PC_VESA_H
diff --git a/sys/i386/include/pcaudioio.h b/sys/i386/include/pcaudioio.h
index 969f910f7f81..3cd10e36feca 100644
--- a/sys/i386/include/pcaudioio.h
+++ b/sys/i386/include/pcaudioio.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/pcaudioio.h,v 1.9.4.1 1999/08/29 16:06:42 peter Exp $
  */
 
 #ifndef	_MACHINE_PCAUDIOIO_H_
diff --git a/sys/i386/include/pcb.h b/sys/i386/include/pcb.h
index acce8bbb5126..9126932f2e9d 100644
--- a/sys/i386/include/pcb.h
+++ b/sys/i386/include/pcb.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pcb.h	5.10 (Berkeley) 5/12/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/pcb.h,v 1.26.2.1 1999/08/29 16:06:43 peter Exp $
  */
 
 #ifndef _I386_PCB_H_
diff --git a/sys/i386/include/pcb_ext.h b/sys/i386/include/pcb_ext.h
index 154cf949ba0b..70dbbba23949 100644
--- a/sys/i386/include/pcb_ext.h
+++ b/sys/i386/include/pcb_ext.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/pcb_ext.h,v 1.1.2.1 1999/08/29 16:06:44 peter Exp $
  */
 
 #ifndef _I386_PCB_EXT_H_
diff --git a/sys/i386/include/perfmon.h b/sys/i386/include/perfmon.h
index 7033a15f35a5..853b20742c7f 100644
--- a/sys/i386/include/perfmon.h
+++ b/sys/i386/include/perfmon.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/perfmon.h,v 1.4.4.1 1999/08/29 16:06:44 peter Exp $
  */
 
 /*
diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h
index f1ce3cfc4ac1..2151cfd430af 100644
--- a/sys/i386/include/pmap.h
+++ b/sys/i386/include/pmap.h
@@ -42,7 +42,7 @@
  *
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/pmap.h,v 1.57.2.4 1999/08/29 16:06:45 peter Exp $
  */
 
 #ifndef _MACHINE_PMAP_H_
diff --git a/sys/i386/include/proc.h b/sys/i386/include/proc.h
index f32b03f3d86e..c7a69b0a3da8 100644
--- a/sys/i386/include/proc.h
+++ b/sys/i386/include/proc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)proc.h	7.1 (Berkeley) 5/15/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/proc.h,v 1.8.4.1 1999/08/29 16:06:45 peter Exp $
  */
 
 #ifndef _MACHINE_PROC_H_
diff --git a/sys/i386/include/profile.h b/sys/i386/include/profile.h
index 1d2b6009f52e..99847345c096 100644
--- a/sys/i386/include/profile.h
+++ b/sys/i386/include/profile.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)profile.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/profile.h,v 1.18.2.1 1999/08/29 16:06:45 peter Exp $
  */
 
 #ifndef _MACHINE_PROFILE_H_
diff --git a/sys/i386/include/psl.h b/sys/i386/include/psl.h
index 6a7e233a8408..8aedb4698742 100644
--- a/sys/i386/include/psl.h
+++ b/sys/i386/include/psl.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)psl.h	5.2 (Berkeley) 1/18/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/psl.h,v 1.9.4.1 1999/08/29 16:06:46 peter Exp $
  */
 
 #ifndef _MACHINE_PSL_H_
diff --git a/sys/i386/include/ptrace.h b/sys/i386/include/ptrace.h
index ac24c0c7faa1..12548236049b 100644
--- a/sys/i386/include/ptrace.h
+++ b/sys/i386/include/ptrace.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/ptrace.h,v 1.6.2.1 1999/08/29 16:06:46 peter Exp $
  */
 
 #ifndef _MACHINE_PTRACE_H_
diff --git a/sys/i386/include/random.h b/sys/i386/include/random.h
index e084f8111d1e..715b7a650873 100644
--- a/sys/i386/include/random.h
+++ b/sys/i386/include/random.h
@@ -1,7 +1,7 @@
 /*
  * random.h -- A strong random number generator
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/random.h,v 1.16.2.1 1999/08/29 16:06:47 peter Exp $
  *
  * Version 0.95, last modified 18-Oct-95
  * 
diff --git a/sys/i386/include/reg.h b/sys/i386/include/reg.h
index 2e6f30144725..1ef8bc13b746 100644
--- a/sys/i386/include/reg.h
+++ b/sys/i386/include/reg.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)reg.h	5.5 (Berkeley) 1/18/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/reg.h,v 1.16.2.2 1999/08/29 16:06:47 peter Exp $
  */
 
 #ifndef _MACHINE_REG_H_
diff --git a/sys/i386/include/reloc.h b/sys/i386/include/reloc.h
index ef4b8dbc3e8c..8fedcc3e1409 100644
--- a/sys/i386/include/reloc.h
+++ b/sys/i386/include/reloc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)reloc.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/reloc.h,v 1.6.4.1 1999/08/29 16:06:48 peter Exp $
  */
 
 #ifndef _I386_MACHINE_RELOC_H_
diff --git a/sys/i386/include/segments.h b/sys/i386/include/segments.h
index c322e0de8589..f549c80c4b91 100644
--- a/sys/i386/include/segments.h
+++ b/sys/i386/include/segments.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)segments.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/segments.h,v 1.17.2.1 1999/08/29 16:06:48 peter Exp $
  */
 
 #ifndef _MACHINE_SEGMENTS_H_
diff --git a/sys/i386/include/setjmp.h b/sys/i386/include/setjmp.h
index 173ea2d92f8c..28f4fb83bf9e 100644
--- a/sys/i386/include/setjmp.h
+++ b/sys/i386/include/setjmp.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/include/setjmp.h,v 1.2.2.1 1999/08/29 16:06:48 peter Exp $ */
 /*
  * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
  * All rights reserved.
diff --git a/sys/i386/include/si.h b/sys/i386/include/si.h
index 29d709bb3284..3f73f5face1f 100644
--- a/sys/i386/include/si.h
+++ b/sys/i386/include/si.h
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/si.h,v 1.13.2.1 1999/08/29 16:06:49 peter Exp $
  */
 
 #include <sys/callout.h>
diff --git a/sys/i386/include/signal.h b/sys/i386/include/signal.h
index deaa06ca7923..ace0f6e6d7d6 100644
--- a/sys/i386/include/signal.h
+++ b/sys/i386/include/signal.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/signal.h,v 1.8.2.1 1999/08/29 16:06:50 peter Exp $
  */
 
 #ifndef _MACHINE_SIGNAL_H_
diff --git a/sys/i386/include/smb.h b/sys/i386/include/smb.h
index 7ed0a82f58fa..612e2a1acef7 100644
--- a/sys/i386/include/smb.h
+++ b/sys/i386/include/smb.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/smb.h,v 1.2.2.1 1999/08/29 16:06:50 peter Exp $
  *
  */
 #ifndef __SMB_H
diff --git a/sys/i386/include/smp.h b/sys/i386/include/smp.h
index cd3935ebcc48..833c0de64888 100644
--- a/sys/i386/include/smp.h
+++ b/sys/i386/include/smp.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/smp.h,v 1.44.2.2 1999/08/31 01:19:22 msmith Exp $
  *
  */
 
diff --git a/sys/i386/include/smptests.h b/sys/i386/include/smptests.h
index dd897284e234..716426c981db 100644
--- a/sys/i386/include/smptests.h
+++ b/sys/i386/include/smptests.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/smptests.h,v 1.32.2.1 1999/08/29 16:06:52 peter Exp $
  */
 
 #ifndef _MACHINE_SMPTESTS_H_
diff --git a/sys/i386/include/soundcard.h b/sys/i386/include/soundcard.h
index 6de90c9b6252..363b2fd89994 100644
--- a/sys/i386/include/soundcard.h
+++ b/sys/i386/include/soundcard.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/soundcard.h,v 1.26.2.2 1999/11/30 01:16:50 alfred Exp $
  * soundcard.h
  *
  * Copyright by Hannu Savolainen 1993
diff --git a/sys/i386/include/speaker.h b/sys/i386/include/speaker.h
index 78b55b6135e3..57164579501b 100644
--- a/sys/i386/include/speaker.h
+++ b/sys/i386/include/speaker.h
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  *      modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/speaker.h,v 1.5.4.1 1999/08/29 16:06:52 peter Exp $
  */
 
 #ifndef	_MACHINE_SPEAKER_H_
diff --git a/sys/i386/include/specialreg.h b/sys/i386/include/specialreg.h
index d95f9331f623..a267d6e93213 100644
--- a/sys/i386/include/specialreg.h
+++ b/sys/i386/include/specialreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)specialreg.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/specialreg.h,v 1.16.2.2 1999/08/31 01:19:23 msmith Exp $
  */
 
 #ifndef _MACHINE_SPECIALREG_H_
diff --git a/sys/i386/include/stdarg.h b/sys/i386/include/stdarg.h
index 341eb87a4728..2ad64c6a29fd 100644
--- a/sys/i386/include/stdarg.h
+++ b/sys/i386/include/stdarg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdarg.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/stdarg.h,v 1.9.4.1 1999/08/29 16:06:53 peter Exp $
  */
 
 #ifndef _STDARG_H_
diff --git a/sys/i386/include/sysarch.h b/sys/i386/include/sysarch.h
index 009c7810259a..f749bb20a03f 100644
--- a/sys/i386/include/sysarch.h
+++ b/sys/i386/include/sysarch.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/sysarch.h,v 1.10.2.1 1999/08/29 16:06:53 peter Exp $
  */
 
 /*
diff --git a/sys/i386/include/trap.h b/sys/i386/include/trap.h
index c21252aaeb53..ff6f8bb629e6 100644
--- a/sys/i386/include/trap.h
+++ b/sys/i386/include/trap.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.h	5.4 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/trap.h,v 1.7.4.1 1999/08/29 16:06:54 peter Exp $
  */
 
 #ifndef _MACHINE_TRAP_H_
diff --git a/sys/i386/include/tss.h b/sys/i386/include/tss.h
index 5d78b755fcb5..523c73c938b7 100644
--- a/sys/i386/include/tss.h
+++ b/sys/i386/include/tss.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)tss.h	5.4 (Berkeley) 1/18/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/tss.h,v 1.8.4.1 1999/08/29 16:06:55 peter Exp $
  */
 
 #ifndef _MACHINE_TSS_H_
diff --git a/sys/i386/include/types.h b/sys/i386/include/types.h
index e3b7c9202d0a..1d7a5cb05fe8 100644
--- a/sys/i386/include/types.h
+++ b/sys/i386/include/types.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/types.h,v 1.16.2.1 1999/08/29 16:06:55 peter Exp $
  */
 
 #ifndef _MACHINE_TYPES_H_
diff --git a/sys/i386/include/varargs.h b/sys/i386/include/varargs.h
index d1d4ed0c0906..79204c6adc86 100644
--- a/sys/i386/include/varargs.h
+++ b/sys/i386/include/varargs.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)varargs.h	8.2 (Berkeley) 3/22/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/varargs.h,v 1.7.4.1 1999/08/29 16:06:56 peter Exp $
  */
 
 #ifndef _VARARGS_H_
diff --git a/sys/i386/include/vm86.h b/sys/i386/include/vm86.h
index ffc1b65afa4c..ae5e00a542aa 100644
--- a/sys/i386/include/vm86.h
+++ b/sys/i386/include/vm86.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/vm86.h,v 1.8.2.2 1999/08/29 16:06:57 peter Exp $
  */
 
 #ifndef _MACHINE_VM86_H_
diff --git a/sys/i386/include/vmparam.h b/sys/i386/include/vmparam.h
index 0a5847dd5ff6..689fb6ecc2e5 100644
--- a/sys/i386/include/vmparam.h
+++ b/sys/i386/include/vmparam.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vmparam.h	5.9 (Berkeley) 5/12/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/vmparam.h,v 1.30.2.2 1999/08/29 16:06:58 peter Exp $
  */
 
 
diff --git a/sys/i386/include/wtio.h b/sys/i386/include/wtio.h
index 8262a01e093c..27a95c8fec69 100644
--- a/sys/i386/include/wtio.h
+++ b/sys/i386/include/wtio.h
@@ -19,7 +19,7 @@
  * This driver is derived from the old 386bsd Wangtek streamer tape driver,
  * made by Robert Baron at CMU, based on Intel sources.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/wtio.h,v 1.3.4.1 1999/08/29 16:06:58 peter Exp $
  *
  */
 
diff --git a/sys/i386/isa/README.le b/sys/i386/isa/README.le
index 74ed23c6b9d7..0d9c2b4b6fa6 100644
--- a/sys/i386/isa/README.le
+++ b/sys/i386/isa/README.le
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/i386/isa/README.le,v 1.5.2.1 1999/08/29 16:07:07 peter Exp $
 
 ----------------
 
diff --git a/sys/i386/isa/adv_isa.c b/sys/i386/isa/adv_isa.c
index 931685aa1308..c4cf6852d860 100644
--- a/sys/i386/isa/adv_isa.c
+++ b/sys/i386/isa/adv_isa.c
@@ -44,7 +44,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/adv_isa.c,v 1.8.2.2 1999/09/14 04:07:58 gibbs Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/isa/aha_isa.c b/sys/i386/isa/aha_isa.c
index a272405e6ae4..8f7936eac287 100644
--- a/sys/i386/isa/aha_isa.c
+++ b/sys/i386/isa/aha_isa.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/aha_isa.c,v 1.6.2.2 1999/09/14 04:07:59 gibbs Exp $
  */
 
 #include "pnp.h"
diff --git a/sys/i386/isa/aic6360.c b/sys/i386/isa/aic6360.c
index fbe2fde5860f..0d29d8f93e0e 100644
--- a/sys/i386/isa/aic6360.c
+++ b/sys/i386/isa/aic6360.c
@@ -32,7 +32,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/aic6360.c,v 1.43.2.1 1999/08/29 16:07:09 peter Exp $
  *
  * Acknowledgements: Many of the algorithms used in this driver are
  * inspired by the work of Julian Elischer (julian@tfs.com) and
diff --git a/sys/i386/isa/apic_ipl.h b/sys/i386/isa/apic_ipl.h
index 921802e7b597..bf9a676907c0 100644
--- a/sys/i386/isa/apic_ipl.h
+++ b/sys/i386/isa/apic_ipl.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/apic_ipl.h,v 1.2.2.1 1999/08/29 16:07:10 peter Exp $
  */
 
 #ifndef _I386_ISA_APIC_IPL_H_
diff --git a/sys/i386/isa/apic_ipl.s b/sys/i386/isa/apic_ipl.s
index 2e2c06ac9218..59e211a6815e 100644
--- a/sys/i386/isa/apic_ipl.s
+++ b/sys/i386/isa/apic_ipl.s
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/apic_ipl.s,v 1.22.2.1 1999/08/29 16:07:10 peter Exp $
  */
 
 
diff --git a/sys/i386/isa/apic_vector.s b/sys/i386/isa/apic_vector.s
index 9ee267d5d7f0..8cf13a22df88 100644
--- a/sys/i386/isa/apic_vector.s
+++ b/sys/i386/isa/apic_vector.s
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/apic_vector.s,v 1.34.2.4 1999/09/10 01:20:32 msmith Exp $
  */
 
 
diff --git a/sys/i386/isa/asc.c b/sys/i386/isa/asc.c
index 798a4085ff17..9eefcd3b4b2f 100644
--- a/sys/i386/isa/asc.c
+++ b/sys/i386/isa/asc.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/asc.c,v 1.32.2.1 1999/08/29 16:07:11 peter Exp $
  */
 
 #include "asc.h"
diff --git a/sys/i386/isa/ascreg.h b/sys/i386/isa/ascreg.h
index 9fcb9a353908..05eff892efc8 100644
--- a/sys/i386/isa/ascreg.h
+++ b/sys/i386/isa/ascreg.h
@@ -31,7 +31,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/ascreg.h,v 1.4.4.1 1999/08/29 16:07:12 peter Exp $
  */
 
     /***    Registers (base=3EB): ************/
diff --git a/sys/i386/isa/atapi-cd.c b/sys/i386/isa/atapi-cd.c
index 2d403f81cd67..50e9a36eb0bd 100644
--- a/sys/i386/isa/atapi-cd.c
+++ b/sys/i386/isa/atapi-cd.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/atapi-cd.c,v 1.7.2.2 1999/08/29 16:07:12 peter Exp $
  */
 
 #include "wdc.h"
diff --git a/sys/i386/isa/atapi-cd.h b/sys/i386/isa/atapi-cd.h
index fecd2d48cf66..6374935f677f 100644
--- a/sys/i386/isa/atapi-cd.h
+++ b/sys/i386/isa/atapi-cd.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/atapi-cd.h,v 1.2.4.1 1999/08/29 16:07:13 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/atapi.c b/sys/i386/isa/atapi.c
index ef5dcba160a9..0ebff8f2176b 100644
--- a/sys/i386/isa/atapi.c
+++ b/sys/i386/isa/atapi.c
@@ -13,7 +13,7 @@
  *
  * Version 1.9, Mon Oct  9 22:34:47 MSK 1995
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/atapi.c,v 1.30.2.3 1999/12/03 13:02:57 nyan Exp $
  */
 
 /*
diff --git a/sys/i386/isa/atkbd_isa.c b/sys/i386/isa/atkbd_isa.c
index dc4895170b48..74013fd4c157 100644
--- a/sys/i386/isa/atkbd_isa.c
+++ b/sys/i386/isa/atkbd_isa.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/atkbd_isa.c,v 1.2.2.2 1999/08/29 16:07:13 peter Exp $
  */
 
 #include "atkbd.h"
diff --git a/sys/i386/isa/atkbdc_isa.c b/sys/i386/isa/atkbdc_isa.c
index 232e054e6815..8ce0f22004a0 100644
--- a/sys/i386/isa/atkbdc_isa.c
+++ b/sys/i386/isa/atkbdc_isa.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/atkbdc_isa.c,v 1.1.2.1 1999/08/29 16:07:13 peter Exp $
  */
 
 #include "atkbdc.h"
diff --git a/sys/i386/isa/bs/bs.c b/sys/i386/isa/bs/bs.c
index fdbc8a1826a3..186200072b69 100644
--- a/sys/i386/isa/bs/bs.c
+++ b/sys/i386/isa/bs/bs.c
@@ -1,6 +1,6 @@
 /*	$NecBSD: bs.c,v 1.1 1997/07/18 09:18:59 kmatsuda Exp $	*/
 /*	$NetBSD$	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/isa/bs/bs.c,v 1.6.2.2 1999/12/03 12:00:26 nyan Exp $ */
 /*
  * [NetBSD for NEC PC98 series]
  *  Copyright (c) 1994, 1995, 1996 NetBSD/pc98 porting staff.
diff --git a/sys/i386/isa/bs/bsfunc.c b/sys/i386/isa/bs/bsfunc.c
index d4fc51c76dc9..7332e00e73a2 100644
--- a/sys/i386/isa/bs/bsfunc.c
+++ b/sys/i386/isa/bs/bsfunc.c
@@ -1,6 +1,6 @@
 /*	$NecBSD: bsfunc.c,v 1.2 1997/10/31 17:43:37 honda Exp $	*/
 /*	$NetBSD$	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/isa/bs/bsfunc.c,v 1.6.2.1 1999/12/03 12:00:26 nyan Exp $ */
 /*
  * [NetBSD for NEC PC98 series]
  *  Copyright (c) 1994, 1995, 1996 NetBSD/pc98 porting staff.
diff --git a/sys/i386/isa/bt_isa.c b/sys/i386/isa/bt_isa.c
index f26da8b49ceb..9bb6bc013d88 100644
--- a/sys/i386/isa/bt_isa.c
+++ b/sys/i386/isa/bt_isa.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/bt_isa.c,v 1.5.2.5 1999/09/15 03:12:17 jkh Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index 39a81706f118..84d176203f24 100644
--- a/sys/i386/isa/clock.c
+++ b/sys/i386/isa/clock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/clock.c,v 1.129.2.5 1999/10/31 06:04:52 iwasaki Exp $
  */
 
 /*
diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index 55edd690b951..19bbd5284f9c 100644
--- a/sys/i386/isa/ctx.c
+++ b/sys/i386/isa/ctx.c
@@ -8,7 +8,7 @@
  *	of this software, nor does the author assume any responsibility
  *	for damages incurred with its use.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/ctx.c,v 1.29.2.1 1999/08/29 16:07:15 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/ctxreg.h b/sys/i386/isa/ctxreg.h
index 55503c0a66cd..54e028d018bd 100644
--- a/sys/i386/isa/ctxreg.h
+++ b/sys/i386/isa/ctxreg.h
@@ -7,7 +7,7 @@
  *	of this software, nor does the author assume any responsibility
  *	for damages incurred with its use
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/ctxreg.h,v 1.4.4.1 1999/08/29 16:07:15 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index 34339e8cc70e..e5a616ed78a9 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/cy.c,v 1.83.2.3 1999/08/29 16:07:16 peter Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/i386/isa/cyreg.h b/sys/i386/isa/cyreg.h
index 88a36eb4a65e..c60f318b6e80 100644
--- a/sys/i386/isa/cyreg.h
+++ b/sys/i386/isa/cyreg.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/cyreg.h,v 1.8.2.1 1999/08/29 16:07:16 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/diskslice_machdep.c b/sys/i386/isa/diskslice_machdep.c
index e23a3a3e7a61..bf162a5a598a 100644
--- a/sys/i386/isa/diskslice_machdep.c
+++ b/sys/i386/isa/diskslice_machdep.c
@@ -35,7 +35,7 @@
  *
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/diskslice_machdep.c,v 1.32.2.1 1999/08/29 16:07:16 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/isa/elink.c b/sys/i386/isa/elink.c
index 11b107f3f79e..db51a0ee91f9 100644
--- a/sys/i386/isa/elink.c
+++ b/sys/i386/isa/elink.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/elink.c,v 1.9.2.1 1999/08/29 16:07:16 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/elink.h b/sys/i386/isa/elink.h
index 881b198641ce..ad0ee47754bb 100644
--- a/sys/i386/isa/elink.h
+++ b/sys/i386/isa/elink.h
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/elink.h,v 1.5.2.1 1999/08/29 16:07:17 peter Exp $
  */
 
 #ifdef PC98
diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c
index 5250f319b527..063d9901999a 100644
--- a/sys/i386/isa/fd.c
+++ b/sys/i386/isa/fd.c
@@ -47,7 +47,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/fd.c,v 1.132.2.3 1999/08/29 16:07:17 peter Exp $
  *
  */
 
diff --git a/sys/i386/isa/fdc.h b/sys/i386/isa/fdc.h
index d186196a2b12..ce6668e78351 100644
--- a/sys/i386/isa/fdc.h
+++ b/sys/i386/isa/fdc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/fdc.h,v 1.13.2.1 1999/08/29 16:07:17 peter Exp $
  *
  */
 
diff --git a/sys/i386/isa/fdreg.h b/sys/i386/isa/fdreg.h
index 7088d05da218..5e9c03c1201f 100644
--- a/sys/i386/isa/fdreg.h
+++ b/sys/i386/isa/fdreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)fdreg.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/fdreg.h,v 1.10.4.1 1999/08/29 16:07:17 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/ic/cd1400.h b/sys/i386/isa/ic/cd1400.h
index 90672c4ee7e6..dd9dcccd8207 100644
--- a/sys/i386/isa/ic/cd1400.h
+++ b/sys/i386/isa/ic/cd1400.h
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/ic/cd1400.h,v 1.5.2.1 1999/08/29 16:07:44 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/ic/esp.h b/sys/i386/isa/ic/esp.h
index 06b665b708fa..7c784d56eea3 100644
--- a/sys/i386/isa/ic/esp.h
+++ b/sys/i386/isa/ic/esp.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/ic/esp.h,v 1.5.2.1 1999/08/29 16:07:44 peter Exp $
  */
 
 #ifndef _IC_ESP_H_
diff --git a/sys/i386/isa/ic/hd64570.h b/sys/i386/isa/ic/hd64570.h
index b676e25a9cd5..6109bebc193e 100644
--- a/sys/i386/isa/ic/hd64570.h
+++ b/sys/i386/isa/ic/hd64570.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/ic/hd64570.h,v 1.5.4.1 1999/08/29 16:07:44 peter Exp $
  */
 #ifndef _HD64570_H_
 #define _HD64570_H_
diff --git a/sys/i386/isa/ic/i8042.h b/sys/i386/isa/ic/i8042.h
index 988eaa8987dd..2977710251b8 100644
--- a/sys/i386/isa/ic/i8042.h
+++ b/sys/i386/isa/ic/i8042.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/ic/i8042.h,v 1.4.4.1 1999/08/29 16:07:44 peter Exp $
  */
 
 #define	KBSTATP		0x64	/* kbd controller status port (I) */
diff --git a/sys/i386/isa/ic/i8237.h b/sys/i386/isa/ic/i8237.h
index 2bc8a08317c6..48c94b0a3a37 100644
--- a/sys/i386/isa/ic/i8237.h
+++ b/sys/i386/isa/ic/i8237.h
@@ -1,7 +1,7 @@
 /*
  * Intel 8237 DMA Controller
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/ic/i8237.h,v 1.6.4.1 1999/08/29 16:07:44 peter Exp $
  */
 
 #define	DMA37MD_SINGLE	0x40	/* single pass mode */
diff --git a/sys/i386/isa/ic/i8251.h b/sys/i386/isa/ic/i8251.h
index 6e07c11c4c56..8d8757ed3f98 100644
--- a/sys/i386/isa/ic/i8251.h
+++ b/sys/i386/isa/ic/i8251.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns16550.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/ic/i8251.h,v 1.1.6.1 1999/12/06 03:28:54 nyan Exp $
  */
 
 /*
diff --git a/sys/i386/isa/ic/i82586.h b/sys/i386/isa/ic/i82586.h
index 8de43b453fa4..e3504297e826 100644
--- a/sys/i386/isa/ic/i82586.h
+++ b/sys/i386/isa/ic/i82586.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/ic/i82586.h,v 1.7.2.1 1999/08/29 16:07:45 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/ic/lemac.h b/sys/i386/isa/ic/lemac.h
index 239741db9e40..9e4840ab4260 100644
--- a/sys/i386/isa/ic/lemac.h
+++ b/sys/i386/isa/ic/lemac.h
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/ic/lemac.h,v 1.4.4.1 1999/08/29 16:07:45 peter Exp $
  */
 #ifndef _LEMAC_H_
 #define	_LEMAC_H_
diff --git a/sys/i386/isa/ic/nec765.h b/sys/i386/isa/ic/nec765.h
index c08b73b7d600..70ae599e681f 100644
--- a/sys/i386/isa/ic/nec765.h
+++ b/sys/i386/isa/ic/nec765.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)nec765.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/ic/nec765.h,v 1.7.2.1 1999/08/29 16:07:45 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/ic/ns16550.h b/sys/i386/isa/ic/ns16550.h
index 2d93e76a554d..02420e9e82ce 100644
--- a/sys/i386/isa/ic/ns16550.h
+++ b/sys/i386/isa/ic/ns16550.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ns16550.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/ic/ns16550.h,v 1.7.2.1 1999/08/29 16:07:45 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/ic/rsa.h b/sys/i386/isa/ic/rsa.h
index 6f9376af2f23..0914f62c237a 100644
--- a/sys/i386/isa/ic/rsa.h
+++ b/sys/i386/isa/ic/rsa.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/ic/rsa.h,v 1.1.2.1 1999/08/29 16:07:45 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/ic/scd1400.h b/sys/i386/isa/ic/scd1400.h
index 272e56c9e4eb..63e8a9efce72 100644
--- a/sys/i386/isa/ic/scd1400.h
+++ b/sys/i386/isa/ic/scd1400.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/ic/scd1400.h,v 1.4.4.1 1999/08/29 16:07:45 peter Exp $
  */
 
 /*****************************************************************************/
diff --git a/sys/i386/isa/icu.h b/sys/i386/isa/icu.h
index 14e8d14aa9be..9ace3c653a26 100644
--- a/sys/i386/isa/icu.h
+++ b/sys/i386/isa/icu.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)icu.h	5.6 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/icu.h,v 1.16.2.1 1999/08/29 16:07:17 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/icu_ipl.h b/sys/i386/isa/icu_ipl.h
index cdbac2bba163..f9bfd74b4951 100644
--- a/sys/i386/isa/icu_ipl.h
+++ b/sys/i386/isa/icu_ipl.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/icu_ipl.h,v 1.2.2.1 1999/08/29 16:07:18 peter Exp $
  */
 
 #ifndef _I386_ISA_ICU_IPL_H_
diff --git a/sys/i386/isa/icu_ipl.s b/sys/i386/isa/icu_ipl.s
index 5b990e979fa6..f5b856d18e18 100644
--- a/sys/i386/isa/icu_ipl.s
+++ b/sys/i386/isa/icu_ipl.s
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/icu_ipl.s,v 1.4.2.1 1999/08/29 16:07:18 peter Exp $
  */
 
 	.data
diff --git a/sys/i386/isa/icu_vector.s b/sys/i386/isa/icu_vector.s
index deb0baccaa71..dd8b542936b4 100644
--- a/sys/i386/isa/icu_vector.s
+++ b/sys/i386/isa/icu_vector.s
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/icu_vector.s,v 1.9.2.1 1999/08/29 16:07:18 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/ida.c b/sys/i386/isa/ida.c
index d09310f5d2c3..e15555cffa30 100644
--- a/sys/i386/isa/ida.c
+++ b/sys/i386/isa/ida.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/ida.c,v 1.1.2.4 1999/10/09 03:51:19 jlemon Exp $
  *
  */
 
diff --git a/sys/i386/isa/if_ar.c b/sys/i386/isa/if_ar.c
index 1c97820f6003..11406333edce 100644
--- a/sys/i386/isa/if_ar.c
+++ b/sys/i386/isa/if_ar.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_ar.c,v 1.24.2.3 1999/12/01 19:41:36 julian Exp $
  */
 
 /*
diff --git a/sys/i386/isa/if_ar.h b/sys/i386/isa/if_ar.h
index a40ccb9dd276..c13f7a3993e9 100644
--- a/sys/i386/isa/if_ar.h
+++ b/sys/i386/isa/if_ar.h
@@ -4,7 +4,7 @@
  * Copyright (C) 1997-1999 Whistle Communications Inc.
  * All rights reserved.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_ar.h,v 1.1.2.1 1999/11/19 07:35:42 julian Exp $
  */
 
 #ifndef _I386_ISA_IF_AR_H_
diff --git a/sys/i386/isa/if_arregs.h b/sys/i386/isa/if_arregs.h
index 6c5b020908e2..adc72bfab29f 100644
--- a/sys/i386/isa/if_arregs.h
+++ b/sys/i386/isa/if_arregs.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_arregs.h,v 1.4.4.1 1999/08/29 16:07:18 peter Exp $
  */
 #ifndef _IF_ARREGS_H_
 #define _IF_ARREGS_H_
diff --git a/sys/i386/isa/if_cs.c b/sys/i386/isa/if_cs.c
index 8a8ec591d946..30010213d5d0 100644
--- a/sys/i386/isa/if_cs.c
+++ b/sys/i386/isa/if_cs.c
@@ -27,7 +27,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_cs.c,v 1.8.2.1 1999/08/29 16:07:19 peter Exp $
  *
  * Device driver for Crystal Semiconductor CS8920 based ethernet
  *   adapters. By Maxim Bolotin and Oleg Sharoiko, 27-April-1997
diff --git a/sys/i386/isa/if_csreg.h b/sys/i386/isa/if_csreg.h
index 56d9fcd595af..3d51ef9865b2 100644
--- a/sys/i386/isa/if_csreg.h
+++ b/sys/i386/isa/if_csreg.h
@@ -27,7 +27,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_csreg.h,v 1.1.4.1 1999/08/29 16:07:19 peter Exp $
  */
 
 #define PP_ChipID 0x0000	/* offset   0h -> Corp -ID              */
diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c
index 9acf27dc3b06..5671f0d04af5 100644
--- a/sys/i386/isa/if_ed.c
+++ b/sys/i386/isa/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_ed.c,v 1.148.2.4 1999/09/25 13:08:18 nyan Exp $
  */
 
 /*
diff --git a/sys/i386/isa/if_edreg.h b/sys/i386/isa/if_edreg.h
index 2d06ef5e9a03..ccac8ad82807 100644
--- a/sys/i386/isa/if_edreg.h
+++ b/sys/i386/isa/if_edreg.h
@@ -6,7 +6,7 @@
  *   of this software, nor does the author assume any responsibility
  *   for damages incurred with its use.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_edreg.h,v 1.25.2.2 1999/09/25 13:08:18 nyan Exp $
  */
 /*
  * National Semiconductor DS8390 NIC register definitions
diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c
index 6e5ae1cb1ff6..95a662f1f3e3 100644
--- a/sys/i386/isa/if_el.c
+++ b/sys/i386/isa/if_el.c
@@ -6,7 +6,7 @@
  *
  * Questions, comments, bug reports and fixes to kimmel@cs.umass.edu.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_el.c,v 1.40.2.1 1999/08/29 16:07:20 peter Exp $
  */
 /* Except of course for the portions of code lifted from other FreeBSD
  * drivers (mainly elread, elget and el_ioctl)
diff --git a/sys/i386/isa/if_elreg.h b/sys/i386/isa/if_elreg.h
index 3fb3f15a295f..35adb586baf1 100644
--- a/sys/i386/isa/if_elreg.h
+++ b/sys/i386/isa/if_elreg.h
@@ -4,7 +4,7 @@
  * of the software, derivative works or modified versions, and any
  * portions thereof.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_elreg.h,v 1.6.4.1 1999/08/29 16:07:20 peter Exp $
  */
 /* 3COM Etherlink 3C501 Register Definitions */
 
diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c
index 8feca214c34d..02288fdd7235 100644
--- a/sys/i386/isa/if_ep.c
+++ b/sys/i386/isa/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_ep.c,v 1.78.2.4 1999/11/01 03:05:14 dima Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
diff --git a/sys/i386/isa/if_epreg.h b/sys/i386/isa/if_epreg.h
index 08ff37be4fc7..fbc743834be5 100644
--- a/sys/i386/isa/if_epreg.h
+++ b/sys/i386/isa/if_epreg.h
@@ -31,7 +31,7 @@
 
  */
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_epreg.h,v 1.23.2.2 1999/08/29 16:07:20 peter Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
diff --git a/sys/i386/isa/if_ex.c b/sys/i386/isa/if_ex.c
index a57b939d11a9..0869a035d38f 100644
--- a/sys/i386/isa/if_ex.c
+++ b/sys/i386/isa/if_ex.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_ex.c,v 1.13.2.1 1999/08/29 16:07:21 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/if_fe.c b/sys/i386/isa/if_fe.c
index 3a4721c320b0..4cc9e2ec8e87 100644
--- a/sys/i386/isa/if_fe.c
+++ b/sys/i386/isa/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_fe.c,v 1.48.2.4 1999/09/01 23:56:52 nyan Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 3.x
diff --git a/sys/i386/isa/if_fereg.h b/sys/i386/isa/if_fereg.h
index 7e28201f6987..a35a3dc1b7c5 100644
--- a/sys/i386/isa/if_fereg.h
+++ b/sys/i386/isa/if_fereg.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/isa/if_fereg.h,v 1.6.2.1 1999/08/29 16:07:21 peter Exp $ */
 
 /*
  * Registers on FMV-180 series' ISA bus interface ASIC.
diff --git a/sys/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c
index 6b744e7e452b..df3479323240 100644
--- a/sys/i386/isa/if_ie.c
+++ b/sys/i386/isa/if_ie.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_ie.c,v 1.58.2.1 1999/08/29 16:07:22 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/if_ie507.h b/sys/i386/isa/if_ie507.h
index 9be1396cf49e..6324dd860992 100644
--- a/sys/i386/isa/if_ie507.h
+++ b/sys/i386/isa/if_ie507.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_ie507.h,v 1.3.4.1 1999/08/29 16:07:22 peter Exp $
  * Definitions for 3C507
  */
 
diff --git a/sys/i386/isa/if_iereg.h b/sys/i386/isa/if_iereg.h
index 875f63ca9dbb..36551f22a099 100644
--- a/sys/i386/isa/if_iereg.h
+++ b/sys/i386/isa/if_iereg.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_iereg.h,v 1.3.4.1 1999/08/29 16:07:22 peter Exp $
  * definitions for AT&T StarLAN 10 etc...
  */
 
diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c
index ff0ea8ad8379..6863773e125c 100644
--- a/sys/i386/isa/if_le.c
+++ b/sys/i386/isa/if_le.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_le.c,v 1.49.2.1 1999/08/29 16:07:22 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/if_lnc.c b/sys/i386/isa/if_lnc.c
index 3b0ee4a864f1..3f2e577b34f9 100644
--- a/sys/i386/isa/if_lnc.c
+++ b/sys/i386/isa/if_lnc.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_lnc.c,v 1.51.2.4 1999/08/29 16:07:22 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/if_lnc.h b/sys/i386/isa/if_lnc.h
index 2830a3c92ad9..9a071d483b05 100644
--- a/sys/i386/isa/if_lnc.h
+++ b/sys/i386/isa/if_lnc.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_lnc.h,v 1.9.2.2 1999/08/29 16:07:23 peter Exp $
  */
 
 #include <i386/isa/ic/Am7990.h>
diff --git a/sys/i386/isa/if_rdp.c b/sys/i386/isa/if_rdp.c
index 5bd0abf7a5cb..a9262eb97b6a 100644
--- a/sys/i386/isa/if_rdp.c
+++ b/sys/i386/isa/if_rdp.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_rdp.c,v 1.3.2.1 1999/08/29 16:07:23 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/if_rdpreg.h b/sys/i386/isa/if_rdpreg.h
index ee56e82e4963..b2e69f8e1256 100644
--- a/sys/i386/isa/if_rdpreg.h
+++ b/sys/i386/isa/if_rdpreg.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_rdpreg.h,v 1.1.1.1.2.1 1999/08/29 16:07:23 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/if_sr.c b/sys/i386/isa/if_sr.c
index a61d8d0f5724..cacb7c6fbd8e 100644
--- a/sys/i386/isa/if_sr.c
+++ b/sys/i386/isa/if_sr.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_sr.c,v 1.21.2.4 1999/12/01 19:41:37 julian Exp $
  */
 
 /*
diff --git a/sys/i386/isa/if_sr.h b/sys/i386/isa/if_sr.h
index d01a2cb35dac..7cc7acd2d358 100644
--- a/sys/i386/isa/if_sr.h
+++ b/sys/i386/isa/if_sr.h
@@ -4,7 +4,7 @@
  * Copyright (C) 1997-1999 Whistle Communications Inc.
  * All rights reserved.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_sr.h,v 1.1.2.1 1999/11/19 07:35:41 julian Exp $
  */
 
 #ifndef _I386_ISA_IF_SR_H_
diff --git a/sys/i386/isa/if_srregs.h b/sys/i386/isa/if_srregs.h
index 64d9ba11c50e..307eec76a348 100644
--- a/sys/i386/isa/if_srregs.h
+++ b/sys/i386/isa/if_srregs.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_srregs.h,v 1.4.4.1 1999/08/29 16:07:24 peter Exp $
  */
 #ifndef _IF_SRREGS_H_
 #define _IF_SRREGS_H_
diff --git a/sys/i386/isa/if_wi.c b/sys/i386/isa/if_wi.c
index 1151d7466265..4aa017791557 100644
--- a/sys/i386/isa/if_wi.c
+++ b/sys/i386/isa/if_wi.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_wi.c,v 1.5.2.4 1999/08/29 16:07:24 peter Exp $
  */
 
 /*
@@ -116,7 +116,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/i386/isa/if_wi.c,v 1.5.2.4 1999/08/29 16:07:24 peter Exp $";
 #endif
 
 static struct wi_softc wi_softc[NWI];
diff --git a/sys/i386/isa/if_wireg.h b/sys/i386/isa/if_wireg.h
index d4173273f524..72dd2e20bcf4 100644
--- a/sys/i386/isa/if_wireg.h
+++ b/sys/i386/isa/if_wireg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_wireg.h,v 1.4.2.3 1999/08/29 16:07:24 peter Exp $
  */
 
 struct wi_counters {
diff --git a/sys/i386/isa/if_wl.c b/sys/i386/isa/if_wl.c
index 01c3b3463a04..b2df2aa4af66 100644
--- a/sys/i386/isa/if_wl.c
+++ b/sys/i386/isa/if_wl.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/isa/if_wl.c,v 1.20.2.2 1999/09/16 07:35:38 roberto Exp $ */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/i386/isa/if_ze.c b/sys/i386/isa/if_ze.c
index 281cea88f79b..89e4b93640d1 100644
--- a/sys/i386/isa/if_ze.c
+++ b/sys/i386/isa/if_ze.c
@@ -47,7 +47,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_ze.c,v 1.56.2.1 1999/08/29 16:07:25 peter Exp $
  */
 
 /* XXX don't mix different PCCARD support code. */
diff --git a/sys/i386/isa/if_zp.c b/sys/i386/isa/if_zp.c
index c475290beb30..1a30c699cd15 100644
--- a/sys/i386/isa/if_zp.c
+++ b/sys/i386/isa/if_zp.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_zp.c,v 1.49.2.2 1999/08/29 16:07:25 peter Exp $
  */
 /*-
  * TODO:
diff --git a/sys/i386/isa/if_zpreg.h b/sys/i386/isa/if_zpreg.h
index b9848f7cfec3..44836041d0e2 100644
--- a/sys/i386/isa/if_zpreg.h
+++ b/sys/i386/isa/if_zpreg.h
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/if_zpreg.h,v 1.6.4.1 1999/08/29 16:07:25 peter Exp $
  */
 /**************************************************************************
  *										  *
diff --git a/sys/i386/isa/intr_machdep.c b/sys/i386/isa/intr_machdep.c
index 1c570543bb02..c9e070ceb0f5 100644
--- a/sys/i386/isa/intr_machdep.c
+++ b/sys/i386/isa/intr_machdep.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/intr_machdep.c,v 1.16.2.2 1999/08/29 16:07:25 peter Exp $
  */
 
 #include "opt_auto_eoi.h"
diff --git a/sys/i386/isa/intr_machdep.h b/sys/i386/isa/intr_machdep.h
index e8f542e095a3..64987d09799f 100644
--- a/sys/i386/isa/intr_machdep.h
+++ b/sys/i386/isa/intr_machdep.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa_device.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/intr_machdep.h,v 1.13.2.3 1999/09/02 23:56:55 msmith Exp $
  */
 
 #ifndef _I386_ISA_INTR_MACHDEP_H_
diff --git a/sys/i386/isa/ipl.s b/sys/i386/isa/ipl.s
index 01e99c772d46..310f4bd09c5e 100644
--- a/sys/i386/isa/ipl.s
+++ b/sys/i386/isa/ipl.s
@@ -36,7 +36,7 @@
  *
  *	@(#)ipl.s
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/ipl.s,v 1.24.2.1 1999/08/29 16:07:26 peter Exp $
  */
 
 
diff --git a/sys/i386/isa/ipl_funcs.c b/sys/i386/isa/ipl_funcs.c
index 46cb75cf5d1b..574c628a94e4 100644
--- a/sys/i386/isa/ipl_funcs.c
+++ b/sys/i386/isa/ipl_funcs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/ipl_funcs.c,v 1.14.2.2 1999/08/29 16:07:26 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c
index ac0235b9ddba..a33e2cf5208b 100644
--- a/sys/i386/isa/isa.c
+++ b/sys/i386/isa/isa.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/isa.c,v 1.117.2.1 1999/08/29 16:07:26 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/isa.h b/sys/i386/isa/isa.h
index cc66da9be045..285fc0435e0e 100644
--- a/sys/i386/isa/isa.h
+++ b/sys/i386/isa/isa.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/isa.h,v 1.22.2.1 1999/08/29 16:07:26 peter Exp $
  */
 
 #ifdef PC98
diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h
index aea20b696bd8..c66d580627d6 100644
--- a/sys/i386/isa/isa_device.h
+++ b/sys/i386/isa/isa_device.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa_device.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/isa_device.h,v 1.57.2.1 1999/08/29 16:07:26 peter Exp $
  */
 
 #ifndef _I386_ISA_ISA_DEVICE_H_
diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c
index 885be8214577..0e4e2c2c86b5 100644
--- a/sys/i386/isa/istallion.c
+++ b/sys/i386/isa/istallion.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/istallion.c,v 1.23.2.1 1999/08/29 16:07:27 peter Exp $
  */
 
 /*****************************************************************************/
diff --git a/sys/i386/isa/kbdtables.h b/sys/i386/isa/kbdtables.h
index 4d2468d5894e..347fbc465afb 100644
--- a/sys/i386/isa/kbdtables.h
+++ b/sys/i386/isa/kbdtables.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/kbdtables.h,v 1.42.2.1 1999/08/29 16:07:27 peter Exp $
  */
 
 #define SET8 0x80       	/* set eight bit on */
diff --git a/sys/i386/isa/loran.c b/sys/i386/isa/loran.c
index 5fbb409b53e9..97ad4ee23af6 100644
--- a/sys/i386/isa/loran.c
+++ b/sys/i386/isa/loran.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/loran.c,v 1.14.2.1 1999/08/29 16:07:27 peter Exp $
  *
  * This device-driver helps the userland controlprogram for a LORAN-C
  * receiver avoid monopolizing the CPU.
diff --git a/sys/i386/isa/lpt.c b/sys/i386/isa/lpt.c
index a6281ce10c7e..122df5ac5eed 100644
--- a/sys/i386/isa/lpt.c
+++ b/sys/i386/isa/lpt.c
@@ -46,7 +46,7 @@
  * SUCH DAMAGE.
  *
  *	from: unknown origin, 386BSD 0.1
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/lpt.c,v 1.72.2.2 1999/08/29 16:07:27 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/lptreg.h b/sys/i386/isa/lptreg.h
index 70906f0073ec..5e6b281a009a 100644
--- a/sys/i386/isa/lptreg.h
+++ b/sys/i386/isa/lptreg.h
@@ -6,7 +6,7 @@
  * William Jolitz.
  *
  *      form: @(#)lptreg.h	1.1 (Berkeley) 12/19/90
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/lptreg.h,v 1.6.4.1 1999/08/29 16:07:28 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c
index bb64ab738c3c..a4cd70eb0775 100644
--- a/sys/i386/isa/matcd/matcd.c
+++ b/sys/i386/isa/matcd/matcd.c
@@ -337,7 +337,7 @@ static char	MATCDVERSION[]="Version  1(26) 18-Oct-95";
 static char	MATCDCOPYRIGHT[] = "Matsushita CD-ROM driver, Copr. 1994,1995 Frank Durda IV";
 /*	The proceeding strings may not be changed*/
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/isa/matcd/matcd.c,v 1.37.2.1 1999/08/29 16:07:47 peter Exp $ */
 
 /*---------------------------------------------------------------------------
 	Include declarations
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index fc8eda69cf3c..a1d5b9238a8f 100644
--- a/sys/i386/isa/mcd.c
+++ b/sys/i386/isa/mcd.c
@@ -40,7 +40,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/mcd.c,v 1.101.2.1 1999/08/29 16:07:28 peter Exp $
  */
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
diff --git a/sys/i386/isa/mcdreg.h b/sys/i386/isa/mcdreg.h
index f0f75f7b2254..1dcf2686446d 100644
--- a/sys/i386/isa/mcdreg.h
+++ b/sys/i386/isa/mcdreg.h
@@ -41,7 +41,7 @@
  * the manufacturer or anyone else might provide better documentation,
  * so this file (and the driver) will then have a better quality.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/mcdreg.h,v 1.13.4.1 1999/08/29 16:07:28 peter Exp $
  */
 
 #ifndef MCD_H
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index 9edbcb7a066a..081ba2e8d7af 100644
--- a/sys/i386/isa/mse.c
+++ b/sys/i386/isa/mse.c
@@ -11,7 +11,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/mse.c,v 1.39.2.1 1999/08/29 16:07:28 peter Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index 6f5d78d571af..da8279d595d5 100644
--- a/sys/i386/isa/npx.c
+++ b/sys/i386/isa/npx.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/npx.c,v 1.65.2.1 1999/08/29 16:07:29 peter Exp $
  */
 
 #include "npx.h"
diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c
index 22ce6d8d4abb..c1e0261725ab 100644
--- a/sys/i386/isa/pcaudio.c
+++ b/sys/i386/isa/pcaudio.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/pcaudio.c,v 1.45.2.1 1999/08/29 16:07:29 peter Exp $
  */
 
 #include "pca.h"
diff --git a/sys/i386/isa/pcf.c b/sys/i386/isa/pcf.c
index 41c92b48d970..449370dd71af 100644
--- a/sys/i386/isa/pcf.c
+++ b/sys/i386/isa/pcf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/pcf.c,v 1.6.2.2 1999/08/29 16:07:29 peter Exp $
  *
  */
 #include <sys/param.h>
diff --git a/sys/i386/isa/pcibus.c b/sys/i386/isa/pcibus.c
index 51e853992fe8..a1114636dfad 100644
--- a/sys/i386/isa/pcibus.c
+++ b/sys/i386/isa/pcibus.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/pcibus.c,v 1.41.2.1 1999/08/29 16:07:29 peter Exp $
  *
  */
 
diff --git a/sys/i386/isa/pcibus.h b/sys/i386/isa/pcibus.h
index 34b3fc54aaa3..53700c868fe2 100644
--- a/sys/i386/isa/pcibus.h
+++ b/sys/i386/isa/pcibus.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/pcibus.h,v 1.1.4.1 1999/08/29 16:07:29 peter Exp $
  *
  */
 
diff --git a/sys/i386/isa/pnp.c b/sys/i386/isa/pnp.c
index 012c34b171a0..8146aefb5a6d 100644
--- a/sys/i386/isa/pnp.c
+++ b/sys/i386/isa/pnp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/pnp.c,v 1.9.2.2 1999/09/22 14:44:31 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/isa/pnp.h b/sys/i386/isa/pnp.h
index 7b6392578d92..b0642f670225 100644
--- a/sys/i386/isa/pnp.h
+++ b/sys/i386/isa/pnp.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/pnp.h,v 1.7.2.1 1999/08/29 16:07:30 peter Exp $
  */
 
 #ifndef _I386_ISA_PNP_H_
diff --git a/sys/i386/isa/ppc.c b/sys/i386/isa/ppc.c
index 6c199fb93946..8e1bf18155ab 100644
--- a/sys/i386/isa/ppc.c
+++ b/sys/i386/isa/ppc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/ppc.c,v 1.15.2.2 1999/08/29 16:07:30 peter Exp $
  *
  */
 #include "ppc.h"
diff --git a/sys/i386/isa/ppcreg.h b/sys/i386/isa/ppcreg.h
index fa185aab7cd0..df8507930901 100644
--- a/sys/i386/isa/ppcreg.h
+++ b/sys/i386/isa/ppcreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/ppcreg.h,v 1.7.2.1 1999/08/29 16:07:30 peter Exp $
  *
  */
 #ifndef __PPCREG_H
diff --git a/sys/i386/isa/prof_machdep.c b/sys/i386/isa/prof_machdep.c
index 1cce85dc04bb..72b744de42f9 100644
--- a/sys/i386/isa/prof_machdep.c
+++ b/sys/i386/isa/prof_machdep.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/prof_machdep.c,v 1.11.2.1 1999/08/29 16:07:30 peter Exp $
  */
 
 #ifdef GUPROF
diff --git a/sys/i386/isa/psm.c b/sys/i386/isa/psm.c
index be32dc6b072b..4dc48edca5b7 100644
--- a/sys/i386/isa/psm.c
+++ b/sys/i386/isa/psm.c
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/psm.c,v 1.60.2.4 1999/08/29 16:07:31 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/random_machdep.c b/sys/i386/isa/random_machdep.c
index 66a48b8ad207..b0032e8499e6 100644
--- a/sys/i386/isa/random_machdep.c
+++ b/sys/i386/isa/random_machdep.c
@@ -1,7 +1,7 @@
 /*
  * random_machdep.c -- A strong random number generator
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/random_machdep.c,v 1.29.2.1 1999/08/29 16:07:31 peter Exp $
  *
  * Version 0.95, last modified 18-Oct-95
  * 
diff --git a/sys/i386/isa/rtc.h b/sys/i386/isa/rtc.h
index 6f78657db0e1..0ac0b3185d1f 100644
--- a/sys/i386/isa/rtc.h
+++ b/sys/i386/isa/rtc.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)rtc.h	7.1 (Berkeley) 5/12/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/rtc.h,v 1.11.2.1 1999/08/29 16:07:31 peter Exp $
  */
 
 #ifndef _I386_ISA_RTC_H_
diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c
index e5c4b1128755..3950e5f5fc92 100644
--- a/sys/i386/isa/scd.c
+++ b/sys/i386/isa/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/isa/scd.c,v 1.41.2.1 1999/08/29 16:07:31 peter Exp $ */
 
 /* Please send any comments to micke@dynas.se */
 
diff --git a/sys/i386/isa/scdreg.h b/sys/i386/isa/scdreg.h
index e9ce3b15a23f..fb00787f217e 100644
--- a/sys/i386/isa/scdreg.h
+++ b/sys/i386/isa/scdreg.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/scdreg.h,v 1.4.4.1 1999/08/29 16:07:32 peter Exp $
  *
  */
 
diff --git a/sys/i386/isa/si.c b/sys/i386/isa/si.c
index 987ee6f435c4..41e7e8913964 100644
--- a/sys/i386/isa/si.c
+++ b/sys/i386/isa/si.c
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/si.c,v 1.78.2.1 1999/08/29 16:07:32 peter Exp $
  */
 
 #ifndef lint
diff --git a/sys/i386/isa/si2_z280.c b/sys/i386/isa/si2_z280.c
index 72596d49e371..abcd3f8db83e 100644
--- a/sys/i386/isa/si2_z280.c
+++ b/sys/i386/isa/si2_z280.c
@@ -25,7 +25,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/si2_z280.c,v 1.1 1998/03/23 16:12:53 peter Exp $
  */
 
 /* SI2_Z280.C Version, Bootstrap and Download Code Arrays... */
diff --git a/sys/i386/isa/si3_t225.c b/sys/i386/isa/si3_t225.c
index 4d269119c167..ce4e068ee5a4 100644
--- a/sys/i386/isa/si3_t225.c
+++ b/sys/i386/isa/si3_t225.c
@@ -25,7 +25,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/si3_t225.c,v 1.1.4.1 1999/03/31 23:57:10 nsayer Exp $
  */
 
 /* SI3_T225.C Version, Bootstrap and Download Code Arrays... */
diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c
index ef49b173cc8a..b03a0609337f 100644
--- a/sys/i386/isa/sio.c
+++ b/sys/i386/isa/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/sio.c,v 1.224.2.8 1999/10/11 15:07:18 steve Exp $
  */
 
 #include "opt_comconsole.h"
diff --git a/sys/i386/isa/sioreg.h b/sys/i386/isa/sioreg.h
index 052106525998..e4015038c50b 100644
--- a/sys/i386/isa/sioreg.h
+++ b/sys/i386/isa/sioreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)comreg.h	7.2 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/sioreg.h,v 1.11.2.1 1999/08/29 16:07:33 peter Exp $
  */
 
 
diff --git a/sys/i386/isa/sireg.h b/sys/i386/isa/sireg.h
index 711bf92e7ea0..6dc0c1ba99a2 100644
--- a/sys/i386/isa/sireg.h
+++ b/sys/i386/isa/sireg.h
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/sireg.h,v 1.6.2.2 1999/08/29 16:07:33 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/snd/sound.c b/sys/i386/isa/snd/sound.c
index b2f0c9102e3d..f73ebcad837c 100644
--- a/sys/i386/isa/snd/sound.c
+++ b/sys/i386/isa/snd/sound.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/isa/snd/sound.c,v 1.26.2.2 1999/11/30 01:16:51 alfred Exp $ */
 /*
  * snd/sound.c
  * 
diff --git a/sys/i386/isa/sound/ad1848.c b/sys/i386/isa/sound/ad1848.c
index 569585c583b7..0e4b99ed75a7 100644
--- a/sys/i386/isa/sound/ad1848.c
+++ b/sys/i386/isa/sound/ad1848.c
@@ -47,7 +47,7 @@
  * Modified: Riccardo Facchetti  24 Mar 1995 - Added the Audio Excel DSP 16
  * initialization routine.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/sound/ad1848.c,v 1.28.2.1 1999/12/01 14:18:12 nyan Exp $
  */
 
 #define DEB(x)
diff --git a/sys/i386/isa/sound/mmap_test.c b/sys/i386/isa/sound/mmap_test.c
index 8f2f5a547b98..b76c44ec4d46 100644
--- a/sys/i386/isa/sound/mmap_test.c
+++ b/sys/i386/isa/sound/mmap_test.c
@@ -15,7 +15,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/i386/isa/sound/mmap_test.c,v 1.4.2.1 1999/08/29 16:07:48 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sys/i386/isa/sound/pcm86.c b/sys/i386/isa/sound/pcm86.c
index 11cbdee02139..9afe3a711bfa 100644
--- a/sys/i386/isa/sound/pcm86.c
+++ b/sys/i386/isa/sound/pcm86.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/sound/pcm86.c,v 1.7.2.2 1999/08/29 16:07:48 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/sound/sb16_dsp.c b/sys/i386/isa/sound/sb16_dsp.c
index a9c3c34f6c05..7476298a8cb9 100644
--- a/sys/i386/isa/sound/sb16_dsp.c
+++ b/sys/i386/isa/sound/sb16_dsp.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/sound/sb16_dsp.c,v 1.31.2.1 1999/12/14 06:36:51 tanimura Exp $
  *
  */
 
diff --git a/sys/i386/isa/sound/sound.doc b/sys/i386/isa/sound/sound.doc
index 13f370275036..970e87e1da26 100644
--- a/sys/i386/isa/sound/sound.doc
+++ b/sys/i386/isa/sound/sound.doc
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/i386/isa/sound/sound.doc,v 1.11.2.1 1999/08/29 16:07:49 peter Exp $
 
 Instructions on using audio on a FreeBSD 2.1 (or 2.0-current) system.
 See also /sys/i386/conf/LINT.
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index 4c42d4605f44..194efbae5955 100644
--- a/sys/i386/isa/spkr.c
+++ b/sys/i386/isa/spkr.c
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/spkr.c,v 1.35.2.1 1999/08/29 16:07:33 peter Exp $
  */
 
 #include "speaker.h"
diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c
index 67764e697f1d..02df9c13910c 100644
--- a/sys/i386/isa/stallion.c
+++ b/sys/i386/isa/stallion.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/stallion.c,v 1.24.2.1 1999/08/29 16:07:33 peter Exp $
  */
 
 /*****************************************************************************/
diff --git a/sys/i386/isa/syscons_isa.c b/sys/i386/isa/syscons_isa.c
index 20b4ce9a164c..0aa11e6172bc 100644
--- a/sys/i386/isa/syscons_isa.c
+++ b/sys/i386/isa/syscons_isa.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/syscons_isa.c,v 1.1.2.1 1999/08/29 16:07:33 peter Exp $
  */
 
 #include "sc.h"
diff --git a/sys/i386/isa/timerreg.h b/sys/i386/isa/timerreg.h
index 0bfd7fc8cd63..3cc52d45366d 100644
--- a/sys/i386/isa/timerreg.h
+++ b/sys/i386/isa/timerreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: Header: timerreg.h,v 1.2 93/02/28 15:08:58 mccanne Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/timerreg.h,v 1.5.4.1 1999/08/29 16:07:34 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/vector.s b/sys/i386/isa/vector.s
index c10946306602..4ee5a009d4d5 100644
--- a/sys/i386/isa/vector.s
+++ b/sys/i386/isa/vector.s
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/vector.s,v 1.30.4.1 1999/08/29 16:07:34 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/vesa.c b/sys/i386/isa/vesa.c
index 04e5632ee5ba..45fcf07e28fa 100644
--- a/sys/i386/isa/vesa.c
+++ b/sys/i386/isa/vesa.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/vesa.c,v 1.15.2.8 1999/12/09 10:58:40 yokota Exp $
  */
 
 #include "vga.h"
diff --git a/sys/i386/isa/vga_isa.c b/sys/i386/isa/vga_isa.c
index 1facce980e3e..0f867400724b 100644
--- a/sys/i386/isa/vga_isa.c
+++ b/sys/i386/isa/vga_isa.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/vga_isa.c,v 1.1.2.5 1999/12/09 10:58:40 yokota Exp $
  */
 
 #include "vga.h"
diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index 9b7f79e6febb..c1cfa9cb32b6 100644
--- a/sys/i386/isa/wd.c
+++ b/sys/i386/isa/wd.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/wd.c,v 1.186.2.4 1999/08/29 16:07:34 peter Exp $
  */
 
 /* TODO:
diff --git a/sys/i386/isa/wdc_p.h b/sys/i386/isa/wdc_p.h
index 2a2133effd66..95041b1c9c5b 100644
--- a/sys/i386/isa/wdc_p.h
+++ b/sys/i386/isa/wdc_p.h
@@ -16,7 +16,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/wdc_p.h,v 1.1.6.1 1999/08/29 16:07:35 peter Exp $
  */
 
 #define Q_CMD640B	0x00000001 /* CMD640B quirk: serialize IDE channels */
diff --git a/sys/i386/isa/wdreg.h b/sys/i386/isa/wdreg.h
index d7716ae73680..8114f23f6236 100644
--- a/sys/i386/isa/wdreg.h
+++ b/sys/i386/isa/wdreg.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wdreg.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/wdreg.h,v 1.25.2.2 1999/08/29 16:07:35 peter Exp $
  */
 
 /*
diff --git a/sys/i386/isa/wfd.c b/sys/i386/isa/wfd.c
index 2fe70a803abf..5fb9b6293fa9 100644
--- a/sys/i386/isa/wfd.c
+++ b/sys/i386/isa/wfd.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/wfd.c,v 1.17.2.4 1999/11/03 07:59:28 nyan Exp $
  */
 
 /*
diff --git a/sys/i386/isa/wst.c b/sys/i386/isa/wst.c
index 10a39df8585b..59b98be64d02 100644
--- a/sys/i386/isa/wst.c
+++ b/sys/i386/isa/wst.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/wst.c,v 1.15.2.2 1999/08/29 16:07:35 peter Exp $
  */
 
 #include "wdc.h"
diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index b2602f2ec42c..2d3f11f103db 100644
--- a/sys/i386/isa/wt.c
+++ b/sys/i386/isa/wt.c
@@ -20,7 +20,7 @@
  * the original CMU copyright notice.
  *
  * Version 1.3, Thu Nov 11 12:09:13 MSK 1993
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/wt.c,v 1.47.2.1 1999/08/29 16:07:36 peter Exp $
  *
  */
 
diff --git a/sys/i386/isa/wtreg.h b/sys/i386/isa/wtreg.h
index 33f0ee478750..0ac5598ef141 100644
--- a/sys/i386/isa/wtreg.h
+++ b/sys/i386/isa/wtreg.h
@@ -19,7 +19,7 @@
  * the original CMU copyright notice.
  *
  * Version 1.3, Thu Nov 11 12:09:13 MSK 1993
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/wtreg.h,v 1.10.4.1 1999/08/29 16:07:36 peter Exp $
  *
  */
 
diff --git a/sys/i386/linux/Makefile b/sys/i386/linux/Makefile
index c062c96ec177..f2dd101aa0e5 100644
--- a/sys/i386/linux/Makefile
+++ b/sys/i386/linux/Makefile
@@ -1,6 +1,6 @@
 # Makefile for syscall tables
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/linux/Makefile,v 1.3.4.1 1999/08/29 16:07:49 peter Exp $
 
 all:
 	@echo "make linux_sysent.c only"
diff --git a/sys/i386/linux/imgact_linux.c b/sys/i386/linux/imgact_linux.c
index feb99c297837..85d524277926 100644
--- a/sys/i386/linux/imgact_linux.c
+++ b/sys/i386/linux/imgact_linux.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/linux/imgact_linux.c,v 1.31.2.1 1999/08/29 16:07:50 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h
index 14ae6c1583fc..324d077a4d0c 100644
--- a/sys/i386/linux/linux.h
+++ b/sys/i386/linux/linux.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/linux/linux.h,v 1.26.2.9 1999/12/08 18:35:30 marcel Exp $
  */
 
 #ifndef _I386_LINUX_LINUX_H_
diff --git a/sys/i386/linux/linux_dummy.c b/sys/i386/linux/linux_dummy.c
index 6b4c88966f74..9db0bfc888d7 100644
--- a/sys/i386/linux/linux_dummy.c
+++ b/sys/i386/linux/linux_dummy.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/linux/linux_dummy.c,v 1.9.2.2 1999/12/08 18:35:31 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/linux/linux_file.c b/sys/i386/linux/linux_file.c
index 4cd1bf10cf31..0acfb99c10eb 100644
--- a/sys/i386/linux/linux_file.c
+++ b/sys/i386/linux/linux_file.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/linux/linux_file.c,v 1.23.2.6 1999/12/08 18:35:31 marcel Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/i386/linux/linux_genassym.c b/sys/i386/linux/linux_genassym.c
index 022a0f9802b4..677321ae7def 100644
--- a/sys/i386/linux/linux_genassym.c
+++ b/sys/i386/linux/linux_genassym.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/linux/linux_genassym.c,v 1.8.2.1 1999/08/29 16:07:50 peter Exp $ */
 
 #include <sys/param.h>
 
diff --git a/sys/i386/linux/linux_ioctl.c b/sys/i386/linux/linux_ioctl.c
index 683c3c5f4aa3..b1091884a10b 100644
--- a/sys/i386/linux/linux_ioctl.c
+++ b/sys/i386/linux/linux_ioctl.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/linux/linux_ioctl.c,v 1.30.2.11 1999/11/30 01:17:52 alfred Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/linux/linux_ipc.c b/sys/i386/linux/linux_ipc.c
index 0428702d045e..3cc1579cc92f 100644
--- a/sys/i386/linux/linux_ipc.c
+++ b/sys/i386/linux/linux_ipc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/linux/linux_ipc.c,v 1.14.2.2 1999/12/08 18:35:32 marcel Exp $
  */
 
 
diff --git a/sys/i386/linux/linux_misc.c b/sys/i386/linux/linux_misc.c
index 5bf70435118f..73ae20701aff 100644
--- a/sys/i386/linux/linux_misc.c
+++ b/sys/i386/linux/linux_misc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/linux/linux_misc.c,v 1.51.2.8 1999/08/29 16:07:51 peter Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h
index 34ae190d6c97..431adc131740 100644
--- a/sys/i386/linux/linux_proto.h
+++ b/sys/i386/linux/linux_proto.h
@@ -2,7 +2,7 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/linux/linux_proto.h,v 1.17.2.5 1999/12/08 18:35:32 marcel Exp $
  * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.16.2.6 1999/12/08 17:34:41 marcel Exp 
  */
 
diff --git a/sys/i386/linux/linux_signal.c b/sys/i386/linux/linux_signal.c
index f69b15ef4206..9647865aa498 100644
--- a/sys/i386/linux/linux_signal.c
+++ b/sys/i386/linux/linux_signal.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/linux/linux_signal.c,v 1.14.2.3 1999/12/08 18:35:33 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/linux/linux_socket.c b/sys/i386/linux/linux_socket.c
index d29efb63d85d..ffee32b71649 100644
--- a/sys/i386/linux/linux_socket.c
+++ b/sys/i386/linux/linux_socket.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/linux/linux_socket.c,v 1.15.2.1 1999/08/29 16:07:52 peter Exp $
  */
 
 /* XXX we use functions that might not exist. */
diff --git a/sys/i386/linux/linux_stats.c b/sys/i386/linux/linux_stats.c
index f2dc0852cb22..d5f06dda41c7 100644
--- a/sys/i386/linux/linux_stats.c
+++ b/sys/i386/linux/linux_stats.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/linux/linux_stats.c,v 1.9.2.3 1999/12/08 18:35:33 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/linux/linux_syscall.h b/sys/i386/linux/linux_syscall.h
index 94304d42aad5..f294fa5442de 100644
--- a/sys/i386/linux/linux_syscall.h
+++ b/sys/i386/linux/linux_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/linux/linux_syscall.h,v 1.13.2.5 1999/12/08 18:35:34 marcel Exp $
  * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.16.2.6 1999/12/08 17:34:41 marcel Exp 
  */
 
diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c
index ac910cd615be..b6028bd23717 100644
--- a/sys/i386/linux/linux_sysent.c
+++ b/sys/i386/linux/linux_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/linux/linux_sysent.c,v 1.18.2.5 1999/12/08 18:35:34 marcel Exp $
  * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.16.2.6 1999/12/08 17:34:41 marcel Exp 
  */
 
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index 898e0f02bd09..d43687ec22cc 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/linux/linux_sysvec.c,v 1.44.2.2 1999/08/29 16:07:52 peter Exp $
  */
 
 /* XXX we use functions that might not exist. */
diff --git a/sys/i386/linux/linux_util.c b/sys/i386/linux/linux_util.c
index 7c87174089a9..4fa9586c7462 100644
--- a/sys/i386/linux/linux_util.c
+++ b/sys/i386/linux/linux_util.c
@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from: svr4_util.c,v 1.5 1995/01/22 23:44:50 christos Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/linux/linux_util.c,v 1.7.2.1 1999/08/29 16:07:52 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/linux/linux_util.h b/sys/i386/linux/linux_util.h
index 323c6adb4d0a..bbd517e7ea66 100644
--- a/sys/i386/linux/linux_util.h
+++ b/sys/i386/linux/linux_util.h
@@ -28,7 +28,7 @@
  *
  * from: svr4_util.h,v 1.5 1994/11/18 02:54:31 christos Exp
  * from: linux_util.h,v 1.2 1995/03/05 23:23:50 fvdl Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/linux/linux_util.h,v 1.7.2.2 1999/08/29 16:07:53 peter Exp $
  */
 
 /*
diff --git a/sys/i386/linux/syscalls.conf b/sys/i386/linux/syscalls.conf
index 01e258801231..fb3a1f297b89 100644
--- a/sys/i386/linux/syscalls.conf
+++ b/sys/i386/linux/syscalls.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/linux/syscalls.conf,v 1.4.2.1 1999/08/29 16:07:53 peter Exp $
 sysnames="/dev/null"
 sysproto="linux_proto.h"
 sysproto_h=_LINUX_SYSPROTO_H_
diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master
index 55057cf2fb66..c37a59c771d5 100644
--- a/sys/i386/linux/syscalls.master
+++ b/sys/i386/linux/syscalls.master
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $FreeBSD: src/sys/i386/linux/syscalls.master,v 1.16.2.6 1999/12/08 17:34:41 marcel Exp $
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; System call name/number master file (or rather, slave, from LINUX).
diff --git a/sys/i4b/MAINTAINER b/sys/i4b/MAINTAINER
index 7988a825e5f0..4bcfc3e91853 100644
--- a/sys/i4b/MAINTAINER
+++ b/sys/i4b/MAINTAINER
@@ -1,2 +1,2 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/i4b/MAINTAINER,v 1.1.2.1 1999/11/15 22:40:16 joe Exp $
 MAINTAINER = hm@freebsd.org
diff --git a/sys/i4b/driver/i4b_bsdi_ibc.c b/sys/i4b/driver/i4b_bsdi_ibc.c
index 17d90c276f16..5ff81cb6d1ba 100644
--- a/sys/i4b/driver/i4b_bsdi_ibc.c
+++ b/sys/i4b/driver/i4b_bsdi_ibc.c
@@ -30,7 +30,7 @@
  *	i4b_bsdi_ibc.c - isdn4bsd kernel BSD/OS point to point driver
  *	-------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/driver/i4b_bsdi_ibc.c,v 1.2.2.1 1999/11/15 22:40:17 joe Exp $
  *
  *	last edit-date: [Fri Apr 23 10:27:57 1999]
  *
diff --git a/sys/i4b/driver/i4b_ctl.c b/sys/i4b/driver/i4b_ctl.c
index 55d03e818b02..5fb96ccd7ce1 100644
--- a/sys/i4b/driver/i4b_ctl.c
+++ b/sys/i4b/driver/i4b_ctl.c
@@ -27,7 +27,7 @@
  *	i4b_ctl.c - i4b system control port driver
  *	------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/driver/i4b_ctl.c,v 1.2.2.2 1999/11/15 22:40:17 joe Exp $
  *
  *	last edit-date: [Tue Jun  8 09:27:15 1999]
  *
diff --git a/sys/i4b/driver/i4b_ipr.c b/sys/i4b/driver/i4b_ipr.c
index b5944513cc94..4aed96750df1 100644
--- a/sys/i4b/driver/i4b_ipr.c
+++ b/sys/i4b/driver/i4b_ipr.c
@@ -27,7 +27,7 @@
  *	i4b_ipr.c - isdn4bsd IP over raw HDLC ISDN network driver
  *	---------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/driver/i4b_ipr.c,v 1.1.2.2 1999/11/15 22:40:17 joe Exp $
  *
  *	last edit-date: [Thu Jul 22 19:46:53 1999]
  *
diff --git a/sys/i4b/driver/i4b_isppp.c b/sys/i4b/driver/i4b_isppp.c
index e3dcac43c58f..f8ad99503406 100644
--- a/sys/i4b/driver/i4b_isppp.c
+++ b/sys/i4b/driver/i4b_isppp.c
@@ -34,7 +34,7 @@
  *	the "cx" driver for Cronyx's HDLC-in-hardware device).  This driver
  *	is only the glue between sppp and i4b.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/driver/i4b_isppp.c,v 1.1.2.2 1999/11/15 22:40:17 joe Exp $
  *
  *	last edit-date: [Sat Jul 24 15:23:04 1999]
  *
diff --git a/sys/i4b/driver/i4b_rbch.c b/sys/i4b/driver/i4b_rbch.c
index aec662af552a..d2b0d3a9ccd3 100644
--- a/sys/i4b/driver/i4b_rbch.c
+++ b/sys/i4b/driver/i4b_rbch.c
@@ -27,7 +27,7 @@
  *	i4b_rbch.c - device driver for raw B channel data
  *	---------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/driver/i4b_rbch.c,v 1.1.2.3 1999/11/28 17:23:38 brian Exp $
  *
  *	last edit-date: [Fri Jul  9 09:37:02 1999]
  *
diff --git a/sys/i4b/driver/i4b_tel.c b/sys/i4b/driver/i4b_tel.c
index 12ddaf83e8b4..60a011e8caaf 100644
--- a/sys/i4b/driver/i4b_tel.c
+++ b/sys/i4b/driver/i4b_tel.c
@@ -27,7 +27,7 @@
  *	i4b_tel.c - device driver for ISDN telephony
  *	--------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/driver/i4b_tel.c,v 1.1.2.2 1999/11/15 22:40:18 joe Exp $
  *
  *	last edit-date: [Fri Jul  9 08:35:30 1999]
  *
diff --git a/sys/i4b/driver/i4b_trace.c b/sys/i4b/driver/i4b_trace.c
index 18b2f4ec3d73..3462a470c545 100644
--- a/sys/i4b/driver/i4b_trace.c
+++ b/sys/i4b/driver/i4b_trace.c
@@ -27,7 +27,7 @@
  *	i4btrc - device driver for trace data read device
  *	---------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/driver/i4b_trace.c,v 1.1.2.2 1999/11/15 22:40:18 joe Exp $
  *
  *	last edit-date: [Tue Jun  1 12:15:40 1999]
  *
diff --git a/sys/i4b/include/i4b_global.h b/sys/i4b/include/i4b_global.h
index c5c852d3348e..ce3a7b79932e 100644
--- a/sys/i4b/include/i4b_global.h
+++ b/sys/i4b/include/i4b_global.h
@@ -27,7 +27,7 @@
  *	i4b_global.h - i4b global include file
  *	--------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_global.h,v 1.1.2.2 1999/11/15 22:40:19 joe Exp $
  *
  *	last edit-date: [Mon Apr 26 11:10:26 1999]
  *
diff --git a/sys/i4b/include/i4b_isdnq931.h b/sys/i4b/include/i4b_isdnq931.h
index 0a85a7081f5b..48d244daf507 100644
--- a/sys/i4b/include/i4b_isdnq931.h
+++ b/sys/i4b/include/i4b_isdnq931.h
@@ -27,7 +27,7 @@
  *	i4b_isdnq931.h - DSS1 layer 3 message types
  *	-------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_isdnq931.h,v 1.1.2.2 1999/11/15 22:40:19 joe Exp $
  *
  *	last edit-date: [Sun Feb 14 10:04:01 1999]
  *
diff --git a/sys/i4b/include/i4b_l1l2.h b/sys/i4b/include/i4b_l1l2.h
index 4386b7b3d608..f27666fe594f 100644
--- a/sys/i4b/include/i4b_l1l2.h
+++ b/sys/i4b/include/i4b_l1l2.h
@@ -27,7 +27,7 @@
  *	i4b_l1l2.h - i4b layer 1 / layer 2 interactions
  *	---------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_l1l2.h,v 1.1.2.2 1999/11/15 22:40:19 joe Exp $
  *
  *	last edit-date: [Sun Feb 14 10:04:07 1999]
  *
diff --git a/sys/i4b/include/i4b_l2l3.h b/sys/i4b/include/i4b_l2l3.h
index 6dee953098e8..e76415406d64 100644
--- a/sys/i4b/include/i4b_l2l3.h
+++ b/sys/i4b/include/i4b_l2l3.h
@@ -27,7 +27,7 @@
  *	i4b_l2l3.h - i4b layer 2 / layer 3 interactions
  *	-----------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_l2l3.h,v 1.1.2.2 1999/11/15 22:40:20 joe Exp $
  *
  *	last edit-date: [Sun Feb 14 10:04:13 1999]
  *
diff --git a/sys/i4b/include/i4b_l3l4.h b/sys/i4b/include/i4b_l3l4.h
index 9a09838c4190..ec0ca2726dd7 100644
--- a/sys/i4b/include/i4b_l3l4.h
+++ b/sys/i4b/include/i4b_l3l4.h
@@ -27,7 +27,7 @@
  *	i4b_l3l4.h - layer 3 / layer 4 interface
  *	------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_l3l4.h,v 1.1.2.2 1999/11/15 22:40:20 joe Exp $
  *
  *	last edit-date: [Wed Mar 17 16:16:40 1999]
  *
diff --git a/sys/i4b/include/i4b_mbuf.h b/sys/i4b/include/i4b_mbuf.h
index 0604c33e94dc..6d3f05912541 100644
--- a/sys/i4b/include/i4b_mbuf.h
+++ b/sys/i4b/include/i4b_mbuf.h
@@ -27,7 +27,7 @@
  *	i4b - mbuf handling support routines
  *	--------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_mbuf.h,v 1.1.2.2 1999/11/15 22:40:20 joe Exp $
  *
  *	last edit-date: [Sun Feb 14 10:04:26 1999]
  *
diff --git a/sys/i4b/layer1/i4b_asuscom_ipac.c b/sys/i4b/layer1/i4b_asuscom_ipac.c
index 59f4211d7dd1..cd9668120ece 100644
--- a/sys/i4b/layer1/i4b_asuscom_ipac.c
+++ b/sys/i4b/layer1/i4b_asuscom_ipac.c
@@ -39,7 +39,7 @@
  *	code is modeled after Linux i4l driver written by Karsten
  *	Keil.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/i4b_asuscom_ipac.c,v 1.2.2.1 1999/11/15 22:40:21 joe Exp $
  *
  *      last edit-date: [Mon May 31 20:53:17 EEST 1999]
  *
diff --git a/sys/i4b/layer1/i4b_avm_a1.c b/sys/i4b/layer1/i4b_avm_a1.c
index 8cb1ec1a5f09..3d4c42a469a9 100644
--- a/sys/i4b/layer1/i4b_avm_a1.c
+++ b/sys/i4b/layer1/i4b_avm_a1.c
@@ -35,7 +35,7 @@
  *	i4b_avm_a1.c - AVM A1/Fritz passive card driver for isdn4bsd
  *	------------------------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer1/i4b_avm_a1.c,v 1.1.2.2 1999/11/15 22:40:21 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:25:11 1999]
  *
diff --git a/sys/i4b/layer1/i4b_avm_fritz_pci.c b/sys/i4b/layer1/i4b_avm_fritz_pci.c
index 5a25e1d19e50..83831e90fbed 100644
--- a/sys/i4b/layer1/i4b_avm_fritz_pci.c
+++ b/sys/i4b/layer1/i4b_avm_fritz_pci.c
@@ -35,7 +35,7 @@
  *	Fritz!Card PCI specific routines for isic driver
  *	------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/i4b_avm_fritz_pci.c,v 1.5.2.2 1999/12/01 23:21:12 gj Exp $
  *
  *      last edit-date: [Tue Jun  1 14:08:01 1999]
  *
diff --git a/sys/i4b/layer1/i4b_avm_fritz_pcmcia.c b/sys/i4b/layer1/i4b_avm_fritz_pcmcia.c
index 575da1abd0fc..574be2780588 100644
--- a/sys/i4b/layer1/i4b_avm_fritz_pcmcia.c
+++ b/sys/i4b/layer1/i4b_avm_fritz_pcmcia.c
@@ -33,7 +33,7 @@
  *	Fritz!Card pcmcia specific routines for isic driver
  *	---------------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer1/i4b_avm_fritz_pcmcia.c,v 1.1.2.2 1999/11/15 22:40:22 joe Exp $ 
  *
  *      last edit-date: [Sun May  2 12:01:16 1999]
  *
diff --git a/sys/i4b/layer1/i4b_avm_fritz_pnp.c b/sys/i4b/layer1/i4b_avm_fritz_pnp.c
index a411c8cb1320..0bba1e139273 100644
--- a/sys/i4b/layer1/i4b_avm_fritz_pnp.c
+++ b/sys/i4b/layer1/i4b_avm_fritz_pnp.c
@@ -38,7 +38,7 @@
  *	Fritz!Card PnP specific routines for isic driver
  *	------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/i4b_avm_fritz_pnp.c,v 1.3.2.1 1999/11/15 22:40:23 joe Exp $
  *
  *      last edit-date: [Thu 10 Jun 08:50:28 CEST 1999]
  *
diff --git a/sys/i4b/layer1/i4b_bchan.c b/sys/i4b/layer1/i4b_bchan.c
index 24f0aec4c975..51b37e8772a7 100644
--- a/sys/i4b/layer1/i4b_bchan.c
+++ b/sys/i4b/layer1/i4b_bchan.c
@@ -27,7 +27,7 @@
  *	i4b_bchan.c - B channel handling L1 procedures
  *	----------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/i4b_bchan.c,v 1.1.2.2 1999/11/15 22:40:23 joe Exp $
  *
  *      last edit-date: [Sun Feb 14 10:25:27 1999]
  *
diff --git a/sys/i4b/layer1/i4b_ctx_s0P.c b/sys/i4b/layer1/i4b_ctx_s0P.c
index a651d6bf7d84..8de9860ca643 100644
--- a/sys/i4b/layer1/i4b_ctx_s0P.c
+++ b/sys/i4b/layer1/i4b_ctx_s0P.c
@@ -27,7 +27,7 @@
  *	isic - I4B Siemens ISDN Chipset Driver for Creatix PnP cards
  *	============================================================
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer1/i4b_ctx_s0P.c,v 1.1.2.3 1999/11/22 14:08:16 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:25:33 1999]
  *
diff --git a/sys/i4b/layer1/i4b_drn_ngo.c b/sys/i4b/layer1/i4b_drn_ngo.c
index cca3a5b91277..7d159501f313 100644
--- a/sys/i4b/layer1/i4b_drn_ngo.c
+++ b/sys/i4b/layer1/i4b_drn_ngo.c
@@ -27,7 +27,7 @@
  *	i4b_drn_ngo.c - Dr. Neuhaus Niccy GO@ and SAGEM Cybermod
  *	--------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/i4b_drn_ngo.c,v 1.1.2.2 1999/11/15 22:40:24 joe Exp $
  *
  *      last edit-date: [Sun Feb 14 10:25:39 1999]
  *
diff --git a/sys/i4b/layer1/i4b_dynalink.c b/sys/i4b/layer1/i4b_dynalink.c
index 1e586ae002a4..fa4cdb75b274 100644
--- a/sys/i4b/layer1/i4b_dynalink.c
+++ b/sys/i4b/layer1/i4b_dynalink.c
@@ -33,7 +33,7 @@
  *	isdn4bsd layer1 driver for Dynalink IS64PH isdn TA
  *	==================================================
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/i4b_dynalink.c,v 1.1.2.3 1999/11/22 14:08:17 joe Exp $
  *
  *      last edit-date: [Sun Feb 14 10:26:21 1999]
  *
diff --git a/sys/i4b/layer1/i4b_elsa_isdnmc.c b/sys/i4b/layer1/i4b_elsa_isdnmc.c
index 2b43323c70d6..7617d143686f 100644
--- a/sys/i4b/layer1/i4b_elsa_isdnmc.c
+++ b/sys/i4b/layer1/i4b_elsa_isdnmc.c
@@ -33,7 +33,7 @@
  *	ELSA MicroLink ISDN/MC card specific routines
  *	---------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/i4b_elsa_isdnmc.c,v 1.1.2.2 1999/11/15 22:40:24 joe Exp $
  *
  *      last edit-date: [Sun Feb 14 10:26:25 1999]
  *
diff --git a/sys/i4b/layer1/i4b_elsa_mcall.c b/sys/i4b/layer1/i4b_elsa_mcall.c
index e1792e2e2d3d..50f7dcb9a6c7 100644
--- a/sys/i4b/layer1/i4b_elsa_mcall.c
+++ b/sys/i4b/layer1/i4b_elsa_mcall.c
@@ -33,7 +33,7 @@
  *	ELSA MicroLink MC/all card specific routines
  *	--------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/i4b_elsa_mcall.c,v 1.1.2.2 1999/11/15 22:40:24 joe Exp $
  *
  *      last edit-date: [Sun Feb 14 10:26:29 1999]
  *
diff --git a/sys/i4b/layer1/i4b_elsa_qs1i.c b/sys/i4b/layer1/i4b_elsa_qs1i.c
index 1dea51d676d6..6a782f5a29ea 100644
--- a/sys/i4b/layer1/i4b_elsa_qs1i.c
+++ b/sys/i4b/layer1/i4b_elsa_qs1i.c
@@ -27,7 +27,7 @@
  *	isic - I4B Siemens ISDN Chipset Driver for ELSA Quickstep 1000pro ISA
  *	=====================================================================
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/i4b_elsa_qs1i.c,v 1.2.2.3 1999/11/22 14:08:17 joe Exp $
  *
  *      last edit-date: [Tue Mar 16 15:42:10 1999]
  *
diff --git a/sys/i4b/layer1/i4b_elsa_qs1p.c b/sys/i4b/layer1/i4b_elsa_qs1p.c
index 3c80e68a6a70..44520436f4be 100644
--- a/sys/i4b/layer1/i4b_elsa_qs1p.c
+++ b/sys/i4b/layer1/i4b_elsa_qs1p.c
@@ -27,7 +27,7 @@
  *	isic - I4B Siemens ISDN Chipset Driver for ELSA Quickstep 1000pro PCI
  *	=====================================================================
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/i4b_elsa_qs1p.c,v 1.1.2.2 1999/11/15 22:40:25 joe Exp $
  *
  *      last edit-date: [Wed Mar 10 07:24:32 1999]
  *
diff --git a/sys/i4b/layer1/i4b_hscx.c b/sys/i4b/layer1/i4b_hscx.c
index efa1e7b6f696..ed57aeb64e77 100644
--- a/sys/i4b/layer1/i4b_hscx.c
+++ b/sys/i4b/layer1/i4b_hscx.c
@@ -27,7 +27,7 @@
  *	i4b - Siemens HSCX chip (B-channel) handling
  *	--------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer1/i4b_hscx.c,v 1.1.2.2 1999/11/15 22:40:25 joe Exp $ 
  *
  *      last edit-date: [Wed Mar 17 11:59:05 1999]
  *
diff --git a/sys/i4b/layer1/i4b_hscx.h b/sys/i4b/layer1/i4b_hscx.h
index ed4208ac4d45..ae84dbacafff 100644
--- a/sys/i4b/layer1/i4b_hscx.h
+++ b/sys/i4b/layer1/i4b_hscx.h
@@ -30,7 +30,7 @@
  *
  *---------------------------------------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer1/i4b_hscx.h,v 1.1.2.2 1999/11/15 22:40:26 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:26:56 1999]
  *
diff --git a/sys/i4b/layer1/i4b_ipac.h b/sys/i4b/layer1/i4b_ipac.h
index 4c2483e1feeb..01eb5320f378 100644
--- a/sys/i4b/layer1/i4b_ipac.h
+++ b/sys/i4b/layer1/i4b_ipac.h
@@ -27,7 +27,7 @@
  *	i4b_ipac.h - definitions for the Siemens IPAC PSB2115 chip
  *	==========================================================
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/i4b_ipac.h,v 1.1.2.2 1999/11/15 22:40:26 joe Exp $
  *
  *      last edit-date: [Tue Jun  8 09:53:26 1999]
  *
diff --git a/sys/i4b/layer1/i4b_isac.c b/sys/i4b/layer1/i4b_isac.c
index 64d20e772f57..1aa2ce1cceb9 100644
--- a/sys/i4b/layer1/i4b_isac.c
+++ b/sys/i4b/layer1/i4b_isac.c
@@ -27,7 +27,7 @@
  *	i4b_isac.c - i4b siemens isdn chipset driver ISAC handler
  *	---------------------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer1/i4b_isac.c,v 1.1.2.2 1999/11/15 22:40:26 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:27:09 1999]
  *
diff --git a/sys/i4b/layer1/i4b_isac.h b/sys/i4b/layer1/i4b_isac.h
index 82fb523ad0ac..54737e1d6629 100644
--- a/sys/i4b/layer1/i4b_isac.h
+++ b/sys/i4b/layer1/i4b_isac.h
@@ -30,7 +30,7 @@
  *
  *---------------------------------------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer1/i4b_isac.h,v 1.1.2.2 1999/11/15 22:40:26 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:27:13 1999]
  *
diff --git a/sys/i4b/layer1/i4b_isic.c b/sys/i4b/layer1/i4b_isic.c
index b1a141ed087c..29dc9b03fb9b 100644
--- a/sys/i4b/layer1/i4b_isic.c
+++ b/sys/i4b/layer1/i4b_isic.c
@@ -27,7 +27,7 @@
  *	i4b_isic.c - global isic stuff
  *	==============================
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer1/i4b_isic.c,v 1.1.2.2 1999/11/15 22:40:27 joe Exp $ 
  *
  *      last edit-date: [Mon Jul 26 10:59:56 1999]
  *
diff --git a/sys/i4b/layer1/i4b_isic_isa.c b/sys/i4b/layer1/i4b_isic_isa.c
index c240a80e8725..79de62cdb2b2 100644
--- a/sys/i4b/layer1/i4b_isic_isa.c
+++ b/sys/i4b/layer1/i4b_isic_isa.c
@@ -27,7 +27,7 @@
  *	i4b_isic_isa.c - ISA bus interface
  *	==================================
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer1/i4b_isic_isa.c,v 1.1.2.2 1999/11/15 22:40:27 joe Exp $ 
  *
  *      last edit-date: [Mon Jul 26 10:59:51 1999]
  *
diff --git a/sys/i4b/layer1/i4b_isic_pci.c b/sys/i4b/layer1/i4b_isic_pci.c
index 59ef6d77e3b7..d0fc651824c4 100644
--- a/sys/i4b/layer1/i4b_isic_pci.c
+++ b/sys/i4b/layer1/i4b_isic_pci.c
@@ -27,7 +27,7 @@
  *	i4b_isic_pci.c - PCI bus interface
  *	==================================
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/i4b_isic_pci.c,v 1.2.2.2 1999/11/15 22:40:28 joe Exp $
  *
  *      last edit-date: [Wed Apr 21 09:57:37 1999]
  *
diff --git a/sys/i4b/layer1/i4b_isic_pcmcia.c b/sys/i4b/layer1/i4b_isic_pcmcia.c
index bf32211afab6..2829b2367bf1 100644
--- a/sys/i4b/layer1/i4b_isic_pcmcia.c
+++ b/sys/i4b/layer1/i4b_isic_pcmcia.c
@@ -35,7 +35,7 @@
  *	i4b_isic_pcmcia.c - i4b FreeBSD PCMCIA support
  *	----------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/i4b_isic_pcmcia.c,v 1.3.2.2 1999/11/15 22:40:28 joe Exp $
  *
  *      last edit-date: [Mon Apr 26 10:52:57 1999]
  *
diff --git a/sys/i4b/layer1/i4b_isic_pnp.c b/sys/i4b/layer1/i4b_isic_pnp.c
index e83061a7eb42..03a967dc0d69 100644
--- a/sys/i4b/layer1/i4b_isic_pnp.c
+++ b/sys/i4b/layer1/i4b_isic_pnp.c
@@ -37,7 +37,7 @@
  *	i4b_isic_pnp.c - i4b pnp support
  *	--------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/i4b_isic_pnp.c,v 1.1.2.3 1999/11/22 13:49:39 joe Exp $
  *
  *      last edit-date: [Mon Jul  5 15:57:01 1999]
  *
diff --git a/sys/i4b/layer1/i4b_itk_ix1.c b/sys/i4b/layer1/i4b_itk_ix1.c
index 9ec4cf3c0e78..dab0841f71ed 100644
--- a/sys/i4b/layer1/i4b_itk_ix1.c
+++ b/sys/i4b/layer1/i4b_itk_ix1.c
@@ -26,7 +26,7 @@
  *	i4b_itk_ix1.c - ITK ix1 micro passive card driver for isdn4bsd
  *	--------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/i4b_itk_ix1.c,v 1.2.2.2 1999/11/15 22:40:28 joe Exp $
  *
  *      last edit-date: [Sun Feb 14 10:28:00 1999]
  *
diff --git a/sys/i4b/layer1/i4b_l1.c b/sys/i4b/layer1/i4b_l1.c
index 847bb4fbb056..73ed8e503720 100644
--- a/sys/i4b/layer1/i4b_l1.c
+++ b/sys/i4b/layer1/i4b_l1.c
@@ -27,7 +27,7 @@
  *	i4b_l1.c - isdn4bsd layer 1 handler
  *	-----------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer1/i4b_l1.c,v 1.1.2.2 1999/11/15 22:40:29 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:28:10 1999]
  *
diff --git a/sys/i4b/layer1/i4b_l1.h b/sys/i4b/layer1/i4b_l1.h
index 3bf196f9da82..2c6158a60c1f 100644
--- a/sys/i4b/layer1/i4b_l1.h
+++ b/sys/i4b/layer1/i4b_l1.h
@@ -27,7 +27,7 @@
  *	i4b_l1.h - isdn4bsd layer 1 header file
  *	---------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer1/i4b_l1.h,v 1.1.2.2 1999/11/15 22:40:29 joe Exp $ 
  *
  *      last edit-date: [Mon Jul  5 15:32:02 1999]
  *
diff --git a/sys/i4b/layer1/i4b_l1fsm.c b/sys/i4b/layer1/i4b_l1fsm.c
index 142cff3d8081..e1bebbc5426c 100644
--- a/sys/i4b/layer1/i4b_l1fsm.c
+++ b/sys/i4b/layer1/i4b_l1fsm.c
@@ -27,7 +27,7 @@
  *	i4b_l1fsm.c - isdn4bsd layer 1 I.430 state machine
  *	--------------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer1/i4b_l1fsm.c,v 1.1.2.2 1999/11/15 22:40:29 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:28:26 1999]
  *
diff --git a/sys/i4b/layer1/i4b_siemens_isurf.c b/sys/i4b/layer1/i4b_siemens_isurf.c
index ed48a66d53e6..5696c41a4d38 100644
--- a/sys/i4b/layer1/i4b_siemens_isurf.c
+++ b/sys/i4b/layer1/i4b_siemens_isurf.c
@@ -37,7 +37,7 @@
  *	Siemens I-Surf 2.0 PnP specific routines for isic driver
  *	--------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/i4b_siemens_isurf.c,v 1.2.2.1 1999/11/15 22:40:29 joe Exp $
  *
  *      last edit-date: [Mon 14 Jun 16:46:27 CEST 1999]
  *
diff --git a/sys/i4b/layer1/i4b_sws.c b/sys/i4b/layer1/i4b_sws.c
index 4759762ce769..8c107558b004 100644
--- a/sys/i4b/layer1/i4b_sws.c
+++ b/sys/i4b/layer1/i4b_sws.c
@@ -47,7 +47,7 @@
  *		EXPERIMENTAL !!!!
  *		=================
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/i4b_sws.c,v 1.1.2.2 1999/11/15 22:40:30 joe Exp $
  *
  *	last edit-date: [Sun Feb 14 10:28:31 1999]
  *
diff --git a/sys/i4b/layer1/i4b_tel_s016.c b/sys/i4b/layer1/i4b_tel_s016.c
index 3a8424985ff4..e818ebca2e5c 100644
--- a/sys/i4b/layer1/i4b_tel_s016.c
+++ b/sys/i4b/layer1/i4b_tel_s016.c
@@ -37,7 +37,7 @@
  *	isic - I4B Siemens ISDN Chipset Driver for Teles S0/16 and clones
  *	=================================================================
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer1/i4b_tel_s016.c,v 1.1.2.2 1999/11/15 22:40:30 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:28:38 1999]
  *
diff --git a/sys/i4b/layer1/i4b_tel_s0163.c b/sys/i4b/layer1/i4b_tel_s0163.c
index 0d36135ce9e3..cb48415994e4 100644
--- a/sys/i4b/layer1/i4b_tel_s0163.c
+++ b/sys/i4b/layer1/i4b_tel_s0163.c
@@ -37,7 +37,7 @@
  *	isic - I4B Siemens ISDN Chipset Driver for Teles S0/16.3
  *	========================================================
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer1/i4b_tel_s0163.c,v 1.1.2.2 1999/11/15 22:40:30 joe Exp $ 
  *
  *      last edit-date: [Mon Jul 26 10:59:38 1999]
  *
diff --git a/sys/i4b/layer1/i4b_tel_s08.c b/sys/i4b/layer1/i4b_tel_s08.c
index 7fb53e639292..6c4805b7bf0e 100644
--- a/sys/i4b/layer1/i4b_tel_s08.c
+++ b/sys/i4b/layer1/i4b_tel_s08.c
@@ -37,7 +37,7 @@
  *	isic - I4B Siemens ISDN Chipset Driver for Teles S0/8 and clones
  *	================================================================
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer1/i4b_tel_s08.c,v 1.1.2.2 1999/11/15 22:40:31 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:28:53 1999]
  *
diff --git a/sys/i4b/layer1/i4b_tel_s0P.c b/sys/i4b/layer1/i4b_tel_s0P.c
index afbc6a5ff5ff..bb8e4ba8006e 100644
--- a/sys/i4b/layer1/i4b_tel_s0P.c
+++ b/sys/i4b/layer1/i4b_tel_s0P.c
@@ -38,7 +38,7 @@
  *		EXPERIMENTAL !!!
  *		================
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer1/i4b_tel_s0P.c,v 1.1.2.2 1999/11/15 22:40:32 joe Exp $ 
  *
  *      last edit-date: [Tue Mar 16 10:39:14 1999]
  *
diff --git a/sys/i4b/layer1/i4b_usr_sti.c b/sys/i4b/layer1/i4b_usr_sti.c
index 9c58ee816ba4..df28f66acb87 100644
--- a/sys/i4b/layer1/i4b_usr_sti.c
+++ b/sys/i4b/layer1/i4b_usr_sti.c
@@ -27,7 +27,7 @@
  *	i4b_usr_sti.c - USRobotics Sportster ISDN TA intern (Tina-pp)
  *	-------------------------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer1/i4b_usr_sti.c,v 1.1.2.2 1999/11/15 22:40:32 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:29:05 1999]
  *
diff --git a/sys/i4b/layer1/isa_isic.c b/sys/i4b/layer1/isa_isic.c
index c89bb5d2572c..bedc5766eb52 100644
--- a/sys/i4b/layer1/isa_isic.c
+++ b/sys/i4b/layer1/isa_isic.c
@@ -33,7 +33,7 @@
  *	isa_isic.c - ISA bus frontend for i4b_isic driver
  *	--------------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer1/isa_isic.c,v 1.1.2.2 1999/11/15 22:40:32 joe Exp $ 
  *
  *      last edit-date: [Mon Jul 19 16:39:02 1999]
  *
diff --git a/sys/i4b/layer1/isapnp_isic.c b/sys/i4b/layer1/isapnp_isic.c
index a72189b73dff..964c829591cd 100644
--- a/sys/i4b/layer1/isapnp_isic.c
+++ b/sys/i4b/layer1/isapnp_isic.c
@@ -33,7 +33,7 @@
  *	isapnp_isic.c - ISA-P&P bus frontend for i4b_isic driver
  *	--------------------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer1/isapnp_isic.c,v 1.1.2.2 1999/11/15 22:40:32 joe Exp $ 
  *
  *      last edit-date: [Sun May  2 11:57:08 1999]
  *
diff --git a/sys/i4b/layer1/isic_supio.c b/sys/i4b/layer1/isic_supio.c
index 709dbcee4f03..1f9ffe5a36e1 100644
--- a/sys/i4b/layer1/isic_supio.c
+++ b/sys/i4b/layer1/isic_supio.c
@@ -38,7 +38,7 @@
  *	But we attach to the supio, so just see "isic" or "isicII".
  *	-----------------------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer1/isic_supio.c,v 1.1.2.2 1999/11/15 22:40:33 joe Exp $ 
  *
  *      last edit-date: [Mon Mar 22 22:49:20 MET 1999]
  *
diff --git a/sys/i4b/layer1/pci_isic.c b/sys/i4b/layer1/pci_isic.c
index a339c2a289be..c4d8a6f9ce57 100644
--- a/sys/i4b/layer1/pci_isic.c
+++ b/sys/i4b/layer1/pci_isic.c
@@ -33,7 +33,7 @@
  *	pci_isic.c - pcmcia bus frontend for i4b_isic driver
  *	-------------------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer1/pci_isic.c,v 1.1.2.2 1999/11/15 22:40:33 joe Exp $ 
  *
  *      last edit-date: [Wed Mar 10 07:22:08 1999]
  *
diff --git a/sys/i4b/layer1/pci_isic.h b/sys/i4b/layer1/pci_isic.h
index a19025c8aaf0..25075755d1c5 100644
--- a/sys/i4b/layer1/pci_isic.h
+++ b/sys/i4b/layer1/pci_isic.h
@@ -33,7 +33,7 @@
  *	pci_isic.h - pci bus frontend for i4b_isic driver
  *	-------------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer1/pci_isic.h,v 1.3.2.1 1999/11/15 22:40:33 joe Exp $ 
  *
  *      last edit-date: [Wed Mar 10 07:22:08 1999]
  *
diff --git a/sys/i4b/layer1/pcmcia_isic.c b/sys/i4b/layer1/pcmcia_isic.c
index d4e0f8ec6c09..be436713f082 100644
--- a/sys/i4b/layer1/pcmcia_isic.c
+++ b/sys/i4b/layer1/pcmcia_isic.c
@@ -33,7 +33,7 @@
  *	pcmcia_isic.c - pcmcia bus frontend for i4b_isic driver
  *	-------------------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer1/pcmcia_isic.c,v 1.1.2.2 1999/11/15 22:40:34 joe Exp $ 
  *
  *      last edit-date: [Tue Apr 20 14:09:16 1999]
  *
diff --git a/sys/i4b/layer1/pcmcia_isic.h b/sys/i4b/layer1/pcmcia_isic.h
index c5426bde0c87..dc0dc7b366c1 100644
--- a/sys/i4b/layer1/pcmcia_isic.h
+++ b/sys/i4b/layer1/pcmcia_isic.h
@@ -33,7 +33,7 @@
  *	pcmcia_isic.h - common definitions for pcmcia isic cards
  *	--------------------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer1/pcmcia_isic.h,v 1.1.2.2 1999/11/15 22:40:34 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:29:33 1999]
  *
diff --git a/sys/i4b/layer2/i4b_iframe.c b/sys/i4b/layer2/i4b_iframe.c
index a043d851340f..e5e688da53e8 100644
--- a/sys/i4b/layer2/i4b_iframe.c
+++ b/sys/i4b/layer2/i4b_iframe.c
@@ -27,7 +27,7 @@
  *	i4b_iframe.c - i frame handling routines
  *	------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer2/i4b_iframe.c,v 1.1.2.2 1999/11/15 22:40:36 joe Exp $ 
  *
  *      last edit-date: [Fri May 28 15:52:41 1999]
  *
diff --git a/sys/i4b/layer2/i4b_l2.c b/sys/i4b/layer2/i4b_l2.c
index cee25ab9bbb6..008adf99e22e 100644
--- a/sys/i4b/layer2/i4b_l2.c
+++ b/sys/i4b/layer2/i4b_l2.c
@@ -27,7 +27,7 @@
  *      i4b_l2.c - ISDN layer 2 (Q.921)
  *	-------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer2/i4b_l2.c,v 1.1.2.2 1999/11/15 22:40:36 joe Exp $ 
  *
  *      last edit-date: [Fri May 28 16:15:39 1999]
  *
diff --git a/sys/i4b/layer2/i4b_l2.h b/sys/i4b/layer2/i4b_l2.h
index 0b838b0fd29d..dd52865c8566 100644
--- a/sys/i4b/layer2/i4b_l2.h
+++ b/sys/i4b/layer2/i4b_l2.h
@@ -27,7 +27,7 @@
  *	i4b_l2.h - ISDN layer 2 (Q.921) definitions
  *	---------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer2/i4b_l2.h,v 1.1.2.2 1999/11/15 22:40:36 joe Exp $ 
  *
  *      last edit-date: [Fri May 28 15:51:17 1999]
  *
diff --git a/sys/i4b/layer2/i4b_l2fsm.c b/sys/i4b/layer2/i4b_l2fsm.c
index 051c5b2a064d..afa81df8304a 100644
--- a/sys/i4b/layer2/i4b_l2fsm.c
+++ b/sys/i4b/layer2/i4b_l2fsm.c
@@ -27,7 +27,7 @@
  *	i4b_l2fsm.c - layer 2 FSM
  *	-------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer2/i4b_l2fsm.c,v 1.1.2.2 1999/11/15 22:40:37 joe Exp $ 
  *
  *      last edit-date: [Tue Mar 16 16:27:12 1999]
  *
diff --git a/sys/i4b/layer2/i4b_l2fsm.h b/sys/i4b/layer2/i4b_l2fsm.h
index ae3f6def3aa5..da58cf922cb1 100644
--- a/sys/i4b/layer2/i4b_l2fsm.h
+++ b/sys/i4b/layer2/i4b_l2fsm.h
@@ -27,7 +27,7 @@
  *      i4b_l2fsm.h - layer 2 FSM
  *      -------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer2/i4b_l2fsm.h,v 1.1.2.2 1999/11/15 22:40:37 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:31:43 1999]
  *
diff --git a/sys/i4b/layer2/i4b_l2timer.c b/sys/i4b/layer2/i4b_l2timer.c
index 50ace65d6caf..dd067bd56456 100644
--- a/sys/i4b/layer2/i4b_l2timer.c
+++ b/sys/i4b/layer2/i4b_l2timer.c
@@ -27,7 +27,7 @@
  *	i4b_l2timer.c - layer 2 timer handling
  *	--------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer2/i4b_l2timer.c,v 1.1.2.2 1999/11/15 22:40:37 joe Exp $ 
  *
  *      last edit-date: [Wed Apr 21 09:17:58 1999]
  *
diff --git a/sys/i4b/layer2/i4b_lme.c b/sys/i4b/layer2/i4b_lme.c
index cdfddee41cb1..d69e5f865a58 100644
--- a/sys/i4b/layer2/i4b_lme.c
+++ b/sys/i4b/layer2/i4b_lme.c
@@ -27,7 +27,7 @@
  *	i4b_lme.c - layer management entity
  *	-------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer2/i4b_lme.c,v 1.1.2.2 1999/11/15 22:40:38 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:31:55 1999]
  *
diff --git a/sys/i4b/layer2/i4b_mbuf.c b/sys/i4b/layer2/i4b_mbuf.c
index 21b12bb6eb25..5943676d507c 100644
--- a/sys/i4b/layer2/i4b_mbuf.c
+++ b/sys/i4b/layer2/i4b_mbuf.c
@@ -27,7 +27,7 @@
  *	i4b - mbuf handling support routines
  *	------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer2/i4b_mbuf.c,v 1.1.2.2 1999/11/15 22:40:38 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:32:00 1999]
  *
diff --git a/sys/i4b/layer2/i4b_sframe.c b/sys/i4b/layer2/i4b_sframe.c
index 309d952e36e8..89479b321407 100644
--- a/sys/i4b/layer2/i4b_sframe.c
+++ b/sys/i4b/layer2/i4b_sframe.c
@@ -27,7 +27,7 @@
  *	i4b_sframe.c - s frame handling routines
  *	----------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer2/i4b_sframe.c,v 1.1.2.2 1999/11/15 22:40:38 joe Exp $ 
  *
  *      last edit-date: [Fri May 28 16:14:04 1999]
  *
diff --git a/sys/i4b/layer2/i4b_tei.c b/sys/i4b/layer2/i4b_tei.c
index 1ca81aa84b5e..b49c6ed4ea14 100644
--- a/sys/i4b/layer2/i4b_tei.c
+++ b/sys/i4b/layer2/i4b_tei.c
@@ -27,7 +27,7 @@
  *	i4b_tei.c - tei handling procedures
  *	-----------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer2/i4b_tei.c,v 1.1.2.2 1999/11/15 22:40:38 joe Exp $ 
  *
  *      last edit-date: [Fri May 28 16:14:14 1999]
  *
diff --git a/sys/i4b/layer2/i4b_uframe.c b/sys/i4b/layer2/i4b_uframe.c
index 127bb303ce36..9747d7e8d8df 100644
--- a/sys/i4b/layer2/i4b_uframe.c
+++ b/sys/i4b/layer2/i4b_uframe.c
@@ -27,7 +27,7 @@
  *	i4b_uframe.c - routines for handling U-frames
  *	-----------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer2/i4b_uframe.c,v 1.1.2.2 1999/11/15 22:40:39 joe Exp $ 
  *
  *      last edit-date: [Fri May 28 16:14:32 1999]
  *
diff --git a/sys/i4b/layer2/i4b_util.c b/sys/i4b/layer2/i4b_util.c
index 32666672aff1..fb769f05fd70 100644
--- a/sys/i4b/layer2/i4b_util.c
+++ b/sys/i4b/layer2/i4b_util.c
@@ -27,7 +27,7 @@
  *	i4b_util.c - layer 2 utility routines
  *	-------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer2/i4b_util.c,v 1.1.2.2 1999/11/15 22:40:39 joe Exp $ 
  *
  *      last edit-date: [Thu Apr 15 10:47:52 1999]
  *
diff --git a/sys/i4b/layer3/i4b_l2if.c b/sys/i4b/layer3/i4b_l2if.c
index f5e3d320e79d..b06d98ad8725 100644
--- a/sys/i4b/layer3/i4b_l2if.c
+++ b/sys/i4b/layer3/i4b_l2if.c
@@ -27,7 +27,7 @@
  *	i4b_l2if.c - Layer 3 interface to Layer 2
  *	-------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer3/i4b_l2if.c,v 1.1.2.2 1999/11/15 22:40:40 joe Exp $ 
  *
  *      last edit-date: [Tue May 25 11:55:15 1999]
  *
diff --git a/sys/i4b/layer3/i4b_l3.h b/sys/i4b/layer3/i4b_l3.h
index 32e6d806b8e9..8076687bb35e 100644
--- a/sys/i4b/layer3/i4b_l3.h
+++ b/sys/i4b/layer3/i4b_l3.h
@@ -27,7 +27,7 @@
  *	i4b_l3.h - layer 3 header file
  *	------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer3/i4b_l3.h,v 1.1.2.2 1999/11/15 22:40:41 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:33:19 1999]
  *
diff --git a/sys/i4b/layer3/i4b_l3fsm.c b/sys/i4b/layer3/i4b_l3fsm.c
index 6bc0e671458e..be9f3a76d81d 100644
--- a/sys/i4b/layer3/i4b_l3fsm.c
+++ b/sys/i4b/layer3/i4b_l3fsm.c
@@ -27,7 +27,7 @@
  *	i4b_l3fsm.c - layer 3 FSM
  *	-------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer3/i4b_l3fsm.c,v 1.1.2.2 1999/11/15 22:40:41 joe Exp $ 
  *
  *      last edit-date: [Wed Apr 21 09:42:26 1999]
  *
diff --git a/sys/i4b/layer3/i4b_l3fsm.h b/sys/i4b/layer3/i4b_l3fsm.h
index 3b46875e8ae4..ad8f09d17975 100644
--- a/sys/i4b/layer3/i4b_l3fsm.h
+++ b/sys/i4b/layer3/i4b_l3fsm.h
@@ -27,7 +27,7 @@
  *      i4b_l3fsm.c - layer 3 FSM
  *      -------------------------
  * 
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer3/i4b_l3fsm.h,v 1.1.2.2 1999/11/15 22:40:41 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:33:31 1999]
  *
diff --git a/sys/i4b/layer3/i4b_l3timer.c b/sys/i4b/layer3/i4b_l3timer.c
index 70c916d3a0aa..27e3146acc3a 100644
--- a/sys/i4b/layer3/i4b_l3timer.c
+++ b/sys/i4b/layer3/i4b_l3timer.c
@@ -27,7 +27,7 @@
  *	i4b_l3timer.c - timer and timeout handling for layer 3
  *	------------------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer3/i4b_l3timer.c,v 1.1.2.2 1999/11/15 22:40:41 joe Exp $ 
  *
  *      last edit-date: [Wed Apr 21 09:46:59 1999]
  *
diff --git a/sys/i4b/layer3/i4b_l4if.c b/sys/i4b/layer3/i4b_l4if.c
index fa6ea162b650..8795d988c71e 100644
--- a/sys/i4b/layer3/i4b_l4if.c
+++ b/sys/i4b/layer3/i4b_l4if.c
@@ -27,7 +27,7 @@
  *	i4b_l4if.c - Layer 3 interface to Layer 4
  *	-------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer3/i4b_l4if.c,v 1.1.2.2 1999/11/15 22:40:42 joe Exp $ 
  *
  *      last edit-date: [Tue Apr 27 16:46:51 1999]
  *
diff --git a/sys/i4b/layer3/i4b_q931.c b/sys/i4b/layer3/i4b_q931.c
index cc6d9040c58c..1c461508c0c2 100644
--- a/sys/i4b/layer3/i4b_q931.c
+++ b/sys/i4b/layer3/i4b_q931.c
@@ -27,7 +27,7 @@
  *	i4b_q931.c - Q931 received messages handling
  *	--------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer3/i4b_q931.c,v 1.1.2.2 1999/11/15 22:40:42 joe Exp $ 
  *
  *      last edit-date: [Tue Apr 27 12:04:35 1999]
  *
diff --git a/sys/i4b/layer3/i4b_q931.h b/sys/i4b/layer3/i4b_q931.h
index 376d5ffb91ef..169c8f14226e 100644
--- a/sys/i4b/layer3/i4b_q931.h
+++ b/sys/i4b/layer3/i4b_q931.h
@@ -27,7 +27,7 @@
  *	i4b_q931.h - Q931 handling header file
  *	--------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer3/i4b_q931.h,v 1.1.2.2 1999/11/15 22:40:42 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:33:56 1999]
  *
diff --git a/sys/i4b/layer3/i4b_q932fac.c b/sys/i4b/layer3/i4b_q932fac.c
index e180b9d24970..87b74fb66e06 100644
--- a/sys/i4b/layer3/i4b_q932fac.c
+++ b/sys/i4b/layer3/i4b_q932fac.c
@@ -27,7 +27,7 @@
  *	i4b_q932fac.c - Q932 facility handling
  *	--------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer3/i4b_q932fac.c,v 1.1.2.2 1999/11/15 22:40:42 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:34:02 1999]
  *
diff --git a/sys/i4b/layer3/i4b_q932fac.h b/sys/i4b/layer3/i4b_q932fac.h
index 4e745ea4a733..a4c5411f2f20 100644
--- a/sys/i4b/layer3/i4b_q932fac.h
+++ b/sys/i4b/layer3/i4b_q932fac.h
@@ -27,7 +27,7 @@
  *	i4b_q932fac.h - Q932 facility handling header file
  *	--------------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer3/i4b_q932fac.h,v 1.1.2.2 1999/11/15 22:40:43 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:34:08 1999]
  *
diff --git a/sys/i4b/layer4/i4b_i4bdrv.c b/sys/i4b/layer4/i4b_i4bdrv.c
index dafbf44fd5ee..dfe0c485c51d 100644
--- a/sys/i4b/layer4/i4b_i4bdrv.c
+++ b/sys/i4b/layer4/i4b_i4bdrv.c
@@ -27,7 +27,7 @@
  *	i4b_i4bdrv.c - i4b userland interface driver
  *	--------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer4/i4b_i4bdrv.c,v 1.2.2.2 1999/11/15 22:40:44 joe Exp $ 
  *
  *      last edit-date: [Tue Jun  8 19:48:16 1999]
  *
diff --git a/sys/i4b/layer4/i4b_l4.c b/sys/i4b/layer4/i4b_l4.c
index 60cf4dc34123..a0f6c5cb2ca5 100644
--- a/sys/i4b/layer4/i4b_l4.c
+++ b/sys/i4b/layer4/i4b_l4.c
@@ -27,7 +27,7 @@
  *	i4b_l4.c - kernel interface to userland
  *	-----------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer4/i4b_l4.c,v 1.1.2.2 1999/11/15 22:40:44 joe Exp $ 
  *
  *      last edit-date: [Thu Apr  8 17:31:52 1999]
  *
diff --git a/sys/i4b/layer4/i4b_l4.h b/sys/i4b/layer4/i4b_l4.h
index 0225137d6fee..29aa03433d58 100644
--- a/sys/i4b/layer4/i4b_l4.h
+++ b/sys/i4b/layer4/i4b_l4.h
@@ -27,7 +27,7 @@
  *	i4b_l4.h - kernel interface to userland header file
  *	---------------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer4/i4b_l4.h,v 1.1.2.2 1999/11/15 22:40:45 joe Exp $ 
  *
  *      last edit-date: [Wed Mar 17 16:20:10 1999]
  *
diff --git a/sys/i4b/layer4/i4b_l4mgmt.c b/sys/i4b/layer4/i4b_l4mgmt.c
index aff1ecaee74e..ddf43be35e58 100644
--- a/sys/i4b/layer4/i4b_l4mgmt.c
+++ b/sys/i4b/layer4/i4b_l4mgmt.c
@@ -27,7 +27,7 @@
  *	i4b_l4mgmt.c - layer 4 calldescriptor management utilites
  *	-----------------------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer4/i4b_l4mgmt.c,v 1.1.2.2 1999/11/15 22:40:45 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:35:13 1999]
  *
diff --git a/sys/i4b/layer4/i4b_l4timer.c b/sys/i4b/layer4/i4b_l4timer.c
index fefb25d3f2a9..f5918023ae7f 100644
--- a/sys/i4b/layer4/i4b_l4timer.c
+++ b/sys/i4b/layer4/i4b_l4timer.c
@@ -27,7 +27,7 @@
  *	i4b_l4timer.c - timer and timeout handling for layer 4
  *	--------------------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/i4b/layer4/i4b_l4timer.c,v 1.1.2.2 1999/11/15 22:40:45 joe Exp $ 
  *
  *      last edit-date: [Wed Apr 21 09:49:08 1999]
  *
diff --git a/sys/i4b/tina-dd/i4b_tina_dd.c b/sys/i4b/tina-dd/i4b_tina_dd.c
index 5ec784c228b4..91002b1ac217 100644
--- a/sys/i4b/tina-dd/i4b_tina_dd.c
+++ b/sys/i4b/tina-dd/i4b_tina_dd.c
@@ -28,7 +28,7 @@
  *	i4b_tina_dd.c - i4b Stollman Tina-dd control device driver
  *	----------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/tina-dd/i4b_tina_dd.c,v 1.2.2.2 1999/11/15 22:40:46 joe Exp $
  *
  *	last edit-date: [Sat Dec  5 18:41:38 1998]
  *
diff --git a/sys/i4b/tina-dd/i4b_tina_ioctl.h b/sys/i4b/tina-dd/i4b_tina_ioctl.h
index ec422f0b1df6..921bf94b1911 100644
--- a/sys/i4b/tina-dd/i4b_tina_ioctl.h
+++ b/sys/i4b/tina-dd/i4b_tina_ioctl.h
@@ -31,7 +31,7 @@
  *	i4b_tina_ioctl.h - i4b Stollman Tina-dd ioctl header file
  *	---------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/tina-dd/i4b_tina_ioctl.h,v 1.1.2.1 1999/08/29 16:25:44 peter Exp $
  *
  *	last edit-date: [Sat Dec  5 18:41:51 1998]
  *
diff --git a/sys/isa/atkbd_isa.c b/sys/isa/atkbd_isa.c
index 9c0157f391a5..49388438ed39 100644
--- a/sys/isa/atkbd_isa.c
+++ b/sys/isa/atkbd_isa.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/isa/atkbd_isa.c,v 1.3.2.3 1999/08/29 16:25:44 peter Exp $
  */
 
 #include "atkbd.h"
diff --git a/sys/isa/atkbdc_isa.c b/sys/isa/atkbdc_isa.c
index 3100bed789c8..f6c3812d2db3 100644
--- a/sys/isa/atkbdc_isa.c
+++ b/sys/isa/atkbdc_isa.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/isa/atkbdc_isa.c,v 1.2.2.2 1999/08/29 16:25:44 peter Exp $
  */
 
 #include "atkbdc.h"
diff --git a/sys/isa/ic/esp.h b/sys/isa/ic/esp.h
index a381ee7d22aa..241980bbc66d 100644
--- a/sys/isa/ic/esp.h
+++ b/sys/isa/ic/esp.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/isa/ic/esp.h,v 1.3.2.1 1999/08/29 16:25:48 peter Exp $
  */
 
 #ifndef _IC_ESP_H_
diff --git a/sys/isa/ic/ns16550.h b/sys/isa/ic/ns16550.h
index e8fad7da832e..6a196000c2ac 100644
--- a/sys/isa/ic/ns16550.h
+++ b/sys/isa/ic/ns16550.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ns16550.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/isa/ic/ns16550.h,v 1.5.2.1 1999/08/29 16:25:49 peter Exp $
  */
 
 /*
diff --git a/sys/isa/isareg.h b/sys/isa/isareg.h
index cc66da9be045..00a27360443c 100644
--- a/sys/isa/isareg.h
+++ b/sys/isa/isareg.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/isa/isareg.h,v 1.2.2.1 1999/08/29 16:25:45 peter Exp $
  */
 
 #ifdef PC98
diff --git a/sys/isa/isavar.h b/sys/isa/isavar.h
index 42a8f852eca0..5463cc002d52 100644
--- a/sys/isa/isavar.h
+++ b/sys/isa/isavar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/isa/isavar.h,v 1.2.2.1 1999/08/29 16:25:45 peter Exp $
  */
 
 #define	ISA_NPORT_IVARS	2
diff --git a/sys/isa/psm.c b/sys/isa/psm.c
index e2eeef1058e9..7d80d7db9773 100644
--- a/sys/isa/psm.c
+++ b/sys/isa/psm.c
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/isa/psm.c,v 1.2.2.5 1999/08/29 16:25:46 peter Exp $
  */
 
 /*
diff --git a/sys/isa/sio.c b/sys/isa/sio.c
index f4151b9b3af5..67d9462eb1a5 100644
--- a/sys/isa/sio.c
+++ b/sys/isa/sio.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/isa/sio.c,v 1.220.2.3 1999/10/11 15:07:21 steve Exp $
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
  *	from: i386/isa sio.c,v 1.215
  */
diff --git a/sys/isa/sioreg.h b/sys/isa/sioreg.h
index 59b68036686a..16973e19f80d 100644
--- a/sys/isa/sioreg.h
+++ b/sys/isa/sioreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)comreg.h	7.2 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/isa/sioreg.h,v 1.11.2.1 1999/08/29 16:25:47 peter Exp $
  */
 
 
diff --git a/sys/isa/syscons_isa.c b/sys/isa/syscons_isa.c
index 082697c379c6..060fc03b3a37 100644
--- a/sys/isa/syscons_isa.c
+++ b/sys/isa/syscons_isa.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/isa/syscons_isa.c,v 1.2.2.2 1999/08/29 16:25:47 peter Exp $
  */
 
 #include "sc.h"
diff --git a/sys/isa/vga_isa.c b/sys/isa/vga_isa.c
index 8a677846d9a3..a4a14075ae40 100644
--- a/sys/isa/vga_isa.c
+++ b/sys/isa/vga_isa.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/isa/vga_isa.c,v 1.5.2.4 1999/12/09 10:58:31 yokota Exp $
  */
 
 #include "vga.h"
diff --git a/sys/isofs/cd9660/TODO b/sys/isofs/cd9660/TODO
index b8d7f3efebb9..bcafcce0103c 100644
--- a/sys/isofs/cd9660/TODO
+++ b/sys/isofs/cd9660/TODO
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/isofs/cd9660/TODO,v 1.6.4.1 1999/08/29 16:25:49 peter Exp $
 
  2) should understand Rock Ridge
 
diff --git a/sys/isofs/cd9660/cd9660_bmap.c b/sys/isofs/cd9660/cd9660_bmap.c
index e5fcd9ab32b3..b47739a09c0f 100644
--- a/sys/isofs/cd9660/cd9660_bmap.c
+++ b/sys/isofs/cd9660/cd9660_bmap.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_bmap.c	8.3 (Berkeley) 1/23/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/isofs/cd9660/cd9660_bmap.c,v 1.7.2.1 1999/08/29 16:25:50 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_lookup.c b/sys/isofs/cd9660/cd9660_lookup.c
index b9aabbc7e2b8..0513514d7260 100644
--- a/sys/isofs/cd9660/cd9660_lookup.c
+++ b/sys/isofs/cd9660/cd9660_lookup.c
@@ -38,7 +38,7 @@
  *	from: @(#)ufs_lookup.c	7.33 (Berkeley) 5/19/91
  *
  *	@(#)cd9660_lookup.c	8.2 (Berkeley) 1/23/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/isofs/cd9660/cd9660_lookup.c,v 1.20.2.2 1999/08/29 16:25:50 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c
index 018ed0eee255..0c257a184b3d 100644
--- a/sys/isofs/cd9660/cd9660_node.c
+++ b/sys/isofs/cd9660/cd9660_node.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.c	8.2 (Berkeley) 1/23/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/isofs/cd9660/cd9660_node.c,v 1.26.2.2 1999/08/29 16:25:50 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_node.h b/sys/isofs/cd9660/cd9660_node.h
index 8496155fa069..e98dc884dd70 100644
--- a/sys/isofs/cd9660/cd9660_node.h
+++ b/sys/isofs/cd9660/cd9660_node.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.h	8.6 (Berkeley) 5/14/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/isofs/cd9660/cd9660_node.h,v 1.17.2.1 1999/08/29 16:25:50 peter Exp $
  */
 
 /*
diff --git a/sys/isofs/cd9660/cd9660_rrip.c b/sys/isofs/cd9660/cd9660_rrip.c
index 16a2a9b757ef..f1c7f1c0ef45 100644
--- a/sys/isofs/cd9660/cd9660_rrip.c
+++ b/sys/isofs/cd9660/cd9660_rrip.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_rrip.c	8.6 (Berkeley) 12/5/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/isofs/cd9660/cd9660_rrip.c,v 1.13.2.2 1999/08/29 16:25:51 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_rrip.h b/sys/isofs/cd9660/cd9660_rrip.h
index 5008abf2a0ac..141919a6b4ed 100644
--- a/sys/isofs/cd9660/cd9660_rrip.h
+++ b/sys/isofs/cd9660/cd9660_rrip.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_rrip.h	8.2 (Berkeley) 12/5/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/isofs/cd9660/cd9660_rrip.h,v 1.5.4.1 1999/08/29 16:25:51 peter Exp $
  */
   
 typedef struct {
diff --git a/sys/isofs/cd9660/cd9660_util.c b/sys/isofs/cd9660/cd9660_util.c
index 2a11dc2f6361..a3a3e9f9cb03 100644
--- a/sys/isofs/cd9660/cd9660_util.c
+++ b/sys/isofs/cd9660/cd9660_util.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_util.c	8.3 (Berkeley) 12/5/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/isofs/cd9660/cd9660_util.c,v 1.10.4.3 1999/08/29 16:25:51 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index bc5066b3754a..f2b946e4732f 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vfsops.c	8.18 (Berkeley) 5/22/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/isofs/cd9660/cd9660_vfsops.c,v 1.47.2.2 1999/08/29 16:25:51 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index af9f5bb5a6a8..034566781c76 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vnops.c	8.19 (Berkeley) 5/27/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/isofs/cd9660/cd9660_vnops.c,v 1.53.2.2 1999/08/29 16:25:51 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/iso.h b/sys/isofs/cd9660/iso.h
index 6a685d2465e9..3ead82df86da 100644
--- a/sys/isofs/cd9660/iso.h
+++ b/sys/isofs/cd9660/iso.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso.h	8.6 (Berkeley) 5/10/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/isofs/cd9660/iso.h,v 1.16.4.2 1999/08/29 16:25:52 peter Exp $
  */
 
 #define ISODCL(from, to) (to - from + 1)
diff --git a/sys/isofs/cd9660/iso_rrip.h b/sys/isofs/cd9660/iso_rrip.h
index 0c06e98825ce..21145160b3a5 100644
--- a/sys/isofs/cd9660/iso_rrip.h
+++ b/sys/isofs/cd9660/iso_rrip.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_rrip.h	8.2 (Berkeley) 1/23/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/isofs/cd9660/iso_rrip.h,v 1.5.2.1 1999/08/29 16:25:52 peter Exp $
  */
 
 
diff --git a/sys/kern/Make.tags.inc b/sys/kern/Make.tags.inc
index e81caa525819..c9e5a75590f1 100644
--- a/sys/kern/Make.tags.inc
+++ b/sys/kern/Make.tags.inc
@@ -1,5 +1,5 @@
 #	@(#)Make.tags.inc	8.1 (Berkeley) 6/11/93
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/Make.tags.inc,v 1.4.4.1 1999/08/29 16:25:53 peter Exp $
 
 # Common files for "make tags".
 # Included by the Makefile for each architecture.
diff --git a/sys/kern/bus_if.m b/sys/kern/bus_if.m
index baf58369f4b1..9c8b806827f4 100644
--- a/sys/kern/bus_if.m
+++ b/sys/kern/bus_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/bus_if.m,v 1.5.2.1 1999/08/29 16:25:53 peter Exp $
 #
 
 INTERFACE bus;
diff --git a/sys/kern/device_if.m b/sys/kern/device_if.m
index 69f70ef7a4f1..7bb71192c00a 100644
--- a/sys/kern/device_if.m
+++ b/sys/kern/device_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/device_if.m,v 1.3.2.1 1999/08/29 16:25:53 peter Exp $
 #
 
 INTERFACE device;
diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c
index 2213e302e78e..7d2369700895 100644
--- a/sys/kern/imgact_aout.c
+++ b/sys/kern/imgact_aout.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/imgact_aout.c,v 1.44.2.4 1999/09/01 06:12:00 sef Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
index 17dbd3620c91..cd92c467de16 100644
--- a/sys/kern/imgact_elf.c
+++ b/sys/kern/imgact_elf.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/imgact_elf.c,v 1.44.2.8 1999/11/27 03:07:10 bp Exp $
  */
 
 #include "opt_rlimit.h"
diff --git a/sys/kern/imgact_gzip.c b/sys/kern/imgact_gzip.c
index a9d2c39e1127..1f8b5707e1ee 100644
--- a/sys/kern/imgact_gzip.c
+++ b/sys/kern/imgact_gzip.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/imgact_gzip.c,v 1.35.2.2 1999/08/29 16:25:54 peter Exp $
  *
  * This module handles execution of a.out files which have been run through
  * "gzip".  This saves diskspace, but wastes cpu-cycles and VM.
diff --git a/sys/kern/imgact_shell.c b/sys/kern/imgact_shell.c
index ed5ffa977530..0b2d0d3040b5 100644
--- a/sys/kern/imgact_shell.c
+++ b/sys/kern/imgact_shell.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/imgact_shell.c,v 1.17.2.1 1999/08/29 16:25:55 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/inflate.c b/sys/kern/inflate.c
index f38e0bf07795..ff89244bb2d3 100644
--- a/sys/kern/inflate.c
+++ b/sys/kern/inflate.c
@@ -7,7 +7,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/inflate.c,v 1.12.2.1 1999/08/29 16:25:55 peter Exp $
  *
  *
  */
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 99b8dfd1fb55..e1021f40e722 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)init_main.c	8.9 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/init_main.c,v 1.103.2.5 1999/08/29 16:25:56 peter Exp $
  */
 
 #include "opt_devfs.h"
diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c
index aad7afab36b4..e0d6d6f977fa 100644
--- a/sys/kern/kern_acct.c
+++ b/sys/kern/kern_acct.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_acct.c	8.1 (Berkeley) 6/14/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_acct.c,v 1.19.2.1 1999/08/29 16:25:56 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 9461eae95de4..3d19ae9042e0 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_clock.c,v 1.86.2.5 1999/10/16 14:45:35 jhay Exp $
  */
 
 #include "opt_ntp.h"
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index 4aec672bce76..9510ed2f1042 100644
--- a/sys/kern/kern_conf.c
+++ b/sys/kern/kern_conf.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_conf.c,v 1.29.2.2 1999/08/29 16:25:57 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index b698d928e3b8..4446044f3967 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_descrip.c	8.6 (Berkeley) 4/19/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_descrip.c,v 1.58.2.3 1999/11/18 08:09:08 dillon Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c
index 1d83c2fc01c8..ecfe3135d7de 100644
--- a/sys/kern/kern_environment.c
+++ b/sys/kern/kern_environment.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_environment.c,v 1.4.2.4 1999/12/06 21:03:22 archie Exp $
  */
 
 /*
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 0867e866d6a8..e7861cf32873 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_exec.c,v 1.93.2.3 1999/08/29 16:25:58 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 3d007c695035..dd5d6f3135f8 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_exit.c	8.7 (Berkeley) 2/12/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_exit.c,v 1.71.2.4 1999/08/29 16:25:59 peter Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index e78cfa765421..079a3d1d9bab 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_fork.c	8.6 (Berkeley) 4/8/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_fork.c,v 1.54.2.4 1999/08/29 16:25:59 peter Exp $
  */
 
 #include "opt_ktrace.h"
diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c
index d2d73e689924..f4ccaecaff52 100644
--- a/sys/kern/kern_intr.c
+++ b/sys/kern/kern_intr.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_intr.c,v 1.21.2.1 1999/08/29 16:25:59 peter Exp $
  *
  */
 
diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index a4d0df90bb33..da48a0aaed8e 100644
--- a/sys/kern/kern_ktrace.c
+++ b/sys/kern/kern_ktrace.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_ktrace.c	8.2 (Berkeley) 9/23/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_ktrace.c,v 1.25.2.2 1999/09/01 05:52:13 dima Exp $
  */
 
 #include "opt_ktrace.h"
diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c
index 51e5dd991f44..150b07e98494 100644
--- a/sys/kern/kern_linker.c
+++ b/sys/kern/kern_linker.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_linker.c,v 1.21.2.3 1999/11/28 14:46:44 peter Exp $
  */
 
 #include "opt_ddb.h"
diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c
index 85cb1fcaab7a..613679526d7b 100644
--- a/sys/kern/kern_lkm.c
+++ b/sys/kern/kern_lkm.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_lkm.c,v 1.60.2.1 1999/08/29 16:26:00 peter Exp $
  */
 
 #include "opt_devfs.h"
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c
index 952fde3cff28..b16634554c00 100644
--- a/sys/kern/kern_lock.c
+++ b/sys/kern/kern_lock.c
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_lock.c	8.18 (Berkeley) 5/21/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_lock.c,v 1.23.2.4 1999/08/29 16:26:00 peter Exp $
  */
 
 #include "opt_lint.h"
diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c
index 27bb5c49f6af..1b48d68a56a6 100644
--- a/sys/kern/kern_lockf.c
+++ b/sys/kern/kern_lockf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_lockf.c	8.3 (Berkeley) 1/6/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_lockf.c,v 1.20.2.2 1999/08/29 16:26:00 peter Exp $
  */
 
 #include "opt_debug_lockf.h"
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 7baca955769c..a629e99fd4b1 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_malloc.c	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_malloc.c,v 1.51.2.4 1999/08/29 16:26:00 peter Exp $
  */
 
 #include "opt_vm.h"
diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c
index 27a098789a22..896946deede9 100644
--- a/sys/kern/kern_mib.c
+++ b/sys/kern/kern_mib.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_sysctl.c	8.4 (Berkeley) 4/14/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_mib.c,v 1.16.2.1 1999/08/29 16:26:01 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c
index 520bf965bea1..cc2520fd9587 100644
--- a/sys/kern/kern_module.c
+++ b/sys/kern/kern_module.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_module.c,v 1.14.2.1 1999/08/29 16:26:01 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_ntptime.c b/sys/kern/kern_ntptime.c
index 527cbd485037..6c0afacfbf22 100644
--- a/sys/kern/kern_ntptime.c
+++ b/sys/kern/kern_ntptime.c
@@ -28,7 +28,7 @@
  * sys/kern/kern_clock.c.   Some of the comments below may be (even more)
  * confusing and/or plain wrong in that context.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_ntptime.c,v 1.18.2.4 1999/10/10 18:29:39 jhay Exp $
  */
 
 #include "opt_ntp.h"
diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c
index 13b177b05686..1ec308a365d4 100644
--- a/sys/kern/kern_physio.c
+++ b/sys/kern/kern_physio.c
@@ -16,7 +16,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_physio.c,v 1.29.2.1 1999/08/29 16:26:01 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index efc9367c2861..1ac2f96a3f37 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_proc.c	8.7 (Berkeley) 2/14/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_proc.c,v 1.43.2.2 1999/08/29 16:26:01 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c
index 74f6c76f7d37..92499cf30d18 100644
--- a/sys/kern/kern_prot.c
+++ b/sys/kern/kern_prot.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_prot.c	8.6 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_prot.c,v 1.43.2.1 1999/08/29 16:26:02 peter Exp $
  */
 
 /*
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index 3cd1e6fd153e..9d174a4800c8 100644
--- a/sys/kern/kern_resource.c
+++ b/sys/kern/kern_resource.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_resource.c	8.5 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_resource.c,v 1.38.2.2 1999/08/29 16:26:02 peter Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index 1667c985f501..6ba7fbbe643d 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_shutdown.c	8.3 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_shutdown.c,v 1.44.2.1 1999/08/29 16:26:02 peter Exp $
  */
 
 #include "opt_ddb.h"
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 5a16c1516cad..f794110359a7 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_sig.c	8.7 (Berkeley) 4/18/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_sig.c,v 1.53.2.6 1999/11/22 20:53:03 sef Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c
index 7388d1051ab5..0c2369922e87 100644
--- a/sys/kern/kern_subr.c
+++ b/sys/kern/kern_subr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_subr.c	8.3 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_subr.c,v 1.24.2.5 1999/08/29 16:26:02 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 77d33610e43a..81e26fdc856a 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_synch.c	8.9 (Berkeley) 5/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_synch.c,v 1.72.2.4 1999/11/30 09:03:49 peter Exp $
  */
 
 #include "opt_ktrace.h"
diff --git a/sys/kern/kern_syscalls.c b/sys/kern/kern_syscalls.c
index ac7e0a8c1b40..36adaf0b6554 100644
--- a/sys/kern/kern_syscalls.c
+++ b/sys/kern/kern_syscalls.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_syscalls.c,v 1.3.2.1 1999/08/29 16:26:03 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index 9eb443f220fc..f73dd1f1c4a7 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_sysctl.c	8.4 (Berkeley) 4/14/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_sysctl.c,v 1.83.2.1 1999/08/29 16:26:03 peter Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/kern_threads.c b/sys/kern/kern_threads.c
index 8abcadce1d9c..4d6e7b7852cc 100644
--- a/sys/kern/kern_threads.c
+++ b/sys/kern/kern_threads.c
@@ -46,7 +46,7 @@
  * in Germany will I accept domestic beer.  This code may or may not work
  * and I certainly make no claims as to its fitness for *any* purpose.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_threads.c,v 1.10.2.1 1999/08/29 16:26:03 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index 5bb23f0581f0..7a657ef3248d 100644
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_time.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_time.c,v 1.59.2.2 1999/08/29 16:26:03 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index 42a7a7320f39..9eafb564f5f4 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_timeout.c,v 1.55.2.2 1999/08/29 16:26:04 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c
index f60c6bec4197..132158efa169 100644
--- a/sys/kern/kern_xxx.c
+++ b/sys/kern/kern_xxx.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_xxx.c	8.2 (Berkeley) 11/14/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_xxx.c,v 1.28.2.1 1999/08/29 16:26:04 peter Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/link_aout.c b/sys/kern/link_aout.c
index 54633d6d5f88..cc984612e81e 100644
--- a/sys/kern/link_aout.c
+++ b/sys/kern/link_aout.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/link_aout.c,v 1.17.2.3 1999/11/28 14:46:44 peter Exp $
  */
 
 #ifndef __alpha__
diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c
index 04ebdb1682c6..08961792abe6 100644
--- a/sys/kern/link_elf.c
+++ b/sys/kern/link_elf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/link_elf.c,v 1.11.2.3 1999/11/28 14:46:45 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/makedevops.pl b/sys/kern/makedevops.pl
index c5f29a5d64fc..723c6e3cf205 100644
--- a/sys/kern/makedevops.pl
+++ b/sys/kern/makedevops.pl
@@ -35,7 +35,7 @@
 # From @(#)makedevops.sh 1.1 1998/06/14 13:53:12 dfr Exp $
 # From @(#)makedevops.sh ?.? 1998/10/05
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/makedevops.pl,v 1.2.2.2 1999/08/29 16:26:04 peter Exp $
 
 #
 # Script to produce device front-end sugar.
diff --git a/sys/kern/makedevops.sh b/sys/kern/makedevops.sh
index 28a6948b9e64..4bc3a0d16686 100644
--- a/sys/kern/makedevops.sh
+++ b/sys/kern/makedevops.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 # From @(#)vnode_if.sh	8.1 (Berkeley) 6/10/93
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/makedevops.sh,v 1.2.2.1 1999/08/29 16:26:04 peter Exp $
 #
 
 # Script to produce device front-end sugar.
diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh
index f8e2726c3171..ebc085569b66 100644
--- a/sys/kern/makesyscalls.sh
+++ b/sys/kern/makesyscalls.sh
@@ -1,6 +1,6 @@
 #! /bin/sh -
 #	@(#)makesyscalls.sh	8.1 (Berkeley) 6/10/93
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/makesyscalls.sh,v 1.35.2.2 1999/12/08 18:32:19 marcel Exp $
 
 set -e
 
diff --git a/sys/kern/md5c.c b/sys/kern/md5c.c
index c4e3791f5342..a6624fb8f721 100644
--- a/sys/kern/md5c.c
+++ b/sys/kern/md5c.c
@@ -22,7 +22,7 @@
  * These notices must be retained in any copies of any part of this
  * documentation and/or software.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/md5c.c,v 1.15.2.1 1999/08/29 16:26:05 peter Exp $
  *
  * This code is the same as the code published by RSA Inc.  It has been
  * edited for clarity and style only.
diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c
index fbb8be7caa55..abb14de8c5a2 100644
--- a/sys/kern/subr_autoconf.c
+++ b/sys/kern/subr_autoconf.c
@@ -41,7 +41,7 @@
  *
  *	@(#)subr_autoconf.c	8.1 (Berkeley) 6/10/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/subr_autoconf.c,v 1.8.2.1 1999/08/29 16:26:05 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index 54827246f48b..4f3df606c3ad 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/subr_bus.c,v 1.14.2.1 1999/08/29 16:26:05 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_devstat.c b/sys/kern/subr_devstat.c
index 565907860996..4b234b6467d8 100644
--- a/sys/kern/subr_devstat.c
+++ b/sys/kern/subr_devstat.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/subr_devstat.c,v 1.8.2.2 1999/08/29 16:26:06 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c
index be784682e32b..6e5c2228607e 100644
--- a/sys/kern/subr_diskslice.c
+++ b/sys/kern/subr_diskslice.c
@@ -43,7 +43,7 @@
  *	from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/subr_diskslice.c,v 1.61.2.2 1999/08/29 16:26:06 peter Exp $
  */
 
 #include "opt_devfs.h"
diff --git a/sys/kern/subr_dkbad.c b/sys/kern/subr_dkbad.c
index c9a9a17e3417..7df89e69ce67 100644
--- a/sys/kern/subr_dkbad.c
+++ b/sys/kern/subr_dkbad.c
@@ -43,7 +43,7 @@
  *	from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/subr_dkbad.c,v 1.8.2.1 1999/08/29 16:26:06 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c
index 902039148617..12cbf0e4603d 100644
--- a/sys/kern/subr_log.c
+++ b/sys/kern/subr_log.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_log.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/subr_log.c,v 1.33.2.1 1999/08/29 16:26:06 peter Exp $
  */
 
 /*
diff --git a/sys/kern/subr_module.c b/sys/kern/subr_module.c
index 15df73bbf1e1..98d96515515e 100644
--- a/sys/kern/subr_module.c
+++ b/sys/kern/subr_module.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/subr_module.c,v 1.4.2.1 1999/08/29 16:26:06 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index 947cf88a3ec6..123abc270bdf 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_prf.c	8.3 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/subr_prf.c,v 1.51.2.3 1999/08/29 16:26:07 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c
index c4f90662a7ff..30d736e69ffa 100644
--- a/sys/kern/subr_prof.c
+++ b/sys/kern/subr_prof.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_prof.c	8.3 (Berkeley) 9/23/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/subr_prof.c,v 1.28.2.1 1999/08/29 16:26:07 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_rlist.c b/sys/kern/subr_rlist.c
index 9722f13048fe..221ad4ae9390 100644
--- a/sys/kern/subr_rlist.c
+++ b/sys/kern/subr_rlist.c
@@ -54,7 +54,7 @@
  * functioning of this software, nor does the author assume any responsibility
  * for damages incurred with its use.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/subr_rlist.c,v 1.29.2.1 1999/08/29 16:26:07 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_rman.c b/sys/kern/subr_rman.c
index f8f8b4e7e38a..5dc28c8f6de1 100644
--- a/sys/kern/subr_rman.c
+++ b/sys/kern/subr_rman.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/subr_rman.c,v 1.4.2.1 1999/08/29 16:26:07 peter Exp $
  */
 
 /*
diff --git a/sys/kern/subr_scanf.c b/sys/kern/subr_scanf.c
index 41b294d1efe7..465b18aa999d 100644
--- a/sys/kern/subr_scanf.c
+++ b/sys/kern/subr_scanf.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/subr_scanf.c,v 1.1.2.3 1999/12/06 21:03:22 archie Exp $
  * From: Id: vfscanf.c,v 1.13 1998/09/25 12:20:27 obrien Exp 
  */
 
diff --git a/sys/kern/subr_xxx.c b/sys/kern/subr_xxx.c
index 86cb08db75d2..bc6ab2a99eca 100644
--- a/sys/kern/subr_xxx.c
+++ b/sys/kern/subr_xxx.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_xxx.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/subr_xxx.c,v 1.12.2.1 1999/08/29 16:26:07 peter Exp $
  */
 
 /*
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index e187c21dea20..f8e66cc8bb21 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sys_generic.c	8.5 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/sys_generic.c,v 1.43.2.2 1999/08/29 16:26:08 peter Exp $
  */
 
 #include "opt_ktrace.h"
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index d468a15e4c80..f3026c6d7f16 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -16,7 +16,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/sys_pipe.c,v 1.46.2.4 1999/08/29 16:26:08 peter Exp $
  */
 
 /*
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index 43d0d80f76c6..b9014c93b288 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/sys_process.c,v 1.41.2.1 1999/08/29 16:26:08 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c
index 057ca4830bb5..b8fb4c120ddd 100644
--- a/sys/kern/sys_socket.c
+++ b/sys/kern/sys_socket.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sys_socket.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/sys_socket.c,v 1.19.2.2 1999/08/29 16:26:08 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index 5db96cf273cf..1e00a77e5003 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $FreeBSD: src/sys/kern/syscalls.master,v 1.55.2.2 1999/08/29 16:26:08 peter Exp $
 ;	from: @(#)syscalls.master	8.2 (Berkeley) 1/13/94
 ;
 ; System call name/number master file.
diff --git a/sys/kern/sysv_ipc.c b/sys/kern/sysv_ipc.c
index 0cdbe54168e4..582f1c6ced83 100644
--- a/sys/kern/sysv_ipc.c
+++ b/sys/kern/sysv_ipc.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/kern/sysv_ipc.c,v 1.8.2.1 1999/08/29 16:26:09 peter Exp $ */
 /*	$NetBSD: sysv_ipc.c,v 1.7 1994/06/29 06:33:11 cgd Exp $	*/
 
 /*
diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c
index 5d7721804686..76c5c807bef4 100644
--- a/sys/kern/sysv_msg.c
+++ b/sys/kern/sysv_msg.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/kern/sysv_msg.c,v 1.18.2.2 1999/08/29 16:26:09 peter Exp $ */
 
 /*
  * Implementation of SVID messages
diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c
index 73c7cf0f8d95..c5c40852d3e8 100644
--- a/sys/kern/sysv_sem.c
+++ b/sys/kern/sysv_sem.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/kern/sysv_sem.c,v 1.22.2.1 1999/08/29 16:26:09 peter Exp $ */
 
 /*
  * Implementation of SVID semaphores
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index 29bf43e5ce72..fa3e72d12e06 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/kern/sysv_shm.c,v 1.39.2.2 1999/08/29 16:26:09 peter Exp $ */
 /*	$NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $	*/
 
 /*
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 261a81443fff..b3233def8fb4 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty.c	8.8 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/tty.c,v 1.111.2.1 1999/08/29 16:26:09 peter Exp $
  */
 
 /*-
diff --git a/sys/kern/tty_compat.c b/sys/kern/tty_compat.c
index c104e223c106..ad571cfbd1b4 100644
--- a/sys/kern/tty_compat.c
+++ b/sys/kern/tty_compat.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_compat.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/tty_compat.c,v 1.28.2.1 1999/08/29 16:26:10 peter Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/tty_conf.c b/sys/kern/tty_conf.c
index 43c73be8ac7e..2f7f67979b0b 100644
--- a/sys/kern/tty_conf.c
+++ b/sys/kern/tty_conf.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_conf.c	8.4 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/tty_conf.c,v 1.13.2.1 1999/08/29 16:26:10 peter Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index ab4a7bc1687a..59826498ec5c 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_pty.c	8.4 (Berkeley) 2/20/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/tty_pty.c,v 1.54.2.1 1999/08/29 16:26:10 peter Exp $
  */
 
 /*
diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c
index d3ed6701e521..c3450fa55f43 100644
--- a/sys/kern/tty_subr.c
+++ b/sys/kern/tty_subr.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/tty_subr.c,v 1.30.2.1 1999/08/29 16:26:10 peter Exp $
  */
 
 /*
diff --git a/sys/kern/tty_tb.c b/sys/kern/tty_tb.c
index 39b75c2bf387..ae24ca50e8f1 100644
--- a/sys/kern/tty_tb.c
+++ b/sys/kern/tty_tb.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_tb.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/tty_tb.c,v 1.4.4.1 1999/08/29 16:26:10 peter Exp $
  */
 
 #include "tb.h"
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index e36fb2403c01..a84c544daade 100644
--- a/sys/kern/tty_tty.c
+++ b/sys/kern/tty_tty.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_tty.c	8.2 (Berkeley) 9/23/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/tty_tty.c,v 1.25.2.1 1999/08/29 16:26:11 peter Exp $
  */
 
 /*
diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c
index 279106c3badc..17b7a086556d 100644
--- a/sys/kern/uipc_domain.c
+++ b/sys/kern/uipc_domain.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_domain.c	8.2 (Berkeley) 10/18/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/uipc_domain.c,v 1.20.2.1 1999/08/29 16:26:11 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index ce0dfa5aef16..952de2109528 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_mbuf.c	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.37.2.3 1999/12/03 07:49:38 julian Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/uipc_proto.c b/sys/kern/uipc_proto.c
index b6279d4717b9..28c865071dc6 100644
--- a/sys/kern/uipc_proto.c
+++ b/sys/kern/uipc_proto.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_proto.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/uipc_proto.c,v 1.17.2.1 1999/08/29 16:26:11 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 820166d622bd..b72483a81832 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_socket.c	8.3 (Berkeley) 4/15/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/uipc_socket.c,v 1.51.2.5 1999/08/29 16:26:11 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c
index aff042158f33..428d7c936385 100644
--- a/sys/kern/uipc_socket2.c
+++ b/sys/kern/uipc_socket2.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_socket2.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/uipc_socket2.c,v 1.43.2.6 1999/10/01 17:08:50 pb Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index bc0229c647bd..bcbeb15b758e 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_syscalls.c	8.4 (Berkeley) 2/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.49.2.3 1999/08/29 16:26:12 peter Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index 1b8021d6e864..1e152531caea 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)uipc_usrreq.c	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.37.2.4 1999/08/29 16:26:12 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index 8f4839b8be80..75fa194a0d0a 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -13,7 +13,7 @@
  * bad that happens because of using this software isn't the responsibility
  * of the author.  This software is distributed AS-IS.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/vfs_aio.c,v 1.36.2.2 1999/08/29 16:26:12 peter Exp $
  */
 
 /*
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 501febb833a2..325260d32d5f 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -11,7 +11,7 @@
  * 2. Absolutely no warranty of function or purpose is made by the author
  *		John S. Dyson.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/vfs_bio.c,v 1.193.2.8 1999/09/16 01:50:29 alfred Exp $
  */
 
 /*
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index a4b362895abc..596b2386810f 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_cache.c	8.5 (Berkeley) 3/22/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/vfs_cache.c,v 1.38.2.3 1999/09/16 02:02:15 alfred Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index 94a182207d99..75a72644b41e 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_cluster.c	8.7 (Berkeley) 2/13/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/vfs_cluster.c,v 1.77.2.1 1999/08/29 16:26:13 peter Exp $
  */
 
 #include "opt_debug_cluster.h"
diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c
index 05343bfdcb7c..526865edbdef 100644
--- a/sys/kern/vfs_conf.c
+++ b/sys/kern/vfs_conf.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_conf.c	8.8 (Berkeley) 3/31/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/vfs_conf.c,v 1.26.2.1 1999/08/29 16:26:14 peter Exp $
  */
 
 /*
diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c
index 641a1ccb53a8..5f789af879b8 100644
--- a/sys/kern/vfs_init.c
+++ b/sys/kern/vfs_init.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_init.c	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/vfs_init.c,v 1.41.2.1 1999/08/29 16:26:14 peter Exp $
  */
 
 
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index 943a8de7bcc3..b5cc54e32482 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_lookup.c	8.4 (Berkeley) 2/16/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/vfs_lookup.c,v 1.31.2.1 1999/08/29 16:26:14 peter Exp $
  */
 
 #include "opt_ktrace.h"
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index c7375a2b0979..a741b5f77d5f 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.182.2.3 1999/09/16 02:02:15 alfred Exp $
  */
 
 /*
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index e503076510bb..598d07ab7105 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.112.2.7 1999/11/18 08:15:10 dillon Exp $
  */
 
 /* For 4.3 integer FS ID compatibility */
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 6d2081a0f34d..ba564d422b8d 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_vnops.c	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/vfs_vnops.c,v 1.62.2.3 1999/11/18 08:15:12 dillon Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/vnode_if.sh b/sys/kern/vnode_if.sh
index f60b05c0f095..bdd921b5de84 100644
--- a/sys/kern/vnode_if.sh
+++ b/sys/kern/vnode_if.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)vnode_if.sh	8.1 (Berkeley) 6/10/93
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/vnode_if.sh,v 1.16.2.1 1999/08/29 16:26:16 peter Exp $
 #
 
 # Script to produce VFS front-end sugar.
diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src
index 173af6dc1927..7dd92dcf2c37 100644
--- a/sys/kern/vnode_if.src
+++ b/sys/kern/vnode_if.src
@@ -31,7 +31,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)vnode_if.src	8.12 (Berkeley) 5/14/95
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/vnode_if.src,v 1.19.2.1 1999/08/29 16:26:16 peter Exp $
 #
 
 #
diff --git a/sys/libkern/adddi3.c b/sys/libkern/adddi3.c
index 51793da73f70..4b5d2ba55a26 100644
--- a/sys/libkern/adddi3.c
+++ b/sys/libkern/adddi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/adddi3.c,v 1.4.4.1 1999/08/29 16:26:30 peter Exp $
  */
 
 #include "quad.h"
diff --git a/sys/libkern/anddi3.c b/sys/libkern/anddi3.c
index d278a3619463..bc8170cf2e4c 100644
--- a/sys/libkern/anddi3.c
+++ b/sys/libkern/anddi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/anddi3.c,v 1.4.4.1 1999/08/29 16:26:30 peter Exp $
  */
 
 #include "quad.h"
diff --git a/sys/libkern/ashldi3.c b/sys/libkern/ashldi3.c
index 4e8e8d6441b3..94e3354fbeba 100644
--- a/sys/libkern/ashldi3.c
+++ b/sys/libkern/ashldi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/ashldi3.c,v 1.4.4.1 1999/08/29 16:26:30 peter Exp $
  */
 
 #include "quad.h"
diff --git a/sys/libkern/ashrdi3.c b/sys/libkern/ashrdi3.c
index 031fcc0523b4..fec73228f3fc 100644
--- a/sys/libkern/ashrdi3.c
+++ b/sys/libkern/ashrdi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/ashrdi3.c,v 1.5.4.1 1999/08/29 16:26:30 peter Exp $
  */
 
 #include "quad.h"
diff --git a/sys/libkern/bcmp.c b/sys/libkern/bcmp.c
index 30208dce038b..d2295aac7550 100644
--- a/sys/libkern/bcmp.c
+++ b/sys/libkern/bcmp.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/bcmp.c,v 1.4.4.1 1999/08/29 16:26:30 peter Exp $
  */
 
 #include <string.h>
diff --git a/sys/libkern/cmpdi2.c b/sys/libkern/cmpdi2.c
index 55198b90d89f..679648b24a65 100644
--- a/sys/libkern/cmpdi2.c
+++ b/sys/libkern/cmpdi2.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/cmpdi2.c,v 1.5.2.1 1999/08/29 16:26:30 peter Exp $
  */
 
 #include <libkern/quad.h>
diff --git a/sys/libkern/divdi3.c b/sys/libkern/divdi3.c
index b221ce58240c..2d38ca38639a 100644
--- a/sys/libkern/divdi3.c
+++ b/sys/libkern/divdi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/divdi3.c,v 1.5.4.1 1999/08/29 16:26:31 peter Exp $
  */
 
 #include <libkern/quad.h>
diff --git a/sys/libkern/ffs.c b/sys/libkern/ffs.c
index 533b8ec483a3..fa6fe3eb1c87 100644
--- a/sys/libkern/ffs.c
+++ b/sys/libkern/ffs.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/ffs.c,v 1.4.4.1 1999/08/29 16:26:31 peter Exp $
  */
 
 #include <string.h>
diff --git a/sys/libkern/index.c b/sys/libkern/index.c
index 63512232fa2f..6fc872c09035 100644
--- a/sys/libkern/index.c
+++ b/sys/libkern/index.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/index.c,v 1.3.4.1 1999/08/29 16:26:31 peter Exp $
  */
 
 #include <string.h>
diff --git a/sys/libkern/iordi3.c b/sys/libkern/iordi3.c
index 8477ac24ea8b..e54dbc0de45e 100644
--- a/sys/libkern/iordi3.c
+++ b/sys/libkern/iordi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/iordi3.c,v 1.4.4.1 1999/08/29 16:26:31 peter Exp $
  */
 
 #include "quad.h"
diff --git a/sys/libkern/locc.c b/sys/libkern/locc.c
index a4510cad9c56..478ed0482eac 100644
--- a/sys/libkern/locc.c
+++ b/sys/libkern/locc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)locc.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/locc.c,v 1.5.4.1 1999/08/29 16:26:31 peter Exp $
  */
 
 #include <sys/libkern.h>
diff --git a/sys/libkern/lshldi3.c b/sys/libkern/lshldi3.c
index 5d20c1d233cf..41f29d5ab7cd 100644
--- a/sys/libkern/lshldi3.c
+++ b/sys/libkern/lshldi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/lshldi3.c,v 1.4.4.1 1999/08/29 16:26:31 peter Exp $
  */
 
 #include "quad.h"
diff --git a/sys/libkern/lshrdi3.c b/sys/libkern/lshrdi3.c
index 6cce84eb658d..edcb2f6bf20c 100644
--- a/sys/libkern/lshrdi3.c
+++ b/sys/libkern/lshrdi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/lshrdi3.c,v 1.4.4.1 1999/08/29 16:26:31 peter Exp $
  */
 
 #include "quad.h"
diff --git a/sys/libkern/mcount.c b/sys/libkern/mcount.c
index ca3c1c4c1209..2a3a42d61efd 100644
--- a/sys/libkern/mcount.c
+++ b/sys/libkern/mcount.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/mcount.c,v 1.14.2.1 1999/08/29 16:26:32 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/libkern/moddi3.c b/sys/libkern/moddi3.c
index c0e51b32fb7a..b999174cd2fc 100644
--- a/sys/libkern/moddi3.c
+++ b/sys/libkern/moddi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/moddi3.c,v 1.6.2.1 1999/08/29 16:26:32 peter Exp $
  */
 
 #include <libkern/quad.h>
diff --git a/sys/libkern/muldi3.c b/sys/libkern/muldi3.c
index f17a2474dbdb..85c22a622716 100644
--- a/sys/libkern/muldi3.c
+++ b/sys/libkern/muldi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/muldi3.c,v 1.5.4.1 1999/08/29 16:26:32 peter Exp $
  */
 
 #include "quad.h"
diff --git a/sys/libkern/negdi2.c b/sys/libkern/negdi2.c
index a803bf40e8f7..ac9127726b81 100644
--- a/sys/libkern/negdi2.c
+++ b/sys/libkern/negdi2.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/negdi2.c,v 1.4.4.1 1999/08/29 16:26:32 peter Exp $
  */
 
 #include "quad.h"
diff --git a/sys/libkern/notdi2.c b/sys/libkern/notdi2.c
index 0a1e97e9e4eb..5f80f6df7f5c 100644
--- a/sys/libkern/notdi2.c
+++ b/sys/libkern/notdi2.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/notdi2.c,v 1.4.4.1 1999/08/29 16:26:32 peter Exp $
  */
 
 #include "quad.h"
diff --git a/sys/libkern/qdivrem.c b/sys/libkern/qdivrem.c
index 241adeb7a6cb..f3b2d8a138d6 100644
--- a/sys/libkern/qdivrem.c
+++ b/sys/libkern/qdivrem.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/qdivrem.c,v 1.7.2.1 1999/08/29 16:26:32 peter Exp $
  */
 
 /*
diff --git a/sys/libkern/qsort.c b/sys/libkern/qsort.c
index 407ad6b0e67e..7f38234303bd 100644
--- a/sys/libkern/qsort.c
+++ b/sys/libkern/qsort.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/qsort.c,v 1.9.2.1 1999/08/29 16:26:33 peter Exp $
  */
 
 #include <sys/libkern.h>
diff --git a/sys/libkern/quad.h b/sys/libkern/quad.h
index 14f57542f761..998e209f6157 100644
--- a/sys/libkern/quad.h
+++ b/sys/libkern/quad.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)quad.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/quad.h,v 1.6.4.1 1999/08/29 16:26:33 peter Exp $
  */
 
 /*
diff --git a/sys/libkern/random.c b/sys/libkern/random.c
index 35ddea1add68..64a5b57ed8aa 100644
--- a/sys/libkern/random.c
+++ b/sys/libkern/random.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)random.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/random.c,v 1.6.4.1 1999/08/29 16:26:33 peter Exp $
  */
 
 #include <sys/libkern.h>
diff --git a/sys/libkern/rindex.c b/sys/libkern/rindex.c
index f51abccb84d4..3121b8dbcac3 100644
--- a/sys/libkern/rindex.c
+++ b/sys/libkern/rindex.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/rindex.c,v 1.4.4.1 1999/08/29 16:26:33 peter Exp $
  */
 
 #include <stddef.h>
diff --git a/sys/libkern/scanc.c b/sys/libkern/scanc.c
index 2a68f583f014..c56c8d69d705 100644
--- a/sys/libkern/scanc.c
+++ b/sys/libkern/scanc.c
@@ -32,7 +32,7 @@
  *
  *	@(#)scanc.c	8.1 (Berkeley) 6/10/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/scanc.c,v 1.7.4.1 1999/08/29 16:26:33 peter Exp $
  */
 
 #include <sys/libkern.h>
diff --git a/sys/libkern/skpc.c b/sys/libkern/skpc.c
index 8ea07da266a7..fdab84f2e198 100644
--- a/sys/libkern/skpc.c
+++ b/sys/libkern/skpc.c
@@ -32,7 +32,7 @@
  *
  *	@(#)skpc.c	8.1 (Berkeley) 6/10/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/skpc.c,v 1.5.4.1 1999/08/29 16:26:33 peter Exp $
  */
 
 #include <sys/libkern.h>
diff --git a/sys/libkern/strcat.c b/sys/libkern/strcat.c
index 3d953b260153..41ce34987606 100644
--- a/sys/libkern/strcat.c
+++ b/sys/libkern/strcat.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/strcat.c,v 1.4.4.1 1999/08/29 16:26:34 peter Exp $
  */
 
 #include <string.h>
diff --git a/sys/libkern/strcmp.c b/sys/libkern/strcmp.c
index 77c5f66233e9..c6df2492fbe9 100644
--- a/sys/libkern/strcmp.c
+++ b/sys/libkern/strcmp.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/strcmp.c,v 1.6.2.1 1999/08/29 16:26:34 peter Exp $
  */
 
 #include <string.h>
diff --git a/sys/libkern/strcpy.c b/sys/libkern/strcpy.c
index e84f986dea93..6f358e2b29cb 100644
--- a/sys/libkern/strcpy.c
+++ b/sys/libkern/strcpy.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/strcpy.c,v 1.5.2.1 1999/08/29 16:26:34 peter Exp $
  */
 
 #include <string.h>
diff --git a/sys/libkern/strlen.c b/sys/libkern/strlen.c
index e3e50cbfca29..d0fe39f013fe 100644
--- a/sys/libkern/strlen.c
+++ b/sys/libkern/strlen.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/strlen.c,v 1.5.2.1 1999/08/29 16:26:34 peter Exp $
  */
 
 #include <string.h>
diff --git a/sys/libkern/strncmp.c b/sys/libkern/strncmp.c
index 523a456fe4ef..25d6f054df3d 100644
--- a/sys/libkern/strncmp.c
+++ b/sys/libkern/strncmp.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/strncmp.c,v 1.6.2.1 1999/08/29 16:26:34 peter Exp $
  */
 
 #include <string.h>
diff --git a/sys/libkern/strncpy.c b/sys/libkern/strncpy.c
index 2b36d1a19459..95e5c7c5ba51 100644
--- a/sys/libkern/strncpy.c
+++ b/sys/libkern/strncpy.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/strncpy.c,v 1.5.2.1 1999/08/29 16:26:34 peter Exp $
  */
 
 #include <string.h>
diff --git a/sys/libkern/strtol.c b/sys/libkern/strtol.c
index f645cb5dfd82..cb64a42b361a 100644
--- a/sys/libkern/strtol.c
+++ b/sys/libkern/strtol.c
@@ -35,7 +35,7 @@
  *
  * From: static char sccsid[] = "@(#)strtol.c	8.1 (Berkeley) 6/4/93";
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/strtol.c,v 1.5.2.1 1999/12/06 21:03:23 archie Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/libkern/strtoq.c b/sys/libkern/strtoq.c
index a1bb4ffc7511..34550392b81c 100644
--- a/sys/libkern/strtoq.c
+++ b/sys/libkern/strtoq.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/strtoq.c,v 1.3.2.1 1999/12/06 21:03:24 archie Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/libkern/strtoul.c b/sys/libkern/strtoul.c
index b5973ef8a686..a57a8e548a51 100644
--- a/sys/libkern/strtoul.c
+++ b/sys/libkern/strtoul.c
@@ -35,7 +35,7 @@
  *
  * From: static char sccsid[] = "@(#)strtoul.c	8.1 (Berkeley) 6/4/93";
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/strtoul.c,v 1.3.2.1 1999/12/06 21:03:24 archie Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/libkern/strtouq.c b/sys/libkern/strtouq.c
index 7b6ca1a9087c..7ef79ad18c20 100644
--- a/sys/libkern/strtouq.c
+++ b/sys/libkern/strtouq.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/strtouq.c,v 1.3.2.1 1999/12/06 21:03:24 archie Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/libkern/subdi3.c b/sys/libkern/subdi3.c
index 9f34e6b4e370..d7c508eb8c1d 100644
--- a/sys/libkern/subdi3.c
+++ b/sys/libkern/subdi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/subdi3.c,v 1.4.4.1 1999/08/29 16:26:34 peter Exp $
  */
 
 #include "quad.h"
diff --git a/sys/libkern/ucmpdi2.c b/sys/libkern/ucmpdi2.c
index 696e28e4f4e2..50e3745fad2b 100644
--- a/sys/libkern/ucmpdi2.c
+++ b/sys/libkern/ucmpdi2.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/ucmpdi2.c,v 1.4.4.1 1999/08/29 16:26:35 peter Exp $
  */
 
 #include "quad.h"
diff --git a/sys/libkern/udivdi3.c b/sys/libkern/udivdi3.c
index 0827fbdc826c..4087e26c334a 100644
--- a/sys/libkern/udivdi3.c
+++ b/sys/libkern/udivdi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/udivdi3.c,v 1.5.4.1 1999/08/29 16:26:35 peter Exp $
  */
 
 #include <libkern/quad.h>
diff --git a/sys/libkern/umoddi3.c b/sys/libkern/umoddi3.c
index 30fb30713f3a..1d21777bb07d 100644
--- a/sys/libkern/umoddi3.c
+++ b/sys/libkern/umoddi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/umoddi3.c,v 1.5.4.1 1999/08/29 16:26:35 peter Exp $
  */
 
 #include <libkern/quad.h>
diff --git a/sys/libkern/xordi3.c b/sys/libkern/xordi3.c
index b666446f049e..1e458a5c2702 100644
--- a/sys/libkern/xordi3.c
+++ b/sys/libkern/xordi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/xordi3.c,v 1.4.4.1 1999/08/29 16:26:35 peter Exp $
  */
 
 #include "quad.h"
diff --git a/sys/miscfs/deadfs/dead_vnops.c b/sys/miscfs/deadfs/dead_vnops.c
index f9acbd043587..81ca519c2108 100644
--- a/sys/miscfs/deadfs/dead_vnops.c
+++ b/sys/miscfs/deadfs/dead_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dead_vnops.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/deadfs/dead_vnops.c,v 1.25.2.1 1999/08/29 16:26:37 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/devfs/devfs_tree.c b/sys/miscfs/devfs/devfs_tree.c
index 7f73d1381a6a..fd55ce0cfcf4 100644
--- a/sys/miscfs/devfs/devfs_tree.c
+++ b/sys/miscfs/devfs/devfs_tree.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/devfs/devfs_tree.c,v 1.58.2.1 1999/08/29 16:26:38 peter Exp $
  */
 
 
diff --git a/sys/miscfs/devfs/devfs_vfsops.c b/sys/miscfs/devfs/devfs_vfsops.c
index b427e232ca49..fd372ef63f24 100644
--- a/sys/miscfs/devfs/devfs_vfsops.c
+++ b/sys/miscfs/devfs/devfs_vfsops.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/devfs/devfs_vfsops.c,v 1.35.2.1 1999/08/29 16:26:38 peter Exp $
  *
  */
 
diff --git a/sys/miscfs/devfs/devfs_vnops.c b/sys/miscfs/devfs/devfs_vnops.c
index ea077f7d449c..cbcc2b27561c 100644
--- a/sys/miscfs/devfs/devfs_vnops.c
+++ b/sys/miscfs/devfs/devfs_vnops.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/devfs/devfs_vnops.c,v 1.65.2.2 1999/08/29 16:26:39 peter Exp $
  */
 
 
diff --git a/sys/miscfs/devfs/devfsdefs.h b/sys/miscfs/devfs/devfsdefs.h
index 6541a538e635..fe27c98d9cd4 100644
--- a/sys/miscfs/devfs/devfsdefs.h
+++ b/sys/miscfs/devfs/devfsdefs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/devfs/devfsdefs.h,v 1.18.2.1 1999/08/29 16:26:40 peter Exp $
  */
 #ifdef DEVFS_DEBUG
 #define DBPRINT(A) printf(A)
diff --git a/sys/miscfs/fdesc/fdesc.h b/sys/miscfs/fdesc/fdesc.h
index 463e52836918..91433b7ea131 100644
--- a/sys/miscfs/fdesc/fdesc.h
+++ b/sys/miscfs/fdesc/fdesc.h
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc.h	8.5 (Berkeley) 1/21/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/fdesc/fdesc.h,v 1.6.2.1 1999/08/29 16:26:40 peter Exp $
  */
 
 #ifdef KERNEL
diff --git a/sys/miscfs/fdesc/fdesc_vfsops.c b/sys/miscfs/fdesc/fdesc_vfsops.c
index 59c1d303343c..0373082c7e2b 100644
--- a/sys/miscfs/fdesc/fdesc_vfsops.c
+++ b/sys/miscfs/fdesc/fdesc_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc_vfsops.c	8.4 (Berkeley) 1/21/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/fdesc/fdesc_vfsops.c,v 1.17.2.1 1999/08/29 16:26:41 peter Exp $
  */
 
 /*
diff --git a/sys/miscfs/fdesc/fdesc_vnops.c b/sys/miscfs/fdesc/fdesc_vnops.c
index 92ffd21dbf1d..73c68701944b 100644
--- a/sys/miscfs/fdesc/fdesc_vnops.c
+++ b/sys/miscfs/fdesc/fdesc_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc_vnops.c	8.9 (Berkeley) 1/21/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/fdesc/fdesc_vnops.c,v 1.40.2.1 1999/08/29 16:26:42 peter Exp $
  */
 
 /*
diff --git a/sys/miscfs/fifofs/fifo.h b/sys/miscfs/fifofs/fifo.h
index e63020752863..215f8841df9f 100644
--- a/sys/miscfs/fifofs/fifo.h
+++ b/sys/miscfs/fifofs/fifo.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo.h	8.6 (Berkeley) 5/21/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/fifofs/fifo.h,v 1.15.2.1 1999/08/29 16:26:43 peter Exp $
  */
 
 extern vop_t **fifo_vnodeop_p;
diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c
index 4a8199a672b5..2393a2d5a720 100644
--- a/sys/miscfs/fifofs/fifo_vnops.c
+++ b/sys/miscfs/fifofs/fifo_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.10 (Berkeley) 5/27/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/fifofs/fifo_vnops.c,v 1.43.2.1 1999/08/29 16:26:43 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/kernfs/kernfs.h b/sys/miscfs/kernfs/kernfs.h
index 361d4899bead..786de053bba8 100644
--- a/sys/miscfs/kernfs/kernfs.h
+++ b/sys/miscfs/kernfs/kernfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernfs.h	8.6 (Berkeley) 3/29/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/kernfs/kernfs.h,v 1.10.2.1 1999/08/29 16:26:44 peter Exp $
  */
 
 #define	_PATH_KERNFS	"/kern"		/* Default mountpoint */
diff --git a/sys/miscfs/kernfs/kernfs_vfsops.c b/sys/miscfs/kernfs/kernfs_vfsops.c
index b203d0807aec..875b75356c8e 100644
--- a/sys/miscfs/kernfs/kernfs_vfsops.c
+++ b/sys/miscfs/kernfs/kernfs_vfsops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernfs_vfsops.c	8.10 (Berkeley) 5/14/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/kernfs/kernfs_vfsops.c,v 1.24.2.1 1999/08/29 16:26:45 peter Exp $
  */
 
 /*
diff --git a/sys/miscfs/kernfs/kernfs_vnops.c b/sys/miscfs/kernfs/kernfs_vnops.c
index 940e2fc9bcb4..358d1f79f01e 100644
--- a/sys/miscfs/kernfs/kernfs_vnops.c
+++ b/sys/miscfs/kernfs/kernfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernfs_vnops.c	8.15 (Berkeley) 5/21/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/kernfs/kernfs_vnops.c,v 1.37.2.1 1999/08/29 16:26:45 peter Exp $
  */
 
 /*
diff --git a/sys/miscfs/nullfs/null.h b/sys/miscfs/nullfs/null.h
index f796d18c6706..f53a6f233750 100644
--- a/sys/miscfs/nullfs/null.h
+++ b/sys/miscfs/nullfs/null.h
@@ -35,7 +35,7 @@
  *
  *	@(#)null.h	8.3 (Berkeley) 8/20/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/nullfs/null.h,v 1.8.2.1 1999/08/29 16:26:46 peter Exp $
  */
 
 struct null_args {
diff --git a/sys/miscfs/nullfs/null_subr.c b/sys/miscfs/nullfs/null_subr.c
index 1504fc84ac0e..0efdc16eea78 100644
--- a/sys/miscfs/nullfs/null_subr.c
+++ b/sys/miscfs/nullfs/null_subr.c
@@ -35,7 +35,7 @@
  *
  *	@(#)null_subr.c	8.7 (Berkeley) 5/14/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/nullfs/null_subr.c,v 1.19.2.1 1999/08/29 16:26:46 peter Exp $
  */
 
 #include "opt_debug_nullfs.h"
diff --git a/sys/miscfs/nullfs/null_vfsops.c b/sys/miscfs/nullfs/null_vfsops.c
index f6ac5a0f749a..f8df04cb897b 100644
--- a/sys/miscfs/nullfs/null_vfsops.c
+++ b/sys/miscfs/nullfs/null_vfsops.c
@@ -36,7 +36,7 @@
  *	@(#)null_vfsops.c	8.2 (Berkeley) 1/21/94
  *
  * @(#)lofs_vfsops.c	1.2 (Berkeley) 6/18/92
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/nullfs/null_vfsops.c,v 1.28.2.1 1999/08/29 16:26:47 peter Exp $
  */
 
 /*
diff --git a/sys/miscfs/nullfs/null_vnops.c b/sys/miscfs/nullfs/null_vnops.c
index 8e3c677c54b2..14a89bf61951 100644
--- a/sys/miscfs/nullfs/null_vnops.c
+++ b/sys/miscfs/nullfs/null_vnops.c
@@ -37,11 +37,11 @@
  *
  * Ancestors:
  *	@(#)lofs_vnops.c	1.2 (Berkeley) 6/18/92
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/nullfs/null_vnops.c,v 1.30.2.1 1999/08/29 16:26:47 peter Exp $
  *	...and...
  *	@(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/nullfs/null_vnops.c,v 1.30.2.1 1999/08/29 16:26:47 peter Exp $
  */
 
 /*
diff --git a/sys/miscfs/portal/portal.h b/sys/miscfs/portal/portal.h
index 6e781455d75b..f2b364c23935 100644
--- a/sys/miscfs/portal/portal.h
+++ b/sys/miscfs/portal/portal.h
@@ -35,7 +35,7 @@
  *
  *	@(#)portal.h	8.4 (Berkeley) 1/21/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/portal/portal.h,v 1.5.2.1 1999/08/29 16:26:48 peter Exp $
  */
 
 struct portal_args {
diff --git a/sys/miscfs/portal/portal_vfsops.c b/sys/miscfs/portal/portal_vfsops.c
index d447664171f1..5e9e52418b63 100644
--- a/sys/miscfs/portal/portal_vfsops.c
+++ b/sys/miscfs/portal/portal_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vfsops.c	8.11 (Berkeley) 5/14/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/portal/portal_vfsops.c,v 1.22.2.1 1999/08/29 16:26:49 peter Exp $
  */
 
 /*
diff --git a/sys/miscfs/portal/portal_vnops.c b/sys/miscfs/portal/portal_vnops.c
index 614d211c8dc6..23653d455f5d 100644
--- a/sys/miscfs/portal/portal_vnops.c
+++ b/sys/miscfs/portal/portal_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vnops.c	8.14 (Berkeley) 5/21/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/portal/portal_vnops.c,v 1.35.2.1 1999/08/29 16:26:49 peter Exp $
  */
 
 /*
diff --git a/sys/miscfs/procfs/README b/sys/miscfs/procfs/README
index f816b321b432..891f3ce90408 100644
--- a/sys/miscfs/procfs/README
+++ b/sys/miscfs/procfs/README
@@ -110,4 +110,4 @@ the debugger, the debugger should fork and the child should stop itself
 "attach".  as before, the child will hit a breakpoint on the first
 instruction in any newly exec'd image.
 
-$FreeBSD$
+$FreeBSD: src/sys/miscfs/procfs/README,v 1.3.4.1 1999/08/29 16:26:50 peter Exp $
diff --git a/sys/miscfs/procfs/procfs.h b/sys/miscfs/procfs/procfs.h
index 271eea25d42f..6b479036fbf6 100644
--- a/sys/miscfs/procfs/procfs.h
+++ b/sys/miscfs/procfs/procfs.h
@@ -37,7 +37,7 @@
  *	@(#)procfs.h	8.9 (Berkeley) 5/14/95
  *
  * From:
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/procfs/procfs.h,v 1.21.2.1 1999/08/29 16:26:51 peter Exp $
  */
 
 /*
diff --git a/sys/miscfs/procfs/procfs_ctl.c b/sys/miscfs/procfs/procfs_ctl.c
index 4f4d84bf02af..f6367e6b38e2 100644
--- a/sys/miscfs/procfs/procfs_ctl.c
+++ b/sys/miscfs/procfs/procfs_ctl.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_ctl.c	8.4 (Berkeley) 6/15/94
  *
  * From:
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/procfs/procfs_ctl.c,v 1.17.2.1 1999/08/29 16:26:51 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_fpregs.c b/sys/miscfs/procfs/procfs_fpregs.c
index b3331e5a726e..5568597c197e 100644
--- a/sys/miscfs/procfs/procfs_fpregs.c
+++ b/sys/miscfs/procfs/procfs_fpregs.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_fpregs.c	8.2 (Berkeley) 6/15/94
  *
  * From:
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/procfs/procfs_fpregs.c,v 1.8.2.1 1999/08/29 16:26:52 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_map.c b/sys/miscfs/procfs/procfs_map.c
index 881455e12f20..9774f94a67bd 100644
--- a/sys/miscfs/procfs/procfs_map.c
+++ b/sys/miscfs/procfs/procfs_map.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_status.c	8.3 (Berkeley) 2/17/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/procfs/procfs_map.c,v 1.18.2.2 1999/08/29 16:26:52 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_mem.c b/sys/miscfs/procfs/procfs_mem.c
index 72d4bfa33e3b..c227fee0822e 100644
--- a/sys/miscfs/procfs/procfs_mem.c
+++ b/sys/miscfs/procfs/procfs_mem.c
@@ -37,7 +37,7 @@
  *
  *	@(#)procfs_mem.c	8.5 (Berkeley) 6/15/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/procfs/procfs_mem.c,v 1.35.2.1 1999/08/29 16:26:53 peter Exp $
  */
 
 /*
diff --git a/sys/miscfs/procfs/procfs_note.c b/sys/miscfs/procfs/procfs_note.c
index 273010b32956..2ebdfad1ab83 100644
--- a/sys/miscfs/procfs/procfs_note.c
+++ b/sys/miscfs/procfs/procfs_note.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_note.c	8.2 (Berkeley) 1/21/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/procfs/procfs_note.c,v 1.5.2.1 1999/08/29 16:26:53 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_regs.c b/sys/miscfs/procfs/procfs_regs.c
index 0edb9ad60639..e149db924808 100644
--- a/sys/miscfs/procfs/procfs_regs.c
+++ b/sys/miscfs/procfs/procfs_regs.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_regs.c	8.4 (Berkeley) 6/15/94
  *
  * From:
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/procfs/procfs_regs.c,v 1.8.2.1 1999/08/29 16:26:53 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_status.c b/sys/miscfs/procfs/procfs_status.c
index 150f04d6e393..d71dc5eff80b 100644
--- a/sys/miscfs/procfs/procfs_status.c
+++ b/sys/miscfs/procfs/procfs_status.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_status.c	8.4 (Berkeley) 6/15/94
  *
  * From:
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/procfs/procfs_status.c,v 1.12.2.2 1999/08/29 16:26:54 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_subr.c b/sys/miscfs/procfs/procfs_subr.c
index 13dd329bd6dd..5728a6640d20 100644
--- a/sys/miscfs/procfs/procfs_subr.c
+++ b/sys/miscfs/procfs/procfs_subr.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_subr.c	8.6 (Berkeley) 5/14/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/procfs/procfs_subr.c,v 1.22.2.1 1999/08/29 16:26:54 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_type.c b/sys/miscfs/procfs/procfs_type.c
index cb2a45f6a3d6..1f7136cc75ba 100644
--- a/sys/miscfs/procfs/procfs_type.c
+++ b/sys/miscfs/procfs/procfs_type.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/procfs/procfs_type.c,v 1.5.2.1 1999/08/29 16:26:55 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_vfsops.c b/sys/miscfs/procfs/procfs_vfsops.c
index a74fe2f06a61..27e4e141a5d4 100644
--- a/sys/miscfs/procfs/procfs_vfsops.c
+++ b/sys/miscfs/procfs/procfs_vfsops.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_vfsops.c	8.7 (Berkeley) 5/10/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/procfs/procfs_vfsops.c,v 1.26.2.1 1999/08/29 16:26:55 peter Exp $
  */
 
 /*
diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c
index 5ce200222820..f7a162571e83 100644
--- a/sys/miscfs/procfs/procfs_vnops.c
+++ b/sys/miscfs/procfs/procfs_vnops.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_vnops.c	8.18 (Berkeley) 5/21/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/procfs/procfs_vnops.c,v 1.63.2.1 1999/08/29 16:26:55 peter Exp $
  */
 
 /*
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index fa8dfbd4b114..28ea1bdd5a4d 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spec_vnops.c	8.14 (Berkeley) 5/21/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/specfs/spec_vnops.c,v 1.78.2.1 1999/08/29 16:26:57 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/specfs/specdev.h b/sys/miscfs/specfs/specdev.h
index 87f48d0dacf9..db1a8c72a890 100644
--- a/sys/miscfs/specfs/specdev.h
+++ b/sys/miscfs/specfs/specdev.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)specdev.h	8.6 (Berkeley) 5/21/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/specfs/specdev.h,v 1.15.2.1 1999/08/29 16:26:58 peter Exp $
  */
 
 /*
diff --git a/sys/miscfs/umapfs/umap.h b/sys/miscfs/umapfs/umap.h
index 09963cbe2b65..fdff8f079f86 100644
--- a/sys/miscfs/umapfs/umap.h
+++ b/sys/miscfs/umapfs/umap.h
@@ -35,7 +35,7 @@
  *
  *	@(#)umap.h	8.4 (Berkeley) 8/20/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/umapfs/umap.h,v 1.9.2.1 1999/08/29 16:26:59 peter Exp $
  */
 
 #define MAPFILEENTRIES 64
diff --git a/sys/miscfs/umapfs/umap_subr.c b/sys/miscfs/umapfs/umap_subr.c
index ed316a944cb1..e323279f1b31 100644
--- a/sys/miscfs/umapfs/umap_subr.c
+++ b/sys/miscfs/umapfs/umap_subr.c
@@ -35,7 +35,7 @@
  *
  *	@(#)umap_subr.c	8.9 (Berkeley) 5/14/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/umapfs/umap_subr.c,v 1.16.2.1 1999/08/29 16:26:59 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/umapfs/umap_vfsops.c b/sys/miscfs/umapfs/umap_vfsops.c
index d7b7ff7b64c8..9dc203b0e6d9 100644
--- a/sys/miscfs/umapfs/umap_vfsops.c
+++ b/sys/miscfs/umapfs/umap_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)umap_vfsops.c	8.8 (Berkeley) 5/14/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/umapfs/umap_vfsops.c,v 1.23.2.1 1999/08/29 16:27:00 peter Exp $
  */
 
 /*
diff --git a/sys/miscfs/umapfs/umap_vnops.c b/sys/miscfs/umapfs/umap_vnops.c
index caff96b08f0e..3050a5597071 100644
--- a/sys/miscfs/umapfs/umap_vnops.c
+++ b/sys/miscfs/umapfs/umap_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)umap_vnops.c	8.6 (Berkeley) 5/22/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/umapfs/umap_vnops.c,v 1.26.2.1 1999/08/29 16:27:00 peter Exp $
  */
 
 /*
diff --git a/sys/miscfs/union/union.h b/sys/miscfs/union/union.h
index 1fc5f996cab0..02c31fb913dc 100644
--- a/sys/miscfs/union/union.h
+++ b/sys/miscfs/union/union.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union.h	8.9 (Berkeley) 12/10/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/union/union.h,v 1.13.2.1 1999/08/29 16:27:01 peter Exp $
  */
 
 struct union_args {
diff --git a/sys/miscfs/union/union_subr.c b/sys/miscfs/union/union_subr.c
index 6334810ae622..6ceaa518df54 100644
--- a/sys/miscfs/union/union_subr.c
+++ b/sys/miscfs/union/union_subr.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_subr.c	8.20 (Berkeley) 5/20/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/union/union_subr.c,v 1.36.2.2 1999/08/29 16:27:02 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/union/union_vfsops.c b/sys/miscfs/union/union_vfsops.c
index 32f35179d233..e572ef387175 100644
--- a/sys/miscfs/union/union_vfsops.c
+++ b/sys/miscfs/union/union_vfsops.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vfsops.c	8.20 (Berkeley) 5/20/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/union/union_vfsops.c,v 1.30.2.1 1999/08/29 16:27:02 peter Exp $
  */
 
 /*
diff --git a/sys/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c
index c5420a7e0a58..b66000c0a811 100644
--- a/sys/miscfs/union/union_vnops.c
+++ b/sys/miscfs/union/union_vnops.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vnops.c	8.32 (Berkeley) 6/23/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/miscfs/union/union_vnops.c,v 1.59.2.1 1999/08/29 16:27:03 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 69fb79700c48..b291183e724c 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/Makefile,v 1.47.2.4 1999/11/22 07:08:09 julian Exp $
 
 # XXX present but broken: ip_mroute_mod
 # XXX not yet completed porting: acd
diff --git a/sys/modules/Makefile.inc b/sys/modules/Makefile.inc
index 2e4c96d251b4..6671d0e4164b 100644
--- a/sys/modules/Makefile.inc
+++ b/sys/modules/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/Makefile.inc,v 1.1.2.1 1999/08/29 16:27:04 peter Exp $
 
 KLDMOD=	true
diff --git a/sys/modules/atapi/Makefile b/sys/modules/atapi/Makefile
index a145312597c9..7bcb3b201f97 100644
--- a/sys/modules/atapi/Makefile
+++ b/sys/modules/atapi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/atapi/Makefile,v 1.12.2.1 1999/08/29 16:27:05 peter Exp $
 
 .PATH:          ${.CURDIR}/../../i386/isa
 KMOD            = atapi
diff --git a/sys/modules/ccd/Makefile b/sys/modules/ccd/Makefile
index 223ad52b8ef5..66bfb980601f 100644
--- a/sys/modules/ccd/Makefile
+++ b/sys/modules/ccd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$ 
+# $FreeBSD: src/sys/modules/ccd/Makefile,v 1.7.2.1 1999/08/29 16:27:06 peter Exp $ 
 
 .PATH:  ${.CURDIR}/../../dev/ccd
 KMOD=   ccd
diff --git a/sys/modules/cd9660/Makefile b/sys/modules/cd9660/Makefile
index 757725ac10e7..5ab049316199 100644
--- a/sys/modules/cd9660/Makefile
+++ b/sys/modules/cd9660/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cd9660/Makefile,v 1.6.2.1 1999/08/29 16:27:07 peter Exp $
 
 .PATH:	${.CURDIR}/../../isofs/cd9660
 KMOD=	cd9660
diff --git a/sys/modules/coda/Makefile b/sys/modules/coda/Makefile
index d3ce37ebd1f0..6a6676d704f5 100644
--- a/sys/modules/coda/Makefile
+++ b/sys/modules/coda/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/coda/Makefile,v 1.4.2.1 1999/08/29 16:27:08 peter Exp $
 
 .PATH:	${.CURDIR}/../../coda
 KMOD=	coda
diff --git a/sys/modules/coff/Makefile b/sys/modules/coff/Makefile
index ab7ecd123ad2..c67e226d791b 100644
--- a/sys/modules/coff/Makefile
+++ b/sys/modules/coff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/coff/Makefile,v 1.8.2.1 1999/08/29 16:27:09 peter Exp $
 
 .PATH:	${.CURDIR}/../../i386/ibcs2
 KMOD=	ibcs2_coff
diff --git a/sys/modules/fdesc/Makefile b/sys/modules/fdesc/Makefile
index 4981b5636dac..7bbb38343e1d 100644
--- a/sys/modules/fdesc/Makefile
+++ b/sys/modules/fdesc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/fdesc/Makefile,v 1.4.2.1 1999/08/29 16:27:10 peter Exp $
 
 .PATH:	${.CURDIR}/../../miscfs/fdesc
 KMOD=	fdesc
diff --git a/sys/modules/fpu/Makefile b/sys/modules/fpu/Makefile
index 66c2ad1ae02a..4a9bbed91f1d 100644
--- a/sys/modules/fpu/Makefile
+++ b/sys/modules/fpu/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/fpu/Makefile,v 1.5.2.1 1999/08/29 16:27:11 peter Exp $
 
 .PATH:  ${.CURDIR}/../../i386/i386
 KMOD=   fpu
diff --git a/sys/modules/gnufpu/Makefile b/sys/modules/gnufpu/Makefile
index d7bfb676aa6f..2545e3447d63 100644
--- a/sys/modules/gnufpu/Makefile
+++ b/sys/modules/gnufpu/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/gnufpu/Makefile,v 1.6.2.1 1999/08/29 16:27:12 peter Exp $
 
 .PATH:  ${.CURDIR}/../../gnu/i386/fpemul
 KMOD=   gnufpu
diff --git a/sys/modules/ibcs2/Makefile b/sys/modules/ibcs2/Makefile
index f9e58255f0bd..971b0e91b1fb 100644
--- a/sys/modules/ibcs2/Makefile
+++ b/sys/modules/ibcs2/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ibcs2/Makefile,v 1.23.2.1 1999/08/29 16:27:14 peter Exp $
 
 .PATH:	${.CURDIR}/../../i386/ibcs2
 KMOD=	ibcs2
diff --git a/sys/modules/ibcs2/ibcs2.8 b/sys/modules/ibcs2/ibcs2.8
index be34bd88ba48..cb820071d520 100644
--- a/sys/modules/ibcs2/ibcs2.8
+++ b/sys/modules/ibcs2/ibcs2.8
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/modules/ibcs2/ibcs2.8,v 1.6.2.4 1999/08/29 16:27:14 peter Exp $
 .\"
 .Dd November 27, 1995
 .Dt IBCS2 8
diff --git a/sys/modules/ibcs2/ibcs2.sh b/sys/modules/ibcs2/ibcs2.sh
index c8bf2a809c81..6c2016310741 100644
--- a/sys/modules/ibcs2/ibcs2.sh
+++ b/sys/modules/ibcs2/ibcs2.sh
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ibcs2/ibcs2.sh,v 1.8.2.1 1999/08/29 16:27:14 peter Exp $
 
 
 PATH=/bin:/sbin:/usr/bin:/usr/sbin; export PATH
diff --git a/sys/modules/if_disc/Makefile b/sys/modules/if_disc/Makefile
index 35984a0020ae..526321223226 100644
--- a/sys/modules/if_disc/Makefile
+++ b/sys/modules/if_disc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_disc/Makefile,v 1.6.2.1 1999/08/29 16:27:15 peter Exp $
 
 .PATH:  ${.CURDIR}/../../net
 KMOD=   if_disc
diff --git a/sys/modules/if_ppp/Makefile b/sys/modules/if_ppp/Makefile
index 6db718d378d8..e6c3b90f6a7f 100644
--- a/sys/modules/if_ppp/Makefile
+++ b/sys/modules/if_ppp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_ppp/Makefile,v 1.16.2.1 1999/08/29 16:27:16 peter Exp $
 
 .PATH:  ${.CURDIR}/../../net
 KMOD=   if_ppp
diff --git a/sys/modules/if_sl/Makefile b/sys/modules/if_sl/Makefile
index a71693269e96..df524ef750cd 100644
--- a/sys/modules/if_sl/Makefile
+++ b/sys/modules/if_sl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_sl/Makefile,v 1.7.2.1 1999/08/29 16:27:17 peter Exp $
 
 .PATH:  ${.CURDIR}/../../net
 KMOD=   if_sl
diff --git a/sys/modules/if_tun/Makefile b/sys/modules/if_tun/Makefile
index e16a41181525..8ba89624fff7 100644
--- a/sys/modules/if_tun/Makefile
+++ b/sys/modules/if_tun/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_tun/Makefile,v 1.8.2.1 1999/08/29 16:27:18 peter Exp $
 
 .PATH:  ${.CURDIR}/../../net
 KMOD=   if_tun
diff --git a/sys/modules/ip_mroute_mod/Makefile b/sys/modules/ip_mroute_mod/Makefile
index 39412bcd95a6..38683cec2b92 100644
--- a/sys/modules/ip_mroute_mod/Makefile
+++ b/sys/modules/ip_mroute_mod/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ip_mroute_mod/Makefile,v 1.4.2.1 1999/08/29 16:27:19 peter Exp $
 
 .PATH:	${.CURDIR}/../../netinet
 KMOD=	ip_mroute
diff --git a/sys/modules/ipfw/Makefile b/sys/modules/ipfw/Makefile
index 5638020ae51a..cb4416dea86c 100644
--- a/sys/modules/ipfw/Makefile
+++ b/sys/modules/ipfw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ipfw/Makefile,v 1.9.2.1 1999/08/29 16:27:20 peter Exp $
 
 .PATH:	${.CURDIR}/../../netinet
 KMOD=	ipfw
diff --git a/sys/modules/joy/Makefile b/sys/modules/joy/Makefile
index a54ef87c389f..74785aca4ede 100644
--- a/sys/modules/joy/Makefile
+++ b/sys/modules/joy/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/joy/Makefile,v 1.11.2.1 1999/08/29 16:27:21 peter Exp $
 
 .PATH:	${.CURDIR}/../../i386/isa
 KMOD	= joy
diff --git a/sys/modules/joy/joy.8 b/sys/modules/joy/joy.8
index e073e4731a47..45e218fc3821 100644
--- a/sys/modules/joy/joy.8
+++ b/sys/modules/joy/joy.8
@@ -22,7 +22,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/modules/joy/joy.8,v 1.4.2.3 1999/08/29 16:27:22 peter Exp $
 .\"
 .Dd March 16, 1996
 .Dt JOY 8
diff --git a/sys/modules/joy/joy.sh b/sys/modules/joy/joy.sh
index 48c5482eb12b..52f68ee10f35 100644
--- a/sys/modules/joy/joy.sh
+++ b/sys/modules/joy/joy.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/joy/joy.sh,v 1.4.2.1 1999/08/29 16:27:22 peter Exp $
 
 kldload joy
diff --git a/sys/modules/kernfs/Makefile b/sys/modules/kernfs/Makefile
index 1b29c5244249..0c8e801b5eda 100644
--- a/sys/modules/kernfs/Makefile
+++ b/sys/modules/kernfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/kernfs/Makefile,v 1.4.2.1 1999/08/29 16:27:23 peter Exp $
 
 .PATH:	${.CURDIR}/../../miscfs/kernfs
 KMOD=	kernfs
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index ab40571ed08b..859338ab61a4 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/linux/Makefile,v 1.24.2.2 1999/08/29 16:27:25 peter Exp $
 
 .PATH:	${.CURDIR}/../../i386/linux
 KMOD=	linux
diff --git a/sys/modules/linux/linux.8 b/sys/modules/linux/linux.8
index 5fef3eb2c17f..5a0df130689a 100644
--- a/sys/modules/linux/linux.8
+++ b/sys/modules/linux/linux.8
@@ -22,7 +22,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/modules/linux/linux.8,v 1.3.2.4 1999/08/29 16:27:25 peter Exp $
 .\"
 .Dd January 9, 1997
 .Dt LINUX 8
diff --git a/sys/modules/linux/linux.sh b/sys/modules/linux/linux.sh
index a9215cf0be71..f4fba1f3f62a 100644
--- a/sys/modules/linux/linux.sh
+++ b/sys/modules/linux/linux.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/linux/linux.sh,v 1.6.2.2 1999/12/13 08:52:19 cracauer Exp $
 
 FOUND=`kldstat -v | egrep 'linux(aout|elf)'`
 
diff --git a/sys/modules/lkm/Makefile b/sys/modules/lkm/Makefile
index 082fb2e648c7..8e51c50e5ca9 100644
--- a/sys/modules/lkm/Makefile
+++ b/sys/modules/lkm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/lkm/Makefile,v 1.1.2.1 1999/08/29 16:27:27 peter Exp $
 
 .PATH:	${.CURDIR}/../../kern
 KMOD	= lkm
diff --git a/sys/modules/mfs/Makefile b/sys/modules/mfs/Makefile
index a5cbc9e4ba73..75ab87c52dc2 100644
--- a/sys/modules/mfs/Makefile
+++ b/sys/modules/mfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mfs/Makefile,v 1.5.2.1 1999/08/29 16:27:28 peter Exp $
 
 .PATH:	${.CURDIR}/../../ufs/mfs
 KMOD=	mfs
diff --git a/sys/modules/msdos/Makefile b/sys/modules/msdos/Makefile
index 777aa2a251b6..c7536628128a 100644
--- a/sys/modules/msdos/Makefile
+++ b/sys/modules/msdos/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/msdos/Makefile,v 1.7.2.1 1999/08/29 16:27:29 peter Exp $
 
 .PATH:	${.CURDIR}/../../msdosfs
 KMOD=	msdos
diff --git a/sys/modules/netgraph/Makefile b/sys/modules/netgraph/Makefile
index 69a9f2b357ce..01df376b6d3c 100644
--- a/sys/modules/netgraph/Makefile
+++ b/sys/modules/netgraph/Makefile
@@ -1,5 +1,5 @@
 # $Whistle: Makefile,v 1.5 1999/01/24 06:48:37 archie Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/Makefile,v 1.6.2.4 1999/12/08 20:33:42 julian Exp $
 
 SUBDIR=	async bpf cisco echo frame_relay hole iface ksocket lmi netgraph \
 	ppp pppoe pptpgre rfc1490 socket tee tty UI vjc
diff --git a/sys/modules/netgraph/Makefile.inc b/sys/modules/netgraph/Makefile.inc
index 16ca171c2de7..3f37f2c286a9 100644
--- a/sys/modules/netgraph/Makefile.inc
+++ b/sys/modules/netgraph/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/Makefile.inc,v 1.1.2.1 1999/11/17 07:23:36 julian Exp $
 # $Whistle: Makefile.inc,v 1.4 1999/01/19 23:46:16 archie Exp $
 
 .PATH:		${.CURDIR}/../../../netgraph
diff --git a/sys/modules/netgraph/UI/Makefile b/sys/modules/netgraph/UI/Makefile
index cf7542ff1c29..6a4dd0316568 100644
--- a/sys/modules/netgraph/UI/Makefile
+++ b/sys/modules/netgraph/UI/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/UI/Makefile,v 1.1.2.1 1999/11/17 07:23:37 julian Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:20 archie Exp $
 
 KMOD=		ng_UI
diff --git a/sys/modules/netgraph/UI/ng_UI.8 b/sys/modules/netgraph/UI/ng_UI.8
index 74b6832a2c4e..e7c9c0fea68e 100644
--- a/sys/modules/netgraph/UI/ng_UI.8
+++ b/sys/modules/netgraph/UI/ng_UI.8
@@ -32,7 +32,7 @@
 .\" 
 .\" Author: Archie Cobbs <archie@whistle.com>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/modules/netgraph/UI/ng_UI.8,v 1.2.2.1 1999/11/17 07:23:37 julian Exp $
 .\" $Whistle: ng_UI.8,v 1.4 1999/01/25 02:37:56 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/sys/modules/netgraph/async/Makefile b/sys/modules/netgraph/async/Makefile
index 507d0e4068be..2eb40fe5c7c7 100644
--- a/sys/modules/netgraph/async/Makefile
+++ b/sys/modules/netgraph/async/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/async/Makefile,v 1.1.2.1 1999/11/17 07:23:39 julian Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:20 archie Exp $
 
 KMOD=		ng_async
diff --git a/sys/modules/netgraph/async/ng_async.8 b/sys/modules/netgraph/async/ng_async.8
index 7c061c9d6394..7704b0694c50 100644
--- a/sys/modules/netgraph/async/ng_async.8
+++ b/sys/modules/netgraph/async/ng_async.8
@@ -32,7 +32,7 @@
 .\" 
 .\" Author: Archie Cobbs <archie@whistle.com>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/modules/netgraph/async/ng_async.8,v 1.4.2.2 1999/12/01 19:29:27 julian Exp $
 .\" $Whistle: ng_async.8,v 1.6 1999/01/25 23:46:25 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/sys/modules/netgraph/bpf/Makefile b/sys/modules/netgraph/bpf/Makefile
index 704b98a1aaa9..dfaa86e88559 100644
--- a/sys/modules/netgraph/bpf/Makefile
+++ b/sys/modules/netgraph/bpf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/bpf/Makefile,v 1.2.2.1 1999/12/06 22:06:55 archie Exp $
 # $Whistle: Makefile,v 1.1 1999/12/03 01:44:28 archie Exp $
 
 KMOD=		ng_bpf
diff --git a/sys/modules/netgraph/bpf/ng_bpf.8 b/sys/modules/netgraph/bpf/ng_bpf.8
index e9079eab7d37..8de6bc967878 100644
--- a/sys/modules/netgraph/bpf/ng_bpf.8
+++ b/sys/modules/netgraph/bpf/ng_bpf.8
@@ -32,7 +32,7 @@
 .\" 
 .\" Author: Archie Cobbs <archie@whistle.com>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/modules/netgraph/bpf/ng_bpf.8,v 1.1.2.1 1999/12/06 22:06:55 archie Exp $
 .\" $Whistle: ng_bpf.8,v 1.2 1999/12/03 01:57:12 archie Exp $
 .\"
 .Dd December 2, 1999
diff --git a/sys/modules/netgraph/cisco/Makefile b/sys/modules/netgraph/cisco/Makefile
index ba91dabeb3ff..9e4e05eb5287 100644
--- a/sys/modules/netgraph/cisco/Makefile
+++ b/sys/modules/netgraph/cisco/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/cisco/Makefile,v 1.1.2.2 1999/12/01 19:41:49 julian Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:20 archie Exp $
 
 KMOD=		ng_cisco
diff --git a/sys/modules/netgraph/cisco/ng_cisco.8 b/sys/modules/netgraph/cisco/ng_cisco.8
index 26370cd42afe..86c5cdc36d63 100644
--- a/sys/modules/netgraph/cisco/ng_cisco.8
+++ b/sys/modules/netgraph/cisco/ng_cisco.8
@@ -32,7 +32,7 @@
 .\" 
 .\" Author: Archie Cobbs <archie@whistle.com>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/modules/netgraph/cisco/ng_cisco.8,v 1.2.2.2 1999/12/01 19:41:49 julian Exp $
 .\" $Whistle: ng_cisco.8,v 1.5 1999/01/25 23:46:26 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/sys/modules/netgraph/echo/Makefile b/sys/modules/netgraph/echo/Makefile
index 0c33d2fd3d0b..e15f618542c7 100644
--- a/sys/modules/netgraph/echo/Makefile
+++ b/sys/modules/netgraph/echo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/echo/Makefile,v 1.1.2.1 1999/11/17 07:23:41 julian Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:20 archie Exp $
 
 KMOD=		ng_echo
diff --git a/sys/modules/netgraph/echo/ng_echo.8 b/sys/modules/netgraph/echo/ng_echo.8
index 7e22a6f8a20e..4a9c4b1ca166 100644
--- a/sys/modules/netgraph/echo/ng_echo.8
+++ b/sys/modules/netgraph/echo/ng_echo.8
@@ -32,7 +32,7 @@
 .\" 
 .\" Author: Archie Cobbs <archie@whistle.com>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/modules/netgraph/echo/ng_echo.8,v 1.3.2.1 1999/11/17 07:23:42 julian Exp $
 .\" $Whistle: ng_echo.8,v 1.4 1999/01/25 23:46:26 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/sys/modules/netgraph/frame_relay/Makefile b/sys/modules/netgraph/frame_relay/Makefile
index 3c0117a1e830..96e495759c4f 100644
--- a/sys/modules/netgraph/frame_relay/Makefile
+++ b/sys/modules/netgraph/frame_relay/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/frame_relay/Makefile,v 1.1.2.1 1999/11/17 07:23:43 julian Exp $
 # $Whistle: Makefile,v 1.1 1999/01/19 19:39:21 archie Exp $
 
 KMOD=		ng_frame_relay
diff --git a/sys/modules/netgraph/frame_relay/ng_frame_relay.8 b/sys/modules/netgraph/frame_relay/ng_frame_relay.8
index fc9ef0f65759..ce73c2e28c32 100644
--- a/sys/modules/netgraph/frame_relay/ng_frame_relay.8
+++ b/sys/modules/netgraph/frame_relay/ng_frame_relay.8
@@ -32,7 +32,7 @@
 .\" 
 .\" Author: Archie Cobbs <archie@whistle.com>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/modules/netgraph/frame_relay/ng_frame_relay.8,v 1.3.2.1 1999/11/17 07:23:43 julian Exp $
 .\" $Whistle: ng_frame_relay.8,v 1.4 1999/01/25 23:46:26 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/sys/modules/netgraph/hole/Makefile b/sys/modules/netgraph/hole/Makefile
index f7408c12ff77..93fe72d766b4 100644
--- a/sys/modules/netgraph/hole/Makefile
+++ b/sys/modules/netgraph/hole/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/hole/Makefile,v 1.1.2.1 1999/11/17 07:23:44 julian Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:21 archie Exp $
 
 KMOD=		ng_hole
diff --git a/sys/modules/netgraph/hole/ng_hole.8 b/sys/modules/netgraph/hole/ng_hole.8
index 472b22cd6e00..cb06ed25ec55 100644
--- a/sys/modules/netgraph/hole/ng_hole.8
+++ b/sys/modules/netgraph/hole/ng_hole.8
@@ -32,7 +32,7 @@
 .\" 
 .\" Author: Archie Cobbs <archie@whistle.com>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/modules/netgraph/hole/ng_hole.8,v 1.3.2.1 1999/11/17 07:23:45 julian Exp $
 .\" $Whistle: ng_hole.8,v 1.4 1999/01/25 23:46:26 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/sys/modules/netgraph/iface/Makefile b/sys/modules/netgraph/iface/Makefile
index 49dc38e1e186..30176b6bff6a 100644
--- a/sys/modules/netgraph/iface/Makefile
+++ b/sys/modules/netgraph/iface/Makefile
@@ -1,5 +1,5 @@
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:21 archie Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/iface/Makefile,v 1.2.2.2 1999/11/17 07:46:40 julian Exp $
 
 KMOD=		ng_iface
 SRCS= 		ng_iface.c bpfilter.h opt_inet.h opt_atalk.h opt_ipx.h
diff --git a/sys/modules/netgraph/iface/ng_iface.8 b/sys/modules/netgraph/iface/ng_iface.8
index 7cb1884c16a9..301f2a0c47e2 100644
--- a/sys/modules/netgraph/iface/ng_iface.8
+++ b/sys/modules/netgraph/iface/ng_iface.8
@@ -32,7 +32,7 @@
 .\" 
 .\" Author: Archie Cobbs <archie@whistle.com>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/modules/netgraph/iface/ng_iface.8,v 1.3.2.1 1999/11/17 07:23:46 julian Exp $
 .\" $Whistle: ng_iface.8,v 1.5 1999/01/25 23:46:26 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/sys/modules/netgraph/ksocket/Makefile b/sys/modules/netgraph/ksocket/Makefile
index 5baadf7d8f85..063f4110b896 100644
--- a/sys/modules/netgraph/ksocket/Makefile
+++ b/sys/modules/netgraph/ksocket/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/ksocket/Makefile,v 1.1.2.1 1999/11/17 07:23:47 julian Exp $
 
 KMOD=		ng_ksocket
 SRCS= 		ng_ksocket.c
diff --git a/sys/modules/netgraph/ksocket/ng_ksocket.8 b/sys/modules/netgraph/ksocket/ng_ksocket.8
index d32c2cf357ff..682a0556a1a6 100644
--- a/sys/modules/netgraph/ksocket/ng_ksocket.8
+++ b/sys/modules/netgraph/ksocket/ng_ksocket.8
@@ -32,7 +32,7 @@
 .\" 
 .\" Author: Archie Cobbs <archie@whistle.com>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/modules/netgraph/ksocket/ng_ksocket.8,v 1.1.2.2 1999/12/01 19:41:50 julian Exp $
 .\"
 .Dd November 15, 1999
 .Dt NG_KSOCKET 8
diff --git a/sys/modules/netgraph/lmi/Makefile b/sys/modules/netgraph/lmi/Makefile
index 9b4c07edeb99..8a39bc3c2555 100644
--- a/sys/modules/netgraph/lmi/Makefile
+++ b/sys/modules/netgraph/lmi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/lmi/Makefile,v 1.1.2.1 1999/11/17 07:23:48 julian Exp $
 # $Whistle: Makefile,v 1.1 1999/01/19 19:39:21 archie Exp $
 
 KMOD=		ng_lmi
diff --git a/sys/modules/netgraph/lmi/ng_lmi.8 b/sys/modules/netgraph/lmi/ng_lmi.8
index 2ce52a7dfbd1..668faa51122b 100644
--- a/sys/modules/netgraph/lmi/ng_lmi.8
+++ b/sys/modules/netgraph/lmi/ng_lmi.8
@@ -32,7 +32,7 @@
 .\" 
 .\" Author: Archie Cobbs <archie@whistle.com>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/modules/netgraph/lmi/ng_lmi.8,v 1.3.2.1 1999/11/17 07:23:49 julian Exp $
 .\" $Whistle: ng_lmi.8,v 1.4 1999/01/25 23:46:27 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/sys/modules/netgraph/netgraph/Makefile b/sys/modules/netgraph/netgraph/Makefile
index eaaf4acfe900..44a6e8209887 100644
--- a/sys/modules/netgraph/netgraph/Makefile
+++ b/sys/modules/netgraph/netgraph/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/netgraph/Makefile,v 1.1.2.2 1999/12/01 19:41:51 julian Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
 
 KMOD=		netgraph
diff --git a/sys/modules/netgraph/netgraph/netgraph.4 b/sys/modules/netgraph/netgraph/netgraph.4
index 46cc6583b8b0..51a1e27c7426 100644
--- a/sys/modules/netgraph/netgraph/netgraph.4
+++ b/sys/modules/netgraph/netgraph/netgraph.4
@@ -33,7 +33,7 @@
 .\" Authors: Julian Elischer <julian@whistle.com>
 .\"          Archie Cobbs <archie@whistle.com>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/modules/netgraph/netgraph/netgraph.4,v 1.2.2.3 1999/12/01 19:41:51 julian Exp $
 .\" $Whistle: netgraph.4,v 1.7 1999/01/28 23:54:52 julian Exp $
 .\"
 .Dd January 19, 1999
diff --git a/sys/modules/netgraph/ppp/Makefile b/sys/modules/netgraph/ppp/Makefile
index 590e10ac1c4f..609d7444baa6 100644
--- a/sys/modules/netgraph/ppp/Makefile
+++ b/sys/modules/netgraph/ppp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/ppp/Makefile,v 1.1.2.1 1999/11/17 07:23:52 julian Exp $
 # $Whistle: Makefile,v 1.1 1999/01/24 02:52:12 archie Exp $
 
 KMOD=		ng_ppp
diff --git a/sys/modules/netgraph/ppp/ng_ppp.8 b/sys/modules/netgraph/ppp/ng_ppp.8
index ac23ee47071e..55eb53324036 100644
--- a/sys/modules/netgraph/ppp/ng_ppp.8
+++ b/sys/modules/netgraph/ppp/ng_ppp.8
@@ -32,7 +32,7 @@
 .\" 
 .\" Author: Archie Cobbs <archie@whistle.com>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/modules/netgraph/ppp/ng_ppp.8,v 1.5.2.2 1999/12/01 19:29:29 julian Exp $
 .\" $Whistle: ng_ppp.8,v 1.3 1999/01/25 23:46:27 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/sys/modules/netgraph/pppoe/Makefile b/sys/modules/netgraph/pppoe/Makefile
index ed3756f1a492..8f6905b59a28 100644
--- a/sys/modules/netgraph/pppoe/Makefile
+++ b/sys/modules/netgraph/pppoe/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/pppoe/Makefile,v 1.1.2.1 1999/11/17 07:23:53 julian Exp $
 # $Whistle: Makefile,v 1.1 1999/01/19 19:39:21 archie Exp $
 
 KMOD=		ng_pppoe
diff --git a/sys/modules/netgraph/pppoe/ng_pppoe.8 b/sys/modules/netgraph/pppoe/ng_pppoe.8
index 69d0016707f3..2cb259ae6411 100644
--- a/sys/modules/netgraph/pppoe/ng_pppoe.8
+++ b/sys/modules/netgraph/pppoe/ng_pppoe.8
@@ -32,7 +32,7 @@
 .\" 
 .\" Author: Archie Cobbs <archie@whistle.com>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/modules/netgraph/pppoe/ng_pppoe.8,v 1.4.2.3 1999/12/01 19:41:51 julian Exp $
 .\" $Whistle: ng_pppoe.8,v 1.1 1999/01/25 23:46:27 archie Exp $
 .\"
 .Dd October 28, 1999
diff --git a/sys/modules/netgraph/pptpgre/Makefile b/sys/modules/netgraph/pptpgre/Makefile
index b8602e3eb83f..c47c03e67fbe 100644
--- a/sys/modules/netgraph/pptpgre/Makefile
+++ b/sys/modules/netgraph/pptpgre/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/pptpgre/Makefile,v 1.1.2.1 1999/12/08 19:44:11 julian Exp $
 # $Whistle: Makefile,v 1.1 1999/11/29 23:14:33 archie Exp $
 
 KMOD=		ng_pptpgre
diff --git a/sys/modules/netgraph/pptpgre/ng_pptpgre.8 b/sys/modules/netgraph/pptpgre/ng_pptpgre.8
index 7eadcc33531c..878861f77a12 100644
--- a/sys/modules/netgraph/pptpgre/ng_pptpgre.8
+++ b/sys/modules/netgraph/pptpgre/ng_pptpgre.8
@@ -32,7 +32,7 @@
 .\" 
 .\" Author: Archie Cobbs <archie@whistle.com>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/modules/netgraph/pptpgre/ng_pptpgre.8,v 1.1.2.2 1999/12/10 19:31:33 archie Exp $
 .\" $Whistle: ng_pptpgre.8,v 1.2 1999/12/08 00:20:53 archie Exp $
 .\"
 .Dd November 29, 1999
diff --git a/sys/modules/netgraph/rfc1490/Makefile b/sys/modules/netgraph/rfc1490/Makefile
index ac7562dafaf2..388b12e68361 100644
--- a/sys/modules/netgraph/rfc1490/Makefile
+++ b/sys/modules/netgraph/rfc1490/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/rfc1490/Makefile,v 1.1.2.1 1999/11/17 07:23:54 julian Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
 
 KMOD=		ng_rfc1490
diff --git a/sys/modules/netgraph/rfc1490/ng_rfc1490.8 b/sys/modules/netgraph/rfc1490/ng_rfc1490.8
index a2aa9d008deb..9b2e50a14474 100644
--- a/sys/modules/netgraph/rfc1490/ng_rfc1490.8
+++ b/sys/modules/netgraph/rfc1490/ng_rfc1490.8
@@ -32,7 +32,7 @@
 .\" 
 .\" Author: Archie Cobbs <archie@whistle.com>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/modules/netgraph/rfc1490/ng_rfc1490.8,v 1.3.2.1 1999/11/17 07:23:55 julian Exp $
 .\" $Whistle: ng_rfc1490.8,v 1.4 1999/01/25 23:46:27 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/sys/modules/netgraph/socket/Makefile b/sys/modules/netgraph/socket/Makefile
index d2779b3cb16a..237f2b69f365 100644
--- a/sys/modules/netgraph/socket/Makefile
+++ b/sys/modules/netgraph/socket/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/socket/Makefile,v 1.1.2.1 1999/11/17 07:23:55 julian Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
 
 KMOD=		ng_socket
diff --git a/sys/modules/netgraph/socket/ng_socket.8 b/sys/modules/netgraph/socket/ng_socket.8
index cb224bca809e..e5cb91f0ee6c 100644
--- a/sys/modules/netgraph/socket/ng_socket.8
+++ b/sys/modules/netgraph/socket/ng_socket.8
@@ -32,7 +32,7 @@
 .\" 
 .\" Author: Archie Cobbs <archie@whistle.com>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/modules/netgraph/socket/ng_socket.8,v 1.4.2.3 1999/11/21 23:21:13 julian Exp $
 .\" $Whistle: ng_socket.8,v 1.5 1999/01/25 23:46:27 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/sys/modules/netgraph/tee/Makefile b/sys/modules/netgraph/tee/Makefile
index 118668f05634..5608dfc9c468 100644
--- a/sys/modules/netgraph/tee/Makefile
+++ b/sys/modules/netgraph/tee/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/tee/Makefile,v 1.1.2.1 1999/11/17 07:23:57 julian Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
 
 KMOD=		ng_tee
diff --git a/sys/modules/netgraph/tee/ng_tee.8 b/sys/modules/netgraph/tee/ng_tee.8
index 1a774e65ede5..ef189e08d83f 100644
--- a/sys/modules/netgraph/tee/ng_tee.8
+++ b/sys/modules/netgraph/tee/ng_tee.8
@@ -32,7 +32,7 @@
 .\" 
 .\" Author: Archie Cobbs <archie@whistle.com>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/modules/netgraph/tee/ng_tee.8,v 1.4.2.1 1999/11/17 07:23:57 julian Exp $
 .\" $Whistle: ng_tee.8,v 1.4 1999/01/25 23:46:27 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/sys/modules/netgraph/tty/Makefile b/sys/modules/netgraph/tty/Makefile
index 5b9bd20c4200..16aeaf9b9d40 100644
--- a/sys/modules/netgraph/tty/Makefile
+++ b/sys/modules/netgraph/tty/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/tty/Makefile,v 1.1.2.1 1999/11/17 07:23:58 julian Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
 
 KMOD=		ng_tty
diff --git a/sys/modules/netgraph/tty/ng_tty.8 b/sys/modules/netgraph/tty/ng_tty.8
index c3f0aa567530..5aaaebc48e1a 100644
--- a/sys/modules/netgraph/tty/ng_tty.8
+++ b/sys/modules/netgraph/tty/ng_tty.8
@@ -32,7 +32,7 @@
 .\" 
 .\" Author: Archie Cobbs <archie@whistle.com>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/modules/netgraph/tty/ng_tty.8,v 1.3.2.1 1999/11/17 07:23:59 julian Exp $
 .\" $Whistle: ng_tty.8,v 1.5 1999/01/25 23:46:28 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/sys/modules/netgraph/vjc/Makefile b/sys/modules/netgraph/vjc/Makefile
index b27f7675a027..00880c475d2c 100644
--- a/sys/modules/netgraph/vjc/Makefile
+++ b/sys/modules/netgraph/vjc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/vjc/Makefile,v 1.1.2.3 1999/12/08 19:44:13 julian Exp $
 # $Whistle: Makefile,v 1.1 1999/01/24 06:48:07 archie Exp $
 
 KMOD=		ng_vjc
diff --git a/sys/modules/netgraph/vjc/ng_vjc.8 b/sys/modules/netgraph/vjc/ng_vjc.8
index c86be55c68b5..25943f844262 100644
--- a/sys/modules/netgraph/vjc/ng_vjc.8
+++ b/sys/modules/netgraph/vjc/ng_vjc.8
@@ -32,7 +32,7 @@
 .\" 
 .\" Author: Archie Cobbs <archie@whistle.com>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/modules/netgraph/vjc/ng_vjc.8,v 1.5.2.3 1999/12/08 19:44:14 julian Exp $
 .\" $Whistle: ng_vjc.8,v 1.4 1999/01/25 23:46:28 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/sys/modules/nfs/Makefile b/sys/modules/nfs/Makefile
index 113d58922c05..f5c9aca8074f 100644
--- a/sys/modules/nfs/Makefile
+++ b/sys/modules/nfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/nfs/Makefile,v 1.11.2.1 1999/08/29 16:27:30 peter Exp $
 
 .PATH: ${.CURDIR}/../../nfs
 KMOD=	nfs
diff --git a/sys/modules/ntfs/Makefile b/sys/modules/ntfs/Makefile
index 0aea8277177b..9932e4b4ea8c 100644
--- a/sys/modules/ntfs/Makefile
+++ b/sys/modules/ntfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ntfs/Makefile,v 1.1.1.1.2.2 1999/08/29 16:27:31 peter Exp $
 
 .PATH:	${.CURDIR}/../../ntfs
 KMOD=	ntfs
diff --git a/sys/modules/nullfs/Makefile b/sys/modules/nullfs/Makefile
index 3fd3568b8686..ffcfa85df0e0 100644
--- a/sys/modules/nullfs/Makefile
+++ b/sys/modules/nullfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/nullfs/Makefile,v 1.7.2.1 1999/08/29 16:27:32 peter Exp $
 
 .PATH:	${.CURDIR}/../../miscfs/nullfs
 KMOD=	null
diff --git a/sys/modules/pcic/Makefile b/sys/modules/pcic/Makefile
index 3cf397460710..701cffbbfb4a 100644
--- a/sys/modules/pcic/Makefile
+++ b/sys/modules/pcic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/pcic/Makefile,v 1.8.2.1 1999/08/29 16:27:33 peter Exp $
 
 .PATH:  ${.CURDIR}/../../pccard
 KMOD=   pcic
diff --git a/sys/modules/portal/Makefile b/sys/modules/portal/Makefile
index f6037ff996f5..a366c956f757 100644
--- a/sys/modules/portal/Makefile
+++ b/sys/modules/portal/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/portal/Makefile,v 1.4.2.1 1999/08/29 16:27:34 peter Exp $
 
 .PATH:	${.CURDIR}/../../miscfs/portal
 KMOD=	portal
diff --git a/sys/modules/procfs/Makefile b/sys/modules/procfs/Makefile
index 03cb6ade586e..7c051e2a53b5 100644
--- a/sys/modules/procfs/Makefile
+++ b/sys/modules/procfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/procfs/Makefile,v 1.13.2.1 1999/08/29 16:27:35 peter Exp $
 
 .PATH:	${.CURDIR}/../../miscfs/procfs
 KMOD=	procfs
diff --git a/sys/modules/splash/Makefile b/sys/modules/splash/Makefile
index 1c634bf4bf98..87468e10653d 100644
--- a/sys/modules/splash/Makefile
+++ b/sys/modules/splash/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/splash/Makefile,v 1.1.2.2 1999/08/29 16:27:36 peter Exp $
 
 SUBDIR=	bmp pcx
 
diff --git a/sys/modules/splash/Makefile.inc b/sys/modules/splash/Makefile.inc
index 265f86d1ed55..389ce0280232 100644
--- a/sys/modules/splash/Makefile.inc
+++ b/sys/modules/splash/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/splash/Makefile.inc,v 1.1.2.1 1999/08/29 16:27:37 peter Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/splash/bmp/Makefile b/sys/modules/splash/bmp/Makefile
index af009a282619..948f5f2b7026 100644
--- a/sys/modules/splash/bmp/Makefile
+++ b/sys/modules/splash/bmp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/splash/bmp/Makefile,v 1.1.2.1 1999/08/29 16:27:38 peter Exp $
 
 KMOD=	splash_bmp
 SRCS= 	splash_bmp.c
diff --git a/sys/modules/splash/bmp/splash_bmp.c b/sys/modules/splash/bmp/splash_bmp.c
index 0512a62f503b..ca6b76bb53e5 100644
--- a/sys/modules/splash/bmp/splash_bmp.c
+++ b/sys/modules/splash/bmp/splash_bmp.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/modules/splash/bmp/splash_bmp.c,v 1.3.2.5 1999/08/29 16:27:38 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/splash/pcx/Makefile b/sys/modules/splash/pcx/Makefile
index a64a61864db2..d445ee436d48 100644
--- a/sys/modules/splash/pcx/Makefile
+++ b/sys/modules/splash/pcx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/splash/pcx/Makefile,v 1.2.2.1 1999/08/29 16:27:39 peter Exp $
 
 KMOD=	splash_pcx
 SRCS=	splash_pcx.c
diff --git a/sys/modules/splash/pcx/splash_pcx.c b/sys/modules/splash/pcx/splash_pcx.c
index 9fd3c22d3b69..67d25d24424e 100644
--- a/sys/modules/splash/pcx/splash_pcx.c
+++ b/sys/modules/splash/pcx/splash_pcx.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/modules/splash/pcx/splash_pcx.c,v 1.1.2.1 1999/08/29 16:27:40 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/syscons/Makefile b/sys/modules/syscons/Makefile
index f73f48f1f27f..b0f4730936d7 100644
--- a/sys/modules/syscons/Makefile
+++ b/sys/modules/syscons/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/Makefile,v 1.7.2.3 1999/10/13 19:12:59 nsayer Exp $
 
 SUBDIR=	apm blank daemon fade green logo rain snake star warp fire
 
diff --git a/sys/modules/syscons/Makefile.inc b/sys/modules/syscons/Makefile.inc
index 265f86d1ed55..eee6e0ef7339 100644
--- a/sys/modules/syscons/Makefile.inc
+++ b/sys/modules/syscons/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/Makefile.inc,v 1.1.2.1 1999/08/29 16:27:41 peter Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/syscons/apm/Makefile b/sys/modules/syscons/apm/Makefile
index 00a889f90e97..5ee8c15a8030 100644
--- a/sys/modules/syscons/apm/Makefile
+++ b/sys/modules/syscons/apm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/apm/Makefile,v 1.1.2.1 1999/10/13 19:13:01 nsayer Exp $
 
 KMOD=	apm_saver
 SRCS= 	apm_saver.c
diff --git a/sys/modules/syscons/apm/apm_saver.c b/sys/modules/syscons/apm/apm_saver.c
index ab6418a7ec5c..a355822dc778 100644
--- a/sys/modules/syscons/apm/apm_saver.c
+++ b/sys/modules/syscons/apm/apm_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/modules/syscons/apm/apm_saver.c,v 1.1.2.1 1999/10/13 19:13:01 nsayer Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/syscons/blank/Makefile b/sys/modules/syscons/blank/Makefile
index e299c924f7a9..74cf7ac3cd9c 100644
--- a/sys/modules/syscons/blank/Makefile
+++ b/sys/modules/syscons/blank/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/blank/Makefile,v 1.8.2.1 1999/08/29 16:27:43 peter Exp $
 
 KMOD=	blank_saver
 SRCS= 	blank_saver.c
diff --git a/sys/modules/syscons/blank/blank_saver.c b/sys/modules/syscons/blank/blank_saver.c
index e81e67a2ba48..b9802ff154ed 100644
--- a/sys/modules/syscons/blank/blank_saver.c
+++ b/sys/modules/syscons/blank/blank_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/modules/syscons/blank/blank_saver.c,v 1.15.2.1 1999/08/29 16:27:43 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/syscons/daemon/Makefile b/sys/modules/syscons/daemon/Makefile
index ea3407784191..f7579b534b34 100644
--- a/sys/modules/syscons/daemon/Makefile
+++ b/sys/modules/syscons/daemon/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/daemon/Makefile,v 1.5.2.1 1999/08/29 16:27:44 peter Exp $
 
 KMOD=	daemon_saver
 SRCS= 	daemon_saver.c
diff --git a/sys/modules/syscons/daemon/daemon_saver.c b/sys/modules/syscons/daemon/daemon_saver.c
index 92eb3ae673ab..6c7aae60f54d 100644
--- a/sys/modules/syscons/daemon/daemon_saver.c
+++ b/sys/modules/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/modules/syscons/daemon/daemon_saver.c,v 1.14.2.2 1999/08/29 16:27:45 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/syscons/fade/Makefile b/sys/modules/syscons/fade/Makefile
index 5fc34ebfe19c..4a647e4aa3d8 100644
--- a/sys/modules/syscons/fade/Makefile
+++ b/sys/modules/syscons/fade/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/fade/Makefile,v 1.8.2.1 1999/08/29 16:27:46 peter Exp $
 
 KMOD=	fade_saver
 SRCS= 	fade_saver.c
diff --git a/sys/modules/syscons/fade/fade_saver.c b/sys/modules/syscons/fade/fade_saver.c
index 73e61aa8cd46..3013b7f359ce 100644
--- a/sys/modules/syscons/fade/fade_saver.c
+++ b/sys/modules/syscons/fade/fade_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/modules/syscons/fade/fade_saver.c,v 1.16.2.1 1999/08/29 16:27:46 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/syscons/fire/fire_saver.c b/sys/modules/syscons/fire/fire_saver.c
index bcb8850e66f5..665ba6ba2052 100644
--- a/sys/modules/syscons/fire/fire_saver.c
+++ b/sys/modules/syscons/fire/fire_saver.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/modules/syscons/fire/fire_saver.c,v 1.2.2.2 1999/08/29 16:27:47 peter Exp $
  */
 
 /*
diff --git a/sys/modules/syscons/green/Makefile b/sys/modules/syscons/green/Makefile
index f62b1f4a2757..f93e8403da1a 100644
--- a/sys/modules/syscons/green/Makefile
+++ b/sys/modules/syscons/green/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/green/Makefile,v 1.8.2.1 1999/08/29 16:27:49 peter Exp $
 
 KMOD=	green_saver
 SRCS= 	green_saver.c
diff --git a/sys/modules/syscons/green/green_saver.c b/sys/modules/syscons/green/green_saver.c
index b16329ae0848..83e8bea4c27d 100644
--- a/sys/modules/syscons/green/green_saver.c
+++ b/sys/modules/syscons/green/green_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/modules/syscons/green/green_saver.c,v 1.15.2.1 1999/08/29 16:27:49 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/syscons/logo/Makefile b/sys/modules/syscons/logo/Makefile
index 2a9ede26cce9..cdb519ec77fd 100644
--- a/sys/modules/syscons/logo/Makefile
+++ b/sys/modules/syscons/logo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/logo/Makefile,v 1.2.2.1 1999/08/29 16:27:50 peter Exp $
 
 KMOD=	logo_saver
 SRCS= 	logo_saver.c
diff --git a/sys/modules/syscons/logo/logo_saver.c b/sys/modules/syscons/logo/logo_saver.c
index cfc3858c34e6..e5b21614ca78 100644
--- a/sys/modules/syscons/logo/logo_saver.c
+++ b/sys/modules/syscons/logo/logo_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/modules/syscons/logo/logo_saver.c,v 1.4.2.3 1999/08/29 16:27:50 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/syscons/rain/Makefile b/sys/modules/syscons/rain/Makefile
index ecc5ec332581..6898f2aa2501 100644
--- a/sys/modules/syscons/rain/Makefile
+++ b/sys/modules/syscons/rain/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/rain/Makefile,v 1.1.2.1 1999/08/29 16:27:51 peter Exp $
 
 KMOD=	rain_saver
 SRCS= 	rain_saver.c
diff --git a/sys/modules/syscons/rain/rain_saver.c b/sys/modules/syscons/rain/rain_saver.c
index 3ae57a2c2e31..f78724cc0d20 100644
--- a/sys/modules/syscons/rain/rain_saver.c
+++ b/sys/modules/syscons/rain/rain_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/modules/syscons/rain/rain_saver.c,v 1.2.2.2 1999/08/29 16:27:52 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/syscons/saver.h b/sys/modules/syscons/saver.h
index c8c57cadb975..177c6692a646 100644
--- a/sys/modules/syscons/saver.h
+++ b/sys/modules/syscons/saver.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/modules/syscons/saver.h,v 1.16.2.2 1999/08/29 16:27:41 peter Exp $
  */
 #include <machine/apm_bios.h>
 #include <machine/console.h>
diff --git a/sys/modules/syscons/snake/Makefile b/sys/modules/syscons/snake/Makefile
index 6dab3edc9ac2..7e0c002c9662 100644
--- a/sys/modules/syscons/snake/Makefile
+++ b/sys/modules/syscons/snake/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/snake/Makefile,v 1.8.2.1 1999/08/29 16:27:53 peter Exp $
 
 KMOD=	snake_saver
 SRCS= 	snake_saver.c
diff --git a/sys/modules/syscons/snake/snake_saver.c b/sys/modules/syscons/snake/snake_saver.c
index 3c01418ab87c..02ca8ce44ed1 100644
--- a/sys/modules/syscons/snake/snake_saver.c
+++ b/sys/modules/syscons/snake/snake_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/modules/syscons/snake/snake_saver.c,v 1.22.2.2 1999/08/29 16:27:54 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/syscons/star/Makefile b/sys/modules/syscons/star/Makefile
index 7ae11d782852..f825b7a5525f 100644
--- a/sys/modules/syscons/star/Makefile
+++ b/sys/modules/syscons/star/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/star/Makefile,v 1.8.2.1 1999/08/29 16:27:54 peter Exp $
 
 KMOD=	star_saver
 SRCS= 	star_saver.c
diff --git a/sys/modules/syscons/star/star_saver.c b/sys/modules/syscons/star/star_saver.c
index 958749014b64..c69dbed13d19 100644
--- a/sys/modules/syscons/star/star_saver.c
+++ b/sys/modules/syscons/star/star_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/modules/syscons/star/star_saver.c,v 1.19.2.2 1999/08/29 16:27:55 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/syscons/warp/Makefile b/sys/modules/syscons/warp/Makefile
index 45a3af9ecb23..33a2c75eab75 100644
--- a/sys/modules/syscons/warp/Makefile
+++ b/sys/modules/syscons/warp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/warp/Makefile,v 1.2.2.1 1999/08/29 16:27:56 peter Exp $
 
 KMOD=	warp_saver
 SRCS= 	warp_saver.c
diff --git a/sys/modules/syscons/warp/warp_saver.c b/sys/modules/syscons/warp/warp_saver.c
index 68e1dcf2d51a..8e693e4f06a5 100644
--- a/sys/modules/syscons/warp/warp_saver.c
+++ b/sys/modules/syscons/warp/warp_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/modules/syscons/warp/warp_saver.c,v 1.4.2.2 1999/08/29 16:27:57 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/umapfs/Makefile b/sys/modules/umapfs/Makefile
index 28acc62ee646..16405555e896 100644
--- a/sys/modules/umapfs/Makefile
+++ b/sys/modules/umapfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/umapfs/Makefile,v 1.4.2.1 1999/08/29 16:27:58 peter Exp $
 
 .PATH:	${.CURDIR}/../../miscfs/umapfs
 KMOD=	umap
diff --git a/sys/modules/union/Makefile b/sys/modules/union/Makefile
index ff0ab8a32539..72d47d931c58 100644
--- a/sys/modules/union/Makefile
+++ b/sys/modules/union/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/union/Makefile,v 1.4.2.1 1999/08/29 16:27:59 peter Exp $
 
 .PATH:	${.CURDIR}/../../miscfs/union
 KMOD=	union
diff --git a/sys/modules/vesa/Makefile b/sys/modules/vesa/Makefile
index 3cc7d6fcf850..7725a5670c24 100644
--- a/sys/modules/vesa/Makefile
+++ b/sys/modules/vesa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/vesa/Makefile,v 1.5.2.1 1999/08/29 16:28:00 peter Exp $
 
 .PATH:	${.CURDIR}/../../dev/syscons ${.CURDIR}/../../i386/isa
 KMOD	=	vesa
diff --git a/sys/modules/vinum/Makefile b/sys/modules/vinum/Makefile
index b717bbc2b7f1..c6f0bf9b3c84 100644
--- a/sys/modules/vinum/Makefile
+++ b/sys/modules/vinum/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$ 
+# $FreeBSD: src/sys/modules/vinum/Makefile,v 1.7.2.4 1999/08/29 16:28:01 peter Exp $ 
 
 MAINTAINER  =  grog@FreeBSD.org
 SOURCE=	${.CURDIR}/../../dev/vinum
diff --git a/sys/msdosfs/bootsect.h b/sys/msdosfs/bootsect.h
index 666c0f8f41b1..d96245fe153a 100644
--- a/sys/msdosfs/bootsect.h
+++ b/sys/msdosfs/bootsect.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/msdosfs/bootsect.h,v 1.6.2.1 1999/08/29 16:28:02 peter Exp $ */
 /*	$NetBSD: bootsect.h,v 1.9 1997/11/17 15:36:17 ws Exp $	*/
 
 /*
diff --git a/sys/msdosfs/bpb.h b/sys/msdosfs/bpb.h
index 88b9eefb859a..3ed2a1d48fd8 100644
--- a/sys/msdosfs/bpb.h
+++ b/sys/msdosfs/bpb.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/msdosfs/bpb.h,v 1.6.2.1 1999/08/29 16:28:03 peter Exp $ */
 /*	$NetBSD: bpb.h,v 1.7 1997/11/17 15:36:24 ws Exp $	*/
 
 /*
diff --git a/sys/msdosfs/denode.h b/sys/msdosfs/denode.h
index 49eac87a2075..a534a0f74129 100644
--- a/sys/msdosfs/denode.h
+++ b/sys/msdosfs/denode.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/msdosfs/denode.h,v 1.18.2.1 1999/08/29 16:28:03 peter Exp $ */
 /*	$NetBSD: denode.h,v 1.25 1997/11/17 15:36:28 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/direntry.h b/sys/msdosfs/direntry.h
index 3225b78b8936..ea7f85a52539 100644
--- a/sys/msdosfs/direntry.h
+++ b/sys/msdosfs/direntry.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/msdosfs/direntry.h,v 1.13.2.1 1999/08/29 16:28:04 peter Exp $ */
 /*	$NetBSD: direntry.h,v 1.14 1997/11/17 15:36:32 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/fat.h b/sys/msdosfs/fat.h
index 9f20cbae4199..361d7f05b94d 100644
--- a/sys/msdosfs/fat.h
+++ b/sys/msdosfs/fat.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/msdosfs/fat.h,v 1.7.2.1 1999/08/29 16:28:05 peter Exp $ */
 /*	$NetBSD: fat.h,v 1.12 1997/11/17 15:36:36 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/msdosfs_conv.c b/sys/msdosfs/msdosfs_conv.c
index 8c43f93c0adc..00fbd348b0b6 100644
--- a/sys/msdosfs/msdosfs_conv.c
+++ b/sys/msdosfs/msdosfs_conv.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/msdosfs/msdosfs_conv.c,v 1.28.2.1 1999/08/29 16:28:05 peter Exp $ */
 /*	$NetBSD: msdosfs_conv.c,v 1.25 1997/11/17 15:36:40 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/msdosfs_denode.c b/sys/msdosfs/msdosfs_denode.c
index 7fb398c6615b..4ee84a97c715 100644
--- a/sys/msdosfs/msdosfs_denode.c
+++ b/sys/msdosfs/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/msdosfs/msdosfs_denode.c,v 1.44.2.1 1999/08/29 16:28:05 peter Exp $ */
 /*	$NetBSD: msdosfs_denode.c,v 1.28 1998/02/10 14:10:00 mrg Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/msdosfs_fat.c b/sys/msdosfs/msdosfs_fat.c
index fae002774668..8fff541dce62 100644
--- a/sys/msdosfs/msdosfs_fat.c
+++ b/sys/msdosfs/msdosfs_fat.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/msdosfs/msdosfs_fat.c,v 1.21.2.1 1999/08/29 16:28:06 peter Exp $ */
 /*	$NetBSD: msdosfs_fat.c,v 1.28 1997/11/17 15:36:49 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/msdosfs_lookup.c b/sys/msdosfs/msdosfs_lookup.c
index 578c483a4ae5..06f7544dc8c1 100644
--- a/sys/msdosfs/msdosfs_lookup.c
+++ b/sys/msdosfs/msdosfs_lookup.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/msdosfs/msdosfs_lookup.c,v 1.28.2.1 1999/08/29 16:28:07 peter Exp $ */
 /*	$NetBSD: msdosfs_lookup.c,v 1.37 1997/11/17 15:36:54 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c
index 366b23684f81..83ebd0effccd 100644
--- a/sys/msdosfs/msdosfs_vfsops.c
+++ b/sys/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/msdosfs/msdosfs_vfsops.c,v 1.39.2.2 1999/08/29 16:28:07 peter Exp $ */
 /*	$NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index 10601daaca86..e455217ca6bc 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/msdosfs/msdosfs_vnops.c,v 1.80.2.1 1999/08/29 16:28:07 peter Exp $ */
 /*	$NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/msdosfsmount.h b/sys/msdosfs/msdosfsmount.h
index 6bd6551341f0..1d69dcdfb3ef 100644
--- a/sys/msdosfs/msdosfsmount.h
+++ b/sys/msdosfs/msdosfsmount.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/msdosfs/msdosfsmount.h,v 1.16.2.1 1999/08/29 16:28:08 peter Exp $ */
 /*	$NetBSD: msdosfsmount.h,v 1.17 1997/11/17 15:37:07 ws Exp $	*/
 
 /*-
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index 7c60765f83b1..46a2973cf41b 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -37,7 +37,7 @@
  *
  *      @(#)bpf.c	8.2 (Berkeley) 3/28/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/bpf.c,v 1.46.2.1 1999/08/29 16:28:09 peter Exp $
  */
 
 #include "bpfilter.h"
diff --git a/sys/net/bpf.h b/sys/net/bpf.h
index 7477f79bf247..8a797a8ef482 100644
--- a/sys/net/bpf.h
+++ b/sys/net/bpf.h
@@ -38,7 +38,7 @@
  *      @(#)bpf.h	8.1 (Berkeley) 6/10/93
  *	@(#)bpf.h	1.34 (LBL)     6/16/96
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/bpf.h,v 1.16.2.2 1999/12/06 20:38:23 archie Exp $
  */
 
 #ifndef _NET_BPF_H_
diff --git a/sys/net/bpf_compat.h b/sys/net/bpf_compat.h
index 0936b8490316..722da7ad49f8 100644
--- a/sys/net/bpf_compat.h
+++ b/sys/net/bpf_compat.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)bpf_compat.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/bpf_compat.h,v 1.5.4.1 1999/08/29 16:28:11 peter Exp $
  */
 
 #ifndef _NET_BPF_COMPAT_H_
diff --git a/sys/net/bpf_filter.c b/sys/net/bpf_filter.c
index 68019425ab05..476c080ef113 100644
--- a/sys/net/bpf_filter.c
+++ b/sys/net/bpf_filter.c
@@ -37,7 +37,7 @@
  *
  *      @(#)bpf_filter.c	8.1 (Berkeley) 6/10/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/bpf_filter.c,v 1.12.2.3 1999/12/06 20:38:24 archie Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/bpfdesc.h b/sys/net/bpfdesc.h
index d87cc40b2f90..80b0a737c96a 100644
--- a/sys/net/bpfdesc.h
+++ b/sys/net/bpfdesc.h
@@ -37,7 +37,7 @@
  *
  *      @(#)bpfdesc.h	8.1 (Berkeley) 6/10/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/bpfdesc.h,v 1.12.2.1 1999/08/29 16:28:11 peter Exp $
  */
 
 #ifndef _NET_BPFDESC_H_
diff --git a/sys/net/bridge.c b/sys/net/bridge.c
index 118384f02607..e4d43909b21b 100644
--- a/sys/net/bridge.c
+++ b/sys/net/bridge.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/bridge.c,v 1.4.2.5 1999/12/07 10:28:08 luigi Exp $
  */
 
 /*
diff --git a/sys/net/bridge.h b/sys/net/bridge.h
index 300949abc22a..8cf132abadf1 100644
--- a/sys/net/bridge.h
+++ b/sys/net/bridge.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/bridge.h,v 1.2.2.1 1999/12/07 10:28:08 luigi Exp $
  */
 
 extern int do_bridge;
diff --git a/sys/net/bsd_comp.c b/sys/net/bsd_comp.c
index d5072cc11b7b..ba88ff025050 100644
--- a/sys/net/bsd_comp.c
+++ b/sys/net/bsd_comp.c
@@ -40,7 +40,7 @@
 /*
  * This version is for use with mbufs on BSD-derived systems.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/bsd_comp.c,v 1.10.2.1 1999/08/29 16:28:12 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/ethernet.h b/sys/net/ethernet.h
index c8b62e0c5724..91dc2a54ff26 100644
--- a/sys/net/ethernet.h
+++ b/sys/net/ethernet.h
@@ -1,7 +1,7 @@
 /*
  * Fundamental constants relating to ethernet.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/ethernet.h,v 1.9.2.1 1999/08/29 16:28:13 peter Exp $
  *
  */
 
diff --git a/sys/net/hostcache.c b/sys/net/hostcache.c
index 0a1d4c00d912..74fc8945bf39 100644
--- a/sys/net/hostcache.c
+++ b/sys/net/hostcache.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/hostcache.c,v 1.5.2.1 1999/08/29 16:28:13 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/hostcache.h b/sys/net/hostcache.h
index 6ffb9ace5e3a..57b78f97d6ff 100644
--- a/sys/net/hostcache.h
+++ b/sys/net/hostcache.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/hostcache.h,v 1.2.2.1 1999/08/29 16:28:14 peter Exp $
  */
 
 #ifndef _NET_HOSTCACHE_H
diff --git a/sys/net/if.c b/sys/net/if.c
index 75e01e10f39c..92ade1be840c 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.c	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if.c,v 1.64.2.1 1999/08/29 16:28:14 peter Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/net/if.h b/sys/net/if.h
index 2705d7ce44ce..b6d5422c9645 100644
--- a/sys/net/if.h
+++ b/sys/net/if.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if.h,v 1.49.2.1 1999/08/29 16:28:15 peter Exp $
  */
 
 #ifndef _NET_IF_H_
diff --git a/sys/net/if_arp.h b/sys/net/if_arp.h
index 52eeb26876e3..8d9cc9c5af10 100644
--- a/sys/net/if_arp.h
+++ b/sys/net/if_arp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_arp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_arp.h,v 1.10.2.3 1999/11/19 09:30:31 julian Exp $
  */
 
 #ifndef _NET_IF_ARP_H_
diff --git a/sys/net/if_disc.c b/sys/net/if_disc.c
index fff6bd7dbcb0..3983938c9594 100644
--- a/sys/net/if_disc.c
+++ b/sys/net/if_disc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)if_loop.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_disc.c,v 1.21.2.1 1999/08/29 16:28:16 peter Exp $
  */
 
 /*
diff --git a/sys/net/if_dl.h b/sys/net/if_dl.h
index aac7c1439dce..b0431dba53c0 100644
--- a/sys/net/if_dl.h
+++ b/sys/net/if_dl.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_dl.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_dl.h,v 1.6.4.2 1999/08/29 16:28:16 peter Exp $
  */
 
 #ifndef _NET_IF_DL_H_
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 54634c557202..630363a18e85 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ethersubr.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.54.2.5 1999/12/01 19:41:38 julian Exp $
  */
 
 #include "opt_atalk.h"
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index a86a82cc3e1e..afd6fa5461fe 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	from: if_ethersubr.c,v 1.5 1994/12/13 22:31:45 wollman Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_fddisubr.c,v 1.33.2.1 1999/08/29 16:28:17 peter Exp $
  */
 
 #include "opt_atalk.h"
diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c
index d31ea0cbe60e..ddef5adc9c2b 100644
--- a/sys/net/if_iso88025subr.c
+++ b/sys/net/if_iso88025subr.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_iso88025subr.c,v 1.2.2.2 1999/08/29 16:28:18 peter Exp $
  *
  */
 
diff --git a/sys/net/if_llc.h b/sys/net/if_llc.h
index 8bcd63e5646a..2371a8878222 100644
--- a/sys/net/if_llc.h
+++ b/sys/net/if_llc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *      @(#)if_llc.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_llc.h,v 1.6.4.1 1999/08/29 16:28:18 peter Exp $
  */
 
 #ifndef _NET_IF_LLC_H_
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index bc15eafe0b09..0ace77a6981d 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_loop.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_loop.c,v 1.37.2.1 1999/08/29 16:28:19 peter Exp $
  */
 
 /*
diff --git a/sys/net/if_media.c b/sys/net/if_media.c
index dfc9a3a82203..3681f9c8c734 100644
--- a/sys/net/if_media.c
+++ b/sys/net/if_media.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_media.c,v 1.1 1997/03/17 02:55:15 thorpej Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/net/if_media.c,v 1.6.2.1 1999/08/29 16:28:19 peter Exp $ */
 
 /*
  * Copyright (c) 1997
diff --git a/sys/net/if_media.h b/sys/net/if_media.h
index b6fc6ec65863..d2181cee5815 100644
--- a/sys/net/if_media.h
+++ b/sys/net/if_media.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_media.h,v 1.3 1997/03/26 01:19:27 thorpej Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/net/if_media.h,v 1.2.6.4 1999/11/24 02:44:15 julian Exp $ */
 
 /*
  * Copyright (c) 1997
diff --git a/sys/net/if_mib.c b/sys/net/if_mib.c
index 4a93e7048e1e..6e9d4a60b4bc 100644
--- a/sys/net/if_mib.c
+++ b/sys/net/if_mib.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_mib.c,v 1.6.2.1 1999/08/29 16:28:20 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/if_mib.h b/sys/net/if_mib.h
index 6c29389f6876..52c6cf0a0fb8 100644
--- a/sys/net/if_mib.h
+++ b/sys/net/if_mib.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_mib.h,v 1.5.4.1 1999/08/29 16:28:20 peter Exp $
  */
 
 #ifndef _NET_IF_MIB_H
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index 1f12e3bece0f..c0d68a39b14a 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -69,7 +69,7 @@
  * Paul Mackerras (paulus@cs.anu.edu.au).
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/net/if_ppp.c,v 1.59.2.1 1999/08/29 16:28:21 peter Exp $ */
 /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */
 /* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */
 
diff --git a/sys/net/if_ppp.h b/sys/net/if_ppp.h
index 713d39a22a30..78634b68b17f 100644
--- a/sys/net/if_ppp.h
+++ b/sys/net/if_ppp.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_ppp.h,v 1.13.2.1 1999/08/29 16:28:21 peter Exp $
  */
 
 #ifndef _IF_PPP_H_
diff --git a/sys/net/if_pppvar.h b/sys/net/if_pppvar.h
index e4b4fd7cfcc6..eb19937eacfa 100644
--- a/sys/net/if_pppvar.h
+++ b/sys/net/if_pppvar.h
@@ -39,7 +39,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_pppvar.h,v 1.13.2.1 1999/08/29 16:28:22 peter Exp $
  */
 
 /*
diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index ba2c9be1e924..9fa1a09dc465 100644
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_sl.c	8.6 (Berkeley) 2/1/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_sl.c,v 1.70.2.3 1999/12/15 09:17:29 phantom Exp $
  */
 
 /*
diff --git a/sys/net/if_slvar.h b/sys/net/if_slvar.h
index 06ac4d961524..f8f75375bba8 100644
--- a/sys/net/if_slvar.h
+++ b/sys/net/if_slvar.h
@@ -32,7 +32,7 @@
  *
  *	@(#)if_slvar.h	8.3 (Berkeley) 2/1/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_slvar.h,v 1.15.2.1 1999/08/29 16:28:23 peter Exp $
  */
 
 #ifndef _NET_IF_SLVAR_H_
diff --git a/sys/net/if_sppp.h b/sys/net/if_sppp.h
index 5e0d53f8e601..6023b4dde0d0 100644
--- a/sys/net/if_sppp.h
+++ b/sys/net/if_sppp.h
@@ -16,7 +16,7 @@
  *
  * From: Version 2.0, Fri Oct  6 20:39:21 MSK 1995
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_sppp.h,v 1.13.2.1 1999/08/29 16:28:23 peter Exp $
  */
 
 #ifndef _NET_IF_SPPP_H_
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index 06dca972de7c..6e0be9bcf952 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -17,7 +17,7 @@
  *
  * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_spppsubr.c,v 1.52.2.2 1999/10/29 18:03:17 joerg Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/if_tun.h b/sys/net/if_tun.h
index 750ad64955e6..c1d8fb35b815 100644
--- a/sys/net/if_tun.h
+++ b/sys/net/if_tun.h
@@ -13,7 +13,7 @@
  * UCL. This driver is based much more on read/write/select mode of
  * operation though.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_tun.h,v 1.13.2.1 1999/08/29 16:28:25 peter Exp $
  */
 
 #ifndef _NET_IF_TUN_H_
diff --git a/sys/net/if_tunvar.h b/sys/net/if_tunvar.h
index 9493c35dfd7c..e4c7e5f24c31 100644
--- a/sys/net/if_tunvar.h
+++ b/sys/net/if_tunvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_tunvar.h,v 1.3.2.1 1999/08/29 16:28:25 peter Exp $
  */
 
 #ifndef _NET_IF_TUNVAR_H_
diff --git a/sys/net/if_types.h b/sys/net/if_types.h
index ebcbcbfef19f..fa5f04174c90 100644
--- a/sys/net/if_types.h
+++ b/sys/net/if_types.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_types.h	8.2 (Berkeley) 4/20/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_types.h,v 1.6.4.1 1999/08/29 16:28:26 peter Exp $
  */
 
 #ifndef _NET_IF_TYPES_H_
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index 5e3c69b1e5e1..9a5cf800d02c 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)if.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_var.h,v 1.10.2.2 1999/08/29 16:28:26 peter Exp $
  */
 
 #ifndef	_NET_IF_VAR_H_
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index ba9b4d1263ba..6633ba913148 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_vlan.c,v 1.4.2.2 1999/12/13 02:02:23 jkh Exp $
  */
 
 /*
diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h
index badc0d567d80..cf025ef4b373 100644
--- a/sys/net/if_vlan_var.h
+++ b/sys/net/if_vlan_var.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_vlan_var.h,v 1.1.2.2 1999/12/13 02:02:24 jkh Exp $
  */
 
 #ifndef _NET_IF_VLAN_VAR_H_
diff --git a/sys/net/iso88025.h b/sys/net/iso88025.h
index ccb16e16836a..11b205849bd8 100644
--- a/sys/net/iso88025.h
+++ b/sys/net/iso88025.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/iso88025.h,v 1.2.2.2 1999/08/29 16:28:28 peter Exp $
  *
  * Information gathered from tokenring@freebsd, /sys/net/ethernet.h and
  * the Mach token ring driver.
diff --git a/sys/net/netisr.h b/sys/net/netisr.h
index 94cedc399ecf..bb5203892eeb 100644
--- a/sys/net/netisr.h
+++ b/sys/net/netisr.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)netisr.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/netisr.h,v 1.14.2.2 1999/11/22 07:08:10 julian Exp $
  */
 
 #ifndef _NET_NETISR_H_
diff --git a/sys/net/ppp_comp.h b/sys/net/ppp_comp.h
index b777bfc2d3b0..675fc3924e86 100644
--- a/sys/net/ppp_comp.h
+++ b/sys/net/ppp_comp.h
@@ -24,7 +24,7 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/ppp_comp.h,v 1.7.2.1 1999/08/29 16:28:29 peter Exp $
  */
 
 #ifndef _NET_PPP_COMP_H
diff --git a/sys/net/ppp_deflate.c b/sys/net/ppp_deflate.c
index fdc0c64fbd23..bcc7b87b0ead 100644
--- a/sys/net/ppp_deflate.c
+++ b/sys/net/ppp_deflate.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/sys/net/ppp_deflate.c,v 1.11.4.1 1999/08/29 16:28:29 peter Exp $	*/
 
 /*
  * ppp_deflate.c - interface the zlib procedures for Deflate compression
diff --git a/sys/net/ppp_defs.h b/sys/net/ppp_defs.h
index ac86be268788..0675e669f35e 100644
--- a/sys/net/ppp_defs.h
+++ b/sys/net/ppp_defs.h
@@ -24,7 +24,7 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/ppp_defs.h,v 1.5.2.1 1999/08/29 16:28:29 peter Exp $
  */
 
 #ifndef _PPP_DEFS_H_
diff --git a/sys/net/ppp_tty.c b/sys/net/ppp_tty.c
index 5fdff39a432b..a13c1b463636 100644
--- a/sys/net/ppp_tty.c
+++ b/sys/net/ppp_tty.c
@@ -70,7 +70,7 @@
  * Paul Mackerras (paulus@cs.anu.edu.au).
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/net/ppp_tty.c,v 1.38.2.1 1999/08/29 16:28:30 peter Exp $ */
 
 #include "ppp.h"
 #if NPPP > 0
diff --git a/sys/net/radix.c b/sys/net/radix.c
index 55887eb61eb9..34b4c0fc3806 100644
--- a/sys/net/radix.c
+++ b/sys/net/radix.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)radix.c	8.4 (Berkeley) 11/2/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/radix.c,v 1.15.2.2 1999/08/29 16:28:30 peter Exp $
  */
 
 /*
diff --git a/sys/net/radix.h b/sys/net/radix.h
index f68f67aaecd5..88c4685d635a 100644
--- a/sys/net/radix.h
+++ b/sys/net/radix.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)radix.h	8.2 (Berkeley) 10/31/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/radix.h,v 1.14.2.1 1999/08/29 16:28:31 peter Exp $
  */
 
 #ifndef _RADIX_H_
diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c
index 97dbc102f616..4e6257dc72bf 100644
--- a/sys/net/raw_cb.c
+++ b/sys/net/raw_cb.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_cb.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/raw_cb.c,v 1.15.2.1 1999/08/29 16:28:31 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/raw_cb.h b/sys/net/raw_cb.h
index 5184de6f1376..b995a24be463 100644
--- a/sys/net/raw_cb.h
+++ b/sys/net/raw_cb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_cb.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/raw_cb.h,v 1.10.2.1 1999/08/29 16:28:32 peter Exp $
  */
 
 #ifndef _NET_RAW_CB_H_
diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c
index bf12fe00df78..d0ad98184071 100644
--- a/sys/net/raw_usrreq.c
+++ b/sys/net/raw_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_usrreq.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.16.2.1 1999/08/29 16:28:32 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/route.c b/sys/net/route.c
index 06f8c4aa8021..ae0bf3f2c2f1 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.c	8.2 (Berkeley) 11/15/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/route.c,v 1.50.2.2 1999/12/11 13:58:36 jdp Exp $
  */
 
 #include "opt_inet.h"
diff --git a/sys/net/route.h b/sys/net/route.h
index 80976110af98..a0396ab81cd0 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.h	8.3 (Berkeley) 4/19/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/route.h,v 1.28.2.2 1999/09/15 08:38:05 ru Exp $
  */
 
 #ifndef _NET_ROUTE_H_
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 30925f3a3c1e..0f04a456c4f5 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)rtsock.c	8.5 (Berkeley) 11/2/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/rtsock.c,v 1.37.2.1 1999/08/29 16:28:34 peter Exp $
  */
 
 
diff --git a/sys/net/slcompress.c b/sys/net/slcompress.c
index f878bf55413e..42daea911751 100644
--- a/sys/net/slcompress.c
+++ b/sys/net/slcompress.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)slcompress.c	8.2 (Berkeley) 4/16/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/slcompress.c,v 1.12.2.1 1999/08/29 16:28:34 peter Exp $
  */
 
 /*
diff --git a/sys/net/slcompress.h b/sys/net/slcompress.h
index ca7ed031ccfc..88c11b74ee82 100644
--- a/sys/net/slcompress.h
+++ b/sys/net/slcompress.h
@@ -34,7 +34,7 @@
  *
  *	Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
  *	- Initial distribution.
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/slcompress.h,v 1.13.2.1 1999/08/29 16:28:35 peter Exp $
  */
 
 #ifndef _NET_SLCOMPRESS_H_
diff --git a/sys/net/slip.h b/sys/net/slip.h
index 917ebf0865b4..d44b0191baaf 100644
--- a/sys/net/slip.h
+++ b/sys/net/slip.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)slip.h	8.1 (Berkeley) 2/12/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/slip.h,v 1.8.4.1 1999/08/29 16:28:35 peter Exp $
  */
 
 #ifndef _NET_SLIP_H_
diff --git a/sys/net/zlib.c b/sys/net/zlib.c
index 46a5e982193e..a004f5fb74dd 100644
--- a/sys/net/zlib.c
+++ b/sys/net/zlib.c
@@ -10,7 +10,7 @@
  * - added inflateIncomp and deflateOutputPending
  * - allow strm->next_out to be NULL, meaning discard the output
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/zlib.c,v 1.7.4.1 1999/08/29 16:28:36 peter Exp $
  */
 
 /* 
diff --git a/sys/net/zlib.h b/sys/net/zlib.h
index 850c584f2bdb..a770c36c0048 100644
--- a/sys/net/zlib.h
+++ b/sys/net/zlib.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/sys/net/zlib.h,v 1.4.4.1 1999/08/29 16:28:36 peter Exp $	*/
 
 /*
  * This file is derived from zlib.h and zconf.h from the zlib-1.0.4
diff --git a/sys/netatm/atm.h b/sys/netatm/atm.h
index 1145a9c462f8..fd96a10738ab 100644
--- a/sys/netatm/atm.h
+++ b/sys/netatm/atm.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm.h,v 1.1.2.1 1999/08/29 16:28:40 peter Exp $
  *
  */
 
diff --git a/sys/netatm/atm_aal5.c b/sys/netatm/atm_aal5.c
index 2cf70c9e3cad..538ea458ed0e 100644
--- a/sys/netatm/atm_aal5.c
+++ b/sys/netatm/atm_aal5.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_aal5.c,v 1.4.2.1 1999/08/29 16:28:40 peter Exp $
  *
  */
 
@@ -39,7 +39,7 @@
 #include <sys/stat.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/atm_aal5.c,v 1.4.2.1 1999/08/29 16:28:40 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/atm_cm.c b/sys/netatm/atm_cm.c
index 13943511d948..01d16274b795 100644
--- a/sys/netatm/atm_cm.c
+++ b/sys/netatm/atm_cm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_cm.c,v 1.3.2.2 1999/08/29 16:28:41 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <netatm/kern_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/atm_cm.c,v 1.3.2.2 1999/08/29 16:28:41 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/atm_cm.h b/sys/netatm/atm_cm.h
index 0507caa8fcfa..30f1ada6a8ee 100644
--- a/sys/netatm/atm_cm.h
+++ b/sys/netatm/atm_cm.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_cm.h,v 1.1.2.1 1999/08/29 16:28:42 peter Exp $
  *
  */
 
diff --git a/sys/netatm/atm_device.c b/sys/netatm/atm_device.c
index 9c645a590dc1..9a0c6917a61b 100644
--- a/sys/netatm/atm_device.c
+++ b/sys/netatm/atm_device.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_device.c,v 1.4.2.1 1999/08/29 16:28:42 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <netatm/kern_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/atm_device.c,v 1.4.2.1 1999/08/29 16:28:42 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/atm_if.c b/sys/netatm/atm_if.c
index 1d3bb8566c2a..0ce53de9abdd 100644
--- a/sys/netatm/atm_if.c
+++ b/sys/netatm/atm_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_if.c,v 1.3.2.1 1999/08/29 16:28:42 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <netatm/kern_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/atm_if.c,v 1.3.2.1 1999/08/29 16:28:42 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/atm_if.h b/sys/netatm/atm_if.h
index d2ea47180c32..6f242c637bf0 100644
--- a/sys/netatm/atm_if.h
+++ b/sys/netatm/atm_if.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_if.h,v 1.1.2.1 1999/08/29 16:28:43 peter Exp $
  *
  */
 
diff --git a/sys/netatm/atm_ioctl.h b/sys/netatm/atm_ioctl.h
index 547432058435..cb1dee7be58e 100644
--- a/sys/netatm/atm_ioctl.h
+++ b/sys/netatm/atm_ioctl.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_ioctl.h,v 1.1.2.2 1999/08/29 16:28:43 peter Exp $
  *
  */
 
diff --git a/sys/netatm/atm_pcb.h b/sys/netatm/atm_pcb.h
index b5518e8079ac..e6248e9a7b71 100644
--- a/sys/netatm/atm_pcb.h
+++ b/sys/netatm/atm_pcb.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_pcb.h,v 1.1.2.1 1999/08/29 16:28:44 peter Exp $
  *
  */
 
diff --git a/sys/netatm/atm_proto.c b/sys/netatm/atm_proto.c
index a75024a94c20..82b4873a2940 100644
--- a/sys/netatm/atm_proto.c
+++ b/sys/netatm/atm_proto.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_proto.c,v 1.2.2.1 1999/08/29 16:28:44 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <netatm/kern_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/atm_proto.c,v 1.2.2.1 1999/08/29 16:28:44 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/atm_sap.h b/sys/netatm/atm_sap.h
index 35f54351c4f5..3941dc0783f0 100644
--- a/sys/netatm/atm_sap.h
+++ b/sys/netatm/atm_sap.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_sap.h,v 1.1.2.1 1999/08/29 16:28:45 peter Exp $
  *
  */
 
diff --git a/sys/netatm/atm_sigmgr.h b/sys/netatm/atm_sigmgr.h
index bd502a32424e..594c212ade9c 100644
--- a/sys/netatm/atm_sigmgr.h
+++ b/sys/netatm/atm_sigmgr.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_sigmgr.h,v 1.1.2.1 1999/08/29 16:28:45 peter Exp $
  *
  */
 
diff --git a/sys/netatm/atm_signal.c b/sys/netatm/atm_signal.c
index e79de84629fc..e6964d2b071a 100644
--- a/sys/netatm/atm_signal.c
+++ b/sys/netatm/atm_signal.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_signal.c,v 1.2.2.1 1999/08/29 16:28:45 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <netatm/kern_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/atm_signal.c,v 1.2.2.1 1999/08/29 16:28:45 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/atm_socket.c b/sys/netatm/atm_socket.c
index 2976ff17ceae..4a6c005102aa 100644
--- a/sys/netatm/atm_socket.c
+++ b/sys/netatm/atm_socket.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_socket.c,v 1.3.2.1 1999/08/29 16:28:46 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <netatm/kern_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/atm_socket.c,v 1.3.2.1 1999/08/29 16:28:46 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/atm_stack.h b/sys/netatm/atm_stack.h
index be7edc851821..aed86b7a4b86 100644
--- a/sys/netatm/atm_stack.h
+++ b/sys/netatm/atm_stack.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_stack.h,v 1.1.2.1 1999/08/29 16:28:46 peter Exp $
  *
  */
 
diff --git a/sys/netatm/atm_subr.c b/sys/netatm/atm_subr.c
index 16262e82d3e6..67f9fe78dac1 100644
--- a/sys/netatm/atm_subr.c
+++ b/sys/netatm/atm_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_subr.c,v 1.3.2.1 1999/08/29 16:28:47 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <netatm/kern_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/atm_subr.c,v 1.3.2.1 1999/08/29 16:28:47 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/atm_sys.h b/sys/netatm/atm_sys.h
index 0c240bfceef8..62e61842a5f1 100644
--- a/sys/netatm/atm_sys.h
+++ b/sys/netatm/atm_sys.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_sys.h,v 1.2.2.1 1999/08/29 16:28:47 peter Exp $
  *
  */
 
diff --git a/sys/netatm/atm_usrreq.c b/sys/netatm/atm_usrreq.c
index d700d27358ab..871351ae111c 100644
--- a/sys/netatm/atm_usrreq.c
+++ b/sys/netatm/atm_usrreq.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_usrreq.c,v 1.3.2.1 1999/08/29 16:28:48 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <netatm/kern_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/atm_usrreq.c,v 1.3.2.1 1999/08/29 16:28:48 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/atm_var.h b/sys/netatm/atm_var.h
index d19a475bd33d..a0c850b815e7 100644
--- a/sys/netatm/atm_var.h
+++ b/sys/netatm/atm_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_var.h,v 1.1.2.1 1999/08/29 16:28:48 peter Exp $
  *
  */
 
diff --git a/sys/netatm/atm_vc.h b/sys/netatm/atm_vc.h
index 64d1b6f39a9d..782cba15f0bb 100644
--- a/sys/netatm/atm_vc.h
+++ b/sys/netatm/atm_vc.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_vc.h,v 1.1.2.1 1999/08/29 16:28:48 peter Exp $
  *
  */
 
diff --git a/sys/netatm/ipatm/ipatm.h b/sys/netatm/ipatm/ipatm.h
index 887509c0fee8..5c07283dc907 100644
--- a/sys/netatm/ipatm/ipatm.h
+++ b/sys/netatm/ipatm/ipatm.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/ipatm/ipatm.h,v 1.1.2.1 1999/08/29 16:28:52 peter Exp $
  *
  */
 
diff --git a/sys/netatm/ipatm/ipatm_event.c b/sys/netatm/ipatm/ipatm_event.c
index 0566d1cfd3b2..d2955b64b30c 100644
--- a/sys/netatm/ipatm/ipatm_event.c
+++ b/sys/netatm/ipatm/ipatm_event.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_event.c,v 1.3.2.1 1999/08/29 16:28:52 peter Exp $
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/ipatm/ipatm_serv.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_event.c,v 1.3.2.1 1999/08/29 16:28:52 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/ipatm/ipatm_if.c b/sys/netatm/ipatm/ipatm_if.c
index eeb3c00659e6..a1a63921e924 100644
--- a/sys/netatm/ipatm/ipatm_if.c
+++ b/sys/netatm/ipatm/ipatm_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_if.c,v 1.2.2.1 1999/08/29 16:28:53 peter Exp $
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/ipatm/ipatm_serv.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_if.c,v 1.2.2.1 1999/08/29 16:28:53 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/ipatm/ipatm_input.c b/sys/netatm/ipatm/ipatm_input.c
index e3049cfb63dd..d78766239a4a 100644
--- a/sys/netatm/ipatm/ipatm_input.c
+++ b/sys/netatm/ipatm/ipatm_input.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_input.c,v 1.2.2.1 1999/08/29 16:28:53 peter Exp $
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/ipatm/ipatm_serv.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_input.c,v 1.2.2.1 1999/08/29 16:28:53 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/ipatm/ipatm_load.c b/sys/netatm/ipatm/ipatm_load.c
index 2acbb2666e31..cb21efcb23eb 100644
--- a/sys/netatm/ipatm/ipatm_load.c
+++ b/sys/netatm/ipatm/ipatm_load.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_load.c,v 1.2.2.2 1999/08/29 16:28:54 peter Exp $
  *
  */
 
@@ -46,7 +46,7 @@
 #include <netatm/ipatm/ipatm_serv.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_load.c,v 1.2.2.2 1999/08/29 16:28:54 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/ipatm/ipatm_output.c b/sys/netatm/ipatm/ipatm_output.c
index c7a1933d8dd2..e07e3ca653d8 100644
--- a/sys/netatm/ipatm/ipatm_output.c
+++ b/sys/netatm/ipatm/ipatm_output.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_output.c,v 1.2.2.1 1999/08/29 16:28:54 peter Exp $
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/ipatm/ipatm_serv.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_output.c,v 1.2.2.1 1999/08/29 16:28:54 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/ipatm/ipatm_serv.h b/sys/netatm/ipatm/ipatm_serv.h
index a807b0672357..d6be268d7424 100644
--- a/sys/netatm/ipatm/ipatm_serv.h
+++ b/sys/netatm/ipatm/ipatm_serv.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_serv.h,v 1.1.2.1 1999/08/29 16:28:54 peter Exp $
  *
  */
 
diff --git a/sys/netatm/ipatm/ipatm_usrreq.c b/sys/netatm/ipatm/ipatm_usrreq.c
index d10f7c743ee8..aa7e5382206e 100644
--- a/sys/netatm/ipatm/ipatm_usrreq.c
+++ b/sys/netatm/ipatm/ipatm_usrreq.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_usrreq.c,v 1.3.2.1 1999/08/29 16:28:55 peter Exp $
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/ipatm/ipatm_serv.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_usrreq.c,v 1.3.2.1 1999/08/29 16:28:55 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/ipatm/ipatm_var.h b/sys/netatm/ipatm/ipatm_var.h
index b587a6e0e4cd..45743cac11d7 100644
--- a/sys/netatm/ipatm/ipatm_var.h
+++ b/sys/netatm/ipatm/ipatm_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_var.h,v 1.1.2.1 1999/08/29 16:28:55 peter Exp $
  *
  */
 
diff --git a/sys/netatm/ipatm/ipatm_vcm.c b/sys/netatm/ipatm/ipatm_vcm.c
index 409c3357aa94..1bc1072c692e 100644
--- a/sys/netatm/ipatm/ipatm_vcm.c
+++ b/sys/netatm/ipatm/ipatm_vcm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_vcm.c,v 1.3.2.1 1999/08/29 16:28:56 peter Exp $
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/ipatm/ipatm_serv.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_vcm.c,v 1.3.2.1 1999/08/29 16:28:56 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/kern_include.h b/sys/netatm/kern_include.h
index 1ce9dd300193..7f26e27d9d16 100644
--- a/sys/netatm/kern_include.h
+++ b/sys/netatm/kern_include.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/kern_include.h,v 1.1.2.1 1999/08/29 16:28:49 peter Exp $
  *
  */
 
diff --git a/sys/netatm/port.h b/sys/netatm/port.h
index d9a0b133c4ec..4845779e95b2 100644
--- a/sys/netatm/port.h
+++ b/sys/netatm/port.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/port.h,v 1.1.2.1 1999/08/29 16:28:50 peter Exp $
  *
  */
 
diff --git a/sys/netatm/queue.h b/sys/netatm/queue.h
index 67bff75481a8..04d3556a63e8 100644
--- a/sys/netatm/queue.h
+++ b/sys/netatm/queue.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/queue.h,v 1.1.2.1 1999/08/29 16:28:50 peter Exp $
  *
  */
 
diff --git a/sys/netatm/sigpvc/sigpvc.h b/sys/netatm/sigpvc/sigpvc.h
index 8cc8374b1ee5..2b18371b0002 100644
--- a/sys/netatm/sigpvc/sigpvc.h
+++ b/sys/netatm/sigpvc/sigpvc.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/sigpvc/sigpvc.h,v 1.1.2.1 1999/08/29 16:28:57 peter Exp $
  *
  */
 
diff --git a/sys/netatm/sigpvc/sigpvc_if.c b/sys/netatm/sigpvc/sigpvc_if.c
index cd6bd390e2ad..ccee6a7e40b4 100644
--- a/sys/netatm/sigpvc/sigpvc_if.c
+++ b/sys/netatm/sigpvc/sigpvc_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/sigpvc/sigpvc_if.c,v 1.4.2.1 1999/08/29 16:28:57 peter Exp $
  *
  */
 
@@ -46,7 +46,7 @@
 #include <netatm/sigpvc/sigpvc_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/sigpvc/sigpvc_if.c,v 1.4.2.1 1999/08/29 16:28:57 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/sigpvc/sigpvc_subr.c b/sys/netatm/sigpvc/sigpvc_subr.c
index adf462b0256f..363b5b50a0dd 100644
--- a/sys/netatm/sigpvc/sigpvc_subr.c
+++ b/sys/netatm/sigpvc/sigpvc_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/sigpvc/sigpvc_subr.c,v 1.2.2.1 1999/08/29 16:28:58 peter Exp $
  *
  */
 
@@ -41,7 +41,7 @@
 #include <netatm/sigpvc/sigpvc_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/sigpvc/sigpvc_subr.c,v 1.2.2.1 1999/08/29 16:28:58 peter Exp $");
 #endif
 
 extern struct sp_info sigpvc_vcpool;
diff --git a/sys/netatm/sigpvc/sigpvc_var.h b/sys/netatm/sigpvc/sigpvc_var.h
index 2cb96bcda2f0..23603e86559c 100644
--- a/sys/netatm/sigpvc/sigpvc_var.h
+++ b/sys/netatm/sigpvc/sigpvc_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/sigpvc/sigpvc_var.h,v 1.1.2.1 1999/08/29 16:28:58 peter Exp $
  *
  */
 
diff --git a/sys/netatm/spans/spans_arp.c b/sys/netatm/spans/spans_arp.c
index b22d85aa903d..260089fde604 100644
--- a/sys/netatm/spans/spans_arp.c
+++ b/sys/netatm/spans/spans_arp.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/spans/spans_arp.c,v 1.4.2.1 1999/08/29 16:28:59 peter Exp $
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/spans/spans_cls.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/spans/spans_arp.c,v 1.4.2.1 1999/08/29 16:28:59 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/spans/spans_cls.c b/sys/netatm/spans/spans_cls.c
index 74dd3fb92b10..bdf859954a7f 100644
--- a/sys/netatm/spans/spans_cls.c
+++ b/sys/netatm/spans/spans_cls.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/spans/spans_cls.c,v 1.3.2.1 1999/08/29 16:28:59 peter Exp $
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/spans/spans_cls.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/spans/spans_cls.c,v 1.3.2.1 1999/08/29 16:28:59 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/spans/spans_cls.h b/sys/netatm/spans/spans_cls.h
index 02e2f6a12a07..db3d6747719e 100644
--- a/sys/netatm/spans/spans_cls.h
+++ b/sys/netatm/spans/spans_cls.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/spans/spans_cls.h,v 1.1.2.1 1999/08/29 16:29:00 peter Exp $
  *
  */
 
diff --git a/sys/netatm/spans/spans_if.c b/sys/netatm/spans/spans_if.c
index 41032d25a4e2..70a6c3cea1a1 100644
--- a/sys/netatm/spans/spans_if.c
+++ b/sys/netatm/spans/spans_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/spans/spans_if.c,v 1.4.2.1 1999/08/29 16:29:00 peter Exp $
  *
  */
 
@@ -46,7 +46,7 @@
 #include <netatm/spans/spans_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/spans/spans_if.c,v 1.4.2.1 1999/08/29 16:29:00 peter Exp $");
 #endif
 
 /*
diff --git a/sys/netatm/spans/spans_kxdr.c b/sys/netatm/spans/spans_kxdr.c
index d2e4ee4aea4c..3ca8ede66ea9 100644
--- a/sys/netatm/spans/spans_kxdr.c
+++ b/sys/netatm/spans/spans_kxdr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/spans/spans_kxdr.c,v 1.2.2.1 1999/08/29 16:29:01 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <netatm/kern_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/spans/spans_kxdr.c,v 1.2.2.1 1999/08/29 16:29:01 peter Exp $");
 #endif
 
 /*
diff --git a/sys/netatm/spans/spans_msg.c b/sys/netatm/spans/spans_msg.c
index 08ceb75d9658..febfb427ebfb 100644
--- a/sys/netatm/spans/spans_msg.c
+++ b/sys/netatm/spans/spans_msg.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/spans/spans_msg.c,v 1.3.2.1 1999/08/29 16:29:02 peter Exp $
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/spans/spans_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/spans/spans_msg.c,v 1.3.2.1 1999/08/29 16:29:02 peter Exp $");
 #endif
 
 /*
diff --git a/sys/netatm/spans/spans_print.c b/sys/netatm/spans/spans_print.c
index 949d6dd8861e..62ba7be7130c 100644
--- a/sys/netatm/spans/spans_print.c
+++ b/sys/netatm/spans/spans_print.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/spans/spans_print.c,v 1.4.2.1 1999/08/29 16:29:02 peter Exp $
  *
  */
 
@@ -41,7 +41,7 @@
 #include <netatm/spans/spans_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/spans/spans_print.c,v 1.4.2.1 1999/08/29 16:29:02 peter Exp $");
 #endif
 
 /*
diff --git a/sys/netatm/spans/spans_proto.c b/sys/netatm/spans/spans_proto.c
index 47e4edc82d93..aa2e61260ec0 100644
--- a/sys/netatm/spans/spans_proto.c
+++ b/sys/netatm/spans/spans_proto.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/spans/spans_proto.c,v 1.3.2.1 1999/08/29 16:29:02 peter Exp $
  *
  */
 
@@ -41,7 +41,7 @@
 #include <netatm/spans/spans_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/spans/spans_proto.c,v 1.3.2.1 1999/08/29 16:29:02 peter Exp $");
 #endif
 
 /*
diff --git a/sys/netatm/spans/spans_subr.c b/sys/netatm/spans/spans_subr.c
index a53d31de2263..fa728a007239 100644
--- a/sys/netatm/spans/spans_subr.c
+++ b/sys/netatm/spans/spans_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/spans/spans_subr.c,v 1.3.2.1 1999/08/29 16:29:03 peter Exp $
  *
  */
 
@@ -41,7 +41,7 @@
 #include <netatm/spans/spans_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/spans/spans_subr.c,v 1.3.2.1 1999/08/29 16:29:03 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/spans/spans_util.c b/sys/netatm/spans/spans_util.c
index e174e16de6c0..7043bda841b7 100644
--- a/sys/netatm/spans/spans_util.c
+++ b/sys/netatm/spans/spans_util.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/spans/spans_util.c,v 1.3.2.1 1999/08/29 16:29:03 peter Exp $
  *
  */
 
@@ -41,7 +41,7 @@
 #include <netatm/spans/spans_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/spans/spans_util.c,v 1.3.2.1 1999/08/29 16:29:03 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/spans/spans_var.h b/sys/netatm/spans/spans_var.h
index f93d1fc5a2d2..208db15cc9f6 100644
--- a/sys/netatm/spans/spans_var.h
+++ b/sys/netatm/spans/spans_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/spans/spans_var.h,v 1.1.2.1 1999/08/29 16:29:04 peter Exp $
  *
  */
 
diff --git a/sys/netatm/spans/spans_xdr.x b/sys/netatm/spans/spans_xdr.x
index 1f46857d73fb..173be7d28e5f 100644
--- a/sys/netatm/spans/spans_xdr.x
+++ b/sys/netatm/spans/spans_xdr.x
@@ -23,7 +23,7 @@
 % * Copies of this Software may be made, however, the above copyright
 % * notice must be reproduced on all copies.
 % *
-% *	@(#) $FreeBSD$
+% *	@(#) $FreeBSD: src/sys/netatm/spans/spans_xdr.x,v 1.1.2.1 1999/08/29 16:29:04 peter Exp $
 % *
 % */
 %
@@ -61,7 +61,7 @@
 % */
 %
 %#ifndef lint
-%static char *RCSid = "@(#) $FreeBSD$";
+%static char *RCSid = "@(#) $FreeBSD: src/sys/netatm/spans/spans_xdr.x,v 1.1.2.1 1999/08/29 16:29:04 peter Exp $";
 %#endif
 %
 #endif
diff --git a/sys/netatm/uni/q2110_sigaa.c b/sys/netatm/uni/q2110_sigaa.c
index cdec794f522f..ef8305d14418 100644
--- a/sys/netatm/uni/q2110_sigaa.c
+++ b/sys/netatm/uni/q2110_sigaa.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/q2110_sigaa.c,v 1.2.2.1 1999/08/29 16:29:06 peter Exp $
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/q2110_sigaa.c,v 1.2.2.1 1999/08/29 16:29:06 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/q2110_sigcpcs.c b/sys/netatm/uni/q2110_sigcpcs.c
index 6fdf512cfb75..4802fdf85c58 100644
--- a/sys/netatm/uni/q2110_sigcpcs.c
+++ b/sys/netatm/uni/q2110_sigcpcs.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/q2110_sigcpcs.c,v 1.2.2.1 1999/08/29 16:29:06 peter Exp $
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/q2110_sigcpcs.c,v 1.2.2.1 1999/08/29 16:29:06 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/q2110_subr.c b/sys/netatm/uni/q2110_subr.c
index f1ea3776572d..d521f18f1a69 100644
--- a/sys/netatm/uni/q2110_subr.c
+++ b/sys/netatm/uni/q2110_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/q2110_subr.c,v 1.2.2.1 1999/08/29 16:29:07 peter Exp $
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/q2110_subr.c,v 1.2.2.1 1999/08/29 16:29:07 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/qsaal1_sigaa.c b/sys/netatm/uni/qsaal1_sigaa.c
index 579e08bdeb22..ec356fdd510b 100644
--- a/sys/netatm/uni/qsaal1_sigaa.c
+++ b/sys/netatm/uni/qsaal1_sigaa.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/qsaal1_sigaa.c,v 1.2.2.1 1999/08/29 16:29:07 peter Exp $
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/qsaal1_sigaa.c,v 1.2.2.1 1999/08/29 16:29:07 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/qsaal1_sigcpcs.c b/sys/netatm/uni/qsaal1_sigcpcs.c
index 8f579845de14..c13d7ba43c16 100644
--- a/sys/netatm/uni/qsaal1_sigcpcs.c
+++ b/sys/netatm/uni/qsaal1_sigcpcs.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/qsaal1_sigcpcs.c,v 1.2.2.1 1999/08/29 16:29:07 peter Exp $
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/qsaal1_sigcpcs.c,v 1.2.2.1 1999/08/29 16:29:07 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/qsaal1_subr.c b/sys/netatm/uni/qsaal1_subr.c
index ee18866be373..d08a8a66f5a6 100644
--- a/sys/netatm/uni/qsaal1_subr.c
+++ b/sys/netatm/uni/qsaal1_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/qsaal1_subr.c,v 1.2.2.1 1999/08/29 16:29:08 peter Exp $
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/qsaal1_subr.c,v 1.2.2.1 1999/08/29 16:29:08 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/sscf_uni.c b/sys/netatm/uni/sscf_uni.c
index 000a2f8125a3..8c37d3b47800 100644
--- a/sys/netatm/uni/sscf_uni.c
+++ b/sys/netatm/uni/sscf_uni.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscf_uni.c,v 1.4.2.1 1999/08/29 16:29:08 peter Exp $
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/sscf_uni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/sscf_uni.c,v 1.4.2.1 1999/08/29 16:29:08 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/sscf_uni.h b/sys/netatm/uni/sscf_uni.h
index e55d6b8e9d30..70926d8bdc2f 100644
--- a/sys/netatm/uni/sscf_uni.h
+++ b/sys/netatm/uni/sscf_uni.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscf_uni.h,v 1.1.2.1 1999/08/29 16:29:09 peter Exp $
  *
  */
 
diff --git a/sys/netatm/uni/sscf_uni_lower.c b/sys/netatm/uni/sscf_uni_lower.c
index c1690667d522..c53269292e69 100644
--- a/sys/netatm/uni/sscf_uni_lower.c
+++ b/sys/netatm/uni/sscf_uni_lower.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscf_uni_lower.c,v 1.3.2.1 1999/08/29 16:29:09 peter Exp $
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/sscf_uni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/sscf_uni_lower.c,v 1.3.2.1 1999/08/29 16:29:09 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/sscf_uni_upper.c b/sys/netatm/uni/sscf_uni_upper.c
index df0ea2565df1..5f22368767ed 100644
--- a/sys/netatm/uni/sscf_uni_upper.c
+++ b/sys/netatm/uni/sscf_uni_upper.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscf_uni_upper.c,v 1.3.2.1 1999/08/29 16:29:09 peter Exp $
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/sscf_uni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/sscf_uni_upper.c,v 1.3.2.1 1999/08/29 16:29:09 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/sscf_uni_var.h b/sys/netatm/uni/sscf_uni_var.h
index f8b70aacaf76..2446bf5f5168 100644
--- a/sys/netatm/uni/sscf_uni_var.h
+++ b/sys/netatm/uni/sscf_uni_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscf_uni_var.h,v 1.1.2.1 1999/08/29 16:29:10 peter Exp $
  *
  */
 
diff --git a/sys/netatm/uni/sscop.c b/sys/netatm/uni/sscop.c
index 88299bc0f08c..5b63dd969627 100644
--- a/sys/netatm/uni/sscop.c
+++ b/sys/netatm/uni/sscop.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscop.c,v 1.3.2.1 1999/08/29 16:29:10 peter Exp $
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/sscop.c,v 1.3.2.1 1999/08/29 16:29:10 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/sscop.h b/sys/netatm/uni/sscop.h
index 89ca468bcc37..7322fbdd71ad 100644
--- a/sys/netatm/uni/sscop.h
+++ b/sys/netatm/uni/sscop.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscop.h,v 1.1.2.1 1999/08/29 16:29:11 peter Exp $
  *
  */
 
diff --git a/sys/netatm/uni/sscop_lower.c b/sys/netatm/uni/sscop_lower.c
index 393a39413e5f..32c99c465073 100644
--- a/sys/netatm/uni/sscop_lower.c
+++ b/sys/netatm/uni/sscop_lower.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscop_lower.c,v 1.3.2.1 1999/08/29 16:29:11 peter Exp $
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/sscop_lower.c,v 1.3.2.1 1999/08/29 16:29:11 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/sscop_misc.h b/sys/netatm/uni/sscop_misc.h
index 5fcea10bcc0f..5e9e58fbc8c9 100644
--- a/sys/netatm/uni/sscop_misc.h
+++ b/sys/netatm/uni/sscop_misc.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscop_misc.h,v 1.1.2.1 1999/08/29 16:29:12 peter Exp $
  *
  */
 
diff --git a/sys/netatm/uni/sscop_pdu.c b/sys/netatm/uni/sscop_pdu.c
index 5fd4c07bb9af..183b58cb80ff 100644
--- a/sys/netatm/uni/sscop_pdu.c
+++ b/sys/netatm/uni/sscop_pdu.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscop_pdu.c,v 1.3.2.1 1999/08/29 16:29:12 peter Exp $
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/sscop_pdu.c,v 1.3.2.1 1999/08/29 16:29:12 peter Exp $");
 #endif
 
 /*
diff --git a/sys/netatm/uni/sscop_pdu.h b/sys/netatm/uni/sscop_pdu.h
index 9a930d0feaff..4ab4863c6050 100644
--- a/sys/netatm/uni/sscop_pdu.h
+++ b/sys/netatm/uni/sscop_pdu.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscop_pdu.h,v 1.1.2.1 1999/08/29 16:29:12 peter Exp $
  *
  */
 
diff --git a/sys/netatm/uni/sscop_sigaa.c b/sys/netatm/uni/sscop_sigaa.c
index 5e91d7cde51f..7a24e0af3dca 100644
--- a/sys/netatm/uni/sscop_sigaa.c
+++ b/sys/netatm/uni/sscop_sigaa.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscop_sigaa.c,v 1.2.2.1 1999/08/29 16:29:13 peter Exp $
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/sscop_sigaa.c,v 1.2.2.1 1999/08/29 16:29:13 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/sscop_sigcpcs.c b/sys/netatm/uni/sscop_sigcpcs.c
index 9223bb2cfec0..68e922f7a111 100644
--- a/sys/netatm/uni/sscop_sigcpcs.c
+++ b/sys/netatm/uni/sscop_sigcpcs.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscop_sigcpcs.c,v 1.2.2.1 1999/08/29 16:29:13 peter Exp $
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/sscop_sigcpcs.c,v 1.2.2.1 1999/08/29 16:29:13 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/sscop_subr.c b/sys/netatm/uni/sscop_subr.c
index c182329063a2..6e8c7170319a 100644
--- a/sys/netatm/uni/sscop_subr.c
+++ b/sys/netatm/uni/sscop_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscop_subr.c,v 1.3.2.1 1999/08/29 16:29:14 peter Exp $
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/sscop_subr.c,v 1.3.2.1 1999/08/29 16:29:14 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/sscop_timer.c b/sys/netatm/uni/sscop_timer.c
index 6181b845ad6d..b4d876710d93 100644
--- a/sys/netatm/uni/sscop_timer.c
+++ b/sys/netatm/uni/sscop_timer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscop_timer.c,v 1.3.2.1 1999/08/29 16:29:14 peter Exp $
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/sscop_timer.c,v 1.3.2.1 1999/08/29 16:29:14 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/sscop_upper.c b/sys/netatm/uni/sscop_upper.c
index 5f345fc61a51..6ee4b62adfa2 100644
--- a/sys/netatm/uni/sscop_upper.c
+++ b/sys/netatm/uni/sscop_upper.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscop_upper.c,v 1.3.2.1 1999/08/29 16:29:15 peter Exp $
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/sscop_upper.c,v 1.3.2.1 1999/08/29 16:29:15 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/sscop_var.h b/sys/netatm/uni/sscop_var.h
index f29108a40d0b..2f2f4093f277 100644
--- a/sys/netatm/uni/sscop_var.h
+++ b/sys/netatm/uni/sscop_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscop_var.h,v 1.1.2.1 1999/08/29 16:29:15 peter Exp $
  *
  */
 
diff --git a/sys/netatm/uni/uni.h b/sys/netatm/uni/uni.h
index b7cd1bd48b4a..7b6ebec618b1 100644
--- a/sys/netatm/uni/uni.h
+++ b/sys/netatm/uni/uni.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/uni.h,v 1.1.2.1 1999/08/29 16:29:15 peter Exp $
  *
  */
 
diff --git a/sys/netatm/uni/uni_load.c b/sys/netatm/uni/uni_load.c
index bd51a4774b06..657ef5c9f004 100644
--- a/sys/netatm/uni/uni_load.c
+++ b/sys/netatm/uni/uni_load.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/uni_load.c,v 1.2.2.1 1999/08/29 16:29:16 peter Exp $
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/uni.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/uni_load.c,v 1.2.2.1 1999/08/29 16:29:16 peter Exp $");
 #endif
 
 /*
diff --git a/sys/netatm/uni/uniarp.c b/sys/netatm/uni/uniarp.c
index 24e0501de6f1..659a54cfa278 100644
--- a/sys/netatm/uni/uniarp.c
+++ b/sys/netatm/uni/uniarp.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/uniarp.c,v 1.5.2.1 1999/08/29 16:29:16 peter Exp $
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/uniip_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/uniarp.c,v 1.5.2.1 1999/08/29 16:29:16 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/uniarp_cache.c b/sys/netatm/uni/uniarp_cache.c
index 6e08e57db388..2f567597d6d3 100644
--- a/sys/netatm/uni/uniarp_cache.c
+++ b/sys/netatm/uni/uniarp_cache.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/uniarp_cache.c,v 1.3.2.1 1999/08/29 16:29:17 peter Exp $
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/uniip_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/uniarp_cache.c,v 1.3.2.1 1999/08/29 16:29:17 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/uniarp_input.c b/sys/netatm/uni/uniarp_input.c
index 6da4300ea699..c61a015146fb 100644
--- a/sys/netatm/uni/uniarp_input.c
+++ b/sys/netatm/uni/uniarp_input.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/uniarp_input.c,v 1.3.2.1 1999/08/29 16:29:17 peter Exp $
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/uniip_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/uniarp_input.c,v 1.3.2.1 1999/08/29 16:29:17 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/uniarp_output.c b/sys/netatm/uni/uniarp_output.c
index f8cd594caac1..7d7024477817 100644
--- a/sys/netatm/uni/uniarp_output.c
+++ b/sys/netatm/uni/uniarp_output.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/uniarp_output.c,v 1.2.2.1 1999/08/29 16:29:18 peter Exp $
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/uni/uniip_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/uniarp_output.c,v 1.2.2.1 1999/08/29 16:29:18 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/uniarp_timer.c b/sys/netatm/uni/uniarp_timer.c
index 2b550ad9d342..5dcbf1b5effa 100644
--- a/sys/netatm/uni/uniarp_timer.c
+++ b/sys/netatm/uni/uniarp_timer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/uniarp_timer.c,v 1.2.2.1 1999/08/29 16:29:18 peter Exp $
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/uniip_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/uniarp_timer.c,v 1.2.2.1 1999/08/29 16:29:18 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/uniarp_vcm.c b/sys/netatm/uni/uniarp_vcm.c
index 95e20e2785d2..d6ad9949cbde 100644
--- a/sys/netatm/uni/uniarp_vcm.c
+++ b/sys/netatm/uni/uniarp_vcm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/uniarp_vcm.c,v 1.3.2.1 1999/08/29 16:29:18 peter Exp $
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/uniip_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/uniarp_vcm.c,v 1.3.2.1 1999/08/29 16:29:18 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/uniip.c b/sys/netatm/uni/uniip.c
index 1137613ffd2b..432a52ccbf19 100644
--- a/sys/netatm/uni/uniip.c
+++ b/sys/netatm/uni/uniip.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/uniip.c,v 1.2.2.1 1999/08/29 16:29:19 peter Exp $
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/uni/uniip_var.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/uniip.c,v 1.2.2.1 1999/08/29 16:29:19 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/uniip_var.h b/sys/netatm/uni/uniip_var.h
index 409d2ad6de0f..f38fa7c188e6 100644
--- a/sys/netatm/uni/uniip_var.h
+++ b/sys/netatm/uni/uniip_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/uniip_var.h,v 1.1.2.1 1999/08/29 16:29:19 peter Exp $
  *
  */
 
diff --git a/sys/netatm/uni/unisig.h b/sys/netatm/uni/unisig.h
index 1f06f5ccffc1..05357fb51402 100644
--- a/sys/netatm/uni/unisig.h
+++ b/sys/netatm/uni/unisig.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig.h,v 1.1.2.1 1999/08/29 16:29:20 peter Exp $
  *
  */
 
diff --git a/sys/netatm/uni/unisig_decode.c b/sys/netatm/uni/unisig_decode.c
index 6cd9bde21412..2ec72cc1b928 100644
--- a/sys/netatm/uni/unisig_decode.c
+++ b/sys/netatm/uni/unisig_decode.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig_decode.c,v 1.3.2.1 1999/08/29 16:29:20 peter Exp $
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/unisig_decode.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/unisig_decode.c,v 1.3.2.1 1999/08/29 16:29:20 peter Exp $");
 #endif
 
 #define	ALLOC_IE(ie)						\
diff --git a/sys/netatm/uni/unisig_decode.h b/sys/netatm/uni/unisig_decode.h
index 3a181f06abd7..409e359c6394 100644
--- a/sys/netatm/uni/unisig_decode.h
+++ b/sys/netatm/uni/unisig_decode.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig_decode.h,v 1.1.2.1 1999/08/29 16:29:21 peter Exp $
  *
  */
 
diff --git a/sys/netatm/uni/unisig_encode.c b/sys/netatm/uni/unisig_encode.c
index 9789ae94fa7c..78919e8e97b0 100644
--- a/sys/netatm/uni/unisig_encode.c
+++ b/sys/netatm/uni/unisig_encode.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig_encode.c,v 1.3.2.1 1999/08/29 16:29:21 peter Exp $
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/unisig_decode.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/unisig_encode.c,v 1.3.2.1 1999/08/29 16:29:21 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/unisig_if.c b/sys/netatm/uni/unisig_if.c
index ef9788707506..2b4dd895ebb8 100644
--- a/sys/netatm/uni/unisig_if.c
+++ b/sys/netatm/uni/unisig_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig_if.c,v 1.5.2.1 1999/08/29 16:29:22 peter Exp $
  *
  */
 
@@ -47,7 +47,7 @@
 #include <netatm/uni/unisig_msg.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/unisig_if.c,v 1.5.2.1 1999/08/29 16:29:22 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/unisig_mbuf.c b/sys/netatm/uni/unisig_mbuf.c
index 031d2ce85932..12a02a65c4cc 100644
--- a/sys/netatm/uni/unisig_mbuf.c
+++ b/sys/netatm/uni/unisig_mbuf.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig_mbuf.c,v 1.3.2.1 1999/08/29 16:29:22 peter Exp $
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/uni/unisig_msg.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/unisig_mbuf.c,v 1.3.2.1 1999/08/29 16:29:22 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/unisig_mbuf.h b/sys/netatm/uni/unisig_mbuf.h
index 986ae43ab5cb..4e76109e5640 100644
--- a/sys/netatm/uni/unisig_mbuf.h
+++ b/sys/netatm/uni/unisig_mbuf.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig_mbuf.h,v 1.1.2.1 1999/08/29 16:29:23 peter Exp $
  *
  */
 
diff --git a/sys/netatm/uni/unisig_msg.c b/sys/netatm/uni/unisig_msg.c
index 7d4125883832..78ee5e9dd49b 100644
--- a/sys/netatm/uni/unisig_msg.c
+++ b/sys/netatm/uni/unisig_msg.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig_msg.c,v 1.4.2.1 1999/08/29 16:29:23 peter Exp $
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/unisig_print.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/unisig_msg.c,v 1.4.2.1 1999/08/29 16:29:23 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/unisig_msg.h b/sys/netatm/uni/unisig_msg.h
index ad1e6d1af41a..026c7e0b62f3 100644
--- a/sys/netatm/uni/unisig_msg.h
+++ b/sys/netatm/uni/unisig_msg.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig_msg.h,v 1.1.2.1 1999/08/29 16:29:23 peter Exp $
  *
  */
 
diff --git a/sys/netatm/uni/unisig_print.c b/sys/netatm/uni/unisig_print.c
index 174b7518902f..c4828b0c2c06 100644
--- a/sys/netatm/uni/unisig_print.c
+++ b/sys/netatm/uni/unisig_print.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig_print.c,v 1.2.2.1 1999/08/29 16:29:24 peter Exp $
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/unisig_print.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/unisig_print.c,v 1.2.2.1 1999/08/29 16:29:24 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/unisig_print.h b/sys/netatm/uni/unisig_print.h
index 22f440a06abc..23bc453ce561 100644
--- a/sys/netatm/uni/unisig_print.h
+++ b/sys/netatm/uni/unisig_print.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig_print.h,v 1.1.2.1 1999/08/29 16:29:24 peter Exp $
  *
  */
 
diff --git a/sys/netatm/uni/unisig_proto.c b/sys/netatm/uni/unisig_proto.c
index 39aa8b0e44a6..1c6b17d9af60 100644
--- a/sys/netatm/uni/unisig_proto.c
+++ b/sys/netatm/uni/unisig_proto.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig_proto.c,v 1.3.2.1 1999/08/29 16:29:24 peter Exp $
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/unisig_mbuf.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/unisig_proto.c,v 1.3.2.1 1999/08/29 16:29:24 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/unisig_sigmgr_state.c b/sys/netatm/uni/unisig_sigmgr_state.c
index b4360c9a5f21..c341425b5330 100644
--- a/sys/netatm/uni/unisig_sigmgr_state.c
+++ b/sys/netatm/uni/unisig_sigmgr_state.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig_sigmgr_state.c,v 1.4.2.1 1999/08/29 16:29:25 peter Exp $
  *
  */
 
@@ -47,7 +47,7 @@
 #include <netatm/uni/sscf_uni.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/unisig_sigmgr_state.c,v 1.4.2.1 1999/08/29 16:29:25 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/unisig_subr.c b/sys/netatm/uni/unisig_subr.c
index 124784a5eae8..0ae3854ec271 100644
--- a/sys/netatm/uni/unisig_subr.c
+++ b/sys/netatm/uni/unisig_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig_subr.c,v 1.5.2.1 1999/08/29 16:29:25 peter Exp $
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/uni/unisig_msg.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/unisig_subr.c,v 1.5.2.1 1999/08/29 16:29:25 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/unisig_util.c b/sys/netatm/uni/unisig_util.c
index 5243628dd0b2..af0dbc08d1ab 100644
--- a/sys/netatm/uni/unisig_util.c
+++ b/sys/netatm/uni/unisig_util.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig_util.c,v 1.4.2.1 1999/08/29 16:29:25 peter Exp $
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/uni/unisig_msg.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/unisig_util.c,v 1.4.2.1 1999/08/29 16:29:25 peter Exp $");
 #endif
 
 
diff --git a/sys/netatm/uni/unisig_var.h b/sys/netatm/uni/unisig_var.h
index ca7e7faf56d5..efa227f25be2 100644
--- a/sys/netatm/uni/unisig_var.h
+++ b/sys/netatm/uni/unisig_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig_var.h,v 1.2.2.1 1999/08/29 16:29:26 peter Exp $
  *
  */
 
diff --git a/sys/netatm/uni/unisig_vc_state.c b/sys/netatm/uni/unisig_vc_state.c
index b6775095d730..711d99319e71 100644
--- a/sys/netatm/uni/unisig_vc_state.c
+++ b/sys/netatm/uni/unisig_vc_state.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig_vc_state.c,v 1.4.2.1 1999/08/29 16:29:26 peter Exp $
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/unisig_decode.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/netatm/uni/unisig_vc_state.c,v 1.4.2.1 1999/08/29 16:29:26 peter Exp $");
 #endif
 
 
diff --git a/sys/netgraph/NOTES b/sys/netgraph/NOTES
index 69d8b711b9e4..3d71ec1149c6 100644
--- a/sys/netgraph/NOTES
+++ b/sys/netgraph/NOTES
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/netgraph/NOTES,v 1.1.2.1 1999/11/17 07:23:20 julian Exp $
 Development ideas..
 
 Archie's suggestions... :-)
diff --git a/sys/netgraph/netgraph.h b/sys/netgraph/netgraph.h
index d59bc1e32ce7..0879e377eeb3 100644
--- a/sys/netgraph/netgraph.h
+++ b/sys/netgraph/netgraph.h
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/netgraph.h,v 1.3.2.11 1999/12/06 21:03:26 archie Exp $
  * $Whistle: netgraph.h,v 1.29 1999/11/01 07:56:13 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_UI.c b/sys/netgraph/ng_UI.c
index f4ec100606e2..fe1986a252d6 100644
--- a/sys/netgraph/ng_UI.c
+++ b/sys/netgraph/ng_UI.c
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_UI.c,v 1.3.2.3 1999/12/08 19:44:03 julian Exp $
  * $Whistle: ng_UI.c,v 1.14 1999/11/01 09:24:51 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_UI.h b/sys/netgraph/ng_UI.h
index 52fc36283ce1..b2746db88fd3 100644
--- a/sys/netgraph/ng_UI.h
+++ b/sys/netgraph/ng_UI.h
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_UI.h,v 1.1.2.2 1999/12/01 19:41:43 julian Exp $
  * $Whistle: ng_UI.h,v 1.6 1999/01/20 00:54:15 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_async.c b/sys/netgraph/ng_async.c
index 54ab716f97db..a0d00cf7bca6 100644
--- a/sys/netgraph/ng_async.c
+++ b/sys/netgraph/ng_async.c
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_async.c,v 1.3.2.5 1999/12/08 19:44:03 julian Exp $
  * $Whistle: ng_async.c,v 1.17 1999/11/01 09:24:51 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_async.h b/sys/netgraph/ng_async.h
index 63f6e43a505d..bec62c687f28 100644
--- a/sys/netgraph/ng_async.h
+++ b/sys/netgraph/ng_async.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_async.h,v 1.2.2.4 1999/12/01 19:41:44 julian Exp $
  * $Whistle: ng_async.h,v 1.5 1999/01/25 01:17:14 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_base.c b/sys/netgraph/ng_base.c
index 7d6bb6b82ae9..e9d67397b3fb 100644
--- a/sys/netgraph/ng_base.c
+++ b/sys/netgraph/ng_base.c
@@ -37,7 +37,7 @@
  * Authors: Julian Elischer <julian@whistle.com>
  *          Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.6.2.9 1999/12/08 19:44:03 julian Exp $
  * $Whistle: ng_base.c,v 1.39 1999/01/28 23:54:53 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_bpf.c b/sys/netgraph/ng_bpf.c
index f3c979f33bb0..018f5758d95b 100644
--- a/sys/netgraph/ng_bpf.c
+++ b/sys/netgraph/ng_bpf.c
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_bpf.c,v 1.2.2.1 1999/12/06 22:06:56 archie Exp $
  * $Whistle: ng_bpf.c,v 1.3 1999/12/03 20:30:23 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_bpf.h b/sys/netgraph/ng_bpf.h
index 474fd2a1183a..edc075438d04 100644
--- a/sys/netgraph/ng_bpf.h
+++ b/sys/netgraph/ng_bpf.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_bpf.h,v 1.2.2.1 1999/12/06 22:06:57 archie Exp $
  * $Whistle: ng_bpf.h,v 1.3 1999/12/03 20:30:23 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_cisco.c b/sys/netgraph/ng_cisco.c
index a94724091c26..3d4058e75f50 100644
--- a/sys/netgraph/ng_cisco.c
+++ b/sys/netgraph/ng_cisco.c
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_cisco.c,v 1.2.2.3 1999/12/08 19:44:04 julian Exp $
  * $Whistle: ng_cisco.c,v 1.25 1999/11/01 09:24:51 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_cisco.h b/sys/netgraph/ng_cisco.h
index a51dbfaff06e..6544f5a0187b 100644
--- a/sys/netgraph/ng_cisco.h
+++ b/sys/netgraph/ng_cisco.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_cisco.h,v 1.1.2.2 1999/12/01 19:41:44 julian Exp $
  * $Whistle: ng_cisco.h,v 1.6 1999/01/25 01:21:48 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_echo.c b/sys/netgraph/ng_echo.c
index a6de89c08754..503ae92c825b 100644
--- a/sys/netgraph/ng_echo.c
+++ b/sys/netgraph/ng_echo.c
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elisher <julian@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_echo.c,v 1.2.2.3 1999/12/08 19:44:04 julian Exp $
  * $Whistle: ng_echo.c,v 1.13 1999/11/01 09:24:51 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_echo.h b/sys/netgraph/ng_echo.h
index ca8663f1d864..6b16564c45a6 100644
--- a/sys/netgraph/ng_echo.h
+++ b/sys/netgraph/ng_echo.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_echo.h,v 1.1.2.1 1999/11/17 07:23:23 julian Exp $
  * $Whistle: ng_echo.h,v 1.3 1999/01/20 00:22:12 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_ether.h b/sys/netgraph/ng_ether.h
index f492361b6374..3279a262cec7 100644
--- a/sys/netgraph/ng_ether.h
+++ b/sys/netgraph/ng_ether.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ether.h,v 1.1.2.2 1999/12/01 19:41:44 julian Exp $
  * $Whistle: ng_ether.h,v 1.1 1999/02/02 03:17:22 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_frame_relay.c b/sys/netgraph/ng_frame_relay.c
index 7486486cfe3a..711eb75fd5b7 100644
--- a/sys/netgraph/ng_frame_relay.c
+++ b/sys/netgraph/ng_frame_relay.c
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elisher <julian@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_frame_relay.c,v 1.6.2.5 1999/12/08 19:44:04 julian Exp $
  * $Whistle: ng_frame_relay.c,v 1.20 1999/11/01 09:24:51 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_frame_relay.h b/sys/netgraph/ng_frame_relay.h
index 5c764217a539..10f3be2b8cb5 100644
--- a/sys/netgraph/ng_frame_relay.h
+++ b/sys/netgraph/ng_frame_relay.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_frame_relay.h,v 1.1.2.1 1999/11/17 07:23:24 julian Exp $
  * $Whistle: ng_frame_relay.h,v 1.7 1999/01/20 00:22:13 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_hole.c b/sys/netgraph/ng_hole.c
index 51470fa4c2f7..a751e3375dc5 100644
--- a/sys/netgraph/ng_hole.c
+++ b/sys/netgraph/ng_hole.c
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elisher <julian@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_hole.c,v 1.2.2.3 1999/12/08 19:44:04 julian Exp $
  * $Whistle: ng_hole.c,v 1.10 1999/11/01 09:24:51 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_hole.h b/sys/netgraph/ng_hole.h
index ec12f3f92513..789e22baa399 100644
--- a/sys/netgraph/ng_hole.h
+++ b/sys/netgraph/ng_hole.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_hole.h,v 1.1.2.1 1999/11/17 07:23:25 julian Exp $
  * $Whistle: ng_hole.h,v 1.3 1999/01/20 00:22:13 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_iface.c b/sys/netgraph/ng_iface.c
index 140a18fd3d9c..25f883b1205e 100644
--- a/sys/netgraph/ng_iface.c
+++ b/sys/netgraph/ng_iface.c
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_iface.c,v 1.4.2.4 1999/12/08 19:44:05 julian Exp $
  * $Whistle: ng_iface.c,v 1.33 1999/11/01 09:24:51 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_iface.h b/sys/netgraph/ng_iface.h
index 946f06e751c8..aea5910c13aa 100644
--- a/sys/netgraph/ng_iface.h
+++ b/sys/netgraph/ng_iface.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_iface.h,v 1.1.2.1 1999/11/17 07:23:26 julian Exp $
  * $Whistle: ng_iface.h,v 1.5 1999/01/20 00:22:13 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_ksocket.c b/sys/netgraph/ng_ksocket.c
index 5f332d9a356e..09b4c223b643 100644
--- a/sys/netgraph/ng_ksocket.c
+++ b/sys/netgraph/ng_ksocket.c
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ksocket.c,v 1.1.2.5 1999/12/08 19:44:05 julian Exp $
  * $Whistle: ng_ksocket.c,v 1.1 1999/11/16 20:04:40 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_ksocket.h b/sys/netgraph/ng_ksocket.h
index 48cb41fa347b..6190742e38af 100644
--- a/sys/netgraph/ng_ksocket.h
+++ b/sys/netgraph/ng_ksocket.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ksocket.h,v 1.1.2.2 1999/12/01 19:41:45 julian Exp $
  * $Whistle: ng_ksocket.h,v 1.1 1999/11/16 20:04:40 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_lmi.c b/sys/netgraph/ng_lmi.c
index 3a3afc9f15bf..b7de2a924670 100644
--- a/sys/netgraph/ng_lmi.c
+++ b/sys/netgraph/ng_lmi.c
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_lmi.c,v 1.3.2.3 1999/12/01 19:41:45 julian Exp $
  * $Whistle: ng_lmi.c,v 1.38 1999/11/01 09:24:52 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_lmi.h b/sys/netgraph/ng_lmi.h
index 16f2b5ba9871..dee3e2befc77 100644
--- a/sys/netgraph/ng_lmi.h
+++ b/sys/netgraph/ng_lmi.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_lmi.h,v 1.1.2.1 1999/11/17 07:23:27 julian Exp $
  * $Whistle: ng_lmi.h,v 1.9 1999/01/20 00:22:13 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_message.h b/sys/netgraph/ng_message.h
index aab7314bcf2c..5096a7b8cf22 100644
--- a/sys/netgraph/ng_message.h
+++ b/sys/netgraph/ng_message.h
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_message.h,v 1.2.2.2 1999/12/01 19:41:45 julian Exp $
  * $Whistle: ng_message.h,v 1.12 1999/01/25 01:17:44 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_parse.c b/sys/netgraph/ng_parse.c
index a1e0f8e5a5c9..84103a50d35a 100644
--- a/sys/netgraph/ng_parse.c
+++ b/sys/netgraph/ng_parse.c
@@ -37,7 +37,7 @@
  * Author: Archie Cobbs <archie@whistle.com>
  *
  * $Whistle: ng_parse.c,v 1.3 1999/11/29 01:43:48 archie Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_parse.c,v 1.1.2.4 1999/12/08 19:44:05 julian Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/netgraph/ng_parse.h b/sys/netgraph/ng_parse.h
index 0dbf7691f0c4..136e9fc8b3b7 100644
--- a/sys/netgraph/ng_parse.h
+++ b/sys/netgraph/ng_parse.h
@@ -37,7 +37,7 @@
  * Author: Archie Cobbs <archie@whistle.com>
  *
  * $Whistle: ng_parse.h,v 1.2 1999/11/29 01:43:48 archie Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_parse.h,v 1.2.2.3 1999/12/03 07:44:24 julian Exp $
  */
 
 #ifndef _NETGRAPH_PARSE_H_
diff --git a/sys/netgraph/ng_ppp.c b/sys/netgraph/ng_ppp.c
index 5bd137f1e792..ba7112928e72 100644
--- a/sys/netgraph/ng_ppp.c
+++ b/sys/netgraph/ng_ppp.c
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ppp.c,v 1.9.2.6 1999/12/17 23:39:37 archie Exp $
  * $Whistle: ng_ppp.c,v 1.24 1999/11/01 09:24:52 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_ppp.h b/sys/netgraph/ng_ppp.h
index c32b5a31b3a2..2b2c3e6019c1 100644
--- a/sys/netgraph/ng_ppp.h
+++ b/sys/netgraph/ng_ppp.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ppp.h,v 1.4.2.2 1999/12/01 19:41:45 julian Exp $
  * $Whistle: ng_ppp.h,v 1.8 1999/01/25 02:40:02 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_pppoe.c b/sys/netgraph/ng_pppoe.c
index 09df976c115e..94ff554e0126 100644
--- a/sys/netgraph/ng_pppoe.c
+++ b/sys/netgraph/ng_pppoe.c
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_pppoe.c,v 1.18.2.5 1999/12/08 19:44:06 julian Exp $
  * $Whistle: ng_pppoe.c,v 1.10 1999/11/01 09:24:52 julian Exp $
  */
 #if 0
diff --git a/sys/netgraph/ng_pppoe.h b/sys/netgraph/ng_pppoe.h
index 41fecd11e982..55bf5b4dcb98 100644
--- a/sys/netgraph/ng_pppoe.h
+++ b/sys/netgraph/ng_pppoe.h
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_pppoe.h,v 1.6.2.2 1999/12/01 19:41:46 julian Exp $
  * $Whistle: ng_pppoe.h,v 1.7 1999/10/16 10:16:43 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_pptpgre.c b/sys/netgraph/ng_pptpgre.c
index dde14bb52792..46cec316c9dd 100644
--- a/sys/netgraph/ng_pptpgre.c
+++ b/sys/netgraph/ng_pptpgre.c
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_pptpgre.c,v 1.1.2.1 1999/12/08 19:44:07 julian Exp $
  * $Whistle: ng_pptpgre.c,v 1.7 1999/12/08 00:10:06 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_pptpgre.h b/sys/netgraph/ng_pptpgre.h
index b3dfe1b64983..fd140818f0ca 100644
--- a/sys/netgraph/ng_pptpgre.h
+++ b/sys/netgraph/ng_pptpgre.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_pptpgre.h,v 1.1.2.1 1999/12/08 19:44:07 julian Exp $
  * $Whistle: ng_pptpgre.h,v 1.3 1999/12/08 00:11:36 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_rfc1490.c b/sys/netgraph/ng_rfc1490.c
index f14e74bf4e39..69bc78923670 100644
--- a/sys/netgraph/ng_rfc1490.c
+++ b/sys/netgraph/ng_rfc1490.c
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_rfc1490.c,v 1.3.2.3 1999/12/08 19:44:07 julian Exp $
  * $Whistle: ng_rfc1490.c,v 1.22 1999/11/01 09:24:52 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_rfc1490.h b/sys/netgraph/ng_rfc1490.h
index 494a60f0925c..2970e7f277e1 100644
--- a/sys/netgraph/ng_rfc1490.h
+++ b/sys/netgraph/ng_rfc1490.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_rfc1490.h,v 1.1.2.2 1999/12/01 19:41:46 julian Exp $
  * $Whistle: ng_rfc1490.h,v 1.7 1999/01/20 00:54:15 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_sample.c b/sys/netgraph/ng_sample.c
index 5269954cc877..a151b4db661e 100644
--- a/sys/netgraph/ng_sample.c
+++ b/sys/netgraph/ng_sample.c
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_sample.c,v 1.4.2.4 1999/12/03 07:44:24 julian Exp $
  * $Whistle: ng_sample.c,v 1.13 1999/11/01 09:24:52 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_sample.h b/sys/netgraph/ng_sample.h
index faa539c3dda0..6c2a04cfbedc 100644
--- a/sys/netgraph/ng_sample.h
+++ b/sys/netgraph/ng_sample.h
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_sample.h,v 1.1.2.3 1999/12/03 07:44:24 julian Exp $
  * $Whistle: ng_sample.h,v 1.3 1999/01/20 00:22:14 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_socket.c b/sys/netgraph/ng_socket.c
index 2bf98b7c45ba..11e20f04d730 100644
--- a/sys/netgraph/ng_socket.c
+++ b/sys/netgraph/ng_socket.c
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_socket.c,v 1.5.2.8 1999/12/08 19:44:08 julian Exp $
  * $Whistle: ng_socket.c,v 1.28 1999/11/01 09:24:52 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_socket.h b/sys/netgraph/ng_socket.h
index 517b316b91de..ebe8b7d47452 100644
--- a/sys/netgraph/ng_socket.h
+++ b/sys/netgraph/ng_socket.h
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_socket.h,v 1.2.2.4 1999/11/22 07:12:52 julian Exp $
  * $Whistle: ng_socket.h,v 1.5 1999/01/20 00:22:14 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_socketvar.h b/sys/netgraph/ng_socketvar.h
index df9cba3f9de3..f5b02f11f3df 100644
--- a/sys/netgraph/ng_socketvar.h
+++ b/sys/netgraph/ng_socketvar.h
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_socketvar.h,v 1.4.2.1 1999/11/17 07:23:32 julian Exp $
  * $Whistle: ng_socketvar.h,v 1.1 1999/01/20 21:35:39 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_tee.c b/sys/netgraph/ng_tee.c
index 575c8702c7a3..d184dcd0843f 100644
--- a/sys/netgraph/ng_tee.c
+++ b/sys/netgraph/ng_tee.c
@@ -36,7 +36,7 @@
  *
  * Author: Julian Elischer <julian@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_tee.c,v 1.4.2.4 1999/12/03 07:44:24 julian Exp $
  * $Whistle: ng_tee.c,v 1.18 1999/11/01 09:24:52 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_tee.h b/sys/netgraph/ng_tee.h
index 2c1959aa2107..3f321506f19f 100644
--- a/sys/netgraph/ng_tee.h
+++ b/sys/netgraph/ng_tee.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_tee.h,v 1.2.2.1 1999/11/17 07:23:33 julian Exp $
  * $Whistle: ng_tee.h,v 1.2 1999/01/20 00:22:14 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_tty.c b/sys/netgraph/ng_tty.c
index 0dc2a14733e2..9e7c655efabf 100644
--- a/sys/netgraph/ng_tty.c
+++ b/sys/netgraph/ng_tty.c
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_tty.c,v 1.4.2.6 1999/12/08 19:44:08 julian Exp $
  * $Whistle: ng_tty.c,v 1.21 1999/11/01 09:24:52 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_tty.h b/sys/netgraph/ng_tty.h
index ad7dc4e8f0b6..06d915944cbb 100644
--- a/sys/netgraph/ng_tty.h
+++ b/sys/netgraph/ng_tty.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_tty.h,v 1.1.2.1 1999/11/17 07:23:33 julian Exp $
  * $Whistle: ng_tty.h,v 1.7 1999/01/20 00:22:15 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_vjc.c b/sys/netgraph/ng_vjc.c
index 216b2df2b08c..f945ba8eeaad 100644
--- a/sys/netgraph/ng_vjc.c
+++ b/sys/netgraph/ng_vjc.c
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_vjc.c,v 1.5.2.4 1999/12/08 19:44:09 julian Exp $
  * $Whistle: ng_vjc.c,v 1.17 1999/11/01 09:24:52 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_vjc.h b/sys/netgraph/ng_vjc.h
index 7d808c99a993..93260e0f2690 100644
--- a/sys/netgraph/ng_vjc.h
+++ b/sys/netgraph/ng_vjc.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_vjc.h,v 1.4.2.1 1999/11/17 07:23:35 julian Exp $
  * $Whistle: ng_vjc.h,v 1.6 1999/01/25 02:40:22 archie Exp $
  */
 
diff --git a/sys/netinet/fil.c b/sys/netinet/fil.c
index ee0ff9096f38..aac7d214f395 100644
--- a/sys/netinet/fil.c
+++ b/sys/netinet/fil.c
@@ -7,7 +7,7 @@
  */
 #if !defined(lint)
 static const char sccsid[] = "@(#)fil.c	1.36 6/5/96 (C) 1993-1996 Darren Reed";
-static const char rcsid[] = "@(#)$FreeBSD$";
+static const char rcsid[] = "@(#)$FreeBSD: src/sys/netinet/fil.c,v 1.4.2.1 1999/08/29 16:29:29 peter Exp $";
 #endif
 
 #include "opt_ipfilter.h"
@@ -1098,7 +1098,7 @@ nodata:
  * SUCH DAMAGE.
  *
  *	@(#)uipc_mbuf.c	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/fil.c,v 1.4.2.1 1999/08/29 16:29:29 peter Exp $
  */
 /*
  * Copy data from an mbuf chain starting "off" bytes from the beginning,
diff --git a/sys/netinet/icmp_var.h b/sys/netinet/icmp_var.h
index c30d96f4f35d..9e1829159b0f 100644
--- a/sys/netinet/icmp_var.h
+++ b/sys/netinet/icmp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)icmp_var.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/icmp_var.h,v 1.12.2.1 1999/08/29 16:29:30 peter Exp $
  */
 
 #ifndef _NETINET_ICMP_VAR_H_
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index 6fa6be704fd6..53597930a23f 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ether.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/if_ether.c,v 1.52.2.6 1999/10/18 11:59:31 sheldonh Exp $
  */
 
 /*
diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h
index 79f1252781c7..85d8cb8aeefa 100644
--- a/sys/netinet/if_ether.h
+++ b/sys/netinet/if_ether.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ether.h	8.3 (Berkeley) 5/2/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/if_ether.h,v 1.21.2.1 1999/08/29 16:29:31 peter Exp $
  */
 
 #ifndef _NETINET_IF_ETHER_H_
diff --git a/sys/netinet/if_fddi.h b/sys/netinet/if_fddi.h
index fc6acc6c9c8f..df95c2b7b67c 100644
--- a/sys/netinet/if_fddi.h
+++ b/sys/netinet/if_fddi.h
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_fddi.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/if_fddi.h,v 1.6.4.1 1999/08/29 16:29:32 peter Exp $
  */
 
 #ifndef _NETINET_IF_FDDI_H_
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index 83cc650c21a5..2ee19eb87e8e 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp.c	8.1 (Berkeley) 7/19/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/igmp.c,v 1.27.2.1 1999/08/29 16:29:32 peter Exp $
  */
 
 /*
diff --git a/sys/netinet/igmp.h b/sys/netinet/igmp.h
index 7d943d6eb548..4150010b5e97 100644
--- a/sys/netinet/igmp.h
+++ b/sys/netinet/igmp.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/igmp.h,v 1.9.4.1 1999/08/29 16:29:32 peter Exp $
  */
 
 #ifndef _NETINET_IGMP_H_
diff --git a/sys/netinet/igmp_var.h b/sys/netinet/igmp_var.h
index 9e4802c305ec..1eb60fb8439f 100644
--- a/sys/netinet/igmp_var.h
+++ b/sys/netinet/igmp_var.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp_var.h	8.1 (Berkeley) 7/19/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/igmp_var.h,v 1.12.2.1 1999/08/29 16:29:33 peter Exp $
  */
 
 #ifndef _NETINET_IGMP_VAR_H_
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index c28b559b2fc2..acee9212c999 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in.c	8.4 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/in.c,v 1.39.2.2 1999/08/29 16:29:33 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/in.h b/sys/netinet/in.h
index 61869ef1cd47..6e159804e52a 100644
--- a/sys/netinet/in.h
+++ b/sys/netinet/in.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in.h	8.3 (Berkeley) 1/3/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/in.h,v 1.38.2.3 1999/08/29 16:29:34 peter Exp $
  */
 
 #ifndef _NETINET_IN_H_
diff --git a/sys/netinet/in_cksum.c b/sys/netinet/in_cksum.c
index eaf14935070a..71dc328a2d14 100644
--- a/sys/netinet/in_cksum.c
+++ b/sys/netinet/in_cksum.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_cksum.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/in_cksum.c,v 1.5.4.1 1999/08/29 16:29:34 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/in_hostcache.c b/sys/netinet/in_hostcache.c
index 33e0187565fa..8985f6bfeb5f 100644
--- a/sys/netinet/in_hostcache.c
+++ b/sys/netinet/in_hostcache.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/in_hostcache.c,v 1.2.2.1 1999/08/29 16:29:35 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/in_hostcache.h b/sys/netinet/in_hostcache.h
index 98e8fd433ecb..4380c360d2ca 100644
--- a/sys/netinet/in_hostcache.h
+++ b/sys/netinet/in_hostcache.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/in_hostcache.h,v 1.1.4.1 1999/08/29 16:29:35 peter Exp $
  */
 
 #ifndef _NETINET_IN_HOSTCACHE_H
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index 1859ac379b9b..ed21b00d0d02 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_pcb.c	8.4 (Berkeley) 5/24/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.46.2.3 1999/08/29 16:29:35 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index bdb16f7fa563..1f621c36b2ae 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_pcb.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/in_pcb.h,v 1.26.2.1 1999/08/29 16:29:36 peter Exp $
  */
 
 #ifndef _NETINET_IN_PCB_H_
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index bf793ea75370..74ee1b064ba1 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_proto.c	8.2 (Berkeley) 2/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/in_proto.c,v 1.47.2.1 1999/08/29 16:29:36 peter Exp $
  */
 
 #include "opt_ipdivert.h"
diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c
index c7c9cab9c1f5..28c76d01f5cb 100644
--- a/sys/netinet/in_rmx.c
+++ b/sys/netinet/in_rmx.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/in_rmx.c,v 1.35.2.1 1999/08/29 16:29:37 peter Exp $
  */
 
 /*
diff --git a/sys/netinet/in_systm.h b/sys/netinet/in_systm.h
index 5d18c56e7175..9597aac3ac50 100644
--- a/sys/netinet/in_systm.h
+++ b/sys/netinet/in_systm.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_systm.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/in_systm.h,v 1.7.2.1 1999/08/29 16:29:38 peter Exp $
  */
 
 #ifndef _NETINET_IN_SYSTM_H_
diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h
index 1ba4beff060b..65e183d06c0f 100644
--- a/sys/netinet/in_var.h
+++ b/sys/netinet/in_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_var.h	8.2 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/in_var.h,v 1.29.2.1 1999/08/29 16:29:38 peter Exp $
  */
 
 #ifndef _NETINET_IN_VAR_H_
diff --git a/sys/netinet/ip.h b/sys/netinet/ip.h
index 0b6f1b6361d5..d6348537ab82 100644
--- a/sys/netinet/ip.h
+++ b/sys/netinet/ip.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip.h	8.2 (Berkeley) 6/1/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip.h,v 1.15.2.1 1999/08/29 16:29:38 peter Exp $
  */
 
 #ifndef _NETINET_IP_H_
diff --git a/sys/netinet/ip_auth.c b/sys/netinet/ip_auth.c
index 4afda70b809d..5ef6bc7a62df 100644
--- a/sys/netinet/ip_auth.c
+++ b/sys/netinet/ip_auth.c
@@ -6,7 +6,7 @@
  * to the original author and the contributors.
  */
 #if !defined(lint)
-static const char rcsid[] = "@(#)$FreeBSD$";
+static const char rcsid[] = "@(#)$FreeBSD: src/sys/netinet/ip_auth.c,v 1.6.2.1 1999/08/29 16:29:39 peter Exp $";
 #endif
 
 #if defined(KERNEL) && !defined(_KERNEL)
diff --git a/sys/netinet/ip_auth.h b/sys/netinet/ip_auth.h
index 72e51b22ae1c..53ce77cf3d45 100644
--- a/sys/netinet/ip_auth.h
+++ b/sys/netinet/ip_auth.h
@@ -5,7 +5,7 @@
  * provided that this notice is preserved and due credit is given
  * to the original author and the contributors.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_auth.h,v 1.2.2.1 1999/08/29 16:29:39 peter Exp $
  *
  */
 #ifndef	__IP_AUTH_H__
diff --git a/sys/netinet/ip_compat.h b/sys/netinet/ip_compat.h
index e3fd1fee5f85..1f68444b3015 100644
--- a/sys/netinet/ip_compat.h
+++ b/sys/netinet/ip_compat.h
@@ -6,7 +6,7 @@
  * to the original author and the contributors.
  *
  * @(#)ip_compat.h	1.8 1/14/96
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_compat.h,v 1.1.1.6.2.1 1999/08/29 16:29:40 peter Exp $
  */
 
 #ifndef	__IP_COMPAT_H__
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index 73b3b2e9b735..efaa552cc689 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_divert.c,v 1.35.2.2 1999/08/29 16:29:40 peter Exp $
  */
 
 #include "opt_inet.h"
diff --git a/sys/netinet/ip_dummynet.c b/sys/netinet/ip_dummynet.c
index 70173674da0b..3748286fdc27 100644
--- a/sys/netinet/ip_dummynet.c
+++ b/sys/netinet/ip_dummynet.c
@@ -10,7 +10,7 @@
  *
  * This software is provided ``AS IS'' without any warranties of any kind.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_dummynet.c,v 1.7.2.8 1999/11/26 13:38:38 luigi Exp $
  */
 
 /*
diff --git a/sys/netinet/ip_dummynet.h b/sys/netinet/ip_dummynet.h
index 2935caa28566..39062956364f 100644
--- a/sys/netinet/ip_dummynet.h
+++ b/sys/netinet/ip_dummynet.h
@@ -10,7 +10,7 @@
  *
  * This software is provided ``AS IS'' without any warranties of any kind.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_dummynet.h,v 1.2.2.3 1999/08/29 16:29:41 peter Exp $
  */
 
 #ifndef _IP_DUMMYNET_H
diff --git a/sys/netinet/ip_fil.c b/sys/netinet/ip_fil.c
index 2dbea5dbf8ac..a0e7fc671a28 100644
--- a/sys/netinet/ip_fil.c
+++ b/sys/netinet/ip_fil.c
@@ -7,7 +7,7 @@
  */
 #if !defined(lint)
 static const char sccsid[] = "@(#)ip_fil.c	2.41 6/5/96 (C) 1993-1995 Darren Reed";
-static const char rcsid[] = "@(#)$FreeBSD$";
+static const char rcsid[] = "@(#)$FreeBSD: src/sys/netinet/ip_fil.c,v 1.7.2.1 1999/08/29 16:29:41 peter Exp $";
 #endif
 
 #include "opt_ipfilter.h"
diff --git a/sys/netinet/ip_fil.h b/sys/netinet/ip_fil.h
index 79f68964cbc9..99c0c4c69c4f 100644
--- a/sys/netinet/ip_fil.h
+++ b/sys/netinet/ip_fil.h
@@ -6,7 +6,7 @@
  * to the original author and the contributors.
  *
  * @(#)ip_fil.h	1.35 6/5/96
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_fil.h,v 1.6.2.1 1999/08/29 16:29:42 peter Exp $
  */
 
 #ifndef	__IP_FIL_H__
diff --git a/sys/netinet/ip_flow.c b/sys/netinet/ip_flow.c
index 29357f40e009..dc56c8f5de10 100644
--- a/sys/netinet/ip_flow.c
+++ b/sys/netinet/ip_flow.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_flow.c,v 1.6.2.1 1999/08/29 16:29:42 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/ip_flow.h b/sys/netinet/ip_flow.h
index 4675996cc790..22b5dab5c7a5 100644
--- a/sys/netinet/ip_flow.h
+++ b/sys/netinet/ip_flow.h
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_flow.h,v 1.1.2.1 1999/08/29 16:29:42 peter Exp $
  */
 
 #ifndef _NETINET_IP_FLOW_H
diff --git a/sys/netinet/ip_frag.c b/sys/netinet/ip_frag.c
index de104e55452b..b7cf45ed1a99 100644
--- a/sys/netinet/ip_frag.c
+++ b/sys/netinet/ip_frag.c
@@ -7,7 +7,7 @@
  */
 #if !defined(lint)
 static const char sccsid[] = "@(#)ip_frag.c	1.11 3/24/96 (C) 1993-1995 Darren Reed";
-static const char rcsid[] = "@(#)$FreeBSD$";
+static const char rcsid[] = "@(#)$FreeBSD: src/sys/netinet/ip_frag.c,v 1.3.2.1 1999/08/29 16:29:43 peter Exp $";
 #endif
 
 #if !defined(_KERNEL) && defined(KERNEL)
diff --git a/sys/netinet/ip_frag.h b/sys/netinet/ip_frag.h
index c50905042fa1..4248aaf45627 100644
--- a/sys/netinet/ip_frag.h
+++ b/sys/netinet/ip_frag.h
@@ -6,7 +6,7 @@
  * to the original author and the contributors.
  *
  * @(#)ip_frag.h	1.5 3/24/96
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_frag.h,v 1.1.1.5.2.1 1999/08/29 16:29:43 peter Exp $
  */
 
 #ifndef	__IP_FRAG_H__
diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c
index c2af6b3a8239..920675baeda7 100644
--- a/sys/netinet/ip_fw.c
+++ b/sys/netinet/ip_fw.c
@@ -12,7 +12,7 @@
  *
  * This software is provided ``AS IS'' without any warranties of any kind.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_fw.c,v 1.103.2.9 1999/08/29 16:29:44 peter Exp $
  */
 
 /*
diff --git a/sys/netinet/ip_fw.h b/sys/netinet/ip_fw.h
index 4ad1525fcafa..217499557999 100644
--- a/sys/netinet/ip_fw.h
+++ b/sys/netinet/ip_fw.h
@@ -11,7 +11,7 @@
  *
  * This software is provided ``AS IS'' without any warranties of any kind.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_fw.h,v 1.36.2.3 1999/08/29 16:29:45 peter Exp $
  */
 
 #ifndef _IP_FW_H
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index 145699b1f6be..a2f3cbef72e5 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_icmp.c	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_icmp.c,v 1.33.2.3 1999/10/14 11:49:38 des Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/ip_icmp.h b/sys/netinet/ip_icmp.h
index c8fd55fdf126..ca286644e9a9 100644
--- a/sys/netinet/ip_icmp.h
+++ b/sys/netinet/ip_icmp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_icmp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_icmp.h,v 1.12.2.2 1999/11/18 08:51:44 peter Exp $
  */
 
 #ifndef _NETINET_IP_ICMP_H_
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index a2028a61f34e..f73f8a29d350 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_input.c	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_input.c,v 1.111.2.4 1999/11/01 22:23:53 des Exp $
  *	$ANA: ip_input.c,v 1.5 1996/09/18 14:34:59 wollman Exp $
  */
 
diff --git a/sys/netinet/ip_log.c b/sys/netinet/ip_log.c
index 3f73a3e21fb6..c7298602f217 100644
--- a/sys/netinet/ip_log.c
+++ b/sys/netinet/ip_log.c
@@ -5,7 +5,7 @@
  * provided that this notice is preserved and due credit is given
  * to the original author and the contributors.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_log.c,v 1.6.2.1 1999/08/29 16:29:46 peter Exp $
  */
 #include "opt_ipfilter.h"
 
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index 00e11fe0cf48..b5963dedd973 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -9,7 +9,7 @@
  * Modified by Bill Fenner, PARC, April 1995
  *
  * MROUTING Revision: 3.5
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_mroute.c,v 1.53.2.1 1999/08/29 16:29:47 peter Exp $
  */
 
 #include "opt_mrouting.h"
diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h
index abccedaa02a9..7823a7168190 100644
--- a/sys/netinet/ip_mroute.h
+++ b/sys/netinet/ip_mroute.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_mroute.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_mroute.h,v 1.15.2.1 1999/08/29 16:29:47 peter Exp $
  */
 
 #ifndef _NETINET_IP_MROUTE_H_
diff --git a/sys/netinet/ip_nat.c b/sys/netinet/ip_nat.c
index a8f8744f5149..e32377c0d5d9 100644
--- a/sys/netinet/ip_nat.c
+++ b/sys/netinet/ip_nat.c
@@ -9,7 +9,7 @@
  */
 #if !defined(lint)
 static const char sccsid[] = "@(#)ip_nat.c	1.11 6/5/96 (C) 1995 Darren Reed";
-static const char rcsid[] = "@(#)$FreeBSD$";
+static const char rcsid[] = "@(#)$FreeBSD: src/sys/netinet/ip_nat.c,v 1.5.2.1 1999/08/29 16:29:48 peter Exp $";
 #endif
 
 #include "opt_ipfilter.h"
diff --git a/sys/netinet/ip_nat.h b/sys/netinet/ip_nat.h
index d02a84457774..a5e677fed63a 100644
--- a/sys/netinet/ip_nat.h
+++ b/sys/netinet/ip_nat.h
@@ -6,7 +6,7 @@
  * to the original author and the contributors.
  *
  * @(#)ip_nat.h	1.5 2/4/96
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_nat.h,v 1.2.2.1 1999/08/29 16:29:48 peter Exp $
  */
 
 #ifndef	__IP_NAT_H__
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index bf6dbf586444..12235858c9db 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_output.c	8.3 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_output.c,v 1.85.2.4 1999/08/29 16:29:49 peter Exp $
  */
 
 #define _IP_VHL
diff --git a/sys/netinet/ip_proxy.c b/sys/netinet/ip_proxy.c
index 30639b94f3b5..c853042d3d96 100644
--- a/sys/netinet/ip_proxy.c
+++ b/sys/netinet/ip_proxy.c
@@ -6,7 +6,7 @@
  * to the original author and the contributors.
  */
 #if !defined(lint)
-static const char rcsid[] = "@(#)$FreeBSD$";
+static const char rcsid[] = "@(#)$FreeBSD: src/sys/netinet/ip_proxy.c,v 1.3.2.1 1999/08/29 16:29:49 peter Exp $";
 #endif
 
 #if defined(__FreeBSD__) && defined(KERNEL) && !defined(_KERNEL)
diff --git a/sys/netinet/ip_proxy.h b/sys/netinet/ip_proxy.h
index cd7e9f9a671a..1c2a01b56e9f 100644
--- a/sys/netinet/ip_proxy.h
+++ b/sys/netinet/ip_proxy.h
@@ -5,7 +5,7 @@
  * provided that this notice is preserved and due credit is given
  * to the original author and the contributors.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_proxy.h,v 1.1.1.3.2.1 1999/08/29 16:29:50 peter Exp $
  */
 
 #ifndef	__IP_PROXY_H__
diff --git a/sys/netinet/ip_state.c b/sys/netinet/ip_state.c
index 6e1c09bc1cc0..1c4ae4be004a 100644
--- a/sys/netinet/ip_state.c
+++ b/sys/netinet/ip_state.c
@@ -7,7 +7,7 @@
  */
 #if !defined(lint)
 static const char sccsid[] = "@(#)ip_state.c	1.8 6/5/96 (C) 1993-1995 Darren Reed";
-static const char rcsid[] = "@(#)$FreeBSD$";
+static const char rcsid[] = "@(#)$FreeBSD: src/sys/netinet/ip_state.c,v 1.4.2.1 1999/08/29 16:29:50 peter Exp $";
 #endif
 
 #include "opt_ipfilter.h"
diff --git a/sys/netinet/ip_state.h b/sys/netinet/ip_state.h
index 2b7e8989de4d..f756a5d2719c 100644
--- a/sys/netinet/ip_state.h
+++ b/sys/netinet/ip_state.h
@@ -6,7 +6,7 @@
  * to the original author and the contributors.
  *
  * @(#)ip_state.h	1.3 1/12/96 (C) 1995 Darren Reed
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_state.h,v 1.1.1.5.2.1 1999/08/29 16:29:51 peter Exp $
  */
 #ifndef	__IP_STATE_H__
 #define	__IP_STATE_H__
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index 08b3a06d3304..d30d614b49ab 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_var.h	8.2 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_var.h,v 1.45.2.1 1999/08/29 16:29:51 peter Exp $
  */
 
 #ifndef _NETINET_IP_VAR_H_
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index 1c4a8fd54f3f..43ebc3c0e886 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_ip.c	8.7 (Berkeley) 5/15/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/raw_ip.c,v 1.56.2.2 1999/08/29 16:29:52 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h
index 268b54e272c1..ac44f17b9613 100644
--- a/sys/netinet/tcp.h
+++ b/sys/netinet/tcp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp.h,v 1.10.2.1 1999/08/29 16:29:52 peter Exp $
  */
 
 #ifndef _NETINET_TCP_H_
diff --git a/sys/netinet/tcp_debug.c b/sys/netinet/tcp_debug.c
index a01607dac3ec..9470d63594a5 100644
--- a/sys/netinet/tcp_debug.c
+++ b/sys/netinet/tcp_debug.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_debug.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_debug.c,v 1.13.2.1 1999/08/29 16:29:52 peter Exp $
  */
 
 #include "opt_inet.h"
diff --git a/sys/netinet/tcp_debug.h b/sys/netinet/tcp_debug.h
index c359cb4034b1..3f1e6ec16306 100644
--- a/sys/netinet/tcp_debug.h
+++ b/sys/netinet/tcp_debug.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_debug.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_debug.h,v 1.7.4.1 1999/08/29 16:29:53 peter Exp $
  */
 
 #ifndef _NETINET_TCP_DEBUG_H_
diff --git a/sys/netinet/tcp_fsm.h b/sys/netinet/tcp_fsm.h
index b079faa65975..7e114202a154 100644
--- a/sys/netinet/tcp_fsm.h
+++ b/sys/netinet/tcp_fsm.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_fsm.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_fsm.h,v 1.10.2.3 1999/11/15 02:52:54 green Exp $
  */
 
 #ifndef _NETINET_TCP_FSM_H_
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 7e1ee2365541..a55e26a818a4 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_input.c	8.12 (Berkeley) 5/24/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.82.2.3 1999/10/14 11:49:38 des Exp $
  */
 
 #include "opt_ipfw.h"		/* for ipfw_fwd		*/
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 23839526a61f..d343d0a01a7f 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_output.c	8.4 (Berkeley) 5/24/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_output.c,v 1.32.2.2 1999/08/29 16:29:55 peter Exp $
  */
 
 #include "opt_tcpdebug.h"
diff --git a/sys/netinet/tcp_seq.h b/sys/netinet/tcp_seq.h
index 0ad0fb838be1..d33f77981ef2 100644
--- a/sys/netinet/tcp_seq.h
+++ b/sys/netinet/tcp_seq.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_seq.h	8.3 (Berkeley) 6/21/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_seq.h,v 1.8.4.1 1999/08/29 16:29:55 peter Exp $
  */
 
 #ifndef _NETINET_TCP_SEQ_H_
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index e8457363da8a..a1aa0900467a 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_subr.c	8.2 (Berkeley) 5/24/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.49.2.4 1999/08/29 16:29:55 peter Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index 858c684f048e..40a2c86848ba 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_timer.c	8.2 (Berkeley) 5/24/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_timer.c,v 1.28.2.1 1999/08/29 16:29:56 peter Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h
index 3c0f39e47a4d..269635524bb2 100644
--- a/sys/netinet/tcp_timer.h
+++ b/sys/netinet/tcp_timer.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_timer.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_timer.h,v 1.13.2.1 1999/08/29 16:29:56 peter Exp $
  */
 
 #ifndef _NETINET_TCP_TIMER_H_
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index 060f84ac1e38..110d783703f8 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)tcp_usrreq.c	8.2 (Berkeley) 1/3/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_usrreq.c,v 1.40.2.3 1999/08/29 16:29:57 peter Exp $
  */
 
 #include "opt_tcpdebug.h"
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index 2742619e449f..4e004989956b 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_var.h	8.4 (Berkeley) 5/24/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_var.h,v 1.49.2.1 1999/08/29 16:29:57 peter Exp $
  */
 
 #ifndef _NETINET_TCP_VAR_H_
diff --git a/sys/netinet/tcpip.h b/sys/netinet/tcpip.h
index 2cf3df1d3ba6..d0f51fd6eb3e 100644
--- a/sys/netinet/tcpip.h
+++ b/sys/netinet/tcpip.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcpip.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcpip.h,v 1.7.2.1 1999/08/29 16:29:57 peter Exp $
  */
 
 #ifndef _NETINET_TCPIP_H_
diff --git a/sys/netinet/udp.h b/sys/netinet/udp.h
index 635267f065a1..7763c82fe55a 100644
--- a/sys/netinet/udp.h
+++ b/sys/netinet/udp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/udp.h,v 1.6.4.1 1999/08/29 16:29:58 peter Exp $
  */
 
 #ifndef _NETINET_UDP_H_
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index c3b7ffb22942..80c0199a7564 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp_usrreq.c	8.6 (Berkeley) 5/23/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.49.2.2 1999/08/29 16:29:58 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h
index f0a5141d8432..b27e7ebc2b09 100644
--- a/sys/netinet/udp_var.h
+++ b/sys/netinet/udp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp_var.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/udp_var.h,v 1.16.2.2 1999/08/29 16:29:59 peter Exp $
  */
 
 #ifndef _NETINET_UDP_VAR_H_
diff --git a/sys/netipx/ipx.c b/sys/netipx/ipx.c
index dccb99783550..fbfdced64020 100644
--- a/sys/netipx/ipx.c
+++ b/sys/netipx/ipx.c
@@ -33,7 +33,7 @@
  * 
  *	@(#)ipx.c
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/ipx.c,v 1.15.2.1 1999/08/29 16:30:03 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netipx/ipx.h b/sys/netipx/ipx.h
index fd23b5c63a07..c0a91d2b8209 100644
--- a/sys/netipx/ipx.h
+++ b/sys/netipx/ipx.h
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/ipx.h,v 1.13.4.2 1999/08/30 16:52:10 jhay Exp $
  */
 
 #ifndef _NETIPX_IPX_H_
diff --git a/sys/netipx/ipx_cksum.c b/sys/netipx/ipx_cksum.c
index 02d8f93a1a1d..48ed59c3b5a2 100644
--- a/sys/netipx/ipx_cksum.c
+++ b/sys/netipx/ipx_cksum.c
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_cksum.c
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/ipx_cksum.c,v 1.7.4.2 1999/08/30 16:52:10 jhay Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netipx/ipx_if.h b/sys/netipx/ipx_if.h
index c6ec19e0ded0..103d2dda1f02 100644
--- a/sys/netipx/ipx_if.h
+++ b/sys/netipx/ipx_if.h
@@ -33,7 +33,7 @@
  * 
  *	@(#)ipx_if.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/ipx_if.h,v 1.9.4.1 1999/08/29 16:30:04 peter Exp $
  */
 
 #ifndef _NETIPX_IPX_IF_H_
diff --git a/sys/netipx/ipx_input.c b/sys/netipx/ipx_input.c
index 0b51a9bccb3d..964aac5fc0d1 100644
--- a/sys/netipx/ipx_input.c
+++ b/sys/netipx/ipx_input.c
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_input.c
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/ipx_input.c,v 1.18.2.2 1999/08/30 16:52:10 jhay Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netipx/ipx_ip.c b/sys/netipx/ipx_ip.c
index 4f5721f00fef..9bfcc2a86163 100644
--- a/sys/netipx/ipx_ip.c
+++ b/sys/netipx/ipx_ip.c
@@ -33,7 +33,7 @@
  * 
  *	@(#)ipx_ip.c
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/ipx_ip.c,v 1.22.2.1 1999/08/29 16:30:05 peter Exp $
  */
 
 /*
diff --git a/sys/netipx/ipx_ip.h b/sys/netipx/ipx_ip.h
index 0543df5dab29..e875a93c939f 100644
--- a/sys/netipx/ipx_ip.h
+++ b/sys/netipx/ipx_ip.h
@@ -33,7 +33,7 @@
  *
  *	@(#)ipxip.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/ipx_ip.h,v 1.12.2.1 1999/08/29 16:30:05 peter Exp $
  */
 
 #ifndef _NETIPX_IPXIP_H_
diff --git a/sys/netipx/ipx_outputfl.c b/sys/netipx/ipx_outputfl.c
index e0f3b9a6b3d9..538d0c866ed6 100644
--- a/sys/netipx/ipx_outputfl.c
+++ b/sys/netipx/ipx_outputfl.c
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_outputfl.c
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/ipx_outputfl.c,v 1.10.2.3 1999/08/30 16:52:10 jhay Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netipx/ipx_pcb.c b/sys/netipx/ipx_pcb.c
index 66a6c8222da7..1cfedadb55ed 100644
--- a/sys/netipx/ipx_pcb.c
+++ b/sys/netipx/ipx_pcb.c
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_pcb.c
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/ipx_pcb.c,v 1.14.2.3 1999/08/30 16:52:10 jhay Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netipx/ipx_pcb.h b/sys/netipx/ipx_pcb.h
index 366f6c1c4f9c..2a2aed3766de 100644
--- a/sys/netipx/ipx_pcb.h
+++ b/sys/netipx/ipx_pcb.h
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_pcb.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/ipx_pcb.h,v 1.12.2.2 1999/08/30 16:52:11 jhay Exp $
  */
 
 #ifndef _NETIPX_IPX_PCB_H_
diff --git a/sys/netipx/ipx_proto.c b/sys/netipx/ipx_proto.c
index 65ab19cf6218..b489f412e178 100644
--- a/sys/netipx/ipx_proto.c
+++ b/sys/netipx/ipx_proto.c
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_proto.c
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/ipx_proto.c,v 1.13.2.1 1999/08/29 16:30:07 peter Exp $
  */
 
 #include "opt_ipx.h"
diff --git a/sys/netipx/ipx_tun.c b/sys/netipx/ipx_tun.c
index f2709eb8c8cf..2c727546f7ef 100644
--- a/sys/netipx/ipx_tun.c
+++ b/sys/netipx/ipx_tun.c
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_tun.c
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/ipx_tun.c,v 1.8.4.1 1999/08/29 16:30:07 peter Exp $
  */
 
 /*
diff --git a/sys/netipx/ipx_usrreq.c b/sys/netipx/ipx_usrreq.c
index bb4d6f37c302..ba765460e532 100644
--- a/sys/netipx/ipx_usrreq.c
+++ b/sys/netipx/ipx_usrreq.c
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_usrreq.c
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/ipx_usrreq.c,v 1.21.2.3 1999/08/30 16:52:11 jhay Exp $
  */
 
 #include "opt_ipx.h"
diff --git a/sys/netipx/ipx_var.h b/sys/netipx/ipx_var.h
index 0ffd908a0026..89ebb6b38290 100644
--- a/sys/netipx/ipx_var.h
+++ b/sys/netipx/ipx_var.h
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_var.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/ipx_var.h,v 1.11.2.1 1999/08/29 16:30:08 peter Exp $
  */
 
 #ifndef _NETIPX_IPX_VAR_H_
diff --git a/sys/netipx/spx.h b/sys/netipx/spx.h
index 6fca28a17d7a..3e68c3bb07fb 100644
--- a/sys/netipx/spx.h
+++ b/sys/netipx/spx.h
@@ -33,7 +33,7 @@
  *
  *	@(#)spx.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/spx.h,v 1.14.2.1 1999/08/29 16:30:08 peter Exp $
  */
 
 #ifndef _NETIPX_SPX_H_
diff --git a/sys/netipx/spx_debug.c b/sys/netipx/spx_debug.c
index d8e0a6f34f0f..e352720c8450 100644
--- a/sys/netipx/spx_debug.c
+++ b/sys/netipx/spx_debug.c
@@ -33,7 +33,7 @@
  *
  *	@(#)spx_debug.c
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/spx_debug.c,v 1.13.2.1 1999/08/29 16:30:10 peter Exp $
  */
 
 #include "opt_inet.h"
diff --git a/sys/netipx/spx_debug.h b/sys/netipx/spx_debug.h
index 94f2e2f3bbf9..28a87445df1a 100644
--- a/sys/netipx/spx_debug.h
+++ b/sys/netipx/spx_debug.h
@@ -33,7 +33,7 @@
  *
  *	@(#)spx_debug.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/spx_debug.h,v 1.10.4.1 1999/08/29 16:30:10 peter Exp $
  */
 
 #ifndef _NETIPX_SPX_DEBUG_H_
diff --git a/sys/netipx/spx_timer.h b/sys/netipx/spx_timer.h
index 602200975fad..b2c9921ac150 100644
--- a/sys/netipx/spx_timer.h
+++ b/sys/netipx/spx_timer.h
@@ -33,7 +33,7 @@
  *
  *	@(#)spx_timer.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/spx_timer.h,v 1.9.4.1 1999/08/29 16:30:10 peter Exp $
  */
 
 #ifndef _NETIPX_SPX_TIMER_H_
diff --git a/sys/netipx/spx_usrreq.c b/sys/netipx/spx_usrreq.c
index 0da1149bfc3a..a980775bad3e 100644
--- a/sys/netipx/spx_usrreq.c
+++ b/sys/netipx/spx_usrreq.c
@@ -33,7 +33,7 @@
  *
  *	@(#)spx_usrreq.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/spx_usrreq.c,v 1.22.2.3 1999/08/30 16:52:11 jhay Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netipx/spx_var.h b/sys/netipx/spx_var.h
index 7dfb783ee89d..9e5ba85a1631 100644
--- a/sys/netipx/spx_var.h
+++ b/sys/netipx/spx_var.h
@@ -33,7 +33,7 @@
  *
  *	@(#)spx_var.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/spx_var.h,v 1.8.4.1 1999/08/29 16:30:11 peter Exp $
  */
 
 #ifndef _NETIPX_SPX_VAR_H_
diff --git a/sys/netns/idp.h b/sys/netns/idp.h
index e83275659767..3e6c1d3998f0 100644
--- a/sys/netns/idp.h
+++ b/sys/netns/idp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)idp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netns/idp.h,v 1.7.4.1 1999/08/29 16:30:13 peter Exp $
  */
 
 #ifndef _NETNS_IDP_H_
diff --git a/sys/netns/idp_usrreq.c b/sys/netns/idp_usrreq.c
index a03770f02ddb..fd0a30e2771e 100644
--- a/sys/netns/idp_usrreq.c
+++ b/sys/netns/idp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)idp_usrreq.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netns/idp_usrreq.c,v 1.8.4.1 1999/08/29 16:30:13 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/idp_var.h b/sys/netns/idp_var.h
index ce4314177404..52d7afedb3e2 100644
--- a/sys/netns/idp_var.h
+++ b/sys/netns/idp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)idp_var.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netns/idp_var.h,v 1.8.4.1 1999/08/29 16:30:14 peter Exp $
  */
 
 #ifndef _NETNS_IDP_VAR_H_
diff --git a/sys/netns/ns.c b/sys/netns/ns.c
index 7af5acf12ac9..e6f64c5180f6 100644
--- a/sys/netns/ns.c
+++ b/sys/netns/ns.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns.c	8.2 (Berkeley) 11/15/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netns/ns.c,v 1.8.4.1 1999/08/29 16:30:14 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns.h b/sys/netns/ns.h
index a20b868cab61..9c1f8b5f7139 100644
--- a/sys/netns/ns.h
+++ b/sys/netns/ns.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netns/ns.h,v 1.11.4.1 1999/08/29 16:30:15 peter Exp $
  */
 
 #ifndef _NETNS_NS_H_
diff --git a/sys/netns/ns_cksum.c b/sys/netns/ns_cksum.c
index 1f9a58aad096..8c79654e108e 100644
--- a/sys/netns/ns_cksum.c
+++ b/sys/netns/ns_cksum.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_cksum.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netns/ns_cksum.c,v 1.6.4.1 1999/08/29 16:30:15 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns_error.c b/sys/netns/ns_error.c
index fc4db94bd69e..43d7467f5a8b 100644
--- a/sys/netns/ns_error.c
+++ b/sys/netns/ns_error.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_error.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netns/ns_error.c,v 1.8.4.1 1999/08/29 16:30:16 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns_error.h b/sys/netns/ns_error.h
index 234080130fa7..41fd77fd3afd 100644
--- a/sys/netns/ns_error.h
+++ b/sys/netns/ns_error.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_error.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netns/ns_error.h,v 1.8.4.1 1999/08/29 16:30:16 peter Exp $
  */
 
 #ifndef _NETNS_NS_ERROR_H_
diff --git a/sys/netns/ns_if.h b/sys/netns/ns_if.h
index 4dfabe7c7494..ba664f5bc9be 100644
--- a/sys/netns/ns_if.h
+++ b/sys/netns/ns_if.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_if.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netns/ns_if.h,v 1.10.4.1 1999/08/29 16:30:17 peter Exp $
  */
 
 #ifndef _NETNS_NS_IF_H_
diff --git a/sys/netns/ns_input.c b/sys/netns/ns_input.c
index 21d64a09a8a6..0c6130dbc59d 100644
--- a/sys/netns/ns_input.c
+++ b/sys/netns/ns_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_input.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netns/ns_input.c,v 1.10.4.1 1999/08/29 16:30:17 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns_ip.c b/sys/netns/ns_ip.c
index 0c5fbeb84647..8ee2b4d86e6e 100644
--- a/sys/netns/ns_ip.c
+++ b/sys/netns/ns_ip.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_ip.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netns/ns_ip.c,v 1.8.4.1 1999/08/29 16:30:18 peter Exp $
  */
 
 /*
diff --git a/sys/netns/ns_output.c b/sys/netns/ns_output.c
index 572ed36585fe..183929934069 100644
--- a/sys/netns/ns_output.c
+++ b/sys/netns/ns_output.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_output.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netns/ns_output.c,v 1.6.4.1 1999/08/29 16:30:18 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns_pcb.c b/sys/netns/ns_pcb.c
index 85f7548e68e9..ddf318c74a43 100644
--- a/sys/netns/ns_pcb.c
+++ b/sys/netns/ns_pcb.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_pcb.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netns/ns_pcb.c,v 1.8.4.1 1999/08/29 16:30:19 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns_pcb.h b/sys/netns/ns_pcb.h
index 8b5646a32cc5..3dd5c968ce9a 100644
--- a/sys/netns/ns_pcb.h
+++ b/sys/netns/ns_pcb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_pcb.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netns/ns_pcb.h,v 1.9.4.1 1999/08/29 16:30:19 peter Exp $
  */
 
 #ifndef _NETNS_NS_PCB_H_
diff --git a/sys/netns/ns_proto.c b/sys/netns/ns_proto.c
index 1bee0e472814..c71e9ad2816c 100644
--- a/sys/netns/ns_proto.c
+++ b/sys/netns/ns_proto.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)ns_proto.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netns/ns_proto.c,v 1.9.4.1 1999/08/29 16:30:20 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/sp.h b/sys/netns/sp.h
index adef4fd64b31..127540cf98b9 100644
--- a/sys/netns/sp.h
+++ b/sys/netns/sp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netns/sp.h,v 1.7.4.1 1999/08/29 16:30:20 peter Exp $
  */
 
 #ifndef _NETNS_SP_H_
diff --git a/sys/netns/spidp.h b/sys/netns/spidp.h
index 3920f672a214..cba571c7666f 100644
--- a/sys/netns/spidp.h
+++ b/sys/netns/spidp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spidp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netns/spidp.h,v 1.7.4.1 1999/08/29 16:30:20 peter Exp $
  */
 
 #ifndef _NETNS_SPIDP_H_
diff --git a/sys/netns/spp_debug.c b/sys/netns/spp_debug.c
index 840d93a844c9..7878824d6814 100644
--- a/sys/netns/spp_debug.c
+++ b/sys/netns/spp_debug.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_debug.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netns/spp_debug.c,v 1.9.2.1 1999/08/29 16:30:21 peter Exp $
  */
 
 #include "opt_inet.h"
diff --git a/sys/netns/spp_debug.h b/sys/netns/spp_debug.h
index db0d71318a52..34e9e9e60dca 100644
--- a/sys/netns/spp_debug.h
+++ b/sys/netns/spp_debug.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_debug.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netns/spp_debug.h,v 1.8.4.1 1999/08/29 16:30:21 peter Exp $
  */
 
 #ifndef _NETNS_SPP_DEBUG_H_
diff --git a/sys/netns/spp_timer.h b/sys/netns/spp_timer.h
index 7501a0cc9889..3890fca754ca 100644
--- a/sys/netns/spp_timer.h
+++ b/sys/netns/spp_timer.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_timer.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netns/spp_timer.h,v 1.7.4.1 1999/08/29 16:30:22 peter Exp $
  */
 
 #ifndef _NETNS_SPP_TIMER_H_
diff --git a/sys/netns/spp_usrreq.c b/sys/netns/spp_usrreq.c
index 4ab74ce1e250..b467d6f05af6 100644
--- a/sys/netns/spp_usrreq.c
+++ b/sys/netns/spp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_usrreq.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netns/spp_usrreq.c,v 1.10.4.1 1999/08/29 16:30:22 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/spp_var.h b/sys/netns/spp_var.h
index e1d88dee9ec2..bf3ea6b9c5e1 100644
--- a/sys/netns/spp_var.h
+++ b/sys/netns/spp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_var.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netns/spp_var.h,v 1.9.4.1 1999/08/29 16:30:22 peter Exp $
  */
 
 #ifndef _NETNS_SPP_VAR_H_
diff --git a/sys/nfs/bootp_subr.c b/sys/nfs/bootp_subr.c
index 3b9a9c3eee78..1245f4ef66ee 100644
--- a/sys/nfs/bootp_subr.c
+++ b/sys/nfs/bootp_subr.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/sys/nfs/bootp_subr.c,v 1.18.2.1 1999/08/29 16:30:24 peter Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon Ross, Adam Glass
diff --git a/sys/nfs/krpc.h b/sys/nfs/krpc.h
index 6c889b57f77c..005b48d589ce 100644
--- a/sys/nfs/krpc.h
+++ b/sys/nfs/krpc.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: krpc.h,v 1.4 1995/12/19 23:07:11 cgd Exp $	*/
-/* $FreeBSD$	*/
+/* $FreeBSD: src/sys/nfs/krpc.h,v 1.5.2.1 1999/08/29 16:30:26 peter Exp $	*/
 
 #include <sys/cdefs.h>
 
diff --git a/sys/nfs/krpc_subr.c b/sys/nfs/krpc_subr.c
index d8e0d5a3c844..aabea5cfc5d9 100644
--- a/sys/nfs/krpc_subr.c
+++ b/sys/nfs/krpc_subr.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: krpc_subr.c,v 1.12.4.1 1996/06/07 00:52:26 cgd Exp $	*/
-/* $FreeBSD$	*/
+/* $FreeBSD: src/sys/nfs/krpc_subr.c,v 1.11.2.1 1999/08/29 16:30:26 peter Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon Ross, Adam Glass
diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h
index 2f3be046206f..df9d8b418a1e 100644
--- a/sys/nfs/nfs.h
+++ b/sys/nfs/nfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/nfs.h,v 1.44.2.1 1999/08/29 16:30:26 peter Exp $
  */
 
 #ifndef _NFS_NFS_H_
diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c
index 129256c16335..823dace419a6 100644
--- a/sys/nfs/nfs_bio.c
+++ b/sys/nfs/nfs_bio.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_bio.c	8.9 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/nfs_bio.c,v 1.65.2.4 1999/12/14 19:12:19 dillon Exp $
  */
 
 
diff --git a/sys/nfs/nfs_node.c b/sys/nfs/nfs_node.c
index 13ff9b2902a0..e5a9ac69e5d2 100644
--- a/sys/nfs/nfs_node.c
+++ b/sys/nfs/nfs_node.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_node.c	8.6 (Berkeley) 5/22/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/nfs_node.c,v 1.28.2.4 1999/08/29 16:30:27 peter Exp $
  */
 
 
diff --git a/sys/nfs/nfs_nqlease.c b/sys/nfs/nfs_nqlease.c
index 302942064df2..da12a922ce1b 100644
--- a/sys/nfs/nfs_nqlease.c
+++ b/sys/nfs/nfs_nqlease.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_nqlease.c	8.9 (Berkeley) 5/20/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/nfs_nqlease.c,v 1.39.2.3 1999/12/12 07:16:17 dillon Exp $
  */
 
 
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c
index 1e8d8d5687a9..822ce1f2cb2b 100644
--- a/sys/nfs/nfs_serv.c
+++ b/sys/nfs/nfs_serv.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_serv.c  8.8 (Berkeley) 7/31/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/nfs_serv.c,v 1.72.2.8 1999/12/16 17:03:10 dillon Exp $
  */
 
 /*
diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c
index 3f88abe23cc4..8fdacad69693 100644
--- a/sys/nfs/nfs_socket.c
+++ b/sys/nfs/nfs_socket.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_socket.c	8.5 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/nfs_socket.c,v 1.49.2.5 1999/12/13 04:44:44 dillon Exp $
  */
 
 /*
diff --git a/sys/nfs/nfs_srvcache.c b/sys/nfs/nfs_srvcache.c
index 6f9d42f422af..66de805378fb 100644
--- a/sys/nfs/nfs_srvcache.c
+++ b/sys/nfs/nfs_srvcache.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_srvcache.c	8.3 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/nfs_srvcache.c,v 1.17.2.2 1999/12/13 17:10:47 dillon Exp $
  */
 
 /*
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index 07af07f4e3d8..6674a83fc7cc 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/nfs_subs.c,v 1.70.2.5 1999/12/12 07:16:18 dillon Exp $
  */
 
 /*
diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c
index ed100af996c9..76b2277500b0 100644
--- a/sys/nfs/nfs_syscalls.c
+++ b/sys/nfs/nfs_syscalls.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_syscalls.c	8.5 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/nfs_syscalls.c,v 1.44.2.2 1999/08/29 16:30:31 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c
index 9f4630eb1bb4..dcac8baee12e 100644
--- a/sys/nfs/nfs_vfsops.c
+++ b/sys/nfs/nfs_vfsops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vfsops.c	8.12 (Berkeley) 5/20/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/nfs_vfsops.c,v 1.79.2.1 1999/08/29 16:30:31 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 9d90d3f6d54a..f803f73cbd74 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vnops.c	8.16 (Berkeley) 5/27/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/nfs_vnops.c,v 1.116.2.8 1999/12/12 06:52:34 dillon Exp $
  */
 
 
diff --git a/sys/nfs/nfsdiskless.h b/sys/nfs/nfsdiskless.h
index 487e0bf65226..26b37e5f38be 100644
--- a/sys/nfs/nfsdiskless.h
+++ b/sys/nfs/nfsdiskless.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsdiskless.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/nfsdiskless.h,v 1.10.2.1 1999/08/29 16:30:33 peter Exp $
  */
 
 
diff --git a/sys/nfs/nfsm_subs.h b/sys/nfs/nfsm_subs.h
index 3242b7ccb883..8c877bddba75 100644
--- a/sys/nfs/nfsm_subs.h
+++ b/sys/nfs/nfsm_subs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/nfsm_subs.h,v 1.22.2.2 1999/08/29 16:30:33 peter Exp $
  */
 
 
diff --git a/sys/nfs/nfsmount.h b/sys/nfs/nfsmount.h
index 77ac7e329464..7b2bbd7690a4 100644
--- a/sys/nfs/nfsmount.h
+++ b/sys/nfs/nfsmount.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsmount.h	8.3 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/nfsmount.h,v 1.15.2.1 1999/08/29 16:30:34 peter Exp $
  */
 
 
diff --git a/sys/nfs/nfsnode.h b/sys/nfs/nfsnode.h
index 3bc818ff2594..4747feef0cc3 100644
--- a/sys/nfs/nfsnode.h
+++ b/sys/nfs/nfsnode.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsnode.h	8.9 (Berkeley) 5/14/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/nfsnode.h,v 1.28.2.1 1999/08/29 16:30:34 peter Exp $
  */
 
 
diff --git a/sys/nfs/nfsproto.h b/sys/nfs/nfsproto.h
index cbb2832704bd..c7a41fc37572 100644
--- a/sys/nfs/nfsproto.h
+++ b/sys/nfs/nfsproto.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsproto.h  8.2 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/nfsproto.h,v 1.6.2.1 1999/08/29 16:30:35 peter Exp $
  */
 
 #ifndef _NFS_NFSPROTO_H_
diff --git a/sys/nfs/nfsrtt.h b/sys/nfs/nfsrtt.h
index 447308633015..5bd5cacee07f 100644
--- a/sys/nfs/nfsrtt.h
+++ b/sys/nfs/nfsrtt.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsrtt.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/nfsrtt.h,v 1.9.2.1 1999/08/29 16:30:35 peter Exp $
  */
 
 
diff --git a/sys/nfs/nfsrvcache.h b/sys/nfs/nfsrvcache.h
index eec5850bd381..b8724ebf46a6 100644
--- a/sys/nfs/nfsrvcache.h
+++ b/sys/nfs/nfsrvcache.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsrvcache.h	8.3 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/nfsrvcache.h,v 1.11.2.1 1999/08/29 16:30:36 peter Exp $
  */
 
 
diff --git a/sys/nfs/nfsv2.h b/sys/nfs/nfsv2.h
index 6f8f85e00d44..23a1767f5071 100644
--- a/sys/nfs/nfsv2.h
+++ b/sys/nfs/nfsv2.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsv2.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/nfsv2.h,v 1.8.2.1 1999/08/29 16:30:36 peter Exp $
  */
 
 #include <nfs/nfsproto.h>
diff --git a/sys/nfs/nqnfs.h b/sys/nfs/nqnfs.h
index 2ba78aead0f4..ce24e58449f1 100644
--- a/sys/nfs/nqnfs.h
+++ b/sys/nfs/nqnfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nqnfs.h	8.3 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/nqnfs.h,v 1.18.2.1 1999/08/29 16:30:36 peter Exp $
  */
 
 
diff --git a/sys/nfs/rpcv2.h b/sys/nfs/rpcv2.h
index 525df093a42d..aecd76f07966 100644
--- a/sys/nfs/rpcv2.h
+++ b/sys/nfs/rpcv2.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)rpcv2.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/rpcv2.h,v 1.9.2.1 1999/08/29 16:30:37 peter Exp $
  */
 
 
diff --git a/sys/nfs/xdr_subs.h b/sys/nfs/xdr_subs.h
index b381f81c1d65..a17cef4fa09c 100644
--- a/sys/nfs/xdr_subs.h
+++ b/sys/nfs/xdr_subs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)xdr_subs.h	8.3 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/xdr_subs.h,v 1.10.2.1 1999/08/29 16:30:37 peter Exp $
  */
 
 
diff --git a/sys/ntfs/ntfs.h b/sys/ntfs/ntfs.h
index 7aa65288a00c..d2642450c391 100644
--- a/sys/ntfs/ntfs.h
+++ b/sys/ntfs/ntfs.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ntfs/ntfs.h,v 1.2.2.4 1999/08/29 16:30:39 peter Exp $
  */
 
 /*#define NTFS_DEBUG 1*/
diff --git a/sys/ntfs/ntfs_compr.c b/sys/ntfs/ntfs_compr.c
index 29ba2bd045d4..3912163ddca1 100644
--- a/sys/ntfs/ntfs_compr.c
+++ b/sys/ntfs/ntfs_compr.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ntfs/ntfs_compr.c,v 1.2.2.3 1999/08/29 16:30:40 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ntfs/ntfs_compr.h b/sys/ntfs/ntfs_compr.h
index bdec08cc3e78..2c65a304af86 100644
--- a/sys/ntfs/ntfs_compr.h
+++ b/sys/ntfs/ntfs_compr.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ntfs/ntfs_compr.h,v 1.2.2.3 1999/08/29 16:30:40 peter Exp $
  */
 
 #define NTFS_COMPBLOCK_SIZE	0x1000
diff --git a/sys/ntfs/ntfs_extern.h b/sys/ntfs/ntfs_extern.h
index 9f714382c2ef..8e04245ba688 100644
--- a/sys/ntfs/ntfs_extern.h
+++ b/sys/ntfs/ntfs_extern.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ntfs/ntfs_extern.h,v 1.2.2.3 1999/08/29 16:30:41 peter Exp $
  */
 
 struct sockaddr;
diff --git a/sys/ntfs/ntfs_ihash.c b/sys/ntfs/ntfs_ihash.c
index 50ee7ac17353..47fe5ebc01a6 100644
--- a/sys/ntfs/ntfs_ihash.c
+++ b/sys/ntfs/ntfs_ihash.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_ihash.c	8.7 (Berkeley) 5/17/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ntfs/ntfs_ihash.c,v 1.2.2.3 1999/08/29 16:30:42 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ntfs/ntfs_ihash.h b/sys/ntfs/ntfs_ihash.h
index 16132a90f919..dc83183283c0 100644
--- a/sys/ntfs/ntfs_ihash.h
+++ b/sys/ntfs/ntfs_ihash.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ntfs/ntfs_ihash.h,v 1.1.2.3 1999/08/29 16:30:42 peter Exp $
  */
 
 void ntfs_nthashinit __P((void));
diff --git a/sys/ntfs/ntfs_inode.h b/sys/ntfs/ntfs_inode.h
index a61338552804..0120fe927d75 100644
--- a/sys/ntfs/ntfs_inode.h
+++ b/sys/ntfs/ntfs_inode.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ntfs/ntfs_inode.h,v 1.2.2.3 1999/08/29 16:30:42 peter Exp $
  */
 
 /* These flags are kept in i_flag. */
diff --git a/sys/ntfs/ntfs_subr.c b/sys/ntfs/ntfs_subr.c
index af62684897b5..a77d074b5c5e 100644
--- a/sys/ntfs/ntfs_subr.c
+++ b/sys/ntfs/ntfs_subr.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ntfs/ntfs_subr.c,v 1.2.2.3 1999/08/29 16:30:43 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ntfs/ntfs_subr.h b/sys/ntfs/ntfs_subr.h
index f0b9a8a1df44..42cec60dccbd 100644
--- a/sys/ntfs/ntfs_subr.h
+++ b/sys/ntfs/ntfs_subr.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ntfs/ntfs_subr.h,v 1.2.2.3 1999/08/29 16:30:43 peter Exp $
  */
 
 #define	VA_LOADED		0x0001
diff --git a/sys/ntfs/ntfs_vfsops.c b/sys/ntfs/ntfs_vfsops.c
index e857717c67cb..e5bb5d4e67eb 100644
--- a/sys/ntfs/ntfs_vfsops.c
+++ b/sys/ntfs/ntfs_vfsops.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ntfs/ntfs_vfsops.c,v 1.2.2.3 1999/08/29 16:30:44 peter Exp $
  */
 
 
diff --git a/sys/ntfs/ntfs_vfsops.h b/sys/ntfs/ntfs_vfsops.h
index d7f5f5d26a11..3bafe624044a 100644
--- a/sys/ntfs/ntfs_vfsops.h
+++ b/sys/ntfs/ntfs_vfsops.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ntfs/ntfs_vfsops.h,v 1.1.2.3 1999/08/29 16:30:44 peter Exp $
  */
 #define VG_DONTLOADIN	0x0001	/* Tells ntfs_vgetex to do not call */
 				/* ntfs_loadnode on ntnode, even if */
diff --git a/sys/ntfs/ntfs_vnops.c b/sys/ntfs/ntfs_vnops.c
index 6197017ba6b7..6ca27ff49ac9 100644
--- a/sys/ntfs/ntfs_vnops.c
+++ b/sys/ntfs/ntfs_vnops.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ntfs/ntfs_vnops.c,v 1.2.2.3 1999/08/29 16:30:44 peter Exp $
  *
  */
 
diff --git a/sys/ntfs/ntfsmount.h b/sys/ntfs/ntfsmount.h
index 0a1f7918e383..b9b94c83e6de 100644
--- a/sys/ntfs/ntfsmount.h
+++ b/sys/ntfs/ntfsmount.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ntfs/ntfsmount.h,v 1.2.2.3 1999/08/29 16:30:45 peter Exp $
  */
 
 #define	NTFS_MFLAG_CASEINS	0x00000001
diff --git a/sys/pc98/boot/Makefile b/sys/pc98/boot/Makefile
index 904c72fd7786..181bb8bf1727 100644
--- a/sys/pc98/boot/Makefile
+++ b/sys/pc98/boot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/pc98/boot/Makefile,v 1.5.4.1 1999/08/29 16:30:46 peter Exp $
   
 SUBDIR=	biosboot kzipboot netboot rawboot
 
diff --git a/sys/pc98/boot/Makefile.inc b/sys/pc98/boot/Makefile.inc
index a3603a63e939..165ca3ac3b08 100644
--- a/sys/pc98/boot/Makefile.inc
+++ b/sys/pc98/boot/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/pc98/boot/Makefile.inc,v 1.4.2.1 1999/08/29 16:30:47 peter Exp $
 
 BINDIR?=	/usr/mdec
 CFLAGS+=	-aout
diff --git a/sys/pc98/boot/biosboot/Makefile b/sys/pc98/boot/biosboot/Makefile
index 925028d109ad..456adebfb17e 100644
--- a/sys/pc98/boot/biosboot/Makefile
+++ b/sys/pc98/boot/biosboot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/pc98/boot/biosboot/Makefile,v 1.22.2.1 1999/08/29 16:30:47 peter Exp $
 #
 
 PROG=	boot
diff --git a/sys/pc98/boot/biosboot/README.386BSD b/sys/pc98/boot/biosboot/README.386BSD
index 3d7c09da5968..301c8e3676f1 100644
--- a/sys/pc98/boot/biosboot/README.386BSD
+++ b/sys/pc98/boot/biosboot/README.386BSD
@@ -169,4 +169,4 @@ Before you do this ensure you have a booting floppy with correct
 disktab and bootblock files on it so that if it doesn't work, you can
 re-disklabel from the floppy.
 
-$FreeBSD$
+$FreeBSD: src/sys/pc98/boot/biosboot/README.386BSD,v 1.5.2.1 1999/08/29 16:30:48 peter Exp $
diff --git a/sys/pc98/boot/biosboot/README.MACH b/sys/pc98/boot/biosboot/README.MACH
index 73d090a404bd..d6ed72a59dd1 100644
--- a/sys/pc98/boot/biosboot/README.MACH
+++ b/sys/pc98/boot/biosboot/README.MACH
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:33:55  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/boot/biosboot/README.MACH,v 1.4.2.1 1999/08/29 16:30:48 peter Exp $
  */
 
 ********NOTE: This is not all relevant to the 386BSD version**********
diff --git a/sys/pc98/boot/biosboot/README.serial b/sys/pc98/boot/biosboot/README.serial
index 7edcdeec060c..a3ac66305f53 100644
--- a/sys/pc98/boot/biosboot/README.serial
+++ b/sys/pc98/boot/biosboot/README.serial
@@ -193,4 +193,4 @@ CAVEATS:
 	  from the new kernel.
 
 
-$FreeBSD$
+$FreeBSD: src/sys/pc98/boot/biosboot/README.serial,v 1.6.2.1 1999/08/29 16:30:49 peter Exp $
diff --git a/sys/pc98/boot/biosboot/asm.S b/sys/pc98/boot/biosboot/asm.S
index f14c7f55104c..d59506216203 100644
--- a/sys/pc98/boot/biosboot/asm.S
+++ b/sys/pc98/boot/biosboot/asm.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:13  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/boot/biosboot/asm.S,v 1.4.2.1 1999/08/29 16:30:49 peter Exp $
  */
 
 
diff --git a/sys/pc98/boot/biosboot/asm.h b/sys/pc98/boot/biosboot/asm.h
index 6f4bcc39e52d..94cf720a2644 100644
--- a/sys/pc98/boot/biosboot/asm.h
+++ b/sys/pc98/boot/biosboot/asm.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.7  92/02/29  15:33:41  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/boot/biosboot/asm.h,v 1.3.4.1 1999/08/29 16:30:50 peter Exp $
  */
 
 #define S_ARG0	 4(%esp)
diff --git a/sys/pc98/boot/biosboot/bios.S b/sys/pc98/boot/biosboot/bios.S
index 88d9506c46b4..18ebadf171c4 100644
--- a/sys/pc98/boot/biosboot/bios.S
+++ b/sys/pc98/boot/biosboot/bios.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/boot/biosboot/bios.S,v 1.9.2.1 1999/08/29 16:30:50 peter Exp $
  */
 
 /*
diff --git a/sys/pc98/boot/biosboot/boot.c b/sys/pc98/boot/biosboot/boot.c
index c225bd35bda3..3394260ff7fe 100644
--- a/sys/pc98/boot/biosboot/boot.c
+++ b/sys/pc98/boot/biosboot/boot.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, [92/04/03  16:51:14  rvb]
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/boot/biosboot/boot.c,v 1.19.2.1 1999/08/29 16:30:51 peter Exp $
  */
 
 
diff --git a/sys/pc98/boot/biosboot/boot.h b/sys/pc98/boot/biosboot/boot.h
index 4e32192eebc6..af988c87bf03 100644
--- a/sys/pc98/boot/biosboot/boot.h
+++ b/sys/pc98/boot/biosboot/boot.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:03  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/boot/biosboot/boot.h,v 1.14.2.1 1999/08/29 16:30:51 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/pc98/boot/biosboot/disk.c b/sys/pc98/boot/biosboot/disk.c
index ad9d3ff74d88..1a4cfabb399d 100644
--- a/sys/pc98/boot/biosboot/disk.c
+++ b/sys/pc98/boot/biosboot/disk.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:49  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/boot/biosboot/disk.c,v 1.9.4.1 1999/08/29 16:30:51 peter Exp $
  */
 
 /*
diff --git a/sys/pc98/boot/biosboot/io.c b/sys/pc98/boot/biosboot/io.c
index 3b540dd1c892..2804940f46d8 100644
--- a/sys/pc98/boot/biosboot/io.c
+++ b/sys/pc98/boot/biosboot/io.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:57  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/boot/biosboot/io.c,v 1.13.2.1 1999/08/29 16:30:52 peter Exp $
  */
 
 #include "boot.h"
diff --git a/sys/pc98/boot/biosboot/serial.S b/sys/pc98/boot/biosboot/serial.S
index f2df31aec6cf..56594e44ff66 100644
--- a/sys/pc98/boot/biosboot/serial.S
+++ b/sys/pc98/boot/biosboot/serial.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/boot/biosboot/serial.S,v 1.8.2.1 1999/08/29 16:30:52 peter Exp $
  */
 
 /*
diff --git a/sys/pc98/boot/biosboot/start.S b/sys/pc98/boot/biosboot/start.S
index a7e69355d621..c3d0356ede4a 100644
--- a/sys/pc98/boot/biosboot/start.S
+++ b/sys/pc98/boot/biosboot/start.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:29  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/boot/biosboot/start.S,v 1.6.2.1 1999/08/29 16:30:53 peter Exp $
  */
 
 /*
diff --git a/sys/pc98/boot/biosboot/sys.c b/sys/pc98/boot/biosboot/sys.c
index 1b138b36d479..bd2136cd6af1 100644
--- a/sys/pc98/boot/biosboot/sys.c
+++ b/sys/pc98/boot/biosboot/sys.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:34  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/boot/biosboot/sys.c,v 1.15.2.1 1999/08/29 16:30:54 peter Exp $
  */
 
 /*
diff --git a/sys/pc98/boot/biosboot/table.c b/sys/pc98/boot/biosboot/table.c
index 81dc130a0314..dcaf0df1db73 100644
--- a/sys/pc98/boot/biosboot/table.c
+++ b/sys/pc98/boot/biosboot/table.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:43  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/boot/biosboot/table.c,v 1.8.2.1 1999/08/29 16:30:54 peter Exp $
  */
 
 /*
diff --git a/sys/pc98/boot/kzipboot/Makefile b/sys/pc98/boot/kzipboot/Makefile
index 6bf04e18bdde..7e0bef12ee8c 100644
--- a/sys/pc98/boot/kzipboot/Makefile
+++ b/sys/pc98/boot/kzipboot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/pc98/boot/kzipboot/Makefile,v 1.7.2.1 1999/08/29 16:30:55 peter Exp $
 
 PROG= kztail.o kzhead.o
 BINMODE = 444	# target is a relocatable object
diff --git a/sys/pc98/boot/netboot/3c509.c b/sys/pc98/boot/netboot/3c509.c
index accc948c6b4f..2ddfd6c6db7b 100644
--- a/sys/pc98/boot/netboot/3c509.c
+++ b/sys/pc98/boot/netboot/3c509.c
@@ -18,7 +18,7 @@ Author: Martin Renters.
 
 3c509 support added by Serge Babkin (babkin@hq.icb.chel.su)
 
-$FreeBSD$
+$FreeBSD: src/sys/pc98/boot/netboot/3c509.c,v 1.2.2.1 1999/08/29 16:30:58 peter Exp $
 
 ***************************************************************************/
 
diff --git a/sys/pc98/boot/rawboot/Makefile b/sys/pc98/boot/rawboot/Makefile
index be5f4cab8f79..0c02ae65d678 100644
--- a/sys/pc98/boot/rawboot/Makefile
+++ b/sys/pc98/boot/rawboot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/pc98/boot/rawboot/Makefile,v 1.12.2.1 1999/08/29 16:30:59 peter Exp $
 #
 
 PROG=	boot
diff --git a/sys/pc98/conf/GENERIC98 b/sys/pc98/conf/GENERIC98
index 9aac82a911c1..e9fe07d80fee 100644
--- a/sys/pc98/conf/GENERIC98
+++ b/sys/pc98/conf/GENERIC98
@@ -15,7 +15,7 @@
 # device lines is also present in the ./LINT configuration file. If you are
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/pc98/conf/GENERIC98,v 1.63.2.23 1999/12/09 01:26:25 nyan Exp $
 
 # GENERIC98 -- Generic PC98 machine with WD/SCSI disks
 
diff --git a/sys/pc98/conf/Makefile.pc98 b/sys/pc98/conf/Makefile.pc98
index 41b0f3859520..4f4e596a0b24 100644
--- a/sys/pc98/conf/Makefile.pc98
+++ b/sys/pc98/conf/Makefile.pc98
@@ -3,7 +3,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD$
+# $FreeBSD: src/sys/pc98/conf/Makefile.pc98,v 1.52.2.8 1999/09/07 12:25:36 nyan Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/pc98/conf/devices.pc98 b/sys/pc98/conf/devices.pc98
index eeac8f2048c5..4e28dba6284f 100644
--- a/sys/pc98/conf/devices.pc98
+++ b/sys/pc98/conf/devices.pc98
@@ -1,6 +1,6 @@
 # This file tells what major numbers the various possible swap devices have.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/pc98/conf/devices.pc98,v 1.7.2.1 1999/08/29 16:31:01 peter Exp $
 #
 wd	0
 wfd	1
diff --git a/sys/pc98/conf/files.pc98 b/sys/pc98/conf/files.pc98
index 06872e31a3a9..c23ea67b40d1 100644
--- a/sys/pc98/conf/files.pc98
+++ b/sys/pc98/conf/files.pc98
@@ -3,7 +3,7 @@
 #
 # modified for PC-9801
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/pc98/conf/files.pc98,v 1.81.2.19 1999/12/06 21:03:28 archie Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/pc98/conf/majors.pc98 b/sys/pc98/conf/majors.pc98
index 96f340e69ff2..a4273bbdb300 100644
--- a/sys/pc98/conf/majors.pc98
+++ b/sys/pc98/conf/majors.pc98
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/pc98/conf/majors.pc98,v 1.49.2.1 1999/08/29 16:31:02 peter Exp $
 
 Hopefully, this list will one day be obsoleted by DEVFS, but for now
 this is the current allocation of device major numbers.
diff --git a/sys/pc98/conf/options.pc98 b/sys/pc98/conf/options.pc98
index 3b8b9c46e3f8..69884cdf1407 100644
--- a/sys/pc98/conf/options.pc98
+++ b/sys/pc98/conf/options.pc98
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/pc98/conf/options.pc98,v 1.78.2.7 1999/11/17 12:14:36 nyan Exp $
 
 DISABLE_PSE
 IDE_DELAY
diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c
index 795d051744dd..c1132dc001f1 100644
--- a/sys/pc98/i386/machdep.c
+++ b/sys/pc98/i386/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/i386/machdep.c,v 1.105.2.10 1999/11/15 20:34:48 luoqi Exp $
  */
 
 #include "apm.h"
diff --git a/sys/pc98/i386/userconfig.c b/sys/pc98/i386/userconfig.c
index 57c45cc759ce..68bd9d00b3e8 100644
--- a/sys/pc98/i386/userconfig.c
+++ b/sys/pc98/i386/userconfig.c
@@ -46,7 +46,7 @@
  ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  **
- ** $FreeBSD$
+ ** $FreeBSD: src/sys/pc98/i386/userconfig.c,v 1.65.2.13 1999/12/06 21:03:29 archie Exp $
  **/
 
 /**
@@ -2536,7 +2536,7 @@ visuserconfig(void)
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/i386/userconfig.c,v 1.65.2.13 1999/12/06 21:03:29 archie Exp $
  */
 
 #include "scbus.h"
diff --git a/sys/pc98/pc98/aic_pc98.c b/sys/pc98/pc98/aic_pc98.c
index 11afeb2d4bf9..e9f3045b6087 100644
--- a/sys/pc98/pc98/aic_pc98.c
+++ b/sys/pc98/pc98/aic_pc98.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/aic_pc98.c,v 1.1.2.1 1999/11/17 12:34:03 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/pc98/pc98/atapi.c b/sys/pc98/pc98/atapi.c
index 1c41364d4068..30e88de61267 100644
--- a/sys/pc98/pc98/atapi.c
+++ b/sys/pc98/pc98/atapi.c
@@ -13,7 +13,7 @@
  *
  * Version 1.9, Mon Oct  9 22:34:47 MSK 1995
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/atapi.c,v 1.5.2.1 1999/12/03 13:03:00 nyan Exp $
  */
 
 /*
diff --git a/sys/pc98/pc98/atcompat_diskslice.c b/sys/pc98/pc98/atcompat_diskslice.c
index d58a22832b57..dd69e7b7c13d 100644
--- a/sys/pc98/pc98/atcompat_diskslice.c
+++ b/sys/pc98/pc98/atcompat_diskslice.c
@@ -35,7 +35,7 @@
  *
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/atcompat_diskslice.c,v 1.13.2.1 1999/08/29 16:31:06 peter Exp $
  */
 
 /*
diff --git a/sys/pc98/pc98/clock.c b/sys/pc98/pc98/clock.c
index a78966df49cb..8c508621dd3f 100644
--- a/sys/pc98/pc98/clock.c
+++ b/sys/pc98/pc98/clock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/clock.c,v 1.65.2.5 1999/10/31 12:22:16 nyan Exp $
  */
 
 /*
diff --git a/sys/pc98/pc98/diskslice_machdep.c b/sys/pc98/pc98/diskslice_machdep.c
index 33ff8c85cdfe..a8b8af73fe1c 100644
--- a/sys/pc98/pc98/diskslice_machdep.c
+++ b/sys/pc98/pc98/diskslice_machdep.c
@@ -35,7 +35,7 @@
  *
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/diskslice_machdep.c,v 1.17.2.4 1999/11/25 13:40:08 nyan Exp $
  */
 
 /*
diff --git a/sys/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c
index 39479ee095be..d9cd26f02e23 100644
--- a/sys/pc98/pc98/fd.c
+++ b/sys/pc98/pc98/fd.c
@@ -47,7 +47,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/fd.c,v 1.50.2.4 1999/09/24 11:52:13 nyan Exp $
  *
  */
 
diff --git a/sys/pc98/pc98/fdreg.h b/sys/pc98/pc98/fdreg.h
index cd1f0a7c0eff..9781259bed2e 100644
--- a/sys/pc98/pc98/fdreg.h
+++ b/sys/pc98/pc98/fdreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)fdreg.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/fdreg.h,v 1.4.4.1 1999/08/29 16:31:08 peter Exp $
  */
 
 /*
diff --git a/sys/pc98/pc98/if_ed.c b/sys/pc98/pc98/if_ed.c
index 47874bc2231b..7b9ad6e628de 100644
--- a/sys/pc98/pc98/if_ed.c
+++ b/sys/pc98/pc98/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/if_ed.c,v 1.58.2.7 1999/12/09 01:26:27 nyan Exp $
  */
 
 /*
diff --git a/sys/pc98/pc98/if_ed98.h b/sys/pc98/pc98/if_ed98.h
index d0ed814dfb4f..cc367400aebd 100644
--- a/sys/pc98/pc98/if_ed98.h
+++ b/sys/pc98/pc98/if_ed98.h
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/if_ed98.h,v 1.17.2.5 1999/12/09 01:26:27 nyan Exp $
  */
 
 /*
diff --git a/sys/pc98/pc98/mse.c b/sys/pc98/pc98/mse.c
index 318ab191e520..3168b9ff52e1 100644
--- a/sys/pc98/pc98/mse.c
+++ b/sys/pc98/pc98/mse.c
@@ -11,7 +11,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/mse.c,v 1.18.2.1 1999/08/29 16:31:10 peter Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
diff --git a/sys/pc98/pc98/npx.c b/sys/pc98/pc98/npx.c
index 1c2219cd0b72..b4d91ce3ed7b 100644
--- a/sys/pc98/pc98/npx.c
+++ b/sys/pc98/pc98/npx.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/npx.c,v 1.42.2.1 1999/08/29 16:31:10 peter Exp $
  */
 
 #include "npx.h"
diff --git a/sys/pc98/pc98/olpt.c b/sys/pc98/pc98/olpt.c
index 19846345799c..ed0041ced236 100644
--- a/sys/pc98/pc98/olpt.c
+++ b/sys/pc98/pc98/olpt.c
@@ -46,7 +46,7 @@
  * SUCH DAMAGE.
  *
  *	from: unknown origin, 386BSD 0.1
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/olpt.c,v 1.1.2.2 1999/08/29 16:31:11 peter Exp $
  */
 
 /*
diff --git a/sys/pc98/pc98/pc98.c b/sys/pc98/pc98/pc98.c
index bfc43fcc6fca..9db15689afba 100644
--- a/sys/pc98/pc98/pc98.c
+++ b/sys/pc98/pc98/pc98.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/pc98.c,v 1.55.2.1 1999/08/29 16:31:11 peter Exp $
  */
 
 /*
diff --git a/sys/pc98/pc98/pc98.h b/sys/pc98/pc98/pc98.h
index 5cafb758dd5c..014e3ff8d793 100644
--- a/sys/pc98/pc98/pc98.h
+++ b/sys/pc98/pc98/pc98.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/pc98.h,v 1.10.4.1 1999/08/29 16:31:12 peter Exp $
  */
 
 #ifndef _PC98_PC98_PC98_H_
diff --git a/sys/pc98/pc98/pc98_machdep.c b/sys/pc98/pc98/pc98_machdep.c
index 163a8b9302c4..e4357cb5196d 100644
--- a/sys/pc98/pc98/pc98_machdep.c
+++ b/sys/pc98/pc98/pc98_machdep.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/pc98_machdep.c,v 1.15.2.1 1999/10/24 14:58:02 nyan Exp $
  */
 
 #include "opt_pc98.h"
diff --git a/sys/pc98/pc98/pc98gdc.c b/sys/pc98/pc98/pc98gdc.c
index 729845e8731e..e677ce689e9f 100644
--- a/sys/pc98/pc98/pc98gdc.c
+++ b/sys/pc98/pc98/pc98gdc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/pc98gdc.c,v 1.3.2.4 1999/12/09 12:00:30 nyan Exp $
  */
 
 #include "gdc.h"
diff --git a/sys/pc98/pc98/pc98kbd.c b/sys/pc98/pc98/pc98kbd.c
index 817cfc277fd2..e84f425ec959 100644
--- a/sys/pc98/pc98/pc98kbd.c
+++ b/sys/pc98/pc98/pc98kbd.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/pc98kbd.c,v 1.4.2.2 1999/08/29 16:31:14 peter Exp $
  */
 
 #include "pckbd.h"
diff --git a/sys/pc98/pc98/pcaudio.c b/sys/pc98/pc98/pcaudio.c
index ad0d0d639f79..b405a3fa176d 100644
--- a/sys/pc98/pc98/pcaudio.c
+++ b/sys/pc98/pc98/pcaudio.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/pcaudio.c,v 1.20.2.1 1999/08/29 16:31:14 peter Exp $
  */
 
 #include "pca.h"
diff --git a/sys/pc98/pc98/ppc.c b/sys/pc98/pc98/ppc.c
index 4f4ed2bfac21..d9ea75dd5057 100644
--- a/sys/pc98/pc98/ppc.c
+++ b/sys/pc98/pc98/ppc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/ppc.c,v 1.1.2.2 1999/08/29 16:31:14 peter Exp $
  *
  */
 #include "ppc.h"
diff --git a/sys/pc98/pc98/ppcreg.h b/sys/pc98/pc98/ppcreg.h
index eee6cfefff12..0b663425dfb2 100644
--- a/sys/pc98/pc98/ppcreg.h
+++ b/sys/pc98/pc98/ppcreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/ppcreg.h,v 1.1.2.2 1999/08/29 16:31:15 peter Exp $
  *
  */
 #ifndef __PPCREG_H
diff --git a/sys/pc98/pc98/scvidctl.c b/sys/pc98/pc98/scvidctl.c
index 1d718ef99d18..0d8fd586779c 100644
--- a/sys/pc98/pc98/scvidctl.c
+++ b/sys/pc98/pc98/scvidctl.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/scvidctl.c,v 1.2.2.4 1999/12/09 12:00:30 nyan Exp $
  */
 
 #include "sc.h"
diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c
index e32740043c5f..c86f3da73b26 100644
--- a/sys/pc98/pc98/sio.c
+++ b/sys/pc98/pc98/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/sio.c,v 1.76.2.10 1999/12/06 03:28:55 nyan Exp $
  */
 
 #include "opt_comconsole.h"
diff --git a/sys/pc98/pc98/spkr.c b/sys/pc98/pc98/spkr.c
index 21a07db74350..c1b802a165ca 100644
--- a/sys/pc98/pc98/spkr.c
+++ b/sys/pc98/pc98/spkr.c
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/spkr.c,v 1.14.2.1 1999/08/29 16:31:16 peter Exp $
  */
 
 /*
diff --git a/sys/pc98/pc98/syscons.c b/sys/pc98/pc98/syscons.c
index c927e85334d7..147e66ec2d97 100644
--- a/sys/pc98/pc98/syscons.c
+++ b/sys/pc98/pc98/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/syscons.c,v 1.109.2.12 1999/12/09 00:06:48 nyan Exp $
  */
 
 #include "sc.h"
diff --git a/sys/pc98/pc98/syscons.h b/sys/pc98/pc98/syscons.h
index f8dbb9942eb4..4bea2c943a21 100644
--- a/sys/pc98/pc98/syscons.h
+++ b/sys/pc98/pc98/syscons.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/syscons.h,v 1.28.2.3 1999/08/29 16:31:18 peter Exp $
  */
 
 #ifndef _PC98_PC98_SYSCONS_H_
diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c
index 8d4ee1018f7f..6377e6fce73e 100644
--- a/sys/pc98/pc98/wd.c
+++ b/sys/pc98/pc98/wd.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/wd.c,v 1.71.2.5 1999/12/01 13:57:10 nyan Exp $
  */
 
 /* TODO:
diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c
index e46e94bd4440..374aaa8bd98c 100644
--- a/sys/pccard/pccard.c
+++ b/sys/pccard/pccard.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pccard/pccard.c,v 1.68.2.4 1999/08/29 16:31:21 peter Exp $
  */
 
 #include "opt_devfs.h"
diff --git a/sys/pccard/pcic.c b/sys/pccard/pcic.c
index b75c1928322a..141cb36d2c94 100644
--- a/sys/pccard/pcic.c
+++ b/sys/pccard/pcic.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pccard/pcic.c,v 1.64.2.5 1999/08/29 16:31:22 peter Exp $
  */
 
 /*
diff --git a/sys/pci/adv_pci.c b/sys/pci/adv_pci.c
index 983515187bb3..aee4af006c32 100644
--- a/sys/pci/adv_pci.c
+++ b/sys/pci/adv_pci.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/adv_pci.c,v 1.4.2.2 1999/09/14 04:08:10 gibbs Exp $
  */
 
 #include <pci.h>
diff --git a/sys/pci/adw_pci.c b/sys/pci/adw_pci.c
index 32dcc2bd5893..981a65e188a1 100644
--- a/sys/pci/adw_pci.c
+++ b/sys/pci/adw_pci.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/adw_pci.c,v 1.3.2.2 1999/09/14 04:08:10 gibbs Exp $
  */
 
 #include <pci.h>
diff --git a/sys/pci/ahc_pci.c b/sys/pci/ahc_pci.c
index 9db0e61c7574..b3b37cec69c8 100644
--- a/sys/pci/ahc_pci.c
+++ b/sys/pci/ahc_pci.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/ahc_pci.c,v 1.5.2.10 1999/12/12 05:01:31 gibbs Exp $
  */
 
 #include <pci.h>
diff --git a/sys/pci/alpm.c b/sys/pci/alpm.c
index 01c8f125596f..67d11f9c3a04 100644
--- a/sys/pci/alpm.c
+++ b/sys/pci/alpm.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/pci/alpm.c,v 1.7.2.1 1999/11/01 22:48:33 nsouch Exp $
  *
  */
 
diff --git a/sys/pci/amd.c b/sys/pci/amd.c
index 7cc1cb3a1a99..fbf2ac3f70c7 100644
--- a/sys/pci/amd.c
+++ b/sys/pci/amd.c
@@ -30,7 +30,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/amd.c,v 1.2.2.1 1999/09/11 15:44:16 gibbs Exp $
  *
  *********************************************************************
  */
diff --git a/sys/pci/amd.h b/sys/pci/amd.h
index 08c6fa51187b..defe549d7a2a 100644
--- a/sys/pci/amd.h
+++ b/sys/pci/amd.h
@@ -30,7 +30,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/amd.h,v 1.1.2.1 1999/09/11 15:44:16 gibbs Exp $
  *
  *********************************************************************
  */
diff --git a/sys/pci/bt_pci.c b/sys/pci/bt_pci.c
index 53bec401b973..0c4ac1ddd9d0 100644
--- a/sys/pci/bt_pci.c
+++ b/sys/pci/bt_pci.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/bt_pci.c,v 1.4.2.2 1999/09/14 04:08:10 gibbs Exp $
  */
 
 #include "pci.h"
diff --git a/sys/pci/cy_pci.c b/sys/pci/cy_pci.c
index 5d5be065ffc7..b294c8f116e2 100644
--- a/sys/pci/cy_pci.c
+++ b/sys/pci/cy_pci.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/cy_pci.c,v 1.10.2.2 1999/08/29 16:31:28 peter Exp $
  */
 
 /*
diff --git a/sys/pci/cy_pcireg.h b/sys/pci/cy_pcireg.h
index 707c4db62fec..0189dbc1bf3d 100644
--- a/sys/pci/cy_pcireg.h
+++ b/sys/pci/cy_pcireg.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/cy_pcireg.h,v 1.5.2.2 1999/08/29 16:31:29 peter Exp $
  */
 
 #define CY_PCI_BASE_ADDR0		0x10
diff --git a/sys/pci/dc21040reg.h b/sys/pci/dc21040reg.h
index 3c235564e5ff..38e0af12033a 100644
--- a/sys/pci/dc21040reg.h
+++ b/sys/pci/dc21040reg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: dc21040reg.h,v 1.15 1998/05/22 18:50:59 matt Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pci/dc21040reg.h,v 1.4.2.1 1999/08/29 16:31:30 peter Exp $ */
 
 /*-
  * Copyright (c) 1994, 1995, 1996 Matt Thomas <matt@3am-software.com>
diff --git a/sys/pci/dpt_pci.c b/sys/pci/dpt_pci.c
index 566bd8a59eec..6dc80d6cccf1 100644
--- a/sys/pci/dpt_pci.c
+++ b/sys/pci/dpt_pci.c
@@ -32,7 +32,7 @@
  *  dptpci.c:  PCI Bus Attachment for DPT SCSI HBAs
  */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sys/pci/dpt_pci.c,v 1.11.2.2 1999/09/14 04:08:10 gibbs Exp $"
 
 #include "opt_devfs.h"
 #include "opt_dpt.h"
diff --git a/sys/pci/dpt_pci.h b/sys/pci/dpt_pci.h
index fe7206a1882d..8e0c5c658759 100644
--- a/sys/pci/dpt_pci.h
+++ b/sys/pci/dpt_pci.h
@@ -28,7 +28,7 @@
  *
  */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sys/pci/dpt_pci.h,v 1.1.4.1 1999/08/29 16:31:30 peter Exp $"
 
 #define DPT_VENDOR_ID             0x00001044
 #define DPT_DEVICE_ID             0x0000a400
diff --git a/sys/pci/es1370.c b/sys/pci/es1370.c
index 156ed45de54d..cbdf64e279b9 100644
--- a/sys/pci/es1370.c
+++ b/sys/pci/es1370.c
@@ -36,7 +36,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/es1370.c,v 1.1.2.2 1999/11/16 19:17:50 roger Exp $
  */
 
 #include "pci.h"
diff --git a/sys/pci/es1370_reg.h b/sys/pci/es1370_reg.h
index 9c6539e0c9e2..42b4bf869340 100644
--- a/sys/pci/es1370_reg.h
+++ b/sys/pci/es1370_reg.h
@@ -18,7 +18,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/es1370_reg.h,v 1.1.2.2 1999/11/16 19:17:51 roger Exp $
  */
 
 #ifndef _ES1370_REG_H
diff --git a/sys/pci/es1371.c b/sys/pci/es1371.c
index e094ec5b4b0b..69cec7263bcf 100644
--- a/sys/pci/es1371.c
+++ b/sys/pci/es1371.c
@@ -35,7 +35,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/es1371.c,v 1.1.2.2 1999/11/16 22:04:45 roger Exp $
  */
 
 
diff --git a/sys/pci/ide_pci.c b/sys/pci/ide_pci.c
index fabced1a5d57..819aff706121 100644
--- a/sys/pci/ide_pci.c
+++ b/sys/pci/ide_pci.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/ide_pci.c,v 1.28.2.4 1999/08/29 16:31:32 peter Exp $
  */
 
 #include "pci.h"
diff --git a/sys/pci/ide_pcireg.h b/sys/pci/ide_pcireg.h
index 1f1c540be300..c6370a4f2c61 100644
--- a/sys/pci/ide_pcireg.h
+++ b/sys/pci/ide_pcireg.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	From: wd82371reg.h,v 1.3 1997/02/22 09:44:15 peter Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/ide_pcireg.h,v 1.1.2.1 1999/08/29 16:31:32 peter Exp $
  */
 
 #ifndef _PCI_IDEPCIREG_H_
diff --git a/sys/pci/if_al.c b/sys/pci/if_al.c
index f85d43807628..05a8f1d565aa 100644
--- a/sys/pci/if_al.c
+++ b/sys/pci/if_al.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_al.c,v 1.4.2.3 1999/10/10 19:43:05 wpaul Exp $
  */
 
 /*
@@ -90,7 +90,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/pci/if_al.c,v 1.4.2.3 1999/10/10 19:43:05 wpaul Exp $";
 #endif
 
 /*
diff --git a/sys/pci/if_alreg.h b/sys/pci/if_alreg.h
index 028cb9b379e6..bb8245a9dca2 100644
--- a/sys/pci/if_alreg.h
+++ b/sys/pci/if_alreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_alreg.h,v 1.2.2.3 1999/10/10 19:43:06 wpaul Exp $
  */
 
 /*
diff --git a/sys/pci/if_ax.c b/sys/pci/if_ax.c
index e67af73fd06e..c07f18f7c1d1 100644
--- a/sys/pci/if_ax.c
+++ b/sys/pci/if_ax.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_ax.c,v 1.3.2.4 1999/08/29 16:31:33 peter Exp $
  */
 
 /*
@@ -87,7 +87,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/pci/if_ax.c,v 1.3.2.4 1999/08/29 16:31:33 peter Exp $";
 #endif
 
 /*
diff --git a/sys/pci/if_axreg.h b/sys/pci/if_axreg.h
index de89112080a6..74bde84cb758 100644
--- a/sys/pci/if_axreg.h
+++ b/sys/pci/if_axreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_axreg.h,v 1.2.2.5 1999/08/29 16:31:34 peter Exp $
  */
 
 /*
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index afcf6dc8d5e8..fc6c837c258c 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_de.c,v 1.80 1998/09/25 18:06:53 matt Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pci/if_de.c,v 1.93.2.3 1999/08/29 16:31:35 peter Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
diff --git a/sys/pci/if_devar.h b/sys/pci/if_devar.h
index 9d85044f2c37..8f93ec8e0a57 100644
--- a/sys/pci/if_devar.h
+++ b/sys/pci/if_devar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_devar.h,v 1.31 1998/09/29 22:40:52 matt Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pci/if_devar.h,v 1.12.2.1 1999/08/29 16:31:36 peter Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
diff --git a/sys/pci/if_ed_p.c b/sys/pci/if_ed_p.c
index 5b7273861934..e994d5e51da5 100644
--- a/sys/pci/if_ed_p.c
+++ b/sys/pci/if_ed_p.c
@@ -17,7 +17,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_ed_p.c,v 1.14.2.1 1999/08/29 16:31:36 peter Exp $
  */
 
 #include "pci.h"
diff --git a/sys/pci/if_fpa.c b/sys/pci/if_fpa.c
index d1a3ea4a42ff..243201234f51 100644
--- a/sys/pci/if_fpa.c
+++ b/sys/pci/if_fpa.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_fpa.c,v 1.8.2.1 1999/08/29 16:31:36 peter Exp $
  *
  */
 
diff --git a/sys/pci/if_fxp.c b/sys/pci/if_fxp.c
index aa049cff2fd8..7609dfa46a82 100644
--- a/sys/pci/if_fxp.c
+++ b/sys/pci/if_fxp.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_fxp.c,v 1.59.2.5 1999/12/06 20:11:52 peter Exp $
  */
 
 /*
diff --git a/sys/pci/if_fxpreg.h b/sys/pci/if_fxpreg.h
index c9fb405331e7..d30a852d7044 100644
--- a/sys/pci/if_fxpreg.h
+++ b/sys/pci/if_fxpreg.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_fxpreg.h,v 1.13.2.3 1999/12/06 20:11:53 peter Exp $
  */
 
 #define FXP_VENDORID_INTEL	0x8086
diff --git a/sys/pci/if_fxpvar.h b/sys/pci/if_fxpvar.h
index b5dbd5d53337..c496dae40359 100644
--- a/sys/pci/if_fxpvar.h
+++ b/sys/pci/if_fxpvar.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_fxpvar.h,v 1.6.2.1 1999/08/29 16:31:38 peter Exp $
  */
 
 /*
diff --git a/sys/pci/if_lnc_p.c b/sys/pci/if_lnc_p.c
index 5d810807e4d9..b25d2d3a1b05 100644
--- a/sys/pci/if_lnc_p.c
+++ b/sys/pci/if_lnc_p.c
@@ -17,7 +17,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_lnc_p.c,v 1.7.2.2 1999/08/29 16:31:38 peter Exp $
  */
 
 #include "pci.h"
diff --git a/sys/pci/if_mx.c b/sys/pci/if_mx.c
index 3661e2ceb1d7..8bdb24ba7039 100644
--- a/sys/pci/if_mx.c
+++ b/sys/pci/if_mx.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_mx.c,v 1.8.2.9 1999/10/29 16:04:52 wpaul Exp $
  */
 
 /*
@@ -94,7 +94,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/pci/if_mx.c,v 1.8.2.9 1999/10/29 16:04:52 wpaul Exp $";
 #endif
 
 /*
diff --git a/sys/pci/if_mxreg.h b/sys/pci/if_mxreg.h
index d9000f93bd10..1576cb1dab6b 100644
--- a/sys/pci/if_mxreg.h
+++ b/sys/pci/if_mxreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_mxreg.h,v 1.2.2.5 1999/08/29 16:31:40 peter Exp $
  */
 
 /*
diff --git a/sys/pci/if_pn.c b/sys/pci/if_pn.c
index ea6215ab6e94..ed70973e17c3 100644
--- a/sys/pci/if_pn.c
+++ b/sys/pci/if_pn.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_pn.c,v 1.6.2.13 1999/08/29 16:31:40 peter Exp $
  */
 
 /*
@@ -97,7 +97,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/pci/if_pn.c,v 1.6.2.13 1999/08/29 16:31:40 peter Exp $";
 #endif
 
 /*
diff --git a/sys/pci/if_pnreg.h b/sys/pci/if_pnreg.h
index d1f8604c42fd..e1b1372764a3 100644
--- a/sys/pci/if_pnreg.h
+++ b/sys/pci/if_pnreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_pnreg.h,v 1.4.2.10 1999/08/29 16:31:40 peter Exp $
  */
 
 /*
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index 5198842d33ba..6f8d38b05cf3 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_rl.c,v 1.9.2.10 1999/11/16 15:36:14 wpaul Exp $
  */
 
 /*
@@ -127,7 +127,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/pci/if_rl.c,v 1.9.2.10 1999/11/16 15:36:14 wpaul Exp $";
 #endif
 
 /*
diff --git a/sys/pci/if_rlreg.h b/sys/pci/if_rlreg.h
index 71d930b57a95..7f4ad71ddaf2 100644
--- a/sys/pci/if_rlreg.h
+++ b/sys/pci/if_rlreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_rlreg.h,v 1.4.2.9 1999/11/01 17:24:52 wpaul Exp $
  */
 
 /*
diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c
index b4991ce85398..356244d3c7d1 100644
--- a/sys/pci/if_sf.c
+++ b/sys/pci/if_sf.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_sf.c,v 1.2.2.2 1999/08/29 16:31:42 peter Exp $
  */
 
 /*
@@ -116,7 +116,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/pci/if_sf.c,v 1.2.2.2 1999/08/29 16:31:42 peter Exp $";
 #endif
 
 static struct sf_type sf_devs[] = {
diff --git a/sys/pci/if_sfreg.h b/sys/pci/if_sfreg.h
index cd0192f2277b..3cb19ad9252b 100644
--- a/sys/pci/if_sfreg.h
+++ b/sys/pci/if_sfreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_sfreg.h,v 1.1.2.2 1999/08/29 16:31:43 peter Exp $
  */
 
 /*
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c
index 131a97cc14b4..de9b10dac545 100644
--- a/sys/pci/if_sis.c
+++ b/sys/pci/if_sis.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_sis.c,v 1.13.2.2 1999/10/13 13:14:14 jhay Exp $
  */
 
 /*
@@ -90,7 +90,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/pci/if_sis.c,v 1.13.2.2 1999/10/13 13:14:14 jhay Exp $";
 #endif
 
 /*
diff --git a/sys/pci/if_sisreg.h b/sys/pci/if_sisreg.h
index 6e35e98a9502..61723883837a 100644
--- a/sys/pci/if_sisreg.h
+++ b/sys/pci/if_sisreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_sisreg.h,v 1.1.2.1 1999/10/10 23:04:54 wpaul Exp $
  */
 
 /*
diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c
index 158e5903e6e0..d1e06aa4e82d 100644
--- a/sys/pci/if_sk.c
+++ b/sys/pci/if_sk.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_sk.c,v 1.9.2.3 1999/10/10 18:41:38 wpaul Exp $
  */
 
 /*
@@ -99,7 +99,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/pci/if_sk.c,v 1.9.2.3 1999/10/10 18:41:38 wpaul Exp $";
 #endif
 
 static struct sk_type sk_devs[] = {
diff --git a/sys/pci/if_skreg.h b/sys/pci/if_skreg.h
index 8a246319efa2..af38ea319c66 100644
--- a/sys/pci/if_skreg.h
+++ b/sys/pci/if_skreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_skreg.h,v 1.6.2.3 1999/10/10 18:41:38 wpaul Exp $
  */
 
 /*
diff --git a/sys/pci/if_sr_p.c b/sys/pci/if_sr_p.c
index b7a572c4860b..20981b3f99d1 100644
--- a/sys/pci/if_sr_p.c
+++ b/sys/pci/if_sr_p.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_sr_p.c,v 1.7.2.1 1999/08/29 16:31:44 peter Exp $
  */
 
 #include "pci.h"
diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c
index 75cfc4c1bbb6..b004a5fd1cce 100644
--- a/sys/pci/if_ste.c
+++ b/sys/pci/if_ste.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_ste.c,v 1.13.2.1 1999/10/10 23:04:54 wpaul Exp $
  */
 
 
@@ -76,7 +76,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/pci/if_ste.c,v 1.13.2.1 1999/10/10 23:04:54 wpaul Exp $";
 #endif
 
 /*
diff --git a/sys/pci/if_stereg.h b/sys/pci/if_stereg.h
index 2fddbc40c2fc..bfd92935ee6c 100644
--- a/sys/pci/if_stereg.h
+++ b/sys/pci/if_stereg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_stereg.h,v 1.4.2.1 1999/10/10 23:04:55 wpaul Exp $
  */
 
 /*
diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c
index 7634bad85bee..16e864cca8a7 100644
--- a/sys/pci/if_ti.c
+++ b/sys/pci/if_ti.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_ti.c,v 1.4.2.9 1999/12/13 02:02:25 jkh Exp $
  */
 
 /*
@@ -128,7 +128,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/pci/if_ti.c,v 1.4.2.9 1999/12/13 02:02:25 jkh Exp $";
 #endif
 
 /*
diff --git a/sys/pci/if_tireg.h b/sys/pci/if_tireg.h
index 18f4ffce3064..93cd798a929c 100644
--- a/sys/pci/if_tireg.h
+++ b/sys/pci/if_tireg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_tireg.h,v 1.1.2.7 1999/10/10 17:55:41 wpaul Exp $
  */
 
 /*
diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c
index c8c5e46d8e9c..5d476dce079b 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_tl.c,v 1.24.2.7 1999/08/29 16:31:46 peter Exp $
  */
 
 /*
@@ -221,7 +221,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/pci/if_tl.c,v 1.24.2.7 1999/08/29 16:31:46 peter Exp $";
 #endif
 
 /*
diff --git a/sys/pci/if_tlreg.h b/sys/pci/if_tlreg.h
index 7df359d929c6..51c745814cce 100644
--- a/sys/pci/if_tlreg.h
+++ b/sys/pci/if_tlreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_tlreg.h,v 1.7.2.3 1999/08/29 16:31:47 peter Exp $
  */
 
 
diff --git a/sys/pci/if_tx.c b/sys/pci/if_tx.c
index bf510a44fa99..e1eeb487edbe 100644
--- a/sys/pci/if_tx.c
+++ b/sys/pci/if_tx.c
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_tx.c,v 1.3 1998/10/10 04:30:09 jason Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pci/if_tx.c,v 1.20.2.4 1999/08/29 16:31:48 peter Exp $ */
 
 /*-
  * Copyright (c) 1997 Semen Ustimenko (semen@iclub.nsu.ru)
diff --git a/sys/pci/if_txvar.h b/sys/pci/if_txvar.h
index 5efe056267f1..6c4db7c23a57 100644
--- a/sys/pci/if_txvar.h
+++ b/sys/pci/if_txvar.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_txvar.h,v 1.3 1998/10/10 04:30:09 jason Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pci/if_txvar.h,v 1.1.4.3 1999/08/29 16:31:48 peter Exp $ */
 
 /*-
  * Copyright (c) 1997 Semen Ustimenko
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index fdf2923f2a78..4a06d0d9659d 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/if_vr.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_vr.c,v 1.7.2.4 1999/09/17 18:28:17 wpaul Exp $
  */
 
 /*
@@ -102,7 +102,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/pci/if_vr.c,v 1.7.2.4 1999/09/17 18:28:17 wpaul Exp $";
 #endif
 
 /*
diff --git a/sys/pci/if_vrreg.h b/sys/pci/if_vrreg.h
index 167acc5d91a7..b196659e422d 100644
--- a/sys/pci/if_vrreg.h
+++ b/sys/pci/if_vrreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_vrreg.h,v 1.2.2.3 1999/08/29 16:31:49 peter Exp $
  */
 
 /*
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index d3d43dd11172..e099da6ef0e7 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_wb.c,v 1.6.2.4 1999/08/29 16:31:49 peter Exp $
  */
 
 /*
@@ -126,7 +126,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/pci/if_wb.c,v 1.6.2.4 1999/08/29 16:31:49 peter Exp $";
 #endif
 
 /*
diff --git a/sys/pci/if_wbreg.h b/sys/pci/if_wbreg.h
index 53d8af2c3331..01abd7043588 100644
--- a/sys/pci/if_wbreg.h
+++ b/sys/pci/if_wbreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_wbreg.h,v 1.2.2.3 1999/08/29 16:31:50 peter Exp $
  */
 
 /*
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index 7910d34d9e54..27a26200bab1 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_xl.c,v 1.22.2.24 1999/12/17 15:58:13 wpaul Exp $
  */
 
 /*
@@ -163,7 +163,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/pci/if_xl.c,v 1.22.2.24 1999/12/17 15:58:13 wpaul Exp $";
 #endif
 
 /*
diff --git a/sys/pci/if_xlreg.h b/sys/pci/if_xlreg.h
index 13347e29063a..0b8fc54fe641 100644
--- a/sys/pci/if_xlreg.h
+++ b/sys/pci/if_xlreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_xlreg.h,v 1.9.2.10 1999/12/17 15:58:14 wpaul Exp $
  */
 
 #define XL_EE_READ	0x0080	/* read, 5 bit address */
diff --git a/sys/pci/intpm.c b/sys/pci/intpm.c
index 6da552c2f3ae..159381557234 100644
--- a/sys/pci/intpm.c
+++ b/sys/pci/intpm.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/pci/intpm.c,v 1.15.2.1 1999/11/01 22:48:33 nsouch Exp $
  */
 
 #include "pci.h"
diff --git a/sys/pci/intpmreg.h b/sys/pci/intpmreg.h
index 7dd2673f3063..f29081ea223a 100644
--- a/sys/pci/intpmreg.h
+++ b/sys/pci/intpmreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/pci/intpmreg.h,v 1.2.2.1 1999/11/01 22:48:34 nsouch Exp $
  */
 
 /*Register Difinition for Intel Chipset with ACPI Support*/
diff --git a/sys/pci/isp_pci.c b/sys/pci/isp_pci.c
index 718a64980fe4..e88d170e1c65 100644
--- a/sys/pci/isp_pci.c
+++ b/sys/pci/isp_pci.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pci/isp_pci.c,v 1.13.2.11 1999/12/03 07:28:33 mjacob Exp $ */
 /*
  * PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
  * FreeBSD Version.
diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c
index e0c52fe3f0fd..a7e860be100f 100644
--- a/sys/pci/meteor.c
+++ b/sys/pci/meteor.c
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pci/meteor.c,v 1.35.2.2 1999/08/29 16:31:52 peter Exp $ */
 
 /*		Change History:
 	8/21/95		Release
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index 5c2504fb5dc8..afffc6e35997 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** $FreeBSD$
+** $FreeBSD: src/sys/pci/ncr.c,v 1.141.2.4 1999/08/29 16:31:53 peter Exp $
 **
 **  Device driver for the   NCR 53C8XX   PCI-SCSI-Controller Family.
 **
@@ -1357,7 +1357,7 @@ static	void	ncr_attach	(pcici_t tag, int unit);
 
 #if !defined(lint)
 static const char ident[] =
-	"\n$FreeBSD$\n";
+	"\n$FreeBSD: src/sys/pci/ncr.c,v 1.141.2.4 1999/08/29 16:31:53 peter Exp $\n";
 #endif
 
 static const u_long	ncr_version = NCR_VERSION	* 11
diff --git a/sys/pci/ncrreg.h b/sys/pci/ncrreg.h
index fcc72124377f..fe3262c96a48 100644
--- a/sys/pci/ncrreg.h
+++ b/sys/pci/ncrreg.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** $FreeBSD$
+** $FreeBSD: src/sys/pci/ncrreg.h,v 1.12.2.1 1999/08/29 16:31:54 peter Exp $
 **
 **  Device driver for the   NCR 53C810   PCI-SCSI-Controller.
 **
diff --git a/sys/pci/pci.c b/sys/pci/pci.c
index 2dc1d4b45480..d28d4a5a9cdb 100644
--- a/sys/pci/pci.c
+++ b/sys/pci/pci.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/pci.c,v 1.93.2.3 1999/12/08 05:04:11 ken Exp $
  *
  */
 
diff --git a/sys/pci/pci_compat.c b/sys/pci/pci_compat.c
index 17586ba3cd68..aa03463a2b12 100644
--- a/sys/pci/pci_compat.c
+++ b/sys/pci/pci_compat.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/pci_compat.c,v 1.20.2.4 1999/08/29 16:31:55 peter Exp $
  *
  */
 
diff --git a/sys/pci/pcic_p.c b/sys/pci/pcic_p.c
index bf4234bd59a2..9279ba297135 100644
--- a/sys/pci/pcic_p.c
+++ b/sys/pci/pcic_p.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/pcic_p.c,v 1.7.2.3 1999/11/23 11:05:16 kuriyama Exp $
  */
 
 #include "pci.h"
diff --git a/sys/pci/pcic_p.h b/sys/pci/pcic_p.h
index bd8e06c79e45..e6dac6630eac 100644
--- a/sys/pci/pcic_p.h
+++ b/sys/pci/pcic_p.h
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/pcic_p.h,v 1.3.4.2 1999/08/29 16:31:56 peter Exp $
  */
 
 /* PCI/CardBus Device IDs */
diff --git a/sys/pci/pcireg.h b/sys/pci/pcireg.h
index f90df10e14de..bcfcd422f8ad 100644
--- a/sys/pci/pcireg.h
+++ b/sys/pci/pcireg.h
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/pcireg.h,v 1.20.2.2 1999/08/29 16:31:56 peter Exp $
  *
  */
 
diff --git a/sys/pci/pcisupport.c b/sys/pci/pcisupport.c
index bd7461a052e1..bb0caca2db43 100644
--- a/sys/pci/pcisupport.c
+++ b/sys/pci/pcisupport.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** $FreeBSD$
+** $FreeBSD: src/sys/pci/pcisupport.c,v 1.86.2.13 1999/11/01 22:48:34 nsouch Exp $
 **
 **  Device driver for DEC/INTEL PCI chipsets.
 **
diff --git a/sys/pci/pcivar.h b/sys/pci/pcivar.h
index 3ac27ecc64bf..c30b43842dfe 100644
--- a/sys/pci/pcivar.h
+++ b/sys/pci/pcivar.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/pcivar.h,v 1.25.2.5 1999/08/29 16:31:57 peter Exp $
  *
  */
 
diff --git a/sys/pci/simos.c b/sys/pci/simos.c
index 91359dc62ccf..c4e679af228d 100644
--- a/sys/pci/simos.c
+++ b/sys/pci/simos.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/simos.c,v 1.3.2.2 1999/08/29 16:31:58 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/pci/simos.h b/sys/pci/simos.h
index e703074e58c3..a6e14f4ad1f3 100644
--- a/sys/pci/simos.h
+++ b/sys/pci/simos.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/simos.h,v 1.1.2.1 1999/08/29 16:31:58 peter Exp $
  */
 
 /*
diff --git a/sys/pci/ti_fw.h b/sys/pci/ti_fw.h
index a302f042d622..4505c639614c 100644
--- a/sys/pci/ti_fw.h
+++ b/sys/pci/ti_fw.h
@@ -2,7 +2,7 @@
  * Firmware for Alteon Tigon 1 chip.
  * Generated by genfw.c
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/ti_fw.h,v 1.1.2.4 1999/10/10 17:55:41 wpaul Exp $
  */
 static int tigonFwReleaseMajor = 0xc;
 static int tigonFwReleaseMinor = 0x3;
diff --git a/sys/pci/ti_fw2.h b/sys/pci/ti_fw2.h
index e166bc9621d8..9b0c06d33e58 100644
--- a/sys/pci/ti_fw2.h
+++ b/sys/pci/ti_fw2.h
@@ -3,7 +3,7 @@
  * Built on Wed Sep 22 02:25:18 1999 by wpaul@xylophone
  * OS: FreeBSD 3.2-RELEASE
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/ti_fw2.h,v 1.1.2.4 1999/10/10 17:55:42 wpaul Exp $
  */
 static int tigon2FwReleaseMajor = 0xc;
 static int tigon2FwReleaseMinor = 0x3;
diff --git a/sys/pci/wdc_p.c b/sys/pci/wdc_p.c
index 789ae1b0f37a..985e191c4908 100644
--- a/sys/pci/wdc_p.c
+++ b/sys/pci/wdc_p.c
@@ -16,7 +16,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/wdc_p.c,v 1.4.2.1 1999/08/29 16:32:01 peter Exp $
  */
 
 /*
diff --git a/sys/pci/xmaciireg.h b/sys/pci/xmaciireg.h
index f649e93a044e..28b3bf0e834b 100644
--- a/sys/pci/xmaciireg.h
+++ b/sys/pci/xmaciireg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/xmaciireg.h,v 1.2.2.1 1999/09/10 01:48:23 wpaul Exp $
  */
 
 /*
diff --git a/sys/pci/xrpu.c b/sys/pci/xrpu.c
index 44a3118297fb..83f59da8e7ef 100644
--- a/sys/pci/xrpu.c
+++ b/sys/pci/xrpu.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/xrpu.c,v 1.6.2.2 1999/08/29 16:32:02 peter Exp $
  *
  * A very simple device driver for PCI cards based on Xilinx 6200 series
  * FPGA/RPU devices.  Current Functionality is to allow you to open and
diff --git a/sys/posix4/aio.h b/sys/posix4/aio.h
index b96e9eb26372..42449d4cb30a 100644
--- a/sys/posix4/aio.h
+++ b/sys/posix4/aio.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/posix4/aio.h,v 1.4.2.1 1999/08/29 16:32:06 peter Exp $
  */
 
 /* aio.h: P1003.1B-1993 Asynchronous I/O */
diff --git a/sys/sys/_posix.h b/sys/sys/_posix.h
index d20187335d35..255da5778bc8 100644
--- a/sys/sys/_posix.h
+++ b/sys/sys/_posix.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/_posix.h,v 1.3.2.1 1999/08/29 16:32:07 peter Exp $
  */
 
 /*
diff --git a/sys/sys/acct.h b/sys/sys/acct.h
index c1ebb8a8dcc3..c0b0a58565e5 100644
--- a/sys/sys/acct.h
+++ b/sys/sys/acct.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)acct.h	8.4 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/acct.h,v 1.9.2.1 1999/08/29 16:32:07 peter Exp $
  */
 
 #ifndef _SYS_ACCT_H_
diff --git a/sys/sys/aio.h b/sys/sys/aio.h
index 68a5698503d1..f7949699bbb6 100644
--- a/sys/sys/aio.h
+++ b/sys/sys/aio.h
@@ -13,7 +13,7 @@
  * bad that happens because of using this software isn't the responsibility
  * of the author.  This software is distributed AS-IS.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/aio.h,v 1.9.2.2 1999/08/29 16:32:08 peter Exp $
  */
 
 #ifndef _SYS_AIO_H_
diff --git a/sys/sys/buf.h b/sys/sys/buf.h
index 2385e522404a..6d49b78a5758 100644
--- a/sys/sys/buf.h
+++ b/sys/sys/buf.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)buf.h	8.9 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/buf.h,v 1.61.2.2 1999/08/29 16:32:08 peter Exp $
  */
 
 #ifndef _SYS_BUF_H_
diff --git a/sys/sys/bus.h b/sys/sys/bus.h
index fdf0d00fe22e..05c18fbbb3e4 100644
--- a/sys/sys/bus.h
+++ b/sys/sys/bus.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/bus.h,v 1.8.2.1 1999/08/29 16:32:09 peter Exp $
  */
 
 #ifndef _SYS_BUS_H_
diff --git a/sys/sys/bus_private.h b/sys/sys/bus_private.h
index 305fb6759188..f6c209511a52 100644
--- a/sys/sys/bus_private.h
+++ b/sys/sys/bus_private.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/bus_private.h,v 1.4.2.1 1999/08/29 16:32:09 peter Exp $
  */
 
 #ifndef _SYS_BUS_PRIVATE_H_
diff --git a/sys/sys/callout.h b/sys/sys/callout.h
index 971ac9f88079..9a2c2c500856 100644
--- a/sys/sys/callout.h
+++ b/sys/sys/callout.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)callout.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/callout.h,v 1.11.2.2 1999/08/29 16:32:09 peter Exp $
  */
 
 #ifndef _SYS_CALLOUT_H_
diff --git a/sys/sys/ccdvar.h b/sys/sys/ccdvar.h
index f8e5aa38eaf1..eec015c59330 100644
--- a/sys/sys/ccdvar.h
+++ b/sys/sys/ccdvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/sys/ccdvar.h,v 1.7.2.1 1999/08/29 16:32:10 peter Exp $ */
 
 /*	$NetBSD: ccdvar.h,v 1.7.2.1 1995/10/12 21:30:18 thorpej Exp $	*/
 
diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h
index f062c772da77..f357f122ed96 100644
--- a/sys/sys/cdefs.h
+++ b/sys/sys/cdefs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cdefs.h	8.8 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/cdefs.h,v 1.24.2.1 1999/08/29 16:32:10 peter Exp $
  */
 
 #ifndef	_SYS_CDEFS_H_
diff --git a/sys/sys/cdio.h b/sys/sys/cdio.h
index dbb0f29f9abc..68731abcb2a0 100644
--- a/sys/sys/cdio.h
+++ b/sys/sys/cdio.h
@@ -1,7 +1,7 @@
 /*
  * 16 Feb 93	Julian Elischer	(julian@dialix.oz.au)
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/cdio.h,v 1.19.2.1 1999/08/29 16:32:11 peter Exp $
  */
 
 /*
diff --git a/sys/sys/chio.h b/sys/sys/chio.h
index cf6f832b7272..b5eca9b3b30f 100644
--- a/sys/sys/chio.h
+++ b/sys/sys/chio.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/chio.h,v 1.12.2.1 1999/08/29 16:32:11 peter Exp $
  */
 
 #ifndef	_SYS_CHIO_H_
diff --git a/sys/sys/clist.h b/sys/sys/clist.h
index d1c22fa3d599..bbdd11635936 100644
--- a/sys/sys/clist.h
+++ b/sys/sys/clist.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clist.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/clist.h,v 1.8.2.1 1999/08/29 16:32:12 peter Exp $
  */
 
 #ifndef _SYS_CLIST_H_
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index 89795f672a42..c63a3c3de032 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)conf.h	8.5 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/conf.h,v 1.48.2.3 1999/11/15 22:40:48 joe Exp $
  */
 
 #ifndef _SYS_CONF_H_
diff --git a/sys/sys/copyright.h b/sys/sys/copyright.h
index d0b29b2ecef8..e53eb2251ac6 100644
--- a/sys/sys/copyright.h
+++ b/sys/sys/copyright.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/copyright.h,v 1.5.2.2 1999/08/29 16:32:13 peter Exp $
  */
 
 
diff --git a/sys/sys/ctype.h b/sys/sys/ctype.h
index 9144b0e725f1..4bbc25d1fb8e 100644
--- a/sys/sys/ctype.h
+++ b/sys/sys/ctype.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ctype.h,v 1.1.2.1 1999/12/06 21:03:31 archie Exp $
  */
 
 #ifndef _SYS_CTYPE_H_
diff --git a/sys/sys/devfsext.h b/sys/sys/devfsext.h
index 86af2180ccfd..ed3baf37ecad 100644
--- a/sys/sys/devfsext.h
+++ b/sys/sys/devfsext.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/devfsext.h,v 1.22.2.1 1999/08/29 16:32:13 peter Exp $
  */
 
 #ifndef _SYS_DEVFSEXT_H_
diff --git a/sys/sys/device.h b/sys/sys/device.h
index fc5ce337439e..94ee081ec430 100644
--- a/sys/sys/device.h
+++ b/sys/sys/device.h
@@ -40,7 +40,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)device.h	8.2 (Berkeley) 2/17/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/device.h,v 1.8.2.1 1999/08/29 16:32:14 peter Exp $
  */
 
 #ifndef _SYS_DEVICE_H_
diff --git a/sys/sys/devicestat.h b/sys/sys/devicestat.h
index 8887744ea306..b01b868e112f 100644
--- a/sys/sys/devicestat.h
+++ b/sys/sys/devicestat.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/devicestat.h,v 1.3.2.2 1999/08/29 16:32:14 peter Exp $
  */
 
 #ifndef _DEVICESTAT_H
diff --git a/sys/sys/dir.h b/sys/sys/dir.h
index 670850ac37ef..77d79ac93704 100644
--- a/sys/sys/dir.h
+++ b/sys/sys/dir.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dir.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/dir.h,v 1.5.4.1 1999/08/29 16:32:14 peter Exp $
  */
 
 #ifndef _SYS_DIR_H_
diff --git a/sys/sys/dirent.h b/sys/sys/dirent.h
index 19db37ba43e7..bd204d363ef4 100644
--- a/sys/sys/dirent.h
+++ b/sys/sys/dirent.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dirent.h	8.3 (Berkeley) 8/10/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/dirent.h,v 1.9.2.1 1999/08/29 16:32:15 peter Exp $
  */
 
 #ifndef	_SYS_DIRENT_H_
diff --git a/sys/sys/disk.h b/sys/sys/disk.h
index 5fb9e65c05db..c98eff8ce4ae 100644
--- a/sys/sys/disk.h
+++ b/sys/sys/disk.h
@@ -41,7 +41,7 @@
  *
  *	@(#)disk.h	8.1 (Berkeley) 6/2/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/disk.h,v 1.8.2.1 1999/08/29 16:32:15 peter Exp $
  */
 
 #ifndef _SYS_DISK_H_
diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h
index 557512dab66d..ff7a44ea5bdb 100644
--- a/sys/sys/disklabel.h
+++ b/sys/sys/disklabel.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/disklabel.h,v 1.36.2.3 1999/08/29 16:32:15 peter Exp $
  */
 
 #ifndef	_SYS_DISKLABEL_H_
diff --git a/sys/sys/diskslice.h b/sys/sys/diskslice.h
index aba8cd210690..e5d45384fe41 100644
--- a/sys/sys/diskslice.h
+++ b/sys/sys/diskslice.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/diskslice.h,v 1.29.2.1 1999/08/29 16:32:16 peter Exp $
  */
 
 #ifndef	_SYS_DISKSLICE_H_
diff --git a/sys/sys/dkbad.h b/sys/sys/dkbad.h
index 882ed327313f..826dfba9abec 100644
--- a/sys/sys/dkbad.h
+++ b/sys/sys/dkbad.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dkbad.h	8.2 (Berkeley) 7/10/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/dkbad.h,v 1.10.2.1 1999/08/29 16:32:16 peter Exp $
  */
 
 #ifndef _SYS_DKBAD_H_
diff --git a/sys/sys/dkstat.h b/sys/sys/dkstat.h
index c62d6ce1350f..29e919811076 100644
--- a/sys/sys/dkstat.h
+++ b/sys/sys/dkstat.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dkstat.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/dkstat.h,v 1.10.2.1 1999/08/29 16:32:17 peter Exp $
  */
 
 #ifndef _SYS_DKSTAT_H_
diff --git a/sys/sys/dmap.h b/sys/sys/dmap.h
index 793176086738..f4281d89844d 100644
--- a/sys/sys/dmap.h
+++ b/sys/sys/dmap.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dmap.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/dmap.h,v 1.5.4.1 1999/08/29 16:32:18 peter Exp $
  */
 
 #ifndef _SYS_DMAP_H_
diff --git a/sys/sys/domain.h b/sys/sys/domain.h
index df57196b9362..b7af28f3a2ce 100644
--- a/sys/sys/domain.h
+++ b/sys/sys/domain.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)domain.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/domain.h,v 1.11.2.1 1999/08/29 16:32:18 peter Exp $
  */
 
 #ifndef _SYS_DOMAIN_H_
diff --git a/sys/sys/elf32.h b/sys/sys/elf32.h
index 309f1a43eada..04ceec6f93ec 100644
--- a/sys/sys/elf32.h
+++ b/sys/sys/elf32.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/elf32.h,v 1.5.2.2 1999/08/29 16:32:18 peter Exp $
  */
 
 #ifndef _SYS_ELF32_H_
diff --git a/sys/sys/elf64.h b/sys/sys/elf64.h
index 022b174f559d..923070b13eb6 100644
--- a/sys/sys/elf64.h
+++ b/sys/sys/elf64.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/elf64.h,v 1.7.2.2 1999/08/29 16:32:19 peter Exp $
  */
 
 #ifndef _SYS_ELF64_H_
diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h
index 207050debe02..7d0103a62ad8 100644
--- a/sys/sys/elf_common.h
+++ b/sys/sys/elf_common.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/elf_common.h,v 1.3.2.2 1999/08/29 16:32:19 peter Exp $
  */
 
 #ifndef _SYS_ELF_COMMON_H_
diff --git a/sys/sys/elf_generic.h b/sys/sys/elf_generic.h
index 32c3e161b5a4..0a29fade1744 100644
--- a/sys/sys/elf_generic.h
+++ b/sys/sys/elf_generic.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/elf_generic.h,v 1.2.2.2 1999/08/29 16:32:20 peter Exp $
  */
 
 #ifndef _SYS_ELF_GENERIC_H_
diff --git a/sys/sys/errno.h b/sys/sys/errno.h
index c25b6afef90d..464e78b2a74f 100644
--- a/sys/sys/errno.h
+++ b/sys/sys/errno.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)errno.h	8.5 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/errno.h,v 1.11.2.2 1999/08/29 16:32:20 peter Exp $
  */
 
 #ifndef _SYS_ERRNO_H_
diff --git a/sys/sys/exec.h b/sys/sys/exec.h
index d724ed9b643d..c758e097e832 100644
--- a/sys/sys/exec.h
+++ b/sys/sys/exec.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.3 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/exec.h,v 1.21.2.1 1999/08/29 16:32:20 peter Exp $
  */
 
 #ifndef _SYS_EXEC_H_
diff --git a/sys/sys/fbio.h b/sys/sys/fbio.h
index 5acb79d0d1c7..5cbc35f661d1 100644
--- a/sys/sys/fbio.h
+++ b/sys/sys/fbio.h
@@ -36,7 +36,7 @@
  *
  *	@(#)fbio.h	8.2 (Berkeley) 10/30/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/fbio.h,v 1.5.4.1 1999/08/29 16:32:21 peter Exp $
  */
 
 #ifndef _SYS_FBIO_H_
diff --git a/sys/sys/fcntl.h b/sys/sys/fcntl.h
index b81f904daaba..61bf9d10f193 100644
--- a/sys/sys/fcntl.h
+++ b/sys/sys/fcntl.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fcntl.h	8.3 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/fcntl.h,v 1.7.2.1 1999/08/29 16:32:21 peter Exp $
  */
 
 #ifndef _SYS_FCNTL_H_
diff --git a/sys/sys/file.h b/sys/sys/file.h
index 692507485e3e..712e09dd1223 100644
--- a/sys/sys/file.h
+++ b/sys/sys/file.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)file.h	8.3 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/file.h,v 1.16.2.2 1999/08/29 16:32:21 peter Exp $
  */
 
 #ifndef _SYS_FILE_H_
diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h
index 4505875fe5c4..98d72c0b85d0 100644
--- a/sys/sys/filedesc.h
+++ b/sys/sys/filedesc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)filedesc.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/filedesc.h,v 1.15.2.1 1999/08/29 16:32:22 peter Exp $
  */
 
 #ifndef _SYS_FILEDESC_H_
diff --git a/sys/sys/filio.h b/sys/sys/filio.h
index 66c3159fb1e2..fa546dde1755 100644
--- a/sys/sys/filio.h
+++ b/sys/sys/filio.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)filio.h	8.1 (Berkeley) 3/28/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/filio.h,v 1.4.4.1 1999/08/29 16:32:22 peter Exp $
  */
 
 #ifndef	_SYS_FILIO_H_
diff --git a/sys/sys/gmon.h b/sys/sys/gmon.h
index 79434a4888a9..8053f500cbb8 100644
--- a/sys/sys/gmon.h
+++ b/sys/sys/gmon.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)gmon.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/gmon.h,v 1.14.2.1 1999/08/29 16:32:23 peter Exp $
  */
 
 #ifndef _SYS_GMON_H_
diff --git a/sys/sys/imgact.h b/sys/sys/imgact.h
index ec147ba8698c..927e6215afba 100644
--- a/sys/sys/imgact.h
+++ b/sys/sys/imgact.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/imgact.h,v 1.18.2.2 1999/08/29 16:32:23 peter Exp $
  */
 
 #ifndef _SYS_IMGACT_H_
diff --git a/sys/sys/imgact_aout.h b/sys/sys/imgact_aout.h
index 873f1b25b3a5..895fa724606b 100644
--- a/sys/sys/imgact_aout.h
+++ b/sys/sys/imgact_aout.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)exec.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/imgact_aout.h,v 1.9.2.2 1999/09/01 06:12:10 sef Exp $
  */
 
 #ifndef	_IMGACT_AOUT_H_
diff --git a/sys/sys/imgact_elf.h b/sys/sys/imgact_elf.h
index 3c6e7ec96c31..53117a5f5f71 100644
--- a/sys/sys/imgact_elf.h
+++ b/sys/sys/imgact_elf.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/imgact_elf.h,v 1.10.2.3 1999/09/01 06:12:11 sef Exp $
  */
 
 #ifndef _SYS_IMGACT_ELF_H_
diff --git a/sys/sys/inflate.h b/sys/sys/inflate.h
index 8b1e95de1958..e6d26db8bd66 100644
--- a/sys/sys/inflate.h
+++ b/sys/sys/inflate.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/inflate.h,v 1.9.2.1 1999/08/29 16:32:24 peter Exp $
  *
  */
 #ifndef	_SYS_INFLATE_H_
diff --git a/sys/sys/interrupt.h b/sys/sys/interrupt.h
index 8eafa2aabc59..5f84bcc26392 100644
--- a/sys/sys/interrupt.h
+++ b/sys/sys/interrupt.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/interrupt.h,v 1.7.2.1 1999/08/29 16:32:25 peter Exp $
  */
 
 /* XXX currently dev_instance must be set to the ISA device_id or -1 for PCI */
diff --git a/sys/sys/inttypes.h b/sys/sys/inttypes.h
index f1d94c615e7f..611a15dd4c7e 100644
--- a/sys/sys/inttypes.h
+++ b/sys/sys/inttypes.h
@@ -1,6 +1,6 @@
 /*
  * This file is in the public domain.
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/inttypes.h,v 1.1.2.1 1999/08/29 16:32:25 peter Exp $
  */
 
 #ifndef _SYS_INTTYPES_H_
diff --git a/sys/sys/ioccom.h b/sys/sys/ioccom.h
index 3dc3c1e0164a..feefd3f4d369 100644
--- a/sys/sys/ioccom.h
+++ b/sys/sys/ioccom.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ioccom.h	8.2 (Berkeley) 3/28/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ioccom.h,v 1.7.2.1 1999/08/29 16:32:25 peter Exp $
  */
 
 #ifndef	_SYS_IOCCOM_H_
diff --git a/sys/sys/ioctl.h b/sys/sys/ioctl.h
index 11a22c60434e..d5a776a33b05 100644
--- a/sys/sys/ioctl.h
+++ b/sys/sys/ioctl.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ioctl.h	8.6 (Berkeley) 3/28/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ioctl.h,v 1.7.4.1 1999/08/29 16:32:26 peter Exp $
  */
 
 #ifndef	_SYS_IOCTL_H_
diff --git a/sys/sys/ioctl_compat.h b/sys/sys/ioctl_compat.h
index baf42e090f83..e0c033dbaf82 100644
--- a/sys/sys/ioctl_compat.h
+++ b/sys/sys/ioctl_compat.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ioctl_compat.h	8.4 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ioctl_compat.h,v 1.4.4.1 1999/08/29 16:32:26 peter Exp $
  */
 
 #ifndef _SYS_IOCTL_COMPAT_H_
diff --git a/sys/sys/ipc.h b/sys/sys/ipc.h
index 62406b9196fb..3dadf6789e46 100644
--- a/sys/sys/ipc.h
+++ b/sys/sys/ipc.h
@@ -41,7 +41,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ipc.h	8.4 (Berkeley) 2/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ipc.h,v 1.12.2.1 1999/08/29 16:32:27 peter Exp $
  */
 
 /*
diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h
index 5d4c8aaaa3bd..4abb9a855688 100644
--- a/sys/sys/kernel.h
+++ b/sys/sys/kernel.h
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernel.h	8.3 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/kernel.h,v 1.49.2.1 1999/08/29 16:32:27 peter Exp $
  */
 
 #ifndef _SYS_KERNEL_H_
diff --git a/sys/sys/ktrace.h b/sys/sys/ktrace.h
index 78b7bc1257a1..46f0e22d3bd8 100644
--- a/sys/sys/ktrace.h
+++ b/sys/sys/ktrace.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ktrace.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ktrace.h,v 1.12.4.1 1999/08/29 16:32:27 peter Exp $
  */
 
 #ifndef _SYS_KTRACE_H_
diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h
index 6f7c4ae90a59..0cf573198f98 100644
--- a/sys/sys/libkern.h
+++ b/sys/sys/libkern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)libkern.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/libkern.h,v 1.16.4.1 1999/08/29 16:32:28 peter Exp $
  */
 
 #ifndef _SYS_LIBKERN_H_
diff --git a/sys/sys/link_aout.h b/sys/sys/link_aout.h
deleted file mode 100644
index 3acb86a3b3d6..000000000000
--- a/sys/sys/link_aout.h
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * Copyright (c) 1993 Paul Kranenburg
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Paul Kranenburg.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-/*
- * RRS section definitions.
- *
- * The layout of some data structures defined in this header file is
- * such that we can provide compatibility with the SunOS 4.x shared
- * library scheme.
- */
-
-#ifndef _LINK_H_
-#define _LINK_H_
-
-#if (defined(FREEBSD_ELF) || defined(__ELF__)) && !defined(FREEBSD_AOUT)
-
-#include <sys/types.h>
-
-struct link_map {
-	caddr_t		l_addr;			/* Base Address of library */
-#ifdef __mips__
-	caddr_t		l_offs;			/* Load Offset of library */
-#endif
-	const char	*l_name;		/* Absolute Path to Library */
-	const void	*l_ld;			/* Pointer to .dynamic in memory */
-	struct link_map	*l_next, *l_prev;	/* linked list of of mapped libs */
-};
-
-struct r_debug {
-	int		r_version;		/* not used */
-	struct link_map *r_map;			/* list of loaded images */
-	void		(*r_brk)(void);		/* pointer to break point */
-	enum {
-	    RT_CONSISTENT,			/* things are stable */
-	    RT_ADD,				/* adding a shared library */
-	    RT_DELETE				/* removing a shared library */
-	}		r_state;
-};
-
-#else /* !__ELF__ */
-
-struct dl_info;
-
-/*
- * A `Shared Object Descriptor' describes a shared object that is needed
- * to complete the link edit process of the object containing it.
- * A list of such objects (chained through `sod_next') is pointed at
- * by `sdt_sods' in the section_dispatch_table structure.
- */
-
-struct sod {	/* Shared Object Descriptor */
-	long	sod_name;		/* name (relative to load address) */
-	u_int	sod_library  : 1,	/* Searched for by library rules */
-		sod_reserved : 31;
-	short	sod_major;		/* major version number */
-	short	sod_minor;		/* minor version number */
-	long	sod_next;		/* next sod */
-};
-
-/*
- * `Shared Object Map's are used by the run-time link editor (ld.so) to
- * keep track of all shared objects loaded into a process' address space.
- * These structures are only used at run-time and do not occur within
- * the text or data segment of an executable or shared library.
- */
-struct so_map {		/* Shared Object Map */
-	caddr_t		som_addr;	/* Address at which object mapped */
-	char 		*som_path;	/* Path to mmap'ed file */
-	struct so_map	*som_next;	/* Next map in chain */
-	struct sod	*som_sod;	/* Sod responsible for this map */
-	caddr_t		som_sodbase;	/* Base address of this sod */
-	u_int		som_write : 1;	/* Text is currently writable */
-	struct _dynamic	*som_dynamic;	/* _dynamic structure */
-	caddr_t		som_spd;	/* Private data */
-};
-
-/*
- * Symbol description with size. This is simply an `nlist' with
- * one field (nz_size) added.
- * Used to convey size information on items in the data segment
- * of shared objects. An array of these live in the shared object's
- * text segment and is addressed by the `sdt_nzlist' field.
- */
-struct nzlist {
-	struct nlist	nlist;
-	u_long		nz_size;
-};
-
-#define nz_un		nlist.n_un
-#define nz_strx		nlist.n_un.n_strx
-#define nz_name		nlist.n_un.n_name
-#define nz_type		nlist.n_type
-#define nz_value	nlist.n_value
-#define nz_desc		nlist.n_desc
-#define nz_other	nlist.n_other
-
-/*
- * The `section_dispatch_table' structure contains offsets to various data
- * structures needed to do run-time relocation.
- */
-struct section_dispatch_table {
-	struct so_map *sdt_loaded;	/* List of loaded objects */
-	long	sdt_sods;		/* List of shared objects descriptors */
-	long	sdt_paths;		/* Library search paths */
-	long	sdt_got;		/* Global offset table */
-	long	sdt_plt;		/* Procedure linkage table */
-	long	sdt_rel;		/* Relocation table */
-	long	sdt_hash;		/* Symbol hash table */
-	long	sdt_nzlist;		/* Symbol table itself */
-	long	sdt_filler2;		/* Unused (was: stab_hash) */
-	long	sdt_buckets;		/* Number of hash buckets */
-	long	sdt_strings;		/* Symbol strings */
-	long	sdt_str_sz;		/* Size of symbol strings */
-	long	sdt_text_sz;		/* Size of text area */
-	long	sdt_plt_sz;		/* Size of procedure linkage table */
-};
-
-/*
- * RRS symbol hash table, addressed by `sdt_hash' in section_dispatch_table.
- * Used to quickly lookup symbols of the shared object by hashing
- * on the symbol's name. `rh_symbolnum' is the index of the symbol
- * in the shared object's symbol list (`sdt_nzlist'), `rh_next' is
- * the next symbol in the hash bucket (in case of collisions).
- */
-struct rrs_hash {
-	int	rh_symbolnum;		/* Symbol number */
-	int	rh_next;		/* Next hash entry */
-};
-
-/*
- * `rt_symbols' is used to keep track of run-time allocated commons
- * and data items copied from shared objects.
- */
-struct rt_symbol {
-	struct nzlist		*rt_sp;		/* The symbol */
-	struct rt_symbol	*rt_next;	/* Next in linear list */
-	struct rt_symbol	*rt_link;	/* Next in bucket */
-	caddr_t			rt_srcaddr;	/* Address of "master" copy */
-	struct so_map		*rt_smp;	/* Originating map */
-};
-
-/*
- * Debugger interface structure.
- */
-struct so_debug {
-	int	dd_version;		/* Version # of interface */
-	int	dd_in_debugger;		/* Set when run by debugger */
-	int	dd_sym_loaded;		/* Run-time linking brought more
-					   symbols into scope */
-	char   	 *dd_bpt_addr;		/* Address of rtld-generated bpt */
-	int	dd_bpt_shadow;		/* Original contents of bpt */
-	struct rt_symbol *dd_cc;	/* Allocated commons/copied data */
-};
-
-/*
- * Version returned to crt0 from ld.so
- */
-#define LDSO_VERSION_NONE	0	/* FreeBSD2.0, 2.0.5 */
-#define LDSO_VERSION_HAS_DLEXIT	1	/* includes dlexit in ld_entry */
-#define LDSO_VERSION_HAS_DLSYM3	2	/* includes 3-argument dlsym */
-#define LDSO_VERSION_HAS_DLADDR	3	/* includes dladdr in ld_entry */
-
-/*
- * Entry points into ld.so - user interface to the run-time linker.
- * Entries are valid for the given version numbers returned by ld.so
- * to crt0.
- */
-struct ld_entry {
-	void	*(*dlopen) __P((const char *, int));	/* NONE */
-	int	(*dlclose) __P((void *));		/* NONE */
-	void	*(*dlsym) __P((void *, const char *));	/* NONE */
-	const char *(*dlerror) __P((void));		/* NONE */
-	void	(*dlexit) __P((void));			/* HAS_DLEXIT */
-	void	*(*dlsym3) __P((void *, const char *, void *)); /* HAS_DLSYM3 */
-	int	 (*dladdr) __P((const void *,
-			        struct dl_info *));	/* HAS_DLADDR */
-};
-
-/*
- * This is the structure pointed at by the __DYNAMIC symbol if an
- * executable requires the attention of the run-time link editor.
- * __DYNAMIC is given the value zero if no run-time linking needs to
- * be done (it is always present in shared objects).
- * The union `d_un' provides for different versions of the dynamic
- * linking mechanism (switched on by `d_version'). The last version
- * used by Sun is 3. We leave some room here and go to version number
- * 8 for NetBSD, the main difference lying in the support for the
- * `nz_list' type of symbols.
- */
-
-struct	_dynamic {
-	int		d_version;	/* version # of this interface */
-	struct so_debug	*d_debug;
-	union {
-		struct section_dispatch_table *d_sdt;
-	} d_un;
-	struct ld_entry *d_entry;	/* XXX */
-};
-
-#define LD_VERSION_SUN		(3)
-#define LD_VERSION_BSD		(8)
-#define LD_VERSION_NZLIST_P(v)	((v) >= 8)
-
-#define LD_GOT(x)	((x)->d_un.d_sdt->sdt_got)
-#define LD_PLT(x)	((x)->d_un.d_sdt->sdt_plt)
-#define LD_REL(x)	((x)->d_un.d_sdt->sdt_rel)
-#define LD_SYMBOL(x)	((x)->d_un.d_sdt->sdt_nzlist)
-#define LD_HASH(x)	((x)->d_un.d_sdt->sdt_hash)
-#define LD_STRINGS(x)	((x)->d_un.d_sdt->sdt_strings)
-#define LD_NEED(x)	((x)->d_un.d_sdt->sdt_sods)
-#define LD_BUCKETS(x)	((x)->d_un.d_sdt->sdt_buckets)
-#define LD_PATHS(x)	((x)->d_un.d_sdt->sdt_paths)
-
-#define LD_GOTSZ(x)	((x)->d_un.d_sdt->sdt_plt - (x)->d_un.d_sdt->sdt_got)
-#define LD_RELSZ(x)	((x)->d_un.d_sdt->sdt_hash - (x)->d_un.d_sdt->sdt_rel)
-#define LD_HASHSZ(x)	((x)->d_un.d_sdt->sdt_nzlist - (x)->d_un.d_sdt->sdt_hash)
-#define LD_STABSZ(x)	((x)->d_un.d_sdt->sdt_strings - (x)->d_un.d_sdt->sdt_nzlist)
-#define LD_PLTSZ(x)	((x)->d_un.d_sdt->sdt_plt_sz)
-#define LD_STRSZ(x)	((x)->d_un.d_sdt->sdt_str_sz)
-#define LD_TEXTSZ(x)	((x)->d_un.d_sdt->sdt_text_sz)
-
-/*
- * Interface to ld.so
- */
-struct crt_ldso {
-	int		crt_ba;		/* Base address of ld.so */
-	int		crt_dzfd;	/* "/dev/zero" file descriptor (SunOS) */
-	int		crt_ldfd;	/* ld.so file descriptor */
-	struct _dynamic	*crt_dp;	/* Main's __DYNAMIC */
-	char		**crt_ep;	/* environment strings */
-	caddr_t		crt_bp;		/* Breakpoint if run from debugger */
-	char		*crt_prog;	/* Program name (v3) */
-	char		*crt_ldso;	/* Link editor name (v4) */
-	struct ld_entry	*crt_ldentry;	/* dl*() access (v4) */
-	char		**crt_argv;	/* argument strings (v5) */
-};
-
-/*
- * Version passed from crt0 to ld.so (1st argument to _rtld()).
- */
-#define CRT_VERSION_SUN		1
-#define CRT_VERSION_BSD_2	2
-#define CRT_VERSION_BSD_3	3
-#define CRT_VERSION_BSD_4	4
-#define CRT_VERSION_BSD_5	5
-
-/*
- * Maximum number of recognized shared object version numbers.
- */
-#define MAXDEWEY	8
-
-/*
- * Header of the hints file.
- */
-struct hints_header {
-	long		hh_magic;
-#define HH_MAGIC	011421044151
-	long		hh_version;	/* Interface version number */
-#define LD_HINTS_VERSION_1	1
-#define LD_HINTS_VERSION_2	2
-	long		hh_hashtab;	/* Location of hash table */
-	long		hh_nbucket;	/* Number of buckets in hashtab */
-	long		hh_strtab;	/* Location of strings */
-	long		hh_strtab_sz;	/* Size of strings */
-	long		hh_ehints;	/* End of hints (max offset in file) */
-	long		hh_dirlist;	/* Colon-separated list of srch dirs */
-};
-
-#define HH_BADMAG(hdr)	((hdr).hh_magic != HH_MAGIC)
-
-/*
- * Hash table element in hints file.
- */
-struct hints_bucket {
-	/* namex and pathx are indices into the string table */
-	int		hi_namex;		/* Library name */
-	int		hi_pathx;		/* Full path */
-	int		hi_dewey[MAXDEWEY];	/* The versions */
-	int		hi_ndewey;		/* Number of version numbers */
-#define hi_major hi_dewey[0]
-#define hi_minor hi_dewey[1]
-	int		hi_next;		/* Next in this bucket */
-};
-
-#define _PATH_LD_HINTS		"/var/run/ld.so.hints"
-
-#endif /* !__ELF__ */
-
-#endif /* _LINK_H_ */
diff --git a/sys/sys/link_elf.h b/sys/sys/link_elf.h
deleted file mode 100644
index 3acb86a3b3d6..000000000000
--- a/sys/sys/link_elf.h
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * Copyright (c) 1993 Paul Kranenburg
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Paul Kranenburg.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-/*
- * RRS section definitions.
- *
- * The layout of some data structures defined in this header file is
- * such that we can provide compatibility with the SunOS 4.x shared
- * library scheme.
- */
-
-#ifndef _LINK_H_
-#define _LINK_H_
-
-#if (defined(FREEBSD_ELF) || defined(__ELF__)) && !defined(FREEBSD_AOUT)
-
-#include <sys/types.h>
-
-struct link_map {
-	caddr_t		l_addr;			/* Base Address of library */
-#ifdef __mips__
-	caddr_t		l_offs;			/* Load Offset of library */
-#endif
-	const char	*l_name;		/* Absolute Path to Library */
-	const void	*l_ld;			/* Pointer to .dynamic in memory */
-	struct link_map	*l_next, *l_prev;	/* linked list of of mapped libs */
-};
-
-struct r_debug {
-	int		r_version;		/* not used */
-	struct link_map *r_map;			/* list of loaded images */
-	void		(*r_brk)(void);		/* pointer to break point */
-	enum {
-	    RT_CONSISTENT,			/* things are stable */
-	    RT_ADD,				/* adding a shared library */
-	    RT_DELETE				/* removing a shared library */
-	}		r_state;
-};
-
-#else /* !__ELF__ */
-
-struct dl_info;
-
-/*
- * A `Shared Object Descriptor' describes a shared object that is needed
- * to complete the link edit process of the object containing it.
- * A list of such objects (chained through `sod_next') is pointed at
- * by `sdt_sods' in the section_dispatch_table structure.
- */
-
-struct sod {	/* Shared Object Descriptor */
-	long	sod_name;		/* name (relative to load address) */
-	u_int	sod_library  : 1,	/* Searched for by library rules */
-		sod_reserved : 31;
-	short	sod_major;		/* major version number */
-	short	sod_minor;		/* minor version number */
-	long	sod_next;		/* next sod */
-};
-
-/*
- * `Shared Object Map's are used by the run-time link editor (ld.so) to
- * keep track of all shared objects loaded into a process' address space.
- * These structures are only used at run-time and do not occur within
- * the text or data segment of an executable or shared library.
- */
-struct so_map {		/* Shared Object Map */
-	caddr_t		som_addr;	/* Address at which object mapped */
-	char 		*som_path;	/* Path to mmap'ed file */
-	struct so_map	*som_next;	/* Next map in chain */
-	struct sod	*som_sod;	/* Sod responsible for this map */
-	caddr_t		som_sodbase;	/* Base address of this sod */
-	u_int		som_write : 1;	/* Text is currently writable */
-	struct _dynamic	*som_dynamic;	/* _dynamic structure */
-	caddr_t		som_spd;	/* Private data */
-};
-
-/*
- * Symbol description with size. This is simply an `nlist' with
- * one field (nz_size) added.
- * Used to convey size information on items in the data segment
- * of shared objects. An array of these live in the shared object's
- * text segment and is addressed by the `sdt_nzlist' field.
- */
-struct nzlist {
-	struct nlist	nlist;
-	u_long		nz_size;
-};
-
-#define nz_un		nlist.n_un
-#define nz_strx		nlist.n_un.n_strx
-#define nz_name		nlist.n_un.n_name
-#define nz_type		nlist.n_type
-#define nz_value	nlist.n_value
-#define nz_desc		nlist.n_desc
-#define nz_other	nlist.n_other
-
-/*
- * The `section_dispatch_table' structure contains offsets to various data
- * structures needed to do run-time relocation.
- */
-struct section_dispatch_table {
-	struct so_map *sdt_loaded;	/* List of loaded objects */
-	long	sdt_sods;		/* List of shared objects descriptors */
-	long	sdt_paths;		/* Library search paths */
-	long	sdt_got;		/* Global offset table */
-	long	sdt_plt;		/* Procedure linkage table */
-	long	sdt_rel;		/* Relocation table */
-	long	sdt_hash;		/* Symbol hash table */
-	long	sdt_nzlist;		/* Symbol table itself */
-	long	sdt_filler2;		/* Unused (was: stab_hash) */
-	long	sdt_buckets;		/* Number of hash buckets */
-	long	sdt_strings;		/* Symbol strings */
-	long	sdt_str_sz;		/* Size of symbol strings */
-	long	sdt_text_sz;		/* Size of text area */
-	long	sdt_plt_sz;		/* Size of procedure linkage table */
-};
-
-/*
- * RRS symbol hash table, addressed by `sdt_hash' in section_dispatch_table.
- * Used to quickly lookup symbols of the shared object by hashing
- * on the symbol's name. `rh_symbolnum' is the index of the symbol
- * in the shared object's symbol list (`sdt_nzlist'), `rh_next' is
- * the next symbol in the hash bucket (in case of collisions).
- */
-struct rrs_hash {
-	int	rh_symbolnum;		/* Symbol number */
-	int	rh_next;		/* Next hash entry */
-};
-
-/*
- * `rt_symbols' is used to keep track of run-time allocated commons
- * and data items copied from shared objects.
- */
-struct rt_symbol {
-	struct nzlist		*rt_sp;		/* The symbol */
-	struct rt_symbol	*rt_next;	/* Next in linear list */
-	struct rt_symbol	*rt_link;	/* Next in bucket */
-	caddr_t			rt_srcaddr;	/* Address of "master" copy */
-	struct so_map		*rt_smp;	/* Originating map */
-};
-
-/*
- * Debugger interface structure.
- */
-struct so_debug {
-	int	dd_version;		/* Version # of interface */
-	int	dd_in_debugger;		/* Set when run by debugger */
-	int	dd_sym_loaded;		/* Run-time linking brought more
-					   symbols into scope */
-	char   	 *dd_bpt_addr;		/* Address of rtld-generated bpt */
-	int	dd_bpt_shadow;		/* Original contents of bpt */
-	struct rt_symbol *dd_cc;	/* Allocated commons/copied data */
-};
-
-/*
- * Version returned to crt0 from ld.so
- */
-#define LDSO_VERSION_NONE	0	/* FreeBSD2.0, 2.0.5 */
-#define LDSO_VERSION_HAS_DLEXIT	1	/* includes dlexit in ld_entry */
-#define LDSO_VERSION_HAS_DLSYM3	2	/* includes 3-argument dlsym */
-#define LDSO_VERSION_HAS_DLADDR	3	/* includes dladdr in ld_entry */
-
-/*
- * Entry points into ld.so - user interface to the run-time linker.
- * Entries are valid for the given version numbers returned by ld.so
- * to crt0.
- */
-struct ld_entry {
-	void	*(*dlopen) __P((const char *, int));	/* NONE */
-	int	(*dlclose) __P((void *));		/* NONE */
-	void	*(*dlsym) __P((void *, const char *));	/* NONE */
-	const char *(*dlerror) __P((void));		/* NONE */
-	void	(*dlexit) __P((void));			/* HAS_DLEXIT */
-	void	*(*dlsym3) __P((void *, const char *, void *)); /* HAS_DLSYM3 */
-	int	 (*dladdr) __P((const void *,
-			        struct dl_info *));	/* HAS_DLADDR */
-};
-
-/*
- * This is the structure pointed at by the __DYNAMIC symbol if an
- * executable requires the attention of the run-time link editor.
- * __DYNAMIC is given the value zero if no run-time linking needs to
- * be done (it is always present in shared objects).
- * The union `d_un' provides for different versions of the dynamic
- * linking mechanism (switched on by `d_version'). The last version
- * used by Sun is 3. We leave some room here and go to version number
- * 8 for NetBSD, the main difference lying in the support for the
- * `nz_list' type of symbols.
- */
-
-struct	_dynamic {
-	int		d_version;	/* version # of this interface */
-	struct so_debug	*d_debug;
-	union {
-		struct section_dispatch_table *d_sdt;
-	} d_un;
-	struct ld_entry *d_entry;	/* XXX */
-};
-
-#define LD_VERSION_SUN		(3)
-#define LD_VERSION_BSD		(8)
-#define LD_VERSION_NZLIST_P(v)	((v) >= 8)
-
-#define LD_GOT(x)	((x)->d_un.d_sdt->sdt_got)
-#define LD_PLT(x)	((x)->d_un.d_sdt->sdt_plt)
-#define LD_REL(x)	((x)->d_un.d_sdt->sdt_rel)
-#define LD_SYMBOL(x)	((x)->d_un.d_sdt->sdt_nzlist)
-#define LD_HASH(x)	((x)->d_un.d_sdt->sdt_hash)
-#define LD_STRINGS(x)	((x)->d_un.d_sdt->sdt_strings)
-#define LD_NEED(x)	((x)->d_un.d_sdt->sdt_sods)
-#define LD_BUCKETS(x)	((x)->d_un.d_sdt->sdt_buckets)
-#define LD_PATHS(x)	((x)->d_un.d_sdt->sdt_paths)
-
-#define LD_GOTSZ(x)	((x)->d_un.d_sdt->sdt_plt - (x)->d_un.d_sdt->sdt_got)
-#define LD_RELSZ(x)	((x)->d_un.d_sdt->sdt_hash - (x)->d_un.d_sdt->sdt_rel)
-#define LD_HASHSZ(x)	((x)->d_un.d_sdt->sdt_nzlist - (x)->d_un.d_sdt->sdt_hash)
-#define LD_STABSZ(x)	((x)->d_un.d_sdt->sdt_strings - (x)->d_un.d_sdt->sdt_nzlist)
-#define LD_PLTSZ(x)	((x)->d_un.d_sdt->sdt_plt_sz)
-#define LD_STRSZ(x)	((x)->d_un.d_sdt->sdt_str_sz)
-#define LD_TEXTSZ(x)	((x)->d_un.d_sdt->sdt_text_sz)
-
-/*
- * Interface to ld.so
- */
-struct crt_ldso {
-	int		crt_ba;		/* Base address of ld.so */
-	int		crt_dzfd;	/* "/dev/zero" file descriptor (SunOS) */
-	int		crt_ldfd;	/* ld.so file descriptor */
-	struct _dynamic	*crt_dp;	/* Main's __DYNAMIC */
-	char		**crt_ep;	/* environment strings */
-	caddr_t		crt_bp;		/* Breakpoint if run from debugger */
-	char		*crt_prog;	/* Program name (v3) */
-	char		*crt_ldso;	/* Link editor name (v4) */
-	struct ld_entry	*crt_ldentry;	/* dl*() access (v4) */
-	char		**crt_argv;	/* argument strings (v5) */
-};
-
-/*
- * Version passed from crt0 to ld.so (1st argument to _rtld()).
- */
-#define CRT_VERSION_SUN		1
-#define CRT_VERSION_BSD_2	2
-#define CRT_VERSION_BSD_3	3
-#define CRT_VERSION_BSD_4	4
-#define CRT_VERSION_BSD_5	5
-
-/*
- * Maximum number of recognized shared object version numbers.
- */
-#define MAXDEWEY	8
-
-/*
- * Header of the hints file.
- */
-struct hints_header {
-	long		hh_magic;
-#define HH_MAGIC	011421044151
-	long		hh_version;	/* Interface version number */
-#define LD_HINTS_VERSION_1	1
-#define LD_HINTS_VERSION_2	2
-	long		hh_hashtab;	/* Location of hash table */
-	long		hh_nbucket;	/* Number of buckets in hashtab */
-	long		hh_strtab;	/* Location of strings */
-	long		hh_strtab_sz;	/* Size of strings */
-	long		hh_ehints;	/* End of hints (max offset in file) */
-	long		hh_dirlist;	/* Colon-separated list of srch dirs */
-};
-
-#define HH_BADMAG(hdr)	((hdr).hh_magic != HH_MAGIC)
-
-/*
- * Hash table element in hints file.
- */
-struct hints_bucket {
-	/* namex and pathx are indices into the string table */
-	int		hi_namex;		/* Library name */
-	int		hi_pathx;		/* Full path */
-	int		hi_dewey[MAXDEWEY];	/* The versions */
-	int		hi_ndewey;		/* Number of version numbers */
-#define hi_major hi_dewey[0]
-#define hi_minor hi_dewey[1]
-	int		hi_next;		/* Next in this bucket */
-};
-
-#define _PATH_LD_HINTS		"/var/run/ld.so.hints"
-
-#endif /* !__ELF__ */
-
-#endif /* _LINK_H_ */
diff --git a/sys/sys/linker.h b/sys/sys/linker.h
index 355b08eb98a8..ced17d821055 100644
--- a/sys/sys/linker.h
+++ b/sys/sys/linker.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/linker.h,v 1.11.2.2 1999/11/28 14:46:45 peter Exp $
  */
 
 #ifndef _SYS_LINKER_H_
diff --git a/sys/sys/linker_set.h b/sys/sys/linker_set.h
index c48b061ed778..285951233fa9 100644
--- a/sys/sys/linker_set.h
+++ b/sys/sys/linker_set.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/linker_set.h,v 1.1.2.1 1999/08/29 16:32:29 peter Exp $
  */
 
 #ifndef _SYS_LINKER_SET_H_
diff --git a/sys/sys/lkm.h b/sys/sys/lkm.h
index c827e9071421..d9ac1793d16c 100644
--- a/sys/sys/lkm.h
+++ b/sys/sys/lkm.h
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/lkm.h,v 1.18.2.1 1999/08/29 16:32:29 peter Exp $
  */
 
 #ifndef _SYS_LKM_H_
diff --git a/sys/sys/lock.h b/sys/sys/lock.h
index 52168ec67cd7..e379e4187f61 100644
--- a/sys/sys/lock.h
+++ b/sys/sys/lock.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lock.h	8.12 (Berkeley) 5/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/lock.h,v 1.13.2.1 1999/08/29 16:32:30 peter Exp $
  */
 
 #ifndef	_LOCK_H_
diff --git a/sys/sys/lockf.h b/sys/sys/lockf.h
index 17980f6a1bbd..e30aab12cb0b 100644
--- a/sys/sys/lockf.h
+++ b/sys/sys/lockf.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lockf.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/lockf.h,v 1.9.2.1 1999/08/29 16:32:30 peter Exp $
  */
 
 #ifndef _SYS_LOCKF_H_
diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h
index 5196a0a9cd6a..733a19ef3aff 100644
--- a/sys/sys/malloc.h
+++ b/sys/sys/malloc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)malloc.h	8.5 (Berkeley) 5/3/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/malloc.h,v 1.38.2.1 1999/08/29 16:32:31 peter Exp $
  */
 
 #ifndef _SYS_MALLOC_H_
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index c48f513b76ef..aa37353072b0 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mbuf.h	8.5 (Berkeley) 2/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/mbuf.h,v 1.31.2.3 1999/12/03 07:49:37 julian Exp $
  */
 
 #ifndef _SYS_MBUF_H_
diff --git a/sys/sys/md5.h b/sys/sys/md5.h
index a69f79099560..4b927eae1cc5 100644
--- a/sys/sys/md5.h
+++ b/sys/sys/md5.h
@@ -1,5 +1,5 @@
 /* MD5.H - header file for MD5C.C
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/md5.h,v 1.11.2.1 1999/08/29 16:32:32 peter Exp $
  */
 
 /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
diff --git a/sys/sys/mman.h b/sys/sys/mman.h
index d5257ea69536..649b04c4cd31 100644
--- a/sys/sys/mman.h
+++ b/sys/sys/mman.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mman.h	8.2 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/mman.h,v 1.24.2.2 1999/08/29 16:32:32 peter Exp $
  */
 
 #ifndef _SYS_MMAN_H_
diff --git a/sys/sys/module.h b/sys/sys/module.h
index cd220a132eab..b0e4da1bc7ef 100644
--- a/sys/sys/module.h
+++ b/sys/sys/module.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/module.h,v 1.6.2.1 1999/08/29 16:32:32 peter Exp $
  */
 
 #ifndef _SYS_MODULE_H_
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 712635b888de..b21e15012926 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mount.h	8.21 (Berkeley) 5/20/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/mount.h,v 1.73.2.2 1999/11/22 07:08:11 julian Exp $
  */
 
 #ifndef _SYS_MOUNT_H_
diff --git a/sys/sys/msg.h b/sys/sys/msg.h
index 3dd70f1bc89d..113ec4e3b563 100644
--- a/sys/sys/msg.h
+++ b/sys/sys/msg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/sys/msg.h,v 1.8.4.1 1999/08/29 16:32:34 peter Exp $ */
 /*	$NetBSD: msg.h,v 1.4 1994/06/29 06:44:43 cgd Exp $	*/
 
 /*
diff --git a/sys/sys/msgbuf.h b/sys/sys/msgbuf.h
index aa7df03e7915..746504210799 100644
--- a/sys/sys/msgbuf.h
+++ b/sys/sys/msgbuf.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)msgbuf.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/msgbuf.h,v 1.11.2.1 1999/08/29 16:32:34 peter Exp $
  */
 
 #ifndef _SYS_MSGBUF_H_
diff --git a/sys/sys/mtio.h b/sys/sys/mtio.h
index 30b8b993819e..ded6f84eda9c 100644
--- a/sys/sys/mtio.h
+++ b/sys/sys/mtio.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mtio.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/mtio.h,v 1.15.2.3 1999/08/29 16:32:34 peter Exp $
  */
 
 #ifndef	_SYS_MTIO_H_
diff --git a/sys/sys/namei.h b/sys/sys/namei.h
index c4611d9c3fc4..c55f22230e01 100644
--- a/sys/sys/namei.h
+++ b/sys/sys/namei.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)namei.h	8.5 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/namei.h,v 1.21.2.1 1999/08/29 16:32:35 peter Exp $
  */
 
 #ifndef _SYS_NAMEI_H_
diff --git a/sys/sys/nlist_aout.h b/sys/sys/nlist_aout.h
deleted file mode 100644
index 560563abf1a1..000000000000
--- a/sys/sys/nlist_aout.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)nlist.h	8.2 (Berkeley) 1/21/94
- *
- * $FreeBSD$
- */
-
-#ifndef _NLIST_H_
-#define	_NLIST_H_
-
-/*
- * Symbol table entries in a.out files.
- */
-
-/*
- * Layout of each symbol.  The "#ifdef _AOUT_INCLUDE_" is so that
- * programs including nlist.h can initialize nlist structures
- * statically.
- */
-struct nlist {
-#ifdef _AOUT_INCLUDE_
-	union {
-		char *n_name;	/* symbol name (in memory) */
-		long n_strx;	/* file string table offset (on disk) */
-	} n_un;
-#else
-	char *n_name;		/* symbol name (in memory) */
-#endif
-	unsigned char n_type;	/* type defines */
-	char n_other;		/* ".type" and binding information */
-	short n_desc;		/* used by stab entries */
-	unsigned long n_value;	/* address/value of the symbol */
-};
-
-#define	n_hash	n_desc		/* used internally by ld(1); XXX */
-
-/*
- * Defines for n_type.
- */
-#define	N_UNDF	0x00		/* undefined */
-#define	N_ABS	0x02		/* absolute address */
-#define	N_TEXT	0x04		/* text segment */
-#define	N_DATA	0x06		/* data segment */
-#define	N_BSS	0x08		/* bss segment */
-#define	N_INDR	0x0a		/* alias definition */
-#define	N_SIZE	0x0c		/* pseudo type, defines a symbol's size */
-#define	N_COMM	0x12		/* common reference */
-/* GNU extensions */
-#define N_SETA	0x14		/* Absolute set element symbol */
-#define N_SETT  0x16		/* Text set element symbol */
-#define N_SETD  0x18		/* Data set element symbol */
-#define N_SETB  0x1a		/* Bss set element symbol */
-#define N_SETV  0x1c		/* Pointer to set vector in data area. */
-/* end GNU extensions */
-#define	N_FN	0x1e		/* file name (N_EXT on) */
-#define	N_WARN	0x1e		/* warning message (N_EXT off) */
-
-#define	N_EXT	0x01		/* external (global) bit, OR'ed in */
-#define	N_TYPE	0x1e		/* mask for all the type bits */
-#define	N_STAB	0xe0		/* mask for debugger symbols -- stab(5) */
-
-/*
- * Defines for n_other.  It contains the ".type" (AUX) field in the least
- * significant 4 bits, and the binding (for weak symbols) in the most
- * significant 4 bits.
- */
-#define N_AUX(p)	((p)->n_other & 0xf)
-#define N_BIND(p)	(((unsigned int)(p)->n_other >> 4) & 0xf)
-#define N_OTHER(r, v)	(((unsigned int)(r) << 4) | ((v) & 0xf))
-
-#define AUX_OBJECT	1	/* data object */
-#define AUX_FUNC	2	/* function */
-
-/*#define BIND_LOCAL	0	not used */
-/*#define BIND_GLOBAL	1	not used */
-#define BIND_WEAK	2	/* weak binding */
-
-#define	N_FORMAT	"%08x"	/* namelist value format; XXX */
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int nlist __P((const char *, struct nlist *));
-__END_DECLS
-
-#endif /* !_NLIST_H_ */
diff --git a/sys/sys/param.h b/sys/sys/param.h
index e75ec03156d9..bf3d2f23725b 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.3 (Berkeley) 4/4/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/param.h,v 1.38.2.11 1999/12/05 20:57:55 obrien Exp $
  */
 
 #ifndef _SYS_PARAM_H_
diff --git a/sys/sys/pioctl.h b/sys/sys/pioctl.h
index b43a47ff5bff..94205e436750 100644
--- a/sys/sys/pioctl.h
+++ b/sys/sys/pioctl.h
@@ -33,7 +33,7 @@
 /*
  * procfs ioctl definitions.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/pioctl.h,v 1.7.2.1 1999/08/29 16:32:35 peter Exp $
  */
 
 #ifndef _SYS_PIOCTL_H
diff --git a/sys/sys/pipe.h b/sys/sys/pipe.h
index e95f45534537..3355a9356b0d 100644
--- a/sys/sys/pipe.h
+++ b/sys/sys/pipe.h
@@ -18,7 +18,7 @@
  * 5. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/pipe.h,v 1.12.2.1 1999/08/29 16:32:36 peter Exp $
  */
 
 #ifndef _SYS_PIPE_H_
diff --git a/sys/sys/poll.h b/sys/sys/poll.h
index 7620a39bd512..4c904e36ab85 100644
--- a/sys/sys/poll.h
+++ b/sys/sys/poll.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/poll.h,v 1.4.2.1 1999/08/29 16:32:36 peter Exp $
  */
 
 #ifndef _SYS_POLL_H_
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index bdedc2e13c4c..f986672ae95d 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)proc.h	8.15 (Berkeley) 5/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/proc.h,v 1.66.2.5 1999/08/29 16:32:36 peter Exp $
  */
 
 #ifndef _SYS_PROC_H_
diff --git a/sys/sys/procfs.h b/sys/sys/procfs.h
index 04f0e1c71a80..eb462d7be86f 100644
--- a/sys/sys/procfs.h
+++ b/sys/sys/procfs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/procfs.h,v 1.1.2.1 1999/08/29 16:32:37 peter Exp $
  */
 
 #ifndef _SYS_PROCFS_H_
diff --git a/sys/sys/protosw.h b/sys/sys/protosw.h
index 15f6e13aef55..d765ab880dac 100644
--- a/sys/sys/protosw.h
+++ b/sys/sys/protosw.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)protosw.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/protosw.h,v 1.26.2.1 1999/08/29 16:32:37 peter Exp $
  */
 
 #ifndef _SYS_PROTOSW_H_
diff --git a/sys/sys/ptio.h b/sys/sys/ptio.h
index 1292280528d3..90105b7bce84 100644
--- a/sys/sys/ptio.h
+++ b/sys/sys/ptio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ptio.h,v 1.2.2.2 1999/08/29 16:32:38 peter Exp $
  */
 
 #ifndef _SYS_PTIO_H_
diff --git a/sys/sys/ptrace.h b/sys/sys/ptrace.h
index f7f77edeec81..37f3d8ef7475 100644
--- a/sys/sys/ptrace.h
+++ b/sys/sys/ptrace.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ptrace.h,v 1.8.2.1 1999/08/29 16:32:38 peter Exp $
  */
 
 #ifndef	_SYS_PTRACE_H_
diff --git a/sys/sys/queue.h b/sys/sys/queue.h
index be4c8b7e7b54..87a9614a3b8b 100644
--- a/sys/sys/queue.h
+++ b/sys/sys/queue.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)queue.h	8.5 (Berkeley) 8/20/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/queue.h,v 1.24.2.2 1999/12/17 01:34:30 jkh Exp $
  */
 
 #ifndef _SYS_QUEUE_H_
diff --git a/sys/sys/reboot.h b/sys/sys/reboot.h
index d0c4210515eb..ca89691b21d6 100644
--- a/sys/sys/reboot.h
+++ b/sys/sys/reboot.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)reboot.h	8.3 (Berkeley) 12/13/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/reboot.h,v 1.17.2.1 1999/08/29 16:32:39 peter Exp $
  */
 
 #ifndef _SYS_REBOOT_H_
diff --git a/sys/sys/resource.h b/sys/sys/resource.h
index 0e3c710d509c..2fbae5a76d73 100644
--- a/sys/sys/resource.h
+++ b/sys/sys/resource.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)resource.h	8.4 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/resource.h,v 1.8.2.1 1999/08/29 16:32:39 peter Exp $
  */
 
 #ifndef _SYS_RESOURCE_H_
diff --git a/sys/sys/resourcevar.h b/sys/sys/resourcevar.h
index bb9f1f45101a..be13a79e57c2 100644
--- a/sys/sys/resourcevar.h
+++ b/sys/sys/resourcevar.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)resourcevar.h	8.4 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/resourcevar.h,v 1.12.2.1 1999/08/29 16:32:40 peter Exp $
  */
 
 #ifndef	_SYS_RESOURCEVAR_H_
diff --git a/sys/sys/rlist.h b/sys/sys/rlist.h
index b8f16e1fd089..e51f12d797a9 100644
--- a/sys/sys/rlist.h
+++ b/sys/sys/rlist.h
@@ -16,7 +16,7 @@
  *		rlist_alloc(&swapmap, 100, &loc); obtain 100 sectors from swap
  *
  *	from: unknown?
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/rlist.h,v 1.11.4.1 1999/08/29 16:32:40 peter Exp $
  */
 
 #ifndef _SYS_RLIST_H_
diff --git a/sys/sys/rman.h b/sys/sys/rman.h
index 45c17170e958..db8721c96995 100644
--- a/sys/sys/rman.h
+++ b/sys/sys/rman.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/rman.h,v 1.1.2.1 1999/08/29 16:32:41 peter Exp $
  */
 
 #ifndef _SYS_RMAN_H_
diff --git a/sys/sys/rtprio.h b/sys/sys/rtprio.h
index 5d115f5693db..f4b484e50618 100644
--- a/sys/sys/rtprio.h
+++ b/sys/sys/rtprio.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/rtprio.h,v 1.7.2.1 1999/08/29 16:32:41 peter Exp $
  */
 
 #ifndef _SYS_RTPRIO_H_
diff --git a/sys/sys/scsiio.h b/sys/sys/scsiio.h
index b49c8d6707da..e57858c7530f 100644
--- a/sys/sys/scsiio.h
+++ b/sys/sys/scsiio.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/scsiio.h,v 1.10.2.1 1999/08/29 16:32:41 peter Exp $
  */
 #ifndef	_SYS_SCSIIO_H_
 #define	_SYS_SCSIIO_H_
diff --git a/sys/sys/select.h b/sys/sys/select.h
index 89e7f9adcbbc..8e08b453506d 100644
--- a/sys/sys/select.h
+++ b/sys/sys/select.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)select.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/select.h,v 1.4.4.1 1999/08/29 16:32:42 peter Exp $
  */
 
 #ifndef _SYS_SELECT_H_
diff --git a/sys/sys/sem.h b/sys/sys/sem.h
index 798f5bb7d124..15f46b4b2c0e 100644
--- a/sys/sys/sem.h
+++ b/sys/sys/sem.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/sys/sem.h,v 1.18.2.1 1999/08/29 16:32:42 peter Exp $ */
 /*	$NetBSD: sem.h,v 1.5 1994/06/29 06:45:15 cgd Exp $	*/
 
 /*
diff --git a/sys/sys/shm.h b/sys/sys/shm.h
index a792f561b116..6566435c8609 100644
--- a/sys/sys/shm.h
+++ b/sys/sys/shm.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/sys/shm.h,v 1.12.2.1 1999/08/29 16:32:43 peter Exp $ */
 /*	$NetBSD: shm.h,v 1.15 1994/06/29 06:45:17 cgd Exp $	*/
 
 /*
diff --git a/sys/sys/signal.h b/sys/sys/signal.h
index 301a3a46fa5b..841c167ff890 100644
--- a/sys/sys/signal.h
+++ b/sys/sys/signal.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.4 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/signal.h,v 1.14.2.1 1999/08/29 16:32:43 peter Exp $
  */
 
 #ifndef	_SYS_SIGNAL_H_
diff --git a/sys/sys/signalvar.h b/sys/sys/signalvar.h
index cf23426ab8c6..b82476d4598b 100644
--- a/sys/sys/signalvar.h
+++ b/sys/sys/signalvar.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signalvar.h	8.6 (Berkeley) 2/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/signalvar.h,v 1.22.2.3 1999/09/01 06:12:12 sef Exp $
  */
 
 #ifndef	_SYS_SIGNALVAR_H_		/* tmp for user.h */
diff --git a/sys/sys/sliceio.h b/sys/sys/sliceio.h
index e93eb3bbcaae..a47645a382a1 100644
--- a/sys/sys/sliceio.h
+++ b/sys/sys/sliceio.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/sliceio.h,v 1.2.2.1 1999/08/29 16:32:44 peter Exp $
  */
 
 #ifndef	_SYS_SLICEIO_H_
diff --git a/sys/sys/socket.h b/sys/sys/socket.h
index c78a9ef15a6a..d18436b2a626 100644
--- a/sys/sys/socket.h
+++ b/sys/sys/socket.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)socket.h	8.4 (Berkeley) 2/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/socket.h,v 1.27.2.2 1999/11/22 07:08:12 julian Exp $
  */
 
 #ifndef _SYS_SOCKET_H_
diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h
index 1c16737a2a99..da2e4c67b48a 100644
--- a/sys/sys/socketvar.h
+++ b/sys/sys/socketvar.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)socketvar.h	8.3 (Berkeley) 2/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/socketvar.h,v 1.32.2.3 1999/08/29 16:32:45 peter Exp $
  */
 
 #ifndef _SYS_SOCKETVAR_H_
diff --git a/sys/sys/sockio.h b/sys/sys/sockio.h
index 372d7e996178..3b9842bb5778 100644
--- a/sys/sys/sockio.h
+++ b/sys/sys/sockio.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sockio.h	8.1 (Berkeley) 3/28/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/sockio.h,v 1.11.2.1 1999/08/29 16:32:45 peter Exp $
  */
 
 #ifndef	_SYS_SOCKIO_H_
diff --git a/sys/sys/stat.h b/sys/sys/stat.h
index 3d5909e3242b..c873d96f30e7 100644
--- a/sys/sys/stat.h
+++ b/sys/sys/stat.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stat.h	8.12 (Berkeley) 6/16/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/stat.h,v 1.15.2.1 1999/08/29 16:32:46 peter Exp $
  */
 
 #ifndef _SYS_STAT_H_
diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h
index 1c84d58bc732..bcff06ae6e2a 100644
--- a/sys/sys/sysctl.h
+++ b/sys/sys/sysctl.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sysctl.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/sysctl.h,v 1.70.2.1 1999/08/29 16:32:46 peter Exp $
  */
 
 #ifndef _SYS_SYSCTL_H_
diff --git a/sys/sys/sysent.h b/sys/sys/sysent.h
index e593f38e037c..2e52bcb61186 100644
--- a/sys/sys/sysent.h
+++ b/sys/sys/sysent.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/sysent.h,v 1.20.2.2 1999/09/01 06:12:12 sef Exp $
  */
 
 #ifndef _SYS_SYSENT_H_
diff --git a/sys/sys/syslimits.h b/sys/sys/syslimits.h
index 634db8f3b3c2..1ecd63a462bf 100644
--- a/sys/sys/syslimits.h
+++ b/sys/sys/syslimits.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)syslimits.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/syslimits.h,v 1.8.4.1 1999/08/29 16:32:47 peter Exp $
  */
 
 #ifndef _SYS_SYSLIMITS_H_
diff --git a/sys/sys/syslog.h b/sys/sys/syslog.h
index 1f56548942c3..93a9d5a02400 100644
--- a/sys/sys/syslog.h
+++ b/sys/sys/syslog.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)syslog.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/syslog.h,v 1.16.2.1 1999/08/29 16:32:47 peter Exp $
  */
 
 #ifndef _SYS_SYSLOG_H_
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 3900416e49c3..cb34e0092df7 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)systm.h	8.7 (Berkeley) 3/29/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/systm.h,v 1.84.2.4 1999/12/06 21:03:31 archie Exp $
  */
 
 #ifndef _SYS_SYSTM_H_
diff --git a/sys/sys/tablet.h b/sys/sys/tablet.h
index 5caa181af9f1..e7c20b28b2d2 100644
--- a/sys/sys/tablet.h
+++ b/sys/sys/tablet.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tablet.h	8.4 (Berkeley) 7/10/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/tablet.h,v 1.7.4.1 1999/08/29 16:32:49 peter Exp $
  */
 
 #ifndef	_SYS_TABLET_H_
diff --git a/sys/sys/termios.h b/sys/sys/termios.h
index 72f4b9e060cf..ce9bb491b339 100644
--- a/sys/sys/termios.h
+++ b/sys/sys/termios.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)termios.h	8.3 (Berkeley) 3/28/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/termios.h,v 1.11.2.1 1999/08/29 16:32:50 peter Exp $
  */
 
 #ifndef _SYS_TERMIOS_H_
diff --git a/sys/sys/time.h b/sys/sys/time.h
index 77aedaeade15..fb70f4b3735b 100644
--- a/sys/sys/time.h
+++ b/sys/sys/time.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)time.h	8.5 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/time.h,v 1.35.2.3 1999/08/29 16:32:50 peter Exp $
  */
 
 #ifndef _SYS_TIME_H_
diff --git a/sys/sys/timeb.h b/sys/sys/timeb.h
index 40aba11ae6b4..2f8a742a33bc 100644
--- a/sys/sys/timeb.h
+++ b/sys/sys/timeb.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)timeb.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/timeb.h,v 1.5.4.1 1999/08/29 16:32:50 peter Exp $
  */
 
 #ifndef _SYS_TIMEB_H_
diff --git a/sys/sys/timepps.h b/sys/sys/timepps.h
index a1a80b7cb740..d9bbd2ed3827 100644
--- a/sys/sys/timepps.h
+++ b/sys/sys/timepps.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/timepps.h,v 1.4.2.4 1999/10/16 14:45:44 jhay Exp $
  *
  * The is a FreeBSD protype version of the "draft-mogul-pps-api-05.txt" 
  * specification for Pulse Per Second timing interfaces.  
diff --git a/sys/sys/timers.h b/sys/sys/timers.h
index 043d37670b08..fe1199ab7d9c 100644
--- a/sys/sys/timers.h
+++ b/sys/sys/timers.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/timers.h,v 1.3.4.1 1999/08/29 16:32:51 peter Exp $
  *
  * Description : Basic timers header.
  */
diff --git a/sys/sys/times.h b/sys/sys/times.h
index ba6dee0ed709..3d368e8c2765 100644
--- a/sys/sys/times.h
+++ b/sys/sys/times.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)times.h	8.4 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/times.h,v 1.4.4.1 1999/08/29 16:32:51 peter Exp $
  */
 
 #ifndef	_SYS_TIMES_H_
diff --git a/sys/sys/timex.h b/sys/sys/timex.h
index 639ccca86b43..d592f14a81ba 100644
--- a/sys/sys/timex.h
+++ b/sys/sys/timex.h
@@ -17,7 +17,7 @@
  **********************************************************************/
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/timex.h,v 1.7.2.3 1999/10/10 18:29:51 jhay Exp $
  *
  * Modification history timex.h
  *
diff --git a/sys/sys/tprintf.h b/sys/sys/tprintf.h
index 936fc1bc0ca8..95208dc1a954 100644
--- a/sys/sys/tprintf.h
+++ b/sys/sys/tprintf.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tprintf.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/tprintf.h,v 1.7.2.1 1999/08/29 16:32:52 peter Exp $
  */
 
 #ifndef _SYS_TPRINTF_H_
diff --git a/sys/sys/tty.h b/sys/sys/tty.h
index 7dee17e996e2..51bd18ceae73 100644
--- a/sys/sys/tty.h
+++ b/sys/sys/tty.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty.h	8.6 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/tty.h,v 1.44.2.1 1999/08/29 16:32:52 peter Exp $
  */
 
 #ifndef _SYS_TTY_H_
diff --git a/sys/sys/ttychars.h b/sys/sys/ttychars.h
index d9b59b7f01e9..9201b487279c 100644
--- a/sys/sys/ttychars.h
+++ b/sys/sys/ttychars.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttychars.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ttychars.h,v 1.6.4.1 1999/08/29 16:32:52 peter Exp $
  */
 
 #ifndef _SYS_TTYCHARS_H_
diff --git a/sys/sys/ttycom.h b/sys/sys/ttycom.h
index 502b4e768e3f..4e9dbadfa9ea 100644
--- a/sys/sys/ttycom.h
+++ b/sys/sys/ttycom.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttycom.h	8.1 (Berkeley) 3/28/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ttycom.h,v 1.13.2.2 1999/11/17 18:37:45 julian Exp $
  */
 
 #ifndef	_SYS_TTYCOM_H_
diff --git a/sys/sys/ttydefaults.h b/sys/sys/ttydefaults.h
index 6d23e3bdd074..31990352e471 100644
--- a/sys/sys/ttydefaults.h
+++ b/sys/sys/ttydefaults.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttydefaults.h	8.4 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ttydefaults.h,v 1.12.2.1 1999/08/29 16:32:53 peter Exp $
  */
 
 /*
diff --git a/sys/sys/ttydev.h b/sys/sys/ttydev.h
index 739ec477c619..c245f816f9e4 100644
--- a/sys/sys/ttydev.h
+++ b/sys/sys/ttydev.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttydev.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ttydev.h,v 1.6.4.1 1999/08/29 16:32:53 peter Exp $
  */
 
 /* COMPATIBILITY HEADER FILE */
diff --git a/sys/sys/types.h b/sys/sys/types.h
index 8424c8e3b368..3adedc922085 100644
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)types.h	8.6 (Berkeley) 2/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/types.h,v 1.26.2.1 1999/08/29 16:32:54 peter Exp $
  */
 
 #ifndef _SYS_TYPES_H_
diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h
index 8199d1c6036b..00360b73d8bb 100644
--- a/sys/sys/ucred.h
+++ b/sys/sys/ucred.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ucred.h	8.4 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ucred.h,v 1.8.4.1 1999/08/29 16:32:54 peter Exp $
  */
 
 #ifndef _SYS_UCRED_H_
diff --git a/sys/sys/uio.h b/sys/sys/uio.h
index e55b84055563..99d9ea70d87e 100644
--- a/sys/sys/uio.h
+++ b/sys/sys/uio.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uio.h	8.5 (Berkeley) 2/22/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/uio.h,v 1.9.2.1 1999/08/29 16:32:55 peter Exp $
  */
 
 #ifndef _SYS_UIO_H_
diff --git a/sys/sys/un.h b/sys/sys/un.h
index a99ba68d9a14..ee9cbf4572f2 100644
--- a/sys/sys/un.h
+++ b/sys/sys/un.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)un.h	8.3 (Berkeley) 2/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/un.h,v 1.15.2.1 1999/08/29 16:32:55 peter Exp $
  */
 
 #ifndef _SYS_UN_H_
diff --git a/sys/sys/unistd.h b/sys/sys/unistd.h
index 7503cddf2574..633c6e14c7ac 100644
--- a/sys/sys/unistd.h
+++ b/sys/sys/unistd.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)unistd.h	8.2 (Berkeley) 1/7/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/unistd.h,v 1.19.2.1 1999/08/29 16:32:55 peter Exp $
  */
 
 #ifndef _SYS_UNISTD_H_
diff --git a/sys/sys/unpcb.h b/sys/sys/unpcb.h
index 874f2b06f5ff..f1c2b3026faf 100644
--- a/sys/sys/unpcb.h
+++ b/sys/sys/unpcb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)unpcb.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/unpcb.h,v 1.7.2.1 1999/08/29 16:32:56 peter Exp $
  */
 
 #ifndef _SYS_UNPCB_H_
diff --git a/sys/sys/user.h b/sys/sys/user.h
index 5af5d3ed13c7..8fb06ed4c964 100644
--- a/sys/sys/user.h
+++ b/sys/sys/user.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)user.h	8.2 (Berkeley) 9/23/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/user.h,v 1.19.2.2 1999/08/29 16:32:56 peter Exp $
  */
 
 #ifndef _SYS_USER_H_
diff --git a/sys/sys/utsname.h b/sys/sys/utsname.h
index 375c3d403f36..6c4ef487d9fb 100644
--- a/sys/sys/utsname.h
+++ b/sys/sys/utsname.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)utsname.h	8.1 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/utsname.h,v 1.5.4.1 1999/08/29 16:32:56 peter Exp $
  */
 
 #ifndef	_SYS_UTSNAME_H
diff --git a/sys/sys/vadvise.h b/sys/sys/vadvise.h
index cf179f04c07f..ac8d61a56fc1 100644
--- a/sys/sys/vadvise.h
+++ b/sys/sys/vadvise.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vadvise.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/vadvise.h,v 1.5.4.1 1999/08/29 16:32:57 peter Exp $
  */
 
 #ifndef _SYS_VADVISE_H_
diff --git a/sys/sys/vcmd.h b/sys/sys/vcmd.h
index 837255cf6dd4..9e5dac1458b5 100644
--- a/sys/sys/vcmd.h
+++ b/sys/sys/vcmd.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vcmd.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/vcmd.h,v 1.6.4.1 1999/08/29 16:32:57 peter Exp $
  */
 
 #ifndef	_SYS_VCMD_H_
diff --git a/sys/sys/vlimit.h b/sys/sys/vlimit.h
index a5a86d7f65b8..b1fbf652fc7d 100644
--- a/sys/sys/vlimit.h
+++ b/sys/sys/vlimit.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vlimit.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/vlimit.h,v 1.6.4.1 1999/08/29 16:32:58 peter Exp $
  */
 
 #ifndef _SYS_VLIMIT_H_
diff --git a/sys/sys/vmmeter.h b/sys/sys/vmmeter.h
index 8fa9b1e3045a..69eb33c5bc58 100644
--- a/sys/sys/vmmeter.h
+++ b/sys/sys/vmmeter.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vmmeter.h	8.2 (Berkeley) 7/10/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/vmmeter.h,v 1.16.2.1 1999/08/29 16:32:58 peter Exp $
  */
 
 #ifndef _SYS_VMMETER_H_
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index dd0f51450ca0..0f11e7e006c0 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vnode.h	8.7 (Berkeley) 2/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/vnode.h,v 1.80.2.3 1999/09/16 02:02:16 alfred Exp $
  */
 
 #ifndef _SYS_VNODE_H_
diff --git a/sys/sys/vsio.h b/sys/sys/vsio.h
index 702e71dce2b3..89312806abc7 100644
--- a/sys/sys/vsio.h
+++ b/sys/sys/vsio.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vsio.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/vsio.h,v 1.6.4.1 1999/08/29 16:32:59 peter Exp $
  */
 
 #ifndef _SYS_VSIO_H_
diff --git a/sys/sys/wait.h b/sys/sys/wait.h
index c854e149d3c6..e2b52ee9746c 100644
--- a/sys/sys/wait.h
+++ b/sys/sys/wait.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)wait.h	8.2 (Berkeley) 7/10/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/wait.h,v 1.8.4.2 1999/08/29 16:33:00 peter Exp $
  */
 
 #ifndef _SYS_WAIT_H_
diff --git a/sys/sys/xrpuio.h b/sys/sys/xrpuio.h
index 70de800d9a4a..21b7d96006b6 100644
--- a/sys/sys/xrpuio.h
+++ b/sys/sys/xrpuio.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/xrpuio.h,v 1.1.2.1 1999/08/29 16:33:00 peter Exp $
  *
  */
 
diff --git a/sys/ufs/ffs/README b/sys/ufs/ffs/README
deleted file mode 100644
index 8a7433b61e9e..000000000000
--- a/sys/ufs/ffs/README
+++ /dev/null
@@ -1,320 +0,0 @@
-Introduction
-
-This package constitutes the alpha distribution of the soft update
-code updates for the fast filesystem.
-
-For More information on what Soft Updates is, see:
-http://www.ece.cmu.edu/~ganger/papers/CSE-TR-254-95/
-
-Status
-
-My `filesystem torture tests' (described below) run for days without
-a hitch (no panic's, hangs, filesystem corruption, or memory leaks).
-However, I have had several panic's reported to me by folks that
-are field testing the code which I have not yet been able to
-reproduce or fix. Although these panic's are rare and do not cause
-filesystem corruption, the code should only be put into production
-on systems where the system administrator is aware that it is being
-run, and knows how to turn it off if problems arise. Thus, you may
-hand out this code to others, but please ensure that this status
-message is included with any distributions. Please also include
-the file ffs_softdep.stub.c in any distributions so that folks that
-cannot abide by the need to redistribute source will not be left
-with a kernel that will not link. It will resolve all the calls
-into the soft update code and simply ignores the request to enable
-them. Thus you will be able to ensure that your other hooks have
-not broken anything and that your kernel is softdep-ready for those
-that wish to use them. Please report problems back to me with
-kernel backtraces of panics if possible. This is massively complex
-code, and people only have to have their filesystems hosed once or
-twice to avoid future changes like the plague. I want to find and
-fix as many bugs as soon as possible so as to get the code rock
-solid before it gets widely released. Please report any bugs that
-you uncover to mckusick@mckusick.com.
-
-Performance
-
-Running the Andrew Benchmarks yields the following raw data:
-
-	Phase	Normal	Softdep	    What it does
-	  1	  3s	  <1s	    Creating directories
-	  2	  8s	   4s	    Copying files
-	  3	  6s	   6s	    Recursive directory stats
-	  4	  8s	   9s	    Scanning each file
-	  5	 25s	  25s	    Compilation
-
-	Normal:  19.9u 29.2s 0:52.8 135+630io
-	Softdep: 20.3u 28.5s 0:47.8 103+363io
-
-Another interesting datapoint are my `filesystem torture tests'.
-They consist of 1000 runs of the andrew benchmarks, 1000 copy and
-removes of /etc with randomly selected pauses of 0-60 seconds
-between each copy and remove, and 500 find from / with randomly
-selected pauses of 100 seconds between each run). The run of the
-torture test compares as follows:
-
-With soft updates: writes: 6 sync, 1,113,686 async; run time 19hr, 50min
-Normal filesystem: writes: 1,459,147 sync, 487,031 async; run time 27hr, 15min
-
-The upshot is 42% less I/O and 28% shorter running time.
-
-Another interesting test point is a full MAKEDEV. Because it runs
-as a shell script, it becomes mostly limited by the execution speed
-of the machine on which it runs. Here are the numbers:
-
-With soft updates:
-
-	labrat# time ./MAKEDEV std
-	2.2u 32.6s 0:34.82 100.0% 0+0k 11+36io 0pf+0w
-
-	labrat# ls | wc
-	     522     522    3317
-
-Without soft updates:
-
-	labrat# time ./MAKEDEV std
-	2.0u 40.5s 0:42.53 100.0% 0+0k 11+1221io 0pf+0w
-
-	labrat# ls | wc
-	     522     522    3317
-
-Of course, some of the system time is being pushed
-to the syncer process, but that is a different story.
-
-To show a benchmark designed to highlight the soft update code
-consider a tar of zero-sized files and an rm -rf of a directory tree
-that has at least 50 files or so at each level. Running a test with
-a directory tree containing 28 directories holding 202 empty files
-produces the following numbers:
-
-With soft updates:
-tar: 0.0u 0.5s 0:00.65 76.9% 0+0k 0+44io 0pf+0w (0 sync, 33 async writes)
-rm: 0.0u 0.2s 0:00.20 100.0% 0+0k 0+37io 0pf+0w (0 sync, 72 async writes)
-
-Normal filesystem:
-tar: 0.0u 1.1s 0:07.27 16.5% 0+0k 60+586io 0pf+0w (523 sync, 0 async writes)
-rm:  0.0u 0.5s 0:01.84 29.3% 0+0k 0+318io 0pf+0w (258 sync, 65 async writes)
-
-The large reduction in writes is because inodes are clustered, so
-most of a block gets allocated, then the whole block is written
-out once rather than having the same block written once for each
-inode allocated from it.  Similarly each directory block is written
-once rather than once for each new directory entry. Effectively
-what the update code is doing is allocating a bunch of inodes
-and directory entries without writing anything, then ensuring that
-the block containing the inodes is written first followed by the
-directory block that references them.  If there were data in the
-files it would further ensure that the data blocks were written
-before their inodes claimed them.
-
-Copyright Restrictions
-
-Please familiarize yourself with the copyright restrictions
-contained at the top of either the sys/ufs/ffs/softdep.h or
-sys/ufs/ffs/ffs_softdep.c file. The key provision is similar
-to the one used by the DB 2.0 package and goes as follows:
-
-    Redistributions in any form must be accompanied by information
-    on how to obtain complete source code for any accompanying
-    software that uses the this software. This source code must
-    either be included in the distribution or be available for
-    no more than the cost of distribution plus a nominal fee,
-    and must be freely redistributable under reasonable
-    conditions. For an executable file, complete source code
-    means the source code for all modules it contains. It does
-    not mean source code for modules or files that typically
-    accompany the operating system on which the executable file
-    runs, e.g., standard library modules or system header files.
-
-The idea is to allow those of you freely redistributing your source
-to use it while retaining for myself the right to peddle it for
-money to the commercial UNIX vendors. Note that I have included a
-stub file ffs_softdep.c.stub that is freely redistributable so that
-you can put in all the necessary hooks to run the full soft updates
-code, but still allow vendors that want to maintain proprietary
-source to have a working system. I do plan to release the code with
-a `Berkeley style' copyright once I have peddled it around to the
-commercial vendors.  If you have concerns about this copyright,
-feel free to contact me with them and we can try to resolve any
-difficulties.
-
-Soft Dependency Operation
-
-The soft update implementation does NOT require ANY changes
-to the on-disk format of your filesystems. Furthermore it is
-not used by default for any filesystems. It must be enabled on
-a filesystem by filesystem basis by running tunefs to set a
-bit in the superblock indicating that the filesystem should be
-managed using soft updates. If you wish to stop using
-soft updates due to performance or reliability reasons,
-you can simply run tunefs on it again to turn off the bit and
-revert to normal operation. The additional dynamic memory load
-placed on the kernel malloc arena is approximately equal to
-the amount of memory used by vnodes plus inodes (for a system
-with 1000 vnodes, the additional peak memory load is about 300K).
-
-Kernel Changes
-
-There are two new changes to the kernel functionality that are not
-contained in in the soft update files. The first is a `trickle
-sync' facility running in the kernel as process 3.  This trickle
-sync process replaces the traditional `update' program (which should
-be commented out of the /etc/rc startup script). When a vnode is
-first written it is placed 30 seconds down on the trickle sync
-queue. If it still exists and has dirty data when it reaches the
-top of the queue, it is sync'ed.  This approach evens out the load
-on the underlying I/O system and avoids writing short-lived files.
-The papers on trickle-sync tend to favor aging based on buffers
-rather than files. However, I sync on file age rather than buffer
-age because the data structures are much smaller as there are
-typically far fewer files than buffers. Although this can make the
-I/O spikey when a big file times out, it is still much better than
-the wholesale sync's that were happening before. It also adapts
-much better to the soft update code where I want to control
-aging to improve performance (inodes age in 10 seconds, directories
-in 15 seconds, files in 30 seconds). This ensures that most
-dependencies are gone (e.g., inodes are written when directory
-entries want to go to disk) reducing the amount of rollback that
-is needed.
-
-The other main kernel change is to split the vnode freelist into
-two separate lists.  One for vnodes that are still being used to
-identify buffers and the other for those vnodes no longer identifying
-any buffers.  The latter list is used by getnewvnode in preference
-to the former.
-
-Packaging of Kernel Changes
-
-The sys subdirectory contains the changes and additions to the
-kernel. My goal in writing this code was to minimize the changes
-that need to be made to the kernel. Thus, most of the new code
-is contained in the two new files softdep.h and ffs_softdep.c.
-The rest of the kernel changes are simply inserting hooks to
-call into these two new files. Although there has been some
-structural reorganization of the filesystem code to accommodate
-gathering the information required by the soft update code,
-the actual ordering of filesystem operations when soft updates
-are disabled is unchanged.
-
-The kernel changes are packaged as a set of diffs. As I am
-doing my development in BSD/OS, the diffs are relative to the
-BSD/OS versions of the files. Because BSD/OS recently had
-4.4BSD-Lite2 merged into it, the Lite2 files are a good starting
-point for figuring out the changes. There are 40 files that
-require change plus the two new files. Most of these files have
-only a few lines of changes in them. However, four files have
-fairly extensive changes: kern/vfs_subr.c, ufs/ufs/ufs_lookup.c,
-ufs/ufs/ufs_vnops.c, and ufs/ffs/ffs_alloc.c. For these four
-files, I have provided the original Lite2 version, the Lite2
-version with the diffs merged in, and the diffs between the
-BSD/OS and merged version. Even so, I expect that there will
-be some difficulty in doing the merge; I am certainly willing
-to assist in helping get the code merged into your system.
-
-Packaging of Utility Changes
-
-The utilities subdirectory contains the changes and additions
-to the utilities. There are diffs to three utilities enclosed:
-
-    tunefs - add a flag to enable and disable soft updates
-
-    mount - print out whether soft updates are enabled and
-	    also statistics on number of sync and async writes
-
-    fsck - tighter checks on acceptable errors and a slightly
-	   different policy for what to put in lost+found on
-	   filesystems using soft updates
-
-In addition you should recompile vmstat so as to get reports
-on the 13 new memory types used by the soft update code.
-It is not necessary to use the new version of fsck, however it
-would aid in my debugging if you do. Also, because of the time
-lag between deleting a directory entry and the inode it
-references, you will find a lot more files showing up in your
-lost+found if you do not use the new version. Note that the
-new version checks for the soft update flag in the superblock
-and only uses the new algorithms if it is set. So, it will run
-unchanged on the filesystems that are not using soft updates.
-
-Operation
-
-Once you have booted a kernel that incorporates the soft update
-code and installed the updated utilities, do the following:
-
-1) Comment out the update program in /etc/rc.
-
-2) Run `tunefs -n enable' on one or more test filesystems.
-
-3) Mount these filesystems and then type `mount' to ensure that
-   they have been enabled for soft updates.
-
-4) Copy the test directory to a softdep filesystem, chdir into
-   it and run `./doit'. You may want to check out each of the
-   three subtests individually first: doit1 - andrew benchmarks,
-   doit2 - copy and removal of /etc, doit3 - find from /.
-
-====
-Additional notes from Feb 13
-
-hen removing huge directories of files, it is possible to get
-the incore state arbitrarily far ahead of the disk. Maintaining
-all the associated depedency information can exhaust the kernel
-malloc arena. To avoid this senario, I have put some limits on
-the soft update code so that it will not be allowed to rampage
-through all of the kernel memory. I enclose below the relevant
-patches to vnode.h and vfs_subr.c (which allow the soft update
-code to speed up the filesystem syncer process). I have also
-included the diffs for ffs_softdep.c. I hope to make a pass over
-ffs_softdep.c to isolate the differences with my standard version
-so that these diffs are less painful to incorporate.
-
-Since I know you like to play with tuning, I have put the relevant
-knobs on sysctl debug variables. The tuning knobs can be viewed
-with `sysctl debug' and set with `sysctl -w debug.<name>=value'.
-The knobs are as follows:
-
-        debug.max_softdeps - limit on any given resource
-        debug.tickdelay - ticks to delay before allocating
-        debug.max_limit_hit - number of times tickdelay imposed
-        debug.rush_requests - number of rush requests to filesystem syncer
-
-The max_softdeps limit is derived from vnodesdesired which in
-turn is sized based on the amount of memory on the machine.
-When the limit is hit, a process requesting a resource first
-tries to speed up the filesystem syncer process. Such a
-request is recorded as a rush_request. After syncdelay / 2 
-unserviced rush requests (typically 15) are in the filesystem
-syncers queue (i.e., it is more than 15 seconds behind in its 
-work), the process requesting the memory is put to sleep for
-tickdelay seconds. Such a delay is recorded in max_limit_hit.
-Following this delay it is granted its memory without further
-delay. I have tried the following experiments in which I
-delete an MH directory containing 16,703 files:
-
-Run #                   1               2               3
-
-max_softdeps         4496            4496            4496
-tickdelay        100 == 1 sec   20 == 0.2 sec   2 == 0.02 sec
-max_limit_hit    16 == 16 sec   27 == 5.4 sec   203 == 4.1 sec
-rush_requests         147             102              93
-run time             57 sec          46 sec          45 sec
-I/O's                 781             859             936
-
-When run with no limits, it completes in 40 seconds. So, the
-time spent in delay is directly added to the bottom line.
-Shortening the tick delay does cut down the total running time,
-but at the expense of generating more total I/O operations
-due to the rush orders being sent to the filesystem syncer.
-Although the number of rush orders decreases with a shorter
-tick delay, there are more requests in each order, hence the
-increase in I/O count. Also, although the I/O count does rise
-with a shorter delay, it is still at least an order of magnitude 
-less than without soft updates. Anyway, you may want to play
-around with these value to see what works best and to see if
-you can get an insight into how best to tune them. If you get
-out of memory panic's, then you have max_softdeps set too high.
-The max_limit_hit and rush_requests show be reset to zero
-before each run. The minimum legal value for tickdelay is 2
-(if you set it below that, the code will use 2).
-
-
diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index 76372b4a7a96..ff4c07ebd9b2 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_alloc.c	8.18 (Berkeley) 5/26/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ffs/ffs_alloc.c,v 1.56.2.2 1999/08/30 12:30:11 sheldonh Exp $
  */
 
 #include "opt_quota.h"
diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c
index 5512e1a08548..288dd8515304 100644
--- a/sys/ufs/ffs/ffs_balloc.c
+++ b/sys/ufs/ffs/ffs_balloc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_balloc.c	8.8 (Berkeley) 6/16/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ffs/ffs_balloc.c,v 1.21.2.1 1999/08/29 16:33:09 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h
index f86d04ac3f86..46dcdcecb138 100644
--- a/sys/ufs/ffs/ffs_extern.h
+++ b/sys/ufs/ffs/ffs_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_extern.h	8.6 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ffs/ffs_extern.h,v 1.25.2.1 1999/08/29 16:33:10 peter Exp $
  */
 
 #ifndef _UFS_FFS_EXTERN_H
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index f044f9ffcbd8..8bf96be02df6 100644
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_inode.c	8.13 (Berkeley) 4/21/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ffs/ffs_inode.c,v 1.52.2.1 1999/08/29 16:33:10 peter Exp $
  */
 
 #include "opt_quota.h"
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
deleted file mode 100644
index 5c0f271d5ce7..000000000000
--- a/sys/ufs/ffs/ffs_softdep.c
+++ /dev/null
@@ -1,4400 +0,0 @@
-/*
- * Copyright 1998 Marshall Kirk McKusick. All Rights Reserved.
- *
- * The soft updates code is derived from the appendix of a University
- * of Michigan technical report (Gregory R. Ganger and Yale N. Patt,
- * "Soft Updates: A Solution to the Metadata Update Problem in File
- * Systems", CSE-TR-254-95, August 1995).
- *
- * The following are the copyrights and redistribution conditions that
- * apply to this copy of the soft update software. For a license
- * to use, redistribute or sell the soft update software under
- * conditions other than those described here, please contact the
- * author at one of the following addresses:
- *
- *	Marshall Kirk McKusick		mckusick@mckusick.com
- *	1614 Oxford Street		+1-510-843-9542
- *	Berkeley, CA 94709-1608
- *	USA
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. None of the names of McKusick, Ganger, Patt, or the University of
- *    Michigan may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- * 4. Redistributions in any form must be accompanied by information on
- *    how to obtain complete source code for any accompanying software
- *    that uses this software. This source code must either be included
- *    in the distribution or be available for no more than the cost of
- *    distribution plus a nominal fee, and must be freely redistributable
- *    under reasonable conditions. For an executable file, complete
- *    source code means the source code for all modules it contains.
- *    It does not mean source code for modules or files that typically
- *    accompany the operating system on which the executable file runs,
- *    e.g., standard library modules or system header files.
- *
- * THIS SOFTWARE IS PROVIDED BY MARSHALL KIRK MCKUSICK ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL MARSHALL KIRK MCKUSICK BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	from: @(#)ffs_softdep.c	9.36 (McKusick) 5/6/99
- * $FreeBSD$
- */
-
-/*
- * For now we want the safety net that the DIAGNOSTIC and DEBUG flags provide.
- */
-#ifndef DIAGNOSTIC
-#define DIAGNOSTIC
-#endif
-#ifndef DEBUG
-#define DEBUG
-#endif
-
-#include <sys/param.h>
-#include <sys/buf.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/mount.h>
-#include <sys/proc.h>
-#include <sys/syslog.h>
-#include <sys/systm.h>
-#include <sys/vnode.h>
-#include <miscfs/specfs/specdev.h>
-#include <ufs/ufs/dir.h>
-#include <ufs/ufs/quota.h>
-#include <ufs/ufs/inode.h>
-#include <ufs/ufs/ufsmount.h>
-#include <ufs/ffs/fs.h>
-#include <ufs/ffs/softdep.h>
-#include <ufs/ffs/ffs_extern.h>
-#include <ufs/ufs/ufs_extern.h>
-
-/*
- * These definitions need to be adapted to the system to which
- * this file is being ported.
- */
-/*
- * malloc types defined for the softdep system.
- */
-MALLOC_DEFINE(M_PAGEDEP, "pagedep","File page dependencies");
-MALLOC_DEFINE(M_INODEDEP, "inodedep","Inode dependencies");
-MALLOC_DEFINE(M_NEWBLK, "newblk","New block allocation");
-MALLOC_DEFINE(M_BMSAFEMAP, "bmsafemap","Block or frag allocated from cyl group map");
-MALLOC_DEFINE(M_ALLOCDIRECT, "allocdirect","Block or frag dependency for an inode");
-MALLOC_DEFINE(M_INDIRDEP, "indirdep","Indirect block dependencies");
-MALLOC_DEFINE(M_ALLOCINDIR, "allocindir","Block dependency for an indirect block");
-MALLOC_DEFINE(M_FREEFRAG, "freefrag","Previously used frag for an inode");
-MALLOC_DEFINE(M_FREEBLKS, "freeblks","Blocks freed from an inode");
-MALLOC_DEFINE(M_FREEFILE, "freefile","Inode deallocated");
-MALLOC_DEFINE(M_DIRADD, "diradd","New directory entry");
-MALLOC_DEFINE(M_MKDIR, "mkdir","New directory");
-MALLOC_DEFINE(M_DIRREM, "dirrem","Directory entry deleted");
-
-#define	D_PAGEDEP	0
-#define	D_INODEDEP	1
-#define	D_NEWBLK	2
-#define	D_BMSAFEMAP	3
-#define	D_ALLOCDIRECT	4
-#define	D_INDIRDEP	5
-#define	D_ALLOCINDIR	6
-#define	D_FREEFRAG	7
-#define	D_FREEBLKS	8
-#define	D_FREEFILE	9
-#define	D_DIRADD	10
-#define	D_MKDIR		11
-#define	D_DIRREM	12
-#define D_LAST		D_DIRREM
-
-/* 
- * translate from workitem type to memory type
- * MUST match the defines above, such that memtype[D_XXX] == M_XXX
- */
-static struct malloc_type *memtype[] = {
-	M_PAGEDEP,
-	M_INODEDEP,
-	M_NEWBLK,
-	M_BMSAFEMAP,
-	M_ALLOCDIRECT,
-	M_INDIRDEP,
-	M_ALLOCINDIR,
-	M_FREEFRAG,
-	M_FREEBLKS,
-	M_FREEFILE,
-	M_DIRADD,
-	M_MKDIR,
-	M_DIRREM
-};
-
-#define DtoM(type) (memtype[type])
-
-/*
- * Names of malloc types.
- */
-#define TYPENAME(type)  \
-	((unsigned)(type) < D_LAST ? memtype[type]->ks_shortdesc : "???")
-#define CURPROC curproc
-/*
- * End system adaptaion definitions.
- */
-
-/*
- * Internal function prototypes.
- */
-static	void softdep_error __P((char *, int));
-static	void drain_output __P((struct vnode *, int));
-static	int getdirtybuf __P((struct buf **, int));
-static	void clear_remove __P((struct proc *));
-static	void clear_inodedeps __P((struct proc *));
-static	int flush_pagedep_deps __P((struct vnode *, struct mount *,
-	    struct diraddhd *));
-static	int flush_inodedep_deps __P((struct fs *, ino_t));
-static	int handle_written_filepage __P((struct pagedep *, struct buf *));
-static  void diradd_inode_written __P((struct diradd *, struct inodedep *));
-static	int handle_written_inodeblock __P((struct inodedep *, struct buf *));
-static	void handle_allocdirect_partdone __P((struct allocdirect *));
-static	void handle_allocindir_partdone __P((struct allocindir *));
-static	void initiate_write_filepage __P((struct pagedep *, struct buf *));
-static	void handle_written_mkdir __P((struct mkdir *, int));
-static	void initiate_write_inodeblock __P((struct inodedep *, struct buf *));
-static	void handle_workitem_freefile __P((struct freefile *));
-static	void handle_workitem_remove __P((struct dirrem *));
-static	struct dirrem *newdirrem __P((struct buf *, struct inode *,
-	    struct inode *, int));
-static	void free_diradd __P((struct diradd *));
-static	void free_allocindir __P((struct allocindir *, struct inodedep *));
-static	int indir_trunc __P((struct inode *, ufs_daddr_t, int, ufs_lbn_t,
-	    long *));
-static	void deallocate_dependencies __P((struct buf *, struct inodedep *));
-static	void free_allocdirect __P((struct allocdirectlst *,
-	    struct allocdirect *, int));
-static	int free_inodedep __P((struct inodedep *));
-static	void handle_workitem_freeblocks __P((struct freeblks *));
-static	void merge_inode_lists __P((struct inodedep *));
-static	void setup_allocindir_phase2 __P((struct buf *, struct inode *,
-	    struct allocindir *));
-static	struct allocindir *newallocindir __P((struct inode *, int, ufs_daddr_t,
-	    ufs_daddr_t));
-static	void handle_workitem_freefrag __P((struct freefrag *));
-static	struct freefrag *newfreefrag __P((struct inode *, ufs_daddr_t, long));
-static	void allocdirect_merge __P((struct allocdirectlst *,
-	    struct allocdirect *, struct allocdirect *));
-static	struct bmsafemap *bmsafemap_lookup __P((struct buf *));
-static	int newblk_lookup __P((struct fs *, ufs_daddr_t, int,
-	    struct newblk **));
-static	int inodedep_lookup __P((struct fs *, ino_t, int, struct inodedep **));
-static	int pagedep_lookup __P((struct inode *, ufs_lbn_t, int,
-	    struct pagedep **));
-static	void pause_timer __P((void *));
-static	int checklimit __P((long *, int));
-static	void add_to_worklist __P((struct worklist *));
-
-/*
- * Exported softdep operations.
- */
-struct bio_ops bioops = {
-	softdep_disk_io_initiation,		/* io_start */
-	softdep_disk_write_complete,		/* io_complete */
-	softdep_deallocate_dependencies,	/* io_deallocate */
-	softdep_fsync,				/* io_fsync */
-	softdep_process_worklist,		/* io_sync */
-};
-
-/*
- * Locking primitives.
- *
- * For a uniprocessor, all we need to do is protect against disk
- * interrupts. For a multiprocessor, this lock would have to be
- * a mutex. A single mutex is used throughout this file, though
- * finer grain locking could be used if contention warranted it.
- *
- * For a multiprocessor, the sleep call would accept a lock and
- * release it after the sleep processing was complete. In a uniprocessor
- * implementation there is no such interlock, so we simple mark
- * the places where it needs to be done with the `interlocked' form
- * of the lock calls. Since the uniprocessor sleep already interlocks
- * the spl, there is nothing that really needs to be done.
- */
-#ifndef /* NOT */ DEBUG
-static struct lockit {
-	int	lkt_spl;
-} lk = { 0 };
-#define ACQUIRE_LOCK(lk)		(lk)->lkt_spl = splbio()
-#define FREE_LOCK(lk)			splx((lk)->lkt_spl)
-#define ACQUIRE_LOCK_INTERLOCKED(lk)
-#define FREE_LOCK_INTERLOCKED(lk)
-
-#else /* DEBUG */
-static struct lockit {
-	int	lkt_spl;
-	pid_t	lkt_held;
-} lk = { 0, -1 };
-static int lockcnt;
-
-static	void acquire_lock __P((struct lockit *));
-static	void free_lock __P((struct lockit *));
-static	void acquire_lock_interlocked __P((struct lockit *));
-static	void free_lock_interlocked __P((struct lockit *));
-
-#define ACQUIRE_LOCK(lk)		acquire_lock(lk)
-#define FREE_LOCK(lk)			free_lock(lk)
-#define ACQUIRE_LOCK_INTERLOCKED(lk)	acquire_lock_interlocked(lk)
-#define FREE_LOCK_INTERLOCKED(lk)	free_lock_interlocked(lk)
-
-static void
-acquire_lock(lk)
-	struct lockit *lk;
-{
-
-	if (lk->lkt_held != -1)
-		if (lk->lkt_held == CURPROC->p_pid)
-			panic("softdep_lock: locking against myself");
-		else
-			panic("softdep_lock: lock held by %d", lk->lkt_held);
-	lk->lkt_spl = splbio();
-	lk->lkt_held = CURPROC->p_pid;
-	lockcnt++;
-}
-
-static void
-free_lock(lk)
-	struct lockit *lk;
-{
-
-	if (lk->lkt_held == -1)
-		panic("softdep_unlock: lock not held");
-	lk->lkt_held = -1;
-	splx(lk->lkt_spl);
-}
-
-static void
-acquire_lock_interlocked(lk)
-	struct lockit *lk;
-{
-
-	if (lk->lkt_held != -1)
-		if (lk->lkt_held == CURPROC->p_pid)
-			panic("softdep_lock_interlocked: locking against self");
-		else
-			panic("softdep_lock_interlocked: lock held by %d",
-			    lk->lkt_held);
-	lk->lkt_held = CURPROC->p_pid;
-	lockcnt++;
-}
-
-static void
-free_lock_interlocked(lk)
-	struct lockit *lk;
-{
-
-	if (lk->lkt_held == -1)
-		panic("softdep_unlock_interlocked: lock not held");
-	lk->lkt_held = -1;
-}
-#endif /* DEBUG */
-
-/*
- * Place holder for real semaphores.
- */
-struct sema {
-	int	value;
-	pid_t	holder;
-	char	*name;
-	int	prio;
-	int	timo;
-};
-static	void sema_init __P((struct sema *, char *, int, int));
-static	int sema_get __P((struct sema *, struct lockit *));
-static	void sema_release __P((struct sema *));
-
-static void
-sema_init(semap, name, prio, timo)
-	struct sema *semap;
-	char *name;
-	int prio, timo;
-{
-
-	semap->holder = -1;
-	semap->value = 0;
-	semap->name = name;
-	semap->prio = prio;
-	semap->timo = timo;
-}
-
-static int
-sema_get(semap, interlock)
-	struct sema *semap;
-	struct lockit *interlock;
-{
-
-	if (semap->value++ > 0) {
-		if (interlock != NULL)
-			FREE_LOCK_INTERLOCKED(interlock);
-		tsleep((caddr_t)semap, semap->prio, semap->name, semap->timo);
-		if (interlock != NULL) {
-			ACQUIRE_LOCK_INTERLOCKED(interlock);
-			FREE_LOCK(interlock);
-		}
-		return (0);
-	}
-	semap->holder = CURPROC->p_pid;
-	if (interlock != NULL)
-		FREE_LOCK(interlock);
-	return (1);
-}
-
-static void
-sema_release(semap)
-	struct sema *semap;
-{
-
-	if (semap->value <= 0 || semap->holder != CURPROC->p_pid)
-		panic("sema_release: not held");
-	if (--semap->value > 0) {
-		semap->value = 0;
-		wakeup(semap);
-	}
-	semap->holder = -1;
-}
-
-/*
- * Worklist queue management.
- * These routines require that the lock be held.
- */
-#ifndef /* NOT */ DEBUG
-#define WORKLIST_INSERT(head, item) do {	\
-	(item)->wk_state |= ONWORKLIST;		\
-	LIST_INSERT_HEAD(head, item, wk_list);	\
-} while (0)
-#define WORKLIST_REMOVE(item) do {		\
-	(item)->wk_state &= ~ONWORKLIST;	\
-	LIST_REMOVE(item, wk_list);		\
-} while (0)
-#define WORKITEM_FREE(item, type) FREE(item, DtoM(type))
-
-#else /* DEBUG */
-static	void worklist_insert __P((struct workhead *, struct worklist *));
-static	void worklist_remove __P((struct worklist *));
-static	void workitem_free __P((struct worklist *, int));
-
-#define WORKLIST_INSERT(head, item) worklist_insert(head, item)
-#define WORKLIST_REMOVE(item) worklist_remove(item)
-#define WORKITEM_FREE(item, type) workitem_free((struct worklist *)item, type)
-
-static void
-worklist_insert(head, item)
-	struct workhead *head;
-	struct worklist *item;
-{
-
-	if (lk.lkt_held == -1)
-		panic("worklist_insert: lock not held");
-	if (item->wk_state & ONWORKLIST)
-		panic("worklist_insert: already on list");
-	item->wk_state |= ONWORKLIST;
-	LIST_INSERT_HEAD(head, item, wk_list);
-}
-
-static void
-worklist_remove(item)
-	struct worklist *item;
-{
-
-	if (lk.lkt_held == -1)
-		panic("worklist_remove: lock not held");
-	if ((item->wk_state & ONWORKLIST) == 0)
-		panic("worklist_remove: not on list");
-	item->wk_state &= ~ONWORKLIST;
-	LIST_REMOVE(item, wk_list);
-}
-
-static void
-workitem_free(item, type)
-	struct worklist *item;
-	int type;
-{
-
-	if (item->wk_state & ONWORKLIST)
-		panic("workitem_free: still on list");
-	if (item->wk_type != type)
-		panic("workitem_free: type mismatch");
-	FREE(item, DtoM(type));
-}
-#endif /* DEBUG */
-
-/*
- * Workitem queue management
- */
-static struct workhead softdep_workitem_pending;
-static int softdep_worklist_busy;
-static int max_softdeps;	/* maximum number of structs before slowdown */
-static int tickdelay = 2;	/* number of ticks to pause during slowdown */
-static int rush_requests;	/* number of times I/O speeded up */
-static int blk_limit_push;	/* number of times block limit neared */
-static int ino_limit_push;	/* number of times inode limit neared */
-static int blk_limit_hit;	/* number of times block slowdown imposed */
-static int ino_limit_hit;	/* number of times inode slowdown imposed */
-static int proc_waiting;	/* tracks whether we have a timeout posted */
-static struct proc *filesys_syncer; /* proc of filesystem syncer process */
-static int req_clear_inodedeps;	/* syncer process flush some inodedeps */
-static int req_clear_remove;	/* syncer process flush some freeblks */
-#ifdef DEBUG
-#include <vm/vm.h>
-#include <sys/sysctl.h>
-#if defined(__FreeBSD__)
-SYSCTL_INT(_debug, OID_AUTO, max_softdeps, CTLFLAG_RW, &max_softdeps, 0, "");
-SYSCTL_INT(_debug, OID_AUTO, tickdelay, CTLFLAG_RW, &tickdelay, 0, "");
-SYSCTL_INT(_debug, OID_AUTO, blk_limit_push, CTLFLAG_RW, &blk_limit_push, 0,"");
-SYSCTL_INT(_debug, OID_AUTO, ino_limit_push, CTLFLAG_RW, &ino_limit_push, 0,"");
-SYSCTL_INT(_debug, OID_AUTO, blk_limit_hit, CTLFLAG_RW, &blk_limit_hit, 0, "");
-SYSCTL_INT(_debug, OID_AUTO, ino_limit_hit, CTLFLAG_RW, &ino_limit_hit, 0, "");
-SYSCTL_INT(_debug, OID_AUTO, rush_requests, CTLFLAG_RW, &rush_requests, 0, "");
-#else /* !__FreeBSD__ */
-struct ctldebug debug7 = { "max_softdeps", &max_softdeps };
-struct ctldebug debug8 = { "tickdelay", &tickdelay };
-struct ctldebug debug9 = { "rush_requests", &rush_requests };
-struct ctldebug debug10 = { "blk_limit_push", &blk_limit_push };
-struct ctldebug debug11 = { "ino_limit_push", &ino_limit_push };
-struct ctldebug debug12 = { "blk_limit_hit", &blk_limit_hit };
-struct ctldebug debug13 = { "ino_limit_hit", &ino_limit_hit };
-#endif	/* !__FreeBSD__ */
-
-#endif /* DEBUG */
-
-/*
- * Add an item to the end of the work queue.
- * This routine requires that the lock be held.
- * This is the only routine that adds items to the list.
- * The following routine is the only one that removes items
- * and does so in order from first to last.
- */
-static void
-add_to_worklist(wk)
-	struct worklist *wk;
-{
-	static struct worklist *worklist_tail;
-
-	if (wk->wk_state & ONWORKLIST)
-		panic("add_to_worklist: already on list");
-	wk->wk_state |= ONWORKLIST;
-	if (LIST_FIRST(&softdep_workitem_pending) == NULL) {
-		LIST_INSERT_HEAD(&softdep_workitem_pending, wk, wk_list);
-	} else {
-		LIST_INSERT_AFTER(worklist_tail, wk, wk_list);
-	}
-	worklist_tail = wk;
-}
-
-/*
- * Process that runs once per second to handle items in the background queue.
- *
- * Note that we ensure that everything is done in the order in which they
- * appear in the queue. The code below depends on this property to ensure
- * that blocks of a file are freed before the inode itself is freed. This
- * ordering ensures that no new <vfsid, inum, lbn> triples will be generated
- * until all the old ones have been purged from the dependency lists.
- */
-int 
-softdep_process_worklist(matchmnt)
-	struct mount *matchmnt;
-{
-	struct proc *p = CURPROC;
-	struct worklist *wk;
-	struct fs *matchfs;
-	int matchcnt;
-
-	/*
-	 * Record the process identifier of our caller so that we can
-	 * give this process preferential treatment in checklimit below.
-	 */
-	filesys_syncer = p;
-	matchcnt = 0;
-	matchfs = NULL;
-	if (matchmnt != NULL)
-		matchfs = VFSTOUFS(matchmnt)->um_fs;
-	/*
-	 * There is no danger of having multiple processes run this
-	 * code. It is single threaded solely so that softdep_flushfiles
-	 * (below) can get an accurate count of the number of items
-	 * related to its mount point that are in the list.
-	 */
-	if (softdep_worklist_busy && matchmnt == NULL)
-		return (-1);
-	/*
-	 * If requested, try removing inode or removal dependencies.
-	 */
-	if (req_clear_inodedeps) {
-		clear_inodedeps(p);
-		req_clear_inodedeps = 0;
-		wakeup(&proc_waiting);
-	}
-	if (req_clear_remove) {
-		clear_remove(p);
-		req_clear_remove = 0;
-		wakeup(&proc_waiting);
-	}
-	ACQUIRE_LOCK(&lk);
-	while ((wk = LIST_FIRST(&softdep_workitem_pending)) != 0) {
-		WORKLIST_REMOVE(wk);
-		FREE_LOCK(&lk);
-		switch (wk->wk_type) {
-
-		case D_DIRREM:
-			/* removal of a directory entry */
-			if (WK_DIRREM(wk)->dm_mnt == matchmnt)
-				matchcnt += 1;
-			handle_workitem_remove(WK_DIRREM(wk));
-			break;
-
-		case D_FREEBLKS:
-			/* releasing blocks and/or fragments from a file */
-			if (WK_FREEBLKS(wk)->fb_fs == matchfs)
-				matchcnt += 1;
-			handle_workitem_freeblocks(WK_FREEBLKS(wk));
-			break;
-
-		case D_FREEFRAG:
-			/* releasing a fragment when replaced as a file grows */
-			if (WK_FREEFRAG(wk)->ff_fs == matchfs)
-				matchcnt += 1;
-			handle_workitem_freefrag(WK_FREEFRAG(wk));
-			break;
-
-		case D_FREEFILE:
-			/* releasing an inode when its link count drops to 0 */
-			if (WK_FREEFILE(wk)->fx_fs == matchfs)
-				matchcnt += 1;
-			handle_workitem_freefile(WK_FREEFILE(wk));
-			break;
-
-		default:
-			panic("%s_process_worklist: Unknown type %s",
-			    "softdep", TYPENAME(wk->wk_type));
-			/* NOTREACHED */
-		}
-		if (softdep_worklist_busy && matchmnt == NULL)
-			return (-1);
-		/*
-		 * If requested, try removing inode or removal dependencies.
-		 */
-		if (req_clear_inodedeps) {
-			clear_inodedeps(p);
-			req_clear_inodedeps = 0;
-			wakeup(&proc_waiting);
-		}
-		if (req_clear_remove) {
-			clear_remove(p);
-			req_clear_remove = 0;
-			wakeup(&proc_waiting);
-		}
-		ACQUIRE_LOCK(&lk);
-	}
-	FREE_LOCK(&lk);
-	return (matchcnt);
-}
-
-/*
- * Purge the work list of all items associated with a particular mount point.
- */
-int
-softdep_flushfiles(oldmnt, flags, p)
-	struct mount *oldmnt;
-	int flags;
-	struct proc *p;
-{
-	struct vnode *devvp;
-	int error, loopcnt;
-
-	/*
-	 * Await our turn to clear out the queue.
-	 */
-	while (softdep_worklist_busy)
-		tsleep(&lbolt, PRIBIO, "softflush", 0);
-	softdep_worklist_busy = 1;
-	if ((error = ffs_flushfiles(oldmnt, flags, p)) != 0) {
-		softdep_worklist_busy = 0;
-		return (error);
-	}
-	/*
-	 * Alternately flush the block device associated with the mount
-	 * point and process any dependencies that the flushing
-	 * creates. In theory, this loop can happen at most twice,
-	 * but we give it a few extra just to be sure.
-	 */
-	devvp = VFSTOUFS(oldmnt)->um_devvp;
-	for (loopcnt = 10; loopcnt > 0; loopcnt--) {
-		if (softdep_process_worklist(oldmnt) == 0) {
-			/*
-			 * Do another flush in case any vnodes were brought in
-			 * as part of the cleanup operations.
-			 */
-			if ((error = ffs_flushfiles(oldmnt, flags, p)) != 0)
-				break;
-			/*
-			 * If we still found nothing to do, we are really done.
-			 */
-			if (softdep_process_worklist(oldmnt) == 0)
-				break;
-		}
-		vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, p);
-		error = VOP_FSYNC(devvp, p->p_ucred, MNT_WAIT, p);
-		VOP_UNLOCK(devvp, 0, p);
-		if (error)
-			break;
-	}
-	softdep_worklist_busy = 0;
-	/*
-	 * If we are unmounting then it is an error to fail. If we
-	 * are simply trying to downgrade to read-only, then filesystem
-	 * activity can keep us busy forever, so we just fail with EBUSY.
-	 */
-	if (loopcnt == 0) {
-		if (oldmnt->mnt_kern_flag & MNTK_UNMOUNT)
-			panic("softdep_flushfiles: looping");
-		error = EBUSY;
-	}
-	return (error);
-}
-
-/*
- * Structure hashing.
- * 
- * There are three types of structures that can be looked up:
- *	1) pagedep structures identified by mount point, inode number,
- *	   and logical block.
- *	2) inodedep structures identified by mount point and inode number.
- *	3) newblk structures identified by mount point and
- *	   physical block number.
- *
- * The "pagedep" and "inodedep" dependency structures are hashed
- * separately from the file blocks and inodes to which they correspond.
- * This separation helps when the in-memory copy of an inode or
- * file block must be replaced. It also obviates the need to access
- * an inode or file page when simply updating (or de-allocating)
- * dependency structures. Lookup of newblk structures is needed to
- * find newly allocated blocks when trying to associate them with
- * their allocdirect or allocindir structure.
- *
- * The lookup routines optionally create and hash a new instance when
- * an existing entry is not found.
- */
-#define DEPALLOC	0x0001	/* allocate structure if lookup fails */
-
-/*
- * Structures and routines associated with pagedep caching.
- */
-LIST_HEAD(pagedep_hashhead, pagedep) *pagedep_hashtbl;
-u_long	pagedep_hash;		/* size of hash table - 1 */
-#define	PAGEDEP_HASH(mp, inum, lbn) \
-	(&pagedep_hashtbl[((((register_t)(mp)) >> 13) + (inum) + (lbn)) & \
-	    pagedep_hash])
-static struct sema pagedep_in_progress;
-
-/*
- * Look up a pagedep. Return 1 if found, 0 if not found.
- * If not found, allocate if DEPALLOC flag is passed.
- * Found or allocated entry is returned in pagedeppp.
- * This routine must be called with splbio interrupts blocked.
- */
-static int
-pagedep_lookup(ip, lbn, flags, pagedeppp)
-	struct inode *ip;
-	ufs_lbn_t lbn;
-	int flags;
-	struct pagedep **pagedeppp;
-{
-	struct pagedep *pagedep;
-	struct pagedep_hashhead *pagedephd;
-	struct mount *mp;
-	int i;
-
-#ifdef DEBUG
-	if (lk.lkt_held == -1)
-		panic("pagedep_lookup: lock not held");
-#endif
-	mp = ITOV(ip)->v_mount;
-	pagedephd = PAGEDEP_HASH(mp, ip->i_number, lbn);
-top:
-	for (pagedep = LIST_FIRST(pagedephd); pagedep;
-	     pagedep = LIST_NEXT(pagedep, pd_hash))
-		if (ip->i_number == pagedep->pd_ino &&
-		    lbn == pagedep->pd_lbn &&
-		    mp == pagedep->pd_mnt)
-			break;
-	if (pagedep) {
-		*pagedeppp = pagedep;
-		return (1);
-	}
-	if ((flags & DEPALLOC) == 0) {
-		*pagedeppp = NULL;
-		return (0);
-	}
-	if (sema_get(&pagedep_in_progress, &lk) == 0) {
-		ACQUIRE_LOCK(&lk);
-		goto top;
-	}
-	MALLOC(pagedep, struct pagedep *, sizeof(struct pagedep), M_PAGEDEP,
-		M_WAITOK);
-	bzero(pagedep, sizeof(struct pagedep));
-	pagedep->pd_list.wk_type = D_PAGEDEP;
-	pagedep->pd_mnt = mp;
-	pagedep->pd_ino = ip->i_number;
-	pagedep->pd_lbn = lbn;
-	LIST_INIT(&pagedep->pd_dirremhd);
-	LIST_INIT(&pagedep->pd_pendinghd);
-	for (i = 0; i < DAHASHSZ; i++)
-		LIST_INIT(&pagedep->pd_diraddhd[i]);
-	ACQUIRE_LOCK(&lk);
-	LIST_INSERT_HEAD(pagedephd, pagedep, pd_hash);
-	sema_release(&pagedep_in_progress);
-	*pagedeppp = pagedep;
-	return (0);
-}
-
-/*
- * Structures and routines associated with inodedep caching.
- */
-LIST_HEAD(inodedep_hashhead, inodedep) *inodedep_hashtbl;
-static u_long	inodedep_hash;	/* size of hash table - 1 */
-static long	num_inodedep;	/* number of inodedep allocated */
-#define	INODEDEP_HASH(fs, inum) \
-      (&inodedep_hashtbl[((((register_t)(fs)) >> 13) + (inum)) & inodedep_hash])
-static struct sema inodedep_in_progress;
-
-/*
- * Look up a inodedep. Return 1 if found, 0 if not found.
- * If not found, allocate if DEPALLOC flag is passed.
- * Found or allocated entry is returned in inodedeppp.
- * This routine must be called with splbio interrupts blocked.
- */
-static int
-inodedep_lookup(fs, inum, flags, inodedeppp)
-	struct fs *fs;
-	ino_t inum;
-	int flags;
-	struct inodedep **inodedeppp;
-{
-	struct inodedep *inodedep;
-	struct inodedep_hashhead *inodedephd;
-	int firsttry;
-
-#ifdef DEBUG
-	if (lk.lkt_held == -1)
-		panic("inodedep_lookup: lock not held");
-#endif
-	firsttry = 1;
-	inodedephd = INODEDEP_HASH(fs, inum);
-top:
-	for (inodedep = LIST_FIRST(inodedephd); inodedep;
-	     inodedep = LIST_NEXT(inodedep, id_hash))
-		if (inum == inodedep->id_ino && fs == inodedep->id_fs)
-			break;
-	if (inodedep) {
-		*inodedeppp = inodedep;
-		return (1);
-	}
-	if ((flags & DEPALLOC) == 0) {
-		*inodedeppp = NULL;
-		return (0);
-	}
-	if (firsttry && checklimit(&num_inodedep, 1) == 1) {
-		firsttry = 0;
-		goto top;
-	}
-	if (sema_get(&inodedep_in_progress, &lk) == 0) {
-		ACQUIRE_LOCK(&lk);
-		goto top;
-	}
-	num_inodedep += 1;
-	MALLOC(inodedep, struct inodedep *, sizeof(struct inodedep),
-		M_INODEDEP, M_WAITOK);
-	inodedep->id_list.wk_type = D_INODEDEP;
-	inodedep->id_fs = fs;
-	inodedep->id_ino = inum;
-	inodedep->id_state = ALLCOMPLETE;
-	inodedep->id_nlinkdelta = 0;
-	inodedep->id_savedino = NULL;
-	inodedep->id_savedsize = -1;
-	inodedep->id_buf = NULL;
-	LIST_INIT(&inodedep->id_pendinghd);
-	LIST_INIT(&inodedep->id_inowait);
-	LIST_INIT(&inodedep->id_bufwait);
-	TAILQ_INIT(&inodedep->id_inoupdt);
-	TAILQ_INIT(&inodedep->id_newinoupdt);
-	ACQUIRE_LOCK(&lk);
-	LIST_INSERT_HEAD(inodedephd, inodedep, id_hash);
-	sema_release(&inodedep_in_progress);
-	*inodedeppp = inodedep;
-	return (0);
-}
-
-/*
- * Structures and routines associated with newblk caching.
- */
-LIST_HEAD(newblk_hashhead, newblk) *newblk_hashtbl;
-u_long	newblk_hash;		/* size of hash table - 1 */
-#define	NEWBLK_HASH(fs, inum) \
-	(&newblk_hashtbl[((((register_t)(fs)) >> 13) + (inum)) & newblk_hash])
-static struct sema newblk_in_progress;
-
-/*
- * Look up a newblk. Return 1 if found, 0 if not found.
- * If not found, allocate if DEPALLOC flag is passed.
- * Found or allocated entry is returned in newblkpp.
- */
-static int
-newblk_lookup(fs, newblkno, flags, newblkpp)
-	struct fs *fs;
-	ufs_daddr_t newblkno;
-	int flags;
-	struct newblk **newblkpp;
-{
-	struct newblk *newblk;
-	struct newblk_hashhead *newblkhd;
-
-	newblkhd = NEWBLK_HASH(fs, newblkno);
-top:
-	for (newblk = LIST_FIRST(newblkhd); newblk;
-	     newblk = LIST_NEXT(newblk, nb_hash))
-		if (newblkno == newblk->nb_newblkno && fs == newblk->nb_fs)
-			break;
-	if (newblk) {
-		*newblkpp = newblk;
-		return (1);
-	}
-	if ((flags & DEPALLOC) == 0) {
-		*newblkpp = NULL;
-		return (0);
-	}
-	if (sema_get(&newblk_in_progress, 0) == 0)
-		goto top;
-	MALLOC(newblk, struct newblk *, sizeof(struct newblk),
-		M_NEWBLK, M_WAITOK);
-	newblk->nb_state = 0;
-	newblk->nb_fs = fs;
-	newblk->nb_newblkno = newblkno;
-	LIST_INSERT_HEAD(newblkhd, newblk, nb_hash);
-	sema_release(&newblk_in_progress);
-	*newblkpp = newblk;
-	return (0);
-}
-
-/*
- * Executed during filesystem system initialization before
- * mounting any file systems.
- */
-void 
-softdep_initialize()
-{
-
-	LIST_INIT(&mkdirlisthd);
-	LIST_INIT(&softdep_workitem_pending);
-	max_softdeps = desiredvnodes * 8;
-	pagedep_hashtbl = hashinit(desiredvnodes / 5, M_PAGEDEP,
-	    &pagedep_hash);
-	sema_init(&pagedep_in_progress, "pagedep", PRIBIO, 0);
-	inodedep_hashtbl = hashinit(desiredvnodes, M_INODEDEP, &inodedep_hash);
-	sema_init(&inodedep_in_progress, "inodedep", PRIBIO, 0);
-	newblk_hashtbl = hashinit(64, M_NEWBLK, &newblk_hash);
-	sema_init(&newblk_in_progress, "newblk", PRIBIO, 0);
-}
-
-/*
- * Called at mount time to notify the dependency code that a
- * filesystem wishes to use it.
- */
-int
-softdep_mount(devvp, mp, fs, cred)
-	struct vnode *devvp;
-	struct mount *mp;
-	struct fs *fs;
-	struct ucred *cred;
-{
-	struct csum cstotal;
-	struct cg *cgp;
-	struct buf *bp;
-	int error, cyl;
-
-	mp->mnt_flag &= ~MNT_ASYNC;
-	mp->mnt_flag |= MNT_SOFTDEP;
-	/*
-	 * When doing soft updates, the counters in the
-	 * superblock may have gotten out of sync, so we have
-	 * to scan the cylinder groups and recalculate them.
-	 */
-	if (fs->fs_clean != 0)
-		return (0);
-	bzero(&cstotal, sizeof cstotal);
-	for (cyl = 0; cyl < fs->fs_ncg; cyl++) {
-		if ((error = bread(devvp, fsbtodb(fs, cgtod(fs, cyl)),
-		    fs->fs_cgsize, cred, &bp)) != 0) {
-			brelse(bp);
-			return (error);
-		}
-		cgp = (struct cg *)bp->b_data;
-		cstotal.cs_nffree += cgp->cg_cs.cs_nffree;
-		cstotal.cs_nbfree += cgp->cg_cs.cs_nbfree;
-		cstotal.cs_nifree += cgp->cg_cs.cs_nifree;
-		cstotal.cs_ndir += cgp->cg_cs.cs_ndir;
-		fs->fs_cs(fs, cyl) = cgp->cg_cs;
-		brelse(bp);
-	}
-#ifdef DEBUG
-	if (bcmp(&cstotal, &fs->fs_cstotal, sizeof cstotal))
-		printf("ffs_mountfs: superblock updated for soft updates\n");
-#endif
-	bcopy(&cstotal, &fs->fs_cstotal, sizeof cstotal);
-	return (0);
-}
-
-/*
- * Protecting the freemaps (or bitmaps).
- * 
- * To eliminate the need to execute fsck before mounting a file system
- * after a power failure, one must (conservatively) guarantee that the
- * on-disk copy of the bitmaps never indicate that a live inode or block is
- * free.  So, when a block or inode is allocated, the bitmap should be
- * updated (on disk) before any new pointers.  When a block or inode is
- * freed, the bitmap should not be updated until all pointers have been
- * reset.  The latter dependency is handled by the delayed de-allocation
- * approach described below for block and inode de-allocation.  The former
- * dependency is handled by calling the following procedure when a block or
- * inode is allocated. When an inode is allocated an "inodedep" is created
- * with its DEPCOMPLETE flag cleared until its bitmap is written to disk.
- * Each "inodedep" is also inserted into the hash indexing structure so
- * that any additional link additions can be made dependent on the inode
- * allocation.
- * 
- * The ufs file system maintains a number of free block counts (e.g., per
- * cylinder group, per cylinder and per <cylinder, rotational position> pair)
- * in addition to the bitmaps.  These counts are used to improve efficiency
- * during allocation and therefore must be consistent with the bitmaps.
- * There is no convenient way to guarantee post-crash consistency of these
- * counts with simple update ordering, for two main reasons: (1) The counts
- * and bitmaps for a single cylinder group block are not in the same disk
- * sector.  If a disk write is interrupted (e.g., by power failure), one may
- * be written and the other not.  (2) Some of the counts are located in the
- * superblock rather than the cylinder group block. So, we focus our soft
- * updates implementation on protecting the bitmaps. When mounting a
- * filesystem, we recompute the auxiliary counts from the bitmaps.
- */
-
-/*
- * Called just after updating the cylinder group block to allocate an inode.
- */
-void
-softdep_setup_inomapdep(bp, ip, newinum)
-	struct buf *bp;		/* buffer for cylgroup block with inode map */
-	struct inode *ip;	/* inode related to allocation */
-	ino_t newinum;		/* new inode number being allocated */
-{
-	struct inodedep *inodedep;
-	struct bmsafemap *bmsafemap;
-
-	/*
-	 * Create a dependency for the newly allocated inode.
-	 * Panic if it already exists as something is seriously wrong.
-	 * Otherwise add it to the dependency list for the buffer holding
-	 * the cylinder group map from which it was allocated.
-	 */
-	ACQUIRE_LOCK(&lk);
-	if (inodedep_lookup(ip->i_fs, newinum, DEPALLOC, &inodedep) != 0)
-		panic("softdep_setup_inomapdep: found inode");
-	inodedep->id_buf = bp;
-	inodedep->id_state &= ~DEPCOMPLETE;
-	bmsafemap = bmsafemap_lookup(bp);
-	LIST_INSERT_HEAD(&bmsafemap->sm_inodedephd, inodedep, id_deps);
-	FREE_LOCK(&lk);
-}
-
-/*
- * Called just after updating the cylinder group block to
- * allocate block or fragment.
- */
-void
-softdep_setup_blkmapdep(bp, fs, newblkno)
-	struct buf *bp;		/* buffer for cylgroup block with block map */
-	struct fs *fs;		/* filesystem doing allocation */
-	ufs_daddr_t newblkno;	/* number of newly allocated block */
-{
-	struct newblk *newblk;
-	struct bmsafemap *bmsafemap;
-
-	/*
-	 * Create a dependency for the newly allocated block.
-	 * Add it to the dependency list for the buffer holding
-	 * the cylinder group map from which it was allocated.
-	 */
-	if (newblk_lookup(fs, newblkno, DEPALLOC, &newblk) != 0)
-		panic("softdep_setup_blkmapdep: found block");
-	ACQUIRE_LOCK(&lk);
-	newblk->nb_bmsafemap = bmsafemap = bmsafemap_lookup(bp);
-	LIST_INSERT_HEAD(&bmsafemap->sm_newblkhd, newblk, nb_deps);
-	FREE_LOCK(&lk);
-}
-
-/*
- * Find the bmsafemap associated with a cylinder group buffer.
- * If none exists, create one. The buffer must be locked when
- * this routine is called and this routine must be called with
- * splbio interrupts blocked.
- */
-static struct bmsafemap *
-bmsafemap_lookup(bp)
-	struct buf *bp;
-{
-	struct bmsafemap *bmsafemap;
-	struct worklist *wk;
-
-#ifdef DEBUG
-	if (lk.lkt_held == -1)
-		panic("bmsafemap_lookup: lock not held");
-#endif
-	for (wk = LIST_FIRST(&bp->b_dep); wk; wk = LIST_NEXT(wk, wk_list))
-		if (wk->wk_type == D_BMSAFEMAP)
-			return (WK_BMSAFEMAP(wk));
-	FREE_LOCK(&lk);
-	MALLOC(bmsafemap, struct bmsafemap *, sizeof(struct bmsafemap),
-		M_BMSAFEMAP, M_WAITOK);
-	bmsafemap->sm_list.wk_type = D_BMSAFEMAP;
-	bmsafemap->sm_list.wk_state = 0;
-	bmsafemap->sm_buf = bp;
-	LIST_INIT(&bmsafemap->sm_allocdirecthd);
-	LIST_INIT(&bmsafemap->sm_allocindirhd);
-	LIST_INIT(&bmsafemap->sm_inodedephd);
-	LIST_INIT(&bmsafemap->sm_newblkhd);
-	ACQUIRE_LOCK(&lk);
-	WORKLIST_INSERT(&bp->b_dep, &bmsafemap->sm_list);
-	return (bmsafemap);
-}
-
-/*
- * Direct block allocation dependencies.
- * 
- * When a new block is allocated, the corresponding disk locations must be
- * initialized (with zeros or new data) before the on-disk inode points to
- * them.  Also, the freemap from which the block was allocated must be
- * updated (on disk) before the inode's pointer. These two dependencies are
- * independent of each other and are needed for all file blocks and indirect
- * blocks that are pointed to directly by the inode.  Just before the
- * "in-core" version of the inode is updated with a newly allocated block
- * number, a procedure (below) is called to setup allocation dependency
- * structures.  These structures are removed when the corresponding
- * dependencies are satisfied or when the block allocation becomes obsolete
- * (i.e., the file is deleted, the block is de-allocated, or the block is a
- * fragment that gets upgraded).  All of these cases are handled in
- * procedures described later.
- * 
- * When a file extension causes a fragment to be upgraded, either to a larger
- * fragment or to a full block, the on-disk location may change (if the
- * previous fragment could not simply be extended). In this case, the old
- * fragment must be de-allocated, but not until after the inode's pointer has
- * been updated. In most cases, this is handled by later procedures, which
- * will construct a "freefrag" structure to be added to the workitem queue
- * when the inode update is complete (or obsolete).  The main exception to
- * this is when an allocation occurs while a pending allocation dependency
- * (for the same block pointer) remains.  This case is handled in the main
- * allocation dependency setup procedure by immediately freeing the
- * unreferenced fragments.
- */ 
-void 
-softdep_setup_allocdirect(ip, lbn, newblkno, oldblkno, newsize, oldsize, bp)
-	struct inode *ip;	/* inode to which block is being added */
-	ufs_lbn_t lbn;		/* block pointer within inode */
-	ufs_daddr_t newblkno;	/* disk block number being added */
-	ufs_daddr_t oldblkno;	/* previous block number, 0 unless frag */
-	long newsize;		/* size of new block */
-	long oldsize;		/* size of new block */
-	struct buf *bp;		/* bp for allocated block */
-{
-	struct allocdirect *adp, *oldadp;
-	struct allocdirectlst *adphead;
-	struct bmsafemap *bmsafemap;
-	struct inodedep *inodedep;
-	struct pagedep *pagedep;
-	struct newblk *newblk;
-
-	MALLOC(adp, struct allocdirect *, sizeof(struct allocdirect),
-		M_ALLOCDIRECT, M_WAITOK);
-	bzero(adp, sizeof(struct allocdirect));
-	adp->ad_list.wk_type = D_ALLOCDIRECT;
-	adp->ad_lbn = lbn;
-	adp->ad_newblkno = newblkno;
-	adp->ad_oldblkno = oldblkno;
-	adp->ad_newsize = newsize;
-	adp->ad_oldsize = oldsize;
-	adp->ad_state = ATTACHED;
-	if (newblkno == oldblkno)
-		adp->ad_freefrag = NULL;
-	else
-		adp->ad_freefrag = newfreefrag(ip, oldblkno, oldsize);
-
-	if (newblk_lookup(ip->i_fs, newblkno, 0, &newblk) == 0)
-		panic("softdep_setup_allocdirect: lost block");
-
-	ACQUIRE_LOCK(&lk);
-	(void) inodedep_lookup(ip->i_fs, ip->i_number, DEPALLOC, &inodedep);
-	adp->ad_inodedep = inodedep;
-
-	if (newblk->nb_state == DEPCOMPLETE) {
-		adp->ad_state |= DEPCOMPLETE;
-		adp->ad_buf = NULL;
-	} else {
-		bmsafemap = newblk->nb_bmsafemap;
-		adp->ad_buf = bmsafemap->sm_buf;
-		LIST_REMOVE(newblk, nb_deps);
-		LIST_INSERT_HEAD(&bmsafemap->sm_allocdirecthd, adp, ad_deps);
-	}
-	LIST_REMOVE(newblk, nb_hash);
-	FREE(newblk, M_NEWBLK);
-
-	WORKLIST_INSERT(&bp->b_dep, &adp->ad_list);
-	if (lbn >= NDADDR) {
-		/* allocating an indirect block */
-		if (oldblkno != 0)
-			panic("softdep_setup_allocdirect: non-zero indir");
-	} else {
-		/*
-		 * Allocating a direct block.
-		 *
-		 * If we are allocating a directory block, then we must
-		 * allocate an associated pagedep to track additions and
-		 * deletions.
-		 */
-		if ((ip->i_mode & IFMT) == IFDIR &&
-		    pagedep_lookup(ip, lbn, DEPALLOC, &pagedep) == 0)
-			WORKLIST_INSERT(&bp->b_dep, &pagedep->pd_list);
-	}
-	/*
-	 * The list of allocdirects must be kept in sorted and ascending
-	 * order so that the rollback routines can quickly determine the
-	 * first uncommitted block (the size of the file stored on disk
-	 * ends at the end of the lowest committed fragment, or if there
-	 * are no fragments, at the end of the highest committed block).
-	 * Since files generally grow, the typical case is that the new
-	 * block is to be added at the end of the list. We speed this
-	 * special case by checking against the last allocdirect in the
-	 * list before laboriously traversing the list looking for the
-	 * insertion point.
-	 */
-	adphead = &inodedep->id_newinoupdt;
-	oldadp = TAILQ_LAST(adphead, allocdirectlst);
-	if (oldadp == NULL || oldadp->ad_lbn <= lbn) {
-		/* insert at end of list */
-		TAILQ_INSERT_TAIL(adphead, adp, ad_next);
-		if (oldadp != NULL && oldadp->ad_lbn == lbn)
-			allocdirect_merge(adphead, adp, oldadp);
-		FREE_LOCK(&lk);
-		return;
-	}
-	for (oldadp = TAILQ_FIRST(adphead); oldadp;
-	     oldadp = TAILQ_NEXT(oldadp, ad_next)) {
-		if (oldadp->ad_lbn >= lbn)
-			break;
-	}
-	if (oldadp == NULL)
-		panic("softdep_setup_allocdirect: lost entry");
-	/* insert in middle of list */
-	TAILQ_INSERT_BEFORE(oldadp, adp, ad_next);
-	if (oldadp->ad_lbn == lbn)
-		allocdirect_merge(adphead, adp, oldadp);
-	FREE_LOCK(&lk);
-}
-
-/*
- * Replace an old allocdirect dependency with a newer one.
- * This routine must be called with splbio interrupts blocked.
- */
-static void
-allocdirect_merge(adphead, newadp, oldadp)
-	struct allocdirectlst *adphead;	/* head of list holding allocdirects */
-	struct allocdirect *newadp;	/* allocdirect being added */
-	struct allocdirect *oldadp;	/* existing allocdirect being checked */
-{
-	struct freefrag *freefrag;
-
-#ifdef DEBUG
-	if (lk.lkt_held == -1)
-		panic("allocdirect_merge: lock not held");
-#endif
-	if (newadp->ad_oldblkno != oldadp->ad_newblkno ||
-	    newadp->ad_oldsize != oldadp->ad_newsize ||
-	    newadp->ad_lbn >= NDADDR)
-		panic("allocdirect_check: old %d != new %d || lbn %ld >= %d",
-		    newadp->ad_oldblkno, oldadp->ad_newblkno, newadp->ad_lbn,
-		    NDADDR);
-	newadp->ad_oldblkno = oldadp->ad_oldblkno;
-	newadp->ad_oldsize = oldadp->ad_oldsize;
-	/*
-	 * If the old dependency had a fragment to free or had never
-	 * previously had a block allocated, then the new dependency
-	 * can immediately post its freefrag and adopt the old freefrag.
-	 * This action is done by swapping the freefrag dependencies.
-	 * The new dependency gains the old one's freefrag, and the
-	 * old one gets the new one and then immediately puts it on
-	 * the worklist when it is freed by free_allocdirect. It is
-	 * not possible to do this swap when the old dependency had a
-	 * non-zero size but no previous fragment to free. This condition
-	 * arises when the new block is an extension of the old block.
-	 * Here, the first part of the fragment allocated to the new
-	 * dependency is part of the block currently claimed on disk by
-	 * the old dependency, so cannot legitimately be freed until the
-	 * conditions for the new dependency are fulfilled.
-	 */
-	if (oldadp->ad_freefrag != NULL || oldadp->ad_oldblkno == 0) {
-		freefrag = newadp->ad_freefrag;
-		newadp->ad_freefrag = oldadp->ad_freefrag;
-		oldadp->ad_freefrag = freefrag;
-	}
-	free_allocdirect(adphead, oldadp, 0);
-}
-		
-/*
- * Allocate a new freefrag structure if needed.
- */
-static struct freefrag *
-newfreefrag(ip, blkno, size)
-	struct inode *ip;
-	ufs_daddr_t blkno;
-	long size;
-{
-	struct freefrag *freefrag;
-	struct fs *fs;
-
-	if (blkno == 0)
-		return (NULL);
-	fs = ip->i_fs;
-	if (fragnum(fs, blkno) + numfrags(fs, size) > fs->fs_frag)
-		panic("newfreefrag: frag size");
-	MALLOC(freefrag, struct freefrag *, sizeof(struct freefrag),
-		M_FREEFRAG, M_WAITOK);
-	freefrag->ff_list.wk_type = D_FREEFRAG;
-	freefrag->ff_state = ip->i_uid & ~ONWORKLIST;	/* XXX - used below */
-	freefrag->ff_inum = ip->i_number;
-	freefrag->ff_fs = fs;
-	freefrag->ff_devvp = ip->i_devvp;
-	freefrag->ff_blkno = blkno;
-	freefrag->ff_fragsize = size;
-	return (freefrag);
-}
-
-/*
- * This workitem de-allocates fragments that were replaced during
- * file block allocation.
- */
-static void 
-handle_workitem_freefrag(freefrag)
-	struct freefrag *freefrag;
-{
-	struct inode tip;
-
-	tip.i_fs = freefrag->ff_fs;
-	tip.i_devvp = freefrag->ff_devvp;
-	tip.i_dev = freefrag->ff_devvp->v_rdev;
-	tip.i_number = freefrag->ff_inum;
-	tip.i_uid = freefrag->ff_state & ~ONWORKLIST;	/* XXX - set above */
-	ffs_blkfree(&tip, freefrag->ff_blkno, freefrag->ff_fragsize);
-	FREE(freefrag, M_FREEFRAG);
-}
-
-/*
- * Indirect block allocation dependencies.
- * 
- * The same dependencies that exist for a direct block also exist when
- * a new block is allocated and pointed to by an entry in a block of
- * indirect pointers. The undo/redo states described above are also
- * used here. Because an indirect block contains many pointers that
- * may have dependencies, a second copy of the entire in-memory indirect
- * block is kept. The buffer cache copy is always completely up-to-date.
- * The second copy, which is used only as a source for disk writes,
- * contains only the safe pointers (i.e., those that have no remaining
- * update dependencies). The second copy is freed when all pointers
- * are safe. The cache is not allowed to replace indirect blocks with
- * pending update dependencies. If a buffer containing an indirect
- * block with dependencies is written, these routines will mark it
- * dirty again. It can only be successfully written once all the
- * dependencies are removed. The ffs_fsync routine in conjunction with
- * softdep_sync_metadata work together to get all the dependencies
- * removed so that a file can be successfully written to disk. Three
- * procedures are used when setting up indirect block pointer
- * dependencies. The division is necessary because of the organization
- * of the "balloc" routine and because of the distinction between file
- * pages and file metadata blocks.
- */
-
-/*
- * Allocate a new allocindir structure.
- */
-static struct allocindir *
-newallocindir(ip, ptrno, newblkno, oldblkno)
-	struct inode *ip;	/* inode for file being extended */
-	int ptrno;		/* offset of pointer in indirect block */
-	ufs_daddr_t newblkno;	/* disk block number being added */
-	ufs_daddr_t oldblkno;	/* previous block number, 0 if none */
-{
-	struct allocindir *aip;
-
-	MALLOC(aip, struct allocindir *, sizeof(struct allocindir),
-		M_ALLOCINDIR, M_WAITOK);
-	bzero(aip, sizeof(struct allocindir));
-	aip->ai_list.wk_type = D_ALLOCINDIR;
-	aip->ai_state = ATTACHED;
-	aip->ai_offset = ptrno;
-	aip->ai_newblkno = newblkno;
-	aip->ai_oldblkno = oldblkno;
-	aip->ai_freefrag = newfreefrag(ip, oldblkno, ip->i_fs->fs_bsize);
-	return (aip);
-}
-
-/*
- * Called just before setting an indirect block pointer
- * to a newly allocated file page.
- */
-void
-softdep_setup_allocindir_page(ip, lbn, bp, ptrno, newblkno, oldblkno, nbp)
-	struct inode *ip;	/* inode for file being extended */
-	ufs_lbn_t lbn;		/* allocated block number within file */
-	struct buf *bp;		/* buffer with indirect blk referencing page */
-	int ptrno;		/* offset of pointer in indirect block */
-	ufs_daddr_t newblkno;	/* disk block number being added */
-	ufs_daddr_t oldblkno;	/* previous block number, 0 if none */
-	struct buf *nbp;	/* buffer holding allocated page */
-{
-	struct allocindir *aip;
-	struct pagedep *pagedep;
-
-	aip = newallocindir(ip, ptrno, newblkno, oldblkno);
-	ACQUIRE_LOCK(&lk);
-	/*
-	 * If we are allocating a directory page, then we must
-	 * allocate an associated pagedep to track additions and
-	 * deletions.
-	 */
-	if ((ip->i_mode & IFMT) == IFDIR &&
-	    pagedep_lookup(ip, lbn, DEPALLOC, &pagedep) == 0)
-		WORKLIST_INSERT(&nbp->b_dep, &pagedep->pd_list);
-	WORKLIST_INSERT(&nbp->b_dep, &aip->ai_list);
-	FREE_LOCK(&lk);
-	setup_allocindir_phase2(bp, ip, aip);
-}
-
-/*
- * Called just before setting an indirect block pointer to a
- * newly allocated indirect block.
- */
-void
-softdep_setup_allocindir_meta(nbp, ip, bp, ptrno, newblkno)
-	struct buf *nbp;	/* newly allocated indirect block */
-	struct inode *ip;	/* inode for file being extended */
-	struct buf *bp;		/* indirect block referencing allocated block */
-	int ptrno;		/* offset of pointer in indirect block */
-	ufs_daddr_t newblkno;	/* disk block number being added */
-{
-	struct allocindir *aip;
-
-	aip = newallocindir(ip, ptrno, newblkno, 0);
-	ACQUIRE_LOCK(&lk);
-	WORKLIST_INSERT(&nbp->b_dep, &aip->ai_list);
-	FREE_LOCK(&lk);
-	setup_allocindir_phase2(bp, ip, aip);
-}
-
-/*
- * Called to finish the allocation of the "aip" allocated
- * by one of the two routines above.
- */
-static void 
-setup_allocindir_phase2(bp, ip, aip)
-	struct buf *bp;		/* in-memory copy of the indirect block */
-	struct inode *ip;	/* inode for file being extended */
-	struct allocindir *aip;	/* allocindir allocated by the above routines */
-{
-	struct worklist *wk;
-	struct indirdep *indirdep, *newindirdep;
-	struct bmsafemap *bmsafemap;
-	struct allocindir *oldaip;
-	struct freefrag *freefrag;
-	struct newblk *newblk;
-
-	if (bp->b_lblkno >= 0)
-		panic("setup_allocindir_phase2: not indir blk");
-	for (indirdep = NULL, newindirdep = NULL; ; ) {
-		ACQUIRE_LOCK(&lk);
-		for (wk = LIST_FIRST(&bp->b_dep); wk;
-		     wk = LIST_NEXT(wk, wk_list)) {
-			if (wk->wk_type != D_INDIRDEP)
-				continue;
-			indirdep = WK_INDIRDEP(wk);
-			break;
-		}
-		if (indirdep == NULL && newindirdep) {
-			indirdep = newindirdep;
-			WORKLIST_INSERT(&bp->b_dep, &indirdep->ir_list);
-			newindirdep = NULL;
-		}
-		FREE_LOCK(&lk);
-		if (indirdep) {
-			if (newblk_lookup(ip->i_fs, aip->ai_newblkno, 0,
-			    &newblk) == 0)
-				panic("setup_allocindir: lost block");
-			ACQUIRE_LOCK(&lk);
-			if (newblk->nb_state == DEPCOMPLETE) {
-				aip->ai_state |= DEPCOMPLETE;
-				aip->ai_buf = NULL;
-			} else {
-				bmsafemap = newblk->nb_bmsafemap;
-				aip->ai_buf = bmsafemap->sm_buf;
-				LIST_REMOVE(newblk, nb_deps);
-				LIST_INSERT_HEAD(&bmsafemap->sm_allocindirhd,
-				    aip, ai_deps);
-			}
-			LIST_REMOVE(newblk, nb_hash);
-			FREE(newblk, M_NEWBLK);
-			aip->ai_indirdep = indirdep;
-			/*
-			 * Check to see if there is an existing dependency
-			 * for this block. If there is, merge the old
-			 * dependency into the new one.
-			 */
-			if (aip->ai_oldblkno == 0)
-				oldaip = NULL;
-			else
-				for (oldaip=LIST_FIRST(&indirdep->ir_deplisthd);
-				    oldaip; oldaip = LIST_NEXT(oldaip, ai_next))
-					if (oldaip->ai_offset == aip->ai_offset)
-						break;
-			if (oldaip != NULL) {
-				if (oldaip->ai_newblkno != aip->ai_oldblkno)
-					panic("setup_allocindir_phase2: blkno");
-				aip->ai_oldblkno = oldaip->ai_oldblkno;
-				freefrag = oldaip->ai_freefrag;
-				oldaip->ai_freefrag = aip->ai_freefrag;
-				aip->ai_freefrag = freefrag;
-				free_allocindir(oldaip, NULL);
-			}
-			LIST_INSERT_HEAD(&indirdep->ir_deplisthd, aip, ai_next);
-			((ufs_daddr_t *)indirdep->ir_savebp->b_data)
-			    [aip->ai_offset] = aip->ai_oldblkno;
-			FREE_LOCK(&lk);
-		}
-		if (newindirdep) {
-			if (indirdep->ir_savebp != NULL)
-				brelse(newindirdep->ir_savebp);
-			WORKITEM_FREE((caddr_t)newindirdep, D_INDIRDEP);
-		}
-		if (indirdep)
-			break;
-		MALLOC(newindirdep, struct indirdep *, sizeof(struct indirdep),
-			M_INDIRDEP, M_WAITOK);
-		newindirdep->ir_list.wk_type = D_INDIRDEP;
-		newindirdep->ir_state = ATTACHED;
-		LIST_INIT(&newindirdep->ir_deplisthd);
-		LIST_INIT(&newindirdep->ir_donehd);
-		if (bp->b_blkno == bp->b_lblkno) {
-			VOP_BMAP(bp->b_vp, bp->b_lblkno, NULL, &bp->b_blkno,
-				NULL, NULL);
-		}
-		newindirdep->ir_savebp =
-		    getblk(ip->i_devvp, bp->b_blkno, bp->b_bcount, 0, 0);
-		bcopy(bp->b_data, newindirdep->ir_savebp->b_data, bp->b_bcount);
-	}
-}
-
-/*
- * Block de-allocation dependencies.
- * 
- * When blocks are de-allocated, the on-disk pointers must be nullified before
- * the blocks are made available for use by other files.  (The true
- * requirement is that old pointers must be nullified before new on-disk
- * pointers are set.  We chose this slightly more stringent requirement to
- * reduce complexity.) Our implementation handles this dependency by updating
- * the inode (or indirect block) appropriately but delaying the actual block
- * de-allocation (i.e., freemap and free space count manipulation) until
- * after the updated versions reach stable storage.  After the disk is
- * updated, the blocks can be safely de-allocated whenever it is convenient.
- * This implementation handles only the common case of reducing a file's
- * length to zero. Other cases are handled by the conventional synchronous
- * write approach.
- *
- * The ffs implementation with which we worked double-checks
- * the state of the block pointers and file size as it reduces
- * a file's length.  Some of this code is replicated here in our
- * soft updates implementation.  The freeblks->fb_chkcnt field is
- * used to transfer a part of this information to the procedure
- * that eventually de-allocates the blocks.
- *
- * This routine should be called from the routine that shortens
- * a file's length, before the inode's size or block pointers
- * are modified. It will save the block pointer information for
- * later release and zero the inode so that the calling routine
- * can release it.
- */
-static long num_freeblks;	/* number of freeblks allocated */
-void
-softdep_setup_freeblocks(ip, length)
-	struct inode *ip;	/* The inode whose length is to be reduced */
-	off_t length;		/* The new length for the file */
-{
-	struct freeblks *freeblks;
-	struct inodedep *inodedep;
-	struct allocdirect *adp;
-	struct vnode *vp;
-	struct buf *bp;
-	struct fs *fs;
-	int i, error;
-
-	fs = ip->i_fs;
-	if (length != 0)
-		panic("softde_setup_freeblocks: non-zero length");
-	(void) checklimit(&num_freeblks, 0);
-	num_freeblks += 1;
-	MALLOC(freeblks, struct freeblks *, sizeof(struct freeblks),
-		M_FREEBLKS, M_WAITOK);
-	bzero(freeblks, sizeof(struct freeblks));
-	freeblks->fb_list.wk_type = D_FREEBLKS;
-	freeblks->fb_uid = ip->i_uid;
-	freeblks->fb_previousinum = ip->i_number;
-	freeblks->fb_devvp = ip->i_devvp;
-	freeblks->fb_fs = fs;
-	freeblks->fb_oldsize = ip->i_size;
-	freeblks->fb_newsize = length;
-	freeblks->fb_chkcnt = ip->i_blocks;
-	for (i = 0; i < NDADDR; i++) {
-		freeblks->fb_dblks[i] = ip->i_db[i];
-		ip->i_db[i] = 0;
-	}
-	for (i = 0; i < NIADDR; i++) {
-		freeblks->fb_iblks[i] = ip->i_ib[i];
-		ip->i_ib[i] = 0;
-	}
-	ip->i_blocks = 0;
-	ip->i_size = 0;
-	/*
-	 * Push the zero'ed inode to to its disk buffer so that we are free
-	 * to delete its dependencies below. Once the dependencies are gone
-	 * the buffer can be safely released.
-	 */
-	if ((error = bread(ip->i_devvp,
-	    fsbtodb(fs, ino_to_fsba(fs, ip->i_number)),
-	    (int)fs->fs_bsize, NOCRED, &bp)) != 0)
-		softdep_error("softdep_setup_freeblocks", error);
-	*((struct dinode *)bp->b_data + ino_to_fsbo(fs, ip->i_number)) =
-	    ip->i_din;
-	/*
-	 * Find and eliminate any inode dependencies.
-	 */
-	ACQUIRE_LOCK(&lk);
-	(void) inodedep_lookup(fs, ip->i_number, DEPALLOC, &inodedep);
-	if ((inodedep->id_state & IOSTARTED) != 0)
-		panic("softdep_setup_freeblocks: inode busy");
-	/*
-	 * Add the freeblks structure to the list of operations that
-	 * must await the zero'ed inode being written to disk.
-	 */
-	WORKLIST_INSERT(&inodedep->id_bufwait, &freeblks->fb_list);
-	/*
-	 * Because the file length has been truncated to zero, any
-	 * pending block allocation dependency structures associated
-	 * with this inode are obsolete and can simply be de-allocated.
-	 * We must first merge the two dependency lists to get rid of
-	 * any duplicate freefrag structures, then purge the merged list.
-	 */
-	merge_inode_lists(inodedep);
-	while ((adp = TAILQ_FIRST(&inodedep->id_inoupdt)) != 0)
-		free_allocdirect(&inodedep->id_inoupdt, adp, 1);
-	FREE_LOCK(&lk);
-	bdwrite(bp);
-	/*
-	 * We must wait for any I/O in progress to finish so that
-	 * all potential buffers on the dirty list will be visible.
-	 * Once they are all there, walk the list and get rid of
-	 * any dependencies.
-	 */
-	vp = ITOV(ip);
-	ACQUIRE_LOCK(&lk);
-	drain_output(vp, 1);
-	while (getdirtybuf(&TAILQ_FIRST(&vp->v_dirtyblkhd), MNT_WAIT)) {
-		bp = TAILQ_FIRST(&vp->v_dirtyblkhd);
-		(void) inodedep_lookup(fs, ip->i_number, 0, &inodedep);
-		deallocate_dependencies(bp, inodedep);
-		bp->b_flags |= B_INVAL | B_NOCACHE;
-		FREE_LOCK(&lk);
-		brelse(bp);
-		ACQUIRE_LOCK(&lk);
-	}
-	/*
-	 * Try freeing the inodedep in case that was the last dependency.
-	 */
-	if ((inodedep_lookup(fs, ip->i_number, 0, &inodedep)) != 0)
-		(void) free_inodedep(inodedep);
-	FREE_LOCK(&lk);
-}
-
-/*
- * Reclaim any dependency structures from a buffer that is about to
- * be reallocated to a new vnode. The buffer must be locked, thus,
- * no I/O completion operations can occur while we are manipulating
- * its associated dependencies. The mutex is held so that other I/O's
- * associated with related dependencies do not occur.
- */
-static void
-deallocate_dependencies(bp, inodedep)
-	struct buf *bp;
-	struct inodedep *inodedep;
-{
-	struct worklist *wk;
-	struct indirdep *indirdep;
-	struct allocindir *aip;
-	struct pagedep *pagedep;
-	struct dirrem *dirrem;
-	struct diradd *dap;
-	int i;
-
-	while ((wk = LIST_FIRST(&bp->b_dep)) != NULL) {
-		switch (wk->wk_type) {
-
-		case D_INDIRDEP:
-			indirdep = WK_INDIRDEP(wk);
-			/*
-			 * None of the indirect pointers will ever be visible,
-			 * so they can simply be tossed. GOINGAWAY ensures
-			 * that allocated pointers will be saved in the buffer
-			 * cache until they are freed. Note that they will
-			 * only be able to be found by their physical address
-			 * since the inode mapping the logical address will
-			 * be gone. The save buffer used for the safe copy
-			 * was allocated in setup_allocindir_phase2 using
-			 * the physical address so it could be used for this
-			 * purpose. Hence we swap the safe copy with the real
-			 * copy, allowing the safe copy to be freed and holding
-			 * on to the real copy for later use in indir_trunc.
-			 */
-			if (indirdep->ir_state & GOINGAWAY)
-				panic("deallocate_dependencies: already gone");
-			indirdep->ir_state |= GOINGAWAY;
-			while ((aip = LIST_FIRST(&indirdep->ir_deplisthd)) != 0)
-				free_allocindir(aip, inodedep);
-			if (bp->b_lblkno >= 0 ||
-			    bp->b_blkno != indirdep->ir_savebp->b_lblkno)
-				panic("deallocate_dependencies: not indir");
-			bcopy(bp->b_data, indirdep->ir_savebp->b_data,
-			    bp->b_bcount);
-			WORKLIST_REMOVE(wk);
-			WORKLIST_INSERT(&indirdep->ir_savebp->b_dep, wk);
-			continue;
-
-		case D_PAGEDEP:
-			pagedep = WK_PAGEDEP(wk);
-			/*
-			 * None of the directory additions will ever be
-			 * visible, so they can simply be tossed.
-			 */
-			for (i = 0; i < DAHASHSZ; i++)
-				while (dap=LIST_FIRST(&pagedep->pd_diraddhd[i]))
-					free_diradd(dap);
-			while ((dap = LIST_FIRST(&pagedep->pd_pendinghd)) != 0)
-				free_diradd(dap);
-			/*
-			 * Copy any directory remove dependencies to the list
-			 * to be processed after the zero'ed inode is written.
-			 * If the inode has already been written, then they 
-			 * can be dumped directly onto the work list.
-			 */
-			for (dirrem = LIST_FIRST(&pagedep->pd_dirremhd); dirrem;
-			     dirrem = LIST_NEXT(dirrem, dm_next)) {
-				LIST_REMOVE(dirrem, dm_next);
-				dirrem->dm_dirinum = pagedep->pd_ino;
-				if (inodedep == NULL)
-					add_to_worklist(&dirrem->dm_list);
-				else
-					WORKLIST_INSERT(&inodedep->id_bufwait,
-					    &dirrem->dm_list);
-			}
-			WORKLIST_REMOVE(&pagedep->pd_list);
-			LIST_REMOVE(pagedep, pd_hash);
-			WORKITEM_FREE(pagedep, D_PAGEDEP);
-			continue;
-
-		case D_ALLOCINDIR:
-			free_allocindir(WK_ALLOCINDIR(wk), inodedep);
-			continue;
-
-		case D_ALLOCDIRECT:
-		case D_INODEDEP:
-			panic("deallocate_dependencies: Unexpected type %s",
-			    TYPENAME(wk->wk_type));
-			/* NOTREACHED */
-
-		default:
-			panic("deallocate_dependencies: Unknown type %s",
-			    TYPENAME(wk->wk_type));
-			/* NOTREACHED */
-		}
-	}
-}
-
-/*
- * Free an allocdirect. Generate a new freefrag work request if appropriate.
- * This routine must be called with splbio interrupts blocked.
- */
-static void
-free_allocdirect(adphead, adp, delay)
-	struct allocdirectlst *adphead;
-	struct allocdirect *adp;
-	int delay;
-{
-
-#ifdef DEBUG
-	if (lk.lkt_held == -1)
-		panic("free_allocdirect: lock not held");
-#endif
-	if ((adp->ad_state & DEPCOMPLETE) == 0)
-		LIST_REMOVE(adp, ad_deps);
-	TAILQ_REMOVE(adphead, adp, ad_next);
-	if ((adp->ad_state & COMPLETE) == 0)
-		WORKLIST_REMOVE(&adp->ad_list);
-	if (adp->ad_freefrag != NULL) {
-		if (delay)
-			WORKLIST_INSERT(&adp->ad_inodedep->id_bufwait,
-			    &adp->ad_freefrag->ff_list);
-		else
-			add_to_worklist(&adp->ad_freefrag->ff_list);
-	}
-	WORKITEM_FREE(adp, D_ALLOCDIRECT);
-}
-
-/*
- * Prepare an inode to be freed. The actual free operation is not
- * done until the zero'ed inode has been written to disk.
- */
-static long num_freefile;	/* number of freefile allocated */
-void
-softdep_freefile(pvp, ino, mode)
-		struct vnode *pvp;
-		ino_t ino;
-		int mode;
-{
-	struct inode *ip = VTOI(pvp);
-	struct inodedep *inodedep;
-	struct freefile *freefile;
-
-	/*
-	 * This sets up the inode de-allocation dependency.
-	 */
-	(void) checklimit(&num_freefile, 0);
-	num_freefile += 1;
-	MALLOC(freefile, struct freefile *, sizeof(struct freefile),
-		M_FREEFILE, M_WAITOK);
-	freefile->fx_list.wk_type = D_FREEFILE;
-	freefile->fx_list.wk_state = 0;
-	freefile->fx_mode = mode;
-	freefile->fx_oldinum = ino;
-	freefile->fx_devvp = ip->i_devvp;
-	freefile->fx_fs = ip->i_fs;
-
-	/*
-	 * If the inodedep does not exist, then the zero'ed inode has
-	 * been written to disk and we can free the file immediately.
-	 */
-	ACQUIRE_LOCK(&lk);
-	if (inodedep_lookup(ip->i_fs, ino, 0, &inodedep) == 0) {
-		add_to_worklist(&freefile->fx_list);
-		FREE_LOCK(&lk);
-		return;
-	}
-
-	/*
-	 * If we still have a bitmap dependency, then the inode has never
-	 * been written to disk. Drop the dependency as it is no longer
-	 * necessary since the inode is being deallocated. We could process
-	 * the freefile immediately, but then we would have to clear the
-	 * id_inowait dependencies here and it is easier just to let the
-	 * zero'ed inode be written and let them be cleaned up in the
-	 * normal followup actions that follow the inode write.
-	 */
-	 if ((inodedep->id_state & DEPCOMPLETE) == 0) {
-		inodedep->id_state |= DEPCOMPLETE;
-		LIST_REMOVE(inodedep, id_deps);
-		inodedep->id_buf = NULL;
-	}
-	/*
-	 * If the inodedep has no dependencies associated with it,
-	 * then we must free it here and free the file immediately.
-	 * This case arises when an early allocation fails (for
-	 * example, the user is over their file quota).
-	 */
-	if (free_inodedep(inodedep) == 0)
-		WORKLIST_INSERT(&inodedep->id_inowait, &freefile->fx_list);
-	else
-		add_to_worklist(&freefile->fx_list);
-	FREE_LOCK(&lk);
-}
-
-/*
- * Try to free an inodedep structure. Return 1 if it could be freed.
- */
-static int
-free_inodedep(inodedep)
-	struct inodedep *inodedep;
-{
-
-	if ((inodedep->id_state & ONWORKLIST) != 0 ||
-	    (inodedep->id_state & ALLCOMPLETE) != ALLCOMPLETE ||
-	    LIST_FIRST(&inodedep->id_pendinghd) != NULL ||
-	    LIST_FIRST(&inodedep->id_bufwait) != NULL ||
-	    LIST_FIRST(&inodedep->id_inowait) != NULL ||
-	    TAILQ_FIRST(&inodedep->id_inoupdt) != NULL ||
-	    TAILQ_FIRST(&inodedep->id_newinoupdt) != NULL ||
-	    inodedep->id_nlinkdelta != 0 || inodedep->id_savedino != NULL)
-		return (0);
-	LIST_REMOVE(inodedep, id_hash);
-	WORKITEM_FREE(inodedep, D_INODEDEP);
-	num_inodedep -= 1;
-	return (1);
-}
-
-/*
- * This workitem routine performs the block de-allocation.
- * The workitem is added to the pending list after the updated
- * inode block has been written to disk.  As mentioned above,
- * checks regarding the number of blocks de-allocated (compared
- * to the number of blocks allocated for the file) are also
- * performed in this function.
- */
-static void
-handle_workitem_freeblocks(freeblks)
-	struct freeblks *freeblks;
-{
-	struct inode tip;
-	ufs_daddr_t bn;
-	struct fs *fs;
-	int i, level, bsize;
-	long nblocks, blocksreleased = 0;
-	int error, allerror = 0;
-	ufs_lbn_t baselbns[NIADDR], tmpval;
-
-	tip.i_number = freeblks->fb_previousinum;
-	tip.i_devvp = freeblks->fb_devvp;
-	tip.i_dev = freeblks->fb_devvp->v_rdev;
-	tip.i_fs = freeblks->fb_fs;
-	tip.i_size = freeblks->fb_oldsize;
-	tip.i_uid = freeblks->fb_uid;
-	fs = freeblks->fb_fs;
-	tmpval = 1;
-	baselbns[0] = NDADDR;
-	for (i = 1; i < NIADDR; i++) {
-		tmpval *= NINDIR(fs);
-		baselbns[i] = baselbns[i - 1] + tmpval;
-	}
-	nblocks = btodb(fs->fs_bsize);
-	blocksreleased = 0;
-	/*
-	 * Indirect blocks first.
-	 */
-	for (level = (NIADDR - 1); level >= 0; level--) {
-		if ((bn = freeblks->fb_iblks[level]) == 0)
-			continue;
-		if ((error = indir_trunc(&tip, fsbtodb(fs, bn), level,
-		    baselbns[level], &blocksreleased)) == 0)
-			allerror = error;
-		ffs_blkfree(&tip, bn, fs->fs_bsize);
-		blocksreleased += nblocks;
-	}
-	/*
-	 * All direct blocks or frags.
-	 */
-	for (i = (NDADDR - 1); i >= 0; i--) {
-		if ((bn = freeblks->fb_dblks[i]) == 0)
-			continue;
-		bsize = blksize(fs, &tip, i);
-		ffs_blkfree(&tip, bn, bsize);
-		blocksreleased += btodb(bsize);
-	}
-
-#ifdef DIAGNOSTIC
-	if (freeblks->fb_chkcnt != blocksreleased)
-		panic("handle_workitem_freeblocks: block count");
-	if (allerror)
-		softdep_error("handle_workitem_freeblks", allerror);
-#endif /* DIAGNOSTIC */
-	WORKITEM_FREE(freeblks, D_FREEBLKS);
-	num_freeblks -= 1;
-}
-
-/*
- * Release blocks associated with the inode ip and stored in the indirect
- * block dbn. If level is greater than SINGLE, the block is an indirect block
- * and recursive calls to indirtrunc must be used to cleanse other indirect
- * blocks.
- */
-static int
-indir_trunc(ip, dbn, level, lbn, countp)
-	struct inode *ip;
-	ufs_daddr_t dbn;
-	int level;
-	ufs_lbn_t lbn;
-	long *countp;
-{
-	struct buf *bp;
-	ufs_daddr_t *bap;
-	ufs_daddr_t nb;
-	struct fs *fs;
-	struct worklist *wk;
-	struct indirdep *indirdep;
-	int i, lbnadd, nblocks;
-	int error, allerror = 0;
-
-	fs = ip->i_fs;
-	lbnadd = 1;
-	for (i = level; i > 0; i--)
-		lbnadd *= NINDIR(fs);
-	/*
-	 * Get buffer of block pointers to be freed. This routine is not
-	 * called until the zero'ed inode has been written, so it is safe
-	 * to free blocks as they are encountered. Because the inode has
-	 * been zero'ed, calls to bmap on these blocks will fail. So, we
-	 * have to use the on-disk address and the block device for the
-	 * filesystem to look them up. If the file was deleted before its
-	 * indirect blocks were all written to disk, the routine that set
-	 * us up (deallocate_dependencies) will have arranged to leave
-	 * a complete copy of the indirect block in memory for our use.
-	 * Otherwise we have to read the blocks in from the disk.
-	 */
-	ACQUIRE_LOCK(&lk);
-	if ((bp = incore(ip->i_devvp, dbn)) != NULL &&
-	    (wk = LIST_FIRST(&bp->b_dep)) != NULL) {
-		if (wk->wk_type != D_INDIRDEP ||
-		    (indirdep = WK_INDIRDEP(wk))->ir_savebp != bp ||
-		    (indirdep->ir_state & GOINGAWAY) == 0)
-			panic("indir_trunc: lost indirdep");
-		WORKLIST_REMOVE(wk);
-		WORKITEM_FREE(indirdep, D_INDIRDEP);
-		if (LIST_FIRST(&bp->b_dep) != NULL)
-			panic("indir_trunc: dangling dep");
-		FREE_LOCK(&lk);
-	} else {
-		FREE_LOCK(&lk);
-		error = bread(ip->i_devvp, dbn, (int)fs->fs_bsize, NOCRED, &bp);
-		if (error)
-			return (error);
-	}
-	/*
-	 * Recursively free indirect blocks.
-	 */
-	bap = (ufs_daddr_t *)bp->b_data;
-	nblocks = btodb(fs->fs_bsize);
-	for (i = NINDIR(fs) - 1; i >= 0; i--) {
-		if ((nb = bap[i]) == 0)
-			continue;
-		if (level != 0) {
-			if ((error = indir_trunc(ip, fsbtodb(fs, nb),
-			     level - 1, lbn + (i * lbnadd), countp)) != 0)
-				allerror = error;
-		}
-		ffs_blkfree(ip, nb, fs->fs_bsize);
-		*countp += nblocks;
-	}
-	bp->b_flags |= B_INVAL | B_NOCACHE;
-	brelse(bp);
-	return (allerror);
-}
-
-/*
- * Free an allocindir.
- * This routine must be called with splbio interrupts blocked.
- */
-static void
-free_allocindir(aip, inodedep)
-	struct allocindir *aip;
-	struct inodedep *inodedep;
-{
-	struct freefrag *freefrag;
-
-#ifdef DEBUG
-	if (lk.lkt_held == -1)
-		panic("free_allocindir: lock not held");
-#endif
-	if ((aip->ai_state & DEPCOMPLETE) == 0)
-		LIST_REMOVE(aip, ai_deps);
-	if (aip->ai_state & ONWORKLIST)
-		WORKLIST_REMOVE(&aip->ai_list);
-	LIST_REMOVE(aip, ai_next);
-	if ((freefrag = aip->ai_freefrag) != NULL) {
-		if (inodedep == NULL)
-			add_to_worklist(&freefrag->ff_list);
-		else
-			WORKLIST_INSERT(&inodedep->id_bufwait,
-			    &freefrag->ff_list);
-	}
-	WORKITEM_FREE(aip, D_ALLOCINDIR);
-}
-
-/*
- * Directory entry addition dependencies.
- * 
- * When adding a new directory entry, the inode (with its incremented link
- * count) must be written to disk before the directory entry's pointer to it.
- * Also, if the inode is newly allocated, the corresponding freemap must be
- * updated (on disk) before the directory entry's pointer. These requirements
- * are met via undo/redo on the directory entry's pointer, which consists
- * simply of the inode number.
- * 
- * As directory entries are added and deleted, the free space within a
- * directory block can become fragmented.  The ufs file system will compact
- * a fragmented directory block to make space for a new entry. When this
- * occurs, the offsets of previously added entries change. Any "diradd"
- * dependency structures corresponding to these entries must be updated with
- * the new offsets.
- */
-
-/*
- * This routine is called after the in-memory inode's link
- * count has been incremented, but before the directory entry's
- * pointer to the inode has been set.
- */
-void 
-softdep_setup_directory_add(bp, dp, diroffset, newinum, newdirbp)
-	struct buf *bp;		/* buffer containing directory block */
-	struct inode *dp;	/* inode for directory */
-	off_t diroffset;	/* offset of new entry in directory */
-	long newinum;		/* inode referenced by new directory entry */
-	struct buf *newdirbp;	/* non-NULL => contents of new mkdir */
-{
-	int offset;		/* offset of new entry within directory block */
-	ufs_lbn_t lbn;		/* block in directory containing new entry */
-	struct fs *fs;
-	struct diradd *dap;
-	struct pagedep *pagedep;
-	struct inodedep *inodedep;
-	struct mkdir *mkdir1, *mkdir2;
-
-	/*
-	 * Whiteouts have no dependencies.
-	 */
-	if (newinum == WINO) {
-		if (newdirbp != NULL)
-			bdwrite(newdirbp);
-		return;
-	}
-
-	fs = dp->i_fs;
-	lbn = lblkno(fs, diroffset);
-	offset = blkoff(fs, diroffset);
-	MALLOC(dap, struct diradd *, sizeof(struct diradd), M_DIRADD, M_WAITOK);
-	bzero(dap, sizeof(struct diradd));
-	dap->da_list.wk_type = D_DIRADD;
-	dap->da_offset = offset;
-	dap->da_newinum = newinum;
-	dap->da_state = ATTACHED;
-	if (newdirbp == NULL) {
-		dap->da_state |= DEPCOMPLETE;
-		ACQUIRE_LOCK(&lk);
-	} else {
-		dap->da_state |= MKDIR_BODY | MKDIR_PARENT;
-		MALLOC(mkdir1, struct mkdir *, sizeof(struct mkdir), M_MKDIR,
-		    M_WAITOK);
-		mkdir1->md_list.wk_type = D_MKDIR;
-		mkdir1->md_state = MKDIR_BODY;
-		mkdir1->md_diradd = dap;
-		MALLOC(mkdir2, struct mkdir *, sizeof(struct mkdir), M_MKDIR,
-		    M_WAITOK);
-		mkdir2->md_list.wk_type = D_MKDIR;
-		mkdir2->md_state = MKDIR_PARENT;
-		mkdir2->md_diradd = dap;
-		/*
-		 * Dependency on "." and ".." being written to disk.
-		 */
-		mkdir1->md_buf = newdirbp;
-		ACQUIRE_LOCK(&lk);
-		LIST_INSERT_HEAD(&mkdirlisthd, mkdir1, md_mkdirs);
-		WORKLIST_INSERT(&newdirbp->b_dep, &mkdir1->md_list);
-		FREE_LOCK(&lk);
-		bdwrite(newdirbp);
-		/*
-		 * Dependency on link count increase for parent directory
-		 */
-		ACQUIRE_LOCK(&lk);
-		if (inodedep_lookup(dp->i_fs, dp->i_number, 0, &inodedep) == 0
-		    || (inodedep->id_state & ALLCOMPLETE) == ALLCOMPLETE) {
-			dap->da_state &= ~MKDIR_PARENT;
-			WORKITEM_FREE(mkdir2, D_MKDIR);
-		} else {
-			LIST_INSERT_HEAD(&mkdirlisthd, mkdir2, md_mkdirs);
-			WORKLIST_INSERT(&inodedep->id_bufwait,&mkdir2->md_list);
-		}
-	}
-	/*
-	 * Link into parent directory pagedep to await its being written.
-	 */
-	if (pagedep_lookup(dp, lbn, DEPALLOC, &pagedep) == 0)
-		WORKLIST_INSERT(&bp->b_dep, &pagedep->pd_list);
-	dap->da_pagedep = pagedep;
-	LIST_INSERT_HEAD(&pagedep->pd_diraddhd[DIRADDHASH(offset)], dap,
-	    da_pdlist);
-	/*
-	 * Link into its inodedep. Put it on the id_bufwait list if the inode
-	 * is not yet written. If it is written, do the post-inode write
-	 * processing to put it on the id_pendinghd list.
-	 */
-	(void) inodedep_lookup(fs, newinum, DEPALLOC, &inodedep);
-	if ((inodedep->id_state & ALLCOMPLETE) == ALLCOMPLETE)
-		diradd_inode_written(dap, inodedep);
-	else
-		WORKLIST_INSERT(&inodedep->id_bufwait, &dap->da_list);
-	FREE_LOCK(&lk);
-}
-
-/*
- * This procedure is called to change the offset of a directory
- * entry when compacting a directory block which must be owned
- * exclusively by the caller. Note that the actual entry movement
- * must be done in this procedure to ensure that no I/O completions
- * occur while the move is in progress.
- */
-void 
-softdep_change_directoryentry_offset(dp, base, oldloc, newloc, entrysize)
-	struct inode *dp;	/* inode for directory */
-	caddr_t base;		/* address of dp->i_offset */
-	caddr_t oldloc;		/* address of old directory location */
-	caddr_t newloc;		/* address of new directory location */
-	int entrysize;		/* size of directory entry */
-{
-	int offset, oldoffset, newoffset;
-	struct pagedep *pagedep;
-	struct diradd *dap;
-	ufs_lbn_t lbn;
-
-	ACQUIRE_LOCK(&lk);
-	lbn = lblkno(dp->i_fs, dp->i_offset);
-	offset = blkoff(dp->i_fs, dp->i_offset);
-	if (pagedep_lookup(dp, lbn, 0, &pagedep) == 0)
-		goto done;
-	oldoffset = offset + (oldloc - base);
-	newoffset = offset + (newloc - base);
-	for (dap = LIST_FIRST(&pagedep->pd_diraddhd[DIRADDHASH(oldoffset)]);
-	     dap; dap = LIST_NEXT(dap, da_pdlist)) {
-		if (dap->da_offset != oldoffset)
-			continue;
-		dap->da_offset = newoffset;
-		if (DIRADDHASH(newoffset) == DIRADDHASH(oldoffset))
-			break;
-		LIST_REMOVE(dap, da_pdlist);
-		LIST_INSERT_HEAD(&pagedep->pd_diraddhd[DIRADDHASH(newoffset)],
-		    dap, da_pdlist);
-		break;
-	}
-	if (dap == NULL) {
-		for (dap = LIST_FIRST(&pagedep->pd_pendinghd);
-		     dap; dap = LIST_NEXT(dap, da_pdlist)) {
-			if (dap->da_offset == oldoffset) {
-				dap->da_offset = newoffset;
-				break;
-			}
-		}
-	}
-done:
-	bcopy(oldloc, newloc, entrysize);
-	FREE_LOCK(&lk);
-}
-
-/*
- * Free a diradd dependency structure. This routine must be called
- * with splbio interrupts blocked.
- */
-static void
-free_diradd(dap)
-	struct diradd *dap;
-{
-	struct dirrem *dirrem;
-	struct pagedep *pagedep;
-	struct inodedep *inodedep;
-	struct mkdir *mkdir, *nextmd;
-
-#ifdef DEBUG
-	if (lk.lkt_held == -1)
-		panic("free_diradd: lock not held");
-#endif
-	WORKLIST_REMOVE(&dap->da_list);
-	LIST_REMOVE(dap, da_pdlist);
-	if ((dap->da_state & DIRCHG) == 0) {
-		pagedep = dap->da_pagedep;
-	} else {
-		dirrem = dap->da_previous;
-		pagedep = dirrem->dm_pagedep;
-		dirrem->dm_dirinum = pagedep->pd_ino;
-		add_to_worklist(&dirrem->dm_list);
-	}
-	if (inodedep_lookup(VFSTOUFS(pagedep->pd_mnt)->um_fs, dap->da_newinum,
-	    0, &inodedep) != 0)
-		(void) free_inodedep(inodedep);
-	if ((dap->da_state & (MKDIR_PARENT | MKDIR_BODY)) != 0) {
-		for (mkdir = LIST_FIRST(&mkdirlisthd); mkdir; mkdir = nextmd) {
-			nextmd = LIST_NEXT(mkdir, md_mkdirs);
-			if (mkdir->md_diradd != dap)
-				continue;
-			dap->da_state &= ~mkdir->md_state;
-			WORKLIST_REMOVE(&mkdir->md_list);
-			LIST_REMOVE(mkdir, md_mkdirs);
-			WORKITEM_FREE(mkdir, D_MKDIR);
-		}
-		if ((dap->da_state & (MKDIR_PARENT | MKDIR_BODY)) != 0)
-			panic("free_diradd: unfound ref");
-	}
-	WORKITEM_FREE(dap, D_DIRADD);
-}
-
-/*
- * Directory entry removal dependencies.
- * 
- * When removing a directory entry, the entry's inode pointer must be
- * zero'ed on disk before the corresponding inode's link count is decremented
- * (possibly freeing the inode for re-use). This dependency is handled by
- * updating the directory entry but delaying the inode count reduction until
- * after the directory block has been written to disk. After this point, the
- * inode count can be decremented whenever it is convenient.
- */
-
-/*
- * This routine should be called immediately after removing
- * a directory entry.  The inode's link count should not be
- * decremented by the calling procedure -- the soft updates
- * code will do this task when it is safe.
- */
-void 
-softdep_setup_remove(bp, dp, ip, isrmdir)
-	struct buf *bp;		/* buffer containing directory block */
-	struct inode *dp;	/* inode for the directory being modified */
-	struct inode *ip;	/* inode for directory entry being removed */
-	int isrmdir;		/* indicates if doing RMDIR */
-{
-	struct dirrem *dirrem;
-
-	/*
-	 * Allocate a new dirrem if appropriate and ACQUIRE_LOCK.
-	 */
-	dirrem = newdirrem(bp, dp, ip, isrmdir);
-	if ((dirrem->dm_state & COMPLETE) == 0) {
-		LIST_INSERT_HEAD(&dirrem->dm_pagedep->pd_dirremhd, dirrem,
-		    dm_next);
-	} else {
-		dirrem->dm_dirinum = dirrem->dm_pagedep->pd_ino;
-		add_to_worklist(&dirrem->dm_list);
-	}
-	FREE_LOCK(&lk);
-}
-
-/*
- * Allocate a new dirrem if appropriate and return it along with
- * its associated pagedep. Called without a lock, returns with lock.
- */
-static struct dirrem *
-newdirrem(bp, dp, ip, isrmdir)
-	struct buf *bp;		/* buffer containing directory block */
-	struct inode *dp;	/* inode for the directory being modified */
-	struct inode *ip;	/* inode for directory entry being removed */
-	int isrmdir;		/* indicates if doing RMDIR */
-{
-	int offset;
-	ufs_lbn_t lbn;
-	struct diradd *dap;
-	struct dirrem *dirrem;
-	struct pagedep *pagedep;
-
-	/*
-	 * Whiteouts have no deletion dependencies.
-	 */
-	if (ip == NULL)
-		panic("newdirrem: whiteout");
-	MALLOC(dirrem, struct dirrem *, sizeof(struct dirrem),
-		M_DIRREM, M_WAITOK);
-	bzero(dirrem, sizeof(struct dirrem));
-	dirrem->dm_list.wk_type = D_DIRREM;
-	dirrem->dm_state = isrmdir ? RMDIR : 0;
-	dirrem->dm_mnt = ITOV(ip)->v_mount;
-	dirrem->dm_oldinum = ip->i_number;
-
-	ACQUIRE_LOCK(&lk);
-	lbn = lblkno(dp->i_fs, dp->i_offset);
-	offset = blkoff(dp->i_fs, dp->i_offset);
-	if (pagedep_lookup(dp, lbn, DEPALLOC, &pagedep) == 0)
-		WORKLIST_INSERT(&bp->b_dep, &pagedep->pd_list);
-	dirrem->dm_pagedep = pagedep;
-	/*
-	 * Check for a diradd dependency for the same directory entry.
-	 * If present, then both dependencies become obsolete and can
-	 * be de-allocated. Check for an entry on both the pd_dirraddhd
-	 * list and the pd_pendinghd list.
-	 */
-	for (dap = LIST_FIRST(&pagedep->pd_diraddhd[DIRADDHASH(offset)]);
-	     dap; dap = LIST_NEXT(dap, da_pdlist))
-		if (dap->da_offset == offset)
-			break;
-	if (dap == NULL) {
-		for (dap = LIST_FIRST(&pagedep->pd_pendinghd);
-		     dap; dap = LIST_NEXT(dap, da_pdlist))
-			if (dap->da_offset == offset)
-				break;
-		if (dap == NULL)
-			return (dirrem);
-	}
-	/*
-	 * Must be ATTACHED at this point, so just delete it.
-	 */
-	if ((dap->da_state & ATTACHED) == 0)
-		panic("newdirrem: not ATTACHED");
-	if (dap->da_newinum != ip->i_number)
-		panic("newdirrem: inum %d should be %d",
-		    ip->i_number, dap->da_newinum);
-	free_diradd(dap);
-	dirrem->dm_state |= COMPLETE;
-	return (dirrem);
-}
-
-/*
- * Directory entry change dependencies.
- * 
- * Changing an existing directory entry requires that an add operation
- * be completed first followed by a deletion. The semantics for the addition
- * are identical to the description of adding a new entry above except
- * that the rollback is to the old inode number rather than zero. Once
- * the addition dependency is completed, the removal is done as described
- * in the removal routine above.
- */
-
-/*
- * This routine should be called immediately after changing
- * a directory entry.  The inode's link count should not be
- * decremented by the calling procedure -- the soft updates
- * code will perform this task when it is safe.
- */
-void 
-softdep_setup_directory_change(bp, dp, ip, newinum, isrmdir)
-	struct buf *bp;		/* buffer containing directory block */
-	struct inode *dp;	/* inode for the directory being modified */
-	struct inode *ip;	/* inode for directory entry being removed */
-	long newinum;		/* new inode number for changed entry */
-	int isrmdir;		/* indicates if doing RMDIR */
-{
-	int offset;
-	struct diradd *dap = NULL;
-	struct dirrem *dirrem;
-	struct pagedep *pagedep;
-	struct inodedep *inodedep;
-
-	offset = blkoff(dp->i_fs, dp->i_offset);
-
-	/*
-	 * Whiteouts do not need diradd dependencies.
-	 */
-	if (newinum != WINO) {
-		MALLOC(dap, struct diradd *, sizeof(struct diradd),
-		    M_DIRADD, M_WAITOK);
-		bzero(dap, sizeof(struct diradd));
-		dap->da_list.wk_type = D_DIRADD;
-		dap->da_state = DIRCHG | ATTACHED | DEPCOMPLETE;
-		dap->da_offset = offset;
-		dap->da_newinum = newinum;
-	}
-
-	/*
-	 * Allocate a new dirrem and ACQUIRE_LOCK.
-	 */
-	dirrem = newdirrem(bp, dp, ip, isrmdir);
-	pagedep = dirrem->dm_pagedep;
-	/*
-	 * The possible values for isrmdir:
-	 *	0 - non-directory file rename
-	 *	1 - directory rename within same directory
-	 *   inum - directory rename to new directory of given inode number
-	 * When renaming to a new directory, we are both deleting and
-	 * creating a new directory entry, so the link count on the new
-	 * directory should not change. Thus we do not need the followup
-	 * dirrem which is usually done in handle_workitem_remove. We set
-	 * the DIRCHG flag to tell handle_workitem_remove to skip the 
-	 * followup dirrem.
-	 */
-	if (isrmdir > 1)
-		dirrem->dm_state |= DIRCHG;
-
-	/*
-	 * Whiteouts have no additional dependencies,
-	 * so just put the dirrem on the correct list.
-	 */
-	if (newinum == WINO) {
-		if ((dirrem->dm_state & COMPLETE) == 0) {
-			LIST_INSERT_HEAD(&pagedep->pd_dirremhd, dirrem,
-			    dm_next);
-		} else {
-			dirrem->dm_dirinum = pagedep->pd_ino;
-			add_to_worklist(&dirrem->dm_list);
-		}
-		FREE_LOCK(&lk);
-		return;
-	}
-
-	/*
-	 * Link into its inodedep. Put it on the id_bufwait list if the inode
-	 * is not yet written. If it is written, do the post-inode write
-	 * processing to put it on the id_pendinghd list.
-	 */
-	dap->da_previous = dirrem;
-	if (inodedep_lookup(dp->i_fs, newinum, DEPALLOC, &inodedep) == 0 ||
-	    (inodedep->id_state & ALLCOMPLETE) == ALLCOMPLETE) {
-		dap->da_state |= COMPLETE;
-		LIST_INSERT_HEAD(&pagedep->pd_pendinghd, dap, da_pdlist);
-		WORKLIST_INSERT(&inodedep->id_pendinghd, &dap->da_list);
-	} else {
-		LIST_INSERT_HEAD(&pagedep->pd_diraddhd[DIRADDHASH(offset)],
-		    dap, da_pdlist);
-		WORKLIST_INSERT(&inodedep->id_bufwait, &dap->da_list);
-	}
-	/*
-	 * If the previous inode was never written or its previous directory
-	 * entry was never written, then we do not want to roll back to this
-	 * previous value. Instead we want to roll back to zero and immediately
-	 * free the unwritten or unreferenced inode.
-	 */
-	if (dirrem->dm_state & COMPLETE) {
-		dap->da_state &= ~DIRCHG;
-		dap->da_pagedep = pagedep;
-		dirrem->dm_dirinum = pagedep->pd_ino;
-		add_to_worklist(&dirrem->dm_list);
-	}
-	FREE_LOCK(&lk);
-}
-
-/*
- * Called whenever the link count on an inode is increased.
- * It creates an inode dependency so that the new reference(s)
- * to the inode cannot be committed to disk until the updated
- * inode has been written.
- */
-void
-softdep_increase_linkcnt(ip)
-	struct inode *ip;	/* the inode with the increased link count */
-{
-	struct inodedep *inodedep;
-
-	ACQUIRE_LOCK(&lk);
-	(void) inodedep_lookup(ip->i_fs, ip->i_number, DEPALLOC, &inodedep);
-	FREE_LOCK(&lk);
-}
-
-/*
- * This workitem decrements the inode's link count.
- * If the link count reaches zero, the file is removed.
- */
-static void 
-handle_workitem_remove(dirrem)
-	struct dirrem *dirrem;
-{
-	struct proc *p = CURPROC;	/* XXX */
-	struct inodedep *inodedep;
-	struct vnode *vp;
-	struct inode *ip;
-	int error;
-
-	if ((error = VFS_VGET(dirrem->dm_mnt, dirrem->dm_oldinum, &vp)) != 0) {
-		softdep_error("handle_workitem_remove: vget", error);
-		return;
-	}
-	ip = VTOI(vp);
-	/*
-	 * Normal file deletion.
-	 */
-	if ((dirrem->dm_state & RMDIR) == 0) {
-		ip->i_nlink--;
-		if (ip->i_nlink < ip->i_effnlink)
-			panic("handle_workitem_remove: bad file delta");
-		ip->i_flag |= IN_CHANGE;
-		vput(vp);
-		WORKITEM_FREE(dirrem, D_DIRREM);
-		return;
-	}
-	/*
-	 * Directory deletion. Decrement reference count for both the
-	 * just deleted parent directory entry and the reference for ".".
-	 * Next truncate the directory to length zero. When the
-	 * truncation completes, arrange to have the reference count on
-	 * the parent decremented to account for the loss of "..".
-	 */
-	ip->i_nlink -= 2;
-	if (ip->i_nlink < ip->i_effnlink)
-		panic("handle_workitem_remove: bad dir delta");
-	ip->i_flag |= IN_CHANGE;
-	if ((error = UFS_TRUNCATE(vp, (off_t)0, 0, p->p_ucred, p)) != 0)
-		softdep_error("handle_workitem_remove: truncate", error);
-	/*
-	 * Rename a directory to a new parent. Since, we are both deleting
-	 * and creating a new directory entry, the link count on the new
-	 * directory should not change. Thus we skip the followup dirrem.
-	 */
-	if (dirrem->dm_state & DIRCHG) {
-		vput(vp);
-		WORKITEM_FREE(dirrem, D_DIRREM);
-		return;
-	}
-	ACQUIRE_LOCK(&lk);
-	(void) inodedep_lookup(ip->i_fs, dirrem->dm_oldinum, DEPALLOC,
-	    &inodedep);
-	dirrem->dm_state = 0;
-	dirrem->dm_oldinum = dirrem->dm_dirinum;
-	WORKLIST_INSERT(&inodedep->id_inowait, &dirrem->dm_list);
-	FREE_LOCK(&lk);
-	vput(vp);
-}
-
-/*
- * Inode de-allocation dependencies.
- * 
- * When an inode's link count is reduced to zero, it can be de-allocated. We
- * found it convenient to postpone de-allocation until after the inode is
- * written to disk with its new link count (zero).  At this point, all of the
- * on-disk inode's block pointers are nullified and, with careful dependency
- * list ordering, all dependencies related to the inode will be satisfied and
- * the corresponding dependency structures de-allocated.  So, if/when the
- * inode is reused, there will be no mixing of old dependencies with new
- * ones.  This artificial dependency is set up by the block de-allocation
- * procedure above (softdep_setup_freeblocks) and completed by the
- * following procedure.
- */
-static void 
-handle_workitem_freefile(freefile)
-	struct freefile *freefile;
-{
-	struct vnode vp;
-	struct inode tip;
-	struct inodedep *idp;
-	int error;
-
-#ifdef DEBUG
-	ACQUIRE_LOCK(&lk);
-	if (inodedep_lookup(freefile->fx_fs, freefile->fx_oldinum, 0, &idp))
-		panic("handle_workitem_freefile: inodedep survived");
-	FREE_LOCK(&lk);
-#endif
-	tip.i_devvp = freefile->fx_devvp;
-	tip.i_dev = freefile->fx_devvp->v_rdev;
-	tip.i_fs = freefile->fx_fs;
-	vp.v_data = &tip;
-	if ((error = ffs_freefile(&vp, freefile->fx_oldinum, freefile->fx_mode)) != 0)
-		softdep_error("handle_workitem_freefile", error);
-	WORKITEM_FREE(freefile, D_FREEFILE);
-	num_freefile -= 1;
-}
-
-/*
- * Disk writes.
- * 
- * The dependency structures constructed above are most actively used when file
- * system blocks are written to disk.  No constraints are placed on when a
- * block can be written, but unsatisfied update dependencies are made safe by
- * modifying (or replacing) the source memory for the duration of the disk
- * write.  When the disk write completes, the memory block is again brought
- * up-to-date.
- *
- * In-core inode structure reclamation.
- * 
- * Because there are a finite number of "in-core" inode structures, they are
- * reused regularly.  By transferring all inode-related dependencies to the
- * in-memory inode block and indexing them separately (via "inodedep"s), we
- * can allow "in-core" inode structures to be reused at any time and avoid
- * any increase in contention.
- *
- * Called just before entering the device driver to initiate a new disk I/O.
- * The buffer must be locked, thus, no I/O completion operations can occur
- * while we are manipulating its associated dependencies.
- */
-void 
-softdep_disk_io_initiation(bp)
-	struct buf *bp;		/* structure describing disk write to occur */
-{
-	struct worklist *wk, *nextwk;
-	struct indirdep *indirdep;
-
-	/*
-	 * We only care about write operations. There should never
-	 * be dependencies for reads.
-	 */
-	if (bp->b_flags & B_READ)
-		panic("softdep_disk_io_initiation: read");
-	/*
-	 * Do any necessary pre-I/O processing.
-	 */
-	for (wk = LIST_FIRST(&bp->b_dep); wk; wk = nextwk) {
-		nextwk = LIST_NEXT(wk, wk_list);
-		switch (wk->wk_type) {
-
-		case D_PAGEDEP:
-			initiate_write_filepage(WK_PAGEDEP(wk), bp);
-			continue;
-
-		case D_INODEDEP:
-			initiate_write_inodeblock(WK_INODEDEP(wk), bp);
-			continue;
-
-		case D_INDIRDEP:
-			indirdep = WK_INDIRDEP(wk);
-			if (indirdep->ir_state & GOINGAWAY)
-				panic("disk_io_initiation: indirdep gone");
-			/*
-			 * If there are no remaining dependencies, this
-			 * will be writing the real pointers, so the
-			 * dependency can be freed.
-			 */
-			if (LIST_FIRST(&indirdep->ir_deplisthd) == NULL) {
-				indirdep->ir_savebp->b_flags |= B_INVAL | B_NOCACHE;
-				brelse(indirdep->ir_savebp);
-				/* inline expand WORKLIST_REMOVE(wk); */
-				wk->wk_state &= ~ONWORKLIST;
-				LIST_REMOVE(wk, wk_list);
-				WORKITEM_FREE(indirdep, D_INDIRDEP);
-				continue;
-			}
-			/*
-			 * Replace up-to-date version with safe version.
-			 */
-			ACQUIRE_LOCK(&lk);
-			indirdep->ir_state &= ~ATTACHED;
-			indirdep->ir_state |= UNDONE;
-			MALLOC(indirdep->ir_saveddata, caddr_t, bp->b_bcount,
-			    M_INDIRDEP, M_WAITOK);
-			bcopy(bp->b_data, indirdep->ir_saveddata, bp->b_bcount);
-			bcopy(indirdep->ir_savebp->b_data, bp->b_data,
-			    bp->b_bcount);
-			FREE_LOCK(&lk);
-			continue;
-
-		case D_MKDIR:
-		case D_BMSAFEMAP:
-		case D_ALLOCDIRECT:
-		case D_ALLOCINDIR:
-			continue;
-
-		default:
-			panic("handle_disk_io_initiation: Unexpected type %s",
-			    TYPENAME(wk->wk_type));
-			/* NOTREACHED */
-		}
-	}
-}
-
-/*
- * Called from within the procedure above to deal with unsatisfied
- * allocation dependencies in a directory. The buffer must be locked,
- * thus, no I/O completion operations can occur while we are
- * manipulating its associated dependencies.
- */
-static void
-initiate_write_filepage(pagedep, bp)
-	struct pagedep *pagedep;
-	struct buf *bp;
-{
-	struct diradd *dap;
-	struct direct *ep;
-	int i;
-
-	if (pagedep->pd_state & IOSTARTED) {
-		/*
-		 * This can only happen if there is a driver that does not
-		 * understand chaining. Here biodone will reissue the call
-		 * to strategy for the incomplete buffers.
-		 */
-		printf("initiate_write_filepage: already started\n");
-		return;
-	}
-	pagedep->pd_state |= IOSTARTED;
-	ACQUIRE_LOCK(&lk);
-	for (i = 0; i < DAHASHSZ; i++) {
-		for (dap = LIST_FIRST(&pagedep->pd_diraddhd[i]); dap;
-		     dap = LIST_NEXT(dap, da_pdlist)) {
-			ep = (struct direct *)
-			    ((char *)bp->b_data + dap->da_offset);
-			if (ep->d_ino != dap->da_newinum)
-				panic("%s: dir inum %d != new %d",
-				    "initiate_write_filepage",
-				    ep->d_ino, dap->da_newinum);
-			if (dap->da_state & DIRCHG)
-				ep->d_ino = dap->da_previous->dm_oldinum;
-			else
-				ep->d_ino = 0;
-			dap->da_state &= ~ATTACHED;
-			dap->da_state |= UNDONE;
-		}
-	}
-	FREE_LOCK(&lk);
-}
-
-/*
- * Called from within the procedure above to deal with unsatisfied
- * allocation dependencies in an inodeblock. The buffer must be
- * locked, thus, no I/O completion operations can occur while we
- * are manipulating its associated dependencies.
- */
-static void 
-initiate_write_inodeblock(inodedep, bp)
-	struct inodedep *inodedep;
-	struct buf *bp;			/* The inode block */
-{
-	struct allocdirect *adp, *lastadp;
-	struct dinode *dp;
-	struct fs *fs;
-	ufs_lbn_t prevlbn = 0;
-	int i, deplist;
-
-	if (inodedep->id_state & IOSTARTED)
-		panic("initiate_write_inodeblock: already started");
-	inodedep->id_state |= IOSTARTED;
-	fs = inodedep->id_fs;
-	dp = (struct dinode *)bp->b_data +
-	    ino_to_fsbo(fs, inodedep->id_ino);
-	/*
-	 * If the bitmap is not yet written, then the allocated
-	 * inode cannot be written to disk.
-	 */
-	if ((inodedep->id_state & DEPCOMPLETE) == 0) {
-		if (inodedep->id_savedino != NULL)
-			panic("initiate_write_inodeblock: already doing I/O");
-		MALLOC(inodedep->id_savedino, struct dinode *,
-		    sizeof(struct dinode), M_INODEDEP, M_WAITOK);
-		*inodedep->id_savedino = *dp;
-		bzero((caddr_t)dp, sizeof(struct dinode));
-		return;
-	}
-	/*
-	 * If no dependencies, then there is nothing to roll back.
-	 */
-	inodedep->id_savedsize = dp->di_size;
-	if (TAILQ_FIRST(&inodedep->id_inoupdt) == NULL)
-		return;
-	/*
-	 * Set the dependencies to busy.
-	 */
-	ACQUIRE_LOCK(&lk);
-	for (deplist = 0, adp = TAILQ_FIRST(&inodedep->id_inoupdt); adp;
-	     adp = TAILQ_NEXT(adp, ad_next)) {
-#ifdef DIAGNOSTIC
-		if (deplist != 0 && prevlbn >= adp->ad_lbn)
-			panic("softdep_write_inodeblock: lbn order");
-		prevlbn = adp->ad_lbn;
-		if (adp->ad_lbn < NDADDR &&
-		    dp->di_db[adp->ad_lbn] != adp->ad_newblkno)
-			panic("%s: direct pointer #%ld mismatch %d != %d",
-			    "softdep_write_inodeblock", adp->ad_lbn,
-			    dp->di_db[adp->ad_lbn], adp->ad_newblkno);
-		if (adp->ad_lbn >= NDADDR &&
-		    dp->di_ib[adp->ad_lbn - NDADDR] != adp->ad_newblkno)
-			panic("%s: indirect pointer #%ld mismatch %d != %d",
-			    "softdep_write_inodeblock", adp->ad_lbn - NDADDR,
-			    dp->di_ib[adp->ad_lbn - NDADDR], adp->ad_newblkno);
-		deplist |= 1 << adp->ad_lbn;
-		if ((adp->ad_state & ATTACHED) == 0)
-			panic("softdep_write_inodeblock: Unknown state 0x%x",
-			    adp->ad_state);
-#endif /* DIAGNOSTIC */
-		adp->ad_state &= ~ATTACHED;
-		adp->ad_state |= UNDONE;
-	}
-	/*
-	 * The on-disk inode cannot claim to be any larger than the last
-	 * fragment that has been written. Otherwise, the on-disk inode
-	 * might have fragments that were not the last block in the file
-	 * which would corrupt the filesystem.
-	 */
-	for (lastadp = NULL, adp = TAILQ_FIRST(&inodedep->id_inoupdt); adp;
-	     lastadp = adp, adp = TAILQ_NEXT(adp, ad_next)) {
-		if (adp->ad_lbn >= NDADDR)
-			break;
-		dp->di_db[adp->ad_lbn] = adp->ad_oldblkno;
-		/* keep going until hitting a rollback to a frag */
-		if (adp->ad_oldsize == 0 || adp->ad_oldsize == fs->fs_bsize)
-			continue;
-		dp->di_size = fs->fs_bsize * adp->ad_lbn + adp->ad_oldsize;
-		for (i = adp->ad_lbn + 1; i < NDADDR; i++) {
-#ifdef DIAGNOSTIC
-			if (dp->di_db[i] != 0 && (deplist & (1 << i)) == 0)
-				panic("softdep_write_inodeblock: lost dep1");
-#endif /* DIAGNOSTIC */
-			dp->di_db[i] = 0;
-		}
-		for (i = 0; i < NIADDR; i++) {
-#ifdef DIAGNOSTIC
-			if (dp->di_ib[i] != 0 &&
-			    (deplist & ((1 << NDADDR) << i)) == 0)
-				panic("softdep_write_inodeblock: lost dep2");
-#endif /* DIAGNOSTIC */
-			dp->di_ib[i] = 0;
-		}
-		FREE_LOCK(&lk);
-		return;
-	}
-	/*
-	 * If we have zero'ed out the last allocated block of the file,
-	 * roll back the size to the last currently allocated block.
-	 * We know that this last allocated block is a full-sized as
-	 * we already checked for fragments in the loop above.
-	 */
-	if (lastadp != NULL &&
-	    dp->di_size <= (lastadp->ad_lbn + 1) * fs->fs_bsize) {
-		for (i = lastadp->ad_lbn; i >= 0; i--)
-			if (dp->di_db[i] != 0)
-				break;
-		dp->di_size = (i + 1) * fs->fs_bsize;
-	}
-	/*
-	 * The only dependencies are for indirect blocks.
-	 *
-	 * The file size for indirect block additions is not guaranteed.
-	 * Such a guarantee would be non-trivial to achieve. The conventional
-	 * synchronous write implementation also does not make this guarantee.
-	 * Fsck should catch and fix discrepancies. Arguably, the file size
-	 * can be over-estimated without destroying integrity when the file
-	 * moves into the indirect blocks (i.e., is large). If we want to
-	 * postpone fsck, we are stuck with this argument.
-	 */
-	for (; adp; adp = TAILQ_NEXT(adp, ad_next))
-		dp->di_ib[adp->ad_lbn - NDADDR] = 0;
-	FREE_LOCK(&lk);
-}
-
-/*
- * This routine is called during the completion interrupt
- * service routine for a disk write (from the procedure called
- * by the device driver to inform the file system caches of
- * a request completion).  It should be called early in this
- * procedure, before the block is made available to other
- * processes or other routines are called.
- */
-void 
-softdep_disk_write_complete(bp)
-	struct buf *bp;		/* describes the completed disk write */
-{
-	struct worklist *wk;
-	struct workhead reattach;
-	struct newblk *newblk;
-	struct allocindir *aip;
-	struct allocdirect *adp;
-	struct indirdep *indirdep;
-	struct inodedep *inodedep;
-	struct bmsafemap *bmsafemap;
-
-#ifdef DEBUG
-	if (lk.lkt_held != -1)
-		panic("softdep_disk_write_complete: lock is held");
-	lk.lkt_held = -2;
-#endif
-	LIST_INIT(&reattach);
-	while ((wk = LIST_FIRST(&bp->b_dep)) != NULL) {
-		WORKLIST_REMOVE(wk);
-		switch (wk->wk_type) {
-
-		case D_PAGEDEP:
-			if (handle_written_filepage(WK_PAGEDEP(wk), bp))
-				WORKLIST_INSERT(&reattach, wk);
-			continue;
-
-		case D_INODEDEP:
-			if (handle_written_inodeblock(WK_INODEDEP(wk), bp))
-				WORKLIST_INSERT(&reattach, wk);
-			continue;
-
-		case D_BMSAFEMAP:
-			bmsafemap = WK_BMSAFEMAP(wk);
-			while ((newblk = LIST_FIRST(&bmsafemap->sm_newblkhd))) {
-				newblk->nb_state |= DEPCOMPLETE;
-				newblk->nb_bmsafemap = NULL;
-				LIST_REMOVE(newblk, nb_deps);
-			}
-			while (adp = LIST_FIRST(&bmsafemap->sm_allocdirecthd)) {
-				adp->ad_state |= DEPCOMPLETE;
-				adp->ad_buf = NULL;
-				LIST_REMOVE(adp, ad_deps);
-				handle_allocdirect_partdone(adp);
-			}
-			while (aip = LIST_FIRST(&bmsafemap->sm_allocindirhd)) {
-				aip->ai_state |= DEPCOMPLETE;
-				aip->ai_buf = NULL;
-				LIST_REMOVE(aip, ai_deps);
-				handle_allocindir_partdone(aip);
-			}
-			while ((inodedep =
-			       LIST_FIRST(&bmsafemap->sm_inodedephd)) != NULL) {
-				inodedep->id_state |= DEPCOMPLETE;
-				LIST_REMOVE(inodedep, id_deps);
-				inodedep->id_buf = NULL;
-			}
-			WORKITEM_FREE(bmsafemap, D_BMSAFEMAP);
-			continue;
-
-		case D_MKDIR:
-			handle_written_mkdir(WK_MKDIR(wk), MKDIR_BODY);
-			continue;
-
-		case D_ALLOCDIRECT:
-			adp = WK_ALLOCDIRECT(wk);
-			adp->ad_state |= COMPLETE;
-			handle_allocdirect_partdone(adp);
-			continue;
-
-		case D_ALLOCINDIR:
-			aip = WK_ALLOCINDIR(wk);
-			aip->ai_state |= COMPLETE;
-			handle_allocindir_partdone(aip);
-			continue;
-
-		case D_INDIRDEP:
-			indirdep = WK_INDIRDEP(wk);
-			if (indirdep->ir_state & GOINGAWAY)
-				panic("disk_write_complete: indirdep gone");
-			bcopy(indirdep->ir_saveddata, bp->b_data, bp->b_bcount);
-			FREE(indirdep->ir_saveddata, M_INDIRDEP);
-			indirdep->ir_saveddata = 0;
-			indirdep->ir_state &= ~UNDONE;
-			indirdep->ir_state |= ATTACHED;
-			while ((aip = LIST_FIRST(&indirdep->ir_donehd)) != 0) {
-				handle_allocindir_partdone(aip);
-				if (aip == LIST_FIRST(&indirdep->ir_donehd))
-					panic("disk_write_complete: not gone");
-			}
-			WORKLIST_INSERT(&reattach, wk);
-			bdirty(bp);
-			continue;
-
-		default:
-			panic("handle_disk_write_complete: Unknown type %s",
-			    TYPENAME(wk->wk_type));
-			/* NOTREACHED */
-		}
-	}
-	/*
-	 * Reattach any requests that must be redone.
-	 */
-	while ((wk = LIST_FIRST(&reattach)) != NULL) {
-		WORKLIST_REMOVE(wk);
-		WORKLIST_INSERT(&bp->b_dep, wk);
-	}
-#ifdef DEBUG
-	if (lk.lkt_held != -2)
-		panic("softdep_disk_write_complete: lock lost");
-	lk.lkt_held = -1;
-#endif
-}
-
-/*
- * Called from within softdep_disk_write_complete above. Note that
- * this routine is always called from interrupt level with further
- * splbio interrupts blocked.
- */
-static void 
-handle_allocdirect_partdone(adp)
-	struct allocdirect *adp;	/* the completed allocdirect */
-{
-	struct allocdirect *listadp;
-	struct inodedep *inodedep;
-	long bsize;
-
-	if ((adp->ad_state & ALLCOMPLETE) != ALLCOMPLETE)
-		return;
-	if (adp->ad_buf != NULL)
-		panic("handle_allocdirect_partdone: dangling dep");
-	/*
-	 * The on-disk inode cannot claim to be any larger than the last
-	 * fragment that has been written. Otherwise, the on-disk inode
-	 * might have fragments that were not the last block in the file
-	 * which would corrupt the filesystem. Thus, we cannot free any
-	 * allocdirects after one whose ad_oldblkno claims a fragment as
-	 * these blocks must be rolled back to zero before writing the inode.
-	 * We check the currently active set of allocdirects in id_inoupdt.
-	 */
-	inodedep = adp->ad_inodedep;
-	bsize = inodedep->id_fs->fs_bsize;
-	for (listadp = TAILQ_FIRST(&inodedep->id_inoupdt); listadp;
-	     listadp = TAILQ_NEXT(listadp, ad_next)) {
-		/* found our block */
-		if (listadp == adp)
-			break;
-		/* continue if ad_oldlbn is not a fragment */
-		if (listadp->ad_oldsize == 0 ||
-		    listadp->ad_oldsize == bsize)
-			continue;
-		/* hit a fragment */
-		return;
-	}
-	/*
-	 * If we have reached the end of the current list without
-	 * finding the just finished dependency, then it must be
-	 * on the future dependency list. Future dependencies cannot
-	 * be freed until they are moved to the current list.
-	 */
-	if (listadp == NULL) {
-#ifdef DEBUG
-		for (listadp = TAILQ_FIRST(&inodedep->id_newinoupdt); listadp;
-		     listadp = TAILQ_NEXT(listadp, ad_next))
-			/* found our block */
-			if (listadp == adp)
-				break;
-		if (listadp == NULL)
-			panic("handle_allocdirect_partdone: lost dep");
-#endif /* DEBUG */
-		return;
-	}
-	/*
-	 * If we have found the just finished dependency, then free
-	 * it along with anything that follows it that is complete.
-	 */
-	for (; adp; adp = listadp) {
-		listadp = TAILQ_NEXT(adp, ad_next);
-		if ((adp->ad_state & ALLCOMPLETE) != ALLCOMPLETE)
-			return;
-		free_allocdirect(&inodedep->id_inoupdt, adp, 1);
-	}
-}
-
-/*
- * Called from within softdep_disk_write_complete above. Note that
- * this routine is always called from interrupt level with further
- * splbio interrupts blocked.
- */
-static void
-handle_allocindir_partdone(aip)
-	struct allocindir *aip;		/* the completed allocindir */
-{
-	struct indirdep *indirdep;
-
-	if ((aip->ai_state & ALLCOMPLETE) != ALLCOMPLETE)
-		return;
-	if (aip->ai_buf != NULL)
-		panic("handle_allocindir_partdone: dangling dependency");
-	indirdep = aip->ai_indirdep;
-	if (indirdep->ir_state & UNDONE) {
-		LIST_REMOVE(aip, ai_next);
-		LIST_INSERT_HEAD(&indirdep->ir_donehd, aip, ai_next);
-		return;
-	}
-	((ufs_daddr_t *)indirdep->ir_savebp->b_data)[aip->ai_offset] =
-	    aip->ai_newblkno;
-	LIST_REMOVE(aip, ai_next);
-	if (aip->ai_freefrag != NULL)
-		add_to_worklist(&aip->ai_freefrag->ff_list);
-	WORKITEM_FREE(aip, D_ALLOCINDIR);
-}
-
-/*
- * Called from within softdep_disk_write_complete above to restore
- * in-memory inode block contents to their most up-to-date state. Note
- * that this routine is always called from interrupt level with further
- * splbio interrupts blocked.
- */
-static int 
-handle_written_inodeblock(inodedep, bp)
-	struct inodedep *inodedep;
-	struct buf *bp;		/* buffer containing the inode block */
-{
-	struct worklist *wk, *filefree;
-	struct allocdirect *adp, *nextadp;
-	struct dinode *dp;
-	int hadchanges;
-
-	if ((inodedep->id_state & IOSTARTED) == 0)
-		panic("handle_written_inodeblock: not started");
-	inodedep->id_state &= ~IOSTARTED;
-	inodedep->id_state |= COMPLETE;
-	dp = (struct dinode *)bp->b_data +
-	    ino_to_fsbo(inodedep->id_fs, inodedep->id_ino);
-	/*
-	 * If we had to rollback the inode allocation because of
-	 * bitmaps being incomplete, then simply restore it.
-	 * Keep the block dirty so that it will not be reclaimed until
-	 * all associated dependencies have been cleared and the
-	 * corresponding updates written to disk.
-	 */
-	if (inodedep->id_savedino != NULL) {
-		*dp = *inodedep->id_savedino;
-		FREE(inodedep->id_savedino, M_INODEDEP);
-		inodedep->id_savedino = NULL;
-		bdirty(bp);
-		return (1);
-	}
-	/*
-	 * Roll forward anything that had to be rolled back before 
-	 * the inode could be updated.
-	 */
-	hadchanges = 0;
-	for (adp = TAILQ_FIRST(&inodedep->id_inoupdt); adp; adp = nextadp) {
-		nextadp = TAILQ_NEXT(adp, ad_next);
-		if (adp->ad_state & ATTACHED)
-			panic("handle_written_inodeblock: new entry");
-		if (adp->ad_lbn < NDADDR) {
-			if (dp->di_db[adp->ad_lbn] != adp->ad_oldblkno)
-				panic("%s: %s #%ld mismatch %d != %d",
-				    "handle_written_inodeblock",
-				    "direct pointer", adp->ad_lbn,
-				    dp->di_db[adp->ad_lbn], adp->ad_oldblkno);
-			dp->di_db[adp->ad_lbn] = adp->ad_newblkno;
-		} else {
-			if (dp->di_ib[adp->ad_lbn - NDADDR] != 0)
-				panic("%s: %s #%ld allocated as %d",
-				    "handle_written_inodeblock",
-				    "indirect pointer", adp->ad_lbn - NDADDR,
-				    dp->di_ib[adp->ad_lbn - NDADDR]);
-			dp->di_ib[adp->ad_lbn - NDADDR] = adp->ad_newblkno;
-		}
-		adp->ad_state &= ~UNDONE;
-		adp->ad_state |= ATTACHED;
-		hadchanges = 1;
-	}
-	/*
-	 * Reset the file size to its most up-to-date value.
-	 */
-	if (inodedep->id_savedsize == -1)
-		panic("handle_written_inodeblock: bad size");
-	if (dp->di_size != inodedep->id_savedsize) {
-		dp->di_size = inodedep->id_savedsize;
-		hadchanges = 1;
-	}
-	inodedep->id_savedsize = -1;
-	/*
-	 * If there were any rollbacks in the inode block, then it must be
-	 * marked dirty so that its will eventually get written back in
-	 * its correct form.
-	 */
-	if (hadchanges)
-		bdirty(bp);
-	/*
-	 * Process any allocdirects that completed during the update.
-	 */
-	if ((adp = TAILQ_FIRST(&inodedep->id_inoupdt)) != NULL)
-		handle_allocdirect_partdone(adp);
-	/*
-	 * Process deallocations that were held pending until the
-	 * inode had been written to disk. Freeing of the inode
-	 * is delayed until after all blocks have been freed to
-	 * avoid creation of new <vfsid, inum, lbn> triples
-	 * before the old ones have been deleted.
-	 */
-	filefree = NULL;
-	while ((wk = LIST_FIRST(&inodedep->id_bufwait)) != NULL) {
-		WORKLIST_REMOVE(wk);
-		switch (wk->wk_type) {
-
-		case D_FREEFILE:
-			/*
-			 * We defer adding filefree to the worklist until
-			 * all other additions have been made to ensure
-			 * that it will be done after all the old blocks
-			 * have been freed.
-			 */
-			if (filefree != NULL)
-				panic("handle_written_inodeblock: filefree");
-			filefree = wk;
-			continue;
-
-		case D_MKDIR:
-			handle_written_mkdir(WK_MKDIR(wk), MKDIR_PARENT);
-			continue;
-
-		case D_DIRADD:
-			diradd_inode_written(WK_DIRADD(wk), inodedep);
-			continue;
-
-		case D_FREEBLKS:
-		case D_FREEFRAG:
-		case D_DIRREM:
-			add_to_worklist(wk);
-			continue;
-
-		default:
-			panic("handle_written_inodeblock: Unknown type %s",
-			    TYPENAME(wk->wk_type));
-			/* NOTREACHED */
-		}
-	}
-	if (filefree != NULL) {
-		if (free_inodedep(inodedep) == 0)
-			panic("handle_written_inodeblock: live inodedep");
-		add_to_worklist(filefree);
-		return (0);
-	}
-
-	/*
-	 * If no outstanding dependencies, free it.
-	 */
-	if (free_inodedep(inodedep) || TAILQ_FIRST(&inodedep->id_inoupdt) == 0)
-		return (0);
-	return (hadchanges);
-}
-
-/*
- * Process a diradd entry after its dependent inode has been written.
- * This routine must be called with splbio interrupts blocked.
- */
-static void
-diradd_inode_written(dap, inodedep)
-	struct diradd *dap;
-	struct inodedep *inodedep;
-{
-	struct pagedep *pagedep;
-
-	dap->da_state |= COMPLETE;
-	if ((dap->da_state & ALLCOMPLETE) == ALLCOMPLETE) {
-		if (dap->da_state & DIRCHG)
-			pagedep = dap->da_previous->dm_pagedep;
-		else
-			pagedep = dap->da_pagedep;
-		LIST_REMOVE(dap, da_pdlist);
-		LIST_INSERT_HEAD(&pagedep->pd_pendinghd, dap, da_pdlist);
-	}
-	WORKLIST_INSERT(&inodedep->id_pendinghd, &dap->da_list);
-}
-
-/*
- * Handle the completion of a mkdir dependency.
- */
-static void
-handle_written_mkdir(mkdir, type)
-	struct mkdir *mkdir;
-	int type;
-{
-	struct diradd *dap;
-	struct pagedep *pagedep;
-
-	if (mkdir->md_state != type)
-		panic("handle_written_mkdir: bad type");
-	dap = mkdir->md_diradd;
-	dap->da_state &= ~type;
-	if ((dap->da_state & (MKDIR_PARENT | MKDIR_BODY)) == 0)
-		dap->da_state |= DEPCOMPLETE;
-	if ((dap->da_state & ALLCOMPLETE) == ALLCOMPLETE) {
-		if (dap->da_state & DIRCHG)
-			pagedep = dap->da_previous->dm_pagedep;
-		else
-			pagedep = dap->da_pagedep;
-		LIST_REMOVE(dap, da_pdlist);
-		LIST_INSERT_HEAD(&pagedep->pd_pendinghd, dap, da_pdlist);
-	}
-	LIST_REMOVE(mkdir, md_mkdirs);
-	WORKITEM_FREE(mkdir, D_MKDIR);
-}
-
-/*
- * Called from within softdep_disk_write_complete above.
- * A write operation was just completed. Removed inodes can
- * now be freed and associated block pointers may be committed.
- * Note that this routine is always called from interrupt level
- * with further splbio interrupts blocked.
- */
-static int 
-handle_written_filepage(pagedep, bp)
-	struct pagedep *pagedep;
-	struct buf *bp;		/* buffer containing the written page */
-{
-	struct dirrem *dirrem;
-	struct diradd *dap, *nextdap;
-	struct direct *ep;
-	int i, chgs;
-
-	if ((pagedep->pd_state & IOSTARTED) == 0)
-		panic("handle_written_filepage: not started");
-	pagedep->pd_state &= ~IOSTARTED;
-	/*
-	 * Process any directory removals that have been committed.
-	 */
-	while ((dirrem = LIST_FIRST(&pagedep->pd_dirremhd)) != NULL) {
-		LIST_REMOVE(dirrem, dm_next);
-		dirrem->dm_dirinum = pagedep->pd_ino;
-		add_to_worklist(&dirrem->dm_list);
-	}
-	/*
-	 * Free any directory additions that have been committed.
-	 */
-	while ((dap = LIST_FIRST(&pagedep->pd_pendinghd)) != NULL)
-		free_diradd(dap);
-	/*
-	 * Uncommitted directory entries must be restored.
-	 */
-	for (chgs = 0, i = 0; i < DAHASHSZ; i++) {
-		for (dap = LIST_FIRST(&pagedep->pd_diraddhd[i]); dap;
-		     dap = nextdap) {
-			nextdap = LIST_NEXT(dap, da_pdlist);
-			if (dap->da_state & ATTACHED)
-				panic("handle_written_filepage: attached");
-			ep = (struct direct *)
-			    ((char *)bp->b_data + dap->da_offset);
-			ep->d_ino = dap->da_newinum;
-			dap->da_state &= ~UNDONE;
-			dap->da_state |= ATTACHED;
-			chgs = 1;
-			/*
-			 * If the inode referenced by the directory has
-			 * been written out, then the dependency can be
-			 * moved to the pending list.
-			 */
-			if ((dap->da_state & ALLCOMPLETE) == ALLCOMPLETE) {
-				LIST_REMOVE(dap, da_pdlist);
-				LIST_INSERT_HEAD(&pagedep->pd_pendinghd, dap,
-				    da_pdlist);
-			}
-		}
-	}
-	/*
-	 * If there were any rollbacks in the directory, then it must be
-	 * marked dirty so that its will eventually get written back in
-	 * its correct form.
-	 */
-	if (chgs)
-		bdirty(bp);
-	/*
-	 * If no dependencies remain, the pagedep will be freed.
-	 * Otherwise it will remain to update the page before it
-	 * is written back to disk.
-	 */
-	if (LIST_FIRST(&pagedep->pd_pendinghd) == 0) {
-		for (i = 0; i < DAHASHSZ; i++)
-			if (LIST_FIRST(&pagedep->pd_diraddhd[i]) != NULL)
-				break;
-		if (i == DAHASHSZ) {
-			LIST_REMOVE(pagedep, pd_hash);
-			WORKITEM_FREE(pagedep, D_PAGEDEP);
-			return (0);
-		}
-	}
-	return (1);
-}
-
-/*
- * Writing back in-core inode structures.
- * 
- * The file system only accesses an inode's contents when it occupies an
- * "in-core" inode structure.  These "in-core" structures are separate from
- * the page frames used to cache inode blocks.  Only the latter are
- * transferred to/from the disk.  So, when the updated contents of the
- * "in-core" inode structure are copied to the corresponding in-memory inode
- * block, the dependencies are also transferred.  The following procedure is
- * called when copying a dirty "in-core" inode to a cached inode block.
- */
-
-/*
- * Called when an inode is loaded from disk. If the effective link count
- * differed from the actual link count when it was last flushed, then we
- * need to ensure that the correct effective link count is put back.
- */
-void 
-softdep_load_inodeblock(ip)
-	struct inode *ip;	/* the "in_core" copy of the inode */
-{
-	struct inodedep *inodedep;
-
-	/*
-	 * Check for alternate nlink count.
-	 */
-	ip->i_effnlink = ip->i_nlink;
-	ACQUIRE_LOCK(&lk);
-	if (inodedep_lookup(ip->i_fs, ip->i_number, 0, &inodedep) == 0) {
-		FREE_LOCK(&lk);
-		return;
-	}
-	if (inodedep->id_nlinkdelta != 0) {
-		ip->i_effnlink -= inodedep->id_nlinkdelta;
-		ip->i_flag |= IN_MODIFIED;
-		inodedep->id_nlinkdelta = 0;
-		(void) free_inodedep(inodedep);
-	}
-	FREE_LOCK(&lk);
-}
-
-/*
- * This routine is called just before the "in-core" inode
- * information is to be copied to the in-memory inode block.
- * Recall that an inode block contains several inodes. If
- * the force flag is set, then the dependencies will be
- * cleared so that the update can always be made. Note that
- * the buffer is locked when this routine is called, so we
- * will never be in the middle of writing the inode block 
- * to disk.
- */
-void 
-softdep_update_inodeblock(ip, bp, waitfor)
-	struct inode *ip;	/* the "in_core" copy of the inode */
-	struct buf *bp;		/* the buffer containing the inode block */
-	int waitfor;		/* nonzero => update must be allowed */
-{
-	struct inodedep *inodedep;
-	struct worklist *wk;
-	int error, gotit;
-
-	/*
-	 * If the effective link count is not equal to the actual link
-	 * count, then we must track the difference in an inodedep while
-	 * the inode is (potentially) tossed out of the cache. Otherwise,
-	 * if there is no existing inodedep, then there are no dependencies
-	 * to track.
-	 */
-	ACQUIRE_LOCK(&lk);
-	if (ip->i_effnlink != ip->i_nlink) {
-		(void) inodedep_lookup(ip->i_fs, ip->i_number, DEPALLOC,
-		    &inodedep);
-	} else if (inodedep_lookup(ip->i_fs, ip->i_number, 0, &inodedep) == 0) {
-		FREE_LOCK(&lk);
-		return;
-	}
-	if (ip->i_nlink < ip->i_effnlink)
-		panic("softdep_update_inodeblock: bad delta");
-	inodedep->id_nlinkdelta = ip->i_nlink - ip->i_effnlink;
-	/*
-	 * Changes have been initiated. Anything depending on these
-	 * changes cannot occur until this inode has been written.
-	 */
-	inodedep->id_state &= ~COMPLETE;
-	if ((inodedep->id_state & ONWORKLIST) == 0)
-		WORKLIST_INSERT(&bp->b_dep, &inodedep->id_list);
-	/*
-	 * Any new dependencies associated with the incore inode must 
-	 * now be moved to the list associated with the buffer holding
-	 * the in-memory copy of the inode. Once merged process any
-	 * allocdirects that are completed by the merger.
-	 */
-	merge_inode_lists(inodedep);
-	if (TAILQ_FIRST(&inodedep->id_inoupdt) != NULL)
-		handle_allocdirect_partdone(TAILQ_FIRST(&inodedep->id_inoupdt));
-	/*
-	 * Now that the inode has been pushed into the buffer, the
-	 * operations dependent on the inode being written to disk
-	 * can be moved to the id_bufwait so that they will be
-	 * processed when the buffer I/O completes.
-	 */
-	while ((wk = LIST_FIRST(&inodedep->id_inowait)) != NULL) {
-		WORKLIST_REMOVE(wk);
-		WORKLIST_INSERT(&inodedep->id_bufwait, wk);
-	}
-	/*
-	 * Newly allocated inodes cannot be written until the bitmap
-	 * that allocates them have been written (indicated by
-	 * DEPCOMPLETE being set in id_state). If we are doing a
-	 * forced sync (e.g., an fsync on a file), we force the bitmap
-	 * to be written so that the update can be done.
-	 */
-	if ((inodedep->id_state & DEPCOMPLETE) != 0 || waitfor == 0) {
-		FREE_LOCK(&lk);
-		return;
-	}
-	gotit = getdirtybuf(&inodedep->id_buf, MNT_WAIT);
-	FREE_LOCK(&lk);
-	if (gotit && (error = VOP_BWRITE(inodedep->id_buf)) != 0)
-		softdep_error("softdep_update_inodeblock: bwrite", error);
-	if ((inodedep->id_state & DEPCOMPLETE) == 0)
-		panic("softdep_update_inodeblock: update failed");
-}
-
-/*
- * Merge the new inode dependency list (id_newinoupdt) into the old
- * inode dependency list (id_inoupdt). This routine must be called
- * with splbio interrupts blocked.
- */
-static void
-merge_inode_lists(inodedep)
-	struct inodedep *inodedep;
-{
-	struct allocdirect *listadp, *newadp;
-
-	newadp = TAILQ_FIRST(&inodedep->id_newinoupdt);
-	for (listadp = TAILQ_FIRST(&inodedep->id_inoupdt); listadp && newadp;) {
-		if (listadp->ad_lbn < newadp->ad_lbn) {
-			listadp = TAILQ_NEXT(listadp, ad_next);
-			continue;
-		}
-		TAILQ_REMOVE(&inodedep->id_newinoupdt, newadp, ad_next);
-		TAILQ_INSERT_BEFORE(listadp, newadp, ad_next);
-		if (listadp->ad_lbn == newadp->ad_lbn) {
-			allocdirect_merge(&inodedep->id_inoupdt, newadp,
-			    listadp);
-			listadp = newadp;
-		}
-		newadp = TAILQ_FIRST(&inodedep->id_newinoupdt);
-	}
-	while ((newadp = TAILQ_FIRST(&inodedep->id_newinoupdt)) != NULL) {
-		TAILQ_REMOVE(&inodedep->id_newinoupdt, newadp, ad_next);
-		TAILQ_INSERT_TAIL(&inodedep->id_inoupdt, newadp, ad_next);
-	}
-}
-
-/*
- * If we are doing an fsync, then we must ensure that any directory
- * entries for the inode have been written after the inode gets to disk.
- */
-int
-softdep_fsync(vp)
-	struct vnode *vp;	/* the "in_core" copy of the inode */
-{
-	struct diradd *dap, *olddap;
-	struct inodedep *inodedep;
-	struct pagedep *pagedep;
-	struct worklist *wk;
-	struct mount *mnt;
-	struct vnode *pvp;
-	struct inode *ip;
-	struct buf *bp;
-	struct fs *fs;
-	struct proc *p = CURPROC;		/* XXX */
-	int error, ret, flushparent;
-	ino_t parentino;
-	ufs_lbn_t lbn;
-
-	ip = VTOI(vp);
-	fs = ip->i_fs;
-	for (error = 0, flushparent = 0, olddap = NULL; ; ) {
-		ACQUIRE_LOCK(&lk);
-		if (inodedep_lookup(fs, ip->i_number, 0, &inodedep) == 0)
-			break;
-		if (LIST_FIRST(&inodedep->id_inowait) != NULL ||
-		    LIST_FIRST(&inodedep->id_bufwait) != NULL ||
-		    TAILQ_FIRST(&inodedep->id_inoupdt) != NULL ||
-		    TAILQ_FIRST(&inodedep->id_newinoupdt) != NULL)
-			panic("softdep_fsync: pending ops");
-		if ((wk = LIST_FIRST(&inodedep->id_pendinghd)) == NULL)
-			break;
-		if (wk->wk_type != D_DIRADD)
-			panic("softdep_fsync: Unexpected type %s",
-			    TYPENAME(wk->wk_type));
-		dap = WK_DIRADD(wk);
-		/*
-		 * If we have failed to get rid of all the dependencies
-		 * then something is seriously wrong.
-		 */
-		if (dap == olddap)
-			panic("softdep_fsync: flush failed");
-		olddap = dap;
-		/*
-		 * Flush our parent if this directory entry
-		 * has a MKDIR_PARENT dependency.
-		 */
-		if (dap->da_state & DIRCHG)
-			pagedep = dap->da_previous->dm_pagedep;
-		else
-			pagedep = dap->da_pagedep;
-		mnt = pagedep->pd_mnt;
-		parentino = pagedep->pd_ino;
-		lbn = pagedep->pd_lbn;
-		if ((dap->da_state & (MKDIR_BODY | COMPLETE)) != COMPLETE)
-			panic("softdep_fsync: dirty");
-		flushparent = dap->da_state & MKDIR_PARENT;
-		/*
-		 * If we are being fsync'ed as part of vgone'ing this vnode,
-		 * then we will not be able to release and recover the
-		 * vnode below, so we just have to give up on writing its
-		 * directory entry out. It will eventually be written, just
-		 * not now, but then the user was not asking to have it
-		 * written, so we are not breaking any promises.
-		 */
-		if (vp->v_flag & VXLOCK)
-			break;
-		/*
-		 * We prevent deadlock by always fetching inodes from the
-		 * root, moving down the directory tree. Thus, when fetching
-		 * our parent directory, we must unlock ourselves before
-		 * requesting the lock on our parent. See the comment in
-		 * ufs_lookup for details on possible races.
-		 */
-		FREE_LOCK(&lk);
-		VOP_UNLOCK(vp, 0, p);
-		if ((error = VFS_VGET(mnt, parentino, &pvp)) != 0) {
-			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p);
-			return (error);
-		}
-		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p);
-		if (flushparent) {
-			if ((error = UFS_UPDATE(pvp, 1)) != 0) {
-				vput(pvp);
-				return (error);
-			}
-		}
-		/*
-		 * Flush directory page containing the inode's name.
-		 */
-		error = bread(pvp, lbn, blksize(fs, VTOI(pvp), lbn), p->p_ucred,
-		    &bp);
-		ret = VOP_BWRITE(bp);
-		vput(pvp);
-		if (error != 0)
-			return (error);
-		if (ret != 0)
-			return (ret);
-	}
-	FREE_LOCK(&lk);
-	return (0);
-}
-
-/*
- * This routine is called when we are trying to synchronously flush a
- * file. This routine must eliminate any filesystem metadata dependencies
- * so that the syncing routine can succeed by pushing the dirty blocks
- * associated with the file. If any I/O errors occur, they are returned.
- */
-int
-softdep_sync_metadata(ap)
-	struct vop_fsync_args /* {
-		struct vnode *a_vp;
-		struct ucred *a_cred;
-		int a_waitfor;
-		struct proc *a_p;
-	} */ *ap;
-{
-	struct vnode *vp = ap->a_vp;
-	struct pagedep *pagedep;
-	struct allocdirect *adp;
-	struct allocindir *aip;
-	struct buf *bp, *nbp;
-	struct worklist *wk;
-	int i, error, waitfor;
-
-	/*
-	 * Check whether this vnode is involved in a filesystem
-	 * that is doing soft dependency processing.
-	 */
-	if (vp->v_type != VBLK) {
-		if (!DOINGSOFTDEP(vp))
-			return (0);
-	} else
-		if (vp->v_specmountpoint == NULL ||
-		    (vp->v_specmountpoint->mnt_flag & MNT_SOFTDEP) == 0)
-			return (0);
-	/*
-	 * Ensure that any direct block dependencies have been cleared.
-	 */
-	ACQUIRE_LOCK(&lk);
-	if ((error = flush_inodedep_deps(VTOI(vp)->i_fs, VTOI(vp)->i_number))) {
-		FREE_LOCK(&lk);
-		return (error);
-	}
-	/*
-	 * For most files, the only metadata dependencies are the
-	 * cylinder group maps that allocate their inode or blocks.
-	 * The block allocation dependencies can be found by traversing
-	 * the dependency lists for any buffers that remain on their
-	 * dirty buffer list. The inode allocation dependency will
-	 * be resolved when the inode is updated with MNT_WAIT.
-	 * This work is done in two passes. The first pass grabs most
-	 * of the buffers and begins asynchronously writing them. The
-	 * only way to wait for these asynchronous writes is to sleep
-	 * on the filesystem vnode which may stay busy for a long time
-	 * if the filesystem is active. So, instead, we make a second
-	 * pass over the dependencies blocking on each write. In the
-	 * usual case we will be blocking against a write that we
-	 * initiated, so when it is done the dependency will have been
-	 * resolved. Thus the second pass is expected to end quickly.
-	 */
-	waitfor = MNT_NOWAIT;
-top:
-	if (getdirtybuf(&TAILQ_FIRST(&vp->v_dirtyblkhd), MNT_WAIT) == 0) {
-		drain_output(vp, 1);
-		FREE_LOCK(&lk);
-		return (0);
-	}
-	bp = TAILQ_FIRST(&vp->v_dirtyblkhd);
-loop:
-	/*
-	 * As we hold the buffer locked, none of its dependencies
-	 * will disappear.
-	 */
-	for (wk = LIST_FIRST(&bp->b_dep); wk;
-	     wk = LIST_NEXT(wk, wk_list)) {
-		switch (wk->wk_type) {
-
-		case D_ALLOCDIRECT:
-			adp = WK_ALLOCDIRECT(wk);
-			if (adp->ad_state & DEPCOMPLETE)
-				break;
-			nbp = adp->ad_buf;
-			if (getdirtybuf(&nbp, waitfor) == 0)
-				break;
-			FREE_LOCK(&lk);
-			if (waitfor == MNT_NOWAIT) {
-				bawrite(nbp);
-			} else if ((error = VOP_BWRITE(nbp)) != 0) {
-				bawrite(bp);
-				return (error);
-			}
-			ACQUIRE_LOCK(&lk);
-			break;
-
-		case D_ALLOCINDIR:
-			aip = WK_ALLOCINDIR(wk);
-			if (aip->ai_state & DEPCOMPLETE)
-				break;
-			nbp = aip->ai_buf;
-			if (getdirtybuf(&nbp, waitfor) == 0)
-				break;
-			FREE_LOCK(&lk);
-			if (waitfor == MNT_NOWAIT) {
-				bawrite(nbp);
-			} else if ((error = VOP_BWRITE(nbp)) != 0) {
-				bawrite(bp);
-				return (error);
-			}
-			ACQUIRE_LOCK(&lk);
-			break;
-
-		case D_INDIRDEP:
-		restart:
-			for (aip = LIST_FIRST(&WK_INDIRDEP(wk)->ir_deplisthd);
-			     aip; aip = LIST_NEXT(aip, ai_next)) {
-				if (aip->ai_state & DEPCOMPLETE)
-					continue;
-				nbp = aip->ai_buf;
-				if (getdirtybuf(&nbp, MNT_WAIT) == 0)
-					goto restart;
-				FREE_LOCK(&lk);
-				if ((error = VOP_BWRITE(nbp)) != 0) {
-					bawrite(bp);
-					return (error);
-				}
-				ACQUIRE_LOCK(&lk);
-				goto restart;
-			}
-			break;
-
-		case D_INODEDEP:
-			if ((error = flush_inodedep_deps(WK_INODEDEP(wk)->id_fs,
-			    WK_INODEDEP(wk)->id_ino)) != 0) {
-				FREE_LOCK(&lk);
-				bawrite(bp);
-				return (error);
-			}
-			break;
-
-		case D_PAGEDEP:
-			/*
-			 * We are trying to sync a directory that may
-			 * have dependencies on both its own metadata
-			 * and/or dependencies on the inodes of any
-			 * recently allocated files. We walk its diradd
-			 * lists pushing out the associated inode.
-			 */
-			pagedep = WK_PAGEDEP(wk);
-			for (i = 0; i < DAHASHSZ; i++) {
-				if (LIST_FIRST(&pagedep->pd_diraddhd[i]) == 0)
-					continue;
-				if (error = flush_pagedep_deps(vp,
-				   pagedep->pd_mnt, &pagedep->pd_diraddhd[i])) {
-					FREE_LOCK(&lk);
-					bawrite(bp);
-					return (error);
-				}
-			}
-			break;
-
-		case D_MKDIR:
-			/*
-			 * This case should never happen if the vnode has
-			 * been properly sync'ed. However, if this function
-			 * is used at a place where the vnode has not yet
-			 * been sync'ed, this dependency can show up. So,
-			 * rather than panic, just flush it.
-			 */
-			nbp = WK_MKDIR(wk)->md_buf;
-			if (getdirtybuf(&nbp, waitfor) == 0)
-				break;
-			FREE_LOCK(&lk);
-			if (waitfor == MNT_NOWAIT) {
-				bawrite(nbp);
-			} else if ((error = VOP_BWRITE(nbp)) != 0) {
-				bawrite(bp);
-				return (error);
-			}
-			ACQUIRE_LOCK(&lk);
-			break;
-
-		case D_BMSAFEMAP:
-			/*
-			 * This case should never happen if the vnode has
-			 * been properly sync'ed. However, if this function
-			 * is used at a place where the vnode has not yet
-			 * been sync'ed, this dependency can show up. So,
-			 * rather than panic, just flush it.
-			 */
-			nbp = WK_BMSAFEMAP(wk)->sm_buf;
-			if (getdirtybuf(&nbp, waitfor) == 0)
-				break;
-			FREE_LOCK(&lk);
-			if (waitfor == MNT_NOWAIT) {
-				bawrite(nbp);
-			} else if ((error = VOP_BWRITE(nbp)) != 0) {
-				bawrite(bp);
-				return (error);
-			}
-			ACQUIRE_LOCK(&lk);
-			break;
-
-		default:
-			panic("softdep_sync_metadata: Unknown type %s",
-			    TYPENAME(wk->wk_type));
-			/* NOTREACHED */
-		}
-	}
-	(void) getdirtybuf(&TAILQ_NEXT(bp, b_vnbufs), MNT_WAIT);
-	nbp = TAILQ_NEXT(bp, b_vnbufs);
-	FREE_LOCK(&lk);
-	bawrite(bp);
-	ACQUIRE_LOCK(&lk);
-	if (nbp != NULL) {
-		bp = nbp;
-		goto loop;
-	}
-	/*
-	 * We must wait for any I/O in progress to finish so that
-	 * all potential buffers on the dirty list will be visible.
-	 * Once they are all there, proceed with the second pass
-	 * which will wait for the I/O as per above.
-	 */
-	drain_output(vp, 1);
-	/*
-	 * The brief unlock is to allow any pent up dependency
-	 * processing to be done.
-	 */
-	if (waitfor == MNT_NOWAIT) {
-		waitfor = MNT_WAIT;
-		FREE_LOCK(&lk);
-		ACQUIRE_LOCK(&lk);
-		goto top;
-	}
-
-	/*
-	 * If we have managed to get rid of all the dirty buffers,
-	 * then we are done. For certain directories and block
-	 * devices, we may need to do further work.
-	 */
-	if (TAILQ_FIRST(&vp->v_dirtyblkhd) == NULL) {
-		FREE_LOCK(&lk);
-		return (0);
-	}
-
-	FREE_LOCK(&lk);
-	/*
-	 * If we are trying to sync a block device, some of its buffers may
-	 * contain metadata that cannot be written until the contents of some
-	 * partially written files have been written to disk. The only easy
-	 * way to accomplish this is to sync the entire filesystem (luckily
-	 * this happens rarely).
-	 */
-	if (vp->v_type == VBLK && vp->v_specmountpoint && !VOP_ISLOCKED(vp) &&
-	    (error = VFS_SYNC(vp->v_specmountpoint, MNT_WAIT, ap->a_cred,
-	     ap->a_p)) != 0)
-		return (error);
-	return (0);
-}
-
-/*
- * Flush the dependencies associated with an inodedep.
- * Called with splbio blocked.
- */
-static int
-flush_inodedep_deps(fs, ino)
-	struct fs *fs;
-	ino_t ino;
-{
-	struct inodedep *inodedep;
-	struct allocdirect *adp;
-	int error, waitfor;
-	struct buf *bp;
-
-	/*
-	 * This work is done in two passes. The first pass grabs most
-	 * of the buffers and begins asynchronously writing them. The
-	 * only way to wait for these asynchronous writes is to sleep
-	 * on the filesystem vnode which may stay busy for a long time
-	 * if the filesystem is active. So, instead, we make a second
-	 * pass over the dependencies blocking on each write. In the
-	 * usual case we will be blocking against a write that we
-	 * initiated, so when it is done the dependency will have been
-	 * resolved. Thus the second pass is expected to end quickly.
-	 * We give a brief window at the top of the loop to allow
-	 * any pending I/O to complete.
-	 */
-	for (waitfor = MNT_NOWAIT; ; ) {
-		FREE_LOCK(&lk);
-		ACQUIRE_LOCK(&lk);
-		if (inodedep_lookup(fs, ino, 0, &inodedep) == 0)
-			return (0);
-		for (adp = TAILQ_FIRST(&inodedep->id_inoupdt); adp;
-		     adp = TAILQ_NEXT(adp, ad_next)) {
-			if (adp->ad_state & DEPCOMPLETE)
-				continue;
-			bp = adp->ad_buf;
-			if (getdirtybuf(&bp, waitfor) == 0) {
-				if (waitfor == MNT_NOWAIT)
-					continue;
-				break;
-			}
-			FREE_LOCK(&lk);
-			if (waitfor == MNT_NOWAIT) {
-				bawrite(bp);
-			} else if ((error = VOP_BWRITE(bp)) != 0) {
-				ACQUIRE_LOCK(&lk);
-				return (error);
-			}
-			ACQUIRE_LOCK(&lk);
-			break;
-		}
-		if (adp != NULL)
-			continue;
-		for (adp = TAILQ_FIRST(&inodedep->id_newinoupdt); adp;
-		     adp = TAILQ_NEXT(adp, ad_next)) {
-			if (adp->ad_state & DEPCOMPLETE)
-				continue;
-			bp = adp->ad_buf;
-			if (getdirtybuf(&bp, waitfor) == 0) {
-				if (waitfor == MNT_NOWAIT)
-					continue;
-				break;
-			}
-			FREE_LOCK(&lk);
-			if (waitfor == MNT_NOWAIT) {
-				bawrite(bp);
-			} else if ((error = VOP_BWRITE(bp)) != 0) {
-				ACQUIRE_LOCK(&lk);
-				return (error);
-			}
-			ACQUIRE_LOCK(&lk);
-			break;
-		}
-		if (adp != NULL)
-			continue;
-		/*
-		 * If pass2, we are done, otherwise do pass 2.
-		 */
-		if (waitfor == MNT_WAIT)
-			break;
-		waitfor = MNT_WAIT;
-	}
-	/*
-	 * Try freeing inodedep in case all dependencies have been removed.
-	 */
-	if (inodedep_lookup(fs, ino, 0, &inodedep) != 0)
-		(void) free_inodedep(inodedep);
-	return (0);
-}
-
-/*
- * Eliminate a pagedep dependency by flushing out all its diradd dependencies.
- * Called with splbio blocked.
- */
-static int
-flush_pagedep_deps(pvp, mp, diraddhdp)
-	struct vnode *pvp;
-	struct mount *mp;
-	struct diraddhd *diraddhdp;
-{
-	struct proc *p = CURPROC;	/* XXX */
-	struct inodedep *inodedep;
-	struct ufsmount *ump;
-	struct diradd *dap;
-	struct vnode *vp;
-	int gotit, error = 0;
-	struct buf *bp;
-	ino_t inum;
-
-	ump = VFSTOUFS(mp);
-	while ((dap = LIST_FIRST(diraddhdp)) != NULL) {
-		/*
-		 * Flush ourselves if this directory entry
-		 * has a MKDIR_PARENT dependency.
-		 */
-		if (dap->da_state & MKDIR_PARENT) {
-			FREE_LOCK(&lk);
-			if ((error = UFS_UPDATE(pvp, 1)) != 0)
-				break;
-			ACQUIRE_LOCK(&lk);
-			/*
-			 * If that cleared dependencies, go on to next.
-			 */
-			if (dap != LIST_FIRST(diraddhdp))
-				continue;
-			if (dap->da_state & MKDIR_PARENT)
-				panic("flush_pagedep_deps: MKDIR");
-		}
-		/*
-		 * Flush the file on which the directory entry depends.
-		 * If the inode has already been pushed out of the cache,
-		 * then all the block dependencies will have been flushed
-		 * leaving only inode dependencies (e.g., bitmaps). Thus,
-		 * we do a ufs_ihashget to check for the vnode in the cache.
-		 * If it is there, we do a full flush. If it is no longer
-		 * there we need only dispose of any remaining bitmap
-		 * dependencies and write the inode to disk.
-		 */
-		inum = dap->da_newinum;
-		FREE_LOCK(&lk);
-		if ((vp = ufs_ihashget(ump->um_dev, inum)) == NULL) {
-			ACQUIRE_LOCK(&lk);
-			if (inodedep_lookup(ump->um_fs, inum, 0, &inodedep) == 0
-			    && dap == LIST_FIRST(diraddhdp))
-				panic("flush_pagedep_deps: flush 1 failed");
-			/*
-			 * If the inode still has bitmap dependencies,
-			 * push them to disk.
-			 */
-			if ((inodedep->id_state & DEPCOMPLETE) == 0) {
-				gotit = getdirtybuf(&inodedep->id_buf,MNT_WAIT);
-				FREE_LOCK(&lk);
-				if (gotit &&
-				    (error = VOP_BWRITE(inodedep->id_buf)) != 0)
-					break;
-				ACQUIRE_LOCK(&lk);
-			}
-			if (dap != LIST_FIRST(diraddhdp))
-				continue;
-			/*
-			 * If the inode is still sitting in a buffer waiting
-			 * to be written, push it to disk.
-			 */
-			FREE_LOCK(&lk);
-			if ((error = bread(ump->um_devvp,
-			    fsbtodb(ump->um_fs, ino_to_fsba(ump->um_fs, inum)),
-			    (int)ump->um_fs->fs_bsize, NOCRED, &bp)) != 0)
-				break;
-			if ((error = VOP_BWRITE(bp)) != 0)
-				break;
-			ACQUIRE_LOCK(&lk);
-			if (dap == LIST_FIRST(diraddhdp))
-				panic("flush_pagedep_deps: flush 2 failed");
-			continue;
-		}
-		if (vp->v_type == VDIR) {
-			/*
-			 * A newly allocated directory must have its "." and
-			 * ".." entries written out before its name can be
-			 * committed in its parent. We do not want or need
-			 * the full semantics of a synchronous VOP_FSYNC as
-			 * that may end up here again, once for each directory
-			 * level in the filesystem. Instead, we push the blocks
-			 * and wait for them to clear.
-			 */
-			if (error = VOP_FSYNC(vp, p->p_ucred, MNT_NOWAIT, p)) {
-				vput(vp);
-				break;
-			}
-			drain_output(vp, 0);
-		}
-		error = UFS_UPDATE(vp, 1);
-		vput(vp);
-		if (error)
-			break;
-		/*
-		 * If we have failed to get rid of all the dependencies
-		 * then something is seriously wrong.
-		 */
-		if (dap == LIST_FIRST(diraddhdp))
-			panic("flush_pagedep_deps: flush 3 failed");
-		ACQUIRE_LOCK(&lk);
-	}
-	if (error)
-		ACQUIRE_LOCK(&lk);
-	return (error);
-}
-
-/*
- * A large burst of file addition or deletion activity can drive the
- * memory load excessively high. Therefore we deliberately slow things
- * down and speed up the I/O processing if we find ourselves with too
- * many dependencies in progress.
- */
-static int
-checklimit(resource, islocked)
-	long *resource;
-	int islocked;
-{
-	struct callout_handle handle;
-	struct proc *p = CURPROC;
-	int s;
-
-	/*
-	 * If we are under our limit, just proceed.
-	 */
-	if (*resource < max_softdeps)
-		return (0);
-	/*
-	 * We never hold up the filesystem syncer process.
-	 */
-	if (p == filesys_syncer)
-		return (0);
-	/*
-	 * Our first approach is to speed up the syncer process.
-	 * We never push it to speed up more than half of its
-	 * normal turn time, otherwise it could take over the cpu.
-	 */
-	s = splhigh();
-	if (filesys_syncer->p_wchan == &lbolt)
-		setrunnable(filesys_syncer);
-	splx(s);
-	if (rushjob < syncdelay / 2) {
-		rushjob += 1;
-		rush_requests += 1;
-		return (0);
-	}
-	/*
-	 * If we are resource constrained on inode dependencies, try
-	 * flushing some dirty inodes. Otherwise, we are constrained
-	 * by file deletions, so try accelerating flushes of directories
-	 * with removal dependencies. We would like to do the cleanup
-	 * here, but we probably hold an inode locked at this point and 
-	 * that might deadlock against one that we try to clean. So,
-	 * the best that we can do is request the syncer daemon (kick
-	 * started above) to do the cleanup for us.
-	 */
-	if (resource == &num_inodedep) {
-		ino_limit_push += 1;
-		req_clear_inodedeps = 1;
-	} else {
-		blk_limit_push += 1;
-		req_clear_remove = 1;
-	}
-	/*
-	 * Hopefully the syncer daemon will catch up and awaken us.
-	 * We wait at most tickdelay before proceeding in any case.
-	 */
-	if (islocked == 0)
-		ACQUIRE_LOCK(&lk);
-	if (proc_waiting == 0) {
-		proc_waiting = 1;
-		handle = timeout(pause_timer, NULL,
-		    tickdelay > 2 ? tickdelay : 2);
-	}
-	FREE_LOCK_INTERLOCKED(&lk);
-	(void) tsleep((caddr_t)&proc_waiting, PPAUSE | PCATCH, "softupdate", 0);
-	ACQUIRE_LOCK_INTERLOCKED(&lk);
-	if (proc_waiting) {
-		untimeout(pause_timer, NULL, handle);
-		proc_waiting = 0;
-	} else {
-		if (resource == &num_inodedep)
-			ino_limit_hit += 1;
-		else
-			blk_limit_hit += 1;
-	}
-	if (islocked == 0)
-		FREE_LOCK(&lk);
-	return (1);
-}
-
-/*
- * Awaken processes pausing in checklimit and clear proc_waiting
- * to indicate that there is no longer a timer running.
- */
-void
-pause_timer(arg)
-	void *arg;
-{
-
-	proc_waiting = 0;
-	wakeup(&proc_waiting);
-}
-
-/*
- * Flush out a directory with at least one removal dependency in an effort
- * to reduce the number of freefile and freeblks dependency structures.
- */
-static void
-clear_remove(p)
-	struct proc *p;
-{
-	struct pagedep_hashhead *pagedephd;
-	struct pagedep *pagedep;
-	static int next = 0;
-	struct mount *mp;
-	struct vnode *vp;
-	int error, cnt;
-	ino_t ino;
-
-	ACQUIRE_LOCK(&lk);
-	for (cnt = 0; cnt < pagedep_hash; cnt++) {
-		pagedephd = &pagedep_hashtbl[next++];
-		if (next >= pagedep_hash)
-			next = 0;
-		for (pagedep = LIST_FIRST(pagedephd); pagedep;
-		     pagedep = LIST_NEXT(pagedep, pd_hash)) {
-			if (LIST_FIRST(&pagedep->pd_dirremhd) == NULL)
-				continue;
-			mp = pagedep->pd_mnt;
-			ino = pagedep->pd_ino;
-			FREE_LOCK(&lk);
-			if ((error = VFS_VGET(mp, ino, &vp)) != 0) {
-				softdep_error("clear_remove: vget", error);
-				return;
-			}
-			if ((error = VOP_FSYNC(vp, p->p_ucred, MNT_NOWAIT, p)))
-				softdep_error("clear_remove: fsync", error);
-			drain_output(vp, 0);
-			vput(vp);
-			return;
-		}
-	}
-	FREE_LOCK(&lk);
-}
-
-/*
- * Clear out a block of dirty inodes in an effort to reduce
- * the number of inodedep dependency structures.
- */
-static void
-clear_inodedeps(p)
-	struct proc *p;
-{
-	struct inodedep_hashhead *inodedephd;
-	struct inodedep *inodedep;
-	static int next = 0;
-	struct mount *mp;
-	struct vnode *vp;
-	struct fs *fs;
-	int error, cnt;
-	ino_t firstino, lastino, ino;
-
-	ACQUIRE_LOCK(&lk);
-	/*
-	 * Pick a random inode dependency to be cleared.
-	 * We will then gather up all the inodes in its block 
-	 * that have dependencies and flush them out.
-	 */
-	for (cnt = 0; cnt < inodedep_hash; cnt++) {
-		inodedephd = &inodedep_hashtbl[next++];
-		if (next >= inodedep_hash)
-			next = 0;
-		if ((inodedep = LIST_FIRST(inodedephd)) != NULL)
-			break;
-	}
-	/*
-	 * Ugly code to find mount point given pointer to superblock.
-	 */
-	fs = inodedep->id_fs;
-	for (mp = CIRCLEQ_FIRST(&mountlist); mp != (void *)&mountlist;
-	     mp = CIRCLEQ_NEXT(mp, mnt_list))
-		if ((mp->mnt_flag & MNT_SOFTDEP) && fs == VFSTOUFS(mp)->um_fs)
-			break;
-	/*
-	 * Find the last inode in the block with dependencies.
-	 */
-	firstino = inodedep->id_ino & ~(INOPB(fs) - 1);
-	for (lastino = firstino + INOPB(fs) - 1; lastino > firstino; lastino--)
-		if (inodedep_lookup(fs, lastino, 0, &inodedep) != 0)
-			break;
-	/*
-	 * Asynchronously push all but the last inode with dependencies.
-	 * Synchronously push the last inode with dependencies to ensure
-	 * that the inode block gets written to free up the inodedeps.
-	 */
-	for (ino = firstino; ino <= lastino; ino++) {
-		if (inodedep_lookup(fs, ino, 0, &inodedep) == 0)
-			continue;
-		FREE_LOCK(&lk);
-		if ((error = VFS_VGET(mp, ino, &vp)) != 0) {
-			softdep_error("clear_inodedeps: vget", error);
-			return;
-		}
-		if (ino == lastino) {
-			if ((error = VOP_FSYNC(vp, p->p_ucred, MNT_WAIT, p)))
-				softdep_error("clear_inodedeps: fsync1", error);
-		} else {
-			if ((error = VOP_FSYNC(vp, p->p_ucred, MNT_NOWAIT, p)))
-				softdep_error("clear_inodedeps: fsync2", error);
-			drain_output(vp, 0);
-		}
-		vput(vp);
-		ACQUIRE_LOCK(&lk);
-	}
-	FREE_LOCK(&lk);
-}
-
-/*
- * Acquire exclusive access to a buffer.
- * Must be called with splbio blocked.
- * Return 1 if buffer was acquired.
- */
-static int
-getdirtybuf(bpp, waitfor)
-	struct buf **bpp;
-	int waitfor;
-{
-	struct buf *bp;
-
-	for (;;) {
-		if ((bp = *bpp) == NULL)
-			return (0);
-		if ((bp->b_flags & B_BUSY) == 0)
-			break;
-		if (waitfor != MNT_WAIT)
-			return (0);
-		bp->b_flags |= B_WANTED;
-		FREE_LOCK_INTERLOCKED(&lk);
-		tsleep((caddr_t)bp, PRIBIO + 1, "sdsdty", 0);
-		ACQUIRE_LOCK_INTERLOCKED(&lk);
-	}
-	if ((bp->b_flags & B_DELWRI) == 0)
-		return (0);
-	bremfree(bp);
-	bp->b_flags |= B_BUSY;
-	return (1);
-}
-
-/*
- * Wait for pending output on a vnode to complete.
- * Must be called with vnode locked.
- */
-static void
-drain_output(vp, islocked)
-	struct vnode *vp;
-	int islocked;
-{
-
-	if (!islocked)
-		ACQUIRE_LOCK(&lk);
-	while (vp->v_numoutput) {
-		vp->v_flag |= VBWAIT;
-		FREE_LOCK_INTERLOCKED(&lk);
-		tsleep((caddr_t)&vp->v_numoutput, PRIBIO + 1, "drainvp", 0);
-		ACQUIRE_LOCK_INTERLOCKED(&lk);
-	}
-	if (!islocked)
-		FREE_LOCK(&lk);
-}
-
-/*
- * Called whenever a buffer that is being invalidated or reallocated
- * contains dependencies. This should only happen if an I/O error has
- * occurred. The routine is called with the buffer locked.
- */ 
-void
-softdep_deallocate_dependencies(bp)
-	struct buf *bp;
-{
-
-	if ((bp->b_flags & B_ERROR) == 0)
-		panic("softdep_deallocate_dependencies: dangling deps");
-	softdep_error(bp->b_vp->v_mount->mnt_stat.f_mntonname, bp->b_error);
-	panic("softdep_deallocate_dependencies: unrecovered I/O error");
-}
-
-/*
- * Function to handle asynchronous write errors in the filesystem.
- */
-void
-softdep_error(func, error)
-	char *func;
-	int error;
-{
-
-	/* XXX should do something better! */
-	printf("%s: got error %d while accessing filesystem\n", func, error);
-}
diff --git a/sys/ufs/ffs/ffs_softdep_stub.c b/sys/ufs/ffs/ffs_softdep_stub.c
index 8d703f319ce0..9c7f7914ad05 100644
--- a/sys/ufs/ffs/ffs_softdep_stub.c
+++ b/sys/ufs/ffs/ffs_softdep_stub.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ffs_softdep_stub.c	9.1 (McKusick) 7/10/97
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ffs/ffs_softdep_stub.c,v 1.2.2.2 1999/08/29 16:33:11 peter Exp $
  */
 
 /* 
diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
index f005c71171ad..9b67859f493d 100644
--- a/sys/ufs/ffs/ffs_subr.c
+++ b/sys/ufs/ffs/ffs_subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_subr.c	8.5 (Berkeley) 3/21/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ffs/ffs_subr.c,v 1.23.2.1 1999/08/29 16:33:11 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/ffs_tables.c b/sys/ufs/ffs/ffs_tables.c
index 0256ee2244bd..44d8c2303da8 100644
--- a/sys/ufs/ffs/ffs_tables.c
+++ b/sys/ufs/ffs/ffs_tables.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_tables.c	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ffs/ffs_tables.c,v 1.6.4.1 1999/08/29 16:33:11 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 8ae767ba6578..4ad64d1c6a04 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vfsops.c	8.31 (Berkeley) 5/20/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ffs/ffs_vfsops.c,v 1.95.2.2 1999/11/21 16:58:49 bde Exp $
  */
 
 #include "opt_quota.h"
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index be5020400f44..aaf2633d85df 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vnops.c	8.15 (Berkeley) 5/14/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ffs/ffs_vnops.c,v 1.54.2.2 1999/08/29 16:33:12 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/fs.h b/sys/ufs/ffs/fs.h
index 91979d87cefc..78179f305848 100644
--- a/sys/ufs/ffs/fs.h
+++ b/sys/ufs/ffs/fs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fs.h	8.13 (Berkeley) 3/21/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ffs/fs.h,v 1.13.2.1 1999/08/29 16:33:13 peter Exp $
  */
 
 #ifndef _UFS_FFS_FS_H_
diff --git a/sys/ufs/ffs/softdep.h b/sys/ufs/ffs/softdep.h
deleted file mode 100644
index 8bbc409accbb..000000000000
--- a/sys/ufs/ffs/softdep.h
+++ /dev/null
@@ -1,548 +0,0 @@
-/*
- * Copyright 1998 Marshall Kirk McKusick. All Rights Reserved.
- *
- * The soft updates code is derived from the appendix of a University
- * of Michigan technical report (Gregory R. Ganger and Yale N. Patt,
- * "Soft Updates: A Solution to the Metadata Update Problem in File
- * Systems", CSE-TR-254-95, August 1995).
- *
- * The following are the copyrights and redistribution conditions that
- * apply to this copy of the soft update software. For a license
- * to use, redistribute or sell the soft update software under
- * conditions other than those described here, please contact the
- * author at one of the following addresses:
- *
- *	Marshall Kirk McKusick		mckusick@mckusick.com
- *	1614 Oxford Street		+1-510-843-9542
- *	Berkeley, CA 94709-1608
- *	USA
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. None of the names of McKusick, Ganger, Patt, or the University of
- *    Michigan may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- * 4. Redistributions in any form must be accompanied by information on
- *    how to obtain complete source code for any accompanying software
- *    that uses this software. This source code must either be included
- *    in the distribution or be available for no more than the cost of
- *    distribution plus a nominal fee, and must be freely redistributable
- *    under reasonable conditions. For an executable file, complete
- *    source code means the source code for all modules it contains.
- *    It does not mean source code for modules or files that typically
- *    accompany the operating system on which the executable file runs,
- *    e.g., standard library modules or system header files.
- *
- * THIS SOFTWARE IS PROVIDED BY MARSHALL KIRK MCKUSICK ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL MARSHALL KIRK MCKUSICK BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)softdep.h	9.6 (McKusick) 2/25/99
- * $FreeBSD$
- */
-
-#include <sys/queue.h>
-
-/*
- * Allocation dependencies are handled with undo/redo on the in-memory
- * copy of the data. A particular data dependency is eliminated when
- * it is ALLCOMPLETE: that is ATTACHED, DEPCOMPLETE, and COMPLETE.
- * 
- * ATTACHED means that the data is not currently being written to
- * disk. UNDONE means that the data has been rolled back to a safe
- * state for writing to the disk. When the I/O completes, the data is
- * restored to its current form and the state reverts to ATTACHED.
- * The data must be locked throughout the rollback, I/O, and roll
- * forward so that the rolled back information is never visible to
- * user processes. The COMPLETE flag indicates that the item has been
- * written. For example, a dependency that requires that an inode be
- * written will be marked COMPLETE after the inode has been written
- * to disk. The DEPCOMPLETE flag indicates the completion of any other
- * dependencies such as the writing of a cylinder group map has been
- * completed. A dependency structure may be freed only when both it
- * and its dependencies have completed and any rollbacks that are in
- * progress have finished as indicated by the set of ALLCOMPLETE flags
- * all being set. The two MKDIR flags indicate additional dependencies
- * that must be done when creating a new directory. MKDIR_BODY is
- * cleared when the directory data block containing the "." and ".."
- * entries has been written. MKDIR_PARENT is cleared when the parent
- * inode with the increased link count for ".." has been written. When
- * both MKDIR flags have been cleared, the DEPCOMPLETE flag is set to
- * indicate that the directory dependencies have been completed. The
- * writing of the directory inode itself sets the COMPLETE flag which
- * then allows the directory entry for the new directory to be written
- * to disk. The RMDIR flag marks a dirrem structure as representing
- * the removal of a directory rather than a file. When the removal
- * dependencies are completed, additional work needs to be done
- * (truncation of the "." and ".." entries, an additional decrement
- * of the associated inode, and a decrement of the parent inode). The
- * DIRCHG flag marks a diradd structure as representing the changing
- * of an existing entry rather than the addition of a new one. When
- * the update is complete the dirrem associated with the inode for
- * the old name must be added to the worklist to do the necessary
- * reference count decrement. The GOINGAWAY flag indicates that the
- * data structure is frozen from further change until its dependencies
- * have been completed and its resources freed after which it will be
- * discarded. The IOSTARTED flag prevents multiple calls to the I/O
- * start routine from doing multiple rollbacks. The ONWORKLIST flag
- * shows whether the structure is currently linked onto a worklist.
- */
-#define	ATTACHED	0x0001
-#define	UNDONE		0x0002
-#define	COMPLETE	0x0004
-#define	DEPCOMPLETE	0x0008
-#define MKDIR_PARENT	0x0010
-#define MKDIR_BODY	0x0020
-#define RMDIR		0x0040
-#define DIRCHG		0x0080
-#define GOINGAWAY	0x0100
-#define IOSTARTED	0x0200
-#define ONWORKLIST	0x8000
-
-#define	ALLCOMPLETE	(ATTACHED | COMPLETE | DEPCOMPLETE)
-
-/*
- * The workitem queue.
- * 
- * It is sometimes useful and/or necessary to clean up certain dependencies
- * in the background rather than during execution of an application process
- * or interrupt service routine. To realize this, we append dependency
- * structures corresponding to such tasks to a "workitem" queue. In a soft
- * updates implementation, most pending workitems should not wait for more
- * than a couple of seconds, so the filesystem syncer process awakens once
- * per second to process the items on the queue.
- */
-
-/* LIST_HEAD(workhead, worklist);	-- declared in buf.h */
-
-/*
- * Each request can be linked onto a work queue through its worklist structure.
- * To avoid the need for a pointer to the structure itself, this structure
- * MUST be declared FIRST in each type in which it appears! If more than one
- * worklist is needed in the structure, then a wk_data field must be added
- * and the macros below changed to use it.
- */
-struct worklist {
-	LIST_ENTRY(worklist)	wk_list;	/* list of work requests */
-	unsigned short		wk_type;	/* type of request */
-	unsigned short		wk_state;	/* state flags */
-};
-#define WK_DATA(wk) ((void *)(wk))
-#define WK_PAGEDEP(wk) ((struct pagedep *)(wk))
-#define WK_INODEDEP(wk) ((struct inodedep *)(wk))
-#define WK_NEWBLK(wk) ((struct newblk *)(wk))
-#define WK_BMSAFEMAP(wk) ((struct bmsafemap *)(wk))
-#define WK_ALLOCDIRECT(wk) ((struct allocdirect *)(wk))
-#define WK_INDIRDEP(wk) ((struct indirdep *)(wk))
-#define WK_ALLOCINDIR(wk) ((struct allocindir *)(wk))
-#define WK_FREEFRAG(wk) ((struct freefrag *)(wk))
-#define WK_FREEBLKS(wk) ((struct freeblks *)(wk))
-#define WK_FREEFILE(wk) ((struct freefile *)(wk))
-#define WK_DIRADD(wk) ((struct diradd *)(wk))
-#define WK_MKDIR(wk) ((struct mkdir *)(wk))
-#define WK_DIRREM(wk) ((struct dirrem *)(wk))
-
-/*
- * Various types of lists
- */
-LIST_HEAD(dirremhd, dirrem);
-LIST_HEAD(diraddhd, diradd);
-LIST_HEAD(newblkhd, newblk);
-LIST_HEAD(inodedephd, inodedep);
-LIST_HEAD(allocindirhd, allocindir);
-LIST_HEAD(allocdirecthd, allocdirect);
-TAILQ_HEAD(allocdirectlst, allocdirect);
-
-/*
- * The "pagedep" structure tracks the various dependencies related to
- * a particular directory page. If a directory page has any dependencies,
- * it will have a pagedep linked to its associated buffer. The
- * pd_dirremhd list holds the list of dirrem requests which decrement
- * inode reference counts. These requests are processed after the
- * directory page with the corresponding zero'ed entries has been
- * written. The pd_diraddhd list maintains the list of diradd requests
- * which cannot be committed until their corresponding inode has been
- * written to disk. Because a directory may have many new entries
- * being created, several lists are maintained hashed on bits of the
- * offset of the entry into the directory page to keep the lists from
- * getting too long. Once a new directory entry has been cleared to
- * be written, it is moved to the pd_pendinghd list. After the new
- * entry has been written to disk it is removed from the pd_pendinghd
- * list, any removed operations are done, and the dependency structure
- * is freed.
- */
-#define DAHASHSZ 6
-#define DIRADDHASH(offset) (((offset) >> 2) % DAHASHSZ)
-struct pagedep {
-	struct	worklist pd_list;	/* page buffer */
-#	define	pd_state pd_list.wk_state /* check for multiple I/O starts */
-	LIST_ENTRY(pagedep) pd_hash;	/* hashed lookup */
-	struct	mount *pd_mnt;		/* associated mount point */
-	ino_t	pd_ino;			/* associated file */
-	ufs_lbn_t pd_lbn;		/* block within file */
-	struct	dirremhd pd_dirremhd;	/* dirrem's waiting for page */
-	struct	diraddhd pd_diraddhd[DAHASHSZ]; /* diradd dir entry updates */
-	struct	diraddhd pd_pendinghd;	/* directory entries awaiting write */
-};
-
-/*
- * The "inodedep" structure tracks the set of dependencies associated
- * with an inode. One task that it must manage is delayed operations
- * (i.e., work requests that must be held until the inodedep's associated
- * inode has been written to disk). Getting an inode from its incore 
- * state to the disk requires two steps to be taken by the filesystem
- * in this order: first the inode must be copied to its disk buffer by
- * the VOP_UPDATE operation; second the inode's buffer must be written
- * to disk. To ensure that both operations have happened in the required
- * order, the inodedep maintains two lists. Delayed operations are
- * placed on the id_inowait list. When the VOP_UPDATE is done, all
- * operations on the id_inowait list are moved to the id_bufwait list.
- * When the buffer is written, the items on the id_bufwait list can be
- * safely moved to the work queue to be processed. A second task of the
- * inodedep structure is to track the status of block allocation within
- * the inode.  Each block that is allocated is represented by an
- * "allocdirect" structure (see below). It is linked onto the id_newinoupdt
- * list until both its contents and its allocation in the cylinder
- * group map have been written to disk. Once these dependencies have been
- * satisfied, it is removed from the id_newinoupdt list and any followup
- * actions such as releasing the previous block or fragment are placed
- * on the id_inowait list. When an inode is updated (a VOP_UPDATE is
- * done), the "inodedep" structure is linked onto the buffer through
- * its worklist. Thus, it will be notified when the buffer is about
- * to be written and when it is done. At the update time, all the
- * elements on the id_newinoupdt list are moved to the id_inoupdt list
- * since those changes are now relevant to the copy of the inode in the
- * buffer. Also at update time, the tasks on the id_inowait list are
- * moved to the id_bufwait list so that they will be executed when
- * the updated inode has been written to disk. When the buffer containing
- * the inode is written to disk, any updates listed on the id_inoupdt
- * list are rolled back as they are not yet safe. Following the write,
- * the changes are once again rolled forward and any actions on the
- * id_bufwait list are processed (since those actions are now safe).
- * The entries on the id_inoupdt and id_newinoupdt lists must be kept
- * sorted by logical block number to speed the calculation of the size
- * of the rolled back inode (see explanation in initiate_write_inodeblock).
- * When a directory entry is created, it is represented by a diradd.
- * The diradd is added to the id_inowait list as it cannot be safely
- * written to disk until the inode that it represents is on disk. After
- * the inode is written, the id_bufwait list is processed and the diradd
- * entries are moved to the id_pendinghd list where they remain until
- * the directory block containing the name has been written to disk.
- * The purpose of keeping the entries on the id_pendinghd list is so that
- * the softdep_fsync function can find and push the inode's directory
- * name(s) as part of the fsync operation for that file.
- */
-struct inodedep {
-	struct	worklist id_list;	/* buffer holding inode block */
-#	define	id_state id_list.wk_state /* inode dependency state */
-	LIST_ENTRY(inodedep) id_hash;	/* hashed lookup */
-	struct	fs *id_fs;		/* associated filesystem */
-	ino_t	id_ino;			/* dependent inode */
-	nlink_t	id_nlinkdelta;		/* saved effective link count */
-	struct	dinode *id_savedino;	/* saved dinode contents */
-	LIST_ENTRY(inodedep) id_deps;	/* bmsafemap's list of inodedep's */
-	struct	buf *id_buf;		/* related bmsafemap (if pending) */
-	off_t	id_savedsize;		/* file size saved during rollback */
-	struct	workhead id_pendinghd;	/* entries awaiting directory write */
-	struct	workhead id_bufwait;	/* operations after inode written */
-	struct	workhead id_inowait;	/* operations waiting inode update */
-	struct	allocdirectlst id_inoupdt; /* updates before inode written */
-	struct	allocdirectlst id_newinoupdt; /* updates when inode written */
-};
-
-/*
- * A "newblk" structure is attached to a bmsafemap structure when a block
- * or fragment is allocated from a cylinder group. Its state is set to
- * DEPCOMPLETE when its cylinder group map is written. It is consumed by
- * an associated allocdirect or allocindir allocation which will attach
- * themselves to the bmsafemap structure if the newblk's DEPCOMPLETE flag
- * is not set (i.e., its cylinder group map has not been written).
- */ 
-struct newblk {
-	LIST_ENTRY(newblk) nb_hash;	/* hashed lookup */
-	struct	fs *nb_fs;		/* associated filesystem */
-	ufs_daddr_t nb_newblkno;	/* allocated block number */
-	int	nb_state;		/* state of bitmap dependency */
-	LIST_ENTRY(newblk) nb_deps;	/* bmsafemap's list of newblk's */
-	struct	bmsafemap *nb_bmsafemap; /* associated bmsafemap */
-};
-
-/*
- * A "bmsafemap" structure maintains a list of dependency structures
- * that depend on the update of a particular cylinder group map.
- * It has lists for newblks, allocdirects, allocindirs, and inodedeps.
- * It is attached to the buffer of a cylinder group block when any of
- * these things are allocated from the cylinder group. It is freed
- * after the cylinder group map is written and the state of its
- * dependencies are updated with DEPCOMPLETE to indicate that it has
- * been processed.
- */
-struct bmsafemap {
-	struct	worklist sm_list;	/* cylgrp buffer */
-	struct	buf *sm_buf;		/* associated buffer */
-	struct	allocdirecthd sm_allocdirecthd; /* allocdirect deps */
-	struct	allocindirhd sm_allocindirhd; /* allocindir deps */
-	struct	inodedephd sm_inodedephd; /* inodedep deps */
-	struct	newblkhd sm_newblkhd;	/* newblk deps */
-};
-
-/*
- * An "allocdirect" structure is attached to an "inodedep" when a new block
- * or fragment is allocated and pointed to by the inode described by
- * "inodedep". The worklist is linked to the buffer that holds the block.
- * When the block is first allocated, it is linked to the bmsafemap
- * structure associated with the buffer holding the cylinder group map
- * from which it was allocated. When the cylinder group map is written
- * to disk, ad_state has the DEPCOMPLETE flag set. When the block itself
- * is written, the COMPLETE flag is set. Once both the cylinder group map
- * and the data itself have been written, it is safe to write the inode
- * that claims the block. If there was a previous fragment that had been
- * allocated before the file was increased in size, the old fragment may
- * be freed once the inode claiming the new block is written to disk.
- * This ad_fragfree request is attached to the id_inowait list of the
- * associated inodedep (pointed to by ad_inodedep) for processing after
- * the inode is written.
- */
-struct allocdirect {
-	struct	worklist ad_list;	/* buffer holding block */
-#	define	ad_state ad_list.wk_state /* block pointer state */
-	TAILQ_ENTRY(allocdirect) ad_next; /* inodedep's list of allocdirect's */
-	ufs_lbn_t ad_lbn;		/* block within file */
-	ufs_daddr_t ad_newblkno;	/* new value of block pointer */
-	ufs_daddr_t ad_oldblkno;	/* old value of block pointer */
-	long	ad_newsize;		/* size of new block */
-	long	ad_oldsize;		/* size of old block */
-	LIST_ENTRY(allocdirect) ad_deps; /* bmsafemap's list of allocdirect's */
-	struct	buf *ad_buf;		/* cylgrp buffer (if pending) */
-	struct	inodedep *ad_inodedep;	/* associated inodedep */
-	struct	freefrag *ad_freefrag;	/* fragment to be freed (if any) */
-};
-
-/*
- * A single "indirdep" structure manages all allocation dependencies for
- * pointers in an indirect block. The up-to-date state of the indirect
- * block is stored in ir_savedata. The set of pointers that may be safely
- * written to the disk is stored in ir_safecopy. The state field is used
- * only to track whether the buffer is currently being written (in which
- * case it is not safe to update ir_safecopy). Ir_deplisthd contains the
- * list of allocindir structures, one for each block that needs to be
- * written to disk. Once the block and its bitmap allocation have been
- * written the safecopy can be updated to reflect the allocation and the
- * allocindir structure freed. If ir_state indicates that an I/O on the
- * indirect block is in progress when ir_safecopy is to be updated, the
- * update is deferred by placing the allocindir on the ir_donehd list.
- * When the I/O on the indirect block completes, the entries on the
- * ir_donehd list are processed by updating their corresponding ir_safecopy
- * pointers and then freeing the allocindir structure.
- */
-struct indirdep {
-	struct	worklist ir_list;	/* buffer holding indirect block */
-#	define	ir_state ir_list.wk_state /* indirect block pointer state */
-	caddr_t ir_saveddata;		/* buffer cache contents */
-	struct	buf *ir_savebp;		/* buffer holding safe copy */
-	struct	allocindirhd ir_donehd;	/* done waiting to update safecopy */
-	struct	allocindirhd ir_deplisthd; /* allocindir deps for this block */
-};
-
-/*
- * An "allocindir" structure is attached to an "indirdep" when a new block
- * is allocated and pointed to by the indirect block described by the
- * "indirdep". The worklist is linked to the buffer that holds the new block.
- * When the block is first allocated, it is linked to the bmsafemap
- * structure associated with the buffer holding the cylinder group map
- * from which it was allocated. When the cylinder group map is written
- * to disk, ai_state has the DEPCOMPLETE flag set. When the block itself
- * is written, the COMPLETE flag is set. Once both the cylinder group map
- * and the data itself have been written, it is safe to write the entry in
- * the indirect block that claims the block; the "allocindir" dependency 
- * can then be freed as it is no longer applicable.
- */
-struct allocindir {
-	struct	worklist ai_list;	/* buffer holding indirect block */
-#	define	ai_state ai_list.wk_state /* indirect block pointer state */
-	LIST_ENTRY(allocindir) ai_next;	/* indirdep's list of allocindir's */
-	int	ai_offset;		/* pointer offset in indirect block */
-	ufs_daddr_t ai_newblkno;	/* new block pointer value */
-	ufs_daddr_t ai_oldblkno;	/* old block pointer value */
-	struct	freefrag *ai_freefrag;	/* block to be freed when complete */
-	struct	indirdep *ai_indirdep;	/* address of associated indirdep */
-	LIST_ENTRY(allocindir) ai_deps;	/* bmsafemap's list of allocindir's */
-	struct	buf *ai_buf;		/* cylgrp buffer (if pending) */
-};
-
-/*
- * A "freefrag" structure is attached to an "inodedep" when a previously
- * allocated fragment is replaced with a larger fragment, rather than extended.
- * The "freefrag" structure is constructed and attached when the replacement
- * block is first allocated. It is processed after the inode claiming the
- * bigger block that replaces it has been written to disk. Note that the
- * ff_state field is is used to store the uid, so may lose data. However,
- * the uid is used only in printing an error message, so is not critical.
- * Keeping it in a short keeps the data structure down to 32 bytes.
- */
-struct freefrag {
-	struct	worklist ff_list;	/* id_inowait or delayed worklist */
-#	define	ff_state ff_list.wk_state /* owning user; should be uid_t */
-	struct	vnode *ff_devvp;	/* filesystem device vnode */
-	struct	fs *ff_fs;		/* addr of superblock */
-	ufs_daddr_t ff_blkno;		/* fragment physical block number */
-	long	ff_fragsize;		/* size of fragment being deleted */
-	ino_t	ff_inum;		/* owning inode number */
-};
-
-/*
- * A "freeblks" structure is attached to an "inodedep" when the
- * corresponding file's length is reduced to zero. It records all
- * the information needed to free the blocks of a file after its
- * zero'ed inode has been written to disk.
- */
-struct freeblks {
-	struct	worklist fb_list;	/* id_inowait or delayed worklist */
-	ino_t	fb_previousinum;	/* inode of previous owner of blocks */
-	struct	vnode *fb_devvp;	/* filesystem device vnode */
-	struct	fs *fb_fs;		/* addr of superblock */
-	off_t	fb_oldsize;		/* previous file size */
-	off_t	fb_newsize;		/* new file size */
-	int	fb_chkcnt;		/* used to check cnt of blks released */
-	uid_t	fb_uid;			/* uid of previous owner of blocks */
-	ufs_daddr_t fb_dblks[NDADDR];	/* direct blk ptrs to deallocate */
-	ufs_daddr_t fb_iblks[NIADDR];	/* indirect blk ptrs to deallocate */
-};
-
-/*
- * A "freefile" structure is attached to an inode when its
- * link count is reduced to zero. It marks the inode as free in
- * the cylinder group map after the zero'ed inode has been written
- * to disk and any associated blocks and fragments have been freed.
- */
-struct freefile {
-	struct	worklist fx_list;	/* id_inowait or delayed worklist */
-	mode_t	fx_mode;		/* mode of inode */
-	ino_t	fx_oldinum;		/* inum of the unlinked file */
-	struct	vnode *fx_devvp;	/* filesystem device vnode */
-	struct	fs *fx_fs;		/* addr of superblock */
-};
-
-/*
- * A "diradd" structure is linked to an "inodedep" id_inowait list when a
- * new directory entry is allocated that references the inode described
- * by "inodedep". When the inode itself is written (either the initial
- * allocation for new inodes or with the increased link count for
- * existing inodes), the COMPLETE flag is set in da_state. If the entry
- * is for a newly allocated inode, the "inodedep" structure is associated
- * with a bmsafemap which prevents the inode from being written to disk
- * until the cylinder group has been updated. Thus the da_state COMPLETE
- * flag cannot be set until the inode bitmap dependency has been removed.
- * When creating a new file, it is safe to write the directory entry that
- * claims the inode once the referenced inode has been written. Since
- * writing the inode clears the bitmap dependencies, the DEPCOMPLETE flag
- * in the diradd can be set unconditionally when creating a file. When
- * creating a directory, there are two additional dependencies described by
- * mkdir structures (see their description below). When these dependencies
- * are resolved the DEPCOMPLETE flag is set in the diradd structure.
- * If there are multiple links created to the same inode, there will be
- * a separate diradd structure created for each link. The diradd is
- * linked onto the pg_diraddhd list of the pagedep for the directory
- * page that contains the entry. When a directory page is written,
- * the pg_diraddhd list is traversed to rollback any entries that are
- * not yet ready to be written to disk. If a directory entry is being
- * changed (by rename) rather than added, the DIRCHG flag is set and
- * the da_previous entry points to the entry that will be "removed"
- * once the new entry has been committed. During rollback, entries
- * with da_previous are replaced with the previous inode number rather
- * than zero.
- *
- * The overlaying of da_pagedep and da_previous is done to keep the
- * structure down to 32 bytes in size on a 32-bit machine. If a
- * da_previous entry is present, the pointer to its pagedep is available
- * in the associated dirrem entry. If the DIRCHG flag is set, the
- * da_previous entry is valid; if not set the da_pagedep entry is valid.
- * The DIRCHG flag never changes; it is set when the structure is created
- * if appropriate and is never cleared.
- */
-struct diradd {
-	struct	worklist da_list;	/* id_inowait or id_pendinghd list */
-#	define	da_state da_list.wk_state /* state of the new directory entry */
-	LIST_ENTRY(diradd) da_pdlist;	/* pagedep holding directory block */
-	doff_t	da_offset;		/* offset of new dir entry in dir blk */
-	ino_t	da_newinum;		/* inode number for the new dir entry */
-	union {
-	struct	dirrem *dau_previous;	/* entry being replaced in dir change */
-	struct	pagedep *dau_pagedep;	/* pagedep dependency for addition */
-	} da_un;
-};
-#define da_previous da_un.dau_previous
-#define da_pagedep da_un.dau_pagedep
-
-/*
- * Two "mkdir" structures are needed to track the additional dependencies
- * associated with creating a new directory entry. Normally a directory
- * addition can be committed as soon as the newly referenced inode has been
- * written to disk with its increased link count. When a directory is
- * created there are two additional dependencies: writing the directory
- * data block containing the "." and ".." entries (MKDIR_BODY) and writing
- * the parent inode with the increased link count for ".." (MKDIR_PARENT).
- * These additional dependencies are tracked by two mkdir structures that
- * reference the associated "diradd" structure. When they have completed,
- * they set the DEPCOMPLETE flag on the diradd so that it knows that its
- * extra dependencies have been completed. The md_state field is used only
- * to identify which type of dependency the mkdir structure is tracking.
- * It is not used in the mainline code for any purpose other than consistency
- * checking. All the mkdir structures in the system are linked together on
- * a list. This list is needed so that a diradd can find its associated
- * mkdir structures and deallocate them if it is prematurely freed (as for
- * example if a mkdir is immediately followed by a rmdir of the same directory).
- * Here, the free of the diradd must traverse the list to find the associated
- * mkdir structures that reference it. The deletion would be faster if the
- * diradd structure were simply augmented to have two pointers that referenced
- * the associated mkdir's. However, this would increase the size of the diradd
- * structure from 32 to 64-bits to speed a very infrequent operation.
- */
-struct mkdir {
-	struct	worklist md_list;	/* id_inowait or buffer holding dir */
-#	define	md_state md_list.wk_state /* type: MKDIR_PARENT or MKDIR_BODY */
-	struct	diradd *md_diradd;	/* associated diradd */
-	struct	buf *md_buf;		/* MKDIR_BODY: buffer holding dir */
-	LIST_ENTRY(mkdir) md_mkdirs;	/* list of all mkdirs */
-};
-LIST_HEAD(mkdirlist, mkdir) mkdirlisthd;
-
-/*
- * A "dirrem" structure describes an operation to decrement the link
- * count on an inode. The dirrem structure is attached to the pg_dirremhd
- * list of the pagedep for the directory page that contains the entry.
- * It is processed after the directory page with the deleted entry has
- * been written to disk.
- *
- * The overlaying of dm_pagedep and dm_dirinum is done to keep the
- * structure down to 32 bytes in size on a 32-bit machine. It works
- * because they are never used concurrently.
- */
-struct dirrem {
-	struct	worklist dm_list;	/* delayed worklist */
-#	define	dm_state dm_list.wk_state /* state of the old directory entry */
-	LIST_ENTRY(dirrem) dm_next;	/* pagedep's list of dirrem's */
-	struct	mount *dm_mnt;		/* associated mount point */
-	ino_t	dm_oldinum;		/* inum of the removed dir entry */
-	union {
-	struct	pagedep *dmu_pagedep;	/* pagedep dependency for remove */
-	ino_t	dmu_dirinum;		/* parent inode number (for rmdir) */
-	} dm_un;
-};
-#define dm_pagedep dm_un.dmu_pagedep
-#define dm_dirinum dm_un.dmu_dirinum
diff --git a/sys/ufs/mfs/mfs_extern.h b/sys/ufs/mfs/mfs_extern.h
index 1a635a5e6873..1fc2ffa601f9 100644
--- a/sys/ufs/mfs/mfs_extern.h
+++ b/sys/ufs/mfs/mfs_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfs_extern.h	8.4 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/mfs/mfs_extern.h,v 1.11.2.1 1999/08/29 16:33:14 peter Exp $
  */
 
 #ifndef _UFS_MFS_MFS_EXTERN_H_
diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c
index 1abd37daf404..dc9c0a365da7 100644
--- a/sys/ufs/mfs/mfs_vfsops.c
+++ b/sys/ufs/mfs/mfs_vfsops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfs_vfsops.c	8.11 (Berkeley) 6/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/mfs/mfs_vfsops.c,v 1.53.2.3 1999/08/29 16:33:15 peter Exp $
  */
 
 
diff --git a/sys/ufs/mfs/mfs_vnops.c b/sys/ufs/mfs/mfs_vnops.c
index 7d4ccd1fd34e..1ecb67150eae 100644
--- a/sys/ufs/mfs/mfs_vnops.c
+++ b/sys/ufs/mfs/mfs_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfs_vnops.c	8.11 (Berkeley) 5/22/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/mfs/mfs_vnops.c,v 1.38.2.1 1999/08/29 16:33:16 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/mfs/mfsnode.h b/sys/ufs/mfs/mfsnode.h
index da428144b9a6..bef5e87f6e9d 100644
--- a/sys/ufs/mfs/mfsnode.h
+++ b/sys/ufs/mfs/mfsnode.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfsnode.h	8.3 (Berkeley) 5/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/mfs/mfsnode.h,v 1.11.2.1 1999/08/29 16:33:16 peter Exp $
  */
 
 #ifndef _UFS_MFS_MFSNODE_H_
diff --git a/sys/ufs/ufs/dinode.h b/sys/ufs/ufs/dinode.h
index 461a6c0bdf20..6bba5aabaf12 100644
--- a/sys/ufs/ufs/dinode.h
+++ b/sys/ufs/ufs/dinode.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dinode.h	8.3 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/dinode.h,v 1.6.4.1 1999/08/29 16:33:17 peter Exp $
  */
 
 #ifndef _UFS_UFS_DINODE_H_
diff --git a/sys/ufs/ufs/dir.h b/sys/ufs/ufs/dir.h
index a8948b9aaeff..f6c5229a440d 100644
--- a/sys/ufs/ufs/dir.h
+++ b/sys/ufs/ufs/dir.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dir.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/dir.h,v 1.8.4.1 1999/08/29 16:33:18 peter Exp $
  */
 
 #ifndef _UFS_UFS_DIR_H_
diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h
index 78bbf70cbf8f..083ec2841dfb 100644
--- a/sys/ufs/ufs/inode.h
+++ b/sys/ufs/ufs/inode.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.9 (Berkeley) 5/14/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/inode.h,v 1.24.2.1 1999/08/29 16:33:18 peter Exp $
  */
 
 #ifndef _UFS_UFS_INODE_H_
diff --git a/sys/ufs/ufs/quota.h b/sys/ufs/ufs/quota.h
index 531290bf8e61..5fc90a886720 100644
--- a/sys/ufs/ufs/quota.h
+++ b/sys/ufs/ufs/quota.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)quota.h	8.3 (Berkeley) 8/19/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/quota.h,v 1.11.2.1 1999/08/29 16:33:19 peter Exp $
  */
 
 #ifndef _UFS_UFS_QUOTA_H_
diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c
index 75bdae771320..e6e8e10da9f0 100644
--- a/sys/ufs/ufs/ufs_bmap.c
+++ b/sys/ufs/ufs/ufs_bmap.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_bmap.c	8.7 (Berkeley) 3/21/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/ufs_bmap.c,v 1.24.2.1 1999/08/29 16:33:19 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufs_disksubr.c b/sys/ufs/ufs/ufs_disksubr.c
index 1e1e39b3f0e9..fbc69841dc33 100644
--- a/sys/ufs/ufs/ufs_disksubr.c
+++ b/sys/ufs/ufs/ufs_disksubr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_disksubr.c	8.5 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/ufs_disksubr.c,v 1.39.2.1 1999/08/29 16:33:19 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h
index ee2779d78778..80633736e46a 100644
--- a/sys/ufs/ufs/ufs_extern.h
+++ b/sys/ufs/ufs/ufs_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_extern.h	8.10 (Berkeley) 5/14/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/ufs_extern.h,v 1.24.2.1 1999/08/29 16:33:20 peter Exp $
  */
 
 #ifndef _UFS_UFS_EXTERN_H_
diff --git a/sys/ufs/ufs/ufs_ihash.c b/sys/ufs/ufs/ufs_ihash.c
index 38056f416536..5819ec7b580d 100644
--- a/sys/ufs/ufs/ufs_ihash.c
+++ b/sys/ufs/ufs/ufs_ihash.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_ihash.c	8.7 (Berkeley) 5/17/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/ufs_ihash.c,v 1.18.2.1 1999/08/29 16:33:20 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufs_inode.c b/sys/ufs/ufs/ufs_inode.c
index edb8c153f190..571cf9d9ae10 100644
--- a/sys/ufs/ufs/ufs_inode.c
+++ b/sys/ufs/ufs/ufs_inode.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_inode.c	8.9 (Berkeley) 5/14/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/ufs_inode.c,v 1.24.2.1 1999/08/29 16:33:21 peter Exp $
  */
 
 #include "opt_quota.h"
diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c
index 728b5a6ef83c..4c481cfb1ce4 100644
--- a/sys/ufs/ufs/ufs_lookup.c
+++ b/sys/ufs/ufs/ufs_lookup.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_lookup.c	8.15 (Berkeley) 6/16/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/ufs_lookup.c,v 1.26.2.2 1999/10/30 00:52:25 dillon Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c
index e1b5b5d986f1..eda87dbdd42a 100644
--- a/sys/ufs/ufs/ufs_quota.c
+++ b/sys/ufs/ufs/ufs_quota.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_quota.c	8.5 (Berkeley) 5/20/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/ufs_quota.c,v 1.25.2.1 1999/08/29 16:33:22 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufs_readwrite.c b/sys/ufs/ufs/ufs_readwrite.c
index 58abf146653f..92ec4f58bdaf 100644
--- a/sys/ufs/ufs/ufs_readwrite.c
+++ b/sys/ufs/ufs/ufs_readwrite.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_readwrite.c	8.11 (Berkeley) 5/8/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/ufs_readwrite.c,v 1.55.2.2 1999/08/31 03:11:12 bde Exp $
  */
 
 #define	BLKSIZE(a, b, c)	blksize(a, b, c)
diff --git a/sys/ufs/ufs/ufs_vfsops.c b/sys/ufs/ufs/ufs_vfsops.c
index d5c2b0ace5ad..6c46cca4e1f8 100644
--- a/sys/ufs/ufs/ufs_vfsops.c
+++ b/sys/ufs/ufs/ufs_vfsops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_vfsops.c	8.8 (Berkeley) 5/20/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/ufs_vfsops.c,v 1.12.2.1 1999/08/29 16:33:23 peter Exp $
  */
 
 #include "opt_quota.h"
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index e6e6c5e61375..3a4f8a90e6c9 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_vnops.c	8.27 (Berkeley) 5/27/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/ufs_vnops.c,v 1.104.2.3 1999/11/21 16:58:50 bde Exp $
  */
 
 #include "opt_quota.h"
diff --git a/sys/ufs/ufs/ufsmount.h b/sys/ufs/ufs/ufsmount.h
index 05f19da73868..7664ffa11a4c 100644
--- a/sys/ufs/ufs/ufsmount.h
+++ b/sys/ufs/ufs/ufsmount.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufsmount.h	8.6 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/ufsmount.h,v 1.14.2.2 1999/11/21 16:58:52 bde Exp $
  */
 
 #ifndef _UFS_UFS_UFSMOUNT_H_
diff --git a/sys/vm/default_pager.c b/sys/vm/default_pager.c
index 836812d07539..ca87a719989f 100644
--- a/sys/vm/default_pager.c
+++ b/sys/vm/default_pager.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/default_pager.c,v 1.16.2.1 1999/08/29 16:33:26 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/vm/default_pager.h b/sys/vm/default_pager.h
index 842969accd4c..5ed5b1cbcf9a 100644
--- a/sys/vm/default_pager.h
+++ b/sys/vm/default_pager.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/default_pager.h,v 1.7.4.1 1999/08/29 16:33:26 peter Exp $
  */
 
 #ifndef _DEFAULT_PAGER_H_
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
index 3fd4103195a5..2989dad1c46f 100644
--- a/sys/vm/device_pager.c
+++ b/sys/vm/device_pager.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)device_pager.c	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/device_pager.c,v 1.37.2.1 1999/08/29 16:33:27 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h
index 1df6b9f0ddb6..bdbb775eb716 100644
--- a/sys/vm/pmap.h
+++ b/sys/vm/pmap.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/pmap.h,v 1.28.2.2 1999/08/29 16:33:27 peter Exp $
  */
 
 /*
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index 78a65977948e..45f2f95e3f6a 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -39,7 +39,7 @@
  * from: Utah $Hdr: swap_pager.c 1.4 91/04/30$
  *
  *	@(#)swap_pager.c	8.9 (Berkeley) 3/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/swap_pager.c,v 1.107.2.1 1999/08/29 16:33:27 peter Exp $
  */
 
 /*
diff --git a/sys/vm/swap_pager.h b/sys/vm/swap_pager.h
index 908a6fa3cf57..7ec0d17f86e6 100644
--- a/sys/vm/swap_pager.h
+++ b/sys/vm/swap_pager.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)swap_pager.h	7.1 (Berkeley) 12/5/90
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/swap_pager.h,v 1.22.2.1 1999/08/29 16:33:28 peter Exp $
  */
 
 /*
diff --git a/sys/vm/vm.h b/sys/vm/vm.h
index 1fd27452dd03..71b9ba1a4030 100644
--- a/sys/vm/vm.h
+++ b/sys/vm/vm.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm.h	8.2 (Berkeley) 12/13/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm.h,v 1.13.4.1 1999/08/29 16:33:29 peter Exp $
  */
 
 #ifndef VM_H
diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h
index 46f381b71b21..d74958708068 100644
--- a/sys/vm/vm_extern.h
+++ b/sys/vm/vm_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_extern.h	8.2 (Berkeley) 1/12/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_extern.h,v 1.39.2.2 1999/08/29 16:33:29 peter Exp $
  */
 
 #ifndef _VM_EXTERN_H_
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index 16400d2a6830..242d0926a5a1 100644
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -66,7 +66,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_fault.c,v 1.93.2.4 1999/08/29 16:33:30 peter Exp $
  */
 
 /*
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index 555808de31d9..7f6008d4cd9e 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -59,7 +59,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_glue.c,v 1.80.2.3 1999/08/29 16:33:31 peter Exp $
  */
 
 #include "opt_rlimit.h"
diff --git a/sys/vm/vm_inherit.h b/sys/vm/vm_inherit.h
index 8d7b7f6df501..ba2a75d3ffaf 100644
--- a/sys/vm/vm_inherit.h
+++ b/sys/vm/vm_inherit.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_inherit.h,v 1.6.4.1 1999/08/29 16:33:31 peter Exp $
  */
 
 /*
diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c
index f7f1df84a199..8a3a8e1ea399 100644
--- a/sys/vm/vm_init.c
+++ b/sys/vm/vm_init.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_init.c,v 1.18.2.1 1999/08/29 16:33:32 peter Exp $
  */
 
 /*
diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
index 3511a48c0295..d6b2210e341f 100644
--- a/sys/vm/vm_kern.c
+++ b/sys/vm/vm_kern.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_kern.c,v 1.50.2.3 1999/08/29 16:33:32 peter Exp $
  */
 
 /*
diff --git a/sys/vm/vm_kern.h b/sys/vm/vm_kern.h
index 0670c9fe95d5..516c89e55404 100644
--- a/sys/vm/vm_kern.h
+++ b/sys/vm/vm_kern.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_kern.h,v 1.17.2.1 1999/08/29 16:33:33 peter Exp $
  */
 
 #ifndef _VM_VM_KERN_H_
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index eb74ed5b0f07..cff1abf799bb 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_map.c,v 1.139.2.10 1999/08/29 16:33:33 peter Exp $
  */
 
 /*
diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h
index fb96e617df83..ddd16da64426 100644
--- a/sys/vm/vm_map.h
+++ b/sys/vm/vm_map.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_map.h,v 1.33.2.5 1999/08/29 16:33:34 peter Exp $
  */
 
 /*
diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c
index 728a7c1b907b..af690b63d938 100644
--- a/sys/vm/vm_meter.c
+++ b/sys/vm/vm_meter.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_meter.c	8.4 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_meter.c,v 1.27.2.1 1999/08/29 16:33:34 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index f069cba6a3df..8cbfeb84fda3 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -38,7 +38,7 @@
  * from: Utah $Hdr: vm_mmap.c 1.6 91/10/21$
  *
  *	@(#)vm_mmap.c	8.4 (Berkeley) 1/12/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_mmap.c,v 1.86.2.3 1999/08/29 16:33:34 peter Exp $
  */
 
 /*
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 0c764ef219b5..7d4fea1a5e64 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_object.c,v 1.138.2.6 1999/08/29 16:33:35 peter Exp $
  */
 
 /*
diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
index 5f9cfcf8a0d1..e9c39b6a838f 100644
--- a/sys/vm/vm_object.h
+++ b/sys/vm/vm_object.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_object.h,v 1.51.2.2 1999/08/29 16:33:36 peter Exp $
  */
 
 /*
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index 20da7769c6fc..57519c83167c 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vm_page.c	7.4 (Berkeley) 5/7/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_page.c,v 1.116.2.4 1999/08/29 16:33:36 peter Exp $
  */
 
 /*
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
index 0d20c58e876a..83ae03314d4a 100644
--- a/sys/vm/vm_page.h
+++ b/sys/vm/vm_page.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_page.h,v 1.49.2.1 1999/08/29 16:33:37 peter Exp $
  */
 
 /*
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index a5ca9dc84ad1..9c53f07a3c58 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -65,7 +65,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_pageout.c,v 1.129.2.7 1999/08/29 16:33:38 peter Exp $
  */
 
 /*
diff --git a/sys/vm/vm_pageout.h b/sys/vm/vm_pageout.h
index 508b4b2be0c6..8da329a47c9b 100644
--- a/sys/vm/vm_pageout.h
+++ b/sys/vm/vm_pageout.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_pageout.h,v 1.23.2.1 1999/08/29 16:33:38 peter Exp $
  */
 
 #ifndef _VM_VM_PAGEOUT_H_
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index 20a40f9c1762..dc7f1b7bc503 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_pager.c,v 1.40.2.1 1999/08/29 16:33:38 peter Exp $
  */
 
 /*
diff --git a/sys/vm/vm_pager.h b/sys/vm/vm_pager.h
index e93e964b4ede..c4172f0653b9 100644
--- a/sys/vm/vm_pager.h
+++ b/sys/vm/vm_pager.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_pager.h	8.4 (Berkeley) 1/12/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_pager.h,v 1.17.2.1 1999/08/29 16:33:39 peter Exp $
  */
 
 /*
diff --git a/sys/vm/vm_param.h b/sys/vm/vm_param.h
index 6759b4176db9..b4d6c410f55a 100644
--- a/sys/vm/vm_param.h
+++ b/sys/vm/vm_param.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_param.h,v 1.9.2.1 1999/08/29 16:33:39 peter Exp $
  */
 
 /*
diff --git a/sys/vm/vm_prot.h b/sys/vm/vm_prot.h
index 68e552e018ad..7dd8f00e436e 100644
--- a/sys/vm/vm_prot.h
+++ b/sys/vm/vm_prot.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_prot.h,v 1.8.4.1 1999/08/29 16:33:39 peter Exp $
  */
 
 /*
diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c
index 76e3f6e97849..b05bb1250353 100644
--- a/sys/vm/vm_swap.c
+++ b/sys/vm/vm_swap.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_swap.c	8.5 (Berkeley) 2/17/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_swap.c,v 1.57.2.1 1999/08/29 16:33:40 peter Exp $
  */
 
 #include "opt_devfs.h"
diff --git a/sys/vm/vm_unix.c b/sys/vm/vm_unix.c
index 3538b3051000..bc35d2abce70 100644
--- a/sys/vm/vm_unix.c
+++ b/sys/vm/vm_unix.c
@@ -38,7 +38,7 @@
  * from: Utah $Hdr: vm_unix.c 1.1 89/11/07$
  *
  *	@(#)vm_unix.c	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_unix.c,v 1.17.2.1 1999/08/29 16:33:40 peter Exp $
  */
 
 /*
diff --git a/sys/vm/vm_zone.c b/sys/vm/vm_zone.c
index 3befc9119c00..13540e10874b 100644
--- a/sys/vm/vm_zone.c
+++ b/sys/vm/vm_zone.c
@@ -11,7 +11,7 @@
  * 2. Absolutely no warranty of function or purpose is made by the author
  *	John S. Dyson.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_zone.c,v 1.26.2.1 1999/08/29 16:33:41 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/vm/vm_zone.h b/sys/vm/vm_zone.h
index b8aa933b3c37..94f3ea74ab2a 100644
--- a/sys/vm/vm_zone.h
+++ b/sys/vm/vm_zone.h
@@ -11,7 +11,7 @@
  * 2. Absolutely no warranty of function or purpose is made by the author
  *	John S. Dyson.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_zone.h,v 1.12.2.1 1999/08/29 16:33:41 peter Exp $
  */
 
 #ifndef _SYS_ZONE_H
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index 35d8f487a160..5d0cc93ff21e 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vnode_pager.c	7.5 (Berkeley) 4/20/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vnode_pager.c,v 1.101.2.2 1999/08/29 16:33:41 peter Exp $
  */
 
 /*
diff --git a/sys/vm/vnode_pager.h b/sys/vm/vnode_pager.h
index 339851d21b65..ed3004ac7751 100644
--- a/sys/vm/vnode_pager.h
+++ b/sys/vm/vnode_pager.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vnode_pager.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vnode_pager.h,v 1.12.2.1 1999/08/29 16:33:42 peter Exp $
  */
 
 #ifndef	_VNODE_PAGER_
diff --git a/tools/3.0-upgrade/cvt-wtmp.c b/tools/3.0-upgrade/cvt-wtmp.c
index c5d3b54a7bbc..5f1daa510474 100644
--- a/tools/3.0-upgrade/cvt-wtmp.c
+++ b/tools/3.0-upgrade/cvt-wtmp.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/3.0-upgrade/cvt-wtmp.c,v 1.5.2.1 1999/08/29 15:18:08 peter Exp $
  *
  */
 
diff --git a/tools/LibraryReport/LibraryReport.tcl b/tools/LibraryReport/LibraryReport.tcl
index fbf63896c71d..75fe6ce75599 100755
--- a/tools/LibraryReport/LibraryReport.tcl
+++ b/tools/LibraryReport/LibraryReport.tcl
@@ -50,7 +50,7 @@ exec tclsh $0 $*
 #
 ################################################################################
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/LibraryReport/LibraryReport.tcl,v 1.4.4.1 1999/08/29 15:18:10 peter Exp $
 #
 
 #########################################################################################
diff --git a/tools/diag/README b/tools/diag/README
index bd6af5f7f9cb..fbd65df28111 100644
--- a/tools/diag/README
+++ b/tools/diag/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/diag/README,v 1.3.2.1 1999/11/04 08:59:50 phantom Exp $
 
 This directory is for diagnostic programs.
 
diff --git a/tools/diag/ac/ac b/tools/diag/ac/ac
index 64bb04107bd3..114a58a89438 100644
--- a/tools/diag/ac/ac
+++ b/tools/diag/ac/ac
@@ -5,7 +5,7 @@
 #
 # ac - check if the FreeBSD handbook is in sync with the committers list
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/diag/ac/ac,v 1.1.2.2 1999/11/04 09:07:14 phantom Exp $
 
 : ${CVSROOT=/home/ncvs}
 contrib=doc/en_US.ISO_8859-1/books/handbook/staff/chapter.sgml
diff --git a/tools/diag/httpd-error/httpd-error b/tools/diag/httpd-error/httpd-error
index 6882067d75db..5513e3c3b53e 100755
--- a/tools/diag/httpd-error/httpd-error
+++ b/tools/diag/httpd-error/httpd-error
@@ -4,7 +4,7 @@
 #
 # httpd-error - check for Web files which does not exists on your host
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/diag/httpd-error/httpd-error,v 1.1.2.1 1999/08/29 15:18:12 peter Exp $
 
 mode=${1}
 
diff --git a/tools/test/devrandom/hammer.random b/tools/test/devrandom/hammer.random
index ea4cb5f64032..a8937b280761 100644
--- a/tools/test/devrandom/hammer.random
+++ b/tools/test/devrandom/hammer.random
@@ -5,7 +5,7 @@
 # Read and display random numbers.
 # Try tapping shift/alt/ctrl to get more randomness.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/test/devrandom/hammer.random,v 1.3.2.1 1999/08/29 15:18:13 peter Exp $
 #
 
 for (;;) {
diff --git a/tools/test/devrandom/hammer.urandom b/tools/test/devrandom/hammer.urandom
index d0b6aa89da58..20f31247f4e7 100644
--- a/tools/test/devrandom/hammer.urandom
+++ b/tools/test/devrandom/hammer.urandom
@@ -5,7 +5,7 @@
 # Read and display random numbers.
 # This also reads /dev/zero to make sure there is no brokenness there.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/test/devrandom/hammer.urandom,v 1.3.2.1 1999/08/29 15:18:14 peter Exp $
 #
 
 open(ZERO, "/dev/zero") || die "Cannot open /dev/zero - $!\n";
diff --git a/tools/test/devrandom/stat.16bit b/tools/test/devrandom/stat.16bit
index 32a6a9caf550..c14795ecdf46 100644
--- a/tools/test/devrandom/stat.16bit
+++ b/tools/test/devrandom/stat.16bit
@@ -8,7 +8,7 @@
 # Redirect the output from this to a file - and go to the movies while
 # it runs. This program is a CPU Hog!
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/test/devrandom/stat.16bit,v 1.3.2.1 1999/08/29 15:18:15 peter Exp $
 #
 
 for ($i = 0; $i < (1024*64); $i++) {
diff --git a/tools/test/devrandom/stat.8bit b/tools/test/devrandom/stat.8bit
index 03fdbdd5b39d..fa5930808b23 100644
--- a/tools/test/devrandom/stat.8bit
+++ b/tools/test/devrandom/stat.8bit
@@ -8,7 +8,7 @@
 # Redirect the output from this to a file - and make a cup of coffee while
 # it runs. This program is a CPU Hog!
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/test/devrandom/stat.8bit,v 1.3.2.1 1999/08/29 15:18:16 peter Exp $
 #
 
 for ($i = 0; $i < (1024*32); $i++) {
diff --git a/tools/tools/README b/tools/tools/README
index 4ae496136ddf..1e91ca6e4446 100644
--- a/tools/tools/README
+++ b/tools/tools/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/README,v 1.15.2.1 1999/08/29 15:18:17 peter Exp $
 
 This directory is for tools.
 
diff --git a/tools/tools/diffburst/Makefile b/tools/tools/diffburst/Makefile
index 6cec60ba256a..3756fc9b4f2b 100644
--- a/tools/tools/diffburst/Makefile
+++ b/tools/tools/diffburst/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/diffburst/Makefile,v 1.1.2.1 1999/08/29 15:18:18 peter Exp $
 
 PROG=		diffburst
 SRCS=		main.c
diff --git a/tools/tools/diffburst/diffburst.1 b/tools/tools/diffburst/diffburst.1
index 5c2bd009b34b..ea16fe74a330 100644
--- a/tools/tools/diffburst/diffburst.1
+++ b/tools/tools/diffburst/diffburst.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/tools/diffburst/diffburst.1,v 1.1.2.1 1999/09/19 18:29:07 phantom Exp $
 .\"
 .Dd Jan 7, 1999
 .Dt DIFFBURST 1
diff --git a/tools/tools/epfe/epfe.pl b/tools/tools/epfe/epfe.pl
index 0aea2c247a64..8ac4bdb1f5f0 100644
--- a/tools/tools/epfe/epfe.pl
+++ b/tools/tools/epfe/epfe.pl
@@ -7,7 +7,7 @@
 #	$ cd /usr/share/examples/printing
 #	$ epfe < ../../doc/handbook/printing.sgml
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/epfe/epfe.pl,v 1.3.4.1 1999/08/29 15:18:19 peter Exp $
 
 $in = 0; @a = ();
 sub Print { s/\&amp\;/&/g; push(@a,$_); }
diff --git a/tools/tools/html-mv/html-mv b/tools/tools/html-mv/html-mv
index 29ea1f2db81d..7811fdfc1585 100644
--- a/tools/tools/html-mv/html-mv
+++ b/tools/tools/html-mv/html-mv
@@ -17,7 +17,7 @@
 # FAQ_Can_FreeBSD_handle_multiport_serial_cards_sharing_irqs_.html
 # [...]
 # 
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/html-mv/html-mv,v 1.1.2.1 1999/08/29 15:18:21 peter Exp $
 
 case $# in 0)
 	echo "usage `basename $0` file"
diff --git a/tools/tools/ifinfo/Makefile b/tools/tools/ifinfo/Makefile
index 2fe0e83260f5..313983aa965c 100644
--- a/tools/tools/ifinfo/Makefile
+++ b/tools/tools/ifinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/ifinfo/Makefile,v 1.3.2.1 1999/08/29 15:18:22 peter Exp $
 
 PROG=	ifinfo
 SRCS=	ifinfo.c rfc1650.c
diff --git a/tools/tools/ifinfo/ifinfo.c b/tools/tools/ifinfo/ifinfo.c
index 63fad7e75fa0..c1aa69093bf1 100644
--- a/tools/tools/ifinfo/ifinfo.c
+++ b/tools/tools/ifinfo/ifinfo.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/ifinfo/ifinfo.c,v 1.4.2.1 1999/08/29 15:18:22 peter Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>		/* for PF_LINK */
diff --git a/tools/tools/ifinfo/ifinfo.h b/tools/tools/ifinfo/ifinfo.h
index c05a8b82eca5..d072fb7ca488 100644
--- a/tools/tools/ifinfo/ifinfo.h
+++ b/tools/tools/ifinfo/ifinfo.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/ifinfo/ifinfo.h,v 1.3.2.1 1999/08/29 15:18:23 peter Exp $
  */
 #ifndef	ifinfo_h
 #define	ifinfo_h	1
diff --git a/tools/tools/kdrv/KernelDriver b/tools/tools/kdrv/KernelDriver
index b840ff48150a..c9584ab4218b 100755
--- a/tools/tools/kdrv/KernelDriver
+++ b/tools/tools/kdrv/KernelDriver
@@ -73,7 +73,7 @@ exec tclsh $0 $*
 #
 ################################################################################
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/kdrv/KernelDriver,v 1.3.2.1 1999/08/29 15:18:24 peter Exp $
 #
 ################################################################################
 
diff --git a/tools/tools/kdrv/sample.drvinfo b/tools/tools/kdrv/sample.drvinfo
index eeb6a254d080..e3724f78441c 100644
--- a/tools/tools/kdrv/sample.drvinfo
+++ b/tools/tools/kdrv/sample.drvinfo
@@ -2,7 +2,7 @@
 # Sample driver information file for KernelDriver.  See the top of
 # the KernelDriver script for a more exact definition of the syntax.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/kdrv/sample.drvinfo,v 1.3.2.1 1999/08/29 15:18:26 peter Exp $
 
 # Device driver name
 #
diff --git a/tools/tools/kernxref/kernxref.sh b/tools/tools/kernxref/kernxref.sh
index 61bb174989a5..102cbdd52c70 100644
--- a/tools/tools/kernxref/kernxref.sh
+++ b/tools/tools/kernxref/kernxref.sh
@@ -7,7 +7,7 @@
 # this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 # ----------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/kernxref/kernxref.sh,v 1.11.2.1 1999/08/29 15:18:27 peter Exp $
 #
 # This shellscript will make a cross reference of the symbols of the LINT 
 # kernel.
diff --git a/tools/tools/mid/mid-index b/tools/tools/mid/mid-index
index a5ec10b78f3b..ea82a47696a7 100755
--- a/tools/tools/mid/mid-index
+++ b/tools/tools/mid/mid-index
@@ -2,7 +2,7 @@
 #
 # create message-id / in-reply-to database
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/mid/mid-index,v 1.1.2.1 1999/08/29 15:18:28 peter Exp $
 
 sub usage { die "usage: mid-index name < filelist"; }
 
diff --git a/tools/tools/portsinfo/portsinfo.sh b/tools/tools/portsinfo/portsinfo.sh
index f3dcf5039b92..84c3bf8db8a3 100644
--- a/tools/tools/portsinfo/portsinfo.sh
+++ b/tools/tools/portsinfo/portsinfo.sh
@@ -3,7 +3,7 @@
 #
 # portsinfo - Generate list of new ports for last two weeks.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/portsinfo/portsinfo.sh,v 1.4.2.1 1999/08/29 15:18:30 peter Exp $
 
 PATH=/bin:/usr/bin:/usr/local/bin:$PATH; export PATH
 
diff --git a/tools/tools/scsi-defects/scsi-defects.pl b/tools/tools/scsi-defects/scsi-defects.pl
index 0827182d6e5f..3df2d5b93a3b 100755
--- a/tools/tools/scsi-defects/scsi-defects.pl
+++ b/tools/tools/scsi-defects/scsi-defects.pl
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 # 
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/scsi-defects/scsi-defects.pl,v 1.2.4.1 1999/08/29 15:18:31 peter Exp $
 #
 
 #
diff --git a/tools/tools/tcl_bmake/mkMakefile.sh b/tools/tools/tcl_bmake/mkMakefile.sh
index f49a79eac3a5..d554dc1fdf20 100644
--- a/tools/tools/tcl_bmake/mkMakefile.sh
+++ b/tools/tools/tcl_bmake/mkMakefile.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tcl_bmake/mkMakefile.sh,v 1.29.2.1 1999/08/29 15:18:33 peter Exp $
 #
 # This script generates a bmake Makefile for src/lib/libtcl
 #
@@ -45,7 +45,7 @@ echo '#
 # Please change src/tools/tools/tcl_bmake/mkMakefile.sh instead
 #
 # Generated by src/tools/tools/tcl_bmake/mkMakefile.sh version:
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tcl_bmake/mkMakefile.sh,v 1.29.2.1 1999/08/29 15:18:33 peter Exp $
 #
 ' | tr -d '$' >> ${LIBTCL}Makefile
 
diff --git a/tools/tools/upgrade/getosreldate.sh b/tools/tools/upgrade/getosreldate.sh
index 3c9564851e16..f2093718a97b 100755
--- a/tools/tools/upgrade/getosreldate.sh
+++ b/tools/tools/upgrade/getosreldate.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/upgrade/getosreldate.sh,v 1.1.2.1 1999/08/29 15:18:34 peter Exp $
 
 RELDATE=`sysctl -n kern.osreldate 2>/dev/null`
 if [ "x$RELDATE" = x ]; then
diff --git a/tools/tools/upgrade/move_aout_libs.sh b/tools/tools/upgrade/move_aout_libs.sh
index b00af5204372..e9e92b9b0951 100755
--- a/tools/tools/upgrade/move_aout_libs.sh
+++ b/tools/tools/upgrade/move_aout_libs.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/upgrade/move_aout_libs.sh,v 1.2.2.4 1999/08/29 15:18:34 peter Exp $
 # 
 # Search for a.out libraries and move them to an aout subdirectory of
 # the elf library directory.
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 265bdb99f912..4dc85c79f3e0 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 1/7/94
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/Makefile,v 1.122.2.4 1999/12/13 15:08:15 peter Exp $
 
 # XXX MISSING:		deroff diction graph learn plot
 #			spell spline struct xsend
diff --git a/usr.bin/apply/apply.1 b/usr.bin/apply/apply.1
index 39b827ed8f8e..7b5fa264c4ce 100644
--- a/usr.bin/apply/apply.1
+++ b/usr.bin/apply/apply.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)apply.1	8.2 (Berkeley) 4/4/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/apply/apply.1,v 1.4.2.2 1999/12/06 04:35:05 kris Exp $
 .\"
 .Dd April 4, 1994
 .Dt APPLY 1
diff --git a/usr.bin/apply/apply.c b/usr.bin/apply/apply.c
index fe060a0de8e7..a8050b27f83a 100644
--- a/usr.bin/apply/apply.c
+++ b/usr.bin/apply/apply.c
@@ -39,7 +39,7 @@
 static const char sccsid[] = "@(#)apply.c	8.4 (Berkeley) 4/4/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/apply/apply.c,v 1.5.2.2 1999/12/06 04:35:06 kris Exp $";
 #endif /* not lint */
 
 #include <sys/wait.h>
diff --git a/usr.bin/ar/Makefile b/usr.bin/ar/Makefile
index af3161251965..242a22037e79 100644
--- a/usr.bin/ar/Makefile
+++ b/usr.bin/ar/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ar/Makefile,v 1.8.2.1 1999/08/29 15:25:20 peter Exp $
 
 PROG=	ar
 CFLAGS+=-I${.CURDIR} -Wall
diff --git a/usr.bin/ar/ar.1 b/usr.bin/ar/ar.1
index 3741299cb8ae..5764ec910319 100644
--- a/usr.bin/ar/ar.1
+++ b/usr.bin/ar/ar.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ar.1	8.1 (Berkeley) 6/29/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ar/ar.1,v 1.5.2.1 1999/08/29 15:25:20 peter Exp $
 .\"
 .Dd June 29, 1993
 .Dt AR 1
diff --git a/usr.bin/ar/ar.1aout b/usr.bin/ar/ar.1aout
index 3741299cb8ae..19043ee35479 100644
--- a/usr.bin/ar/ar.1aout
+++ b/usr.bin/ar/ar.1aout
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ar.1	8.1 (Berkeley) 6/29/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ar/ar.1aout,v 1.5.2.1 1999/08/29 15:25:22 peter Exp $
 .\"
 .Dd June 29, 1993
 .Dt AR 1
diff --git a/usr.bin/ar/ar.c b/usr.bin/ar/ar.c
index c53c1e44dcfa..6997eb3f78de 100644
--- a/usr.bin/ar/ar.c
+++ b/usr.bin/ar/ar.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/ar/ar.c,v 1.7.2.1 1999/08/29 15:25:22 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/at/Makefile b/usr.bin/at/Makefile
index df96d573b49b..85193c541455 100644
--- a/usr.bin/at/Makefile
+++ b/usr.bin/at/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/at/Makefile,v 1.9.2.1 1999/08/29 15:25:23 peter Exp $
 
 .include "${.CURDIR}/Makefile.inc"
 
diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c
index 88bde639cd22..3580659f65fd 100644
--- a/usr.bin/at/at.c
+++ b/usr.bin/at/at.c
@@ -92,7 +92,7 @@ enum { ATQ, ATRM, AT, BATCH, CAT };	/* what program we want to run */
 
 /* File scope variables */
 
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/usr.bin/at/at.c,v 1.15.2.1 1999/08/29 15:25:24 peter Exp $";
 char *no_export[] =
 {
     "TERM", "TERMCAP", "DISPLAY", "_"
diff --git a/usr.bin/at/at.man b/usr.bin/at/at.man
index fc5bc90ce21a..2985754ea7f6 100644
--- a/usr.bin/at/at.man
+++ b/usr.bin/at/at.man
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/at/at.man,v 1.8.2.3 1999/08/29 15:25:25 peter Exp $
 .Dd April 12, 1995
 .Dt "AT" 1
 .Os FreeBSD 2.1
diff --git a/usr.bin/at/panic.c b/usr.bin/at/panic.c
index 6098c9501e9e..0f7da346abcd 100644
--- a/usr.bin/at/panic.c
+++ b/usr.bin/at/panic.c
@@ -38,7 +38,7 @@
 /* File scope variables */
 
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/at/panic.c,v 1.8.2.1 1999/08/29 15:25:25 peter Exp $";
 
 /* External variables */
 
diff --git a/usr.bin/at/parsetime.c b/usr.bin/at/parsetime.c
index 15b689f50c17..9f4d4767fd2f 100644
--- a/usr.bin/at/parsetime.c
+++ b/usr.bin/at/parsetime.c
@@ -144,7 +144,7 @@ static int sc_tokid;	/* scanner - token id */
 static int sc_tokplur;	/* scanner - is token plural? */
 
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/at/parsetime.c,v 1.16.2.1 1999/08/29 15:25:26 peter Exp $";
 
 /* Local functions */
 
diff --git a/usr.bin/at/perm.c b/usr.bin/at/perm.c
index 6d2d27c70182..4bc46af7ca61 100644
--- a/usr.bin/at/perm.c
+++ b/usr.bin/at/perm.c
@@ -48,7 +48,7 @@
 
 /* File scope variables */
 
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/usr.bin/at/perm.c,v 1.6.2.1 1999/08/29 15:25:27 peter Exp $";
 
 /* Function declarations */
 
diff --git a/usr.bin/banner/banner.6 b/usr.bin/banner/banner.6
index 119a3e822c7b..e9b059a5a09d 100644
--- a/usr.bin/banner/banner.6
+++ b/usr.bin/banner/banner.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)banner.6	8.2 (Berkeley) 4/29/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/banner/banner.6,v 1.3.2.1 1999/08/29 15:25:29 peter Exp $
 .\"
 .Dd April 29, 1995
 .Dt BANNER 6
diff --git a/usr.bin/basename/basename.1 b/usr.bin/basename/basename.1
index ba95e761270d..48d3fbd85e01 100644
--- a/usr.bin/basename/basename.1
+++ b/usr.bin/basename/basename.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)basename.1	8.2 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/basename/basename.1,v 1.5.2.1 1999/08/29 15:25:30 peter Exp $
 .\"
 .Dd April 18, 1994
 .Dt BASENAME 1
diff --git a/usr.bin/biff/biff.1 b/usr.bin/biff/biff.1
index 4b4a2d8a45ee..f3a75da64a40 100644
--- a/usr.bin/biff/biff.1
+++ b/usr.bin/biff/biff.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)biff.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/biff/biff.1,v 1.5.2.1 1999/08/29 15:25:31 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt BIFF 1
diff --git a/usr.bin/biff/biff.c b/usr.bin/biff/biff.c
index 606afa8a919d..7daed5b9ad39 100644
--- a/usr.bin/biff/biff.c
+++ b/usr.bin/biff/biff.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/biff/biff.c,v 1.5.2.1 1999/08/29 15:25:32 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/brandelf/brandelf.c b/usr.bin/brandelf/brandelf.c
index c09d91c625d3..c3b0b5ac7833 100644
--- a/usr.bin/brandelf/brandelf.c
+++ b/usr.bin/brandelf/brandelf.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/brandelf/brandelf.c,v 1.10.2.1 1999/08/29 15:25:34 peter Exp $
  */
 
 #include <elf.h>
diff --git a/usr.bin/c89/c89.1 b/usr.bin/c89/c89.1
index a683df08f43d..d6a8515e3f8a 100644
--- a/usr.bin/c89/c89.1
+++ b/usr.bin/c89/c89.1
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/c89/c89.1,v 1.2.4.1 1999/08/29 15:25:35 peter Exp $
 .\" "
 .Dd September 17, 1997
 .Os
diff --git a/usr.bin/c89/c89.sh b/usr.bin/c89/c89.sh
index 157fbbff884a..5985c2338831 100755
--- a/usr.bin/c89/c89.sh
+++ b/usr.bin/c89/c89.sh
@@ -24,7 +24,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/c89/c89.sh,v 1.3.4.1 1999/08/29 15:25:36 peter Exp $
 #
 # This is the Posix.2 mandated C compiler.  Basically, a hook to the
 # cc(1) command.
diff --git a/usr.bin/calendar/calendars/calendar.all b/usr.bin/calendar/calendars/calendar.all
index 652829ef863d..b883db3f13d8 100644
--- a/usr.bin/calendar/calendars/calendar.all
+++ b/usr.bin/calendar/calendars/calendar.all
@@ -1,7 +1,7 @@
 /*
  * International and national calendar files
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.all,v 1.5.2.1 1999/08/29 15:25:41 peter Exp $
  */
 
 #ifndef _calendar_all_
diff --git a/usr.bin/calendar/calendars/calendar.birthday b/usr.bin/calendar/calendars/calendar.birthday
index 06a30c0d5268..e7ecc2fa9afc 100644
--- a/usr.bin/calendar/calendars/calendar.birthday
+++ b/usr.bin/calendar/calendars/calendar.birthday
@@ -1,7 +1,7 @@
 /*
  * Birthday
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.birthday,v 1.10.2.1 1999/08/29 15:25:42 peter Exp $
  */
 
 #ifndef _calendar_birthday_
diff --git a/usr.bin/calendar/calendars/calendar.christian b/usr.bin/calendar/calendars/calendar.christian
index d7562f74176d..20d8adaa4ebb 100644
--- a/usr.bin/calendar/calendars/calendar.christian
+++ b/usr.bin/calendar/calendars/calendar.christian
@@ -1,7 +1,7 @@
 /*
  * Christian
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.christian,v 1.7.2.1 1999/08/29 15:25:42 peter Exp $
  */
 
 #ifndef _calendar_christian_
diff --git a/usr.bin/calendar/calendars/calendar.computer b/usr.bin/calendar/calendars/calendar.computer
index 0b45111acde0..46986891cdfc 100644
--- a/usr.bin/calendar/calendars/calendar.computer
+++ b/usr.bin/calendar/calendars/calendar.computer
@@ -1,7 +1,7 @@
 /*
  * Computer
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.computer,v 1.5.2.1 1999/08/29 15:25:43 peter Exp $
  */
 
 #ifndef _calendar_computer_
diff --git a/usr.bin/calendar/calendars/calendar.croatian b/usr.bin/calendar/calendars/calendar.croatian
index af9a55854387..c05432c078c5 100644
--- a/usr.bin/calendar/calendars/calendar.croatian
+++ b/usr.bin/calendar/calendars/calendar.croatian
@@ -1,7 +1,7 @@
 /*
  * Croatian calendar files
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.croatian,v 1.3.2.1 1999/08/29 15:25:43 peter Exp $
  */
 
 #ifndef _calendar_croatian_
diff --git a/usr.bin/calendar/calendars/calendar.german b/usr.bin/calendar/calendars/calendar.german
index d22207cfd500..9b97b2726991 100644
--- a/usr.bin/calendar/calendars/calendar.german
+++ b/usr.bin/calendar/calendars/calendar.german
@@ -1,7 +1,7 @@
 /*
  * German calendar file(s)
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.german,v 1.4.2.1 1999/08/29 15:25:44 peter Exp $
  */
 
 #ifndef _calendar_german_
diff --git a/usr.bin/calendar/calendars/calendar.history b/usr.bin/calendar/calendars/calendar.history
index e4e248c31f3e..947e69185328 100644
--- a/usr.bin/calendar/calendars/calendar.history
+++ b/usr.bin/calendar/calendars/calendar.history
@@ -1,7 +1,7 @@
 /*
  * History
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.history,v 1.7.2.1 1999/08/29 15:25:45 peter Exp $
  */
 
 #ifndef _calendar_history_
diff --git a/usr.bin/calendar/calendars/calendar.holiday b/usr.bin/calendar/calendars/calendar.holiday
index 0ae713c1523b..b3b7d5bc494f 100644
--- a/usr.bin/calendar/calendars/calendar.holiday
+++ b/usr.bin/calendar/calendars/calendar.holiday
@@ -1,7 +1,7 @@
 /*
  * Holiday
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.holiday,v 1.7.2.1 1999/08/29 15:25:46 peter Exp $
  */
 
 #ifndef _calendar_holiday_
diff --git a/usr.bin/calendar/calendars/calendar.judaic b/usr.bin/calendar/calendars/calendar.judaic
index f1bc9e43e263..e29042f20644 100644
--- a/usr.bin/calendar/calendars/calendar.judaic
+++ b/usr.bin/calendar/calendars/calendar.judaic
@@ -1,7 +1,7 @@
 /*
  * Judaic
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.judaic,v 1.6.2.1 1999/08/29 15:25:47 peter Exp $
  */
 
 #ifndef _calendar_judaic_
diff --git a/usr.bin/calendar/calendars/calendar.music b/usr.bin/calendar/calendars/calendar.music
index 99629ce73c81..cb6b98c283fb 100644
--- a/usr.bin/calendar/calendars/calendar.music
+++ b/usr.bin/calendar/calendars/calendar.music
@@ -1,7 +1,7 @@
 /*
  * Music
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.music,v 1.7.2.1 1999/08/29 15:25:47 peter Exp $
  */
 
 #ifndef _calendar_music_
diff --git a/usr.bin/calendar/calendars/calendar.russian b/usr.bin/calendar/calendars/calendar.russian
index e308873676c1..a6d4d71d93c8 100644
--- a/usr.bin/calendar/calendars/calendar.russian
+++ b/usr.bin/calendar/calendars/calendar.russian
@@ -1,7 +1,7 @@
 /*
  * Russian calendar files
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.russian,v 1.3.2.1 1999/08/29 15:25:48 peter Exp $
  */
 
 #ifndef _calendar_russian_
diff --git a/usr.bin/calendar/calendars/calendar.usholiday b/usr.bin/calendar/calendars/calendar.usholiday
index 712a4b784599..959dfd10c585 100644
--- a/usr.bin/calendar/calendars/calendar.usholiday
+++ b/usr.bin/calendar/calendars/calendar.usholiday
@@ -1,7 +1,7 @@
 /*
  * USA holiday
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.usholiday,v 1.6.2.1 1999/08/29 15:25:48 peter Exp $
  */
 
 #ifndef _calendar_usholiday_
diff --git a/usr.bin/calendar/calendars/calendar.world b/usr.bin/calendar/calendars/calendar.world
index 7e2833b3a5fe..01cd95d2c68e 100644
--- a/usr.bin/calendar/calendars/calendar.world
+++ b/usr.bin/calendar/calendars/calendar.world
@@ -1,7 +1,7 @@
 /*
  * World wide calendar files, except national calendars
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.world,v 1.3.2.1 1999/08/29 15:25:49 peter Exp $
  */
 
 #ifndef _calendar_world_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all
index 92c0e51ff73e..bfddbbae45a2 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all
@@ -1,7 +1,7 @@
 /*
  * deutscher Kalender
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all,v 1.4.2.1 1999/08/29 15:25:51 peter Exp $
  */
 
 #ifndef _de_DE_ISO_8859_1_all_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag
index 4969fc7b7d2d..32305f5b8358 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag
@@ -1,7 +1,7 @@
 /*
  * Feiertage
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag,v 1.5.2.1 1999/08/29 15:25:52 peter Exp $
  */
 
 #ifndef _de_DE_ISO_8859_1_feiertag_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte
index 24d51f61fe57..2f913923fb60 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte
@@ -13,7 +13,7 @@
  * 
  * ISBN 3-924521-59-X
  * 
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte,v 1.5.2.1 1999/08/29 15:25:52 peter Exp $
  */
 
 #ifndef _de_DE_ISO_8859_1_geschichte_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche
index aa4ef195e74d..af6b229cbf49 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche
@@ -1,7 +1,7 @@
 /*
  * Kirche in Deutschland
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche,v 1.5.2.1 1999/08/29 15:25:53 peter Exp $
  */
 
 #ifndef _de_DE_ISO_8859_1_kirche_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur
index 62acab9011a8..57c5feda295f 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur
@@ -1,7 +1,7 @@
 /*
  * Literatur
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur,v 1.5.2.1 1999/08/29 15:25:54 peter Exp $
  */
 
 #ifndef _de_DE_ISO_8859_1_literatur_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik
index ad63646271f6..c99562850eca 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik
@@ -1,7 +1,7 @@
 /*
  * Musik
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik,v 1.5.2.1 1999/08/29 15:25:54 peter Exp $
  */
 
 #ifndef _de_DE_ISO_8859_1_musik_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft
index 175fe0fa4207..d039c4aae62b 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft
@@ -1,7 +1,7 @@
 /*
  * Wissenschaft
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft,v 1.5.2.1 1999/08/29 15:25:55 peter Exp $
  */
 
 #ifndef _de_DE_ISO_8859_1_wissenschaft_
diff --git a/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all b/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all
index 11be34324383..6bf6d4c90748 100644
--- a/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all
+++ b/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all
@@ -1,7 +1,7 @@
 /*
  *  hrvatski calendar
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all,v 1.3.2.1 1999/08/29 15:25:57 peter Exp $
  */
 
 #ifndef _hr_HR_ISO_8859_2_all
diff --git a/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici b/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici
index b78ea99533f8..23dab4052dab 100644
--- a/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici
+++ b/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici
@@ -1,7 +1,7 @@
 /*
  * hrvatski praznici
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici,v 1.5.2.1 1999/08/29 15:25:58 peter Exp $
  */
 
 #ifndef _hr_HR_ISO_8859_2_praznici
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all
index fcdc5e7f8f5e..3d053f650a1b 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all
@@ -1,7 +1,7 @@
 /*
  * òÕÓÓËÉÊ ËÁÌÅÎÄÁÒØ
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all,v 1.3.2.1 1999/08/29 15:25:59 peter Exp $
  */
 
 #ifndef _ru_SU_KOI8_R_all
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common
index 2a45b1d2650f..41eee082bcab 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common
@@ -1,7 +1,7 @@
 /*
  * òÕÓÓËÉÅ ÐÒÁÚÄÎÉËÉ
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common,v 1.7.2.1 1999/08/29 15:26:00 peter Exp $
  */
 
 #ifndef _ru_SU_KOI8_R_common_
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk
index 22de9d3588b7..3ea2e46d1151 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk
@@ -1,7 +1,7 @@
 /*
  * ðÅÒÅ×ÏÄ ÞÁÓÏ× ÄÌÑ ÍÏÓËÏ×ÓËÏÊ ×ÒÅÍÅÎÎÏÊ ÚÏÎÙ
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk,v 1.4.2.1 1999/08/29 15:26:01 peter Exp $
  */
 
 #ifndef _ru_SU_KOI8_R_msk_
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox
index 0105343eae8a..ab7a09669f4a 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox
@@ -1,7 +1,7 @@
 /*
  * ðÒÁ×ÏÓÌÁ×ÎÙÅ ÐÒÁÚÄÎÉËÉ
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox,v 1.3.2.1 1999/08/29 15:26:02 peter Exp $
  */
 
 #ifndef _ru_SU_KOI8_R_orthodox_
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan
index c37c993680e9..a3f55ee44819 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan
@@ -1,7 +1,7 @@
 /*
  * ñÚÙÞÅÓËÉÅ ÐÒÁÚÄÎÉËÉ
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan,v 1.3.2.1 1999/08/29 15:26:02 peter Exp $
  */
 
 #ifndef _ru_SU_KOI8_R_pagan_
diff --git a/usr.bin/calendar/day.c b/usr.bin/calendar/day.c
index 508c71fdd653..2de8ec52c813 100644
--- a/usr.bin/calendar/day.c
+++ b/usr.bin/calendar/day.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/day.c,v 1.11.2.1 1999/08/29 15:25:38 peter Exp $
  */
 
 
diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c
index 846b96ed5805..036ddee2540f 100644
--- a/usr.bin/calendar/io.c
+++ b/usr.bin/calendar/io.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/io.c,v 1.11.2.1 1999/08/29 15:25:39 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/calendar/ostern.c b/usr.bin/calendar/ostern.c
index 12bff9f86e92..45d7ae1c82d4 100644
--- a/usr.bin/calendar/ostern.c
+++ b/usr.bin/calendar/ostern.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/ostern.c,v 1.7.2.1 1999/08/29 15:25:39 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.bin/cap_mkdb/cap_mkdb.1 b/usr.bin/cap_mkdb/cap_mkdb.1
index 4cd9ab2c979e..a0d4bc03163f 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.1
+++ b/usr.bin/cap_mkdb/cap_mkdb.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cap_mkdb.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/cap_mkdb/cap_mkdb.1,v 1.5.2.1 1999/08/29 15:26:04 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt CAP_MKDB 1
diff --git a/usr.bin/chat/Makefile b/usr.bin/chat/Makefile
index 2d25d76a12a0..97e5afd20291 100644
--- a/usr.bin/chat/Makefile
+++ b/usr.bin/chat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/chat/Makefile,v 1.6.2.1 1999/08/29 15:26:05 peter Exp $
 
 PROG=	chat
 CFLAGS+=-Wall
diff --git a/usr.bin/chat/chat.8 b/usr.bin/chat/chat.8
index efcf1948c09d..aed72ee37c48 100644
--- a/usr.bin/chat/chat.8
+++ b/usr.bin/chat/chat.8
@@ -1,6 +1,6 @@
 .\" -*- nroff -*-
 .\" manual page [] for chat 1.8
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/chat/chat.8,v 1.12.2.1 1999/08/29 15:26:06 peter Exp $
 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph
diff --git a/usr.bin/chat/chat.c b/usr.bin/chat/chat.c
index fd71405d17b2..712ce3bc2c5b 100644
--- a/usr.bin/chat/chat.c
+++ b/usr.bin/chat/chat.c
@@ -79,7 +79,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/chat/chat.c,v 1.13.2.2 1999/12/04 02:13:11 kris Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.bin/chflags/chflags.1 b/usr.bin/chflags/chflags.1
index 1af45709cbdc..dc8959765b67 100644
--- a/usr.bin/chflags/chflags.1
+++ b/usr.bin/chflags/chflags.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chflags.1	8.2 (Berkeley) 3/31/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/chflags/chflags.1,v 1.6.2.1 1999/08/29 15:26:09 peter Exp $
 .\"
 .Dd March 31, 1994
 .Dt CHFLAGS 1
diff --git a/usr.bin/chkey/Makefile b/usr.bin/chkey/Makefile
index c0bbd6aea174..83f78d0a5e8f 100644
--- a/usr.bin/chkey/Makefile
+++ b/usr.bin/chkey/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/chkey/Makefile,v 1.2.2.1 1999/08/29 15:26:10 peter Exp $
 
 PROG=	chkey
 SRCS=	chkey.c update.c generic.c
diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index b36ddbba10e6..b65015b178b4 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chpass.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/chpass/chpass.1,v 1.14.2.5 1999/11/18 16:06:50 phantom Exp $
 .\"
 .Dd December 30, 1993
 .Dt CHPASS 1
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index 77f9f7832f84..59ea76b90706 100644
--- a/usr.bin/chpass/chpass.c
+++ b/usr.bin/chpass/chpass.c
@@ -40,7 +40,7 @@ static const char copyright[] =
 #ifndef lint
 static const char sccsid[] = "From: @(#)chpass.c	8.4 (Berkeley) 4/2/94";
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/chpass/chpass.c,v 1.15.2.1 1999/08/29 15:26:13 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/chpass/edit.c b/usr.bin/chpass/edit.c
index cfb951302d65..b2a6e7a8d785 100644
--- a/usr.bin/chpass/edit.c
+++ b/usr.bin/chpass/edit.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/chpass/edit.c,v 1.12.2.2 1999/08/29 15:26:14 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/chpass/pw_yp.c b/usr.bin/chpass/pw_yp.c
index d6cfaebb15a3..36b0ba2bac76 100644
--- a/usr.bin/chpass/pw_yp.c
+++ b/usr.bin/chpass/pw_yp.c
@@ -35,7 +35,7 @@
  * Center for Telecommunications Research
  * Columbia University, New York City
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/chpass/pw_yp.c,v 1.13.2.3 1999/10/20 15:25:43 gallatin Exp $
  */
 
 #ifdef YP
diff --git a/usr.bin/chpass/pw_yp.h b/usr.bin/chpass/pw_yp.h
index 15f63d038776..5bebe6fc8c0f 100644
--- a/usr.bin/chpass/pw_yp.h
+++ b/usr.bin/chpass/pw_yp.h
@@ -35,7 +35,7 @@
  * Center for Telecommunications Research
  * Columbia University, New York City
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/chpass/pw_yp.h,v 1.6.2.1 1999/08/29 15:26:15 peter Exp $
  */
 
 #ifdef YP
diff --git a/usr.bin/chpass/util.c b/usr.bin/chpass/util.c
index e7dd06b6db88..2ffcba776453 100644
--- a/usr.bin/chpass/util.c
+++ b/usr.bin/chpass/util.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)util.c	8.4 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/chpass/util.c,v 1.7.2.1 1999/08/29 15:26:15 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/cksum/cksum.1 b/usr.bin/cksum/cksum.1
index 66a1d18f0c87..f212c5be46f6 100644
--- a/usr.bin/cksum/cksum.1
+++ b/usr.bin/cksum/cksum.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cksum.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/cksum/cksum.1,v 1.7.2.2 1999/08/29 15:26:17 peter Exp $
 .\"
 .Dd April 28, 1995
 .Dt CKSUM 1
diff --git a/usr.bin/cksum/cksum.c b/usr.bin/cksum/cksum.c
index 01a7165c1d9c..8f3ea5a9045c 100644
--- a/usr.bin/cksum/cksum.c
+++ b/usr.bin/cksum/cksum.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)cksum.c	8.2 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/cksum/cksum.c,v 1.9.2.1 1999/08/29 15:26:17 peter Exp $";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/cmp/cmp.1 b/usr.bin/cmp/cmp.1
index 6153e5160cb4..e92a4be829c9 100644
--- a/usr.bin/cmp/cmp.1
+++ b/usr.bin/cmp/cmp.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cmp.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/cmp/cmp.1,v 1.6.2.1 1999/08/29 15:26:18 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt CMP 1
diff --git a/usr.bin/colldef/Makefile b/usr.bin/colldef/Makefile
index 29b5e108b553..3ff16f2fd35e 100644
--- a/usr.bin/colldef/Makefile
+++ b/usr.bin/colldef/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/colldef/Makefile,v 1.14.2.1 1999/08/29 15:26:20 peter Exp $
 
 PROG = colldef
 LFLAGS = -8 -i
diff --git a/usr.bin/colldef/colldef.1 b/usr.bin/colldef/colldef.1
index 772659eaf63c..d2f94a2007cc 100644
--- a/usr.bin/colldef/colldef.1
+++ b/usr.bin/colldef/colldef.1
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/colldef/colldef.1,v 1.5.2.1 1999/08/29 15:26:21 peter Exp $
 .\"
 .Dd January, 27 1995
 .Dt COLLDEF 1
diff --git a/usr.bin/colldef/data/Makefile b/usr.bin/colldef/data/Makefile
index b828085c3b5a..6e7cc046ee3e 100644
--- a/usr.bin/colldef/data/Makefile
+++ b/usr.bin/colldef/data/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/colldef/data/Makefile,v 1.15.2.7 1999/08/29 15:26:23 peter Exp $
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
diff --git a/usr.bin/colldef/data/de_DE.DIS_8859-15.src b/usr.bin/colldef/data/de_DE.DIS_8859-15.src
index e79e593db17c..f2335c20cbb2 100644
--- a/usr.bin/colldef/data/de_DE.DIS_8859-15.src
+++ b/usr.bin/colldef/data/de_DE.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # German/ISO 8859-1 (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/colldef/data/de_DE.DIS_8859-15.src,v 1.3.2.3 1999/08/29 15:26:23 peter Exp $
 #
 charmap map.DIS_8859-15
 order \
diff --git a/usr.bin/colldef/data/de_DE.ISO_8859-1.src b/usr.bin/colldef/data/de_DE.ISO_8859-1.src
index 130e8501ab14..0db5488a34ed 100644
--- a/usr.bin/colldef/data/de_DE.ISO_8859-1.src
+++ b/usr.bin/colldef/data/de_DE.ISO_8859-1.src
@@ -1,6 +1,6 @@
 # German/ISO 8859-1 (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/colldef/data/de_DE.ISO_8859-1.src,v 1.4.2.4 1999/08/29 15:26:24 peter Exp $
 #
 charmap map.ISO_8859-1
 order \
diff --git a/usr.bin/colldef/data/es_ES.DIS_8859-15.src b/usr.bin/colldef/data/es_ES.DIS_8859-15.src
index 002b63503d5a..e87396f15be5 100644
--- a/usr.bin/colldef/data/es_ES.DIS_8859-15.src
+++ b/usr.bin/colldef/data/es_ES.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # Espan~ol (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/colldef/data/es_ES.DIS_8859-15.src,v 1.1.2.2 1999/08/29 15:26:24 peter Exp $
 #
 charmap map.DIS_8859-15
 order \
diff --git a/usr.bin/colldef/data/es_ES.ISO_8859-1.src b/usr.bin/colldef/data/es_ES.ISO_8859-1.src
index 7c2b21fc5955..848a4678afbb 100644
--- a/usr.bin/colldef/data/es_ES.ISO_8859-1.src
+++ b/usr.bin/colldef/data/es_ES.ISO_8859-1.src
@@ -1,6 +1,6 @@
 # Espan~ol (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/colldef/data/es_ES.ISO_8859-1.src,v 1.3.2.1 1999/08/29 15:26:25 peter Exp $
 #
 charmap map.ISO_8859-1
 order \
diff --git a/usr.bin/colldef/data/is_IS.DIS_8859-15.src b/usr.bin/colldef/data/is_IS.DIS_8859-15.src
index fe4dd9beae88..8f8bab290d4f 100644
--- a/usr.bin/colldef/data/is_IS.DIS_8859-15.src
+++ b/usr.bin/colldef/data/is_IS.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # icelandic (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/colldef/data/is_IS.DIS_8859-15.src,v 1.1.2.2 1999/08/29 15:26:26 peter Exp $
 #
 charmap map.DIS_8859-15
 order \
diff --git a/usr.bin/colldef/data/is_IS.ISO_8859-1.src b/usr.bin/colldef/data/is_IS.ISO_8859-1.src
index 50cd9a95ca8f..ef3b33de8868 100644
--- a/usr.bin/colldef/data/is_IS.ISO_8859-1.src
+++ b/usr.bin/colldef/data/is_IS.ISO_8859-1.src
@@ -1,6 +1,6 @@
 # icelandic (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/colldef/data/is_IS.ISO_8859-1.src,v 1.4.2.1 1999/08/29 15:26:26 peter Exp $
 #
 charmap map.ISO_8859-1
 order \
diff --git a/usr.bin/colldef/data/lt_LN.ASCII.src b/usr.bin/colldef/data/lt_LN.ASCII.src
index df3c34088764..dbd8784f2b10 100644
--- a/usr.bin/colldef/data/lt_LN.ASCII.src
+++ b/usr.bin/colldef/data/lt_LN.ASCII.src
@@ -1,6 +1,6 @@
 # ASCII
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/colldef/data/lt_LN.ASCII.src,v 1.1.4.1 1999/08/29 15:26:27 peter Exp $
 #
 order \
 	\x00;...;\xff
diff --git a/usr.bin/colldef/data/lt_LN.DIS_8859-15.src b/usr.bin/colldef/data/lt_LN.DIS_8859-15.src
index 449ce85e6336..206816d26bbc 100644
--- a/usr.bin/colldef/data/lt_LN.DIS_8859-15.src
+++ b/usr.bin/colldef/data/lt_LN.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # latin1 (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/colldef/data/lt_LN.DIS_8859-15.src,v 1.1.2.2 1999/08/29 15:26:27 peter Exp $
 #
 charmap map.DIS_8859-15
 order \
diff --git a/usr.bin/colldef/data/lt_LN.ISO_8859-1.src b/usr.bin/colldef/data/lt_LN.ISO_8859-1.src
index 99b7d08ddb00..eaa05e4c1cd8 100644
--- a/usr.bin/colldef/data/lt_LN.ISO_8859-1.src
+++ b/usr.bin/colldef/data/lt_LN.ISO_8859-1.src
@@ -1,6 +1,6 @@
 # latin1 (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/colldef/data/lt_LN.ISO_8859-1.src,v 1.8.2.1 1999/08/29 15:26:28 peter Exp $
 #
 charmap map.ISO_8859-1
 order \
diff --git a/usr.bin/colldef/data/lt_LN.ISO_8859-2.src b/usr.bin/colldef/data/lt_LN.ISO_8859-2.src
index aee3671f0966..4d0ba5c363ea 100644
--- a/usr.bin/colldef/data/lt_LN.ISO_8859-2.src
+++ b/usr.bin/colldef/data/lt_LN.ISO_8859-2.src
@@ -1,6 +1,6 @@
 # latin2 (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/colldef/data/lt_LN.ISO_8859-2.src,v 1.1.4.1 1999/08/29 15:26:28 peter Exp $
 #
 charmap map.ISO_8859-2
 order \
diff --git a/usr.bin/colldef/data/ru_SU.CP866.src b/usr.bin/colldef/data/ru_SU.CP866.src
index 2fc2d20835c3..ab69670e9dbb 100644
--- a/usr.bin/colldef/data/ru_SU.CP866.src
+++ b/usr.bin/colldef/data/ru_SU.CP866.src
@@ -1,6 +1,6 @@
 # CP866 (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/colldef/data/ru_SU.CP866.src,v 1.7.2.1 1999/08/29 15:26:29 peter Exp $
 #
 charmap map.CP866
 order \
diff --git a/usr.bin/colldef/data/ru_SU.KOI8-R.src b/usr.bin/colldef/data/ru_SU.KOI8-R.src
index 3a67bc4e39fb..8f9f4164c7ec 100644
--- a/usr.bin/colldef/data/ru_SU.KOI8-R.src
+++ b/usr.bin/colldef/data/ru_SU.KOI8-R.src
@@ -1,6 +1,6 @@
 # koi8-r (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/colldef/data/ru_SU.KOI8-R.src,v 1.7.2.1 1999/08/29 15:26:29 peter Exp $
 #
 charmap map.KOI8-R
 order \
diff --git a/usr.bin/colldef/parse.y b/usr.bin/colldef/parse.y
index 5a6c972adb27..06d675755c4a 100644
--- a/usr.bin/colldef/parse.y
+++ b/usr.bin/colldef/parse.y
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/colldef/parse.y,v 1.11.2.1 1999/08/29 15:26:21 peter Exp $
  */
 
 #include <err.h>
diff --git a/usr.bin/colldef/scan.l b/usr.bin/colldef/scan.l
index 212eac32a1c6..1eadea54dd26 100644
--- a/usr.bin/colldef/scan.l
+++ b/usr.bin/colldef/scan.l
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/colldef/scan.l,v 1.7.2.1 1999/08/29 15:26:22 peter Exp $
  */
 
 #include <ctype.h>
diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c
index b00182d604dd..02cb9625665c 100644
--- a/usr.bin/colrm/colrm.c
+++ b/usr.bin/colrm/colrm.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/colrm/colrm.c,v 1.6.2.1 1999/08/29 15:26:31 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/comm/comm.1 b/usr.bin/comm/comm.1
index 7fe49374dd85..721065b3827b 100644
--- a/usr.bin/comm/comm.1
+++ b/usr.bin/comm/comm.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)comm.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/comm/comm.1,v 1.3.2.1 1999/08/29 15:26:33 peter Exp $
 .\"
 .Dd June 6, 1993
 .Os
diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c
index c1a23a0b58ed..2f80d55f0c66 100644
--- a/usr.bin/comm/comm.c
+++ b/usr.bin/comm/comm.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "From: @(#)comm.c	8.4 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/comm/comm.c,v 1.5.2.5 1999/12/10 13:28:23 ache Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/compile_et/Makefile b/usr.bin/compile_et/Makefile
index d8cd73854eb7..1e0df93704c5 100644
--- a/usr.bin/compile_et/Makefile
+++ b/usr.bin/compile_et/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/compile_et/Makefile,v 1.9.2.1 1999/08/29 15:26:35 peter Exp $
 
 PROG=	compile_et
 SRCS=	compile_et.c error_table.y
diff --git a/usr.bin/compile_et/compile_et.1 b/usr.bin/compile_et/compile_et.1
index 091038079535..771e3625df56 100644
--- a/usr.bin/compile_et/compile_et.1
+++ b/usr.bin/compile_et/compile_et.1
@@ -1,7 +1,7 @@
 .\" Copyright (c) 1988 Massachusetts Institute of Technology,
 .\" Student Information Processing Board.  All rights reserved.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/compile_et/compile_et.1,v 1.2.2.1 1999/08/29 15:26:36 peter Exp $
 .\"
 .Dd	November 22, 1988
 .Os
diff --git a/usr.bin/compile_et/compile_et.c b/usr.bin/compile_et/compile_et.c
index b0a99267aa1e..3a34b2b973bb 100644
--- a/usr.bin/compile_et/compile_et.c
+++ b/usr.bin/compile_et/compile_et.c
@@ -26,7 +26,7 @@ static const char copyright[] =
     "Copyright 1987,1988 by MIT Student Information Processing Board";
 
 static const char rcsid_compile_et_c[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/compile_et/compile_et.c,v 1.6.2.1 1999/08/29 15:26:36 peter Exp $";
 #endif
 
 extern char *gensym();
diff --git a/usr.bin/compile_et/error_table.y b/usr.bin/compile_et/error_table.y
index 0045df7b728f..220842e8e17b 100644
--- a/usr.bin/compile_et/error_table.y
+++ b/usr.bin/compile_et/error_table.y
@@ -74,7 +74,7 @@ description	:	QUOTED_STRING
 
 #ifndef	lint
 static char const rcsid_error_table_y[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/compile_et/error_table.y,v 1.4.4.1 1999/08/29 15:26:37 peter Exp $";
 #endif
 
 void *malloc(), *realloc();
diff --git a/usr.bin/compile_et/et_lex.lex.l b/usr.bin/compile_et/et_lex.lex.l
index 57cbd04416c0..6f6aac9cade1 100644
--- a/usr.bin/compile_et/et_lex.lex.l
+++ b/usr.bin/compile_et/et_lex.lex.l
@@ -22,5 +22,5 @@ end		return END;
 .		{ return (*yytext); }
 %%
 #ifndef lint
-static char rcsid_et_lex_lex_l[] = "$FreeBSD$";
+static char rcsid_et_lex_lex_l[] = "$FreeBSD: src/usr.bin/compile_et/et_lex.lex.l,v 1.3.4.1 1999/08/29 15:26:38 peter Exp $";
 #endif
diff --git a/usr.bin/compress/doc/revision.log b/usr.bin/compress/doc/revision.log
index 5f7f066317c7..d700ea273983 100644
--- a/usr.bin/compress/doc/revision.log
+++ b/usr.bin/compress/doc/revision.log
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/compress/doc/revision.log,v 1.1.1.1.10.1 1999/08/29 15:26:42 peter Exp $
  * $Log: revision.log,v $
  * Revision 1.1.1.1  1994/05/27 12:30:59  rgrimes
  * BSD 4.4 Lite Usr.bin Sources
@@ -116,4 +116,4 @@
  */
 
 static char rcs_ident[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/compress/doc/revision.log,v 1.1.1.1.10.1 1999/08/29 15:26:42 peter Exp $";
diff --git a/usr.bin/compress/zopen.h b/usr.bin/compress/zopen.h
index 1a22de12cab3..dec26c7acdfd 100644
--- a/usr.bin/compress/zopen.h
+++ b/usr.bin/compress/zopen.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/compress/zopen.h,v 1.3.2.1 1999/08/29 15:26:40 peter Exp $
  */
 
 #ifndef _ZOPEN_H_
diff --git a/usr.bin/cpp/cpp.sh b/usr.bin/cpp/cpp.sh
index 19dee9d4d558..ea10da9b4bab 100644
--- a/usr.bin/cpp/cpp.sh
+++ b/usr.bin/cpp/cpp.sh
@@ -36,7 +36,7 @@
 # SUCH DAMAGE.
 #
 #	From: @(#)cpp.sh	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/cpp/cpp.sh,v 1.6.2.1 1999/08/29 15:26:43 peter Exp $
 #
 # Transitional front end to CCCP to make it behave like (Reiser) CCP:
 #	specifies -traditional
diff --git a/usr.bin/ctags/C.c b/usr.bin/ctags/C.c
index 55c637e7ddf1..795750cac702 100644
--- a/usr.bin/ctags/C.c
+++ b/usr.bin/ctags/C.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)C.c	8.4 (Berkeley) 4/2/94";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ctags/C.c,v 1.2.2.1 1999/08/29 15:26:44 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/dig/Makefile b/usr.bin/dig/Makefile
index c2c9b2269049..9d63ac383078 100644
--- a/usr.bin/dig/Makefile
+++ b/usr.bin/dig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/dig/Makefile,v 1.5.2.2 1999/12/13 15:08:16 peter Exp $
 
 USE_LIBBIND=	yes
 .include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
diff --git a/usr.bin/dnskeygen/Makefile b/usr.bin/dnskeygen/Makefile
index 727334188f42..d67895ca1a5c 100644
--- a/usr.bin/dnskeygen/Makefile
+++ b/usr.bin/dnskeygen/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/dnskeygen/Makefile,v 1.1.2.1 1999/12/13 15:08:17 peter Exp $
 
 USE_LIBBIND=	true
 .include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
diff --git a/usr.bin/dnsquery/Makefile b/usr.bin/dnsquery/Makefile
index 915f3ea828b9..0ec541b72caa 100644
--- a/usr.bin/dnsquery/Makefile
+++ b/usr.bin/dnsquery/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/dnsquery/Makefile,v 1.5.2.2 1999/12/13 15:08:18 peter Exp $
 
 USE_LIBBIND=	yes
 .include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
diff --git a/usr.bin/doscmd/Makefile b/usr.bin/doscmd/Makefile
index 3d3b3a0ad6de..92397ee2525e 100644
--- a/usr.bin/doscmd/Makefile
+++ b/usr.bin/doscmd/Makefile
@@ -1,6 +1,6 @@
 # from BSDI Makefile,v 2.6 1996/04/08 20:06:40 bostic Exp
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/doscmd/Makefile,v 1.13.2.3 1999/08/29 15:26:49 peter Exp $
 
 PROG=	doscmd
 SRCS=	AsyncIO.c ParseBuffer.c bios.c callback.c cpu.c dos.c cmos.c config.c \
diff --git a/usr.bin/doscmd/ParseBuffer.c b/usr.bin/doscmd/ParseBuffer.c
index 2eeaeed31647..038fb6d540c3 100644
--- a/usr.bin/doscmd/ParseBuffer.c
+++ b/usr.bin/doscmd/ParseBuffer.c
@@ -29,7 +29,7 @@
  *
  *	BSDI ParseBuffer.c,v 2.2 1996/04/08 19:32:15 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/ParseBuffer.c,v 1.1.2.1 1999/08/29 15:26:49 peter Exp $
  */
 
 #include <stdlib.h>
diff --git a/usr.bin/doscmd/bios.c b/usr.bin/doscmd/bios.c
index c6cea9204ff5..d7835d73b63a 100644
--- a/usr.bin/doscmd/bios.c
+++ b/usr.bin/doscmd/bios.c
@@ -29,7 +29,7 @@
  *
  *	BSDI bios.c,v 2.3 1996/04/08 19:32:19 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/bios.c,v 1.3.2.1 1999/08/29 15:26:50 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/callback.c b/usr.bin/doscmd/callback.c
index 890c7142d454..c72eed744c94 100644
--- a/usr.bin/doscmd/callback.c
+++ b/usr.bin/doscmd/callback.c
@@ -1,6 +1,6 @@
 /* No copyright?!
 **
-** $FreeBSD$
+** $FreeBSD: src/usr.bin/doscmd/callback.c,v 1.1.2.1 1999/08/29 15:26:51 peter Exp $
 */
 
 
diff --git a/usr.bin/doscmd/callback.h b/usr.bin/doscmd/callback.h
index d3c656fd7c26..2a0332b9a5c4 100644
--- a/usr.bin/doscmd/callback.h
+++ b/usr.bin/doscmd/callback.h
@@ -1,7 +1,7 @@
 /* 
 ** No copyright?!
 **
-** $FreeBSD$
+** $FreeBSD: src/usr.bin/doscmd/callback.h,v 1.1.2.1 1999/08/29 15:26:52 peter Exp $
 */
 typedef void		(*callback_t)(regcontext_t *REGS);
 
diff --git a/usr.bin/doscmd/cmos.c b/usr.bin/doscmd/cmos.c
index 1486c6fd348e..2cc25404f005 100644
--- a/usr.bin/doscmd/cmos.c
+++ b/usr.bin/doscmd/cmos.c
@@ -29,7 +29,7 @@
  *
  *	BSDI cmos.c,v 2.3 1996/04/08 19:32:20 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/cmos.c,v 1.1.2.1 1999/08/29 15:26:52 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/com.h b/usr.bin/doscmd/com.h
index 98982a958722..32d337b11b9a 100644
--- a/usr.bin/doscmd/com.h
+++ b/usr.bin/doscmd/com.h
@@ -29,7 +29,7 @@
  *
  *	BSDI com.h,v 2.2 1996/04/08 19:32:21 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/com.h,v 1.1.2.1 1999/08/29 15:26:53 peter Exp $
  */
 
 /* com.h for doscmd int14.c */
diff --git a/usr.bin/doscmd/config.c b/usr.bin/doscmd/config.c
index d20aa1579a17..c5c30c85a38d 100644
--- a/usr.bin/doscmd/config.c
+++ b/usr.bin/doscmd/config.c
@@ -29,7 +29,7 @@
  *
  *	BSDI config.c,v 2.2 1996/04/08 19:32:22 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/config.c,v 1.2.2.1 1999/08/29 15:26:54 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.bin/doscmd/cpu.c b/usr.bin/doscmd/cpu.c
index c273084547e0..6eb4c781ee9b 100644
--- a/usr.bin/doscmd/cpu.c
+++ b/usr.bin/doscmd/cpu.c
@@ -1,7 +1,7 @@
 /*
 ** No copyright ?!
 **
-** $FreeBSD$
+** $FreeBSD: src/usr.bin/doscmd/cpu.c,v 1.1.2.1 1999/08/29 15:26:54 peter Exp $
 */
 #include "doscmd.h"
 
diff --git a/usr.bin/doscmd/crt0.c b/usr.bin/doscmd/crt0.c
index ec9c706f7f5c..6fc1733cc131 100644
--- a/usr.bin/doscmd/crt0.c
+++ b/usr.bin/doscmd/crt0.c
@@ -29,7 +29,7 @@
  *
  *	BSDI crt0.c,v 2.2 1996/04/08 19:32:24 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/crt0.c,v 1.1.2.1 1999/08/29 15:26:55 peter Exp $
  */
 
 char **environ;
diff --git a/usr.bin/doscmd/cwd.c b/usr.bin/doscmd/cwd.c
index a5d6c88c83f4..77e7fdbbd51c 100644
--- a/usr.bin/doscmd/cwd.c
+++ b/usr.bin/doscmd/cwd.c
@@ -29,7 +29,7 @@
  *
  *	BSDI cwd.c,v 2.2 1996/04/08 19:32:25 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/cwd.c,v 1.3.2.1 1999/08/29 15:26:56 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/doscmd/cwd.h b/usr.bin/doscmd/cwd.h
index dfe7e4ea4486..58d8410bc283 100644
--- a/usr.bin/doscmd/cwd.h
+++ b/usr.bin/doscmd/cwd.h
@@ -29,7 +29,7 @@
  *
  *	BSDI cwd.h,v 2.2 1996/04/08 19:32:26 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/cwd.h,v 1.1.2.1 1999/08/29 15:26:56 peter Exp $
  */
 
 static inline u_char *
diff --git a/usr.bin/doscmd/debug.c b/usr.bin/doscmd/debug.c
index dde4fcb72c00..2110c27bc6db 100644
--- a/usr.bin/doscmd/debug.c
+++ b/usr.bin/doscmd/debug.c
@@ -31,7 +31,7 @@
  *
  * from: BSDI doscmd.c,v 2.3 1996/04/08 19:32:30 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/debug.c,v 1.1.2.1 1999/08/29 15:26:57 peter Exp $
  */
 
 
diff --git a/usr.bin/doscmd/dispatch.h b/usr.bin/doscmd/dispatch.h
index 7506c534220a..f596689e9c22 100644
--- a/usr.bin/doscmd/dispatch.h
+++ b/usr.bin/doscmd/dispatch.h
@@ -23,7 +23,7 @@
 ** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 ** SUCH DAMAGE.
 **
-** $FreeBSD$
+** $FreeBSD: src/usr.bin/doscmd/dispatch.h,v 1.1.2.1 1999/08/29 15:26:58 peter Exp $
 */
 
 /*
diff --git a/usr.bin/doscmd/dos.c b/usr.bin/doscmd/dos.c
index 7b8fa0c9a911..79a9a91233f4 100644
--- a/usr.bin/doscmd/dos.c
+++ b/usr.bin/doscmd/dos.c
@@ -31,7 +31,7 @@
  *
  *	BSDI int21.c,v 2.2 1996/04/08 19:32:51 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/dos.c,v 1.5.2.1 1999/08/29 15:26:58 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/dos.h b/usr.bin/doscmd/dos.h
index 1ec83ac7f32c..d3220b8469d1 100644
--- a/usr.bin/doscmd/dos.h
+++ b/usr.bin/doscmd/dos.h
@@ -29,7 +29,7 @@
  *
  *	BSDI dos.h,v 2.2 1996/04/08 19:32:28 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/dos.h,v 1.1.2.1 1999/08/29 15:26:59 peter Exp $
  */
 
 /*
diff --git a/usr.bin/doscmd/doscmd.c b/usr.bin/doscmd/doscmd.c
index 8e8da70f5191..da55ea7a93ab 100644
--- a/usr.bin/doscmd/doscmd.c
+++ b/usr.bin/doscmd/doscmd.c
@@ -29,7 +29,7 @@
  *
  *	BSDI doscmd.c,v 2.3 1996/04/08 19:32:30 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/doscmd.c,v 1.8.2.1 1999/08/29 15:26:59 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/doscmd/doscmd.h b/usr.bin/doscmd/doscmd.h
index 1c960647d6f4..9775a9404959 100644
--- a/usr.bin/doscmd/doscmd.h
+++ b/usr.bin/doscmd/doscmd.h
@@ -29,7 +29,7 @@
  *
  *	BSDI doscmd.h,v 2.3 1996/04/08 19:32:32 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/doscmd.h,v 1.4.2.1 1999/08/29 15:27:00 peter Exp $
  */
 
 
diff --git a/usr.bin/doscmd/doscmd_loader.c b/usr.bin/doscmd/doscmd_loader.c
index d219ad52b46e..134b21498acb 100644
--- a/usr.bin/doscmd/doscmd_loader.c
+++ b/usr.bin/doscmd/doscmd_loader.c
@@ -29,7 +29,7 @@
  *
  *	BSDI doscmd_loader.c,v 2.3 1996/04/08 19:32:33 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/doscmd_loader.c,v 1.1.2.1 1999/08/29 15:27:00 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.bin/doscmd/ems.c b/usr.bin/doscmd/ems.c
index 1b9b04568432..e3c33336b63c 100644
--- a/usr.bin/doscmd/ems.c
+++ b/usr.bin/doscmd/ems.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/ems.c,v 1.1.2.1 1999/08/29 15:27:01 peter Exp $
  */
 
 /* 
diff --git a/usr.bin/doscmd/ems.h b/usr.bin/doscmd/ems.h
index 276bddc6bbde..1ba40deac397 100644
--- a/usr.bin/doscmd/ems.h
+++ b/usr.bin/doscmd/ems.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/ems.h,v 1.2.2.1 1999/08/29 15:27:02 peter Exp $
  */
 
 #ifndef EMS_H
diff --git a/usr.bin/doscmd/emsdriv.S b/usr.bin/doscmd/emsdriv.S
index 40c7affd00b7..fa6a49c96b3c 100644
--- a/usr.bin/doscmd/emsdriv.S
+++ b/usr.bin/doscmd/emsdriv.S
@@ -24,7 +24,7 @@
 ! (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 ! THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 !
-! $FreeBSD$
+! $FreeBSD: src/usr.bin/doscmd/emsdriv.S,v 1.1.2.1 1999/08/29 15:27:02 peter Exp $
 
 
 !
diff --git a/usr.bin/doscmd/emuint.c b/usr.bin/doscmd/emuint.c
index 9c230a3c0dae..cdac799dedc1 100644
--- a/usr.bin/doscmd/emuint.c
+++ b/usr.bin/doscmd/emuint.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/emuint.c,v 1.1.2.1 1999/08/29 15:27:03 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.bin/doscmd/emuint.h b/usr.bin/doscmd/emuint.h
index d3797687eda3..e28cd110c4da 100644
--- a/usr.bin/doscmd/emuint.h
+++ b/usr.bin/doscmd/emuint.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/emuint.h,v 1.1.2.1 1999/08/29 15:27:03 peter Exp $
  */
 
 
diff --git a/usr.bin/doscmd/exe.c b/usr.bin/doscmd/exe.c
index ce9a8f02d049..6f0e1a1b44e0 100644
--- a/usr.bin/doscmd/exe.c
+++ b/usr.bin/doscmd/exe.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	BSDI exe.c,v 2.2 1996/04/08 19:32:34 bostic Exp
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/exe.c,v 1.1.2.1 1999/08/29 15:27:04 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.bin/doscmd/int.c b/usr.bin/doscmd/int.c
index 3b72e24bebaa..8ac98bfadd64 100644
--- a/usr.bin/doscmd/int.c
+++ b/usr.bin/doscmd/int.c
@@ -1,7 +1,7 @@
 /*
 ** No copyright?!
 **
-** $FreeBSD$
+** $FreeBSD: src/usr.bin/doscmd/int.c,v 1.1.2.1 1999/08/29 15:27:04 peter Exp $
 */
 #include "doscmd.h"
 
diff --git a/usr.bin/doscmd/int10.c b/usr.bin/doscmd/int10.c
index 32bec88c1c53..8cfb98d10f5d 100644
--- a/usr.bin/doscmd/int10.c
+++ b/usr.bin/doscmd/int10.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int10.c,v 2.3 1996/04/08 19:32:40 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/int10.c,v 1.1.2.1 1999/08/29 15:27:04 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int13.c b/usr.bin/doscmd/int13.c
index 84cb13f6eb0d..c4a35a2920db 100644
--- a/usr.bin/doscmd/int13.c
+++ b/usr.bin/doscmd/int13.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int13.c,v 2.3 1996/04/08 19:32:43 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/int13.c,v 1.2.2.1 1999/08/29 15:27:05 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int14.c b/usr.bin/doscmd/int14.c
index 4d367eb7f4a0..ec1b0d411c15 100644
--- a/usr.bin/doscmd/int14.c
+++ b/usr.bin/doscmd/int14.c
@@ -32,7 +32,7 @@
  *
  *	BSDI int14.c,v 2.2 1996/04/08 19:32:45 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/int14.c,v 1.1.2.1 1999/08/29 15:27:05 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int16.c b/usr.bin/doscmd/int16.c
index 517e1312c186..b858b24c5c70 100644
--- a/usr.bin/doscmd/int16.c
+++ b/usr.bin/doscmd/int16.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int16.c,v 2.2 1996/04/08 19:32:47 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/int16.c,v 1.1.2.1 1999/08/29 15:27:06 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int17.c b/usr.bin/doscmd/int17.c
index d62d6da9b321..b9a58dfdcc89 100644
--- a/usr.bin/doscmd/int17.c
+++ b/usr.bin/doscmd/int17.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int17.c,v 2.2 1996/04/08 19:32:48 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/int17.c,v 1.3.2.1 1999/08/29 15:27:06 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int1a.c b/usr.bin/doscmd/int1a.c
index ff7df30f8376..3eac028d81c6 100644
--- a/usr.bin/doscmd/int1a.c
+++ b/usr.bin/doscmd/int1a.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int1a.c,v 2.2 1996/04/08 19:32:49 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/int1a.c,v 1.2.2.1 1999/08/29 15:27:06 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int2f.c b/usr.bin/doscmd/int2f.c
index 8bfe3d8db71e..380158001087 100644
--- a/usr.bin/doscmd/int2f.c
+++ b/usr.bin/doscmd/int2f.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int2f.c,v 2.2 1996/04/08 19:32:53 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/int2f.c,v 1.2.2.1 1999/08/29 15:27:06 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/intff.c b/usr.bin/doscmd/intff.c
index fd167af6cf4e..134b6d90171b 100644
--- a/usr.bin/doscmd/intff.c
+++ b/usr.bin/doscmd/intff.c
@@ -29,7 +29,7 @@
  *
  *	BSDI intff.c,v 2.2 1996/04/08 19:32:56 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/intff.c,v 1.5.2.1 1999/08/29 15:27:07 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/mem.c b/usr.bin/doscmd/mem.c
index bae413f660fc..fb38997f229b 100644
--- a/usr.bin/doscmd/mem.c
+++ b/usr.bin/doscmd/mem.c
@@ -29,7 +29,7 @@
  *
  *	BSDI mem.c,v 2.2 1996/04/08 19:32:57 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/mem.c,v 1.1.2.1 1999/08/29 15:27:07 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.bin/doscmd/mouse.c b/usr.bin/doscmd/mouse.c
index c9a07740a0fa..524db260de9f 100644
--- a/usr.bin/doscmd/mouse.c
+++ b/usr.bin/doscmd/mouse.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int33.c,v 2.2 1996/04/08 19:32:54 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/mouse.c,v 1.1.2.1 1999/08/29 15:27:07 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/mouse.h b/usr.bin/doscmd/mouse.h
index b77cba48f57d..b880e52fcc51 100644
--- a/usr.bin/doscmd/mouse.h
+++ b/usr.bin/doscmd/mouse.h
@@ -29,7 +29,7 @@
  *
  *	BSDI mouse.h,v 2.2 1996/04/08 19:32:58 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/mouse.h,v 1.1.2.1 1999/08/29 15:27:07 peter Exp $
  */
 
 typedef struct {
diff --git a/usr.bin/doscmd/net.c b/usr.bin/doscmd/net.c
index b899d96599a8..96ddeb33bd53 100644
--- a/usr.bin/doscmd/net.c
+++ b/usr.bin/doscmd/net.c
@@ -1,7 +1,7 @@
 /*
 ** No copyright!
 **
-** $FreeBSD$
+** $FreeBSD: src/usr.bin/doscmd/net.c,v 1.1.2.1 1999/08/29 15:27:08 peter Exp $
 **
 ** NetBIOS etc. hooks.
 */
diff --git a/usr.bin/doscmd/port.c b/usr.bin/doscmd/port.c
index eb2158f1e7d1..9bb80b15ca92 100644
--- a/usr.bin/doscmd/port.c
+++ b/usr.bin/doscmd/port.c
@@ -29,7 +29,7 @@
  *
  *	BSDI port.c,v 2.2 1996/04/08 19:33:03 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/port.c,v 1.2.2.1 1999/08/29 15:27:08 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/redir.S b/usr.bin/doscmd/redir.S
index 1f40f3cce6e8..426941d94d76 100644
--- a/usr.bin/doscmd/redir.S
+++ b/usr.bin/doscmd/redir.S
@@ -24,7 +24,7 @@
 ! (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 ! THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 !
-! $FreeBSD$
+! $FreeBSD: src/usr.bin/doscmd/redir.S,v 1.1.2.1 1999/08/29 15:27:09 peter Exp $
 
 
 !
diff --git a/usr.bin/doscmd/register.h b/usr.bin/doscmd/register.h
index ba0e91e03a9a..dc2957a9800b 100644
--- a/usr.bin/doscmd/register.h
+++ b/usr.bin/doscmd/register.h
@@ -23,7 +23,7 @@
 ** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 ** SUCH DAMAGE.
 **
-** $FreeBSD$
+** $FreeBSD: src/usr.bin/doscmd/register.h,v 1.1.2.1 1999/08/29 15:27:10 peter Exp $
 */
 
 /******************************************************************************
diff --git a/usr.bin/doscmd/setver.c b/usr.bin/doscmd/setver.c
index 5826567373ed..fcab0c0cbc14 100644
--- a/usr.bin/doscmd/setver.c
+++ b/usr.bin/doscmd/setver.c
@@ -29,7 +29,7 @@
  *
  *	BSDI setver.c,v 2.2 1996/04/08 19:33:04 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/setver.c,v 1.1.2.1 1999/08/29 15:27:10 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/signal.c b/usr.bin/doscmd/signal.c
index 2d91d03ce539..623e70a04da9 100644
--- a/usr.bin/doscmd/signal.c
+++ b/usr.bin/doscmd/signal.c
@@ -29,7 +29,7 @@
  *
  *	BSDI signal.c,v 2.2 1996/04/08 19:33:06 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/signal.c,v 1.2.2.1 1999/08/29 15:27:10 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/timer.c b/usr.bin/doscmd/timer.c
index 41b30199585a..c9d0d48e5391 100644
--- a/usr.bin/doscmd/timer.c
+++ b/usr.bin/doscmd/timer.c
@@ -1,7 +1,7 @@
 /*
 ** No copyright?!
 **
-** $FreeBSD$
+** $FreeBSD: src/usr.bin/doscmd/timer.c,v 1.1.2.1 1999/08/29 15:27:11 peter Exp $
 */
 #include "doscmd.h"
 
diff --git a/usr.bin/doscmd/trace.c b/usr.bin/doscmd/trace.c
index 9be758fd7ba6..de1d30a91a4f 100644
--- a/usr.bin/doscmd/trace.c
+++ b/usr.bin/doscmd/trace.c
@@ -29,7 +29,7 @@
  *
  *	BSDI trace.c,v 2.2 1996/04/08 19:33:07 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/trace.c,v 1.1.2.1 1999/08/29 15:27:11 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/trap.c b/usr.bin/doscmd/trap.c
index 9aecde5dc1e2..09c426812791 100644
--- a/usr.bin/doscmd/trap.c
+++ b/usr.bin/doscmd/trap.c
@@ -29,7 +29,7 @@
  *
  *	BSDI trap.c,v 2.3 1996/04/08 19:33:08 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/trap.c,v 1.2.2.1 1999/08/29 15:27:11 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/trap.h b/usr.bin/doscmd/trap.h
index 6cba0df95c3d..27671ee905c0 100644
--- a/usr.bin/doscmd/trap.h
+++ b/usr.bin/doscmd/trap.h
@@ -29,7 +29,7 @@
  *
  *	BSDI trap.h,v 2.2 1996/04/08 19:33:09 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/trap.h,v 1.1.2.1 1999/08/29 15:27:11 peter Exp $
  */
 
 #define	CLI	0xfa
diff --git a/usr.bin/doscmd/tty.c b/usr.bin/doscmd/tty.c
index 380585e12e6f..4cbe98267079 100644
--- a/usr.bin/doscmd/tty.c
+++ b/usr.bin/doscmd/tty.c
@@ -29,7 +29,7 @@
  *
  *	BSDI tty.c,v 2.4 1996/04/08 22:03:27 prb Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/tty.c,v 1.4.2.1 1999/08/29 15:27:12 peter Exp $
  */
 
 #ifndef NO_X
diff --git a/usr.bin/doscmd/video.h b/usr.bin/doscmd/video.h
index 7b36eb782056..3db0fed6c24f 100644
--- a/usr.bin/doscmd/video.h
+++ b/usr.bin/doscmd/video.h
@@ -29,7 +29,7 @@
  *
  *	BSDI video.h,v 2.2 1996/04/08 19:33:12 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/video.h,v 1.1.2.1 1999/08/29 15:27:12 peter Exp $
  */
 
 /*
diff --git a/usr.bin/doscmd/xms.c b/usr.bin/doscmd/xms.c
index 9dbd4ba71f9d..1ccf906a34d0 100644
--- a/usr.bin/doscmd/xms.c
+++ b/usr.bin/doscmd/xms.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/xms.c,v 1.4.2.1 1999/08/29 15:27:12 peter Exp $
  */
 
 /*
diff --git a/usr.bin/doscmd/xms.h b/usr.bin/doscmd/xms.h
index 51890282b24c..7aaf52195707 100644
--- a/usr.bin/doscmd/xms.h
+++ b/usr.bin/doscmd/xms.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/xms.h,v 1.1.2.1 1999/08/29 15:27:12 peter Exp $
  */
 
 #ifndef XMS_H
diff --git a/usr.bin/du/du.1 b/usr.bin/du/du.1
index 08b1ab456c3e..932b54690daf 100644
--- a/usr.bin/du/du.1
+++ b/usr.bin/du/du.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)du.1	8.2 (Berkeley) 4/1/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/du/du.1,v 1.11.2.1 1999/08/29 15:27:18 peter Exp $
 .\"
 .Dd April 1, 1994
 .Dt DU 1
diff --git a/usr.bin/ee/ee.1 b/usr.bin/ee/ee.1
index 3f957835d238..59b74186cd44 100644
--- a/usr.bin/ee/ee.1
+++ b/usr.bin/ee/ee.1
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ee/ee.1,v 1.6.2.2 1999/09/20 09:49:55 phantom Exp $
 .\"
 .Dd August 30, 1995
 .Dt EE 1
diff --git a/usr.bin/ee/ee.c b/usr.bin/ee/ee.c
index c44ec0057cf4..6e2c61a4798f 100644
--- a/usr.bin/ee/ee.c
+++ b/usr.bin/ee/ee.c
@@ -52,7 +52,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ee/ee.c,v 1.12.2.1 1999/08/29 15:27:19 peter Exp $";
 #endif /* not lint */
 
 char *ee_copyright_message = 
diff --git a/usr.bin/ee/new_curse.c b/usr.bin/ee/new_curse.c
index 95d42a0b14fc..13d6b979d036 100644
--- a/usr.bin/ee/new_curse.c
+++ b/usr.bin/ee/new_curse.c
@@ -37,7 +37,7 @@
  |	Copyright (c) 1986, 1987, 1988, 1991, 1992, 1993, 1994, 1995 Hugh Mahon
  |	All are rights reserved.
  |
- | $FreeBSD$
+ | $FreeBSD: src/usr.bin/ee/new_curse.c,v 1.2.4.1 1999/08/29 15:27:20 peter Exp $
  |
  */
 
diff --git a/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg b/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg
index ef2ce2230d3e..0b2e5af6530c 100644
--- a/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg
+++ b/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $ 
-$ $FreeBSD$
+$ $FreeBSD: src/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg,v 1.5.2.1 1999/08/29 15:27:22 peter Exp $
 $ 
 $set 1
 $quote "
diff --git a/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg b/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg
index 0a383ad0cfe2..d45a488b2df0 100644
--- a/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg
+++ b/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $ 
-$ $FreeBSD$
+$ $FreeBSD: src/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg,v 1.4.2.1 1999/08/29 15:27:24 peter Exp $
 $ 
 $set 1
 $quote "
diff --git a/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg b/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg
index e4c2c9567b35..a05d1aba68b5 100644
--- a/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg
+++ b/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $
-$ $FreeBSD$
+$ $FreeBSD: src/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg,v 1.8.2.1 1999/08/29 15:27:25 peter Exp $
 $ 
 $set 1
 $quote "
diff --git a/usr.bin/ee/nls/pl_PL.ISO_8859-2/ee.msg b/usr.bin/ee/nls/pl_PL.ISO_8859-2/ee.msg
index d5dfd4b3572e..5ca208259318 100644
--- a/usr.bin/ee/nls/pl_PL.ISO_8859-2/ee.msg
+++ b/usr.bin/ee/nls/pl_PL.ISO_8859-2/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $ 
-$ $FreeBSD$
+$ $FreeBSD: src/usr.bin/ee/nls/pl_PL.ISO_8859-2/ee.msg,v 1.3.4.1 1999/08/29 15:27:26 peter Exp $
 $ 
 $set 1
 $quote "
diff --git a/usr.bin/enigma/enigma.1 b/usr.bin/enigma/enigma.1
index aa025e2028a0..26c5cb470ef3 100644
--- a/usr.bin/enigma/enigma.1
+++ b/usr.bin/enigma/enigma.1
@@ -4,7 +4,7 @@
 .\" Since enigma itself is distributed in the Public Domain, this file
 .\" is also.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/enigma/enigma.1,v 1.1.2.4 1999/08/29 15:27:28 peter Exp $
 .\" "
 .Dd October 30, 1998
 .Os
diff --git a/usr.bin/error/filter.c b/usr.bin/error/filter.c
index 84fd970572a9..a108f4755084 100644
--- a/usr.bin/error/filter.c
+++ b/usr.bin/error/filter.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)filter.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/error/filter.c,v 1.3.2.1 1999/08/29 15:27:31 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/error/input.c b/usr.bin/error/input.c
index 602fed616ae6..b02b5ae8636f 100644
--- a/usr.bin/error/input.c
+++ b/usr.bin/error/input.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)input.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/error/input.c,v 1.3.2.1 1999/08/29 15:27:31 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/error/main.c b/usr.bin/error/main.c
index 7e8b9d587f51..d254640c382e 100644
--- a/usr.bin/error/main.c
+++ b/usr.bin/error/main.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/error/main.c,v 1.4.2.1 1999/08/29 15:27:31 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/error/pi.c b/usr.bin/error/pi.c
index 405f548e4b08..fcf36428ba90 100644
--- a/usr.bin/error/pi.c
+++ b/usr.bin/error/pi.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)pi.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/error/pi.c,v 1.4.2.1 1999/08/29 15:27:32 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/error/subr.c b/usr.bin/error/subr.c
index cd0846392cab..8bca9b1516ae 100644
--- a/usr.bin/error/subr.c
+++ b/usr.bin/error/subr.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)subr.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/error/subr.c,v 1.3.2.1 1999/08/29 15:27:32 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/error/touch.c b/usr.bin/error/touch.c
index de6a396ebd3d..f33b6d930fb4 100644
--- a/usr.bin/error/touch.c
+++ b/usr.bin/error/touch.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)touch.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/error/touch.c,v 1.6.2.1 1999/08/29 15:27:33 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c
index f16f64582754..44d0c1a7e9db 100644
--- a/usr.bin/expand/expand.c
+++ b/usr.bin/expand/expand.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)expand.c	8.1 (Berkeley) 6/9/93";
 #else
 static const char rcsid[] = 
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/expand/expand.c,v 1.4.2.1 1999/08/29 15:27:34 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/fetch/fetch.1 b/usr.bin/fetch/fetch.1
index c94bdbce2067..16bf8d512ab3 100644
--- a/usr.bin/fetch/fetch.1
+++ b/usr.bin/fetch/fetch.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/fetch/fetch.1,v 1.27.2.3 1999/08/29 15:27:35 peter Exp $
 .Dd February 22, 1999
 .Dt FETCH 1
 .Os FreeBSD 3.1
diff --git a/usr.bin/fetch/fetch.h b/usr.bin/fetch/fetch.h
index bea7db93a38e..59f551f5d13d 100644
--- a/usr.bin/fetch/fetch.h
+++ b/usr.bin/fetch/fetch.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/fetch/fetch.h,v 1.7.2.1 1999/08/29 15:27:36 peter Exp $
  */
 
 #ifndef fetch_h
diff --git a/usr.bin/fetch/file.c b/usr.bin/fetch/file.c
index 24dfd75ab4ca..d99491bd8dfe 100644
--- a/usr.bin/fetch/file.c
+++ b/usr.bin/fetch/file.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/fetch/file.c,v 1.4.2.2 1999/08/29 15:27:36 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/fetch/ftp.c b/usr.bin/fetch/ftp.c
index 922887bb2789..a302db501ae1 100644
--- a/usr.bin/fetch/ftp.c
+++ b/usr.bin/fetch/ftp.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/fetch/ftp.c,v 1.11.2.3 1999/08/29 15:27:36 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/fetch/http.c b/usr.bin/fetch/http.c
index 4e19485a9f8f..ce70afc48dcd 100644
--- a/usr.bin/fetch/http.c
+++ b/usr.bin/fetch/http.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/fetch/http.c,v 1.24.2.4 1999/08/29 15:27:37 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/fetch/main.c b/usr.bin/fetch/main.c
index 7cae99ba4e06..e922fd0cda89 100644
--- a/usr.bin/fetch/main.c
+++ b/usr.bin/fetch/main.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/fetch/main.c,v 1.49.2.4 1999/08/29 15:27:37 peter Exp $ */
 
 #include <sys/types.h>
 
diff --git a/usr.bin/fetch/uri.c b/usr.bin/fetch/uri.c
index 3aeb0d1c74a8..2e99da2cc3c5 100644
--- a/usr.bin/fetch/uri.c
+++ b/usr.bin/fetch/uri.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/fetch/uri.c,v 1.1.4.1 1999/08/29 15:27:37 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/fetch/util.c b/usr.bin/fetch/util.c
index bac316d3a508..eee155fd10bc 100644
--- a/usr.bin/fetch/util.c
+++ b/usr.bin/fetch/util.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/fetch/util.c,v 1.6.2.1 1999/08/29 15:27:38 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/file/LEGAL.NOTICE b/usr.bin/file/LEGAL.NOTICE
index 29f21aed456b..5f498199afa2 100644
--- a/usr.bin/file/LEGAL.NOTICE
+++ b/usr.bin/file/LEGAL.NOTICE
@@ -1,6 +1,6 @@
 Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995.
 Software written by Ian F. Darwin and others; maintained by Christos Zoulas.
-$FreeBSD$
+$FreeBSD: src/usr.bin/file/LEGAL.NOTICE,v 1.3.2.1 1999/08/29 15:27:39 peter Exp $
 
 This software (or derivative software) may not be made subject to any 
 license which denies anyone permission to alter it and redistribute it 
diff --git a/usr.bin/file/MAINT b/usr.bin/file/MAINT
index cb318445c60f..3fe983376e6f 100644
--- a/usr.bin/file/MAINT
+++ b/usr.bin/file/MAINT
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.bin/file/MAINT,v 1.3.2.1 1999/08/29 15:27:39 peter Exp $
 
 Maintenance notes:
 
diff --git a/usr.bin/file/Magdir/Localstuff b/usr.bin/file/Magdir/Localstuff
index a3e1e0bfce4c..69dbf3e66639 100644
--- a/usr.bin/file/Magdir/Localstuff
+++ b/usr.bin/file/Magdir/Localstuff
@@ -2,6 +2,6 @@
 #------------------------------------------------------------------------------
 # Localstuff:  file(1) magic for locally observed files
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/file/Magdir/Localstuff,v 1.3.2.1 1999/08/29 15:27:45 peter Exp $
 # Add any locally observed files here.  Remember:
 # text if readable, executable if runnable binary, data if unreadable.
diff --git a/usr.bin/file/Magdir/softquad b/usr.bin/file/Magdir/softquad
index 0fd952a2ee43..4f7973f06604 100644
--- a/usr.bin/file/Magdir/softquad
+++ b/usr.bin/file/Magdir/softquad
@@ -2,7 +2,7 @@
 #------------------------------------------------------------------------------
 # softquad:  file(1) magic for SoftQuad Publishing Software
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/file/Magdir/softquad,v 1.3.2.1 1999/08/29 15:27:48 peter Exp $
 # Author/Editor and RulesBuilder
 #
 # XXX - byte order?
diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile
index 3834e4b0b307..c9748d77ddcd 100644
--- a/usr.bin/file/Makefile
+++ b/usr.bin/file/Makefile
@@ -1,6 +1,6 @@
 # Makefile for file(1) cmd.
 # Copyright (c) Ian F. Darwin 86/09/01 - see LEGAL.NOTICE.
-# @(#)$FreeBSD$
+# @(#)$FreeBSD: src/usr.bin/file/Makefile,v 1.12.2.1 1999/08/29 15:27:39 peter Exp $
 #
 # This software is not subject to any license of the American Telephone
 # and Telegraph Company or of the Regents of the University of California.
diff --git a/usr.bin/file/PORTING b/usr.bin/file/PORTING
index 7e65021d2950..8fdbf28c25d7 100644
--- a/usr.bin/file/PORTING
+++ b/usr.bin/file/PORTING
@@ -1,5 +1,5 @@
 Portability of the new file(1) command.
-@(#) $FreeBSD$
+@(#) $FreeBSD: src/usr.bin/file/PORTING,v 1.3.2.1 1999/08/29 15:27:39 peter Exp $
 
 Read this file only if the program doesn't compile on your system.
 
diff --git a/usr.bin/file/README b/usr.bin/file/README
index 9872176410be..7648147f26bb 100644
--- a/usr.bin/file/README
+++ b/usr.bin/file/README
@@ -1,5 +1,5 @@
 ** README for file(1) Command **
-@(#) $FreeBSD$
+@(#) $FreeBSD: src/usr.bin/file/README,v 1.4.2.1 1999/08/29 15:27:40 peter Exp $
 
 This is Release 3.x of Ian Darwin's (copyright but distributable)
 file(1) command. This version is the standard "file" command for Linux,
diff --git a/usr.bin/file/apprentice.c b/usr.bin/file/apprentice.c
index 9c5b94547f55..a218b1761112 100644
--- a/usr.bin/file/apprentice.c
+++ b/usr.bin/file/apprentice.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/file/apprentice.c,v 1.7.2.2 1999/08/29 15:27:40 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/file/ascmagic.c b/usr.bin/file/ascmagic.c
index bf116999e3dc..0be10fa7a5d2 100644
--- a/usr.bin/file/ascmagic.c
+++ b/usr.bin/file/ascmagic.c
@@ -28,7 +28,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/file/ascmagic.c,v 1.9.2.1 1999/08/29 15:27:40 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/file/compress.c b/usr.bin/file/compress.c
index f1e8ae8b2510..dd530d5698bf 100644
--- a/usr.bin/file/compress.c
+++ b/usr.bin/file/compress.c
@@ -8,7 +8,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/file/compress.c,v 1.6.2.1 1999/08/29 15:27:40 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/file/cvsimport.sh b/usr.bin/file/cvsimport.sh
index 0436074fc634..84f677be82db 100644
--- a/usr.bin/file/cvsimport.sh
+++ b/usr.bin/file/cvsimport.sh
@@ -3,7 +3,7 @@
 # This shell script can be used in order to handle future imports
 # of newer versions of file(1)
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/file/cvsimport.sh,v 1.4.2.1 1999/08/29 15:27:41 peter Exp $
 if [ $# -ne 2 ] ; then 
 	echo "usage: $0 <major> <minor>" 1>&2
 	exit 1
diff --git a/usr.bin/file/file.1 b/usr.bin/file/file.1
index f661815290ac..ac6d616487bc 100644
--- a/usr.bin/file/file.1
+++ b/usr.bin/file/file.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/file/file.1,v 1.12.2.2 1999/09/20 09:49:56 phantom Exp $
 .Dd July 30, 1997
 .Dt FILE 1 "Copyright but distributable"
 .Os
diff --git a/usr.bin/file/file.c b/usr.bin/file/file.c
index f420cac9f1c0..75ad4ed05953 100644
--- a/usr.bin/file/file.c
+++ b/usr.bin/file/file.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/file/file.c,v 1.9.2.1 1999/08/29 15:27:42 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/file/file.h b/usr.bin/file/file.h
index 7d42ad88c712..f3651354413e 100644
--- a/usr.bin/file/file.h
+++ b/usr.bin/file/file.h
@@ -1,6 +1,6 @@
 /*
  * file.h - definitions for file(1) program
- * @(#)$FreeBSD$
+ * @(#)$FreeBSD: src/usr.bin/file/file.h,v 1.8.2.2 1999/08/29 15:27:42 peter Exp $
  *
  * Copyright (c) Ian F. Darwin, 1987.
  * Written by Ian F. Darwin.
diff --git a/usr.bin/file/fsmagic.c b/usr.bin/file/fsmagic.c
index 57e5ec61328a..3d7e1e0c034d 100644
--- a/usr.bin/file/fsmagic.c
+++ b/usr.bin/file/fsmagic.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/file/fsmagic.c,v 1.7.2.1 1999/08/29 15:27:42 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/file/internat.c b/usr.bin/file/internat.c
index f04208e08a01..f985b9b2b36f 100644
--- a/usr.bin/file/internat.c
+++ b/usr.bin/file/internat.c
@@ -1,7 +1,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/file/internat.c,v 1.2.2.1 1999/08/29 15:27:42 peter Exp $";
 #endif /* not lint */
 
 #include "file.h"
diff --git a/usr.bin/file/is_tar.c b/usr.bin/file/is_tar.c
index 362825f3e8d6..3a1bddd2f8d3 100644
--- a/usr.bin/file/is_tar.c
+++ b/usr.bin/file/is_tar.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/file/is_tar.c,v 1.6.2.1 1999/08/29 15:27:42 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/file/magic.5 b/usr.bin/file/magic.5
index 12923ac0057a..3dcb8a3a2d62 100644
--- a/usr.bin/file/magic.5
+++ b/usr.bin/file/magic.5
@@ -1,5 +1,5 @@
 .\"
-.\" @(#)$FreeBSD$
+.\" @(#)$FreeBSD: src/usr.bin/file/magic.5,v 1.9.2.1 1999/08/29 15:27:43 peter Exp $
 .\"
 .\" install as magic.4 on USG, magic.5 on V7 or Berkeley systems.
 .\"
diff --git a/usr.bin/file/names.h b/usr.bin/file/names.h
index 1273375f6a49..d52981d0704a 100644
--- a/usr.bin/file/names.h
+++ b/usr.bin/file/names.h
@@ -10,7 +10,7 @@
  *
  * See LEGAL.NOTICE
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/file/names.h,v 1.5.2.1 1999/08/29 15:27:43 peter Exp $
  */
 
 /* these types are used to index the table 'types': keep em in sync! */
diff --git a/usr.bin/file/patchlevel.h b/usr.bin/file/patchlevel.h
index 7fe74e7f1d65..6a9671f5bf0e 100644
--- a/usr.bin/file/patchlevel.h
+++ b/usr.bin/file/patchlevel.h
@@ -3,7 +3,7 @@
 
 /*
  * Patchlevel file for Ian Darwin's MAGIC command.
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/file/patchlevel.h,v 1.8.2.1 1999/08/29 15:27:43 peter Exp $
  *
  */
 
diff --git a/usr.bin/file/print.c b/usr.bin/file/print.c
index 8cd079ad8fcd..95cfe50de92f 100644
--- a/usr.bin/file/print.c
+++ b/usr.bin/file/print.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/file/print.c,v 1.8.2.1 1999/08/29 15:27:43 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/file/readelf.c b/usr.bin/file/readelf.c
index 5674402a4602..54a43b03363e 100644
--- a/usr.bin/file/readelf.c
+++ b/usr.bin/file/readelf.c
@@ -1,7 +1,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/file/readelf.c,v 1.5.2.1 1999/08/29 15:27:43 peter Exp $";
 #endif /* not lint */
 
 #ifdef BUILTIN_ELF
diff --git a/usr.bin/file/readelf.h b/usr.bin/file/readelf.h
index 28d44976c241..4e8da673e914 100644
--- a/usr.bin/file/readelf.h
+++ b/usr.bin/file/readelf.h
@@ -1,6 +1,6 @@
 /*
  * readelf.h 
- * @(#)$FreeBSD$
+ * @(#)$FreeBSD: src/usr.bin/file/readelf.h,v 1.2.4.1 1999/08/29 15:27:43 peter Exp $
  *
  * Provide elf data structures for non-elf machines, allowing file
  * non-elf hosts to determine if an elf binary is stripped.
diff --git a/usr.bin/file/softmagic.c b/usr.bin/file/softmagic.c
index c1e79257963c..26a72c9e9f27 100644
--- a/usr.bin/file/softmagic.c
+++ b/usr.bin/file/softmagic.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/file/softmagic.c,v 1.8.2.1 1999/08/29 15:27:44 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/file/tar.h b/usr.bin/file/tar.h
index 87f0d55f25ad..cb837330df65 100644
--- a/usr.bin/file/tar.h
+++ b/usr.bin/file/tar.h
@@ -5,7 +5,7 @@
  *
  * Created 25 August 1985 by John Gilmore, ihnp4!hoptoad!gnu.
  *
- * $FreeBSD$ # checkin only
+ * $FreeBSD: src/usr.bin/file/tar.h,v 1.3.2.1 1999/08/29 15:27:44 peter Exp $ # checkin only
  */
 
 /*
diff --git a/usr.bin/file2c/Makefile b/usr.bin/file2c/Makefile
index 79fdc9267dce..9db7d6eca886 100644
--- a/usr.bin/file2c/Makefile
+++ b/usr.bin/file2c/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/file2c/Makefile,v 1.3.2.1 1999/08/29 15:27:49 peter Exp $
 
 PROG=	file2c
 MAN1=	file2c.1
diff --git a/usr.bin/file2c/file2c.1 b/usr.bin/file2c/file2c.1
index 0cf0d42826a7..706f5300835d 100644
--- a/usr.bin/file2c/file2c.1
+++ b/usr.bin/file2c/file2c.1
@@ -5,7 +5,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.  Poul-Henning Kamp
 .\" ---------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/file2c/file2c.1,v 1.5.2.1 1999/08/29 15:27:50 peter Exp $
 .\"
 .Dd January 28, 1995
 .Dt FILE2C 1
diff --git a/usr.bin/file2c/file2c.c b/usr.bin/file2c/file2c.c
index 258e70f2510c..f4f57f52a25d 100644
--- a/usr.bin/file2c/file2c.c
+++ b/usr.bin/file2c/file2c.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/file2c/file2c.c,v 1.3.2.1 1999/08/29 15:27:50 peter Exp $
  *
  */
 
diff --git a/usr.bin/find/find.1 b/usr.bin/find/find.1
index 631260788d64..6be39e4ccfe1 100644
--- a/usr.bin/find/find.1
+++ b/usr.bin/find/find.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)find.1	8.7 (Berkeley) 5/9/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/find/find.1,v 1.18.2.2 1999/08/29 15:27:52 peter Exp $
 .\"
 .Dd May 9, 1995
 .Dt FIND 1
diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c
index c6cb12ef1297..d2d8fe1bb6a1 100644
--- a/usr.bin/find/option.c
+++ b/usr.bin/find/option.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)option.c	8.2 (Berkeley) 4/16/94";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/find/option.c,v 1.7.2.1 1999/08/29 15:27:53 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/finger/finger.1 b/usr.bin/finger/finger.1
index 4fa1860ce043..1ab014e9c7c8 100644
--- a/usr.bin/finger/finger.1
+++ b/usr.bin/finger/finger.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)finger.1	8.3 (Berkeley) 5/5/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/finger/finger.1,v 1.7.2.1 1999/08/29 15:27:54 peter Exp $
 .\"
 .Dd August 1, 1997
 .Dt FINGER 1
diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c
index e15a3ad013c8..595934da0ed2 100644
--- a/usr.bin/finger/finger.c
+++ b/usr.bin/finger/finger.c
@@ -55,7 +55,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)finger.c	8.5 (Berkeley) 5/4/95";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/finger/finger.c,v 1.12.2.2 1999/08/29 15:27:54 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/finger/finger.h b/usr.bin/finger/finger.h
index 7d4d99f6fb6f..1322cdcc43b1 100644
--- a/usr.bin/finger/finger.h
+++ b/usr.bin/finger/finger.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)finger.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/finger/finger.h,v 1.2.10.2 1999/08/29 15:27:56 peter Exp $
  */
 
 typedef struct person {
diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c
index 3d0a4091c070..ee7b85113246 100644
--- a/usr.bin/finger/lprint.c
+++ b/usr.bin/finger/lprint.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)lprint.c	8.3 (Berkeley) 4/28/95";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/finger/lprint.c,v 1.9.2.1 1999/08/29 15:27:56 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/finger/net.c b/usr.bin/finger/net.c
index 2903c063806f..ac6af2535781 100644
--- a/usr.bin/finger/net.c
+++ b/usr.bin/finger/net.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)net.c	8.4 (Berkeley) 4/28/95";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/finger/net.c,v 1.10.2.2 1999/08/29 15:27:57 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/finger/sprint.c b/usr.bin/finger/sprint.c
index acf9dff350a3..0986846168bc 100644
--- a/usr.bin/finger/sprint.c
+++ b/usr.bin/finger/sprint.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)sprint.c	8.3 (Berkeley) 4/28/95";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/finger/sprint.c,v 1.10.2.1 1999/08/29 15:27:58 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c
index 54c68f0f6f98..edafae8a196e 100644
--- a/usr.bin/finger/util.c
+++ b/usr.bin/finger/util.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/28/95";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/finger/util.c,v 1.5.2.3 1999/09/06 12:34:18 ru Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/fmt/fmt.c b/usr.bin/fmt/fmt.c
index 94dd8c6de00d..85576d9ac31d 100644
--- a/usr.bin/fmt/fmt.c
+++ b/usr.bin/fmt/fmt.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)fmt.c	8.1 (Berkeley) 7/20/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/fmt/fmt.c,v 1.11.2.1 1999/08/29 15:28:00 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/fold/fold.c b/usr.bin/fold/fold.c
index 386caaffcea2..1288da1086ad 100644
--- a/usr.bin/fold/fold.c
+++ b/usr.bin/fold/fold.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)fold.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/fold/fold.c,v 1.3.2.1 1999/08/29 15:28:01 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/from/from.1 b/usr.bin/from/from.1
index 6ccabd13c23f..a5f65f94a60a 100644
--- a/usr.bin/from/from.1
+++ b/usr.bin/from/from.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)from.1	8.2 (Berkeley) 12/30/93
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/usr.bin/from/from.1,v 1.3.4.1 1999/10/30 21:49:05 green Exp $
 .\"
 .Dd December 30, 1993
 .Dt FROM 1
diff --git a/usr.bin/from/from.c b/usr.bin/from/from.c
index 6b3320712f06..1dae8fa96a96 100644
--- a/usr.bin/from/from.c
+++ b/usr.bin/from/from.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)from.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/from/from.c,v 1.5.2.2 1999/10/30 21:49:05 green Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/fsplit/fsplit.c b/usr.bin/fsplit/fsplit.c
index d80837efb506..4d6491b5c1b8 100644
--- a/usr.bin/fsplit/fsplit.c
+++ b/usr.bin/fsplit/fsplit.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)fsplit.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/fsplit/fsplit.c,v 1.4.2.1 1999/08/29 15:28:05 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/fstat/Makefile b/usr.bin/fstat/Makefile
index 8e9e277d38d0..af9ac7548610 100644
--- a/usr.bin/fstat/Makefile
+++ b/usr.bin/fstat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/fstat/Makefile,v 1.2.2.2 1999/08/29 15:28:06 peter Exp $
 
 PROG=	fstat
 CFLAGS+=-Wall
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index b8e0c973a470..7155f81782ce 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)fstat.c	8.3 (Berkeley) 5/2/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/fstat/fstat.c,v 1.16.2.2 1999/08/29 15:28:06 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile
index bbd82e253aa6..52970d4207f7 100644
--- a/usr.bin/ftp/Makefile
+++ b/usr.bin/ftp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ftp/Makefile,v 1.8.2.2 1999/08/29 15:28:07 peter Exp $
 #	$NetBSD: Makefile,v 1.15 1997/10/18 15:31:20 lukem Exp $
 #	from: @(#)Makefile	8.2 (Berkeley) 4/3/94
 
diff --git a/usr.bin/ftp/cmds.c b/usr.bin/ftp/cmds.c
index acc3c6bde69c..2d5caf179d82 100644
--- a/usr.bin/ftp/cmds.c
+++ b/usr.bin/ftp/cmds.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/usr.bin/ftp/cmds.c,v 1.14.2.2 1999/08/29 15:28:08 peter Exp $	*/
 /*	$NetBSD: cmds.c,v 1.30.2.1 1997/11/18 00:58:26 mellon Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)cmds.c	8.6 (Berkeley) 10/9/94";
 #else
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/usr.bin/ftp/cmds.c,v 1.14.2.2 1999/08/29 15:28:08 peter Exp $");
 __RCSID_SOURCE("$NetBSD: cmds.c,v 1.30.2.1 1997/11/18 00:58:26 mellon Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/cmdtab.c b/usr.bin/ftp/cmdtab.c
index 542d32053d95..f1c4253f3109 100644
--- a/usr.bin/ftp/cmdtab.c
+++ b/usr.bin/ftp/cmdtab.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/usr.bin/ftp/cmdtab.c,v 1.6.2.1 1999/08/29 15:28:09 peter Exp $	*/
 /*	$NetBSD: cmdtab.c,v 1.17 1997/08/18 10:20:17 lukem Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)cmdtab.c	8.4 (Berkeley) 10/9/94";
 #else
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/usr.bin/ftp/cmdtab.c,v 1.6.2.1 1999/08/29 15:28:09 peter Exp $");
 __RCSID_SOURCE("$NetBSD: cmdtab.c,v 1.17 1997/08/18 10:20:17 lukem Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/complete.c b/usr.bin/ftp/complete.c
index ee0453f61e15..adff44189cc0 100644
--- a/usr.bin/ftp/complete.c
+++ b/usr.bin/ftp/complete.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/usr.bin/ftp/complete.c,v 1.4.4.1 1999/08/29 15:28:10 peter Exp $	*/
 /*	$NetBSD: complete.c,v 1.11 1997/09/13 09:05:53 lukem Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/usr.bin/ftp/complete.c,v 1.4.4.1 1999/08/29 15:28:10 peter Exp $");
 __RCSID_SOURCE("$NetBSD: complete.c,v 1.11 1997/09/13 09:05:53 lukem Exp $");
 #endif /* not lint */
 
diff --git a/usr.bin/ftp/domacro.c b/usr.bin/ftp/domacro.c
index 907af4583b9a..740a149d52bf 100644
--- a/usr.bin/ftp/domacro.c
+++ b/usr.bin/ftp/domacro.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/usr.bin/ftp/domacro.c,v 1.5.2.1 1999/08/29 15:28:10 peter Exp $	*/
 /*	$NetBSD: domacro.c,v 1.10 1997/07/20 09:45:45 lukem Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)domacro.c	8.3 (Berkeley) 4/2/94";
 #else
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/usr.bin/ftp/domacro.c,v 1.5.2.1 1999/08/29 15:28:10 peter Exp $");
 __RCSID_SOURCE("$NetBSD: domacro.c,v 1.10 1997/07/20 09:45:45 lukem Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/extern.h b/usr.bin/ftp/extern.h
index a8ac97b8c866..3fd7588c56d6 100644
--- a/usr.bin/ftp/extern.h
+++ b/usr.bin/ftp/extern.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/usr.bin/ftp/extern.h,v 1.7.2.1 1999/08/29 15:28:11 peter Exp $	*/
 /*	$NetBSD: extern.h,v 1.17.2.1 1997/11/18 00:59:50 mellon Exp $	*/
 
 /*-
diff --git a/usr.bin/ftp/fetch.c b/usr.bin/ftp/fetch.c
index 1d73c0f9655e..2275cca51fbf 100644
--- a/usr.bin/ftp/fetch.c
+++ b/usr.bin/ftp/fetch.c
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/usr.bin/ftp/fetch.c,v 1.5.4.2 1999/08/29 15:28:12 peter Exp $");
 __RCSID_SOURCE("$NetBSD: fetch.c,v 1.16.2.1 1997/11/18 01:00:22 mellon Exp $");
 #endif /* not lint */
 
diff --git a/usr.bin/ftp/ftp.1 b/usr.bin/ftp/ftp.1
index 59b371f34b7b..96aeeffae63f 100644
--- a/usr.bin/ftp/ftp.1
+++ b/usr.bin/ftp/ftp.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ftp/ftp.1,v 1.8.2.4 1999/08/29 15:28:12 peter Exp $
 .\" 	$NetBSD: ftp.1,v 1.21 1997/06/10 21:59:58 lukem Exp $
 .\"
 .\" Copyright (c) 1985, 1989, 1990, 1993
diff --git a/usr.bin/ftp/ftp.c b/usr.bin/ftp/ftp.c
index d2edd014d54b..48f3c1640e78 100644
--- a/usr.bin/ftp/ftp.c
+++ b/usr.bin/ftp/ftp.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/usr.bin/ftp/ftp.c,v 1.15.2.2 1999/08/29 15:28:13 peter Exp $	*/
 /*	$NetBSD: ftp.c,v 1.29.2.1 1997/11/18 01:01:04 mellon Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)ftp.c	8.6 (Berkeley) 10/27/94";
 #else
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/usr.bin/ftp/ftp.c,v 1.15.2.2 1999/08/29 15:28:13 peter Exp $");
 __RCSID_SOURCE("$NetBSD: ftp.c,v 1.29.2.1 1997/11/18 01:01:04 mellon Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/ftp_var.h b/usr.bin/ftp/ftp_var.h
index d26d22df7f14..32496e9e2dc2 100644
--- a/usr.bin/ftp/ftp_var.h
+++ b/usr.bin/ftp/ftp_var.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/usr.bin/ftp/ftp_var.h,v 1.6.2.2 1999/08/29 15:28:13 peter Exp $	*/
 /*	$NetBSD: ftp_var.h,v 1.20.2.1 1997/11/18 01:01:37 mellon Exp $	*/
 
 /*
diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c
index f2cad20744c1..955fa62071f2 100644
--- a/usr.bin/ftp/main.c
+++ b/usr.bin/ftp/main.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/usr.bin/ftp/main.c,v 1.16.2.3 1999/08/29 15:28:14 peter Exp $	*/
 /*	$NetBSD: main.c,v 1.26 1997/10/14 16:31:22 christos Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ __COPYRIGHT("@(#) Copyright (c) 1985, 1989, 1993, 1994\n\
 #if 0
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 10/9/94";
 #else
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/usr.bin/ftp/main.c,v 1.16.2.3 1999/08/29 15:28:14 peter Exp $");
 __RCSID_SOURCE("$NetBSD: main.c,v 1.26 1997/10/14 16:31:22 christos Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/pathnames.h b/usr.bin/ftp/pathnames.h
index bf71177a33d4..b51a88ca23ff 100644
--- a/usr.bin/ftp/pathnames.h
+++ b/usr.bin/ftp/pathnames.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/usr.bin/ftp/pathnames.h,v 1.3.2.1 1999/08/29 15:28:14 peter Exp $	*/
 /*	$NetBSD: pathnames.h,v 1.7 1997/01/09 20:19:40 tls Exp $	*/
 
 /*
diff --git a/usr.bin/ftp/ruserpass.c b/usr.bin/ftp/ruserpass.c
index 6feff71b8fdd..9f98cf0cb94d 100644
--- a/usr.bin/ftp/ruserpass.c
+++ b/usr.bin/ftp/ruserpass.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/usr.bin/ftp/ruserpass.c,v 1.7.2.1 1999/08/29 15:28:15 peter Exp $	*/
 /*	$NetBSD: ruserpass.c,v 1.14.2.1 1997/11/18 01:02:05 mellon Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)ruserpass.c	8.4 (Berkeley) 4/27/95";
 #else
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/usr.bin/ftp/ruserpass.c,v 1.7.2.1 1999/08/29 15:28:15 peter Exp $");
 __RCSID_SOURCE("$NetBSD: ruserpass.c,v 1.14.2.1 1997/11/18 01:02:05 mellon Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/util.c b/usr.bin/ftp/util.c
index 24024a19342d..1371c93936ea 100644
--- a/usr.bin/ftp/util.c
+++ b/usr.bin/ftp/util.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/usr.bin/ftp/util.c,v 1.6.2.2 1999/08/29 15:28:15 peter Exp $	*/
 /*	$NetBSD: util.c,v 1.16.2.1 1997/11/18 01:02:33 mellon Exp $	*/
 
 /*
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/usr.bin/ftp/util.c,v 1.6.2.2 1999/08/29 15:28:15 peter Exp $");
 __RCSID_SOURCE("$NetBSD: util.c,v 1.16.2.1 1997/11/18 01:02:33 mellon Exp $");
 #endif /* not lint */
 
diff --git a/usr.bin/gcore/elfcore.c b/usr.bin/gcore/elfcore.c
index 4c0358e34b13..bc137dd17011 100644
--- a/usr.bin/gcore/elfcore.c
+++ b/usr.bin/gcore/elfcore.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/gcore/elfcore.c,v 1.2.2.1 1999/08/29 15:28:17 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.bin/gcore/gcore.c b/usr.bin/gcore/gcore.c
index fc8ed3a70bcc..af3336ab9bbb 100644
--- a/usr.bin/gcore/gcore.c
+++ b/usr.bin/gcore/gcore.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)gcore.c	8.2 (Berkeley) 9/23/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/gcore/gcore.c,v 1.13.2.1 1999/08/29 15:28:18 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/gcore/md-nop.c b/usr.bin/gcore/md-nop.c
index 331901c1841c..a985a9976434 100644
--- a/usr.bin/gcore/md-nop.c
+++ b/usr.bin/gcore/md-nop.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)md-nop.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/gcore/md-nop.c,v 1.2.2.1 1999/08/29 15:28:18 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/gencat/Makefile b/usr.bin/gencat/Makefile
index 45af07adf895..56008d12fb11 100644
--- a/usr.bin/gencat/Makefile
+++ b/usr.bin/gencat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/gencat/Makefile,v 1.4.2.1 1999/08/29 15:28:19 peter Exp $
 
 PROG=	gencat
 SRCS=	gencat.c genlib.c
diff --git a/usr.bin/gencat/gencat.1 b/usr.bin/gencat/gencat.1
index b7936c6ef128..09aefcf9a888 100644
--- a/usr.bin/gencat/gencat.1
+++ b/usr.bin/gencat/gencat.1
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/gencat/gencat.1,v 1.2.2.2 1999/08/29 15:28:20 peter Exp $
 .\"
 .Dd June 11, 1997
 .Dt GENCAT 1
diff --git a/usr.bin/gensetdefs/Makefile b/usr.bin/gensetdefs/Makefile
index af403f739d14..e2b767035144 100644
--- a/usr.bin/gensetdefs/Makefile
+++ b/usr.bin/gensetdefs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/gensetdefs/Makefile,v 1.2.2.1 1999/08/29 15:28:21 peter Exp $
 
 PROG=	gensetdefs
 NOMAN=	noman
diff --git a/usr.bin/gensetdefs/gensetdefs.c b/usr.bin/gensetdefs/gensetdefs.c
index 7e36992214f7..b60cd6f48bf8 100644
--- a/usr.bin/gensetdefs/gensetdefs.c
+++ b/usr.bin/gensetdefs/gensetdefs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/gensetdefs/gensetdefs.c,v 1.1.2.1 1999/08/29 15:28:21 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/getopt/Makefile b/usr.bin/getopt/Makefile
index 5d01b3d705c2..334e684f7b4f 100644
--- a/usr.bin/getopt/Makefile
+++ b/usr.bin/getopt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/getopt/Makefile,v 1.1.10.1 1999/08/29 15:28:23 peter Exp $
 #
 
 PROG = getopt
diff --git a/usr.bin/getopt/getopt.1 b/usr.bin/getopt/getopt.1
index 80e51d7079de..e1b5f1a181a4 100644
--- a/usr.bin/getopt/getopt.1
+++ b/usr.bin/getopt/getopt.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/getopt/getopt.1,v 1.4.4.2 1999/09/18 15:53:26 phantom Exp $
 .\"
 .Dd April 3, 1999
 .Dt GETOPT 1
diff --git a/usr.bin/global/Makefile b/usr.bin/global/Makefile
index a37a2f967cda..688dc76f13d0 100644
--- a/usr.bin/global/Makefile
+++ b/usr.bin/global/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/global/Makefile,v 1.3.2.1 1999/08/29 15:28:24 peter Exp $
 
 SUBDIR= lib global gtags gctags btreeop htags systags
 
diff --git a/usr.bin/global/Makefile.inc b/usr.bin/global/Makefile.inc
index 0e33fa03b8fe..9d120bd8656c 100644
--- a/usr.bin/global/Makefile.inc
+++ b/usr.bin/global/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/global/Makefile.inc,v 1.6.2.1 1999/08/29 15:28:25 peter Exp $
 
 .if !defined(GLOBAL_MAKEFILE_INC_BEEN_HERE)
 
diff --git a/usr.bin/global/btreeop/Makefile b/usr.bin/global/btreeop/Makefile
index da762b8ccbbb..2cd6d4c68537 100644
--- a/usr.bin/global/btreeop/Makefile
+++ b/usr.bin/global/btreeop/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/global/btreeop/Makefile,v 1.5.2.1 1999/08/29 15:28:26 peter Exp $
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/btreeop
diff --git a/usr.bin/global/gctags/Makefile b/usr.bin/global/gctags/Makefile
index 48ae79232d68..65e10d4cf882 100644
--- a/usr.bin/global/gctags/Makefile
+++ b/usr.bin/global/gctags/Makefile
@@ -1,5 +1,5 @@
 
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/global/gctags/Makefile,v 1.5.2.1 1999/08/29 15:28:28 peter Exp $
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/gctags
diff --git a/usr.bin/global/global/Makefile b/usr.bin/global/global/Makefile
index 61c4d092ab73..94d740b77ff4 100644
--- a/usr.bin/global/global/Makefile
+++ b/usr.bin/global/global/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/global/global/Makefile,v 1.5.2.1 1999/08/29 15:28:29 peter Exp $
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/global
diff --git a/usr.bin/global/gtags/Makefile b/usr.bin/global/gtags/Makefile
index ab3fc7624f49..7b02593070c7 100644
--- a/usr.bin/global/gtags/Makefile
+++ b/usr.bin/global/gtags/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/global/gtags/Makefile,v 1.6.2.1 1999/08/29 15:28:30 peter Exp $
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/gtags
diff --git a/usr.bin/global/htags/Makefile b/usr.bin/global/htags/Makefile
index 197d5bb6ad47..e25fa112cc83 100644
--- a/usr.bin/global/htags/Makefile
+++ b/usr.bin/global/htags/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/global/htags/Makefile,v 1.3.2.1 1999/08/29 15:28:31 peter Exp $
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/htags
diff --git a/usr.bin/global/lib/Makefile b/usr.bin/global/lib/Makefile
index ad6b48d8ecdb..81441ae19f04 100644
--- a/usr.bin/global/lib/Makefile
+++ b/usr.bin/global/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/global/lib/Makefile,v 1.3.2.1 1999/08/29 15:28:33 peter Exp $
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/lib
diff --git a/usr.bin/global/systags/Makefile b/usr.bin/global/systags/Makefile
index ed125c424c68..e1641935cdbe 100644
--- a/usr.bin/global/systags/Makefile
+++ b/usr.bin/global/systags/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/global/systags/Makefile,v 1.4.2.1 1999/08/29 15:28:34 peter Exp $
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/systags
diff --git a/usr.bin/gprof/arcs.c b/usr.bin/gprof/arcs.c
index c6e77103e739..b13e74730f20 100644
--- a/usr.bin/gprof/arcs.c
+++ b/usr.bin/gprof/arcs.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)arcs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/gprof/arcs.c,v 1.5.2.1 1999/08/29 15:28:36 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/gprof/gprof.c b/usr.bin/gprof/gprof.c
index e778bac04dca..6ee74cecb948 100644
--- a/usr.bin/gprof/gprof.c
+++ b/usr.bin/gprof/gprof.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)gprof.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/gprof/gprof.c,v 1.8.2.1 1999/08/29 15:28:36 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/gprof/printgprof.c b/usr.bin/gprof/printgprof.c
index 0fb74f44ce98..606d964a4c87 100644
--- a/usr.bin/gprof/printgprof.c
+++ b/usr.bin/gprof/printgprof.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)printgprof.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/gprof/printgprof.c,v 1.5.2.1 1999/08/29 15:28:37 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/gprof/printlist.c b/usr.bin/gprof/printlist.c
index c77b19fa008b..c82b18db7da3 100644
--- a/usr.bin/gprof/printlist.c
+++ b/usr.bin/gprof/printlist.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)printlist.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/gprof/printlist.c,v 1.2.2.1 1999/08/29 15:28:38 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/head/head.c b/usr.bin/head/head.c
index e93896bc3ef0..71d8b8279232 100644
--- a/usr.bin/head/head.c
+++ b/usr.bin/head/head.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)head.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/head/head.c,v 1.9.2.1 1999/08/29 15:28:39 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/hexdump/display.c b/usr.bin/hexdump/display.c
index 2d3bdcbd964a..9a3708e1d3ff 100644
--- a/usr.bin/hexdump/display.c
+++ b/usr.bin/hexdump/display.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)display.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/hexdump/display.c,v 1.3.2.1 1999/08/29 15:28:40 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/hexdump/hexdump.1 b/usr.bin/hexdump/hexdump.1
index 71a8caa9d7f2..e3f4386386f6 100644
--- a/usr.bin/hexdump/hexdump.1
+++ b/usr.bin/hexdump/hexdump.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hexdump.1	8.2 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/hexdump/hexdump.1,v 1.7.2.2 1999/09/20 09:49:56 phantom Exp $
 .\"
 .Dd April 18, 1994
 .Dt HEXDUMP 1
diff --git a/usr.bin/hexdump/hexdump.c b/usr.bin/hexdump/hexdump.c
index c8ce78de8c3a..2e03d54feff3 100644
--- a/usr.bin/hexdump/hexdump.c
+++ b/usr.bin/hexdump/hexdump.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)hexdump.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/hexdump/hexdump.c,v 1.3.2.1 1999/08/29 15:28:42 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/hexdump/hexsyntax.c b/usr.bin/hexdump/hexsyntax.c
index f3bf5878dafe..d5b243e9aa57 100644
--- a/usr.bin/hexdump/hexsyntax.c
+++ b/usr.bin/hexdump/hexsyntax.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)hexsyntax.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/hexdump/hexsyntax.c,v 1.7.2.1 1999/08/29 15:28:43 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/hexdump/od.1 b/usr.bin/hexdump/od.1
index ba11227cc57d..34251d0c5e4b 100644
--- a/usr.bin/hexdump/od.1
+++ b/usr.bin/hexdump/od.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)od.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/hexdump/od.1,v 1.6.2.2 1999/09/20 09:49:56 phantom Exp $
 .\"
 .Dd May 27, 1994
 .Os
diff --git a/usr.bin/hexdump/odsyntax.c b/usr.bin/hexdump/odsyntax.c
index 2e666c699050..bebe34078b3f 100644
--- a/usr.bin/hexdump/odsyntax.c
+++ b/usr.bin/hexdump/odsyntax.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)odsyntax.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/hexdump/odsyntax.c,v 1.6.2.1 1999/08/29 15:28:44 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/hexdump/parse.c b/usr.bin/hexdump/parse.c
index d02cd09a0185..72a31e1537b8 100644
--- a/usr.bin/hexdump/parse.c
+++ b/usr.bin/hexdump/parse.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/hexdump/parse.c,v 1.3.2.1 1999/08/29 15:28:44 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/host/Makefile b/usr.bin/host/Makefile
index a81d9e7562a4..0cf480309d84 100644
--- a/usr.bin/host/Makefile
+++ b/usr.bin/host/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/host/Makefile,v 1.5.2.2 1999/12/13 15:08:19 peter Exp $
 
 USE_LIBBIND=	yes
 .include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
diff --git a/usr.bin/id/groups.sh b/usr.bin/id/groups.sh
index b6350be8057e..790772a6f635 100644
--- a/usr.bin/id/groups.sh
+++ b/usr.bin/id/groups.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)groups.sh	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/id/groups.sh,v 1.5.2.1 1999/08/29 15:28:46 peter Exp $
 
 PATH=/bin:/usr/bin; export PATH
 
diff --git a/usr.bin/id/id.1 b/usr.bin/id/id.1
index 7205976faf1e..75f8665be13e 100644
--- a/usr.bin/id/id.1
+++ b/usr.bin/id/id.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)id.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/id/id.1,v 1.5.2.2 1999/09/04 16:06:08 chris Exp $
 .\"
 .Dd June 6, 1993
 .Dt ID 1
diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c
index 21ae9ed69e24..b6461f609008 100644
--- a/usr.bin/id/id.c
+++ b/usr.bin/id/id.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)id.c	8.2 (Berkeley) 2/16/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/id/id.c,v 1.7.2.2 1999/09/04 16:06:09 chris Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/id/whoami.sh b/usr.bin/id/whoami.sh
index 9b18bac19953..29d5b3d203f4 100644
--- a/usr.bin/id/whoami.sh
+++ b/usr.bin/id/whoami.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)whoami.sh	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/id/whoami.sh,v 1.5.2.1 1999/08/29 15:28:48 peter Exp $
 
 PATH=/bin:/usr/bin; export PATH
 
diff --git a/usr.bin/indent/args.c b/usr.bin/indent/args.c
index 7a646c0fcfd9..b3382931eb9d 100644
--- a/usr.bin/indent/args.c
+++ b/usr.bin/indent/args.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)args.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/indent/args.c,v 1.2.2.1 1999/08/29 15:28:50 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/indent/indent.c b/usr.bin/indent/indent.c
index bc014c5d3d40..e42082870d56 100644
--- a/usr.bin/indent/indent.c
+++ b/usr.bin/indent/indent.c
@@ -46,7 +46,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)indent.c	5.17 (Berkeley) 6/7/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/indent/indent.c,v 1.3.2.1 1999/08/29 15:28:51 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/indent/io.c b/usr.bin/indent/io.c
index 1668b2fbe502..734e77213b64 100644
--- a/usr.bin/indent/io.c
+++ b/usr.bin/indent/io.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)io.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/indent/io.c,v 1.3.2.1 1999/08/29 15:28:52 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/ipcrm/Makefile b/usr.bin/ipcrm/Makefile
index 9c0e45c0702c..79ad371bd148 100644
--- a/usr.bin/ipcrm/Makefile
+++ b/usr.bin/ipcrm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ipcrm/Makefile,v 1.3.2.1 1999/08/29 15:28:53 peter Exp $
 
 PROG=	ipcrm
 
diff --git a/usr.bin/ipcrm/ipcrm.1 b/usr.bin/ipcrm/ipcrm.1
index 78e4054a02fc..f9f5e4d70632 100644
--- a/usr.bin/ipcrm/ipcrm.1
+++ b/usr.bin/ipcrm/ipcrm.1
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ipcrm/ipcrm.1,v 1.5.2.2 1999/08/29 15:28:53 peter Exp $
 .\""
 .Dd August 8, 1994
 .Dt IPCRM 1
diff --git a/usr.bin/ipcrm/ipcrm.c b/usr.bin/ipcrm/ipcrm.c
index b52100f632bc..5d1a13fc3533 100644
--- a/usr.bin/ipcrm/ipcrm.c
+++ b/usr.bin/ipcrm/ipcrm.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ipcrm/ipcrm.c,v 1.5.2.1 1999/08/29 15:28:54 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/ipcs/Makefile b/usr.bin/ipcs/Makefile
index 665371074767..1c28ee80efd8 100644
--- a/usr.bin/ipcs/Makefile
+++ b/usr.bin/ipcs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ipcs/Makefile,v 1.4.2.1 1999/08/29 15:28:54 peter Exp $
 
 PROG=	ipcs
 BINGRP=	kmem
diff --git a/usr.bin/ipcs/ipcs.1 b/usr.bin/ipcs/ipcs.1
index b52961465f65..e84d9a492a27 100644
--- a/usr.bin/ipcs/ipcs.1
+++ b/usr.bin/ipcs/ipcs.1
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ipcs/ipcs.1,v 1.8.2.1 1999/08/29 15:28:55 peter Exp $
 .\"
 .Dd June 18, 1994
 .Dt "IPCS" 1
diff --git a/usr.bin/ipcs/ipcs.c b/usr.bin/ipcs/ipcs.c
index a752e6cbf360..fd65ef7b9ea4 100644
--- a/usr.bin/ipcs/ipcs.c
+++ b/usr.bin/ipcs/ipcs.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ipcs/ipcs.c,v 1.10.2.1 1999/08/29 15:28:56 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c
index dc7455036d5c..2489837194b3 100644
--- a/usr.bin/join/join.c
+++ b/usr.bin/join/join.c
@@ -46,7 +46,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)join.c	8.6 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/join/join.c,v 1.8.2.1 1999/08/29 15:28:57 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/jot/jot.1 b/usr.bin/jot/jot.1
index d8419c71b0c0..7ab344ba8d03 100644
--- a/usr.bin/jot/jot.1
+++ b/usr.bin/jot/jot.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)jot.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/jot/jot.1,v 1.3.2.2 1999/08/29 15:28:58 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt JOT 1
diff --git a/usr.bin/jot/jot.c b/usr.bin/jot/jot.c
index 12b5998cac94..55216fa6521d 100644
--- a/usr.bin/jot/jot.c
+++ b/usr.bin/jot/jot.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)jot.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/jot/jot.c,v 1.8.2.3 1999/08/29 15:28:59 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/kdump/kdump.1 b/usr.bin/kdump/kdump.1
index b4df3ebb698b..4744b5e4a744 100644
--- a/usr.bin/kdump/kdump.1
+++ b/usr.bin/kdump/kdump.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)kdump.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/kdump/kdump.1,v 1.4.2.1 1999/08/29 15:29:01 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt KDUMP 1
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index f0ee9f039924..98f72b28b835 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)kdump.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/kdump/kdump.c,v 1.11.2.2 1999/08/29 15:29:02 peter Exp $";
 #endif /* not lint */
 
 #define KERNEL
diff --git a/usr.bin/key/key.1 b/usr.bin/key/key.1
index a20dd419d558..d90d5770da49 100644
--- a/usr.bin/key/key.1
+++ b/usr.bin/key/key.1
@@ -1,5 +1,5 @@
 .\"	from: @(#)key.1	1.0 (Bellcore) 12/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/key/key.1,v 1.4.2.1 1999/08/29 15:29:03 peter Exp $
 .\"
 .Dd December 2, 1991
 .Dt KEY 1
diff --git a/usr.bin/keyinfo/keyinfo.1 b/usr.bin/keyinfo/keyinfo.1
index 775043736354..227f042fd259 100644
--- a/usr.bin/keyinfo/keyinfo.1
+++ b/usr.bin/keyinfo/keyinfo.1
@@ -1,5 +1,5 @@
 .\"	from: @(#)keyinfo.1	1.1 (Bellcore) 7/20/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/keyinfo/keyinfo.1,v 1.6.2.1 1999/08/29 15:29:04 peter Exp $
 .\"
 .Dd April 26, 1996
 .Dt KEYINFO 1
diff --git a/usr.bin/keyinfo/keyinfo.pl b/usr.bin/keyinfo/keyinfo.pl
index 8316c5896505..92cb61396fee 100644
--- a/usr.bin/keyinfo/keyinfo.pl
+++ b/usr.bin/keyinfo/keyinfo.pl
@@ -3,7 +3,7 @@
 # Search /etc/skeykeys for the skey string for this user OR user specified
 # in 1st parameter.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/keyinfo/keyinfo.pl,v 1.3.2.1 1999/08/29 15:29:05 peter Exp $
 #
 
 die "usage: keyinfo [user]\n" unless $#ARGV < 1;
diff --git a/usr.bin/keylogin/Makefile b/usr.bin/keylogin/Makefile
index bf279eb25b22..82b66d84dacc 100644
--- a/usr.bin/keylogin/Makefile
+++ b/usr.bin/keylogin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/keylogin/Makefile,v 1.2.2.1 1999/08/29 15:29:06 peter Exp $
 
 PROG=	keylogin
 
diff --git a/usr.bin/keylogout/Makefile b/usr.bin/keylogout/Makefile
index cc433e444669..15c5dc6e7286 100644
--- a/usr.bin/keylogout/Makefile
+++ b/usr.bin/keylogout/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/keylogout/Makefile,v 1.2.2.1 1999/08/29 15:29:08 peter Exp $
 
 PROG=	keylogout
 
diff --git a/usr.bin/keylogout/keylogout.c b/usr.bin/keylogout/keylogout.c
index d5276d2e168f..82b93afbff7c 100644
--- a/usr.bin/keylogout/keylogout.c
+++ b/usr.bin/keylogout/keylogout.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/keylogout/keylogout.c,v 1.2.2.1 1999/08/29 15:29:08 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/killall/killall.1 b/usr.bin/killall/killall.1
index c7b3c3e0feb2..f0a49efbb42f 100644
--- a/usr.bin/killall/killall.1
+++ b/usr.bin/killall/killall.1
@@ -22,7 +22,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/killall/killall.1,v 1.10.2.1 1999/08/29 15:29:09 peter Exp $
 .\"
 .Dd June 25, 1995
 .Os FreeBSD 2.2 
diff --git a/usr.bin/killall/killall.pl b/usr.bin/killall/killall.pl
index 6238c7b49668..822b123d1a48 100755
--- a/usr.bin/killall/killall.pl
+++ b/usr.bin/killall/killall.pl
@@ -26,7 +26,7 @@
 #
 # killall - kill processes by name
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/killall/killall.pl,v 1.11.2.1 1999/08/29 15:29:10 peter Exp $
 
 
 $ENV{'PATH'} = '/bin:/usr/bin'; # security
diff --git a/usr.bin/ktrace/Makefile b/usr.bin/ktrace/Makefile
index c00bb7510459..f9c3599e6708 100644
--- a/usr.bin/ktrace/Makefile
+++ b/usr.bin/ktrace/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	1.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ktrace/Makefile,v 1.5.2.1 1999/08/29 15:29:11 peter Exp $
 
 PROG=	ktrace
 SRCS=	ktrace.c subr.c
diff --git a/usr.bin/ktrace/ktrace.1 b/usr.bin/ktrace/ktrace.1
index 20a461a39410..9902e51e546e 100644
--- a/usr.bin/ktrace/ktrace.1
+++ b/usr.bin/ktrace/ktrace.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ktrace.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ktrace/ktrace.1,v 1.7.2.1 1999/08/29 15:29:11 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt KTRACE 1
diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c
index 1c5a98ba6796..4fabeb8a1d50 100644
--- a/usr.bin/ktrace/ktrace.c
+++ b/usr.bin/ktrace/ktrace.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)ktrace.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ktrace/ktrace.c,v 1.11.2.1 1999/08/29 15:29:12 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c
index 4e4b3bf466a5..c8f2e5ab4f75 100644
--- a/usr.bin/ktrace/subr.c
+++ b/usr.bin/ktrace/subr.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)subr.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ktrace/subr.c,v 1.5.2.1 1999/08/29 15:29:13 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/kzip/Makefile b/usr.bin/kzip/Makefile
index 8ff6f7f09623..e8b955863c6d 100644
--- a/usr.bin/kzip/Makefile
+++ b/usr.bin/kzip/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/kzip/Makefile,v 1.5.2.1 1999/08/29 15:29:14 peter Exp $
 
 PROG=	kzip
 MAN8=	kzip.8
diff --git a/usr.bin/kzip/kzip.8 b/usr.bin/kzip/kzip.8
index a966d365f314..df7d48b09036 100644
--- a/usr.bin/kzip/kzip.8
+++ b/usr.bin/kzip/kzip.8
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/kzip/kzip.8,v 1.5.2.2 1999/08/29 15:29:14 peter Exp $
 .\"
 .Dd August 15, 1996
 .Os
diff --git a/usr.bin/kzip/kzip.c b/usr.bin/kzip/kzip.c
index 430dcc39f619..b1dc3987af5b 100644
--- a/usr.bin/kzip/kzip.c
+++ b/usr.bin/kzip/kzip.c
@@ -13,7 +13,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/kzip/kzip.c,v 1.12.2.1 1999/08/29 15:29:15 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/lam/lam.c b/usr.bin/lam/lam.c
index 277081095af7..761deeb0987a 100644
--- a/usr.bin/lam/lam.c
+++ b/usr.bin/lam/lam.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)lam.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/lam/lam.c,v 1.2.2.1 1999/08/29 15:29:16 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/lastcomm/lastcomm.1 b/usr.bin/lastcomm/lastcomm.1
index 33248e24b3c7..51670589b22e 100644
--- a/usr.bin/lastcomm/lastcomm.1
+++ b/usr.bin/lastcomm/lastcomm.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)lastcomm.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/lastcomm/lastcomm.1,v 1.6.2.1 1999/08/29 15:29:17 peter Exp $
 .\"
 .Dd September 18, 1996
 .Dt LASTCOMM 1
diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c
index 4beed143c977..71f798c7d962 100644
--- a/usr.bin/lastcomm/lastcomm.c
+++ b/usr.bin/lastcomm/lastcomm.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)lastcomm.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/lastcomm/lastcomm.c,v 1.9.2.1 1999/08/29 15:29:18 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ldd/Makefile b/usr.bin/ldd/Makefile
index d7cd01069682..a65d628a620f 100644
--- a/usr.bin/ldd/Makefile
+++ b/usr.bin/ldd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ldd/Makefile,v 1.10.2.1 1999/08/29 15:29:19 peter Exp $
 
 PROG=		ldd
 SRCS=		ldd.c
diff --git a/usr.bin/ldd/ldd.c b/usr.bin/ldd/ldd.c
index d565d607102f..9ecd1262259d 100644
--- a/usr.bin/ldd/ldd.c
+++ b/usr.bin/ldd/ldd.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/ldd/ldd.c,v 1.17.2.1 1999/08/29 15:29:20 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/ldd/sods.c b/usr.bin/ldd/sods.c
index a41afaa63c13..7d909bf98c76 100644
--- a/usr.bin/ldd/sods.c
+++ b/usr.bin/ldd/sods.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/ldd/sods.c,v 1.8.2.1 1999/08/29 15:29:21 peter Exp $
  */
 
 #include <assert.h>
diff --git a/usr.bin/leave/Makefile b/usr.bin/leave/Makefile
index eacf6f1e021d..fd59f657beae 100644
--- a/usr.bin/leave/Makefile
+++ b/usr.bin/leave/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/leave/Makefile,v 1.2.2.1 1999/08/29 15:29:22 peter Exp $
 
 PROG=	leave
 CFLAGS+=-Wall
diff --git a/usr.bin/leave/leave.c b/usr.bin/leave/leave.c
index d76465531fa4..dd0f550876d4 100644
--- a/usr.bin/leave/leave.c
+++ b/usr.bin/leave/leave.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)leave.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/leave/leave.c,v 1.4.2.1 1999/08/29 15:29:23 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/lex/FlexLexer.h b/usr.bin/lex/FlexLexer.h
index 52c656f4706d..f478dbb31f0e 100644
--- a/usr.bin/lex/FlexLexer.h
+++ b/usr.bin/lex/FlexLexer.h
@@ -1,4 +1,4 @@
-// $FreeBSD$
+// $FreeBSD: src/usr.bin/lex/FlexLexer.h,v 1.1.1.2.4.1 1999/08/29 15:29:24 peter Exp $
 
 // FlexLexer.h -- define interfaces for lexical analyzer classes generated
 //		  by flex
diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile
index 855da64da498..5cebe4b64d17 100644
--- a/usr.bin/lex/Makefile
+++ b/usr.bin/lex/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lex/Makefile,v 1.12.2.1 1999/08/29 15:29:25 peter Exp $
 #
 # By default, flex will be configured to generate 8-bit scanners only if the
 # -8 flag is given.  If you want it to always generate 8-bit scanners, add
diff --git a/usr.bin/lex/ccl.c b/usr.bin/lex/ccl.c
index 243e739fa651..c7ccb8288986 100644
--- a/usr.bin/lex/ccl.c
+++ b/usr.bin/lex/ccl.c
@@ -26,7 +26,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/ccl.c,v 1.3.4.1 1999/08/29 15:29:25 peter Exp $ */
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/config.h b/usr.bin/lex/config.h
index 2e0b5b43747b..475dbd332876 100644
--- a/usr.bin/lex/config.h
+++ b/usr.bin/lex/config.h
@@ -1,5 +1,5 @@
 /* config.h.  Generated automatically by configure.  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/config.h,v 1.2.4.1 1999/08/29 15:29:26 peter Exp $ */
 
 /* Define to empty if the keyword does not work.  */
 /* #undef const */
diff --git a/usr.bin/lex/dfa.c b/usr.bin/lex/dfa.c
index 8b023cbba50b..3c583ae6f34d 100644
--- a/usr.bin/lex/dfa.c
+++ b/usr.bin/lex/dfa.c
@@ -26,7 +26,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/dfa.c,v 1.3.4.1 1999/08/29 15:29:26 peter Exp $ */
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/ecs.c b/usr.bin/lex/ecs.c
index fa7206a2adfa..c25e4e3df559 100644
--- a/usr.bin/lex/ecs.c
+++ b/usr.bin/lex/ecs.c
@@ -26,7 +26,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/ecs.c,v 1.3.4.1 1999/08/29 15:29:27 peter Exp $ */
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/flex.skl b/usr.bin/lex/flex.skl
index 589b1b2b60ba..a7863b49cc05 100644
--- a/usr.bin/lex/flex.skl
+++ b/usr.bin/lex/flex.skl
@@ -1,7 +1,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/lex/flex.skl,v 1.2.2.1 1999/08/29 15:29:27 peter Exp $
  */
 
 #define FLEX_SCANNER
diff --git a/usr.bin/lex/flexdef.h b/usr.bin/lex/flexdef.h
index 62ccf3c09232..61a5e1df1e86 100644
--- a/usr.bin/lex/flexdef.h
+++ b/usr.bin/lex/flexdef.h
@@ -26,7 +26,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* @(#) $FreeBSD$ (LBL) */
+/* @(#) $FreeBSD: src/usr.bin/lex/flexdef.h,v 1.3.4.1 1999/08/29 15:29:28 peter Exp $ (LBL) */
 
 #include <stdio.h>
 #include <ctype.h>
diff --git a/usr.bin/lex/gen.c b/usr.bin/lex/gen.c
index c0efadf29d8d..27fb4032441e 100644
--- a/usr.bin/lex/gen.c
+++ b/usr.bin/lex/gen.c
@@ -26,7 +26,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/gen.c,v 1.3.4.1 1999/08/29 15:29:29 peter Exp $ */
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/initscan.c b/usr.bin/lex/initscan.c
index 6ccb56e7a343..4b63e5f9fa05 100644
--- a/usr.bin/lex/initscan.c
+++ b/usr.bin/lex/initscan.c
@@ -2,7 +2,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/lex/initscan.c,v 1.4.2.1 1999/08/29 15:29:30 peter Exp $
  */
 
 #define FLEX_SCANNER
@@ -1270,7 +1270,7 @@ char *yytext;
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/initscan.c,v 1.4.2.1 1999/08/29 15:29:30 peter Exp $ */
 
 #include "flexdef.h"
 #include "parse.h"
diff --git a/usr.bin/lex/lib/Makefile b/usr.bin/lex/lib/Makefile
index 0091cc2747bc..c6d4b46b275c 100644
--- a/usr.bin/lex/lib/Makefile
+++ b/usr.bin/lex/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lex/lib/Makefile,v 1.6.2.1 1999/08/29 15:29:37 peter Exp $
 
 LIB=    ln
 SRCS=   libmain.c libyywrap.c
diff --git a/usr.bin/lex/lib/libmain.c b/usr.bin/lex/lib/libmain.c
index 0bcdbfc73929..2574d04b1fc9 100644
--- a/usr.bin/lex/lib/libmain.c
+++ b/usr.bin/lex/lib/libmain.c
@@ -1,6 +1,6 @@
 /* libmain - flex run-time support library "main" function */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/lib/libmain.c,v 1.1.1.2.4.1 1999/08/29 15:29:39 peter Exp $ */
 
 extern int yylex();
 
diff --git a/usr.bin/lex/lib/libyywrap.c b/usr.bin/lex/lib/libyywrap.c
index 3618f8d08ee2..300e3b0d22bf 100644
--- a/usr.bin/lex/lib/libyywrap.c
+++ b/usr.bin/lex/lib/libyywrap.c
@@ -1,6 +1,6 @@
 /* libyywrap - flex run-time support library "yywrap" function */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/lib/libyywrap.c,v 1.2.4.1 1999/08/29 15:29:39 peter Exp $ */
 
 int yywrap()
 	{
diff --git a/usr.bin/lex/main.c b/usr.bin/lex/main.c
index 2c7836d5b009..530ff73a6c95 100644
--- a/usr.bin/lex/main.c
+++ b/usr.bin/lex/main.c
@@ -32,7 +32,7 @@ char copyright[] =
  All rights reserved.\n";
 #endif /* not lint */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/main.c,v 1.5.2.1 1999/08/29 15:29:31 peter Exp $ */
 
 
 #include "flexdef.h"
diff --git a/usr.bin/lex/misc.c b/usr.bin/lex/misc.c
index 54ca3a4bb2e8..f79e089cd61f 100644
--- a/usr.bin/lex/misc.c
+++ b/usr.bin/lex/misc.c
@@ -26,7 +26,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/misc.c,v 1.3.4.1 1999/08/29 15:29:31 peter Exp $ */
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/nfa.c b/usr.bin/lex/nfa.c
index c0cb5426f737..aac666da561f 100644
--- a/usr.bin/lex/nfa.c
+++ b/usr.bin/lex/nfa.c
@@ -26,7 +26,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/nfa.c,v 1.3.4.1 1999/08/29 15:29:32 peter Exp $ */
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/parse.y b/usr.bin/lex/parse.y
index d98d0324720a..66a3a26fae6a 100644
--- a/usr.bin/lex/parse.y
+++ b/usr.bin/lex/parse.y
@@ -33,7 +33,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/parse.y,v 1.1.1.2.4.1 1999/08/29 15:29:32 peter Exp $ */
 
 
 /* Some versions of bison are broken in that they use alloca() but don't
diff --git a/usr.bin/lex/scan.l b/usr.bin/lex/scan.l
index c13c6f7d3052..89c348622f0e 100644
--- a/usr.bin/lex/scan.l
+++ b/usr.bin/lex/scan.l
@@ -27,7 +27,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/scan.l,v 1.3.2.1 1999/08/29 15:29:33 peter Exp $ */
 
 #include "flexdef.h"
 #include "parse.h"
diff --git a/usr.bin/lex/skel.c b/usr.bin/lex/skel.c
index 42dfcc155b2f..f222efae5e8a 100644
--- a/usr.bin/lex/skel.c
+++ b/usr.bin/lex/skel.c
@@ -6,7 +6,7 @@ const char *skel[] = {
   "/* A lexical scanner generated by flex */",
   "",
   "/* Scanner skeleton version:",
-  " * $FreeBSD$",
+  " * $FreeBSD: src/usr.bin/lex/skel.c,v 1.2.2.1 1999/08/29 15:29:33 peter Exp $",
   " */",
   "",
   "#define FLEX_SCANNER",
diff --git a/usr.bin/lex/sym.c b/usr.bin/lex/sym.c
index f287e906974a..f5a68a90e479 100644
--- a/usr.bin/lex/sym.c
+++ b/usr.bin/lex/sym.c
@@ -26,7 +26,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/sym.c,v 1.3.4.1 1999/08/29 15:29:34 peter Exp $ */
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/tblcmp.c b/usr.bin/lex/tblcmp.c
index 8668a75a3631..95275c3b4af0 100644
--- a/usr.bin/lex/tblcmp.c
+++ b/usr.bin/lex/tblcmp.c
@@ -26,7 +26,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/tblcmp.c,v 1.3.4.1 1999/08/29 15:29:35 peter Exp $ */
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/yylex.c b/usr.bin/lex/yylex.c
index 03fbf568f85d..5e8d40f6342e 100644
--- a/usr.bin/lex/yylex.c
+++ b/usr.bin/lex/yylex.c
@@ -26,7 +26,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/yylex.c,v 1.3.4.1 1999/08/29 15:29:36 peter Exp $ */
 
 #include <ctype.h>
 #include "flexdef.h"
diff --git a/usr.bin/limits/limits.1 b/usr.bin/limits/limits.1
index 258dc55b3708..3da0adfe3ffe 100644
--- a/usr.bin/limits/limits.1
+++ b/usr.bin/limits/limits.1
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/limits/limits.1,v 1.8.2.3 1999/08/29 15:29:41 peter Exp $
 .\"
 .Dd January 15, 1996
 .Dt LIMITS 1
diff --git a/usr.bin/limits/limits.c b/usr.bin/limits/limits.c
index b9de9a4c9cd7..a145c557ef9f 100644
--- a/usr.bin/limits/limits.c
+++ b/usr.bin/limits/limits.c
@@ -20,7 +20,7 @@
  *
  * Display/change(+runprogram)/eval resource limits.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/limits/limits.c,v 1.5.2.1 1999/08/29 15:29:41 peter Exp $
  */
 
 #include <err.h>
diff --git a/usr.bin/locate/Makefile b/usr.bin/locate/Makefile
index 1d495e420ece..c999f3b06326 100644
--- a/usr.bin/locate/Makefile
+++ b/usr.bin/locate/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/Makefile,v 1.4.2.2 1999/08/29 15:29:42 peter Exp $
 
 MAINTAINER= wosch
 
diff --git a/usr.bin/locate/Makefile.inc b/usr.bin/locate/Makefile.inc
index 48174083d848..da38980e8311 100644
--- a/usr.bin/locate/Makefile.inc
+++ b/usr.bin/locate/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/Makefile.inc,v 1.3.2.1 1999/08/29 15:29:43 peter Exp $
 
 LIBEXECDIR?=	/usr/libexec
diff --git a/usr.bin/locate/bigram/Makefile b/usr.bin/locate/bigram/Makefile
index e0018d89b7fd..e8b76c6a9420 100644
--- a/usr.bin/locate/bigram/Makefile
+++ b/usr.bin/locate/bigram/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/bigram/Makefile,v 1.3.2.1 1999/08/29 15:29:45 peter Exp $
 
 PROG=	locate.bigram
 NOMAN=	noman
diff --git a/usr.bin/locate/bigram/locate.bigram.c b/usr.bin/locate/bigram/locate.bigram.c
index 137b590697ae..a2603491b983 100644
--- a/usr.bin/locate/bigram/locate.bigram.c
+++ b/usr.bin/locate/bigram/locate.bigram.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/locate/bigram/locate.bigram.c,v 1.10.2.1 1999/08/29 15:29:45 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/locate/code/Makefile b/usr.bin/locate/code/Makefile
index fb1fb510e59a..cdab928bc241 100644
--- a/usr.bin/locate/code/Makefile
+++ b/usr.bin/locate/code/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/code/Makefile,v 1.3.2.1 1999/08/29 15:29:46 peter Exp $
 
 PROG=	locate.code
 CFLAGS+=-I${.CURDIR}/../locate 
diff --git a/usr.bin/locate/code/locate.code.c b/usr.bin/locate/code/locate.code.c
index c7cb09715fb4..80640d44b4dd 100644
--- a/usr.bin/locate/code/locate.code.c
+++ b/usr.bin/locate/code/locate.code.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/locate/code/locate.code.c,v 1.10.2.1 1999/08/29 15:29:47 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/locate/locate/Makefile b/usr.bin/locate/locate/Makefile
index 064cf08a52be..eff5fda30553 100644
--- a/usr.bin/locate/locate/Makefile
+++ b/usr.bin/locate/locate/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/locate/Makefile,v 1.10.2.1 1999/08/29 15:29:48 peter Exp $
 
 PROG=	locate
 SRCS=	util.c locate.c
diff --git a/usr.bin/locate/locate/concatdb.sh b/usr.bin/locate/locate/concatdb.sh
index 75c683246ca4..a7b6469d5987 100644
--- a/usr.bin/locate/locate/concatdb.sh
+++ b/usr.bin/locate/locate/concatdb.sh
@@ -30,7 +30,7 @@
 #
 # Sequence of databases is important.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/locate/concatdb.sh,v 1.8.2.1 1999/08/29 15:29:49 peter Exp $
 
 # The directory containing locate subprograms
 : ${LIBEXECDIR:=/usr/libexec}; export LIBEXECDIR
diff --git a/usr.bin/locate/locate/fastfind.c b/usr.bin/locate/locate/fastfind.c
index 68f8a86d2b2b..4a05d0e07426 100644
--- a/usr.bin/locate/locate/fastfind.c
+++ b/usr.bin/locate/locate/fastfind.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/locate/locate/fastfind.c,v 1.11.2.1 1999/08/29 15:29:49 peter Exp $
  */
 
 
diff --git a/usr.bin/locate/locate/locate.1 b/usr.bin/locate/locate/locate.1
index e4cffa873aa3..186c3a6b5bf2 100644
--- a/usr.bin/locate/locate/locate.1
+++ b/usr.bin/locate/locate/locate.1
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)locate.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/locate/locate/locate.1,v 1.11.2.1 1999/08/29 15:29:50 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt LOCATE 1
diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c
index a0ffe0dbdcc0..59722183ac09 100644
--- a/usr.bin/locate/locate/locate.c
+++ b/usr.bin/locate/locate/locate.c
@@ -47,7 +47,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)locate.c    8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/locate/locate/locate.c,v 1.11.2.1 1999/08/29 15:29:51 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/locate/locate/locate.h b/usr.bin/locate/locate/locate.h
index 24df8d4002be..bff87074810b 100644
--- a/usr.bin/locate/locate/locate.h
+++ b/usr.bin/locate/locate/locate.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)locate.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/locate/locate/locate.h,v 1.6.2.1 1999/08/29 15:29:51 peter Exp $
  */
 
 /* Symbolic constants shared by locate.c and code.c */
diff --git a/usr.bin/locate/locate/locate.rc b/usr.bin/locate/locate/locate.rc
index 57835b363a3c..0c847ac305a4 100644
--- a/usr.bin/locate/locate/locate.rc
+++ b/usr.bin/locate/locate/locate.rc
@@ -1,7 +1,7 @@
 #
 # /etc/locate.rc -  command script for updatedb(8)
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/locate/locate.rc,v 1.7.2.1 1999/08/29 15:29:52 peter Exp $
 
 #
 # All commented values are the defaults
diff --git a/usr.bin/locate/locate/mklocatedb.sh b/usr.bin/locate/locate/mklocatedb.sh
index 4df3afa1386f..7bb728643b59 100644
--- a/usr.bin/locate/locate/mklocatedb.sh
+++ b/usr.bin/locate/locate/mklocatedb.sh
@@ -28,7 +28,7 @@
 # 
 # usage: mklocatedb [-presort] < filelist > database
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/locate/mklocatedb.sh,v 1.8.2.1 1999/08/29 15:29:52 peter Exp $
 
 # The directory containing locate subprograms
 : ${LIBEXECDIR:=/usr/libexec}; export LIBEXECDIR
diff --git a/usr.bin/locate/locate/updatedb.sh b/usr.bin/locate/locate/updatedb.sh
index fbf1e61b0a49..ef432bd94d50 100644
--- a/usr.bin/locate/locate/updatedb.sh
+++ b/usr.bin/locate/locate/updatedb.sh
@@ -26,7 +26,7 @@
 #
 # updatedb - update locate database for local mounted filesystems
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/locate/updatedb.sh,v 1.12.2.3 1999/08/29 15:29:53 peter Exp $
 
 : ${LOCATE_CONFIG="/etc/locate.rc"}
 if [ -f "$LOCATE_CONFIG" -a -r "$LOCATE_CONFIG" ]; then
diff --git a/usr.bin/locate/locate/util.c b/usr.bin/locate/locate/util.c
index 38fe284a80f8..0ea00210c889 100644
--- a/usr.bin/locate/locate/util.c
+++ b/usr.bin/locate/locate/util.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/locate/locate/util.c,v 1.5.2.1 1999/08/29 15:29:53 peter Exp $
  */
 
 
diff --git a/usr.bin/lock/lock.c b/usr.bin/lock/lock.c
index d5b60ae10da1..772d24037499 100644
--- a/usr.bin/lock/lock.c
+++ b/usr.bin/lock/lock.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)lock.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/lock/lock.c,v 1.5.2.1 1999/08/29 15:29:56 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/lockf/Makefile b/usr.bin/lockf/Makefile
index 77d89c45bbdf..3d1c27afbfda 100644
--- a/usr.bin/lockf/Makefile
+++ b/usr.bin/lockf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lockf/Makefile,v 1.3.2.1 1999/08/29 15:29:57 peter Exp $
 
 PROG=	lockf
 CFLAGS+=-Wall
diff --git a/usr.bin/lockf/lockf.1 b/usr.bin/lockf/lockf.1
index e4fc80eb93dc..8ac1d361c082 100644
--- a/usr.bin/lockf/lockf.1
+++ b/usr.bin/lockf/lockf.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/lockf/lockf.1,v 1.6.2.1 1999/08/29 15:29:57 peter Exp $
 .\"
 .Dd July 7, 1998
 .Os FreeBSD
diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c
index 0a91048cafc4..5721a8436182 100644
--- a/usr.bin/lockf/lockf.c
+++ b/usr.bin/lockf/lockf.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/lockf/lockf.c,v 1.7.2.1 1999/08/29 15:29:58 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/logger/logger.c b/usr.bin/logger/logger.c
index e7be77125506..992d1c1afa61 100644
--- a/usr.bin/logger/logger.c
+++ b/usr.bin/logger/logger.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)logger.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/logger/logger.c,v 1.4.2.1 1999/08/29 15:29:59 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index 2813ccbdfe30..1e0b3f89646a 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -1,5 +1,5 @@
 # From:	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/login/Makefile,v 1.27.2.2 1999/08/29 15:30:00 peter Exp $
 
 PROG=	login
 MAN1=	login.1
diff --git a/usr.bin/login/login.1 b/usr.bin/login/login.1
index 2ee22ef7f0db..bd4d4bc31ed9 100644
--- a/usr.bin/login/login.1
+++ b/usr.bin/login/login.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)login.1	8.2 (Berkeley) 5/5/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/login/login.1,v 1.13.2.2 1999/08/29 15:30:01 peter Exp $
 .\"
 .Dd May 5, 1994
 .Dt LOGIN 1
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index 230842505ce4..081941593fcf 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)login.c	8.4 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/login/login.c,v 1.45.2.1 1999/08/29 15:30:01 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/logname/logname.1 b/usr.bin/logname/logname.1
index e75afcb925ec..c11578fbe6a3 100644
--- a/usr.bin/logname/logname.1
+++ b/usr.bin/logname/logname.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)logname.1	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/logname/logname.1,v 1.4.2.1 1999/08/29 15:30:03 peter Exp $
 .\"
 .Dd June 9, 1993
 .Dt LOGNAME 1
diff --git a/usr.bin/look/look.c b/usr.bin/look/look.c
index ad2f35c4f3bf..2df7313b9273 100644
--- a/usr.bin/look/look.c
+++ b/usr.bin/look/look.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)look.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/look/look.c,v 1.10.2.1 1999/08/29 15:30:04 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/lsvfs/Makefile b/usr.bin/lsvfs/Makefile
index b2b06113e666..83fbf37c709b 100644
--- a/usr.bin/lsvfs/Makefile
+++ b/usr.bin/lsvfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lsvfs/Makefile,v 1.3.2.1 1999/08/29 15:30:06 peter Exp $
 PROG=	lsvfs
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/lsvfs/lsvfs.1 b/usr.bin/lsvfs/lsvfs.1
index bd075c85db55..66c513416589 100644
--- a/usr.bin/lsvfs/lsvfs.1
+++ b/usr.bin/lsvfs/lsvfs.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/lsvfs/lsvfs.1,v 1.6.2.1 1999/08/29 15:30:06 peter Exp $
 .\" Garrett A. Wollman, September 1994
 .\" This file is in the public domain.
 .\"
diff --git a/usr.bin/lsvfs/lsvfs.c b/usr.bin/lsvfs/lsvfs.c
index cb6a032e634b..08794e357dfc 100644
--- a/usr.bin/lsvfs/lsvfs.c
+++ b/usr.bin/lsvfs/lsvfs.c
@@ -3,7 +3,7 @@
  * Garrett A. Wollman, September 1994
  * This file is in the public domain.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/lsvfs/lsvfs.c,v 1.11.2.2 1999/08/29 15:30:07 peter Exp $
  */
 
 #define _NEW_VFSCONF
diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c
index e863a13cbdff..effff55c509f 100644
--- a/usr.bin/m4/eval.c
+++ b/usr.bin/m4/eval.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)eval.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/m4/eval.c,v 1.9.2.1 1999/08/29 15:30:08 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1
index 3e5551f4e283..362d175f71fe 100644
--- a/usr.bin/m4/m4.1
+++ b/usr.bin/m4/m4.1
@@ -1,5 +1,5 @@
 .\"
-.\"	@(#) $FreeBSD$
+.\"	@(#) $FreeBSD: src/usr.bin/m4/m4.1,v 1.7.2.2 1999/08/29 15:30:09 peter Exp $
 .\"
 .Dd January 26, 1993
 .Dt M4 1
diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c
index 41b7b1385fe9..c7ea153cbbff 100644
--- a/usr.bin/m4/main.c
+++ b/usr.bin/m4/main.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/m4/main.c,v 1.5.2.1 1999/08/29 15:30:09 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c
index 452f849cf4d2..10fc2480175c 100644
--- a/usr.bin/m4/misc.c
+++ b/usr.bin/m4/misc.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/m4/misc.c,v 1.4.2.1 1999/08/29 15:30:11 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1
index a76a19096a1c..19ec7743eb0d 100644
--- a/usr.bin/mail/mail.1
+++ b/usr.bin/mail/mail.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mail.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mail/mail.1,v 1.15.2.2 1999/11/22 10:33:49 jkoshy Exp $
 .\"
 .Dd December 30, 1993
 .Dt MAIL 1
diff --git a/usr.bin/mail/main.c b/usr.bin/mail/main.c
index c28d42574df3..f41bd78aea59 100644
--- a/usr.bin/mail/main.c
+++ b/usr.bin/mail/main.c
@@ -36,7 +36,7 @@ static char copyright[] =
 "@(#) Copyright (c) 1980, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 static const char rcsid[] =
-        "$FreeBSD$";
+        "$FreeBSD: src/usr.bin/mail/main.c,v 1.5.2.1 1999/11/19 00:47:19 jmz Exp $";
 #endif /* not lint */
 
 #ifndef lint
diff --git a/usr.bin/mail/temp.c b/usr.bin/mail/temp.c
index fd14c58e971b..75e136ca692a 100644
--- a/usr.bin/mail/temp.c
+++ b/usr.bin/mail/temp.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)temp.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/mail/temp.c,v 1.5.2.1 1999/08/29 15:30:13 peter Exp $";
 #endif /* not lint */
 
 #include "rcv.h"
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index da2c13dbe108..d02d13334056 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	5.2 (Berkeley) 12/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/make/Makefile,v 1.10.2.1 1999/08/29 15:30:15 peter Exp $
 
 PROG=	make
 CFLAGS+= -I${.CURDIR}
diff --git a/usr.bin/make/PSD.doc/Makefile b/usr.bin/make/PSD.doc/Makefile
index d9f5acd3a47a..8c99a1469cae 100644
--- a/usr.bin/make/PSD.doc/Makefile
+++ b/usr.bin/make/PSD.doc/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/make/PSD.doc/Makefile,v 1.4.2.1 1999/08/29 15:30:34 peter Exp $
 
 DIR=	psd/12.make
 SRCS=	tutorial.ms
diff --git a/usr.bin/make/PSD.doc/tutorial.ms b/usr.bin/make/PSD.doc/tutorial.ms
index d4269ca06488..ae8684acb555 100644
--- a/usr.bin/make/PSD.doc/tutorial.ms
+++ b/usr.bin/make/PSD.doc/tutorial.ms
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tutorial.ms	8.1 (Berkeley) 8/18/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/make/PSD.doc/tutorial.ms,v 1.7.2.1 1999/08/29 15:30:35 peter Exp $
 .\"
 .EH 'PSD:12-%''PMake \*- A Tutorial'
 .OH 'PMake \*- A Tutorial''PSD:12-%'
diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c
index cff79490ef09..5138b6d997ba 100644
--- a/usr.bin/make/arch.c
+++ b/usr.bin/make/arch.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/arch.c,v 1.10.2.3 1999/10/10 20:44:00 julian Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/buf.c b/usr.bin/make/buf.c
index ad186c15b410..9962f28d05ab 100644
--- a/usr.bin/make/buf.c
+++ b/usr.bin/make/buf.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/buf.c,v 1.8.2.1 1999/08/29 15:30:17 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/buf.h b/usr.bin/make/buf.h
index 454cb435b18d..b6a96a4c7893 100644
--- a/usr.bin/make/buf.h
+++ b/usr.bin/make/buf.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)buf.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/buf.h,v 1.7.2.1 1999/08/29 15:30:17 peter Exp $
  */
 
 /*-
diff --git a/usr.bin/make/compat.c b/usr.bin/make/compat.c
index b2d1e9d7fdfa..4455af278d35 100644
--- a/usr.bin/make/compat.c
+++ b/usr.bin/make/compat.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/compat.c,v 1.12.2.2 1999/08/29 15:30:18 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index 202e7c0f1a6d..c08be3860d51 100644
--- a/usr.bin/make/cond.c
+++ b/usr.bin/make/cond.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/cond.c,v 1.7.2.2 1999/08/29 15:30:18 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/config.h b/usr.bin/make/config.h
index 9d97eb5e4b60..8e508743a499 100644
--- a/usr.bin/make/config.h
+++ b/usr.bin/make/config.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)config.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/config.h,v 1.7.2.2 1999/09/16 00:28:40 julian Exp $
  */
 
 #define	DEFSHELL	1			/* Bourne shell */
diff --git a/usr.bin/make/dir.c b/usr.bin/make/dir.c
index 18d0a8c39dbd..f3e1702d2006 100644
--- a/usr.bin/make/dir.c
+++ b/usr.bin/make/dir.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/dir.c,v 1.7.2.1 1999/08/29 15:30:19 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/dir.h b/usr.bin/make/dir.h
index 487957222eee..528d479bfa11 100644
--- a/usr.bin/make/dir.h
+++ b/usr.bin/make/dir.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)dir.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/dir.h,v 1.6.2.1 1999/08/29 15:30:20 peter Exp $
  */
 
 /* dir.h --
diff --git a/usr.bin/make/for.c b/usr.bin/make/for.c
index 9318b7e8a875..454652b37c95 100644
--- a/usr.bin/make/for.c
+++ b/usr.bin/make/for.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/for.c,v 1.7.2.1 1999/08/29 15:30:21 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/hash.c b/usr.bin/make/hash.c
index 26947a8cd426..7ce516f12708 100644
--- a/usr.bin/make/hash.c
+++ b/usr.bin/make/hash.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/hash.c,v 1.6.2.1 1999/08/29 15:30:22 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/hash.h b/usr.bin/make/hash.h
index 6a1dcbd12f44..ff4e31511a59 100644
--- a/usr.bin/make/hash.h
+++ b/usr.bin/make/hash.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)hash.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/hash.h,v 1.7.2.1 1999/08/29 15:30:22 peter Exp $
  */
 
 /* hash.h --
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index e0c19ae4860a..eac02943ade4 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/job.c,v 1.11.2.2 1999/08/29 15:30:23 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/job.h b/usr.bin/make/job.h
index 87aef22057e6..2a6d8e865926 100644
--- a/usr.bin/make/job.h
+++ b/usr.bin/make/job.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)job.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/job.h,v 1.8.2.2 1999/08/29 15:30:24 peter Exp $
  */
 
 /*-
diff --git a/usr.bin/make/list.h b/usr.bin/make/list.h
index e053f1a6d6f0..ad994d15e690 100644
--- a/usr.bin/make/list.h
+++ b/usr.bin/make/list.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)list.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/list.h,v 1.7.2.1 1999/08/29 15:30:25 peter Exp $
  */
 
 /*
diff --git a/usr.bin/make/lst.h b/usr.bin/make/lst.h
index 57e73d83a180..cfad346fcb8e 100644
--- a/usr.bin/make/lst.h
+++ b/usr.bin/make/lst.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)lst.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.h,v 1.7.2.1 1999/08/29 15:30:26 peter Exp $
  */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstAppend.c b/usr.bin/make/lst.lib/lstAppend.c
index a6d3a7bbd143..61dba7aa300d 100644
--- a/usr.bin/make/lst.lib/lstAppend.c
+++ b/usr.bin/make/lst.lib/lstAppend.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstAppend.c,v 1.5.2.1 1999/08/29 15:30:37 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstAtEnd.c b/usr.bin/make/lst.lib/lstAtEnd.c
index 9d22bef9ba05..0842eac2cec0 100644
--- a/usr.bin/make/lst.lib/lstAtEnd.c
+++ b/usr.bin/make/lst.lib/lstAtEnd.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstAtEnd.c,v 1.5.2.1 1999/08/29 15:30:38 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstAtFront.c b/usr.bin/make/lst.lib/lstAtFront.c
index 57a895062890..fb9a4c709f1a 100644
--- a/usr.bin/make/lst.lib/lstAtFront.c
+++ b/usr.bin/make/lst.lib/lstAtFront.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstAtFront.c,v 1.5.2.1 1999/08/29 15:30:39 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstClose.c b/usr.bin/make/lst.lib/lstClose.c
index d0a8e9f6600a..8fc030e58f63 100644
--- a/usr.bin/make/lst.lib/lstClose.c
+++ b/usr.bin/make/lst.lib/lstClose.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstClose.c,v 1.5.2.1 1999/08/29 15:30:39 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstConcat.c b/usr.bin/make/lst.lib/lstConcat.c
index fd98a308bf86..375732346a2f 100644
--- a/usr.bin/make/lst.lib/lstConcat.c
+++ b/usr.bin/make/lst.lib/lstConcat.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstConcat.c,v 1.6.2.1 1999/08/29 15:30:39 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstDatum.c b/usr.bin/make/lst.lib/lstDatum.c
index afb84b46fec6..1f02cf0773c4 100644
--- a/usr.bin/make/lst.lib/lstDatum.c
+++ b/usr.bin/make/lst.lib/lstDatum.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstDatum.c,v 1.4.2.1 1999/08/29 15:30:40 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstDeQueue.c b/usr.bin/make/lst.lib/lstDeQueue.c
index a10becbc0be9..c3ea332c9106 100644
--- a/usr.bin/make/lst.lib/lstDeQueue.c
+++ b/usr.bin/make/lst.lib/lstDeQueue.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstDeQueue.c,v 1.5.2.1 1999/08/29 15:30:40 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstDestroy.c b/usr.bin/make/lst.lib/lstDestroy.c
index 2a84d638c0c0..2c88c6303b22 100644
--- a/usr.bin/make/lst.lib/lstDestroy.c
+++ b/usr.bin/make/lst.lib/lstDestroy.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstDestroy.c,v 1.6.2.1 1999/08/29 15:30:41 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstDupl.c b/usr.bin/make/lst.lib/lstDupl.c
index a29fa2febecc..0a4c7bf97ea2 100644
--- a/usr.bin/make/lst.lib/lstDupl.c
+++ b/usr.bin/make/lst.lib/lstDupl.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstDupl.c,v 1.6.2.1 1999/08/29 15:30:42 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstEnQueue.c b/usr.bin/make/lst.lib/lstEnQueue.c
index cafc4a699473..0bb7609d60a7 100644
--- a/usr.bin/make/lst.lib/lstEnQueue.c
+++ b/usr.bin/make/lst.lib/lstEnQueue.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstEnQueue.c,v 1.5.2.1 1999/08/29 15:30:43 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstFind.c b/usr.bin/make/lst.lib/lstFind.c
index a74d6b9b6bf2..344e2e56368c 100644
--- a/usr.bin/make/lst.lib/lstFind.c
+++ b/usr.bin/make/lst.lib/lstFind.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstFind.c,v 1.5.2.1 1999/08/29 15:30:43 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstFindFrom.c b/usr.bin/make/lst.lib/lstFindFrom.c
index 96ce3b079cf4..6b048229a2ea 100644
--- a/usr.bin/make/lst.lib/lstFindFrom.c
+++ b/usr.bin/make/lst.lib/lstFindFrom.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstFindFrom.c,v 1.6.2.1 1999/08/29 15:30:44 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstFirst.c b/usr.bin/make/lst.lib/lstFirst.c
index b9f2ae55286a..a5d63013a641 100644
--- a/usr.bin/make/lst.lib/lstFirst.c
+++ b/usr.bin/make/lst.lib/lstFirst.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstFirst.c,v 1.4.2.1 1999/08/29 15:30:44 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstForEach.c b/usr.bin/make/lst.lib/lstForEach.c
index 95ee44abbc27..4d3bd117e3d9 100644
--- a/usr.bin/make/lst.lib/lstForEach.c
+++ b/usr.bin/make/lst.lib/lstForEach.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstForEach.c,v 1.5.2.1 1999/08/29 15:30:44 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstForEachFrom.c b/usr.bin/make/lst.lib/lstForEachFrom.c
index aff154f70e0c..256a9c686f9c 100644
--- a/usr.bin/make/lst.lib/lstForEachFrom.c
+++ b/usr.bin/make/lst.lib/lstForEachFrom.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstForEachFrom.c,v 1.6.2.1 1999/08/29 15:30:45 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstInit.c b/usr.bin/make/lst.lib/lstInit.c
index 7b3c2b089312..b401097a56da 100644
--- a/usr.bin/make/lst.lib/lstInit.c
+++ b/usr.bin/make/lst.lib/lstInit.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstInit.c,v 1.5.2.1 1999/08/29 15:30:45 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstInsert.c b/usr.bin/make/lst.lib/lstInsert.c
index 3c3861e11803..4fa64b2552d1 100644
--- a/usr.bin/make/lst.lib/lstInsert.c
+++ b/usr.bin/make/lst.lib/lstInsert.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstInsert.c,v 1.5.2.1 1999/08/29 15:30:46 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstInt.h b/usr.bin/make/lst.lib/lstInt.h
index 7d9b62fe0c0f..f7c08fa11b5f 100644
--- a/usr.bin/make/lst.lib/lstInt.h
+++ b/usr.bin/make/lst.lib/lstInt.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)lstInt.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstInt.h,v 1.5.2.1 1999/08/29 15:30:46 peter Exp $
  */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstIsAtEnd.c b/usr.bin/make/lst.lib/lstIsAtEnd.c
index 50a4de019319..9fb615bd38f9 100644
--- a/usr.bin/make/lst.lib/lstIsAtEnd.c
+++ b/usr.bin/make/lst.lib/lstIsAtEnd.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstIsAtEnd.c,v 1.4.2.1 1999/08/29 15:30:46 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstIsEmpty.c b/usr.bin/make/lst.lib/lstIsEmpty.c
index 79a27431e4dd..ec88579cda30 100644
--- a/usr.bin/make/lst.lib/lstIsEmpty.c
+++ b/usr.bin/make/lst.lib/lstIsEmpty.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstIsEmpty.c,v 1.4.2.1 1999/08/29 15:30:47 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstLast.c b/usr.bin/make/lst.lib/lstLast.c
index 1affe2e0c383..6af0c9a807db 100644
--- a/usr.bin/make/lst.lib/lstLast.c
+++ b/usr.bin/make/lst.lib/lstLast.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstLast.c,v 1.4.2.1 1999/08/29 15:30:47 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstMember.c b/usr.bin/make/lst.lib/lstMember.c
index 7e3c2ceb9f72..6843424b32b7 100644
--- a/usr.bin/make/lst.lib/lstMember.c
+++ b/usr.bin/make/lst.lib/lstMember.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstMember.c,v 1.5.2.1 1999/08/29 15:30:47 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstNext.c b/usr.bin/make/lst.lib/lstNext.c
index 6008d0a485b5..b1f91994abd7 100644
--- a/usr.bin/make/lst.lib/lstNext.c
+++ b/usr.bin/make/lst.lib/lstNext.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstNext.c,v 1.5.2.1 1999/08/29 15:30:48 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstOpen.c b/usr.bin/make/lst.lib/lstOpen.c
index 9af9c7cd163d..a5ace2013e76 100644
--- a/usr.bin/make/lst.lib/lstOpen.c
+++ b/usr.bin/make/lst.lib/lstOpen.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstOpen.c,v 1.4.2.1 1999/08/29 15:30:48 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstRemove.c b/usr.bin/make/lst.lib/lstRemove.c
index be8b375e4b7d..8574fffb06ed 100644
--- a/usr.bin/make/lst.lib/lstRemove.c
+++ b/usr.bin/make/lst.lib/lstRemove.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstRemove.c,v 1.5.2.1 1999/08/29 15:30:49 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstReplace.c b/usr.bin/make/lst.lib/lstReplace.c
index 967da863f6a4..fa5725aa149f 100644
--- a/usr.bin/make/lst.lib/lstReplace.c
+++ b/usr.bin/make/lst.lib/lstReplace.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstReplace.c,v 1.4.2.1 1999/08/29 15:30:50 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstSucc.c b/usr.bin/make/lst.lib/lstSucc.c
index 6412f3e52d8a..439ba5e52b3b 100644
--- a/usr.bin/make/lst.lib/lstSucc.c
+++ b/usr.bin/make/lst.lib/lstSucc.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstSucc.c,v 1.4.2.1 1999/08/29 15:30:50 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index 73af5fa7f0b0..642603a711b9 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -47,7 +47,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.3 (Berkeley) 3/19/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/make/main.c,v 1.29.2.3 1999/09/03 22:07:19 jb Exp $";
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index f92e779a9fb8..28791b1a4ad1 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/make/make.1,v 1.16.2.5 1999/12/05 12:36:19 cracauer Exp $
 .\"
 .Dd March 19, 1994
 .Dt MAKE 1
diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c
index 98f390200048..6f53036ea70c 100644
--- a/usr.bin/make/make.c
+++ b/usr.bin/make/make.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/make.c,v 1.8.2.1 1999/08/29 15:30:27 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h
index 5c0d21ce122c..b82d9ea7a069 100644
--- a/usr.bin/make/make.h
+++ b/usr.bin/make/make.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)make.h	8.3 (Berkeley) 6/13/95
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/make.h,v 1.8.2.2 1999/08/29 15:30:28 peter Exp $
  */
 
 /*-
diff --git a/usr.bin/make/nonints.h b/usr.bin/make/nonints.h
index 23cfe7323ca4..02edd5a9fc9e 100644
--- a/usr.bin/make/nonints.h
+++ b/usr.bin/make/nonints.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)nonints.h	8.3 (Berkeley) 3/19/94
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/nonints.h,v 1.6.2.1 1999/08/29 15:30:28 peter Exp $
  */
 
 /* arch.c */
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index d1b3bb4eb3d3..ef3ebfd85ebf 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -41,7 +41,7 @@
 static char sccsid[] = "@(#)parse.c	8.3 (Berkeley) 3/19/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/make/parse.c,v 1.20.2.1 1999/08/29 15:30:28 peter Exp $";
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/pathnames.h b/usr.bin/make/pathnames.h
index b4ec874fc9a7..876288177c23 100644
--- a/usr.bin/make/pathnames.h
+++ b/usr.bin/make/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pathnames.h	5.2 (Berkeley) 6/1/90
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/pathnames.h,v 1.7.2.1 1999/08/29 15:30:29 peter Exp $
  */
 
 #define	_PATH_OBJDIR		"obj"
diff --git a/usr.bin/make/sprite.h b/usr.bin/make/sprite.h
index 42e077bed068..6383b8a174e8 100644
--- a/usr.bin/make/sprite.h
+++ b/usr.bin/make/sprite.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sprite.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/sprite.h,v 1.7.2.1 1999/08/29 15:30:29 peter Exp $
  */
 
 /*
diff --git a/usr.bin/make/str.c b/usr.bin/make/str.c
index b4361fb10576..c1d9729fc156 100644
--- a/usr.bin/make/str.c
+++ b/usr.bin/make/str.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/str.c,v 1.9.2.1 1999/08/29 15:30:30 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c
index f895ad6e3fb1..e019e6a3ecd1 100644
--- a/usr.bin/make/suff.c
+++ b/usr.bin/make/suff.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/suff.c,v 1.9.2.1 1999/08/29 15:30:30 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/targ.c b/usr.bin/make/targ.c
index 7e4673b1611b..319997fac40f 100644
--- a/usr.bin/make/targ.c
+++ b/usr.bin/make/targ.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/targ.c,v 1.7.2.1 1999/08/29 15:30:31 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/util.c b/usr.bin/make/util.c
index 174954eb445a..ec61c4c1c21e 100644
--- a/usr.bin/make/util.c
+++ b/usr.bin/make/util.c
@@ -3,7 +3,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.bin/make/util.c,v 1.4.2.1 1999/08/29 15:30:31 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index 2aa5a6df5e54..3758a7f844cc 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/var.c,v 1.11.2.2 1999/08/29 15:30:32 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/mesg/mesg.1 b/usr.bin/mesg/mesg.1
index 7bdf0fd17246..873eee96a907 100644
--- a/usr.bin/mesg/mesg.1
+++ b/usr.bin/mesg/mesg.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mesg.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mesg/mesg.1,v 1.6.2.1 1999/08/29 15:30:53 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt MESG 1
diff --git a/usr.bin/mesg/mesg.c b/usr.bin/mesg/mesg.c
index 4e5878b2a1ae..3a08cab70b15 100644
--- a/usr.bin/mesg/mesg.c
+++ b/usr.bin/mesg/mesg.c
@@ -47,7 +47,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mesg.c	8.2 (Berkeley) 1/21/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/mesg/mesg.c,v 1.3.2.1 1999/08/29 15:30:53 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/minigzip/Makefile b/usr.bin/minigzip/Makefile
index edc5d85e81c7..2dffe2bc1f03 100644
--- a/usr.bin/minigzip/Makefile
+++ b/usr.bin/minigzip/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/minigzip/Makefile,v 1.2.4.1 1999/08/29 15:30:56 peter Exp $
 
 PROG=	minigzip
 LDADD+=	-lz
diff --git a/usr.bin/minigzip/minigzip.1 b/usr.bin/minigzip/minigzip.1
index 48a60ea11324..6a2f9f7f50b5 100644
--- a/usr.bin/minigzip/minigzip.1
+++ b/usr.bin/minigzip/minigzip.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/minigzip/minigzip.1,v 1.2.4.1 1999/08/29 15:30:56 peter Exp $
 .\"
 .Dd December 13, 1997
 .Dt MINIGZIP 1
diff --git a/usr.bin/mk_cmds/Makefile b/usr.bin/mk_cmds/Makefile
index 4cbbbb95fcb9..7928e3e9342e 100644
--- a/usr.bin/mk_cmds/Makefile
+++ b/usr.bin/mk_cmds/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mk_cmds/Makefile,v 1.7.2.2 1999/12/12 03:04:10 chris Exp $
 
 PROG=	mk_cmds
 SRCS=	mk_cmds.c options.c utils.c ct.y cmd_tbl.l y.tab.h
diff --git a/usr.bin/mk_cmds/mk_cmds.1 b/usr.bin/mk_cmds/mk_cmds.1
index fc5b04be0e4e..5a6bffcde271 100644
--- a/usr.bin/mk_cmds/mk_cmds.1
+++ b/usr.bin/mk_cmds/mk_cmds.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mk_cmds/mk_cmds.1,v 1.1.2.1 1999/12/12 03:04:11 chris Exp $
 .Dd November 14, 1999
 .Dt MK_CMDS 1
 .Os FreeBSD
diff --git a/usr.bin/mkdep/mkdep.1 b/usr.bin/mkdep/mkdep.1
index fb19a20ccda1..b146c89233c7 100644
--- a/usr.bin/mkdep/mkdep.1
+++ b/usr.bin/mkdep/mkdep.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mkdep.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mkdep/mkdep.1,v 1.4.2.1 1999/09/25 21:48:33 chris Exp $
 .\"
 .Dd June 6, 1993
 .Dt MKDEP 1
diff --git a/usr.bin/mkdep/mkdep.gcc.sh b/usr.bin/mkdep/mkdep.gcc.sh
index ec00dcfbdf92..36095cab2f14 100644
--- a/usr.bin/mkdep/mkdep.gcc.sh
+++ b/usr.bin/mkdep/mkdep.gcc.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)mkdep.gcc.sh	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mkdep/mkdep.gcc.sh,v 1.17.2.1 1999/08/29 15:31:00 peter Exp $
 
 D=.depend			# default dependency file is .depend
 append=0
diff --git a/usr.bin/mkfifo/mkfifo.1 b/usr.bin/mkfifo/mkfifo.1
index c19a7c38f883..7206708d8394 100644
--- a/usr.bin/mkfifo/mkfifo.1
+++ b/usr.bin/mkfifo/mkfifo.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mkfifo.1	8.2 (Berkeley) 1/5/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mkfifo/mkfifo.1,v 1.4.2.1 1999/08/29 15:31:01 peter Exp $
 .\"
 .Dd January 5, 1994
 .Dt MKFIFO 1
diff --git a/usr.bin/mkfifo/mkfifo.c b/usr.bin/mkfifo/mkfifo.c
index 92d7fb1dcf93..e24c1279a2cf 100644
--- a/usr.bin/mkfifo/mkfifo.c
+++ b/usr.bin/mkfifo/mkfifo.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mkfifo.c	8.2 (Berkeley) 1/5/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/mkfifo/mkfifo.c,v 1.3.2.1 1999/08/29 15:31:02 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/mklocale/Makefile b/usr.bin/mklocale/Makefile
index 955c8c2fe961..c8a575e37e98 100644
--- a/usr.bin/mklocale/Makefile
+++ b/usr.bin/mklocale/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/7/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mklocale/Makefile,v 1.19.2.1 1999/08/29 15:31:03 peter Exp $
 
 PROG=	mklocale
 SRCS=	yacc.y lex.l y.tab.h
diff --git a/usr.bin/mklocale/data/Makefile b/usr.bin/mklocale/data/Makefile
index 1c446a9ca13b..d45b5ed54ea2 100644
--- a/usr.bin/mklocale/data/Makefile
+++ b/usr.bin/mklocale/data/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mklocale/data/Makefile,v 1.17.2.3 1999/08/29 15:31:04 peter Exp $
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
diff --git a/usr.bin/mklocale/data/lt_LN.ISO_8859-2.src b/usr.bin/mklocale/data/lt_LN.ISO_8859-2.src
index a9fa03fc89e5..0ac2a7a3228e 100644
--- a/usr.bin/mklocale/data/lt_LN.ISO_8859-2.src
+++ b/usr.bin/mklocale/data/lt_LN.ISO_8859-2.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for the iso_8859_2 Locale
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/mklocale/data/lt_LN.ISO_8859-2.src,v 1.1.4.1 1999/08/29 15:31:05 peter Exp $
  */
 
 ENCODING	"NONE"
diff --git a/usr.bin/mklocale/data/zh_CN.EUC.src b/usr.bin/mklocale/data/zh_CN.EUC.src
index b298ef5de562..bb85275b436d 100644
--- a/usr.bin/mklocale/data/zh_CN.EUC.src
+++ b/usr.bin/mklocale/data/zh_CN.EUC.src
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/mklocale/data/zh_CN.EUC.src,v 1.2.2.1 1999/08/29 15:31:06 peter Exp $
  */
 
 ENCODING	"EUC"
diff --git a/usr.bin/mklocale/mklocale.1 b/usr.bin/mklocale/mklocale.1
index f1b3d3950e63..6243709afe3e 100644
--- a/usr.bin/mklocale/mklocale.1
+++ b/usr.bin/mklocale/mklocale.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mklocale.1	8.2 (Berkeley) 4/18/94
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/usr.bin/mklocale/mklocale.1,v 1.3.2.1 1999/09/20 09:49:57 phantom Exp $
 .\"
 .Dd April 18, 1994
 .Dt MKLOCALE 1
diff --git a/usr.bin/mkstr/mkstr.c b/usr.bin/mkstr/mkstr.c
index a0db88949595..38cee78baff3 100644
--- a/usr.bin/mkstr/mkstr.c
+++ b/usr.bin/mkstr/mkstr.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mkstr.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/mkstr/mkstr.c,v 1.3.2.1 1999/08/29 15:31:08 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/mktemp/Makefile b/usr.bin/mktemp/Makefile
index 76ebee6f360b..8e5be6867bbd 100644
--- a/usr.bin/mktemp/Makefile
+++ b/usr.bin/mktemp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mktemp/Makefile,v 1.1 1998/04/14 07:39:56 peter Exp $
 
 PROG=	mktemp
 
diff --git a/usr.bin/mktemp/mktemp.1 b/usr.bin/mktemp/mktemp.1
index c6f5cdca504f..02900788ed05 100644
--- a/usr.bin/mktemp/mktemp.1
+++ b/usr.bin/mktemp/mktemp.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mktemp/mktemp.1,v 1.3.2.1 1999/10/30 14:05:49 phantom Exp $
 .\" From: $OpenBSD: mktemp.1,v 1.8 1998/03/19 06:13:37 millert Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
diff --git a/usr.bin/mktemp/mktemp.c b/usr.bin/mktemp/mktemp.c
index 381872d45ee4..9a9a68441651 100644
--- a/usr.bin/mktemp/mktemp.c
+++ b/usr.bin/mktemp/mktemp.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$FreeBSD: src/usr.bin/mktemp/mktemp.c,v 1.2 1998/05/05 06:13:47 charnier Exp $";
 #endif /* not lint */
 
 static void usage __P((void));
diff --git a/usr.bin/modstat/Makefile b/usr.bin/modstat/Makefile
index 27f63e84fc83..031836f55a95 100644
--- a/usr.bin/modstat/Makefile
+++ b/usr.bin/modstat/Makefile
@@ -33,7 +33,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/modstat/Makefile,v 1.4.2.1 1999/08/29 15:31:09 peter Exp $
 #
 
 PROG=	modstat
diff --git a/usr.bin/modstat/modstat.8 b/usr.bin/modstat/modstat.8
index 95f01e55f4ba..effa9d5da3f5 100644
--- a/usr.bin/modstat/modstat.8
+++ b/usr.bin/modstat/modstat.8
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/modstat/modstat.8,v 1.7.2.1 1999/08/29 15:31:10 peter Exp $
 .\"
 .Dd June 7, 1993
 .Dt MODSTAT 8
diff --git a/usr.bin/modstat/modstat.c b/usr.bin/modstat/modstat.c
index 21dd258c06dd..b82f58944e7f 100644
--- a/usr.bin/modstat/modstat.c
+++ b/usr.bin/modstat/modstat.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/modstat/modstat.c,v 1.10.2.1 1999/08/29 15:31:10 peter Exp $";
 #endif /* not lint */
 
 #include <a.out.h>
diff --git a/usr.bin/more/Makefile b/usr.bin/more/Makefile
index 79048432118c..2362b5e5f75b 100644
--- a/usr.bin/more/Makefile
+++ b/usr.bin/more/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/more/Makefile,v 1.6.2.1 1999/08/29 15:31:12 peter Exp $
 
 PROG=	more
 CFLAGS+=-I${.CURDIR} -DTERMIOS
diff --git a/usr.bin/more/command.c b/usr.bin/more/command.c
index 0a400d881bc6..322d9f39da7b 100644
--- a/usr.bin/more/command.c
+++ b/usr.bin/more/command.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)command.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/more/command.c,v 1.10.2.3 1999/08/29 15:31:13 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/more/decode.c b/usr.bin/more/decode.c
index 4a3315275946..1c6f1771dc26 100644
--- a/usr.bin/more/decode.c
+++ b/usr.bin/more/decode.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)decode.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/more/decode.c,v 1.1.1.1.10.3 1999/08/29 15:31:14 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/input.c b/usr.bin/more/input.c
index 50e2031724ab..eacfd9574325 100644
--- a/usr.bin/more/input.c
+++ b/usr.bin/more/input.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)input.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/more/input.c,v 1.2.8.3 1999/08/29 15:31:15 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/less.h b/usr.bin/more/less.h
index e17ec4038210..3d744bb0a945 100644
--- a/usr.bin/more/less.h
+++ b/usr.bin/more/less.h
@@ -33,7 +33,7 @@
  *
  *	@(#)less.h	8.1 (Berkeley) 6/6/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/more/less.h,v 1.2.10.3 1999/08/29 15:31:15 peter Exp $
  */
 
 #define	NULL_POSITION	((off_t)(-1))
diff --git a/usr.bin/more/line.c b/usr.bin/more/line.c
index 6b980739b1dc..c9383d0d915d 100644
--- a/usr.bin/more/line.c
+++ b/usr.bin/more/line.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)line.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/more/line.c,v 1.4.8.3 1999/08/29 15:31:16 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/main.c b/usr.bin/more/main.c
index f7159eaafbb8..5f75806417a0 100644
--- a/usr.bin/more/main.c
+++ b/usr.bin/more/main.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/7/93";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/more/main.c,v 1.10.2.3 1999/08/29 15:31:16 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/more.1 b/usr.bin/more/more.1
index 09bd03066c89..1c9bfafd11aa 100644
--- a/usr.bin/more/more.1
+++ b/usr.bin/more/more.1
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)more.1	8.2 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/more/more.1,v 1.7.2.6 1999/08/29 15:31:17 peter Exp $
 .\"
 .Dd April 18, 1994
 .Dt MORE 1
diff --git a/usr.bin/more/option.c b/usr.bin/more/option.c
index 53f332b9e6ce..b7f096f928f8 100644
--- a/usr.bin/more/option.c
+++ b/usr.bin/more/option.c
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)option.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/more/option.c,v 1.5.2.1 1999/08/29 15:31:17 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.bin/more/output.c b/usr.bin/more/output.c
index 337a294e6b9a..d495897364ef 100644
--- a/usr.bin/more/output.c
+++ b/usr.bin/more/output.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)output.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/more/output.c,v 1.7.2.4 1999/08/29 15:31:18 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/prim.c b/usr.bin/more/prim.c
index 03fcad8d408e..08b36baa158a 100644
--- a/usr.bin/more/prim.c
+++ b/usr.bin/more/prim.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)prim.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/more/prim.c,v 1.6.2.3 1999/08/29 15:31:19 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/tags.c b/usr.bin/more/tags.c
index b0068b0e2f06..5eccfce7a265 100644
--- a/usr.bin/more/tags.c
+++ b/usr.bin/more/tags.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)tags.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/more/tags.c,v 1.3.2.3 1999/08/29 15:31:19 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/msgs/Makefile b/usr.bin/msgs/Makefile
index 21cb15155568..e66d81bd1cda 100644
--- a/usr.bin/msgs/Makefile
+++ b/usr.bin/msgs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/msgs/Makefile,v 1.5.2.1 1999/08/29 15:31:21 peter Exp $
 
 PROG=	msgs
 DPADD=	${LIBTERMCAP}
diff --git a/usr.bin/msgs/msgs.c b/usr.bin/msgs/msgs.c
index 17536400f468..122e252bca2a 100644
--- a/usr.bin/msgs/msgs.c
+++ b/usr.bin/msgs/msgs.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)msgs.c	8.2 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/msgs/msgs.c,v 1.13.2.2 1999/08/29 15:31:21 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/mt/Makefile b/usr.bin/mt/Makefile
index 0e692e92cd12..1b5685ce9ab3 100644
--- a/usr.bin/mt/Makefile
+++ b/usr.bin/mt/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mt/Makefile,v 1.2.2.1 1999/08/29 15:31:23 peter Exp $
 
 PROG=	mt
 CFLAGS+=-I${.CURDIR}/../../sys
diff --git a/usr.bin/mt/mt.c b/usr.bin/mt/mt.c
index 9fcb727e197a..0a0c72713ef3 100644
--- a/usr.bin/mt/mt.c
+++ b/usr.bin/mt/mt.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mt.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/mt/mt.c,v 1.20.2.3 1999/08/29 15:31:23 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/ncal/Makefile b/usr.bin/ncal/Makefile
index 569453240d60..5a1d14231be2 100644
--- a/usr.bin/ncal/Makefile
+++ b/usr.bin/ncal/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ncal/Makefile,v 1.1.1.1.4.1 1999/08/29 15:31:25 peter Exp $
 PROG= ncal
 SRCS= ncal.c
 
diff --git a/usr.bin/ncal/ncal.1 b/usr.bin/ncal/ncal.1
index 5636440d0e56..caf6207ac35b 100644
--- a/usr.bin/ncal/ncal.1
+++ b/usr.bin/ncal/ncal.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ncal/ncal.1,v 1.7.2.1 1999/08/29 15:31:25 peter Exp $
 .\"
 .Dd December 16, 1997
 .Dt CAL 1
diff --git a/usr.bin/ncal/ncal.c b/usr.bin/ncal/ncal.c
index 31293ce9693f..dd9c2dfea10b 100644
--- a/usr.bin/ncal/ncal.c
+++ b/usr.bin/ncal/ncal.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ncal/ncal.c,v 1.6.2.1 1999/08/29 15:31:26 peter Exp $";
 #endif /* not lint */
 
 #include <calendar.h>
diff --git a/usr.bin/netstat/atalk.c b/usr.bin/netstat/atalk.c
index f0a72e48eae1..5d8326500824 100644
--- a/usr.bin/netstat/atalk.c
+++ b/usr.bin/netstat/atalk.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)atalk.c	1.1 (Whistle) 6/6/96";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/netstat/atalk.c,v 1.11.2.1 1999/08/29 15:31:27 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index 61ad2b6cd30b..978a486f80b3 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)if.c	8.3 (Berkeley) 4/28/95";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/netstat/if.c,v 1.24.2.3 1999/08/29 15:31:28 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c
index 826afccce4ee..3847691a4063 100644
--- a/usr.bin/netstat/inet.c
+++ b/usr.bin/netstat/inet.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)inet.c	8.5 (Berkeley) 5/24/95";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/netstat/inet.c,v 1.30.2.3 1999/08/29 15:31:29 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/ipx.c b/usr.bin/netstat/ipx.c
index 8f7c1baa889f..7acee83cad25 100644
--- a/usr.bin/netstat/ipx.c
+++ b/usr.bin/netstat/ipx.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)ns.c	8.1 (Berkeley) 6/6/93";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/netstat/ipx.c,v 1.10.2.2 1999/11/27 03:21:33 bp Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/iso.c b/usr.bin/netstat/iso.c
index bd38e15003ee..a99f22154032 100644
--- a/usr.bin/netstat/iso.c
+++ b/usr.bin/netstat/iso.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)iso.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/netstat/iso.c,v 1.2.8.1 1999/08/29 15:31:31 peter Exp $
  * $Source: /home/ncvs/src/usr.bin/netstat/iso.c,v $
  */
 /*******************************************************************************
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index 74ad109b458a..edcd7f7ec3a8 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -42,7 +42,7 @@ char const copyright[] =
 static char sccsid[] = "@(#)main.c	8.4 (Berkeley) 3/1/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/netstat/main.c,v 1.23.2.3 1999/08/29 15:31:31 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c
index 921b31ac7bee..bc62add990cf 100644
--- a/usr.bin/netstat/mbuf.c
+++ b/usr.bin/netstat/mbuf.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)mbuf.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/netstat/mbuf.c,v 1.15.2.1 1999/08/29 15:31:32 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1
index b28d8f84d1c7..065f70b0e58b 100644
--- a/usr.bin/netstat/netstat.1
+++ b/usr.bin/netstat/netstat.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)netstat.1	8.8 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/netstat/netstat.1,v 1.11.2.3 1999/10/30 14:42:19 phantom Exp $
 .\"
 .Dd April 18, 1994
 .Dt NETSTAT 1
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index 129337bfbcae..5a57c2bcce41 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "From: @(#)route.c	8.6 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/netstat/route.c,v 1.33.2.1 1999/08/29 15:31:32 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/unix.c b/usr.bin/netstat/unix.c
index 345e28a4ee41..fe350938a042 100644
--- a/usr.bin/netstat/unix.c
+++ b/usr.bin/netstat/unix.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)unix.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/netstat/unix.c,v 1.10.2.2 1999/08/29 15:31:33 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/newkey/Makefile b/usr.bin/newkey/Makefile
index 75f369face5a..066c0215203d 100644
--- a/usr.bin/newkey/Makefile
+++ b/usr.bin/newkey/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/newkey/Makefile,v 1.2.2.1 1999/08/29 15:31:35 peter Exp $
 
 PROG= newkey
 SRCS= newkey.c update.c generic.c
diff --git a/usr.bin/newkey/generic.c b/usr.bin/newkey/generic.c
index 4067867d6598..e7b59702e1c8 100644
--- a/usr.bin/newkey/generic.c
+++ b/usr.bin/newkey/generic.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)generic.c 1.2 91/03/11 Copyr 1986 Sun Micro";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/newkey/generic.c,v 1.2.2.1 1999/08/29 15:31:35 peter Exp $";
 #endif
 
 /*
diff --git a/usr.bin/newkey/newkey.c b/usr.bin/newkey/newkey.c
index 141614ee088d..3906cd3bdd68 100644
--- a/usr.bin/newkey/newkey.c
+++ b/usr.bin/newkey/newkey.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)newkey.c 1.8 91/03/11 Copyr 1986 Sun Micro";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/newkey/newkey.c,v 1.2.2.1 1999/08/29 15:31:36 peter Exp $";
 #endif
 
 /*
diff --git a/usr.bin/newkey/update.c b/usr.bin/newkey/update.c
index 2f1c53fab9ae..e9a04ed12abe 100644
--- a/usr.bin/newkey/update.c
+++ b/usr.bin/newkey/update.c
@@ -32,7 +32,7 @@
 static	char sccsid[] = "@(#)update.c 1.2 91/03/11 Copyr 1986 Sun Micro";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/newkey/update.c,v 1.4.2.1 1999/08/29 15:31:37 peter Exp $";
 #endif
 
 /*
diff --git a/usr.bin/nfsstat/nfsstat.1 b/usr.bin/nfsstat/nfsstat.1
index 94f36d750187..d0808225c953 100644
--- a/usr.bin/nfsstat/nfsstat.1
+++ b/usr.bin/nfsstat/nfsstat.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)nfsstat.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/nfsstat/nfsstat.1,v 1.7.2.1 1999/08/29 15:31:38 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt NFSSTAT 1
diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c
index f68f6216c3e5..d65e49b0e431 100644
--- a/usr.bin/nfsstat/nfsstat.c
+++ b/usr.bin/nfsstat/nfsstat.c
@@ -45,7 +45,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)nfsstat.c	8.2 (Berkeley) 3/31/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/nfsstat/nfsstat.c,v 1.12.2.1 1999/08/29 15:31:39 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/nice/nice.1 b/usr.bin/nice/nice.1
index 2531a9ca4aaf..94985a52e3a2 100644
--- a/usr.bin/nice/nice.1
+++ b/usr.bin/nice/nice.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)nice.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/nice/nice.1,v 1.7.2.2 1999/08/29 15:31:40 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt NICE 1
diff --git a/usr.bin/nm/nm.1 b/usr.bin/nm/nm.1
index d6a52d22b42e..1f579a0d5158 100644
--- a/usr.bin/nm/nm.1
+++ b/usr.bin/nm/nm.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nm.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/nm/nm.1,v 1.8.2.1 1999/08/29 15:31:42 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt NM 1
diff --git a/usr.bin/nm/nm.1aout b/usr.bin/nm/nm.1aout
index d6a52d22b42e..f86c3cee17e8 100644
--- a/usr.bin/nm/nm.1aout
+++ b/usr.bin/nm/nm.1aout
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nm.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/nm/nm.1aout,v 1.8.2.1 1999/08/29 15:31:42 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt NM 1
diff --git a/usr.bin/nm/nm.c b/usr.bin/nm/nm.c
index 91665b229a51..c08c01b688ef 100644
--- a/usr.bin/nm/nm.c
+++ b/usr.bin/nm/nm.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)nm.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/nm/nm.c,v 1.12.2.1 1999/08/29 15:31:43 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/nohup/nohup.c b/usr.bin/nohup/nohup.c
index 8992997b6cfd..07310e2b3e63 100644
--- a/usr.bin/nohup/nohup.c
+++ b/usr.bin/nohup/nohup.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)nohup.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/nohup/nohup.c,v 1.2.2.2 1999/08/29 15:31:44 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/objformat/Makefile b/usr.bin/objformat/Makefile
index a56fdd4f8b8c..6d63e05c1d19 100644
--- a/usr.bin/objformat/Makefile
+++ b/usr.bin/objformat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/objformat/Makefile,v 1.14 1998/11/01 02:37:40 jdp Exp $
 
 PROG=		objformat
 CFLAGS+=	-Wall
diff --git a/usr.bin/objformat/objformat.1 b/usr.bin/objformat/objformat.1
index 9fde70c17d69..3b7ebb5f5f9b 100644
--- a/usr.bin/objformat/objformat.1
+++ b/usr.bin/objformat/objformat.1
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/objformat/objformat.1,v 1.1.2.2 1999/08/29 15:31:46 peter Exp $
 .\"
 .Dd October 25, 1998
 .Os
diff --git a/usr.bin/objformat/objformat.c b/usr.bin/objformat/objformat.c
index 8d75f5ea64ae..d5a5d4e1f29d 100644
--- a/usr.bin/objformat/objformat.c
+++ b/usr.bin/objformat/objformat.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/objformat/objformat.c,v 1.6 1998/10/24 02:01:30 jdp Exp $
  */
 
 #include <err.h>
diff --git a/usr.bin/opieinfo/Makefile b/usr.bin/opieinfo/Makefile
index 7f7241dc5e72..dba606f778f8 100644
--- a/usr.bin/opieinfo/Makefile
+++ b/usr.bin/opieinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/opieinfo/Makefile,v 1.3.2.1 1999/08/29 15:31:47 peter Exp $
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 
diff --git a/usr.bin/opiekey/Makefile b/usr.bin/opiekey/Makefile
index 6c43636ad57b..99c501670753 100644
--- a/usr.bin/opiekey/Makefile
+++ b/usr.bin/opiekey/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/opiekey/Makefile,v 1.3.2.1 1999/08/29 15:31:48 peter Exp $
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 
diff --git a/usr.bin/opiepasswd/Makefile b/usr.bin/opiepasswd/Makefile
index 7fc70ffbf5e7..8ea8b73dbed2 100644
--- a/usr.bin/opiepasswd/Makefile
+++ b/usr.bin/opiepasswd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/opiepasswd/Makefile,v 1.3.2.1 1999/08/29 15:31:50 peter Exp $
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 
diff --git a/usr.bin/pagesize/pagesize.sh b/usr.bin/pagesize/pagesize.sh
index fd5477b3222b..3ffc7a64975a 100644
--- a/usr.bin/pagesize/pagesize.sh
+++ b/usr.bin/pagesize/pagesize.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)pagesize.sh	8.1 (Berkeley) 4/3/94
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/pagesize/pagesize.sh,v 1.4.2.1 1999/08/29 15:31:51 peter Exp $
 #
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin; export PATH
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index 51b2b9b8fce7..7b0adf98fb79 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,5 +1,5 @@
 # From:	@(#)Makefile	8.3 (Berkeley) 4/2/94
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/passwd/Makefile,v 1.30.2.4 1999/11/18 13:33:53 roger Exp $
 
 # NOPAM is used by PicoBSD
 
diff --git a/usr.bin/passwd/extern.h b/usr.bin/passwd/extern.h
index 287646c6a380..a21e057e2e4d 100644
--- a/usr.bin/passwd/extern.h
+++ b/usr.bin/passwd/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)extern.h	8.1 (Berkeley) 4/2/94
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/passwd/extern.h,v 1.4.2.1 1999/08/29 15:31:53 peter Exp $
  */
 
 int	krb_passwd __P((char *, char *, char *, char *));
diff --git a/usr.bin/passwd/local_passwd.c b/usr.bin/passwd/local_passwd.c
index 07e1d183d440..760f06c75b60 100644
--- a/usr.bin/passwd/local_passwd.c
+++ b/usr.bin/passwd/local_passwd.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/passwd/local_passwd.c,v 1.20.2.1 1999/08/29 15:31:53 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/passwd/passwd.1 b/usr.bin/passwd/passwd.1
index e3dc52177d7e..f694805ad4aa 100644
--- a/usr.bin/passwd/passwd.1
+++ b/usr.bin/passwd/passwd.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)passwd.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/passwd/passwd.1,v 1.11.2.2 1999/08/29 15:31:54 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt PASSWD 1
diff --git a/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c
index e69864a0dedb..ce02efbfb537 100644
--- a/usr.bin/passwd/passwd.c
+++ b/usr.bin/passwd/passwd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)passwd.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/passwd/passwd.c,v 1.15.2.1 1999/08/29 15:31:54 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c
index a1971199b49c..791dc16cfedb 100644
--- a/usr.bin/paste/paste.c
+++ b/usr.bin/paste/paste.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)paste.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/paste/paste.c,v 1.5.2.1 1999/08/29 15:31:56 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/pr/pr.1 b/usr.bin/pr/pr.1
index 85d011cf639d..94c807272c9f 100644
--- a/usr.bin/pr/pr.1
+++ b/usr.bin/pr/pr.1
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pr.1	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/pr/pr.1,v 1.5.2.2 1999/12/06 04:43:22 kris Exp $
 .\"
 .Dd April 18, 1994
 .Dt PR 1
diff --git a/usr.bin/pr/pr.c b/usr.bin/pr/pr.c
index 850ecdadac7c..fe0558ad4fa2 100644
--- a/usr.bin/pr/pr.c
+++ b/usr.bin/pr/pr.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/pr/pr.c,v 1.6.2.1 1999/12/06 04:43:22 kris Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/pr/pr.h b/usr.bin/pr/pr.h
index f132675e5aea..09bec4f43861 100644
--- a/usr.bin/pr/pr.h
+++ b/usr.bin/pr/pr.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *      @(#)pr.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/pr/pr.h,v 1.1.1.1.10.1 1999/12/06 04:43:22 kris Exp $
  */
 
 /*
diff --git a/usr.bin/quota/quota.1 b/usr.bin/quota/quota.1
index 7d1a471e98bd..51851074c0a7 100644
--- a/usr.bin/quota/quota.1
+++ b/usr.bin/quota/quota.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)quota.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/quota/quota.1,v 1.6.2.1 1999/08/29 15:31:59 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt QUOTA 1
diff --git a/usr.bin/quota/quota.c b/usr.bin/quota/quota.c
index 246922df88b5..659380bcd36a 100644
--- a/usr.bin/quota/quota.c
+++ b/usr.bin/quota/quota.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "from: @(#)quota.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/quota/quota.c,v 1.10.2.1 1999/08/29 15:31:59 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/ranlib/Makefile b/usr.bin/ranlib/Makefile
index 8148e57c2bac..fc8606f91902 100644
--- a/usr.bin/ranlib/Makefile
+++ b/usr.bin/ranlib/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ranlib/Makefile,v 1.6.2.1 1999/08/29 15:32:00 peter Exp $
 
 PROG=	ranlib
 SRCS=	archive.c build.c misc.c ranlib.c touch.c
diff --git a/usr.bin/ranlib/build.c b/usr.bin/ranlib/build.c
index b4d8bc69a8ee..eb5827d66b86 100644
--- a/usr.bin/ranlib/build.c
+++ b/usr.bin/ranlib/build.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)build.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ranlib/build.c,v 1.6.2.1 1999/08/29 15:32:01 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/ranlib/misc.c b/usr.bin/ranlib/misc.c
index 19b4854cbfa7..c2236064f19f 100644
--- a/usr.bin/ranlib/misc.c
+++ b/usr.bin/ranlib/misc.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ranlib/misc.c,v 1.4.2.1 1999/08/29 15:32:01 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ranlib/ranlib.1 b/usr.bin/ranlib/ranlib.1
index d57cf9836a42..ae7b0c59fec7 100644
--- a/usr.bin/ranlib/ranlib.1
+++ b/usr.bin/ranlib/ranlib.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ranlib.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ranlib/ranlib.1,v 1.6.2.1 1999/08/29 15:32:03 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt RANLIB 1
diff --git a/usr.bin/ranlib/ranlib.1aout b/usr.bin/ranlib/ranlib.1aout
index d57cf9836a42..5d7eadcd44db 100644
--- a/usr.bin/ranlib/ranlib.1aout
+++ b/usr.bin/ranlib/ranlib.1aout
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ranlib.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ranlib/ranlib.1aout,v 1.6.2.1 1999/08/29 15:32:03 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt RANLIB 1
diff --git a/usr.bin/ranlib/ranlib.c b/usr.bin/ranlib/ranlib.c
index 40263318e6a6..a56574c7a01e 100644
--- a/usr.bin/ranlib/ranlib.c
+++ b/usr.bin/ranlib/ranlib.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ranlib.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ranlib/ranlib.c,v 1.4.2.1 1999/08/29 15:32:04 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/ranlib/touch.c b/usr.bin/ranlib/touch.c
index b062e087c4fe..e22da41ae620 100644
--- a/usr.bin/ranlib/touch.c
+++ b/usr.bin/ranlib/touch.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)touch.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ranlib/touch.c,v 1.5.2.1 1999/08/29 15:32:04 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/rdist/Makefile b/usr.bin/rdist/Makefile
index ea47411d40a7..e055253c318c 100644
--- a/usr.bin/rdist/Makefile
+++ b/usr.bin/rdist/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.3 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rdist/Makefile,v 1.5.2.1 1999/08/29 15:32:05 peter Exp $
 
 PROG=	rdist
 SRCS=	docmd.c expand.c gram.y lookup.c main.c rshrcmd.c server.c
diff --git a/usr.bin/rdist/docmd.c b/usr.bin/rdist/docmd.c
index 7ea9a8c1103a..f3025622a4b3 100644
--- a/usr.bin/rdist/docmd.c
+++ b/usr.bin/rdist/docmd.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "From: @(#)docmd.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rdist/docmd.c,v 1.11.2.1 1999/08/29 15:32:06 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/rdist/expand.c b/usr.bin/rdist/expand.c
index 425d8c7cbf7b..b0a4ca66186b 100644
--- a/usr.bin/rdist/expand.c
+++ b/usr.bin/rdist/expand.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)expand.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rdist/expand.c,v 1.6.2.1 1999/08/29 15:32:06 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/rdist/gram.y b/usr.bin/rdist/gram.y
index bd77901726d6..49111290433a 100644
--- a/usr.bin/rdist/gram.y
+++ b/usr.bin/rdist/gram.y
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)gram.y	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rdist/gram.y,v 1.5.2.1 1999/08/29 15:32:07 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/rdist/lookup.c b/usr.bin/rdist/lookup.c
index b97ce3f5bf71..2e8956aa0f88 100644
--- a/usr.bin/rdist/lookup.c
+++ b/usr.bin/rdist/lookup.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)lookup.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rdist/lookup.c,v 1.5.2.1 1999/08/29 15:32:07 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/rdist/main.c b/usr.bin/rdist/main.c
index d4d94a2219b6..3a4b51a20ed4 100644
--- a/usr.bin/rdist/main.c
+++ b/usr.bin/rdist/main.c
@@ -39,7 +39,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rdist/main.c,v 1.4.2.1 1999/08/29 15:32:08 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/rdist/rshrcmd.c b/usr.bin/rdist/rshrcmd.c
index c747cc6cf5ea..41d3d8db355a 100644
--- a/usr.bin/rdist/rshrcmd.c
+++ b/usr.bin/rdist/rshrcmd.c
@@ -6,7 +6,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rdist/rshrcmd.c,v 1.5.2.1 1999/08/29 15:32:08 peter Exp $";
 #endif /* not lint */
 
 #include	"defs.h"
diff --git a/usr.bin/rdist/server.c b/usr.bin/rdist/server.c
index 44c2610fa114..552955ff5715 100644
--- a/usr.bin/rdist/server.c
+++ b/usr.bin/rdist/server.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)server.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rdist/server.c,v 1.9.2.1 1999/08/29 15:32:10 peter Exp $";
 #endif /* not lint */
 
 #include <sys/wait.h>
diff --git a/usr.bin/renice/renice.c b/usr.bin/renice/renice.c
index baed30a8b582..75b65909aa2a 100644
--- a/usr.bin/renice/renice.c
+++ b/usr.bin/renice/renice.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)renice.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/renice/renice.c,v 1.3.2.1 1999/08/29 15:32:11 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/rlogin/Makefile b/usr.bin/rlogin/Makefile
index 2f2fef112f4c..2b9f233ea703 100644
--- a/usr.bin/rlogin/Makefile
+++ b/usr.bin/rlogin/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rlogin/Makefile,v 1.13.2.1 1999/08/29 15:32:12 peter Exp $
 
 PROG=	rlogin
 SRCS=	rlogin.c
diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c
index 0353ba439523..b920ab4f2c9d 100644
--- a/usr.bin/rlogin/rlogin.c
+++ b/usr.bin/rlogin/rlogin.c
@@ -40,7 +40,7 @@ static const char copyright[] =
 #ifndef lint
 static const char sccsid[] = "@(#)rlogin.c	8.1 (Berkeley) 6/6/93";
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rlogin/rlogin.c,v 1.18.2.1 1999/08/29 15:32:13 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/rpcgen/rpc_cout.c b/usr.bin/rpcgen/rpc_cout.c
index 252776eea67f..b8e9ebcb83ae 100644
--- a/usr.bin/rpcgen/rpc_cout.c
+++ b/usr.bin/rpcgen/rpc_cout.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rpcgen/rpc_cout.c,v 1.5.2.1 1999/08/29 15:32:14 peter Exp $";
 #endif
 
 /*
diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c
index 9224dbbc9832..3b6d86e77147 100644
--- a/usr.bin/rpcgen/rpc_main.c
+++ b/usr.bin/rpcgen/rpc_main.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rpcgen/rpc_main.c,v 1.10.2.1 1999/08/29 15:32:15 peter Exp $";
 #endif
 
 /*
diff --git a/usr.bin/rpcgen/rpc_tblout.c b/usr.bin/rpcgen/rpc_tblout.c
index 45282c87418c..d338442bf4a2 100644
--- a/usr.bin/rpcgen/rpc_tblout.c
+++ b/usr.bin/rpcgen/rpc_tblout.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)rpc_tblout.c 1.4 89/02/22 (C) 1988 SMI";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rpcgen/rpc_tblout.c,v 1.3.2.1 1999/08/29 15:32:16 peter Exp $";
 #endif
 
 /*
diff --git a/usr.bin/rpcgen/rpc_util.c b/usr.bin/rpcgen/rpc_util.c
index 75583a586596..783f5765f8c2 100644
--- a/usr.bin/rpcgen/rpc_util.c
+++ b/usr.bin/rpcgen/rpc_util.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)rpc_util.c 1.11 89/02/22 (C) 1987 SMI";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rpcgen/rpc_util.c,v 1.5.2.1 1999/08/29 15:32:17 peter Exp $";
 #endif
 
 /*
diff --git a/usr.bin/rpcgen/rpcgen.1 b/usr.bin/rpcgen/rpcgen.1
index 9539856e6bf5..b50bb1e2c78f 100644
--- a/usr.bin/rpcgen/rpcgen.1
+++ b/usr.bin/rpcgen/rpcgen.1
@@ -1,6 +1,6 @@
 .\" @(#)rpcgen.1 1.35 93/06/02 SMI
 .\" Copyright 1985-1993 Sun Microsystems, Inc.
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rpcgen/rpcgen.1,v 1.6.2.1 1999/10/30 15:27:57 phantom Exp $
 .Dd March 28, 1993
 .Dt RPCGEN 1
 .Os
diff --git a/usr.bin/rpcinfo/Makefile b/usr.bin/rpcinfo/Makefile
index 045c37cf1188..8ecb2e60439b 100644
--- a/usr.bin/rpcinfo/Makefile
+++ b/usr.bin/rpcinfo/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.2 (Berkeley) 5/11/90
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rpcinfo/Makefile,v 1.3.2.1 1999/08/29 15:32:19 peter Exp $
 
 PROG=	rpcinfo
 MAN8 = rpcinfo.8
diff --git a/usr.bin/rpcinfo/rpcinfo.8 b/usr.bin/rpcinfo/rpcinfo.8
index e3fb914fcd09..fd877ca55b91 100644
--- a/usr.bin/rpcinfo/rpcinfo.8
+++ b/usr.bin/rpcinfo/rpcinfo.8
@@ -1,5 +1,5 @@
 .\"	from: @(#)rpcinfo.8c	2.2 88/08/03 4.0 RPCSRC; from 1.24 88/02/25 SMI
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rpcinfo/rpcinfo.8,v 1.4.2.1 1999/08/29 15:32:19 peter Exp $
 .\"
 .Dd December 17, 1987
 .Dt RPCINFO 8
diff --git a/usr.bin/rpcinfo/rpcinfo.c b/usr.bin/rpcinfo/rpcinfo.c
index 99089bb2f305..0213722558fa 100644
--- a/usr.bin/rpcinfo/rpcinfo.c
+++ b/usr.bin/rpcinfo/rpcinfo.c
@@ -2,7 +2,7 @@
 /*static char sccsid[] = "from: @(#)rpcinfo.c 1.22 87/08/12 SMI";*/
 /*static char sccsid[] = "from: @(#)rpcinfo.c	2.2 88/08/11 4.0 RPCSRC";*/
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rpcinfo/rpcinfo.c,v 1.8.2.1 1999/08/29 15:32:20 peter Exp $";
 #endif
 
 /*
diff --git a/usr.bin/rs/rs.c b/usr.bin/rs/rs.c
index bd7dc33dcce8..6faf622899c9 100644
--- a/usr.bin/rs/rs.c
+++ b/usr.bin/rs/rs.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)rs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rs/rs.c,v 1.4.2.1 1999/08/29 15:32:21 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/rsh/Makefile b/usr.bin/rsh/Makefile
index 6b102f4dc950..f89d22f6574d 100644
--- a/usr.bin/rsh/Makefile
+++ b/usr.bin/rsh/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rsh/Makefile,v 1.9.2.1 1999/08/29 15:32:22 peter Exp $
 
 PROG=	rsh
 SRCS=	rsh.c
diff --git a/usr.bin/rsh/rsh.1 b/usr.bin/rsh/rsh.1
index be348c47cfdb..b260fb77381c 100644
--- a/usr.bin/rsh/rsh.1
+++ b/usr.bin/rsh/rsh.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rsh.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rsh/rsh.1,v 1.6.2.1 1999/10/30 15:27:58 phantom Exp $
 .\"
 .Dd June 6, 1993
 .Dt RSH 1
diff --git a/usr.bin/rsh/rsh.c b/usr.bin/rsh/rsh.c
index deea9d94990d..78146128ad98 100644
--- a/usr.bin/rsh/rsh.c
+++ b/usr.bin/rsh/rsh.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "From: @(#)rsh.c	8.3 (Berkeley) 4/6/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rsh/rsh.c,v 1.16.2.2 1999/08/29 15:32:23 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/rup/Makefile b/usr.bin/rup/Makefile
index 2e67e374bfa7..64a5cb1cd447 100644
--- a/usr.bin/rup/Makefile
+++ b/usr.bin/rup/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rup/Makefile,v 1.3.2.1 1999/08/29 15:32:24 peter Exp $
 
 PROG=	rup
 MAN1=	rup.1
diff --git a/usr.bin/rup/rup.1 b/usr.bin/rup/rup.1
index f7e83d715d12..4ac529a4f80d 100644
--- a/usr.bin/rup/rup.1
+++ b/usr.bin/rup/rup.1
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rup/rup.1,v 1.6.2.1 1999/08/29 15:32:25 peter Exp $
 .\"
 .Dd June 7, 1993
 .Dt RUP 1
diff --git a/usr.bin/rup/rup.c b/usr.bin/rup/rup.c
index b916e9d23440..11f4c76c6e59 100644
--- a/usr.bin/rup/rup.c
+++ b/usr.bin/rup/rup.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rup/rup.c,v 1.10.2.1 1999/08/29 15:32:26 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/ruptime/ruptime.1 b/usr.bin/ruptime/ruptime.1
index 03f79d4f784b..f9f523a5ff7a 100644
--- a/usr.bin/ruptime/ruptime.1
+++ b/usr.bin/ruptime/ruptime.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ruptime.1	8.2 (Berkeley) 4/5/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ruptime/ruptime.1,v 1.4.2.2 1999/08/29 15:32:27 peter Exp $
 .\"
 .Dd April 5, 1994
 .Dt RUPTIME 1
diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c
index ab275b901bbe..7e492a0edf48 100644
--- a/usr.bin/ruptime/ruptime.c
+++ b/usr.bin/ruptime/ruptime.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/ruptime/ruptime.c,v 1.11.2.1 1999/08/29 15:32:27 peter Exp $ */
 
 #ifndef lint
 static char copyright[] =
diff --git a/usr.bin/rusers/Makefile b/usr.bin/rusers/Makefile
index 6ec50ab8ea50..80ff7d37873e 100644
--- a/usr.bin/rusers/Makefile
+++ b/usr.bin/rusers/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rusers/Makefile,v 1.3.2.1 1999/08/29 15:32:28 peter Exp $
 
 PROG = rusers
 MAN1 = rusers.1
diff --git a/usr.bin/rusers/rusers.1 b/usr.bin/rusers/rusers.1
index 05044f57816b..cf19ea21889a 100644
--- a/usr.bin/rusers/rusers.1
+++ b/usr.bin/rusers/rusers.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)rusers.1	6.7 (Berkeley) 4/23/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rusers/rusers.1,v 1.6.2.1 1999/08/29 15:32:29 peter Exp $
 .\"
 .Dd April 23, 1991
 .Dt RUSERS 1
diff --git a/usr.bin/rusers/rusers.c b/usr.bin/rusers/rusers.c
index a59abd62872d..0ea0fbc30c7c 100644
--- a/usr.bin/rusers/rusers.c
+++ b/usr.bin/rusers/rusers.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rusers/rusers.c,v 1.7.2.1 1999/08/29 15:32:30 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/rwall/Makefile b/usr.bin/rwall/Makefile
index 33a2dcc6b634..1d43b37c0956 100644
--- a/usr.bin/rwall/Makefile
+++ b/usr.bin/rwall/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rwall/Makefile,v 1.3.2.1 1999/08/29 15:32:31 peter Exp $
 
 PROG = rwall
 MAN1 = rwall.1
diff --git a/usr.bin/rwall/rwall.1 b/usr.bin/rwall/rwall.1
index abdcda5b5bbe..28c6fa09f225 100644
--- a/usr.bin/rwall/rwall.1
+++ b/usr.bin/rwall/rwall.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)rwall.1	6.7 (Berkeley) 4/23/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rwall/rwall.1,v 1.5.2.1 1999/08/29 15:32:32 peter Exp $
 .\"
 .Dd April 23, 1991
 .Dt RWALL 1
diff --git a/usr.bin/rwall/rwall.c b/usr.bin/rwall/rwall.c
index 214a5a59236e..95442e3ec74e 100644
--- a/usr.bin/rwall/rwall.c
+++ b/usr.bin/rwall/rwall.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "from: @(#)wall.c	5.14 (Berkeley) 3/2/91";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rwall/rwall.c,v 1.7.2.1 1999/08/29 15:32:32 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/rwho/rwho.c b/usr.bin/rwho/rwho.c
index c9045f1f9e2f..fbb7283cbc7e 100644
--- a/usr.bin/rwho/rwho.c
+++ b/usr.bin/rwho/rwho.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)rwho.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rwho/rwho.c,v 1.12.2.1 1999/08/29 15:32:34 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/sasc/sasc.1 b/usr.bin/sasc/sasc.1
index cf5635ecd842..0b153a27c472 100644
--- a/usr.bin/sasc/sasc.1
+++ b/usr.bin/sasc/sasc.1
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/sasc/sasc.1,v 1.7.2.1 1999/08/29 15:32:36 peter Exp $
 .\"
 .Dd January 6, 1995
 .Dt SASC 1
diff --git a/usr.bin/sasc/sasc.c b/usr.bin/sasc/sasc.c
index 3b023ea8eaa6..2d2ba4c632fe 100644
--- a/usr.bin/sasc/sasc.c
+++ b/usr.bin/sasc/sasc.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/sasc/sasc.c,v 1.6.2.1 1999/08/29 15:32:36 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/script/script.1 b/usr.bin/script/script.1
index 3281f909f34b..e8db8532bba5 100644
--- a/usr.bin/script/script.1
+++ b/usr.bin/script/script.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)script.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/script/script.1,v 1.6.2.2 1999/12/13 23:47:12 billf Exp $
 .\"
 .Dd June 6, 1993
 .Dt SCRIPT 1
diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c
index 708a59b68e61..349733a0a6a2 100644
--- a/usr.bin/script/script.c
+++ b/usr.bin/script/script.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)script.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/script/script.c,v 1.9.2.2 1999/08/29 15:32:38 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/sed/compile.c b/usr.bin/sed/compile.c
index 136f56ce1197..80a67c2f8195 100644
--- a/usr.bin/sed/compile.c
+++ b/usr.bin/sed/compile.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)compile.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/sed/compile.c,v 1.12.2.1 1999/08/29 15:32:39 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c
index 88f4ea52b3e4..4bf2ee0f200c 100644
--- a/usr.bin/sed/main.c
+++ b/usr.bin/sed/main.c
@@ -46,7 +46,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.2 (Berkeley) 1/3/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/sed/main.c,v 1.8.2.1 1999/08/29 15:32:40 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/sed/misc.c b/usr.bin/sed/misc.c
index c9b013a8dbd9..a018b919bba5 100644
--- a/usr.bin/sed/misc.c
+++ b/usr.bin/sed/misc.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/sed/misc.c,v 1.2.2.1 1999/08/29 15:32:41 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/sed/process.c b/usr.bin/sed/process.c
index f7f0c3f1289d..3c1e57547412 100644
--- a/usr.bin/sed/process.c
+++ b/usr.bin/sed/process.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)process.c	8.6 (Berkeley) 4/20/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/sed/process.c,v 1.8.2.1 1999/08/29 15:32:42 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1
index 795d939c58dc..bc4809b50a9b 100644
--- a/usr.bin/shar/shar.1
+++ b/usr.bin/shar/shar.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)shar.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/shar/shar.1,v 1.6.2.1 1999/08/29 15:32:43 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt SHAR 1
diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c
index ecc528d8e6ec..17ce7093893f 100644
--- a/usr.bin/showmount/showmount.c
+++ b/usr.bin/showmount/showmount.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)showmount.c	8.3 (Berkeley) 3/29/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/showmount/showmount.c,v 1.7.2.1 1999/08/29 15:32:45 peter Exp $";
 #endif not lint
 
 #include <sys/types.h>
diff --git a/usr.bin/size/size.c b/usr.bin/size/size.c
index b42e975da34a..69269ae6c62d 100644
--- a/usr.bin/size/size.c
+++ b/usr.bin/size/size.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)size.c	8.2 (Berkeley) 12/9/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/size/size.c,v 1.4.2.1 1999/08/29 15:32:47 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/sockstat/Makefile b/usr.bin/sockstat/Makefile
index a72aadfe8ba8..b2640f003af2 100644
--- a/usr.bin/sockstat/Makefile
+++ b/usr.bin/sockstat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/sockstat/Makefile,v 1.1.2.1 1999/08/29 15:32:48 peter Exp $
 
 MAINTAINER=	des@freebsd.org
 MAN1=		sockstat.1
diff --git a/usr.bin/sockstat/sockstat.1 b/usr.bin/sockstat/sockstat.1
index 09859098f8d7..3b8707544858 100644
--- a/usr.bin/sockstat/sockstat.1
+++ b/usr.bin/sockstat/sockstat.1
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/sockstat/sockstat.1,v 1.1.2.3 1999/09/06 13:20:42 sheldonh Exp $
 .\"
 .Dd April 13, 1999
 .Dt SOCKSTAT 1
diff --git a/usr.bin/sockstat/sockstat.pl b/usr.bin/sockstat/sockstat.pl
index 3c251884cb49..836b52007c81 100644
--- a/usr.bin/sockstat/sockstat.pl
+++ b/usr.bin/sockstat/sockstat.pl
@@ -26,7 +26,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/sockstat/sockstat.pl,v 1.2.2.2 1999/08/29 15:32:49 peter Exp $
 #
 
 my (%myaddr, %hisaddr);
diff --git a/usr.bin/soelim/soelim.c b/usr.bin/soelim/soelim.c
index 9152a2791b44..352f339fa868 100644
--- a/usr.bin/soelim/soelim.c
+++ b/usr.bin/soelim/soelim.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)soelim.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/soelim/soelim.c,v 1.2.2.1 1999/08/29 15:32:50 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/split/split.1 b/usr.bin/split/split.1
index 12759bf0de64..286173e9468e 100644
--- a/usr.bin/split/split.1
+++ b/usr.bin/split/split.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)split.1	8.3 (Berkeley) 4/16/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/split/split.1,v 1.1.1.1.10.2 1999/08/29 15:32:52 peter Exp $
 .\"
 .Dd April 16, 1994
 .Dt SPLIT 1
diff --git a/usr.bin/strings/strings.c b/usr.bin/strings/strings.c
index 6a49d632035e..b8951feffa42 100644
--- a/usr.bin/strings/strings.c
+++ b/usr.bin/strings/strings.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)strings.c	8.2 (Berkeley) 1/28/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/strings/strings.c,v 1.6.2.2 1999/08/29 15:32:53 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/strip/strip.1 b/usr.bin/strip/strip.1
index e91d6d9ada33..052bc7e78f1f 100644
--- a/usr.bin/strip/strip.1
+++ b/usr.bin/strip/strip.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strip.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/strip/strip.1,v 1.6.2.1 1999/08/29 15:32:54 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt STRIP 1
diff --git a/usr.bin/strip/strip.1aout b/usr.bin/strip/strip.1aout
index e91d6d9ada33..a7d30d552997 100644
--- a/usr.bin/strip/strip.1aout
+++ b/usr.bin/strip/strip.1aout
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strip.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/strip/strip.1aout,v 1.6.2.1 1999/08/29 15:32:55 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt STRIP 1
diff --git a/usr.bin/strip/strip.c b/usr.bin/strip/strip.c
index 03ba76c6baac..b8814d201260 100644
--- a/usr.bin/strip/strip.c
+++ b/usr.bin/strip/strip.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)strip.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/strip/strip.c,v 1.11.2.1 1999/08/29 15:32:56 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile
index 33064a4e089d..30690d5c9195 100644
--- a/usr.bin/su/Makefile
+++ b/usr.bin/su/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/su/Makefile,v 1.21.2.2 1999/09/10 15:10:58 sheldonh Exp $
 
 PROG=	su
 SRCS=	su.c
diff --git a/usr.bin/su/su.1 b/usr.bin/su/su.1
index c7a05977a351..2ef0de88f11e 100644
--- a/usr.bin/su/su.1
+++ b/usr.bin/su/su.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)su.1	8.2 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/su/su.1,v 1.15.2.1 1999/08/29 15:32:57 peter Exp $
 .\"
 .\" this is for hilit19's braindeadness: "
 .Dd April 18, 1994
diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c
index cfda2014c8bb..45f61d5ef595 100644
--- a/usr.bin/su/su.c
+++ b/usr.bin/su/su.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)su.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/su/su.c,v 1.29.2.2 1999/09/10 15:10:58 sheldonh Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/symorder/symorder.c b/usr.bin/symorder/symorder.c
index 503c67eca60f..6272418f948b 100644
--- a/usr.bin/symorder/symorder.c
+++ b/usr.bin/symorder/symorder.c
@@ -42,7 +42,7 @@ char const copyright[] =
 static char sccsid[] = "@(#)symorder.c	5.8 (Berkeley) 4/1/91";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/symorder/symorder.c,v 1.14.2.1 1999/08/29 15:32:59 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/systat/cmds.c b/usr.bin/systat/cmds.c
index e15d7e28a50b..f9580ab8a6fa 100644
--- a/usr.bin/systat/cmds.c
+++ b/usr.bin/systat/cmds.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cmds.c	8.2 (Berkeley) 4/29/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/systat/cmds.c,v 1.2.2.1 1999/08/29 15:33:01 peter Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/usr.bin/systat/cmdtab.c b/usr.bin/systat/cmdtab.c
index ffb0259d474a..6a23202fc594 100644
--- a/usr.bin/systat/cmdtab.c
+++ b/usr.bin/systat/cmdtab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/systat/cmdtab.c,v 1.4.2.1 1999/08/29 15:33:02 peter Exp $";
 #endif /* not lint */
 
 #include "systat.h"
diff --git a/usr.bin/systat/devs.c b/usr.bin/systat/devs.c
index 6f9c8117063e..076fb91b55b8 100644
--- a/usr.bin/systat/devs.c
+++ b/usr.bin/systat/devs.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/systat/devs.c,v 1.3.2.1 1999/08/29 15:33:02 peter Exp $
  */
 /*
  * Some code and ideas taken from the old disks.c.
diff --git a/usr.bin/systat/devs.h b/usr.bin/systat/devs.h
index ec656543b91b..d149a3beeb3e 100644
--- a/usr.bin/systat/devs.h
+++ b/usr.bin/systat/devs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/systat/devs.h,v 1.2.2.1 1999/08/29 15:33:03 peter Exp $
  */
 
 int dsinit(int, struct statinfo *, struct statinfo *, struct statinfo *);
diff --git a/usr.bin/systat/icmp.c b/usr.bin/systat/icmp.c
index 3b5b82935364..99097fa2dbcd 100644
--- a/usr.bin/systat/icmp.c
+++ b/usr.bin/systat/icmp.c
@@ -38,7 +38,7 @@ static const char rcsid[] =
 	"Id: mbufs.c,v 1.5 1997/02/24 20:59:03 wollman Exp";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/systat/icmp.c,v 1.1.2.1 1999/08/29 15:33:04 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/systat/iostat.c b/usr.bin/systat/iostat.c
index b499a8b21046..7e7281befc85 100644
--- a/usr.bin/systat/iostat.c
+++ b/usr.bin/systat/iostat.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/systat/iostat.c,v 1.7.2.1 1999/08/29 15:33:04 peter Exp $
  */
 /*
  * Copyright (c) 1980, 1992, 1993
diff --git a/usr.bin/systat/ip.c b/usr.bin/systat/ip.c
index d54c76ddb41d..94493e510970 100644
--- a/usr.bin/systat/ip.c
+++ b/usr.bin/systat/ip.c
@@ -38,7 +38,7 @@ static const char rcsid[] =
 	"Id: mbufs.c,v 1.5 1997/02/24 20:59:03 wollman Exp";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/systat/ip.c,v 1.2.2.1 1999/08/29 15:33:05 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c
index 8454682e8eba..0312c47906e4 100644
--- a/usr.bin/systat/main.c
+++ b/usr.bin/systat/main.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/systat/main.c,v 1.10.2.1 1999/08/29 15:33:06 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/systat/mbufs.c b/usr.bin/systat/mbufs.c
index f542da99e727..37ef252409ce 100644
--- a/usr.bin/systat/mbufs.c
+++ b/usr.bin/systat/mbufs.c
@@ -34,7 +34,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/systat/mbufs.c,v 1.8.2.1 1999/08/29 15:33:07 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/systat/mode.c b/usr.bin/systat/mode.c
index 3eb85c033f1b..d7f072a99ca9 100644
--- a/usr.bin/systat/mode.c
+++ b/usr.bin/systat/mode.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/systat/mode.c,v 1.1.2.1 1999/08/29 15:33:07 peter Exp $
  */
 
 /*
diff --git a/usr.bin/systat/mode.h b/usr.bin/systat/mode.h
index caa6bae7e246..c1bb5e2e7deb 100644
--- a/usr.bin/systat/mode.h
+++ b/usr.bin/systat/mode.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/systat/mode.h,v 1.1.2.1 1999/08/29 15:33:08 peter Exp $
  */
 
 /*
diff --git a/usr.bin/systat/netcmds.c b/usr.bin/systat/netcmds.c
index b5d0422143a8..4ea32c45ecf8 100644
--- a/usr.bin/systat/netcmds.c
+++ b/usr.bin/systat/netcmds.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)netcmds.c	8.1 (Berkeley) 6/6/93";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/systat/netcmds.c,v 1.8.2.1 1999/08/29 15:33:08 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c
index ba53fdae58ab..ac50762bac23 100644
--- a/usr.bin/systat/netstat.c
+++ b/usr.bin/systat/netstat.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)netstat.c	8.1 (Berkeley) 6/6/93";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/systat/netstat.c,v 1.11.2.1 1999/08/29 15:33:09 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/systat/swap.c b/usr.bin/systat/swap.c
index 4ca2284781ac..a2dd367e09bc 100644
--- a/usr.bin/systat/swap.c
+++ b/usr.bin/systat/swap.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)swap.c	8.3 (Berkeley) 4/29/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/systat/swap.c,v 1.7.2.1 1999/08/29 15:33:10 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index 46be0931459d..25d0fdf54ef7 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)systat.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/systat/systat.1,v 1.16.2.4 1999/09/07 08:39:34 des Exp $
 .\"
 .Dd September 9, 1997
 .Dt SYSTAT 1
diff --git a/usr.bin/systat/systat.h b/usr.bin/systat/systat.h
index d8045d8fecff..17799d982038 100644
--- a/usr.bin/systat/systat.h
+++ b/usr.bin/systat/systat.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)systat.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/systat/systat.h,v 1.2.2.1 1999/08/29 15:33:11 peter Exp $
  */
 
 #include <curses.h>
diff --git a/usr.bin/systat/tcp.c b/usr.bin/systat/tcp.c
index 433721ec187f..0533e6e3917d 100644
--- a/usr.bin/systat/tcp.c
+++ b/usr.bin/systat/tcp.c
@@ -38,7 +38,7 @@ static const char rcsid[] =
 	"Id: mbufs.c,v 1.5 1997/02/24 20:59:03 wollman Exp";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/systat/tcp.c,v 1.2.2.1 1999/08/29 15:33:12 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index fd44db312abd..7d21e3c0e20a 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 1/12/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/systat/vmstat.c,v 1.32.2.2 1999/09/07 08:39:34 des Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tail/reverse.c b/usr.bin/tail/reverse.c
index 7acf45063725..c988f53ed20e 100644
--- a/usr.bin/tail/reverse.c
+++ b/usr.bin/tail/reverse.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)reverse.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tail/reverse.c,v 1.8.2.1 1999/08/29 15:33:15 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/talk/Makefile b/usr.bin/talk/Makefile
index bddde1ba259f..dc6b2f35cf4a 100644
--- a/usr.bin/talk/Makefile
+++ b/usr.bin/talk/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/talk/Makefile,v 1.6.2.1 1999/08/29 15:33:16 peter Exp $
 
 PROG=	talk
 DPADD=	${LIBCURSES} ${LIBTERMCAP}
diff --git a/usr.bin/talk/ctl.c b/usr.bin/talk/ctl.c
index c8094b47c51d..6aa679dda336 100644
--- a/usr.bin/talk/ctl.c
+++ b/usr.bin/talk/ctl.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)ctl.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/talk/ctl.c,v 1.5.2.1 1999/08/29 15:33:17 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/talk/ctl_transact.c b/usr.bin/talk/ctl_transact.c
index fa3ebad7a5c8..e8ab34f31b25 100644
--- a/usr.bin/talk/ctl_transact.c
+++ b/usr.bin/talk/ctl_transact.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)ctl_transact.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/talk/ctl_transact.c,v 1.4.2.1 1999/08/29 15:33:17 peter Exp $";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/usr.bin/talk/display.c b/usr.bin/talk/display.c
index 16c7605d447d..345f04d0719b 100644
--- a/usr.bin/talk/display.c
+++ b/usr.bin/talk/display.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)display.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/talk/display.c,v 1.6.2.1 1999/08/29 15:33:18 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/talk/get_addrs.c b/usr.bin/talk/get_addrs.c
index 871dc9ac786b..8d9eebcf9c93 100644
--- a/usr.bin/talk/get_addrs.c
+++ b/usr.bin/talk/get_addrs.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)get_addrs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/talk/get_addrs.c,v 1.3.2.1 1999/08/29 15:33:18 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/talk/get_iface.c b/usr.bin/talk/get_iface.c
index 05a8368e6b1f..a0487d9defe5 100644
--- a/usr.bin/talk/get_iface.c
+++ b/usr.bin/talk/get_iface.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/talk/get_iface.c,v 1.6.2.1 1999/08/29 15:33:19 peter Exp $";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/usr.bin/talk/get_names.c b/usr.bin/talk/get_names.c
index 73e20a162bd9..bad583f161a5 100644
--- a/usr.bin/talk/get_names.c
+++ b/usr.bin/talk/get_names.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)get_names.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/talk/get_names.c,v 1.5.2.1 1999/08/29 15:33:19 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/talk/init_disp.c b/usr.bin/talk/init_disp.c
index b752e0aa4926..59e011841da8 100644
--- a/usr.bin/talk/init_disp.c
+++ b/usr.bin/talk/init_disp.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)init_disp.c	8.2 (Berkeley) 2/16/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/talk/init_disp.c,v 1.9.2.1 1999/08/29 15:33:20 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/talk/invite.c b/usr.bin/talk/invite.c
index f941c8dde78d..1a7357d56029 100644
--- a/usr.bin/talk/invite.c
+++ b/usr.bin/talk/invite.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)invite.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/talk/invite.c,v 1.5.2.1 1999/08/29 15:33:21 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/talk/io.c b/usr.bin/talk/io.c
index 660d7430d20b..3dc7d235f9cc 100644
--- a/usr.bin/talk/io.c
+++ b/usr.bin/talk/io.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)io.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/talk/io.c,v 1.6.2.1 1999/08/29 15:33:22 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/talk/look_up.c b/usr.bin/talk/look_up.c
index 3c6f3edc2765..03b39b97084a 100644
--- a/usr.bin/talk/look_up.c
+++ b/usr.bin/talk/look_up.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)look_up.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/talk/look_up.c,v 1.4.2.1 1999/08/29 15:33:22 peter Exp $";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/usr.bin/talk/msgs.c b/usr.bin/talk/msgs.c
index 82c5038fc447..058ef115de83 100644
--- a/usr.bin/talk/msgs.c
+++ b/usr.bin/talk/msgs.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)msgs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/talk/msgs.c,v 1.4.2.1 1999/08/29 15:33:23 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/talk/talk.c b/usr.bin/talk/talk.c
index d71d49ae2b7d..0e246d6d6c80 100644
--- a/usr.bin/talk/talk.c
+++ b/usr.bin/talk/talk.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)talk.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/talk/talk.c,v 1.6.2.1 1999/08/29 15:33:23 peter Exp $";
 #endif /* not lint */
 
 #include "talk.h"
diff --git a/usr.bin/tconv/Makefile b/usr.bin/tconv/Makefile
index 403397f67e4a..24986e414f81 100644
--- a/usr.bin/tconv/Makefile
+++ b/usr.bin/tconv/Makefile
@@ -1,5 +1,5 @@
 # Makefile for tconv
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tconv/Makefile,v 1.4.2.1 1999/08/29 15:33:25 peter Exp $
 
 PROG=   tconv
 SRCS=   tconv.c quit.c
diff --git a/usr.bin/tconv/tconv.1 b/usr.bin/tconv/tconv.1
index 2cfa9c100989..9fa073cd08f4 100644
--- a/usr.bin/tconv/tconv.1
+++ b/usr.bin/tconv/tconv.1
@@ -1,5 +1,5 @@
 .\" @(#) mytinfo tconv.1 3.2 92/02/01 public domain, By Ross Ridge
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tconv/tconv.1,v 1.8.2.2 1999/08/29 15:33:25 peter Exp $
 .\"
 .Dd February 1, 1992
 .Dt TCONV 1
diff --git a/usr.bin/tconv/tconv.c b/usr.bin/tconv/tconv.c
index a9d035d028d6..94cb3e0b983f 100644
--- a/usr.bin/tconv/tconv.c
+++ b/usr.bin/tconv/tconv.c
@@ -58,7 +58,7 @@
 static const char SCCSid[] =
 	"@(#) mytinfo tconv.c 3.2 92/02/01 public domain, By Ross Ridge";
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tconv/tconv.c,v 1.4.2.1 1999/08/29 15:33:26 peter Exp $";
 #endif
 
 /* the right margin of the output */
diff --git a/usr.bin/tcopy/tcopy.c b/usr.bin/tcopy/tcopy.c
index d4520b3fceac..361615dd6589 100644
--- a/usr.bin/tcopy/tcopy.c
+++ b/usr.bin/tcopy/tcopy.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tcopy.c	8.2 (Berkeley) 4/17/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tcopy/tcopy.c,v 1.4.2.1 1999/08/29 15:33:27 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tee/tee.c b/usr.bin/tee/tee.c
index c393200780c1..dc4de367f574 100644
--- a/usr.bin/tee/tee.c
+++ b/usr.bin/tee/tee.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tee.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tee/tee.c,v 1.3.2.1 1999/08/29 15:33:29 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/telnet/telnet.1 b/usr.bin/telnet/telnet.1
index ca2e968be6fd..de53621e2448 100644
--- a/usr.bin/telnet/telnet.1
+++ b/usr.bin/telnet/telnet.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)telnet.1	8.5 (Berkeley) 3/1/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/telnet/telnet.1,v 1.10.2.3 1999/08/29 15:33:30 peter Exp $
 .\"
 .Dd March 1, 1994
 .Dt TELNET 1
diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c
index 4ae5dc4c11c0..8035bae1c384 100644
--- a/usr.bin/tftp/main.c
+++ b/usr.bin/tftp/main.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tftp/main.c,v 1.7.2.1 1999/08/29 15:33:32 peter Exp $";
 #endif /* not lint */
 
 /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
diff --git a/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c
index 9dc00afeddba..039a102d292d 100644
--- a/usr.bin/tftp/tftp.c
+++ b/usr.bin/tftp/tftp.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)tftp.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tftp/tftp.c,v 1.4.2.1 1999/08/29 15:33:33 peter Exp $";
 #endif /* not lint */
 
 /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
diff --git a/usr.bin/tftp/tftpsubs.c b/usr.bin/tftp/tftpsubs.c
index 5f3549d7dcf8..b9540a3e0111 100644
--- a/usr.bin/tftp/tftpsubs.c
+++ b/usr.bin/tftp/tftpsubs.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)tftpsubs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tftp/tftpsubs.c,v 1.2.2.1 1999/08/29 15:33:34 peter Exp $";
 #endif /* not lint */
 
 /* Simple minded read-ahead/write-behind subroutines for tftp user and
diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c
index 960d00e27aac..10b9269ce0e8 100644
--- a/usr.bin/time/time.c
+++ b/usr.bin/time/time.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)time.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/time/time.c,v 1.12.2.2 1999/08/29 15:33:35 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tip/libacu/acucommon.c b/usr.bin/tip/libacu/acucommon.c
index efb644fce7d6..0a64bb9a4163 100644
--- a/usr.bin/tip/libacu/acucommon.c
+++ b/usr.bin/tip/libacu/acucommon.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)acucommon.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/libacu/acucommon.c,v 1.2.2.1 1999/08/29 15:33:36 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/libacu/unidialer.c b/usr.bin/tip/libacu/unidialer.c
index 0206571007a1..a2c51e78360e 100644
--- a/usr.bin/tip/libacu/unidialer.c
+++ b/usr.bin/tip/libacu/unidialer.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)unidialer.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/libacu/unidialer.c,v 1.6.2.1 1999/08/29 15:33:38 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/libacu/ventel.c b/usr.bin/tip/libacu/ventel.c
index 08f2be588e62..3080cbb2f101 100644
--- a/usr.bin/tip/libacu/ventel.c
+++ b/usr.bin/tip/libacu/ventel.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)ventel.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/libacu/ventel.c,v 1.2.2.1 1999/08/29 15:33:39 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/tip/acu.c b/usr.bin/tip/tip/acu.c
index 3ee0381f9468..50097b8103e3 100644
--- a/usr.bin/tip/tip/acu.c
+++ b/usr.bin/tip/tip/acu.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)acu.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/tip/acu.c,v 1.3.2.2 1999/08/29 15:33:40 peter Exp $";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/acutab.c b/usr.bin/tip/tip/acutab.c
index 2d38c7d3efb8..83c5d1f5fb18 100644
--- a/usr.bin/tip/tip/acutab.c
+++ b/usr.bin/tip/tip/acutab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)acutab.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/tip/acutab.c,v 1.3.2.1 1999/08/29 15:33:41 peter Exp $";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/cmds.c b/usr.bin/tip/tip/cmds.c
index f0caf1e648d8..01c18a23a59a 100644
--- a/usr.bin/tip/tip/cmds.c
+++ b/usr.bin/tip/tip/cmds.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cmds.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/tip/cmds.c,v 1.8.2.2 1999/08/29 15:33:41 peter Exp $";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/cmdtab.c b/usr.bin/tip/tip/cmdtab.c
index 3ad19e89afa8..9a22a1ff236f 100644
--- a/usr.bin/tip/tip/cmdtab.c
+++ b/usr.bin/tip/tip/cmdtab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/tip/cmdtab.c,v 1.2.2.1 1999/08/29 15:33:42 peter Exp $";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/cu.c b/usr.bin/tip/tip/cu.c
index 2b3b2ed60d42..8fae40e32fa8 100644
--- a/usr.bin/tip/tip/cu.c
+++ b/usr.bin/tip/tip/cu.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cu.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/tip/cu.c,v 1.3.2.1 1999/08/29 15:33:42 peter Exp $";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/hunt.c b/usr.bin/tip/tip/hunt.c
index 90f7a613ad70..880f357a1aa0 100644
--- a/usr.bin/tip/tip/hunt.c
+++ b/usr.bin/tip/tip/hunt.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)hunt.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/tip/hunt.c,v 1.4.2.1 1999/08/29 15:33:42 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tip/tip/log.c b/usr.bin/tip/tip/log.c
index 20004e8aa683..fb178be2935f 100644
--- a/usr.bin/tip/tip/log.c
+++ b/usr.bin/tip/tip/log.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)log.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/tip/log.c,v 1.3.2.1 1999/08/29 15:33:43 peter Exp $";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/partab.c b/usr.bin/tip/tip/partab.c
index 94b2ab195e5d..8600a743edab 100644
--- a/usr.bin/tip/tip/partab.c
+++ b/usr.bin/tip/tip/partab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)partab.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/tip/partab.c,v 1.2.2.1 1999/08/29 15:33:44 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/tip/remote.c b/usr.bin/tip/tip/remote.c
index 2bc934389252..a583aa7add8e 100644
--- a/usr.bin/tip/tip/remote.c
+++ b/usr.bin/tip/tip/remote.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)remote.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/tip/remote.c,v 1.3.2.1 1999/08/29 15:33:45 peter Exp $";
 #endif /* not lint */
 
 #include <sys/syslimits.h>
diff --git a/usr.bin/tip/tip/tip.c b/usr.bin/tip/tip/tip.c
index 810c9c6b123f..f6aea815694f 100644
--- a/usr.bin/tip/tip/tip.c
+++ b/usr.bin/tip/tip/tip.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tip.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/tip/tip.c,v 1.9.2.2 1999/08/29 15:33:45 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/tip/tipout.c b/usr.bin/tip/tip/tipout.c
index c9292a870a30..8b962b6f0958 100644
--- a/usr.bin/tip/tip/tipout.c
+++ b/usr.bin/tip/tip/tipout.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)tipout.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/tip/tipout.c,v 1.5.2.1 1999/08/29 15:33:46 peter Exp $";
 #endif /* not lint */
 
 #include "tip.h"
diff --git a/usr.bin/tip/tip/value.c b/usr.bin/tip/tip/value.c
index 8be5cd9a0db0..82ce702ea775 100644
--- a/usr.bin/tip/tip/value.c
+++ b/usr.bin/tip/tip/value.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)value.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/tip/value.c,v 1.4.2.1 1999/08/29 15:33:46 peter Exp $";
 #endif /* not lint */
 
 #include "tip.h"
diff --git a/usr.bin/tip/tip/vars.c b/usr.bin/tip/tip/vars.c
index 6aba4993e23d..714c9111c382 100644
--- a/usr.bin/tip/tip/vars.c
+++ b/usr.bin/tip/tip/vars.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)vars.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/tip/vars.c,v 1.3.2.1 1999/08/29 15:33:47 peter Exp $";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tn3270/api/api_bsd.c b/usr.bin/tn3270/api/api_bsd.c
index 0e39a855b0fd..515910756473 100644
--- a/usr.bin/tn3270/api/api_bsd.c
+++ b/usr.bin/tn3270/api/api_bsd.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)api_bsd.c	8.2 (Berkeley) 1/7/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tn3270/api/api_bsd.c,v 1.2.2.1 1999/08/29 15:33:48 peter Exp $";
 #endif /* not lint */
 
 #if	defined(unix)
diff --git a/usr.bin/tn3270/ascii/mset.c b/usr.bin/tn3270/ascii/mset.c
index 8e344930320d..56dd69285980 100644
--- a/usr.bin/tn3270/ascii/mset.c
+++ b/usr.bin/tn3270/ascii/mset.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mset.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tn3270/ascii/mset.c,v 1.3.2.1 1999/08/29 15:33:50 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c
index 9dab5bbd2b7d..9f24cd8228e5 100644
--- a/usr.bin/top/machine.c
+++ b/usr.bin/top/machine.c
@@ -19,7 +19,7 @@
  *          Steven Wallace  <swallace@freebsd.org>
  *          Wolfram Schneider <wosch@FreeBSD.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/top/machine.c,v 1.18.2.3 1999/08/29 15:33:52 peter Exp $
  */
 
 
diff --git a/usr.bin/tput/tput.1 b/usr.bin/tput/tput.1
index 834f49e78585..1136236f3a07 100644
--- a/usr.bin/tput/tput.1
+++ b/usr.bin/tput/tput.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tput.1	8.2 (Berkeley) 3/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tput/tput.1,v 1.3.2.2 1999/08/29 15:33:53 peter Exp $
 .\"
 .Dd March 19, 1994
 .Dt TPUT 1
diff --git a/usr.bin/tr/str.c b/usr.bin/tr/str.c
index ff27e4add3ce..39a529929c53 100644
--- a/usr.bin/tr/str.c
+++ b/usr.bin/tr/str.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)str.c	8.2 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tr/str.c,v 1.9.2.1 1999/08/29 15:33:55 peter Exp $";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c
index b842e6d3452f..82993c4e106e 100644
--- a/usr.bin/tr/tr.c
+++ b/usr.bin/tr/tr.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tr.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tr/tr.c,v 1.7.2.1 1999/08/29 15:33:56 peter Exp $";
 #endif /* not lint */
 
 #include <locale.h>
diff --git a/usr.bin/truss/alpha-fbsd.c b/usr.bin/truss/alpha-fbsd.c
index 125e126da9c4..8c6cef3c8bad 100644
--- a/usr.bin/truss/alpha-fbsd.c
+++ b/usr.bin/truss/alpha-fbsd.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/truss/alpha-fbsd.c,v 1.2.2.1 1999/08/29 15:33:57 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/i386-fbsd.c b/usr.bin/truss/i386-fbsd.c
index 463f475cefaf..ab0f0f5aa7ab 100644
--- a/usr.bin/truss/i386-fbsd.c
+++ b/usr.bin/truss/i386-fbsd.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/truss/i386-fbsd.c,v 1.6.2.1 1999/08/29 15:33:57 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/i386-linux.c b/usr.bin/truss/i386-linux.c
index ec7632b83e0d..67ff4a6855df 100644
--- a/usr.bin/truss/i386-linux.c
+++ b/usr.bin/truss/i386-linux.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/truss/i386-linux.c,v 1.6.2.1 1999/08/29 15:33:57 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/main.c b/usr.bin/truss/main.c
index ab5c0bae20dd..9aa1d517bc6d 100644
--- a/usr.bin/truss/main.c
+++ b/usr.bin/truss/main.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/truss/main.c,v 1.13.2.1 1999/08/29 15:33:58 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/setup.c b/usr.bin/truss/setup.c
index afa011308e93..ccb0fd0aad48 100644
--- a/usr.bin/truss/setup.c
+++ b/usr.bin/truss/setup.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/truss/setup.c,v 1.8.2.1 1999/08/29 15:33:58 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/syscall.h b/usr.bin/truss/syscall.h
index ccf80edf8c89..00c5cc8e7df4 100644
--- a/usr.bin/truss/syscall.h
+++ b/usr.bin/truss/syscall.h
@@ -18,7 +18,7 @@
  * IN (meaning that the data is passed *into* the system call).
  */
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/truss/syscall.h,v 1.3.2.1 1999/08/29 15:33:59 peter Exp $
  */
 
 enum Argtype { None = 1, Hex, Octal, Int, String, Ptr, Stat, Ioctl, Quad };
diff --git a/usr.bin/truss/syscalls.c b/usr.bin/truss/syscalls.c
index 2a5915bb2019..9d0acb7542d5 100644
--- a/usr.bin/truss/syscalls.c
+++ b/usr.bin/truss/syscalls.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/truss/syscalls.c,v 1.6.2.2 1999/08/29 15:34:00 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tset/map.c b/usr.bin/tset/map.c
index 016afb1ff596..ac2922704b3e 100644
--- a/usr.bin/tset/map.c
+++ b/usr.bin/tset/map.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)map.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tset/map.c,v 1.5.2.1 1999/08/29 15:34:01 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tset/misc.c b/usr.bin/tset/misc.c
index 4d8d705a9a25..58a82195fe15 100644
--- a/usr.bin/tset/misc.c
+++ b/usr.bin/tset/misc.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tset/misc.c,v 1.3.2.1 1999/08/29 15:34:02 peter Exp $";
 #endif /* not lint */
 
 #include <fcntl.h>
diff --git a/usr.bin/tset/set.c b/usr.bin/tset/set.c
index 0f3081437d60..a99b140964ec 100644
--- a/usr.bin/tset/set.c
+++ b/usr.bin/tset/set.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)set.c	8.2 (Berkeley) 2/28/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tset/set.c,v 1.5.2.1 1999/08/29 15:34:03 peter Exp $";
 #endif /* not lint */
 
 #include <termios.h>
diff --git a/usr.bin/tset/term.c b/usr.bin/tset/term.c
index eb889ce6b123..f2386d3cbb42 100644
--- a/usr.bin/tset/term.c
+++ b/usr.bin/tset/term.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)term.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tset/term.c,v 1.2.2.1 1999/08/29 15:34:03 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c
index df6b5b452d1a..db24dd1ed660 100644
--- a/usr.bin/tset/tset.c
+++ b/usr.bin/tset/tset.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tset.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcdif[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tset/tset.c,v 1.12.2.1 1999/08/29 15:34:04 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tset/wrterm.c b/usr.bin/tset/wrterm.c
index 8c5936898d63..45dce2faf80a 100644
--- a/usr.bin/tset/wrterm.c
+++ b/usr.bin/tset/wrterm.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)wrterm.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tset/wrterm.c,v 1.2.2.1 1999/08/29 15:34:04 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tsort/tsort.c b/usr.bin/tsort/tsort.c
index 4d041d75775c..bbca469906e0 100644
--- a/usr.bin/tsort/tsort.c
+++ b/usr.bin/tsort/tsort.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/tsort/tsort.c,v 1.8.2.1 1999/08/29 15:34:06 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/tty/tty.1 b/usr.bin/tty/tty.1
index dbf0e777661c..33d80669e9a6 100644
--- a/usr.bin/tty/tty.1
+++ b/usr.bin/tty/tty.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tty.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tty/tty.1,v 1.5.2.1 1999/08/29 15:34:08 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt TTY 1
diff --git a/usr.bin/tty/tty.c b/usr.bin/tty/tty.c
index 4d02fa9dccd4..8cd1281652b2 100644
--- a/usr.bin/tty/tty.c
+++ b/usr.bin/tty/tty.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tty.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tty/tty.c,v 1.3.2.1 1999/08/29 15:34:08 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c
index cfdd55245690..a0b0f30c6d5f 100644
--- a/usr.bin/ul/ul.c
+++ b/usr.bin/ul/ul.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ul.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ul/ul.c,v 1.5.2.1 1999/08/29 15:34:09 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/unexpand/unexpand.c b/usr.bin/unexpand/unexpand.c
index ed05c85d73af..3772a3f51951 100644
--- a/usr.bin/unexpand/unexpand.c
+++ b/usr.bin/unexpand/unexpand.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)unexpand.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/unexpand/unexpand.c,v 1.4.2.1 1999/08/29 15:34:11 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/unifdef/unifdef.c b/usr.bin/unifdef/unifdef.c
index 0b7344b2eb77..4ec979597833 100644
--- a/usr.bin/unifdef/unifdef.c
+++ b/usr.bin/unifdef/unifdef.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)unifdef.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/unifdef/unifdef.c,v 1.3.2.1 1999/08/29 15:34:12 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/uniq/uniq.1 b/usr.bin/uniq/uniq.1
index e14dd517cda1..ea9b51611c16 100644
--- a/usr.bin/uniq/uniq.1
+++ b/usr.bin/uniq/uniq.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)uniq.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/uniq/uniq.1,v 1.3.2.2 1999/08/29 15:34:13 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt UNIQ 1
diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c
index 07e25a07c9cf..3c2142840285 100644
--- a/usr.bin/uniq/uniq.c
+++ b/usr.bin/uniq/uniq.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)uniq.c	8.3 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/uniq/uniq.c,v 1.5.2.5 1999/12/10 13:11:19 ache Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/units/Makefile b/usr.bin/units/Makefile
index 946132c7bb99..65e5f30f1772 100644
--- a/usr.bin/units/Makefile
+++ b/usr.bin/units/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/units/Makefile,v 1.4.2.1 1999/08/29 15:34:15 peter Exp $
 
 PROG=	units
 
diff --git a/usr.bin/units/README b/usr.bin/units/README
index 974cbe9fee3f..0a31dbccffc1 100644
--- a/usr.bin/units/README
+++ b/usr.bin/units/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/units/README,v 1.3.2.1 1999/08/29 15:34:16 peter Exp $
 
 This is a program which I wrote as a clone of the UNIX 'units'
 command.  I threw it together in a couple days, but it seems to work,
diff --git a/usr.bin/units/pathnames.h b/usr.bin/units/pathnames.h
index 227dd00b4922..3f634ff21289 100644
--- a/usr.bin/units/pathnames.h
+++ b/usr.bin/units/pathnames.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/usr.bin/units/pathnames.h,v 1.3.2.1 1999/08/29 15:34:16 peter Exp $	*/
 
 /*
  * Copyright (c) 1993 Christopher G. Demetriou
diff --git a/usr.bin/units/units.1 b/usr.bin/units/units.1
index f1c2de8602e7..1a8c288766f2 100644
--- a/usr.bin/units/units.1
+++ b/usr.bin/units/units.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/units/units.1,v 1.7.2.1 1999/08/29 15:34:17 peter Exp $
 .Dd July 14, 1993
 .Dt UNITS 1
 .Os
diff --git a/usr.bin/units/units.c b/usr.bin/units/units.c
index 7d1fd785d5b6..0d8354b9991e 100644
--- a/usr.bin/units/units.c
+++ b/usr.bin/units/units.c
@@ -17,7 +17,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/units/units.c,v 1.5.2.1 1999/08/29 15:34:18 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/units/units.lib b/usr.bin/units/units.lib
index a2f821459881..b7e77ec1712c 100644
--- a/usr.bin/units/units.lib
+++ b/usr.bin/units/units.lib
@@ -1,4 +1,4 @@
-/ $FreeBSD$
+/ $FreeBSD: src/usr.bin/units/units.lib,v 1.3.2.2 1999/08/29 15:34:18 peter Exp $
 
 / primitive units
 
diff --git a/usr.bin/unvis/unvis.c b/usr.bin/unvis/unvis.c
index 418b74ec460b..360b8f61cba2 100644
--- a/usr.bin/unvis/unvis.c
+++ b/usr.bin/unvis/unvis.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)unvis.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/unvis/unvis.c,v 1.4.2.1 1999/08/29 15:34:20 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/users/users.c b/usr.bin/users/users.c
index 7acb26836e40..eac59d0b4ce7 100644
--- a/usr.bin/users/users.c
+++ b/usr.bin/users/users.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)users.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/users/users.c,v 1.4.2.1 1999/08/29 15:34:21 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/uudecode/uudecode.c b/usr.bin/uudecode/uudecode.c
index 247e80212d1e..89035474fbb9 100644
--- a/usr.bin/uudecode/uudecode.c
+++ b/usr.bin/uudecode/uudecode.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)uudecode.c	8.2 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/uudecode/uudecode.c,v 1.12.2.1 1999/08/29 15:34:23 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/uuencode/uuencode.1 b/usr.bin/uuencode/uuencode.1
index 9616d6608974..dea9ef3ccd02 100644
--- a/usr.bin/uuencode/uuencode.1
+++ b/usr.bin/uuencode/uuencode.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)uuencode.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/uuencode/uuencode.1,v 1.7.2.1 1999/08/29 15:34:24 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt UUENCODE 1
diff --git a/usr.bin/uuencode/uuencode.c b/usr.bin/uuencode/uuencode.c
index e8696e900d0a..febc26ba26ce 100644
--- a/usr.bin/uuencode/uuencode.c
+++ b/usr.bin/uuencode/uuencode.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)uuencode.c	8.2 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/uuencode/uuencode.c,v 1.3.2.1 1999/08/29 15:34:24 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/vacation/Makefile b/usr.bin/vacation/Makefile
index ee668d894e64..6de17d9d5875 100644
--- a/usr.bin/vacation/Makefile
+++ b/usr.bin/vacation/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/vacation/Makefile,v 1.5.2.1 1999/08/29 15:34:25 peter Exp $
 
 PROG=	vacation
 CFLAGS+= -Wall
diff --git a/usr.bin/vacation/vacation.1 b/usr.bin/vacation/vacation.1
index 7d2c6aee6558..2a50c34f5d48 100644
--- a/usr.bin/vacation/vacation.1
+++ b/usr.bin/vacation/vacation.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)vacation.1	8.1 (Berkeley) 6/16/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/vacation/vacation.1,v 1.6.2.2 1999/08/29 15:34:27 peter Exp $
 .\"
 .Dd June 16, 1993
 .Dt VACATION 1
diff --git a/usr.bin/vacation/vacation.c b/usr.bin/vacation/vacation.c
index 98a2987abd3c..4a06ed0d29f8 100644
--- a/usr.bin/vacation/vacation.c
+++ b/usr.bin/vacation/vacation.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)from: vacation.c	8.2 (Berkeley) 1/26/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/vacation/vacation.c,v 1.13.2.2 1999/08/29 15:34:27 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/vgrind/vfontedpr.c b/usr.bin/vgrind/vfontedpr.c
index 09c63380307f..d3b8050f77c9 100644
--- a/usr.bin/vgrind/vfontedpr.c
+++ b/usr.bin/vgrind/vfontedpr.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)vfontedpr.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/vgrind/vfontedpr.c,v 1.11.2.1 1999/08/29 15:34:28 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile
index d2c463e06d2d..f0cbef5babc1 100644
--- a/usr.bin/vi/Makefile
+++ b/usr.bin/vi/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/vi/Makefile,v 1.24.2.1 1999/08/29 15:34:30 peter Exp $
 #
 # This has most of the glue needed to compile tknvi and the perl hooks,
 # but not all.
diff --git a/usr.bin/vis/foldit.c b/usr.bin/vis/foldit.c
index 6cf63f35ac05..af2ac3f3f3ea 100644
--- a/usr.bin/vis/foldit.c
+++ b/usr.bin/vis/foldit.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)foldit.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/vis/foldit.c,v 1.3.2.1 1999/08/29 15:34:31 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.bin/vis/vis.c b/usr.bin/vis/vis.c
index 0ff6a21f0a0f..7760c36abe5f 100644
--- a/usr.bin/vis/vis.c
+++ b/usr.bin/vis/vis.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)vis.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/vis/vis.c,v 1.5.2.1 1999/08/29 15:34:32 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/vmstat/vmstat.8 b/usr.bin/vmstat/vmstat.8
index 6fc6e4e67b7c..c4b673661beb 100644
--- a/usr.bin/vmstat/vmstat.8
+++ b/usr.bin/vmstat/vmstat.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)vmstat.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/vmstat/vmstat.8,v 1.10.2.2 1999/08/29 15:34:33 peter Exp $
 .\"
 .Dd June 6, 1996
 .Dt VMSTAT 8
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index 0dcefca9f551..d0e103440931 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)vmstat.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/vmstat/vmstat.c,v 1.29.2.2 1999/08/29 15:34:34 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/w/pr_time.c b/usr.bin/w/pr_time.c
index 4b9614c1af88..a1420aea5668 100644
--- a/usr.bin/w/pr_time.c
+++ b/usr.bin/w/pr_time.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)pr_time.c	8.2 (Berkeley) 4/4/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/w/pr_time.c,v 1.12.2.2 1999/11/15 02:28:54 davidn Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/w/w.1 b/usr.bin/w/w.1
index 12f3da808c13..798d954b10fd 100644
--- a/usr.bin/w/w.1
+++ b/usr.bin/w/w.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)w.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/w/w.1,v 1.10.2.2 1999/10/30 22:15:30 green Exp $
 .\"
 .Dd June 6, 1993
 .Dt W 1
diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c
index 6441ee8f8966..d119d66fe24e 100644
--- a/usr.bin/w/w.c
+++ b/usr.bin/w/w.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)w.c	8.4 (Berkeley) 4/16/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/w/w.c,v 1.32.2.2 1999/10/30 22:15:31 green Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/wall/ttymsg.c b/usr.bin/wall/ttymsg.c
index 2b58a1b97eb8..6c693119423a 100644
--- a/usr.bin/wall/ttymsg.c
+++ b/usr.bin/wall/ttymsg.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)ttymsg.c	8.2 (Berkeley) 11/16/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/wall/ttymsg.c,v 1.3.2.1 1999/08/29 15:34:39 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/wall/wall.c b/usr.bin/wall/wall.c
index 941211963d7e..a8619a0ba734 100644
--- a/usr.bin/wall/wall.c
+++ b/usr.bin/wall/wall.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)wall.c	8.2 (Berkeley) 11/16/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/wall/wall.c,v 1.10.2.2 1999/09/09 23:05:51 dbaker Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/wc/wc.1 b/usr.bin/wc/wc.1
index 86fc751fe7ac..5c02e7953fac 100644
--- a/usr.bin/wc/wc.1
+++ b/usr.bin/wc/wc.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)wc.1	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/wc/wc.1,v 1.5.2.1 1999/08/29 15:34:40 peter Exp $
 .\"
 .Dd April 19, 1994
 .Dt WC 1
diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c
index 3793a905af2a..1fa5c2bd3134 100644
--- a/usr.bin/wc/wc.c
+++ b/usr.bin/wc/wc.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)wc.c	8.1 (Berkeley) 6/6/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/wc/wc.c,v 1.8.2.3 1999/08/29 15:34:41 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/what/what.1 b/usr.bin/what/what.1
index b5fe8bb05c80..c3ffa4b62f99 100644
--- a/usr.bin/what/what.1
+++ b/usr.bin/what/what.1
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)what.1	8.1 (Berkeley) 6/6/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/what/what.1,v 1.9.2.1 1999/08/29 15:34:43 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt WHAT 1
diff --git a/usr.bin/what/what.c b/usr.bin/what/what.c
index 5a9bf35018ec..c3a836b20d0a 100644
--- a/usr.bin/what/what.c
+++ b/usr.bin/what/what.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)what.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/what/what.c,v 1.4.2.1 1999/08/29 15:34:44 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/whereis/whereis.1 b/usr.bin/whereis/whereis.1
index d3ca9866d5ac..10cc33c0614b 100644
--- a/usr.bin/whereis/whereis.1
+++ b/usr.bin/whereis/whereis.1
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)whereis.1	8.2 (Berkeley) 12/30/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/whereis/whereis.1,v 1.6.2.1 1999/08/29 15:34:45 peter Exp $
 .\"
 .Dd June 15, 1996
 .Dt WHEREIS 1
diff --git a/usr.bin/whereis/whereis.pl b/usr.bin/whereis/whereis.pl
index 7fce8e9fd866..90e803e2651f 100644
--- a/usr.bin/whereis/whereis.pl
+++ b/usr.bin/whereis/whereis.pl
@@ -28,7 +28,7 @@
 #
 # Rewritten from scratch for FreeBSD after the 4.3BSD manual page.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/whereis/whereis.pl,v 1.6.2.1 1999/08/29 15:34:45 peter Exp $
 #
 
 sub usage
diff --git a/usr.bin/which/which.1 b/usr.bin/which/which.1
index e9ae9d32ae70..447cf6957ffd 100644
--- a/usr.bin/which/which.1
+++ b/usr.bin/which/which.1
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 .\" OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/which/which.1,v 1.12.2.1 1999/08/29 15:34:46 peter Exp $
 .Dd January 26, 1995
 .Dt WHICH 1
 .Os FreeBSD
diff --git a/usr.bin/which/which.pl b/usr.bin/which/which.pl
index 781e1c151602..3d046ec96f25 100755
--- a/usr.bin/which/which.pl
+++ b/usr.bin/which/which.pl
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/which/which.pl,v 1.13.2.1 1999/08/29 15:34:47 peter Exp $
 
 $all = $silent = $found = 0;
 @path = split(/:/, $ENV{'PATH'});
diff --git a/usr.bin/who/who.1 b/usr.bin/who/who.1
index 6352eab33d8c..5cd215b20689 100644
--- a/usr.bin/who/who.1
+++ b/usr.bin/who/who.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)who.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/who/who.1,v 1.6.2.1 1999/08/29 15:34:48 peter Exp $
 .\"
 .Dd December 30, 1993
 .Dt WHO 1
diff --git a/usr.bin/who/who.c b/usr.bin/who/who.c
index 76ecdc2ae94d..0d9eb731b9ec 100644
--- a/usr.bin/who/who.c
+++ b/usr.bin/who/who.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)who.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/who/who.c,v 1.8.2.1 1999/08/29 15:34:49 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/whois/Makefile b/usr.bin/whois/Makefile
index 299c963fb1a6..fa6ce6857a44 100644
--- a/usr.bin/whois/Makefile
+++ b/usr.bin/whois/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/whois/Makefile,v 1.2.4.1 1999/12/06 22:05:37 joe Exp $
 
 PROG=	whois
 
diff --git a/usr.bin/whois/whois.1 b/usr.bin/whois/whois.1
index 0a61dc61b557..0355881c9deb 100644
--- a/usr.bin/whois/whois.1
+++ b/usr.bin/whois/whois.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)whois.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/whois/whois.1,v 1.4.2.3 1999/12/06 22:05:38 joe Exp $
 .\"
 .Dd November 17, 1999
 .Dt WHOIS 1
diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c
index 0ef3d4b5c30f..0b432b153518 100644
--- a/usr.bin/whois/whois.c
+++ b/usr.bin/whois/whois.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)whois.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/whois/whois.c,v 1.6.2.3 1999/12/06 22:05:38 joe Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/write/write.1 b/usr.bin/write/write.1
index 2b9490209418..ed24d2c5060e 100644
--- a/usr.bin/write/write.1
+++ b/usr.bin/write/write.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)write.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/write/write.1,v 1.6.2.1 1999/08/29 15:34:53 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt WRITE 1
diff --git a/usr.bin/write/write.c b/usr.bin/write/write.c
index f3827de092f9..d4d5fe554a15 100644
--- a/usr.bin/write/write.c
+++ b/usr.bin/write/write.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)write.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/write/write.c,v 1.10.2.1 1999/08/29 15:34:53 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c
index 2ad94cc90926..3c3e43802095 100644
--- a/usr.bin/xargs/xargs.c
+++ b/usr.bin/xargs/xargs.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)xargs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/xargs/xargs.c,v 1.7.2.2 1999/08/29 15:34:54 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1
index 46179cbf73fd..f75d289b9daa 100644
--- a/usr.bin/xinstall/install.1
+++ b/usr.bin/xinstall/install.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)install.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/xinstall/install.1,v 1.13.2.1 1999/08/29 15:34:56 peter Exp $
 .\"
 .Dd September 22, 1996
 .Dt INSTALL 1
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index 769d095624c5..3a02c19c2cc5 100644
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "From: @(#)xinstall.c	8.1 (Berkeley) 7/21/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/xinstall/xinstall.c,v 1.34.2.1 1999/08/29 15:34:57 peter Exp $";
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/xlint/lint1/Makefile b/usr.bin/xlint/lint1/Makefile
index fef8dae73801..a74d41398741 100644
--- a/usr.bin/xlint/lint1/Makefile
+++ b/usr.bin/xlint/lint1/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.3 1995/07/04 01:53:05 cgd Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/xlint/lint1/Makefile,v 1.6.2.1 1999/08/29 15:34:59 peter Exp $
 
 PROG=	lint1
 SRCS=	cgram.y scan.l mem1.c mem.c err.c main1.c decl.c tree.c func.c \
diff --git a/usr.bin/xstr/xstr.c b/usr.bin/xstr/xstr.c
index 8160bb857630..e84c1fc0d77d 100644
--- a/usr.bin/xstr/xstr.c
+++ b/usr.bin/xstr/xstr.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)xstr.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/xstr/xstr.c,v 1.3.2.1 1999/08/29 15:35:01 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/yacc/Makefile b/usr.bin/yacc/Makefile
index 3a871d989b4e..e4e28fd81a73 100644
--- a/usr.bin/yacc/Makefile
+++ b/usr.bin/yacc/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	5.3 (Berkeley) 5/12/90
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/yacc/Makefile,v 1.7.2.1 1999/08/29 15:35:03 peter Exp $
 
 PROG=	yacc
 SRCS=	closure.c error.c lalr.c lr0.c main.c mkpar.c output.c reader.c \
diff --git a/usr.bin/yacc/closure.c b/usr.bin/yacc/closure.c
index 4caf45857640..9f9023745a7e 100644
--- a/usr.bin/yacc/closure.c
+++ b/usr.bin/yacc/closure.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/yacc/closure.c,v 1.5.2.1 1999/08/29 15:35:03 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/defs.h b/usr.bin/yacc/defs.h
index 46f3efad22d0..e885d84542e5 100644
--- a/usr.bin/yacc/defs.h
+++ b/usr.bin/yacc/defs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)defs.h	5.6 (Berkeley) 5/24/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/yacc/defs.h,v 1.6.2.1 1999/08/29 15:35:04 peter Exp $
  */
 
 #include <sys/cdefs.h>	/* for __P macro */
diff --git a/usr.bin/yacc/error.c b/usr.bin/yacc/error.c
index 3229f345104c..e4bb92113c25 100644
--- a/usr.bin/yacc/error.c
+++ b/usr.bin/yacc/error.c
@@ -39,7 +39,7 @@
 static char const sccsid[] = "@(#)error.c	5.3 (Berkeley) 6/1/90";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/yacc/error.c,v 1.6.2.1 1999/08/29 15:35:04 peter Exp $";
 #endif /* not lint */
 
 /* routines for printing error messages  */
diff --git a/usr.bin/yacc/lalr.c b/usr.bin/yacc/lalr.c
index bd61e489e46b..8459d2bdc15e 100644
--- a/usr.bin/yacc/lalr.c
+++ b/usr.bin/yacc/lalr.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/yacc/lalr.c,v 1.6.2.1 1999/08/29 15:35:05 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/lr0.c b/usr.bin/yacc/lr0.c
index 07816d2ac114..9515c98cea5d 100644
--- a/usr.bin/yacc/lr0.c
+++ b/usr.bin/yacc/lr0.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/yacc/lr0.c,v 1.5.2.1 1999/08/29 15:35:06 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/main.c b/usr.bin/yacc/main.c
index 0a5511fdf568..9087bb57c5c8 100644
--- a/usr.bin/yacc/main.c
+++ b/usr.bin/yacc/main.c
@@ -45,7 +45,7 @@ static char const copyright[] =
 static char const sccsid[] = "@(#)main.c	5.5 (Berkeley) 5/24/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/yacc/main.c,v 1.9.2.1 1999/08/29 15:35:06 peter Exp $";
 #endif /* not lint */
 
 #include <signal.h>
diff --git a/usr.bin/yacc/mkpar.c b/usr.bin/yacc/mkpar.c
index 2d1147a69f86..203684251b5f 100644
--- a/usr.bin/yacc/mkpar.c
+++ b/usr.bin/yacc/mkpar.c
@@ -39,7 +39,7 @@
 static char const sccsid[] = "@(#)mkpar.c	5.3 (Berkeley) 1/20/91";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/yacc/mkpar.c,v 1.7.2.1 1999/08/29 15:35:07 peter Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/usr.bin/yacc/output.c b/usr.bin/yacc/output.c
index 255aeea809b2..764d8ca012c9 100644
--- a/usr.bin/yacc/output.c
+++ b/usr.bin/yacc/output.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/yacc/output.c,v 1.10.2.1 1999/08/29 15:35:08 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/reader.c b/usr.bin/yacc/reader.c
index 48609d5a32a9..2b92b44d59ab 100644
--- a/usr.bin/yacc/reader.c
+++ b/usr.bin/yacc/reader.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/yacc/reader.c,v 1.6.2.1 1999/08/29 15:35:09 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/skeleton.c b/usr.bin/yacc/skeleton.c
index 266b03042af8..31efb8023b4d 100644
--- a/usr.bin/yacc/skeleton.c
+++ b/usr.bin/yacc/skeleton.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.14.2.1 1999/08/29 15:35:09 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/symtab.c b/usr.bin/yacc/symtab.c
index f155021bb68e..909f00a2d8b9 100644
--- a/usr.bin/yacc/symtab.c
+++ b/usr.bin/yacc/symtab.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/yacc/symtab.c,v 1.5.2.1 1999/08/29 15:35:10 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/verbose.c b/usr.bin/yacc/verbose.c
index 69ce15e1d271..27558e26b8df 100644
--- a/usr.bin/yacc/verbose.c
+++ b/usr.bin/yacc/verbose.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/yacc/verbose.c,v 1.5.2.1 1999/08/29 15:35:10 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/warshall.c b/usr.bin/yacc/warshall.c
index 37408c0b3fa9..333c5a227d31 100644
--- a/usr.bin/yacc/warshall.c
+++ b/usr.bin/yacc/warshall.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/yacc/warshall.c,v 1.5.2.1 1999/08/29 15:35:11 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/yacc.1 b/usr.bin/yacc/yacc.1
index 23a3b0d5b4a9..41feb43578cf 100644
--- a/usr.bin/yacc/yacc.1
+++ b/usr.bin/yacc/yacc.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)yacc.1	5.8 (Berkeley) 5/24/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/yacc/yacc.1,v 1.8.2.1 1999/08/29 15:35:11 peter Exp $
 .\"
 .Dd May 24, 1993
 .Dt YACC 1
diff --git a/usr.bin/yacc/yyfix.1 b/usr.bin/yacc/yyfix.1
index 3b50a624e2d8..d7bebb4cdecf 100644
--- a/usr.bin/yacc/yyfix.1
+++ b/usr.bin/yacc/yyfix.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)yyfix.1	5.4 (Berkeley) 3/23/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/yacc/yyfix.1,v 1.2.2.1 1999/08/29 15:35:12 peter Exp $
 .\"
 .Dd March 23, 1993
 .Dt YYFIX 1
diff --git a/usr.bin/ypcat/Makefile b/usr.bin/ypcat/Makefile
index 58ee6907f07f..e3e04ed5bc9a 100644
--- a/usr.bin/ypcat/Makefile
+++ b/usr.bin/ypcat/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ypcat/Makefile,v 1.3.2.1 1999/08/29 15:35:15 peter Exp $
 
 PROG=	ypcat
 
diff --git a/usr.bin/ypcat/ypcat.1 b/usr.bin/ypcat/ypcat.1
index 139b2c6e5799..55444fd76a66 100644
--- a/usr.bin/ypcat/ypcat.1
+++ b/usr.bin/ypcat/ypcat.1
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ypcat/ypcat.1,v 1.7.2.1 1999/08/29 15:35:16 peter Exp $
 .\"
 .Dd December 3, 1993
 .Dt YPCAT 1
diff --git a/usr.bin/ypcat/ypcat.c b/usr.bin/ypcat/ypcat.c
index e90e763a0349..45cd75c5aaf6 100644
--- a/usr.bin/ypcat/ypcat.c
+++ b/usr.bin/ypcat/ypcat.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ypcat/ypcat.c,v 1.3.2.1 1999/08/29 15:35:17 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ypmatch/Makefile b/usr.bin/ypmatch/Makefile
index 22e62996937e..0309c4425aac 100644
--- a/usr.bin/ypmatch/Makefile
+++ b/usr.bin/ypmatch/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ypmatch/Makefile,v 1.3.2.1 1999/08/29 15:35:18 peter Exp $
 
 PROG=	ypmatch
 
diff --git a/usr.bin/ypmatch/ypmatch.1 b/usr.bin/ypmatch/ypmatch.1
index 6491407e942a..c7ecee27bb49 100644
--- a/usr.bin/ypmatch/ypmatch.1
+++ b/usr.bin/ypmatch/ypmatch.1
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ypmatch/ypmatch.1,v 1.7.2.1 1999/08/29 15:35:18 peter Exp $
 .\"
 .Dd December 3, 1993
 .Dt YPMATCH 1
diff --git a/usr.bin/ypmatch/ypmatch.c b/usr.bin/ypmatch/ypmatch.c
index be266bb7e1e0..4b11f220b458 100644
--- a/usr.bin/ypmatch/ypmatch.c
+++ b/usr.bin/ypmatch/ypmatch.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ypmatch/ypmatch.c,v 1.6.2.1 1999/08/29 15:35:19 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ypwhich/Makefile b/usr.bin/ypwhich/Makefile
index f28f864ab097..00637e6d16d1 100644
--- a/usr.bin/ypwhich/Makefile
+++ b/usr.bin/ypwhich/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ypwhich/Makefile,v 1.4.2.1 1999/08/29 15:35:20 peter Exp $
 
 PROG=	ypwhich
 
diff --git a/usr.bin/ypwhich/ypwhich.1 b/usr.bin/ypwhich/ypwhich.1
index 88ca36d759ba..c1556db6b520 100644
--- a/usr.bin/ypwhich/ypwhich.1
+++ b/usr.bin/ypwhich/ypwhich.1
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ypwhich/ypwhich.1,v 1.3.2.1 1999/08/29 15:35:21 peter Exp $
 .\"
 .Dd February 23, 1994
 .Dt YPWHICH 1
diff --git a/usr.bin/ypwhich/ypwhich.c b/usr.bin/ypwhich/ypwhich.c
index 2bc9ff377dd5..5a2f7f53150c 100644
--- a/usr.bin/ypwhich/ypwhich.c
+++ b/usr.bin/ypwhich/ypwhich.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ypwhich/ypwhich.c,v 1.10.2.1 1999/08/29 15:35:22 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/IPXrouted/IPXrouted.8 b/usr.sbin/IPXrouted/IPXrouted.8
index bed2ed619fe1..e6081dc073c2 100644
--- a/usr.sbin/IPXrouted/IPXrouted.8
+++ b/usr.sbin/IPXrouted/IPXrouted.8
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/IPXrouted/IPXrouted.8,v 1.3.4.2 1999/12/11 14:34:45 jhay Exp $
 .\"
 .Dd Oct 11, 1995
 .Dt IPXROUTED 8
diff --git a/usr.sbin/IPXrouted/Makefile b/usr.sbin/IPXrouted/Makefile
index 8d5c3557ce68..8386d9dac83f 100644
--- a/usr.sbin/IPXrouted/Makefile
+++ b/usr.sbin/IPXrouted/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/IPXrouted/Makefile,v 1.3.2.1 1999/08/29 15:38:44 peter Exp $
 
 PROG=	IPXrouted
 MAN8=	IPXrouted.8
diff --git a/usr.sbin/IPXrouted/af.c b/usr.sbin/IPXrouted/af.c
index 74455dfe39e9..be10baecdf86 100644
--- a/usr.sbin/IPXrouted/af.c
+++ b/usr.sbin/IPXrouted/af.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/af.c,v 1.5.2.1 1999/08/29 15:38:45 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/af.h b/usr.sbin/IPXrouted/af.h
index 576a6c7adc04..e136dc25b9e7 100644
--- a/usr.sbin/IPXrouted/af.h
+++ b/usr.sbin/IPXrouted/af.h
@@ -36,7 +36,7 @@
  *
  *	@(#)af.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/af.h,v 1.3.2.1 1999/08/29 15:38:46 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/IPXrouted/defs.h b/usr.sbin/IPXrouted/defs.h
index 3a1e6ac803ce..f92fac4476c6 100644
--- a/usr.sbin/IPXrouted/defs.h
+++ b/usr.sbin/IPXrouted/defs.h
@@ -34,7 +34,7 @@
  *
  *	@(#)defs.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/defs.h,v 1.6.2.2 1999/08/29 15:38:46 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/IPXrouted/if.c b/usr.sbin/IPXrouted/if.c
index 7b914e7bd200..d02e8bc110cc 100644
--- a/usr.sbin/IPXrouted/if.c
+++ b/usr.sbin/IPXrouted/if.c
@@ -34,7 +34,7 @@
  *
  * static char sccsid[] = "@(#)if.c	5.1 (Berkeley) 6/4/85"; (routed/if.c)
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/if.c,v 1.4.2.1 1999/08/29 15:38:47 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/input.c b/usr.sbin/IPXrouted/input.c
index a2e8c261ce67..af5dc369926f 100644
--- a/usr.sbin/IPXrouted/input.c
+++ b/usr.sbin/IPXrouted/input.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/input.c,v 1.6.2.1 1999/08/29 15:38:47 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/interface.h b/usr.sbin/IPXrouted/interface.h
index ed7b9889dcff..941b561bb877 100644
--- a/usr.sbin/IPXrouted/interface.h
+++ b/usr.sbin/IPXrouted/interface.h
@@ -34,7 +34,7 @@
  *
  *	@(#)interface.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/interface.h,v 1.3.2.1 1999/08/29 15:38:48 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/IPXrouted/main.c b/usr.sbin/IPXrouted/main.c
index 91fe635dbb96..ac519185a91f 100644
--- a/usr.sbin/IPXrouted/main.c
+++ b/usr.sbin/IPXrouted/main.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/main.c,v 1.7.2.3 1999/12/11 14:34:45 jhay Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/output.c b/usr.sbin/IPXrouted/output.c
index 1e60fc893cdd..1573d0b3744a 100644
--- a/usr.sbin/IPXrouted/output.c
+++ b/usr.sbin/IPXrouted/output.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/output.c,v 1.7.2.1 1999/08/29 15:38:48 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/protocol.h b/usr.sbin/IPXrouted/protocol.h
index 7fae5363cf02..6a605d78686c 100644
--- a/usr.sbin/IPXrouted/protocol.h
+++ b/usr.sbin/IPXrouted/protocol.h
@@ -37,7 +37,7 @@
  *
  *	@(#)protocol.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/protocol.h,v 1.4.2.1 1999/08/29 15:38:49 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/IPXrouted/sap.h b/usr.sbin/IPXrouted/sap.h
index b4e9dcb6ef51..bcc9494ff1f4 100644
--- a/usr.sbin/IPXrouted/sap.h
+++ b/usr.sbin/IPXrouted/sap.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/sap.h,v 1.6.2.1 1999/08/29 15:38:49 peter Exp $
  */
 #ifndef _SAP_H_
 #define _SAP_H_
diff --git a/usr.sbin/IPXrouted/sap_input.c b/usr.sbin/IPXrouted/sap_input.c
index 59281b29cac5..265795e44032 100644
--- a/usr.sbin/IPXrouted/sap_input.c
+++ b/usr.sbin/IPXrouted/sap_input.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/sap_input.c,v 1.5.2.2 1999/08/29 15:38:50 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/IPXrouted/sap_output.c b/usr.sbin/IPXrouted/sap_output.c
index 15452c8977d0..ae9f63a66d52 100644
--- a/usr.sbin/IPXrouted/sap_output.c
+++ b/usr.sbin/IPXrouted/sap_output.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/sap_output.c,v 1.8.2.1 1999/08/29 15:38:50 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/IPXrouted/sap_tables.c b/usr.sbin/IPXrouted/sap_tables.c
index f2d83e0b3198..510beca4c9a2 100644
--- a/usr.sbin/IPXrouted/sap_tables.c
+++ b/usr.sbin/IPXrouted/sap_tables.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/sap_tables.c,v 1.5.2.2 1999/08/29 15:38:51 peter Exp $
  */
 
 #include "defs.h"
diff --git a/usr.sbin/IPXrouted/startup.c b/usr.sbin/IPXrouted/startup.c
index db443abb338b..492e4f95867e 100644
--- a/usr.sbin/IPXrouted/startup.c
+++ b/usr.sbin/IPXrouted/startup.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/startup.c,v 1.6.2.2 1999/08/29 15:38:51 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/table.h b/usr.sbin/IPXrouted/table.h
index 3f9693f187f3..57273e179fc8 100644
--- a/usr.sbin/IPXrouted/table.h
+++ b/usr.sbin/IPXrouted/table.h
@@ -36,7 +36,7 @@
  *
  *	@(#)table.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/table.h,v 1.5.2.1 1999/08/29 15:38:52 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/IPXrouted/tables.c b/usr.sbin/IPXrouted/tables.c
index 8801b111caf8..b65e22ac93a7 100644
--- a/usr.sbin/IPXrouted/tables.c
+++ b/usr.sbin/IPXrouted/tables.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/tables.c,v 1.6.2.1 1999/08/29 15:38:52 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/timer.c b/usr.sbin/IPXrouted/timer.c
index 8b31c1deb1d6..c75e23e34af6 100644
--- a/usr.sbin/IPXrouted/timer.c
+++ b/usr.sbin/IPXrouted/timer.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/timer.c,v 1.4.2.1 1999/08/29 15:38:53 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/trace.c b/usr.sbin/IPXrouted/trace.c
index 63fb1e9bd5dc..ba93f5d86e10 100644
--- a/usr.sbin/IPXrouted/trace.c
+++ b/usr.sbin/IPXrouted/trace.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/trace.c,v 1.5.2.1 1999/08/29 15:38:53 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/trace.h b/usr.sbin/IPXrouted/trace.h
index c83a9d1b4572..e646eba54543 100644
--- a/usr.sbin/IPXrouted/trace.h
+++ b/usr.sbin/IPXrouted/trace.h
@@ -37,7 +37,7 @@
  *
  *	@(#)trace.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/trace.h,v 1.6.2.1 1999/08/29 15:38:54 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 319d3cce2b4d..7985f4edbce5 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.20 (Berkeley) 6/12/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/Makefile,v 1.147.2.12 1999/12/13 15:08:20 peter Exp $
 
 # XXX MISSING:		mkproto
 SUBDIR=	IPXrouted \
diff --git a/usr.sbin/ac/Makefile b/usr.sbin/ac/Makefile
index 612b4c29932f..937f72eb6eae 100644
--- a/usr.sbin/ac/Makefile
+++ b/usr.sbin/ac/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ac/Makefile,v 1.3.2.1 1999/08/29 15:38:56 peter Exp $
 
 PROG=	ac
 MAN8=	ac.8
diff --git a/usr.sbin/ac/ac.8 b/usr.sbin/ac/ac.8
index f78fb8d9c2c5..149add4e72f0 100644
--- a/usr.sbin/ac/ac.8
+++ b/usr.sbin/ac/ac.8
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ac/ac.8,v 1.10.2.3 1999/08/29 15:38:57 peter Exp $
 .\"
 .Dd March 15, 1994
 .Dt AC 8
diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c
index 47732eea1f75..f00cd806a8b9 100644
--- a/usr.sbin/ac/ac.c
+++ b/usr.sbin/ac/ac.c
@@ -15,7 +15,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/ac/ac.c,v 1.10.2.3 1999/08/29 15:38:58 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/accton/accton.c b/usr.sbin/accton/accton.c
index 4e9a9329b1c6..286cc17eda34 100644
--- a/usr.sbin/accton/accton.c
+++ b/usr.sbin/accton/accton.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)accton.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/accton/accton.c,v 1.4.2.1 1999/08/29 15:38:59 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/adduser/Makefile b/usr.sbin/adduser/Makefile
index 02ef5312c20c..3aa4626f3486 100644
--- a/usr.sbin/adduser/Makefile
+++ b/usr.sbin/adduser/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/adduser/Makefile,v 1.12.2.1 1999/08/29 15:39:00 peter Exp $
 
 SCRIPTS= adduser.perl rmuser.perl
 MAN8=	 adduser.8    rmuser.8
diff --git a/usr.sbin/adduser/adduser.8 b/usr.sbin/adduser/adduser.8
index a1ca1480e524..a2c620f421f2 100644
--- a/usr.sbin/adduser/adduser.8
+++ b/usr.sbin/adduser/adduser.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/adduser/adduser.8,v 1.26.2.1 1999/08/29 15:39:01 peter Exp $
 .\"
 .Dd January 9, 1995
 .Dt ADDUSER 8
diff --git a/usr.sbin/adduser/adduser.perl b/usr.sbin/adduser/adduser.perl
index 3ce7b2aa03fd..687f1b8989e7 100644
--- a/usr.sbin/adduser/adduser.perl
+++ b/usr.sbin/adduser/adduser.perl
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/adduser/adduser.perl,v 1.42.2.2 1999/08/29 15:39:02 peter Exp $
 
 
 # read variables
diff --git a/usr.sbin/adduser/rmuser.8 b/usr.sbin/adduser/rmuser.8
index ce2c86e9883b..5f393acce5f4 100644
--- a/usr.sbin/adduser/rmuser.8
+++ b/usr.sbin/adduser/rmuser.8
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/adduser/rmuser.8,v 1.8.2.1 1999/08/29 15:39:02 peter Exp $
 .\"
 .Dd February 23, 1997
 .Dt RMUSER 8
diff --git a/usr.sbin/adduser/rmuser.perl b/usr.sbin/adduser/rmuser.perl
index 0e4296a33070..60a85d38ceab 100644
--- a/usr.sbin/adduser/rmuser.perl
+++ b/usr.sbin/adduser/rmuser.perl
@@ -30,7 +30,7 @@
 #
 # Guy Helmer <ghelmer@cs.iastate.edu>, 02/23/97
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/adduser/rmuser.perl,v 1.7.2.1 1999/08/29 15:39:03 peter Exp $
 
 sub LOCK_SH {0x01;}
 sub LOCK_EX {0x02;}
diff --git a/usr.sbin/amd/Makefile b/usr.sbin/amd/Makefile
index 599811341fe4..fb8f1cd3a644 100644
--- a/usr.sbin/amd/Makefile
+++ b/usr.sbin/amd/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/Makefile,v 1.4.2.2 1999/08/29 15:39:05 peter Exp $
 #
 
 SUBDIR= libamu amd amq doc fixmount fsinfo hlfsd mk-amd-map pawd scripts \
diff --git a/usr.sbin/amd/Makefile.inc b/usr.sbin/amd/Makefile.inc
index ff4a9142ae63..fbae903032f0 100644
--- a/usr.sbin/amd/Makefile.inc
+++ b/usr.sbin/amd/Makefile.inc
@@ -1,6 +1,6 @@
 # ex:ts=8
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/Makefile.inc,v 1.3.2.2 1999/08/29 15:39:06 peter Exp $
 #
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998.
diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile
index 164179f7bcdb..2ed9ac8632f6 100644
--- a/usr.sbin/amd/amd/Makefile
+++ b/usr.sbin/amd/amd/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/amd/Makefile,v 1.16.2.1 1999/08/29 15:39:07 peter Exp $
 #
 
 .PATH:		${.CURDIR}/../../../contrib/amd/amd
diff --git a/usr.sbin/amd/amq/Makefile b/usr.sbin/amd/amq/Makefile
index 26bd507677d1..19894a01bec4 100644
--- a/usr.sbin/amd/amq/Makefile
+++ b/usr.sbin/amd/amq/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/amq/Makefile,v 1.11.2.1 1999/08/29 15:39:08 peter Exp $
 #
 
 .PATH:		${.CURDIR}/../../../contrib/amd/amq
diff --git a/usr.sbin/amd/doc/Makefile b/usr.sbin/amd/doc/Makefile
index e9c77073b290..9a82c9e1df45 100644
--- a/usr.sbin/amd/doc/Makefile
+++ b/usr.sbin/amd/doc/Makefile
@@ -1,6 +1,6 @@
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998.
 
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/doc/Makefile,v 1.8.2.2 1999/08/29 15:39:10 peter Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/amd/doc
 
diff --git a/usr.sbin/amd/fixmount/Makefile b/usr.sbin/amd/fixmount/Makefile
index 508064eefb5e..f41539603075 100644
--- a/usr.sbin/amd/fixmount/Makefile
+++ b/usr.sbin/amd/fixmount/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/fixmount/Makefile,v 1.3.2.1 1999/08/29 15:39:11 peter Exp $
 #
 
 .PATH:		${.CURDIR}/../../../contrib/amd/fixmount \
diff --git a/usr.sbin/amd/fsinfo/Makefile b/usr.sbin/amd/fsinfo/Makefile
index 36948404df38..fc1c70bd54fc 100644
--- a/usr.sbin/amd/fsinfo/Makefile
+++ b/usr.sbin/amd/fsinfo/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/fsinfo/Makefile,v 1.9.2.1 1999/08/29 15:39:12 peter Exp $
 #
 
 .PATH:		${.CURDIR}/../../../contrib/amd/fsinfo
diff --git a/usr.sbin/amd/hlfsd/Makefile b/usr.sbin/amd/hlfsd/Makefile
index 8c65de9e22e9..21a39edd794e 100644
--- a/usr.sbin/amd/hlfsd/Makefile
+++ b/usr.sbin/amd/hlfsd/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/hlfsd/Makefile,v 1.3.2.1 1999/08/29 15:39:14 peter Exp $
 #
 
 .PATH:		${.CURDIR}/../../../contrib/amd/hlfsd
diff --git a/usr.sbin/amd/include/Makefile b/usr.sbin/amd/include/Makefile
index 0bf2c8efcf6f..db3f2955c893 100644
--- a/usr.sbin/amd/include/Makefile
+++ b/usr.sbin/amd/include/Makefile
@@ -1,6 +1,6 @@
 # ex:ts=8
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/include/Makefile,v 1.1.2.1 1999/08/29 15:39:15 peter Exp $
 #
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998.
diff --git a/usr.sbin/amd/include/config.h b/usr.sbin/amd/include/config.h
index f293061aae3d..21bedf097ed0 100644
--- a/usr.sbin/amd/include/config.h
+++ b/usr.sbin/amd/include/config.h
@@ -1,5 +1,5 @@
 /* 
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/amd/include/config.h,v 1.9.2.3 1999/11/27 04:22:28 obrien Exp $
  *
  * portions derived from 
  *	$NetBSD: config.h,v 1.11 1998/08/08 22:33:37 christos Exp $
diff --git a/usr.sbin/amd/include/newvers.sh b/usr.sbin/amd/include/newvers.sh
index 09068b0e3830..64ae9bef7fb8 100644
--- a/usr.sbin/amd/include/newvers.sh
+++ b/usr.sbin/amd/include/newvers.sh
@@ -1,5 +1,5 @@
 #	$NetBSD: mkconf,v 1.1.1.1 1997/07/24 21:20:12 christos Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/include/newvers.sh,v 1.2.2.1 1999/08/29 15:39:16 peter Exp $
 # mkconf
 # Generate local configuration parameters for amd
 #
diff --git a/usr.sbin/amd/libamu/Makefile b/usr.sbin/amd/libamu/Makefile
index ae0256533f20..e9f984d21a9b 100644
--- a/usr.sbin/amd/libamu/Makefile
+++ b/usr.sbin/amd/libamu/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/libamu/Makefile,v 1.3.2.1 1999/08/29 15:39:18 peter Exp $
 
 .PATH:		${.CURDIR}/../../../contrib/amd/libamu \
 		${.CURDIR}/../../../contrib/amd/conf/transp \
diff --git a/usr.sbin/amd/mk-amd-map/Makefile b/usr.sbin/amd/mk-amd-map/Makefile
index 2978087d4133..bff1ea11568d 100644
--- a/usr.sbin/amd/mk-amd-map/Makefile
+++ b/usr.sbin/amd/mk-amd-map/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/mk-amd-map/Makefile,v 1.9.2.1 1999/08/29 15:39:19 peter Exp $
 #
 
 .PATH:		${.CURDIR}/../../../contrib/amd/mk-amd-map
diff --git a/usr.sbin/amd/pawd/Makefile b/usr.sbin/amd/pawd/Makefile
index 8c74b99d642b..aaa65ccd5d3c 100644
--- a/usr.sbin/amd/pawd/Makefile
+++ b/usr.sbin/amd/pawd/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/pawd/Makefile,v 1.2.2.1 1999/08/29 15:39:20 peter Exp $
 #
 
 .PATH:		${.CURDIR}/../../../contrib/amd/amq
diff --git a/usr.sbin/amd/scripts/Makefile b/usr.sbin/amd/scripts/Makefile
index 130b6bb30f0d..56231a90daa7 100644
--- a/usr.sbin/amd/scripts/Makefile
+++ b/usr.sbin/amd/scripts/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/scripts/Makefile,v 1.1.2.1 1999/08/29 15:39:21 peter Exp $
 
 .PATH:		${.CURDIR}/../../../contrib/amd/scripts
 
diff --git a/usr.sbin/amd/wire-test/Makefile b/usr.sbin/amd/wire-test/Makefile
index f6d68c352f2d..4bcb285abcdd 100644
--- a/usr.sbin/amd/wire-test/Makefile
+++ b/usr.sbin/amd/wire-test/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/wire-test/Makefile,v 1.2.2.1 1999/08/29 15:39:22 peter Exp $
 #
 
 .PATH:		${.CURDIR}/../../../contrib/amd/wire-test
diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile
index cdcba3e4437d..b119fb44bc38 100644
--- a/usr.sbin/apm/Makefile
+++ b/usr.sbin/apm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/apm/Makefile,v 1.7.2.1 1999/08/29 15:39:24 peter Exp $
 
 PROG=		apm
 LINKS=		${BINDIR}/apm ${BINDIR}/zzz
diff --git a/usr.sbin/apm/apm.c b/usr.sbin/apm/apm.c
index 6a0befca7345..09737242d18f 100644
--- a/usr.sbin/apm/apm.c
+++ b/usr.sbin/apm/apm.c
@@ -15,7 +15,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/apm/apm.c,v 1.14.2.4 1999/08/29 15:39:24 peter Exp $";
 #endif /* not lint */
 
 #include <sys/file.h> 
diff --git a/usr.sbin/apmconf/apmconf.c b/usr.sbin/apmconf/apmconf.c
index 0ce07202280d..6586c4d5d667 100644
--- a/usr.sbin/apmconf/apmconf.c
+++ b/usr.sbin/apmconf/apmconf.c
@@ -13,7 +13,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/apmconf/apmconf.c,v 1.8.2.1 1999/08/29 15:39:26 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/apmd/Makefile b/usr.sbin/apmd/Makefile
index 92dc1a246980..a4012079ddf1 100644
--- a/usr.sbin/apmd/Makefile
+++ b/usr.sbin/apmd/Makefile
@@ -1,5 +1,5 @@
 # Makefile for apmd
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/apmd/Makefile,v 1.1.1.1.2.2 1999/08/29 15:39:27 peter Exp $
 
 PROG=	apmd
 SHSRCS=	apmd.c apmdparse.y apmdlex.l
diff --git a/usr.sbin/apmd/README b/usr.sbin/apmd/README
index 59a56e33827d..631e38e8c9e5 100644
--- a/usr.sbin/apmd/README
+++ b/usr.sbin/apmd/README
@@ -210,4 +210,4 @@ Created by: iwasaki@FreeBSD.org
 Edited by: jkh@FreeBSD.org
            nick@foobar.org
 
-$FreeBSD$
+$FreeBSD: src/usr.sbin/apmd/README,v 1.1.1.1.2.2 1999/08/29 15:39:28 peter Exp $
diff --git a/usr.sbin/apmd/apmd.8 b/usr.sbin/apmd/apmd.8
index 8338263efc52..e9544abe84a0 100644
--- a/usr.sbin/apmd/apmd.8
+++ b/usr.sbin/apmd/apmd.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)apmd.8	1.1 (FreeBSD) 6/28/99
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/apmd/apmd.8,v 1.2.2.4 1999/10/30 19:43:42 mpp Exp $
 .\"
 .Dd June 28, 1999
 .Dt APMD 8
diff --git a/usr.sbin/apmd/apmd.c b/usr.sbin/apmd/apmd.c
index 7073dc4e80eb..83b3005ac40d 100644
--- a/usr.sbin/apmd/apmd.c
+++ b/usr.sbin/apmd/apmd.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/apmd/apmd.c,v 1.1.1.1.2.2 1999/08/29 15:39:29 peter Exp $";
 #endif /* not lint */
 
 #include <assert.h>
diff --git a/usr.sbin/apmd/apmd.h b/usr.sbin/apmd/apmd.h
index e45b84a2b17c..ec081fa29208 100644
--- a/usr.sbin/apmd/apmd.h
+++ b/usr.sbin/apmd/apmd.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/apmd/apmd.h,v 1.1.1.1.2.2 1999/08/29 15:39:29 peter Exp $
  */
 
 #define APMD_CONFIGFILE		"/etc/apmd.conf"
diff --git a/usr.sbin/apmd/apmdlex.l b/usr.sbin/apmd/apmdlex.l
index 34598bb927b6..fee56ebd48c4 100644
--- a/usr.sbin/apmd/apmdlex.l
+++ b/usr.sbin/apmd/apmdlex.l
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/apmd/apmdlex.l,v 1.1.1.1.2.2 1999/08/29 15:39:31 peter Exp $
  */
 
 #include <string.h>
diff --git a/usr.sbin/apmd/apmdparse.y b/usr.sbin/apmd/apmdparse.y
index ce9c9dcce341..30d7c701b4cc 100644
--- a/usr.sbin/apmd/apmdparse.y
+++ b/usr.sbin/apmd/apmdparse.y
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/apmd/apmdparse.y,v 1.1.1.1.2.2 1999/08/29 15:39:31 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/apmd/contrib/pccardq.c b/usr.sbin/apmd/contrib/pccardq.c
index 20b789d7d273..cadba5dc00e6 100644
--- a/usr.sbin/apmd/contrib/pccardq.c
+++ b/usr.sbin/apmd/contrib/pccardq.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/apmd/contrib/pccardq.c,v 1.1.1.1.2.2 1999/08/29 15:39:32 peter Exp $ */
 
 #include <err.h>
 #include <errno.h>
diff --git a/usr.sbin/arp/arp.4 b/usr.sbin/arp/arp.4
index 39c60c5b8e8a..637e33cf8ed7 100644
--- a/usr.sbin/arp/arp.4
+++ b/usr.sbin/arp/arp.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)arp4.4	6.5 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/arp/arp.4,v 1.2.2.2 1999/08/29 15:39:33 peter Exp $
 .\"
 .Dd April 18, 1994
 .Dt ARP 4
diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c
index 3fde087c1a37..2de6947d23d2 100644
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
@@ -45,7 +45,7 @@ static char const copyright[] =
 static char const sccsid[] = "@(#)from: arp.c	8.2 (Berkeley) 1/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/arp/arp.c,v 1.14.2.4 1999/09/14 08:44:55 ru Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/atm/Makefile b/usr.sbin/atm/Makefile
index 96f3cbfee481..3de9828c281f 100644
--- a/usr.sbin/atm/Makefile
+++ b/usr.sbin/atm/Makefile
@@ -23,7 +23,7 @@
 # Copies of this Software may be made, however, the above copyright
 # notice must be reproduced on all copies.
 #
-#	@(#) $FreeBSD$
+#	@(#) $FreeBSD: src/usr.sbin/atm/Makefile,v 1.1.2.1 1999/08/29 15:39:35 peter Exp $
 #
 #
 
diff --git a/usr.sbin/atm/Makefile.inc b/usr.sbin/atm/Makefile.inc
index 2a0f3f62268d..f8a0593585eb 100644
--- a/usr.sbin/atm/Makefile.inc
+++ b/usr.sbin/atm/Makefile.inc
@@ -23,7 +23,7 @@
 # Copies of this Software may be made, however, the above copyright
 # notice must be reproduced on all copies.
 #
-#	@(#) $FreeBSD$
+#	@(#) $FreeBSD: src/usr.sbin/atm/Makefile.inc,v 1.1.2.1 1999/08/29 15:39:36 peter Exp $
 #
 #
 
diff --git a/usr.sbin/atm/atmarpd/Makefile b/usr.sbin/atm/atmarpd/Makefile
index ebe4056a27e4..60a67880f540 100644
--- a/usr.sbin/atm/atmarpd/Makefile
+++ b/usr.sbin/atm/atmarpd/Makefile
@@ -23,7 +23,7 @@
 # Copies of this Software may be made, however, the above copyright
 # notice must be reproduced on all copies.
 #
-#	@(#) $FreeBSD$
+#	@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/Makefile,v 1.3.2.1 1999/08/29 15:39:38 peter Exp $
 #
 #
 
diff --git a/usr.sbin/atm/atmarpd/atmarp_config.c b/usr.sbin/atm/atmarpd/atmarp_config.c
index 101612111dca..f2655ab3664d 100644
--- a/usr.sbin/atm/atmarpd/atmarp_config.c
+++ b/usr.sbin/atm/atmarpd/atmarp_config.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_config.c,v 1.1.2.1 1999/08/29 15:39:38 peter Exp $
  *
  */
 
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_config.c,v 1.1.2.1 1999/08/29 15:39:38 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/atm/atmarpd/atmarp_log.c b/usr.sbin/atm/atmarpd/atmarp_log.c
index acf862a30a60..698b5f14601b 100644
--- a/usr.sbin/atm/atmarpd/atmarp_log.c
+++ b/usr.sbin/atm/atmarpd/atmarp_log.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_log.c,v 1.1.2.1 1999/08/29 15:39:39 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_log.c,v 1.1.2.1 1999/08/29 15:39:39 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/atm/atmarpd/atmarp_scsp.c b/usr.sbin/atm/atmarpd/atmarp_scsp.c
index a9fed5ad022c..d4cedc106739 100644
--- a/usr.sbin/atm/atmarpd/atmarp_scsp.c
+++ b/usr.sbin/atm/atmarpd/atmarp_scsp.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_scsp.c,v 1.1.2.1 1999/08/29 15:39:39 peter Exp $
  *
  */
 
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_scsp.c,v 1.1.2.1 1999/08/29 15:39:39 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/atm/atmarpd/atmarp_subr.c b/usr.sbin/atm/atmarpd/atmarp_subr.c
index ecd4916b4af5..9cefe43caf22 100644
--- a/usr.sbin/atm/atmarpd/atmarp_subr.c
+++ b/usr.sbin/atm/atmarpd/atmarp_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_subr.c,v 1.1.2.1 1999/08/29 15:39:40 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_subr.c,v 1.1.2.1 1999/08/29 15:39:40 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/atm/atmarpd/atmarp_timer.c b/usr.sbin/atm/atmarpd/atmarp_timer.c
index ba70fbbfec92..bde394817fad 100644
--- a/usr.sbin/atm/atmarpd/atmarp_timer.c
+++ b/usr.sbin/atm/atmarpd/atmarp_timer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_timer.c,v 1.1.2.1 1999/08/29 15:39:40 peter Exp $
  *
  */
 
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_timer.c,v 1.1.2.1 1999/08/29 15:39:40 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/atm/atmarpd/atmarp_var.h b/usr.sbin/atm/atmarpd/atmarp_var.h
index 53e7727341a4..71b057659bda 100644
--- a/usr.sbin/atm/atmarpd/atmarp_var.h
+++ b/usr.sbin/atm/atmarpd/atmarp_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_var.h,v 1.1.2.1 1999/08/29 15:39:41 peter Exp $
  *
  */
 
diff --git a/usr.sbin/atm/atmarpd/atmarpd.8 b/usr.sbin/atm/atmarpd/atmarpd.8
index 24693f0804a7..3d13f0613c98 100644
--- a/usr.sbin/atm/atmarpd/atmarpd.8
+++ b/usr.sbin/atm/atmarpd/atmarpd.8
@@ -22,7 +22,7 @@
 .\" Copies of this Software may be made, however, the above copyright
 .\" notice must be reproduced on all copies.
 .\"
-.\" @(#) $FreeBSD$
+.\" @(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarpd.8,v 1.2.2.1 1999/08/29 15:39:41 peter Exp $
 .\"
 .\"
 .de EX		\"Begin example
diff --git a/usr.sbin/atm/atmarpd/atmarpd.c b/usr.sbin/atm/atmarpd/atmarpd.c
index 77292d04c6c4..467d432a4d92 100644
--- a/usr.sbin/atm/atmarpd/atmarpd.c
+++ b/usr.sbin/atm/atmarpd/atmarpd.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarpd.c,v 1.1.2.1 1999/08/29 15:39:41 peter Exp $
  *
  */
 
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarpd.c,v 1.1.2.1 1999/08/29 15:39:41 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/atm/scspd/Makefile b/usr.sbin/atm/scspd/Makefile
index edea7487e298..a995af95092d 100644
--- a/usr.sbin/atm/scspd/Makefile
+++ b/usr.sbin/atm/scspd/Makefile
@@ -23,7 +23,7 @@
 # Copies of this Software may be made, however, the above copyright
 # notice must be reproduced on all copies.
 #
-#	@(#) $FreeBSD$
+#	@(#) $FreeBSD: src/usr.sbin/atm/scspd/Makefile,v 1.5.2.1 1999/08/29 15:39:43 peter Exp $
 #
 #
 
diff --git a/usr.sbin/atm/scspd/scsp_cafsm.c b/usr.sbin/atm/scspd/scsp_cafsm.c
index 2a6807025157..5f3ec0066b31 100644
--- a/usr.sbin/atm/scspd/scsp_cafsm.c
+++ b/usr.sbin/atm/scspd/scsp_cafsm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_cafsm.c,v 1.1.2.1 1999/08/29 15:39:44 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_cafsm.c,v 1.1.2.1 1999/08/29 15:39:44 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/atm/scspd/scsp_config.c b/usr.sbin/atm/scspd/scsp_config.c
index 79847f82f230..aa535dfe786b 100644
--- a/usr.sbin/atm/scspd/scsp_config.c
+++ b/usr.sbin/atm/scspd/scsp_config.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_config.c,v 1.1.2.1 1999/08/29 15:39:44 peter Exp $
  *
  */
 
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_config.c,v 1.1.2.1 1999/08/29 15:39:44 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/atm/scspd/scsp_config_lex.c b/usr.sbin/atm/scspd/scsp_config_lex.c
index e612752da15f..f7ea6d2501a2 100644
--- a/usr.sbin/atm/scspd/scsp_config_lex.c
+++ b/usr.sbin/atm/scspd/scsp_config_lex.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_config_lex.c,v 1.1.2.1 1999/08/29 15:39:45 peter Exp $
  *
  */
 
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_config_lex.c,v 1.1.2.1 1999/08/29 15:39:45 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/atm/scspd/scsp_config_parse.y b/usr.sbin/atm/scspd/scsp_config_parse.y
index f641d298aa95..302fbb40b2cb 100644
--- a/usr.sbin/atm/scspd/scsp_config_parse.y
+++ b/usr.sbin/atm/scspd/scsp_config_parse.y
@@ -24,7 +24,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_config_parse.y,v 1.1.2.1 1999/08/29 15:39:46 peter Exp $
  *
  */
 
@@ -39,7 +39,7 @@
 
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_config_parse.y,v 1.1.2.1 1999/08/29 15:39:46 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/atm/scspd/scsp_hfsm.c b/usr.sbin/atm/scspd/scsp_hfsm.c
index 7515518cb065..443374b545d7 100644
--- a/usr.sbin/atm/scspd/scsp_hfsm.c
+++ b/usr.sbin/atm/scspd/scsp_hfsm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_hfsm.c,v 1.1.2.1 1999/08/29 15:39:47 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_hfsm.c,v 1.1.2.1 1999/08/29 15:39:47 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/atm/scspd/scsp_if.c b/usr.sbin/atm/scspd/scsp_if.c
index da50a4ca2d26..c467ee26ac7d 100644
--- a/usr.sbin/atm/scspd/scsp_if.c
+++ b/usr.sbin/atm/scspd/scsp_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_if.c,v 1.1.2.1 1999/08/29 15:39:47 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_if.c,v 1.1.2.1 1999/08/29 15:39:47 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/atm/scspd/scsp_if.h b/usr.sbin/atm/scspd/scsp_if.h
index 844ee2c82135..c8fed20b4f61 100644
--- a/usr.sbin/atm/scspd/scsp_if.h
+++ b/usr.sbin/atm/scspd/scsp_if.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_if.h,v 1.1.2.1 1999/08/29 15:39:48 peter Exp $
  *
  */
 
diff --git a/usr.sbin/atm/scspd/scsp_input.c b/usr.sbin/atm/scspd/scsp_input.c
index f28e41f51696..6995621ebf58 100644
--- a/usr.sbin/atm/scspd/scsp_input.c
+++ b/usr.sbin/atm/scspd/scsp_input.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_input.c,v 1.1.2.1 1999/08/29 15:39:48 peter Exp $
  *
  */
 
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_input.c,v 1.1.2.1 1999/08/29 15:39:48 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/atm/scspd/scsp_log.c b/usr.sbin/atm/scspd/scsp_log.c
index 0155667a977b..ac15311152b4 100644
--- a/usr.sbin/atm/scspd/scsp_log.c
+++ b/usr.sbin/atm/scspd/scsp_log.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_log.c,v 1.1.2.1 1999/08/29 15:39:48 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_log.c,v 1.1.2.1 1999/08/29 15:39:48 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/atm/scspd/scsp_msg.c b/usr.sbin/atm/scspd/scsp_msg.c
index 51c1fc8155e2..30a1a864e15d 100644
--- a/usr.sbin/atm/scspd/scsp_msg.c
+++ b/usr.sbin/atm/scspd/scsp_msg.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_msg.c,v 1.1.2.1 1999/08/29 15:39:49 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_msg.c,v 1.1.2.1 1999/08/29 15:39:49 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/atm/scspd/scsp_msg.h b/usr.sbin/atm/scspd/scsp_msg.h
index c70ada7fef56..52b50a39b250 100644
--- a/usr.sbin/atm/scspd/scsp_msg.h
+++ b/usr.sbin/atm/scspd/scsp_msg.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_msg.h,v 1.1.2.1 1999/08/29 15:39:49 peter Exp $
  *
  */
 
diff --git a/usr.sbin/atm/scspd/scsp_output.c b/usr.sbin/atm/scspd/scsp_output.c
index 9beaae36b89a..f462b37f5873 100644
--- a/usr.sbin/atm/scspd/scsp_output.c
+++ b/usr.sbin/atm/scspd/scsp_output.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_output.c,v 1.1.2.1 1999/08/29 15:39:50 peter Exp $
  *
  */
 
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_output.c,v 1.1.2.1 1999/08/29 15:39:50 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/atm/scspd/scsp_print.c b/usr.sbin/atm/scspd/scsp_print.c
index 6e2ad259ea50..0d1f366db28b 100644
--- a/usr.sbin/atm/scspd/scsp_print.c
+++ b/usr.sbin/atm/scspd/scsp_print.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_print.c,v 1.1.2.1 1999/08/29 15:39:50 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_print.c,v 1.1.2.1 1999/08/29 15:39:50 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/atm/scspd/scsp_socket.c b/usr.sbin/atm/scspd/scsp_socket.c
index 33fc37be17d3..f64ba30b9d3b 100644
--- a/usr.sbin/atm/scspd/scsp_socket.c
+++ b/usr.sbin/atm/scspd/scsp_socket.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_socket.c,v 1.1.2.1 1999/08/29 15:39:51 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_socket.c,v 1.1.2.1 1999/08/29 15:39:51 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/atm/scspd/scsp_subr.c b/usr.sbin/atm/scspd/scsp_subr.c
index 429d63ddf1bb..35a14d6126bf 100644
--- a/usr.sbin/atm/scspd/scsp_subr.c
+++ b/usr.sbin/atm/scspd/scsp_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_subr.c,v 1.1.2.1 1999/08/29 15:39:51 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_subr.c,v 1.1.2.1 1999/08/29 15:39:51 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/atm/scspd/scsp_timer.c b/usr.sbin/atm/scspd/scsp_timer.c
index 4dd5b8459ad1..4eedf6bbb553 100644
--- a/usr.sbin/atm/scspd/scsp_timer.c
+++ b/usr.sbin/atm/scspd/scsp_timer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_timer.c,v 1.1.2.1 1999/08/29 15:39:52 peter Exp $
  *
  */
 
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_timer.c,v 1.1.2.1 1999/08/29 15:39:52 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/atm/scspd/scsp_var.h b/usr.sbin/atm/scspd/scsp_var.h
index 30218c939c80..78d4bfb094ce 100644
--- a/usr.sbin/atm/scspd/scsp_var.h
+++ b/usr.sbin/atm/scspd/scsp_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_var.h,v 1.1.2.1 1999/08/29 15:39:53 peter Exp $
  *
  */
 
diff --git a/usr.sbin/atm/scspd/scspd.8 b/usr.sbin/atm/scspd/scspd.8
index 5c0b1600dcde..c83bf03ebcc0 100644
--- a/usr.sbin/atm/scspd/scspd.8
+++ b/usr.sbin/atm/scspd/scspd.8
@@ -22,7 +22,7 @@
 .\" Copies of this Software may be made, however, the above copyright
 .\" notice must be reproduced on all copies.
 .\"
-.\" @(#) $FreeBSD$
+.\" @(#) $FreeBSD: src/usr.sbin/atm/scspd/scspd.8,v 1.1.2.1 1999/08/29 15:39:54 peter Exp $
 .\"
 .\"
 .de EX		\"Begin example
diff --git a/usr.sbin/atm/scspd/scspd.c b/usr.sbin/atm/scspd/scspd.c
index bb11d6b0abdd..94de6665b78b 100644
--- a/usr.sbin/atm/scspd/scspd.c
+++ b/usr.sbin/atm/scspd/scspd.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scspd.c,v 1.1.2.1 1999/08/29 15:39:55 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 
 
 #ifndef lint
-static char *RCSid = "@(#) $FreeBSD$";
+static char *RCSid = "@(#) $FreeBSD: src/usr.sbin/atm/scspd/scspd.c,v 1.1.2.1 1999/08/29 15:39:55 peter Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/bad144/bad144.c b/usr.sbin/bad144/bad144.c
index bd5c53fb762b..4dc687e127fe 100644
--- a/usr.sbin/bad144/bad144.c
+++ b/usr.sbin/bad144/bad144.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)bad144.c	8.2 (Berkeley) 4/27/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/bad144/bad144.c,v 1.17.2.1 1999/08/29 15:39:57 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/boot0cfg/Makefile b/usr.sbin/boot0cfg/Makefile
index 81189f3de741..b917f57ad511 100644
--- a/usr.sbin/boot0cfg/Makefile
+++ b/usr.sbin/boot0cfg/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/boot0cfg/Makefile,v 1.1.1.1.2.2 1999/08/29 15:39:58 peter Exp $
 
 PROG=	boot0cfg
 MAN8=	boot0cfg.8
diff --git a/usr.sbin/boot0cfg/boot0cfg.8 b/usr.sbin/boot0cfg/boot0cfg.8
index a56356a2801e..419ea0cd9622 100644
--- a/usr.sbin/boot0cfg/boot0cfg.8
+++ b/usr.sbin/boot0cfg/boot0cfg.8
@@ -22,7 +22,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/boot0cfg/boot0cfg.8,v 1.3.2.3 1999/08/29 15:39:59 peter Exp $
 .\"
 .Dd February 21, 1999
 .Dt BOOT0CFG 8
diff --git a/usr.sbin/boot0cfg/boot0cfg.c b/usr.sbin/boot0cfg/boot0cfg.c
index e755ef91ecac..4ef46ea0def7 100644
--- a/usr.sbin/boot0cfg/boot0cfg.c
+++ b/usr.sbin/boot0cfg/boot0cfg.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/boot0cfg/boot0cfg.c,v 1.3.2.3 1999/08/29 15:40:00 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/bootparamd/bootparamd/Makefile b/usr.sbin/bootparamd/bootparamd/Makefile
index 7a702b994c02..53477f3f8752 100644
--- a/usr.sbin/bootparamd/bootparamd/Makefile
+++ b/usr.sbin/bootparamd/bootparamd/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bootparamd/bootparamd/Makefile,v 1.10.2.1 1999/08/29 15:40:01 peter Exp $
 
 PROG=	bootparamd
 SRCS=	bootparamd.c main.c ${GENSRCS}
diff --git a/usr.sbin/bootparamd/bootparamd/bootparamd.c b/usr.sbin/bootparamd/bootparamd/bootparamd.c
index 80fbe70ff939..62a923981e25 100644
--- a/usr.sbin/bootparamd/bootparamd/bootparamd.c
+++ b/usr.sbin/bootparamd/bootparamd/bootparamd.c
@@ -9,7 +9,7 @@ use and modify. Please send modifications and/or suggestions + bug fixes to
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/bootparamd/bootparamd/bootparamd.c,v 1.9.2.1 1999/08/29 15:40:03 peter Exp $";
 #endif /* not lint */
 
 #include <rpc/rpc.h>
diff --git a/usr.sbin/bootparamd/bootparamd/bootparams.5 b/usr.sbin/bootparamd/bootparamd/bootparams.5
index 85f4c982cf4b..67975b452c3d 100644
--- a/usr.sbin/bootparamd/bootparamd/bootparams.5
+++ b/usr.sbin/bootparamd/bootparamd/bootparams.5
@@ -25,7 +25,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	from: Id: bootparams.5,v 1.2 1994/10/03 19:26:13 gwr Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bootparamd/bootparamd/bootparams.5,v 1.8.2.1 1999/08/29 15:40:03 peter Exp $
 .\"
 .Dd October 2, 1994
 .Dt BOOTPARAMS 5
diff --git a/usr.sbin/bootparamd/bootparamd/main.c b/usr.sbin/bootparamd/bootparamd/main.c
index a3cc0e762024..4773cd2ca6f3 100644
--- a/usr.sbin/bootparamd/bootparamd/main.c
+++ b/usr.sbin/bootparamd/bootparamd/main.c
@@ -9,7 +9,7 @@ use and modify. Please send modifications and/or suggestions + bug fixes to
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/bootparamd/bootparamd/main.c,v 1.8.2.1 1999/08/29 15:40:03 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/bootparamd/callbootd/Makefile b/usr.sbin/bootparamd/callbootd/Makefile
index 92ae2e5b1e2e..1c27de00aa66 100644
--- a/usr.sbin/bootparamd/callbootd/Makefile
+++ b/usr.sbin/bootparamd/callbootd/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bootparamd/callbootd/Makefile,v 1.9.2.1 1999/08/29 15:40:05 peter Exp $
 
 PROG=	callbootd
 SRCS=	callbootd.c ${GENSRCS}
diff --git a/usr.sbin/bootparamd/callbootd/callbootd.c b/usr.sbin/bootparamd/callbootd/callbootd.c
index 7a09168ac3a9..9f6dc185c3a6 100644
--- a/usr.sbin/bootparamd/callbootd/callbootd.c
+++ b/usr.sbin/bootparamd/callbootd/callbootd.c
@@ -9,7 +9,7 @@ use and modify. Please send modifications and/or suggestions + bug fixes to
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/bootparamd/callbootd/callbootd.c,v 1.7.2.1 1999/08/29 15:40:05 peter Exp $";
 #endif /* not lint */
 
 #include "bootparam_prot.h"
diff --git a/usr.sbin/btxld/Makefile b/usr.sbin/btxld/Makefile
index 229b20e0278e..f4a0fab41f21 100644
--- a/usr.sbin/btxld/Makefile
+++ b/usr.sbin/btxld/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/btxld/Makefile,v 1.1.1.1.2.1 1999/08/29 15:40:10 peter Exp $
 
 PROG=	btxld
 SRCS=	btxld.c elfh.c
diff --git a/usr.sbin/btxld/btx.h b/usr.sbin/btxld/btx.h
index 86f0ede0759c..878baa90ab53 100644
--- a/usr.sbin/btxld/btx.h
+++ b/usr.sbin/btxld/btx.h
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/btxld/btx.h,v 1.1.1.1.2.1 1999/08/29 15:40:11 peter Exp $
  */
 
 #ifndef _BTX_H_
diff --git a/usr.sbin/btxld/btxld.8 b/usr.sbin/btxld/btxld.8
index 1510ba2a1aa6..5bf145628718 100644
--- a/usr.sbin/btxld/btxld.8
+++ b/usr.sbin/btxld/btxld.8
@@ -22,7 +22,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/btxld/btxld.8,v 1.1.1.1.2.1 1999/08/29 15:40:11 peter Exp $
 .\"
 .Dd September 12, 1998
 .Dt BTXLD 8
diff --git a/usr.sbin/btxld/btxld.c b/usr.sbin/btxld/btxld.c
index e24f4f4ee4f6..ca920529138c 100644
--- a/usr.sbin/btxld/btxld.c
+++ b/usr.sbin/btxld/btxld.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/btxld/btxld.c,v 1.2.2.1 1999/08/29 15:40:12 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/btxld/elfh.c b/usr.sbin/btxld/elfh.c
index cf163483e3ac..2525eb765d0e 100644
--- a/usr.sbin/btxld/elfh.c
+++ b/usr.sbin/btxld/elfh.c
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/btxld/elfh.c,v 1.1.1.1.2.1 1999/08/29 15:40:12 peter Exp $
  */
 
 #include <stddef.h>
diff --git a/usr.sbin/btxld/elfh.h b/usr.sbin/btxld/elfh.h
index cf00f382d707..6add5d332f3b 100644
--- a/usr.sbin/btxld/elfh.h
+++ b/usr.sbin/btxld/elfh.h
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/btxld/elfh.h,v 1.1.1.1.2.1 1999/08/29 15:40:13 peter Exp $
  */
 
 #include <elf.h>
diff --git a/usr.sbin/cdcontrol/cdcontrol.1 b/usr.sbin/cdcontrol/cdcontrol.1
index af3804300293..301f9bb1530c 100644
--- a/usr.sbin/cdcontrol/cdcontrol.1
+++ b/usr.sbin/cdcontrol/cdcontrol.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/cdcontrol/cdcontrol.1,v 1.16.2.3 1999/08/29 15:40:15 peter Exp $
 .\"
 .Dd July 3, 1995
 .Dt CDCONTROL 1
diff --git a/usr.sbin/cdcontrol/cdcontrol.c b/usr.sbin/cdcontrol/cdcontrol.c
index 1b36bc3486f5..c0844bdf8f44 100644
--- a/usr.sbin/cdcontrol/cdcontrol.c
+++ b/usr.sbin/cdcontrol/cdcontrol.c
@@ -20,7 +20,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cdcontrol/cdcontrol.c,v 1.17.2.2 1999/08/29 15:40:16 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/chkgrp/Makefile b/usr.sbin/chkgrp/Makefile
index 12afb6f48efb..f0953ada7194 100644
--- a/usr.sbin/chkgrp/Makefile
+++ b/usr.sbin/chkgrp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/chkgrp/Makefile,v 1.1.2.1 1999/08/29 15:40:16 peter Exp $
 
 PROG=	chkgrp
 SRCS=	chkgrp.c
diff --git a/usr.sbin/chkgrp/chkgrp.8 b/usr.sbin/chkgrp/chkgrp.8
index 7ebe28933629..b9dccec048aa 100644
--- a/usr.sbin/chkgrp/chkgrp.8
+++ b/usr.sbin/chkgrp/chkgrp.8
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/chkgrp/chkgrp.8,v 1.4.2.1 1999/08/29 15:40:17 peter Exp $
 .\"
 .Dd May 5, 1998
 .Dt CHKGRP 8
diff --git a/usr.sbin/chkgrp/chkgrp.c b/usr.sbin/chkgrp/chkgrp.c
index 1389d42a37fd..21c140fef84b 100644
--- a/usr.sbin/chkgrp/chkgrp.c
+++ b/usr.sbin/chkgrp/chkgrp.c
@@ -28,7 +28,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/chkgrp/chkgrp.c,v 1.2.2.1 1999/08/29 15:40:17 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/chown/chown.8 b/usr.sbin/chown/chown.8
index 351b89da2c59..5bf5f657c200 100644
--- a/usr.sbin/chown/chown.8
+++ b/usr.sbin/chown/chown.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chown.8	8.3 (Berkeley) 3/31/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/chown/chown.8,v 1.6.2.1 1999/08/29 15:40:19 peter Exp $
 .\"
 .Dd March 31, 1994
 .Dt CHOWN 8
diff --git a/usr.sbin/chown/chown.c b/usr.sbin/chown/chown.c
index e41441684418..95f1f2a42d7e 100644
--- a/usr.sbin/chown/chown.c
+++ b/usr.sbin/chown/chown.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)chown.c	8.8 (Berkeley) 4/4/94";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/chown/chown.c,v 1.12.2.1 1999/08/29 15:40:20 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.sbin/chroot/chroot.c b/usr.sbin/chroot/chroot.c
index ccd9c493e64d..193887a2211e 100644
--- a/usr.sbin/chroot/chroot.c
+++ b/usr.sbin/chroot/chroot.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)chroot.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/chroot/chroot.c,v 1.3.2.1 1999/08/29 15:40:21 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ckdist/Makefile b/usr.sbin/ckdist/Makefile
index 74c4c5402f74..0426dd37d285 100644
--- a/usr.sbin/ckdist/Makefile
+++ b/usr.sbin/ckdist/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ckdist/Makefile,v 1.1.1.1.2.1 1999/08/29 15:40:22 peter Exp $
 
 PROG=	ckdist
 
diff --git a/usr.sbin/ckdist/ckdist.1 b/usr.sbin/ckdist/ckdist.1
index 2656f690cab8..1708d1f60417 100644
--- a/usr.sbin/ckdist/ckdist.1
+++ b/usr.sbin/ckdist/ckdist.1
@@ -1,7 +1,7 @@
 .\" Copyright (c) 1997 Robert Nordier
 .\" All rights reserved.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ckdist/ckdist.1,v 1.2.2.2 1999/08/29 15:40:22 peter Exp $
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/usr.sbin/ckdist/ckdist.c b/usr.sbin/ckdist/ckdist.c
index 2c8e83e2d77d..e5a8227d16fd 100644
--- a/usr.sbin/ckdist/ckdist.c
+++ b/usr.sbin/ckdist/ckdist.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/ckdist/ckdist.c,v 1.2.2.1 1999/08/29 15:40:23 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/config/Makefile b/usr.sbin/config/Makefile
index ed849b272f5e..6058266a3360 100644
--- a/usr.sbin/config/Makefile
+++ b/usr.sbin/config/Makefile
@@ -1,5 +1,5 @@
 # 	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/config/Makefile,v 1.20.2.1 1999/08/29 15:40:24 peter Exp $
 
 PROG=	config
 CFLAGS+=-I. -I${.CURDIR}
diff --git a/usr.sbin/config/configvers.h b/usr.sbin/config/configvers.h
index d039e9af5d10..6ed0f58f8b61 100644
--- a/usr.sbin/config/configvers.h
+++ b/usr.sbin/config/configvers.h
@@ -6,6 +6,6 @@
  * The numbering scheme is inspired by the sys/conf/newvers.sh RELDATE
  * and <osreldate.h> system.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/config/configvers.h,v 1.8.2.1 1999/08/29 15:40:25 peter Exp $
  */
 #define	CONFIGVERS	300009
diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c
index a9483aee5fe4..ee00503ccf5e 100644
--- a/usr.sbin/config/main.c
+++ b/usr.sbin/config/main.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/config/main.c,v 1.26.2.1 1999/08/29 15:40:25 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/config/mkglue.c b/usr.sbin/config/mkglue.c
index 8799e8781101..0ee556573971 100644
--- a/usr.sbin/config/mkglue.c
+++ b/usr.sbin/config/mkglue.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)mkglue.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/config/mkglue.c,v 1.14.2.1 1999/08/29 15:40:26 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/config/mkheaders.c b/usr.sbin/config/mkheaders.c
index ef2cb5a54dc6..8a62467bb93a 100644
--- a/usr.sbin/config/mkheaders.c
+++ b/usr.sbin/config/mkheaders.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)mkheaders.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/config/mkheaders.c,v 1.8.2.1 1999/08/29 15:40:27 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/config/mkioconf.c b/usr.sbin/config/mkioconf.c
index f9392326dbe6..1aef9e335568 100644
--- a/usr.sbin/config/mkioconf.c
+++ b/usr.sbin/config/mkioconf.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)mkioconf.c	8.2 (Berkeley) 1/21/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/config/mkioconf.c,v 1.45.2.2 1999/08/29 15:40:28 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c
index 56bd43c9a9a0..f45867911009 100644
--- a/usr.sbin/config/mkmakefile.c
+++ b/usr.sbin/config/mkmakefile.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)mkmakefile.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/config/mkmakefile.c,v 1.34.2.2 1999/12/03 10:06:57 julian Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/config/mkoptions.c b/usr.sbin/config/mkoptions.c
index be99a83c0f99..5475d4963513 100644
--- a/usr.sbin/config/mkoptions.c
+++ b/usr.sbin/config/mkoptions.c
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)mkheaders.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/config/mkoptions.c,v 1.8.2.1 1999/08/29 15:40:29 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/config/mkswapconf.c b/usr.sbin/config/mkswapconf.c
index 4c6ab859bbef..c07ac5f985dc 100644
--- a/usr.sbin/config/mkswapconf.c
+++ b/usr.sbin/config/mkswapconf.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)mkswapconf.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/config/mkswapconf.c,v 1.15.2.1 1999/08/29 15:40:30 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/config/mkubglue.c b/usr.sbin/config/mkubglue.c
index e70cd988c53a..72a6d0d2e84f 100644
--- a/usr.sbin/config/mkubglue.c
+++ b/usr.sbin/config/mkubglue.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)mkubglue.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/config/mkubglue.c,v 1.4.2.1 1999/08/29 15:40:30 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/cron/Makefile.inc b/usr.sbin/cron/Makefile.inc
index f9208ecffeee..fca517fbe1c3 100644
--- a/usr.sbin/cron/Makefile.inc
+++ b/usr.sbin/cron/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/cron/Makefile.inc,v 1.1.2.1 1999/08/29 15:40:32 peter Exp $
 
 .if exists(${.OBJDIR}/../lib)
 LIBCRON=${.OBJDIR}/../lib/libcron.a
diff --git a/usr.sbin/cron/cron/Makefile b/usr.sbin/cron/cron/Makefile
index 318e781d1aa6..0e810e41e9fc 100644
--- a/usr.sbin/cron/cron/Makefile
+++ b/usr.sbin/cron/cron/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/cron/cron/Makefile,v 1.11.2.1 1999/08/29 15:40:33 peter Exp $
 
 PROG=	cron
 SRCS=	cron.c database.c do_command.c job.c user.c popen.c
diff --git a/usr.sbin/cron/cron/compat.h b/usr.sbin/cron/cron/compat.h
index 905c3aaf3bd9..b7914d82a30e 100644
--- a/usr.sbin/cron/cron/compat.h
+++ b/usr.sbin/cron/cron/compat.h
@@ -16,7 +16,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/cron/cron/compat.h,v 1.4.2.1 1999/08/29 15:40:34 peter Exp $
  */
 
 #ifndef __P
diff --git a/usr.sbin/cron/cron/config.h b/usr.sbin/cron/cron/config.h
index 6d77da27580d..b24969a6a035 100644
--- a/usr.sbin/cron/cron/config.h
+++ b/usr.sbin/cron/cron/config.h
@@ -17,7 +17,7 @@
 
 /* config.h - configurables for Vixie Cron
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/cron/cron/config.h,v 1.7.2.1 1999/08/29 15:40:35 peter Exp $
  */
 
 #if !defined(_PATH_SENDMAIL)
diff --git a/usr.sbin/cron/cron/cron.8 b/usr.sbin/cron/cron/cron.8
index d43ea58c53a3..ee48ae65319b 100644
--- a/usr.sbin/cron/cron/cron.8
+++ b/usr.sbin/cron/cron/cron.8
@@ -15,7 +15,7 @@
 .\" * Paul Vixie          <paul@vix.com>          uunet!decwrl!vixie!paul
 .\" */
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/cron/cron/cron.8,v 1.6.2.1 1999/08/29 15:40:35 peter Exp $
 .\" 
 .Dd December 20, 1993
 .Dt CRON 8
diff --git a/usr.sbin/cron/cron/cron.c b/usr.sbin/cron/cron/cron.c
index e8f8557609d1..9b4150b28fe5 100644
--- a/usr.sbin/cron/cron/cron.c
+++ b/usr.sbin/cron/cron/cron.c
@@ -17,7 +17,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/cron/cron.c,v 1.8.2.1 1999/08/29 15:40:36 peter Exp $";
 #endif
 
 #define	MAIN_PROGRAM
diff --git a/usr.sbin/cron/cron/cron.h b/usr.sbin/cron/cron/cron.h
index c125874686fc..9ac7152611e3 100644
--- a/usr.sbin/cron/cron/cron.h
+++ b/usr.sbin/cron/cron/cron.h
@@ -17,7 +17,7 @@
 
 /* cron.h - header for vixie's cron
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/cron/cron/cron.h,v 1.8.2.1 1999/08/29 15:40:36 peter Exp $
  *
  * vix 14nov88 [rest of log is in RCS]
  * vix 14jan87 [0 or 7 can be sunday; thanks, mwm@berkeley]
diff --git a/usr.sbin/cron/cron/database.c b/usr.sbin/cron/cron/database.c
index 9ebf75d83999..ca236647f7b3 100644
--- a/usr.sbin/cron/cron/database.c
+++ b/usr.sbin/cron/cron/database.c
@@ -17,7 +17,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/cron/database.c,v 1.7.2.1 1999/08/29 15:40:37 peter Exp $";
 #endif
 
 /* vix 26jan87 [RCS has the log]
diff --git a/usr.sbin/cron/cron/do_command.c b/usr.sbin/cron/cron/do_command.c
index e674563c610a..66bc17ff066e 100644
--- a/usr.sbin/cron/cron/do_command.c
+++ b/usr.sbin/cron/cron/do_command.c
@@ -17,7 +17,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/cron/do_command.c,v 1.14.2.1 1999/08/29 15:40:37 peter Exp $";
 #endif
 
 
diff --git a/usr.sbin/cron/cron/job.c b/usr.sbin/cron/cron/job.c
index 6d1b1af6e474..c786b51b7698 100644
--- a/usr.sbin/cron/cron/job.c
+++ b/usr.sbin/cron/cron/job.c
@@ -17,7 +17,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/cron/job.c,v 1.5.2.1 1999/08/29 15:40:38 peter Exp $";
 #endif
 
 
diff --git a/usr.sbin/cron/cron/pathnames.h b/usr.sbin/cron/cron/pathnames.h
index ba91bfdc61f9..05a63834037c 100644
--- a/usr.sbin/cron/cron/pathnames.h
+++ b/usr.sbin/cron/cron/pathnames.h
@@ -16,7 +16,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/cron/cron/pathnames.h,v 1.4.2.1 1999/08/29 15:40:38 peter Exp $
  */
 
 #if (defined(BSD)) && (BSD >= 199103) || defined(__linux) || defined(AIX)
diff --git a/usr.sbin/cron/cron/popen.c b/usr.sbin/cron/cron/popen.c
index c71d62ef1b34..ea8352bcd321 100644
--- a/usr.sbin/cron/cron/popen.c
+++ b/usr.sbin/cron/cron/popen.c
@@ -28,7 +28,7 @@
 static char sccsid[] = "@(#)popen.c	5.7 (Berkeley) 2/14/89";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/cron/popen.c,v 1.5.2.1 1999/08/29 15:40:39 peter Exp $";
 #endif /* not lint */
 
 #include "cron.h"
diff --git a/usr.sbin/cron/cron/user.c b/usr.sbin/cron/cron/user.c
index 16fd61723a86..3db229dee176 100644
--- a/usr.sbin/cron/cron/user.c
+++ b/usr.sbin/cron/cron/user.c
@@ -17,7 +17,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/cron/user.c,v 1.7.2.1 1999/08/29 15:40:39 peter Exp $";
 #endif
 
 /* vix 26jan87 [log is in RCS file]
diff --git a/usr.sbin/cron/crontab/Makefile b/usr.sbin/cron/crontab/Makefile
index ce8d5d38aa8b..cbf5a8a536fd 100644
--- a/usr.sbin/cron/crontab/Makefile
+++ b/usr.sbin/cron/crontab/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/cron/crontab/Makefile,v 1.9.2.1 1999/08/29 15:40:40 peter Exp $
 
 PROG=	crontab
 CFLAGS+=-I${.CURDIR}/../cron
diff --git a/usr.sbin/cron/crontab/crontab.1 b/usr.sbin/cron/crontab/crontab.1
index e904d4ded7c4..b30a9266119b 100644
--- a/usr.sbin/cron/crontab/crontab.1
+++ b/usr.sbin/cron/crontab/crontab.1
@@ -15,7 +15,7 @@
 .\" * Paul Vixie          <paul@vix.com>          uunet!decwrl!vixie!paul
 .\" */
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/cron/crontab/crontab.1,v 1.5.2.2 1999/08/29 15:40:41 peter Exp $
 .\"
 .Dd December 29, 1993
 .Dt CRONTAB 1
diff --git a/usr.sbin/cron/crontab/crontab.5 b/usr.sbin/cron/crontab/crontab.5
index 8a20047e7cbe..b3724104580a 100644
--- a/usr.sbin/cron/crontab/crontab.5
+++ b/usr.sbin/cron/crontab/crontab.5
@@ -15,7 +15,7 @@
 .\" * Paul Vixie          <paul@vix.com>          uunet!decwrl!vixie!paul
 .\" */
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/cron/crontab/crontab.5,v 1.8.2.2 1999/08/29 15:40:42 peter Exp $
 .\" 
 .Dd January 24, 1994
 .Dt CRONTAB 5
diff --git a/usr.sbin/cron/crontab/crontab.c b/usr.sbin/cron/crontab/crontab.c
index 1ae677704223..de9237a2666c 100644
--- a/usr.sbin/cron/crontab/crontab.c
+++ b/usr.sbin/cron/crontab/crontab.c
@@ -18,7 +18,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/crontab/crontab.c,v 1.11.2.1 1999/08/29 15:40:42 peter Exp $";
 #endif
 
 /* crontab - install and manage per-user crontab files
diff --git a/usr.sbin/cron/doc/CONVERSION b/usr.sbin/cron/doc/CONVERSION
index 8821edd49857..e83f302500d6 100644
--- a/usr.sbin/cron/doc/CONVERSION
+++ b/usr.sbin/cron/doc/CONVERSION
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.sbin/cron/doc/CONVERSION,v 1.3.2.1 1999/08/29 15:40:43 peter Exp $
 
 Conversion of BSD 4.[23] crontab files:
 
diff --git a/usr.sbin/cron/doc/FEATURES b/usr.sbin/cron/doc/FEATURES
index 821d1f3a3af2..924742d75d7a 100644
--- a/usr.sbin/cron/doc/FEATURES
+++ b/usr.sbin/cron/doc/FEATURES
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.sbin/cron/doc/FEATURES,v 1.3.2.1 1999/08/29 15:40:45 peter Exp $
 
 Features of Vixie's cron relative to BSD 4.[23] and SysV crons:
 
diff --git a/usr.sbin/cron/doc/INSTALL b/usr.sbin/cron/doc/INSTALL
index 7f4c9974da64..c88db4626c3a 100644
--- a/usr.sbin/cron/doc/INSTALL
+++ b/usr.sbin/cron/doc/INSTALL
@@ -15,7 +15,7 @@
  * Paul Vixie          <paul@vix.com>          uunet!decwrl!vixie!paul
  */
 
-$FreeBSD$
+$FreeBSD: src/usr.sbin/cron/doc/INSTALL,v 1.3.2.1 1999/08/29 15:40:45 peter Exp $
 
 Read the comments at the top of the Makefile, then edit the area marked
 'configurable stuff'.
diff --git a/usr.sbin/cron/doc/MAIL b/usr.sbin/cron/doc/MAIL
index 3549e94d575a..fdde398fbf97 100644
--- a/usr.sbin/cron/doc/MAIL
+++ b/usr.sbin/cron/doc/MAIL
@@ -3,7 +3,7 @@
   version of cron.  it is presented here for its entertainment value.
   --vix ]
 
-$FreeBSD$
+$FreeBSD: src/usr.sbin/cron/doc/MAIL,v 1.3.2.1 1999/08/29 15:40:46 peter Exp $
 
 From ptsfa!lll-crg!ames!acornrc!bob Wed Dec 31 10:07:08 1986
 Date: Wed, 31 Dec 86 08:59:31 pst
diff --git a/usr.sbin/cron/doc/Makefile.vixie b/usr.sbin/cron/doc/Makefile.vixie
index 8df1301c689d..449c00b88d15 100644
--- a/usr.sbin/cron/doc/Makefile.vixie
+++ b/usr.sbin/cron/doc/Makefile.vixie
@@ -17,7 +17,7 @@
 
 # Makefile for vixie's cron
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/cron/doc/Makefile.vixie,v 1.4.2.1 1999/08/29 15:40:46 peter Exp $
 #
 # vix 03mar88 [moved to RCS, rest of log is in there]
 # vix 30mar87 [goodbye, time.c; hello, getopt]
diff --git a/usr.sbin/cron/doc/README b/usr.sbin/cron/doc/README
index eaced9e65d94..f9270eb369df 100644
--- a/usr.sbin/cron/doc/README
+++ b/usr.sbin/cron/doc/README
@@ -69,4 +69,4 @@ have to go edit a couple of files... So, here's the checklist:
 	if you like it, change your /etc/{rc,rc.local} to use it instead of
 		the old one.
 
-$FreeBSD$
+$FreeBSD: src/usr.sbin/cron/doc/README,v 1.3.2.1 1999/08/29 15:40:47 peter Exp $
diff --git a/usr.sbin/cron/lib/compat.c b/usr.sbin/cron/lib/compat.c
index 6057b8601f1a..0700b2e97097 100644
--- a/usr.sbin/cron/lib/compat.c
+++ b/usr.sbin/cron/lib/compat.c
@@ -16,7 +16,7 @@
  */
 
 #if !defined(lint) && !defined(LINT)
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/cron/lib/compat.c,v 1.5.2.1 1999/08/29 15:40:48 peter Exp $";
 #endif
 
 /* vix 30dec93 [broke this out of misc.c - see RCS log for history]
diff --git a/usr.sbin/cron/lib/entry.c b/usr.sbin/cron/lib/entry.c
index 51c1a0cb78f9..69ca714e8b46 100644
--- a/usr.sbin/cron/lib/entry.c
+++ b/usr.sbin/cron/lib/entry.c
@@ -17,7 +17,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/lib/entry.c,v 1.8.2.1 1999/08/29 15:40:48 peter Exp $";
 #endif
 
 /* vix 26jan87 [RCS'd; rest of log is in RCS file]
diff --git a/usr.sbin/cron/lib/env.c b/usr.sbin/cron/lib/env.c
index c5f22005bfbf..7d1021dcb395 100644
--- a/usr.sbin/cron/lib/env.c
+++ b/usr.sbin/cron/lib/env.c
@@ -17,7 +17,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/lib/env.c,v 1.6.2.1 1999/08/29 15:40:49 peter Exp $";
 #endif
 
 
diff --git a/usr.sbin/cron/lib/misc.c b/usr.sbin/cron/lib/misc.c
index eca9604bafc1..f682d605722d 100644
--- a/usr.sbin/cron/lib/misc.c
+++ b/usr.sbin/cron/lib/misc.c
@@ -17,7 +17,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/lib/misc.c,v 1.7.2.1 1999/08/29 15:40:49 peter Exp $";
 #endif
 
 /* vix 26jan87 [RCS has the rest of the log]
diff --git a/usr.sbin/crunch/examples/filesystem.conf b/usr.sbin/crunch/examples/filesystem.conf
index 1fb93856c7f1..16cb17ef1733 100644
--- a/usr.sbin/crunch/examples/filesystem.conf
+++ b/usr.sbin/crunch/examples/filesystem.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/crunch/examples/filesystem.conf,v 1.7.2.1 1999/08/29 15:40:51 peter Exp $
 
 srcdirs /usr/src/bin /usr/src/sbin /usr/src/gnu/usr.bin /usr/src/usr.sbin
 srcdirs /usr/src/sbin/i386
diff --git a/usr.sbin/crunch/examples/kcopy.conf b/usr.sbin/crunch/examples/kcopy.conf
index 3284e868c51b..87f1239aef4f 100644
--- a/usr.sbin/crunch/examples/kcopy.conf
+++ b/usr.sbin/crunch/examples/kcopy.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/crunch/examples/kcopy.conf,v 1.6.2.1 1999/08/29 15:40:52 peter Exp $
 
 srcdirs /usr/src/bin /usr/src/sbin
 
diff --git a/usr.sbin/ctm/Makefile b/usr.sbin/ctm/Makefile
index 630aab0940dd..3345424acc58 100644
--- a/usr.sbin/ctm/Makefile
+++ b/usr.sbin/ctm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ctm/Makefile,v 1.6.2.1 1999/08/29 15:40:53 peter Exp $
 
 SUBDIR=	ctm ctm_rmail ctm_smail ctm_dequeue
 
diff --git a/usr.sbin/ctm/Makefile.inc b/usr.sbin/ctm/Makefile.inc
index c6c2c5aebdff..0e1fc2a82042 100644
--- a/usr.sbin/ctm/Makefile.inc
+++ b/usr.sbin/ctm/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ctm/Makefile.inc,v 1.3.2.1 1999/08/29 15:40:53 peter Exp $
 
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/usr.sbin/ctm/README b/usr.sbin/ctm/README
index 7cdd344d83c8..1b844d5e15e5 100644
--- a/usr.sbin/ctm/README
+++ b/usr.sbin/ctm/README
@@ -5,7 +5,7 @@
 # this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 # ----------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ctm/README,v 1.7.2.1 1999/08/29 15:40:54 peter Exp $
 #
 
 What will I not find in this file ?
diff --git a/usr.sbin/ctm/ctm/Makefile b/usr.sbin/ctm/ctm/Makefile
index 5fb80d5a4784..6e88c577623f 100644
--- a/usr.sbin/ctm/ctm/Makefile
+++ b/usr.sbin/ctm/ctm/Makefile
@@ -6,7 +6,7 @@
 # this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 # ----------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ctm/ctm/Makefile,v 1.12.2.1 1999/08/29 15:40:55 peter Exp $
 #
 
 PROG=		ctm
diff --git a/usr.sbin/ctm/ctm/ctm.1 b/usr.sbin/ctm/ctm/ctm.1
index 4656301c11ba..7d9ff34716ce 100644
--- a/usr.sbin/ctm/ctm/ctm.1
+++ b/usr.sbin/ctm/ctm/ctm.1
@@ -10,7 +10,7 @@
 .\"
 .\" CTM and ctm(1) by <phk@login.dknet.dk>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ctm/ctm/ctm.1,v 1.14.2.1 1999/08/29 15:40:55 peter Exp $
 .\"
 .Dd Mar 25, 1995
 .Os
diff --git a/usr.sbin/ctm/ctm/ctm.5 b/usr.sbin/ctm/ctm/ctm.5
index c70fdff3bb23..92eb6e8a0e06 100644
--- a/usr.sbin/ctm/ctm/ctm.5
+++ b/usr.sbin/ctm/ctm/ctm.5
@@ -10,7 +10,7 @@
 .\"
 .\" CTM and ctm(1) by <phk@login.dknet.dk>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ctm/ctm/ctm.5,v 1.7.2.1 1999/08/29 15:40:56 peter Exp $
 .\"
 .Dd March 25, 1995
 .Os
diff --git a/usr.sbin/ctm/ctm/ctm.c b/usr.sbin/ctm/ctm/ctm.c
index 156f1ee31c41..67978c344985 100644
--- a/usr.sbin/ctm/ctm/ctm.c
+++ b/usr.sbin/ctm/ctm/ctm.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm/ctm.c,v 1.17.2.1 1999/08/29 15:40:57 peter Exp $
  *
  * This is the client program of 'CTM'.  It will apply a CTM-patch to a
  * collection of files.
diff --git a/usr.sbin/ctm/ctm/ctm.h b/usr.sbin/ctm/ctm/ctm.h
index 437672f16054..f85d7e4b63cd 100644
--- a/usr.sbin/ctm/ctm/ctm.h
+++ b/usr.sbin/ctm/ctm/ctm.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm/ctm.h,v 1.13.2.1 1999/08/29 15:40:57 peter Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm/ctm_ed.c b/usr.sbin/ctm/ctm/ctm_ed.c
index 975b6b5e4b94..8a475affbfdb 100644
--- a/usr.sbin/ctm/ctm/ctm_ed.c
+++ b/usr.sbin/ctm/ctm/ctm_ed.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm/ctm_ed.c,v 1.9.2.1 1999/08/29 15:40:58 peter Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm/ctm_input.c b/usr.sbin/ctm/ctm/ctm_input.c
index 70192cdd0f4b..9fb8c0d9353e 100644
--- a/usr.sbin/ctm/ctm/ctm_input.c
+++ b/usr.sbin/ctm/ctm/ctm_input.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm/ctm_input.c,v 1.7.2.1 1999/08/29 15:40:58 peter Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm/ctm_pass1.c b/usr.sbin/ctm/ctm/ctm_pass1.c
index 90779dec2891..0b97c2e6575c 100644
--- a/usr.sbin/ctm/ctm/ctm_pass1.c
+++ b/usr.sbin/ctm/ctm/ctm_pass1.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm/ctm_pass1.c,v 1.15.2.1 1999/08/29 15:40:59 peter Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm/ctm_pass2.c b/usr.sbin/ctm/ctm/ctm_pass2.c
index ea298955646f..fe9d3fc33918 100644
--- a/usr.sbin/ctm/ctm/ctm_pass2.c
+++ b/usr.sbin/ctm/ctm/ctm_pass2.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm/ctm_pass2.c,v 1.16.2.1 1999/08/29 15:40:59 peter Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm/ctm_pass3.c b/usr.sbin/ctm/ctm/ctm_pass3.c
index 1d45b159a125..d70dc3652c72 100644
--- a/usr.sbin/ctm/ctm/ctm_pass3.c
+++ b/usr.sbin/ctm/ctm/ctm_pass3.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm/ctm_pass3.c,v 1.18.2.1 1999/08/29 15:41:00 peter Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm/ctm_passb.c b/usr.sbin/ctm/ctm/ctm_passb.c
index ace2ce7065f2..f0b7ee2cb1a3 100644
--- a/usr.sbin/ctm/ctm/ctm_passb.c
+++ b/usr.sbin/ctm/ctm/ctm_passb.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Joseph Koshy
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm/ctm_passb.c,v 1.4.2.1 1999/08/29 15:41:00 peter Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm/ctm_syntax.c b/usr.sbin/ctm/ctm/ctm_syntax.c
index 5b7c637ff389..84cbc314f756 100644
--- a/usr.sbin/ctm/ctm/ctm_syntax.c
+++ b/usr.sbin/ctm/ctm/ctm_syntax.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm/ctm_syntax.c,v 1.9.2.1 1999/08/29 15:41:00 peter Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c b/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c
index 932cd43eea87..9a8a9353fd2d 100644
--- a/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c
+++ b/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c,v 1.8.2.1 1999/08/29 15:41:02 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/ctm/ctm_rmail/ctm_rmail.1 b/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
index 77a670baab19..2ac9e5524c03 100644
--- a/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
+++ b/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
@@ -5,7 +5,7 @@
 .\"
 .\" Author: Stephen McKay
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ctm/ctm_rmail/ctm_rmail.1,v 1.14.2.3 1999/10/30 15:59:34 phantom Exp $
 .\"
 .Dd January 24, 1995
 .Dt CTM_MAIL 1
diff --git a/usr.sbin/ctm/ctm_smail/ctm_smail.c b/usr.sbin/ctm/ctm_smail/ctm_smail.c
index f86d5d045ebe..648532f523ba 100644
--- a/usr.sbin/ctm/ctm_smail/ctm_smail.c
+++ b/usr.sbin/ctm/ctm_smail/ctm_smail.c
@@ -11,7 +11,7 @@
  * In return you should think about all the nice people who give away software.
  * Maybe you should write some free software too.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm_smail/ctm_smail.c,v 1.11.2.1 1999/08/29 15:41:05 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/ctm/mkCTM/dequeue b/usr.sbin/ctm/mkCTM/dequeue
index 697ec0b5be85..c7bfdeec8f6f 100755
--- a/usr.sbin/ctm/mkCTM/dequeue
+++ b/usr.sbin/ctm/mkCTM/dequeue
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ctm/mkCTM/dequeue,v 1.3.2.1 1999/08/29 15:41:07 peter Exp $
 
 L=/home/ctm/log.dequeue
 /usr/sbin/ctm_dequeue -n 1 -l $L /home/ctm/queue/ctm-cvs-cur
diff --git a/usr.sbin/dev_mkdb/dev_mkdb.c b/usr.sbin/dev_mkdb/dev_mkdb.c
index 0a0e2c1857a8..4fdd4cbb6180 100644
--- a/usr.sbin/dev_mkdb/dev_mkdb.c
+++ b/usr.sbin/dev_mkdb/dev_mkdb.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)dev_mkdb.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/dev_mkdb/dev_mkdb.c,v 1.3.2.1 1999/08/29 15:41:08 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/diskpart/diskpart.c b/usr.sbin/diskpart/diskpart.c
index 6c4d4ad1d5de..4cd49ec28ca2 100644
--- a/usr.sbin/diskpart/diskpart.c
+++ b/usr.sbin/diskpart/diskpart.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)diskpart.c	8.3 (Berkeley) 11/30/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/diskpart/diskpart.c,v 1.10.2.1 1999/08/29 15:41:10 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/dpt/Makefile b/usr.sbin/dpt/Makefile
index 74313300ffa7..f68ebe7db251 100644
--- a/usr.sbin/dpt/Makefile
+++ b/usr.sbin/dpt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/dpt/Makefile,v 1.1.4.1 1999/08/29 15:41:11 peter Exp $
 
 SUBDIR=	dpt_ctlinfo dpt_ctls dpt_dm dpt_led dpt_sig dpt_softc dpt_sysinfo
 
diff --git a/usr.sbin/dpt/Makefile.inc b/usr.sbin/dpt/Makefile.inc
index 265f86d1ed55..624d4a39a69b 100644
--- a/usr.sbin/dpt/Makefile.inc
+++ b/usr.sbin/dpt/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/dpt/Makefile.inc,v 1.2.4.1 1999/08/29 15:41:12 peter Exp $
 
 .include "../Makefile.inc"
diff --git a/usr.sbin/dpt/dpt_ctlinfo/Makefile b/usr.sbin/dpt/dpt_ctlinfo/Makefile
index ac71bd1305c2..c4ba2575e952 100644
--- a/usr.sbin/dpt/dpt_ctlinfo/Makefile
+++ b/usr.sbin/dpt/dpt_ctlinfo/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/dpt/dpt_ctlinfo/Makefile,v 1.4.2.1 1999/08/29 15:41:14 peter Exp $
 
 PROG=	dpt_ctlinfo
 SRCS=	dpt_ctlinfo.c
diff --git a/usr.sbin/dpt/dpt_ctlinfo/dpt_ctlinfo.c b/usr.sbin/dpt/dpt_ctlinfo/dpt_ctlinfo.c
index ccc984ed4b41..701fcce020ce 100644
--- a/usr.sbin/dpt/dpt_ctlinfo/dpt_ctlinfo.c
+++ b/usr.sbin/dpt/dpt_ctlinfo/dpt_ctlinfo.c
@@ -30,7 +30,7 @@
 
 /* dpt_ctlinfo.c:  Dunp a DPT HBA Information Block */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/usr.sbin/dpt/dpt_ctlinfo/dpt_ctlinfo.c,v 1.2.2.1 1999/08/29 15:41:14 peter Exp $"
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/usr.sbin/dpt/dpt_ctls/Makefile b/usr.sbin/dpt/dpt_ctls/Makefile
index e0b0eda2b4ce..112214b5b29f 100644
--- a/usr.sbin/dpt/dpt_ctls/Makefile
+++ b/usr.sbin/dpt/dpt_ctls/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/dpt/dpt_ctls/Makefile,v 1.3.2.1 1999/08/29 15:41:15 peter Exp $
 
 PROG=	dpt_ctls
 SRCS=	dpt_ctls.c
diff --git a/usr.sbin/dpt/dpt_ctls/dpt_ctls.c b/usr.sbin/dpt/dpt_ctls/dpt_ctls.c
index 41e3d24f0155..492ed583bcd5 100644
--- a/usr.sbin/dpt/dpt_ctls/dpt_ctls.c
+++ b/usr.sbin/dpt/dpt_ctls/dpt_ctls.c
@@ -30,7 +30,7 @@
 
 /* dpt_ctls.c:  Dunp a the number of configured DPT HBAs */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/usr.sbin/dpt/dpt_ctls/dpt_ctls.c,v 1.2.2.1 1999/08/29 15:41:16 peter Exp $"
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/usr.sbin/dpt/dpt_dm/Makefile b/usr.sbin/dpt/dpt_dm/Makefile
index d67e5567972a..7c1778cbfbe4 100644
--- a/usr.sbin/dpt/dpt_dm/Makefile
+++ b/usr.sbin/dpt/dpt_dm/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/dpt/dpt_dm/Makefile,v 1.3.2.1 1999/08/29 15:41:17 peter Exp $
 
 PROG=	dpt_dm
 SRCS=	dpt_dm.c
diff --git a/usr.sbin/dpt/dpt_dm/dpt_dm.c b/usr.sbin/dpt/dpt_dm/dpt_dm.c
index 91df80797294..0a4186b59bd6 100644
--- a/usr.sbin/dpt/dpt_dm/dpt_dm.c
+++ b/usr.sbin/dpt/dpt_dm/dpt_dm.c
@@ -30,7 +30,7 @@
 
 /* dpt_dm.c: Dump a DPT metrics structure */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/usr.sbin/dpt/dpt_dm/dpt_dm.c,v 1.2.2.1 1999/08/29 15:41:17 peter Exp $"
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/usr.sbin/dpt/dpt_led/Makefile b/usr.sbin/dpt/dpt_led/Makefile
index e449aa5ae9ef..d9479251dea3 100644
--- a/usr.sbin/dpt/dpt_led/Makefile
+++ b/usr.sbin/dpt/dpt_led/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/dpt/dpt_led/Makefile,v 1.3.2.1 1999/08/29 15:41:19 peter Exp $
 
 PROG=	dpt_led
 SRCS=	dpt_led.c
diff --git a/usr.sbin/dpt/dpt_led/dpt_led.c b/usr.sbin/dpt/dpt_led/dpt_led.c
index 21728fb093ad..3711f341cf83 100644
--- a/usr.sbin/dpt/dpt_led/dpt_led.c
+++ b/usr.sbin/dpt/dpt_led/dpt_led.c
@@ -30,7 +30,7 @@
 
 /* dpt_led.c:  Show the blinking LED array status of a DPT HBAs */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/usr.sbin/dpt/dpt_led/dpt_led.c,v 1.2.2.1 1999/08/29 15:41:20 peter Exp $"
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/usr.sbin/dpt/dpt_sig/Makefile b/usr.sbin/dpt/dpt_sig/Makefile
index c25c11a18848..571eb4ec8784 100644
--- a/usr.sbin/dpt/dpt_sig/Makefile
+++ b/usr.sbin/dpt/dpt_sig/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/dpt/dpt_sig/Makefile,v 1.3.2.1 1999/08/29 15:41:21 peter Exp $
 
 PROG=	dpt_sig
 SRCS=	dpt_sig.c
diff --git a/usr.sbin/dpt/dpt_sig/dpt_sig.c b/usr.sbin/dpt/dpt_sig/dpt_sig.c
index 0d7727bd0e19..e9d9d7ab6121 100644
--- a/usr.sbin/dpt/dpt_sig/dpt_sig.c
+++ b/usr.sbin/dpt/dpt_sig/dpt_sig.c
@@ -30,7 +30,7 @@
 
 /* dpt_sig.c:  Dunp a DPT Signature */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/usr.sbin/dpt/dpt_sig/dpt_sig.c,v 1.2.2.1 1999/08/29 15:41:21 peter Exp $"
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/usr.sbin/dpt/dpt_softc/Makefile b/usr.sbin/dpt/dpt_softc/Makefile
index 45c24ddd601d..700b7f10970c 100644
--- a/usr.sbin/dpt/dpt_softc/Makefile
+++ b/usr.sbin/dpt/dpt_softc/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/dpt/dpt_softc/Makefile,v 1.3.2.1 1999/08/29 15:41:23 peter Exp $
 
 PROG=	dpt_softc
 SRCS=	dpt_softc.c
diff --git a/usr.sbin/dpt/dpt_softc/dpt_softc.c b/usr.sbin/dpt/dpt_softc/dpt_softc.c
index 8b913d915d22..d6a435c95bf5 100644
--- a/usr.sbin/dpt/dpt_softc/dpt_softc.c
+++ b/usr.sbin/dpt/dpt_softc/dpt_softc.c
@@ -30,7 +30,7 @@
 
 /* dpt_softc.c:  Dunp a DPT control structure */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/usr.sbin/dpt/dpt_softc/dpt_softc.c,v 1.2.2.1 1999/08/29 15:41:23 peter Exp $"
 
 #include <stdlib.h>
 #include <fcntl.h>
diff --git a/usr.sbin/dpt/dpt_sysinfo/Makefile b/usr.sbin/dpt/dpt_sysinfo/Makefile
index d9a61f3c697d..d5c283f5933e 100644
--- a/usr.sbin/dpt/dpt_sysinfo/Makefile
+++ b/usr.sbin/dpt/dpt_sysinfo/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/dpt/dpt_sysinfo/Makefile,v 1.3.2.1 1999/08/29 15:41:25 peter Exp $
 
 PROG=	dpt_sysinfo
 SRCS=	dpt_sysinfo.c
diff --git a/usr.sbin/dpt/dpt_sysinfo/dpt_sysinfo.c b/usr.sbin/dpt/dpt_sysinfo/dpt_sysinfo.c
index edd90fa17318..49cb781cc5d0 100644
--- a/usr.sbin/dpt/dpt_sysinfo/dpt_sysinfo.c
+++ b/usr.sbin/dpt/dpt_sysinfo/dpt_sysinfo.c
@@ -30,7 +30,7 @@
 
 /* dpt_ctlinfo.c:  Dunp a DPT HBA Information Block */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/usr.sbin/dpt/dpt_sysinfo/dpt_sysinfo.c,v 1.2.2.1 1999/08/29 15:41:25 peter Exp $"
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/usr.sbin/edquota/edquota.8 b/usr.sbin/edquota/edquota.8
index dc07d19a1489..9f744cf90ba2 100644
--- a/usr.sbin/edquota/edquota.8
+++ b/usr.sbin/edquota/edquota.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)edquota.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/edquota/edquota.8,v 1.6.2.2 1999/08/29 15:41:27 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt EDQUOTA 8
diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c
index ef3b2ed4b0c5..72302123c4dc 100644
--- a/usr.sbin/edquota/edquota.c
+++ b/usr.sbin/edquota/edquota.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)edquota.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/edquota/edquota.c,v 1.8.2.1 1999/08/29 15:41:27 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/fdcontrol/fdcontrol.c b/usr.sbin/fdcontrol/fdcontrol.c
index 2d9511ea15a9..e8a67b364498 100644
--- a/usr.sbin/fdcontrol/fdcontrol.c
+++ b/usr.sbin/fdcontrol/fdcontrol.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/fdcontrol/fdcontrol.c,v 1.5.2.1 1999/08/29 15:41:28 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/fdwrite/Makefile b/usr.sbin/fdwrite/Makefile
index 8eac7b0ebc00..c221814563e2 100644
--- a/usr.sbin/fdwrite/Makefile
+++ b/usr.sbin/fdwrite/Makefile
@@ -6,7 +6,7 @@
 # this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 # ----------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/fdwrite/Makefile,v 1.4.2.1 1999/08/29 15:41:30 peter Exp $
 #
 #
 
diff --git a/usr.sbin/fdwrite/fdwrite.1 b/usr.sbin/fdwrite/fdwrite.1
index 66e0f619ba56..ac3156312514 100644
--- a/usr.sbin/fdwrite/fdwrite.1
+++ b/usr.sbin/fdwrite/fdwrite.1
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/fdwrite/fdwrite.1,v 1.9.2.1 1999/08/29 15:41:31 peter Exp $
 .\"
 .\"
 .Dd September 16, 1993
diff --git a/usr.sbin/fdwrite/fdwrite.c b/usr.sbin/fdwrite/fdwrite.c
index f9f76a81bcdd..29f9445c951d 100644
--- a/usr.sbin/fdwrite/fdwrite.c
+++ b/usr.sbin/fdwrite/fdwrite.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/fdwrite/fdwrite.c,v 1.7.2.1 1999/08/29 15:41:31 peter Exp $
  *
  */
 
diff --git a/usr.sbin/i4b/Makefile b/usr.sbin/i4b/Makefile
index c554200d8904..343353d40b37 100644
--- a/usr.sbin/i4b/Makefile
+++ b/usr.sbin/i4b/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/Makefile,v 1.1.2.1 1999/11/15 22:40:48 joe Exp $
 
 MAINTAINER  = hm@freebsd.org
 SUBDIR      = isdntrace isdndebug isdnd g711conv man isdntest \
diff --git a/usr.sbin/i4b/dtmfdecode/Makefile b/usr.sbin/i4b/dtmfdecode/Makefile
index 792b2ef39301..295c06dee1eb 100644
--- a/usr.sbin/i4b/dtmfdecode/Makefile
+++ b/usr.sbin/i4b/dtmfdecode/Makefile
@@ -1,6 +1,6 @@
 #---------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/dtmfdecode/Makefile,v 1.3.2.1 1999/11/15 22:40:51 joe Exp $
 #
 #	last edit-date: [Thu May 20 12:04:05 1999]
 #
diff --git a/usr.sbin/i4b/dtmfdecode/dtmfdecode.1 b/usr.sbin/i4b/dtmfdecode/dtmfdecode.1
index 42cd5beb7419..aed5f5bff123 100644
--- a/usr.sbin/i4b/dtmfdecode/dtmfdecode.1
+++ b/usr.sbin/i4b/dtmfdecode/dtmfdecode.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/dtmfdecode/dtmfdecode.1,v 1.4.2.1 1999/11/15 22:40:51 joe Exp $
 .\"
 .\"	last edit-date: [Mon Apr 26 13:42:15 1999]
 .\"
diff --git a/usr.sbin/i4b/dtmfdecode/dtmfdecode.c b/usr.sbin/i4b/dtmfdecode/dtmfdecode.c
index f96bacd42b10..68dd7bbddb73 100644
--- a/usr.sbin/i4b/dtmfdecode/dtmfdecode.c
+++ b/usr.sbin/i4b/dtmfdecode/dtmfdecode.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/dtmfdecode/dtmfdecode.c,v 1.3.2.1 1999/11/15 22:40:51 joe Exp $
  *
  * Extract DTMF signalling from ISDN4BSD A-law coded audio data
  *
diff --git a/usr.sbin/i4b/g711conv/Makefile b/usr.sbin/i4b/g711conv/Makefile
index f96de268deea..606e177ec31f 100644
--- a/usr.sbin/i4b/g711conv/Makefile
+++ b/usr.sbin/i4b/g711conv/Makefile
@@ -1,6 +1,6 @@
 #---------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/g711conv/Makefile,v 1.2.2.1 1999/11/15 22:40:52 joe Exp $
 #
 #	last edit-date: [Thu May 20 11:58:43 1999]
 #
diff --git a/usr.sbin/i4b/g711conv/g711conv.1 b/usr.sbin/i4b/g711conv/g711conv.1
index 4d9102458cad..a4d8a06a357c 100644
--- a/usr.sbin/i4b/g711conv/g711conv.1
+++ b/usr.sbin/i4b/g711conv/g711conv.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/g711conv/g711conv.1,v 1.3.2.1 1999/11/15 22:40:52 joe Exp $
 .\"
 .\"	last edit-date: [Mon Mar 15 16:17:23 1999]
 .\"
diff --git a/usr.sbin/i4b/g711conv/g711conv.c b/usr.sbin/i4b/g711conv/g711conv.c
index f6a442ead0d3..77997a16a4b5 100644
--- a/usr.sbin/i4b/g711conv/g711conv.c
+++ b/usr.sbin/i4b/g711conv/g711conv.c
@@ -67,7 +67,7 @@
  *
  *	last edit-date: [Mon Apr 26 14:00:31 1999]
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/g711conv/g711conv.c,v 1.3.2.1 1999/11/15 22:40:53 joe Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/usr.sbin/i4b/isdnd/Makefile b/usr.sbin/i4b/isdnd/Makefile
index 8b325b0c3225..8c40737c1896 100644
--- a/usr.sbin/i4b/isdnd/Makefile
+++ b/usr.sbin/i4b/isdnd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/isdnd/Makefile,v 1.2.2.1 1999/08/29 15:41:35 peter Exp $
 
 PROG	=	isdnd
 
diff --git a/usr.sbin/i4b/isdnd/alias.c b/usr.sbin/i4b/isdnd/alias.c
index fe25e4c66a11..4ebe45fd0d0a 100644
--- a/usr.sbin/i4b/isdnd/alias.c
+++ b/usr.sbin/i4b/isdnd/alias.c
@@ -30,7 +30,7 @@
  *	NOTE:	this has to stay in sync with isdntel/alias.c to be able
  *		to share a common aliasfile!
  *		
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/alias.c,v 1.1.2.2 1999/11/15 22:40:53 joe Exp $
  *
  *      last edit-date: [Sun Feb 14 10:10:03 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/config.h b/usr.sbin/i4b/isdnd/config.h
index 6f591a90bc8b..0b2a66f9cf21 100644
--- a/usr.sbin/i4b/isdnd/config.h
+++ b/usr.sbin/i4b/isdnd/config.h
@@ -27,7 +27,7 @@
  *	i4b daemon - compile time configuration header file
  *	---------------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/config.h,v 1.1.2.2 1999/11/15 22:40:54 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:10:10 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/controller.c b/usr.sbin/i4b/isdnd/controller.c
index 861b79e6de3d..8b472d727c3b 100644
--- a/usr.sbin/i4b/isdnd/controller.c
+++ b/usr.sbin/i4b/isdnd/controller.c
@@ -27,7 +27,7 @@
  *	i4b daemon - controller state support routines
  *	----------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/controller.c,v 1.1.2.2 1999/11/15 22:40:54 joe Exp $
  *
  *      last edit-date: [Mon May 10 21:35:55 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/curses.c b/usr.sbin/i4b/isdnd/curses.c
index ca8bf757d805..15311c02bf20 100644
--- a/usr.sbin/i4b/isdnd/curses.c
+++ b/usr.sbin/i4b/isdnd/curses.c
@@ -27,7 +27,7 @@
  *	i4b daemon - curses fullscreen output
  *	-------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/curses.c,v 1.1.2.2 1999/11/15 22:40:54 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:10:24 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/dial.c b/usr.sbin/i4b/isdnd/dial.c
index 0d6c3e0f1b47..bbc2774e395b 100644
--- a/usr.sbin/i4b/isdnd/dial.c
+++ b/usr.sbin/i4b/isdnd/dial.c
@@ -27,7 +27,7 @@
  *	i4b daemon - dial handling routines
  *	-----------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/dial.c,v 1.1.2.2 1999/11/15 22:40:54 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:10:30 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/exec.c b/usr.sbin/i4b/isdnd/exec.c
index b79b2beed8ae..0258f4b82938 100644
--- a/usr.sbin/i4b/isdnd/exec.c
+++ b/usr.sbin/i4b/isdnd/exec.c
@@ -27,7 +27,7 @@
  *	exec.h - supplemental program/script execution
  *	----------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/exec.c,v 1.1.2.2 1999/11/15 22:40:55 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:10:35 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/fsm.c b/usr.sbin/i4b/isdnd/fsm.c
index 0dca785674d4..3f643e32efdd 100644
--- a/usr.sbin/i4b/isdnd/fsm.c
+++ b/usr.sbin/i4b/isdnd/fsm.c
@@ -27,7 +27,7 @@
  *	FSM for isdnd
  *	-------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/fsm.c,v 1.1.2.2 1999/11/15 22:40:55 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:10:41 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/isdnd.8 b/usr.sbin/i4b/isdnd/isdnd.8
index 3397fc3d0765..d83b18c4eb82 100644
--- a/usr.sbin/i4b/isdnd/isdnd.8
+++ b/usr.sbin/i4b/isdnd/isdnd.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$ 
+.\" $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.8,v 1.1.2.3 1999/11/15 22:40:55 joe Exp $ 
 .\"
 .\"	last edit-date: [Thu May 20 14:37:42 1999]
 .\"
diff --git a/usr.sbin/i4b/isdnd/isdnd.acct.5 b/usr.sbin/i4b/isdnd/isdnd.acct.5
index 5c0d0baa4a74..c37f1a623871 100644
--- a/usr.sbin/i4b/isdnd/isdnd.acct.5
+++ b/usr.sbin/i4b/isdnd/isdnd.acct.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$ 
+.\" $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.acct.5,v 1.1.2.3 1999/11/15 22:40:55 joe Exp $ 
 .\"
 .\"	last edit-date: [Mon Feb 15 16:54:23 1999]
 .\"
diff --git a/usr.sbin/i4b/isdnd/isdnd.h b/usr.sbin/i4b/isdnd/isdnd.h
index 130703405612..549c2c0d775c 100644
--- a/usr.sbin/i4b/isdnd/isdnd.h
+++ b/usr.sbin/i4b/isdnd/isdnd.h
@@ -27,7 +27,7 @@
  *	i4b daemon - main header file
  *	-----------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.h,v 1.1.2.2 1999/11/15 22:40:56 joe Exp $ 
  *
  *      last edit-date: [Thu May 20 14:44:18 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/isdnd.rates.5 b/usr.sbin/i4b/isdnd/isdnd.rates.5
index 098e5efa79d9..b949ab9484a9 100644
--- a/usr.sbin/i4b/isdnd/isdnd.rates.5
+++ b/usr.sbin/i4b/isdnd/isdnd.rates.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$ 
+.\" $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.rates.5,v 1.1.2.3 1999/11/15 22:40:56 joe Exp $ 
 .\"
 .\"     last edit-date: [Sun Feb 14 10:11:05 1999]
 .\"
diff --git a/usr.sbin/i4b/isdnd/isdnd.rc.5 b/usr.sbin/i4b/isdnd/isdnd.rc.5
index 08ccdd601221..b3fc0dbb1ba2 100644
--- a/usr.sbin/i4b/isdnd/isdnd.rc.5
+++ b/usr.sbin/i4b/isdnd/isdnd.rc.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$ 
+.\" $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.rc.5,v 1.1.2.3 1999/11/15 22:40:56 joe Exp $ 
 .\"
 .\"     last edit-date: [Wed Jul 28 15:57:02 1999]
 .\"
diff --git a/usr.sbin/i4b/isdnd/log.c b/usr.sbin/i4b/isdnd/log.c
index 25a0307a7620..c7cd31365c6e 100644
--- a/usr.sbin/i4b/isdnd/log.c
+++ b/usr.sbin/i4b/isdnd/log.c
@@ -27,7 +27,7 @@
  *	i4b daemon - logging routines
  *	-----------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/log.c,v 1.1.2.2 1999/11/15 22:40:57 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:11:18 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/main.c b/usr.sbin/i4b/isdnd/main.c
index 3980e69b539a..8c672e232833 100644
--- a/usr.sbin/i4b/isdnd/main.c
+++ b/usr.sbin/i4b/isdnd/main.c
@@ -27,7 +27,7 @@
  *	i4b daemon - main program entry
  *	-------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/main.c,v 1.1.2.2 1999/11/15 22:40:57 joe Exp $ 
  *
  *      last edit-date: [Fri Jul 30 08:14:10 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/monitor.c b/usr.sbin/i4b/isdnd/monitor.c
index afa54dbb065c..a24c630ad19d 100644
--- a/usr.sbin/i4b/isdnd/monitor.c
+++ b/usr.sbin/i4b/isdnd/monitor.c
@@ -33,7 +33,7 @@
  *	i4b daemon - network monitor server module
  *	------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/monitor.c,v 1.1.2.2 1999/11/15 22:40:57 joe Exp $
  *
  *      last edit-date: [Sun May 30 10:33:05 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/msghdl.c b/usr.sbin/i4b/isdnd/msghdl.c
index 0c72ae18a5d2..76f142444414 100644
--- a/usr.sbin/i4b/isdnd/msghdl.c
+++ b/usr.sbin/i4b/isdnd/msghdl.c
@@ -27,7 +27,7 @@
  *	i4b daemon - message from kernel handling routines
  *	--------------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/msghdl.c,v 1.1.2.2 1999/11/15 22:40:58 joe Exp $ 
  *
  *      last edit-date: [Mon Jul 26 13:55:57 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/pathnames.h b/usr.sbin/i4b/isdnd/pathnames.h
index b1d85a54f4ce..f2937a34bdb6 100644
--- a/usr.sbin/i4b/isdnd/pathnames.h
+++ b/usr.sbin/i4b/isdnd/pathnames.h
@@ -27,7 +27,7 @@
  *	i4b daemon - location of files
  *	------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/pathnames.h,v 1.1.2.2 1999/11/15 22:40:58 joe Exp $ 
  *
  *      last edit-date: [Thu Apr 29 09:07:29 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/pcause.c b/usr.sbin/i4b/isdnd/pcause.c
index a6b016af6d48..539a3f3bb483 100644
--- a/usr.sbin/i4b/isdnd/pcause.c
+++ b/usr.sbin/i4b/isdnd/pcause.c
@@ -27,7 +27,7 @@
  *	printing cause values
  *	---------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/pcause.c,v 1.1.2.2 1999/11/15 22:40:58 joe Exp $
  *
  *	last edit-date: [Sun Feb 14 10:11:49 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/process.c b/usr.sbin/i4b/isdnd/process.c
index 67747ea61a6a..9b60d4dee287 100644
--- a/usr.sbin/i4b/isdnd/process.c
+++ b/usr.sbin/i4b/isdnd/process.c
@@ -27,7 +27,7 @@
  *	i4b daemon - process handling routines
  *	--------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/process.c,v 1.1.2.2 1999/11/15 22:40:59 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:11:54 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/rates.c b/usr.sbin/i4b/isdnd/rates.c
index 20fd961b0bfd..6c5e240f27f7 100644
--- a/usr.sbin/i4b/isdnd/rates.c
+++ b/usr.sbin/i4b/isdnd/rates.c
@@ -35,7 +35,7 @@
  *	i4b daemon - charging rates description file handling
  *	-----------------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/rates.c,v 1.1.2.2 1999/11/15 22:40:59 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:12:01 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/rc_config.c b/usr.sbin/i4b/isdnd/rc_config.c
index 1ab383a41d03..88888b2bd16b 100644
--- a/usr.sbin/i4b/isdnd/rc_config.c
+++ b/usr.sbin/i4b/isdnd/rc_config.c
@@ -27,7 +27,7 @@
  *	i4b daemon - config file processing
  *	-----------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/rc_config.c,v 1.1.2.2 1999/11/15 22:40:59 joe Exp $ 
  *
  *      last edit-date: [Thu May 20 14:11:26 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/rc_parse.y b/usr.sbin/i4b/isdnd/rc_parse.y
index 7d77359235e9..bd1797011cb5 100644
--- a/usr.sbin/i4b/isdnd/rc_parse.y
+++ b/usr.sbin/i4b/isdnd/rc_parse.y
@@ -30,7 +30,7 @@
  *	i4b daemon - runtime configuration parser
  *	-----------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/rc_parse.y,v 1.1.2.2 1999/11/15 22:40:59 joe Exp $ 
  *
  *      last edit-date: [Thu May 20 14:05:26 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/rc_scan.l b/usr.sbin/i4b/isdnd/rc_scan.l
index 9e0df6e4b548..72c6ffac7e7b 100644
--- a/usr.sbin/i4b/isdnd/rc_scan.l
+++ b/usr.sbin/i4b/isdnd/rc_scan.l
@@ -30,7 +30,7 @@
  *	i4b daemon - runtime configuration lexical analyzer
  *	---------------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/rc_scan.l,v 1.1.2.2 1999/11/15 22:41:00 joe Exp $ 
  *
  *      last edit-date: [Thu May 20 14:04:13 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/support.c b/usr.sbin/i4b/isdnd/support.c
index bf15653becbb..0a075e5a6687 100644
--- a/usr.sbin/i4b/isdnd/support.c
+++ b/usr.sbin/i4b/isdnd/support.c
@@ -27,7 +27,7 @@
  *	i4b daemon - misc support routines
  *	----------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/support.c,v 1.1.2.2 1999/11/15 22:41:00 joe Exp $ 
  *
  *      last edit-date: [Mon Jul  5 15:29:22 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/timer.c b/usr.sbin/i4b/isdnd/timer.c
index df556d255e0c..88ea68163155 100644
--- a/usr.sbin/i4b/isdnd/timer.c
+++ b/usr.sbin/i4b/isdnd/timer.c
@@ -27,7 +27,7 @@
  *	i4b daemon - timer/timing support routines
  *	------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/timer.c,v 1.1.2.2 1999/11/15 22:41:01 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:12:32 1999]
  *
diff --git a/usr.sbin/i4b/isdndebug/isdndebug.8 b/usr.sbin/i4b/isdndebug/isdndebug.8
index 6fafa500c33d..ccb0543ae411 100644
--- a/usr.sbin/i4b/isdndebug/isdndebug.8
+++ b/usr.sbin/i4b/isdndebug/isdndebug.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdndebug/isdndebug.8,v 1.1.2.3 1999/11/15 22:41:02 joe Exp $
 .\"
 .\"	last edit-date: [Sat May 29 11:03:15 1999]
 .\"
diff --git a/usr.sbin/i4b/isdndebug/main.c b/usr.sbin/i4b/isdndebug/main.c
index 8cc48673a01f..97315a9e8b0e 100644
--- a/usr.sbin/i4b/isdndebug/main.c
+++ b/usr.sbin/i4b/isdndebug/main.c
@@ -27,7 +27,7 @@
  *	main.c - i4b set debug options
  *	------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdndebug/main.c,v 1.1.2.2 1999/11/15 22:41:02 joe Exp $ 
  *
  *      last edit-date: [Fri Jul 30 08:14:34 1999]
  *
diff --git a/usr.sbin/i4b/isdndecode/decode.h b/usr.sbin/i4b/isdndecode/decode.h
index bdd917a25c4e..6fe76deed035 100644
--- a/usr.sbin/i4b/isdndecode/decode.h
+++ b/usr.sbin/i4b/isdndecode/decode.h
@@ -27,7 +27,7 @@
  *	decode.h - isdndecode header file
  *	---------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/decode.h,v 1.1.2.2 1999/11/15 22:41:04 joe Exp $
  *
  *      last edit-date: [Sun Feb 14 10:15:59 1999]
  *
diff --git a/usr.sbin/i4b/isdndecode/facility.c b/usr.sbin/i4b/isdndecode/facility.c
index c9003f8037f4..73d36f82dc30 100644
--- a/usr.sbin/i4b/isdndecode/facility.c
+++ b/usr.sbin/i4b/isdndecode/facility.c
@@ -27,7 +27,7 @@
  *	facility.c - decode Q.932 facilities
  *	------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/facility.c,v 1.1.2.2 1999/11/15 22:41:05 joe Exp $
  *
  *      last edit-date: [Sun Feb 14 10:16:11 1999]
  *
diff --git a/usr.sbin/i4b/isdndecode/facility.h b/usr.sbin/i4b/isdndecode/facility.h
index 5e98e726c94e..eafe3359f786 100644
--- a/usr.sbin/i4b/isdndecode/facility.h
+++ b/usr.sbin/i4b/isdndecode/facility.h
@@ -27,7 +27,7 @@
  *	facility.h - Q.932 facility header file
  *	---------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/facility.h,v 1.1.2.2 1999/11/15 22:41:05 joe Exp $
  *
  *      last edit-date: [Sun Feb 14 10:16:17 1999]
  *
diff --git a/usr.sbin/i4b/isdndecode/isdndecode.8 b/usr.sbin/i4b/isdndecode/isdndecode.8
index be06df5e11fb..cf252dc01c1f 100644
--- a/usr.sbin/i4b/isdndecode/isdndecode.8
+++ b/usr.sbin/i4b/isdndecode/isdndecode.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdndecode/isdndecode.8,v 1.1.2.3 1999/11/15 22:41:05 joe Exp $
 .\"
 .\"	last edit-date: [Sun Feb 14 10:16:25 1999]
 .\"
diff --git a/usr.sbin/i4b/isdndecode/layer1.c b/usr.sbin/i4b/isdndecode/layer1.c
index 47374382952a..985ab22356de 100644
--- a/usr.sbin/i4b/isdndecode/layer1.c
+++ b/usr.sbin/i4b/isdndecode/layer1.c
@@ -27,7 +27,7 @@
  *	layer1.c - isdndecode, decode and print layer 1 information
  *	-----------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/layer1.c,v 1.1.2.2 1999/11/15 22:41:05 joe Exp $
  *
  *      last edit-date: [Sun Feb 14 10:16:40 1999]
  *
diff --git a/usr.sbin/i4b/isdndecode/layer2.c b/usr.sbin/i4b/isdndecode/layer2.c
index 9b5b737fc85d..961147af35ab 100644
--- a/usr.sbin/i4b/isdndecode/layer2.c
+++ b/usr.sbin/i4b/isdndecode/layer2.c
@@ -27,7 +27,7 @@
  *	layer2.c - decode and print layer 2 (Q.921) information
  *	-------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/layer2.c,v 1.1.2.2 1999/11/15 22:41:06 joe Exp $
  *
  *      last edit-date: [Sun Feb 14 10:16:46 1999]
  *
diff --git a/usr.sbin/i4b/isdndecode/layer3.c b/usr.sbin/i4b/isdndecode/layer3.c
index c7b6927edbad..289934538b59 100644
--- a/usr.sbin/i4b/isdndecode/layer3.c
+++ b/usr.sbin/i4b/isdndecode/layer3.c
@@ -27,7 +27,7 @@
  *	layer3.c - decode and print layer 3 (Q.931) information
  *	-------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/layer3.c,v 1.1.2.2 1999/11/15 22:41:06 joe Exp $
  *
  *      last edit-date: [Sun Feb 14 10:16:52 1999]
  *
diff --git a/usr.sbin/i4b/isdndecode/layer3_subr.c b/usr.sbin/i4b/isdndecode/layer3_subr.c
index 18721703370b..1907271e3d31 100644
--- a/usr.sbin/i4b/isdndecode/layer3_subr.c
+++ b/usr.sbin/i4b/isdndecode/layer3_subr.c
@@ -27,7 +27,7 @@
  *	layer3_subr.c - subroutines for IE decoding
  *	-------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/layer3_subr.c,v 1.1.2.2 1999/11/15 22:41:06 joe Exp $
  *
  *      last edit-date: [Sun Feb 14 10:16:58 1999]
  *
diff --git a/usr.sbin/i4b/isdndecode/main.c b/usr.sbin/i4b/isdndecode/main.c
index ead32521bd0d..7194a9fc9b25 100644
--- a/usr.sbin/i4b/isdndecode/main.c
+++ b/usr.sbin/i4b/isdndecode/main.c
@@ -27,7 +27,7 @@
  *	main.c - isdndecode main program file
  *	-------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/main.c,v 1.1.2.2 1999/11/15 22:41:06 joe Exp $
  *
  *      last edit-date: [Fri Jul 30 08:14:58 1999]
  *
diff --git a/usr.sbin/i4b/isdndecode/pcause.c b/usr.sbin/i4b/isdndecode/pcause.c
index a9f7f2f85389..6788c344376e 100644
--- a/usr.sbin/i4b/isdndecode/pcause.c
+++ b/usr.sbin/i4b/isdndecode/pcause.c
@@ -27,7 +27,7 @@
  *	pcause.c - printing cause values
  *	--------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/pcause.c,v 1.1.2.2 1999/11/15 22:41:07 joe Exp $
  *
  *      last edit-date: [Sun Feb 14 10:17:10 1999]
  *
diff --git a/usr.sbin/i4b/isdndecode/pcause.h b/usr.sbin/i4b/isdndecode/pcause.h
index 3f31eb92b307..cc5588fc427a 100644
--- a/usr.sbin/i4b/isdndecode/pcause.h
+++ b/usr.sbin/i4b/isdndecode/pcause.h
@@ -27,7 +27,7 @@
  *	pcause.h - Q.850 causes definitions
  *	-----------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/pcause.h,v 1.1.2.2 1999/11/15 22:41:07 joe Exp $
  *
  *      last edit-date: [Sun Feb 14 10:17:15 1999]
  *
diff --git a/usr.sbin/i4b/isdnmonitor/isdnmonitor.8 b/usr.sbin/i4b/isdnmonitor/isdnmonitor.8
index 2bf1f0584ade..d034fe3459c9 100644
--- a/usr.sbin/i4b/isdnmonitor/isdnmonitor.8
+++ b/usr.sbin/i4b/isdnmonitor/isdnmonitor.8
@@ -20,7 +20,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdnmonitor/isdnmonitor.8,v 1.1.2.2 1999/08/29 15:42:02 peter Exp $
 .\"
 .\"	last edit-date: [Fri Jan 30 22:49:48 1998]
 .\"
diff --git a/usr.sbin/i4b/isdnmonitor/main.c b/usr.sbin/i4b/isdnmonitor/main.c
index 873c24184934..7ac9eb247f9a 100644
--- a/usr.sbin/i4b/isdnmonitor/main.c
+++ b/usr.sbin/i4b/isdnmonitor/main.c
@@ -33,7 +33,7 @@
  *	i4b daemon - network monitor client
  *	-----------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnmonitor/main.c,v 1.1.2.2 1999/11/15 22:41:08 joe Exp $
  *
  *      last edit-date: [Sun May 30 15:19:47 1999]
  *
diff --git a/usr.sbin/i4b/isdnmonitor/monitor.h b/usr.sbin/i4b/isdnmonitor/monitor.h
index 8a87240e268c..727263dea43d 100644
--- a/usr.sbin/i4b/isdnmonitor/monitor.h
+++ b/usr.sbin/i4b/isdnmonitor/monitor.h
@@ -33,7 +33,7 @@
  *	i4b daemon - network monitor protocl definition
  *	-----------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnmonitor/monitor.h,v 1.1.2.2 1999/11/15 22:41:09 joe Exp $
  *
  *      last edit-date: [Sun May 30 15:50:10 1999]
  *
diff --git a/usr.sbin/i4b/isdntel/Makefile b/usr.sbin/i4b/isdntel/Makefile
index f1478a5a5dc3..db1e57cacbe1 100644
--- a/usr.sbin/i4b/isdntel/Makefile
+++ b/usr.sbin/i4b/isdntel/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/isdntel/Makefile,v 1.2.2.1 1999/08/29 15:42:06 peter Exp $
 
 PROG	 =	isdntel
 SRCS	 =	main.c display.c files.c alias.c
diff --git a/usr.sbin/i4b/isdntel/alias.c b/usr.sbin/i4b/isdntel/alias.c
index 76634961a0d8..df1d808c6d53 100644
--- a/usr.sbin/i4b/isdntel/alias.c
+++ b/usr.sbin/i4b/isdntel/alias.c
@@ -27,7 +27,7 @@
  *	isdntel - isdn4bsd telephone answering machine support
  *      ======================================================
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdntel/alias.c,v 1.1.2.2 1999/11/15 22:41:09 joe Exp $ 
  *
  *      last edit-date: [Mon Apr 26 13:53:13 1999]
  *
diff --git a/usr.sbin/i4b/isdntel/alias.h b/usr.sbin/i4b/isdntel/alias.h
index 1d9e71c9ad62..3bcb60ad1bb0 100644
--- a/usr.sbin/i4b/isdntel/alias.h
+++ b/usr.sbin/i4b/isdntel/alias.h
@@ -27,7 +27,7 @@
  *	isdn4bsd common alias file handling header
  *      ==========================================
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntel/alias.h,v 1.1.2.2 1999/11/15 22:41:10 joe Exp $
  *
  *      last edit-date: [Sun Feb 14 10:19:20 1999]
  *
diff --git a/usr.sbin/i4b/isdntel/defs.h b/usr.sbin/i4b/isdntel/defs.h
index 65109a1ce9ac..35d91e236c7e 100644
--- a/usr.sbin/i4b/isdntel/defs.h
+++ b/usr.sbin/i4b/isdntel/defs.h
@@ -27,7 +27,7 @@
  *	isdntel - isdn4bsd telephone answering support
  *      ==============================================
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdntel/defs.h,v 1.1.2.2 1999/11/15 22:41:10 joe Exp $ 
  *
  *      last edit-date: [Mon Apr 26 13:55:35 1999]
  *
diff --git a/usr.sbin/i4b/isdntel/display.c b/usr.sbin/i4b/isdntel/display.c
index bf0d898ed0f4..40f7afe4ed2c 100644
--- a/usr.sbin/i4b/isdntel/display.c
+++ b/usr.sbin/i4b/isdntel/display.c
@@ -27,7 +27,7 @@
  *	isdntel - isdn4bsd telephone answering machine support
  *      ======================================================
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdntel/display.c,v 1.1.2.2 1999/11/15 22:41:11 joe Exp $ 
  *
  *      last edit-date: [Mon Apr 26 13:57:08 1999]
  *
diff --git a/usr.sbin/i4b/isdntel/files.c b/usr.sbin/i4b/isdntel/files.c
index 6c007d35d83c..81c5229ff6aa 100644
--- a/usr.sbin/i4b/isdntel/files.c
+++ b/usr.sbin/i4b/isdntel/files.c
@@ -27,7 +27,7 @@
  *	isdntel - isdn4bsd telephone answering machine support
  *      ======================================================
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdntel/files.c,v 1.1.2.2 1999/11/15 22:41:11 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:19:38 1999]
  *
diff --git a/usr.sbin/i4b/isdntel/isdntel.8 b/usr.sbin/i4b/isdntel/isdntel.8
index 3c00f6499ee0..aad9be1d1f49 100644
--- a/usr.sbin/i4b/isdntel/isdntel.8
+++ b/usr.sbin/i4b/isdntel/isdntel.8
@@ -24,7 +24,7 @@
 .\"
 .\"	last edit-date: [Sun Feb 14 10:19:44 1999]
 .\"	
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdntel/isdntel.8,v 1.1.2.3 1999/11/15 22:41:11 joe Exp $
 .\"
 .Dd July 11, 1998
 .Dt ISDNTEL 8
diff --git a/usr.sbin/i4b/isdntel/main.c b/usr.sbin/i4b/isdntel/main.c
index 4eff3a34aa1a..9c341509bfb2 100644
--- a/usr.sbin/i4b/isdntel/main.c
+++ b/usr.sbin/i4b/isdntel/main.c
@@ -27,7 +27,7 @@
  *	isdntel - isdn4bsd telephone answering machine support
  *      ======================================================
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdntel/main.c,v 1.1.2.2 1999/11/15 22:41:12 joe Exp $ 
  *
  *      last edit-date: [Fri Jul 30 08:16:03 1999]
  *
diff --git a/usr.sbin/i4b/isdntelctl/isdntelctl.8 b/usr.sbin/i4b/isdntelctl/isdntelctl.8
index 77998ead5751..8eb76787fa64 100644
--- a/usr.sbin/i4b/isdntelctl/isdntelctl.8
+++ b/usr.sbin/i4b/isdntelctl/isdntelctl.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdntelctl/isdntelctl.8,v 1.1.2.2 1999/11/15 22:41:12 joe Exp $
 .\"
 .\"	last edit-date: [Wed Apr 21 11:27:34 1999]
 .\"
diff --git a/usr.sbin/i4b/isdntelctl/main.c b/usr.sbin/i4b/isdntelctl/main.c
index 00a57a289611..89839bc9607f 100644
--- a/usr.sbin/i4b/isdntelctl/main.c
+++ b/usr.sbin/i4b/isdntelctl/main.c
@@ -27,7 +27,7 @@
  *	isdntelctl - i4b set telephone interface options
  *	------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntelctl/main.c,v 1.1.2.2 1999/11/15 22:41:13 joe Exp $
  *
  *      last edit-date: [Fri Jul 30 08:16:21 1999]
  *
diff --git a/usr.sbin/i4b/isdntest/isdntest.8 b/usr.sbin/i4b/isdntest/isdntest.8
index 943c45133e39..25e86ccbfa80 100644
--- a/usr.sbin/i4b/isdntest/isdntest.8
+++ b/usr.sbin/i4b/isdntest/isdntest.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdntest/isdntest.8,v 1.1.2.3 1999/11/15 22:41:13 joe Exp $
 .\"
 .\"	last edit-date: [Sun Feb 14 10:21:18 1999]
 .\"
diff --git a/usr.sbin/i4b/isdntest/main.c b/usr.sbin/i4b/isdntest/main.c
index ba297357fc00..fd1ccae8702a 100644
--- a/usr.sbin/i4b/isdntest/main.c
+++ b/usr.sbin/i4b/isdntest/main.c
@@ -27,7 +27,7 @@
  *	main.c - i4b selftest utility
  *	-----------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdntest/main.c,v 1.1.2.2 1999/11/15 22:41:14 joe Exp $ 
  *
  *      last edit-date: [Fri Jul 30 08:16:37 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/1tr6.c b/usr.sbin/i4b/isdntrace/1tr6.c
index fe50837f79e5..e4cba1894548 100644
--- a/usr.sbin/i4b/isdntrace/1tr6.c
+++ b/usr.sbin/i4b/isdntrace/1tr6.c
@@ -27,7 +27,7 @@
  *	1tr6.c - print 1TR6 protocol traces
  *	-----------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/1tr6.c,v 1.1.2.2 1999/11/15 22:41:14 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:22:11 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/cable.txt b/usr.sbin/i4b/isdntrace/cable.txt
index 1190668469cc..1365fe9dd8d1 100644
--- a/usr.sbin/i4b/isdntrace/cable.txt
+++ b/usr.sbin/i4b/isdntrace/cable.txt
@@ -3,7 +3,7 @@
  *      Custom cable to trace an ISDN S0 bus with two passive (!) ISDN boards
  *	---------------------------------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/cable.txt,v 1.1.2.1 1999/08/29 15:42:17 peter Exp $ 
  *
  *      last edit-date: [Thu Jan 22 19:57:50 1998]
  *
diff --git a/usr.sbin/i4b/isdntrace/isdntrace.8 b/usr.sbin/i4b/isdntrace/isdntrace.8
index d648f1ce9a19..ca4f4642e917 100644
--- a/usr.sbin/i4b/isdntrace/isdntrace.8
+++ b/usr.sbin/i4b/isdntrace/isdntrace.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdntrace/isdntrace.8,v 1.1.2.3 1999/11/15 22:41:15 joe Exp $
 .\"
 .\"	last edit-date: [Sun Feb 14 10:22:24 1999]
 .\"
diff --git a/usr.sbin/i4b/isdntrace/pcause_1tr6.c b/usr.sbin/i4b/isdntrace/pcause_1tr6.c
index 69f4501d06fc..fcc0927e408e 100644
--- a/usr.sbin/i4b/isdntrace/pcause_1tr6.c
+++ b/usr.sbin/i4b/isdntrace/pcause_1tr6.c
@@ -27,7 +27,7 @@
  *	printing cause values
  *	---------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/pcause_1tr6.c,v 1.1.2.2 1999/11/15 22:41:15 joe Exp $
  *
  *	last edit-date: [Sun Feb 14 10:22:30 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/pcause_1tr6.h b/usr.sbin/i4b/isdntrace/pcause_1tr6.h
index 50cca662a33b..e4d4bdc269aa 100644
--- a/usr.sbin/i4b/isdntrace/pcause_1tr6.h
+++ b/usr.sbin/i4b/isdntrace/pcause_1tr6.h
@@ -27,7 +27,7 @@
  *	pcause1tr6.h - 1TR6 causes definitions
  *	--------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/pcause_1tr6.h,v 1.1.2.2 1999/11/15 22:41:15 joe Exp $
  *
  *	last edit-date: [Sun Feb 14 10:22:36 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/pcause_q850.c b/usr.sbin/i4b/isdntrace/pcause_q850.c
index 2ac097ebb16a..4d0f75d7f563 100644
--- a/usr.sbin/i4b/isdntrace/pcause_q850.c
+++ b/usr.sbin/i4b/isdntrace/pcause_q850.c
@@ -27,7 +27,7 @@
  *	printing cause values
  *	---------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/pcause_q850.c,v 1.1.2.2 1999/11/15 22:41:16 joe Exp $
  *
  *	last edit-date: [Sun Feb 14 10:22:42 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/pcause_q850.h b/usr.sbin/i4b/isdntrace/pcause_q850.h
index 01f217868437..35cb2538dd07 100644
--- a/usr.sbin/i4b/isdntrace/pcause_q850.h
+++ b/usr.sbin/i4b/isdntrace/pcause_q850.h
@@ -27,7 +27,7 @@
  *	pcauseq850.h - Q.850 causes definitions
  *	---------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/pcause_q850.h,v 1.1.2.2 1999/11/15 22:41:16 joe Exp $
  *
  *	last edit-date: [Sun Feb 14 10:22:48 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/q921.c b/usr.sbin/i4b/isdntrace/q921.c
index 5ad964d842e0..cc1af08b6fe0 100644
--- a/usr.sbin/i4b/isdntrace/q921.c
+++ b/usr.sbin/i4b/isdntrace/q921.c
@@ -30,7 +30,7 @@
  *	q.921.c - print Q.921 traces
  *	----------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/q921.c,v 1.1.2.1 1999/08/29 15:42:20 peter Exp $ 
  *
  *      last edit-date: [Thu Apr 16 15:38:34 1998]
  *
diff --git a/usr.sbin/i4b/isdntrace/q931.c b/usr.sbin/i4b/isdntrace/q931.c
index f997f9e9bce6..caf8e195c7e3 100644
--- a/usr.sbin/i4b/isdntrace/q931.c
+++ b/usr.sbin/i4b/isdntrace/q931.c
@@ -27,7 +27,7 @@
  *	q931.c - print Q.931 traces
  *	---------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/q931.c,v 1.1.2.2 1999/11/15 22:41:16 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:23:03 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/q931_util.c b/usr.sbin/i4b/isdntrace/q931_util.c
index 2afdd5a56daa..b6747f69707f 100644
--- a/usr.sbin/i4b/isdntrace/q931_util.c
+++ b/usr.sbin/i4b/isdntrace/q931_util.c
@@ -27,7 +27,7 @@
  *	q931_util.c - utility functions to print Q.931 traces
  *	-----------------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/q931_util.c,v 1.1.2.2 1999/11/15 22:41:17 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:23:10 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/q932_fac.c b/usr.sbin/i4b/isdntrace/q932_fac.c
index 55354a847be8..4598d60ebc1d 100644
--- a/usr.sbin/i4b/isdntrace/q932_fac.c
+++ b/usr.sbin/i4b/isdntrace/q932_fac.c
@@ -27,7 +27,7 @@
  *	q932_fac.c - decode Q.932 facilities
  *	------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/q932_fac.c,v 1.1.2.2 1999/11/15 22:41:17 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:23:16 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/q932_fac.h b/usr.sbin/i4b/isdntrace/q932_fac.h
index 176a705d4f47..eb5509e67ac1 100644
--- a/usr.sbin/i4b/isdntrace/q932_fac.h
+++ b/usr.sbin/i4b/isdntrace/q932_fac.h
@@ -27,7 +27,7 @@
  *	q932_fac.h - facility header file
  *	---------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/q932_fac.h,v 1.1.2.2 1999/11/15 22:41:17 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:23:22 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/trace.c b/usr.sbin/i4b/isdntrace/trace.c
index 465d363ab1d7..aa9d5e66eb15 100644
--- a/usr.sbin/i4b/isdntrace/trace.c
+++ b/usr.sbin/i4b/isdntrace/trace.c
@@ -35,7 +35,7 @@
  *	trace.c - print traces of D (B) channel activity for isdn4bsd
  *	-------------------------------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/trace.c,v 1.1.2.2 1999/11/15 22:41:17 joe Exp $ 
  *
  *      last edit-date: [Fri Jul 30 08:16:59 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/trace.h b/usr.sbin/i4b/isdntrace/trace.h
index 276b340d043b..75e1cb453279 100644
--- a/usr.sbin/i4b/isdntrace/trace.h
+++ b/usr.sbin/i4b/isdntrace/trace.h
@@ -35,7 +35,7 @@
  *	trace.h - header file for isdn trace
  *	------------------------------------
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/trace.h,v 1.1.2.2 1999/11/15 22:41:18 joe Exp $ 
  *
  *      last edit-date: [Sun Feb 14 10:23:35 1999]
  *
diff --git a/usr.sbin/i4b/man/daic.4 b/usr.sbin/i4b/man/daic.4
index 0053a8ef34d2..61301726cd67 100644
--- a/usr.sbin/i4b/man/daic.4
+++ b/usr.sbin/i4b/man/daic.4
@@ -20,7 +20,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/daic.4,v 1.1.2.2 1999/08/29 15:42:25 peter Exp $
 .\"
 .\"	last edit-date: [Fri Jan 30 22:49:48 1998]
 .\"
diff --git a/usr.sbin/i4b/man/i4b.4 b/usr.sbin/i4b/man/i4b.4
index bc5c4b14c62f..6cfd6d934b93 100644
--- a/usr.sbin/i4b/man/i4b.4
+++ b/usr.sbin/i4b/man/i4b.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4b.4,v 1.1.2.3 1999/11/15 22:41:20 joe Exp $
 .\"
 .\"	last edit-date: [Sun Feb 14 10:36:28 1999]
 .\"
diff --git a/usr.sbin/i4b/man/i4bctl.4 b/usr.sbin/i4b/man/i4bctl.4
index 9cb4ee941be9..ff9602ed5149 100644
--- a/usr.sbin/i4b/man/i4bctl.4
+++ b/usr.sbin/i4b/man/i4bctl.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4bctl.4,v 1.1.2.3 1999/11/15 22:41:20 joe Exp $
 .\"
 .\"	last edit-date: [Sun Feb 14 10:36:34 1999]
 .\"
diff --git a/usr.sbin/i4b/man/i4bipr.4 b/usr.sbin/i4b/man/i4bipr.4
index ce3fe1350acc..654c5b8ae58d 100644
--- a/usr.sbin/i4b/man/i4bipr.4
+++ b/usr.sbin/i4b/man/i4bipr.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4bipr.4,v 1.1.2.3 1999/11/15 22:41:20 joe Exp $
 .\"
 .\"	last edit-date: [Sun Feb 14 10:36:40 1999]
 .\"
diff --git a/usr.sbin/i4b/man/i4bisppp.4 b/usr.sbin/i4b/man/i4bisppp.4
index f68ca70d0c9f..9e22661414f9 100644
--- a/usr.sbin/i4b/man/i4bisppp.4
+++ b/usr.sbin/i4b/man/i4bisppp.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4bisppp.4,v 1.1.2.3 1999/11/15 22:41:20 joe Exp $
 .\"
 .\"	last edit-date: [Sun Feb 14 10:36:45 1999]
 .\"
diff --git a/usr.sbin/i4b/man/i4bq921.4 b/usr.sbin/i4b/man/i4bq921.4
index 85ec7d05db79..e967fd80aed0 100644
--- a/usr.sbin/i4b/man/i4bq921.4
+++ b/usr.sbin/i4b/man/i4bq921.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4bq921.4,v 1.1.2.3 1999/11/15 22:41:21 joe Exp $
 .\"
 .\"	last edit-date: [Sun Feb 14 10:36:51 1999]
 .\"
diff --git a/usr.sbin/i4b/man/i4bq931.4 b/usr.sbin/i4b/man/i4bq931.4
index 34dbd69b33a7..c1151af6c1d8 100644
--- a/usr.sbin/i4b/man/i4bq931.4
+++ b/usr.sbin/i4b/man/i4bq931.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4bq931.4,v 1.1.2.3 1999/11/15 22:41:21 joe Exp $
 .\"
 .\"	last edit-date: [Sun Feb 14 10:36:57 1999]
 .\"
diff --git a/usr.sbin/i4b/man/i4brbch.4 b/usr.sbin/i4b/man/i4brbch.4
index a79f897a14e5..0144ddab92f4 100644
--- a/usr.sbin/i4b/man/i4brbch.4
+++ b/usr.sbin/i4b/man/i4brbch.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4brbch.4,v 1.1.2.3 1999/11/15 22:41:21 joe Exp $
 .\"
 .\"	last edit-date: [Sun Feb 14 10:37:03 1999]
 .\"
diff --git a/usr.sbin/i4b/man/i4btel.4 b/usr.sbin/i4b/man/i4btel.4
index cc1caac3a3ba..2743166b65e7 100644
--- a/usr.sbin/i4b/man/i4btel.4
+++ b/usr.sbin/i4b/man/i4btel.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4btel.4,v 1.1.2.2 1999/11/15 22:41:21 joe Exp $
 .\"
 .\"	last edit-date: [Wed Apr 21 12:03:34 1999]
 .\"
diff --git a/usr.sbin/i4b/man/i4btrc.4 b/usr.sbin/i4b/man/i4btrc.4
index 78e5317e6615..7a4d235126b9 100644
--- a/usr.sbin/i4b/man/i4btrc.4
+++ b/usr.sbin/i4b/man/i4btrc.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4btrc.4,v 1.1.2.3 1999/11/15 22:41:22 joe Exp $
 .\"
 .\"	last edit-date: [Fri Jul 30 09:15:57 1999]
 .\"
diff --git a/usr.sbin/i4b/man/isic.4 b/usr.sbin/i4b/man/isic.4
index 0c84e770ff29..f3a1a7d2ebc7 100644
--- a/usr.sbin/i4b/man/isic.4
+++ b/usr.sbin/i4b/man/isic.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/isic.4,v 1.1.2.2 1999/11/15 22:41:22 joe Exp $
 .\"
 .\"	last edit-date: [Fri Jul 30 09:20:24 1999]
 .\"
diff --git a/usr.sbin/inetd/Makefile b/usr.sbin/inetd/Makefile
index 0df97554b47c..1e3035f6c34e 100644
--- a/usr.sbin/inetd/Makefile
+++ b/usr.sbin/inetd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/inetd/Makefile,v 1.5.2.7 1999/11/18 09:33:45 des Exp $
 
 PROG=	inetd
 SRCS=	inetd.c builtins.c
diff --git a/usr.sbin/inetd/builtins.c b/usr.sbin/inetd/builtins.c
index d5fa0bb5e485..caf09a2b4dd9 100644
--- a/usr.sbin/inetd/builtins.c
+++ b/usr.sbin/inetd/builtins.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/inetd/builtins.c,v 1.14.2.1 1999/11/18 09:33:47 des Exp $
  *
  */
 
diff --git a/usr.sbin/inetd/inetd.8 b/usr.sbin/inetd/inetd.8
index f063f27c9a5c..6ae463d27267 100644
--- a/usr.sbin/inetd/inetd.8
+++ b/usr.sbin/inetd/inetd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)inetd.8	8.3 (Berkeley) 4/13/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/inetd/inetd.8,v 1.22.2.5 1999/11/18 09:33:47 des Exp $
 .\"
 .Dd February 7, 1996
 .Dt INETD 8
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c
index dc99fa023c8f..5200201f22e6 100644
--- a/usr.sbin/inetd/inetd.c
+++ b/usr.sbin/inetd/inetd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)from: inetd.c	8.4 (Berkeley) 4/13/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/inetd/inetd.c,v 1.46.2.10 1999/11/18 09:33:48 des Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/inetd/inetd.h b/usr.sbin/inetd/inetd.h
index ab78c734c54e..64669eb03535 100644
--- a/usr.sbin/inetd/inetd.h
+++ b/usr.sbin/inetd/inetd.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/inetd/inetd.h,v 1.3 1999/08/28 01:16:35 peter Exp $
  */
 
 #include <sys/time.h>
diff --git a/usr.sbin/inetd/pathnames.h b/usr.sbin/inetd/pathnames.h
index fc4ff5a127bf..087b5607ce19 100644
--- a/usr.sbin/inetd/pathnames.h
+++ b/usr.sbin/inetd/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/inetd/pathnames.h,v 1.5.2.1 1999/08/29 15:42:35 peter Exp $
  */
 
 #include <paths.h>
diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8
index e623de497107..271f680afd67 100644
--- a/usr.sbin/iostat/iostat.8
+++ b/usr.sbin/iostat/iostat.8
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/iostat/iostat.8,v 1.7.2.2 1999/08/29 15:42:36 peter Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
diff --git a/usr.sbin/iostat/iostat.c b/usr.sbin/iostat/iostat.c
index bf8ee5ac3f79..1a5f7d9a0820 100644
--- a/usr.sbin/iostat/iostat.c
+++ b/usr.sbin/iostat/iostat.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/iostat/iostat.c,v 1.12.2.1 1999/08/29 15:42:36 peter Exp $
  */
 /*
  * Parts of this program are derived from the original FreeBSD iostat
diff --git a/usr.sbin/ipfstat/Makefile b/usr.sbin/ipfstat/Makefile
index 200b0b8eca8a..d13123889dd4 100644
--- a/usr.sbin/ipfstat/Makefile
+++ b/usr.sbin/ipfstat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ipfstat/Makefile,v 1.1 1998/03/21 13:52:55 peter Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
 
diff --git a/usr.sbin/ipftest/Makefile b/usr.sbin/ipftest/Makefile
index 60ee3148d6bb..b0203fc13f14 100644
--- a/usr.sbin/ipftest/Makefile
+++ b/usr.sbin/ipftest/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ipftest/Makefile,v 1.1 1998/03/21 13:52:59 peter Exp $
 
 .PATH:	${.CURDIR}/../../sys/netinet \
 	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
diff --git a/usr.sbin/ipmon/Makefile b/usr.sbin/ipmon/Makefile
index 96cffcf4a6d5..c117dd1506b5 100644
--- a/usr.sbin/ipmon/Makefile
+++ b/usr.sbin/ipmon/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ipmon/Makefile,v 1.2 1998/08/30 04:48:00 jkoshy Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
 
diff --git a/usr.sbin/ipnat/Makefile b/usr.sbin/ipnat/Makefile
index 7daa52d89d60..4afe0a1a756b 100644
--- a/usr.sbin/ipnat/Makefile
+++ b/usr.sbin/ipnat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ipnat/Makefile,v 1.1 1998/03/21 13:53:06 peter Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
 
diff --git a/usr.sbin/ipresend/Makefile b/usr.sbin/ipresend/Makefile
index 8a9d8b22b9e6..4f1cc2d0ceb1 100644
--- a/usr.sbin/ipresend/Makefile
+++ b/usr.sbin/ipresend/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ipresend/Makefile,v 1.1 1998/03/21 13:53:10 peter Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter/ipsend \
 	${.CURDIR}/../../contrib/ipfilter
diff --git a/usr.sbin/ipsend/Makefile b/usr.sbin/ipsend/Makefile
index 75a45b398d0d..3d2a69ff772d 100644
--- a/usr.sbin/ipsend/Makefile
+++ b/usr.sbin/ipsend/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ipsend/Makefile,v 1.5 1998/05/05 13:16:31 bde Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter/ipsend \
 	${.CURDIR}/../../contrib/ipfilter/iplang \
diff --git a/usr.sbin/iptest/Makefile b/usr.sbin/iptest/Makefile
index f29694577b82..00f9532826c3 100644
--- a/usr.sbin/iptest/Makefile
+++ b/usr.sbin/iptest/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/iptest/Makefile,v 1.1 1998/03/21 13:53:18 peter Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter/ipsend \
 	${.CURDIR}/../../contrib/ipfilter
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.1 b/usr.sbin/kbdcontrol/kbdcontrol.1
index 87d4287be7b5..5d4d329764fb 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.1
+++ b/usr.sbin/kbdcontrol/kbdcontrol.1
@@ -11,7 +11,7 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\"     @(#)kbdcontrol.1
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/kbdcontrol/kbdcontrol.1,v 1.11.2.4 1999/11/18 16:10:46 phantom Exp $
 .\"
 .Dd June 30, 1999
 .Dt KBDCONTROL 1
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c
index 8422eb5e58df..02c9bf91e86e 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.c
+++ b/usr.sbin/kbdcontrol/kbdcontrol.c
@@ -28,7 +28,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/kbdcontrol/kbdcontrol.c,v 1.21.2.4 1999/08/29 15:42:38 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/kbdcontrol/lex.h b/usr.sbin/kbdcontrol/lex.h
index ecf4c5b54d52..a3cf9b392f90 100644
--- a/usr.sbin/kbdcontrol/lex.h
+++ b/usr.sbin/kbdcontrol/lex.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kbdcontrol/lex.h,v 1.6.2.1 1999/08/29 15:42:38 peter Exp $
  */
 
 #define TNOP		256
diff --git a/usr.sbin/kbdcontrol/lex.l b/usr.sbin/kbdcontrol/lex.l
index d0d0cb02df12..ac96d761eae2 100644
--- a/usr.sbin/kbdcontrol/lex.l
+++ b/usr.sbin/kbdcontrol/lex.l
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kbdcontrol/lex.l,v 1.8.2.1 1999/08/29 15:42:39 peter Exp $
  */
 
 %{
diff --git a/usr.sbin/kbdmap/Makefile b/usr.sbin/kbdmap/Makefile
index a8e0cf5f5f72..ad1b9547b03b 100644
--- a/usr.sbin/kbdmap/Makefile
+++ b/usr.sbin/kbdmap/Makefile
@@ -1,5 +1,5 @@
 # Makefile for kbdmap / vidfont
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/kbdmap/Makefile,v 1.7.2.1 1999/08/29 15:42:40 peter Exp $
 
 SCRIPT=	${.CURDIR}/kbdmap.pl
 LINKS=	${BINDIR}/kbdmap ${BINDIR}/vidfont
diff --git a/usr.sbin/kbdmap/kbdmap.1 b/usr.sbin/kbdmap/kbdmap.1
index e4f7e76fcf0d..afb56b0855e2 100644
--- a/usr.sbin/kbdmap/kbdmap.1
+++ b/usr.sbin/kbdmap/kbdmap.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/kbdmap/kbdmap.1,v 1.14.2.1 1999/08/29 15:42:41 peter Exp $
 
 .Dd Mar 25, 1995
 .Dt KBDMAP 1
diff --git a/usr.sbin/kbdmap/kbdmap.pl b/usr.sbin/kbdmap/kbdmap.pl
index 86613bc9faa5..8e87f8be69c8 100644
--- a/usr.sbin/kbdmap/kbdmap.pl
+++ b/usr.sbin/kbdmap/kbdmap.pl
@@ -26,7 +26,7 @@
 #
 # kbdmap/vidfont - front end for syscons
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/kbdmap/kbdmap.pl,v 1.8.2.1 1999/08/29 15:42:41 peter Exp $
 
 
 # simple test if syscons works
diff --git a/usr.sbin/kernbb/Makefile b/usr.sbin/kernbb/Makefile
index c7d566304a97..5e8256568993 100644
--- a/usr.sbin/kernbb/Makefile
+++ b/usr.sbin/kernbb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/kernbb/Makefile,v 1.4.2.1 1999/08/29 15:42:43 peter Exp $
 
 PROG=	kernbb
 MAN8=	kernbb.8
diff --git a/usr.sbin/kernbb/kernbb.8 b/usr.sbin/kernbb/kernbb.8
index 087bc444513d..3a91fb1b680f 100644
--- a/usr.sbin/kernbb/kernbb.8
+++ b/usr.sbin/kernbb/kernbb.8
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/kernbb/kernbb.8,v 1.7.2.2 1999/09/20 09:49:58 phantom Exp $
 .\"
 .Dd May 22, 1995
 .Dt KERNBB 8
diff --git a/usr.sbin/kernbb/kernbb.c b/usr.sbin/kernbb/kernbb.c
index 11209f4cabb2..3dc6f8022c46 100644
--- a/usr.sbin/kernbb/kernbb.c
+++ b/usr.sbin/kernbb/kernbb.c
@@ -10,7 +10,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/kernbb/kernbb.c,v 1.9.2.1 1999/08/29 15:42:44 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/keyserv/Makefile b/usr.sbin/keyserv/Makefile
index 9493e04ec3f3..b09f7cabd1d4 100644
--- a/usr.sbin/keyserv/Makefile
+++ b/usr.sbin/keyserv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/keyserv/Makefile,v 1.4.2.1 1999/08/29 15:42:45 peter Exp $
 
 PROG=	keyserv
 SRCS=	keyserv.c setkey.c keyserv_uid.c crypt_svc.c crypt_server.c crypt.h
diff --git a/usr.sbin/keyserv/crypt_server.c b/usr.sbin/keyserv/crypt_server.c
index 79b79232a8d6..ce8de0032aa7 100644
--- a/usr.sbin/keyserv/crypt_server.c
+++ b/usr.sbin/keyserv/crypt_server.c
@@ -44,7 +44,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/keyserv/crypt_server.c,v 1.4.2.1 1999/08/29 15:42:46 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/keyserv/keyserv.c b/usr.sbin/keyserv/keyserv.c
index 72a334af1d05..bc6a4467952c 100644
--- a/usr.sbin/keyserv/keyserv.c
+++ b/usr.sbin/keyserv/keyserv.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)keyserv.c	1.15	94/04/25 SMI";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/keyserv/keyserv.c,v 1.2.2.1 1999/08/29 15:42:47 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/keyserv/keyserv_uid.c b/usr.sbin/keyserv/keyserv_uid.c
index 8a46fd12bbff..b499737846e4 100644
--- a/usr.sbin/keyserv/keyserv_uid.c
+++ b/usr.sbin/keyserv/keyserv_uid.c
@@ -44,7 +44,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/keyserv/keyserv_uid.c,v 1.2.2.1 1999/08/29 15:42:47 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/keyserv/setkey.c b/usr.sbin/keyserv/setkey.c
index 566b1c79834c..5d81ecc8f898 100644
--- a/usr.sbin/keyserv/setkey.c
+++ b/usr.sbin/keyserv/setkey.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)setkey.c	1.11	94/04/25 SMI";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/keyserv/setkey.c,v 1.2.2.1 1999/08/29 15:42:48 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/kgmon/kgmon.c b/usr.sbin/kgmon/kgmon.c
index 8ab42274a750..f6e445df8438 100644
--- a/usr.sbin/kgmon/kgmon.c
+++ b/usr.sbin/kgmon/kgmon.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)kgmon.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/kgmon/kgmon.c,v 1.8.2.1 1999/08/29 15:42:49 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/kgzip/Makefile b/usr.sbin/kgzip/Makefile
index 5a3565a95f1b..4035d48f1ec7 100644
--- a/usr.sbin/kgzip/Makefile
+++ b/usr.sbin/kgzip/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/kgzip/Makefile,v 1.1.1.1.2.2 1999/08/29 15:42:50 peter Exp $
 
 PROG=	kgzip
 SRCS=	kgzip.c elfhdr.c kgzcmp.c kgzld.c xio.c
diff --git a/usr.sbin/kgzip/elfhdr.c b/usr.sbin/kgzip/elfhdr.c
index d3abec77cbf0..6410718b0afd 100644
--- a/usr.sbin/kgzip/elfhdr.c
+++ b/usr.sbin/kgzip/elfhdr.c
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kgzip/elfhdr.c,v 1.1.1.1.2.2 1999/08/29 15:42:51 peter Exp $
  */
 
 #include <stddef.h>
diff --git a/usr.sbin/kgzip/elfhdr.h b/usr.sbin/kgzip/elfhdr.h
index b14b9f10ac65..2b9bdce359e1 100644
--- a/usr.sbin/kgzip/elfhdr.h
+++ b/usr.sbin/kgzip/elfhdr.h
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kgzip/elfhdr.h,v 1.1.1.1.2.2 1999/08/29 15:42:52 peter Exp $
  */
 
 #include <elf.h>
diff --git a/usr.sbin/kgzip/kgz.h b/usr.sbin/kgzip/kgz.h
index 3cc8e13d4553..d33bbe8ba621 100644
--- a/usr.sbin/kgzip/kgz.h
+++ b/usr.sbin/kgzip/kgz.h
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kgzip/kgz.h,v 1.1.1.1.2.2 1999/08/29 15:42:52 peter Exp $
  */
 
 #ifndef _KGZ_H_
diff --git a/usr.sbin/kgzip/kgzcmp.c b/usr.sbin/kgzip/kgzcmp.c
index 489e845a0a0e..60eec345a899 100644
--- a/usr.sbin/kgzip/kgzcmp.c
+++ b/usr.sbin/kgzip/kgzcmp.c
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kgzip/kgzcmp.c,v 1.1.1.1.2.2 1999/08/29 15:42:53 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/kgzip/kgzip.8 b/usr.sbin/kgzip/kgzip.8
index 7ddd68b9d74f..43a1bfa01cfb 100644
--- a/usr.sbin/kgzip/kgzip.8
+++ b/usr.sbin/kgzip/kgzip.8
@@ -22,7 +22,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/kgzip/kgzip.8,v 1.1.1.1.2.2 1999/08/29 15:42:53 peter Exp $
 .\"
 .Dd July 19, 1999
 .Dt KGZIP 8
diff --git a/usr.sbin/kgzip/kgzip.c b/usr.sbin/kgzip/kgzip.c
index 3af89e58cd15..60fc5a55fc73 100644
--- a/usr.sbin/kgzip/kgzip.c
+++ b/usr.sbin/kgzip/kgzip.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/kgzip/kgzip.c,v 1.1.1.1.2.2 1999/08/29 15:42:54 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/kgzip/kgzip.h b/usr.sbin/kgzip/kgzip.h
index 4231c0fee5b8..3c897a1e0cb3 100644
--- a/usr.sbin/kgzip/kgzip.h
+++ b/usr.sbin/kgzip/kgzip.h
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kgzip/kgzip.h,v 1.1.1.1.2.2 1999/08/29 15:42:54 peter Exp $
  */
 
 #include "kgz.h"
diff --git a/usr.sbin/kgzip/kgzld.c b/usr.sbin/kgzip/kgzld.c
index a2b0086b313f..408a3dad267d 100644
--- a/usr.sbin/kgzip/kgzld.c
+++ b/usr.sbin/kgzip/kgzld.c
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kgzip/kgzld.c,v 1.1.1.1.2.2 1999/08/29 15:42:55 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/kgzip/xio.c b/usr.sbin/kgzip/xio.c
index 21c9634398f1..30c97256183b 100644
--- a/usr.sbin/kgzip/xio.c
+++ b/usr.sbin/kgzip/xio.c
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kgzip/xio.c,v 1.1.1.1.2.2 1999/08/29 15:42:56 peter Exp $
  */
 
 #include <err.h>
diff --git a/usr.sbin/kvm_mkdb/kvm_mkdb.c b/usr.sbin/kvm_mkdb/kvm_mkdb.c
index 4e362d31becb..73d942ab74ce 100644
--- a/usr.sbin/kvm_mkdb/kvm_mkdb.c
+++ b/usr.sbin/kvm_mkdb/kvm_mkdb.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)kvm_mkdb.c	8.3 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/kvm_mkdb/kvm_mkdb.c,v 1.7.2.1 1999/08/29 15:42:57 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/kvm_mkdb/nlist.c b/usr.sbin/kvm_mkdb/nlist.c
index 5e85ae428a63..c6067d47b308 100644
--- a/usr.sbin/kvm_mkdb/nlist.c
+++ b/usr.sbin/kvm_mkdb/nlist.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/kvm_mkdb/nlist.c,v 1.10.2.1 1999/08/29 15:42:57 peter Exp $
  */
 
 #ifndef lint
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)from: nlist.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/kvm_mkdb/nlist.c,v 1.10.2.1 1999/08/29 15:42:57 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/kvm_mkdb/testdb.c b/usr.sbin/kvm_mkdb/testdb.c
index a43baf26f7b5..28e2c02eab18 100644
--- a/usr.sbin/kvm_mkdb/testdb.c
+++ b/usr.sbin/kvm_mkdb/testdb.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)testdb.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/kvm_mkdb/testdb.c,v 1.3.2.1 1999/08/29 15:42:59 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/lpr/Makefile b/usr.sbin/lpr/Makefile
index 4f34ca04e423..ec91d7d55503 100644
--- a/usr.sbin/lpr/Makefile
+++ b/usr.sbin/lpr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/Makefile,v 1.4.2.1 1999/08/29 15:43:00 peter Exp $
 
 SUBDIR=	common_source chkprintcap lp lpc lpd lpq lpr lprm lptest pac \
 	filters filters.ru SMM.doc
diff --git a/usr.sbin/lpr/Makefile.inc b/usr.sbin/lpr/Makefile.inc
index 141373e9c290..cd61cb518591 100644
--- a/usr.sbin/lpr/Makefile.inc
+++ b/usr.sbin/lpr/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/Makefile.inc,v 1.4.2.1 1999/08/29 15:43:01 peter Exp $
 
 CWARNFLAGS=	-Wall -Wnested-externs -Wmissing-prototypes -Wno-unused -Wredundant-decls -Wstrict-prototypes
 
diff --git a/usr.sbin/lpr/SMM.doc/Makefile b/usr.sbin/lpr/SMM.doc/Makefile
index faeb266062d9..fbbd71342a12 100644
--- a/usr.sbin/lpr/SMM.doc/Makefile
+++ b/usr.sbin/lpr/SMM.doc/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/SMM.doc/Makefile,v 1.3.2.1 1999/08/29 15:43:02 peter Exp $
 
 BINDIR=	/usr/share/doc
 VOLUME=	smm/07.lpd
diff --git a/usr.sbin/lpr/chkprintcap/Makefile b/usr.sbin/lpr/chkprintcap/Makefile
index e671ec98a94d..c1496be4f418 100644
--- a/usr.sbin/lpr/chkprintcap/Makefile
+++ b/usr.sbin/lpr/chkprintcap/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/chkprintcap/Makefile,v 1.6.2.1 1999/08/29 15:43:03 peter Exp $
 
 PROG=	chkprintcap
 MAN8=	chkprintcap.8
diff --git a/usr.sbin/lpr/chkprintcap/chkprintcap.8 b/usr.sbin/lpr/chkprintcap/chkprintcap.8
index ecf7822cef57..5d0bd59c645c 100644
--- a/usr.sbin/lpr/chkprintcap/chkprintcap.8
+++ b/usr.sbin/lpr/chkprintcap/chkprintcap.8
@@ -25,7 +25,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lpr/chkprintcap/chkprintcap.8,v 1.2.2.1 1999/08/29 15:43:04 peter Exp $
 .Dd November 30, 1997
 .Dt CHKPRINTCAP 8
 .Os
diff --git a/usr.sbin/lpr/chkprintcap/chkprintcap.c b/usr.sbin/lpr/chkprintcap/chkprintcap.c
index 8b8465651e44..7f130c42fd0c 100644
--- a/usr.sbin/lpr/chkprintcap/chkprintcap.c
+++ b/usr.sbin/lpr/chkprintcap/chkprintcap.c
@@ -30,7 +30,7 @@
 static const char copyright[] =
 	"Copyright (C) 1997, Massachusetts Institute of Technology\r\n";
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/chkprintcap/chkprintcap.c,v 1.2.2.1 1999/08/29 15:43:05 peter Exp $";
 
 #include <sys/types.h>
 #include <sys/queue.h>
diff --git a/usr.sbin/lpr/common_source/Makefile b/usr.sbin/lpr/common_source/Makefile
index e5c6191fbbe9..f6e324af3ebf 100644
--- a/usr.sbin/lpr/common_source/Makefile
+++ b/usr.sbin/lpr/common_source/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/common_source/Makefile,v 1.4.2.1 1999/08/29 15:43:07 peter Exp $
 
 #
 # Library of internal routines for the print spooler suite.
diff --git a/usr.sbin/lpr/common_source/common.c b/usr.sbin/lpr/common_source/common.c
index ebc7bfd68c8b..2bb420f242ff 100644
--- a/usr.sbin/lpr/common_source/common.c
+++ b/usr.sbin/lpr/common_source/common.c
@@ -41,7 +41,7 @@
 static char sccsid[] = "@(#)common.c	8.5 (Berkeley) 4/28/95";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/common_source/common.c,v 1.11.2.1 1999/08/29 15:43:07 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/lpr/common_source/displayq.c b/usr.sbin/lpr/common_source/displayq.c
index 88f90a60e5cf..452824da8f93 100644
--- a/usr.sbin/lpr/common_source/displayq.c
+++ b/usr.sbin/lpr/common_source/displayq.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)displayq.c	8.4 (Berkeley) 4/28/95";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/common_source/displayq.c,v 1.14.2.1 1999/08/29 15:43:08 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/lpr/common_source/lp.h b/usr.sbin/lpr/common_source/lp.h
index c7a960e8dfe4..8f808fd2af46 100644
--- a/usr.sbin/lpr/common_source/lp.h
+++ b/usr.sbin/lpr/common_source/lp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * 	From: @(#)lp.h	8.2 (Berkeley) 4/28/95
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/lpr/common_source/lp.h,v 1.7.2.2 1999/08/29 15:43:09 peter Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/lpr/common_source/net.c b/usr.sbin/lpr/common_source/net.c
index 4f5c0c5d4c3d..650f15d1f86f 100644
--- a/usr.sbin/lpr/common_source/net.c
+++ b/usr.sbin/lpr/common_source/net.c
@@ -40,7 +40,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/common_source/net.c,v 1.1.2.2 1999/08/29 15:43:10 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/lpr/common_source/printcap.c b/usr.sbin/lpr/common_source/printcap.c
index 7b6d1242453a..f40932632c3f 100644
--- a/usr.sbin/lpr/common_source/printcap.c
+++ b/usr.sbin/lpr/common_source/printcap.c
@@ -40,7 +40,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/common_source/printcap.c,v 1.4.2.2 1999/08/29 15:43:10 peter Exp $";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/usr.sbin/lpr/common_source/recvjob.c b/usr.sbin/lpr/common_source/recvjob.c
index a2de1a94641f..9adcca8a6d23 100644
--- a/usr.sbin/lpr/common_source/recvjob.c
+++ b/usr.sbin/lpr/common_source/recvjob.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)recvjob.c	8.2 (Berkeley) 4/27/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/common_source/recvjob.c,v 1.12.2.1 1999/08/29 15:43:11 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/common_source/request.c b/usr.sbin/lpr/common_source/request.c
index e3e43667a11f..8fef005ae690 100644
--- a/usr.sbin/lpr/common_source/request.c
+++ b/usr.sbin/lpr/common_source/request.c
@@ -30,7 +30,7 @@
 static const char copyright[] =
 	"Copyright (C) 1997, Massachusetts Institute of Technology\r\n";
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/common_source/request.c,v 1.1.2.1 1999/08/29 15:43:11 peter Exp $";
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/lpr/common_source/rmjob.c b/usr.sbin/lpr/common_source/rmjob.c
index a3216a8b2133..7ccda921de0c 100644
--- a/usr.sbin/lpr/common_source/rmjob.c
+++ b/usr.sbin/lpr/common_source/rmjob.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)rmjob.c	8.2 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/common_source/rmjob.c,v 1.11.2.1 1999/08/29 15:43:11 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/lpr/common_source/startdaemon.c b/usr.sbin/lpr/common_source/startdaemon.c
index 29866b28c895..6a8e11259e54 100644
--- a/usr.sbin/lpr/common_source/startdaemon.c
+++ b/usr.sbin/lpr/common_source/startdaemon.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)startdaemon.c	8.2 (Berkeley) 4/17/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/common_source/startdaemon.c,v 1.7.2.1 1999/08/29 15:43:12 peter Exp $";
 #endif /* not lint */
 
 
diff --git a/usr.sbin/lpr/filters/lpf.c b/usr.sbin/lpr/filters/lpf.c
index 6fef3c4a0310..adb4af3c753e 100644
--- a/usr.sbin/lpr/filters/lpf.c
+++ b/usr.sbin/lpr/filters/lpf.c
@@ -39,7 +39,7 @@ static char copyright[] =
 
 #ifndef lint
 static char sccsid[] = "From: @(#)lpf.c	8.1 (Berkeley) 6/6/93";
-static char id[] = "$FreeBSD$";
+static char id[] = "$FreeBSD: src/usr.sbin/lpr/filters/lpf.c,v 1.5.2.1 1999/08/29 15:43:14 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/lp/Makefile b/usr.sbin/lpr/lp/Makefile
index 9522fc3796a6..2bcc7ed4f02d 100644
--- a/usr.sbin/lpr/lp/Makefile
+++ b/usr.sbin/lpr/lp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/lp/Makefile,v 1.4.2.1 1999/08/29 15:43:16 peter Exp $
 
 BINDIR = /usr/bin
 MAN1 = lp.1
diff --git a/usr.sbin/lpr/lp/lp.1 b/usr.sbin/lpr/lp/lp.1
index 5ab91e7c032e..f1f90ac7467d 100644
--- a/usr.sbin/lpr/lp/lp.1
+++ b/usr.sbin/lpr/lp/lp.1
@@ -31,7 +31,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lpr/lp/lp.1,v 1.7.2.1 1999/08/29 15:43:16 peter Exp $
 .\"
 .Dd January 22, 1995
 .Dt LP 1
diff --git a/usr.sbin/lpr/lp/lp.sh b/usr.sbin/lpr/lp/lp.sh
index 317f840f8ce9..60cb2a370b94 100644
--- a/usr.sbin/lpr/lp/lp.sh
+++ b/usr.sbin/lpr/lp/lp.sh
@@ -36,7 +36,7 @@
 #
 # Posix 1003.2 compliant print spooler interface.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/lp/lp.sh,v 1.5.2.1 1999/08/29 15:43:16 peter Exp $
 #
 
 ncopies=""
diff --git a/usr.sbin/lpr/lpc/Makefile b/usr.sbin/lpr/lpc/Makefile
index e894eba1a6b9..8c8736843d90 100644
--- a/usr.sbin/lpr/lpc/Makefile
+++ b/usr.sbin/lpr/lpc/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/lpc/Makefile,v 1.5.2.1 1999/08/29 15:43:17 peter Exp $
 
 PROG=	lpc
 CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
diff --git a/usr.sbin/lpr/lpc/cmds.c b/usr.sbin/lpr/lpc/cmds.c
index 5fa5eab3415e..cdaf4cef0135 100644
--- a/usr.sbin/lpr/lpc/cmds.c
+++ b/usr.sbin/lpr/lpc/cmds.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)cmds.c	8.2 (Berkeley) 4/28/95";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/lpc/cmds.c,v 1.12.2.1 1999/08/29 15:43:18 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/lpc/cmdtab.c b/usr.sbin/lpr/lpc/cmdtab.c
index 8e2b6efba848..8221702203cd 100644
--- a/usr.sbin/lpr/lpc/cmdtab.c
+++ b/usr.sbin/lpr/lpc/cmdtab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/lpc/cmdtab.c,v 1.2.2.1 1999/08/29 15:43:19 peter Exp $";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/usr.sbin/lpr/lpc/lpc.c b/usr.sbin/lpr/lpc/lpc.c
index ba1cea850588..2e4239c76dc6 100644
--- a/usr.sbin/lpr/lpc/lpc.c
+++ b/usr.sbin/lpr/lpc/lpc.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)lpc.c	8.3 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/lpc/lpc.c,v 1.8.2.1 1999/08/29 15:43:20 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/lpr/lpd/Makefile b/usr.sbin/lpr/lpd/Makefile
index e107e97f8a87..d35e1ac0a424 100644
--- a/usr.sbin/lpr/lpd/Makefile
+++ b/usr.sbin/lpr/lpd/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/lpd/Makefile,v 1.9.2.1 1999/08/29 15:43:21 peter Exp $
 
 PROG=	lpd
 CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
diff --git a/usr.sbin/lpr/lpd/extern.h b/usr.sbin/lpr/lpd/extern.h
index 70c536dbc9c9..bccda3b1f760 100644
--- a/usr.sbin/lpr/lpd/extern.h
+++ b/usr.sbin/lpr/lpd/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *      From: @(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/lpr/lpd/extern.h,v 1.4.2.1 1999/08/29 15:43:21 peter Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.sbin/lpr/lpd/lpd.8 b/usr.sbin/lpr/lpd/lpd.8
index 2421fb3333ae..634eb97c25fd 100644
--- a/usr.sbin/lpr/lpd/lpd.8
+++ b/usr.sbin/lpr/lpd/lpd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lpd.8	8.3 (Berkeley) 4/19/94
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/usr.sbin/lpr/lpd/lpd.8,v 1.9.2.1 1999/09/20 09:49:58 phantom Exp $
 .\"
 .Dd April 19, 1994
 .Dt LPD 8
diff --git a/usr.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c
index f5df2a761eaf..8fdf814d0dd6 100644
--- a/usr.sbin/lpr/lpd/lpd.c
+++ b/usr.sbin/lpr/lpd/lpd.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)lpd.c	8.7 (Berkeley) 5/10/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/lpd/lpd.c,v 1.10.2.1 1999/08/29 15:43:22 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/lpd/lpdchar.c b/usr.sbin/lpr/lpd/lpdchar.c
index ba39a9f1ed3f..f1c80e5b2424 100644
--- a/usr.sbin/lpr/lpd/lpdchar.c
+++ b/usr.sbin/lpr/lpd/lpdchar.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)lpdchar.c	8.1 (Berkeley) 6/6/93";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/lpd/lpdchar.c,v 1.4.2.1 1999/08/29 15:43:22 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/lpd/modes.c b/usr.sbin/lpr/lpd/modes.c
index 4bb2ea0a11d3..a2ee8e49acc3 100644
--- a/usr.sbin/lpr/lpd/modes.c
+++ b/usr.sbin/lpr/lpd/modes.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)modes.c	8.3 (Berkeley) 4/2/94";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/lpd/modes.c,v 1.5.2.1 1999/08/29 15:43:23 peter Exp $";
 #endif /* not lint */
 
 #include <stddef.h>
diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c
index 37cc960f0238..8a27527d23ed 100644
--- a/usr.sbin/lpr/lpd/printjob.c
+++ b/usr.sbin/lpr/lpd/printjob.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)printjob.c	8.7 (Berkeley) 5/10/95";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/lpd/printjob.c,v 1.20.2.1 1999/08/29 15:43:24 peter Exp $";
 #endif /* not lint */
 
 
diff --git a/usr.sbin/lpr/lpd/recvjob.c b/usr.sbin/lpr/lpd/recvjob.c
index e4cd4e972c16..df5708940dce 100644
--- a/usr.sbin/lpr/lpd/recvjob.c
+++ b/usr.sbin/lpr/lpd/recvjob.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)recvjob.c	8.2 (Berkeley) 4/27/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/lpd/recvjob.c,v 1.13.2.1 1999/08/29 15:43:25 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/lpq/Makefile b/usr.sbin/lpr/lpq/Makefile
index 24afb7ab101a..e4586d946a65 100644
--- a/usr.sbin/lpr/lpq/Makefile
+++ b/usr.sbin/lpr/lpq/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/lpq/Makefile,v 1.6.2.1 1999/08/29 15:43:26 peter Exp $
 
 PROG=	lpq
 CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
diff --git a/usr.sbin/lpr/lpq/lpq.c b/usr.sbin/lpr/lpq/lpq.c
index 67de966673fc..9ec1be30f492 100644
--- a/usr.sbin/lpr/lpq/lpq.c
+++ b/usr.sbin/lpr/lpq/lpq.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)lpq.c	8.3 (Berkeley) 5/10/95";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/lpq/lpq.c,v 1.6.2.1 1999/08/29 15:43:27 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/lpr/Makefile b/usr.sbin/lpr/lpr/Makefile
index e82347cb933e..79db8c75c8d8 100644
--- a/usr.sbin/lpr/lpr/Makefile
+++ b/usr.sbin/lpr/lpr/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/lpr/Makefile,v 1.7.2.1 1999/08/29 15:43:28 peter Exp $
 
 PROG=	lpr
 CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
diff --git a/usr.sbin/lpr/lpr/lpr.1 b/usr.sbin/lpr/lpr/lpr.1
index 62950427574c..d2839118ca2c 100644
--- a/usr.sbin/lpr/lpr/lpr.1
+++ b/usr.sbin/lpr/lpr/lpr.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From @(#)lpr.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lpr/lpr/lpr.1,v 1.8.2.1 1999/08/29 15:43:28 peter Exp $
 .\" "
 .Dd June 6, 1993
 .Dt LPR 1
diff --git a/usr.sbin/lpr/lpr/lpr.c b/usr.sbin/lpr/lpr/lpr.c
index 9a19606678f4..3340e40cfe18 100644
--- a/usr.sbin/lpr/lpr/lpr.c
+++ b/usr.sbin/lpr/lpr/lpr.c
@@ -48,7 +48,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)from: lpr.c	8.4 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/lpr/lpr.c,v 1.27.2.2 1999/08/29 15:43:29 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/lpr/printcap.5 b/usr.sbin/lpr/lpr/printcap.5
index 1ed62069d492..97b515af0108 100644
--- a/usr.sbin/lpr/lpr/printcap.5
+++ b/usr.sbin/lpr/lpr/printcap.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)printcap.5	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lpr/lpr/printcap.5,v 1.15.2.1 1999/08/29 15:43:29 peter Exp $
 .\"
 .Dd December 11, 1993
 .Dt PRINTCAP 5
diff --git a/usr.sbin/lpr/lprm/Makefile b/usr.sbin/lpr/lprm/Makefile
index abeac25b290e..6b3476aa6b91 100644
--- a/usr.sbin/lpr/lprm/Makefile
+++ b/usr.sbin/lpr/lprm/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/lprm/Makefile,v 1.7.2.1 1999/08/29 15:43:31 peter Exp $
 
 PROG=	lprm
 CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
diff --git a/usr.sbin/lpr/lprm/lprm.c b/usr.sbin/lpr/lprm/lprm.c
index ca52f5d8ae06..9a80b9818fdf 100644
--- a/usr.sbin/lpr/lprm/lprm.c
+++ b/usr.sbin/lpr/lprm/lprm.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)lprm.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/lprm/lprm.c,v 1.5.2.1 1999/08/29 15:43:32 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/pac/Makefile b/usr.sbin/lpr/pac/Makefile
index 2b8d6ed22a06..d6b364ece626 100644
--- a/usr.sbin/lpr/pac/Makefile
+++ b/usr.sbin/lpr/pac/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/pac/Makefile,v 1.6.2.1 1999/08/29 15:43:33 peter Exp $
 
 PROG=	pac
 CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
diff --git a/usr.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c
index 08de1145e606..8913614e0ae8 100644
--- a/usr.sbin/lpr/pac/pac.c
+++ b/usr.sbin/lpr/pac/pac.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)pac.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/pac/pac.c,v 1.9.2.1 1999/08/29 15:43:34 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/runqueue/extern.h b/usr.sbin/lpr/runqueue/extern.h
index 8f390fb76636..68f9e63595cf 100644
--- a/usr.sbin/lpr/runqueue/extern.h
+++ b/usr.sbin/lpr/runqueue/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *      From: @(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/lpr/runqueue/extern.h,v 1.3.2.1 1999/08/29 15:43:35 peter Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.sbin/lpr/runqueue/lpdchar.c b/usr.sbin/lpr/runqueue/lpdchar.c
index ba39a9f1ed3f..9f7419cf2787 100644
--- a/usr.sbin/lpr/runqueue/lpdchar.c
+++ b/usr.sbin/lpr/runqueue/lpdchar.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)lpdchar.c	8.1 (Berkeley) 6/6/93";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/runqueue/lpdchar.c,v 1.4.2.1 1999/08/29 15:43:35 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/runqueue/modes.c b/usr.sbin/lpr/runqueue/modes.c
index 9c22055f46a9..9d6d82326890 100644
--- a/usr.sbin/lpr/runqueue/modes.c
+++ b/usr.sbin/lpr/runqueue/modes.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)modes.c	8.3 (Berkeley) 4/2/94";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/runqueue/modes.c,v 1.4.2.1 1999/08/29 15:43:36 peter Exp $";
 #endif /* not lint */
 
 #include <stddef.h>
diff --git a/usr.sbin/lpr/runqueue/printjob.c b/usr.sbin/lpr/runqueue/printjob.c
index c5f7990572bf..8aebfdbf0421 100644
--- a/usr.sbin/lpr/runqueue/printjob.c
+++ b/usr.sbin/lpr/runqueue/printjob.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)printjob.c	8.7 (Berkeley) 5/10/95";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lpr/runqueue/printjob.c,v 1.18.2.1 1999/08/29 15:43:36 peter Exp $";
 #endif /* not lint */
 
 
diff --git a/usr.sbin/lptcontrol/lptcontrol.8 b/usr.sbin/lptcontrol/lptcontrol.8
index d2c42d218e27..b348d7926eac 100644
--- a/usr.sbin/lptcontrol/lptcontrol.8
+++ b/usr.sbin/lptcontrol/lptcontrol.8
@@ -11,7 +11,7 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lptcontrol/lptcontrol.8,v 1.7.2.3 1999/08/29 15:43:37 peter Exp $
 .Dd September 3, 1994
 .Dt LPTCONTROL 8
 .Os FreeBSD 2
diff --git a/usr.sbin/lptcontrol/lptcontrol.c b/usr.sbin/lptcontrol/lptcontrol.c
index 7556badee663..18996853aeab 100644
--- a/usr.sbin/lptcontrol/lptcontrol.c
+++ b/usr.sbin/lptcontrol/lptcontrol.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/lptcontrol/lptcontrol.c,v 1.7.2.2 1999/08/29 15:43:38 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/manctl/Makefile b/usr.sbin/manctl/Makefile
index 187edd313a4b..12c535b15bf5 100644
--- a/usr.sbin/manctl/Makefile
+++ b/usr.sbin/manctl/Makefile
@@ -1,5 +1,5 @@
 # Makefile
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/manctl/Makefile,v 1.9.2.1 1999/08/29 15:43:39 peter Exp $
 
 MAN8=	manctl.8
 
diff --git a/usr.sbin/manctl/manctl.8 b/usr.sbin/manctl/manctl.8
index 7411ff00218d..37b835285d93 100644
--- a/usr.sbin/manctl/manctl.8
+++ b/usr.sbin/manctl/manctl.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/manctl/manctl.8,v 1.7.2.1 1999/08/29 15:43:40 peter Exp $
 .Dd January 1, 1996
 .Dt MANCTL 8
 .Os FreeBSD
diff --git a/usr.sbin/manctl/manctl.sh b/usr.sbin/manctl/manctl.sh
index 43a1511f0ff3..2ac3f7ff073e 100644
--- a/usr.sbin/manctl/manctl.sh
+++ b/usr.sbin/manctl/manctl.sh
@@ -30,7 +30,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/manctl/manctl.sh,v 1.10.2.1 1999/08/29 15:43:41 peter Exp $
 #
 # manctl: 
 #	a utility for manipulating manual pages
diff --git a/usr.sbin/memcontrol/Makefile b/usr.sbin/memcontrol/Makefile
index 046bb670eece..d23d08fb3928 100644
--- a/usr.sbin/memcontrol/Makefile
+++ b/usr.sbin/memcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/memcontrol/Makefile,v 1.1.1.1.2.2 1999/11/03 05:47:12 chris Exp $
 
 PROG=		memcontrol
 MAN8=		memcontrol.8
diff --git a/usr.sbin/memcontrol/memcontrol.8 b/usr.sbin/memcontrol/memcontrol.8
index 3107b16f893d..f946c9dc14dc 100644
--- a/usr.sbin/memcontrol/memcontrol.8
+++ b/usr.sbin/memcontrol/memcontrol.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/memcontrol/memcontrol.8,v 1.2.2.1 1999/11/03 05:47:13 chris Exp $
 .\" 
 .Dd September 28, 1999
 .Dt MEMCONTROL 8
diff --git a/usr.sbin/memcontrol/memcontrol.c b/usr.sbin/memcontrol/memcontrol.c
index f4af0cddea5a..d43d9f3a8d19 100644
--- a/usr.sbin/memcontrol/memcontrol.c
+++ b/usr.sbin/memcontrol/memcontrol.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/memcontrol/memcontrol.c,v 1.3.2.1 1999/09/03 19:16:39 msmith Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/mergemaster/Makefile b/usr.sbin/mergemaster/Makefile
index c00d18010be7..31e8aafd6252 100644
--- a/usr.sbin/mergemaster/Makefile
+++ b/usr.sbin/mergemaster/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mergemaster/Makefile,v 1.3.2.1 1999/11/03 20:58:47 billf Exp $
 
 MAINTAINER=	billf@FreeBSD.org
 MAINTAINER+=	doug@gorean.org
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8
index d0dee8289eb2..1906e8364c8d 100644
--- a/usr.sbin/mergemaster/mergemaster.8
+++ b/usr.sbin/mergemaster/mergemaster.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mergemaster/mergemaster.8,v 1.4.2.1 1999/11/03 20:58:47 billf Exp $
 .\"
 .Dd September 10, 1999
 .Dt MERGEMASTER 8
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 330db745f5b3..0592d5645d73 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -8,7 +8,7 @@
 # Copyright 1998, 1999 Douglas Barton
 # Doug@gorean.org
 
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mergemaster/mergemaster.sh,v 1.4.2.1 1999/11/03 20:58:47 billf Exp $
 
 PATH=/bin:/usr/bin:/usr/sbin
 
diff --git a/usr.sbin/mixer/Makefile b/usr.sbin/mixer/Makefile
index 78f5844209e6..9ab483bccda9 100644
--- a/usr.sbin/mixer/Makefile
+++ b/usr.sbin/mixer/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mixer/Makefile,v 1.5.2.1 1999/08/29 15:43:42 peter Exp $
 
 PROG = mixer
 MAN8=	mixer.8
diff --git a/usr.sbin/mixer/mixer.8 b/usr.sbin/mixer/mixer.8
index 2946ce7e22c8..a6dbbb97f120 100644
--- a/usr.sbin/mixer/mixer.8
+++ b/usr.sbin/mixer/mixer.8
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mixer/mixer.8,v 1.4.2.1 1999/10/30 19:38:52 mpp Exp $
 .Dd January 9, 1997
 .Dt MIXER 8
 .Os
diff --git a/usr.sbin/mixer/mixer.c b/usr.sbin/mixer/mixer.c
index 8df5c17b8681..540c6a150625 100644
--- a/usr.sbin/mixer/mixer.c
+++ b/usr.sbin/mixer/mixer.c
@@ -13,7 +13,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mixer/mixer.c,v 1.9.2.1 1999/08/29 15:43:42 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/moused/moused.8 b/usr.sbin/moused/moused.8
index ee78af740371..0f3b11eee4e3 100644
--- a/usr.sbin/moused/moused.8
+++ b/usr.sbin/moused/moused.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/moused/moused.8,v 1.18.2.7 1999/12/17 09:59:07 sheldonh Exp $
 .\"
 .Dd December 3, 1997
 .Dt MOUSED 8
diff --git a/usr.sbin/moused/moused.c b/usr.sbin/moused/moused.c
index fed2a052fbed..b87845757e54 100644
--- a/usr.sbin/moused/moused.c
+++ b/usr.sbin/moused/moused.c
@@ -46,7 +46,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/moused/moused.c,v 1.24.2.5 1999/12/17 09:59:07 sheldonh Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/mptable/Makefile b/usr.sbin/mptable/Makefile
index 66a4f43cefca..0bc5a1ed64c2 100644
--- a/usr.sbin/mptable/Makefile
+++ b/usr.sbin/mptable/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mptable/Makefile,v 1.1.2.1 1999/08/29 15:43:45 peter Exp $
 
 PROG = mptable
 MAN1 = mptable.1
diff --git a/usr.sbin/mptable/mptable.1 b/usr.sbin/mptable/mptable.1
index 44bfcdb1b93c..e735bf8509f6 100644
--- a/usr.sbin/mptable/mptable.1
+++ b/usr.sbin/mptable/mptable.1
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mptable/mptable.1,v 1.3.2.1 1999/10/30 16:11:12 phantom Exp $
 .\"
 .Dd April 28, 1997
 .Dt MPTABLE 1
diff --git a/usr.sbin/mptable/mptable.c b/usr.sbin/mptable/mptable.c
index 8a3873b7a638..130ec34f4f6a 100644
--- a/usr.sbin/mptable/mptable.c
+++ b/usr.sbin/mptable/mptable.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mptable/mptable.c,v 1.10.2.1 1999/08/29 15:43:47 peter Exp $";
 #endif /* not lint */
 
 #define VMAJOR			2
diff --git a/usr.sbin/mrouted/Makefile b/usr.sbin/mrouted/Makefile
index 43fe8b10ac70..bccab7ad0787 100644
--- a/usr.sbin/mrouted/Makefile
+++ b/usr.sbin/mrouted/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mrouted/Makefile,v 1.4.2.1 1999/08/29 15:43:48 peter Exp $
 
 SUBDIR=	common mrouted mrinfo map-mbone mtrace testrsrr
 
diff --git a/usr.sbin/mrouted/Makefile.inc b/usr.sbin/mrouted/Makefile.inc
index 767c93a298fc..bd02d107eaae 100644
--- a/usr.sbin/mrouted/Makefile.inc
+++ b/usr.sbin/mrouted/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mrouted/Makefile.inc,v 1.3.2.1 1999/08/29 15:43:49 peter Exp $
 
 CFLAGS+=	-DRSRR
 
diff --git a/usr.sbin/mrouted/callout.c b/usr.sbin/mrouted/callout.c
index 8b8ea9c7156a..a731c4d2c2fa 100644
--- a/usr.sbin/mrouted/callout.c
+++ b/usr.sbin/mrouted/callout.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/callout.c,v 1.11.2.1 1999/08/29 15:43:49 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.sbin/mrouted/cfparse.y b/usr.sbin/mrouted/cfparse.y
index f244d9c2aaf6..4088a3bf95a4 100644
--- a/usr.sbin/mrouted/cfparse.y
+++ b/usr.sbin/mrouted/cfparse.y
@@ -4,7 +4,7 @@
  *
  * Written by Bill Fenner, NRL, 1994
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mrouted/cfparse.y,v 1.9.2.1 1999/08/29 15:43:50 peter Exp $
  * cfparse.y,v 3.8.4.30 1998/03/01 01:48:58 fenner Exp
  */
 #include <stdio.h>
diff --git a/usr.sbin/mrouted/common/Makefile b/usr.sbin/mrouted/common/Makefile
index d3ed61e4f731..0ceb99aa10c0 100644
--- a/usr.sbin/mrouted/common/Makefile
+++ b/usr.sbin/mrouted/common/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mrouted/common/Makefile,v 1.4.2.1 1999/08/29 15:44:05 peter Exp $
 
 LIB=		mrouted
 NOPROFILE=	yes
diff --git a/usr.sbin/mrouted/config.c b/usr.sbin/mrouted/config.c
index 5b436e60b813..d23b2003645c 100644
--- a/usr.sbin/mrouted/config.c
+++ b/usr.sbin/mrouted/config.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/config.c,v 1.13.2.1 1999/08/29 15:43:50 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.sbin/mrouted/defs.h b/usr.sbin/mrouted/defs.h
index 1ec24de04d3f..c75934505674 100644
--- a/usr.sbin/mrouted/defs.h
+++ b/usr.sbin/mrouted/defs.h
@@ -7,7 +7,7 @@
  * Leland Stanford Junior University.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mrouted/defs.h,v 1.11.2.1 1999/08/29 15:43:51 peter Exp $
  * defs.h,v 3.8.4.15 1998/03/01 02:51:42 fenner Exp
  */
 
diff --git a/usr.sbin/mrouted/dvmrp.h b/usr.sbin/mrouted/dvmrp.h
index 2f11872216c0..188778bafa84 100644
--- a/usr.sbin/mrouted/dvmrp.h
+++ b/usr.sbin/mrouted/dvmrp.h
@@ -7,7 +7,7 @@
  * Leland Stanford Junior University.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mrouted/dvmrp.h,v 1.8.2.1 1999/08/29 15:43:51 peter Exp $
  * dvmrp.h,v 3.8.4.5 1997/11/18 23:25:57 fenner Exp
  */
 
diff --git a/usr.sbin/mrouted/igmp.c b/usr.sbin/mrouted/igmp.c
index f3430355cb15..e4d81a684e91 100644
--- a/usr.sbin/mrouted/igmp.c
+++ b/usr.sbin/mrouted/igmp.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/igmp.c,v 1.15.2.1 1999/08/29 15:43:51 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.sbin/mrouted/inet.c b/usr.sbin/mrouted/inet.c
index 53aad7c63a94..f02141635eac 100644
--- a/usr.sbin/mrouted/inet.c
+++ b/usr.sbin/mrouted/inet.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/inet.c,v 1.10.2.1 1999/08/29 15:43:52 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.sbin/mrouted/kern.c b/usr.sbin/mrouted/kern.c
index 716b4794180b..171063e60ce6 100644
--- a/usr.sbin/mrouted/kern.c
+++ b/usr.sbin/mrouted/kern.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/kern.c,v 1.11.2.1 1999/08/29 15:43:54 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.sbin/mrouted/main.c b/usr.sbin/mrouted/main.c
index 7ab3de8495f8..7c511d059e81 100644
--- a/usr.sbin/mrouted/main.c
+++ b/usr.sbin/mrouted/main.c
@@ -22,7 +22,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/main.c,v 1.15.2.1 1999/08/29 15:43:54 peter Exp $";
 #endif
 
 #include <err.h>
diff --git a/usr.sbin/mrouted/map-mbone/Makefile b/usr.sbin/mrouted/map-mbone/Makefile
index afe6d24ef377..123b8b4daae4 100644
--- a/usr.sbin/mrouted/map-mbone/Makefile
+++ b/usr.sbin/mrouted/map-mbone/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mrouted/map-mbone/Makefile,v 1.7.2.1 1999/08/29 15:44:06 peter Exp $
 
 PROG=	map-mbone
 
diff --git a/usr.sbin/mrouted/mapper.c b/usr.sbin/mrouted/mapper.c
index 0f09835fa87b..59775acf092f 100644
--- a/usr.sbin/mrouted/mapper.c
+++ b/usr.sbin/mrouted/mapper.c
@@ -23,7 +23,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/mapper.c,v 1.14.2.1 1999/08/29 15:43:55 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/mrouted/mrinfo.c b/usr.sbin/mrouted/mrinfo.c
index a9f9dd9112ea..62d6c041040c 100644
--- a/usr.sbin/mrouted/mrinfo.c
+++ b/usr.sbin/mrouted/mrinfo.c
@@ -61,7 +61,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/mrinfo.c,v 1.16.2.1 1999/08/29 15:43:55 peter Exp $";
 /*  original rcsid:
     "@(#) Header: mrinfo.c,v 1.6 93/04/08 15:14:16 van Exp (LBL)";
 */
diff --git a/usr.sbin/mrouted/mrinfo/Makefile b/usr.sbin/mrouted/mrinfo/Makefile
index a529cf9b64ee..f34eff66d89c 100644
--- a/usr.sbin/mrouted/mrinfo/Makefile
+++ b/usr.sbin/mrouted/mrinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mrouted/mrinfo/Makefile,v 1.10.2.1 1999/08/29 15:44:07 peter Exp $
 
 PROG=	mrinfo
 
diff --git a/usr.sbin/mrouted/mrouted.8 b/usr.sbin/mrouted/mrouted.8
index 7655de4a8f83..89f75efaa32d 100644
--- a/usr.sbin/mrouted/mrouted.8
+++ b/usr.sbin/mrouted/mrouted.8
@@ -1,5 +1,5 @@
 .\"COPYRIGHT 1989 by The Board of Trustees of Leland Stanford Junior University.
-.\"$FreeBSD$
+.\"$FreeBSD: src/usr.sbin/mrouted/mrouted.8,v 1.12.2.2 1999/08/29 15:43:56 peter Exp $
 .Dd May 8, 1995
 .Dt MROUTED 8
 .UC 5
diff --git a/usr.sbin/mrouted/mrouted.conf b/usr.sbin/mrouted/mrouted.conf
index e9cb04c3ed6e..fafbeacd72bc 100644
--- a/usr.sbin/mrouted/mrouted.conf
+++ b/usr.sbin/mrouted/mrouted.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mrouted/mrouted.conf,v 1.8.2.1 1999/08/29 15:43:56 peter Exp $
 # mrouted.conf,v 3.8 1995/11/29 22:40:47 fenner Rel
 #
 #   This is the configuration file for "mrouted", an IP multicast router.
diff --git a/usr.sbin/mrouted/mrouted/Makefile b/usr.sbin/mrouted/mrouted/Makefile
index a7a0fcbe5512..e5536444084b 100644
--- a/usr.sbin/mrouted/mrouted/Makefile
+++ b/usr.sbin/mrouted/mrouted/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mrouted/mrouted/Makefile,v 1.11.2.2 1999/08/29 15:44:10 peter Exp $
 
 PROG=	mrouted
 
diff --git a/usr.sbin/mrouted/mtrace.c b/usr.sbin/mrouted/mtrace.c
index 2ddf4f9e88a5..f8e94778aa2d 100644
--- a/usr.sbin/mrouted/mtrace.c
+++ b/usr.sbin/mrouted/mtrace.c
@@ -113,7 +113,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/mtrace.c,v 1.16.2.1 1999/08/29 15:43:57 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/usr.sbin/mrouted/mtrace/Makefile b/usr.sbin/mrouted/mtrace/Makefile
index 6fa62606f2e4..d89b1c4f329d 100644
--- a/usr.sbin/mrouted/mtrace/Makefile
+++ b/usr.sbin/mrouted/mtrace/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mrouted/mtrace/Makefile,v 1.9.2.1 1999/08/29 15:44:11 peter Exp $
 
 PROG=	mtrace
 
diff --git a/usr.sbin/mrouted/pathnames.h b/usr.sbin/mrouted/pathnames.h
index d4fb01d18a15..3ef543bcd7f9 100644
--- a/usr.sbin/mrouted/pathnames.h
+++ b/usr.sbin/mrouted/pathnames.h
@@ -7,7 +7,7 @@
  * Leland Stanford Junior University.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mrouted/pathnames.h,v 1.6.2.1 1999/08/29 15:43:58 peter Exp $
  * pathnames.h,v 3.8 1995/11/29 22:36:57 fenner Rel
  */
 
diff --git a/usr.sbin/mrouted/prune.c b/usr.sbin/mrouted/prune.c
index 7ffb34b23a7d..2a85e2176b6f 100644
--- a/usr.sbin/mrouted/prune.c
+++ b/usr.sbin/mrouted/prune.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/prune.c,v 1.16.2.1 1999/08/29 15:43:58 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.sbin/mrouted/prune.h b/usr.sbin/mrouted/prune.h
index 375fada1116e..56a34f3295bb 100644
--- a/usr.sbin/mrouted/prune.h
+++ b/usr.sbin/mrouted/prune.h
@@ -7,7 +7,7 @@
  * Leland Stanford Junior University.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mrouted/prune.h,v 1.9.2.1 1999/08/29 15:43:59 peter Exp $
  * prune.h,v 3.8.4.5 1998/02/27 22:45:43 fenner Exp
  */
 
diff --git a/usr.sbin/mrouted/route.c b/usr.sbin/mrouted/route.c
index b2695395ed92..9a63b9351867 100644
--- a/usr.sbin/mrouted/route.c
+++ b/usr.sbin/mrouted/route.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/route.c,v 1.11.2.1 1999/08/29 15:44:00 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.sbin/mrouted/route.h b/usr.sbin/mrouted/route.h
index 300202b967dd..ff7124bc16d3 100644
--- a/usr.sbin/mrouted/route.h
+++ b/usr.sbin/mrouted/route.h
@@ -7,7 +7,7 @@
  * Leland Stanford Junior University.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mrouted/route.h,v 1.8.2.1 1999/08/29 15:44:00 peter Exp $
  * route.h,v 3.8.4.6 1997/07/01 23:02:35 fenner Exp
  */
 
diff --git a/usr.sbin/mrouted/rsrr.c b/usr.sbin/mrouted/rsrr.c
index a74fd6caa2f2..1fcb0a3444a4 100644
--- a/usr.sbin/mrouted/rsrr.c
+++ b/usr.sbin/mrouted/rsrr.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/rsrr.c,v 1.7.2.1 1999/08/29 15:44:01 peter Exp $";
 #endif /* not lint */
 
 #ifdef RSRR
diff --git a/usr.sbin/mrouted/testrsrr/Makefile b/usr.sbin/mrouted/testrsrr/Makefile
index b1ea5e523689..1764761c3dcf 100644
--- a/usr.sbin/mrouted/testrsrr/Makefile
+++ b/usr.sbin/mrouted/testrsrr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mrouted/testrsrr/Makefile,v 1.3.2.1 1999/08/29 15:44:12 peter Exp $
 
 PROG=	testrsrr
 
diff --git a/usr.sbin/mrouted/testrsrr/testrsrr.c b/usr.sbin/mrouted/testrsrr/testrsrr.c
index b18d6b028882..6a4a06c412f4 100644
--- a/usr.sbin/mrouted/testrsrr/testrsrr.c
+++ b/usr.sbin/mrouted/testrsrr/testrsrr.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mrouted/testrsrr/testrsrr.c,v 1.3.2.1 1999/08/29 15:44:13 peter Exp $
  */
 #include <stddef.h>
 #include <stdlib.h>
diff --git a/usr.sbin/mrouted/vif.c b/usr.sbin/mrouted/vif.c
index 423fa532225e..6331014b9489 100644
--- a/usr.sbin/mrouted/vif.c
+++ b/usr.sbin/mrouted/vif.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mrouted/vif.c,v 1.14.2.1 1999/08/29 15:44:01 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.sbin/mrouted/vif.h b/usr.sbin/mrouted/vif.h
index 5be618dea308..58f79f88148f 100644
--- a/usr.sbin/mrouted/vif.h
+++ b/usr.sbin/mrouted/vif.h
@@ -7,7 +7,7 @@
  * Leland Stanford Junior University.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mrouted/vif.h,v 1.9.2.1 1999/08/29 15:44:02 peter Exp $
  * vif.h,v 3.8.4.26 1998/01/14 21:21:19 fenner Exp
  */
 
diff --git a/usr.sbin/mtree/Makefile b/usr.sbin/mtree/Makefile
index 75c0b03776dc..6d731f6f3d9c 100644
--- a/usr.sbin/mtree/Makefile
+++ b/usr.sbin/mtree/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mtree/Makefile,v 1.6.2.1 1999/08/29 15:44:16 peter Exp $
 
 PROG=	mtree
 SRCS=	compare.c crc.c create.c misc.c mtree.c spec.c verify.c
diff --git a/usr.sbin/mtree/compare.c b/usr.sbin/mtree/compare.c
index 20ac1be97584..9cf79bee0ab5 100644
--- a/usr.sbin/mtree/compare.c
+++ b/usr.sbin/mtree/compare.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)compare.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mtree/compare.c,v 1.10.2.1 1999/08/29 15:44:16 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/mtree/create.c b/usr.sbin/mtree/create.c
index c16e7454b847..0a8735f06fc1 100644
--- a/usr.sbin/mtree/create.c
+++ b/usr.sbin/mtree/create.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)create.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mtree/create.c,v 1.13.2.1 1999/08/29 15:44:17 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/mtree/misc.c b/usr.sbin/mtree/misc.c
index 40051ad6db55..079c5caf39b9 100644
--- a/usr.sbin/mtree/misc.c
+++ b/usr.sbin/mtree/misc.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mtree/misc.c,v 1.5.2.1 1999/08/29 15:44:17 peter Exp $";
 #endif /*not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/mtree/mtree.8 b/usr.sbin/mtree/mtree.8
index 1be1910fb116..840dd313d8a6 100644
--- a/usr.sbin/mtree/mtree.8
+++ b/usr.sbin/mtree/mtree.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)mtree.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mtree/mtree.8,v 1.13.2.1 1999/08/29 15:44:18 peter Exp $
 .\"
 .Dd February 9, 1995
 .Dt MTREE 8
diff --git a/usr.sbin/mtree/mtree.c b/usr.sbin/mtree/mtree.c
index c8ac609fd539..a32683f75bd1 100644
--- a/usr.sbin/mtree/mtree.c
+++ b/usr.sbin/mtree/mtree.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mtree.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mtree/mtree.c,v 1.7.2.1 1999/08/29 15:44:19 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/mtree/spec.c b/usr.sbin/mtree/spec.c
index fb512a78f1b9..d1692dda5934 100644
--- a/usr.sbin/mtree/spec.c
+++ b/usr.sbin/mtree/spec.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)spec.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mtree/spec.c,v 1.9.2.1 1999/08/29 15:44:19 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/mtree/verify.c b/usr.sbin/mtree/verify.c
index a04bd55d4796..33fc8765529f 100644
--- a/usr.sbin/mtree/verify.c
+++ b/usr.sbin/mtree/verify.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)verify.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mtree/verify.c,v 1.7.2.1 1999/08/29 15:44:19 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/named.reload/Makefile b/usr.sbin/named.reload/Makefile
index f5b7b33a075d..19d21526e0e3 100644
--- a/usr.sbin/named.reload/Makefile
+++ b/usr.sbin/named.reload/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/named.reload/Makefile,v 1.5.2.1 1999/08/29 15:44:24 peter Exp $
 
 .include "${.CURDIR}/../named/Makefile.inc"
 
diff --git a/usr.sbin/named.reload/named.reload.8 b/usr.sbin/named.reload/named.reload.8
index 9d0cb404e1a3..deaf242512b2 100644
--- a/usr.sbin/named.reload/named.reload.8
+++ b/usr.sbin/named.reload/named.reload.8
@@ -52,7 +52,7 @@
 .\" --Copyright--
 .\"
 .\"	from hostname.7	6.4 (Berkeley) 1/16/90
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/named.reload/named.reload.8,v 1.1.2.1 1999/12/13 15:08:25 peter Exp $
 .\"
 .TH @INDOT_U@NAMED.RELOAD @SYS_OPS_EXT_U@ "June 26, 1993"
 .UC 5
diff --git a/usr.sbin/named.reload/named.reload.sh b/usr.sbin/named.reload/named.reload.sh
index 4a657a720ae5..c02975e42d00 100644
--- a/usr.sbin/named.reload/named.reload.sh
+++ b/usr.sbin/named.reload/named.reload.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -
 #
 #	from named.reload	5.2 (Berkeley) 6/27/89
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/named.reload/named.reload.sh,v 1.1.2.1 1999/08/29 15:44:24 peter Exp $
 #
 
 exec %DESTSBIN%/%INDOT%ndc reload
diff --git a/usr.sbin/named.restart/Makefile b/usr.sbin/named.restart/Makefile
index e0c4bcb037ba..e9ca75ad06c3 100644
--- a/usr.sbin/named.restart/Makefile
+++ b/usr.sbin/named.restart/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/named.restart/Makefile,v 1.5.2.1 1999/08/29 15:44:25 peter Exp $
 
 .include "${.CURDIR}/../named/Makefile.inc"
 
diff --git a/usr.sbin/named.restart/named.restart.8 b/usr.sbin/named.restart/named.restart.8
index 1f276377f417..0211710cf569 100644
--- a/usr.sbin/named.restart/named.restart.8
+++ b/usr.sbin/named.restart/named.restart.8
@@ -52,7 +52,7 @@
 .\" --Copyright--
 .\"
 .\"	from hostname.7	6.4 (Berkeley) 1/16/90
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/named.restart/named.restart.8,v 1.1.2.1 1999/12/13 15:08:27 peter Exp $
 .\"
 .TH @INDOT_U@NAMED.RESTART @SYS_OPS_EXT_U@ "June 26, 1993"
 .UC 5
diff --git a/usr.sbin/named.restart/named.restart.sh b/usr.sbin/named.restart/named.restart.sh
index 518f6f2d11bc..2565bb776f51 100644
--- a/usr.sbin/named.restart/named.restart.sh
+++ b/usr.sbin/named.restart/named.restart.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -
 #
 #	from named.restart	5.4 (Berkeley) 6/27/89
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/named.restart/named.restart.sh,v 1.1.2.1 1999/08/29 15:44:26 peter Exp $
 #
 
 exec %DESTSBIN%/%INDOT%ndc restart
diff --git a/usr.sbin/named/Makefile b/usr.sbin/named/Makefile
index 390f808e9581..82c6805f504c 100644
--- a/usr.sbin/named/Makefile
+++ b/usr.sbin/named/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/named/Makefile,v 1.21.2.2 1999/12/13 15:08:23 peter Exp $
 
 USE_LIBBIND=	true
 .include "${.CURDIR}/Makefile.inc"
diff --git a/usr.sbin/named/Makefile.inc b/usr.sbin/named/Makefile.inc
index bd9211e8291c..8d7a3a4585be 100644
--- a/usr.sbin/named/Makefile.inc
+++ b/usr.sbin/named/Makefile.inc
@@ -1,5 +1,5 @@
 # From: Id: Makefile.inc,v 8.4 1996/03/03 17:42:43 vixie Exp
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/named/Makefile.inc,v 1.9.2.2 1999/12/13 15:08:23 peter Exp $
 
 .ifndef (Mk.Inc)
 Mk.Inc?=defined
diff --git a/usr.sbin/named/Makefile.maninc b/usr.sbin/named/Makefile.maninc
index b4595b97a23c..4e08f436b331 100644
--- a/usr.sbin/named/Makefile.maninc
+++ b/usr.sbin/named/Makefile.maninc
@@ -1,5 +1,5 @@
 # From: Id: Makefile.maninc,v 8.1 1994/12/15 06:23:43 vixie Exp
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/named/Makefile.maninc,v 1.4.2.1 1999/08/29 15:44:22 peter Exp $
 
 # (the BIND kit's man page Makefile has gotten bad and crazy over the years.
 #  this file has to be included AFTER bsd.prog.mk (which includes bsd.man.mk))
diff --git a/usr.sbin/ndc/Makefile b/usr.sbin/ndc/Makefile
index 033803c4e952..03ef112168aa 100644
--- a/usr.sbin/ndc/Makefile
+++ b/usr.sbin/ndc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ndc/Makefile,v 1.5.2.2 1999/12/13 15:08:28 peter Exp $
 
 USE_LIBBIND=	true
 .include "${.CURDIR}/../named/Makefile.inc"
diff --git a/usr.sbin/newsyslog/Makefile b/usr.sbin/newsyslog/Makefile
index a7cf621c9811..f270f39b2d7b 100644
--- a/usr.sbin/newsyslog/Makefile
+++ b/usr.sbin/newsyslog/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/newsyslog/Makefile,v 1.5.2.2 1999/08/29 15:44:30 peter Exp $
 
 PROG=	newsyslog
 
diff --git a/usr.sbin/newsyslog/newsyslog.8 b/usr.sbin/newsyslog/newsyslog.8
index 50bfd3a9d6ab..57af0f0e1c17 100644
--- a/usr.sbin/newsyslog/newsyslog.8
+++ b/usr.sbin/newsyslog/newsyslog.8
@@ -1,7 +1,7 @@
 .\" This file contains changes from the Open Software Foundation.
 .\"
 .\"	from: @(#)newsyslog.8
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/newsyslog/newsyslog.8,v 1.14.2.3 1999/08/29 15:44:31 peter Exp $
 .\"
 .\" Copyright 1988, 1989 by the Massachusetts Institute of Technology
 .\" 
diff --git a/usr.sbin/newsyslog/newsyslog.c b/usr.sbin/newsyslog/newsyslog.c
index 808136372f67..36337049f60f 100644
--- a/usr.sbin/newsyslog/newsyslog.c
+++ b/usr.sbin/newsyslog/newsyslog.c
@@ -27,7 +27,7 @@ provided "as is" without express or implied warranty.
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/newsyslog/newsyslog.c,v 1.21.2.3 1999/08/29 15:44:31 peter Exp $";
 #endif /* not lint */
 
 #define OSF
diff --git a/usr.sbin/newsyslog/pathnames.h b/usr.sbin/newsyslog/pathnames.h
index ff224a8c5431..83cfd8183357 100644
--- a/usr.sbin/newsyslog/pathnames.h
+++ b/usr.sbin/newsyslog/pathnames.h
@@ -18,7 +18,7 @@ M.I.T. and the M.I.T. S.I.P.B. make no representations about
 the suitability of this software for any purpose.  It is
 provided "as is" without express or implied warranty.
 
- $FreeBSD$
+ $FreeBSD: src/usr.sbin/newsyslog/pathnames.h,v 1.1.2.2 1999/08/29 15:44:32 peter Exp $
 
 */
 
diff --git a/usr.sbin/ngctl/Makefile b/usr.sbin/ngctl/Makefile
index 468a17cffe22..9d96b0cd3282 100644
--- a/usr.sbin/ngctl/Makefile
+++ b/usr.sbin/ngctl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ngctl/Makefile,v 1.3.2.2 1999/12/01 19:41:40 julian Exp $
 # $Whistle: Makefile,v 1.3 1999/01/16 00:10:11 archie Exp $
 
 PROG=		ngctl
diff --git a/usr.sbin/ngctl/connect.c b/usr.sbin/ngctl/connect.c
index 470468a0dff2..02cbff3db220 100644
--- a/usr.sbin/ngctl/connect.c
+++ b/usr.sbin/ngctl/connect.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/connect.c,v 1.1.2.2 1999/12/01 19:41:40 julian Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/debug.c b/usr.sbin/ngctl/debug.c
index 7b355e5d1fec..7662a12fe2c9 100644
--- a/usr.sbin/ngctl/debug.c
+++ b/usr.sbin/ngctl/debug.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/debug.c,v 1.1.2.1 1999/11/17 07:23:14 julian Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/list.c b/usr.sbin/ngctl/list.c
index aeb74fb057ce..e66f8891f478 100644
--- a/usr.sbin/ngctl/list.c
+++ b/usr.sbin/ngctl/list.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/list.c,v 1.1.2.2 1999/12/01 19:41:41 julian Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/main.c b/usr.sbin/ngctl/main.c
index 74017e77085f..641d411bcbe1 100644
--- a/usr.sbin/ngctl/main.c
+++ b/usr.sbin/ngctl/main.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/main.c,v 1.2.2.2 1999/12/01 19:41:41 julian Exp $
  * $Whistle: main.c,v 1.12 1999/11/29 19:17:46 archie Exp $
  */
 
diff --git a/usr.sbin/ngctl/mkpeer.c b/usr.sbin/ngctl/mkpeer.c
index c5735e13650a..014ca2219a09 100644
--- a/usr.sbin/ngctl/mkpeer.c
+++ b/usr.sbin/ngctl/mkpeer.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/mkpeer.c,v 1.1.2.1 1999/11/17 07:23:15 julian Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/msg.c b/usr.sbin/ngctl/msg.c
index 7a040762d5d0..91d0835256ec 100644
--- a/usr.sbin/ngctl/msg.c
+++ b/usr.sbin/ngctl/msg.c
@@ -35,7 +35,7 @@
  * OF SUCH DAMAGE.
  *
  * $Whistle: msg.c,v 1.2 1999/11/29 23:38:35 archie Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/msg.c,v 1.1.2.1 1999/12/01 19:41:41 julian Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/name.c b/usr.sbin/ngctl/name.c
index 85c6eff5d0f0..999d1773fb2c 100644
--- a/usr.sbin/ngctl/name.c
+++ b/usr.sbin/ngctl/name.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/name.c,v 1.1.2.1 1999/11/17 07:23:15 julian Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/ngctl.8 b/usr.sbin/ngctl/ngctl.8
index 44b540207b9a..7d4500e3b775 100644
--- a/usr.sbin/ngctl/ngctl.8
+++ b/usr.sbin/ngctl/ngctl.8
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ngctl/ngctl.8,v 1.2.2.2 1999/12/01 19:41:41 julian Exp $
 .\" $Whistle: ngctl.8,v 1.6 1999/01/20 03:19:44 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/usr.sbin/ngctl/ngctl.h b/usr.sbin/ngctl/ngctl.h
index 8c7155b82744..880133415cd3 100644
--- a/usr.sbin/ngctl/ngctl.h
+++ b/usr.sbin/ngctl/ngctl.h
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/ngctl.h,v 1.4.2.2 1999/12/01 19:41:41 julian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ngctl/rmhook.c b/usr.sbin/ngctl/rmhook.c
index 4af398e34e5a..3e5622c5e85a 100644
--- a/usr.sbin/ngctl/rmhook.c
+++ b/usr.sbin/ngctl/rmhook.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/rmhook.c,v 1.1.2.2 1999/12/01 19:41:41 julian Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/show.c b/usr.sbin/ngctl/show.c
index da51361a6ee7..7d49d633a358 100644
--- a/usr.sbin/ngctl/show.c
+++ b/usr.sbin/ngctl/show.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/show.c,v 1.1.2.2 1999/12/01 19:41:41 julian Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/shutdown.c b/usr.sbin/ngctl/shutdown.c
index d391ba801e58..a4bb8564f392 100644
--- a/usr.sbin/ngctl/shutdown.c
+++ b/usr.sbin/ngctl/shutdown.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/shutdown.c,v 1.1.2.2 1999/12/01 19:41:41 julian Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/status.c b/usr.sbin/ngctl/status.c
index 75706b3103bb..0d9089d5a958 100644
--- a/usr.sbin/ngctl/status.c
+++ b/usr.sbin/ngctl/status.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/status.c,v 1.1.2.1 1999/11/17 07:23:18 julian Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/ngctl/types.c b/usr.sbin/ngctl/types.c
index b7be6aa1edbe..d06ffaad124c 100644
--- a/usr.sbin/ngctl/types.c
+++ b/usr.sbin/ngctl/types.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/types.c,v 1.1.2.1 1999/11/17 07:23:18 julian Exp $
  */
 
 #include "ngctl.h"
diff --git a/usr.sbin/nghook/Makefile b/usr.sbin/nghook/Makefile
index 18b07d29a671..b401a685753e 100644
--- a/usr.sbin/nghook/Makefile
+++ b/usr.sbin/nghook/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/nghook/Makefile,v 1.2.2.1 1999/11/17 07:06:03 julian Exp $
 # $Whistle: Makefile,v 1.4 1999/01/16 04:44:33 archie Exp $
 
 PROG=		nghook
diff --git a/usr.sbin/nghook/main.c b/usr.sbin/nghook/main.c
index 8027dc658c8d..8643212ac581 100644
--- a/usr.sbin/nghook/main.c
+++ b/usr.sbin/nghook/main.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/nghook/main.c,v 1.3.2.2 1999/12/01 19:41:42 julian Exp $
  * $Whistle: main.c,v 1.9 1999/01/20 00:26:26 archie Exp $
  */
 
diff --git a/usr.sbin/nghook/nghook.8 b/usr.sbin/nghook/nghook.8
index 33016b08d606..7d5a1678b7ad 100644
--- a/usr.sbin/nghook/nghook.8
+++ b/usr.sbin/nghook/nghook.8
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\"
-.\"  $FreeBSD$
+.\"  $FreeBSD: src/usr.sbin/nghook/nghook.8,v 1.1.2.1 1999/11/17 07:06:04 julian Exp $
 .\" $Whistle: nghook.8,v 1.4 1999/01/20 03:19:45 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/usr.sbin/nslookup/Makefile b/usr.sbin/nslookup/Makefile
index c3a51a46625c..6c1b21b0d5f3 100644
--- a/usr.sbin/nslookup/Makefile
+++ b/usr.sbin/nslookup/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/nslookup/Makefile,v 1.7.2.2 1999/12/13 15:08:30 peter Exp $
 
 USE_LIBBIND=	yes
 .include "${.CURDIR}/../named/Makefile.inc"
diff --git a/usr.sbin/nsupdate/Makefile b/usr.sbin/nsupdate/Makefile
index c8b2b9b3eb6a..ea911f822978 100644
--- a/usr.sbin/nsupdate/Makefile
+++ b/usr.sbin/nsupdate/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/nsupdate/Makefile,v 1.1.2.1 1999/12/13 15:08:31 peter Exp $
 
 USE_LIBBIND=	yes
 .include "${.CURDIR}/../named/Makefile.inc"
diff --git a/usr.sbin/pccard/Makefile b/usr.sbin/pccard/Makefile
index 06516bf40815..2893a68ec5a5 100644
--- a/usr.sbin/pccard/Makefile
+++ b/usr.sbin/pccard/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for pccardc/pccardd.
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pccard/Makefile,v 1.4.2.1 1999/08/29 15:44:35 peter Exp $
 #
 SUBDIR= pccardc pccardd
 
diff --git a/usr.sbin/pccard/pccardc/Makefile b/usr.sbin/pccard/pccardc/Makefile
index 902ea18818e6..d71c8c59e268 100644
--- a/usr.sbin/pccard/pccardc/Makefile
+++ b/usr.sbin/pccard/pccardc/Makefile
@@ -1,7 +1,7 @@
 #
 #	pccardc Makefile
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pccard/pccardc/Makefile,v 1.7.2.3 1999/08/29 15:44:36 peter Exp $
 #
 PROG=	pccardc
 SRCS=	beep.c dumpcis.c enabler.c pccardc.c pccardmem.c printcis.c \
diff --git a/usr.sbin/pccard/pccardc/beep.c b/usr.sbin/pccard/pccardc/beep.c
index dda2e1c42807..e01673f1d5e2 100644
--- a/usr.sbin/pccard/pccardc/beep.c
+++ b/usr.sbin/pccard/pccardc/beep.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/beep.c,v 1.1.2.2 1999/08/29 15:44:37 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/pccard/pccardc/dumpcis.c b/usr.sbin/pccard/pccardc/dumpcis.c
index d5fc7579933f..2d6f18cfdbf4 100644
--- a/usr.sbin/pccard/pccardc/dumpcis.c
+++ b/usr.sbin/pccard/pccardc/dumpcis.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/dumpcis.c,v 1.9.2.3 1999/08/29 15:44:37 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/enabler.c b/usr.sbin/pccard/pccardc/enabler.c
index ae9fc1853a6c..779d9f7cd96d 100644
--- a/usr.sbin/pccard/pccardc/enabler.c
+++ b/usr.sbin/pccard/pccardc/enabler.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/enabler.c,v 1.10.2.3 1999/08/29 15:44:38 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/pccardc.8 b/usr.sbin/pccard/pccardc/pccardc.8
index 9a148ec02463..c09648a2cef4 100644
--- a/usr.sbin/pccard/pccardc/pccardc.8
+++ b/usr.sbin/pccard/pccardc/pccardc.8
@@ -26,7 +26,7 @@
 .\"
 .\" Translated to English by Hiroki Sato <hrs@geocities.co.jp>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pccard/pccardc/pccardc.8,v 1.1.2.3 1999/08/29 15:44:39 peter Exp $
 .\"
 .Dd November 14, 1998
 .Dt PCCARDC 8
diff --git a/usr.sbin/pccard/pccardc/pccardc.c b/usr.sbin/pccard/pccardc/pccardc.c
index c162a2aaeace..ba2861fa84fe 100644
--- a/usr.sbin/pccard/pccardc/pccardc.c
+++ b/usr.sbin/pccard/pccardc/pccardc.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/pccardc.c,v 1.7.2.2 1999/08/29 15:44:39 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/pccardmem.c b/usr.sbin/pccard/pccardc/pccardmem.c
index 2b79e581e85e..d3264cf34d6d 100644
--- a/usr.sbin/pccard/pccardc/pccardmem.c
+++ b/usr.sbin/pccard/pccardc/pccardmem.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/pccardmem.c,v 1.9.2.3 1999/08/29 15:44:40 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/printcis.c b/usr.sbin/pccard/pccardc/printcis.c
index 92dafe531db0..da8041b6d206 100644
--- a/usr.sbin/pccard/pccardc/printcis.c
+++ b/usr.sbin/pccard/pccardc/printcis.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/printcis.c,v 1.9.2.1 1999/08/29 15:44:40 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pccard/pccardc/rdmap.c b/usr.sbin/pccard/pccardc/rdmap.c
index 3ac81f930ca9..555172ac61ef 100644
--- a/usr.sbin/pccard/pccardc/rdmap.c
+++ b/usr.sbin/pccard/pccardc/rdmap.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/rdmap.c,v 1.9.2.3 1999/08/29 15:44:41 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/rdreg.c b/usr.sbin/pccard/pccardc/rdreg.c
index a3171487998a..c31289a02ee9 100644
--- a/usr.sbin/pccard/pccardc/rdreg.c
+++ b/usr.sbin/pccard/pccardc/rdreg.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/rdreg.c,v 1.9.2.3 1999/08/29 15:44:41 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/wrattr.c b/usr.sbin/pccard/pccardc/wrattr.c
index cc3df8ecbee8..43a2fb7a51ec 100644
--- a/usr.sbin/pccard/pccardc/wrattr.c
+++ b/usr.sbin/pccard/pccardc/wrattr.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/wrattr.c,v 1.10.2.3 1999/08/29 15:44:41 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/wrreg.c b/usr.sbin/pccard/pccardc/wrreg.c
index 5fda2a72f24c..dc3298b40830 100644
--- a/usr.sbin/pccard/pccardc/wrreg.c
+++ b/usr.sbin/pccard/pccardc/wrreg.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/wrreg.c,v 1.9.2.3 1999/08/29 15:44:42 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardd/cardd.c b/usr.sbin/pccard/pccardd/cardd.c
index bee70e6ce150..87bcff52d369 100644
--- a/usr.sbin/pccard/pccardd/cardd.c
+++ b/usr.sbin/pccard/pccardd/cardd.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardd/cardd.c,v 1.33.2.4 1999/08/29 15:44:43 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pccard/pccardd/cardd.h b/usr.sbin/pccard/pccardd/cardd.h
index 017414d1c4ba..97d792bba38e 100644
--- a/usr.sbin/pccard/pccardd/cardd.h
+++ b/usr.sbin/pccard/pccardd/cardd.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pccard/pccardd/cardd.h,v 1.12.2.2 1999/08/29 15:44:44 peter Exp $
  *
  *	Common include file for PCMCIA daemon
  */
diff --git a/usr.sbin/pccard/pccardd/file.c b/usr.sbin/pccard/pccardd/file.c
index fd6fc67d6d0d..c52b9914e7c1 100644
--- a/usr.sbin/pccard/pccardd/file.c
+++ b/usr.sbin/pccard/pccardd/file.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardd/file.c,v 1.16.2.3 1999/08/29 15:44:45 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pccard/pccardd/pccardd.8 b/usr.sbin/pccard/pccardd/pccardd.8
index e7449c0a4924..0c45f16e318e 100644
--- a/usr.sbin/pccard/pccardd/pccardd.8
+++ b/usr.sbin/pccard/pccardd/pccardd.8
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pccard/pccardd/pccardd.8,v 1.10.2.4 1999/08/29 15:44:45 peter Exp $
 .\"
 .Dd November 1, 1994
 .Dt PCCARDD 8
diff --git a/usr.sbin/pccard/pccardd/pccardd.c b/usr.sbin/pccard/pccardd/pccardd.c
index bcfd7bede1eb..b20a38f08028 100644
--- a/usr.sbin/pccard/pccardd/pccardd.c
+++ b/usr.sbin/pccard/pccardd/pccardd.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardd/pccardd.c,v 1.2.4.3 1999/08/29 15:44:46 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pccard/pccardd/readcis.c b/usr.sbin/pccard/pccardd/readcis.c
index 6fd7c7bb2592..261586c7a22e 100644
--- a/usr.sbin/pccard/pccardd/readcis.c
+++ b/usr.sbin/pccard/pccardd/readcis.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardd/readcis.c,v 1.14.2.1 1999/08/29 15:44:47 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardd/readcis.h b/usr.sbin/pccard/pccardd/readcis.h
index 054003604d4e..4e39f580f4fe 100644
--- a/usr.sbin/pccard/pccardd/readcis.h
+++ b/usr.sbin/pccard/pccardd/readcis.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pccard/pccardd/readcis.h,v 1.9.2.1 1999/08/29 15:44:47 peter Exp $
  */
 
 #define	CIS_MAXSTR	30
diff --git a/usr.sbin/pccard/pccardd/util.c b/usr.sbin/pccard/pccardd/util.c
index 6f42f607772f..285df79f370c 100644
--- a/usr.sbin/pccard/pccardd/util.c
+++ b/usr.sbin/pccard/pccardd/util.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardd/util.c,v 1.12.2.1 1999/08/29 15:44:47 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pciconf/pciconf.8 b/usr.sbin/pciconf/pciconf.8
index d32204c203c4..6c2833c90f2b 100644
--- a/usr.sbin/pciconf/pciconf.8
+++ b/usr.sbin/pciconf/pciconf.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pciconf/pciconf.8,v 1.4.2.2 1999/08/29 15:44:50 peter Exp $
 .\" Copyright (c) 1997
 .\"	Stefan Esser <se@freebsd.org>. All rights reserved.
 .\"
diff --git a/usr.sbin/pciconf/pciconf.c b/usr.sbin/pciconf/pciconf.c
index 7c2f3bdba42d..1b71828056c7 100644
--- a/usr.sbin/pciconf/pciconf.c
+++ b/usr.sbin/pciconf/pciconf.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pciconf/pciconf.c,v 1.7.2.1 1999/08/29 15:44:51 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/pcvt/Makefile.inc b/usr.sbin/pcvt/Makefile.inc
index 20f7cc0632e9..c20b6fe33ade 100644
--- a/usr.sbin/pcvt/Makefile.inc
+++ b/usr.sbin/pcvt/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/Makefile.inc,v 1.6.2.1 1999/08/29 15:44:52 peter Exp $
 
 FONTDIR	=	/usr/share/misc/pcvtfonts
 
diff --git a/usr.sbin/pcvt/Misc/Etc/Makefile b/usr.sbin/pcvt/Misc/Etc/Makefile
index c72a02544f95..ab5c6eab92df 100644
--- a/usr.sbin/pcvt/Misc/Etc/Makefile
+++ b/usr.sbin/pcvt/Misc/Etc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/Misc/Etc/Makefile,v 1.4.2.1 1999/08/29 15:44:53 peter Exp $
 
 FILES=	Termcap Terminfo pcvt.el rc.local uemacs.tar.Z.uu xmodmap-german
 
diff --git a/usr.sbin/pcvt/fonts/Makefile b/usr.sbin/pcvt/fonts/Makefile
index 51c7908446e4..c14daea11ba5 100644
--- a/usr.sbin/pcvt/fonts/Makefile
+++ b/usr.sbin/pcvt/fonts/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/fonts/Makefile,v 1.9.2.1 1999/08/29 15:44:54 peter Exp $
 
 .SUFFIXES: .uu
 .uu:
diff --git a/usr.sbin/pcvt/kbdio/kbdio.y b/usr.sbin/pcvt/kbdio/kbdio.y
index d6a294e07463..6e948545e811 100644
--- a/usr.sbin/pcvt/kbdio/kbdio.y
+++ b/usr.sbin/pcvt/kbdio/kbdio.y
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/usr.sbin/pcvt/kbdio/kbdio.y,v 1.4.2.1 1999/08/29 15:44:56 peter Exp $"
 
 /*
  * $Log: kbdio.y,v $
diff --git a/usr.sbin/pcvt/kbdio/lex.l b/usr.sbin/pcvt/kbdio/lex.l
index 6a7a1503e484..fccf81f672cd 100644
--- a/usr.sbin/pcvt/kbdio/lex.l
+++ b/usr.sbin/pcvt/kbdio/lex.l
@@ -33,7 +33,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/usr.sbin/pcvt/kbdio/lex.l,v 1.4.2.1 1999/08/29 15:44:57 peter Exp $"
 
 /*
  * $Log: lex.l,v $
diff --git a/usr.sbin/pcvt/keycap/man5/keycap.5 b/usr.sbin/pcvt/keycap/man5/keycap.5
index cb3342b46b80..fe8499221b93 100644
--- a/usr.sbin/pcvt/keycap/man5/keycap.5
+++ b/usr.sbin/pcvt/keycap/man5/keycap.5
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" @(#)keycap.5, 3.00, Last Edit-Date: [Sun Jan  2 13:45:59 1994]
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pcvt/keycap/man5/keycap.5,v 1.7.2.1 1999/08/29 15:44:58 peter Exp $
 .\"
 .Dd January 3, 1993
 .Dt KEYCAP 5
diff --git a/usr.sbin/pcvt/set2061/compiler.h b/usr.sbin/pcvt/set2061/compiler.h
index 57d1cd32e060..9a4a10aea764 100644
--- a/usr.sbin/pcvt/set2061/compiler.h
+++ b/usr.sbin/pcvt/set2061/compiler.h
@@ -20,7 +20,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pcvt/set2061/compiler.h,v 1.4.2.1 1999/08/29 15:44:59 peter Exp $
  */
 
 
diff --git a/usr.sbin/pcvt/vgaio/Makefile b/usr.sbin/pcvt/vgaio/Makefile
index 73753efbfe3e..2e294aae0dc0 100644
--- a/usr.sbin/pcvt/vgaio/Makefile
+++ b/usr.sbin/pcvt/vgaio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pcvt/vgaio/Makefile,v 1.11.2.1 1999/08/29 15:45:00 peter Exp $
 
 .if !exists(${.CURDIR}/../Makefile.inc)
 error:
diff --git a/usr.sbin/pcvt/vgaio/lex.l b/usr.sbin/pcvt/vgaio/lex.l
index f979581d43b5..5a45b68408d5 100644
--- a/usr.sbin/pcvt/vgaio/lex.l
+++ b/usr.sbin/pcvt/vgaio/lex.l
@@ -33,7 +33,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/usr.sbin/pcvt/vgaio/lex.l,v 1.3.2.1 1999/08/29 15:45:01 peter Exp $"
 
 /*
  * $Log: lex.l,v $
diff --git a/usr.sbin/pcvt/vgaio/vgaio.8 b/usr.sbin/pcvt/vgaio/vgaio.8
index 4736b570f64c..27bf64698add 100644
--- a/usr.sbin/pcvt/vgaio/vgaio.8
+++ b/usr.sbin/pcvt/vgaio/vgaio.8
@@ -31,7 +31,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pcvt/vgaio/vgaio.8,v 1.4.2.1 1999/08/29 15:45:02 peter Exp $
 .\" -hm updated 31.12.94
 .\" 
 .Dd December 31, 1994
diff --git a/usr.sbin/pcvt/vgaio/vgaio.y b/usr.sbin/pcvt/vgaio/vgaio.y
index f1bac559e402..3b395c48026e 100644
--- a/usr.sbin/pcvt/vgaio/vgaio.y
+++ b/usr.sbin/pcvt/vgaio/vgaio.y
@@ -33,7 +33,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/usr.sbin/pcvt/vgaio/vgaio.y,v 1.3.2.1 1999/08/29 15:45:02 peter Exp $"
 
 /*
  * $Log: vgaio.y,v $
diff --git a/usr.sbin/periodic/Makefile b/usr.sbin/periodic/Makefile
index 48a128688c94..6e1310052f24 100644
--- a/usr.sbin/periodic/Makefile
+++ b/usr.sbin/periodic/Makefile
@@ -1,6 +1,6 @@
 # Makefile for periodic(8)
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/periodic/Makefile,v 1.1.1.1.2.1 1999/08/29 15:45:04 peter Exp $
 
 MAN8=	periodic.8
 
diff --git a/usr.sbin/periodic/periodic.8 b/usr.sbin/periodic/periodic.8
index 97957ac3c8d9..703f016fdfbd 100644
--- a/usr.sbin/periodic/periodic.8
+++ b/usr.sbin/periodic/periodic.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/periodic/periodic.8,v 1.8.2.3 1999/08/29 15:45:04 peter Exp $
 .\"
 .Dd 13 August 1997
 .Os FreeBSD 3.0
diff --git a/usr.sbin/periodic/periodic.sh b/usr.sbin/periodic/periodic.sh
index 077afa40c563..36fd5ed6f076 100644
--- a/usr.sbin/periodic/periodic.sh
+++ b/usr.sbin/periodic/periodic.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/periodic/periodic.sh,v 1.7.2.2 1999/08/29 15:45:05 peter Exp $
 #
 # Run nightly periodic scripts
 #
diff --git a/usr.sbin/pkg_install/Makefile b/usr.sbin/pkg_install/Makefile
index 5ee77481af84..f5acd0f79638 100644
--- a/usr.sbin/pkg_install/Makefile
+++ b/usr.sbin/pkg_install/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/Makefile,v 1.4.10.1 1999/11/26 22:04:48 billf Exp $
 
 SUBDIR=lib add create delete info version
 
diff --git a/usr.sbin/pkg_install/Makefile.inc b/usr.sbin/pkg_install/Makefile.inc
index ac13ed56e771..98f4c9ae61e5 100644
--- a/usr.sbin/pkg_install/Makefile.inc
+++ b/usr.sbin/pkg_install/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/Makefile.inc,v 1.4.2.1 1999/08/29 15:45:06 peter Exp $
 
 .if exists(${.OBJDIR}/../lib)
 LIBINSTALL=	${.OBJDIR}/../lib/libinstall.a
diff --git a/usr.sbin/pkg_install/add/Makefile b/usr.sbin/pkg_install/add/Makefile
index 0f541267161a..33416c77728a 100644
--- a/usr.sbin/pkg_install/add/Makefile
+++ b/usr.sbin/pkg_install/add/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/add/Makefile,v 1.10.2.1 1999/08/29 15:45:08 peter Exp $
 
 PROG= pkg_add
 
diff --git a/usr.sbin/pkg_install/add/add.h b/usr.sbin/pkg_install/add/add.h
index 8ef0555eee31..05680a40f945 100644
--- a/usr.sbin/pkg_install/add/add.h
+++ b/usr.sbin/pkg_install/add/add.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pkg_install/add/add.h,v 1.8.2.1 1999/08/29 15:45:09 peter Exp $ */
 
 /*
  * FreeBSD install - a package for the installation and maintainance
diff --git a/usr.sbin/pkg_install/add/extract.c b/usr.sbin/pkg_install/add/extract.c
index 66391b6d6a73..f2d22cfc2570 100644
--- a/usr.sbin/pkg_install/add/extract.c
+++ b/usr.sbin/pkg_install/add/extract.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/add/extract.c,v 1.23.2.3 1999/08/29 15:45:09 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/add/futil.c b/usr.sbin/pkg_install/add/futil.c
index e68d817df6e6..fc6993d370c1 100644
--- a/usr.sbin/pkg_install/add/futil.c
+++ b/usr.sbin/pkg_install/add/futil.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/add/futil.c,v 1.7.2.1 1999/08/29 15:45:09 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/add/main.c b/usr.sbin/pkg_install/add/main.c
index a97b7bbfb958..8fede6bad019 100644
--- a/usr.sbin/pkg_install/add/main.c
+++ b/usr.sbin/pkg_install/add/main.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/add/main.c,v 1.20.2.9 1999/12/12 00:19:57 billf Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/add/perform.c b/usr.sbin/pkg_install/add/perform.c
index fcf8db8a1a0d..2b698d4b694d 100644
--- a/usr.sbin/pkg_install/add/perform.c
+++ b/usr.sbin/pkg_install/add/perform.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/add/perform.c,v 1.54.2.2 1999/08/29 15:45:11 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/add/pkg_add.1 b/usr.sbin/pkg_install/add/pkg_add.1
index 2aeccdb1ddaf..657069957f42 100644
--- a/usr.sbin/pkg_install/add/pkg_add.1
+++ b/usr.sbin/pkg_install/add/pkg_add.1
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_add.1
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pkg_install/add/pkg_add.1,v 1.29.2.5 1999/09/01 14:05:07 billf Exp $
 .\"
 .Dd November 25, 1994
 .Dt PKG_ADD 1
diff --git a/usr.sbin/pkg_install/create/Makefile b/usr.sbin/pkg_install/create/Makefile
index 18e8ca7de3b6..4a420998533b 100644
--- a/usr.sbin/pkg_install/create/Makefile
+++ b/usr.sbin/pkg_install/create/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/create/Makefile,v 1.10.2.1 1999/08/29 15:45:13 peter Exp $
 
 PROG= pkg_create
 
diff --git a/usr.sbin/pkg_install/create/create.h b/usr.sbin/pkg_install/create/create.h
index ff3fc9520596..51e096446693 100644
--- a/usr.sbin/pkg_install/create/create.h
+++ b/usr.sbin/pkg_install/create/create.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pkg_install/create/create.h,v 1.14.2.1 1999/08/29 15:45:13 peter Exp $ */
 
 /*
  * FreeBSD install - a package for the installation and maintainance
diff --git a/usr.sbin/pkg_install/create/main.c b/usr.sbin/pkg_install/create/main.c
index 403cd93e18f5..384f81c59dc4 100644
--- a/usr.sbin/pkg_install/create/main.c
+++ b/usr.sbin/pkg_install/create/main.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/create/main.c,v 1.18.2.2 1999/08/29 15:45:14 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/create/perform.c b/usr.sbin/pkg_install/create/perform.c
index 3fbe9cd16b86..2731631f7670 100644
--- a/usr.sbin/pkg_install/create/perform.c
+++ b/usr.sbin/pkg_install/create/perform.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/create/perform.c,v 1.47.2.2 1999/08/29 15:45:14 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/create/pkg_create.1 b/usr.sbin/pkg_install/create/pkg_create.1
index dfcecb66b5b3..966519103261 100644
--- a/usr.sbin/pkg_install/create/pkg_create.1
+++ b/usr.sbin/pkg_install/create/pkg_create.1
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_create.1
-.\" $FreeBSD$	
+.\" $FreeBSD: src/usr.sbin/pkg_install/create/pkg_create.1,v 1.27.2.3 1999/08/29 15:45:15 peter Exp $	
 .\"
 .\" hacked up by John Kohl for NetBSD--fixed a few bugs, extended keywords,
 .\" added dependency tracking, etc.
diff --git a/usr.sbin/pkg_install/create/pl.c b/usr.sbin/pkg_install/create/pl.c
index 1269c81ade16..8be1bbc5c9d7 100644
--- a/usr.sbin/pkg_install/create/pl.c
+++ b/usr.sbin/pkg_install/create/pl.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/create/pl.c,v 1.12.2.1 1999/08/29 15:45:16 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/delete/Makefile b/usr.sbin/pkg_install/delete/Makefile
index 488eceffd0aa..d2708458cb1a 100644
--- a/usr.sbin/pkg_install/delete/Makefile
+++ b/usr.sbin/pkg_install/delete/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/delete/Makefile,v 1.10.2.1 1999/08/29 15:45:17 peter Exp $
 
 PROG= pkg_delete
 CFLAGS+=	${DEBUG} -I${.CURDIR}/../lib
diff --git a/usr.sbin/pkg_install/delete/delete.h b/usr.sbin/pkg_install/delete/delete.h
index cc7a70e8fd14..193af3584a7a 100644
--- a/usr.sbin/pkg_install/delete/delete.h
+++ b/usr.sbin/pkg_install/delete/delete.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pkg_install/delete/delete.h,v 1.4.2.1 1999/08/29 15:45:18 peter Exp $ */
 
 /*
  * FreeBSD install - a package for the installation and maintainance
diff --git a/usr.sbin/pkg_install/delete/main.c b/usr.sbin/pkg_install/delete/main.c
index 6956f7048e41..6401b7efaab1 100644
--- a/usr.sbin/pkg_install/delete/main.c
+++ b/usr.sbin/pkg_install/delete/main.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/delete/main.c,v 1.11.2.2 1999/08/29 15:45:18 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/delete/perform.c b/usr.sbin/pkg_install/delete/perform.c
index 028ab4225960..048ea729c040 100644
--- a/usr.sbin/pkg_install/delete/perform.c
+++ b/usr.sbin/pkg_install/delete/perform.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/delete/perform.c,v 1.18.2.2 1999/08/29 15:45:19 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/delete/pkg_delete.1 b/usr.sbin/pkg_install/delete/pkg_delete.1
index dc9870188933..9cf38fc60c1f 100644
--- a/usr.sbin/pkg_install/delete/pkg_delete.1
+++ b/usr.sbin/pkg_install/delete/pkg_delete.1
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_delete.1
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pkg_install/delete/pkg_delete.1,v 1.11.2.3 1999/08/29 15:45:19 peter Exp $
 .\"
 .Dd November 25, 1994
 .Dt PKG_DELETE 1
diff --git a/usr.sbin/pkg_install/info/Makefile b/usr.sbin/pkg_install/info/Makefile
index 50e1ef02cd59..12b0a1b06b6b 100644
--- a/usr.sbin/pkg_install/info/Makefile
+++ b/usr.sbin/pkg_install/info/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/info/Makefile,v 1.10.2.1 1999/08/29 15:45:21 peter Exp $
 
 PROG= pkg_info
 CFLAGS+=	${DEBUG} -I${.CURDIR}/../lib
diff --git a/usr.sbin/pkg_install/info/info.h b/usr.sbin/pkg_install/info/info.h
index 7830cf6ce23f..a9367b4e9cbf 100644
--- a/usr.sbin/pkg_install/info/info.h
+++ b/usr.sbin/pkg_install/info/info.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pkg_install/info/info.h,v 1.10.2.1 1999/08/29 15:45:22 peter Exp $ */
 
 /*
  * FreeBSD install - a package for the installation and maintainance
diff --git a/usr.sbin/pkg_install/info/main.c b/usr.sbin/pkg_install/info/main.c
index 817691f32b5a..54da339f3685 100644
--- a/usr.sbin/pkg_install/info/main.c
+++ b/usr.sbin/pkg_install/info/main.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/info/main.c,v 1.15.2.3 1999/08/29 15:45:23 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/info/perform.c b/usr.sbin/pkg_install/info/perform.c
index f89e031a8576..5a13584df721 100644
--- a/usr.sbin/pkg_install/info/perform.c
+++ b/usr.sbin/pkg_install/info/perform.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/info/perform.c,v 1.26.2.3 1999/08/29 15:45:23 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/info/pkg_info.1 b/usr.sbin/pkg_install/info/pkg_info.1
index 8b16b8c59e19..a6e74e987ecd 100644
--- a/usr.sbin/pkg_install/info/pkg_info.1
+++ b/usr.sbin/pkg_install/info/pkg_info.1
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_info.1
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pkg_install/info/pkg_info.1,v 1.19.2.3 1999/08/29 15:45:24 peter Exp $
 .\"
 .Dd November 25, 1994
 .Dt PKG_INFO 1
diff --git a/usr.sbin/pkg_install/info/show.c b/usr.sbin/pkg_install/info/show.c
index a4e62662212c..9be05d366b3b 100644
--- a/usr.sbin/pkg_install/info/show.c
+++ b/usr.sbin/pkg_install/info/show.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/info/show.c,v 1.12.2.2 1999/08/29 15:45:24 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/lib/exec.c b/usr.sbin/pkg_install/lib/exec.c
index 4ed452ebfbf5..a737baee65de 100644
--- a/usr.sbin/pkg_install/lib/exec.c
+++ b/usr.sbin/pkg_install/lib/exec.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/lib/exec.c,v 1.6.2.1 1999/08/29 15:45:25 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/lib/file.c b/usr.sbin/pkg_install/lib/file.c
index 5c71081f73d2..4bbc979c5c95 100644
--- a/usr.sbin/pkg_install/lib/file.c
+++ b/usr.sbin/pkg_install/lib/file.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/lib/file.c,v 1.35.2.3 1999/08/29 15:45:26 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/lib/global.c b/usr.sbin/pkg_install/lib/global.c
index aeaa96a2e5a8..62017a747c1f 100644
--- a/usr.sbin/pkg_install/lib/global.c
+++ b/usr.sbin/pkg_install/lib/global.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/lib/global.c,v 1.6.2.1 1999/08/29 15:45:26 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/lib/lib.h b/usr.sbin/pkg_install/lib/lib.h
index 00b9b6f2913f..037405c788f2 100644
--- a/usr.sbin/pkg_install/lib/lib.h
+++ b/usr.sbin/pkg_install/lib/lib.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pkg_install/lib/lib.h,v 1.27.2.2 1999/08/29 15:45:27 peter Exp $ */
 
 /*
  * FreeBSD install - a package for the installation and maintainance
diff --git a/usr.sbin/pkg_install/lib/msg.c b/usr.sbin/pkg_install/lib/msg.c
index 43dd7e6eb394..ed56b8836ba5 100644
--- a/usr.sbin/pkg_install/lib/msg.c
+++ b/usr.sbin/pkg_install/lib/msg.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/lib/msg.c,v 1.11.2.1 1999/08/29 15:45:28 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/lib/pen.c b/usr.sbin/pkg_install/lib/pen.c
index 9aad6857a85c..4a939a21d322 100644
--- a/usr.sbin/pkg_install/lib/pen.c
+++ b/usr.sbin/pkg_install/lib/pen.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/lib/pen.c,v 1.30.2.1 1999/08/29 15:45:28 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/lib/plist.c b/usr.sbin/pkg_install/lib/plist.c
index 6dfbabce09bd..47dfec5de8ec 100644
--- a/usr.sbin/pkg_install/lib/plist.c
+++ b/usr.sbin/pkg_install/lib/plist.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/lib/plist.c,v 1.27.2.2 1999/08/29 15:45:29 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/lib/str.c b/usr.sbin/pkg_install/lib/str.c
index 815d7c10d6b6..c4f8e082d361 100644
--- a/usr.sbin/pkg_install/lib/str.c
+++ b/usr.sbin/pkg_install/lib/str.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pkg_install/lib/str.c,v 1.5.2.1 1999/08/29 15:45:29 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pkg_install/tkpkg b/usr.sbin/pkg_install/tkpkg
index df09efc17a40..1c3f178bcc6c 100755
--- a/usr.sbin/pkg_install/tkpkg
+++ b/usr.sbin/pkg_install/tkpkg
@@ -1,12 +1,12 @@
 #!/usr/local/bin/wish -f
-#$FreeBSD$
+#$FreeBSD: src/usr.sbin/pkg_install/tkpkg,v 1.4.2.1 1999/08/29 15:45:07 peter Exp $
 #
 #$Log: tkpkg,v $
 #Revision 1.4  1997/02/22 16:09:13  peter
-#Revert $FreeBSD$ to $Id$
+#Revert $FreeBSD: src/usr.sbin/pkg_install/tkpkg,v 1.4.2.1 1999/08/29 15:45:07 peter Exp $ to $Id$
 #
 #Revision 1.3  1997/01/14 07:14:23  jkh
-#Make the long-awaited change from $FreeBSD$
+#Make the long-awaited change from $FreeBSD: src/usr.sbin/pkg_install/tkpkg,v 1.4.2.1 1999/08/29 15:45:07 peter Exp $
 #
 #This will make a number of things easier in the future, as well as (finally!)
 #avoiding the Id-smashing problem which has plagued developers for so long.
diff --git a/usr.sbin/pkg_install/version/Makefile b/usr.sbin/pkg_install/version/Makefile
index 276b8dc8fb3e..e5f5b53d0abc 100644
--- a/usr.sbin/pkg_install/version/Makefile
+++ b/usr.sbin/pkg_install/version/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/version/Makefile,v 1.3.2.3 1999/12/03 06:18:03 billf Exp $
 
 MAINTAINER=	billf@FreeBSD.org
 MAINTAINER+=	bmah@CA.Sandia.GOV
diff --git a/usr.sbin/pkg_install/version/pkg_version.1 b/usr.sbin/pkg_install/version/pkg_version.1
index 77ead1494b3f..56ade45a2b64 100644
--- a/usr.sbin/pkg_install/version/pkg_version.1
+++ b/usr.sbin/pkg_install/version/pkg_version.1
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/usr.sbin/pkg_install/version/pkg_version.1,v 1.2.2.2 1999/12/03 06:18:04 billf Exp $
 .Dd July 17, 1998
 .Dt PKG_VERSION 1
 .Os FreeBSD
diff --git a/usr.sbin/pkg_install/version/pkg_version.pl b/usr.sbin/pkg_install/version/pkg_version.pl
index b8ef76709e70..f5ef7f5f5f5e 100755
--- a/usr.sbin/pkg_install/version/pkg_version.pl
+++ b/usr.sbin/pkg_install/version/pkg_version.pl
@@ -28,7 +28,7 @@
 #
 # A package version-checking utility for FreeBSD.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/version/pkg_version.pl,v 1.2.2.2 1999/12/03 06:18:04 billf Exp $
 #
 
 use Getopt::Std;
diff --git a/usr.sbin/pnpinfo/Makefile b/usr.sbin/pnpinfo/Makefile
index 09ade2438151..59a63045a12f 100644
--- a/usr.sbin/pnpinfo/Makefile
+++ b/usr.sbin/pnpinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pnpinfo/Makefile,v 1.2.2.1 1999/08/29 15:45:31 peter Exp $
 
 PROG=	pnpinfo
 
diff --git a/usr.sbin/portmap/Makefile b/usr.sbin/portmap/Makefile
index b87cf595a9e4..33a45089117e 100644
--- a/usr.sbin/portmap/Makefile
+++ b/usr.sbin/portmap/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/portmap/Makefile,v 1.4.10.2 1999/08/29 15:45:32 peter Exp $
 
 PROG=	portmap
 MAN8=	portmap.8
diff --git a/usr.sbin/portmap/from_local.c b/usr.sbin/portmap/from_local.c
index dbff1d6e6541..7e9da6edcb32 100644
--- a/usr.sbin/portmap/from_local.c
+++ b/usr.sbin/portmap/from_local.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#) from_local.c 1.2 93/11/16 21:50:02";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/portmap/from_local.c,v 1.7.2.1 1999/08/29 15:45:32 peter Exp $";
 #endif
 
 #ifdef TEST
diff --git a/usr.sbin/portmap/pmap_check.c b/usr.sbin/portmap/pmap_check.c
index 818c0d1d4d51..cb2fd8085733 100644
--- a/usr.sbin/portmap/pmap_check.c
+++ b/usr.sbin/portmap/pmap_check.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#) pmap_check.c 1.6 93/11/21 20:58:59";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/portmap/pmap_check.c,v 1.3.2.1 1999/08/29 15:45:33 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/portmap/pmap_dump/pmap_dump.c b/usr.sbin/portmap/pmap_dump/pmap_dump.c
index 944081fe1c2f..ace96707e09f 100644
--- a/usr.sbin/portmap/pmap_dump/pmap_dump.c
+++ b/usr.sbin/portmap/pmap_dump/pmap_dump.c
@@ -10,7 +10,7 @@
 static char sccsid[] = "@(#) pmap_dump.c 1.1 92/06/11 22:53:15";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/portmap/pmap_dump/pmap_dump.c,v 1.3.2.1 1999/08/29 15:45:35 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/portmap/pmap_set/pmap_set.c b/usr.sbin/portmap/pmap_set/pmap_set.c
index 34b4bc1a9d6e..4a8fe254b63a 100644
--- a/usr.sbin/portmap/pmap_set/pmap_set.c
+++ b/usr.sbin/portmap/pmap_set/pmap_set.c
@@ -10,7 +10,7 @@
 static char sccsid[] = "@(#) pmap_set.c 1.1 92/06/11 22:53:16";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/portmap/pmap_set/pmap_set.c,v 1.3.2.1 1999/08/29 15:45:36 peter Exp $";
 #endif
 
 #include <err.h>
diff --git a/usr.sbin/portmap/portmap.c b/usr.sbin/portmap/portmap.c
index 28dbda4ac468..107dcd93f07d 100644
--- a/usr.sbin/portmap/portmap.c
+++ b/usr.sbin/portmap/portmap.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)portmap.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/portmap/portmap.c,v 1.7.2.1 1999/08/29 15:45:34 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile
index 7c46ad859c1c..f5296abcb22a 100644
--- a/usr.sbin/ppp/Makefile
+++ b/usr.sbin/ppp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ppp/Makefile,v 1.50.2.11 1999/11/30 23:59:40 brian Exp $
 
 MAINTAINER=brian@FreeBSD.org
 
diff --git a/usr.sbin/ppp/README.changes b/usr.sbin/ppp/README.changes
index 11d83d6dac13..7566438fe3f2 100644
--- a/usr.sbin/ppp/README.changes
+++ b/usr.sbin/ppp/README.changes
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.sbin/ppp/README.changes,v 1.4.2.4 1999/11/29 18:54:55 brian Exp $
 
 This file summarises changes made to ppp that effect
 its configuration.
diff --git a/usr.sbin/ppp/acf.c b/usr.sbin/ppp/acf.c
index 821032b3b6e1..6351a5f49953 100644
--- a/usr.sbin/ppp/acf.c
+++ b/usr.sbin/ppp/acf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/acf.c,v 1.2.2.2 1999/08/29 15:45:39 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/acf.h b/usr.sbin/ppp/acf.h
index e32adbc1661c..5a08db9dc9bd 100644
--- a/usr.sbin/ppp/acf.h
+++ b/usr.sbin/ppp/acf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/acf.h,v 1.1.2.2 1999/08/29 15:45:39 peter Exp $
  */
 
 struct lcp;
diff --git a/usr.sbin/ppp/arp.c b/usr.sbin/ppp/arp.c
index 9f370273b6a9..f13911af6f2d 100644
--- a/usr.sbin/ppp/arp.c
+++ b/usr.sbin/ppp/arp.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/arp.c,v 1.31.2.5 1999/08/29 15:45:41 peter Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/arp.h b/usr.sbin/ppp/arp.h
index 3dbace3cc2c3..92467a1c3dce 100644
--- a/usr.sbin/ppp/arp.h
+++ b/usr.sbin/ppp/arp.h
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/arp.h,v 1.8.2.1 1999/08/29 15:45:42 peter Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/async.c b/usr.sbin/ppp/async.c
index 956413e7b402..73c8dd8d62f1 100644
--- a/usr.sbin/ppp/async.c
+++ b/usr.sbin/ppp/async.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/async.c,v 1.17.2.5 1999/08/29 15:45:42 peter Exp $
  *
  */
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/async.h b/usr.sbin/ppp/async.h
index 33c68a5953f1..b1f05bdf9bf6 100644
--- a/usr.sbin/ppp/async.h
+++ b/usr.sbin/ppp/async.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/async.h,v 1.4.2.2 1999/08/29 15:45:43 peter Exp $
  */
 
 #define HDLCSIZE	(MAX_MRU*2+6)
diff --git a/usr.sbin/ppp/auth.c b/usr.sbin/ppp/auth.c
index 0a8616011fa9..bb742d9ad82d 100644
--- a/usr.sbin/ppp/auth.c
+++ b/usr.sbin/ppp/auth.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/auth.c,v 1.34.2.7 1999/08/29 15:45:43 peter Exp $
  *
  *	TODO:
  *		o Implement check against with registered IP addresses.
diff --git a/usr.sbin/ppp/auth.h b/usr.sbin/ppp/auth.h
index bf395791ebf9..e1703bcb1441 100644
--- a/usr.sbin/ppp/auth.h
+++ b/usr.sbin/ppp/auth.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/auth.h,v 1.12.2.6 1999/08/29 15:45:44 peter Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/bundle.c b/usr.sbin/ppp/bundle.c
index 943401437908..9ecf3897bd7f 100644
--- a/usr.sbin/ppp/bundle.c
+++ b/usr.sbin/ppp/bundle.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/bundle.c,v 1.43.2.10 1999/11/23 00:15:38 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/bundle.h b/usr.sbin/ppp/bundle.h
index a56860b4c714..1db6e9dd7e4d 100644
--- a/usr.sbin/ppp/bundle.h
+++ b/usr.sbin/ppp/bundle.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/bundle.h,v 1.20.2.6 1999/11/19 23:47:48 brian Exp $
  */
 
 #define	PHASE_DEAD		0	/* Link is dead */
diff --git a/usr.sbin/ppp/cbcp.c b/usr.sbin/ppp/cbcp.c
index 7de97488ae41..75914803c552 100644
--- a/usr.sbin/ppp/cbcp.c
+++ b/usr.sbin/ppp/cbcp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/cbcp.c,v 1.8.2.6 1999/11/19 23:47:49 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/cbcp.h b/usr.sbin/ppp/cbcp.h
index 46bf274f21c9..5e2c5fec2bdf 100644
--- a/usr.sbin/ppp/cbcp.h
+++ b/usr.sbin/ppp/cbcp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/cbcp.h,v 1.1.4.2 1999/08/29 15:45:47 peter Exp $
  */
 
 struct mbuf;
diff --git a/usr.sbin/ppp/ccp.c b/usr.sbin/ppp/ccp.c
index 865756ac3228..8fe2ded7adef 100644
--- a/usr.sbin/ppp/ccp.c
+++ b/usr.sbin/ppp/ccp.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ccp.c,v 1.40.2.6 1999/08/29 15:45:47 peter Exp $
  *
  *	TODO:
  *		o Support other compression protocols
diff --git a/usr.sbin/ppp/ccp.h b/usr.sbin/ppp/ccp.h
index 72342ddf33f8..99dfda8e9e13 100644
--- a/usr.sbin/ppp/ccp.h
+++ b/usr.sbin/ppp/ccp.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ccp.h,v 1.19.2.5 1999/08/29 15:45:48 peter Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/chap.c b/usr.sbin/ppp/chap.c
index 446e1dc28130..4b60a2deaae0 100644
--- a/usr.sbin/ppp/chap.c
+++ b/usr.sbin/ppp/chap.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/chap.c,v 1.37.2.7 1999/11/19 23:47:49 brian Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/chap.h b/usr.sbin/ppp/chap.h
index 37d5c6f10e4a..8559f9f5d438 100644
--- a/usr.sbin/ppp/chap.h
+++ b/usr.sbin/ppp/chap.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/chap.h,v 1.10.2.6 1999/08/29 15:45:49 peter Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/chap_ms.c b/usr.sbin/ppp/chap_ms.c
index e1d495f04e42..2e201c6c7bed 100644
--- a/usr.sbin/ppp/chap_ms.c
+++ b/usr.sbin/ppp/chap_ms.c
@@ -19,7 +19,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/chap_ms.c,v 1.6.2.4 1999/08/29 15:45:49 peter Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/chap_ms.h b/usr.sbin/ppp/chap_ms.h
index 5bf0f78fa85b..26cf97635eee 100644
--- a/usr.sbin/ppp/chap_ms.h
+++ b/usr.sbin/ppp/chap_ms.h
@@ -19,7 +19,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/chap_ms.h,v 1.3.2.4 1999/08/29 15:45:50 peter Exp $
  */
 
 /* Max # of (Unicode) chars in an NT password */
diff --git a/usr.sbin/ppp/chat.c b/usr.sbin/ppp/chat.c
index 0ccda30d583c..2435e220481d 100644
--- a/usr.sbin/ppp/chat.c
+++ b/usr.sbin/ppp/chat.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/chat.c,v 1.52.2.8 1999/12/03 06:34:03 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/chat.h b/usr.sbin/ppp/chat.h
index 872e1c6368f5..ae4c66b5a9d4 100644
--- a/usr.sbin/ppp/chat.h
+++ b/usr.sbin/ppp/chat.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/chat.h,v 1.10.2.4 1999/12/03 06:34:04 brian Exp $
  */
 
 #define CHAT_EXPECT 0
diff --git a/usr.sbin/ppp/command.c b/usr.sbin/ppp/command.c
index 4096597217c4..036f52b9a483 100644
--- a/usr.sbin/ppp/command.c
+++ b/usr.sbin/ppp/command.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/command.c,v 1.177.2.9 1999/11/19 23:47:50 brian Exp $
  *
  */
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/command.h b/usr.sbin/ppp/command.h
index 6b1468d4cfc4..602e7519af38 100644
--- a/usr.sbin/ppp/command.h
+++ b/usr.sbin/ppp/command.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/command.h,v 1.15.2.6 1999/10/08 08:17:15 brian Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/datalink.c b/usr.sbin/ppp/datalink.c
index 583e88c8b999..3aaaba0fc38a 100644
--- a/usr.sbin/ppp/datalink.c
+++ b/usr.sbin/ppp/datalink.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/datalink.c,v 1.25.2.14 1999/12/03 06:34:04 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/datalink.h b/usr.sbin/ppp/datalink.h
index 9931795348eb..215a0a9972a4 100644
--- a/usr.sbin/ppp/datalink.h
+++ b/usr.sbin/ppp/datalink.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/datalink.h,v 1.5.4.6 1999/11/19 23:47:51 brian Exp $
  */
 
 #define DATALINK_CLOSED  (0)
diff --git a/usr.sbin/ppp/deflate.c b/usr.sbin/ppp/deflate.c
index 528987be7ae0..7fd8b665e7be 100644
--- a/usr.sbin/ppp/deflate.c
+++ b/usr.sbin/ppp/deflate.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/deflate.c,v 1.11.2.5 1999/08/29 15:45:55 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/deflate.h b/usr.sbin/ppp/deflate.h
index a478b24cb1de..526dd3862274 100644
--- a/usr.sbin/ppp/deflate.h
+++ b/usr.sbin/ppp/deflate.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/deflate.h,v 1.3.6.1 1999/08/29 15:45:56 peter Exp $
  */
 
 extern const struct ccp_algorithm PppdDeflateAlgorithm;
diff --git a/usr.sbin/ppp/defs.c b/usr.sbin/ppp/defs.c
index 740fc628d460..5ca8467652e1 100644
--- a/usr.sbin/ppp/defs.c
+++ b/usr.sbin/ppp/defs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/defs.c,v 1.17.2.6 1999/08/29 15:45:56 peter Exp $
  */
 
 
diff --git a/usr.sbin/ppp/defs.h b/usr.sbin/ppp/defs.h
index 7c03dea5ecf5..d0929a71ba52 100644
--- a/usr.sbin/ppp/defs.h
+++ b/usr.sbin/ppp/defs.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/defs.h,v 1.36.2.6 1999/08/29 15:45:56 peter Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/descriptor.h b/usr.sbin/ppp/descriptor.h
index 77452ccd3312..31893789194c 100644
--- a/usr.sbin/ppp/descriptor.h
+++ b/usr.sbin/ppp/descriptor.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/descriptor.h,v 1.4.4.4 1999/08/29 15:45:57 peter Exp $
  */
 
 #define PHYSICAL_DESCRIPTOR (1)
diff --git a/usr.sbin/ppp/ether.c b/usr.sbin/ppp/ether.c
index 77cd5e1a8daf..2525664c103a 100644
--- a/usr.sbin/ppp/ether.c
+++ b/usr.sbin/ppp/ether.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ether.c,v 1.6.2.2 1999/11/21 23:28:11 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/ether.h b/usr.sbin/ppp/ether.h
index a2e96c706f56..9db503626422 100644
--- a/usr.sbin/ppp/ether.h
+++ b/usr.sbin/ppp/ether.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ether.h,v 1.1.2.1 1999/11/19 23:47:51 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/exec.c b/usr.sbin/ppp/exec.c
index 80f8343b1d09..fa3ec5350652 100644
--- a/usr.sbin/ppp/exec.c
+++ b/usr.sbin/ppp/exec.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/exec.c,v 1.8.2.3 1999/11/19 23:47:52 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/exec.h b/usr.sbin/ppp/exec.h
index d4b338767fb3..c9e8cb4e2481 100644
--- a/usr.sbin/ppp/exec.h
+++ b/usr.sbin/ppp/exec.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/exec.h,v 1.3.2.3 1999/11/19 23:47:52 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/filter.c b/usr.sbin/ppp/filter.c
index 217c177fbf78..16e1d6529fd4 100644
--- a/usr.sbin/ppp/filter.c
+++ b/usr.sbin/ppp/filter.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/filter.c,v 1.26.2.7 1999/11/19 23:47:53 brian Exp $
  *
  *	TODO: Shoud send ICMP error message when we discard packets.
  */
diff --git a/usr.sbin/ppp/filter.h b/usr.sbin/ppp/filter.h
index 03922cd21d13..3e68c519c2c8 100644
--- a/usr.sbin/ppp/filter.h
+++ b/usr.sbin/ppp/filter.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/filter.h,v 1.13.2.6 1999/11/19 23:47:53 brian Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/fsm.c b/usr.sbin/ppp/fsm.c
index 2e2a2ea4f6ba..2e8ac661f226 100644
--- a/usr.sbin/ppp/fsm.c
+++ b/usr.sbin/ppp/fsm.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/fsm.c,v 1.37.2.7 1999/11/19 23:47:54 brian Exp $
  *
  *  TODO:
  */
diff --git a/usr.sbin/ppp/fsm.h b/usr.sbin/ppp/fsm.h
index b11693816dae..6fd4c3107247 100644
--- a/usr.sbin/ppp/fsm.h
+++ b/usr.sbin/ppp/fsm.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/fsm.h,v 1.19.2.5 1999/08/29 15:46:00 peter Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/hdlc.c b/usr.sbin/ppp/hdlc.c
index 3f5d6b9d6ba8..c2284970b2e5 100644
--- a/usr.sbin/ppp/hdlc.c
+++ b/usr.sbin/ppp/hdlc.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/hdlc.c,v 1.36.2.5 1999/08/29 15:46:01 peter Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/hdlc.h b/usr.sbin/ppp/hdlc.h
index 25398a479846..9a164209c133 100644
--- a/usr.sbin/ppp/hdlc.h
+++ b/usr.sbin/ppp/hdlc.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/hdlc.h,v 1.15.2.5 1999/11/19 23:47:54 brian Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/i4b.c b/usr.sbin/ppp/i4b.c
index ccaa76b8b32b..8282b58f75e9 100644
--- a/usr.sbin/ppp/i4b.c
+++ b/usr.sbin/ppp/i4b.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/i4b.c,v 1.1.2.3 1999/11/19 23:47:54 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/i4b.h b/usr.sbin/ppp/i4b.h
index 4375ca332f86..6b526cb66a4e 100644
--- a/usr.sbin/ppp/i4b.h
+++ b/usr.sbin/ppp/i4b.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/i4b.h,v 1.1.2.3 1999/11/19 23:47:54 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/id.c b/usr.sbin/ppp/id.c
index f2b4581f10fe..3931f4d37c60 100644
--- a/usr.sbin/ppp/id.c
+++ b/usr.sbin/ppp/id.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/id.c,v 1.11.2.3 1999/11/21 23:28:12 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/id.h b/usr.sbin/ppp/id.h
index 11cb831a45c2..b589a419d28f 100644
--- a/usr.sbin/ppp/id.h
+++ b/usr.sbin/ppp/id.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/id.h,v 1.7.2.3 1999/11/21 23:28:12 brian Exp $
  */
 
 struct utmp;
diff --git a/usr.sbin/ppp/iface.c b/usr.sbin/ppp/iface.c
index ebe68030db58..ae7034655824 100644
--- a/usr.sbin/ppp/iface.c
+++ b/usr.sbin/ppp/iface.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/iface.c,v 1.2.4.6 1999/11/19 23:47:55 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/iface.h b/usr.sbin/ppp/iface.h
index a42ec0976236..2b7b1ebbe7a3 100644
--- a/usr.sbin/ppp/iface.h
+++ b/usr.sbin/ppp/iface.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/iface.h,v 1.1.4.2 1999/08/29 15:46:05 peter Exp $
  */
 
 struct iface_addr {
diff --git a/usr.sbin/ppp/ip.c b/usr.sbin/ppp/ip.c
index 2e5f00c21efa..9bd182ca6976 100644
--- a/usr.sbin/ppp/ip.c
+++ b/usr.sbin/ppp/ip.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ip.c,v 1.54.2.7 1999/11/19 23:47:55 brian Exp $
  *
  *	TODO:
  *		o Return ICMP message for filterd packet
diff --git a/usr.sbin/ppp/ip.h b/usr.sbin/ppp/ip.h
index 21e4a36b3791..cdf9bf7c9d27 100644
--- a/usr.sbin/ppp/ip.h
+++ b/usr.sbin/ppp/ip.h
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ip.h,v 1.11.2.2 1999/08/29 15:46:06 peter Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/ipcp.c b/usr.sbin/ppp/ipcp.c
index 3efb315d8364..4e0246f0d70a 100644
--- a/usr.sbin/ppp/ipcp.c
+++ b/usr.sbin/ppp/ipcp.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ipcp.c,v 1.68.2.9 1999/11/19 23:47:56 brian Exp $
  *
  *	TODO:
  *		o Support IPADDRS properly
diff --git a/usr.sbin/ppp/ipcp.h b/usr.sbin/ppp/ipcp.h
index 6f87eb78354d..3a1fe615c599 100644
--- a/usr.sbin/ppp/ipcp.h
+++ b/usr.sbin/ppp/ipcp.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ipcp.h,v 1.22.2.6 1999/11/19 23:47:56 brian Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/iplist.c b/usr.sbin/ppp/iplist.c
index 4ef00e457736..5e4ec908fff6 100644
--- a/usr.sbin/ppp/iplist.c
+++ b/usr.sbin/ppp/iplist.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/iplist.c,v 1.7.2.2 1999/08/29 15:46:08 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/iplist.h b/usr.sbin/ppp/iplist.h
index 5805a2cfbb77..18682a07c36a 100644
--- a/usr.sbin/ppp/iplist.h
+++ b/usr.sbin/ppp/iplist.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/iplist.h,v 1.3.2.1 1999/08/29 15:46:08 peter Exp $
  */
 
 struct iplist_cur {
diff --git a/usr.sbin/ppp/layer.h b/usr.sbin/ppp/layer.h
index 4ee59a10a6f2..5e932b1f3208 100644
--- a/usr.sbin/ppp/layer.h
+++ b/usr.sbin/ppp/layer.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/layer.h,v 1.2.2.2 1999/08/29 15:46:09 peter Exp $
  */
 
 #define	LAYER_ASYNC	2
diff --git a/usr.sbin/ppp/lcp.c b/usr.sbin/ppp/lcp.c
index 062f8ba03f59..6990dddd6ac8 100644
--- a/usr.sbin/ppp/lcp.c
+++ b/usr.sbin/ppp/lcp.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/lcp.c,v 1.66.2.6 1999/08/29 15:46:09 peter Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/lcp.h b/usr.sbin/ppp/lcp.h
index 06f2ded48daa..f8aa307cd7da 100644
--- a/usr.sbin/ppp/lcp.h
+++ b/usr.sbin/ppp/lcp.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/lcp.h,v 1.19.2.5 1999/08/29 15:46:10 peter Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/link.c b/usr.sbin/ppp/link.c
index a96fb9a53aca..d312ceb110c6 100644
--- a/usr.sbin/ppp/link.c
+++ b/usr.sbin/ppp/link.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/link.c,v 1.6.4.6 1999/11/19 23:47:56 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/link.h b/usr.sbin/ppp/link.h
index e277630b33f1..873368c781e5 100644
--- a/usr.sbin/ppp/link.h
+++ b/usr.sbin/ppp/link.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/link.h,v 1.4.4.3 1999/11/19 23:47:57 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/log.c b/usr.sbin/ppp/log.c
index 7c45d17f7521..570f5690bae9 100644
--- a/usr.sbin/ppp/log.c
+++ b/usr.sbin/ppp/log.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/log.c,v 1.35.2.7 1999/11/19 23:47:57 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/log.h b/usr.sbin/ppp/log.h
index 70fe4c2e6514..be3843dbc4e3 100644
--- a/usr.sbin/ppp/log.h
+++ b/usr.sbin/ppp/log.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/log.h,v 1.23.2.3 1999/11/19 23:47:58 brian Exp $
  */
 
 #define LogMIN		(1)
diff --git a/usr.sbin/ppp/lqr.c b/usr.sbin/ppp/lqr.c
index b47e3fc388b2..58fbbd27040d 100644
--- a/usr.sbin/ppp/lqr.c
+++ b/usr.sbin/ppp/lqr.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/lqr.c,v 1.30.2.6 1999/11/19 23:47:58 brian Exp $
  *
  *	o LQR based on RFC1333
  *
diff --git a/usr.sbin/ppp/lqr.h b/usr.sbin/ppp/lqr.h
index 0cc03d970571..b6ae9b508418 100644
--- a/usr.sbin/ppp/lqr.h
+++ b/usr.sbin/ppp/lqr.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/lqr.h,v 1.13.2.2 1999/08/29 15:46:13 peter Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/main.c b/usr.sbin/ppp/main.c
index 54b9ece3e7fa..0a3e8d19674f 100644
--- a/usr.sbin/ppp/main.c
+++ b/usr.sbin/ppp/main.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/main.c,v 1.146.2.9 1999/11/29 18:54:56 brian Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/main.h b/usr.sbin/ppp/main.h
index f5300a326100..76e3ae31bca6 100644
--- a/usr.sbin/ppp/main.h
+++ b/usr.sbin/ppp/main.h
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/main.h,v 1.10.2.1 1999/08/29 15:46:14 peter Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/mbuf.c b/usr.sbin/ppp/mbuf.c
index de4e6b70540b..ccf1d22e3f67 100644
--- a/usr.sbin/ppp/mbuf.c
+++ b/usr.sbin/ppp/mbuf.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/mbuf.c,v 1.22.2.6 1999/10/08 08:17:51 brian Exp $
  *
  */
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/mbuf.h b/usr.sbin/ppp/mbuf.h
index 7b0669b3d441..d089f350d1d1 100644
--- a/usr.sbin/ppp/mbuf.h
+++ b/usr.sbin/ppp/mbuf.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/mbuf.h,v 1.14.2.4 1999/08/29 15:46:15 peter Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/mp.c b/usr.sbin/ppp/mp.c
index 43c5829451c2..ba4940535b79 100644
--- a/usr.sbin/ppp/mp.c
+++ b/usr.sbin/ppp/mp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/mp.c,v 1.17.4.7 1999/11/19 23:47:59 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/mp.h b/usr.sbin/ppp/mp.h
index 607ba74881c2..ffcb00a57e68 100644
--- a/usr.sbin/ppp/mp.h
+++ b/usr.sbin/ppp/mp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/mp.h,v 1.4.4.2 1999/08/29 15:46:17 peter Exp $
  */
 
 struct mbuf;
diff --git a/usr.sbin/ppp/nat_cmd.c b/usr.sbin/ppp/nat_cmd.c
index ebf13e7ca99a..363d5dd9fc63 100644
--- a/usr.sbin/ppp/nat_cmd.c
+++ b/usr.sbin/ppp/nat_cmd.c
@@ -2,7 +2,7 @@
  * The code in this file was written by Eivind Eklund <perhaps@yes.no>,
  * who places it in the public domain without restriction.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/nat_cmd.c,v 1.33.2.1 1999/11/19 23:47:59 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/nat_cmd.h b/usr.sbin/ppp/nat_cmd.h
index 1ce19d10c76d..366c18075f90 100644
--- a/usr.sbin/ppp/nat_cmd.h
+++ b/usr.sbin/ppp/nat_cmd.h
@@ -2,7 +2,7 @@
  * The code in this file was written by Eivind Eklund <perhaps@yes.no>,
  * who places it in the public domain without restriction.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/nat_cmd.h,v 1.13.2.1 1999/11/19 23:48:00 brian Exp $
  */
 
 struct cmdargs;
diff --git a/usr.sbin/ppp/pap.c b/usr.sbin/ppp/pap.c
index f283d3a7d867..1b7e8aa1c505 100644
--- a/usr.sbin/ppp/pap.c
+++ b/usr.sbin/ppp/pap.c
@@ -18,7 +18,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/pap.c,v 1.27.2.8 1999/11/19 23:48:00 brian Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/pap.h b/usr.sbin/ppp/pap.h
index e72b32852b1b..ebfac2f6a34e 100644
--- a/usr.sbin/ppp/pap.h
+++ b/usr.sbin/ppp/pap.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/pap.h,v 1.6.2.7 1999/08/29 15:46:18 peter Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/physical.c b/usr.sbin/ppp/physical.c
index 97124e0dd447..8f3c8344cb71 100644
--- a/usr.sbin/ppp/physical.c
+++ b/usr.sbin/ppp/physical.c
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/physical.c,v 1.7.2.4 1999/11/19 23:48:00 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/physical.h b/usr.sbin/ppp/physical.h
index 0ff589a23c4d..37a9db1c6e79 100644
--- a/usr.sbin/ppp/physical.h
+++ b/usr.sbin/ppp/physical.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/physical.h,v 1.5.2.6 1999/11/19 23:48:01 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/ppp.8 b/usr.sbin/ppp/ppp.8
index 7337192936d6..7a19d8235ccd 100644
--- a/usr.sbin/ppp/ppp.8
+++ b/usr.sbin/ppp/ppp.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ppp/ppp.8,v 1.142.2.16 1999/11/19 23:48:01 brian Exp $
 .Dd 20 September 1995
 .nr XX \w'\fC00'
 .Os FreeBSD
diff --git a/usr.sbin/ppp/pred.c b/usr.sbin/ppp/pred.c
index de831eec2e16..2fae2a561a85 100644
--- a/usr.sbin/ppp/pred.c
+++ b/usr.sbin/ppp/pred.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/pred.c,v 1.22.2.5 1999/08/29 15:46:21 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/pred.h b/usr.sbin/ppp/pred.h
index 434cf102c403..b7088ac9bb2b 100644
--- a/usr.sbin/ppp/pred.h
+++ b/usr.sbin/ppp/pred.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/pred.h,v 1.7.4.1 1999/08/29 15:46:22 peter Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/probe.c b/usr.sbin/ppp/probe.c
index 0b6b61746695..678eadd92c39 100644
--- a/usr.sbin/ppp/probe.c
+++ b/usr.sbin/ppp/probe.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/probe.c,v 1.2.4.1 1999/08/29 15:46:23 peter Exp $
  */
 
 #include <sys/time.h>
diff --git a/usr.sbin/ppp/probe.h b/usr.sbin/ppp/probe.h
index 2439c4e6cf47..4075a2ba9a08 100644
--- a/usr.sbin/ppp/probe.h
+++ b/usr.sbin/ppp/probe.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/probe.h,v 1.1.4.1 1999/08/29 15:46:24 peter Exp $
  */
 
 struct probe {
diff --git a/usr.sbin/ppp/prompt.c b/usr.sbin/ppp/prompt.c
index 5e39f00ff5fd..3450be782673 100644
--- a/usr.sbin/ppp/prompt.c
+++ b/usr.sbin/ppp/prompt.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/prompt.c,v 1.12.4.6 1999/11/19 23:48:02 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/prompt.h b/usr.sbin/ppp/prompt.h
index cd8edc7a5de1..1b52944968a7 100644
--- a/usr.sbin/ppp/prompt.h
+++ b/usr.sbin/ppp/prompt.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/prompt.h,v 1.4.4.1 1999/08/29 15:46:25 peter Exp $
  */
 
 #define LOCAL_AUTH	0x01
diff --git a/usr.sbin/ppp/proto.c b/usr.sbin/ppp/proto.c
index 685572fd5208..57c12260eb5e 100644
--- a/usr.sbin/ppp/proto.c
+++ b/usr.sbin/ppp/proto.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/proto.c,v 1.3.2.2 1999/08/29 15:46:25 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/proto.h b/usr.sbin/ppp/proto.h
index a479be720df7..d4c56ab0b6e7 100644
--- a/usr.sbin/ppp/proto.h
+++ b/usr.sbin/ppp/proto.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/proto.h,v 1.1.2.2 1999/08/29 15:46:26 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/ppp/radius.c b/usr.sbin/ppp/radius.c
index 366baec45944..5d636c6b5220 100644
--- a/usr.sbin/ppp/radius.c
+++ b/usr.sbin/ppp/radius.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/radius.c,v 1.4.2.7 1999/09/02 15:11:53 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/radius.h b/usr.sbin/ppp/radius.h
index ea0235fc15e8..cf89fab0ef3e 100644
--- a/usr.sbin/ppp/radius.h
+++ b/usr.sbin/ppp/radius.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/radius.h,v 1.2.2.4 1999/08/29 15:46:27 peter Exp $
  */
 
 struct radius {
diff --git a/usr.sbin/ppp/route.c b/usr.sbin/ppp/route.c
index 688bcfe205b0..e52f4ae7f07d 100644
--- a/usr.sbin/ppp/route.c
+++ b/usr.sbin/ppp/route.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/route.c,v 1.54.2.6 1999/08/29 15:46:28 peter Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/route.h b/usr.sbin/ppp/route.h
index 86a3d4edb13e..5dd32e3ad5bb 100644
--- a/usr.sbin/ppp/route.h
+++ b/usr.sbin/ppp/route.h
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/route.h,v 1.11.2.4 1999/08/29 15:46:28 peter Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/server.c b/usr.sbin/ppp/server.c
index 0f6cb513e1a2..ac41587860e8 100644
--- a/usr.sbin/ppp/server.c
+++ b/usr.sbin/ppp/server.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/server.c,v 1.23.2.5 1999/08/29 15:46:29 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/server.h b/usr.sbin/ppp/server.h
index 860f43225a50..c692b6d482a7 100644
--- a/usr.sbin/ppp/server.h
+++ b/usr.sbin/ppp/server.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/server.h,v 1.5.2.1 1999/08/29 15:46:29 peter Exp $
  */
 
 struct bundle;
diff --git a/usr.sbin/ppp/sig.c b/usr.sbin/ppp/sig.c
index 59928e5b9e07..17b9fdfd94e6 100644
--- a/usr.sbin/ppp/sig.c
+++ b/usr.sbin/ppp/sig.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/sig.c,v 1.13.2.3 1999/08/29 15:46:30 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/sig.h b/usr.sbin/ppp/sig.h
index 27d264c19370..dc81da323710 100644
--- a/usr.sbin/ppp/sig.h
+++ b/usr.sbin/ppp/sig.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/sig.h,v 1.12.2.3 1999/08/29 15:46:30 peter Exp $
  */
 
 typedef void (*sig_type)(int);
diff --git a/usr.sbin/ppp/slcompress.c b/usr.sbin/ppp/slcompress.c
index 19bbb4ac945a..df2a127f99ce 100644
--- a/usr.sbin/ppp/slcompress.c
+++ b/usr.sbin/ppp/slcompress.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/slcompress.c,v 1.20.2.6 1999/11/19 23:48:02 brian Exp $
  *
  *	Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
  *	- Initial distribution.
diff --git a/usr.sbin/ppp/slcompress.h b/usr.sbin/ppp/slcompress.h
index 223f65948b4e..27749e1d24d0 100644
--- a/usr.sbin/ppp/slcompress.h
+++ b/usr.sbin/ppp/slcompress.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/slcompress.h,v 1.12.2.1 1999/08/29 15:46:31 peter Exp $
  *
  *	Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
  *	- Initial distribution.
diff --git a/usr.sbin/ppp/sync.c b/usr.sbin/ppp/sync.c
index 29e5cbc3b4ff..9ce84d807625 100644
--- a/usr.sbin/ppp/sync.c
+++ b/usr.sbin/ppp/sync.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/sync.c,v 1.4.2.2 1999/08/29 15:46:32 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/sync.h b/usr.sbin/ppp/sync.h
index 4f5bfee0805f..f0120c934f05 100644
--- a/usr.sbin/ppp/sync.h
+++ b/usr.sbin/ppp/sync.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/sync.h,v 1.1.2.2 1999/08/29 15:46:33 peter Exp $
  */
 
 extern struct layer synclayer;
diff --git a/usr.sbin/ppp/systems.c b/usr.sbin/ppp/systems.c
index db29092fc1d2..eb9096913d6d 100644
--- a/usr.sbin/ppp/systems.c
+++ b/usr.sbin/ppp/systems.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/systems.c,v 1.40.2.8 1999/11/19 23:48:03 brian Exp $
  *
  *  TODO:
  */
diff --git a/usr.sbin/ppp/systems.h b/usr.sbin/ppp/systems.h
index 39130d642cb1..e577ecc80774 100644
--- a/usr.sbin/ppp/systems.h
+++ b/usr.sbin/ppp/systems.h
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/systems.h,v 1.13.2.1 1999/08/29 15:46:34 peter Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/tcp.c b/usr.sbin/ppp/tcp.c
index c6cb16db5732..437cd19d555b 100644
--- a/usr.sbin/ppp/tcp.c
+++ b/usr.sbin/ppp/tcp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/tcp.c,v 1.5.2.3 1999/11/19 23:48:03 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/tcp.h b/usr.sbin/ppp/tcp.h
index f6a823529e9e..36fe6ceb506e 100644
--- a/usr.sbin/ppp/tcp.h
+++ b/usr.sbin/ppp/tcp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/tcp.h,v 1.3.2.3 1999/11/19 23:48:03 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/throughput.c b/usr.sbin/ppp/throughput.c
index 1704e121c964..a17a7bdc52c8 100644
--- a/usr.sbin/ppp/throughput.c
+++ b/usr.sbin/ppp/throughput.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/throughput.c,v 1.8.2.2 1999/08/29 15:46:35 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/throughput.h b/usr.sbin/ppp/throughput.h
index 21acdbe3cbca..e7cbc0eed4b1 100644
--- a/usr.sbin/ppp/throughput.h
+++ b/usr.sbin/ppp/throughput.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/throughput.h,v 1.5.2.2 1999/08/29 15:46:36 peter Exp $
  */
 
 #define SAMPLE_PERIOD 5		/* Default sample period */
diff --git a/usr.sbin/ppp/timer.c b/usr.sbin/ppp/timer.c
index 7a7d592fdfaa..90db74454058 100644
--- a/usr.sbin/ppp/timer.c
+++ b/usr.sbin/ppp/timer.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/timer.c,v 1.32.2.3 1999/11/19 23:48:03 brian Exp $
  *
  *  TODO:
  */
diff --git a/usr.sbin/ppp/timer.h b/usr.sbin/ppp/timer.h
index 9dcb3f369716..b09767c558a1 100644
--- a/usr.sbin/ppp/timer.h
+++ b/usr.sbin/ppp/timer.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/timer.h,v 1.8.2.1 1999/08/29 15:46:37 peter Exp $
  *
  *	TODO:
  */
diff --git a/usr.sbin/ppp/tty.c b/usr.sbin/ppp/tty.c
index e248679e214c..e6f2f30b619b 100644
--- a/usr.sbin/ppp/tty.c
+++ b/usr.sbin/ppp/tty.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/tty.c,v 1.12.2.4 1999/12/13 22:40:46 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/tty.h b/usr.sbin/ppp/tty.h
index 9f37dd5080ad..587fdd91284c 100644
--- a/usr.sbin/ppp/tty.h
+++ b/usr.sbin/ppp/tty.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/tty.h,v 1.3.2.3 1999/11/19 23:48:04 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/tun.c b/usr.sbin/ppp/tun.c
index c35894a6c207..2f3a166c600a 100644
--- a/usr.sbin/ppp/tun.c
+++ b/usr.sbin/ppp/tun.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/tun.c,v 1.10.2.6 1999/10/08 08:17:58 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/tun.h b/usr.sbin/ppp/tun.h
index 8cbae71f87ea..d0912ea1502d 100644
--- a/usr.sbin/ppp/tun.h
+++ b/usr.sbin/ppp/tun.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/tun.h,v 1.6.2.1 1999/08/29 15:46:39 peter Exp $
  */
 
 struct tun_data {
diff --git a/usr.sbin/ppp/ua.h b/usr.sbin/ppp/ua.h
index dbd89e5be618..b2d62f6e63e1 100644
--- a/usr.sbin/ppp/ua.h
+++ b/usr.sbin/ppp/ua.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ua.h,v 1.2.4.1 1999/08/29 15:46:39 peter Exp $
  */
 
 #ifdef __i386__		/* Do any other archs not care about alignment ? */
diff --git a/usr.sbin/ppp/udp.c b/usr.sbin/ppp/udp.c
index c3763dccf208..b4aecae9ed37 100644
--- a/usr.sbin/ppp/udp.c
+++ b/usr.sbin/ppp/udp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/udp.c,v 1.4.2.3 1999/11/19 23:48:05 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/udp.h b/usr.sbin/ppp/udp.h
index 46b8fe63de1a..02066f84ce88 100644
--- a/usr.sbin/ppp/udp.h
+++ b/usr.sbin/ppp/udp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/udp.h,v 1.2.2.3 1999/11/19 23:48:05 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/vjcomp.c b/usr.sbin/ppp/vjcomp.c
index 1395ba1335ed..07b0950827fc 100644
--- a/usr.sbin/ppp/vjcomp.c
+++ b/usr.sbin/ppp/vjcomp.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/vjcomp.c,v 1.23.2.5 1999/08/29 15:46:42 peter Exp $
  *
  *  TODO:
  */
diff --git a/usr.sbin/ppp/vjcomp.h b/usr.sbin/ppp/vjcomp.h
index 2956122fd061..6eee38dc5626 100644
--- a/usr.sbin/ppp/vjcomp.h
+++ b/usr.sbin/ppp/vjcomp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/vjcomp.h,v 1.6.2.2 1999/08/29 15:46:42 peter Exp $
  */
 
 struct mbuf;
diff --git a/usr.sbin/pppctl/Makefile b/usr.sbin/pppctl/Makefile
index 718d2f764737..4e9817da052a 100644
--- a/usr.sbin/pppctl/Makefile
+++ b/usr.sbin/pppctl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pppctl/Makefile,v 1.4.2.1 1999/08/29 15:46:51 peter Exp $
 
 PROG=	pppctl
 SRCS=	pppctl.c
diff --git a/usr.sbin/pppctl/pppctl.8 b/usr.sbin/pppctl/pppctl.8
index 7e3ebe9ecb64..c57fca3b4929 100644
--- a/usr.sbin/pppctl/pppctl.8
+++ b/usr.sbin/pppctl/pppctl.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pppctl/pppctl.8,v 1.11.2.1 1999/08/29 15:46:51 peter Exp $
 .Dd 26 June 1997
 .Os FreeBSD
 .Dt PPPCTL 8
diff --git a/usr.sbin/pppctl/pppctl.c b/usr.sbin/pppctl/pppctl.c
index 46c55c9919f0..224483220d75 100644
--- a/usr.sbin/pppctl/pppctl.c
+++ b/usr.sbin/pppctl/pppctl.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppctl/pppctl.c,v 1.16.2.3 1999/08/29 15:46:52 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/pppd/Makefile b/usr.sbin/pppd/Makefile
index b983feed57e3..c1a2e900c3ea 100644
--- a/usr.sbin/pppd/Makefile
+++ b/usr.sbin/pppd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pppd/Makefile,v 1.12.2.2 1999/08/29 15:46:53 peter Exp $
 
 CFLAGS+= -DHAVE_PATHS_H
 
diff --git a/usr.sbin/pppd/auth.c b/usr.sbin/pppd/auth.c
index 4cc40cbf2991..015074075182 100644
--- a/usr.sbin/pppd/auth.c
+++ b/usr.sbin/pppd/auth.c
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/auth.c,v 1.23.2.1 1999/08/29 15:46:54 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/pppd/cbcp.c b/usr.sbin/pppd/cbcp.c
index fb265e6d5954..e6a8fbfb7e14 100644
--- a/usr.sbin/pppd/cbcp.c
+++ b/usr.sbin/pppd/cbcp.c
@@ -19,7 +19,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/cbcp.c,v 1.3.4.1 1999/08/29 15:46:54 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/pppd/ccp.c b/usr.sbin/pppd/ccp.c
index fb21cfda3587..df1ead423329 100644
--- a/usr.sbin/pppd/ccp.c
+++ b/usr.sbin/pppd/ccp.c
@@ -26,7 +26,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/ccp.c,v 1.9.2.1 1999/08/29 15:46:55 peter Exp $";
 #endif
 
 #include <string.h>
diff --git a/usr.sbin/pppd/ccp.h b/usr.sbin/pppd/ccp.h
index a03ac4d4961e..c2a41e380155 100644
--- a/usr.sbin/pppd/ccp.h
+++ b/usr.sbin/pppd/ccp.h
@@ -24,7 +24,7 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/ccp.h,v 1.7.2.1 1999/08/29 15:46:56 peter Exp $
  */
 
 typedef struct ccp_options {
diff --git a/usr.sbin/pppd/chap.c b/usr.sbin/pppd/chap.c
index c3acafbe8392..5f8fe65b1d0a 100644
--- a/usr.sbin/pppd/chap.c
+++ b/usr.sbin/pppd/chap.c
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/chap.c,v 1.9.2.1 1999/08/29 15:46:56 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pppd/chap.h b/usr.sbin/pppd/chap.h
index 4a4f38383a34..784c08fa39af 100644
--- a/usr.sbin/pppd/chap.h
+++ b/usr.sbin/pppd/chap.h
@@ -30,7 +30,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/chap.h,v 1.6.2.1 1999/08/29 15:46:57 peter Exp $
  */
 
 #ifndef __CHAP_INCLUDE__
diff --git a/usr.sbin/pppd/chap_ms.c b/usr.sbin/pppd/chap_ms.c
index 72fa6766b69f..9a103492dac8 100644
--- a/usr.sbin/pppd/chap_ms.c
+++ b/usr.sbin/pppd/chap_ms.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/chap_ms.c,v 1.6.2.1 1999/08/29 15:46:58 peter Exp $";
 #endif
 
 #ifdef CHAPMS
diff --git a/usr.sbin/pppd/chap_ms.h b/usr.sbin/pppd/chap_ms.h
index 7c0088308aa6..a0cfa02f761c 100644
--- a/usr.sbin/pppd/chap_ms.h
+++ b/usr.sbin/pppd/chap_ms.h
@@ -19,7 +19,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/chap_ms.h,v 1.4.4.1 1999/08/29 15:46:59 peter Exp $
  */
 
 #ifndef __CHAPMS_INCLUDE__
diff --git a/usr.sbin/pppd/demand.c b/usr.sbin/pppd/demand.c
index 59c0281e16a0..422eae13d4e2 100644
--- a/usr.sbin/pppd/demand.c
+++ b/usr.sbin/pppd/demand.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/demand.c,v 1.4.4.1 1999/08/29 15:46:59 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/pppd/fsm.c b/usr.sbin/pppd/fsm.c
index a1fd948d3617..ffc7e9242116 100644
--- a/usr.sbin/pppd/fsm.c
+++ b/usr.sbin/pppd/fsm.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/fsm.c,v 1.7.2.1 1999/08/29 15:47:00 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pppd/fsm.h b/usr.sbin/pppd/fsm.h
index 7b43b7a08be2..c2208442733e 100644
--- a/usr.sbin/pppd/fsm.h
+++ b/usr.sbin/pppd/fsm.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/fsm.h,v 1.6.2.1 1999/08/29 15:47:00 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/pppd/ipcp.c b/usr.sbin/pppd/ipcp.c
index 576b2006ab58..9c3f6f3837b8 100644
--- a/usr.sbin/pppd/ipcp.c
+++ b/usr.sbin/pppd/ipcp.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/ipcp.c,v 1.11.2.1 1999/08/29 15:47:00 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pppd/ipcp.h b/usr.sbin/pppd/ipcp.h
index 2bc795d9a504..0862ec9e512b 100644
--- a/usr.sbin/pppd/ipcp.h
+++ b/usr.sbin/pppd/ipcp.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/ipcp.h,v 1.9.2.1 1999/08/29 15:47:01 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/pppd/ipxcp.c b/usr.sbin/pppd/ipxcp.c
index d035709bb036..ad8e6b5c06ba 100644
--- a/usr.sbin/pppd/ipxcp.c
+++ b/usr.sbin/pppd/ipxcp.c
@@ -19,7 +19,7 @@
 
 #ifdef IPX_CHANGE
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/ipxcp.c,v 1.4.4.1 1999/08/29 15:47:02 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pppd/ipxcp.h b/usr.sbin/pppd/ipxcp.h
index 0890181af7ec..90464b8e44d0 100644
--- a/usr.sbin/pppd/ipxcp.h
+++ b/usr.sbin/pppd/ipxcp.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/ipxcp.h,v 1.3.4.1 1999/08/29 15:47:02 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/pppd/lcp.c b/usr.sbin/pppd/lcp.c
index 21ff02eea62c..0d2faaf1a19d 100644
--- a/usr.sbin/pppd/lcp.c
+++ b/usr.sbin/pppd/lcp.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/lcp.c,v 1.8.2.1 1999/08/29 15:47:03 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pppd/lcp.h b/usr.sbin/pppd/lcp.h
index 2a19e2611b59..5e75e28d8e62 100644
--- a/usr.sbin/pppd/lcp.h
+++ b/usr.sbin/pppd/lcp.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/lcp.h,v 1.6.2.1 1999/08/29 15:47:03 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/pppd/magic.c b/usr.sbin/pppd/magic.c
index 1e13d02dd371..c4a4b8ceaa45 100644
--- a/usr.sbin/pppd/magic.c
+++ b/usr.sbin/pppd/magic.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/magic.c,v 1.7.2.1 1999/08/29 15:47:04 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/pppd/magic.h b/usr.sbin/pppd/magic.h
index 82f65cf55d4e..aed013d92674 100644
--- a/usr.sbin/pppd/magic.h
+++ b/usr.sbin/pppd/magic.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/magic.h,v 1.6.2.1 1999/08/29 15:47:04 peter Exp $
  */
 
 void magic_init __P((void));	/* Initialize the magic number generator */
diff --git a/usr.sbin/pppd/main.c b/usr.sbin/pppd/main.c
index f5a1f7185d12..a3a209e411a7 100644
--- a/usr.sbin/pppd/main.c
+++ b/usr.sbin/pppd/main.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/main.c,v 1.17.2.1 1999/08/29 15:47:05 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/pppd/options.c b/usr.sbin/pppd/options.c
index 663d5e0bd4f3..588ae6f4a49c 100644
--- a/usr.sbin/pppd/options.c
+++ b/usr.sbin/pppd/options.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/options.c,v 1.19.2.1 1999/08/29 15:47:06 peter Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/usr.sbin/pppd/patchlevel.h b/usr.sbin/pppd/patchlevel.h
index bc49c5879a24..99278e92ef6b 100644
--- a/usr.sbin/pppd/patchlevel.h
+++ b/usr.sbin/pppd/patchlevel.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pppd/patchlevel.h,v 1.9.2.1 1999/08/29 15:47:07 peter Exp $ */
 #define	PATCHLEVEL	5
 
 #define VERSION		"2.3"
diff --git a/usr.sbin/pppd/pathnames.h b/usr.sbin/pppd/pathnames.h
index 3bc2e8396867..11d5ad7316c1 100644
--- a/usr.sbin/pppd/pathnames.h
+++ b/usr.sbin/pppd/pathnames.h
@@ -1,7 +1,7 @@
 /*
  * define path names
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/pathnames.h,v 1.8.2.1 1999/08/29 15:47:07 peter Exp $
  */
 
 #ifdef HAVE_PATHS_H
diff --git a/usr.sbin/pppd/pppd.8 b/usr.sbin/pppd/pppd.8
index 3f25a94a8eb8..8b0e371db4f7 100644
--- a/usr.sbin/pppd/pppd.8
+++ b/usr.sbin/pppd/pppd.8
@@ -1,5 +1,5 @@
 .\" manual page [] for pppd 2.3
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pppd/pppd.8,v 1.18.2.1 1999/08/29 15:47:08 peter Exp $
 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph
diff --git a/usr.sbin/pppd/pppd.h b/usr.sbin/pppd/pppd.h
index 248556d381e8..ec94436dd132 100644
--- a/usr.sbin/pppd/pppd.h
+++ b/usr.sbin/pppd/pppd.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/pppd.h,v 1.12.2.1 1999/08/29 15:47:08 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/pppd/sys-bsd.c b/usr.sbin/pppd/sys-bsd.c
index a5dcd161feca..5d1cb93dbc2e 100644
--- a/usr.sbin/pppd/sys-bsd.c
+++ b/usr.sbin/pppd/sys-bsd.c
@@ -21,7 +21,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/sys-bsd.c,v 1.15.2.2 1999/08/29 15:47:09 peter Exp $";
 #endif
 /*	$NetBSD: sys-bsd.c,v 1.1.1.3 1997/09/26 18:53:04 christos Exp $	*/
 
diff --git a/usr.sbin/pppd/upap.c b/usr.sbin/pppd/upap.c
index 627c7d03d5db..b904f8b57609 100644
--- a/usr.sbin/pppd/upap.c
+++ b/usr.sbin/pppd/upap.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/upap.c,v 1.7.2.1 1999/08/29 15:47:10 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pppd/upap.h b/usr.sbin/pppd/upap.h
index 2cfd86c8077f..97db9b7738fe 100644
--- a/usr.sbin/pppd/upap.h
+++ b/usr.sbin/pppd/upap.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/upap.h,v 1.6.2.1 1999/08/29 15:47:10 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/pppstats/Makefile b/usr.sbin/pppstats/Makefile
index adf70a339520..d729a9690eae 100644
--- a/usr.sbin/pppstats/Makefile
+++ b/usr.sbin/pppstats/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pppstats/Makefile,v 1.6.2.1 1999/08/29 15:47:13 peter Exp $
 
 PROG=	pppstats
 SRCS=	pppstats.c
diff --git a/usr.sbin/pppstats/pppstats.8 b/usr.sbin/pppstats/pppstats.8
index 39145d789bfa..b96c6868989d 100644
--- a/usr.sbin/pppstats/pppstats.8
+++ b/usr.sbin/pppstats/pppstats.8
@@ -1,4 +1,4 @@
-.\"	@(#) $FreeBSD$
+.\"	@(#) $FreeBSD: src/usr.sbin/pppstats/pppstats.8,v 1.8.2.1 1999/08/29 15:47:13 peter Exp $
 .TH PPPSTATS 8 "26 June 1995"
 .SH NAME
 pppstats \- print PPP statistics
diff --git a/usr.sbin/pppstats/pppstats.c b/usr.sbin/pppstats/pppstats.c
index 1c7c744f9119..5e8b2c402d1a 100644
--- a/usr.sbin/pppstats/pppstats.c
+++ b/usr.sbin/pppstats/pppstats.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppstats/pppstats.c,v 1.12.2.1 1999/08/29 15:47:13 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/procctl/Makefile b/usr.sbin/procctl/Makefile
index 09e70cac7ba3..fb1658be0a63 100644
--- a/usr.sbin/procctl/Makefile
+++ b/usr.sbin/procctl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/procctl/Makefile,v 1.3.2.1 1999/08/29 15:47:15 peter Exp $
 
 PROG=	procctl
 MAN8=	procctl.8
diff --git a/usr.sbin/procctl/procctl.8 b/usr.sbin/procctl/procctl.8
index 532b4d1425da..e605819255cb 100644
--- a/usr.sbin/procctl/procctl.8
+++ b/usr.sbin/procctl/procctl.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/procctl/procctl.8,v 1.3.2.2 1999/08/29 15:47:16 peter Exp $
 .Dd Nov 23, 1997
 .Dt PROCCTL 8
 .Os FreeBSD
diff --git a/usr.sbin/procctl/procctl.c b/usr.sbin/procctl/procctl.c
index fb4d5dfed522..de339dede6e9 100644
--- a/usr.sbin/procctl/procctl.c
+++ b/usr.sbin/procctl/procctl.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/procctl/procctl.c,v 1.4.2.1 1999/08/29 15:47:16 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/pstat/pstat.8 b/usr.sbin/pstat/pstat.8
index f780c3c254d7..acd43b5860e5 100644
--- a/usr.sbin/pstat/pstat.8
+++ b/usr.sbin/pstat/pstat.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pstat.8	8.5 (Berkeley) 5/13/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pstat/pstat.8,v 1.16.2.1 1999/08/29 15:47:18 peter Exp $
 .\"
 .Dd May 13, 1994
 .Dt PSTAT 8
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index 2d402b77ae21..440503785d59 100644
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)pstat.c	8.16 (Berkeley) 5/9/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pstat/pstat.c,v 1.37.2.1 1999/08/29 15:47:18 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/pw/Makefile b/usr.sbin/pw/Makefile
index e6c9fa309e24..6eb23cec16f0 100644
--- a/usr.sbin/pw/Makefile
+++ b/usr.sbin/pw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pw/Makefile,v 1.6.2.2 1999/10/14 18:32:37 davidn Exp $
 
 PROG=	pw
 SRCS=	pw.c pw_conf.c pw_user.c pw_group.c pw_log.c pw_nis.c pw_vpw.c \
diff --git a/usr.sbin/pw/README b/usr.sbin/pw/README
index e5abd8f99c37..15c746f4e80b 100644
--- a/usr.sbin/pw/README
+++ b/usr.sbin/pw/README
@@ -18,5 +18,5 @@ other bsd4.4 variants.
 
 Author and maintainer: David L. Nugent, <davidn@blaze.net.au>
 
-$FreeBSD$
+$FreeBSD: src/usr.sbin/pw/README,v 1.4.2.1 1999/08/29 15:47:20 peter Exp $
 
diff --git a/usr.sbin/pw/bitmap.c b/usr.sbin/pw/bitmap.c
index bcfea7e2c887..44786908ff0f 100644
--- a/usr.sbin/pw/bitmap.c
+++ b/usr.sbin/pw/bitmap.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/bitmap.c,v 1.4.2.1 1999/08/29 15:47:20 peter Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/usr.sbin/pw/bitmap.h b/usr.sbin/pw/bitmap.h
index 94bd059dc399..547c553713ca 100644
--- a/usr.sbin/pw/bitmap.h
+++ b/usr.sbin/pw/bitmap.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pw/bitmap.h,v 1.3.2.1 1999/08/29 15:47:21 peter Exp $
  */
 
 #ifndef _BITMAP_H_
diff --git a/usr.sbin/pw/cpdir.c b/usr.sbin/pw/cpdir.c
index 6d59401469c5..4a8997d89226 100644
--- a/usr.sbin/pw/cpdir.c
+++ b/usr.sbin/pw/cpdir.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/cpdir.c,v 1.4.2.1 1999/08/29 15:47:21 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pw/edgroup.c b/usr.sbin/pw/edgroup.c
index 40313d29a5c8..dfe320be562c 100644
--- a/usr.sbin/pw/edgroup.c
+++ b/usr.sbin/pw/edgroup.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/edgroup.c,v 1.6.2.2 1999/10/14 18:32:37 davidn Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/fileupd.c b/usr.sbin/pw/fileupd.c
index 376f589ac1f7..c0604424b354 100644
--- a/usr.sbin/pw/fileupd.c
+++ b/usr.sbin/pw/fileupd.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/fileupd.c,v 1.6.2.2 1999/10/14 18:32:38 davidn Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/grupd.c b/usr.sbin/pw/grupd.c
index 237fe950d5fc..cadb26963161 100644
--- a/usr.sbin/pw/grupd.c
+++ b/usr.sbin/pw/grupd.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/grupd.c,v 1.5.2.2 1999/10/14 18:32:40 davidn Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/psdate.c b/usr.sbin/pw/psdate.c
index f8b1fce894b4..94e048d6a4d5 100644
--- a/usr.sbin/pw/psdate.c
+++ b/usr.sbin/pw/psdate.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/psdate.c,v 1.4.2.2 1999/10/14 18:32:40 davidn Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/psdate.h b/usr.sbin/pw/psdate.h
index 137427f1f0f0..50509d5eb54e 100644
--- a/usr.sbin/pw/psdate.h
+++ b/usr.sbin/pw/psdate.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pw/psdate.h,v 1.3.2.1 1999/08/29 15:47:24 peter Exp $
  */
 
 #ifndef _PSDATE_H_
diff --git a/usr.sbin/pw/pw.8 b/usr.sbin/pw/pw.8
index c65aafe5169c..58e10d2a4da5 100644
--- a/usr.sbin/pw/pw.8
+++ b/usr.sbin/pw/pw.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pw/pw.8,v 1.15.2.2 1999/10/14 18:32:41 davidn Exp $
 .\"
 .Dd December 9, 1996
 .Dt PW 8
diff --git a/usr.sbin/pw/pw.c b/usr.sbin/pw/pw.c
index 1da063c0796b..f8e81087f8e7 100644
--- a/usr.sbin/pw/pw.c
+++ b/usr.sbin/pw/pw.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/pw.c,v 1.11.2.2 1999/10/14 18:32:41 davidn Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pw/pw.conf.5 b/usr.sbin/pw/pw.conf.5
index 2cec8240079c..0fac4e3613a9 100644
--- a/usr.sbin/pw/pw.conf.5
+++ b/usr.sbin/pw/pw.conf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pw/pw.conf.5,v 1.8.2.1 1999/08/29 15:47:26 peter Exp $
 .\"
 .Dd December 9, 1996
 .Dt PW.CONF 5
diff --git a/usr.sbin/pw/pw.h b/usr.sbin/pw/pw.h
index f85eac737db3..863167a73c51 100644
--- a/usr.sbin/pw/pw.h
+++ b/usr.sbin/pw/pw.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pw/pw.h,v 1.7.2.2 1999/10/14 18:32:42 davidn Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/pw_conf.c b/usr.sbin/pw/pw_conf.c
index e8a21051d1a5..7b277fd10abb 100644
--- a/usr.sbin/pw/pw_conf.c
+++ b/usr.sbin/pw/pw_conf.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/pw_conf.c,v 1.7.2.2 1999/10/14 18:32:43 davidn Exp $";
 #endif /* not lint */
 
 #include <string.h>
diff --git a/usr.sbin/pw/pw_group.c b/usr.sbin/pw/pw_group.c
index 3385752feafc..aafa92dc16c8 100644
--- a/usr.sbin/pw/pw_group.c
+++ b/usr.sbin/pw/pw_group.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/pw_group.c,v 1.7.2.2 1999/10/14 18:32:43 davidn Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/pw/pw_log.c b/usr.sbin/pw/pw_log.c
index 6f72c0d2bb05..2cf93fe5aead 100644
--- a/usr.sbin/pw/pw_log.c
+++ b/usr.sbin/pw/pw_log.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/pw_log.c,v 1.4.2.1 1999/08/29 15:47:28 peter Exp $";
 #endif /* not lint */
 
 #include <fcntl.h>
diff --git a/usr.sbin/pw/pw_nis.c b/usr.sbin/pw/pw_nis.c
index 74a3ed09a7a9..ac1dbc610486 100644
--- a/usr.sbin/pw/pw_nis.c
+++ b/usr.sbin/pw/pw_nis.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/pw_nis.c,v 1.4.2.2 1999/10/14 18:32:44 davidn Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c
index bba8a01e47bd..1aa55e0a81a3 100644
--- a/usr.sbin/pw/pw_user.c
+++ b/usr.sbin/pw/pw_user.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/pw_user.c,v 1.25.2.3 1999/10/14 18:32:45 davidn Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/pw/pw_vpw.c b/usr.sbin/pw/pw_vpw.c
index ef12437a15ef..1d92ddc1a237 100644
--- a/usr.sbin/pw/pw_vpw.c
+++ b/usr.sbin/pw/pw_vpw.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/pw_vpw.c,v 1.2.2.1 1999/10/14 18:32:46 davidn Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/pwupd.c b/usr.sbin/pw/pwupd.c
index 10a6066e198c..a7fccce1c516 100644
--- a/usr.sbin/pw/pwupd.c
+++ b/usr.sbin/pw/pwupd.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/pwupd.c,v 1.7.2.2 1999/10/14 18:32:47 davidn Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/pwupd.h b/usr.sbin/pw/pwupd.h
index 046bd2e464c9..b32681138b4f 100644
--- a/usr.sbin/pw/pwupd.h
+++ b/usr.sbin/pw/pwupd.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pw/pwupd.h,v 1.4.2.2 1999/10/14 18:32:47 davidn Exp $
  */
 
 #ifndef _PWUPD_H_
diff --git a/usr.sbin/pw/rm_r.c b/usr.sbin/pw/rm_r.c
index 2af9a4efca9e..d8693c028835 100644
--- a/usr.sbin/pw/rm_r.c
+++ b/usr.sbin/pw/rm_r.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/rm_r.c,v 1.4.2.1 1999/08/29 15:47:31 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pwd_mkdb/pw_scan.c b/usr.sbin/pwd_mkdb/pw_scan.c
index 5190686e5e78..89777d2fd472 100644
--- a/usr.sbin/pwd_mkdb/pw_scan.c
+++ b/usr.sbin/pwd_mkdb/pw_scan.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)pw_scan.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pwd_mkdb/pw_scan.c,v 1.6.2.3 1999/08/31 06:44:17 sheldonh Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.8 b/usr.sbin/pwd_mkdb/pwd_mkdb.8
index 32233538cef7..4d7cdc684dd6 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.8
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pwd_mkdb.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pwd_mkdb/pwd_mkdb.8,v 1.8.2.2 1999/08/31 06:44:17 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt PWD_MKDB 8
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c
index 644ef08ed61b..be75e8a65cbf 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.c
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)pwd_mkdb.c	8.5 (Berkeley) 4/20/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pwd_mkdb/pwd_mkdb.c,v 1.30.2.1 1999/08/29 15:47:33 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/quot/Makefile b/usr.sbin/quot/Makefile
index 6754d6a66af3..b845536581f1 100644
--- a/usr.sbin/quot/Makefile
+++ b/usr.sbin/quot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/quot/Makefile,v 1.4.2.1 1999/08/29 15:47:34 peter Exp $
 
 PROG=	quot
 MAN8=	quot.8
diff --git a/usr.sbin/quot/quot.8 b/usr.sbin/quot/quot.8
index da243e347098..73e47cc446ae 100644
--- a/usr.sbin/quot/quot.8
+++ b/usr.sbin/quot/quot.8
@@ -27,7 +27,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/quot/quot.8,v 1.9.2.1 1999/08/29 15:47:35 peter Exp $
 .\"
 .Dd February 8, 1994
 .Dt QUOT 8
diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c
index fcfea6a51901..6e36f4a8ff25 100644
--- a/usr.sbin/quot/quot.c
+++ b/usr.sbin/quot/quot.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/quot/quot.c,v 1.9.2.1 1999/08/29 15:47:35 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/quotaon/quotaon.c b/usr.sbin/quotaon/quotaon.c
index 6235c1f2058f..f1ce694888a9 100644
--- a/usr.sbin/quotaon/quotaon.c
+++ b/usr.sbin/quotaon/quotaon.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)quotaon.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/quotaon/quotaon.c,v 1.3.2.1 1999/08/29 15:47:36 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/rarpd/Makefile b/usr.sbin/rarpd/Makefile
index f5825a24f409..839aef362088 100644
--- a/usr.sbin/rarpd/Makefile
+++ b/usr.sbin/rarpd/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rarpd/Makefile,v 1.6.2.1 1999/08/29 15:47:38 peter Exp $
 
 PROG=	rarpd
 MAN8=	rarpd.8
diff --git a/usr.sbin/rarpd/rarpd.8 b/usr.sbin/rarpd/rarpd.8
index d209567c2ed5..df1d51e3f52c 100644
--- a/usr.sbin/rarpd/rarpd.8
+++ b/usr.sbin/rarpd/rarpd.8
@@ -1,4 +1,4 @@
-.\" @(#) $FreeBSD$ (LBL)
+.\" @(#) $FreeBSD: src/usr.sbin/rarpd/rarpd.8,v 1.7.2.1 1999/08/29 15:47:39 peter Exp $ (LBL)
 .\"
 .\" Copyright (c) 1990, 1991, 1993 The Regents of the University of
 .\" California. All rights reserved.
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index c17f7665f342..e25247af3544 100644
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -27,7 +27,7 @@ The Regents of the University of California.  All rights reserved.\n";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rarpd/rarpd.c,v 1.20.2.1 1999/08/29 15:47:39 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/repquota/repquota.c b/usr.sbin/repquota/repquota.c
index 8a905ccee37d..5b93acf81423 100644
--- a/usr.sbin/repquota/repquota.c
+++ b/usr.sbin/repquota/repquota.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)repquota.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/repquota/repquota.c,v 1.6.2.2 1999/08/29 15:47:40 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/rmt/rmt.c b/usr.sbin/rmt/rmt.c
index 1a536aa61de9..838d904b3866 100644
--- a/usr.sbin/rmt/rmt.c
+++ b/usr.sbin/rmt/rmt.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)rmt.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rmt/rmt.c,v 1.5.2.1 1999/08/29 15:47:42 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/rndcontrol/random.4 b/usr.sbin/rndcontrol/random.4
index 9b8c6c9d5d09..a2fdc52574b5 100644
--- a/usr.sbin/rndcontrol/random.4
+++ b/usr.sbin/rndcontrol/random.4
@@ -36,7 +36,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rndcontrol/random.4,v 1.6.2.1 1999/08/29 15:47:43 peter Exp $
 .\"
 .Dd October 21, 1995
 .Dt RANDOM 4 i386
diff --git a/usr.sbin/rndcontrol/rndcontrol.8 b/usr.sbin/rndcontrol/rndcontrol.8
index 18099d955f5e..4ee5d47bfe84 100644
--- a/usr.sbin/rndcontrol/rndcontrol.8
+++ b/usr.sbin/rndcontrol/rndcontrol.8
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rndcontrol/rndcontrol.8,v 1.8.2.1 1999/08/29 15:47:44 peter Exp $
 .\"
 .Dd October 20, 1995
 .Dt RNDCONTROL 8
diff --git a/usr.sbin/rndcontrol/rndcontrol.c b/usr.sbin/rndcontrol/rndcontrol.c
index b1b3e3cd5b43..335440cb3e79 100644
--- a/usr.sbin/rndcontrol/rndcontrol.c
+++ b/usr.sbin/rndcontrol/rndcontrol.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rndcontrol/rndcontrol.c,v 1.9.2.1 1999/08/29 15:47:44 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/rpc.lockd/Makefile b/usr.sbin/rpc.lockd/Makefile
index 19a6565a4048..87103bfc1aef 100644
--- a/usr.sbin/rpc.lockd/Makefile
+++ b/usr.sbin/rpc.lockd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rpc.lockd/Makefile,v 1.7.2.1 1999/08/29 15:47:45 peter Exp $
 
 PROG =	rpc.lockd
 SRCS =	nlm_prot_svc.c nlm_prot.h lockd.c procs.c
diff --git a/usr.sbin/rpc.lockd/handles.c b/usr.sbin/rpc.lockd/handles.c
index d2d104551969..4b9d070c0ea4 100644
--- a/usr.sbin/rpc.lockd/handles.c
+++ b/usr.sbin/rpc.lockd/handles.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.lockd/handles.c,v 1.3.2.1 1999/08/29 15:47:46 peter Exp $";
 #endif /* not lint */
 
 #include "nlm_prot.h"
diff --git a/usr.sbin/rpc.lockd/lockd.c b/usr.sbin/rpc.lockd/lockd.c
index ac328569126e..62c3fad32db7 100644
--- a/usr.sbin/rpc.lockd/lockd.c
+++ b/usr.sbin/rpc.lockd/lockd.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.lockd/lockd.c,v 1.4.2.1 1999/08/29 15:47:47 peter Exp $";
 #endif /* not lint */
 
 /* main() function for NFS lock daemon.  Most of the code in this	*/
diff --git a/usr.sbin/rpc.lockd/procs.c b/usr.sbin/rpc.lockd/procs.c
index 07060fd16a97..87c54434d83b 100644
--- a/usr.sbin/rpc.lockd/procs.c
+++ b/usr.sbin/rpc.lockd/procs.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.lockd/procs.c,v 1.3.2.1 1999/08/29 15:47:47 peter Exp $";
 #endif /* not lint */
 
 #include <string.h>
diff --git a/usr.sbin/rpc.lockd/test.c b/usr.sbin/rpc.lockd/test.c
index 0dd8eaefa09e..c9f1100bdaa4 100644
--- a/usr.sbin/rpc.lockd/test.c
+++ b/usr.sbin/rpc.lockd/test.c
@@ -4,7 +4,7 @@ static char sccsid[] = "from: @(#)nlm_prot.x 1.8 87/09/21 Copyr 1987 Sun Micro";
 static char sccsid[] = "from: * @(#)nlm_prot.x	2.1 88/08/01 4.0 RPCSRC";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.lockd/test.c,v 1.3.2.1 1999/08/29 15:47:48 peter Exp $";
 #endif /* not lint */
 
 #include <rpc/rpc.h>
diff --git a/usr.sbin/rpc.statd/Makefile b/usr.sbin/rpc.statd/Makefile
index 112cc138bbe9..fcf9f53ed347 100644
--- a/usr.sbin/rpc.statd/Makefile
+++ b/usr.sbin/rpc.statd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rpc.statd/Makefile,v 1.8.2.1 1999/08/29 15:47:49 peter Exp $
 
 PROG =	rpc.statd
 SRCS =	file.c sm_inter_svc.c sm_inter.h statd.c procs.c
diff --git a/usr.sbin/rpc.statd/procs.c b/usr.sbin/rpc.statd/procs.c
index 3f27e582197b..a829db30f061 100644
--- a/usr.sbin/rpc.statd/procs.c
+++ b/usr.sbin/rpc.statd/procs.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.statd/procs.c,v 1.3.2.1 1999/08/29 15:47:49 peter Exp $";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/usr.sbin/rpc.statd/statd.c b/usr.sbin/rpc.statd/statd.c
index 3b47dfe041bb..b89355a76b7c 100644
--- a/usr.sbin/rpc.statd/statd.c
+++ b/usr.sbin/rpc.statd/statd.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.statd/statd.c,v 1.3.2.1 1999/08/29 15:47:50 peter Exp $";
 #endif /* not lint */
 
 /* main() function for status monitor daemon.  Some of the code in this	*/
diff --git a/usr.sbin/rpc.statd/test.c b/usr.sbin/rpc.statd/test.c
index 6df15011db3b..e34caabb61d5 100644
--- a/usr.sbin/rpc.statd/test.c
+++ b/usr.sbin/rpc.statd/test.c
@@ -1,7 +1,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.statd/test.c,v 1.2.2.1 1999/08/29 15:47:51 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/rpc.yppasswdd/Makefile b/usr.sbin/rpc.yppasswdd/Makefile
index 772b5fbc7fa2..63d458e8a98d 100644
--- a/usr.sbin/rpc.yppasswdd/Makefile
+++ b/usr.sbin/rpc.yppasswdd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rpc.yppasswdd/Makefile,v 1.10.2.1 1999/08/29 15:47:52 peter Exp $
 
 PROG=	rpc.yppasswdd
 SRCS=	pw_copy.c pw_util.c util.c yp_access.c yp_dblookup.c yp_dbwrite.c \
diff --git a/usr.sbin/rpc.yppasswdd/pw_copy.c b/usr.sbin/rpc.yppasswdd/pw_copy.c
index be0dbb831e55..dfee81b35513 100644
--- a/usr.sbin/rpc.yppasswdd/pw_copy.c
+++ b/usr.sbin/rpc.yppasswdd/pw_copy.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)pw_copy.c	8.4 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.yppasswdd/pw_copy.c,v 1.3.2.1 1999/08/29 15:47:53 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/rpc.yppasswdd/pw_util.c b/usr.sbin/rpc.yppasswdd/pw_util.c
index 3f783c155057..b79d400cd25e 100644
--- a/usr.sbin/rpc.yppasswdd/pw_util.c
+++ b/usr.sbin/rpc.yppasswdd/pw_util.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)pw_util.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.yppasswdd/pw_util.c,v 1.3.2.1 1999/08/29 15:47:54 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8 b/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
index a654abf309a0..8b28198a9baf 100644
--- a/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
+++ b/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8,v 1.9.2.1 1999/08/29 15:47:54 peter Exp $
 .\"
 .Dd February 8, 1996
 .Dt RPC.YPPASSWDD 8
diff --git a/usr.sbin/rpc.yppasswdd/yppasswd_private.x b/usr.sbin/rpc.yppasswdd/yppasswd_private.x
index f2921e80b0cf..29ddeb11e41f 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswd_private.x
+++ b/usr.sbin/rpc.yppasswdd/yppasswd_private.x
@@ -33,7 +33,7 @@
 #ifndef RPC_HDR
 %#ifndef lint
 %static const char rcsid[] =
-%	"$FreeBSD$";
+%	"$FreeBSD: src/usr.sbin/rpc.yppasswdd/yppasswd_private.x,v 1.5.2.1 1999/08/29 15:47:55 peter Exp $";
 %#endif /* not lint */
 #endif
 
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h b/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h
index 8bc79a52ca13..b0571e622bc0 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h,v 1.8.2.1 1999/08/29 15:47:55 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_main.c b/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
index 904e841d64e3..20f67cb929b5 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.yppasswdd/yppasswdd_main.c,v 1.12.2.2 1999/08/29 15:47:55 peter Exp $";
 #endif /* not lint */
 
 #include "yppasswd.h"
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
index c27cf8c51fe7..99a66dfec6ff 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.yppasswdd/yppasswdd_server.c,v 1.15.2.1 1999/08/29 15:47:56 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/rpc.yppasswdd/yppwupdate b/usr.sbin/rpc.yppasswdd/yppwupdate
index a9db8f7e5b6c..66b15601a526 100644
--- a/usr.sbin/rpc.yppasswdd/yppwupdate
+++ b/usr.sbin/rpc.yppasswdd/yppwupdate
@@ -8,7 +8,7 @@
 #
 # Comment out the LOG=yes line to disable logging.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rpc.yppasswdd/yppwupdate,v 1.6.2.1 1999/08/29 15:47:57 peter Exp $
 #
 
 PATH=/bin:/usr/bin; export PATH
diff --git a/usr.sbin/rpc.ypupdated/Makefile b/usr.sbin/rpc.ypupdated/Makefile
index 5b245758b7f4..a37a794159af 100644
--- a/usr.sbin/rpc.ypupdated/Makefile
+++ b/usr.sbin/rpc.ypupdated/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rpc.ypupdated/Makefile,v 1.5.2.1 1999/08/29 15:47:59 peter Exp $
 
 PROG=	rpc.ypupdated
 SRCS=	ypupdate_prot_svc.c ypupdate_prot.h ypupdated_main.c \
diff --git a/usr.sbin/rpc.ypupdated/update.c b/usr.sbin/rpc.ypupdated/update.c
index 996347b429de..39ca68f6221b 100644
--- a/usr.sbin/rpc.ypupdated/update.c
+++ b/usr.sbin/rpc.ypupdated/update.c
@@ -33,7 +33,7 @@
 static	char sccsid[] = "@(#)update.c 1.2 91/03/11 Copyr 1986 Sun Micro";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.ypupdated/update.c,v 1.3.2.1 1999/08/29 15:47:59 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/rpc.ypupdated/yp_dbdelete.c b/usr.sbin/rpc.ypupdated/yp_dbdelete.c
index f66b9741e85e..719a4aa64cb5 100644
--- a/usr.sbin/rpc.ypupdated/yp_dbdelete.c
+++ b/usr.sbin/rpc.ypupdated/yp_dbdelete.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.ypupdated/yp_dbdelete.c,v 1.2.2.1 1999/08/29 15:47:59 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/rpc.ypupdated/yp_dbupdate.c b/usr.sbin/rpc.ypupdated/yp_dbupdate.c
index c906deceefea..1dee04ac1de7 100644
--- a/usr.sbin/rpc.ypupdated/yp_dbupdate.c
+++ b/usr.sbin/rpc.ypupdated/yp_dbupdate.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.ypupdated/yp_dbupdate.c,v 1.2.2.1 1999/08/29 15:48:00 peter Exp $";
 #endif /* not lint */
 
 #include <sys/fcntl.h>
diff --git a/usr.sbin/rpc.ypupdated/ypupdate b/usr.sbin/rpc.ypupdated/ypupdate
index 4a26f4b6d72b..b7f183801265 100755
--- a/usr.sbin/rpc.ypupdated/ypupdate
+++ b/usr.sbin/rpc.ypupdated/ypupdate
@@ -8,7 +8,7 @@
 #
 # Comment out the LOG=yes line to disable logging.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rpc.ypupdated/ypupdate,v 1.1.1.1.2.1 1999/08/29 15:48:00 peter Exp $
 #
 
 LOG=yes
diff --git a/usr.sbin/rpc.ypupdated/ypupdated_main.c b/usr.sbin/rpc.ypupdated/ypupdated_main.c
index 40db4c0952d1..89f3e02d20cf 100644
--- a/usr.sbin/rpc.ypupdated/ypupdated_main.c
+++ b/usr.sbin/rpc.ypupdated/ypupdated_main.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.ypupdated/ypupdated_main.c,v 1.2.2.1 1999/08/29 15:48:01 peter Exp $";
 #endif /* not lint */
 
 #include "ypupdate_prot.h"
diff --git a/usr.sbin/rpc.ypupdated/ypupdated_server.c b/usr.sbin/rpc.ypupdated/ypupdated_server.c
index f0c5bff89af5..9c348c9c6746 100644
--- a/usr.sbin/rpc.ypupdated/ypupdated_server.c
+++ b/usr.sbin/rpc.ypupdated/ypupdated_server.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.ypupdated/ypupdated_server.c,v 1.2.2.1 1999/08/29 15:48:01 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/rpc.ypxfrd/Makefile b/usr.sbin/rpc.ypxfrd/Makefile
index fffa5eafe060..919b8ffd3a5a 100644
--- a/usr.sbin/rpc.ypxfrd/Makefile
+++ b/usr.sbin/rpc.ypxfrd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rpc.ypxfrd/Makefile,v 1.7.2.1 1999/08/29 15:48:02 peter Exp $
 
 PROG=	rpc.ypxfrd
 SRCS=	ypxfrd_svc.c ypxfrd.h ypxfrd_server.c yp_error.c \
diff --git a/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8 b/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8
index c086f77b16c6..f5784e8ee7e5 100644
--- a/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8
+++ b/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8,v 1.7.2.1 1999/08/29 15:48:03 peter Exp $
 .\"
 .Dd June 2, 1996
 .Dt RPC.YPXFRD 8
diff --git a/usr.sbin/rpc.ypxfrd/ypxfrd_extern.h b/usr.sbin/rpc.ypxfrd/ypxfrd_extern.h
index 4fb51ec253de..c668d5adf5c1 100644
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_extern.h
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_extern.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rpc.ypxfrd/ypxfrd_extern.h,v 1.3.2.1 1999/08/29 15:48:03 peter Exp $
  */
 
 #ifndef MAX_CHILDREN
diff --git a/usr.sbin/rpc.ypxfrd/ypxfrd_main.c b/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
index 5cb6b42e775e..54e3403fb76b 100644
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.ypxfrd/ypxfrd_main.c,v 1.7.2.1 1999/08/29 15:48:04 peter Exp $";
 #endif /* not lint */
 
 #include "ypxfrd.h"
diff --git a/usr.sbin/rpc.ypxfrd/ypxfrd_server.c b/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
index 1a4b2e503a42..769e47bce206 100644
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.ypxfrd/ypxfrd_server.c,v 1.7.2.1 1999/08/29 15:48:04 peter Exp $";
 #endif /* not lint */
 
 #include "ypxfrd.h"
diff --git a/usr.sbin/rtprio/Makefile b/usr.sbin/rtprio/Makefile
index 4c0e0cdc3212..e3ae15939401 100644
--- a/usr.sbin/rtprio/Makefile
+++ b/usr.sbin/rtprio/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.5 (Berkeley) 5/11/90
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rtprio/Makefile,v 1.5.2.1 1999/08/29 15:48:05 peter Exp $
 
 BINDIR=/usr/sbin
 PROG=	rtprio
diff --git a/usr.sbin/rtprio/rtprio.1 b/usr.sbin/rtprio/rtprio.1
index bce3f8113e42..05085e30cda3 100644
--- a/usr.sbin/rtprio/rtprio.1
+++ b/usr.sbin/rtprio/rtprio.1
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rtprio/rtprio.1,v 1.15.2.2 1999/08/29 15:48:06 peter Exp $
 .\"
 .Dd July 23, 1994
 .Dt RTPRIO 1
diff --git a/usr.sbin/rtprio/rtprio.c b/usr.sbin/rtprio/rtprio.c
index 9c650a60104e..7abba96ff4a3 100644
--- a/usr.sbin/rtprio/rtprio.c
+++ b/usr.sbin/rtprio/rtprio.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rtprio/rtprio.c,v 1.7.2.1 1999/08/29 15:48:06 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c
index f3d702849d84..8305866a5d4c 100644
--- a/usr.sbin/rwhod/rwhod.c
+++ b/usr.sbin/rwhod/rwhod.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)rwhod.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rwhod/rwhod.c,v 1.9.2.2 1999/08/29 15:48:07 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/sa/Makefile b/usr.sbin/sa/Makefile
index db82867e720d..64ca5c97e328 100644
--- a/usr.sbin/sa/Makefile
+++ b/usr.sbin/sa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/sa/Makefile,v 1.4.2.1 1999/08/29 15:48:08 peter Exp $
 
 PROG=	sa
 MAN8=	sa.8
diff --git a/usr.sbin/sa/extern.h b/usr.sbin/sa/extern.h
index 5804aa27a5e6..9b12e1146a3e 100644
--- a/usr.sbin/sa/extern.h
+++ b/usr.sbin/sa/extern.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sa/extern.h,v 1.3.2.1 1999/08/29 15:48:09 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/sa/main.c b/usr.sbin/sa/main.c
index de8439659dea..b35f8bfc9508 100644
--- a/usr.sbin/sa/main.c
+++ b/usr.sbin/sa/main.c
@@ -36,7 +36,7 @@ static const char copyright[] =
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/sa/main.c,v 1.6.2.2 1999/08/29 15:48:09 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/sa/pathnames.h b/usr.sbin/sa/pathnames.h
index 7a7edf68caf6..406928dc3777 100644
--- a/usr.sbin/sa/pathnames.h
+++ b/usr.sbin/sa/pathnames.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sa/pathnames.h,v 1.3.2.1 1999/08/29 15:48:10 peter Exp $
  */
 
 #define	_PATH_ACCT	"/var/account/acct"
diff --git a/usr.sbin/sa/pdb.c b/usr.sbin/sa/pdb.c
index eafdf59e985f..4f1cb9794190 100644
--- a/usr.sbin/sa/pdb.c
+++ b/usr.sbin/sa/pdb.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/sa/pdb.c,v 1.6.2.1 1999/08/29 15:48:10 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/sa/sa.8 b/usr.sbin/sa/sa.8
index cad6c343f231..65d669a82486 100644
--- a/usr.sbin/sa/sa.8
+++ b/usr.sbin/sa/sa.8
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/sa/sa.8,v 1.9.2.1 1999/08/29 15:48:11 peter Exp $
 .\"
 .Dd February 25, 1994
 .Dt SA 8
diff --git a/usr.sbin/sa/usrdb.c b/usr.sbin/sa/usrdb.c
index 38de520b22e8..183d2a9d04f1 100644
--- a/usr.sbin/sa/usrdb.c
+++ b/usr.sbin/sa/usrdb.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/sa/usrdb.c,v 1.6.2.2 1999/08/29 15:48:11 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile
index 2eaa13f62957..bf7940ce1a5a 100644
--- a/usr.sbin/sendmail/Makefile
+++ b/usr.sbin/sendmail/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.8 (Berkeley) 3/28/97
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/sendmail/Makefile,v 1.9.2.4 1999/08/29 15:48:12 peter Exp $
 
 SMDIR=	${.CURDIR}/../../contrib/sendmail/src
 .PATH:	${SMDIR}
diff --git a/usr.sbin/sgsc/Makefile b/usr.sbin/sgsc/Makefile
index 5f14a66b9bba..ec19bfba20dd 100644
--- a/usr.sbin/sgsc/Makefile
+++ b/usr.sbin/sgsc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/sgsc/Makefile,v 1.3.2.1 1999/08/29 15:48:13 peter Exp $
 
 PROG=	sgsc
 
diff --git a/usr.sbin/sgsc/sgsc.c b/usr.sbin/sgsc/sgsc.c
index 94960a30b322..7791de55d225 100644
--- a/usr.sbin/sgsc/sgsc.c
+++ b/usr.sbin/sgsc/sgsc.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/sgsc/sgsc.c,v 1.4.2.1 1999/08/29 15:48:14 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/sicontrol/sicontrol.8 b/usr.sbin/sicontrol/sicontrol.8
index be965a79d407..570a69ea8025 100644
--- a/usr.sbin/sicontrol/sicontrol.8
+++ b/usr.sbin/sicontrol/sicontrol.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/sicontrol/sicontrol.8,v 1.8.2.2 1999/10/30 15:59:35 phantom Exp $
 .\"
 .Dd September 26,1995
 .Dt SICONTROL 8
diff --git a/usr.sbin/sicontrol/sicontrol.c b/usr.sbin/sicontrol/sicontrol.c
index b4eba8cd70ed..be6d3d76d9e9 100644
--- a/usr.sbin/sicontrol/sicontrol.c
+++ b/usr.sbin/sicontrol/sicontrol.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/sicontrol/sicontrol.c,v 1.8.2.1 1999/08/29 15:48:16 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/slstat/Makefile b/usr.sbin/slstat/Makefile
index 601612578129..d0337ed92f0a 100644
--- a/usr.sbin/slstat/Makefile
+++ b/usr.sbin/slstat/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.6 (Berkeley) 4/23/91
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/slstat/Makefile,v 1.6.2.1 1999/08/29 15:48:17 peter Exp $
 
 PROG=	slstat
 MAN8=	slstat.8
diff --git a/usr.sbin/slstat/slstat.8 b/usr.sbin/slstat/slstat.8
index eb37f482ffce..708e326d6c52 100644
--- a/usr.sbin/slstat/slstat.8
+++ b/usr.sbin/slstat/slstat.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)slstat.8	6.8 (Berkeley) 6/20/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/slstat/slstat.8,v 1.12.2.1 1999/08/29 15:48:17 peter Exp $
 .\"
 .Dd October 11, 1996
 .Dt SLSTAT 8
diff --git a/usr.sbin/slstat/slstat.c b/usr.sbin/slstat/slstat.c
index e3004f309ad7..f6a42b8057e8 100644
--- a/usr.sbin/slstat/slstat.c
+++ b/usr.sbin/slstat/slstat.c
@@ -23,7 +23,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/slstat/slstat.c,v 1.13.2.1 1999/08/29 15:48:18 peter Exp $";
 #endif
 
 #include <sys/param.h>
diff --git a/usr.sbin/spkrtest/spkrtest.8 b/usr.sbin/spkrtest/spkrtest.8
index 7febb8538bfc..aa62cd6265cb 100644
--- a/usr.sbin/spkrtest/spkrtest.8
+++ b/usr.sbin/spkrtest/spkrtest.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/spkrtest/spkrtest.8,v 1.7.2.1 1999/08/29 15:48:19 peter Exp $
 
 .Dd July 23, 1995
 .Dt SPKRTEST 8
diff --git a/usr.sbin/spkrtest/spkrtest.pl b/usr.sbin/spkrtest/spkrtest.pl
index ccb1631fd865..14cb3d3e4005 100644
--- a/usr.sbin/spkrtest/spkrtest.pl
+++ b/usr.sbin/spkrtest/spkrtest.pl
@@ -32,7 +32,7 @@
 #
 # NOTE for iso-* (latin1) fonts: use TERM=cons25-iso8859-1
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/spkrtest/spkrtest.pl,v 1.6.2.1 1999/08/29 15:48:20 peter Exp $
 
 $title = qq{
 reveille   -- Reveille
diff --git a/usr.sbin/spray/Makefile b/usr.sbin/spray/Makefile
index 4a0cbab20514..03ea43e34dde 100644
--- a/usr.sbin/spray/Makefile
+++ b/usr.sbin/spray/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/spray/Makefile,v 1.4.2.1 1999/08/29 15:48:20 peter Exp $
 
 PROG=	spray
 MAN8=	spray.8
diff --git a/usr.sbin/spray/spray.c b/usr.sbin/spray/spray.c
index a0e446cc2789..105ec93928f0 100644
--- a/usr.sbin/spray/spray.c
+++ b/usr.sbin/spray/spray.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/spray/spray.c,v 1.4.2.1 1999/08/29 15:48:20 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/stallion/Makefile b/usr.sbin/stallion/Makefile
index 4b017fca1192..a8798f54c94d 100644
--- a/usr.sbin/stallion/Makefile
+++ b/usr.sbin/stallion/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/stallion/Makefile,v 1.3.2.1 1999/08/29 15:48:21 peter Exp $
 
 SUBDIR=	bootcode stlload stlstats
 
diff --git a/usr.sbin/stallion/Makefile.inc b/usr.sbin/stallion/Makefile.inc
index 314a85b6dab4..3be2769937ff 100644
--- a/usr.sbin/stallion/Makefile.inc
+++ b/usr.sbin/stallion/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/stallion/Makefile.inc,v 1.3.2.1 1999/08/29 15:48:21 peter Exp $
 
 BOOTDIR=	/usr/libdata/stallion
 
diff --git a/usr.sbin/stallion/bootcode/Makefile b/usr.sbin/stallion/bootcode/Makefile
index e9a7143c3486..94d6383d60e7 100644
--- a/usr.sbin/stallion/bootcode/Makefile
+++ b/usr.sbin/stallion/bootcode/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/stallion/bootcode/Makefile,v 1.8.2.1 1999/08/29 15:48:23 peter Exp $
 
 .SUFFIXES: .uu
 .uu:
diff --git a/usr.sbin/stallion/stlload/Makefile b/usr.sbin/stallion/stlload/Makefile
index ece45d380e2f..b24f3b99f3f1 100644
--- a/usr.sbin/stallion/stlload/Makefile
+++ b/usr.sbin/stallion/stlload/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/stallion/stlload/Makefile,v 1.4.2.1 1999/08/29 15:48:24 peter Exp $
 
 PROG=	stlload
 MAN8=	stlload.8
diff --git a/usr.sbin/stallion/stlload/stlload.c b/usr.sbin/stallion/stlload/stlload.c
index 6d0f0303788e..8f8092de383c 100644
--- a/usr.sbin/stallion/stlload/stlload.c
+++ b/usr.sbin/stallion/stlload/stlload.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/stallion/stlload/stlload.c,v 1.8.2.1 1999/08/29 15:48:24 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/stallion/stlstats/Makefile b/usr.sbin/stallion/stlstats/Makefile
index e0eda1aeb94d..599fc54fd9df 100644
--- a/usr.sbin/stallion/stlstats/Makefile
+++ b/usr.sbin/stallion/stlstats/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/stallion/stlstats/Makefile,v 1.5.2.1 1999/08/29 15:48:26 peter Exp $
 
 PROG=	stlstats
 MAN8=	stlstats.8
diff --git a/usr.sbin/stallion/stlstats/stlstats.c b/usr.sbin/stallion/stlstats/stlstats.c
index 19d31612fd13..8d99ab7a415d 100644
--- a/usr.sbin/stallion/stlstats/stlstats.c
+++ b/usr.sbin/stallion/stlstats/stlstats.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/stallion/stlstats/stlstats.c,v 1.7.2.1 1999/08/29 15:48:27 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/syslogd/syslog.conf.5 b/usr.sbin/syslogd/syslog.conf.5
index c2e1dbf6fb19..ddda5b204511 100644
--- a/usr.sbin/syslogd/syslog.conf.5
+++ b/usr.sbin/syslogd/syslog.conf.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)syslog.conf.5	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/syslogd/syslog.conf.5,v 1.12.2.1 1999/08/29 15:48:29 peter Exp $
 .\"
 .Dd June 9, 1993
 .Dt SYSLOG.CONF 5
diff --git a/usr.sbin/syslogd/syslogd.8 b/usr.sbin/syslogd/syslogd.8
index 8f23d658597a..d669d89f5a63 100644
--- a/usr.sbin/syslogd/syslogd.8
+++ b/usr.sbin/syslogd/syslogd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)syslogd.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/syslogd/syslogd.8,v 1.16.2.2 1999/08/29 15:48:31 peter Exp $
 .\"
 .Dd October 12, 1995
 .Dt SYSLOGD 8
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index a57ba6b8b503..8c166a984d67 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)syslogd.c	8.3 (Berkeley) 4/4/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/syslogd/syslogd.c,v 1.46.2.4 1999/08/29 15:48:31 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/tcpdchk/Makefile b/usr.sbin/tcpdchk/Makefile
index d802eef045c2..eed9fc2cce3a 100644
--- a/usr.sbin/tcpdchk/Makefile
+++ b/usr.sbin/tcpdchk/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/tcpdchk/Makefile,v 1.1.2.2 1999/08/29 15:48:33 peter Exp $
 #
 
 MAINTAINER=markm@FreeBSD.org
diff --git a/usr.sbin/tcpdmatch/Makefile b/usr.sbin/tcpdmatch/Makefile
index c29eb91375df..28adb5845cda 100644
--- a/usr.sbin/tcpdmatch/Makefile
+++ b/usr.sbin/tcpdmatch/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/tcpdmatch/Makefile,v 1.1.2.2 1999/08/29 15:48:36 peter Exp $
 #
 
 MAINTAINER=markm@FreeBSD.org
diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile
index e352b1dbc4ce..4d5e0cdc4b76 100644
--- a/usr.sbin/tcpdump/tcpdump/Makefile
+++ b/usr.sbin/tcpdump/tcpdump/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/tcpdump/tcpdump/Makefile,v 1.20.2.2 1999/08/29 15:48:38 peter Exp $
 
 PROG=	tcpdump
 CFLAGS+=-DHAVE_FCNTL_H=1 -DHAVE_NET_SLIP_H=1 -DTIME_WITH_SYS_TIME=1 \
diff --git a/usr.sbin/tcpdump/tcpslice/gwtm2secs.c b/usr.sbin/tcpdump/tcpslice/gwtm2secs.c
index 249454e6f044..003ba48ee2ed 100644
--- a/usr.sbin/tcpdump/tcpslice/gwtm2secs.c
+++ b/usr.sbin/tcpdump/tcpslice/gwtm2secs.c
@@ -20,7 +20,7 @@
  */
 #if !defined(lint) && !defined(__GNUC__)
 static char rcsid[] =
-    "@(#)$FreeBSD$ (LBL)";
+    "@(#)$FreeBSD: src/usr.sbin/tcpdump/tcpslice/gwtm2secs.c,v 1.3.4.1 1999/08/29 15:48:40 peter Exp $ (LBL)";
 #endif
 
 /*
diff --git a/usr.sbin/tcpdump/tcpslice/search.c b/usr.sbin/tcpdump/tcpslice/search.c
index a460ffab2f7e..8aa2e75da689 100644
--- a/usr.sbin/tcpdump/tcpslice/search.c
+++ b/usr.sbin/tcpdump/tcpslice/search.c
@@ -20,7 +20,7 @@
  */
 #if !defined(lint) && !defined(__GNUC__)
 static char rcsid[] =
-    "@(#)$FreeBSD$ (LBL)";
+    "@(#)$FreeBSD: src/usr.sbin/tcpdump/tcpslice/search.c,v 1.3.4.1 1999/08/29 15:48:40 peter Exp $ (LBL)";
 #endif
 
 /*
diff --git a/usr.sbin/tcpdump/tcpslice/tcpslice.1 b/usr.sbin/tcpdump/tcpslice/tcpslice.1
index 36cc13139a91..ea0a9e957d82 100644
--- a/usr.sbin/tcpdump/tcpslice/tcpslice.1
+++ b/usr.sbin/tcpdump/tcpslice/tcpslice.1
@@ -17,7 +17,7 @@
 .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/tcpdump/tcpslice/tcpslice.1,v 1.6.2.1 1999/08/29 15:48:40 peter Exp $
 .\"
 .Dd October 14, 1991
 .Dt TCPSLICE 1
diff --git a/usr.sbin/tcpdump/tcpslice/tcpslice.c b/usr.sbin/tcpdump/tcpslice/tcpslice.c
index dba5eadfcc04..b473a3b4e06e 100644
--- a/usr.sbin/tcpdump/tcpslice/tcpslice.c
+++ b/usr.sbin/tcpdump/tcpslice/tcpslice.c
@@ -27,7 +27,7 @@ static const char copyright[] =
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/tcpdump/tcpslice/tcpslice.c,v 1.8.2.1 1999/08/29 15:48:40 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/tcpdump/tcpslice/util.c b/usr.sbin/tcpdump/tcpslice/util.c
index 8904352b798c..10e7e622f7d3 100644
--- a/usr.sbin/tcpdump/tcpslice/util.c
+++ b/usr.sbin/tcpdump/tcpslice/util.c
@@ -21,7 +21,7 @@
 
 #if !defined(lint) && !defined(__GNUC__)
 static char rcsid[] =
-    "@(#) $FreeBSD$ (LBL)";
+    "@(#) $FreeBSD: src/usr.sbin/tcpdump/tcpslice/util.c,v 1.2.4.1 1999/08/29 15:48:41 peter Exp $ (LBL)";
 #endif
 
 #include "tcpslice.h"
diff --git a/usr.sbin/timed/timed/acksend.c b/usr.sbin/timed/timed/acksend.c
index 8bde7438a556..1e32152ad1a8 100644
--- a/usr.sbin/timed/timed/acksend.c
+++ b/usr.sbin/timed/timed/acksend.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)acksend.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/acksend.c,v 1.3.2.1 1999/08/29 15:48:42 peter Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/byteorder.c b/usr.sbin/timed/timed/byteorder.c
index 038dd56bf8b5..d768cdbda9c0 100644
--- a/usr.sbin/timed/timed/byteorder.c
+++ b/usr.sbin/timed/timed/byteorder.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)byteorder.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/byteorder.c,v 1.3.2.1 1999/08/29 15:48:43 peter Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/candidate.c b/usr.sbin/timed/timed/candidate.c
index 79f1f5ab19fa..7cb89b701c65 100644
--- a/usr.sbin/timed/timed/candidate.c
+++ b/usr.sbin/timed/timed/candidate.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)candidate.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/candidate.c,v 1.4.2.1 1999/08/29 15:48:43 peter Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/cksum.c b/usr.sbin/timed/timed/cksum.c
index 50a7da27161f..671d11102342 100644
--- a/usr.sbin/timed/timed/cksum.c
+++ b/usr.sbin/timed/timed/cksum.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cksum.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/cksum.c,v 1.2.2.1 1999/08/29 15:48:43 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/timed/timed/correct.c b/usr.sbin/timed/timed/correct.c
index 1e136545e148..f2fff3e85245 100644
--- a/usr.sbin/timed/timed/correct.c
+++ b/usr.sbin/timed/timed/correct.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)correct.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/correct.c,v 1.3.2.1 1999/08/29 15:48:43 peter Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/master.c b/usr.sbin/timed/timed/master.c
index ac4ff457cd4f..63afc0d3850d 100644
--- a/usr.sbin/timed/timed/master.c
+++ b/usr.sbin/timed/timed/master.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)master.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/master.c,v 1.5.2.1 1999/08/29 15:48:43 peter Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/measure.c b/usr.sbin/timed/timed/measure.c
index 2c4cd148c049..64d99aa42416 100644
--- a/usr.sbin/timed/timed/measure.c
+++ b/usr.sbin/timed/timed/measure.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)measure.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/measure.c,v 1.5.2.1 1999/08/29 15:48:43 peter Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/networkdelta.c b/usr.sbin/timed/timed/networkdelta.c
index dcbe550237ff..b310dd9ff203 100644
--- a/usr.sbin/timed/timed/networkdelta.c
+++ b/usr.sbin/timed/timed/networkdelta.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)networkdelta.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/networkdelta.c,v 1.2.2.1 1999/08/29 15:48:44 peter Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/readmsg.c b/usr.sbin/timed/timed/readmsg.c
index 93366a60b102..6ef23c612716 100644
--- a/usr.sbin/timed/timed/readmsg.c
+++ b/usr.sbin/timed/timed/readmsg.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)readmsg.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/readmsg.c,v 1.4.2.1 1999/08/29 15:48:44 peter Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/slave.c b/usr.sbin/timed/timed/slave.c
index 4029ee856d88..10803d4ee550 100644
--- a/usr.sbin/timed/timed/slave.c
+++ b/usr.sbin/timed/timed/slave.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)slave.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/slave.c,v 1.6.2.1 1999/08/29 15:48:44 peter Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/timed.c b/usr.sbin/timed/timed/timed.c
index d376bcaa5db5..05b5a99a4bac 100644
--- a/usr.sbin/timed/timed/timed.c
+++ b/usr.sbin/timed/timed/timed.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)timed.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/timed.c,v 1.8.2.1 1999/08/29 15:48:45 peter Exp $";
 #endif /* not lint */
 
 #define TSPTYPES
diff --git a/usr.sbin/timed/timedc/cmds.c b/usr.sbin/timed/timedc/cmds.c
index 51613d150c5b..0f3768240e93 100644
--- a/usr.sbin/timed/timedc/cmds.c
+++ b/usr.sbin/timed/timedc/cmds.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cmds.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timedc/cmds.c,v 1.5.2.1 1999/08/29 15:48:46 peter Exp $";
 #endif /* not lint */
 
 #include "timedc.h"
diff --git a/usr.sbin/timed/timedc/cmdtab.c b/usr.sbin/timed/timedc/cmdtab.c
index 8e4c3d5a0767..1f4df05db7da 100644
--- a/usr.sbin/timed/timedc/cmdtab.c
+++ b/usr.sbin/timed/timedc/cmdtab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timedc/cmdtab.c,v 1.2.2.1 1999/08/29 15:48:46 peter Exp $";
 #endif /* not lint */
 
 #include "timedc.h"
diff --git a/usr.sbin/timed/timedc/timedc.c b/usr.sbin/timed/timedc/timedc.c
index 71ac9b340005..b4a6410013be 100644
--- a/usr.sbin/timed/timedc/timedc.c
+++ b/usr.sbin/timed/timedc/timedc.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)timedc.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timedc/timedc.c,v 1.2.2.1 1999/08/29 15:48:46 peter Exp $";
 #endif /* not lint */
 
 #include "timedc.h"
diff --git a/usr.sbin/traceroute/Makefile b/usr.sbin/traceroute/Makefile
index 4ddf20d0e011..aebdc58874c6 100644
--- a/usr.sbin/traceroute/Makefile
+++ b/usr.sbin/traceroute/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/traceroute/Makefile,v 1.10.2.1 1999/08/29 15:48:47 peter Exp $
 
 PROG=	traceroute
 MAN8=	traceroute.8
diff --git a/usr.sbin/trpt/trpt.8 b/usr.sbin/trpt/trpt.8
index 49e6670f8f03..85ad2f1b6d7b 100644
--- a/usr.sbin/trpt/trpt.8
+++ b/usr.sbin/trpt/trpt.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)trpt.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/trpt/trpt.8,v 1.4.2.1 1999/10/30 15:59:35 phantom Exp $
 .\"
 .Dd December 11, 1993
 .Dt TRPT 8
diff --git a/usr.sbin/trpt/trpt.c b/usr.sbin/trpt/trpt.c
index e5f1fafa3c5a..4b190c364e1d 100644
--- a/usr.sbin/trpt/trpt.c
+++ b/usr.sbin/trpt/trpt.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)trpt.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/trpt/trpt.c,v 1.8.2.1 1999/08/29 15:48:48 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/tzsetup/Makefile b/usr.sbin/tzsetup/Makefile
index 1e037a9ea7a1..0b846994bdee 100644
--- a/usr.sbin/tzsetup/Makefile
+++ b/usr.sbin/tzsetup/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/tzsetup/Makefile,v 1.7.2.1 1999/08/29 15:48:49 peter Exp $
 
 PROG=	tzsetup
 MAN8=	tzsetup.8
diff --git a/usr.sbin/tzsetup/tzsetup.8 b/usr.sbin/tzsetup/tzsetup.8
index 3bf3f66815cd..bd38801c6fc5 100644
--- a/usr.sbin/tzsetup/tzsetup.8
+++ b/usr.sbin/tzsetup/tzsetup.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/tzsetup/tzsetup.8,v 1.8.2.2 1999/08/29 15:48:49 peter Exp $
 .Dd January 24, 1996
 .Dt TZSETUP 8
 .Os FreeBSD
diff --git a/usr.sbin/tzsetup/tzsetup.c b/usr.sbin/tzsetup/tzsetup.c
index c1aafd5543a8..43875ce95799 100644
--- a/usr.sbin/tzsetup/tzsetup.c
+++ b/usr.sbin/tzsetup/tzsetup.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/tzsetup/tzsetup.c,v 1.11.2.3 1999/08/29 15:48:49 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/usbd/Makefile b/usr.sbin/usbd/Makefile
index c237784ec33e..3241ddc46c07 100644
--- a/usr.sbin/usbd/Makefile
+++ b/usr.sbin/usbd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/usbd/Makefile,v 1.2.2.1 1999/08/29 15:48:50 peter Exp $
 
 PROG=	usbd
 MAN8=	usbd.8
diff --git a/usr.sbin/usbd/usbd.8 b/usr.sbin/usbd/usbd.8
index b57cc361fad2..58114deaf7d6 100644
--- a/usr.sbin/usbd/usbd.8
+++ b/usr.sbin/usbd/usbd.8
@@ -1,5 +1,5 @@
 .\" $NetBSD: usbd.8,v 1.2 1998/07/13 11:01:50 augustss Exp $
-.\" FreeBSD $FreeBSD$
+.\" FreeBSD $FreeBSD: src/usr.sbin/usbd/usbd.8,v 1.2.2.1 1999/08/29 15:48:50 peter Exp $
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
diff --git a/usr.sbin/usbd/usbd.c b/usr.sbin/usbd/usbd.c
index 6c2ad7e4e81d..bfc1d9966d77 100644
--- a/usr.sbin/usbd/usbd.c
+++ b/usr.sbin/usbd/usbd.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbd.c,v 1.2 1998/07/23 18:39:53 augustss Exp $	*/
-/*	FreeBSD $FreeBSD$ */
+/*	FreeBSD $FreeBSD: src/usr.sbin/usbd/usbd.c,v 1.2.2.1 1999/08/29 15:48:51 peter Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/usr.sbin/usbdevs/Makefile b/usr.sbin/usbdevs/Makefile
index 0fb9f82c89b2..94a95b32f2c6 100644
--- a/usr.sbin/usbdevs/Makefile
+++ b/usr.sbin/usbdevs/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.2 1998/07/12 20:40:45 augustss Exp $
-#	FreeBSD $FreeBSD$
+#	FreeBSD $FreeBSD: src/usr.sbin/usbdevs/Makefile,v 1.3.2.1 1999/08/29 15:48:51 peter Exp $
 
 PROG=	usbdevs
 MAN8=	usbdevs.8
diff --git a/usr.sbin/usbdevs/usbdevs.8 b/usr.sbin/usbdevs/usbdevs.8
index 2af11cd48cfc..d4df4bdb37e7 100644
--- a/usr.sbin/usbdevs/usbdevs.8
+++ b/usr.sbin/usbdevs/usbdevs.8
@@ -1,5 +1,5 @@
 .\" $NetBSD: usbdevs.8,v 1.3 1998/07/23 13:57:51 augustss Exp $
-.\" FreeBSD $FreeBSD$
+.\" FreeBSD $FreeBSD: src/usr.sbin/usbdevs/usbdevs.8,v 1.2.2.1 1999/08/29 15:48:52 peter Exp $
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
diff --git a/usr.sbin/usbdevs/usbdevs.c b/usr.sbin/usbdevs/usbdevs.c
index 0086bb33d4bc..c7e0766b4be7 100644
--- a/usr.sbin/usbdevs/usbdevs.c
+++ b/usr.sbin/usbdevs/usbdevs.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbdevs.c,v 1.4 1998/07/23 13:57:51 augustss Exp $	*/
-/*	FreeBSD $FreeBSD$ */
+/*	FreeBSD $FreeBSD: src/usr.sbin/usbdevs/usbdevs.c,v 1.2.2.1 1999/08/29 15:48:52 peter Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/usr.sbin/vidcontrol/decode.c b/usr.sbin/vidcontrol/decode.c
index 19905958f4cb..e62535726c9e 100644
--- a/usr.sbin/vidcontrol/decode.c
+++ b/usr.sbin/vidcontrol/decode.c
@@ -28,7 +28,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/vidcontrol/decode.c,v 1.7.2.1 1999/08/29 15:48:53 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/vidcontrol/vidcontrol.1 b/usr.sbin/vidcontrol/vidcontrol.1
index 02d0e8801213..82637fbfdf75 100644
--- a/usr.sbin/vidcontrol/vidcontrol.1
+++ b/usr.sbin/vidcontrol/vidcontrol.1
@@ -12,7 +12,7 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\"     @(#)vidcontrol.1
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/vidcontrol/vidcontrol.1,v 1.14.2.6 1999/10/30 14:31:56 phantom Exp $
 .\"
 .Dd June 30, 1999
 .Dt VIDCONTROL 1
diff --git a/usr.sbin/vidcontrol/vidcontrol.c b/usr.sbin/vidcontrol/vidcontrol.c
index f898781da157..ead695ece274 100644
--- a/usr.sbin/vidcontrol/vidcontrol.c
+++ b/usr.sbin/vidcontrol/vidcontrol.c
@@ -28,7 +28,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/vidcontrol/vidcontrol.c,v 1.26.2.2 1999/08/29 15:48:54 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/vipw/pw_util.c b/usr.sbin/vipw/pw_util.c
index 207da8f0d5bf..6ea9c31cee2f 100644
--- a/usr.sbin/vipw/pw_util.c
+++ b/usr.sbin/vipw/pw_util.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pw_util.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/vipw/pw_util.c,v 1.13.2.4 1999/09/11 10:21:05 pb Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/vipw/vipw.c b/usr.sbin/vipw/vipw.c
index 8986ab3bc1bd..f6fb53d3acf4 100644
--- a/usr.sbin/vipw/vipw.c
+++ b/usr.sbin/vipw/vipw.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)vipw.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/vipw/vipw.c,v 1.5.2.6 1999/10/25 09:50:18 sheldonh Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/vnconfig/Makefile b/usr.sbin/vnconfig/Makefile
index 72e5627188f6..cab778e55721 100644
--- a/usr.sbin/vnconfig/Makefile
+++ b/usr.sbin/vnconfig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/vnconfig/Makefile,v 1.4.2.1 1999/08/29 15:48:57 peter Exp $
 
 PROG=		vnconfig
 MAN8=		vnconfig.8
diff --git a/usr.sbin/vnconfig/vnconfig.c b/usr.sbin/vnconfig/vnconfig.c
index 353104cd1a80..84ec5c8ecba7 100644
--- a/usr.sbin/vnconfig/vnconfig.c
+++ b/usr.sbin/vnconfig/vnconfig.c
@@ -43,7 +43,7 @@
 static char sccsid[] = "@(#)vnconfig.c	8.1 (Berkeley) 12/15/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/vnconfig/vnconfig.c,v 1.7.2.1 1999/08/29 15:48:58 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/watch/Makefile b/usr.sbin/watch/Makefile
index 4d8d9f166cff..7f550efbc322 100644
--- a/usr.sbin/watch/Makefile
+++ b/usr.sbin/watch/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/watch/Makefile,v 1.7.2.1 1999/08/29 15:48:59 peter Exp $
 
 PROG=	watch
 MAN8=   watch.8
diff --git a/usr.sbin/watch/watch.8 b/usr.sbin/watch/watch.8
index b8539d81e35e..46509a867a3e 100644
--- a/usr.sbin/watch/watch.8
+++ b/usr.sbin/watch/watch.8
@@ -1,6 +1,6 @@
 .\"
 .\" @(#)watch.8		1.1 (FreeBSD) 2/17/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/watch/watch.8,v 1.14.2.1 1999/10/30 14:57:33 phantom Exp $
 .\"
 .Dd February 17, 1995
 .Dt WATCH 8
diff --git a/usr.sbin/watch/watch.c b/usr.sbin/watch/watch.c
index 307ffa712656..2fa1bd9891e0 100644
--- a/usr.sbin/watch/watch.c
+++ b/usr.sbin/watch/watch.c
@@ -15,7 +15,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/watch/watch.c,v 1.15.2.1 1999/08/29 15:49:00 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/wicontrol/Makefile b/usr.sbin/wicontrol/Makefile
index 47ea6f84010e..f89b0a7468c7 100644
--- a/usr.sbin/wicontrol/Makefile
+++ b/usr.sbin/wicontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/wicontrol/Makefile,v 1.1.2.2 1999/08/29 15:49:01 peter Exp $
 PROG=	wicontrol
 SRCS=	wicontrol.c
 
diff --git a/usr.sbin/wicontrol/wicontrol.8 b/usr.sbin/wicontrol/wicontrol.8
index ad7d03c5cb64..df2fd2564a93 100644
--- a/usr.sbin/wicontrol/wicontrol.8
+++ b/usr.sbin/wicontrol/wicontrol.8
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/wicontrol/wicontrol.8,v 1.6.2.5 1999/08/29 15:49:02 peter Exp $
 .\"
 .Dd April 21, 1999
 .Dt WICONTROL 8
diff --git a/usr.sbin/wicontrol/wicontrol.c b/usr.sbin/wicontrol/wicontrol.c
index bdb9e2068b03..f19dec7e52ec 100644
--- a/usr.sbin/wicontrol/wicontrol.c
+++ b/usr.sbin/wicontrol/wicontrol.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/wicontrol/wicontrol.c,v 1.6.2.2 1999/08/29 15:49:02 peter Exp $
  */
 
 #include <sys/types.h>
@@ -56,7 +56,7 @@
 static const char copyright[] = "@(#) Copyright (c) 1997, 1998, 1999\
 	Bill Paul. All rights reserved.";
 static const char rcsid[] =
-	"@(#) $FreeBSD$";
+	"@(#) $FreeBSD: src/usr.sbin/wicontrol/wicontrol.c,v 1.6.2.2 1999/08/29 15:49:02 peter Exp $";
 #endif
 
 static void wi_getval		__P((char *, struct wi_req *));
diff --git a/usr.sbin/wlconfig/Makefile b/usr.sbin/wlconfig/Makefile
index 0ebb7b4e174b..a358d6bd8090 100644
--- a/usr.sbin/wlconfig/Makefile
+++ b/usr.sbin/wlconfig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/wlconfig/Makefile,v 1.2.4.1 1999/08/29 15:49:03 peter Exp $
 PROG=	wlconfig
 SRCS=	wlconfig.c
 CFLAGS+= -Wall
diff --git a/usr.sbin/wlconfig/wlconfig.c b/usr.sbin/wlconfig/wlconfig.c
index f6d7882459ab..9426f9903723 100644
--- a/usr.sbin/wlconfig/wlconfig.c
+++ b/usr.sbin/wlconfig/wlconfig.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/wlconfig/wlconfig.c,v 1.7.2.1 1999/08/29 15:49:04 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/wormcontrol/wormcontrol.8 b/usr.sbin/wormcontrol/wormcontrol.8
index 7406d1d7e746..e504974b5999 100644
--- a/usr.sbin/wormcontrol/wormcontrol.8
+++ b/usr.sbin/wormcontrol/wormcontrol.8
@@ -32,7 +32,7 @@
 .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/wormcontrol/wormcontrol.8,v 1.12.2.1 1999/08/29 15:49:05 peter Exp $
 .\"
 .\" arrgh, hilit19 needs this" :-(
 .Dd January 27, 1996
diff --git a/usr.sbin/wormcontrol/wormcontrol.c b/usr.sbin/wormcontrol/wormcontrol.c
index a18f6b0b627b..8614d8d9e008 100644
--- a/usr.sbin/wormcontrol/wormcontrol.c
+++ b/usr.sbin/wormcontrol/wormcontrol.c
@@ -35,7 +35,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/wormcontrol/wormcontrol.c,v 1.8.2.1 1999/08/29 15:49:05 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/xntpd/Makefile b/usr.sbin/xntpd/Makefile
index c1623c7cdaf9..ade65619bfac 100644
--- a/usr.sbin/xntpd/Makefile
+++ b/usr.sbin/xntpd/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for xntpd.
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/xntpd/Makefile,v 1.7.2.1 1999/08/29 15:49:07 peter Exp $
 #
 SUBDIR= lib parse xntpd xntpdc ntpq ntpdate ntptrace authstuff
 
diff --git a/usr.sbin/xntpd/Makefile.inc b/usr.sbin/xntpd/Makefile.inc
index 3fa34c048038..eb59506456f3 100644
--- a/usr.sbin/xntpd/Makefile.inc
+++ b/usr.sbin/xntpd/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/xntpd/Makefile.inc,v 1.17.2.1 1999/08/29 15:49:08 peter Exp $
 
 DEFS_LOCAL=-DREFCLOCK -DPARSE -DUDP_WILDCARD_DELIVERY
 NTPDEFS=   -DSYS_FREEBSD -DSYS_44BSD
diff --git a/usr.sbin/xntpd/README.FreeBSD b/usr.sbin/xntpd/README.FreeBSD
index 3d41380f82c3..655cef3d76bc 100644
--- a/usr.sbin/xntpd/README.FreeBSD
+++ b/usr.sbin/xntpd/README.FreeBSD
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $FreeBSD: src/usr.sbin/xntpd/README.FreeBSD,v 1.10.2.1 1999/08/29 15:49:08 peter Exp $
 
 This version of NTP was converted to the BSD-style Makefile system by
 Garrett Wollman (wollman@FreeBSD.org); it is based on version
diff --git a/usr.sbin/xntpd/authstuff/Makefile b/usr.sbin/xntpd/authstuff/Makefile
index bf6ec874cc73..b82ae3b2d11f 100644
--- a/usr.sbin/xntpd/authstuff/Makefile
+++ b/usr.sbin/xntpd/authstuff/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/xntpd/authstuff/Makefile,v 1.6.2.1 1999/08/29 15:49:10 peter Exp $
 #
 # Most of the programs in this directory are completely useless for the
 # NTP configuration that we provide by default.
diff --git a/usr.sbin/xntpd/clockstuff/Makefile b/usr.sbin/xntpd/clockstuff/Makefile
index 22bc486094fd..d71ea8251af4 100644
--- a/usr.sbin/xntpd/clockstuff/Makefile
+++ b/usr.sbin/xntpd/clockstuff/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/xntpd/clockstuff/Makefile,v 1.5.2.1 1999/08/29 15:49:11 peter Exp $
 #
 
 PROG= propdelay
diff --git a/usr.sbin/xntpd/doc/ntpdate.8 b/usr.sbin/xntpd/doc/ntpdate.8
index fc34f075fa9d..1f6845cb3300 100644
--- a/usr.sbin/xntpd/doc/ntpdate.8
+++ b/usr.sbin/xntpd/doc/ntpdate.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/xntpd/doc/ntpdate.8,v 1.4.2.1 1999/08/29 15:49:13 peter Exp $
 .\"
 .Dd December 21, 1993
 .Dt NTPDATE 8
diff --git a/usr.sbin/xntpd/doc/ntpq.8 b/usr.sbin/xntpd/doc/ntpq.8
index 4a99fab8a072..1b9e8bf1e7e6 100644
--- a/usr.sbin/xntpd/doc/ntpq.8
+++ b/usr.sbin/xntpd/doc/ntpq.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/xntpd/doc/ntpq.8,v 1.5.2.3 1999/09/20 09:50:01 phantom Exp $
 .\"
 .Dd December 21, 1993
 .Dt NTPQ 8
diff --git a/usr.sbin/xntpd/doc/ntptrace.8 b/usr.sbin/xntpd/doc/ntptrace.8
index 1ef35959cb59..bbc935ff5fce 100644
--- a/usr.sbin/xntpd/doc/ntptrace.8
+++ b/usr.sbin/xntpd/doc/ntptrace.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/xntpd/doc/ntptrace.8,v 1.2.2.1 1999/08/29 15:49:15 peter Exp $
 .\"
 .Dd December 21, 1993
 .Dt NTPTRACE 8
diff --git a/usr.sbin/xntpd/doc/tickadj.8 b/usr.sbin/xntpd/doc/tickadj.8
index 4ba5a090831e..62e6ad635528 100644
--- a/usr.sbin/xntpd/doc/tickadj.8
+++ b/usr.sbin/xntpd/doc/tickadj.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/xntpd/doc/tickadj.8,v 1.6.2.1 1999/08/29 15:49:15 peter Exp $
 .\"
 .Dd December 21, 1993
 .Dt TICKADJ 8
diff --git a/usr.sbin/xntpd/doc/xntpd.8 b/usr.sbin/xntpd/doc/xntpd.8
index a4a290c77e5a..3e80036b2d35 100644
--- a/usr.sbin/xntpd/doc/xntpd.8
+++ b/usr.sbin/xntpd/doc/xntpd.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/xntpd/doc/xntpd.8,v 1.5.2.2 1999/08/29 15:49:16 peter Exp $
 .\"
 .Dd December 21, 1993
 .Dt XNTPD 8
diff --git a/usr.sbin/xntpd/doc/xntpdc.8 b/usr.sbin/xntpd/doc/xntpdc.8
index cd6fff0ed0e4..30e515e7b2a7 100644
--- a/usr.sbin/xntpd/doc/xntpdc.8
+++ b/usr.sbin/xntpd/doc/xntpdc.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/xntpd/doc/xntpdc.8,v 1.3.2.1 1999/08/29 15:49:16 peter Exp $
 .\"
 .Dd December 21, 1993
 .Dt XNTPDC 8
diff --git a/usr.sbin/xntpd/kernel/chuinit.c b/usr.sbin/xntpd/kernel/chuinit.c
index 77a4cd2cc4b8..885784932f75 100644
--- a/usr.sbin/xntpd/kernel/chuinit.c
+++ b/usr.sbin/xntpd/kernel/chuinit.c
@@ -1,7 +1,7 @@
 /*
 **	dynamically loadable chu driver
 **
-** $FreeBSD$
+** $FreeBSD: src/usr.sbin/xntpd/kernel/chuinit.c,v 1.2.8.1 1999/08/29 15:49:18 peter Exp $
 **
 **	william robertson <rob@agate.berkeley.edu>
 */
diff --git a/usr.sbin/xntpd/kernel/clkinit.c b/usr.sbin/xntpd/kernel/clkinit.c
index 9dae10d4e162..d4a05511d431 100644
--- a/usr.sbin/xntpd/kernel/clkinit.c
+++ b/usr.sbin/xntpd/kernel/clkinit.c
@@ -1,7 +1,7 @@
 /*
 **	dynamically loadable clk driver
 **
-** $FreeBSD$
+** $FreeBSD: src/usr.sbin/xntpd/kernel/clkinit.c,v 1.2.8.1 1999/08/29 15:49:18 peter Exp $
 **
 **	william robertson <rob@agate.berkeley.edu>
 */
diff --git a/usr.sbin/xntpd/lib/Makefile b/usr.sbin/xntpd/lib/Makefile
index 19b01ddb4275..57f0c73b145f 100644
--- a/usr.sbin/xntpd/lib/Makefile
+++ b/usr.sbin/xntpd/lib/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/xntpd/lib/Makefile,v 1.8.2.1 1999/08/29 15:49:20 peter Exp $
 #
 
 CFLAGS+= -I${.CURDIR}/../include
diff --git a/usr.sbin/xntpd/lib/machines.c b/usr.sbin/xntpd/lib/machines.c
index b6cd04b7f7df..3d1e5888154a 100644
--- a/usr.sbin/xntpd/lib/machines.c
+++ b/usr.sbin/xntpd/lib/machines.c
@@ -2,7 +2,7 @@
  *
  * Real bummers unite !
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/xntpd/lib/machines.c,v 1.3.2.1 1999/08/29 15:49:22 peter Exp $
  */
 
 #include "ntp_stdlib.h"
diff --git a/usr.sbin/xntpd/ntpdate/Makefile b/usr.sbin/xntpd/ntpdate/Makefile
index f56183526909..d2b48f07d331 100644
--- a/usr.sbin/xntpd/ntpdate/Makefile
+++ b/usr.sbin/xntpd/ntpdate/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/xntpd/ntpdate/Makefile,v 1.10.2.1 1999/08/29 15:49:24 peter Exp $
 #
 
 CFLAGS+= -I${.CURDIR}/../include
diff --git a/usr.sbin/xntpd/ntpq/Makefile b/usr.sbin/xntpd/ntpq/Makefile
index 669b40804bfe..7b09c685ce68 100644
--- a/usr.sbin/xntpd/ntpq/Makefile
+++ b/usr.sbin/xntpd/ntpq/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/xntpd/ntpq/Makefile,v 1.10.2.1 1999/08/29 15:49:25 peter Exp $
 #
 
 CFLAGS+= -I${.CURDIR}/../include
diff --git a/usr.sbin/xntpd/ntptrace/Makefile b/usr.sbin/xntpd/ntptrace/Makefile
index 1b704ba44ba0..cafd33a42076 100644
--- a/usr.sbin/xntpd/ntptrace/Makefile
+++ b/usr.sbin/xntpd/ntptrace/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/xntpd/ntptrace/Makefile,v 1.9.2.1 1999/08/29 15:49:26 peter Exp $
 #
 
 CFLAGS+= -I${.CURDIR}/../include
diff --git a/usr.sbin/xntpd/parse/Makefile b/usr.sbin/xntpd/parse/Makefile
index 444f23dd7a35..c17a7cd0c567 100644
--- a/usr.sbin/xntpd/parse/Makefile
+++ b/usr.sbin/xntpd/parse/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/xntpd/parse/Makefile,v 1.3.2.1 1999/08/29 15:49:28 peter Exp $
 #
 
 PARSEFLAGS= -DCLOCK_SCHMID -DCLOCK_DCF7000 -DCLOCK_MEINBERG \
diff --git a/usr.sbin/xntpd/parse/clk_trimtaip.c b/usr.sbin/xntpd/parse/clk_trimtaip.c
index ac0e75c8b958..d54388b078b4 100644
--- a/usr.sbin/xntpd/parse/clk_trimtaip.c
+++ b/usr.sbin/xntpd/parse/clk_trimtaip.c
@@ -1,6 +1,6 @@
 #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS)) && defined(CLOCK_TRIMTAIP)
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/xntpd/parse/clk_trimtaip.c,v 1.1.1.1.10.1 1999/08/29 15:49:29 peter Exp $
  *
  * Trimble SV6 clock support
  */
diff --git a/usr.sbin/xntpd/parse/clk_trimtsip.c b/usr.sbin/xntpd/parse/clk_trimtsip.c
index 7a4e3ddba080..0d50aa81e6ab 100644
--- a/usr.sbin/xntpd/parse/clk_trimtsip.c
+++ b/usr.sbin/xntpd/parse/clk_trimtsip.c
@@ -1,6 +1,6 @@
 #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS)) && defined(CLOCK_TRIMTSIP)
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/xntpd/parse/clk_trimtsip.c,v 1.3.2.1 1999/08/29 15:49:29 peter Exp $
  *
  * Trimble TSIP support - CURRENTLY VERY MUCH UNDER CONSTRUCTION
  */
diff --git a/usr.sbin/xntpd/parse/util/Makefile b/usr.sbin/xntpd/parse/util/Makefile
index 496b70e3f58d..c56edf5b1b48 100644
--- a/usr.sbin/xntpd/parse/util/Makefile
+++ b/usr.sbin/xntpd/parse/util/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/xntpd/parse/util/Makefile,v 1.5.2.1 1999/08/29 15:49:30 peter Exp $
 #
 
 CFLAGS+= -I${.CURDIR}/../../include
diff --git a/usr.sbin/xntpd/util/Makefile b/usr.sbin/xntpd/util/Makefile
index 4eb52756cfcf..1db15c6253c0 100644
--- a/usr.sbin/xntpd/util/Makefile
+++ b/usr.sbin/xntpd/util/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/xntpd/util/Makefile,v 1.9.2.1 1999/08/29 15:49:32 peter Exp $
 #
 
 CFLAGS+= -I${.CURDIR}/../include
diff --git a/usr.sbin/xntpd/util/tickadj.c b/usr.sbin/xntpd/util/tickadj.c
index 87ac4f257f80..99484ad01ca6 100644
--- a/usr.sbin/xntpd/util/tickadj.c
+++ b/usr.sbin/xntpd/util/tickadj.c
@@ -8,7 +8,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/xntpd/util/tickadj.c,v 1.15.2.1 1999/08/29 15:49:33 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/xntpd/xntpd/Makefile b/usr.sbin/xntpd/xntpd/Makefile
index 0b655841a23e..c14f5cb7d7ac 100644
--- a/usr.sbin/xntpd/xntpd/Makefile
+++ b/usr.sbin/xntpd/xntpd/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/xntpd/xntpd/Makefile,v 1.13.2.1 1999/08/29 15:49:34 peter Exp $
 #
 
 CFLAGS+= -I${.CURDIR}/../include
diff --git a/usr.sbin/xntpd/xntpdc/Makefile b/usr.sbin/xntpd/xntpdc/Makefile
index a224c48ae088..6cfe419fb32d 100644
--- a/usr.sbin/xntpd/xntpdc/Makefile
+++ b/usr.sbin/xntpd/xntpdc/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/xntpd/xntpdc/Makefile,v 1.9.2.1 1999/08/29 15:49:37 peter Exp $
 #
 
 CFLAGS+= -I${.CURDIR}/../include
diff --git a/usr.sbin/xten/Makefile b/usr.sbin/xten/Makefile
index a86f58632a12..f17256c7e0a5 100644
--- a/usr.sbin/xten/Makefile
+++ b/usr.sbin/xten/Makefile
@@ -1,5 +1,5 @@
 #	Makefile for xten (Stark) 10/30/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/xten/Makefile,v 1.7.2.1 1999/08/29 15:49:37 peter Exp $
 
 PROG=	xten
 CFLAGS+= -I${.CURDIR}/../../libexec/xtend
diff --git a/usr.sbin/xten/xten.1 b/usr.sbin/xten/xten.1
index 51a9170aab38..cdea78c290bb 100644
--- a/usr.sbin/xten/xten.1
+++ b/usr.sbin/xten/xten.1
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/xten/xten.1,v 1.8.2.1 1999/08/29 15:49:39 peter Exp $
 .\"
 .Dd October 30, 1993
 .Dt XTEN 1
diff --git a/usr.sbin/xten/xten.c b/usr.sbin/xten/xten.c
index 1157ab877ae0..3f3277591b1e 100644
--- a/usr.sbin/xten/xten.c
+++ b/usr.sbin/xten/xten.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/xten/xten.c,v 1.3.2.1 1999/08/29 15:49:39 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/yp_mkdb/Makefile b/usr.sbin/yp_mkdb/Makefile
index 18f79b4cabb2..6e8f9eeaef4a 100644
--- a/usr.sbin/yp_mkdb/Makefile
+++ b/usr.sbin/yp_mkdb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/yp_mkdb/Makefile,v 1.4.2.1 1999/08/29 15:49:41 peter Exp $
 
 PROG=	yp_mkdb
 SRCS=	yp_mkdb.c yp_dblookup.c yp_dbwrite.c
diff --git a/usr.sbin/yp_mkdb/yp_mkdb.8 b/usr.sbin/yp_mkdb/yp_mkdb.8
index 61a7efa18a5b..906bb5852391 100644
--- a/usr.sbin/yp_mkdb/yp_mkdb.8
+++ b/usr.sbin/yp_mkdb/yp_mkdb.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/yp_mkdb/yp_mkdb.8,v 1.8.2.2 1999/08/29 15:49:41 peter Exp $
 .\"
 .Dd March 12, 1996
 .Dt YP_MKDB 8
diff --git a/usr.sbin/yp_mkdb/yp_mkdb.c b/usr.sbin/yp_mkdb/yp_mkdb.c
index a5fed00631db..ef21af914650 100644
--- a/usr.sbin/yp_mkdb/yp_mkdb.c
+++ b/usr.sbin/yp_mkdb/yp_mkdb.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/yp_mkdb/yp_mkdb.c,v 1.8.2.3 1999/09/01 12:45:45 sheldonh Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/ypbind/Makefile b/usr.sbin/ypbind/Makefile
index 2f0ff5fe82de..b48d6f010fcd 100644
--- a/usr.sbin/ypbind/Makefile
+++ b/usr.sbin/ypbind/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ypbind/Makefile,v 1.5.2.1 1999/08/29 15:49:43 peter Exp $
 
 SRCS=	ypbind.c yp_ping.c
 PROG=	ypbind
diff --git a/usr.sbin/ypbind/yp_ping.c b/usr.sbin/ypbind/yp_ping.c
index aaf71d64ddcd..3d7a13322316 100644
--- a/usr.sbin/ypbind/yp_ping.c
+++ b/usr.sbin/ypbind/yp_ping.c
@@ -72,7 +72,7 @@ static char *sccsid = "@(#)from: clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)from: clnt_udp.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/ypbind/yp_ping.c,v 1.4.2.1 1999/08/29 15:49:43 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/ypbind/ypbind.8 b/usr.sbin/ypbind/ypbind.8
index e8055f3742da..8517d4ba1d4e 100644
--- a/usr.sbin/ypbind/ypbind.8
+++ b/usr.sbin/ypbind/ypbind.8
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ypbind/ypbind.8,v 1.12.2.1 1999/08/29 15:49:44 peter Exp $
 .\"
 .Dd April 9, 1995
 .Dt YPBIND 8
diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c
index 7e2fa2cd5d62..f0370a0c2abd 100644
--- a/usr.sbin/ypbind/ypbind.c
+++ b/usr.sbin/ypbind/ypbind.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/ypbind/ypbind.c,v 1.27.2.2 1999/08/29 15:49:45 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/yppoll/Makefile b/usr.sbin/yppoll/Makefile
index e099f4d6f317..55ae9381b3a7 100644
--- a/usr.sbin/yppoll/Makefile
+++ b/usr.sbin/yppoll/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/yppoll/Makefile,v 1.4.2.1 1999/08/29 15:49:47 peter Exp $
 
 PROG=	yppoll
 MAN8=	yppoll.8
diff --git a/usr.sbin/yppoll/yppoll.8 b/usr.sbin/yppoll/yppoll.8
index 88d07deed89b..8f489a24f6ca 100644
--- a/usr.sbin/yppoll/yppoll.8
+++ b/usr.sbin/yppoll/yppoll.8
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/yppoll/yppoll.8,v 1.3.2.1 1999/08/29 15:49:47 peter Exp $
 .\"
 .Dd October 25, 1994
 .Dt YPPOLL 8
diff --git a/usr.sbin/yppoll/yppoll.c b/usr.sbin/yppoll/yppoll.c
index 820938f9759e..319b6ad1a531 100644
--- a/usr.sbin/yppoll/yppoll.c
+++ b/usr.sbin/yppoll/yppoll.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/yppoll/yppoll.c,v 1.3.2.1 1999/08/29 15:49:48 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/yppush/Makefile b/usr.sbin/yppush/Makefile
index abaa5784d640..633a32ee38b1 100644
--- a/usr.sbin/yppush/Makefile
+++ b/usr.sbin/yppush/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/yppush/Makefile,v 1.5.2.1 1999/08/29 15:49:49 peter Exp $
 
 PROG=	yppush
 SRCS=	ypxfr_getmap.c yp_dblookup.c yp_error.c ypxfr_misc.c yppush_main.c \
diff --git a/usr.sbin/yppush/yppush.8 b/usr.sbin/yppush/yppush.8
index 1fcf264ac50f..3ffc59e42d32 100644
--- a/usr.sbin/yppush/yppush.8
+++ b/usr.sbin/yppush/yppush.8
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/yppush/yppush.8,v 1.8.2.1 1999/08/29 15:49:49 peter Exp $
 .\"
 .Dd February 5, 1995
 .Dt YPPUSH 8
diff --git a/usr.sbin/yppush/yppush_extern.h b/usr.sbin/yppush/yppush_extern.h
index 86ca7a26faed..4c80eacd46a9 100644
--- a/usr.sbin/yppush/yppush_extern.h
+++ b/usr.sbin/yppush/yppush_extern.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/yppush/yppush_extern.h,v 1.3.2.1 1999/08/29 15:49:50 peter Exp $
  */
 
 /* Privately defined error codes. */
diff --git a/usr.sbin/yppush/yppush_main.c b/usr.sbin/yppush/yppush_main.c
index 39b5bdf43d76..a727ddfdd476 100644
--- a/usr.sbin/yppush/yppush_main.c
+++ b/usr.sbin/yppush/yppush_main.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/yppush/yppush_main.c,v 1.10.2.1 1999/08/29 15:49:50 peter Exp $";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/usr.sbin/ypserv/Makefile b/usr.sbin/ypserv/Makefile
index 851cc228ada3..0727d8d7821a 100644
--- a/usr.sbin/ypserv/Makefile
+++ b/usr.sbin/ypserv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ypserv/Makefile,v 1.16.2.1 1999/08/29 15:49:52 peter Exp $
 
 PROG=	ypserv
 SRCS=	yp_svc.c yp_server.c yp_dblookup.c yp_dnslookup.c \
diff --git a/usr.sbin/ypserv/Makefile.yp b/usr.sbin/ypserv/Makefile.yp
index 61a5636f7b21..f32a2c5c1841 100644
--- a/usr.sbin/ypserv/Makefile.yp
+++ b/usr.sbin/ypserv/Makefile.yp
@@ -1,7 +1,7 @@
 #
 # Makefile for the NIS databases
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ypserv/Makefile.yp,v 1.25.2.3 1999/08/29 15:49:53 peter Exp $
 #
 # This Makefile should only be run on the NIS master server of a domain.
 # All updated maps will be pushed to all NIS slave servers listed in the
diff --git a/usr.sbin/ypserv/yp_access.c b/usr.sbin/ypserv/yp_access.c
index d6089fe10327..6cd8ac4e95eb 100644
--- a/usr.sbin/ypserv/yp_access.c
+++ b/usr.sbin/ypserv/yp_access.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/ypserv/yp_access.c,v 1.16.2.1 1999/08/29 15:49:53 peter Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/usr.sbin/ypserv/yp_dblookup.c b/usr.sbin/ypserv/yp_dblookup.c
index f558b0534683..89d8ca0bd50f 100644
--- a/usr.sbin/ypserv/yp_dblookup.c
+++ b/usr.sbin/ypserv/yp_dblookup.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/ypserv/yp_dblookup.c,v 1.15.2.2 1999/08/29 15:49:54 peter Exp $";
 #endif /* not lint */
 
 #include <db.h>
diff --git a/usr.sbin/ypserv/yp_dnslookup.c b/usr.sbin/ypserv/yp_dnslookup.c
index 3a62694033ae..21d8e396ae55 100644
--- a/usr.sbin/ypserv/yp_dnslookup.c
+++ b/usr.sbin/ypserv/yp_dnslookup.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/ypserv/yp_dnslookup.c,v 1.15.2.1 1999/08/29 15:49:55 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/ypserv/yp_error.c b/usr.sbin/ypserv/yp_error.c
index d1ffd40ef4fb..b51decbf8227 100644
--- a/usr.sbin/ypserv/yp_error.c
+++ b/usr.sbin/ypserv/yp_error.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/ypserv/yp_error.c,v 1.6.2.1 1999/08/29 15:49:55 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/ypserv/yp_extern.h b/usr.sbin/ypserv/yp_extern.h
index cefab07b2b0b..f04087097fec 100644
--- a/usr.sbin/ypserv/yp_extern.h
+++ b/usr.sbin/ypserv/yp_extern.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ypserv/yp_extern.h,v 1.12.2.2 1999/08/29 15:49:56 peter Exp $
  */
 
 #include <db.h>
diff --git a/usr.sbin/ypserv/yp_main.c b/usr.sbin/ypserv/yp_main.c
index 9fdb39692a7a..ef407b5063db 100644
--- a/usr.sbin/ypserv/yp_main.c
+++ b/usr.sbin/ypserv/yp_main.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/ypserv/yp_main.c,v 1.18.2.2 1999/08/29 15:49:56 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/ypserv/yp_server.c b/usr.sbin/ypserv/yp_server.c
index aa95bba1bc62..067a9776b335 100644
--- a/usr.sbin/ypserv/yp_server.c
+++ b/usr.sbin/ypserv/yp_server.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/ypserv/yp_server.c,v 1.26.2.4 1999/08/29 15:49:57 peter Exp $";
 #endif /* not lint */
 
 #include "yp.h"
diff --git a/usr.sbin/ypserv/yp_svc_udp.c b/usr.sbin/ypserv/yp_svc_udp.c
index 40ee4736a622..87cd80b4359f 100644
--- a/usr.sbin/ypserv/yp_svc_udp.c
+++ b/usr.sbin/ypserv/yp_svc_udp.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/ypserv/yp_svc_udp.c,v 1.4.2.1 1999/08/29 15:49:57 peter Exp $";
 #endif /* not lint */
 
 #include <rpc/rpc.h>
diff --git a/usr.sbin/ypserv/ypinit.8 b/usr.sbin/ypserv/ypinit.8
index 6e2c0149e4db..d19ed1913ea4 100644
--- a/usr.sbin/ypserv/ypinit.8
+++ b/usr.sbin/ypserv/ypinit.8
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ypserv/ypinit.8,v 1.4.2.1 1999/08/29 15:49:58 peter Exp $
 .\"
 .Dd November 10, 1997
 .Dt YPINIT 8
diff --git a/usr.sbin/ypserv/ypinit.sh b/usr.sbin/ypserv/ypinit.sh
index 8d1871b404f1..f25edb3f8a27 100644
--- a/usr.sbin/ypserv/ypinit.sh
+++ b/usr.sbin/ypserv/ypinit.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ypserv/ypinit.sh,v 1.2.2.1 1999/08/29 15:49:58 peter Exp $
 #
 # ypinit.sh - setup an master or slave server.
 # (Taken from OpenBSD and modified for FreeBSD.)
diff --git a/usr.sbin/ypserv/ypserv.8 b/usr.sbin/ypserv/ypserv.8
index 168769093006..22db78066668 100644
--- a/usr.sbin/ypserv/ypserv.8
+++ b/usr.sbin/ypserv/ypserv.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ypserv/ypserv.8,v 1.15.2.2 1999/08/29 15:49:59 peter Exp $
 .\"
 .Dd February 4, 1995
 .Dt YPSERV 8
diff --git a/usr.sbin/ypset/ypset.8 b/usr.sbin/ypset/ypset.8
index 0e5b4bf46bd2..3c287e54de58 100644
--- a/usr.sbin/ypset/ypset.8
+++ b/usr.sbin/ypset/ypset.8
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ypset/ypset.8,v 1.6.2.1 1999/08/29 15:50:01 peter Exp $
 .\"
 .Dd October 25, 1994
 .Dt YPSET 8
diff --git a/usr.sbin/ypset/ypset.c b/usr.sbin/ypset/ypset.c
index 578138d9162f..5259160677d4 100644
--- a/usr.sbin/ypset/ypset.c
+++ b/usr.sbin/ypset/ypset.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/ypset/ypset.c,v 1.4.2.1 1999/08/29 15:50:02 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/zic/Makefile b/usr.sbin/zic/Makefile
index f2d9a0caa01d..c00c9479a467 100644
--- a/usr.sbin/zic/Makefile
+++ b/usr.sbin/zic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/zic/Makefile,v 1.3.2.1 1999/08/29 15:50:03 peter Exp $
 SUBDIR=	zic zdump
 
 .include <bsd.subdir.mk>
diff --git a/usr.sbin/zic/Makefile.inc b/usr.sbin/zic/Makefile.inc
index b915adff92ab..21d78af5d944 100644
--- a/usr.sbin/zic/Makefile.inc
+++ b/usr.sbin/zic/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/zic/Makefile.inc,v 1.3.2.1 1999/08/29 15:50:03 peter Exp $
 
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/usr.sbin/zic/ialloc.c b/usr.sbin/zic/ialloc.c
index eef295a7d52d..beaf1f47b3e7 100644
--- a/usr.sbin/zic/ialloc.c
+++ b/usr.sbin/zic/ialloc.c
@@ -6,7 +6,7 @@ static char	elsieid[] = "@(#)ialloc.c	8.28";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/zic/ialloc.c,v 1.3.2.1 1999/08/29 15:50:04 peter Exp $";
 #endif /* not lint */
 
 /*LINTLIBRARY*/
diff --git a/usr.sbin/zic/scheck.c b/usr.sbin/zic/scheck.c
index 3458e383b090..ae3cdafb169c 100644
--- a/usr.sbin/zic/scheck.c
+++ b/usr.sbin/zic/scheck.c
@@ -6,7 +6,7 @@ static char	elsieid[] = "@(#)scheck.c	8.13";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/zic/scheck.c,v 1.2.2.1 1999/08/29 15:50:04 peter Exp $";
 #endif /* not lint */
 
 /*LINTLIBRARY*/
diff --git a/usr.sbin/zic/zdump.8 b/usr.sbin/zic/zdump.8
index d0a0df9cee58..5ddc5eab9be8 100644
--- a/usr.sbin/zic/zdump.8
+++ b/usr.sbin/zic/zdump.8
@@ -1,6 +1,6 @@
 .\"
 .\"	@(#)zdump.8	7.3
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/zic/zdump.8,v 1.5.2.1 1999/08/29 15:50:05 peter Exp $
 .\"
 .Dd September 13, 1994
 .Dt ZDUMP 8
diff --git a/usr.sbin/zic/zdump.c b/usr.sbin/zic/zdump.c
index 45a1e137d17f..31f360506849 100644
--- a/usr.sbin/zic/zdump.c
+++ b/usr.sbin/zic/zdump.c
@@ -6,7 +6,7 @@ static char	elsieid[] = "@(#)zdump.c	7.24";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/zic/zdump.c,v 1.4.2.1 1999/08/29 15:50:06 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/zic/zdump/Makefile b/usr.sbin/zic/zdump/Makefile
index ca10ac2c3375..f71dd1dc73ac 100644
--- a/usr.sbin/zic/zdump/Makefile
+++ b/usr.sbin/zic/zdump/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/zic/zdump/Makefile,v 1.3.2.1 1999/08/29 15:50:08 peter Exp $
 
 .PATH:	${.CURDIR}/..
 
diff --git a/usr.sbin/zic/zic.c b/usr.sbin/zic/zic.c
index 2fcbddacd895..61237136d98d 100644
--- a/usr.sbin/zic/zic.c
+++ b/usr.sbin/zic/zic.c
@@ -6,7 +6,7 @@ static char	elsieid[] = "@(#)zic.c	7.77";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/zic/zic.c,v 1.7.2.1 1999/08/29 15:50:06 peter Exp $";
 #endif /* not lint */
 
 #include "private.h"
diff --git a/usr.sbin/zic/zic/Makefile b/usr.sbin/zic/zic/Makefile
index f8ad4db11253..5fa0786a6cfb 100644
--- a/usr.sbin/zic/zic/Makefile
+++ b/usr.sbin/zic/zic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/zic/zic/Makefile,v 1.4.2.1 1999/08/29 15:50:09 peter Exp $
 
 .PATH:	${.CURDIR}/..