remove rcs keyword cruft which doesn't make much sense in CVS.

removal simplifies merging. I left in the RCSID's that are in actual
error table values (*_RCSID typically) but comments had them elided
(Source keywords replaced with a literal pathname, Id totally removed.)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7014 dc483132-0cff-0310-8789-dd5450dbe970

48 files changed, 83 insertions, 156 deletions

diff --git a/src/admin/aname/kdb5_anadd.M b/src/admin/aname/kdb5_anadd.M
index d28606d4c4..84a8735ad9 100644
--- a/src/admin/aname/kdb5_anadd.M
+++ b/src/admin/aname/kdb5_anadd.M
@@ -1,6 +1,5 @@
-.\" $Source$
-.\" $Author$
-.\" $Id$
+.\" admin/aname/kdb5_anadd.M
+.\"
 .\" Copyright 1990 by the Massachusetts Institute of Technology.
 .\"
 .\" Export of this software from the United States of America may
diff --git a/src/admin/convert/kdb5_convert.M b/src/admin/convert/kdb5_convert.M
index 522766a5f4..802df4a36a 100644
--- a/src/admin/convert/kdb5_convert.M
+++ b/src/admin/convert/kdb5_convert.M
@@ -1,6 +1,5 @@
-.\" $Source$
-.\" $Author$
-.\" $Id$
+.\" admin/convert/kdb5_convert.M
+.\"
 .\" Copyright 1991 by the Massachusetts Institute of Technology.
 .\"
 .\" Export of this software from the United States of America may
diff --git a/src/admin/create/kdb5_create.M b/src/admin/create/kdb5_create.M
index 4a4fc4b294..7f9d3405f9 100644
--- a/src/admin/create/kdb5_create.M
+++ b/src/admin/create/kdb5_create.M
@@ -1,6 +1,5 @@
-.\" $Source$
-.\" $Author$
-.\" $Id$
+.\" admin/create/kdb5_create.M
+.\"
 .\" Copyright 1990 by the Massachusetts Institute of Technology.
 .\"
 .\" Export of this software from the United States of America may
diff --git a/src/admin/destroy/kdb5_destroy.M b/src/admin/destroy/kdb5_destroy.M
index 28c3f2f4a1..e50dde92f7 100644
--- a/src/admin/destroy/kdb5_destroy.M
+++ b/src/admin/destroy/kdb5_destroy.M
@@ -1,6 +1,5 @@
-.\" $Source$
-.\" $Author$
-.\" $Id$
+.\" admin/destroy/kdb5_destroy.M
+.\"
 .\" Copyright 1990 by the Massachusetts Institute of Technology.
 .\"
 .\" Export of this software from the United States of America may
diff --git a/src/admin/edit/kdb5_ed_ct.ct b/src/admin/edit/kdb5_ed_ct.ct
index 84ef78ce54..ad36cc517c 100644
--- a/src/admin/edit/kdb5_ed_ct.ct
+++ b/src/admin/edit/kdb5_ed_ct.ct
@@ -1,6 +1,4 @@
-#	$Source$
-#	$Author$
-#	$Id$
+#	admin/edit/kdb5_ed_ct.ct
 #
 # Copyright 1990 by the Massachusetts Institute of Technology.
 # All Rights Reserved.
diff --git a/src/admin/edit/kdb5_edit.M b/src/admin/edit/kdb5_edit.M
index 2f2798defc..514fbdabf3 100644
--- a/src/admin/edit/kdb5_edit.M
+++ b/src/admin/edit/kdb5_edit.M
@@ -1,6 +1,5 @@
-.\" $Source$
-.\" $Author$
-.\" $Id$
+.\" admin/edit/kdb5_edit.M
+.\"
 .\" Copyright 1990 by the Massachusetts Institute of Technology.
 .\"
 .\" Export of this software from the United States of America may
diff --git a/src/admin/stash/kdb5_stash.M b/src/admin/stash/kdb5_stash.M
index 25758ed8f7..c34122e04c 100644
--- a/src/admin/stash/kdb5_stash.M
+++ b/src/admin/stash/kdb5_stash.M
@@ -1,6 +1,5 @@
-.\" $Source$
-.\" $Author$
-.\" $Id$
+.\" admin/stash/kdb5_stash.M
+.\"
 .\" Copyright 1990 by the Massachusetts Institute of Technology.
 .\"
 .\" Export of this software from the United States of America may
diff --git a/src/appl/bsd/rcp.M b/src/appl/bsd/rcp.M
index 7df82a6f00..b8b0a476a3 100644
--- a/src/appl/bsd/rcp.M
+++ b/src/appl/bsd/rcp.M
@@ -1,6 +1,4 @@
-.\" $Source$
-.\" $Author$
-.\" $Header$
+.\" appl/bsd/rcp.M
 .\"
 .\" Copyright (c) 1983 The Regents of the University of California.
 .\" All rights reserved.
diff --git a/src/appl/bsd/rlogin.M b/src/appl/bsd/rlogin.M
index 26ddb6aaf0..b7e8765f39 100644
--- a/src/appl/bsd/rlogin.M
+++ b/src/appl/bsd/rlogin.M
@@ -1,6 +1,4 @@
-.\" $Source$
-.\" $Author$
-.\" $Header$
+.\" appl/bsd/rlogin.M
 .\"
 .\" Copyright (c) 1983 The Regents of the University of California.
 .\" All rights reserved.
diff --git a/src/appl/bsd/rsh.M b/src/appl/bsd/rsh.M
index d9c2177d10..95ddfd0f11 100644
--- a/src/appl/bsd/rsh.M
+++ b/src/appl/bsd/rsh.M
@@ -1,6 +1,4 @@
-.\" $Source$
-.\" $Author$
-.\" $Header$
+.\" appl/bsd/rsh.M
 .\"
 .\" Copyright (c) 1983 The Regents of the University of California.
 .\" All rights reserved.
diff --git a/src/appl/gss-sample/README b/src/appl/gss-sample/README
index 5afa0ed4a9..0ec6bb7d7c 100644
--- a/src/appl/gss-sample/README
+++ b/src/appl/gss-sample/README
@@ -79,5 +79,3 @@ This sample application uses the following GSS-API functions:
 
 Barry Jaspan, bjaspan@security.ov.com
 OpenVision Technologies, Inc.
-
-$Id$
diff --git a/src/appl/sample/sclient/sclient.M b/src/appl/sample/sclient/sclient.M
index 2f916b9b3e..64d634d917 100644
--- a/src/appl/sample/sclient/sclient.M
+++ b/src/appl/sample/sclient/sclient.M
@@ -1,6 +1,5 @@
-.\" $Source$
-.\" $Author$
-.\" $Id$
+.\" appl/sample/sclient/sclient.M
+.\"
 .\" Copyright 1990 by the Massachusetts Institute of Technology.
 .\"
 .\" Export of this software from the United States of America may
diff --git a/src/appl/sample/sserver/sserver.M b/src/appl/sample/sserver/sserver.M
index 0debcb739c..04df561339 100644
--- a/src/appl/sample/sserver/sserver.M
+++ b/src/appl/sample/sserver/sserver.M
@@ -1,6 +1,5 @@
-.\" $Source$
-.\" $Author$
-.\" $Id$
+.\" appl/sample/sserver/sserver.M
+.\"
 .\" Copyright 1990 by the Massachusetts Institute of Technology.
 .\"
 .\" Export of this software from the United States of America may
diff --git a/src/clients/kdestroy/kdestroy.M b/src/clients/kdestroy/kdestroy.M
index 564a1ad9be..90f18a154a 100644
--- a/src/clients/kdestroy/kdestroy.M
+++ b/src/clients/kdestroy/kdestroy.M
@@ -1,6 +1,5 @@
-.\" $Source$
-.\" $Author$
-.\" $Id$
+.\" clients/kdestroy/kdestroy.M
+.\"
 .\" Copyright 1992 by the Massachusetts Institute of Technology.
 .\"
 .\" Export of this software from the United States of America may
diff --git a/src/clients/kinit/kinit.M b/src/clients/kinit/kinit.M
index 0e58eea10b..2ac10ffb41 100644
--- a/src/clients/kinit/kinit.M
+++ b/src/clients/kinit/kinit.M
@@ -1,6 +1,5 @@
-.\" $Source$
-.\" $Author$
-.\" $Id$
+.\" clients/kinit/kinit.M
+.\"
 .\" Copyright 1990 by the Massachusetts Institute of Technology.
 .\"
 .\" Export of this software from the United States of America may
diff --git a/src/clients/klist/klist.M b/src/clients/klist/klist.M
index 47cca44e9b..9cbacabfd6 100644
--- a/src/clients/klist/klist.M
+++ b/src/clients/klist/klist.M
@@ -1,6 +1,5 @@
-.\" $Source$
-.\" $Author$
-.\" $Id$
+.\" clients/klist/klist.M
+.\"
 .\" Copyright 1990 by the Massachusetts Institute of Technology.
 .\"
 .\" Export of this software from the United States of America may
diff --git a/src/kadmin.v4/server/kadm_err.et b/src/kadmin.v4/server/kadm_err.et
index 71c6c3bf97..a192730833 100644
--- a/src/kadmin.v4/server/kadm_err.et
+++ b/src/kadmin.v4/server/kadm_err.et
@@ -1,6 +1,5 @@
-#	$Source$
-#	$Author$
-#	$Header$
+#	kadmin.v4/server/kadm_err.et
+#
 # Copyright 1988 by the Massachusetts Institute of Technology.
 #
 # For copying and distribution information, please see the file
diff --git a/src/kadmin/kpasswd/kpasswd.M b/src/kadmin/kpasswd/kpasswd.M
index a8c2836f05..86150ba3d4 100644
--- a/src/kadmin/kpasswd/kpasswd.M
+++ b/src/kadmin/kpasswd/kpasswd.M
@@ -1,6 +1,4 @@
-.\" $Source$
-.\" $Author$
-.\" $Id$
+.\" kadmin/kpasswd/kpasswd.M
 .\" 
 .\" Copyright 1995 by the Massachusetts Institute of Technology.
 .\"
diff --git a/src/kadmin/v5client/kadmin5.M b/src/kadmin/v5client/kadmin5.M
index e0d11359ec..c840e7fddc 100644
--- a/src/kadmin/v5client/kadmin5.M
+++ b/src/kadmin/v5client/kadmin5.M
@@ -1,6 +1,5 @@
-.\" $Source$
-.\" $Author$
-.\" $Id$
+.\" kadmin/v5client/kadmin5.M
+.\"
 .\" Copyright 1995 by the Massachusetts Institute of Technology.
 .\"
 .\" Export of this software from the United States of America may
diff --git a/src/kadmin/v5client/kadmin5_ct.ct b/src/kadmin/v5client/kadmin5_ct.ct
index 6eee054d52..8404dd7c74 100644
--- a/src/kadmin/v5client/kadmin5_ct.ct
+++ b/src/kadmin/v5client/kadmin5_ct.ct
@@ -1,6 +1,4 @@
-#	$Source$
-#	$Author$
-#	$Id$
+#	kadmin/v5client/kadmin5_ct.ct
 #
 # Copyright 1995 by the Massachusetts Institute of Technology.
 # All Rights Reserved.
diff --git a/src/kadmin/v5server/kadmind5.M b/src/kadmin/v5server/kadmind5.M
index 7de71150a2..43496d9664 100644
--- a/src/kadmin/v5server/kadmind5.M
+++ b/src/kadmin/v5server/kadmind5.M
@@ -1,6 +1,4 @@
-.\" $Source$
-.\" $Author$
-.\" $Id$
+.\" kadmin/v5server/kadmind5.M
 .\" 
 .\" Copyright 1995 by the Massachusetts Institute of Technology.
 .\"
diff --git a/src/kdc/kdc5_err.et b/src/kdc/kdc5_err.et
index f8967f5f30..ab3feb10c5 100644
--- a/src/kdc/kdc5_err.et
+++ b/src/kdc/kdc5_err.et
@@ -1,6 +1,5 @@
 #
-# $Source$
-# $Author$
+# kdc/kdc5_err.et
 #
 # Copyright 1990 by the Massachusetts Institute of Technology.
 #
diff --git a/src/kdc/krb5kdc.M b/src/kdc/krb5kdc.M
index 4d797a58be..3e1565d114 100644
--- a/src/kdc/krb5kdc.M
+++ b/src/kdc/krb5kdc.M
@@ -1,6 +1,5 @@
-.\" $Source$
-.\" $Author$
-.\" $Id$
+.\" kdc/krb5kdc.M
+.\"
 .\" Copyright 1990 by the Massachusetts Institute of Technology.
 .\"
 .\" Export of this software from the United States of America may
diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in
index 8cfb68eeb8..df73986fc7 100644
--- a/src/krb524/Makefile.in
+++ b/src/krb524/Makefile.in
@@ -18,7 +18,6 @@
 # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 # 
-# $Id$
 
 CFLAGS = $(CCOPTS) -DUSE_MASTER  $(DEFS) $(LOCALINCLUDE)
 
diff --git a/src/krb524/README b/src/krb524/README
index 2c7e4fa8fb..1531de0d96 100644
--- a/src/krb524/README
+++ b/src/krb524/README
@@ -18,7 +18,6 @@ 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.
 
-$Id$
 
 Kerberos V5 to Kerberos V4 Credentials Converting Service, ALPHA RELEASE
 ========================================================================
diff --git a/src/krb524/RELEASE_NOTES b/src/krb524/RELEASE_NOTES
index 57d6e7999e..8d1ea9fb9e 100644
--- a/src/krb524/RELEASE_NOTES
+++ b/src/krb524/RELEASE_NOTES
@@ -1,4 +1,3 @@
-$Id$
 
 Kerberos V5 to Kerberos V4 Credentials Converting Service, ALPHA RELEASE
 ========================================================================
diff --git a/src/krb524/krb524_err.et b/src/krb524/krb524_err.et
index d28ed27f77..471252e569 100644
--- a/src/krb524/krb524_err.et
+++ b/src/krb524/krb524_err.et
@@ -18,7 +18,6 @@
 # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 # 
-# $Id$
 
 error_table k524
 
diff --git a/src/lib/des425/util.c b/src/lib/des425/util.c
index 5b88cbc372..99b5e866df 100644
--- a/src/lib/des425/util.c
+++ b/src/lib/des425/util.c
@@ -1,6 +1,5 @@
 /*
- * $Source$
- * $Author$
+ * lib/des425/util.c
  *
  * Copyright 1988 by the Massachusetts Institute of Technology.
  *
@@ -10,11 +9,6 @@
  * Miscellaneous debug printing utilities
  */
 
-#ifndef	lint
-static char rcsid_util_c[] =
-"$Header$";
-#endif	/* lint */
-
 #include <stdio.h>
 
 /* Application include files */
diff --git a/src/lib/gssapi/Makefile.original b/src/lib/gssapi/Makefile.original
index 0ace19c8e0..f875c78498 100644
--- a/src/lib/gssapi/Makefile.original
+++ b/src/lib/gssapi/Makefile.original
@@ -20,8 +20,6 @@
 # PERFORMANCE OF THIS SOFTWARE.
 # 
 
-# $Id$
-
 TOP = ../..
 include $(TOP)/config.mk/template
 
diff --git a/src/lib/gssapi/generic/Makefile.original b/src/lib/gssapi/generic/Makefile.original
index 6fa6194d2d..b877c82a0f 100644
--- a/src/lib/gssapi/generic/Makefile.original
+++ b/src/lib/gssapi/generic/Makefile.original
@@ -20,8 +20,6 @@
 # PERFORMANCE OF THIS SOFTWARE.
 # 
 
-# $Id$
-
 TOP = ../../..
 include $(TOP)/config.mk/template
 
diff --git a/src/lib/gssapi/generic/gssapi.h b/src/lib/gssapi/generic/gssapi.h
index f81fbae756..99390059e8 100644
--- a/src/lib/gssapi/generic/gssapi.h
+++ b/src/lib/gssapi/generic/gssapi.h
@@ -124,7 +124,7 @@ typedef unsigned long gss_uint32;
  * correctly.
  */
 #if sizeof(gss_uint32) != sizeof(OM_uint32)
-#error Incompatible definition of OM_uint32 from xom.h
+/**/#error Incompatible definition of OM_uint32 from xom.h
 #endif
 
 typedef OM_object_identifier	gss_OID_desc, *gss_OID;
@@ -248,7 +248,7 @@ typedef	int		gss_cred_usage_t;
  * Expiration time of 2^32-1 seconds means infinite lifetime for a
  * credential or security context
  */
-#define GSS_C_INDEFINITE 0xfffffffful
+#define GSS_C_INDEFINITE 0xffffffffl
 
 
 /* Major status codes */
@@ -261,9 +261,9 @@ typedef	int		gss_cred_usage_t;
 #define GSS_C_CALLING_ERROR_OFFSET 24
 #define GSS_C_ROUTINE_ERROR_OFFSET 16
 #define GSS_C_SUPPLEMENTARY_OFFSET 0
-#define GSS_C_CALLING_ERROR_MASK 0377ul
-#define GSS_C_ROUTINE_ERROR_MASK 0377ul
-#define GSS_C_SUPPLEMENTARY_MASK 0177777ul
+#define GSS_C_CALLING_ERROR_MASK 0377l
+#define GSS_C_ROUTINE_ERROR_MASK 0377l
+#define GSS_C_SUPPLEMENTARY_MASK 0177777l
 
 /*
  * The macros that test status codes for error conditions.  Note that the
@@ -288,39 +288,39 @@ typedef	int		gss_cred_usage_t;
  * Calling errors:
  */
 #define GSS_S_CALL_INACCESSIBLE_READ \
-                             (1ul << GSS_C_CALLING_ERROR_OFFSET)
+                             (1l << GSS_C_CALLING_ERROR_OFFSET)
 #define GSS_S_CALL_INACCESSIBLE_WRITE \
-                             (2ul << GSS_C_CALLING_ERROR_OFFSET)
+                             (2l << GSS_C_CALLING_ERROR_OFFSET)
 #define GSS_S_CALL_BAD_STRUCTURE \
-                             (3ul << GSS_C_CALLING_ERROR_OFFSET)
+                             (3l << GSS_C_CALLING_ERROR_OFFSET)
 
 /*
  * Routine errors:
  */
-#define GSS_S_BAD_MECH (1ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_BAD_NAME (2ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_BAD_NAMETYPE (3ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_BAD_BINDINGS (4ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_BAD_STATUS (5ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_BAD_SIG (6ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_NO_CRED (7ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_NO_CONTEXT (8ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_DEFECTIVE_TOKEN (9ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_DEFECTIVE_CREDENTIAL (10ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_CREDENTIALS_EXPIRED (11ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_CONTEXT_EXPIRED (12ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_FAILURE (13ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_BAD_QOP (14ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_UNAUTHORIZED (15ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_UNAVAILABLE (16ul << GSS_C_ROUTINE_ERROR_OFFSET)
+#define GSS_S_BAD_MECH (1l << GSS_C_ROUTINE_ERROR_OFFSET)
+#define GSS_S_BAD_NAME (2l << GSS_C_ROUTINE_ERROR_OFFSET)
+#define GSS_S_BAD_NAMETYPE (3l << GSS_C_ROUTINE_ERROR_OFFSET)
+#define GSS_S_BAD_BINDINGS (4l << GSS_C_ROUTINE_ERROR_OFFSET)
+#define GSS_S_BAD_STATUS (5l << GSS_C_ROUTINE_ERROR_OFFSET)
+#define GSS_S_BAD_SIG (6l << GSS_C_ROUTINE_ERROR_OFFSET)
+#define GSS_S_NO_CRED (7l << GSS_C_ROUTINE_ERROR_OFFSET)
+#define GSS_S_NO_CONTEXT (8l << GSS_C_ROUTINE_ERROR_OFFSET)
+#define GSS_S_DEFECTIVE_TOKEN (9l << GSS_C_ROUTINE_ERROR_OFFSET)
+#define GSS_S_DEFECTIVE_CREDENTIAL (10l << GSS_C_ROUTINE_ERROR_OFFSET)
+#define GSS_S_CREDENTIALS_EXPIRED (11l << GSS_C_ROUTINE_ERROR_OFFSET)
+#define GSS_S_CONTEXT_EXPIRED (12l << GSS_C_ROUTINE_ERROR_OFFSET)
+#define GSS_S_FAILURE (13l << GSS_C_ROUTINE_ERROR_OFFSET)
+#define GSS_S_BAD_QOP (14l << GSS_C_ROUTINE_ERROR_OFFSET)
+#define GSS_S_UNAUTHORIZED (15l << GSS_C_ROUTINE_ERROR_OFFSET)
+#define GSS_S_UNAVAILABLE (16l << GSS_C_ROUTINE_ERROR_OFFSET)
 
 /*
  * Supplementary info bits:
  */
-#define GSS_S_CONTINUE_NEEDED (1ul << (GSS_C_SUPPLEMENTARY_OFFSET + 0))
-#define GSS_S_DUPLICATE_TOKEN (1ul << (GSS_C_SUPPLEMENTARY_OFFSET + 1))
-#define GSS_S_OLD_TOKEN (1ul << (GSS_C_SUPPLEMENTARY_OFFSET + 2))
-#define GSS_S_UNSEQ_TOKEN (1ul << (GSS_C_SUPPLEMENTARY_OFFSET + 3))
+#define GSS_S_CONTINUE_NEEDED (1l << (GSS_C_SUPPLEMENTARY_OFFSET + 0))
+#define GSS_S_DUPLICATE_TOKEN (1l << (GSS_C_SUPPLEMENTARY_OFFSET + 1))
+#define GSS_S_OLD_TOKEN (1l << (GSS_C_SUPPLEMENTARY_OFFSET + 2))
+#define GSS_S_UNSEQ_TOKEN (1l << (GSS_C_SUPPLEMENTARY_OFFSET + 3))
 
 
 /*
diff --git a/src/lib/gssapi/generic/gssapi_err_generic.et b/src/lib/gssapi/generic/gssapi_err_generic.et
index cc5ce7c190..91d958d125 100644
--- a/src/lib/gssapi/generic/gssapi_err_generic.et
+++ b/src/lib/gssapi/generic/gssapi_err_generic.et
@@ -20,10 +20,6 @@
 # PERFORMANCE OF THIS SOFTWARE.
 # 
 
-#
-# $Id$
-#
-
 error_table ggss
 
 error_code G_BAD_SERVICE_NAME, "No @ in SERVICE-NAME name string"
diff --git a/src/lib/gssapi/krb5/Makefile.original b/src/lib/gssapi/krb5/Makefile.original
index 0235b4d1f6..4fcfb87dbb 100644
--- a/src/lib/gssapi/krb5/Makefile.original
+++ b/src/lib/gssapi/krb5/Makefile.original
@@ -20,8 +20,6 @@
 # PERFORMANCE OF THIS SOFTWARE.
 # 
 
-# $Id$
-
 TOP = ../../..
 include $(TOP)/config.mk/template
 
diff --git a/src/lib/gssapi/krb5/gssapi_err_krb5.et b/src/lib/gssapi/krb5/gssapi_err_krb5.et
index a06947d601..0f26773b19 100644
--- a/src/lib/gssapi/krb5/gssapi_err_krb5.et
+++ b/src/lib/gssapi/krb5/gssapi_err_krb5.et
@@ -20,10 +20,6 @@
 # PERFORMANCE OF THIS SOFTWARE.
 # 
 
-#
-# $Id$
-#
-
 error_table k5g
 
 error_code KG_CCACHE_NOMATCH, "Principal in credential cache does not match desired name"
diff --git a/src/lib/krb425/krb_err.et b/src/lib/krb425/krb_err.et
index d03288aea4..2411a6f842 100644
--- a/src/lib/krb425/krb_err.et
+++ b/src/lib/krb425/krb_err.et
@@ -3,9 +3,7 @@
 #	For copying and distribution information, see the file
 #	"mit-copyright.h".
 # 
-#	$Source$
-#	$Author$
-#	$Header$
+#	lib/krb425/krb_err.et
 #
 	error_table	krb
 
diff --git a/src/lib/krb5/asn.1/KRB5-asn.py b/src/lib/krb5/asn.1/KRB5-asn.py
index a8a73e45af..989a214fef 100644
--- a/src/lib/krb5/asn.1/KRB5-asn.py
+++ b/src/lib/krb5/asn.1/KRB5-asn.py
@@ -1,6 +1,4 @@
--- $Source$
--- $Author$
--- $Id$
+-- lib/krb5/asn.1/KRB5-asn.py
 --
 -- Copyright 1989 by the Massachusetts Institute of Technology.
 --
diff --git a/src/lib/krb5/error_tables/adm_err.et b/src/lib/krb5/error_tables/adm_err.et
index 3059decbdf..e01ef387be 100644
--- a/src/lib/krb5/error_tables/adm_err.et
+++ b/src/lib/krb5/error_tables/adm_err.et
@@ -1,6 +1,5 @@
-#	$Source$
-#	$Author$
-#	$Header$
+#	lib/krb5/error_tables/adm_err.et
+#
 # Copyright 1988 by the Massachusetts Institute of Technology.
 #
 # For copying and distribution information, please see the file
diff --git a/src/lib/krb5/error_tables/kdb5_err.et b/src/lib/krb5/error_tables/kdb5_err.et
index 6a48ada26c..ba913dff0d 100644
--- a/src/lib/krb5/error_tables/kdb5_err.et
+++ b/src/lib/krb5/error_tables/kdb5_err.et
@@ -1,6 +1,5 @@
 #
-# $Source$
-# $Author$
+# lib/krb5/error_tables/kdb5_err.et
 #
 # Copyright 1990 by the Massachusetts Institute of Technology.
 # All Rights Reserved.
diff --git a/src/lib/krb5/error_tables/krb5_err.et b/src/lib/krb5/error_tables/krb5_err.et
index 369a5446c5..fbe5d58d41 100644
--- a/src/lib/krb5/error_tables/krb5_err.et
+++ b/src/lib/krb5/error_tables/krb5_err.et
@@ -1,6 +1,5 @@
 #
-# $Source$
-# $Author$
+# lib/krb5/error_tables/krb5_err.et
 #
 # Copyright 1989,1990,1991 by the Massachusetts Institute of Technology.
 # All Rights Reserved.
diff --git a/src/slave/kprop.M b/src/slave/kprop.M
index 292cc40365..b5a1a44078 100644
--- a/src/slave/kprop.M
+++ b/src/slave/kprop.M
@@ -1,6 +1,5 @@
-.\" $Source$
-.\" $Author$
-.\" $Id$
+.\" slave/kprop.M
+.\"
 .\" Copyright 1992 by the Massachusetts Institute of Technology.
 .\"
 .\" Export of this software from the United States of America may
diff --git a/src/slave/kpropd.M b/src/slave/kpropd.M
index 15ff7f91a4..90492d1259 100644
--- a/src/slave/kpropd.M
+++ b/src/slave/kpropd.M
@@ -1,6 +1,5 @@
-.\" $Source$
-.\" $Author$
-.\" $Id$
+.\" slave/kpropd.M
+.\"
 .\" Copyright 1992 by the Massachusetts Institute of Technology.
 .\"
 .\" Export of this software from the United States of America may
diff --git a/src/tests/create/Imakefile b/src/tests/create/Imakefile
index 2b401a81e1..24ca9c3999 100644
--- a/src/tests/create/Imakefile
+++ b/src/tests/create/Imakefile
@@ -1,6 +1,4 @@
-#	$Source$
-#	$Author$
-#	$Id$
+#	tests/create/Imakefile
 #
 #  Copyright 1990,1991 by the Massachusetts Institute of Technology.
 #  All Rights Reserved.
diff --git a/src/tests/create/kdb5_mkdums.M b/src/tests/create/kdb5_mkdums.M
index 3be786cf26..48e7678803 100644
--- a/src/tests/create/kdb5_mkdums.M
+++ b/src/tests/create/kdb5_mkdums.M
@@ -1,6 +1,5 @@
-.\" $Source$
-.\" $Author$
-.\" $Id$
+.\" tests/create/kdb5_mkdums.M
+.\"
 .\" Copyright 1990 by the Massachusetts Institute of Technology.
 .\"
 .\" Export of this software from the United States of America may
diff --git a/src/tests/hammer/Imakefile b/src/tests/hammer/Imakefile
index ad86f7da88..e1545199aa 100644
--- a/src/tests/hammer/Imakefile
+++ b/src/tests/hammer/Imakefile
@@ -1,6 +1,4 @@
-#	$Source$
-#	$Author$
-#	$Id$
+#	tests/hammer/Imakefile
 #
 #  Copyright 1990,1991 by the Massachusetts Institute of Technology.
 #  All Rights Reserved.
diff --git a/src/tests/verify/Imakefile b/src/tests/verify/Imakefile
index 84add7b8b8..b448512d95 100644
--- a/src/tests/verify/Imakefile
+++ b/src/tests/verify/Imakefile
@@ -1,6 +1,4 @@
-#	$Source$
-#	$Author$
-#	$Id$
+#	tests/verify/Imakefile
 #
 #  Copyright 1990,1991 by the Massachusetts Institute of Technology.
 #  All Rights Reserved.
diff --git a/src/util/et/com_err.3 b/src/util/et/com_err.3
index 3fb293e416..d4704342c3 100644
--- a/src/util/et/com_err.3
+++ b/src/util/et/com_err.3
@@ -1,7 +1,7 @@
 .\" Copyright (c) 1988 Massachusetts Institute of Technology,
 .\" Student Information Processing Board.  All rights reserved.
 .\"
-.\" $Header$
+.\" util/et/com_err.3
 .\"
 .TH COM_ERR 3 "22 Nov 1988" SIPB
 .SH NAME
diff --git a/src/util/et/com_err.texinfo b/src/util/et/com_err.texinfo
index 2f4b266129..8b6399930b 100644
--- a/src/util/et/com_err.texinfo
+++ b/src/util/et/com_err.texinfo
@@ -1,8 +1,6 @@
 \input texinfo @c -*-texinfo-*-
 
-@c $Header$
-@c $Source$
-@c $Locker$
+@c util/et/com_err.texinfo
 
 @c Note that although this source file is in texinfo format (more
 @c or less), it is not yet suitable for turning into an ``info''
diff --git a/src/util/et/compile_et.1 b/src/util/et/compile_et.1
index f17a278bdc..a082bca46c 100644
--- a/src/util/et/compile_et.1
+++ b/src/util/et/compile_et.1
@@ -1,7 +1,7 @@
 .\" Copyright (c) 1988 Massachusetts Institute of Technology,
 .\" Student Information Processing Board.  All rights reserved.
 .\"
-.\" $Header$
+.\" util/et/compile_et.1
 .\"
 .TH COMPILE_ET 1 "22 Nov 1988" SIPB
 .SH NAME